X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e4501ee3cc88ee8dd2b75e2964118e2897ec4a2..818503a1826c8d32340234318afe6de35f756c2f:/src/x11/toplevel.cpp?ds=sidebyside diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp index 2c81bc7cef..b26cd79947 100644 --- a/src/x11/toplevel.cpp +++ b/src/x11/toplevel.cpp @@ -62,7 +62,7 @@ void wxTopLevelWindowX11::Init() m_fsIsMaximized = FALSE; m_fsIsShowing = FALSE; - m_focusWidget = NULL; + m_needResizeInIdle = FALSE; } bool wxTopLevelWindowX11::Create(wxWindow *parent, @@ -101,21 +101,6 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent, m_backgroundColour.CalcPixel( (WXColormap) cm ); m_hasBgCol = TRUE; - XSetWindowAttributes xattributes; - XSizeHints size_hints; - XWMHints wm_hints; - - long xattributes_mask = - CWOverrideRedirect | - 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; - wxSize size2(size); if (size2.x == -1) size2.x = 100; @@ -128,25 +113,69 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent, 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; +#if !wxUSE_NANOX + XSetWindowAttributes xattributes; + XSizeHints size_hints; + + long xattributes_mask = + CWBorderPixel | CWBackPixel; - XSelectInput( xdisplay, xwindow, -#if wxUSE_NANOX - GR_EVENT_MASK_CLOSE_REQ | -#endif + xattributes.background_pixel = m_backgroundColour.GetPixel(); + xattributes.border_pixel = BlackPixel( xdisplay, xscreen ); + + if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE )) + { + xattributes_mask |= CWBitGravity; + xattributes.bit_gravity = StaticGravity; + } + + xattributes_mask |= CWEventMask; + xattributes.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | - PropertyChangeMask ); + PropertyChangeMask; + + Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, + 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes ); +#else + long backColor, foreColor; + backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue()); + foreColor = GR_RGB(m_foregroundColour.Red(), m_foregroundColour.Green(), m_foregroundColour.Blue()); + + Window xwindow = XCreateWindowWithColor( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, + 0, 0, InputOutput, xvisual, backColor, foreColor); +#endif + m_mainWidget = (WXWindow) xwindow; + +#if wxUSE_NANOX + XSelectInput( xdisplay, xwindow, + GR_EVENT_MASK_CLOSE_REQ | + ExposureMask | + KeyPressMask | + KeyReleaseMask | + ButtonPressMask | + ButtonReleaseMask | + ButtonMotionMask | + EnterWindowMask | + LeaveWindowMask | + PointerMotionMask | + KeymapStateMask | + FocusChangeMask | + ColormapChangeMask | + StructureNotifyMask | + 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 (GetParent() && GetParent()->GetMainWindow()) @@ -163,15 +192,35 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent, size_hints.height = size2.y; XSetWMNormalHints( xdisplay, xwindow, &size_hints); + XWMHints wm_hints; wm_hints.flags = InputHint | StateHint /* | WindowGroupHint */; wm_hints.input = True; wm_hints.initial_state = NormalState; XSetWMHints( xdisplay, xwindow, &wm_hints); - + 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); + +#if 0 // TODO + // You will need a compliant window manager for this to work + // (e.g. sawfish/enlightenment/kde/icewm/windowmaker) + if (style & wxSTAY_ON_TOP) + { + CARD32 data = 4; // or should this be 6? According to http://developer.gnome.org/doc/standards/wm/c44.html + XChangeProperty (xdisplay, + xwindow, + XInternAtom (xdisplay, "_WIN_LAYER", False), + XA_CARDINAL, + 32, + PropModeReplace, + (unsigned char *)&data, + 1); + } +#endif + +#endif wxSetWMDecorations( xwindow, style); @@ -197,12 +246,53 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11() } } +void wxTopLevelWindowX11::OnInternalIdle() +{ + wxWindow::OnInternalIdle(); + + if (m_needResizeInIdle) + { + wxSizeEvent event( GetClientSize(), GetId() ); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent( event ); + + m_needResizeInIdle = FALSE; + } +} + // ---------------------------------------------------------------------------- // wxTopLevelWindowX11 showing // ---------------------------------------------------------------------------- bool wxTopLevelWindowX11::Show(bool show) { + // Nano-X has to force a size event, + // else there's no initial size. +#if wxUSE_NANOX + if (show) +#else + if (show && m_needResizeInIdle) +#endif + { + wxSizeEvent event(GetSize(), GetId()); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + + m_needResizeInIdle = FALSE; + } + + if (show) + { + // This does the layout _before_ the + // window is shown, else the items are + // drawn first at the wrong positions, + // then at the correct positions. + if (GetAutoLayout()) + { + Layout(); + } + } + return wxWindowX11::Show(show); } @@ -287,6 +377,8 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon) if (icon.Ok() && GetMainWindow()) { +#if wxUSE_NANOX +#else XWMHints *wmHints = XAllocWMHints(); wmHints->icon_pixmap = (Pixmap) icon.GetPixmap(); @@ -300,6 +392,7 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon) XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(), wmHints); XFree(wmHints); +#endif } } @@ -333,11 +426,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) @@ -346,6 +439,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 { @@ -361,56 +470,114 @@ struct MwmHints { // given wxWindows style bool wxSetWMDecorations(Window w, long style) { - if (!wxMWMIsRunning(w)) - return FALSE; +#if wxUSE_NANOX + GR_WM_PROPERTIES wmProp; - Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False); - MwmHints hints; - hints.flags = 0; - hints.decorations = 0; + wmProp.flags = 0; + wmProp.props = 0; if (style & wxRESIZE_BORDER) { - wxLogDebug("MWM_DECOR_RESIZEH"); - hints.flags |= MWM_HINTS_DECORATIONS; - hints.decorations |= MWM_DECOR_RESIZEH; + wmProp.props |= GR_WM_PROPS_APPFRAME ; + wmProp.flags |= GR_WM_FLAGS_PROPS ; } if (style & wxSYSTEM_MENU) { - wxLogDebug("MWM_DECOR_MENU"); - hints.flags |= MWM_HINTS_DECORATIONS; - hints.decorations |= MWM_DECOR_MENU; + wmProp.props |= GR_WM_PROPS_CLOSEBOX ; + wmProp.flags |= GR_WM_FLAGS_PROPS ; } 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; + wmProp.props |= GR_WM_PROPS_CAPTION ; + wmProp.flags |= GR_WM_FLAGS_PROPS ; + + // The default dialog style doesn't include any kind + // of border, which is a bit odd. Anyway, inclusion + // of a caption surely implies a border. + style |= wxTHICK_FRAME; + } + + if (style & wxTHICK_FRAME) + { + wmProp.props |= GR_WM_PROPS_APPFRAME ; + wmProp.flags |= GR_WM_FLAGS_PROPS ; } - if ((style & wxTHICK_FRAME) || (style & wxSIMPLE_BORDER) || (style & wxCAPTION)) + if (style & wxSIMPLE_BORDER) { - wxLogDebug("MWM_DECOR_BORDER"); - hints.flags |= MWM_HINTS_DECORATIONS; - hints.decorations |= MWM_DECOR_BORDER; + wmProp.props |= GR_WM_PROPS_BORDER ; + wmProp.flags |= GR_WM_FLAGS_PROPS ; } 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; + wmProp.props |= GR_WM_PROPS_MAXIMIZE ; + wmProp.flags |= GR_WM_FLAGS_PROPS ; + } + + if (((style & wxBORDER) != wxBORDER) && ((style & wxTHICK_FRAME) != wxTHICK_FRAME) + && ((style & wxRESIZE_BORDER) != wxRESIZE_BORDER)) + { + wmProp.props |= GR_WM_PROPS_NODECORATE ; + wmProp.flags |= GR_WM_FLAGS_PROPS ; + } + + GrSetWMProperties(w, & wmProp); + +#else + + Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False); + if (mwm_wm_hints == 0) + return FALSE; + + MwmHints hints; + hints.flags = MWM_HINTS_DECORATIONS | MWM_HINTS_FUNCTIONS; + hints.decorations = 0; + hints.functions = 0; + + if ((style & wxSIMPLE_BORDER) || (style & wxNO_BORDER)) + { + // leave zeros + } + else + { + hints.decorations = MWM_DECOR_BORDER; + hints.functions = MWM_FUNC_MOVE; + + 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(), @@ -419,143 +586,134 @@ bool wxSetWMDecorations(Window w, long style) 32, PropModeReplace, (unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS); +#endif return TRUE; } -bool wxMWMIsRunning(Window w) -{ - 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); -} - // For implementation purposes - sometimes decorations make the client area // smaller wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const { - // In fact wxFrame::GetClientAreaOrigin + // 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 { + XSync(wxGlobalDisplay(), False); 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; +#if !wxUSE_NANOX + // Set the top-level window size + XSizeHints size_hints; + wxSize oldSize = GetSize(); + wxSize oldClientSize = GetClientSize(); - XWindowChanges windowChanges; - int valueMask = 0; + 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(), + &size_hints); - if (width != -1) - { - windowChanges.width = width ; - valueMask |= CWWidth; - } - if (height != -1) - { - windowChanges.height = height ; - valueMask |= CWHeight; - } - XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(), - valueMask, & windowChanges); + // This seems to be necessary or resizes don't get performed + XSync(wxGlobalDisplay(), False); + XSync(wxGlobalDisplay(), False); + +#if 0 + wxLogDebug("DoSetClientSize: Tried to set size to %d, %d", (int) size_hints.width, (int) size_hints.height); + + XSync(wxGlobalDisplay(), False); + wxSize newSize = GetSize(); + wxLogDebug("New size is %d, %d", (int) newSize.x, (int) newSize.y); +#endif #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 + // wxLogDebug( "Setting pos: %d, %d", x, y ); + wxWindowX11::DoSetSize(x, y, width, height, sizeFlags); +#endif 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; + Window window = (Window) m_mainWidget; + if (!window) + return ; + + Display *display = (Display*) GetXDisplay(); + Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display)); + Window parent_window = window, + next_parent = window; + + // search for the parent that is child of ROOT, because the WM may + // reparent twice and notify only the next parent (like FVWM) + while (next_parent != root) { + Window *theChildren; +#if wxUSE_NANOX + GR_COUNT n; +#else + unsigned int n; +#endif + parent_window = next_parent; + XQueryTree(display, parent_window, &root, + &next_parent, &theChildren, &n); + XFree(theChildren); // not needed + } XWindowChanges windowChanges; - int valueMask = 0; + windowChanges.x = x; + windowChanges.y = y; + windowChanges.width = width; + windowChanges.height = height; + windowChanges.stack_mode = 0; + int valueMask = CWX | CWY | CWWidth | CWHeight; 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)) + if (width != -1) { - windowChanges.width = width /* - m_borderSize*2 */; + windowChanges.width = wxMax(1, width); valueMask |= CWWidth; } - if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (height != -1) { - windowChanges.height = height /* -m_borderSize*2*/; + windowChanges.height = wxMax(1, height); valueMask |= CWHeight; } - XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(), - valueMask, & windowChanges); + XConfigureWindow( display, parent_window, valueMask, &windowChanges ); + +#if !wxUSE_NANOX + XSizeHints size_hints; + size_hints.flags = 0; + if (x > -1 && y > -1) + size_hints.flags |= PPosition; + if (width > -1 && height > -1) + size_hints.flags |= PSize; + size_hints.width = width; + size_hints.height = height; + size_hints.x = x; + size_hints.y = y; + XSetWMNormalHints( (Display*) GetXDisplay(), (Window) GetMainWindow(), + &size_hints); + + // This seems to be necessary or resizes don't get performed. + // Take them out (or even just one of them), and the About + // box of the minimal sample probably won't be resized right. + XSync(wxGlobalDisplay(), False); 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 } @@ -563,28 +721,46 @@ void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const { XSync(wxGlobalDisplay(), False); Window window = (Window) m_mainWidget; - if (window) + if (!window) + return ; + + Display *display = (Display*) GetXDisplay(); + Window root = RootWindowOfScreen(DefaultScreenOfDisplay(display)); + Window parent_window = window, + next_parent = window; + + // search for the parent that is child of ROOT, because the WM may + // reparent twice and notify only the next parent (like FVWM) + while (next_parent != root) { + Window *theChildren; +#if wxUSE_NANOX + GR_COUNT n; +#else + unsigned int n; +#endif + parent_window = next_parent; + XQueryTree(display, parent_window, &root, + &next_parent, &theChildren, &n); + XFree(theChildren); // not needed + } +#if 0 + int xx, yy; unsigned int dummy; + XGetGeometry(display, parent_window, &root, + &xx, &yy, &dummy, &dummy, &dummy, &dummy); + if (x) *x = xx; + if (y) *y = yy; +#else + XWindowAttributes attr; + Status status = XGetWindowAttributes((Display*) GetXDisplay(), parent_window, & attr); + if (status) { - 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; - } + if (x) *x = attr.x; + if (y) *y = attr.y; } + else + { + if (x) *x = 0; + if (y) *y = 0; + } +#endif }