don't use -q option with egrep, Solaris doesn't have it (bug 517145)

[wxWidgets.git] / src / x11 / toplevel.cpp

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 54389a216103a29e51eda5516b6d5f4106b01ef4..b610b7f0a5fcdc540778c2a541750aed7a504673 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -35,18 +35,15 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"

+    #include "wx/menu.h"
+    #include "wx/statusbr.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

+#include "wx/settings.h"

 #include "wx/x11/private.h"
 #include "wx/x11/private.h"

-#include "X11/Xatom.h"

 #include "X11/Xutil.h"
 
 #include "X11/Xutil.h"
 

-// Set the window manager decorations according to the
-// given wxWindows style
-#if 0
-static bool SetWMDecorations(Widget w, long style);
-#endif
-static bool MWMIsRunning(Window w);
+bool wxMWMIsRunning(Window w);

 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11 creation
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowX11 creation


@@ -66,22 +63,6 @@ void wxTopLevelWindowX11::Init()
     m_fsIsShowing = FALSE;
 }
 
     m_fsIsShowing = FALSE;
 }
 

-bool wxTopLevelWindowX11::CreateDialog(const wxString& title,
-                                       const wxPoint& pos,
-                                       const wxSize& size)
-{
-    // TODO
-    return FALSE;
-}
-
-bool wxTopLevelWindowX11::CreateFrame(const wxString& title,
-                                      const wxPoint& pos,
-                                      const wxSize& size)
-{
-    // TODO
-    return FALSE;
-}
-

 bool wxTopLevelWindowX11::Create(wxWindow *parent,
                                  wxWindowID id,
                                  const wxString& title,
 bool wxTopLevelWindowX11::Create(wxWindow *parent,
                                  wxWindowID id,
                                  const wxString& title,


@@ -94,31 +75,45 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     Init();
 
     m_windowStyle = style;
     Init();
 
     m_windowStyle = style;

+    m_parent = parent;

 
     SetName(name);
 
     m_windowId = id == -1 ? NewControlId() : id;
 
 
     SetName(name);
 
     m_windowId = id == -1 ? NewControlId() : id;
 

+    if (parent)
+        parent->AddChild(this);
+

     wxTopLevelWindows.Append(this);
     
     Display *xdisplay = wxGlobalDisplay();
     int xscreen = DefaultScreen( xdisplay );
     Visual *xvisual = DefaultVisual( xdisplay, xscreen );
     Window xparent = RootWindow( xdisplay, xscreen );
     wxTopLevelWindows.Append(this);
     
     Display *xdisplay = wxGlobalDisplay();
     int xscreen = DefaultScreen( xdisplay );
     Visual *xvisual = DefaultVisual( xdisplay, xscreen );
     Window xparent = RootWindow( xdisplay, xscreen );

+    Colormap cm = DefaultColormap( xdisplay, xscreen );

     
     

+    // TODO: For dialogs, this should be wxSYS_COLOUR_3DFACE
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
+    m_backgroundColour.CalcPixel( (WXColormap) cm );
+    m_hasBgCol = TRUE;
+       

     XSetWindowAttributes xattributes;
     XSizeHints size_hints;
     XWMHints wm_hints;
     
     long xattributes_mask =
     XSetWindowAttributes xattributes;
     XSizeHints size_hints;
     XWMHints wm_hints;
     
     long xattributes_mask =

-        CWEventMask |
+        CWOverrideRedirect |

         CWBorderPixel | CWBackPixel;
         CWBorderPixel | CWBackPixel;

-    xattributes.background_pixel = BlackPixel( xdisplay, xscreen );
+    xattributes.background_pixel = m_backgroundColour.GetPixel();

     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
     xattributes.border_pixel = BlackPixel( xdisplay, xscreen );

+
+    // TODO: if we want no border, caption etc.,
+    // I think we set this to True to remove decorations

     xattributes.override_redirect = False;
     
     Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y, 
        0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
     xattributes.override_redirect = False;
     
     Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y, 
        0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );

+    m_mainWidget = (WXWindow) xwindow;

     
     XSelectInput( xdisplay, xwindow,
         ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
     
     XSelectInput( xdisplay, xwindow,
         ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |


@@ -143,9 +138,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     Atom wm_delete_window = XInternAtom( xdisplay, "WM_DELETE_WINDOW", False);
     XSetWMProtocols( xdisplay, xwindow, &wm_delete_window, 1);
     
     Atom wm_delete_window = XInternAtom( xdisplay, "WM_DELETE_WINDOW", False);
     XSetWMProtocols( xdisplay, xwindow, &wm_delete_window, 1);
     

-#if 0
-    SetWMDecorations((Window) GetMainWindow(), style);
-#endif
+    wxSetWMDecorations((Window) GetMainWindow(), style);

 
     SetTitle(title);
     
 
     SetTitle(title);
     


@@ -175,9 +168,6 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11()
 
 bool wxTopLevelWindowX11::Show(bool show)
 {
 
 bool wxTopLevelWindowX11::Show(bool show)
 {

-    if ( !wxWindowBase::Show(show) )
-        return FALSE;
-

     return wxWindowX11::Show(show);
 }
 
     return wxWindowX11::Show(show);
 }
 


@@ -262,22 +252,19 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon)
 
     if (icon.Ok() && GetMainWindow())
     {
 
     if (icon.Ok() && GetMainWindow())
     {

-#if 0

         XWMHints *wmHints = XAllocWMHints();
         XWMHints *wmHints = XAllocWMHints();

-        wmHints.icon_pixmap = (Pixmap) icon.GetPixmap();
+        wmHints->icon_pixmap = (Pixmap) icon.GetPixmap();

 
 

-        wmHints.flags = IconPixmapHint;
+        wmHints->flags = IconPixmapHint;

 
         if (icon.GetMask())
         {
 
         if (icon.GetMask())
         {

-            wmHints.flags |= IconMaskHint;
-            wmHints.icon_mask = (Pixmap) icon.GetMask()->GetPixmap();
+            wmHints->flags |= IconMaskHint;
+            wmHints->icon_mask = (Pixmap) icon.GetMask()->GetBitmap();

         }
 
         }
 

-        XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(),
-            wmHints);
+        XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(), wmHints);

         XFree(wmHints);
         XFree(wmHints);

-#endif

     }
 }
 
     }
 }
 


