X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ac7c5092401be067f7c727ad8e2bf7274c05866..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/x11/window.cpp?ds=sidebyside diff --git a/src/x11/window.cpp b/src/x11/window.cpp index 744cdd6b1d..5fc23f7e6b 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "window.h" #endif @@ -36,9 +36,13 @@ #include "wx/msgdlg.h" #include "wx/frame.h" #include "wx/scrolwin.h" +#include "wx/scrolbar.h" #include "wx/module.h" #include "wx/menuitem.h" #include "wx/log.h" +#include "wx/fontutil.h" +#include "wx/univ/renderer.h" +#include "wx/hash.h" #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" @@ -47,6 +51,11 @@ #include "wx/x11/private.h" #include "X11/Xutil.h" +#if wxUSE_NANOX +// For wxGetLocalTime, used by XButtonEventGetTime +#include "wx/timer.h" +#endif + #include // ---------------------------------------------------------------------------- @@ -54,7 +63,9 @@ // ---------------------------------------------------------------------------- extern wxHashTable *wxWidgetHashTable; +extern wxHashTable *wxClientWidgetHashTable; static wxWindow* g_captureWindow = NULL; +static GC g_eraseGC; // ---------------------------------------------------------------------------- // macros @@ -92,7 +103,11 @@ void wxWindowX11::Init() InitBase(); // X11-specific - m_mainWidget = (WXWindow) 0; + m_mainWindow = (WXWindow) 0; + m_clientWindow = (WXWindow) 0; + m_insertIntoMain = FALSE; + m_updateNcArea = FALSE; + m_winCaptured = FALSE; m_needsInputFocus = FALSE; m_isShown = TRUE; @@ -114,68 +129,207 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, 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 ); Colormap cm = DefaultColormap( xdisplay, xscreen ); m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - m_backgroundColour.CalcPixel( (WXColormap) cm ); - + m_backgroundColour.CalcPixel( (WXColormap) cm ); + m_foregroundColour = *wxBLACK; - m_foregroundColour.CalcPixel( (WXColormap) cm ); + m_foregroundColour.CalcPixel( (WXColormap) cm ); - Window parentWindow = (Window) parent->GetMainWindow(); + Window xparent = (Window) parent->GetClientAreaWindow(); + // Add window's own scrollbars to main window, not to client window + if (parent->GetInsertIntoMain()) + { + // wxLogDebug( "Inserted into main: %s", GetName().c_str() ); + 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 = 100; - if (size2.y == -1) - size2.y = 100; + if (size2.x <= 0) + size2.x = 20; + if (size2.y <= 0) + size2.y = 20; wxPoint pos2(pos); if (pos2.x == -1) - pos2.x = 100; + pos2.x = 0; if (pos2.y == -1) - pos2.y = 100; - - Window xwindow = XCreateSimpleWindow( - xdisplay, parentWindow, - pos2.x, pos2.y, size2.x, size2.y, 0, - m_backgroundColour.GetPixel(), - m_backgroundColour.GetPixel() ); - - m_mainWidget = (WXWindow) xwindow; - - // Select event types wanted - XSelectInput( xdisplay, xwindow, - ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | - ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | - KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | - PropertyChangeMask); - - wxAddWindowToTable( xwindow, (wxWindow*) this ); + pos2.y = 0; + +#if wxUSE_TWO_WINDOWS + bool need_two_windows = + ((( wxSUNKEN_BORDER | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0); +#else + bool need_two_windows = FALSE; +#endif + +#if wxUSE_NANOX + long xattributes = 0; +#else + XSetWindowAttributes xattributes; + long xattributes_mask = 0; + + xattributes_mask |= CWBackPixel; + xattributes.background_pixel = m_backgroundColour.GetPixel(); + + xattributes_mask |= CWBorderPixel; + 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 | + KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | + PropertyChangeMask | VisibilityChangeMask ; + + if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE )) + { + 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 )) + { + pos2.x = 1; + pos2.y = 1; + size2.x -= 2; + size2.y -= 2; + } + 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; + wxAddClientWindowToTable( xwindow, (wxWindow*) this ); + + XMapWindow( xdisplay, 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 | + KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | + PropertyChangeMask | VisibilityChangeMask ; + + if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE )) + { + xattributes_mask |= CWBitGravity; + xattributes.bit_gravity = NorthWestGravity; + } + + 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; + m_clientWindow = m_mainWindow; + wxAddWindowToTable( xwindow, (wxWindow*) this ); + + XMapWindow( xdisplay, xwindow ); + } // Is a subwindow, so map immediately m_isShown = TRUE; - XMapWindow( xdisplay, xwindow ); // Without this, the cursor may not be restored properly (e.g. in splitter // sample). SetCursor(*wxSTANDARD_CURSOR); SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - - // Set background to None which will prevent X11 from clearing the - // background comletely. - XSetWindowBackgroundPixmap( xdisplay, xwindow, None ); // Don't call this, it can have nasty repercussions for composite controls, // for example @@ -187,32 +341,32 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, // Destructor wxWindowX11::~wxWindowX11() { + SendDestroyEvent(); + if (g_captureWindow == this) - g_captureWindow = NULL; - + g_captureWindow = NULL; + m_isBeingDeleted = TRUE; - - // X11-specific actions first - Window main = (Window) m_mainWidget; - if ( main ) - { - // Removes event handlers - //DetachWidget(main); - } if (m_parent) m_parent->RemoveChild( this ); DestroyChildren(); - // Destroy the window - if (main) + if (m_clientWindow != m_mainWindow) { - XSelectInput( wxGlobalDisplay(), main, NoEventMask); - wxDeleteWindowFromTable( main ); - XDestroyWindow( wxGlobalDisplay(), main ); - m_mainWidget = NULL; + // Destroy the cleint window + Window xwindow = (Window) m_clientWindow; + wxDeleteClientWindowFromTable( xwindow ); + XDestroyWindow( wxGlobalDisplay(), xwindow ); + m_clientWindow = NULL; } + + // Destroy the window + Window xwindow = (Window) m_mainWindow; + wxDeleteWindowFromTable( xwindow ); + XDestroyWindow( wxGlobalDisplay(), xwindow ); + m_mainWindow = NULL; } // --------------------------------------------------------------------------- @@ -221,13 +375,25 @@ wxWindowX11::~wxWindowX11() void wxWindowX11::SetFocus() { - Window xwindow = (Window) GetMainWindow(); - + Window xwindow = (Window) m_clientWindow; + wxCHECK_RET( xwindow, wxT("invalid window") ); + wxCHECK_RET( AcceptsFocus(), wxT("set focus on window that doesn't accept the focus") ); + +#if 0 + if (GetName() == "scrollBar") + { + char *crash = NULL; + *crash = 0; + } +#endif + 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 @@ -246,6 +412,10 @@ wxWindow *wxWindowBase::FindFocus() if (xfocus) { wxWindow *win = wxGetWindowFromTable( xfocus ); + if (!win) + { + win = wxGetClientWindowFromTable( xfocus ); + } return win; } @@ -259,7 +429,7 @@ bool wxWindowX11::Enable(bool enable) { if ( !wxWindowBase::Enable(enable) ) return FALSE; - + return TRUE; } @@ -267,22 +437,17 @@ bool wxWindowX11::Show(bool show) { wxWindowBase::Show(show); - Window xwin = (Window) GetXWindow(); - Display *xdisp = (Display*) GetXDisplay(); + Window xwindow = (Window) m_mainWindow; + Display *xdisp = wxGlobalDisplay(); if (show) { - wxString msg; - msg.Printf("Mapping window of type %s", GetClassInfo()->GetClassName()); - wxLogDebug(msg); - XMapWindow(xdisp, xwin); - XSync(xdisp, False); + // wxLogDebug( "Mapping window of type %s", GetName().c_str() ); + XMapWindow(xdisp, xwindow); } else { - wxString msg; - msg.Printf("Unmapping window of type %s", GetClassInfo()->GetClassName()); - wxLogDebug(msg); - XUnmapWindow(xdisp, xwin); + // wxLogDebug( "Unmapping window of type %s", GetName().c_str() ); + XUnmapWindow(xdisp, xwindow); } return TRUE; @@ -291,15 +456,15 @@ bool wxWindowX11::Show(bool show) // Raise the window to the top of the Z order void wxWindowX11::Raise() { - if (m_mainWidget) - XRaiseWindow( wxGlobalDisplay(), (Window) m_mainWidget ); + if (m_mainWindow) + XRaiseWindow( wxGlobalDisplay(), (Window) m_mainWindow ); } // Lower the window to the bottom of the Z order void wxWindowX11::Lower() { - if (m_mainWidget) - XLowerWindow( wxGlobalDisplay(), (Window) m_mainWidget ); + if (m_mainWindow) + XLowerWindow( wxGlobalDisplay(), (Window) m_mainWindow ); } void wxWindowX11::DoCaptureMouse() @@ -313,14 +478,14 @@ void wxWindowX11::DoCaptureMouse() (*tmp) = 1; return; } - + if (m_winCaptured) return; - Window xwindow = (Window) GetMainWindow(); + Window xwindow = (Window) m_clientWindow; wxCHECK_RET( xwindow, wxT("invalid window") ); - + g_captureWindow = (wxWindow*) this; if (xwindow) @@ -329,7 +494,7 @@ void wxWindowX11::DoCaptureMouse() FALSE, ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, GrabModeAsync, - GrabModeAsync, + GrabModeAsync, None, None, /* cursor */ // TODO: This may need to be set to the cursor of this window CurrentTime ); @@ -337,54 +502,15 @@ void wxWindowX11::DoCaptureMouse() if (res != GrabSuccess) { wxString msg; - msg.Printf("Failed to grab pointer for window %s", this->GetClassInfo()->GetClassName()); + msg.Printf(wxT("Failed to grab pointer for window %s"), this->GetClassInfo()->GetClassName()); wxLogDebug(msg); if (res == GrabNotViewable) - { - wxLogDebug("This is not a viewable window - perhaps not shown yet?"); - } - g_captureWindow = NULL; - return; - } + wxLogDebug( wxT("This is not a viewable window - perhaps not shown yet?") ); - wxLogDebug("Grabbed pointer"); - -#if 0 - res = XGrabButton(wxGlobalDisplay(), AnyButton, AnyModifier, - (Window) GetMainWindow(), - FALSE, - ButtonPressMask | ButtonReleaseMask | ButtonMotionMask, - GrabModeAsync, - GrabModeAsync, - None, - None); - - if (res != GrabSuccess) - { - wxLogDebug("Failed to grab mouse buttons."); - XUngrabPointer(wxGlobalDisplay(), CurrentTime); + g_captureWindow = NULL; return; } -#endif -#if 0 - res = XGrabKeyboard(wxGlobalDisplay(), (Window) GetMainWindow(), - ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask, - FALSE, - GrabModeAsync, - GrabModeAsync, - CurrentTime); - - if (res != GrabSuccess) - { - wxLogDebug("Failed to grab keyboard."); - XUngrabPointer(wxGlobalDisplay(), CurrentTime); - XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier, - (Window) GetMainWindow()); - return; - } -#endif - m_winCaptured = TRUE; } } @@ -392,21 +518,18 @@ void wxWindowX11::DoCaptureMouse() void wxWindowX11::DoReleaseMouse() { g_captureWindow = NULL; - + if ( !m_winCaptured ) return; - Window xwindow = (Window) GetMainWindow(); + Window xwindow = (Window) m_clientWindow; if (xwindow) { XUngrabPointer( wxGlobalDisplay(), CurrentTime ); -#if 0 - XUngrabButton( wxGlobalDisplay(), AnyButton, AnyModifier, xwindow); - XUngrabKeyboard( wxGlobalDisplay(), CurrentTime ); -#endif } - wxLogDebug("Ungrabbed pointer"); + + // wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() ); m_winCaptured = FALSE; } @@ -430,10 +553,10 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor) return FALSE; } - Window xwindow = (Window) GetMainWindow(); + Window xwindow = (Window) m_clientWindow; wxCHECK_MSG( xwindow, FALSE, wxT("invalid window") ); - + wxCursor cursorToUse; if (m_cursor.Ok()) cursorToUse = m_cursor; @@ -442,7 +565,7 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor) Cursor xcursor = (Cursor) cursorToUse.GetCursor(); - XDefineCursor( (Display*) wxGlobalDisplay(), xwindow, xcursor ); + XDefineCursor( wxGlobalDisplay(), xwindow, xcursor ); return TRUE; } @@ -450,17 +573,40 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor) // Coordinates relative to the window void wxWindowX11::WarpPointer (int x, int y) { - Window xwindow = (Window) GetMainWindow(); + Window xwindow = (Window) m_clientWindow; wxCHECK_RET( xwindow, wxT("invalid window") ); - + XWarpPointer( wxGlobalDisplay(), None, xwindow, 0, 0, 0, 0, x, y); } // Does a physical scroll void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect) { - Window xwindow = (Window) GetMainWindow(); + // No scrolling requested. + if ((dx == 0) && (dy == 0)) return; + + if (!m_updateRegion.IsEmpty()) + { + m_updateRegion.Offset( dx, dy ); + + int cw = 0; + int ch = 0; + GetSize( &cw, &ch ); // GetClientSize() ?? + m_updateRegion.Intersect( 0, 0, cw, ch ); + } + + if (!m_clearRegion.IsEmpty()) + { + m_clearRegion.Offset( dx, dy ); + + int cw = 0; + int ch = 0; + GetSize( &cw, &ch ); // GetClientSize() ?? + m_clearRegion.Intersect( 0, 0, cw, ch ); + } + + Window xwindow = (Window) GetClientAreaWindow(); wxCHECK_RET( xwindow, wxT("invalid window") ); @@ -469,14 +615,15 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect) GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL ); XSetGraphicsExposures( xdisplay, xgc, True ); - int s_x; - int s_y; + int s_x = 0; + int s_y = 0; int cw; int ch; if (rect) { s_x = rect->x; s_y = rect->y; + cw = rect->width; ch = rect->height; } @@ -486,14 +633,18 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect) s_y = 0; GetClientSize( &cw, &ch ); } - + +#if wxUSE_TWO_WINDOWS + wxPoint offset( 0,0 ); +#else wxPoint offset = GetClientAreaOrigin(); s_x += offset.x; s_y += offset.y; +#endif int w = cw - abs(dx); int h = ch - abs(dy); - + if ((h < 0) || (w < 0)) { Refresh(); @@ -501,28 +652,29 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect) else { wxRect rect; - if (dx < 0) rect.x = cw+dx; else rect.x = s_x; - if (dy < 0) rect.y = ch+dy; else rect.y = s_y; + if (dx < 0) rect.x = cw+dx + offset.x; else rect.x = s_x; + if (dy < 0) rect.y = ch+dy + offset.y; else rect.y = s_y; if (dy != 0) rect.width = cw; else rect.width = abs(dx); if (dx != 0) rect.height = ch; else rect.height = abs(dy); - + int d_x = s_x; int d_y = s_y; + if (dx < 0) s_x += -dx; if (dy < 0) s_y += -dy; - if (dx > 0) d_x = dx; - if (dy > 0) d_y = dy; + if (dx > 0) d_x = dx + offset.x; + if (dy > 0) d_y = dy + offset.y; XCopyArea( xdisplay, xwindow, xwindow, xgc, s_x, s_y, w, h, d_x, d_y ); - - // printf( "s_x %d s_y %d w %d h %d d_x %d d_y %d\n", s_x, s_y, w, h, d_x, d_y ); - // printf( "rect %d %d %d %d\n", rect.x, rect.y, rect.width, rect.height ); + // wxLogDebug( "Copy: s_x %d s_y %d w %d h %d d_x %d d_y %d", s_x, s_y, w, h, d_x, d_y ); + + // wxLogDebug( "Update: %d %d %d %d", rect.x, rect.y, rect.width, rect.height ); m_updateRegion.Union( rect ); m_clearRegion.Union( rect ); } - + XFreeGC( xdisplay, xgc ); } @@ -570,15 +722,16 @@ bool wxWindowX11::PreResize() // Get total size void wxWindowX11::DoGetSize(int *x, int *y) const { - Window xwindow = (Window) GetMainWindow(); + Window xwindow = (Window) m_mainWindow; wxCHECK_RET( xwindow, wxT("invalid window") ); - - XSync(wxGlobalDisplay(), False); + + //XSync(wxGlobalDisplay(), False); + XWindowAttributes attr; Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr ); wxASSERT(status); - + if (status) { *x = attr.width /* + 2*m_borderSize */ ; @@ -588,19 +741,19 @@ void wxWindowX11::DoGetSize(int *x, int *y) const void wxWindowX11::DoGetPosition(int *x, int *y) const { - Window window = (Window) m_mainWidget; + Window window = (Window) m_mainWindow; if (window) { - XSync(wxGlobalDisplay(), False); + //XSync(wxGlobalDisplay(), False); XWindowAttributes attr; Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr); wxASSERT(status); - + if (status) { *x = attr.x; *y = attr.y; - + // We may be faking the client origin. So a window that's really at (0, 30) // may appear (to wxWin apps) to be at (0, 0). if (GetParent()) @@ -617,7 +770,7 @@ void wxWindowX11::DoScreenToClient(int *x, int *y) const { Display *display = wxGlobalDisplay(); Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display)); - Window thisWindow = (Window) m_mainWidget; + Window thisWindow = (Window) m_clientWindow; Window childWindow; int xx = *x; @@ -629,7 +782,7 @@ void wxWindowX11::DoClientToScreen(int *x, int *y) const { Display *display = wxGlobalDisplay(); Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display)); - Window thisWindow = (Window) m_mainWidget; + Window thisWindow = (Window) m_clientWindow; Window childWindow; int xx = *x; @@ -641,15 +794,14 @@ void wxWindowX11::DoClientToScreen(int *x, int *y) const // Get size *available for subwindows* i.e. excluding menu bar etc. void wxWindowX11::DoGetClientSize(int *x, int *y) const { - Window window = (Window) m_mainWidget; + Window window = (Window) m_mainWindow; if (window) { - XSync(wxGlobalDisplay(), False); // Is this really a good idea? XWindowAttributes attr; Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr ); wxASSERT(status); - + if (status) { *x = attr.width ; @@ -660,19 +812,20 @@ void wxWindowX11::DoGetClientSize(int *x, int *y) const void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags) { - Window xwindow = (Window) GetMainWindow(); + // wxLogDebug("DoSetSize: %s (%ld) %d, %d %dx%d", GetClassInfo()->GetClassName(), GetId(), x, y, width, height); + + Window xwindow = (Window) m_mainWindow; wxCHECK_RET( xwindow, wxT("invalid window") ); XWindowAttributes attr; Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr ); wxCHECK_RET( status, wxT("invalid window attributes") ); - + int new_x = attr.x; int new_y = attr.y; int new_w = attr.width; int new_h = attr.height; - if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) { @@ -698,32 +851,35 @@ void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags) if (new_h <= 0) new_h = 20; } - + DoMoveWindow( new_x, new_y, new_w, new_h ); } void wxWindowX11::DoSetClientSize(int width, int height) { - Window xwindow = (Window) GetMainWindow(); + // wxLogDebug("DoSetClientSize: %s (%ld) %dx%d", GetClassInfo()->GetClassName(), GetId(), width, height); + + Window xwindow = (Window) m_mainWindow; wxCHECK_RET( xwindow, wxT("invalid window") ); - XWindowAttributes attr; - Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr ); - wxCHECK_RET( status, wxT("invalid window attributes") ); - - int new_x = attr.x; - int new_y = attr.y; - int new_w = attr.width; - int new_h = attr.height; - - if (width != -1) - new_w = width; - - if (height != -1) - new_h = height; - - DoMoveWindow( new_x, new_y, new_w, new_h ); + XResizeWindow( wxGlobalDisplay(), xwindow, width, height ); + + if (m_mainWindow != m_clientWindow) + { + xwindow = (Window) m_clientWindow; + + wxWindow *window = (wxWindow*) this; + wxRenderer *renderer = window->GetRenderer(); + if (renderer) + { + wxRect border = renderer->GetBorderDimensions( (wxBorder)(m_windowStyle & wxBORDER_MASK) ); + width -= border.x + border.width; + height -= border.y + border.height; + } + + XResizeWindow( wxGlobalDisplay(), xwindow, width, height ); + } } // For implementation purposes - sometimes decorations make the client area @@ -733,15 +889,64 @@ wxPoint wxWindowX11::GetClientAreaOrigin() const return wxPoint(0, 0); } -// Makes an adjustment to the window position (for example, a frame that has -// a toolbar that it manages itself). -void wxWindowX11::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) +void wxWindowX11::DoMoveWindow(int x, int y, int width, int height) { - if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent()) + Window xwindow = (Window) m_mainWindow; + + wxCHECK_RET( xwindow, wxT("invalid window") ); + +#if !wxUSE_NANOX + + XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, width, height ); + if (m_mainWindow != m_clientWindow) { - wxPoint pt(GetParent()->GetClientAreaOrigin()); - x += pt.x; y += pt.y; + xwindow = (Window) m_clientWindow; + + wxWindow *window = (wxWindow*) this; + wxRenderer *renderer = window->GetRenderer(); + if (renderer) + { + 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; + } + + wxScrollBar *sb = window->GetScrollbar( wxHORIZONTAL ); + if (sb && sb->IsShown()) + { + wxSize size = sb->GetSize(); + height -= size.y; + } + sb = window->GetScrollbar( wxVERTICAL ); + if (sb && sb->IsShown()) + { + wxSize size = sb->GetSize(); + width -= size.x; + } + + XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, wxMax(1, width), wxMax(1, height) ); } + +#else + + XWindowChanges windowChanges; + windowChanges.x = x; + windowChanges.y = y; + windowChanges.width = width; + windowChanges.height = height; + windowChanges.stack_mode = 0; + int valueMask = CWX | CWY | CWWidth | CWHeight; + + XConfigureWindow( wxGlobalDisplay(), xwindow, valueMask, &windowChanges ); + +#endif } void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH) @@ -751,9 +956,10 @@ void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, m_maxWidth = maxW; m_maxHeight = maxH; +#if !wxUSE_NANOX XSizeHints sizeHints; sizeHints.flags = 0; - + if (minW > -1 && minH > -1) { sizeHints.flags |= PMinSize; @@ -773,24 +979,8 @@ void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, sizeHints.height_inc = incH; } - XSetWMNormalHints(wxGlobalDisplay(), (Window) GetMainWindow(), & sizeHints); -} - -void wxWindowX11::DoMoveWindow(int x, int y, int width, int height) -{ - Window xwindow = (Window) GetMainWindow(); - - wxCHECK_RET( xwindow, wxT("invalid window") ); - - XWindowChanges windowChanges; - windowChanges.x = x; - windowChanges.y = y; - windowChanges.width = width; - windowChanges.height = height; - windowChanges.stack_mode = 0; - int valueMask = CWX | CWY | CWWidth | CWHeight; - - XConfigureWindow( wxGlobalDisplay(), xwindow, valueMask, &windowChanges ); + XSetWMNormalHints(wxGlobalDisplay(), (Window) m_mainWindow, &sizeHints ); +#endif } // --------------------------------------------------------------------------- @@ -801,7 +991,18 @@ int wxWindowX11::GetCharHeight() const { wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" ); - WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay()); +#if wxUSE_UNICODE + // There should be an easier way. + PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() ); + pango_layout_set_font_description( layout, GetFont().GetNativeFontInfo()->description ); + pango_layout_set_text(layout, "H", 1 ); + int w,h; + pango_layout_get_pixel_size(layout, &w, &h); + g_object_unref( G_OBJECT( layout ) ); + + return h; +#else + WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay()); int direction, ascent, descent; XCharStruct overall; @@ -810,13 +1011,25 @@ int wxWindowX11::GetCharHeight() const // return (overall.ascent + overall.descent); return (ascent + descent); +#endif } int wxWindowX11::GetCharWidth() const { wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" ); - WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay()); +#if wxUSE_UNICODE + // There should be an easier way. + PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() ); + pango_layout_set_font_description( layout, GetFont().GetNativeFontInfo()->description ); + pango_layout_set_text(layout, "H", 1 ); + int w,h; + pango_layout_get_pixel_size(layout, &w, &h); + g_object_unref( G_OBJECT( layout ) ); + + return w; +#else + WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay()); int direction, ascent, descent; XCharStruct overall; @@ -824,6 +1037,7 @@ int wxWindowX11::GetCharWidth() const &descent, &overall); return overall.width; +#endif } void wxWindowX11::GetTextExtent(const wxString& string, @@ -836,19 +1050,46 @@ void wxWindowX11::GetTextExtent(const wxString& string, wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") ); - WXFontStructPtr pFontStruct = fontToUse.GetFontStruct(1.0, GetXDisplay()); + if (string.IsEmpty()) + { + if (x) (*x) = 0; + if (y) (*y) = 0; + return; + } + +#if wxUSE_UNICODE + PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() ); + + PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description; + pango_layout_set_font_description(layout, desc); + + const wxCharBuffer data = wxConvUTF8.cWC2MB( string ); + pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); + + PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; + + + PangoRectangle rect; + pango_layout_line_get_extents(line, NULL, &rect); + + if (x) (*x) = (wxCoord) (rect.width / PANGO_SCALE); + if (y) (*y) = (wxCoord) (rect.height / PANGO_SCALE); + if (descent) + { + // Do something about metrics here + (*descent) = 0; + } + if (externalLeading) (*externalLeading) = 0; // ?? + + g_object_unref( G_OBJECT( layout ) ); +#else + WXFontStructPtr pFontStruct = fontToUse.GetFontStruct(1.0, wxGlobalDisplay()); int direction, ascent, descent2; XCharStruct overall; int slen = string.Len(); -#if 0 - if (use16) - XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction, - &ascent, &descent2, &overall); -#endif - - XTextExtents((XFontStruct*) pFontStruct, string.c_str(), slen, + XTextExtents((XFontStruct*) pFontStruct, (char*) string.c_str(), slen, &direction, &ascent, &descent2, &overall); if ( x ) @@ -859,7 +1100,7 @@ void wxWindowX11::GetTextExtent(const wxString& string, *descent = descent2; if (externalLeading) *externalLeading = 0; - +#endif } // ---------------------------------------------------------------------------- @@ -879,7 +1120,7 @@ void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect) { int height,width; GetSize( &width, &height ); - + // Schedule for later Updating in ::Update() or ::OnInternalIdle(). m_clearRegion.Clear(); m_clearRegion.Union( 0, 0, width, height ); @@ -895,7 +1136,7 @@ void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect) { int height,width; GetSize( &width, &height ); - + // Schedule for later Updating in ::Update() or ::OnInternalIdle(). m_updateRegion.Clear(); m_updateRegion.Union( 0, 0, width, height ); @@ -904,63 +1145,105 @@ void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect) void wxWindowX11::Update() { + if (m_updateNcArea) + { + // wxLogDebug("wxWindowX11::UpdateNC: %s", GetClassInfo()->GetClassName()); + // Send nc paint events. + SendNcPaintEvents(); + } + if (!m_updateRegion.IsEmpty()) { - // Actually send erase and paint events. - X11SendPaintEvents(); + // wxLogDebug("wxWindowX11::Update: %s", GetClassInfo()->GetClassName()); + // Actually send erase events. + SendEraseEvents(); + + // Actually send paint events. + SendPaintEvents(); } } -void wxWindowX11::Clear() +void wxWindowX11::SendEraseEvents() { - wxClientDC dc((wxWindow*) this); - wxBrush brush(GetBackgroundColour(), wxSOLID); - dc.SetBackground(brush); - dc.Clear(); + if (m_clearRegion.IsEmpty()) return; + + wxClientDC dc( (wxWindow*)this ); + dc.SetClippingRegion( m_clearRegion ); + + wxEraseEvent erase_event( GetId(), &dc ); + erase_event.SetEventObject( this ); + + if (!GetEventHandler()->ProcessEvent(erase_event) ) + { + Display *xdisplay = wxGlobalDisplay(); + Window xwindow = (Window) GetClientAreaWindow(); + XSetForeground( xdisplay, g_eraseGC, m_backgroundColour.GetPixel() ); + + wxRegionIterator upd( m_clearRegion ); + while (upd) + { + XFillRectangle( xdisplay, xwindow, g_eraseGC, + upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() ); + upd ++; + } + } + + m_clearRegion.Clear(); } -void wxWindowX11::X11SendPaintEvents() +void wxWindowX11::SendPaintEvents() { + // wxLogDebug("SendPaintEvents: %s (%ld)", GetClassInfo()->GetClassName(), GetId()); + m_clipPaintRegion = TRUE; - if (!m_clearRegion.IsEmpty()) + wxPaintEvent paint_event( GetId() ); + paint_event.SetEventObject( this ); + GetEventHandler()->ProcessEvent( paint_event ); + + m_updateRegion.Clear(); + + m_clipPaintRegion = FALSE; +} + +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()) { - wxWindowDC dc( (wxWindow*)this ); - dc.SetClippingRegion( m_clearRegion ); - - wxEraseEvent erase_event( GetId(), &dc ); - erase_event.SetEventObject( this ); - - if (!GetEventHandler()->ProcessEvent(erase_event)) + height = sb->GetSize().y; + y = sb->GetPosition().y; + + sb = window->GetScrollbar( wxVERTICAL ); + if (sb && sb->IsShown()) { - Window xwindow = (Window) GetMainWindow(); + width = sb->GetSize().x; + x = sb->GetPosition().x; + Display *xdisplay = wxGlobalDisplay(); - GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL ); - XSetFillStyle( xdisplay, xgc, FillSolid ); - XSetForeground( xdisplay, xgc, m_backgroundColour.GetPixel() ); - wxRegionIterator upd( m_clearRegion ); - while (upd) - { - XFillRectangle( xdisplay, xwindow, xgc, - upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() ); - upd ++; - } - XFreeGC( xdisplay, xgc ); + 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 ); } - m_clearRegion.Clear(); } wxNcPaintEvent nc_paint_event( GetId() ); nc_paint_event.SetEventObject( this ); GetEventHandler()->ProcessEvent( nc_paint_event ); - wxPaintEvent paint_event( GetId() ); - paint_event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( paint_event ); - - m_updateRegion.Clear(); - - m_clipPaintRegion = FALSE; + m_updateNcArea = FALSE; } // ---------------------------------------------------------------------------- @@ -970,7 +1253,7 @@ void wxWindowX11::X11SendPaintEvents() // Responds to colour changes: passes event on to children. void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event) { - wxWindowList::Node *node = GetChildren().GetFirst(); + wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); while ( node ) { // Only propagate to non-top-level windows @@ -986,18 +1269,34 @@ void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event) } } +// See handler for InFocus case in app.cpp for details. +wxWindow* g_GettingFocus = NULL; + void wxWindowX11::OnInternalIdle() { // Update invalidated regions. Update(); - + // This calls the UI-update mechanism (querying windows for // menu/toolbar/control state information) - UpdateWindowUI(); + if (wxUpdateUIEvent::CanUpdate((wxWindow*) this)) + UpdateWindowUI(wxUPDATE_UI_FROMIDLE); // Set the input focus if couldn't do it before if (m_needsInputFocus) - SetFocus(); + { +#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; } // ---------------------------------------------------------------------------- @@ -1009,15 +1308,15 @@ bool wxAddWindowToTable(Window w, wxWindow *win) wxWindow *oldItem = NULL; if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w))) { - wxLogDebug("Widget table clash: new widget is %ld, %s", - (long)w, win->GetClassInfo()->GetClassName()); + wxLogDebug( wxT("Widget table clash: new widget is %ld, %s"), + (long)w, win->GetClassInfo()->GetClassName()); return FALSE; } wxWidgetHashTable->Put((long) w, win); - wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)", - w, win, win->GetClassInfo()->GetClassName()); + wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"), + (unsigned int) w, win, win->GetClassInfo()->GetClassName()); return TRUE; } @@ -1033,28 +1332,53 @@ void wxDeleteWindowFromTable(Window w) } // ---------------------------------------------------------------------------- -// add/remove window from the table +// function which maintain the global hash table mapping client widgets // ---------------------------------------------------------------------------- -// ---------------------------------------------------------------------------- -// X11-specific accessors -// ---------------------------------------------------------------------------- +bool wxAddClientWindowToTable(Window w, wxWindow *win) +{ + wxWindow *oldItem = NULL; + if ((oldItem = (wxWindow *)wxClientWidgetHashTable->Get ((long) w))) + { + wxLogDebug( wxT("Client window table clash: new window is %ld, %s"), + (long)w, win->GetClassInfo()->GetClassName()); + return FALSE; + } + + wxClientWidgetHashTable->Put((long) w, win); + + wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"), + (unsigned int) w, win, win->GetClassInfo()->GetClassName()); -// Get the underlying X window -WXWindow wxWindowX11::GetXWindow() const + return TRUE; +} + +wxWindow *wxGetClientWindowFromTable(Window w) { - return GetMainWindow(); + return (wxWindow *)wxClientWidgetHashTable->Get((long) w); } -// Get the underlying X display -WXDisplay *wxWindowX11::GetXDisplay() const +void wxDeleteClientWindowFromTable(Window w) { - return wxGetDisplay(); + wxClientWidgetHashTable->Delete((long)w); } +// ---------------------------------------------------------------------------- +// add/remove window from the table +// ---------------------------------------------------------------------------- + +// ---------------------------------------------------------------------------- +// X11-specific accessors +// ---------------------------------------------------------------------------- + WXWindow wxWindowX11::GetMainWindow() const { - return m_mainWidget; + return m_mainWindow; +} + +WXWindow wxWindowX11::GetClientAreaWindow() const +{ + return m_clientWindow; } // ---------------------------------------------------------------------------- @@ -1063,7 +1387,7 @@ WXWindow wxWindowX11::GetMainWindow() const bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, XEvent *xevent) { - switch (xevent->xany.type) + switch (XEventGetType(xevent)) { case EnterNotify: case LeaveNotify: @@ -1073,39 +1397,39 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, { wxEventType eventType = wxEVT_NULL; - if (xevent->xany.type == EnterNotify) + if (XEventGetType(xevent) == EnterNotify) { //if (local_event.xcrossing.mode!=NotifyNormal) // return ; // Ignore grab events eventType = wxEVT_ENTER_WINDOW; // canvas->GetEventHandler()->OnSetFocus(); } - else if (xevent->xany.type == LeaveNotify) + else if (XEventGetType(xevent) == LeaveNotify) { //if (local_event.xcrossingr.mode!=NotifyNormal) // return ; // Ignore grab events eventType = wxEVT_LEAVE_WINDOW; // canvas->GetEventHandler()->OnKillFocus(); } - else if (xevent->xany.type == MotionNotify) + else if (XEventGetType(xevent) == MotionNotify) { eventType = wxEVT_MOTION; } - else if (xevent->xany.type == ButtonPress) + else if (XEventGetType(xevent) == ButtonPress) { - wxevent.SetTimestamp(xevent->xbutton.time); + wxevent.SetTimestamp(XButtonEventGetTime(xevent)); int button = 0; - if (xevent->xbutton.button == Button1) + if (XButtonEventLChanged(xevent)) { eventType = wxEVT_LEFT_DOWN; button = 1; } - else if (xevent->xbutton.button == Button2) + else if (XButtonEventMChanged(xevent)) { eventType = wxEVT_MIDDLE_DOWN; button = 2; } - else if (xevent->xbutton.button == Button3) + else if (XButtonEventRChanged(xevent)) { eventType = wxEVT_RIGHT_DOWN; button = 3; @@ -1136,17 +1460,17 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, win->SetLastClick(button, ts); } } - else if (xevent->xany.type == ButtonRelease) + else if (XEventGetType(xevent) == ButtonRelease) { - if (xevent->xbutton.button == Button1) + if (XButtonEventLChanged(xevent)) { eventType = wxEVT_LEFT_UP; } - else if (xevent->xbutton.button == Button2) + else if (XButtonEventMChanged(xevent)) { eventType = wxEVT_MIDDLE_UP; } - else if (xevent->xbutton.button == Button3) + else if (XButtonEventRChanged(xevent)) { eventType = wxEVT_RIGHT_UP; } @@ -1159,23 +1483,23 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, wxevent.SetEventType(eventType); - wxevent.m_x = xevent->xbutton.x; - wxevent.m_y = xevent->xbutton.y; + wxevent.m_x = XButtonEventGetX(xevent); + wxevent.m_y = XButtonEventGetY(xevent); wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN) - || (event_left_is_down (xevent) + || (XButtonEventLIsDown(xevent) && (eventType != wxEVT_LEFT_UP))); wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN) - || (event_middle_is_down (xevent) + || (XButtonEventMIsDown(xevent) && (eventType != wxEVT_MIDDLE_UP))); wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN) - || (event_right_is_down (xevent) + || (XButtonEventRIsDown (xevent) && (eventType != wxEVT_RIGHT_UP))); - wxevent.m_shiftDown = xevent->xbutton.state & ShiftMask; - wxevent.m_controlDown = xevent->xbutton.state & ControlMask; - wxevent.m_altDown = xevent->xbutton.state & Mod3Mask; - wxevent.m_metaDown = xevent->xbutton.state & Mod1Mask; + wxevent.m_shiftDown = XButtonEventShiftIsDown(xevent); + wxevent.m_controlDown = XButtonEventCtrlIsDown(xevent); + wxevent.m_altDown = XButtonEventAltIsDown(xevent); + wxevent.m_metaDown = XButtonEventMetaIsDown(xevent); wxevent.SetId(win->GetId()); wxevent.SetEventObject(win); @@ -1186,9 +1510,9 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, return FALSE; } -bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win), XEvent *xevent) +bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win), XEvent *xevent, bool isAscii) { - switch (xevent->xany.type) + switch (XEventGetType(xevent)) { case KeyPress: case KeyRelease: @@ -1198,27 +1522,27 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win KeySym keySym; (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL); int id = wxCharCodeXToWX (keySym); + // id may be WXK_xxx code - these are outside ASCII range, so we + // can't just use toupper() on id. + // Only change this if we want the raw key that was pressed, + // and don't change it if we want an ASCII value. + if (!isAscii && (id >= 'a' && id <= 'z')) + { + id = id + 'A' - 'a'; + } - if (xevent->xkey.state & ShiftMask) - wxevent.m_shiftDown = TRUE; - if (xevent->xkey.state & ControlMask) - wxevent.m_controlDown = TRUE; - if (xevent->xkey.state & Mod3Mask) - wxevent.m_altDown = TRUE; - if (xevent->xkey.state & Mod1Mask) - wxevent.m_metaDown = TRUE; + wxevent.m_shiftDown = XKeyEventShiftIsDown(xevent); + wxevent.m_controlDown = XKeyEventCtrlIsDown(xevent); + wxevent.m_altDown = XKeyEventAltIsDown(xevent); + wxevent.m_metaDown = XKeyEventMetaIsDown(xevent); wxevent.SetEventObject(win); wxevent.m_keyCode = id; - wxevent.SetTimestamp(xevent->xkey.time); + wxevent.SetTimestamp(XKeyEventGetTime(xevent)); - wxevent.m_x = xevent->xbutton.x; - wxevent.m_y = xevent->xbutton.y; + wxevent.m_x = XKeyEventGetX(xevent); + wxevent.m_y = XKeyEventGetY(xevent); - if (id > -1) - return TRUE; - else - return FALSE; - break; + return id > -1; } default: break; @@ -1239,19 +1563,10 @@ bool wxWindowX11::SetBackgroundColour(const wxColour& col) Colormap cm = DefaultColormap( xdisplay, xscreen ); m_backgroundColour.CalcPixel( (WXColormap) cm ); - - if (!GetMainWindow()) - return FALSE; - -/* - XSetWindowAttributes attrib; - attrib.background_pixel = colour.GetPixel(); - XChangeWindowAttributes(wxGlobalDisplay(), - (Window) GetMainWindow(), - CWBackPixel, - & attrib); -*/ + // We don't set the background colour as we paint + // the background ourselves. + // XSetWindowBackground( xdisplay, (Window) m_clientWindow, m_backgroundColour.GetPixel() ); return TRUE; } @@ -1292,6 +1607,10 @@ wxWindow* wxFindWindowAtPointer(wxPoint& pt) // Get the current mouse position. wxPoint wxGetMousePosition() { +#if wxUSE_NANOX + /* TODO */ + return wxPoint(0, 0); +#else Display *display = wxGlobalDisplay(); Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display)); Window rootReturn, childReturn; @@ -1299,11 +1618,12 @@ wxPoint wxGetMousePosition() unsigned int maskReturn; XQueryPointer (display, - rootWindow, - &rootReturn, + rootWindow, + &rootReturn, &childReturn, &rootX, &rootY, &winX, &winY, &maskReturn); return wxPoint(rootX, rootY); +#endif } @@ -1313,3 +1633,38 @@ wxPoint wxGetMousePosition() int wxNoOptimize::ms_count = 0; + +// ---------------------------------------------------------------------------- +// wxDCModule +// ---------------------------------------------------------------------------- + +class wxWinModule : public wxModule +{ +public: + bool OnInit(); + void OnExit(); + +private: + DECLARE_DYNAMIC_CLASS(wxWinModule) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule) + +bool wxWinModule::OnInit() +{ + Display *xdisplay = wxGlobalDisplay(); + int xscreen = DefaultScreen( xdisplay ); + Window xroot = RootWindow( xdisplay, xscreen ); + g_eraseGC = XCreateGC( xdisplay, xroot, 0, NULL ); + XSetFillStyle( xdisplay, g_eraseGC, FillSolid ); + + return TRUE; +} + +void wxWinModule::OnExit() +{ + Display *xdisplay = wxGlobalDisplay(); + XFreeGC( xdisplay, g_eraseGC ); +} + +