X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a11672a469f036436838911c268cb2f8d5da5bf8..4d90b8de01ca34d4d123d6d2386968bfe4923efc:/src/x11/toplevel.cpp diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp index a357025c69..2c81bc7cef 100644 --- a/src/x11/toplevel.cpp +++ b/src/x11/toplevel.cpp @@ -61,6 +61,8 @@ void wxTopLevelWindowX11::Init() m_fsStyle = 0; m_fsIsMaximized = FALSE; m_fsIsShowing = FALSE; + + m_focusWidget = NULL; } bool wxTopLevelWindowX11::Create(wxWindow *parent, @@ -92,8 +94,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; @@ -106,25 +110,57 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent, CWBorderPixel | CWBackPixel; xattributes.background_pixel = m_backgroundColour.GetPixel(); xattributes.border_pixel = BlackPixel( xdisplay, xscreen ); + + // TODO: if we want no border, caption etc., + // I think we set this to True to remove decorations + // No. RR. xattributes.override_redirect = False; - Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y, + wxSize size2(size); + if (size2.x == -1) + size2.x = 100; + if (size2.y == -1) + size2.y = 100; + + wxPoint pos2(pos); + if (pos2.x == -1) + pos2.x = 100; + if (pos2.y == -1) + pos2.y = 100; + + Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes ); 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 | PropertyChangeMask ); wxAddWindowToTable( xwindow, (wxWindow*) this ); - - XSetTransientForHint( xdisplay, xwindow, xparent ); - - size_hints.flags = PSize; - size_hints.width = size.x; - size_hints.height = size.y; + + // Set background to None which will prevent X11 from clearing the + // background completely. + XSetWindowBackgroundPixmap( xdisplay, xwindow, None ); + + if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) + { + if (GetParent() && GetParent()->GetMainWindow()) + { + Window xparentwindow = (Window) GetParent()->GetMainWindow(); + XSetTransientForHint( xdisplay, xwindow, xparentwindow ); + } + } + + size_hints.flags = PSize | PPosition; + size_hints.x = pos2.x; + size_hints.y = pos2.y; + size_hints.width = size2.x; + size_hints.height = size2.y; XSetWMNormalHints( xdisplay, xwindow, &size_hints); wm_hints.flags = InputHint | StateHint /* | WindowGroupHint */; @@ -132,10 +168,12 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent, wm_hints.initial_state = NormalState; XSetWMHints( xdisplay, xwindow, &wm_hints); - Atom wm_delete_window = XInternAtom( xdisplay, "WM_DELETE_WINDOW", False); - XSetWMProtocols( xdisplay, xwindow, &wm_delete_window, 1); + Atom wm_protocols[2]; + wm_protocols[0] = XInternAtom( xdisplay, "WM_DELETE_WINDOW", False ); + wm_protocols[1] = XInternAtom( xdisplay, "WM_TAKE_FOCUS", False ); + XSetWMProtocols( xdisplay, xwindow, wm_protocols, 2); - wxSetWMDecorations((Window) GetMainWindow(), style); + wxSetWMDecorations( xwindow, style); SetTitle(title); @@ -333,12 +371,14 @@ bool wxSetWMDecorations(Window w, long style) 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; } @@ -347,30 +387,28 @@ bool wxSetWMDecorations(Window w, long style) (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) - { - hints.flags |= MWM_HINTS_DECORATIONS; - hints.decorations |= MWM_DECOR_BORDER; - } - - if (style & wxTHICK_FRAME) + if ((style & wxTHICK_FRAME) || (style & wxSIMPLE_BORDER) || (style & wxCAPTION)) { + wxLogDebug("MWM_DECOR_BORDER"); hints.flags |= MWM_HINTS_DECORATIONS; hints.decorations |= MWM_DECOR_BORDER; } if (style & wxMINIMIZE_BOX) { + wxLogDebug("MWM_DECOR_MINIMIZE"); hints.flags |= MWM_HINTS_DECORATIONS; hints.decorations |= MWM_DECOR_MINIMIZE; } if (style & wxMAXIMIZE_BOX) { + wxLogDebug("MWM_DECOR_MAXIMIZE"); hints.flags |= MWM_HINTS_DECORATIONS; hints.decorations |= MWM_DECOR_MAXIMIZE; } @@ -441,6 +479,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; @@ -462,3 +501,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; + } + } +}