X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f12683e40eee0104fc92a76524337a350a3a3a0..24bcaec36746abeeb9e2023d03e3ab4289006fc3:/src/x11/toplevel.cpp

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 9f2f52a173..56ffc9d7d4 100644
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -123,18 +123,17 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     xattributes.background_pixel = m_backgroundColour.GetPixel();
     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
 
+    if (HasFlag( wxNO_BORDER ))
+    {
+        xattributes_mask |= CWOverrideRedirect;
+        xattributes.override_redirect = True;
+    }
+    
     if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE ))
     {
         xattributes_mask |= CWBitGravity;
         xattributes.bit_gravity = StaticGravity;
     }
-
-    // TODO: if we want no border, caption etc.,
-    // I think we set this to True to remove decorations
-    // No. RR.
-    // Yes :-) JACS (because some WMs don't respect
-    // the hints)
-    // xattributes.override_redirect = (style & wxNO_BORDER) ? True : False;
     
     xattributes_mask |= CWEventMask;
     xattributes.event_mask = 
@@ -154,7 +153,9 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
                                     0, 0, InputOutput, xvisual, backColor, foreColor);
 #endif
 
-    m_mainWidget = (WXWindow) xwindow;
+    m_mainWindow = (WXWindow) xwindow;
+    m_clientWindow = (WXWindow) xwindow;
+    wxAddWindowToTable( xwindow, (wxWindow*) this );
 
 #if wxUSE_NANOX
     XSelectInput( xdisplay, xwindow,
@@ -175,20 +176,26 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
                   PropertyChangeMask
                   );
 #endif
-    
-    wxAddWindowToTable( xwindow, (wxWindow*) this );
 
     // Set background to None which will prevent X11 from clearing the
     // background completely.
     XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
 
 #if !wxUSE_NANOX
-    if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
+    if (HasFlag( wxSTAY_ON_TOP ))
     {
-        if (GetParent() && GetParent()->GetMainWindow())
-        {
-             Window xparentwindow = (Window) GetParent()->GetMainWindow();
-             XSetTransientForHint( xdisplay, xwindow, xparentwindow );
+        Window xroot = RootWindow( xdisplay, xscreen );
+        XSetTransientForHint( xdisplay, xwindow, xroot );
+    }
+    else
+    {
+       if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
+       {
+            if (GetParent() && GetParent()->GetMainWindow())
+            {
+                Window xparentwindow = (Window) GetParent()->GetMainWindow();
+                XSetTransientForHint( xdisplay, xwindow, xparentwindow );
+            }
         }
     }
 
@@ -200,7 +207,12 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     XSetWMNormalHints( xdisplay, xwindow, &size_hints);
     
     XWMHints wm_hints;
-    wm_hints.flags = InputHint | StateHint /* | WindowGroupHint */;
+    wm_hints.flags = InputHint | StateHint;
+    if (GetParent())
+    {  
+        wm_hints.flags |= WindowGroupHint;
+        wm_hints.window_group = (Window) GetParent()->GetMainWindow();
+    }
     wm_hints.input = True;
     wm_hints.initial_state = NormalState;
     XSetWMHints( xdisplay, xwindow, &wm_hints);
@@ -273,6 +285,8 @@ void wxTopLevelWindowX11::OnInternalIdle()
 
 bool wxTopLevelWindowX11::Show(bool show)
 {
+    XSync( wxGlobalDisplay(), False );
+    
     // Nano-X has to force a size event,
     // else there's no initial size.
 #if wxUSE_NANOX
@@ -287,7 +301,6 @@ bool wxTopLevelWindowX11::Show(bool show)
         
         m_needResizeInIdle = FALSE;
     }
-
     if (show)
     {
         // This does the layout _before_ the
@@ -299,8 +312,10 @@ bool wxTopLevelWindowX11::Show(bool show)
             Layout();
         }
     }
+    wxYield();
 
-    return wxWindowX11::Show(show);
+    bool ret = wxWindowX11::Show(show);
+    return ret;
 }
 
 // ----------------------------------------------------------------------------
@@ -433,11 +448,11 @@ wxString wxTopLevelWindowX11::GetTitle() const
 }
 
 #ifndef MWM_DECOR_BORDER
