Fix for the splashscreen bitmap not showing up in wxGTK.

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

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 6914ada32d9eeda9698af0d6dd33b4a4cd55966e..89ba9d056a6b7f6a9688852592ecae56343d91c6 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -49,12 +49,6 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-static const int SCROLL_MARGIN = 4;
-

 // ----------------------------------------------------------------------------
 // global variables for this module
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global variables for this module
 // ----------------------------------------------------------------------------


@@ -78,7 +72,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxWindowX11, wxWindowBase)
 
 BEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase)
     EVT_SYS_COLOUR_CHANGED(wxWindowX11::OnSysColourChanged)
 
 BEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase)
     EVT_SYS_COLOUR_CHANGED(wxWindowX11::OnSysColourChanged)

-    EVT_IDLE(wxWindowX11::OnIdle)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -121,11 +114,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
 
     CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
 
 
     CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
 

-    if (parent)
-        parent->AddChild(this);
-
-    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-    m_foregroundColour = *wxBLACK;
+    parent->AddChild(this);

 
     int w = size.GetWidth();
     int h = size.GetHeight();
 
     int w = size.GetWidth();
     int h = size.GetHeight();


@@ -136,18 +125,26 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
     if (x == -1) x = 0;
     if (y == -1) y = 0;
 
     if (x == -1) x = 0;
     if (y == -1) y = 0;
 

-    int screen = DefaultScreen(wxGlobalDisplay());
+    Display *xdisplay = (Display*) wxGlobalDisplay();
+    int xscreen = DefaultScreen( xdisplay );
+    Colormap cm = DefaultColormap( xdisplay, xscreen );

 
 

-    Window parentWindow;
-    if (parent)
-        parentWindow = (Window) parent->GetMainWindow();
-    else
-        parentWindow = RootWindow(wxGlobalDisplay(), screen);
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+    m_backgroundColour.CalcPixel( (WXColormap) cm ); 
+    m_hasBgCol = TRUE;
+    
+    m_foregroundColour = *wxBLACK;
+    m_foregroundColour.CalcPixel( (WXColormap) cm ); 
+    

 
 

-    Window window = XCreateSimpleWindow(wxGlobalDisplay(), parentWindow,
-        x, y, w, h, 0,
-        m_backgroundColour.AllocColour(wxGlobalDisplay()),
-                                       m_foregroundColour.AllocColour(wxGlobalDisplay()));
+    Window parentWindow = (Window) parent->GetMainWindow();
+
+    Window window = XCreateSimpleWindow( 
+        xdisplay, parentWindow,
+        x, y, w, h, 0, 
+        m_backgroundColour.GetPixel(),
+        m_backgroundColour.GetPixel() );
+        

     m_mainWidget = (WXWindow) window;
 
     // Select event types wanted
     m_mainWidget = (WXWindow) window;
 
     // Select event types wanted


