Changeset 8279 for trunk

Timestamp:

07/12/11 14:33:25 (6 months ago)

Author:

westram

Message:

• moved AW_window awar-create/read/write into member-functions
• several fixes related to [8278]
  • if window-position is unknown in expose callback
    • set it again from awars and
    • delay WM_offset calculation using timed-callback
  • never save values into awars, if WM_offsets have not been calculated
  • make sure that window-position set and stored-in-awars is the same (in show_internal)
    • needed for correct WM_offset-calculation
    • popup-windows which are repositioned on show, no longer popup on (old) wrong position and then jump to wanted position (instead they instantly appear at wanted position).
  • only add expose-callback once
• changed behavior of modal prompter windows
  • faster reaction (100ms instead of 500ms delay)
  • the window is not centered on mouse pos, instead its just moved that far that the mouse is inside the window.
  • considers WM_offsets
  • fallback to center-jump if window-position is unknown

Location:

trunk/WINDOW

Files:

• AW_modal.cxx (modified) (1 diff)
• AW_window.cxx (modified) (13 diffs)
• aw_window.hxx (modified) (4 diffs)
• aw_window_Xm.hxx (modified) (1 diff)

trunk/WINDOW/AW_modal.cxx

@@ -26 +26 @@
 #define AWAR_QUESTION "tmp/question"
 
-#define AW_MESSAGE_LISTEN_DELAY 500 // look in ms whether a father died
+#define AW_MESSAGE_LISTEN_DELAY 100 // look in ms whether a father died
 
 int aw_message_cb_result;

trunk/WINDOW/AW_window.cxx

@@ -601 +601 @@
 #define aw_awar_name_height(aww) aw_size_awar_name((aww), "height")
 
+void AW_window::create_user_geometry_awars(int posx, int posy, int width, int height) {
+    get_root()->awar_int(aw_awar_name_posx(this), posx);
+    get_root()->awar_int(aw_awar_name_posy(this), posy);
+    get_root()->awar_int(aw_awar_name_width(this), width);
+    get_root()->awar_int(aw_awar_name_height(this), height);
+}
+
+
+void AW_window::store_size_in_awars(int width, int height) {
+    get_root()->awar(aw_awar_name_width(this))->write_int(width);
+    get_root()->awar(aw_awar_name_height(this))->write_int(height);
+}
+
+void AW_window::get_size_from_awars(int& width, int& height) {
+    width  = get_root()->awar(aw_awar_name_width(this))->read_int();
+    height = get_root()->awar(aw_awar_name_height(this))->read_int();
+}
+
+void AW_window::store_pos_in_awars(int posx, int posy) {
+    get_root()->awar(aw_awar_name_posx(this))->write_int(posx);
+    get_root()->awar(aw_awar_name_posy(this))->write_int(posy);
+}
+
+void AW_window::get_pos_from_awars(int& posx, int& posy) {
+    posx = get_root()->awar(aw_awar_name_posx(this))->read_int();
+    posy = get_root()->awar(aw_awar_name_posy(this))->read_int();
+}
+
+#undef aw_awar_name_posx
+#undef aw_awar_name_posy
+#undef aw_awar_name_width
+#undef aw_awar_name_height
+
+static void aw_onExpose_calc_WM_offsets(AW_window *aww);
+static void aw_calc_WM_offsets_delayed(AW_root *, AW_CL cl_aww, AW_CL) { aw_onExpose_calc_WM_offsets((AW_window*)cl_aww); }
+
 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. 
+    int posx,  posy;  aww->get_window_content_pos(posx, posy);
+
+    bool knows_window_position = posx != 0 || posy != 0;
+
+    if (!knows_window_position) { // 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);
+
+        int oposx, oposy; aww->get_pos_from_awars(oposx, oposy);
+        aww->set_window_frame_pos(oposx, oposy);
+
+        if (!motif->knows_WM_offset()) {
+            aww->get_root()->add_timed_callback(100, aw_calc_WM_offsets_delayed, (AW_CL)aww, 0);
+        }
+    }
+    else if (!motif->knows_WM_offset()) {
+        int oposx, oposy; aww->get_pos_from_awars(oposx, oposy);
+        // calculate offset
+        motif->WM_top_offset  = posy-oposy;
+        motif->WM_left_offset = posx-oposx;
+    }
 }
 
