#include "wx/log.h"
#include "wx/intl.h"
#include "wx/frame.h"
+ #include "wx/menu.h"
+ #include "wx/statusbr.h"
#endif //WX_PRECOMP
+#include "wx/settings.h"
#include "wx/x11/private.h"
-#include "X11/Xatom.h"
#include "X11/Xutil.h"
-// Set the window manager decorations according to the
-// given wxWindows style
-static bool SetWMDecorations(Widget w, long style);
-static bool MWMIsRunning(Window w);
-
-
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-// list of all frames and modeless dialogs
-// wxWindowList wxModelessWindows;
+bool wxMWMIsRunning(Window w);
// ----------------------------------------------------------------------------
// wxTopLevelWindowX11 creation
m_fsIsShowing = FALSE;
}
-bool wxTopLevelWindowX11::CreateDialog(const wxString& title,
- const wxPoint& pos,
- const wxSize& size)
-{
- // TODO
- return FALSE;
-}
-
-bool wxTopLevelWindowX11::CreateFrame(const wxString& title,
- const wxPoint& pos,
- const wxSize& size)
-{
- // TODO
- return FALSE;
-}
-
bool wxTopLevelWindowX11::Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
Init();
m_windowStyle = style;
+ m_parent = parent;
SetName(name);
m_windowId = id == -1 ? NewControlId() : id;
- wxTopLevelWindows.Append(this);
-
- Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", False);
+ if (parent)
+ parent->AddChild(this);
- XSetWMProtocols(wxGlobalDisplay(), (Window) GetMainWindow(), &wm_delete_window, 1);
- SetWMDecorations((Window) GetMainWindow(), style);
+ wxTopLevelWindows.Append(this);
+
+ Display *xdisplay = wxGlobalDisplay();
+ int xscreen = DefaultScreen( xdisplay );
+ Visual *xvisual = DefaultVisual( xdisplay, xscreen );
+ 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);
+ 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 );
+ 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 );
+ m_mainWidget = (WXWindow) xwindow;
+
+ XSelectInput( xdisplay, xwindow,
+ 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;
+ 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);
SetTitle(title);
-
- if ( GetExtraStyle() & wxTOPLEVEL_EX_DIALOG )
- {
- return CreateDialog(title, pos, size);
- }
- else // !dialog
- {
- return CreateFrame(title, pos, size);
- }
+
+ return TRUE;
}
wxTopLevelWindowX11::~wxTopLevelWindowX11()
{
wxTopLevelWindows.DeleteObject(this);
- if ( wxModelessWindows.Find(this) )
- wxModelessWindows.DeleteObject(this);
-
// If this is the last top-level window, exit.
if ( wxTheApp && (wxTopLevelWindows.Number() == 0) )
{
bool wxTopLevelWindowX11::Show(bool show)
{
- if ( !wxWindowBase::Show(show) )
- return FALSE;
-
return wxWindowX11::Show(show);
}
if (icon.Ok() && GetMainWindow())
{
XWMHints *wmHints = XAllocWMHints();
- wmHints.icon_pixmap = (Pixmap) icon.GetPixmap();
+ wmHints->icon_pixmap = (Pixmap) icon.GetPixmap();
- wmHints.flags = IconPixmapHint;
+ wmHints->flags = IconPixmapHint;
if (icon.GetMask())
{
- wmHints.flags |= IconMaskHint;
- wmHints.icon_mask = (Pixmap) icon.GetMask()->GetPixmap();
+ wmHints->flags |= IconMaskHint;
+ wmHints->icon_mask = (Pixmap) icon.GetMask()->GetPixmap();
}
- XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(),
- wmHints);
+ XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(), wmHints);
XFree(wmHints);
}
}
(const char*) title);
XSetIconName(wxGlobalDisplay(), (Window) GetMainWindow(),
(const char*) title);
+
+ // Use this if the platform doesn't supply the above functions.
#if 0
XTextProperty textProperty;
textProperty.value = (unsigned char*) title;
// Set the window manager decorations according to the
// given wxWindows style
-static bool SetWMDecorations(Widget w, long style)
+bool wxSetWMDecorations(Window w, long style)
{
- if (!MWMIsRunning(w))
+ if (!wxMWMIsRunning(w))
return FALSE;
Atom mwm_wm_hints = XInternAtom(wxGlobalDisplay(),"_MOTIF_WM_HINTS", False);
XChangeProperty(wxGlobalDisplay(),
w,
- mwm_wm_hints, mem_wm_hints,
+ mwm_wm_hints, mwm_wm_hints,
32, PropModeReplace,
(unsigned char *) &hints, PROP_MOTIF_WM_HINTS_ELEMENTS);
return TRUE;
}
-static bool MWMIsRunning(Window w)
+bool wxMWMIsRunning(Window w)
{
+ Display *dpy = (Display*)wxGetDisplay();
Atom motifWmInfo = XInternAtom(dpy, "_MOTIF_WM_INFO", False);
unsigned long length, bytesafter;
unsigned char value[20];
- int ret, type, format;
+ unsigned char *ptr = &value[0];
+ int ret, format;
+ Atom type;
type = format = length = 0;
- value = 0;
+ value[0] = 0;
ret = XGetWindowProperty(wxGlobalDisplay(), w, motifWmInfo,
0L, 2, False, motifWmInfo,
- &type, &format, &length, &bytesafter, &value);
+ &type, &format, &length, &bytesafter, &ptr);
return (ret == Success);
}
-
\ No newline at end of file
+
+// For implementation purposes - sometimes decorations make the client area
+// smaller
+wxPoint wxTopLevelWindowX11::GetClientAreaOrigin() const
+{
+ // In fact 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
+{
+ 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;
+
+ XWindowChanges windowChanges;
+ int valueMask = 0;
+
+ if (width != -1)
+ {
+ windowChanges.width = width ;
+ valueMask |= CWWidth;
+ }
+ if (height != -1)
+ {
+ windowChanges.height = height ;
+ valueMask |= CWHeight;
+ }
+ XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
+ valueMask, & windowChanges);
+#endif
+}
projects / wxWidgets.git / blobdiff