-/* bit definitions for MwmHints.flags */
-#define MWM_HINTS_FUNCTIONS (1L << 0)
-#define MWM_HINTS_DECORATIONS (1L << 1)
-#define MWM_HINTS_INPUT_MODE (1L << 2)
-#define MWM_HINTS_STATUS (1L << 3)
+
+#define MWM_HINTS_FUNCTIONS     (1L << 0)
+#define MWM_HINTS_DECORATIONS   (1L << 1)
+#define MWM_HINTS_INPUT_MODE    (1L << 2)
+#define MWM_HINTS_STATUS        (1L << 3)
 
 #define MWM_DECOR_ALL           (1L << 0)
 #define MWM_DECOR_BORDER        (1L << 1)
@@ -446,6 +461,22 @@ wxString wxTopLevelWindowX11::GetTitle() const
 #define MWM_DECOR_MENU          (1L << 4)
 #define MWM_DECOR_MINIMIZE      (1L << 5)
 #define MWM_DECOR_MAXIMIZE      (1L << 6)
+
+#define MWM_FUNC_ALL            (1L << 0)
+#define MWM_FUNC_RESIZE         (1L << 1)
+#define MWM_FUNC_MOVE           (1L << 2)
+#define MWM_FUNC_MINIMIZE       (1L << 3)
+#define MWM_FUNC_MAXIMIZE       (1L << 4)
+#define MWM_FUNC_CLOSE          (1L << 5)
+
+#define MWM_INPUT_MODELESS 0
+#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
+#define MWM_INPUT_SYSTEM_MODAL 2
+#define MWM_INPUT_FULL_APPLICATION_MODAL 3
+#define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL
+
+#define MWM_TEAROFF_WINDOW	(1L<<0)
+
 #endif
 
 struct MwmHints {
@@ -524,56 +555,51 @@ bool wxSetWMDecorations(Window w, long style)
     GrSetWMProperties(w, & wmProp);
     
 #else
-    if (!wxMWMIsRunning(w))
-        return FALSE;
 
     Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False);
+    if (mwm_wm_hints == 0)
+       return FALSE;
+    
     MwmHints hints;
-    hints.flags = 0;
+    hints.flags = MWM_HINTS_DECORATIONS | MWM_HINTS_FUNCTIONS;
     hints.decorations = 0;
-
-    if (style & wxRESIZE_BORDER)
-    {
-        // wxLogDebug("MWM_DECOR_RESIZEH");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_RESIZEH;
-    }
-
-    if (style & wxSYSTEM_MENU)
-    {
-        // wxLogDebug("MWM_DECOR_MENU");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_MENU;
-    }
-
-    if ((style & wxCAPTION) ||
-        (style & wxTINY_CAPTION_HORIZ) ||
-        (style & wxTINY_CAPTION_VERT))
-    {
-        // wxLogDebug("MWM_DECOR_TITLE");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_TITLE;
-    }
-
-    if ((style & wxTHICK_FRAME) || (style & wxCAPTION))
+    hints.functions = 0;
+    
+    if ((style & wxSIMPLE_BORDER) || (style & wxNO_BORDER))
     {
-        // wxLogDebug("MWM_DECOR_BORDER");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_BORDER;
+        // leave zeros
     }
-
-    if (style & wxMINIMIZE_BOX)
+    else
     {
-        // wxLogDebug("MWM_DECOR_MINIMIZE");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_MINIMIZE;
-    }
+        hints.decorations = MWM_DECOR_BORDER;
+        hints.functions = MWM_FUNC_MOVE;
 