@@ -290,6 +277,8 @@ void wxTopLevelWindowX11::SetTitle(const wxString& title)
             (const char*) title);
         XSetIconName(wxGlobalDisplay(), (Window) GetMainWindow(),
             (const char*) title);
             (const char*) title);
         XSetIconName(wxGlobalDisplay(), (Window) GetMainWindow(),
             (const char*) title);

+
+        // Use this if the platform doesn't supply the above functions.

 #if 0
         XTextProperty textProperty;
         textProperty.value = (unsigned char*) title;
 #if 0
         XTextProperty textProperty;
         textProperty.value = (unsigned char*) title;


@@ -335,10 +324,9 @@ struct MwmHints {
 
 // Set the window manager decorations according to the
 // given wxWindows style
 
 // Set the window manager decorations according to the
 // given wxWindows style

-#if 0
-static bool SetWMDecorations(Widget w, long style)
+bool wxSetWMDecorations(Window w, long style)

 {
 {

-    if (!MWMIsRunning(w))
+    if (!wxMWMIsRunning(w))

         return FALSE;
 
     Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False);
         return FALSE;
 
     Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False);


@@ -392,15 +380,14 @@ static bool SetWMDecorations(Widget w, long style)
 
     XChangeProperty(wxGlobalDisplay(),
                    w,
 
     XChangeProperty(wxGlobalDisplay(),
                    w,

-                   mwm_wm_hints, mem_wm_hints,
+                   mwm_wm_hints, mwm_wm_hints,

                    32, PropModeReplace,
                    (unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
 
     return TRUE;
 }
                    32, PropModeReplace,
                    (unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
 
     return TRUE;
 }

-#endif

 
 

-static bool MWMIsRunning(Window w)
+bool wxMWMIsRunning(Window w)

 {
     Display *dpy = (Display*)wxGetDisplay();
     Atom motifWmInfo = XInternAtom(dpy, "_MOTIF_WM_INFO", False);
 {
     Display *dpy = (Display*)wxGetDisplay();
     Atom motifWmInfo = XInternAtom(dpy, "_MOTIF_WM_INFO", False);


@@ -420,4 +407,61 @@ static bool MWMIsRunning(Window w)
 
     return (ret == Success);
 }
 
     return (ret == Success);
 }

-    
\ No newline at end of file
+    
+// For implementation purposes - sometimes decorations make the client area
+// smaller
+wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const
+{
+    // In fact wxFrame::GetClientAreaOrigin
+    // does the required calculation already.
+#if 0
+    if (this->IsKindOf(CLASSINFO(wxFrame)))
+    {
+       wxFrame* frame = (wxFrame*) this;
+       if (frame->GetMenuBar())
+           return wxPoint(0, frame->GetMenuBar()->GetSize().y);
+    }
+#endif
+    return wxPoint(0, 0);
+}
+
+void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const
+{
+    wxWindowX11::DoGetClientSize(width, height);
+    // Done by wxTopLevelWindow
+#if 0
+    if (this->IsKindOf(CLASSINFO(wxFrame)))
+    {
+       wxFrame* frame = (wxFrame*) this;
+       if (frame->GetMenuBar())
+           (*height) -= frame->GetMenuBar()->GetSize().y;
+       if (frame->GetStatusBar())
+           (*height) -= frame->GetStatusBar()->GetSize().y;
+    }
+#endif
+}
+
+void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
+{
+    wxWindowX11::DoSetClientSize(width, height);
+#if 0
+    if (!GetMainWindow())
+        return;
+
+    XWindowChanges windowChanges;
+    int valueMask = 0;
+
+    if (width != -1)
+    {
+        windowChanges.width = width ;
+        valueMask |= CWWidth;
+    }
+    if (height != -1)
+    {
+        windowChanges.height = height ;
+        valueMask |= CWHeight;
+    }
+    XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
+        valueMask, & windowChanges);
+#endif
+}