@@ -955 +982 @@
 }
 
-void AW_window::set_window_pos(int x, int y) {
+void AW_window::set_window_frame_pos(int x, int y) {
+    // this will set the position of the frame around the client-area (see also WM_top_offset ..)
     XtVaSetValues(p_w->shell, XmNx, (int)x, XmNy, (int)y, NULL);
 }
-void AW_window::get_window_pos(int& xpos, int& ypos) {
+void AW_window::get_window_content_pos(int& xpos, int& ypos) {
+    // this will report the position of the client-area (see also WM_top_offset ..)
     unsigned short x, y;
     XtVaGetValues(p_w->shell, XmNx, &x, XmNy, &y, NULL);
@@ -1686 +1715 @@
 
 void aw_update_window_geometry_awars(AW_window *aww) {
-    AW_root *root = aww->get_root();
+    AW_window_Motif *motif = p_aww(aww);
 
     short          posx, posy;
     unsigned short width, height, borderwidth;
-    XtVaGetValues(p_aww(aww)->shell,                // bad hack
+    XtVaGetValues(motif->shell, // bad hack
                   XmNborderWidth, &borderwidth,
                   XmNwidth, &width,
@@ -1698 +1727 @@
                   NULL);
 
-    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; // why is this not handled like posy?
-
-    if (posx<0) posx = 0;
-    if (posy<0) posy = 0;
-
-    root->awar(aw_awar_name_width (aww))->write_int(width);
-    root->awar(aw_awar_name_height(aww))->write_int(height);
-    root->awar(aw_awar_name_posx (aww))->write_int(posx);
-    root->awar(aw_awar_name_posy (aww))->write_int(posy);
+    if (motif->knows_WM_offset()) {
+        posy -= motif->WM_top_offset;
+        posx -= motif->WM_left_offset;
+
+        if (posx<0) posx = 0;
+        if (posy<0) posy = 0;
+
+        aww->store_pos_in_awars(posx, posy);
+    }
+#if defined(DEBUG)
+    else {
+        fprintf(stderr, " WM_offsets unknown. Did not update awars!\n");
+    }
+#endif
+    aww->store_size_in_awars(width, height);
 }
 
@@ -1791 +1823 @@
         bool has_user_geometry = false;
 
-        const char *temp = aw_awar_name_width(aww);
-        root->awar_int(temp, width);
+        aww->create_user_geometry_awars(posx, posy, width, height);
+
+        int user_width, user_height; aww->get_size_from_awars(user_width, user_height);
+        int user_posx,  user_posy;   aww->get_pos_from_awars(user_posx,  user_posy);
+
         if (allow_resize) {
-            int found_width = (int)root->awar(temp)->read_int();
-            if (width != found_width) {
-                has_user_geometry = true;
-                width = found_width;
-            }
-        }
-
-        temp = aw_awar_name_height(aww);
-        root->awar_int(temp, height);
-        if (allow_resize) {
-            int found_height = (int)root->awar(temp)->read_int();
-            if (height != found_height) {
-                has_user_geometry = true;
-                height = found_height;
-            }
-        }
-
-        temp = aw_awar_name_posx(aww);
-        root->awar_int(temp, posx)->set_minmax(0, 4000);
+            if (width != user_width) { width = user_width; has_user_geometry = true; }
+            if (height != user_height) { height = user_height; has_user_geometry = true; }
+        }
+
         // @@@ FIXME:  maximum should be set to current screen size minus some offset
         // to ensure that windows do not appear outside screen
-        // same for posy below!
-
-        int found_posx = (int)root->awar(temp)->read_int();
-        if (posx != found_posx) {
-            has_user_geometry = true;
-            posx = found_posx;
-        }
-
-        temp = aw_awar_name_posy(aww);
-        root->awar_int(temp, posy)->set_minmax(0, 3000);
-        int found_posy = (int)root->awar(temp)->read_int();
-        if (posy != found_posy) {
-            has_user_geometry = true;
-            posy = found_posy;
-        }
+        if (posx != user_posx) { posx = user_posx; has_user_geometry = true; }
+        if (posy != user_posy) { posy = user_posy; has_user_geometry = true; }
 
         if (has_user_geometry) {
@@ -1864 +1871 @@
         GBK_terminatef("Failed to load icon pixmap for window '%s'\n", aww->window_defaults_name);
     }
-
-#if defined(DEBUG) && 0
-    printf("aw_create_shell: pos=%i/%i size=%i%i\n", posx, posy, width, height);
-#endif // DEBUG
 
     int focusPolicy = root->focus_follows_mouse ? XmPOINTER : XmEXPLICIT;
@@ -1960 +1963 @@
 }
 
-void AW_window_menu_modes::init(AW_root *root_in, const char *wid, const char *windowname, int  width, int height) {
+void AW_window_menu_modes::init(AW_root *root_in, const char *wid, const char *windowname, int  width, int height) { // @@@ indentation
     Widget      main_window;
     Widget      help_popup;
@@ -2170 +2173 @@
 }
 
-void AW_window_menu::init(AW_root *root_in, const char *wid, const char *windowname, int width, int height) {
+void AW_window_menu::init(AW_root *root_in, const char *wid, const char *windowname, int width, int height) { // @@@ indentation
     Widget      main_window;
     Widget      help_popup;
@@ -2403 +2406 @@
 }
 
-void AW_window_simple_menu::init(AW_root *root_in, const char *wid, const char *windowname) {
+void AW_window_simple_menu::init(AW_root *root_in, const char *wid, const char *windowname) { // @@@ indentation
     root = root_in; // for macro
 
@@ -3131 +3134 @@
         else {
             aw_assert(recalc_size_at_show == AW_RESIZE_USER);
-            // check whether user size is too small and increase to minimum (aka default)
-            int default_width, default_height;
-            get_window_size(default_width, default_height);
-            AW_root *tmp_root = get_root();
-            int user_width = tmp_root->awar(aw_awar_name_width(this))->read_int();
-            int user_height = tmp_root->awar(aw_awar_name_height(this))->read_int();
-
-            if (user_width<default_width) user_width = default_width;
-            if (user_height<default_height) user_height = default_height;
+            // check whether user size is too small and increase to minimum window size
+
+            int min_width, min_height;   get_window_size(min_width, min_height);
+            int user_width, user_height; get_size_from_awars(user_width, user_height);
+
+            if (user_width <min_width)  user_width  = min_width;
+            if (user_height<min_height) user_height = min_height;
 
             set_window_size(user_width, user_height);
@@ -3146 +3147 @@
     }
 
-    if (recalc_pos_at_show != AW_KEEP_POS) {
+    {
         int  posx, posy;
         bool setPos = false;
@@ -3157 +3158 @@
                 int mx, my; if (!get_mouse_pos(mx, my)) goto FALLBACK_CENTER;
                 int width, height; get_window_size(width, height);
-                int wx, wy; get_window_pos(wx, wy);
-
-                int wx2 = wx+width-1;
-                int wy2 = wy+height-1;
-
-                if (mx<wx || mx>wx2 || my<wy || my>wy2) { // mouse is outside window
+                int wx, wy; get_window_content_pos(wx, wy);
+
+                if (wx || wy) {
+                    if (p_w->knows_WM_offset()) {
+                        wx -= p_w->WM_left_offset;
+                        wy -= p_w->WM_top_offset;
+
+                        width  += p_w->WM_left_offset;
+                        height += p_w->WM_top_offset;
+                    }
+
+                    int wx2 = wx+width-1;
+                    int wy2 = wy+height-1;
+
+                    if (mx<wx) { setPos = true; wx = mx; } else if (mx>wx2) { setPos = true; wx = mx-width+1; }
+                    if (my<wy) { setPos = true; wy = my; } else if (my>wy2) { setPos = true; wy = my-height+1; }
+
+                    posx = wx;
+                    posy = wy;
+                }
+                else {
                     setPos = true;
-                    posx   = mx-width/2; // center window on mouse position
+                    posx   = mx-width/2;
                     posy   = my-height/2;
                 }
+
+                if (posx<0) posx = 0;
+                if (posy<0) posy = 0;
+
                 break;
             }
             case AW_REPOS_TO_CENTER: {
-            FALLBACK_CENTER :
+                  FALLBACK_CENTER :
                 int width, height; get_window_size(width, height);
                 int swidth, sheight; get_screen_size(swidth, sheight);
@@ -3181 +3201 @@
 
             case AW_KEEP_POS:
-                aw_assert(0);
                 break;
         }
 
-        if (setPos) set_window_pos(posx, posy); // @@@ try if it's better to set this via aw_onExpose_setPosFromAwars
+        if (setPos) store_pos_in_awars(posx, posy);
+        else get_pos_from_awars(posx, posy);
+
+        set_window_frame_pos(posx, posy); // always set pos
     }
 
     XtPopup(p_w->shell, grab);
-    if (p_w->WM_top_offset == AW_CALC_OFFSET_ON_EXPOSE) {              // very bad hack
+    if (!expose_callback_added) {
         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
+        expose_callback_added = true;
     }
 }

trunk/WINDOW/aw_window.hxx

@@ -194 +194 @@
 enum AW_PosRecalc {
     AW_KEEP_POS            = 0,                     // do not change position on show
-    AW_REPOS_TO_CENTER     = 1,                     // center the window on show
+    AW_REPOS_TO_CENTER     = 1,                     // center the window on show (unused atm)
     AW_REPOS_TO_MOUSE      = 2,                     // move the window under the current mouse position
     AW_REPOS_TO_MOUSE_ONCE = 3,                     // like AW_REPOS_TO_MOUSE, but only done once!
@@ -206 +206 @@
     aw_hide_cb         hide_cb;
 
+    bool expose_callback_added;
+    
     void all_menus_created() const;
     void create_toggle(const char *var_name, aw_toggle_data *tdata);
@@ -386 +388 @@
 
 
+    void create_user_geometry_awars(int posx, int posy, int width, int height);
+    
     // ************** Control window size  *********
     void set_window_size(int width, int height);
@@ -391 +395 @@
     void window_fit();                              // Recalculate the size of a window with buttons
 
+    void store_size_in_awars(int width, int height);
+    void get_size_from_awars(int& width, int& height);
+
 
     // ************** Control window position  *********
-    void set_window_pos(int width, int height);
-    void get_window_pos(int& xpos, int& ypos);
-
+    void set_window_frame_pos(int xpos, int ypos);
+    void get_window_content_pos(int& xpos, int& ypos);
+
+    void store_pos_in_awars(int xpos, int ypos);
+    void get_pos_from_awars(int& xpos, int& ypos);
+    
+    
     // *****************
 

trunk/WINDOW/aw_window_Xm.hxx

@@ -301 +301 @@
 
     AW_area_management *areas[AW_MAX_AREA];
-    int                 WM_top_offset; // WM top area
-    int                 WM_left_offset;
+
+    int WM_top_offset;                 // correction between position set and position reported ( = size of window frame - in most cases!)
+    int WM_left_offset;
+
+    bool knows_WM_offset() const { return WM_top_offset != AW_CALC_OFFSET_ON_EXPOSE; }
 
     AW_window_Motif();