-    if (style & wxMAXIMIZE_BOX)
-    {
-        // wxLogDebug("MWM_DECOR_MAXIMIZE");
-        hints.flags |= MWM_HINTS_DECORATIONS;
-        hints.decorations |= MWM_DECOR_MAXIMIZE;
+        if ((style & wxCAPTION) != 0)
+            hints.decorations |= MWM_DECOR_TITLE;
+            
+        if ((style & wxSYSTEM_MENU) != 0)
+        {
+            hints.functions |= MWM_FUNC_CLOSE;
+            hints.decorations |= MWM_DECOR_MENU;
+        }
+        
+        if ((style & wxMINIMIZE_BOX) != 0)
+        {
+            hints.functions |= MWM_FUNC_MINIMIZE;
+            hints.decorations |= MWM_DECOR_MINIMIZE;
+        }
+        
+        if ((style & wxMAXIMIZE_BOX) != 0)
+        {
+            hints.functions |= MWM_FUNC_MAXIMIZE;
+            hints.decorations |= MWM_DECOR_MAXIMIZE;
+        }
+        
+        if ((style & wxRESIZE_BORDER) != 0)
+        {
+            hints.functions |= MWM_FUNC_RESIZE;
+            hints.decorations |= MWM_DECOR_RESIZEH;
+        }
     }
 
     XChangeProperty(wxGlobalDisplay(),
@@ -586,31 +612,6 @@ bool wxSetWMDecorations(Window w, long style)
     return TRUE;
 }
 
-bool wxMWMIsRunning(Window w)
-{
-#if wxUSE_NANOX
-    return FALSE;
-#else
-    Display *dpy = (Display*)wxGetDisplay();
-    Atom motifWmInfo = XInternAtom(dpy, "_MOTIF_WM_INFO", False);
-
-    unsigned long length, bytesafter;
-    unsigned char value[20];
-    unsigned char *ptr = &value[0];
-    int ret, format;
-    Atom type;
-
-    type = format = length = 0;
-    value[0] = 0;
-
-    ret = XGetWindowProperty(wxGlobalDisplay(), w, motifWmInfo,
-	    0L, 2, False, motifWmInfo, 
-	    &type, &format, &length, &bytesafter, &ptr);
-
-    return (ret == Success);
-#endif
-}
-    
 // For implementation purposes - sometimes decorations make the client area
 // smaller
 wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const
@@ -639,7 +640,7 @@ void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
     size_hints.flags = PSize;
     size_hints.width = width + (oldSize.x - oldClientSize.x);
     size_hints.height = height + (oldSize.y - oldClientSize.y);
-    XSetWMNormalHints( (Display*) GetXDisplay(), (Window) GetMainWindow(),
+    XSetWMNormalHints( wxGlobalDisplay(), (Window) GetMainWindow(),
                        &size_hints);
 
     // This seems to be necessary or resizes don't get performed
@@ -658,16 +659,17 @@ void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
 
 void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
+    //    wxLogDebug("DoSetSize: %s (%ld) %d, %d %dx%d", GetClassInfo()->GetClassName(), GetId(), x, y, width, height);
+
 #if 0
-    // wxLogDebug( "Setting pos: %d, %d", x, y );
     wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
 #endif
     XSync(wxGlobalDisplay(), False);
-    Window window = (Window) m_mainWidget;
+    Window window = (Window) m_mainWindow;
     if (!window)
         return ;
 
-    Display *display = (Display*) GetXDisplay();
+    Display *display = wxGlobalDisplay();
     Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display));
     Window parent_window = window,
         next_parent   = window;
@@ -727,7 +729,7 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz
     size_hints.height = height;
     size_hints.x = x;
     size_hints.y = y;
-    XSetWMNormalHints( (Display*) GetXDisplay(), (Window) GetMainWindow(),
+    XSetWMNormalHints( wxGlobalDisplay(), (Window) GetMainWindow(),
                        &size_hints);
 
     // This seems to be necessary or resizes don't get performed.
@@ -736,16 +738,21 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz
     XSync(wxGlobalDisplay(), False);
     XSync(wxGlobalDisplay(), False);
 #endif
+#if 1
+    wxSizeEvent event(wxSize(width, height), GetId());
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
+#endif
 }
 
 void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const
 {
     XSync(wxGlobalDisplay(), False);
-    Window window = (Window) m_mainWidget;
+    Window window = (Window) m_mainWindow;
     if (!window)
         return ;
 
-    Display *display = (Display*) GetXDisplay();
+    Display *display = wxGlobalDisplay();
     Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display));
     Window parent_window = window,
         next_parent   = window;
@@ -772,7 +779,7 @@ void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const
     if (y) *y = yy;
 #else
     XWindowAttributes attr;
-    Status status = XGetWindowAttributes((Display*) GetXDisplay(), parent_window, & attr);
+    Status status = XGetWindowAttributes( wxGlobalDisplay(), parent_window, & attr);
     if (status)
     {
         if (x) *x = attr.x;