#include "wx/module.h"
#include "wx/menuitem.h"
#include "wx/log.h"
+#include "wx/univ/renderer.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
parent->AddChild(this);
- int w = size.GetWidth();
- int h = size.GetHeight();
- int x = size.GetX();
- int y = size.GetY();
- if (w == -1) w = 20;
- if (h == -1) h = 20;
- if (x == -1) x = 0;
- if (y == -1) y = 0;
-
Display *xdisplay = (Display*) wxGlobalDisplay();
int xscreen = DefaultScreen( xdisplay );
Visual *xvisual = DefaultVisual( xdisplay, xscreen );
m_foregroundColour = *wxBLACK;
m_foregroundColour.CalcPixel( (WXColormap) cm );
- Window xparent = (Window) parent->GetClientWindow();
+ Window xparent = (Window) parent->GetClientAreaWindow();
// Add window's own scrollbars to main window, not to client window
if (parent->GetInsertIntoMain())
xparent = (Window) parent->GetMainWindow();
}
+ // Size (not including the border) must be nonzero (or a Value error results)!
+ // Note: The Xlib manual doesn't mention this restriction of XCreateWindow.
wxSize size2(size);
- if (size2.x == -1)
- size2.x = 20;
- if (size2.y == -1)
- size2.y = 20;
+ if (size2.x <= 0)
+ size2.x = 20;
+ if (size2.y <= 0)
+ size2.y = 20;
wxPoint pos2(pos);
if (pos2.x == -1)
- pos2.x = 0;
+ pos2.x = 0;
if (pos2.y == -1)
- pos2.y = 0;
+ pos2.y = 0;
-#if !wxUSE_NANOX
-
#if wxUSE_TWO_WINDOWS
bool need_two_windows =
((( wxSUNKEN_BORDER | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0);
bool need_two_windows = FALSE;
#endif
+#if wxUSE_NANOX
+ long xattributes = 0;
+#else
XSetWindowAttributes xattributes;
long xattributes_mask = 0;
xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
xattributes_mask |= CWEventMask;
+#endif
if (need_two_windows)
{
+#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);
+ XSelectInput( xdisplay, xwindow,
+ GR_EVENT_MASK_CLOSE_REQ | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+ ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+ KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+ PropertyChangeMask );
+
+#else
+ // Normal X11
xattributes.event_mask =
ExposureMask | StructureNotifyMask | ColormapChangeMask;
Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
-
+
+#endif
+
XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
m_mainWindow = (WXWindow) xwindow;
wxAddWindowToTable( xwindow, (wxWindow*) this );
XMapWindow( xdisplay, xwindow );
-
+
+#if !wxUSE_NANOX
xattributes.event_mask =
ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
xattributes_mask |= CWBitGravity;
xattributes.bit_gravity = StaticGravity;
}
-
+#endif
+
if (HasFlag( wxSUNKEN_BORDER) || HasFlag( wxRAISED_BORDER))
{
pos2.x = 2;
pos2.y = 2;
size2.x -= 4;
size2.y -= 4;
- } else
- if (HasFlag( wxSIMPLE_BORDER ))
+ }
+ else if (HasFlag( wxSIMPLE_BORDER ))
{
pos2.x = 1;
pos2.y = 1;
size2.x -= 2;
size2.y -= 2;
- } else
+ }
+ else
{
pos2.x = 0;
pos2.y = 0;
}
+
+ // Make again sure the size is nonzero.
+ if (size2.x <= 0)
+ size2.x = 1;
+ if (size2.y <= 0)
+ size2.y = 1;
+
+#if wxUSE_NANOX
+ backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());
+ foreColor = GR_RGB(m_foregroundColour.Red(), m_foregroundColour.Green(), m_foregroundColour.Blue());
+
+ xwindow = XCreateWindowWithColor( xdisplay, xwindow, pos2.x, pos2.y, size2.x, size2.y,
+ 0, 0, InputOutput, xvisual, backColor, foreColor);
+ XSelectInput( xdisplay, xwindow,
+ GR_EVENT_MASK_CLOSE_REQ | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+ ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+ KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+ PropertyChangeMask );
+#else
xwindow = XCreateWindow( xdisplay, xwindow, pos2.x, pos2.y, size2.x, size2.y,
0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
-
+#endif
+
XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
m_clientWindow = (WXWindow) xwindow;
else
{
// wxLogDebug( "No two windows needed %s", GetName().c_str() );
+#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);
+ XSelectInput( xdisplay, xwindow,
+ GR_EVENT_MASK_CLOSE_REQ | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+ ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+ KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+ PropertyChangeMask );
+
+#else
xattributes.event_mask =
ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
-
+#endif
+
XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
m_mainWindow = (WXWindow) xwindow;
XMapWindow( xdisplay, xwindow );
}
-#else
-
- int extraFlags = GR_EVENT_MASK_CLOSE_REQ;
-
- 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);
- XSelectInput( xdisplay, xwindow,
- extraFlags | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
- ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
- KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
- PropertyChangeMask );
-
- XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
-
- m_mainWindow = (WXWindow) xwindow;
- wxAddWindowToTable( xwindow, (wxWindow*) this );
-
- XMapWindow( xdisplay, xwindow );
-#endif
// Is a subwindow, so map immediately
m_isShown = TRUE;
if (wxWindowIsVisible(xwindow))
{
- XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
+ wxLogTrace( _T("focus"), _T("wxWindowX11::SetFocus: %s"), GetClassInfo()->GetClassName());
+ // XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
+ XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToNone, CurrentTime );
m_needsInputFocus = FALSE;
}
else
if (xfocus)
{
wxWindow *win = wxGetWindowFromTable( xfocus );
+ if (!win)
+ {
+ win = wxGetClientWindowFromTable( xfocus );
+ }
return win;
}
m_clearRegion.Intersect( 0, 0, cw, ch );
}
- Window xwindow = (Window) GetClientWindow();
+ Window xwindow = (Window) GetClientAreaWindow();
wxCHECK_RET( xwindow, wxT("invalid window") );
{
xwindow = (Window) m_clientWindow;
- if (HasFlag( wxSUNKEN_BORDER) || HasFlag( wxRAISED_BORDER))
- {
- width -= 4;
- height -= 4;
- } else
- if (HasFlag( wxSIMPLE_BORDER ))
+ wxWindow *window = (wxWindow*) this;
+ wxRenderer *renderer = window->GetRenderer();
+ if (renderer)
{
- width -= 2;
- height -= 2;
+ wxRect border = renderer->GetBorderDimensions( (wxBorder)(m_windowStyle & wxBORDER_MASK) );
+ width -= border.x + border.width;
+ height -= border.y + border.height;
}
XResizeWindow( wxGlobalDisplay(), xwindow, width, height );
{
xwindow = (Window) m_clientWindow;
- if (HasFlag( wxSUNKEN_BORDER) || HasFlag( wxRAISED_BORDER))
- {
- x = 2;
- y = 2;
- width -= 4;
- height -= 4;
- } else
- if (HasFlag( wxSIMPLE_BORDER ))
+ wxWindow *window = (wxWindow*) this;
+ wxRenderer *renderer = window->GetRenderer();
+ if (renderer)
{
- x = 1;
- y = 1;
- width -= 2;
- height -= 2;
- } else
+ wxRect border = renderer->GetBorderDimensions( (wxBorder)(m_windowStyle & wxBORDER_MASK) );
+ x = border.x;
+ y = border.y;
+ width -= border.x + border.width;
+ height -= border.y + border.height;
+ }
+ else
{
x = 0;
y = 0;
}
- wxWindow *window = (wxWindow*) this;
wxScrollBar *sb = window->GetScrollbar( wxHORIZONTAL );
if (sb && sb->IsShown())
{
width -= size.x;
}
- XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, width, height );
+ XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, wxMax(1, width), wxMax(1, height) );
}
#else
if (!GetEventHandler()->ProcessEvent(erase_event) )
{
Display *xdisplay = wxGlobalDisplay();
- Window xwindow = (Window) GetClientWindow();
+ Window xwindow = (Window) GetClientAreaWindow();
XSetForeground( xdisplay, g_eraseGC, m_backgroundColour.GetPixel() );
wxRegionIterator upd( m_clearRegion );
void wxWindowX11::SendNcPaintEvents()
{
+ wxWindow *window = (wxWindow*) this;
+
+ // All this for drawing the small square between the scrollbars.
+ int width = 0;
+ int height = 0;
+ int x = 0;
+ int y = 0;
+ wxScrollBar *sb = window->GetScrollbar( wxHORIZONTAL );
+ if (sb && sb->IsShown())
+ {
+ height = sb->GetSize().y;
+ y = sb->GetPosition().y;
+
+ sb = window->GetScrollbar( wxVERTICAL );
+ if (sb && sb->IsShown())
+ {
+ width = sb->GetSize().x;
+ x = sb->GetPosition().x;
+
+ Display *xdisplay = wxGlobalDisplay();
+ Window xwindow = (Window) GetMainWindow();
+ Colormap cm = (Colormap) wxTheApp->GetMainColormap( wxGetDisplay() );
+ wxColour colour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
+ colour.CalcPixel( (WXColormap) cm );
+
+ XSetForeground( xdisplay, g_eraseGC, colour.GetPixel() );
+
+ XFillRectangle( xdisplay, xwindow, g_eraseGC, x, y, width, height );
+ }
+ }
+
wxNcPaintEvent nc_paint_event( GetId() );
nc_paint_event.SetEventObject( this );
GetEventHandler()->ProcessEvent( nc_paint_event );
}
}
+// See handler for InFocus case in app.cpp for details.
+wxWindow* g_GettingFocus = NULL;
+
void wxWindowX11::OnInternalIdle()
{
// Update invalidated regions.
// Set the input focus if couldn't do it before
if (m_needsInputFocus)
{
+#if 0
+ wxString msg;
+ msg.Printf("Setting focus for %s from OnInternalIdle\n", GetClassInfo()->GetClassName());
+ printf(msg.c_str());
+#endif
SetFocus();
+ // If it couldn't set the focus now, there's
+ // no point in trying again.
+ m_needsInputFocus = FALSE;
}
+ g_GettingFocus = NULL;
}
// ----------------------------------------------------------------------------
wxWidgetHashTable->Put((long) w, win);
wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)",
- w, win, win->GetClassInfo()->GetClassName());
+ (unsigned int) w, win, win->GetClassInfo()->GetClassName());
return TRUE;
}
wxClientWidgetHashTable->Put((long) w, win);
wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)",
- w, win, win->GetClassInfo()->GetClassName());
+ (unsigned int) w, win, win->GetClassInfo()->GetClassName());
return TRUE;
}
return m_mainWindow;
}
-WXWindow wxWindowX11::GetClientWindow() const
+WXWindow wxWindowX11::GetClientAreaWindow() const
{
return m_clientWindow;
}
wxevent.m_altDown = XKeyEventAltIsDown(xevent);
wxevent.m_metaDown = XKeyEventMetaIsDown(xevent);
wxevent.SetEventObject(win);
- wxevent.m_keyCode = id;
+ wxevent.m_keyCode = toupper(id);
wxevent.SetTimestamp(XKeyEventGetTime(xevent));
wxevent.m_x = XKeyEventGetX(xevent);
projects / wxWidgets.git / blobdiff