X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8354aa92a177f27ebe55869ecc254e1f6da05331..73ef393701bd6c2c689a05d5637cc701e2f5cc2f:/src/x11/popupwin.cpp diff --git a/src/x11/popupwin.cpp b/src/x11/popupwin.cpp index fe1d27c1ed..1645c359a8 100644 --- a/src/x11/popupwin.cpp +++ b/src/x11/popupwin.cpp @@ -16,11 +16,11 @@ #if wxUSE_POPUPWIN #include "wx/popupwin.h" -#include "wx/frame.h" #include "wx/app.h" -#include "wx/cursor.h" #include "wx/x11/private.h" +#include "X11/Xatom.h" +#include "X11/Xutil.h" //----------------------------------------------------------------------------- // wxPopupWindow @@ -40,11 +40,61 @@ bool wxPopupWindow::Create( wxWindow *parent, int style ) } // All dialogs should really have this style + m_windowStyle = style; m_windowStyle |= wxTAB_TRAVERSAL; + + wxPoint pos( 20,20 ); + wxSize size( 20,20 ); + m_parent = parent; if (m_parent) m_parent->AddChild( this ); - // TODO: implementation + wxTopLevelWindows.Append(this); + + Display *xdisplay = wxGlobalDisplay(); + int xscreen = DefaultScreen( xdisplay ); + Visual *xvisual = DefaultVisual( xdisplay, xscreen ); + Window xparent = RootWindow( xdisplay, xscreen ); + + XSetWindowAttributes xattributes; + XSizeHints size_hints; + XWMHints wm_hints; + + long xattributes_mask = + CWOverrideRedirect | + CWBorderPixel | CWBackPixel; + xattributes.background_pixel = BlackPixel( xdisplay, xscreen ); + xattributes.border_pixel = BlackPixel( xdisplay, xscreen ); + xattributes.override_redirect = False; + + Window xwindow = XCreateWindow( xdisplay, xparent, pos.x, pos.y, size.x, size.y, + 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes ); + + XSelectInput( xdisplay, xwindow, + ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | + ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | + KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | + PropertyChangeMask ); + + m_mainWidget = (WXWindow) xwindow; + wxAddWindowToTable( xwindow, (wxWindow*) this ); + + XSetTransientForHint( xdisplay, xwindow, xparent ); + + size_hints.flags = PSize; + size_hints.width = size.x; + size_hints.height = size.y; + XSetWMNormalHints( xdisplay, xwindow, &size_hints); + + wm_hints.flags = InputHint | StateHint /* | WindowGroupHint */; + wm_hints.input = True; + 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); + + wxSetWMDecorations((Window) GetMainWindow(), style); return TRUE; } @@ -56,14 +106,12 @@ void wxPopupWindow::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED( void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { - // TODO + wxWindowX11::DoSetSize(x, y, width, height, sizeFlags); } + bool wxPopupWindow::Show( bool show ) { - // TODO? - bool ret = wxWindow::Show( show ); - - return ret; + return wxWindowX11::Show( show ); } #endif // wxUSE_POPUPWIN