@@ -255,17 +252,23 @@ bool wxWindowX11::Enable(bool enable)
 
 bool wxWindowX11::Show(bool show)
 {
 
 bool wxWindowX11::Show(bool show)
 {

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

 
     Window xwin = (Window) GetXWindow();
     Display *xdisp = (Display*) GetXDisplay();
     if (show)
     {
 
     Window xwin = (Window) GetXWindow();
     Display *xdisp = (Display*) GetXDisplay();
     if (show)
     {

+        wxString msg;
+       msg.Printf("Mapping window of type %s", GetClassInfo()->GetClassName());
+       wxLogDebug(msg);

         XMapWindow(xdisp, xwin);
         XMapWindow(xdisp, xwin);

+       XSync(xdisp, False);

     }
     else
     {
     }
     else
     {

+        wxString msg;
+       msg.Printf("Unmapping window of type %s", GetClassInfo()->GetClassName());
+       wxLogDebug(msg);

         XUnmapWindow(xdisp, xwin);
     }
 
         XUnmapWindow(xdisp, xwin);
     }
 


@@ -288,10 +291,21 @@ void wxWindowX11::Lower()
 
 void wxWindowX11::DoCaptureMouse()
 {
 
 void wxWindowX11::DoCaptureMouse()
 {

-    g_captureWindow = (wxWindow*) this;
+    if ((g_captureWindow != NULL) && (g_captureWindow != this))
+    {
+       wxASSERT_MSG(FALSE, "Trying to capture before mouse released.");
+
+       // Core dump now
+       int *tmp = NULL;
+       (*tmp) = 1;
+       return;
+    }
+    

     if ( m_winCaptured )
         return;
 
     if ( m_winCaptured )
         return;
 

+    g_captureWindow = (wxWindow*) this;
+

     if (GetMainWindow())
     {
         int res = XGrabPointer(wxGlobalDisplay(), (Window) GetMainWindow(),
     if (GetMainWindow())
     {
         int res = XGrabPointer(wxGlobalDisplay(), (Window) GetMainWindow(),


@@ -305,10 +319,19 @@ void wxWindowX11::DoCaptureMouse()
 
         if (res != GrabSuccess)
         {
 
         if (res != GrabSuccess)
         {

-            wxLogDebug("Failed to grab pointer.");
+           wxString msg;
+           msg.Printf("Failed to grab pointer for window %s", this->GetClassInfo()->GetClassName());
+           wxLogDebug(msg);
+           if (res == GrabNotViewable)
+           {
+               wxLogDebug("This is not a viewable window - perhaps not shown yet?");
+           }
+           g_captureWindow = NULL;

             return;
         }
             return;
         }

+       wxLogDebug("Grabbed pointer");

 
 

+#if 0

         res = XGrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
             (Window) GetMainWindow(),
             FALSE,
         res = XGrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
             (Window) GetMainWindow(),
             FALSE,


@@ -317,14 +340,16 @@ void wxWindowX11::DoCaptureMouse()
                GrabModeAsync,
             None,
             None);
                GrabModeAsync,
             None,
             None);

-
+       

         if (res != GrabSuccess)
         {
             wxLogDebug("Failed to grab mouse buttons.");
             XUngrabPointer(wxGlobalDisplay(), CurrentTime);
             return;
         }
         if (res != GrabSuccess)
         {
             wxLogDebug("Failed to grab mouse buttons.");
             XUngrabPointer(wxGlobalDisplay(), CurrentTime);
             return;
         }

+#endif

 
 

+#if 0

         res = XGrabKeyboard(wxGlobalDisplay(), (Window) GetMainWindow(),
 #if 0
             ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask,
         res = XGrabKeyboard(wxGlobalDisplay(), (Window) GetMainWindow(),
 #if 0
             ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask,


@@ -339,11 +364,14 @@ void wxWindowX11::DoCaptureMouse()
         {
             wxLogDebug("Failed to grab keyboard.");
             XUngrabPointer(wxGlobalDisplay(), CurrentTime);
         {
             wxLogDebug("Failed to grab keyboard.");
             XUngrabPointer(wxGlobalDisplay(), CurrentTime);

+#if 0

             XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
                 (Window) GetMainWindow());
             XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
                 (Window) GetMainWindow());

+#endif

             return;
         }
             return;
         }

-
+#endif
+       

         m_winCaptured = TRUE;
     }
 }
         m_winCaptured = TRUE;
     }
 }


@@ -359,10 +387,13 @@ void wxWindowX11::DoReleaseMouse()
     if ( wMain )
     {
         XUngrabPointer(wxGlobalDisplay(), wMain);
     if ( wMain )
     {
         XUngrabPointer(wxGlobalDisplay(), wMain);

+#if 0

         XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
                 wMain);
         XUngrabKeyboard(wxGlobalDisplay(), CurrentTime);
         XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
                 wMain);
         XUngrabKeyboard(wxGlobalDisplay(), CurrentTime);

+#endif

     }
     }

