X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/307be31a92ef859183711d3836bf67c3db5cc7da..22385679c4c3ba8d836611a314e2e05710097cda:/src/x11/toplevel.cpp diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp index 68e4ef5aa3..5633dae559 100644 --- a/src/x11/toplevel.cpp +++ b/src/x11/toplevel.cpp @@ -92,8 +92,10 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent, 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); + if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); + else + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE); m_backgroundColour.CalcPixel( (WXColormap) cm ); m_hasBgCol = TRUE; @@ -128,6 +130,9 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent, m_mainWidget = (WXWindow) xwindow; XSelectInput( xdisplay, xwindow, +#if wxUSE_NANOX + GR_EVENT_MASK_CLOSE_REQ | +#endif ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | @@ -135,6 +140,10 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent, wxAddWindowToTable( xwindow, (wxWindow*) this ); + // Set background to None which will prevent X11 from clearing the + // background completely. + XSetWindowBackgroundPixmap( xdisplay, xwindow, None ); + // Messes up window management // XSetTransientForHint( xdisplay, xwindow, xparent ); @@ -457,6 +466,7 @@ void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const void wxTopLevelWindowX11::DoSetClientSize(int width, int height) { wxWindowX11::DoSetClientSize(width, height); + #if 0 if (!GetMainWindow()) return; @@ -478,3 +488,90 @@ void wxTopLevelWindowX11::DoSetClientSize(int width, int height) valueMask, & windowChanges); #endif } + +void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags) +{ + wxString msg; + msg.Printf("Setting pos: %d, %d", x, y); + wxLogDebug(msg); + wxWindowX11::DoSetSize(x, y, width, height, sizeFlags); + + wxPoint pt = GetPosition(); + msg.Printf("After, pos: %d, %d", pt.x, pt.y); + wxLogDebug(msg); +#if 0 + XSync(wxGlobalDisplay(), False); + int w, h; + GetSize(& w, & h); + wxString msg; + msg.Printf("Before setting size: %d, %d", w, h); + wxLogDebug(msg); + if (!GetMainWindow()) + return; + + XWindowChanges windowChanges; + int valueMask = 0; + + 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)) + { + int xx = 0; + AdjustForParentClientOrigin( xx, y, sizeFlags); + windowChanges.y = y; + valueMask |= CWY; + } + if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + { + windowChanges.width = width /* - m_borderSize*2 */; + valueMask |= CWWidth; + } + if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + { + windowChanges.height = height /* -m_borderSize*2*/; + valueMask |= CWHeight; + } + + XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(), + valueMask, & windowChanges); + XSync(wxGlobalDisplay(), False); + GetSize(& w, & h); + msg.Printf("Tried to set to %d, %d. After setting size: %d, %d", width, height, w, h); + wxLogDebug(msg); +#endif +} + +void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const +{ + XSync(wxGlobalDisplay(), False); + Window window = (Window) m_mainWidget; + if (window) + { + int offsetX = 0; + int offsetY = 0; + + wxLogDebug("Translating..."); + Window childWindow; + XTranslateCoordinates(wxGlobalDisplay(), window, XDefaultRootWindow(wxGlobalDisplay()), + 0, 0, & offsetX, & offsetY, & childWindow); + + wxString msg; + msg.Printf("Offset: %d, %d", offsetX, offsetY); + wxLogDebug(msg); + + XWindowAttributes attr; + Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr); + wxASSERT(status); + + if (status) + { + *x = attr.x + offsetX; + *y = attr.y + offsetY; + } + } +}