Changeset 8278 for trunk

Timestamp:

05/12/11 11:50:35 (6 months ago)

Author:

westram

Message:

• fix ARB<>Unity incompatibilities
  • buttons of freshly generated ARB windows were clickable, but nothing happened when clicked.
    • Slightly moving the window or otherwise triggering an expose-callback fixed that behavior, but only for this window.
  • changes for this fix
    • the hack to calculate the WM-offsets failed, since unity does not provide the already-set, but not yet exposed window-position
      • assume that the values in awars are correct and use them to set position (again)
    • unity forgets window position when hiding a window. ARB did not restore the previously used position and button again where w/o effect. fixed by:
      • store position on hide
      • always set position in show_internal

Location:

trunk/WINDOW

Files:

• AW_nawar.cxx (modified) (1 diff)
• AW_window.cxx (modified) (7 diffs)
• aw_nawar.hxx (modified) (1 diff)
• aw_window_Xm.hxx (modified) (1 diff)

trunk/WINDOW/AW_nawar.cxx

@@ -619 +619 @@
         error = GB_push_transaction(gb_main);
         if (!error) {
-            aw_update_awar_window_geometry(this);
+            aw_update_all_window_geometry_awars(this);
             error = GB_pop_transaction(gb_main);
             if (!error) error = GB_save_in_arbprop(gb_main, filename, "a");

trunk/WINDOW/AW_window.cxx

@@ -601 +601 @@
 #define aw_awar_name_height(aww) aw_size_awar_name((aww), "height")
 
-static void aw_calculate_WM_offsets(AW_window *aww) {
-    if (p_aww(aww)->WM_top_offset == AW_FIX_POS_ON_EXPOSE) {        // very bad hack continued
-        // get last position stored in properties
-        AW_root *root  = aww->get_root();
-        int      oposx = root->awar(aw_awar_name_posx(aww))->read_int();
-        int      oposy = root->awar(aw_awar_name_posy(aww))->read_int();
-
-        // get current window position
-        short            posy, posx;
-        AW_window_Motif *motif = p_aww(aww);
-        XtVaGetValues(motif->shell,  XmNx, &posx, XmNy, &posy, NULL);
-
-        // calculate offset
-        motif->WM_top_offset  = posy-oposy;
-        motif->WM_left_offset = posx-oposx;
-
-#if defined(DEBUG) && 0
-        printf("aw_calculate_WM_offsets: WM_left_offset=%i WM_top_offset=%i\n", motif->WM_left_offset, motif->WM_top_offset);
-#endif // DEBUG
-    }
-
-#if defined(DEBUG) && 0
-    {
-        short posx, posy;
-        AW_window_Motif *motif = p_aww(aww);
-        XtVaGetValues(motif->shell,  XmNx, &posx, XmNy, &posy, NULL);
-        printf("[expose] Position reported by motif: %i/%i\n", posx, posy);
-    }
-#endif // DEBUG
+static void aw_onExpose_calc_WM_offsets(AW_window *aww) {
+    if (p_aww(aww)->WM_top_offset != AW_CALC_OFFSET_ON_EXPOSE) return; // @@@ remove me when using called-once-expose-callbacks
+    aw_assert(p_aww(aww)->WM_top_offset == AW_CALC_OFFSET_ON_EXPOSE);
+
+    // get last position stored in properties
+    AW_root *root  = aww->get_root();
+    int      oposx = root->awar(aw_awar_name_posx(aww))->read_int();
+    int      oposy = root->awar(aw_awar_name_posy(aww))->read_int();
+
+    AW_window_Motif *motif = p_aww(aww);
+
+    int posx, posy;
+    aww->get_window_pos(posx, posy);
+
+    if (posx == 0 && posy == 0) { // oops - motif has no idea where the window has been placed
+        // assume positions stored in awars are correct and use them. 
+        // This works around problems with unclickable GUI-elements when running on 'Unity'
+        aww->set_window_pos(oposx, oposy);
+        posx = oposx;
+        posy = oposy;
+    }
+
+    // calculate offset
+    motif->WM_top_offset  = posy-oposy;
+    motif->WM_left_offset = posx-oposx;
+}
+
+static void aw_onExpose_setPosFromAwars(AW_window *aww) {
+    AW_root *root  = aww->get_root();
+    int oposx = root->awar(aw_awar_name_posx(aww))->read_int();
+    int oposy = root->awar(aw_awar_name_posy(aww))->read_int();
+        
+    aww->set_window_pos(oposx, oposy);
 }
 
@@ -1681 +1685 @@
 }
 
-static long aw_loop_get_window_geometry(const char *, long val, void *) {
-    AW_window *aww = (AW_window *)val;
-    short posx, posy;
-
+void aw_update_window_geometry_awars(AW_window *aww) {
     AW_root *root = aww->get_root();
+
+    short          posx, posy;
     unsigned short width, height, borderwidth;
-
     XtVaGetValues(p_aww(aww)->shell,                // bad hack
                   XmNborderWidth, &borderwidth,
@@ -1696 +1698 @@
                   NULL);
 
-    if (p_aww(aww)->WM_top_offset != AW_FIX_POS_ON_EXPOSE) {
+    if (p_aww(aww)->WM_top_offset != AW_CALC_OFFSET_ON_EXPOSE) {
         posy -= p_aww(aww)->WM_top_offset;
     }
-    posx -= p_aww(aww)->WM_left_offset;
+    posx -= p_aww(aww)->WM_left_offset; // why is this not handled like posy?
 
     if (posx<0) posx = 0;
@@ -1708 +1710 @@
     root->awar(aw_awar_name_posx (aww))->write_int(posx);
     root->awar(aw_awar_name_posy (aww))->write_int(posy);
-
+}
+
+static long aw_loop_get_window_geometry(const char *, long val, void *) {
+    aw_update_window_geometry_awars((AW_window *)val);
     return val;
 }
 
-void aw_update_awar_window_geometry(AW_root *awr) {
+void aw_update_all_window_geometry_awars(AW_root *awr) {
     GBS_hash_do_loop(awr->hash_for_windows, aw_loop_get_window_geometry, NULL);
 }
@@ -1952 +1957 @@
     }
     XtRealizeWidget(p_aww(aww)->shell);
-    p_aww(aww)->WM_top_offset = AW_FIX_POS_ON_EXPOSE;
+    p_aww(aww)->WM_top_offset = AW_CALC_OFFSET_ON_EXPOSE;
 }
 
@@ -3180 +3185 @@
         }
 
-        if (setPos) {
-            int currx, curry;
-            get_window_pos(currx, curry);
-            if (currx != posx || curry != posy) {
-#if defined(DEBUG) && 0
-                printf("force position at show_internal: %i/%i\n", posx, posy);
-#endif // DEBUG
-                set_window_pos(posx, posy);
-            }
-        }
+        if (setPos) set_window_pos(posx, posy); // @@@ try if it's better to set this via aw_onExpose_setPosFromAwars
     }
 
     XtPopup(p_w->shell, grab);