+    wxLogDebug("Ungrabbed pointer");

 
     m_winCaptured = FALSE;
 }
 
     m_winCaptured = FALSE;
 }


@@ -392,11 +423,10 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor)
     else
         cursor2 = wxSTANDARD_CURSOR;
 
     else
         cursor2 = wxSTANDARD_CURSOR;
 

-    WXDisplay *dpy = GetXDisplay();
-    WXCursor x_cursor = cursor2->GetXCursor(dpy);
+    WXCursor x_cursor = cursor2->GetCursor();

 
     Window win = (Window) GetMainWindow();
 
     Window win = (Window) GetMainWindow();

-    XDefineCursor((Display*) dpy, win, (Cursor) x_cursor);
+    XDefineCursor((Display*) wxGlobalDisplay(), win, (Cursor) x_cursor);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -411,6 +441,7 @@ void wxWindowX11::WarpPointer (int x, int y)
 // Does a physical scroll
 void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
 // Does a physical scroll
 void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
 {

+#if 0

     int x, y, w, h;
     if (rect)
     {
     int x, y, w, h;
     if (rect)
     {


@@ -573,10 +604,7 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
         delete rect;
         node = node->Next();
     }
         delete rect;
         node = node->Next();
     }

-    
-    // TODO
-
-    // XmUpdateDisplay((Widget) GetMainWidget());
+#endif

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -697,7 +725,7 @@ void wxWindowX11::DoGetClientSize(int *x, int *y) const
     if (window)
     {
         XWindowAttributes attr;
     if (window)
     {
         XWindowAttributes attr;

-        Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
+        Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr );

         wxASSERT(status);
         
         if (status)
         wxASSERT(status);
         
         if (status)


@@ -718,11 +746,15 @@ void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
     if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {
 
     if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {

+       int yy = 0;
+        AdjustForParentClientOrigin( x, yy, sizeFlags);

         windowChanges.x = x;
         valueMask |= CWX;
     }
     if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {
         windowChanges.x = x;
         valueMask |= CWX;
     }
     if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {

+       int xx = 0;
+        AdjustForParentClientOrigin( xx, y, sizeFlags);

         windowChanges.y = y;
         valueMask |= CWY;
     }
         windowChanges.y = y;
         valueMask |= CWY;
     }


@@ -736,7 +768,6 @@ void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         windowChanges.height = height /* -m_borderSize*2*/;
         valueMask |= CWHeight;
     }
         windowChanges.height = height /* -m_borderSize*2*/;
         valueMask |= CWHeight;
     }

-    AdjustForParentClientOrigin( x, y, sizeFlags);

 
     XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
         valueMask, & windowChanges);
 
     XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
         valueMask, & windowChanges);


@@ -857,13 +888,12 @@ void wxWindowX11::GetTextExtent(const wxString& string,
                              int *descent, int *externalLeading,
                              const wxFont *theFont) const
 {
                              int *descent, int *externalLeading,
                              const wxFont *theFont) const
 {

-    wxFont *fontToUse = (wxFont *)theFont;
-    if (!fontToUse)
-        fontToUse = (wxFont *) & m_font;
+    wxFont fontToUse = m_font;
+    if (theFont) fontToUse = *theFont;

 
 

-    wxCHECK_RET( fontToUse->Ok(), "valid window font needed" );
-    
-    WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay());
+    wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
+
+    WXFontStructPtr pFontStruct = fontToUse.GetFontStruct(1.0, GetXDisplay());

 
     int direction, ascent, descent2;
     XCharStruct overall;
 
     int direction, ascent, descent2;
     XCharStruct overall;


@@ -875,7 +905,7 @@ void wxWindowX11::GetTextExtent(const wxString& string,
         &ascent, &descent2, &overall);
 #endif
 
         &ascent, &descent2, &overall);
 #endif
 

-    XTextExtents((XFontStruct*) pFontStruct, string, slen,
+    XTextExtents((XFontStruct*) pFontStruct, string.c_str(), slen,

                  &direction, &ascent, &descent2, &overall);
 
     if ( x )
                  &direction, &ascent, &descent2, &overall);
 
     if ( x )


