m_fsStyle = 0;
m_fsIsMaximized = FALSE;
m_fsIsShowing = FALSE;
+
+ m_focusWidget = NULL;
}
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;
+ 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 = 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;
+#endif
- 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
+ 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);
+#else
Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
- 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+ 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+#endif
m_mainWidget = (WXWindow) xwindow;
- XSelectInput( xdisplay, xwindow,
- ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
- ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
- KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
- PropertyChangeMask );
+ 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
+ );
+
wxAddWindowToTable( xwindow, (wxWindow*) this );
// Set background to None which will prevent X11 from clearing the
// background completely.
XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
- // Messes up window management
- // XSetTransientForHint( xdisplay, xwindow, xparent );
+#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;
+ 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);
+#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);
bool wxTopLevelWindowX11::Show(bool show)
{
+ // Nano-X has to force a size event,
+ // else there's no initial size.
+#if wxUSE_NANOX
+ if (show)
+ {
+ wxSizeEvent event(GetSize(), GetId());
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event);
+ }
+#endif
+
return wxWindowX11::Show(show);
}
if (icon.Ok() && GetMainWindow())
{
+#if wxUSE_NANOX
+#else
XWMHints *wmHints = XAllocWMHints();
wmHints->icon_pixmap = (Pixmap) icon.GetPixmap();
XSetWMHints(wxGlobalDisplay(), (Window) GetMainWindow(), wmHints);
XFree(wmHints);
+#endif
}
}
// 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;
if (style & wxRESIZE_BORDER)
{
- wxLogDebug("MWM_DECOR_RESIZEH");
+ // wxLogDebug("MWM_DECOR_RESIZEH");
hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_RESIZEH;
}
if (style & wxSYSTEM_MENU)
{
- wxLogDebug("MWM_DECOR_MENU");
+ // wxLogDebug("MWM_DECOR_MENU");
hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_MENU;
}
(style & wxTINY_CAPTION_HORIZ) ||
(style & wxTINY_CAPTION_VERT))
{
- wxLogDebug("MWM_DECOR_TITLE");
+ // wxLogDebug("MWM_DECOR_TITLE");
hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_TITLE;
}
if ((style & wxTHICK_FRAME) || (style & wxSIMPLE_BORDER) || (style & wxCAPTION))
{
- wxLogDebug("MWM_DECOR_BORDER");
+ // wxLogDebug("MWM_DECOR_BORDER");
hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_BORDER;
}
if (style & wxMINIMIZE_BOX)
{
- wxLogDebug("MWM_DECOR_MINIMIZE");
+ // wxLogDebug("MWM_DECOR_MINIMIZE");
hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_MINIMIZE;
}
if (style & wxMAXIMIZE_BOX)
{
- wxLogDebug("MWM_DECOR_MAXIMIZE");
+ // wxLogDebug("MWM_DECOR_MAXIMIZE");
hints.flags |= MWM_HINTS_DECORATIONS;
hints.decorations |= MWM_DECOR_MAXIMIZE;
}
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);
&type, &format, &length, &bytesafter, &ptr);
return (ret == Success);
+#endif
}
// For implementation purposes - sometimes decorations make the client area
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);
+ // wxLogDebug( "Setting pos: %d, %d", x, y );
wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
- wxPoint pt = GetPosition();
- msg.Printf("After, pos: %d, %d", pt.x, pt.y);
- wxLogDebug(msg);
#if 0
+ wxPoint pt = GetPosition();
+ // wxLogDebug( "After, pos: %d, %d", pt.x, pt.y );
+
XSync(wxGlobalDisplay(), False);
int w, h;
GetSize(& w, & h);
if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
- int yy = 0;
+ int yy = 0;
AdjustForParentClientOrigin( x, yy, sizeFlags);
windowChanges.x = x;
valueMask |= CWX;
}
if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
- int xx = 0;
+ int xx = 0;
AdjustForParentClientOrigin( xx, y, sizeFlags);
windowChanges.y = y;
valueMask |= CWY;
Window window = (Window) m_mainWidget;
if (window)
{
- int offsetX = 0;
- int offsetY = 0;
+ int offsetX = 0;
+ int offsetY = 0;
- wxLogDebug("Translating...");
+#if !wxUSE_NANOX
+ // 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);
+ // wxLogDebug("Offset: %d, %d", offsetX, offsetY);
+#endif
XWindowAttributes attr;
Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
projects / wxWidgets.git / blobdiff