-    if (p_w->WM_top_offset == AW_FIX_POS_ON_EXPOSE) {              // very bad hack
-        set_expose_callback(AW_INFO_AREA, (AW_CB)aw_calculate_WM_offsets, 0, 0);
+    if (p_w->WM_top_offset == AW_CALC_OFFSET_ON_EXPOSE) {              // very bad hack
+        set_expose_callback(AW_INFO_AREA, (AW_CB)aw_onExpose_calc_WM_offsets, 0, 0); // @@@ should be removed after it was called once
+    }
+    else if (recalc_pos_at_show == AW_KEEP_POS) {
+        set_expose_callback(AW_INFO_AREA, (AW_CB)aw_onExpose_setPosFromAwars, 0, 0); // @@@ should be removed after it was called once
     }
 }
@@ -3210 +3209 @@
 void AW_window::hide() {
     if (window_is_shown) {
+        aw_update_window_geometry_awars(this);
         if (hide_cb) hide_cb(this);
         get_root()->window_hide();

trunk/WINDOW/aw_nawar.hxx

@@ -92 +92 @@
 };
 
-void aw_update_awar_window_geometry(AW_root *awr);
+void aw_update_window_geometry_awars(AW_window *aww); // one window
+void aw_update_all_window_geometry_awars(AW_root *awr); // all windows
 
 #else

trunk/WINDOW/aw_window_Xm.hxx

@@ -272 +272 @@
 
 const int AW_NUMBER_OF_F_KEYS = 20;
-#define AW_FIX_POS_ON_EXPOSE -12345
+#define AW_CALC_OFFSET_ON_EXPOSE -12345
 
 class AW_window_Motif : virtual Noncopyable {