@@ -920,16 +950,13 @@ void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect)
     }
     else
     {
     }
     else
     {

-       int height,width;
-       GetSize( &width, &height );
+        int height,width;
+        GetSize( &width, &height );

             
         // Schedule for later Updating in ::Update() or ::OnInternalIdle().
         m_updateRegion.Clear();
         m_updateRegion.Union( 0, 0, width, height );
     }
             
         // Schedule for later Updating in ::Update() or ::OnInternalIdle().
         m_updateRegion.Clear();
         m_updateRegion.Union( 0, 0, width, height );
     }

-    
-    // Actually don't schedule yet..
-    Update();

 }
 
 void wxWindowX11::Update()
 }
 
 void wxWindowX11::Update()


@@ -952,7 +979,7 @@ void wxWindowX11::X11SendPaintEvents()
 {
     m_clipPaintRegion = TRUE;
 
 {
     m_clipPaintRegion = TRUE;
 

-    if (!m_clearRegion.IsEmpty())
+    //    if (!m_clearRegion.IsEmpty())

     {
         wxWindowDC dc( (wxWindow*)this );
         dc.SetClippingRegion( m_clearRegion );
     {
         wxWindowDC dc( (wxWindow*)this );
         dc.SetClippingRegion( m_clearRegion );


@@ -965,7 +992,8 @@ void wxWindowX11::X11SendPaintEvents()
             wxRegionIterator upd( m_clearRegion );
             while (upd)
             {
             wxRegionIterator upd( m_clearRegion );
             while (upd)
             {

-                // XClearArea( ... , upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
+                XClearArea( wxGlobalDisplay(), (Window) m_mainWidget, 
+                            upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight(), False );

                 upd ++;
             }
         }
                 upd ++;
             }
         }


@@ -980,6 +1008,8 @@ void wxWindowX11::X11SendPaintEvents()
     paint_event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( paint_event );
 
     paint_event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( paint_event );
 

+    m_updateRegion.Clear();
+    

     m_clipPaintRegion = FALSE;
 }
 
     m_clipPaintRegion = FALSE;
 }
 


@@ -1006,8 +1036,11 @@ void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event)
     }
 }
 
     }
 }
 

-void wxWindowX11::OnIdle(wxIdleEvent& WXUNUSED(event))
+void wxWindowX11::OnInternalIdle()

 {
 {

+    // Update invalidated regions.
+    Update();
+    

     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)
     UpdateWindowUI();
     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)
     UpdateWindowUI();


@@ -1308,15 +1341,20 @@ int wxComputeColours (Display *display, wxColour * back, wxColour * fore)
 
 bool wxWindowX11::SetBackgroundColour(const wxColour& col)
 {
 
 bool wxWindowX11::SetBackgroundColour(const wxColour& col)
 {

-    if ( !wxWindowBase::SetBackgroundColour(col) )
-        return FALSE;
+    wxWindowBase::SetBackgroundColour(col);

 
     if (!GetMainWindow())
         return FALSE;
 
 
     if (!GetMainWindow())
         return FALSE;
 

+    Display *xdisplay = (Display*) wxGlobalDisplay();
+    int xscreen = DefaultScreen( xdisplay );
+    Colormap cm = DefaultColormap( xdisplay, xscreen );
+

     wxColour colour( col );
     wxColour colour( col );

+    colour.CalcPixel( (WXColormap) cm );
+    

     XSetWindowAttributes attrib;
     XSetWindowAttributes attrib;

-    attrib.background_pixel = colour.AllocColour(wxGlobalDisplay());
+    attrib.background_pixel = colour.GetPixel();

 
     XChangeWindowAttributes(wxGlobalDisplay(),
         (Window) GetMainWindow(),
 
     XChangeWindowAttributes(wxGlobalDisplay(),
         (Window) GetMainWindow(),