X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc797f4cc8ffe36277ba8b7dd4b57e63a96bfcb5..4b6f211eba3624d8c0f1e6480f79fe89842b8618:/src/x11/window.cpp diff --git a/src/x11/window.cpp b/src/x11/window.cpp index 54f29ea892..9fa7e4d83f 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -36,46 +36,34 @@ #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/univ/renderer.h" #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" #endif #include "wx/x11/private.h" +#include "X11/Xutil.h" -#include - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- +#if wxUSE_NANOX +// For wxGetLocalTime, used by XButtonEventGetTime +#include "wx/timer.h" +#endif -static const int SCROLL_MARGIN = 4; +#include // ---------------------------------------------------------------------------- // global variables for this module // ---------------------------------------------------------------------------- extern wxHashTable *wxWidgetHashTable; +extern wxHashTable *wxClientWidgetHashTable; static wxWindow* g_captureWindow = NULL; - - -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -static void wxCanvasRepaintProc(Widget, XtPointer, XmDrawingAreaCallbackStruct * cbs); -static void wxCanvasInputEvent(Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs); -static void wxCanvasMotionEvent(Widget, XButtonEvent * event); -static void wxCanvasEnterLeave(Widget drawingArea, XtPointer clientData, XCrossingEvent * event); -static void wxScrollBarCallback(Widget widget, XtPointer clientData, - XmScrollBarCallbackStruct *cbs); -static void wxPanelItemEventHandler(Widget wid, - XtPointer client_data, - XEvent* event, - Boolean *continueToDispatch); +static GC g_eraseGC; // ---------------------------------------------------------------------------- // macros @@ -89,11 +77,10 @@ static void wxPanelItemEventHandler(Widget wid, // event tables // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxWindowX11, wxWindowBase) +IMPLEMENT_ABSTRACT_CLASS(wxWindowX11, wxWindowBase) BEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase) EVT_SYS_COLOUR_CHANGED(wxWindowX11::OnSysColourChanged) - EVT_IDLE(wxWindowX11::OnIdle) END_EVENT_TABLE() // ============================================================================ @@ -113,41 +100,18 @@ void wxWindowX11::Init() // generic initializations first InitBase(); - // Motif-specific - m_needsRefresh = TRUE; - m_mainWidget = (WXWidget) 0; - - m_button1Pressed = - m_button2Pressed = - m_button3Pressed = FALSE; - + // X11-specific + m_mainWindow = (WXWindow) 0; + m_clientWindow = (WXWindow) 0; + m_insertIntoMain = FALSE; + m_updateNcArea = FALSE; + m_winCaptured = FALSE; - + m_needsInputFocus = FALSE; m_isShown = TRUE; m_isBeingDeleted = FALSE; - - m_hScrollBar = - m_vScrollBar = - m_borderWidget = - m_scrolledWindow = - m_drawingArea = (WXWidget) 0; - - m_hScroll = - m_vScroll = FALSE; - - m_scrollPosX = - m_scrollPosY = 0; - - m_backingPixmap = (WXPixmap) 0; - m_pixmapWidth = - m_pixmapHeight = 0; - - m_pixmapOffsetX = - m_pixmapOffsetY = 0; - m_lastTS = 0; m_lastButton = 0; - m_canAddEventHandler = FALSE; } // real construction (Init() must have been called before!) @@ -163,250 +127,241 @@ 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_foregroundColour = *wxBLACK; + m_foregroundColour.CalcPixel( (WXColormap) cm ); - if (style & wxSIMPLE_BORDER) - { - } else if (style & wxSUNKEN_BORDER) - { - } else if (style & wxRAISED_BORDER) + Window xparent = (Window) parent->GetClientWindow(); + + // 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(); } - - // TODO: create XWindow - -#if 0 - wxAddWindowToTable((Window) m_drawingArea, this); - wxAddWindowToTable((Window) m_scrolledWindow, this); + + wxSize size2(size); + if (size2.x == -1) + size2.x = 20; + if (size2.y == -1) + size2.y = 20; + + wxPoint pos2(pos); + if (pos2.x == -1) + pos2.x = 0; + if (pos2.y == -1) + 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 - // Without this, the cursor may not be restored properly (e.g. in splitter - // sample). - SetCursor(*wxSTANDARD_CURSOR); - SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - SetSize(pos.x, pos.y, size.x, size.y); - - return TRUE; -} - -// Destructor -wxWindowX11::~wxWindow() -{ - if (g_captureWindow == this) - g_captureWindow = NULL; +#if wxUSE_NANOX + long xattributes = 0; +#else + XSetWindowAttributes xattributes; + long xattributes_mask = 0; - m_isBeingDeleted = TRUE; + xattributes_mask |= CWBackPixel; + xattributes.background_pixel = m_backgroundColour.GetPixel(); + + xattributes_mask |= CWBorderPixel; + xattributes.border_pixel = BlackPixel( xdisplay, xscreen ); + + xattributes_mask |= CWEventMask; +#endif - // Motif-specific actions first - WXWindow wMain = GetMainWindow(); - if ( wMain ) + if (need_two_windows) { - // Removes event handlers - //DetachWidget(wMain); - } - - ClearUpdateRects(); - - if ( m_parent ) - m_parent->RemoveChild( this ); - - // TODO +#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; -#if 0 - // If m_drawingArea, we're a fully-fledged window with drawing area, - // scrollbars etc. (what wxCanvas used to be) - if ( m_drawingArea ) - { - // Destroy children before destroying self - DestroyChildren(); + Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, + 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes ); - if (m_backingPixmap) - XFreePixmap (XtDisplay ((Widget) GetMainWidget()), (Pixmap) m_backingPixmap); +#endif + + XSetWindowBackgroundPixmap( xdisplay, xwindow, None ); + + m_mainWindow = (WXWindow) xwindow; + wxAddWindowToTable( xwindow, (wxWindow*) this ); + + XMapWindow( xdisplay, xwindow ); - Widget w = (Widget) m_drawingArea; - wxDeleteWindowFromTable(w); +#if !wxUSE_NANOX + xattributes.event_mask = + ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | + ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | + KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | + PropertyChangeMask | VisibilityChangeMask ; - if (w) + if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE )) { - XtDestroyWidget(w); - m_drawingArea = (WXWidget) 0; + xattributes_mask |= CWBitGravity; + xattributes.bit_gravity = StaticGravity; } - - // Only if we're _really_ a canvas (not a dialog box/panel) - if (m_scrolledWindow) +#endif + + if (HasFlag( wxSUNKEN_BORDER) || HasFlag( wxRAISED_BORDER)) { - wxDeleteWindowFromTable((Widget) m_scrolledWindow); - } - - if (m_hScrollBar) + pos2.x = 2; + pos2.y = 2; + size2.x -= 4; + size2.y -= 4; + } else + if (HasFlag( wxSIMPLE_BORDER )) { - wxDeleteWindowFromTable((Widget) m_hScrollBar); - XtUnmanageChild((Widget) m_hScrollBar); - } - if (m_vScrollBar) + pos2.x = 1; + pos2.y = 1; + size2.x -= 2; + size2.y -= 2; + } else { - wxDeleteWindowFromTable((Widget) m_vScrollBar); - XtUnmanageChild((Widget) m_vScrollBar); + pos2.x = 0; + pos2.y = 0; } - - if (m_hScrollBar) - XtDestroyWidget((Widget) m_hScrollBar); - if (m_vScrollBar) - XtDestroyWidget((Widget) m_vScrollBar); - - UnmanageAndDestroy(m_scrolledWindow); - - if (m_borderWidget) +#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 )) { - XtDestroyWidget ((Widget) m_borderWidget); - m_borderWidget = (WXWidget) 0; + xattributes_mask |= CWBitGravity; + xattributes.bit_gravity = NorthWestGravity; } - } - else // Why wasn't this here before? JACS 8/3/2000 -#endif - DestroyChildren(); - - // Destroy the window - if (GetMainWindow()) - { - // TODO - // XtDestroyWidget((Widget) GetMainWidget()); - SetMainWindow((WXWindow) NULL); + 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 ); } -} - -// ---------------------------------------------------------------------------- -// scrollbar management -// ---------------------------------------------------------------------------- - -// Helper function -void wxWindowX11::CreateScrollbar(wxOrientation orientation) -{ - // TODO -#if 0 - wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" ); - XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL); + // Is a subwindow, so map immediately + m_isShown = TRUE; - // Add scrollbars if required - if (orientation == wxHORIZONTAL) - { - Widget hScrollBar = XtVaCreateManagedWidget ("hsb", - xmScrollBarWidgetClass, (Widget) m_scrolledWindow, - XmNorientation, XmHORIZONTAL, - NULL); - XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL); - XtAddCallback (hScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL); - XtAddCallback (hScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL); - XtAddCallback (hScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL); - XtAddCallback (hScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL); - XtAddCallback (hScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL); - XtAddCallback (hScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL); - XtAddCallback (hScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL); - - XtVaSetValues (hScrollBar, - XmNincrement, 1, - XmNvalue, 0, - NULL); - - m_hScrollBar = (WXWidget) hScrollBar; - - wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE); - - XtRealizeWidget(hScrollBar); - - XtVaSetValues((Widget) m_scrolledWindow, - XmNhorizontalScrollBar, (Widget) m_hScrollBar, - NULL); - - m_hScroll = TRUE; - - wxAddWindowToTable( hScrollBar, this ); - } + // Without this, the cursor may not be restored properly (e.g. in splitter + // sample). + SetCursor(*wxSTANDARD_CURSOR); + SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - if (orientation == wxVERTICAL) - { - Widget vScrollBar = XtVaCreateManagedWidget ("vsb", - xmScrollBarWidgetClass, (Widget) m_scrolledWindow, - XmNorientation, XmVERTICAL, - NULL); - XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL); - XtAddCallback (vScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL); - XtAddCallback (vScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL); - XtAddCallback (vScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL); - XtAddCallback (vScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL); - XtAddCallback (vScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL); - XtAddCallback (vScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL); - XtAddCallback (vScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL); - - XtVaSetValues (vScrollBar, - XmNincrement, 1, - XmNvalue, 0, - NULL); - - m_vScrollBar = (WXWidget) vScrollBar; - wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE); - - XtRealizeWidget(vScrollBar); - - XtVaSetValues((Widget) m_scrolledWindow, - XmNverticalScrollBar, (Widget) m_vScrollBar, - NULL); - - m_vScroll = TRUE; - - wxAddWindowToTable( vScrollBar, this ); - } + // Don't call this, it can have nasty repercussions for composite controls, + // for example + // SetSize(pos.x, pos.y, size.x, size.y); - XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL); -#endif + return TRUE; } -void wxWindowX11::DestroyScrollbar(wxOrientation orientation) +// Destructor +wxWindowX11::~wxWindowX11() { - // TODO -#if 0 - wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" ); - - XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL); - // Add scrollbars if required - if (orientation == wxHORIZONTAL) - { - if (m_hScrollBar) - { - wxDeleteWindowFromTable((Widget)m_hScrollBar); - XtDestroyWidget((Widget) m_hScrollBar); - } - m_hScrollBar = (WXWidget) 0; - m_hScroll = FALSE; - - XtVaSetValues((Widget) m_scrolledWindow, - XmNhorizontalScrollBar, (Widget) 0, - NULL); + if (g_captureWindow == this) + g_captureWindow = NULL; + + m_isBeingDeleted = TRUE; + + if (m_parent) + m_parent->RemoveChild( this ); - } + DestroyChildren(); - if (orientation == wxVERTICAL) + if (m_clientWindow != m_mainWindow) { - if (m_vScrollBar) - { - wxDeleteWindowFromTable((Widget)m_vScrollBar); - XtDestroyWidget((Widget) m_vScrollBar); - } - m_vScrollBar = (WXWidget) 0; - m_vScroll = FALSE; - - XtVaSetValues((Widget) m_scrolledWindow, - XmNverticalScrollBar, (Widget) 0, - NULL); - + // Destroy the cleint window + Window xwindow = (Window) m_clientWindow; + wxDeleteClientWindowFromTable( xwindow ); + XDestroyWindow( wxGlobalDisplay(), xwindow ); + m_clientWindow = NULL; } - XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL); -#endif + + // Destroy the window + Window xwindow = (Window) m_mainWindow; + wxDeleteWindowFromTable( xwindow ); + XDestroyWindow( wxGlobalDisplay(), xwindow ); + m_mainWindow = NULL; } // --------------------------------------------------------------------------- @@ -415,77 +370,80 @@ void wxWindowX11::DestroyScrollbar(wxOrientation orientation) void wxWindowX11::SetFocus() { - // TODO + 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 - Widget wMain = (Widget) GetMainWidget(); - XmProcessTraversal(wMain, XmTRAVERSE_CURRENT); - XmProcessTraversal((Widget) GetMainWidget(), XmTRAVERSE_CURRENT); + if (GetName() == "scrollBar") + { + char *crash = NULL; + *crash = 0; + } #endif + + if (wxWindowIsVisible(xwindow)) + { + wxLogTrace( _T("focus"), _T("wxWindowX11::SetFocus: %s"), GetClassInfo()->GetClassName()); + // XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime ); + XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToNone, CurrentTime ); + m_needsInputFocus = FALSE; + } + else + { + m_needsInputFocus = TRUE; + } } // Get the window with the focus wxWindow *wxWindowBase::FindFocus() { - // TODO - return NULL; -#if 0 + Window xfocus = (Window) 0; + int revert = 0; - // TODO Problems: - // (1) Can there be multiple focussed widgets in an application? - // In which case we need to find the top-level window that's - // currently active. - // (2) The widget with the focus may not be in the widget table - // depending on which widgets I put in the table - wxWindow *winFocus = (wxWindow *)NULL; - for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst(); - node; - node = node->GetNext() ) + XGetInputFocus( wxGlobalDisplay(), &xfocus, &revert); + if (xfocus) { - wxWindow *win = node->GetData(); - - Widget w = XmGetFocusWidget ((Widget) win->GetTopWidget()); - - if (w != (Widget) NULL) + wxWindow *win = wxGetWindowFromTable( xfocus ); + if (!win) { - winFocus = wxGetWindowFromTable(w); - if ( winFocus ) - break; + win = wxGetClientWindowFromTable( xfocus ); } + + return win; } - return winFocus; -#endif + return NULL; } +// Enabling/disabling handled by event loop, and not sending events +// if disabled. bool wxWindowX11::Enable(bool enable) { if ( !wxWindowBase::Enable(enable) ) return FALSE; - - // TODO -#if 0 - Widget wMain = (Widget)GetMainWidget(); - if ( wMain ) - { - XtSetSensitive(wMain, enable); - XmUpdateDisplay(wMain); - } -#endif - + return TRUE; } bool wxWindowX11::Show(bool show) { - if ( !wxWindowBase::Show(show) ) - return FALSE; + wxWindowBase::Show(show); - Window xwin = (Window) GetXWindow(); - Display *xdisp = (Display*) GetXDisplay(); + Window xwindow = (Window) m_mainWindow; + Display *xdisp = wxGlobalDisplay(); if (show) - XMapWindow(xdisp, xwin); + { + // wxLogDebug( "Mapping window of type %s", GetName().c_str() ); + XMapWindow(xdisp, xwindow); + } else - XUnmapWindow(xdisp, xwin); + { + // wxLogDebug( "Unmapping window of type %s", GetName().c_str() ); + XUnmapWindow(xdisp, xwindow); + } return TRUE; } @@ -493,65 +451,81 @@ bool wxWindowX11::Show(bool show) // Raise the window to the top of the Z order void wxWindowX11::Raise() { - Window window = GetTopWindow(); - if (window) - XRaiseWindow(wxGetDisplay(), window); + if (m_mainWindow) + XRaiseWindow( wxGlobalDisplay(), (Window) m_mainWindow ); } // Lower the window to the bottom of the Z order void wxWindowX11::Lower() { - Window window = GetTopWindow(); - if (window) - XLowerWindow(wxGetDisplay(), window); + if (m_mainWindow) + XLowerWindow( wxGlobalDisplay(), (Window) m_mainWindow ); } -void wxWindowX11::SetTitle(const wxString& title) +void wxWindowX11::DoCaptureMouse() { - // TODO -// XtVaSetValues((Widget)GetMainWidget(), XmNtitle, title.c_str(), NULL); -} + if ((g_captureWindow != NULL) && (g_captureWindow != this)) + { + wxASSERT_MSG(FALSE, "Trying to capture before mouse released."); -wxString wxWindowX11::GetTitle() const -{ - // TODO - return wxEmptyString; -#if 0 - char *title; - XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &title, NULL); + // Core dump now + int *tmp = NULL; + (*tmp) = 1; + return; + } + + if (m_winCaptured) + return; - return wxString(title); -#endif -} + Window xwindow = (Window) m_clientWindow; -void wxWindowX11::DoCaptureMouse() -{ - g_captureWindow = this; - if ( m_winCaptured ) - return; + wxCHECK_RET( xwindow, wxT("invalid window") ); + + g_captureWindow = (wxWindow*) this; - // TODO -#if 0 - Widget wMain = (Widget)GetMainWidget(); - if ( wMain ) - XtAddGrab(wMain, TRUE, FALSE); -#endif + if (xwindow) + { + int res = XGrabPointer(wxGlobalDisplay(), xwindow, + FALSE, + ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, + GrabModeAsync, + GrabModeAsync, + None, + None, /* cursor */ // TODO: This may need to be set to the cursor of this window + CurrentTime ); + + if (res != GrabSuccess) + { + wxString msg; + msg.Printf("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; + } - m_winCaptured = TRUE; + m_winCaptured = TRUE; + } } void wxWindowX11::DoReleaseMouse() { g_captureWindow = NULL; + if ( !m_winCaptured ) return; - // TODO -#if 0 - Widget wMain = (Widget)GetMainWidget(); - if ( wMain ) - XtRemoveGrab(wMain); -#endif + Window xwindow = (Window) m_clientWindow; + + if (xwindow) + { + XUngrabPointer( wxGlobalDisplay(), CurrentTime ); + } + + // wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() ); m_winCaptured = FALSE; } @@ -564,8 +538,6 @@ bool wxWindowX11::SetFont(const wxFont& font) return FALSE; } - ChangeFont(); - return TRUE; } @@ -577,17 +549,19 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor) return FALSE; } - wxCursor* cursor2 = NULL; + Window xwindow = (Window) m_clientWindow; + + wxCHECK_MSG( xwindow, FALSE, wxT("invalid window") ); + + wxCursor cursorToUse; if (m_cursor.Ok()) - cursor2 = & m_cursor; + cursorToUse = m_cursor; else - cursor2 = wxSTANDARD_CURSOR; + cursorToUse = *wxSTANDARD_CURSOR; - WXDisplay *dpy = GetXDisplay(); - WXCursor x_cursor = cursor2->GetXCursor(dpy); + Cursor xcursor = (Cursor) cursorToUse.GetCursor(); - Window win = (Window) GetMainWindow(); - XDefineCursor((Display*) dpy, win, (Cursor) x_cursor); + XDefineCursor( wxGlobalDisplay(), xwindow, xcursor ); return TRUE; } @@ -595,316 +569,109 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor) // Coordinates relative to the window void wxWindowX11::WarpPointer (int x, int y) { - Window wClient = (Window) GetClientWindow(); - - XWarpPointer(wxGetDisplay(), None, wClient, 0, 0, 0, 0, x, y); -} - -// --------------------------------------------------------------------------- -// scrolling stuff -// --------------------------------------------------------------------------- + Window xwindow = (Window) m_clientWindow; -int wxWindowX11::GetScrollPos(int orient) const -{ - if (orient == wxHORIZONTAL) - return m_scrollPosX; - else - return m_scrollPosY; + wxCHECK_RET( xwindow, wxT("invalid window") ); + + XWarpPointer( wxGlobalDisplay(), None, xwindow, 0, 0, 0, 0, x, y); } -// This now returns the whole range, not just the number of positions that we -// can scroll. -int wxWindowX11::GetScrollRange(int WXUNUSED(orient)) const +// Does a physical scroll +void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect) { - // TODO - return 0; -#if 0 - Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient); - wxCHECK_MSG( scrollBar, 0, "no such scrollbar" ); + // 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) GetClientWindow(); - int range; - XtVaGetValues(scrollBar, XmNmaximum, &range, NULL); - return range; -#endif -} + wxCHECK_RET( xwindow, wxT("invalid window") ); -int wxWindowX11::GetScrollThumb(int orient) const -{ - // TODO - return 0; + Display *xdisplay = wxGlobalDisplay(); -#if 0 - Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient); - wxCHECK_MSG( scrollBar, 0, "no such scrollbar" ); + GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL ); + XSetGraphicsExposures( xdisplay, xgc, True ); - int thumb; - XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL); - return thumb; + 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; + } + else + { + s_x = 0; + 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(); + } + else + { + wxRect rect; + 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 + offset.x; + if (dy > 0) d_y = dy + offset.y; -void wxWindowX11::SetScrollPos(int WXUNUSED(orient), int WXUNUSED(pos), bool WXUNUSED(refresh)) -{ - // TODO + XCopyArea( xdisplay, xwindow, xwindow, xgc, s_x, s_y, w, h, d_x, d_y ); + + // 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 ); -#if 0 - Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient); + // wxLogDebug( "Update: %d %d %d %d", rect.x, rect.y, rect.width, rect.height ); - if ( scrollBar ) - { - XtVaSetValues (scrollBar, XmNvalue, pos, NULL); + m_updateRegion.Union( rect ); + m_clearRegion.Union( rect ); } -#endif - SetInternalScrollPos((wxOrientation)orient, pos); -} - -// New function that will replace some of the above. -void wxWindowX11::SetScrollbar(int WXUNUSED(orient), int WXUNUSED(pos), int WXUNUSED(thumbVisible), - int WXUNUSED(range), bool WXUNUSED(refresh)) -{ - // TODO -#if 0 - int oldW, oldH; - GetSize(& oldW, & oldH); - - if (range == 0) - range = 1; - if (thumbVisible == 0) - thumbVisible = 1; - - if (thumbVisible > range) - thumbVisible = range; - - // Save the old state to see if it changed - WXWidget oldScrollBar = GetScrollbar((wxOrientation)orient); - - if (orient == wxHORIZONTAL) - { - if (thumbVisible == range) - { - if (m_hScrollBar) - DestroyScrollbar(wxHORIZONTAL); - } - else - { - if (!m_hScrollBar) - CreateScrollbar(wxHORIZONTAL); - } - } - if (orient == wxVERTICAL) - { - if (thumbVisible == range) - { - if (m_vScrollBar) - DestroyScrollbar(wxVERTICAL); - } - else - { - if (!m_vScrollBar) - CreateScrollbar(wxVERTICAL); - } - } - WXWidget newScrollBar = GetScrollbar((wxOrientation)orient); - - if (oldScrollBar != newScrollBar) - { - // This is important! Without it, scrollbars misbehave badly. - XtUnrealizeWidget((Widget) m_scrolledWindow); - XmScrolledWindowSetAreas ((Widget) m_scrolledWindow, (Widget) m_hScrollBar, (Widget) m_vScrollBar, (Widget) m_drawingArea); - XtRealizeWidget((Widget) m_scrolledWindow); - XtManageChild((Widget) m_scrolledWindow); - } - - if (newScrollBar) - { - XtVaSetValues((Widget) newScrollBar, - XmNvalue, pos, - XmNminimum, 0, - XmNmaximum, range, - XmNsliderSize, thumbVisible, - NULL); - } - - SetInternalScrollPos((wxOrientation)orient, pos); - - int newW, newH; - GetSize(& newW, & newH); - - // Adjusting scrollbars can resize the canvas accidentally - if (newW != oldW || newH != oldH) - SetSize(-1, -1, oldW, oldH); -#endif -} - -// Does a physical scroll -void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect) -{ - int x, y, w, h; - if (rect) - { - // Use specified rectangle - x = rect->x; y = rect->y; w = rect->width; h = rect->height; - } - else - { - // Use whole client area - x = 0; y = 0; - GetClientSize(& w, & h); - } - - wxNode *cnode = m_children.First(); - while (cnode) - { - wxWindow *child = (wxWindow*) cnode->Data(); - int sx = 0; - int sy = 0; - child->GetSize( &sx, &sy ); - wxPoint pos( child->GetPosition() ); - child->SetSize( pos.x + dx, pos.y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE ); - cnode = cnode->Next(); - } - - int x1 = (dx >= 0) ? x : x - dx; - int y1 = (dy >= 0) ? y : y - dy; - int w1 = w - abs(dx); - int h1 = h - abs(dy); - int x2 = (dx >= 0) ? x + dx : x; - int y2 = (dy >= 0) ? y + dy : y; - - wxClientDC dc(this); - - dc.SetLogicalFunction (wxCOPY); - - Window window = (Window) GetMainWindow(); - Display* display = wxGetDisplay(); - - XCopyArea(display, window, window, (GC) dc.GetGC(), - x1, y1, w1, h1, x2, y2); - - dc.SetAutoSetting(TRUE); - wxBrush brush(GetBackgroundColour(), wxSOLID); - dc.SetBrush(brush); // FIXME: needed? - - // We'll add rectangles to the list of update rectangles according to which - // bits we've exposed. - wxList updateRects; - - if (dx > 0) - { - wxRect *rect = new wxRect; - rect->x = x; - rect->y = y; - rect->width = dx; - rect->height = h; - - XFillRectangle(display, window, - (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height); - - rect->x = rect->x; - rect->y = rect->y; - rect->width = rect->width; - rect->height = rect->height; - - updateRects.Append((wxObject*) rect); - } - else if (dx < 0) - { - wxRect *rect = new wxRect; - - rect->x = x + w + dx; - rect->y = y; - rect->width = -dx; - rect->height = h; - - XFillRectangle(display, window, - (GC) dc.GetGC(), rect->x, rect->y, rect->width, - rect->height); - - rect->x = rect->x; - rect->y = rect->y; - rect->width = rect->width; - rect->height = rect->height; - - updateRects.Append((wxObject*) rect); - } - if (dy > 0) - { - wxRect *rect = new wxRect; - - rect->x = x; - rect->y = y; - rect->width = w; - rect->height = dy; - - XFillRectangle(display, window, - (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height); - - rect->x = rect->x; - rect->y = rect->y; - rect->width = rect->width; - rect->height = rect->height; - - updateRects.Append((wxObject*) rect); - } - else if (dy < 0) - { - wxRect *rect = new wxRect; - - rect->x = x; - rect->y = y + h + dy; - rect->width = w; - rect->height = -dy; - - XFillRectangle(display, window, - (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height); - - rect->x = rect->x; - rect->y = rect->y; - rect->width = rect->width; - rect->height = rect->height; - - updateRects.Append((wxObject*) rect); - } - dc.SetBrush(wxNullBrush); - - // Now send expose events - - wxNode* node = updateRects.First(); - while (node) - { - wxRect* rect = (wxRect*) node->Data(); - XExposeEvent event; - - event.type = Expose; - event.display = display; - event.send_event = True; - event.window = window; - - event.x = rect->x; - event.y = rect->y; - event.width = rect->width; - event.height = rect->height; - - event.count = 0; - - XSendEvent(display, window, False, ExposureMask, (XEvent *)&event); - - node = node->Next(); - - } - - // Delete the update rects - node = updateRects.First(); - while (node) - { - wxRect* rect = (wxRect*) node->Data(); - delete rect; - node = node->Next(); - } - - // TODO - - // XmUpdateDisplay((Widget) GetMainWidget()); + + XFreeGC( xdisplay, xgc ); } // --------------------------------------------------------------------------- @@ -951,52 +718,55 @@ bool wxWindowX11::PreResize() // Get total size void wxWindowX11::DoGetSize(int *x, int *y) const { - // TODO -#if 0 - if (m_drawingArea) + Window xwindow = (Window) m_mainWindow; + + wxCHECK_RET( xwindow, wxT("invalid window") ); + + //XSync(wxGlobalDisplay(), False); + + XWindowAttributes attr; + Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr ); + wxASSERT(status); + + if (status) { - CanvasGetSize(x, y); - return; + *x = attr.width /* + 2*m_borderSize */ ; + *y = attr.height /* + 2*m_borderSize */ ; } - - Widget widget = (Widget) GetTopWidget(); - Dimension xx, yy; - XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL); - if(x) *x = xx; if(y) *y = yy; -#endif } void wxWindowX11::DoGetPosition(int *x, int *y) const { - // TODO -#if 0 - if (m_drawingArea) - { - CanvasGetPosition(x, y); - return; - } - Widget widget = (Widget) GetTopWidget(); - Position xx, yy; - XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL); - - // 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()) + Window window = (Window) m_mainWindow; + if (window) { - wxPoint pt(GetParent()->GetClientAreaOrigin()); - xx -= pt.x; - yy -= pt.y; + //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()) + { + wxPoint pt(GetParent()->GetClientAreaOrigin()); + *x -= pt.x; + *y -= pt.y; + } + } } - - if(x) *x = xx; if(y) *y = yy; -#endif } void wxWindowX11::DoScreenToClient(int *x, int *y) const { - Display *display = wxGetDisplay(); + Display *display = wxGlobalDisplay(); Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display)); - Window thisWindow = (Window) GetClientWindow(); + Window thisWindow = (Window) m_clientWindow; Window childWindow; int xx = *x; @@ -1006,9 +776,9 @@ void wxWindowX11::DoScreenToClient(int *x, int *y) const void wxWindowX11::DoClientToScreen(int *x, int *y) const { - Display *display = wxGetDisplay(); + Display *display = wxGlobalDisplay(); Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display)); - Window thisWindow = (Window) GetClientWindow(); + Window thisWindow = (Window) m_clientWindow; Window childWindow; int xx = *x; @@ -1020,96 +790,92 @@ 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 { - // TODO -#if 0 - Widget widget = (Widget) GetClientWidget(); - Dimension xx, yy; - XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL); - if(x) *x = xx; if(y) *y = yy; -#endif + Window window = (Window) m_mainWindow; + + if (window) + { + XWindowAttributes attr; + Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr ); + wxASSERT(status); + + if (status) + { + *x = attr.width ; + *y = attr.height ; + } + } } void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags) { - // TODO -#if 0 - // A bit of optimization to help sort out the flickers. - int oldX, oldY, oldW, oldH; - GetSize(& oldW, & oldH); - GetPosition(& oldX, & oldY); + // wxLogDebug("DoSetSize: %s (%ld) %d, %d %dx%d", GetClassInfo()->GetClassName(), GetId(), x, y, width, height); + + Window xwindow = (Window) m_mainWindow; - if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) + 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)) { - if ( x == -1 ) - x = oldX; - if ( y == -1 ) - y = oldY; + int yy = 0; + AdjustForParentClientOrigin( x, yy, sizeFlags); + new_x = x; } - - if ( width == -1 ) - width = oldW; - if ( height == -1 ) - height = oldH; - - bool nothingChanged = (x == oldX) && (y == oldY) && - (width == oldW) && (height == oldH); - - if (!wxNoOptimize::CanOptimize()) + if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) { - nothingChanged = FALSE; + int xx = 0; + AdjustForParentClientOrigin( xx, y, sizeFlags); + new_y = y; } - - if ( !nothingChanged ) + if (width != -1) { - if (m_drawingArea) - { - CanvasSetSize(x, y, width, height, sizeFlags); - return; - } - - Widget widget = (Widget) GetTopWidget(); - if (!widget) - return; - - bool managed = XtIsManaged( widget ); - if (managed) - XtUnmanageChild(widget); - - int xx = x; - int yy = y; - AdjustForParentClientOrigin(xx, yy, sizeFlags); - - DoMoveWindow(xx, yy, width, height); - - if (managed) - XtManageChild(widget); - + new_w = width; + if (new_w <= 0) + new_w = 20; } -#endif + if (height != -1) + { + new_h = height; + if (new_h <= 0) + new_h = 20; + } + + DoMoveWindow( new_x, new_y, new_w, new_h ); } void wxWindowX11::DoSetClientSize(int width, int height) { - // TODO -#if 0 - if (m_drawingArea) - { - CanvasSetClientSize(width, height); - return; - } - - Widget widget = (Widget) GetTopWidget(); - - if (width > -1) - XtVaSetValues(widget, XmNwidth, width, NULL); - if (height > -1) - XtVaSetValues(widget, XmNheight, height, NULL); + // wxLogDebug("DoSetClientSize: %s (%ld) %dx%d", GetClassInfo()->GetClassName(), GetId(), width, height); + + Window xwindow = (Window) m_mainWindow; - wxSizeEvent sizeEvent(wxSize(width, height), GetId()); - sizeEvent.SetEventObject(this); + wxCHECK_RET( xwindow, wxT("invalid window") ); - GetEventHandler()->ProcessEvent(sizeEvent); -#endif + 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 @@ -1119,60 +885,97 @@ 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) { - // TODO -#if 0 m_minWidth = minW; m_minHeight = minH; m_maxWidth = maxW; m_maxHeight = maxH; - wxFrame *frame = wxDynamicCast(this, wxFrame); - if ( !frame ) +#if !wxUSE_NANOX + XSizeHints sizeHints; + sizeHints.flags = 0; + + if (minW > -1 && minH > -1) { - // TODO what about dialogs? - return; + sizeHints.flags |= PMinSize; + sizeHints.min_width = minW; + sizeHints.min_height = minH; + } + if (maxW > -1 && maxH > -1) + { + sizeHints.flags |= PMaxSize; + sizeHints.max_width = maxW; + sizeHints.max_height = maxH; + } + if (incW > -1 && incH > -1) + { + sizeHints.flags |= PResizeInc; + sizeHints.width_inc = incW; + sizeHints.height_inc = incH; } - Widget widget = (Widget) frame->GetShellWidget(); - - if (minW > -1) - XtVaSetValues(widget, XmNminWidth, minW, NULL); - if (minH > -1) - XtVaSetValues(widget, XmNminHeight, minH, NULL); - if (maxW > -1) - XtVaSetValues(widget, XmNmaxWidth, maxW, NULL); - if (maxH > -1) - XtVaSetValues(widget, XmNmaxHeight, maxH, NULL); - if (incW > -1) - XtVaSetValues(widget, XmNwidthInc, incW, NULL); - if (incH > -1) - XtVaSetValues(widget, XmNheightInc, incH, NULL); -#endif -} - -void wxWindowX11::DoMoveWindow(int x, int y, int width, int height) -{ - // TODO -#if 0 - XtVaSetValues((Widget)GetTopWidget(), - XmNx, x, - XmNy, y, - XmNwidth, width, - XmNheight, height, - NULL); + XSetWMNormalHints(wxGlobalDisplay(), (Window) m_mainWindow, &sizeHints ); #endif } @@ -1184,7 +987,7 @@ int wxWindowX11::GetCharHeight() const { wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" ); - WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay()); + WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay()); int direction, ascent, descent; XCharStruct overall; @@ -1199,7 +1002,7 @@ int wxWindowX11::GetCharWidth() const { wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" ); - WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay()); + WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay()); int direction, ascent, descent; XCharStruct overall; @@ -1214,13 +1017,12 @@ void wxWindowX11::GetTextExtent(const wxString& string, int *descent, int *externalLeading, const wxFont *theFont) const { - wxFont *fontToUse = (wxFont *)theFont; - if (!fontToUse) - fontToUse = (wxFont *) & m_font; + wxFont fontToUse = m_font; + if (theFont) fontToUse = *theFont; - wxCHECK_RET( fontToUse->Ok(), "valid window font needed" ); - - WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay()); + wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") ); + + WXFontStructPtr pFontStruct = fontToUse.GetFontStruct(1.0, wxGlobalDisplay()); int direction, ascent, descent2; XCharStruct overall; @@ -1232,7 +1034,7 @@ void wxWindowX11::GetTextExtent(const wxString& string, &ascent, &descent2, &overall); #endif - XTextExtents((XFontStruct*) pFontStruct, string, slen, + XTextExtents((XFontStruct*) pFontStruct, (char*) string.c_str(), slen, &direction, &ascent, &descent2, &overall); if ( x ) @@ -1252,1098 +1054,342 @@ void wxWindowX11::GetTextExtent(const wxString& string, void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect) { - m_needsRefresh = TRUE; - Display *display = wxGetDisplay(); - Window thisWindow = (Widget) GetMainWindow(); - - XExposeEvent dummyEvent; - int width, height; - GetSize(&width, &height); - - dummyEvent.type = Expose; - dummyEvent.display = display; - dummyEvent.send_event = True; - dummyEvent.window = thisWindow; - if (rect) - { - dummyEvent.x = rect->x; - dummyEvent.y = rect->y; - dummyEvent.width = rect->width; - dummyEvent.height = rect->height; - } - else - { - dummyEvent.x = 0; - dummyEvent.y = 0; - dummyEvent.width = width; - dummyEvent.height = height; - } - dummyEvent.count = 0; - if (eraseBack) { - wxClientDC dc(this); - wxBrush backgroundBrush(GetBackgroundColour(), wxSOLID); - dc.SetBackground(backgroundBrush); if (rect) - dc.Clear(*rect); + { + // Schedule for later Updating in ::Update() or ::OnInternalIdle(). + m_clearRegion.Union( rect->x, rect->y, rect->width, rect->height ); + } else - dc.Clear(); - } - - XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent); -} - -void wxWindowX11::Clear() -{ - wxClientDC dc(this); - wxBrush brush(GetBackgroundColour(), wxSOLID); - dc.SetBackground(brush); - dc.Clear(); -} - -void wxWindowX11::ClearUpdateRects() -{ - wxRectList::Node* node = m_updateRects.GetFirst(); - while (node) - { - wxRect* rect = node->GetData(); - delete rect; - node = node->GetNext(); - } - - m_updateRects.Clear(); -} - -void wxWindowX11::DoPaint() -{ - // Set an erase event first - wxEraseEvent eraseEvent(GetId()); - eraseEvent.SetEventObject(this); - GetEventHandler()->ProcessEvent(eraseEvent); - - wxPaintEvent event(GetId()); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); - - m_needsRefresh = FALSE; -} - -// ---------------------------------------------------------------------------- -// event handlers -// ---------------------------------------------------------------------------- - -// Responds to colour changes: passes event on to children. -void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event) -{ - wxWindowList::Node *node = GetChildren().GetFirst(); - while ( node ) - { - // Only propagate to non-top-level windows - wxWindow *win = node->GetData(); - if ( win->GetParent() ) { - wxSysColourChangedEvent event2; - event.m_eventObject = win; - win->GetEventHandler()->ProcessEvent(event2); + int height,width; + GetSize( &width, &height ); + + // Schedule for later Updating in ::Update() or ::OnInternalIdle(). + m_clearRegion.Clear(); + m_clearRegion.Union( 0, 0, width, height ); } - - node = node->GetNext(); } -} -void wxWindowX11::OnIdle(wxIdleEvent& WXUNUSED(event)) -{ - // This calls the UI-update mechanism (querying windows for - // menu/toolbar/control state information) - UpdateWindowUI(); -} - -// ---------------------------------------------------------------------------- -// accelerators -// ---------------------------------------------------------------------------- - -bool wxWindowX11::ProcessAccelerator(wxKeyEvent& event) -{ - if (!m_acceleratorTable.Ok()) - return FALSE; - - int count = m_acceleratorTable.GetCount(); - wxAcceleratorEntry* entries = m_acceleratorTable.GetEntries(); - int i; - for (i = 0; i < count; i++) - { - wxAcceleratorEntry* entry = & (entries[i]); - if (entry->MatchesEvent(event)) - { - // Bingo, we have a match. Now find a control that matches the - // entry command id. - - // Need to go up to the top of the window hierarchy, since it might - // be e.g. a menu item - wxWindow* parent = this; - while ( parent && !parent->IsTopLevel() ) - parent = parent->GetParent(); - - if (!parent) - return FALSE; - - wxFrame* frame = wxDynamicCast(parent, wxFrame); - if ( frame ) - { - // Try for a menu command - if (frame->GetMenuBar()) - { - wxMenuItem* item = frame->GetMenuBar()->FindItem(entry->GetCommand()); - if (item) - { - wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand()); - commandEvent.SetEventObject(frame); - - // If ProcessEvent returns TRUE (it was handled), then - // the calling code will skip the event handling. - return frame->GetEventHandler()->ProcessEvent(commandEvent); - } - } - } - - // Find a child matching the command id - wxWindow* child = parent->FindWindow(entry->GetCommand()); - - // No such child - if (!child) - return FALSE; - - // Now we process those kinds of windows that we can. - // For now, only buttons. - if ( wxDynamicCast(child, wxButton) ) - { - wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId()); - commandEvent.SetEventObject(child); - return child->GetEventHandler()->ProcessEvent(commandEvent); - } - - return FALSE; - } // matches event - }// for - - // We didn't match the key event against an accelerator. - return FALSE; -} - -// ============================================================================ -// X11-specific stuff from here on -// ============================================================================ - -// ---------------------------------------------------------------------------- -// function which maintain the global hash table mapping Widgets to wxWindows -// ---------------------------------------------------------------------------- - -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()); - return FALSE; - } - - wxWidgetHashTable->Put((long) w, win); - - wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)", - w, win, win->GetClassInfo()->GetClassName()); - - return TRUE; -} - -wxWindow *wxGetWindowFromTable(Window w) -{ - return (wxWindow *)wxWidgetHashTable->Get((long) w); -} - -void wxDeleteWindowFromTable(Window w) -{ - wxWidgetHashTable->Delete((long)w); -} - -// ---------------------------------------------------------------------------- -// add/remove window from the table -// ---------------------------------------------------------------------------- - -// Add to hash table, add event handler -bool wxWindowX11::AttachWidget (wxWindow* WXUNUSED(parent), WXWindow mainWidget, - int x, int y, int width, int height) -{ - wxAddWindowToTable((Window ) mainWidget, this); - - // TODO -#if 0 - if (CanAddEventHandler()) - { - XtAddEventHandler((Widget) mainWidget, - ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask, - False, - wxPanelItemEventHandler, - (XtPointer) this); - } - - if (!formWidget) - { - XtTranslations ptr; - XtOverrideTranslations ((Widget) mainWidget, - ptr = XtParseTranslationTable (": resize()")); - XtFree ((char *) ptr); - } - - // Some widgets have a parent form widget, e.g. wxRadioBox - if (formWidget) - { - if (!wxAddWindowToTable((Widget) formWidget, this)) - return FALSE; - - XtTranslations ptr; - XtOverrideTranslations ((Widget) formWidget, - ptr = XtParseTranslationTable (": resize()")); - XtFree ((char *) ptr); - } -#endif - if (x == -1) - x = 0; - if (y == -1) - y = 0; - - SetSize (x, y, width, height); - - return TRUE; -} - -// Remove event handler, remove from hash table -bool wxWindowX11::DetachWidget(WXWindow widget) -{ - // TODO -#if 0 - if (CanAddEventHandler()) - { - XtRemoveEventHandler((Widget) widget, - ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask, - False, - wxPanelItemEventHandler, - (XtPointer)this); - } -#endif - - wxDeleteWindowFromTable((Window) widget); - return TRUE; -} - -// ---------------------------------------------------------------------------- -// X11-specific accessors -// ---------------------------------------------------------------------------- - -// Get the underlying X window -WXWindow wxWindowX11::GetXWindow() const -{ - return GetMainWindow(); -} - -// Get the underlying X display -WXDisplay *wxWindowX11::GetXDisplay() const -{ - return wxGetDisplay(); -} - -WXWindow wxWindowX11::GetMainWindow() const -{ - if (m_drawingArea) - return m_drawingArea; - else - return m_mainWidget; -} - -WXWindow wxWindowX11::GetClientWidget() const -{ - if (m_drawingArea != (WXWindow) 0) - return m_drawingArea; - else - return GetMainWindow(); -} - -WXWindow wxWindowX11::GetTopWindow() const -{ - return GetMainWindow(); -} - -WXWindow wxWindowX11::GetLabelWindow() const -{ - return GetMainWindow(); -} - -// ---------------------------------------------------------------------------- -// callbacks -// ---------------------------------------------------------------------------- - -// TODO -#if 0 - -// All widgets should have this as their resize proc. -// OnSize sent to wxWindow via client data. -void wxWidgetResizeProc(Widget w, XConfigureEvent *WXUNUSED(event), String WXUNUSED(args)[], int *WXUNUSED(num_args)) -{ - wxWindow *win = wxGetWindowFromTable(w); - if (!win) - return; - - if (win->PreResize()) - { - int width, height; - win->GetSize(&width, &height); - wxSizeEvent sizeEvent(wxSize(width, height), win->GetId()); - sizeEvent.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(sizeEvent); - } -} - -static void wxCanvasRepaintProc(Widget drawingArea, - XtPointer clientData, - XmDrawingAreaCallbackStruct * cbs) -{ - if (!wxGetWindowFromTable(drawingArea)) - return; - - XEvent * event = cbs->event; - wxWindow * win = (wxWindow *) clientData; - - switch (event->type) - { - case Expose: - { - win->AddUpdateRect(event->xexpose.x, event->xexpose.y, - event->xexpose.width, event->xexpose.height); - - if (event -> xexpose.count == 0) - { - win->DoPaint(); - win->ClearUpdateRects(); - } - break; - } - } -} - -// Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4) -static void wxCanvasEnterLeave(Widget drawingArea, - XtPointer WXUNUSED(clientData), - XCrossingEvent * event) -{ - XmDrawingAreaCallbackStruct cbs; - XEvent ev; - - ((XCrossingEvent &) ev) = *event; - - cbs.reason = XmCR_INPUT; - cbs.event = &ev; - - wxCanvasInputEvent(drawingArea, (XtPointer) NULL, &cbs); -} - -// Fix to make it work under Motif 1.0 (!) -static void wxCanvasMotionEvent (Widget WXUNUSED(drawingArea), XButtonEvent * WXUNUSED(event)) -{ -#if XmVersion <= 1000 - XmDrawingAreaCallbackStruct cbs; - XEvent ev; - - ev = *((XEvent *) event); - cbs.reason = XmCR_INPUT; - cbs.event = &ev; - - wxCanvasInputEvent (drawingArea, (XtPointer) NULL, &cbs); -#endif // XmVersion <= 1000 -} - -static void wxCanvasInputEvent(Widget drawingArea, - XtPointer WXUNUSED(data), - XmDrawingAreaCallbackStruct * cbs) -{ - wxWindow *canvas = wxGetWindowFromTable(drawingArea); - XEvent local_event; - - if (canvas==NULL) - return; - - if (cbs->reason != XmCR_INPUT) - return; - - local_event = *(cbs->event); // We must keep a copy! - - switch (local_event.xany.type) - { - case EnterNotify: - case LeaveNotify: - case ButtonPress: - case ButtonRelease: - case MotionNotify: - { - // FIXME: most of this mouse event code is more or less - // duplicated in wxTranslateMouseEvent - // - wxEventType eventType = wxEVT_NULL; - - if (local_event.xany.type == EnterNotify) - { - //if (local_event.xcrossing.mode!=NotifyNormal) - // return ; // Ignore grab events - eventType = wxEVT_ENTER_WINDOW; - // canvas->GetEventHandler()->OnSetFocus(); - } - else if (local_event.xany.type == LeaveNotify) - { - //if (local_event.xcrossingr.mode!=NotifyNormal) - // return ; // Ignore grab events - eventType = wxEVT_LEAVE_WINDOW; - // canvas->GetEventHandler()->OnKillFocus(); - } - else if (local_event.xany.type == MotionNotify) - { - eventType = wxEVT_MOTION; - } - - else if (local_event.xany.type == ButtonPress) - { - if (local_event.xbutton.button == Button1) - { - eventType = wxEVT_LEFT_DOWN; - canvas->SetButton1(TRUE); - } - else if (local_event.xbutton.button == Button2) - { - eventType = wxEVT_MIDDLE_DOWN; - canvas->SetButton2(TRUE); - } - else if (local_event.xbutton.button == Button3) - { - eventType = wxEVT_RIGHT_DOWN; - canvas->SetButton3(TRUE); - } - } - else if (local_event.xany.type == ButtonRelease) - { - if (local_event.xbutton.button == Button1) - { - eventType = wxEVT_LEFT_UP; - canvas->SetButton1(FALSE); - } - else if (local_event.xbutton.button == Button2) - { - eventType = wxEVT_MIDDLE_UP; - canvas->SetButton2(FALSE); - } - else if (local_event.xbutton.button == Button3) - { - eventType = wxEVT_RIGHT_UP; - canvas->SetButton3(FALSE); - } - } - - wxMouseEvent wxevent (eventType); - - wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN) - || (event_left_is_down (&local_event) - && (eventType != wxEVT_LEFT_UP))); - wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN) - || (event_middle_is_down (&local_event) - && (eventType != wxEVT_MIDDLE_UP))); - wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN) - || (event_right_is_down (&local_event) - && (eventType != wxEVT_RIGHT_UP))); - - wxevent.m_shiftDown = local_event.xbutton.state & ShiftMask; - wxevent.m_controlDown = local_event.xbutton.state & ControlMask; - wxevent.m_altDown = local_event.xbutton.state & Mod3Mask; - wxevent.m_metaDown = local_event.xbutton.state & Mod1Mask; - wxevent.SetTimestamp(local_event.xbutton.time); - - if ( eventType == wxEVT_MOTION ) - { - if (local_event.xmotion.is_hint == NotifyHint) - { - Window root, child; - Display *dpy = XtDisplay (drawingArea); - - XQueryPointer (dpy, XtWindow (drawingArea), - &root, &child, - &local_event.xmotion.x_root, - &local_event.xmotion.y_root, - &local_event.xmotion.x, - &local_event.xmotion.y, - &local_event.xmotion.state); - } - else - { - } - } - - // Now check if we need to translate this event into a double click - if (TRUE) // canvas->doubleClickAllowed) - { - if (wxevent.ButtonDown()) - { - long dclickTime = XtGetMultiClickTime((Display*) wxGetDisplay()); - - // get button and time-stamp - int button = 0; - if (wxevent.LeftDown()) - button = 1; - else if (wxevent.MiddleDown()) - button = 2; - else if (wxevent.RightDown()) - button = 3; - long ts = wxevent.GetTimestamp(); - - // check, if single or double click - int buttonLast = canvas->GetLastClickedButton(); - long lastTS = canvas->GetLastClickTime(); - if ( buttonLast && buttonLast == button && (ts - lastTS) < dclickTime ) - { - // I have a dclick - canvas->SetLastClick(0, ts); - - wxEventType typeDouble; - if ( eventType == wxEVT_LEFT_DOWN ) - typeDouble = wxEVT_LEFT_DCLICK; - else if ( eventType == wxEVT_MIDDLE_DOWN ) - typeDouble = wxEVT_MIDDLE_DCLICK; - else if ( eventType == wxEVT_RIGHT_DOWN ) - typeDouble = wxEVT_RIGHT_DCLICK; - else - typeDouble = wxEVT_NULL; - - if ( typeDouble != wxEVT_NULL ) - { - wxevent.SetEventType(typeDouble); - } - } - else - { - // not fast enough or different button - canvas->SetLastClick(button, ts); - } - } - } - - wxevent.SetId(canvas->GetId()); - wxevent.SetEventObject(canvas); - wxevent.m_x = local_event.xbutton.x; - wxevent.m_y = local_event.xbutton.y; - canvas->GetEventHandler()->ProcessEvent (wxevent); -#if 0 - if (eventType == wxEVT_ENTER_WINDOW || - eventType == wxEVT_LEAVE_WINDOW || - eventType == wxEVT_MOTION - ) - return; -#endif // 0 - break; - } - case KeyPress: - { - KeySym keySym; -#if 0 - XComposeStatus compose; - (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, &compose); -#endif // 0 - - (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL); - int id = wxCharCodeXToWX (keySym); - - wxEventType eventType = wxEVT_CHAR; - - wxKeyEvent event (eventType); - - if (local_event.xkey.state & ShiftMask) - event.m_shiftDown = TRUE; - if (local_event.xkey.state & ControlMask) - event.m_controlDown = TRUE; - if (local_event.xkey.state & Mod3Mask) - event.m_altDown = TRUE; - if (local_event.xkey.state & Mod1Mask) - event.m_metaDown = TRUE; - event.SetEventObject(canvas); - event.m_keyCode = id; - event.SetTimestamp(local_event.xkey.time); - - if (id > -1) - { - // Implement wxFrame::OnCharHook by checking ancestor. - wxWindow *parent = canvas->GetParent(); - while (parent && !parent->IsKindOf(CLASSINFO(wxFrame))) - parent = parent->GetParent(); - - if (parent) - { - event.SetEventType(wxEVT_CHAR_HOOK); - if (parent->GetEventHandler()->ProcessEvent(event)) - return; - } - - // For simplicity, OnKeyDown is the same as OnChar - // TODO: filter modifier key presses from OnChar - event.SetEventType(wxEVT_KEY_DOWN); - - // Only process OnChar if OnKeyDown didn't swallow it - if (!canvas->GetEventHandler()->ProcessEvent (event)) - { - event.SetEventType(wxEVT_CHAR); - canvas->GetEventHandler()->ProcessEvent (event); - } - } - break; - } - case KeyRelease: - { - KeySym keySym; - (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, NULL); - int id = wxCharCodeXToWX (keySym); - - wxKeyEvent event (wxEVT_KEY_UP); - - if (local_event.xkey.state & ShiftMask) - event.m_shiftDown = TRUE; - if (local_event.xkey.state & ControlMask) - event.m_controlDown = TRUE; - if (local_event.xkey.state & Mod3Mask) - event.m_altDown = TRUE; - if (local_event.xkey.state & Mod1Mask) - event.m_metaDown = TRUE; - event.SetEventObject(canvas); - event.m_keyCode = id; - event.SetTimestamp(local_event.xkey.time); - - if (id > -1) - { - canvas->GetEventHandler()->ProcessEvent (event); - } - break; - } - case FocusIn: - { - if (local_event.xfocus.detail != NotifyPointer) - { - wxFocusEvent event(wxEVT_SET_FOCUS, canvas->GetId()); - event.SetEventObject(canvas); - canvas->GetEventHandler()->ProcessEvent(event); - } - break; - } - case FocusOut: - { - if (local_event.xfocus.detail != NotifyPointer) - { - wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId()); - event.SetEventObject(canvas); - canvas->GetEventHandler()->ProcessEvent(event); - } - break; - } - default: - break; - } -} - -static void wxPanelItemEventHandler(Widget wid, - XtPointer WXUNUSED(client_data), - XEvent* event, - Boolean *continueToDispatch) -{ - // Widget can be a label or the actual widget. - - wxWindow *window = wxGetWindowFromTable(wid); - if (window) - { - wxMouseEvent wxevent(0); - if (wxTranslateMouseEvent(wxevent, window, wid, event)) - { - window->GetEventHandler()->ProcessEvent(wxevent); - } - } - - // TODO: probably the key to allowing default behaviour to happen. Say we - // set a m_doDefault flag to FALSE at the start of this function. Then in - // e.g. wxWindowX11::OnMouseEvent we can call Default() which sets this flag to - // TRUE, indicating that default processing can happen. Thus, behaviour can - // appear to be overridden just by adding an event handler and not calling - // wxWindowX11::OnWhatever. ALSO, maybe we can use this instead of the current - // way of handling drawing area events, to simplify things. - *continueToDispatch = True; -} - -static void wxScrollBarCallback(Widget scrollbar, - XtPointer clientData, - XmScrollBarCallbackStruct *cbs) -{ - wxWindow *win = wxGetWindowFromTable(scrollbar); - int orientation = (int) clientData; - - wxEventType eventType = wxEVT_NULL; - switch (cbs->reason) - { - case XmCR_INCREMENT: - { - eventType = wxEVT_SCROLLWIN_LINEDOWN; - break; - } - case XmCR_DECREMENT: - { - eventType = wxEVT_SCROLLWIN_LINEUP; - break; - } - case XmCR_DRAG: - { - eventType = wxEVT_SCROLLWIN_THUMBTRACK; - break; - } - case XmCR_VALUE_CHANGED: - { - eventType = wxEVT_SCROLLWIN_THUMBRELEASE; - break; - } - case XmCR_PAGE_INCREMENT: - { - eventType = wxEVT_SCROLLWIN_PAGEDOWN; - break; - } - case XmCR_PAGE_DECREMENT: - { - eventType = wxEVT_SCROLLWIN_PAGEUP; - break; - } - case XmCR_TO_TOP: - { - eventType = wxEVT_SCROLLWIN_TOP; - break; - } - case XmCR_TO_BOTTOM: - { - eventType = wxEVT_SCROLLWIN_BOTTOM; - break; - } - default: - { - // Should never get here - wxFAIL_MSG("Unknown scroll event."); - break; - } + if (rect) + { + // Schedule for later Updating in ::Update() or ::OnInternalIdle(). + m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height ); + } + else + { + int height,width; + GetSize( &width, &height ); + + // Schedule for later Updating in ::Update() or ::OnInternalIdle(). + m_updateRegion.Clear(); + m_updateRegion.Union( 0, 0, width, height ); } +} - wxScrollWinEvent event(eventType, - cbs->value, - ((orientation == XmHORIZONTAL) ? - wxHORIZONTAL : wxVERTICAL)); - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent(event); +void wxWindowX11::Update() +{ + if (m_updateNcArea) + { + // wxLogDebug("wxWindowX11::UpdateNC: %s", GetClassInfo()->GetClassName()); + // Send nc paint events. + SendNcPaintEvents(); + } + + if (!m_updateRegion.IsEmpty()) + { + // wxLogDebug("wxWindowX11::Update: %s", GetClassInfo()->GetClassName()); + // Actually send erase events. + SendEraseEvents(); + + // Actually send paint events. + SendPaintEvents(); + } } -// For repainting arbitrary windows -void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *) +void wxWindowX11::Clear() { - Window window; - Display *display; +// wxClientDC dc((wxWindow*) this); +// wxBrush brush(GetBackgroundColour(), wxSOLID); +// dc.SetBackground(brush); +// dc.Clear(); +} - wxWindow* win = wxGetWindowFromTable(w); - if (!win) - return; +void wxWindowX11::SendEraseEvents() +{ + if (m_clearRegion.IsEmpty()) return; + + wxClientDC dc( (wxWindow*)this ); + dc.SetClippingRegion( m_clearRegion ); + + wxEraseEvent erase_event( GetId(), &dc ); + erase_event.SetEventObject( this ); - switch(event -> type) + if (!GetEventHandler()->ProcessEvent(erase_event) ) { - case Expose: + Display *xdisplay = wxGlobalDisplay(); + Window xwindow = (Window) GetClientWindow(); + XSetForeground( xdisplay, g_eraseGC, m_backgroundColour.GetPixel() ); + + wxRegionIterator upd( m_clearRegion ); + while (upd) { - window = (Window) win -> GetXWindow(); - display = (Display *) win -> GetXDisplay(); - - if (event -> xexpose.count == 0) - { - win->DoPaint(); - - win->ClearUpdateRects(); - } - else - { - win->AddUpdateRect(event->xexpose.x, event->xexpose.y, - event->xexpose.width, event->xexpose.height); - } - - break; + XFillRectangle( xdisplay, xwindow, g_eraseGC, + upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() ); + upd ++; } } + + m_clearRegion.Clear(); } -#endif - // 0 - -// ---------------------------------------------------------------------------- -// CanvaseXXXSize() functions -// ---------------------------------------------------------------------------- - -// SetSize, but as per old wxCanvas (with drawing widget etc.) -void wxWindowX11::CanvasSetSize (int x, int y, int w, int h, int sizeFlags) +void wxWindowX11::SendPaintEvents() { - // TODO -#if 0 - // A bit of optimization to help sort out the flickers. - int oldX, oldY, oldW, oldH; - GetSize(& oldW, & oldH); - GetPosition(& oldX, & oldY); - - bool useOldPos = FALSE; - bool useOldSize = FALSE; + // wxLogDebug("SendPaintEvents: %s (%ld)", GetClassInfo()->GetClassName(), GetId()); - if ((x == -1) && (x == -1) && ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)) - useOldPos = TRUE; - else if (x == oldX && y == oldY) - useOldPos = TRUE; + m_clipPaintRegion = TRUE; + + wxPaintEvent paint_event( GetId() ); + paint_event.SetEventObject( this ); + GetEventHandler()->ProcessEvent( paint_event ); + + m_updateRegion.Clear(); + + m_clipPaintRegion = FALSE; +} - if ((w == -1) && (h == -1)) - useOldSize = TRUE; - else if (w == oldW && h == oldH) - useOldSize = TRUE; +void wxWindowX11::SendNcPaintEvents() +{ + wxWindow *window = (wxWindow*) this; - if (!wxNoOptimize::CanOptimize()) + // 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()) { - useOldSize = FALSE; useOldPos = FALSE; + 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 ); + + m_updateNcArea = FALSE; +} - if (useOldPos && useOldSize) - return; - - Widget drawingArea = (Widget) m_drawingArea; - bool managed = XtIsManaged(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow); - - if (managed) - XtUnmanageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow); - XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL); - - int xx = x; int yy = y; - AdjustForParentClientOrigin(xx, yy, sizeFlags); +// ---------------------------------------------------------------------------- +// event handlers +// ---------------------------------------------------------------------------- - if (!useOldPos) +// Responds to colour changes: passes event on to children. +void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event) +{ + wxWindowList::Node *node = GetChildren().GetFirst(); + while ( node ) { - if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + // Only propagate to non-top-level windows + wxWindow *win = node->GetData(); + if ( win->GetParent() ) { - XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, - XmNx, xx, NULL); + wxSysColourChangedEvent event2; + event.m_eventObject = win; + win->GetEventHandler()->ProcessEvent(event2); } - if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - { - XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, - XmNy, yy, NULL); - } + node = node->GetNext(); } +} - if (!useOldSize) - { +// See handler for InFocus case in app.cpp for details. +wxWindow* g_GettingFocus = NULL; - if (w > -1) - { - if (m_borderWidget) - { - XtVaSetValues ((Widget) m_borderWidget, XmNwidth, w, NULL); - short thick, margin; - XtVaGetValues ((Widget) m_borderWidget, - XmNshadowThickness, &thick, - XmNmarginWidth, &margin, - NULL); - w -= 2 * (thick + margin); - } +void wxWindowX11::OnInternalIdle() +{ + // Update invalidated regions. + Update(); + + // This calls the UI-update mechanism (querying windows for + // menu/toolbar/control state information) + UpdateWindowUI(); - XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL); - - Dimension spacing; - Widget sbar; - XtVaGetValues ((Widget) m_scrolledWindow, - XmNspacing, &spacing, - XmNverticalScrollBar, &sbar, - NULL); - Dimension wsbar; - if (sbar) - XtVaGetValues (sbar, XmNwidth, &wsbar, NULL); - else - wsbar = 0; + // 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; +} - w -= (spacing + wsbar); +// ---------------------------------------------------------------------------- +// function which maintain the global hash table mapping Widgets to wxWindows +// ---------------------------------------------------------------------------- -#if 0 - XtVaSetValues(drawingArea, XmNwidth, w, NULL); -#endif // 0 - } - if (h > -1) - { - if (m_borderWidget) - { - XtVaSetValues ((Widget) m_borderWidget, XmNheight, h, NULL); - short thick, margin; - XtVaGetValues ((Widget) m_borderWidget, - XmNshadowThickness, &thick, - XmNmarginHeight, &margin, - NULL); - h -= 2 * (thick + margin); - } +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()); + return FALSE; + } - XtVaSetValues ((Widget) m_scrolledWindow, XmNheight, h, NULL); - - Dimension spacing; - Widget sbar; - XtVaGetValues ((Widget) m_scrolledWindow, - XmNspacing, &spacing, - XmNhorizontalScrollBar, &sbar, - NULL); - Dimension wsbar; - if (sbar) - XtVaGetValues (sbar, XmNheight, &wsbar, NULL); - else - wsbar = 0; + wxWidgetHashTable->Put((long) w, win); - h -= (spacing + wsbar); + wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)", + w, win, win->GetClassInfo()->GetClassName()); -#if 0 - XtVaSetValues(drawingArea, XmNheight, h, NULL); -#endif // 0 - } - } + return TRUE; +} - if (managed) - XtManageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow); - XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL); -#endif - // 0 +wxWindow *wxGetWindowFromTable(Window w) +{ + return (wxWindow *)wxWidgetHashTable->Get((long) w); } -void wxWindowX11::CanvasSetClientSize (int w, int h) +void wxDeleteWindowFromTable(Window w) { -// TODO -#if 0 - Widget drawingArea = (Widget) m_drawingArea; + wxWidgetHashTable->Delete((long)w); +} + +// ---------------------------------------------------------------------------- +// function which maintain the global hash table mapping client widgets +// ---------------------------------------------------------------------------- + +bool wxAddClientWindowToTable(Window w, wxWindow *win) +{ + wxWindow *oldItem = NULL; + if ((oldItem = (wxWindow *)wxClientWidgetHashTable->Get ((long) w))) + { + wxLogDebug("Client window table clash: new window is %ld, %s", + (long)w, win->GetClassInfo()->GetClassName()); + return FALSE; + } - XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL); + wxClientWidgetHashTable->Put((long) w, win); - if (w > -1) - XtVaSetValues(drawingArea, XmNwidth, w, NULL); - if (h > -1) - XtVaSetValues(drawingArea, XmNheight, h, NULL); + wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)", + w, win, win->GetClassInfo()->GetClassName()); - XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL); -#endif // 0 + return TRUE; } -void wxWindowX11::CanvasGetClientSize (int *w, int *h) const +wxWindow *wxGetClientWindowFromTable(Window w) { -// TODO -#if 0 - // Must return the same thing that was set via SetClientSize - Dimension xx, yy; - XtVaGetValues ((Widget) m_drawingArea, XmNwidth, &xx, XmNheight, &yy, NULL); - *w = xx; - *h = yy; -#endif + return (wxWindow *)wxClientWidgetHashTable->Get((long) w); } -void wxWindowX11::CanvasGetSize (int *w, int *h) const +void wxDeleteClientWindowFromTable(Window w) { -// TODO -#if 0 - Dimension xx, yy; - if ((Widget) m_borderWidget) - XtVaGetValues ((Widget) m_borderWidget, XmNwidth, &xx, XmNheight, &yy, NULL); - else if ((Widget) m_scrolledWindow) - XtVaGetValues ((Widget) m_scrolledWindow, XmNwidth, &xx, XmNheight, &yy, NULL); - else - XtVaGetValues ((Widget) m_drawingArea, XmNwidth, &xx, XmNheight, &yy, NULL); - - *w = xx; - *h = yy; -#endif + wxClientWidgetHashTable->Delete((long)w); } -void wxWindowX11::CanvasGetPosition (int *x, int *y) const -{ -// TODO -#if 0 - Position xx, yy; - XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNx, &xx, XmNy, &yy, NULL); +// ---------------------------------------------------------------------------- +// add/remove window from the table +// ---------------------------------------------------------------------------- - // 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()) - { - wxPoint pt(GetParent()->GetClientAreaOrigin()); - xx -= pt.x; - yy -= pt.y; - } +// ---------------------------------------------------------------------------- +// X11-specific accessors +// ---------------------------------------------------------------------------- - *x = xx; - *y = yy; -#endif +WXWindow wxWindowX11::GetMainWindow() const +{ + return m_mainWindow; +} + +WXWindow wxWindowX11::GetClientWindow() const +{ + return m_clientWindow; } // ---------------------------------------------------------------------------- // TranslateXXXEvent() functions // ---------------------------------------------------------------------------- -bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent) +bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, XEvent *xevent) { - // TODO -#if 0 - switch (xevent->xany.type) + switch (XEventGetType(xevent)) { - case EnterNotify: // never received here - yes ? MB - case LeaveNotify: // never received here - yes ? MB + case EnterNotify: + case LeaveNotify: case ButtonPress: case ButtonRelease: case MotionNotify: { wxEventType eventType = wxEVT_NULL; - // FIXME: this is never true I think - MB - // - if (xevent->xany.type == LeaveNotify) + if (XEventGetType(xevent) == EnterNotify) { - win->SetButton1(FALSE); - win->SetButton2(FALSE); - win->SetButton3(FALSE); - return FALSE; + //if (local_event.xcrossing.mode!=NotifyNormal) + // return ; // Ignore grab events + eventType = wxEVT_ENTER_WINDOW; + // canvas->GetEventHandler()->OnSetFocus(); + } + 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; - win->SetButton1(TRUE); button = 1; } - else if (xevent->xbutton.button == Button2) + else if (XButtonEventMChanged(xevent)) { eventType = wxEVT_MIDDLE_DOWN; - win->SetButton2(TRUE); button = 2; } - else if (xevent->xbutton.button == Button3) + else if (XButtonEventRChanged(xevent)) { eventType = wxEVT_RIGHT_DOWN; - win->SetButton3(TRUE); button = 3; } // check for a double click - // - long dclickTime = XtGetMultiClickTime((Display*) wxGetDisplay()); + // TODO: where can we get this value from? + //long dclickTime = XtGetMultiClickTime(wxGlobalDisplay()); + long dclickTime = 200; long ts = wxevent.GetTimestamp(); int buttonLast = win->GetLastClickedButton(); @@ -2365,22 +1411,19 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, 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; - win->SetButton1(FALSE); } - else if (xevent->xbutton.button == Button2) + else if (XButtonEventMChanged(xevent)) { eventType = wxEVT_MIDDLE_UP; - win->SetButton2(FALSE); } - else if (xevent->xbutton.button == Button3) + else if (XButtonEventRChanged(xevent)) { eventType = wxEVT_RIGHT_UP; - win->SetButton3(FALSE); } else return FALSE; } @@ -2391,40 +1434,23 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, wxevent.SetEventType(eventType); - Position x1, y1; - XtVaGetValues(widget, XmNx, &x1, XmNy, &y1, NULL); - - int x2, y2; - win->GetPosition(&x2, &y2); - - // The button x/y must be translated to wxWindows - // window space - the widget might be a label or button, - // within a form. - int dx = 0; - int dy = 0; - if (widget != (Widget)win->GetMainWidget()) - { - dx = x1; - dy = y1; - } - - wxevent.m_x = xevent->xbutton.x + dx; - wxevent.m_y = xevent->xbutton.y + dy; + 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); @@ -2432,13 +1458,12 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, return TRUE; } } -#endif return FALSE; } bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win), XEvent *xevent) { - switch (xevent->xany.type) + switch (XEventGetType(xevent)) { case KeyPress: case KeyRelease: @@ -2449,20 +1474,16 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL); int id = wxCharCodeXToWX (keySym); - 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; @@ -2480,145 +1501,20 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win // Colour stuff // ---------------------------------------------------------------------------- -#if 0 - -#define YAllocColor XAllocColor -XColor g_itemColors[5]; -int wxComputeColours (Display *display, wxColour * back, wxColour * fore) -{ - int result; - static XmColorProc colorProc; - - result = wxNO_COLORS; - - if (back) - { - g_itemColors[0].red = (((long) back->Red ()) << 8); - g_itemColors[0].green = (((long) back->Green ()) << 8); - g_itemColors[0].blue = (((long) back->Blue ()) << 8); - g_itemColors[0].flags = DoRed | DoGreen | DoBlue; - if (colorProc == (XmColorProc) NULL) - { - // Get a ptr to the actual function - colorProc = XmSetColorCalculation ((XmColorProc) NULL); - // And set it back to motif. - XmSetColorCalculation (colorProc); - } - (*colorProc) (&g_itemColors[wxBACK_INDEX], - &g_itemColors[wxFORE_INDEX], - &g_itemColors[wxSELE_INDEX], - &g_itemColors[wxTOPS_INDEX], - &g_itemColors[wxBOTS_INDEX]); - result = wxBACK_COLORS; - } - if (fore) - { - g_itemColors[wxFORE_INDEX].red = (((long) fore->Red ()) << 8); - g_itemColors[wxFORE_INDEX].green = (((long) fore->Green ()) << 8); - g_itemColors[wxFORE_INDEX].blue = (((long) fore->Blue ()) << 8); - g_itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue; - if (result == wxNO_COLORS) - result = wxFORE_COLORS; - } - - Display *dpy = display; - Colormap cmap = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dpy); - - if (back) - { - /* 5 Colours to allocate */ - for (int i = 0; i < 5; i++) - if (!YAllocColor (dpy, cmap, &g_itemColors[i])) - result = wxNO_COLORS; - } - else if (fore) - { - /* Only 1 colour to allocate */ - if (!YAllocColor (dpy, cmap, &g_itemColors[wxFORE_INDEX])) - result = wxNO_COLORS; - } - - return (result); - -} -#endif - -// Changes the foreground and background colours to be derived from the current -// background colour. To change the foreground colour, you must call -// SetForegroundColour explicitly. -void wxWindowX11::ChangeBackgroundColour() -{ - // TODO -#if 0 - WXWidget mainWidget = GetMainWidget(); - if ( mainWidget ) - DoChangeBackgroundColour(mainWidget, m_backgroundColour); -#endif -} - -void wxWindowX11::ChangeForegroundColour() -{ - // TODO -#if 0 - WXWidget mainWidget = GetMainWidget(); - if ( mainWidget ) - DoChangeForegroundColour(mainWidget, m_foregroundColour); - if ( m_scrolledWindow && mainWidget != m_scrolledWindow ) - DoChangeForegroundColour(m_scrolledWindow, m_foregroundColour); -#endif -} - -// Change a widget's foreground and background colours. -void wxWindowX11::DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour) -{ - // TODO -#if 0 - // When should we specify the foreground, if it's calculated - // by wxComputeColours? - // Solution: say we start with the default (computed) foreground colour. - // If we call SetForegroundColour explicitly for a control or window, - // then the foreground is changed. - // Therefore SetBackgroundColour computes the foreground colour, and - // SetForegroundColour changes the foreground colour. The ordering is - // important. - - Widget w = (Widget)widget; - XtVaSetValues( - w, - XmNforeground, foregroundColour.AllocColour(XtDisplay(w)), - NULL - ); -#endif -} - -void wxWindowX11::DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour) -{ - // TODO -#if 0 - wxComputeColours (XtDisplay((Widget) widget), & backgroundColour, - (wxColour*) NULL); - - XtVaSetValues ((Widget) widget, - XmNbackground, g_itemColors[wxBACK_INDEX].pixel, - XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel, - XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel, - XmNforeground, g_itemColors[wxFORE_INDEX].pixel, - NULL); - - if (changeArmColour) - XtVaSetValues ((Widget) widget, - XmNarmColor, g_itemColors[wxSELE_INDEX].pixel, - NULL); -#endif -} - bool wxWindowX11::SetBackgroundColour(const wxColour& col) { - if ( !wxWindowBase::SetBackgroundColour(col) ) - return FALSE; + wxWindowBase::SetBackgroundColour(col); - ChangeBackgroundColour(); + Display *xdisplay = (Display*) wxGlobalDisplay(); + int xscreen = DefaultScreen( xdisplay ); + Colormap cm = DefaultColormap( xdisplay, xscreen ); + m_backgroundColour.CalcPixel( (WXColormap) cm ); + + // We don't set the background colour as we paint + // the background ourselves. + // XSetWindowBackground( xdisplay, (Window) m_clientWindow, m_backgroundColour.GetPixel() ); + return TRUE; } @@ -2627,40 +1523,9 @@ bool wxWindowX11::SetForegroundColour(const wxColour& col) if ( !wxWindowBase::SetForegroundColour(col) ) return FALSE; - ChangeForegroundColour(); - return TRUE; } -void wxWindowX11::ChangeFont(bool keepOriginalSize) -{ - // TODO -#if 0 - // Note that this causes the widget to be resized back - // to its original size! We therefore have to set the size - // back again. TODO: a better way in Motif? - Widget w = (Widget) GetLabelWidget(); // Usually the main widget - if (w && m_font.Ok()) - { - int width, height, width1, height1; - GetSize(& width, & height); - - // lesstif 0.87 hangs here -#ifndef LESSTIF_VERSION - XtVaSetValues (w, - XmNfontList, (XmFontList) m_font.GetFontList(1.0, XtDisplay(w)), - NULL); -#endif - - GetSize(& width1, & height1); - if (keepOriginalSize && (width != width1 || height != height1)) - { - SetSize(-1, -1, width, height); - } - } -#endif -} - // ---------------------------------------------------------------------------- // global functions // ---------------------------------------------------------------------------- @@ -2689,7 +1554,11 @@ wxWindow* wxFindWindowAtPointer(wxPoint& pt) // Get the current mouse position. wxPoint wxGetMousePosition() { - Display *display = (Display*) wxGetDisplay(); +#if wxUSE_NANOX + /* TODO */ + return wxPoint(0, 0); +#else + Display *display = wxGlobalDisplay(); Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display)); Window rootReturn, childReturn; int rootX, rootY, winX, winY; @@ -2701,6 +1570,7 @@ wxPoint wxGetMousePosition() &childReturn, &rootX, &rootY, &winX, &winY, &maskReturn); return wxPoint(rootX, rootY); +#endif } @@ -2710,3 +1580,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 ); +} + +