X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5053ade6b00922decc47f2cf143ef08b5d0cfbb..e09526489246ee620c62c1b5673d294fff89b736:/src/x11/toplevel.cpp diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp index 101ef8e446..9be69bcdad 100644 --- a/src/x11/toplevel.cpp +++ b/src/x11/toplevel.cpp @@ -39,7 +39,9 @@ #include "wx/statusbr.h" #endif //WX_PRECOMP +#include "wx/settings.h" #include "wx/x11/private.h" +#include "X11/Xutil.h" bool wxMWMIsRunning(Window w); @@ -59,6 +61,8 @@ void wxTopLevelWindowX11::Init() m_fsStyle = 0; m_fsIsMaximized = FALSE; m_fsIsShowing = FALSE; + + m_needResizeInIdle = FALSE; } bool wxTopLevelWindowX11::Create(wxWindow *parent, @@ -88,46 +92,136 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent, int xscreen = DefaultScreen( xdisplay ); Visual *xvisual = DefaultVisual( xdisplay, xscreen ); Window xparent = RootWindow( xdisplay, xscreen ); + Colormap cm = DefaultColormap( xdisplay, xscreen ); + + 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; + + 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; +#if !wxUSE_NANOX XSetWindowAttributes xattributes; XSizeHints size_hints; - XWMHints wm_hints; long xattributes_mask = CWOverrideRedirect | CWBorderPixel | CWBackPixel; - xattributes.background_pixel = BlackPixel( xdisplay, xscreen ); + + xattributes.background_pixel = m_backgroundColour.GetPixel(); xattributes.border_pixel = BlackPixel( xdisplay, xscreen ); - xattributes.override_redirect = False; + + // TODO: if we want no border, caption etc., + // I think we set this to True to remove decorations + // No. RR. + // Yes :-) JACS (because some WMs don't respect + // the hints) + xattributes.override_redirect = (style & wxNO_BORDER) ? True : False; +#endif - 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; +#if wxUSE_NANOX + 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()); - XSelectInput( xdisplay, xwindow, - ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | - ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | - KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | - PropertyChangeMask ); + Window xwindow = XCreateWindowWithColor( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, + 0, 0, InputOutput, xvisual, backColor, foreColor); +#else + Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, + 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes ); +#endif + m_mainWidget = (WXWindow) xwindow; - wxAddWindowToTable( xwindow, (wxWindow*) this ); - - XSetTransientForHint( xdisplay, xwindow, xparent ); + int extraFlags = 0; +#if wxUSE_NANOX + extraFlags |= GR_EVENT_MASK_CLOSE_REQ; +#endif + + XSelectInput( xdisplay, xwindow, + extraFlags | + ExposureMask | + KeyPressMask | + KeyReleaseMask | + ButtonPressMask | + ButtonReleaseMask | + ButtonMotionMask | + EnterWindowMask | + LeaveWindowMask | + PointerMotionMask | + KeymapStateMask | + FocusChangeMask | + ColormapChangeMask | + StructureNotifyMask | + PropertyChangeMask + ); - size_hints.flags = PSize; - size_hints.width = size.x; - size_hints.height = size.y; + 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()) + { + 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); + 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 - Atom wm_delete_window = XInternAtom( xdisplay, "WM_DELETE_WINDOW", False); - XSetWMProtocols( xdisplay, xwindow, &wm_delete_window, 1); - - wxSetWMDecorations((Window) GetMainWindow(), style); + wxSetWMDecorations( xwindow, style); SetTitle(title); @@ -151,12 +245,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); } @@ -241,6 +376,8 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon) if (icon.Ok() && GetMainWindow()) { +#if wxUSE_NANOX +#else XWMHints *wmHints = XAllocWMHints(); wmHints->icon_pixmap = (Pixmap) icon.GetPixmap(); @@ -249,11 +386,12 @@ void wxTopLevelWindowX11::SetIcon(const wxIcon& icon) if (icon.GetMask()) { wmHints->flags |= IconMaskHint; - wmHints->icon_mask = (Pixmap) icon.GetMask()->GetPixmap(); + wmHints->icon_mask = (Pixmap) icon.GetMask()->GetBitmap(); } XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(), wmHints); XFree(wmHints); +#endif } } @@ -315,6 +453,69 @@ struct MwmHints { // given wxWindows style bool wxSetWMDecorations(Window w, long style) { +#if wxUSE_NANOX + GR_WM_PROPERTIES wmProp; + + wmProp.flags = 0; + wmProp.props = 0; + + if (style & wxRESIZE_BORDER) + { + wmProp.props |= GR_WM_PROPS_APPFRAME ; + wmProp.flags |= GR_WM_FLAGS_PROPS ; + } + + if (style & wxSYSTEM_MENU) + { + wmProp.props |= GR_WM_PROPS_CLOSEBOX ; + wmProp.flags |= GR_WM_FLAGS_PROPS ; + } + + if ((style & wxCAPTION) || + (style & wxTINY_CAPTION_HORIZ) || + (style & wxTINY_CAPTION_VERT)) + { + 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 & wxSIMPLE_BORDER) + { + wmProp.props |= GR_WM_PROPS_BORDER ; + wmProp.flags |= GR_WM_FLAGS_PROPS ; + } + + if (style & wxMINIMIZE_BOX) + { + } + + if (style & wxMAXIMIZE_BOX) + { + 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 if (!wxMWMIsRunning(w)) return FALSE; @@ -325,12 +526,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; } @@ -339,30 +542,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 & 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; } @@ -373,11 +574,15 @@ bool wxSetWMDecorations(Window w, long style) 32, PropModeReplace, (unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS); +#endif return TRUE; } bool wxMWMIsRunning(Window w) { +#if wxUSE_NANOX + return FALSE; +#else Display *dpy = (Display*)wxGetDisplay(); Atom motifWmInfo = XInternAtom(dpy, "_MOTIF_WM_INFO", False); @@ -395,56 +600,180 @@ bool wxMWMIsRunning(Window w) &type, &format, &length, &bytesafter, &ptr); return (ret == Success); +#endif } // For implementation purposes - sometimes decorations make the client area // smaller wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const { - if (this->IsKindOf(CLASSINFO(wxFrame))) - { - wxFrame* frame = (wxFrame*) this; - if (frame->GetMenuBar()) - return wxPoint(0, frame->GetMenuBar()->GetSize().y); - } + // wxFrame::GetClientAreaOrigin + // does the required calculation already. return wxPoint(0, 0); } void wxTopLevelWindowX11::DoGetClientSize( int *width, int *height ) const { + XSync(wxGlobalDisplay(), False); wxWindowX11::DoGetClientSize(width, height); - 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; - } } void wxTopLevelWindowX11::DoSetClientSize(int width, int height) { - // TODO - take menubar and status line into account wxWindowX11::DoSetClientSize(width, height); + +#if !wxUSE_NANOX + // Set the top-level window size + XSizeHints size_hints; + wxSize oldSize = GetSize(); + wxSize oldClientSize = GetClientSize(); + + 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); + + // This seems to be necessary or resizes don't get performed + XSync(wxGlobalDisplay(), False); + XSync(wxGlobalDisplay(), False); + #if 0 - if (!GetMainWindow()) - return; + wxLogDebug("DoSetClientSize: Tried to set size to %d, %d", (int) size_hints.width, (int) size_hints.height); - XWindowChanges windowChanges; - int valueMask = 0; + 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) +{ +#if 0 + // wxLogDebug( "Setting pos: %d, %d", x, y ); + wxWindowX11::DoSetSize(x, y, width, height, sizeFlags); +#endif + XSync(wxGlobalDisplay(), False); + 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; + 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)) + { + valueMask |= CWX; + } + if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + { + valueMask |= CWY; + } if (width != -1) { - windowChanges.width = width ; + windowChanges.width = wxMax(1, width); valueMask |= CWWidth; } if (height != -1) { - windowChanges.height = height ; + 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); +#endif +} + +void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const +{ + XSync(wxGlobalDisplay(), False); + 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 + } +#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) + { + if (x) *x = attr.x; + if (y) *y = attr.y; + } + else + { + if (x) *x = 0; + if (y) *y = 0; + } #endif }