X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad813b00d5956f35f2b1585a276095e24ce8ad5a..ab85e6cd0021eba5d95c1e1e52187a6f256b06de:/src/motif/window.cpp diff --git a/src/motif/window.cpp b/src/motif/window.cpp index e3e0d614be..ba7350acb3 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -6,11 +6,25 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation "window.h" + #pragma implementation "window.h" +#endif + +#ifdef __VMS +#define XtDisplay XTDISPLAY +#define XtWindow XTWINDOW +#define XtScreen XTSCREEN #endif #include "wx/setup.h" @@ -28,14 +42,17 @@ #include "wx/msgdlg.h" #include "wx/frame.h" #include "wx/scrolwin.h" - +#include "wx/module.h" #include "wx/menuitem.h" #include "wx/log.h" #if wxUSE_DRAG_AND_DROP -#include "wx/dnd.h" + #include "wx/dnd.h" #endif +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include #include @@ -43,312 +60,181 @@ #include #include #include +#include // for XmMenuPosition +#ifdef __VMS__ +#pragma message enable nosimpint +#endif #include "wx/motif/private.h" #include -#define SCROLL_MARGIN 4 -void wxCanvasRepaintProc (Widget, XtPointer, XmDrawingAreaCallbackStruct * cbs); -void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs); -void wxCanvasMotionEvent (Widget, XButtonEvent * event); -void wxCanvasEnterLeave (Widget drawingArea, XtPointer clientData, XCrossingEvent * event); +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +static const int SCROLL_MARGIN = 4; + +// ---------------------------------------------------------------------------- +// global variables for this module +// ---------------------------------------------------------------------------- + +extern wxHashTable *wxWidgetHashTable; + +// ---------------------------------------------------------------------------- +// 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, - XmScaleCallbackStruct *cbs); -void wxPanelItemEventHandler (Widget wid, - XtPointer client_data, - XEvent* event, - Boolean *continueToDispatch); + XmScrollBarCallbackStruct *cbs); +static void wxPanelItemEventHandler(Widget wid, + XtPointer client_data, + XEvent* event, + Boolean *continueToDispatch); + +// unused for now +#if 0 + +// Helper function for 16-bit fonts +static int str16len(const char *s) +{ + int count = 0; + + while (s[0] && s[1]) { + count++; + s += 2; + } + + return count; +} + +#endif // 0 + +// ---------------------------------------------------------------------------- +// macros +// ---------------------------------------------------------------------------- #define event_left_is_down(x) ((x)->xbutton.state & Button1Mask) #define event_middle_is_down(x) ((x)->xbutton.state & Button2Mask) #define event_right_is_down(x) ((x)->xbutton.state & Button3Mask) -extern wxList wxPendingDelete; +// ---------------------------------------------------------------------------- +// event tables +// ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler) + IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) -BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) -EVT_CHAR(wxWindow::OnChar) -EVT_KEY_DOWN(wxWindow::OnKeyDown) -EVT_KEY_UP(wxWindow::OnKeyUp) -EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground) -EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged) -EVT_INIT_DIALOG(wxWindow::OnInitDialog) -EVT_IDLE(wxWindow::OnIdle) -END_EVENT_TABLE() - -#endif + BEGIN_EVENT_TABLE(wxWindow, wxWindowBase) + EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged) + EVT_IDLE(wxWindow::OnIdle) + END_EVENT_TABLE() +// ============================================================================ +// implementation +// ============================================================================ -// Constructor -wxWindow::wxWindow() -{ - // Generic - m_windowId = 0; - m_windowStyle = 0; - m_windowParent = NULL; - m_windowEventHandler = this; - m_windowName = ""; - m_windowCursor = *wxSTANDARD_CURSOR; - m_children = new wxList; - m_constraints = NULL; - m_constraintsInvolvedIn = NULL; - m_windowSizer = NULL; - m_sizerParent = NULL; - m_autoLayout = FALSE; - m_windowValidator = NULL; - m_defaultItem = NULL; - m_returnCode = 0; - m_caretWidth = 0; m_caretHeight = 0; - m_caretEnabled = FALSE; - m_caretShown = FALSE; - // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ; - m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ; - m_foregroundColour = *wxBLACK; - -#if wxUSE_DRAG_AND_DROP - m_pDropTarget = NULL; -#endif - m_clientObject = (wxClientData*) NULL; - m_clientData = NULL; - - /// Motif-specific - m_needsRefresh = TRUE; - m_mainWidget = (WXWidget) 0; - m_button1Pressed = FALSE; - m_button2Pressed = FALSE; - m_button3Pressed = FALSE; - m_winCaptured = FALSE; - m_isShown = TRUE; - m_hScrollBar = (WXWidget) 0; - m_vScrollBar = (WXWidget) 0; - m_borderWidget = (WXWidget) 0; - m_scrolledWindow = (WXWidget) 0; - m_drawingArea = (WXWidget) 0; - m_hScroll = FALSE; - m_vScroll = FALSE; - m_backingPixmap = (WXPixmap) 0; - m_pixmapWidth = 0; - m_pixmapHeight = 0; - m_pixmapOffsetX = 0; - m_pixmapOffsetY = 0; - m_lastTS = 0; - m_lastButton = 0; - m_canAddEventHandler = FALSE; - m_scrollPosX = 0; - m_scrollPosY = 0; -} +// ---------------------------------------------------------------------------- +// helper functions +// ---------------------------------------------------------------------------- -// Destructor -wxWindow::~wxWindow() +void wxWindow::UnmanageAndDestroy(WXWidget widget) { - //// Motif-specific - - if (GetMainWidget()) - DetachWidget(GetMainWidget()); // Removes event handlers - - // 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(); - - if (m_backingPixmap) - XFreePixmap (XtDisplay ((Widget) GetMainWidget()), (Pixmap) m_backingPixmap); - - Widget w = (Widget) m_drawingArea; - wxDeleteWindowFromTable(w); - - if (w) - XtDestroyWidget(w); - m_mainWidget = (WXWidget) 0; - - // Only if we're _really_ a canvas (not a dialog box/panel) - if (m_scrolledWindow) - { - wxDeleteWindowFromTable((Widget) m_scrolledWindow); - } - - if (m_hScrollBar) - { - XtUnmanageChild ((Widget) m_hScrollBar); - XtDestroyWidget ((Widget) m_hScrollBar); - } - if (m_vScrollBar) - { - XtUnmanageChild ((Widget) m_vScrollBar); - XtDestroyWidget ((Widget) m_vScrollBar); - } - if (m_scrolledWindow) - { - XtUnmanageChild ((Widget) m_scrolledWindow); - XtDestroyWidget ((Widget) m_scrolledWindow); - } - - if (m_borderWidget) - { - XtDestroyWidget ((Widget) m_borderWidget); - m_borderWidget = (WXWidget) 0; - } - } - - //// Generic stuff - - // Have to delete constraints/sizer FIRST otherwise - // sizers may try to look at deleted windows as they - // delete themselves. -#if wxUSE_CONSTRAINTS - DeleteRelatedConstraints(); - if (m_constraints) - { - // This removes any dangling pointers to this window - // in other windows' constraintsInvolvedIn lists. - UnsetConstraints(m_constraints); - delete m_constraints; - m_constraints = NULL; - } - if (m_windowSizer) - { - delete m_windowSizer; - m_windowSizer = NULL; - } - // If this is a child of a sizer, remove self from parent - if (m_sizerParent) - m_sizerParent->RemoveChild((wxWindow *)this); -#endif - - if (m_windowParent) - m_windowParent->RemoveChild(this); - - DestroyChildren(); - - // Destroy the window - if (GetMainWidget()) + Widget w = (Widget)widget; + if ( w ) { - // If this line (XtDestroyWidget) causes a crash, you may comment it out. - // Child widgets will get destroyed automatically when a frame - // or dialog is destroyed, but before that you may get some memory - // leaks and potential layout problems if you delete and then add - // child windows. - XtDestroyWidget((Widget) GetMainWidget()); - SetMainWidget((WXWidget) NULL); + XtUnmanageChild(w); + XtDestroyWidget(w); } - - delete m_children; - m_children = NULL; - - // Just in case the window has been Closed, but - // we're then deleting immediately: don't leave - // dangling pointers. - wxPendingDelete.DeleteObject(this); - - if ( m_windowValidator ) delete m_windowValidator; - if (m_clientObject) delete m_clientObject; - - ClearUpdateRects(); } -// Destroy the window (delayed, if a managed window) -bool wxWindow::Destroy() +bool wxWindow::MapOrUnmap(WXWidget widget, bool map) { - delete this; + Widget w = (Widget)widget; + if ( !w ) + return FALSE; + + if ( map ) + XtMapWidget(w); + else + XtUnmapWidget(w); + return TRUE; } -// Constructor -bool wxWindow::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) +// ---------------------------------------------------------------------------- +// constructors +// ---------------------------------------------------------------------------- + +void wxWindow::Init() { - // Generic - m_windowId = 0; - m_windowStyle = 0; - m_windowParent = NULL; - m_windowEventHandler = this; - m_windowName = ""; - m_windowCursor = *wxSTANDARD_CURSOR; - m_constraints = NULL; - m_constraintsInvolvedIn = NULL; - m_windowSizer = NULL; - m_sizerParent = NULL; - m_autoLayout = FALSE; - m_windowValidator = NULL; -#if wxUSE_DRAG_AND_DROP - m_pDropTarget = NULL; -#endif - m_caretWidth = 0; m_caretHeight = 0; - m_caretEnabled = FALSE; - m_caretShown = FALSE; - m_minSizeX = -1; - m_minSizeY = -1; - m_maxSizeX = -1; - m_maxSizeY = -1; - m_defaultItem = NULL; - m_windowParent = NULL; - m_clientObject = (wxClientData*) NULL; - m_clientData = NULL; - + // generic initializations first + InitBase(); + // Motif-specific m_needsRefresh = TRUE; - m_canAddEventHandler = FALSE; m_mainWidget = (WXWidget) 0; - m_button1Pressed = FALSE; - m_button2Pressed = FALSE; + + m_button1Pressed = + m_button2Pressed = m_button3Pressed = FALSE; + m_winCaptured = FALSE; + m_isShown = TRUE; - m_hScrollBar = (WXWidget) 0; - m_vScrollBar = (WXWidget) 0; - m_borderWidget = (WXWidget) 0; - m_scrolledWindow = (WXWidget) 0; + m_isBeingDeleted = FALSE; + + m_hScrollBar = + m_vScrollBar = + m_borderWidget = + m_scrolledWindow = m_drawingArea = (WXWidget) 0; - m_hScroll = FALSE; + + m_hScroll = m_vScroll = FALSE; + + m_scrollPosX = + m_scrollPosY = 0; + m_backingPixmap = (WXPixmap) 0; - m_pixmapWidth = 0; + m_pixmapWidth = m_pixmapHeight = 0; - m_pixmapOffsetX = 0; + + m_pixmapOffsetX = m_pixmapOffsetY = 0; - m_scrollPosX = 0; - m_scrollPosY = 0; - - if (!parent) - return FALSE; - - if (parent) parent->AddChild(this); - - m_returnCode = 0; - - SetName(name); - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ; - m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ; + + m_lastTS = 0; + m_lastButton = 0; + m_canAddEventHandler = FALSE; +} + +// real construction (Init() must have been called before!) +bool wxWindow::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) +{ + wxCHECK_MSG( parent, FALSE, "can't create wxWindow without parent" ); + + CreateBase(parent, id, pos, size, style, wxDefaultValidator, name); + + parent->AddChild(this); + + m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE); m_foregroundColour = *wxBLACK; - - m_windowStyle = style; - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - + //// TODO: we should probably optimize by only creating a //// a drawing area if we have one or more scrollbars (wxVSCROLL/wxHSCROLL). //// But for now, let's simplify things by always creating the //// drawing area, since otherwise the translations are different. - + // New translations for getting mouse motion feedback - String translations = - ": wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\ + static const String translations = +": wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\ : wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\ : wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\ : wxCanvasMotionEvent() DrawingAreaInput() ManagerGadgetButtonMotion()\n\ @@ -362,884 +248,593 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, : wxCanvasMotionEvent() DrawingAreaInput()\n\ : wxCanvasMotionEvent() DrawingAreaInput()\n\ : DrawingAreaInput()"; - + XtActionsRec actions[1]; actions[0].string = "wxCanvasMotionEvent"; actions[0].proc = (XtActionProc) wxCanvasMotionEvent; XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1); - - Widget parentWidget = (Widget) parent->GetClientWidget(); - if (style & wxBORDER) - m_borderWidget = (WXWidget) XtVaCreateManagedWidget ("canvasBorder", - xmFrameWidgetClass, parentWidget, - XmNshadowType, XmSHADOW_IN, - NULL); - - m_scrolledWindow = (WXWidget) XtVaCreateManagedWidget ("scrolledWindow", - xmScrolledWindowWidgetClass, m_borderWidget ? (Widget) m_borderWidget : parentWidget, - XmNresizePolicy, XmRESIZE_NONE, - XmNspacing, 0, - XmNscrollingPolicy, XmAPPLICATION_DEFINED, - // XmNscrollBarDisplayPolicy, XmAS_NEEDED, - NULL); - - XtTranslations ptr; - m_drawingArea = (WXWidget) XtVaCreateWidget ((char*) (const char*) name, - xmDrawingAreaWidgetClass, (Widget) m_scrolledWindow, - XmNunitType, XmPIXELS, - // XmNresizePolicy, XmRESIZE_ANY, - XmNresizePolicy, XmRESIZE_NONE, - XmNmarginHeight, 0, - XmNmarginWidth, 0, - XmNtranslations, ptr = XtParseTranslationTable (translations), - NULL); - /* - if (GetWindowStyleFlag() & wxOVERRIDE_KEY_TRANSLATIONS) - { - XtFree ((char *) ptr); + + Widget parentWidget = (Widget) parent->GetClientWidget(); + + if (style & wxSIMPLE_BORDER) + { + m_borderWidget = (WXWidget)XtVaCreateManagedWidget + ( + "canvasBorder", + xmFrameWidgetClass, parentWidget, + XmNshadowType, XmSHADOW_IN, + XmNshadowThickness, 1, + NULL + ); + } else if (style & wxSUNKEN_BORDER) + { + m_borderWidget = (WXWidget)XtVaCreateManagedWidget + ( + "canvasBorder", + xmFrameWidgetClass, parentWidget, + XmNshadowType, XmSHADOW_IN, + NULL + ); + } else if (style & wxRAISED_BORDER) + { + m_borderWidget = (WXWidget)XtVaCreateManagedWidget + ( + "canvasBorder", + xmFrameWidgetClass, parentWidget, + XmNshadowType, XmSHADOW_OUT, + NULL + ); + } + + m_scrolledWindow = (WXWidget)XtVaCreateManagedWidget + ( + "scrolledWindow", + xmScrolledWindowWidgetClass, + m_borderWidget ? (Widget) m_borderWidget + : parentWidget, + XmNresizePolicy, XmRESIZE_NONE, + XmNspacing, 0, + XmNscrollingPolicy, XmAPPLICATION_DEFINED, + //XmNscrollBarDisplayPolicy, XmAS_NEEDED, + NULL + ); + + XtTranslations ptr = XtParseTranslationTable(translations); + m_drawingArea = (WXWidget)XtVaCreateWidget + ( + name, + xmDrawingAreaWidgetClass, (Widget) m_scrolledWindow, + XmNunitType, XmPIXELS, + // XmNresizePolicy, XmRESIZE_ANY, + XmNresizePolicy, XmRESIZE_NONE, + XmNmarginHeight, 0, + XmNmarginWidth, 0, + XmNtranslations, ptr, + NULL + ); + XtFree((char *) ptr); + +#if 0 + if (GetWindowStyleFlag() & wxOVERRIDE_KEY_TRANSLATIONS) + { ptr = XtParseTranslationTable (": DrawingAreaInput()"); XtOverrideTranslations ((Widget) m_drawingArea, ptr); XtFree ((char *) ptr); - } - */ - + } +#endif // 0 + wxAddWindowToTable((Widget) m_drawingArea, this); wxAddWindowToTable((Widget) m_scrolledWindow, this); - - /* - * This order is very important in Motif 1.2.1 - * - */ - + + // This order is very important in Motif 1.2.1 XtRealizeWidget ((Widget) m_scrolledWindow); XtRealizeWidget ((Widget) m_drawingArea); XtManageChild ((Widget) m_drawingArea); - - XtOverrideTranslations ((Widget) m_drawingArea, - ptr = XtParseTranslationTable (": resize()")); + + ptr = XtParseTranslationTable(": resize()"); + XtOverrideTranslations((Widget) m_drawingArea, ptr); XtFree ((char *) ptr); - + XtAddCallback ((Widget) m_drawingArea, XmNexposeCallback, (XtCallbackProc) wxCanvasRepaintProc, (XtPointer) this); XtAddCallback ((Widget) m_drawingArea, XmNinputCallback, (XtCallbackProc) wxCanvasInputEvent, (XtPointer) this); - - /* TODO? + + // TODO? +#if 0 display = XtDisplay (scrolledWindow); xwindow = XtWindow (drawingArea); - */ - - XtAddEventHandler ((Widget) m_drawingArea, PointerMotionHintMask | EnterWindowMask | LeaveWindowMask | FocusChangeMask, - False, (XtEventHandler) wxCanvasEnterLeave, (XtPointer) this); - - // Scrolled widget needs to have its colour changed or we get - // a little blue square where the scrollbars abutt +#endif // 0 + + XtAddEventHandler( + (Widget)m_drawingArea, + PointerMotionHintMask | EnterWindowMask | + LeaveWindowMask | FocusChangeMask, + False, + (XtEventHandler) wxCanvasEnterLeave, + (XtPointer) this + ); + + // Scrolled widget needs to have its colour changed or we get a little blue + // square where the scrollbars abutt wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE); DoChangeBackgroundColour(m_scrolledWindow, backgroundColour, TRUE); DoChangeBackgroundColour(m_drawingArea, backgroundColour, TRUE); - - XmScrolledWindowSetAreas ((Widget) m_scrolledWindow, (Widget) 0, (Widget) 0, (Widget) m_drawingArea); - - /* + + XmScrolledWindowSetAreas( + (Widget)m_scrolledWindow, + (Widget) 0, (Widget) 0, + (Widget) m_drawingArea); + +#if 0 if (m_hScrollBar) - XtRealizeWidget ((Widget) m_hScrollBar); + XtRealizeWidget ((Widget) m_hScrollBar); if (m_vScrollBar) - XtRealizeWidget ((Widget) m_vScrollBar); - */ - - // Without this, the cursor may not be restored properly - // (e.g. in splitter sample). + XtRealizeWidget ((Widget) m_vScrollBar); +#endif // 0 + + // Without this, the cursor may not be restored properly (e.g. in splitter + // sample). SetCursor(*wxSTANDARD_CURSOR); SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); SetSize(pos.x, pos.y, size.x, size.y); - + return TRUE; } -// Helper function -void wxWindow::CreateScrollbar(int orientation) +// Destructor +wxWindow::~wxWindow() { - if (!m_drawingArea) - return; - - XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL); + m_isBeingDeleted = TRUE; - // Add scrollbars if required - if (orientation == wxHORIZONTAL) + // Motif-specific actions first + WXWidget wMain = GetMainWidget(); + if ( wMain ) { - 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::GetSystemColour(wxSYS_COLOUR_3DFACE); - DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE); - - XtRealizeWidget(hScrollBar); - - XtVaSetValues((Widget) m_scrolledWindow, - XmNhorizontalScrollBar, (Widget) m_hScrollBar, - NULL); - - m_hScroll = TRUE; + // Removes event handlers + DetachWidget(wMain); } - - if (orientation == wxVERTICAL) + + ClearUpdateRects(); + + if ( m_parent ) + m_parent->RemoveChild( this ); + + // If m_drawingArea, we're a fully-fledged window with drawing area, + // scrollbars etc. (what wxCanvas used to be) + if ( m_drawingArea ) { - 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, + // Destroy children before destroying self + DestroyChildren(); + + if (m_backingPixmap) + XFreePixmap (XtDisplay ((Widget) GetMainWidget()), (Pixmap) m_backingPixmap); + + Widget w = (Widget) m_drawingArea; + wxDeleteWindowFromTable(w); + + if (w) + { + XtDestroyWidget(w); + m_drawingArea = (WXWidget) 0; + } + + // Only if we're _really_ a canvas (not a dialog box/panel) + if (m_scrolledWindow) + { + wxDeleteWindowFromTable((Widget) m_scrolledWindow); + } + + if (m_hScrollBar) + { + wxDeleteWindowFromTable((Widget) m_hScrollBar); + XtUnmanageChild((Widget) m_hScrollBar); + } + if (m_vScrollBar) + { + wxDeleteWindowFromTable((Widget) m_vScrollBar); + XtUnmanageChild((Widget) m_vScrollBar); + } + + if (m_hScrollBar) + XtDestroyWidget((Widget) m_hScrollBar); + if (m_vScrollBar) + XtDestroyWidget((Widget) m_vScrollBar); + + UnmanageAndDestroy(m_scrolledWindow); + + if (m_borderWidget) + { + XtDestroyWidget ((Widget) m_borderWidget); + m_borderWidget = (WXWidget) 0; + } + } + else // Why wasn't this here before? JACS 8/3/2000 + DestroyChildren(); + + + // Destroy the window + if (GetMainWidget()) + { + // If this line (XtDestroyWidget) causes a crash, you may comment it out. + // Child widgets will get destroyed automatically when a frame + // or dialog is destroyed, but before that you may get some memory + // leaks and potential layout problems if you delete and then add + // child windows. + + // GRG, Feb/2000: commented this out when adding support for + // wxSCROLL[WIN]_THUMBRELEASE events. Also it was reported + // that this call crashed wxMotif under OS/2, so it seems + // that leaving it out is the right thing to do. + // SN, Feb/2000: newgrid/griddemo shows why it is needed :-( + XtDestroyWidget((Widget) GetMainWidget()); + SetMainWidget((WXWidget) NULL); + } +} + +// ---------------------------------------------------------------------------- +// scrollbar management +// ---------------------------------------------------------------------------- + +// Helper function +void wxWindow::CreateScrollbar(wxOrientation orientation) +{ + 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) + { + 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::GetSystemColour(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 ); + } + + 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::GetSystemColour(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 ); } - + XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL); } -void wxWindow::DestroyScrollbar(int orientation) + +void wxWindow::DestroyScrollbar(wxOrientation orientation) { - if (!m_drawingArea) - return; - + 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 (orientation == wxVERTICAL) { if (m_vScrollBar) { + wxDeleteWindowFromTable((Widget)m_vScrollBar); XtDestroyWidget((Widget) m_vScrollBar); } m_vScrollBar = (WXWidget) 0; - m_vScroll = TRUE; - + m_vScroll = FALSE; + XtVaSetValues((Widget) m_scrolledWindow, XmNverticalScrollBar, (Widget) 0, NULL); - + } XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL); } +// --------------------------------------------------------------------------- +// basic operations +// --------------------------------------------------------------------------- + void wxWindow::SetFocus() { - XmProcessTraversal((Widget) GetMainWidget(), XmTRAVERSE_CURRENT); + Widget wMain = (Widget) GetMainWidget(); + XmProcessTraversal(wMain, XmTRAVERSE_CURRENT); XmProcessTraversal((Widget) GetMainWidget(), XmTRAVERSE_CURRENT); } -void wxWindow::Enable(bool enable) +// Get the window with the focus +wxWindow *wxWindowBase::FindFocus() { - if (GetMainWidget()) + // 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() ) { - XtSetSensitive((Widget) GetMainWidget(), enable); - XmUpdateDisplay((Widget) GetMainWidget()); - } -} + wxWindow *win = node->GetData(); -void wxWindow::CaptureMouse() -{ - if (m_winCaptured) - return; - - if (GetMainWidget()) - XtAddGrab((Widget) GetMainWidget(), TRUE, FALSE); - - m_winCaptured = TRUE; -} + Widget w = XmGetFocusWidget ((Widget) win->GetTopWidget()); -void wxWindow::ReleaseMouse() -{ - if (!m_winCaptured) - return; - - if (GetMainWidget()) - XtRemoveGrab((Widget) GetMainWidget()); - m_winCaptured = FALSE; -} + if (w != (Widget) NULL) + { + winFocus = wxGetWindowFromTable(w); + if ( winFocus ) + break; + } + } -// Push/pop event handler (i.e. allow a chain of event handlers -// be searched) -void wxWindow::PushEventHandler(wxEvtHandler *handler) -{ - handler->SetNextHandler(GetEventHandler()); - SetEventHandler(handler); + return winFocus; } -wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler) +bool wxWindow::Enable(bool enable) { - if ( GetEventHandler() ) + if ( !wxWindowBase::Enable(enable) ) + return FALSE; + + Widget wMain = (Widget)GetMainWidget(); + if ( wMain ) { - wxEvtHandler *handlerA = GetEventHandler(); - wxEvtHandler *handlerB = handlerA->GetNextHandler(); - handlerA->SetNextHandler(NULL); - SetEventHandler(handlerB); - if ( deleteHandler ) - { - delete handlerA; - return NULL; - } - else - return handlerA; + XtSetSensitive(wMain, enable); + XmUpdateDisplay(wMain); } - else - return NULL; -} -#if wxUSE_DRAG_AND_DROP + return TRUE; +} -void wxWindow::SetDropTarget(wxDropTarget *pDropTarget) +bool wxWindow::Show(bool show) { - if ( m_pDropTarget != 0 ) { - delete m_pDropTarget; + if ( !wxWindowBase::Show(show) ) + return FALSE; + + if (m_borderWidget || m_scrolledWindow) + { + MapOrUnmap(m_drawingArea, show); + MapOrUnmap(m_borderWidget ? m_borderWidget : m_scrolledWindow, show); } - - m_pDropTarget = pDropTarget; - if ( m_pDropTarget != 0 ) + else { - // TODO + if ( !MapOrUnmap(GetTopWidget(), show) ) + MapOrUnmap(GetMainWidget(), show); } -} +#if 0 + Window xwin = (Window) GetXWindow(); + Display *xdisp = (Display*) GetXDisplay(); + if (show) + XMapWindow(xdisp, xwin); + else + XUnmapWindow(xdisp, xwin); #endif -// Old style file-manager drag&drop -void wxWindow::DragAcceptFiles(bool accept) + return TRUE; +} + +// Raise the window to the top of the Z order +void wxWindow::Raise() { - // TODO + Widget wTop = (Widget) GetTopWidget(); + Window window = XtWindow(wTop); + XRaiseWindow(XtDisplay(wTop), window); } -// Get total size -void wxWindow::GetSize(int *x, int *y) const +// Lower the window to the bottom of the Z order +void wxWindow::Lower() { - if (m_drawingArea) - { - CanvasGetSize(x, y); - return; - } - - Widget widget = (Widget) GetTopWidget(); - Dimension xx, yy; - XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL); - *x = xx; *y = yy; + Widget wTop = (Widget) GetTopWidget(); + Window window = XtWindow(wTop); + XLowerWindow(XtDisplay(wTop), window); } -void wxWindow::GetPosition(int *x, int *y) const +void wxWindow::SetTitle(const wxString& title) { - 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()) - { - wxPoint pt(GetParent()->GetClientAreaOrigin()); - xx -= pt.x; - yy -= pt.y; - } - - *x = xx; *y = yy; + XtVaSetValues((Widget)GetMainWidget(), XmNtitle, title.c_str(), NULL); } -void wxWindow::ScreenToClient(int *x, int *y) const +wxString wxWindow::GetTitle() const { - Widget widget = (Widget) GetClientWidget(); - Display *display = XtDisplay((Widget) GetMainWidget()); - Window rootWindow = RootWindowOfScreen(XtScreen(widget)); - Window thisWindow = XtWindow(widget); - - Window childWindow; - int xx = *x; - int yy = *y; - XTranslateCoordinates(display, rootWindow, thisWindow, xx, yy, x, y, &childWindow); + char *title; + XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &title, NULL); + + return wxString(title); } -void wxWindow::ClientToScreen(int *x, int *y) const +void wxWindow::CaptureMouse() { - Widget widget = (Widget) GetClientWidget(); - Display *display = XtDisplay(widget); - Window rootWindow = RootWindowOfScreen(XtScreen(widget)); - Window thisWindow = XtWindow(widget); - - Window childWindow; - int xx = *x; - int yy = *y; - XTranslateCoordinates(display, thisWindow, rootWindow, xx, yy, x, y, &childWindow); + if ( m_winCaptured ) + return; + + Widget wMain = (Widget)GetMainWidget(); + if ( wMain ) + XtAddGrab(wMain, TRUE, FALSE); + + m_winCaptured = TRUE; +} + +void wxWindow::ReleaseMouse() +{ + if ( !m_winCaptured ) + return; + + Widget wMain = (Widget)GetMainWidget(); + if ( wMain ) + XtRemoveGrab(wMain); + + m_winCaptured = FALSE; } -void wxWindow::SetCursor(const wxCursor& cursor) +bool wxWindow::SetFont(const wxFont& font) { - m_windowCursor = cursor; - if (m_windowCursor.Ok()) + if ( !wxWindowBase::SetFont(font) ) { - WXDisplay *dpy = GetXDisplay(); - WXCursor x_cursor = ((wxCursor&)cursor).GetXCursor(dpy); - - Widget w = (Widget) GetMainWidget(); - Window win = XtWindow(w); - XDefineCursor((Display*) dpy, win, (Cursor) x_cursor); + // nothing to do + return FALSE; } -} + ChangeFont(); -// Get size *available for subwindows* i.e. excluding menu bar etc. -void wxWindow::GetClientSize(int *x, int *y) const -{ - Widget widget = (Widget) GetClientWidget(); - Dimension xx, yy; - XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL); - *x = xx; *y = yy; + return TRUE; } -void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) +bool wxWindow::SetCursor(const wxCursor& cursor) { - // 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; - - if ((x == -1) && (x == -1) && ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)) - useOldPos = TRUE; - else if (x == oldX && y == oldY) - useOldPos = TRUE; - - if ((width == -1) && (height == -1)) - useOldSize = TRUE; - else if (width == oldW && height == oldH) - useOldSize = TRUE; - - if (!wxNoOptimize::CanOptimize()) - { - useOldSize = FALSE; useOldPos = FALSE; - } - - if (useOldPos && useOldSize) - return; - - 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); - - if (!useOldPos) - { - if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - XtVaSetValues(widget, XmNx, xx, NULL); - if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - XtVaSetValues(widget, XmNy, yy, NULL); - } - if (!useOldSize) - { - if (width > -1) - XtVaSetValues(widget, XmNwidth, width, NULL); - if (height > -1) - XtVaSetValues(widget, XmNheight, height, NULL); - } - - if (managed) - XtManageChild(widget); - - // How about this bit. Maybe we don't need to generate size events - // all the time -- they'll be generated when the window is sized anyway. - /* - wxSizeEvent sizeEvent(wxSize(width, height), GetId()); - sizeEvent.SetEventObject(this); - - GetEventHandler()->ProcessEvent(sizeEvent); - */ -} - -void wxWindow::DoSetClientSize(int width, int height) -{ - 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); - - wxSizeEvent sizeEvent(wxSize(width, height), GetId()); - sizeEvent.SetEventObject(this); - - GetEventHandler()->ProcessEvent(sizeEvent); -} - -// For implementation purposes - sometimes decorations make the client area -// smaller -wxPoint wxWindow::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 wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) -{ - if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent()) - { - wxPoint pt(GetParent()->GetClientAreaOrigin()); - x += pt.x; y += pt.y; - } -} - -bool wxWindow::Show(bool show) -{ - if (show) - { - if (m_borderWidget || m_scrolledWindow) - { - if (m_drawingArea) - XtMapWidget((Widget) m_drawingArea); - XtMapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow); - } - else - { - WXWidget topWidget = GetTopWidget(); - if (GetTopWidget()) - XtMapWidget((Widget) GetTopWidget()); - else if (GetMainWidget()) - XtMapWidget((Widget) GetMainWidget()); - } - } - else + if ( !wxWindowBase::SetCursor(cursor) ) { - if (m_borderWidget || m_scrolledWindow) - { - if (m_drawingArea) - XtUnmapWidget((Widget) m_drawingArea); - XtUnmapWidget(m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow); - } - else - { - if (GetTopWidget()) - XtUnmapWidget((Widget) GetTopWidget()); - else if (GetMainWidget()) - XtUnmapWidget((Widget) GetMainWidget()); - } - } - - /* - Window xwin = (Window) GetXWindow(); - Display *xdisp = (Display*) GetXDisplay(); - if (show) - XMapWindow(xdisp, xwin); - else - XUnmapWindow(xdisp, xwin); - */ - - m_isShown = show; - - return TRUE; -} - -bool wxWindow::IsShown() const -{ - return m_isShown; -} - -int wxWindow::GetCharHeight() const -{ - if (!m_windowFont.Ok()) - return 0; - - WXFontStructPtr pFontStruct = m_windowFont.GetFontStruct(1.0, GetXDisplay()); - - int direction, ascent, descent; - XCharStruct overall; - XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent, - &descent, &overall); - // return (overall.ascent + overall.descent); - return (ascent + descent); -} - -int wxWindow::GetCharWidth() const -{ - if (!m_windowFont.Ok()) - return 0; - - WXFontStructPtr pFontStruct = m_windowFont.GetFontStruct(1.0, GetXDisplay()); - - int direction, ascent, descent; - XCharStruct overall; - XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent, - &descent, &overall); - return overall.width; -} - -/* Helper function for 16-bit fonts */ -static int str16len(const char *s) -{ - int count = 0; - - while (s[0] && s[1]) { - count++; - s += 2; + // no change + return FALSE; } - - return count; -} -void wxWindow::GetTextExtent(const wxString& string, int *x, int *y, - int *descent, int *externalLeading, const wxFont *theFont, bool use16) const -{ - wxFont *fontToUse = (wxFont *)theFont; - if (!fontToUse) - fontToUse = (wxFont *) & m_windowFont; - - if (!fontToUse->Ok()) - return; - - WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay()); - - int direction, ascent, descent2; - XCharStruct overall; - int slen; - - if (use16) slen = str16len(string); else slen = strlen(string); - - if (use16) - XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction, - &ascent, &descent2, &overall); + // wxASSERT_MSG( m_cursor.Ok(), + // wxT("cursor must be valid after call to the base version")); + wxCursor* cursor2 = NULL; + if (m_cursor.Ok()) + cursor2 = & m_cursor; else - XTextExtents((XFontStruct*) pFontStruct, (char*) (const char*) string, slen, &direction, - &ascent, &descent2, &overall); - - *x = (overall.width); - *y = (ascent + descent2); - if (descent) - *descent = descent2; - if (externalLeading) - *externalLeading = 0; -} - -void wxWindow::Refresh(bool eraseBack, const wxRect *rect) -{ - m_needsRefresh = TRUE; - Display *display = XtDisplay((Widget) GetMainWidget()); - Window thisWindow = XtWindow((Widget) GetMainWidget()); - - 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); - else - dc.Clear(); - } - - XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent); -} - -// Responds to colour changes: passes event on to children. -void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event) -{ - wxNode *node = GetChildren().First(); - while ( node ) - { - // Only propagate to non-top-level windows - wxWindow *win = (wxWindow *)node->Data(); - if ( win->GetParent() ) - { - wxSysColourChangedEvent event2; - event.m_eventObject = win; - win->GetEventHandler()->ProcessEvent(event2); - } - - node = node->Next(); - } -} - -// This can be called by the app (or wxWindows) to do default processing for the current -// event. Save message/event info in wxWindow so they can be used in this function. -long wxWindow::Default() -{ - // TODO - return 0; -} - -void wxWindow::InitDialog() -{ - wxInitDialogEvent event(GetId()); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); -} - -// Default init dialog behaviour is to transfer data to window -void wxWindow::OnInitDialog(wxInitDialogEvent& event) -{ - TransferDataToWindow(); -} - -// Caret manipulation -void wxWindow::CreateCaret(int w, int h) -{ - m_caretWidth = w; - m_caretHeight = h; - m_caretEnabled = TRUE; -} - -void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap)) -{ - // TODO -} - -void wxWindow::ShowCaret(bool show) -{ - // TODO -} - -void wxWindow::DestroyCaret() -{ - // TODO - m_caretEnabled = FALSE; -} - -void wxWindow::SetCaretPos(int x, int y) -{ - // TODO -} + cursor2 = wxSTANDARD_CURSOR; -void wxWindow::GetCaretPos(int *x, int *y) const -{ - // TODO -} - -wxWindow *wxGetActiveWindow() -{ - // TODO - return NULL; -} + WXDisplay *dpy = GetXDisplay(); + WXCursor x_cursor = cursor2->GetXCursor(dpy); -void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH) -{ - m_minSizeX = minW; - m_minSizeY = minH; - m_maxSizeX = maxW; - m_maxSizeY = maxH; - - if (!this->IsKindOf(CLASSINFO(wxFrame))) - return; - - wxFrame *frame = (wxFrame *)this; - 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); -} + Widget w = (Widget) GetMainWidget(); + Window win = XtWindow(w); + XDefineCursor((Display*) dpy, win, (Cursor) x_cursor); -void wxWindow::Centre(int direction) -{ - int x, y, width, height, panel_width, panel_height, new_x, new_y; - - wxWindow *father = (wxWindow *)GetParent(); - if (!father) - return; - - father->GetClientSize(&panel_width, &panel_height); - GetSize(&width, &height); - GetPosition(&x, &y); - - new_x = -1; - new_y = -1; - - if (direction & wxHORIZONTAL) - new_x = (int)((panel_width - width)/2); - - if (direction & wxVERTICAL) - new_y = (int)((panel_height - height)/2); - - SetSize(new_x, new_y, -1, -1); - + return TRUE; } // Coordinates relative to the window void wxWindow::WarpPointer (int x, int y) { - XWarpPointer (XtDisplay((Widget) GetClientWidget()), None, XtWindow((Widget) GetClientWidget()), 0, 0, 0, 0, x, y); -} + Widget wClient = (Widget)GetClientWidget(); -void wxWindow::OnEraseBackground(wxEraseEvent& event) -{ - // TODO - Default(); + XWarpPointer(XtDisplay(wClient), None, XtWindow(wClient), 0, 0, 0, 0, x, y); } +// --------------------------------------------------------------------------- +// scrolling stuff +// --------------------------------------------------------------------------- + int wxWindow::GetScrollPos(int orient) const { if (orient == wxHORIZONTAL) return m_scrollPosX; else return m_scrollPosY; - /* - Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar); - if (scrollBar) - { - int pos; - XtVaGetValues(scrollBar, - XmNvalue, &pos, NULL); - return pos; - } - else - return 0; - */ -} -// This now returns the whole range, not just the number -// of positions that we can scroll. -int wxWindow::GetScrollRange(int orient) const -{ +#if 0 Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar); if (scrollBar) { - int range; - XtVaGetValues(scrollBar, - XmNmaximum, &range, NULL); - return range; + int pos; + XtVaGetValues(scrollBar, XmNvalue, &pos, NULL); + return pos; } else return 0; +#endif // 0 +} + +// This now returns the whole range, not just the number of positions that we +// can scroll. +int wxWindow::GetScrollRange(int orient) const +{ + Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient); + wxCHECK_MSG( scrollBar, 0, "no such scrollbar" ); + + int range; + XtVaGetValues(scrollBar, XmNmaximum, &range, NULL); + return range; } int wxWindow::GetScrollThumb(int orient) const { - Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar); - if (scrollBar) - { - int thumb; - XtVaGetValues(scrollBar, - XmNsliderSize, &thumb, NULL); - return thumb; - } - else - return 0; + Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient); + wxCHECK_MSG( scrollBar, 0, "no such scrollbar" ); + + int thumb; + XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL); + return thumb; } void wxWindow::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh)) { - Widget scrollBar = (Widget) ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar); - if (scrollBar) + Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient); + + if ( scrollBar ) { - XtVaSetValues (scrollBar, - XmNvalue, pos, - NULL); + XtVaSetValues (scrollBar, XmNvalue, pos, NULL); } - if (orient == wxHORIZONTAL) - m_scrollPosX = pos; - else - m_scrollPosY = pos; - + + SetInternalScrollPos((wxOrientation)orient, pos); } // New function that will replace some of the above. @@ -1248,18 +843,18 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, { 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 = ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar ); - + WXWidget oldScrollBar = GetScrollbar((wxOrientation)orient); + if (orient == wxHORIZONTAL) { if (thumbVisible == range) @@ -1286,34 +881,32 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, CreateScrollbar(wxVERTICAL); } } - WXWidget newScrollBar = ((orient == wxHORIZONTAL) ? m_hScrollBar : m_vScrollBar ); - + WXWidget newScrollBar = GetScrollbar((wxOrientation)orient); + if (oldScrollBar != newScrollBar) { - // This is important! Without it, scrollbars misbehave - // badly. + // 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); - - if (orient == wxHORIZONTAL) - m_scrollPosX = pos; - else - m_scrollPosY = pos; - + } + + 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); @@ -1322,7 +915,6 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, // Does a physical scroll void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) { - // cerr << "Scrolling. delta = " << dx << ", " << dy << endl; int x, y, w, h; if (rect) { @@ -1335,36 +927,45 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) x = 0; y = 0; GetClientSize(& w, & h); } - - int x1 = (dx >= 0) ? x : x - dx ; + + 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); - + Widget widget = (Widget) GetMainWidget(); Window window = XtWindow(widget); Display* display = XtDisplay(widget); - - XCopyArea(display, window, - window, (GC) dc.GetGC(), - x1, y1, - w1, h1, - x2, y2); - + + XCopyArea(display, window, window, (GC) dc.GetGC(), + x1, y1, w1, h1, x2, y2); + dc.SetAutoSetting(TRUE); wxBrush brush(GetBackgroundColour(), wxSOLID); - dc.SetBrush(brush); // ?? - - // We'll add rectangles to the list of update rectangles - // according to which bits we've exposed. + 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; @@ -1372,735 +973,559 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) 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(); - } - - XmUpdateDisplay((Widget) GetMainWidget()); -} - -void wxWindow::OnChar(wxKeyEvent& event) -{ - event.Skip(); -/* ?? -if ( event.KeyCode() == WXK_TAB ) { -// propagate the TABs to the parent - it's up to it to decide what -// to do with it -if ( GetParent() ) { -if ( GetParent()->ProcessEvent(event) ) -return; -} -} - */ -} -void wxWindow::OnKeyDown(wxKeyEvent& event) -{ - event.Skip(); -} - -void wxWindow::OnKeyUp(wxKeyEvent& event) -{ - event.Skip(); -} - -void wxWindow::OnPaint(wxPaintEvent& event) -{ - Default(); -} - -bool wxWindow::IsEnabled() const -{ - // TODO. Is this right? - // return XtGetSensitive((Widget) GetMainWidget()); - return FALSE; -} + event.count = 0; -// Dialog support: override these and call -// base class members to add functionality -// that can't be done using validators. -// NOTE: these functions assume that controls -// are direct children of this window, not grandchildren -// or other levels of descendant. + XSendEvent(display, window, False, ExposureMask, (XEvent *)&event); -// Transfer values to controls. If returns FALSE, -// it's an application error (pops up a dialog) -bool wxWindow::TransferDataToWindow() -{ - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->GetValidator() && - !child->GetValidator()->TransferToWindow() ) - { - wxLogError("Could not transfer data to window."); - return FALSE; - } - node = node->Next(); - } - return TRUE; -} -// Transfer values from controls. If returns FALSE, -// validation failed: don't quit -bool wxWindow::TransferDataFromWindow() -{ - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->GetValidator() && !child->GetValidator()->TransferFromWindow() ) - { - return FALSE; - } - - node = node->Next(); } - return TRUE; -} -bool wxWindow::Validate() -{ - wxNode *node = GetChildren().First(); - while ( node ) + // Delete the update rects + node = updateRects.First(); + while (node) { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this) ) - { - return FALSE; - } - + wxRect* rect = (wxRect*) node->Data(); + delete rect; node = node->Next(); } - return TRUE; -} -// Get the window with the focus -wxWindow *wxWindow::FindFocus() -{ - // TODO - return NULL; + XmUpdateDisplay((Widget) GetMainWidget()); } -void wxWindow::AddChild(wxWindow *child) -{ - GetChildren().Append(child); - child->m_windowParent = this; -} +// --------------------------------------------------------------------------- +// drag and drop +// --------------------------------------------------------------------------- -void wxWindow::RemoveChild(wxWindow *child) -{ - GetChildren().DeleteObject(child); - child->m_windowParent = NULL; -} +#if wxUSE_DRAG_AND_DROP -// Reparents this window to have the new parent. -bool wxWindow::Reparent(wxWindow* WXUNUSED(parent)) +void wxWindow::SetDropTarget(wxDropTarget * WXUNUSED(pDropTarget)) { - // For now, we indicate that this isn't implemented. - return FALSE; + // TODO } -void wxWindow::DestroyChildren() -{ - wxNode *node = GetChildren().First(); - while (node) - { - wxNode* next = node->Next(); - wxWindow* child = (wxWindow*) node->Data(); - delete child; - node = next; - } - GetChildren().Clear(); -#if 0 - wxNode *node; - while ((node = GetChildren().First()) != (wxNode *)NULL) { - wxWindow *child; - if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) { - delete child; - if ( GetChildren().Member(child) ) - delete node; - } - } /* while */ #endif -} -void wxWindow::MakeModal(bool modal) +// Old style file-manager drag&drop +void wxWindow::DragAcceptFiles(bool WXUNUSED(accept)) { - // Disable all other windows - if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame))) - { - wxNode *node = wxTopLevelWindows.First(); - while (node) - { - wxWindow *win = (wxWindow *)node->Data(); - if (win != this) - win->Enable(!modal); - - node = node->Next(); - } - } + // TODO } -// If nothing defined for this, try the parent. -// E.g. we may be a button loaded from a resource, with no callback function -// defined. -void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event) +// ---------------------------------------------------------------------------- +// tooltips +// ---------------------------------------------------------------------------- + +#if wxUSE_TOOLTIPS + +void wxWindow::DoSetToolTip(wxToolTip * WXUNUSED(tooltip)) { - if (GetEventHandler()->ProcessEvent(event) ) - return; - if (m_windowParent) - m_windowParent->GetEventHandler()->OnCommand(win, event); + // TODO } -void wxWindow::SetConstraints(wxLayoutConstraints *c) +#endif // wxUSE_TOOLTIPS + +// ---------------------------------------------------------------------------- +// popup menus +// ---------------------------------------------------------------------------- + +bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y) { - if (m_constraints) - { - UnsetConstraints(m_constraints); - delete m_constraints; - } - m_constraints = c; - if (m_constraints) - { - // Make sure other windows know they're part of a 'meaningful relationship' - if (m_constraints->left.GetOtherWindow() && (m_constraints->left.GetOtherWindow() != this)) - m_constraints->left.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->top.GetOtherWindow() && (m_constraints->top.GetOtherWindow() != this)) - m_constraints->top.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->right.GetOtherWindow() && (m_constraints->right.GetOtherWindow() != this)) - m_constraints->right.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->bottom.GetOtherWindow() && (m_constraints->bottom.GetOtherWindow() != this)) - m_constraints->bottom.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->width.GetOtherWindow() && (m_constraints->width.GetOtherWindow() != this)) - m_constraints->width.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->height.GetOtherWindow() && (m_constraints->height.GetOtherWindow() != this)) - m_constraints->height.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->centreX.GetOtherWindow() && (m_constraints->centreX.GetOtherWindow() != this)) - m_constraints->centreX.GetOtherWindow()->AddConstraintReference((wxWindow *)this); - if (m_constraints->centreY.GetOtherWindow() && (m_constraints->centreY.GetOtherWindow() != this)) - m_constraints->centreY.GetOtherWindow()->AddConstraintReference((wxWindow *)this); + Widget widget = (Widget) GetMainWidget(); + + /* The menuId field seems to be usused, so we'll use it to + indicate whether a menu is popped up or not: + 0: Not currently created as a popup + -1: Created as a popup, but not active + 1: Active popup. + */ + + if (menu->GetParent() && (menu->GetId() != -1)) + return FALSE; + + if (menu->GetMainWidget()) { + menu->DestroyMenu(TRUE); } -} -// This removes any dangling pointers to this window -// in other windows' constraintsInvolvedIn lists. -void wxWindow::UnsetConstraints(wxLayoutConstraints *c) -{ - if (c) + menu->SetId(1); /* Mark as popped-up */ + menu->CreateMenu(NULL, widget, menu); + menu->SetInvokingWindow(this); + + menu->UpdateUI(); + + // menu->SetParent(parent); + // parent->children->Append(menu); // Store menu for later deletion + + Widget menuWidget = (Widget) menu->GetMainWidget(); + + int rootX = 0; + int rootY = 0; + + int deviceX = x; + int deviceY = y; + /* + if (this->IsKindOf(CLASSINFO(wxCanvas))) { - if (c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this)) - c->left.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this)) - c->top.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->right.GetOtherWindow() && (c->right.GetOtherWindow() != this)) - c->right.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->bottom.GetOtherWindow() && (c->bottom.GetOtherWindow() != this)) - c->bottom.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->width.GetOtherWindow() && (c->width.GetOtherWindow() != this)) - c->width.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->height.GetOtherWindow() && (c->height.GetOtherWindow() != this)) - c->height.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->centreX.GetOtherWindow() && (c->centreX.GetOtherWindow() != this)) - c->centreX.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); - if (c->centreY.GetOtherWindow() && (c->centreY.GetOtherWindow() != this)) - c->centreY.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this); + wxCanvas *canvas = (wxCanvas *) this; + deviceX = canvas->GetDC ()->LogicalToDeviceX (x); + deviceY = canvas->GetDC ()->LogicalToDeviceY (y); } -} + */ -// Back-pointer to other windows we're involved with, so if we delete -// this window, we must delete any constraints we're involved with. -void wxWindow::AddConstraintReference(wxWindow *otherWin) -{ - if (!m_constraintsInvolvedIn) - m_constraintsInvolvedIn = new wxList; - if (!m_constraintsInvolvedIn->Member(otherWin)) - m_constraintsInvolvedIn->Append(otherWin); + Display *display = XtDisplay (widget); + Window rootWindow = RootWindowOfScreen (XtScreen((Widget)widget)); + Window thisWindow = XtWindow (widget); + Window childWindow; + XTranslateCoordinates (display, thisWindow, rootWindow, (int) deviceX, (int) deviceY, + &rootX, &rootY, &childWindow); + + XButtonPressedEvent event; + event.type = ButtonPress; + event.button = 1; + + event.x = deviceX; + event.y = deviceY; + + event.x_root = rootX; + event.y_root = rootY; + + XmMenuPosition (menuWidget, &event); + XtManageChild (menuWidget); + + return TRUE; } -// REMOVE back-pointer to other windows we're involved with. -void wxWindow::RemoveConstraintReference(wxWindow *otherWin) +// --------------------------------------------------------------------------- +// moving and resizing +// --------------------------------------------------------------------------- + +bool wxWindow::PreResize() { - if (m_constraintsInvolvedIn) - m_constraintsInvolvedIn->DeleteObject(otherWin); + return TRUE; } -// Reset any constraints that mention this window -void wxWindow::DeleteRelatedConstraints() +// Get total size +void wxWindow::DoGetSize(int *x, int *y) const { - if (m_constraintsInvolvedIn) + if (m_drawingArea) { - wxNode *node = m_constraintsInvolvedIn->First(); - while (node) - { - wxWindow *win = (wxWindow *)node->Data(); - wxNode *next = node->Next(); - wxLayoutConstraints *constr = win->GetConstraints(); - - // Reset any constraints involving this window - if (constr) - { - constr->left.ResetIfWin((wxWindow *)this); - constr->top.ResetIfWin((wxWindow *)this); - constr->right.ResetIfWin((wxWindow *)this); - constr->bottom.ResetIfWin((wxWindow *)this); - constr->width.ResetIfWin((wxWindow *)this); - constr->height.ResetIfWin((wxWindow *)this); - constr->centreX.ResetIfWin((wxWindow *)this); - constr->centreY.ResetIfWin((wxWindow *)this); - } - delete node; - node = next; - } - delete m_constraintsInvolvedIn; - m_constraintsInvolvedIn = NULL; + CanvasGetSize(x, y); + return; } -} -void wxWindow::SetSizer(wxSizer *sizer) -{ - m_windowSizer = sizer; - if (sizer) - sizer->SetSizerParent((wxWindow *)this); + Widget widget = (Widget) GetTopWidget(); + Dimension xx, yy; + XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL); + if(x) *x = xx; if(y) *y = yy; } -/* -* New version -*/ - -bool wxWindow::Layout() +void wxWindow::DoGetPosition(int *x, int *y) const { - if (GetConstraints()) - { - int w, h; - GetClientSize(&w, &h); - GetConstraints()->width.SetValue(w); - GetConstraints()->height.SetValue(h); - } - - // If top level (one sizer), evaluate the sizer's constraints. - if (GetSizer()) - { - int noChanges; - GetSizer()->ResetConstraints(); // Mark all constraints as unevaluated - GetSizer()->LayoutPhase1(&noChanges); - GetSizer()->LayoutPhase2(&noChanges); - GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes - return TRUE; - } - else + if (m_drawingArea) { - // Otherwise, evaluate child constraints - ResetConstraints(); // Mark all constraints as unevaluated - DoPhase(1); // Just one phase need if no sizers involved - DoPhase(2); - SetConstraintSizes(); // Recursively set the real window sizes + CanvasGetPosition(x, y); + return; } - return TRUE; -} - + Widget widget = (Widget) GetTopWidget(); + Position xx, yy; + XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL); -// Do a phase of evaluating constraints: -// the default behaviour. wxSizers may do a similar -// thing, but also impose their own 'constraints' -// and order the evaluation differently. -bool wxWindow::LayoutPhase1(int *noChanges) -{ - wxLayoutConstraints *constr = GetConstraints(); - if (constr) + // 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()) { - return constr->SatisfyConstraints((wxWindow *)this, noChanges); + wxPoint pt(GetParent()->GetClientAreaOrigin()); + xx -= pt.x; + yy -= pt.y; } - else - return TRUE; + + if(x) *x = xx; if(y) *y = yy; } -bool wxWindow::LayoutPhase2(int *noChanges) +void wxWindow::DoScreenToClient(int *x, int *y) const { - *noChanges = 0; - - // Layout children - DoPhase(1); - DoPhase(2); - return TRUE; + Widget widget = (Widget) GetClientWidget(); + Display *display = XtDisplay((Widget) GetMainWidget()); + Window rootWindow = RootWindowOfScreen(XtScreen(widget)); + Window thisWindow = XtWindow(widget); + + Window childWindow; + int xx = *x; + int yy = *y; + XTranslateCoordinates(display, rootWindow, thisWindow, xx, yy, x, y, &childWindow); } -// Do a phase of evaluating child constraints -bool wxWindow::DoPhase(int phase) +void wxWindow::DoClientToScreen(int *x, int *y) const { - int noIterations = 0; - int maxIterations = 500; - int noChanges = 1; - int noFailures = 0; - wxList succeeded; - while ((noChanges > 0) && (noIterations < maxIterations)) - { - noChanges = 0; - noFailures = 0; - wxNode *node = GetChildren().First(); - while (node) - { - wxWindow *child = (wxWindow *)node->Data(); - if (!child->IsKindOf(CLASSINFO(wxFrame)) && !child->IsKindOf(CLASSINFO(wxDialog))) - { - wxLayoutConstraints *constr = child->GetConstraints(); - if (constr) - { - if (succeeded.Member(child)) - { - } - else - { - int tempNoChanges = 0; - bool success = ( (phase == 1) ? child->LayoutPhase1(&tempNoChanges) : child->LayoutPhase2(&tempNoChanges) ) ; - noChanges += tempNoChanges; - if (success) - { - succeeded.Append(child); - } - } - } - } - node = node->Next(); - } - noIterations ++; - } - return TRUE; + Widget widget = (Widget) GetClientWidget(); + Display *display = XtDisplay(widget); + Window rootWindow = RootWindowOfScreen(XtScreen(widget)); + Window thisWindow = XtWindow(widget); + + Window childWindow; + int xx = *x; + int yy = *y; + XTranslateCoordinates(display, thisWindow, rootWindow, xx, yy, x, y, &childWindow); } -void wxWindow::ResetConstraints() + +// Get size *available for subwindows* i.e. excluding menu bar etc. +void wxWindow::DoGetClientSize(int *x, int *y) const { - wxLayoutConstraints *constr = GetConstraints(); - if (constr) - { - constr->left.SetDone(FALSE); - constr->top.SetDone(FALSE); - constr->right.SetDone(FALSE); - constr->bottom.SetDone(FALSE); - constr->width.SetDone(FALSE); - constr->height.SetDone(FALSE); - constr->centreX.SetDone(FALSE); - constr->centreY.SetDone(FALSE); - } - wxNode *node = GetChildren().First(); - while (node) - { - wxWindow *win = (wxWindow *)node->Data(); - if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog))) - win->ResetConstraints(); - node = node->Next(); - } + Widget widget = (Widget) GetClientWidget(); + Dimension xx, yy; + XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL); + if(x) *x = xx; if(y) *y = yy; } -// Need to distinguish between setting the 'fake' size for -// windows and sizers, and setting the real values. -void wxWindow::SetConstraintSizes(bool recurse) +void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) { - wxLayoutConstraints *constr = GetConstraints(); - if (constr && constr->left.GetDone() && constr->right.GetDone() && - constr->width.GetDone() && constr->height.GetDone()) + // A bit of optimization to help sort out the flickers. + int oldX, oldY, oldW, oldH; + GetSize(& oldW, & oldH); + GetPosition(& oldX, & oldY); + + if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) { - int x = constr->left.GetValue(); - int y = constr->top.GetValue(); - int w = constr->width.GetValue(); - int h = constr->height.GetValue(); - - // If we don't want to resize this window, just move it... - if ((constr->width.GetRelationship() != wxAsIs) || - (constr->height.GetRelationship() != wxAsIs)) - { - // Calls Layout() recursively. AAAGH. How can we stop that. - // Simply take Layout() out of non-top level OnSizes. - SizerSetSize(x, y, w, h); - } - else - { - SizerMove(x, y); - } + if ( x == -1 ) + x = oldX; + if ( y == -1 ) + y = oldY; } - else if (constr) + + if ( width == -1 ) + width = oldW; + if ( height == -1 ) + height = oldH; + + bool nothingChanged = (x == oldX) && (y == oldY) && + (width == oldW) && (height == oldH); + + if (!wxNoOptimize::CanOptimize()) { - char *windowClass = this->GetClassInfo()->GetClassName(); - - wxString winName; - if (GetName() == "") - winName = "unnamed"; - else - winName = GetName(); - wxDebugMsg("Constraint(s) not satisfied for window of type %s, name %s:\n", (const char *)windowClass, (const char *)winName); - if (!constr->left.GetDone()) - wxDebugMsg(" unsatisfied 'left' constraint.\n"); - if (!constr->right.GetDone()) - wxDebugMsg(" unsatisfied 'right' constraint.\n"); - if (!constr->width.GetDone()) - wxDebugMsg(" unsatisfied 'width' constraint.\n"); - if (!constr->height.GetDone()) - wxDebugMsg(" unsatisfied 'height' constraint.\n"); - wxDebugMsg("Please check constraints: try adding AsIs() constraints.\n"); + nothingChanged = FALSE; } - - if (recurse) + + if ( !nothingChanged ) { - wxNode *node = GetChildren().First(); - while (node) + if (m_drawingArea) { - wxWindow *win = (wxWindow *)node->Data(); - if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog))) - win->SetConstraintSizes(); - node = node->Next(); + 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); + + // How about this bit. Maybe we don't need to generate size events + // all the time -- they'll be generated when the window is sized anyway. +#if 0 + wxSizeEvent sizeEvent(wxSize(width, height), GetId()); + sizeEvent.SetEventObject(this); + + GetEventHandler()->ProcessEvent(sizeEvent); +#endif // 0 } } -// This assumes that all sizers are 'on' the same -// window, i.e. the parent of this window. -void wxWindow::TransformSizerToActual(int *x, int *y) const +void wxWindow::DoSetClientSize(int width, int height) { - if (!m_sizerParent || m_sizerParent->IsKindOf(CLASSINFO(wxDialog)) || - m_sizerParent->IsKindOf(CLASSINFO(wxFrame)) ) + if (m_drawingArea) + { + CanvasSetClientSize(width, height); return; - - int xp, yp; - m_sizerParent->GetPosition(&xp, &yp); - m_sizerParent->TransformSizerToActual(&xp, &yp); - *x += xp; - *y += yp; + } + + Widget widget = (Widget) GetTopWidget(); + + if (width > -1) + XtVaSetValues(widget, XmNwidth, width, NULL); + if (height > -1) + XtVaSetValues(widget, XmNheight, height, NULL); + + wxSizeEvent sizeEvent(wxSize(width, height), GetId()); + sizeEvent.SetEventObject(this); + + GetEventHandler()->ProcessEvent(sizeEvent); } -void wxWindow::SizerSetSize(int x, int y, int w, int h) +// For implementation purposes - sometimes decorations make the client area +// smaller +wxPoint wxWindow::GetClientAreaOrigin() const { - int xx = x; - int yy = y; - TransformSizerToActual(&xx, &yy); - SetSize(xx, yy, w, h); + return wxPoint(0, 0); } -void wxWindow::SizerMove(int x, int y) +// Makes an adjustment to the window position (for example, a frame that has +// a toolbar that it manages itself). +void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) { - int xx = x; - int yy = y; - TransformSizerToActual(&xx, &yy); - Move(xx, yy); + if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent()) + { + wxPoint pt(GetParent()->GetClientAreaOrigin()); + x += pt.x; y += pt.y; + } } -// Only set the size/position of the constraint (if any) -void wxWindow::SetSizeConstraint(int x, int y, int w, int h) +void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH) { - wxLayoutConstraints *constr = GetConstraints(); - if (constr) + m_minWidth = minW; + m_minHeight = minH; + m_maxWidth = maxW; + m_maxHeight = maxH; + + wxFrame *frame = wxDynamicCast(this, wxFrame); + if ( !frame ) { - if (x != -1) - { - constr->left.SetValue(x); - constr->left.SetDone(TRUE); - } - if (y != -1) - { - constr->top.SetValue(y); - constr->top.SetDone(TRUE); - } - if (w != -1) - { - constr->width.SetValue(w); - constr->width.SetDone(TRUE); - } - if (h != -1) - { - constr->height.SetValue(h); - constr->height.SetDone(TRUE); - } + // TODO what about dialogs? + return; } + + 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); } -void wxWindow::MoveConstraint(int x, int y) +void wxWindow::DoMoveWindow(int x, int y, int width, int height) { - wxLayoutConstraints *constr = GetConstraints(); - if (constr) - { - if (x != -1) - { - constr->left.SetValue(x); - constr->left.SetDone(TRUE); - } - if (y != -1) - { - constr->top.SetValue(y); - constr->top.SetDone(TRUE); - } - } + XtVaSetValues((Widget)GetTopWidget(), + XmNx, x, + XmNy, y, + XmNwidth, width, + XmNheight, height, + NULL); } -void wxWindow::GetSizeConstraint(int *w, int *h) const -{ - wxLayoutConstraints *constr = GetConstraints(); - if (constr) - { - *w = constr->width.GetValue(); - *h = constr->height.GetValue(); - } - else - GetSize(w, h); -} +// --------------------------------------------------------------------------- +// text metrics +// --------------------------------------------------------------------------- -void wxWindow::GetClientSizeConstraint(int *w, int *h) const +int wxWindow::GetCharHeight() const { - wxLayoutConstraints *constr = GetConstraints(); - if (constr) - { - *w = constr->width.GetValue(); - *h = constr->height.GetValue(); - } - else - GetClientSize(w, h); + wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" ); + + WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay()); + + int direction, ascent, descent; + XCharStruct overall; + XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent, + &descent, &overall); + + // return (overall.ascent + overall.descent); + return (ascent + descent); } -void wxWindow::GetPositionConstraint(int *x, int *y) const +int wxWindow::GetCharWidth() const { - wxLayoutConstraints *constr = GetConstraints(); - if (constr) - { - *x = constr->left.GetValue(); - *y = constr->top.GetValue(); - } - else - GetPosition(x, y); + wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" ); + + WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay()); + + int direction, ascent, descent; + XCharStruct overall; + XTextExtents ((XFontStruct*) pFontStruct, "x", 1, &direction, &ascent, + &descent, &overall); + + return overall.width; } -bool wxWindow::Close(bool force) +void wxWindow::GetTextExtent(const wxString& string, + int *x, int *y, + int *descent, int *externalLeading, + const wxFont *theFont) const { - wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId); - event.SetEventObject(this); -#if WXWIN_COMPATIBILITY - event.SetForce(force); -#endif - event.SetCanVeto(!force); + wxFont *fontToUse = (wxFont *)theFont; + if (!fontToUse) + fontToUse = (wxFont *) & m_font; + + wxCHECK_RET( fontToUse->Ok(), "valid window font needed" ); - return GetEventHandler()->ProcessEvent(event); + WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay()); + + 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, slen, + &direction, &ascent, &descent2, &overall); + + if ( x ) + *x = (overall.width); + if ( y ) + *y = (ascent + descent2); + if (descent) + *descent = descent2; + if (externalLeading) + *externalLeading = 0; + } -wxObject* wxWindow::GetChild(int number) const +// ---------------------------------------------------------------------------- +// painting +// ---------------------------------------------------------------------------- + +void wxWindow::Refresh(bool eraseBack, const wxRect *rect) { - // Return a pointer to the Nth object in the window - wxNode *node = GetChildren().First(); - int n = number; - while (node && n--) - node = node->Next() ; - if (node) + m_needsRefresh = TRUE; + Display *display = XtDisplay((Widget) GetMainWidget()); + Window thisWindow = XtWindow((Widget) GetMainWidget()); + + XExposeEvent dummyEvent; + int width, height; + GetSize(&width, &height); + + dummyEvent.type = Expose; + dummyEvent.display = display; + dummyEvent.send_event = True; + dummyEvent.window = thisWindow; + if (rect) { - wxObject *obj = (wxObject *)node->Data(); - return(obj) ; + dummyEvent.x = rect->x; + dummyEvent.y = rect->y; + dummyEvent.width = rect->width; + dummyEvent.height = rect->height; } else - return NULL ; -} + { + dummyEvent.x = 0; + dummyEvent.y = 0; + dummyEvent.width = width; + dummyEvent.height = height; + } + dummyEvent.count = 0; -void wxWindow::OnDefaultAction(wxControl *initiatingItem) -{ - // Obsolete function + if (eraseBack) + { + wxClientDC dc(this); + wxBrush backgroundBrush(GetBackgroundColour(), wxSOLID); + dc.SetBackground(backgroundBrush); + if (rect) + dc.Clear(*rect); + else + dc.Clear(); + } + + XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent); } void wxWindow::Clear() @@ -2111,192 +1536,223 @@ void wxWindow::Clear() dc.Clear(); } -// Fits the panel around the items -void wxWindow::Fit() +void wxWindow::ClearUpdateRects() { - int maxX = 0; - int maxY = 0; - wxNode *node = GetChildren().First(); - while ( node ) + wxRectList::Node* node = m_updateRects.GetFirst(); + while (node) { - wxWindow *win = (wxWindow *)node->Data(); - int wx, wy, ww, wh; - win->GetPosition(&wx, &wy); - win->GetSize(&ww, &wh); - if ( wx + ww > maxX ) - maxX = wx + ww; - if ( wy + wh > maxY ) - maxY = wy + wh; - - node = node->Next(); + wxRect* rect = node->GetData(); + delete rect; + node = node->GetNext(); } - SetClientSize(maxX + 5, maxY + 5); -} -void wxWindow::SetValidator(const wxValidator& validator) -{ - if ( m_windowValidator ) - delete m_windowValidator; - m_windowValidator = validator.Clone(); - - if ( m_windowValidator ) - m_windowValidator->SetWindow(this) ; + m_updateRects.Clear(); } -void wxWindow::SetClientObject( wxClientData *data ) +void wxWindow::DoPaint() { - if (m_clientObject) delete m_clientObject; - m_clientObject = data; -} + //TODO : make a temporary gc so we can do the XCopyArea below + if (m_backingPixmap && !m_needsRefresh) + { + wxPaintDC dc(this); -wxClientData *wxWindow::GetClientObject() -{ - return m_clientObject; -} + GC tempGC = (GC) dc.GetBackingGC(); -void wxWindow::SetClientData( void *data ) -{ - m_clientData = data; -} + Widget widget = (Widget) GetMainWidget(); -void *wxWindow::GetClientData() -{ - return m_clientData; -} + int scrollPosX = 0; + int scrollPosY = 0; -// Find a window by id or name -wxWindow *wxWindow::FindWindow(long id) -{ - if ( GetId() == id) - return this; - - wxNode *node = GetChildren().First(); - while ( node ) + // We have to test whether it's a wxScrolledWindow (hack!) because + // otherwise we don't know how many pixels have been scrolled. We might + // solve this in the future by defining virtual wxWindow functions to get + // the scroll position in pixels. Or, each kind of scrolled window has to + // implement backing stores itself, using generic wxWindows code. + wxScrolledWindow* scrolledWindow = wxDynamicCast(this, wxScrolledWindow); + if ( scrolledWindow ) + { + int x, y; + scrolledWindow->CalcScrolledPosition(0, 0, &x, &y); + + scrollPosX = - x; + scrollPosY = - y; + } + + // TODO: This could be optimized further by only copying the areas in the + // current update region. + + // Only blit the part visible in the client area. The backing pixmap + // always starts at 0, 0 but we may be looking at only a portion of it. + wxSize clientArea = GetClientSize(); + int toBlitX = m_pixmapWidth - scrollPosX; + int toBlitY = m_pixmapHeight - scrollPosY; + + // Copy whichever is samller, the amount of pixmap we have to copy, + // or the size of the client area. + toBlitX = wxMin(toBlitX, clientArea.x); + toBlitY = wxMin(toBlitY, clientArea.y); + + // Make sure we're not negative + toBlitX = wxMax(0, toBlitX); + toBlitY = wxMax(0, toBlitY); + + XCopyArea + ( + XtDisplay(widget), + (Pixmap) m_backingPixmap, + XtWindow (widget), + tempGC, + scrollPosX, scrollPosY, // Start at the scroll position + toBlitX, toBlitY, // How much of the pixmap to copy + 0, 0 // Destination + ); + } + else { - wxWindow *child = (wxWindow *)node->Data(); - wxWindow *found = child->FindWindow(id); - if ( found ) - return found; - node = node->Next(); + // 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; } - return NULL; } -wxWindow *wxWindow::FindWindow(const wxString& name) +// ---------------------------------------------------------------------------- +// event handlers +// ---------------------------------------------------------------------------- + +// Responds to colour changes: passes event on to children. +void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event) { - if ( GetName() == name) - return this; - - wxNode *node = GetChildren().First(); + wxWindowList::Node *node = GetChildren().GetFirst(); while ( node ) { - wxWindow *child = (wxWindow *)node->Data(); - wxWindow *found = child->FindWindow(name); - if ( found ) - return found; - node = node->Next(); + // Only propagate to non-top-level windows + wxWindow *win = node->GetData(); + if ( win->GetParent() ) + { + wxSysColourChangedEvent event2; + event.m_eventObject = win; + win->GetEventHandler()->ProcessEvent(event2); + } + + node = node->GetNext(); } - return NULL; } -void wxWindow::OnIdle(wxIdleEvent& event) +void wxWindow::OnIdle(wxIdleEvent& WXUNUSED(event)) { // This calls the UI-update mechanism (querying windows for // menu/toolbar/control state information) UpdateWindowUI(); } -// Raise the window to the top of the Z order -void wxWindow::Raise() -{ - Window window = XtWindow((Widget) GetTopWidget()); - XRaiseWindow(XtDisplay((Widget) GetTopWidget()), window); -} +// ---------------------------------------------------------------------------- +// accelerators +// ---------------------------------------------------------------------------- -// Lower the window to the bottom of the Z order -void wxWindow::Lower() +bool wxWindow::ProcessAccelerator(wxKeyEvent& event) { - Window window = XtWindow((Widget) GetTopWidget()); - XLowerWindow(XtDisplay((Widget) GetTopWidget()), window); -} + if (!m_acceleratorTable.Ok()) + return FALSE; -bool wxWindow::AcceptsFocus() const -{ - return IsShown() && IsEnabled(); -} + 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. -// Update region access -wxRegion& wxWindow::GetUpdateRegion() const -{ - return (wxRegion&) m_updateRegion; -} + // 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(); -bool wxWindow::IsExposed(int x, int y, int w, int h) const -{ - return (m_updateRegion.Contains(x, y, w, h) != wxOutRegion); -} + if (!parent) + return FALSE; -bool wxWindow::IsExposed(const wxPoint& pt) const -{ - return (m_updateRegion.Contains(pt) != wxOutRegion); -} + 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); -bool wxWindow::IsExposed(const wxRect& rect) const -{ - return (m_updateRegion.Contains(rect) != wxOutRegion); -} + // If ProcessEvent returns TRUE (it was handled), then + // the calling code will skip the event handling. + return frame->GetEventHandler()->ProcessEvent(commandEvent); + } + } + } -/* -* Allocates control IDs -*/ + // Find a child matching the command id + wxWindow* child = parent->FindWindow(entry->GetCommand()); -int wxWindow::NewControlId() -{ - static int s_controlId = 0; - s_controlId ++; - return s_controlId; -} + // No such child + if (!child) + return FALSE; -void wxWindow::SetAcceleratorTable(const wxAcceleratorTable& accel) -{ - m_acceleratorTable = accel; -} + // 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); + } -// All widgets should have this as their resize proc. -// OnSize sent to wxWindow via client data. -void wxWidgetResizeProc(Widget w, XConfigureEvent *event, String args[], int *num_args) -{ - wxWindow *win = (wxWindow *)wxWidgetHashTable->Get((long)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); - } + return FALSE; + } // matches event + }// for + + // We didn't match the key event against an accelerator. + return FALSE; } +// ============================================================================ +// Motif-specific stuff from here on +// ============================================================================ + +// ---------------------------------------------------------------------------- +// function which maintain the global hash table mapping Widgets to wxWindows +// ---------------------------------------------------------------------------- + bool wxAddWindowToTable(Widget w, wxWindow *win) { wxWindow *oldItem = NULL; - // printf("Adding widget %ld, name = %s\n", w, win->GetClassInfo()->GetClassName()); if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w))) { - wxLogError("Widget table clash: new widget is %ld, %s", (long)w, win->GetClassInfo()->GetClassName()); + wxLogDebug("Widget table clash: new widget is %ld, %s", + (long)w, win->GetClassInfo()->GetClassName()); return FALSE; } - - wxWidgetHashTable->Put ((long) w, win); + + wxWidgetHashTable->Put((long) w, win); + + wxLogTrace("widget", "Widget 0x%08x <-> window %p (%s)", + w, win, win->GetClassInfo()->GetClassName()); + return TRUE; } wxWindow *wxGetWindowFromTable(Widget w) { - return (wxWindow *)wxWidgetHashTable->Get ((long) w); + return (wxWindow *)wxWidgetHashTable->Get((long) w); } void wxDeleteWindowFromTable(Widget w) @@ -2304,19 +1760,89 @@ void wxDeleteWindowFromTable(Widget w) wxWidgetHashTable->Delete((long)w); } -// Get the underlying X window and display +// ---------------------------------------------------------------------------- +// add/remove window from the table +// ---------------------------------------------------------------------------- + +// Add to hash table, add event handler +bool wxWindow::AttachWidget (wxWindow* WXUNUSED(parent), WXWidget mainWidget, + WXWidget formWidget, int x, int y, int width, int height) +{ + wxAddWindowToTable((Widget) mainWidget, this); + 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); + } + + 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 wxWindow::DetachWidget(WXWidget widget) +{ + if (CanAddEventHandler()) + { + XtRemoveEventHandler((Widget) widget, + ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask, + False, + wxPanelItemEventHandler, + (XtPointer)this); + } + + wxDeleteWindowFromTable((Widget) widget); + return TRUE; +} + +// ---------------------------------------------------------------------------- +// Motif-specific accessors +// ---------------------------------------------------------------------------- + +// Get the underlying X window WXWindow wxWindow::GetXWindow() const { - if (GetMainWidget()) - return (WXWindow) XtWindow((Widget) GetMainWidget()); + Widget wMain = (Widget)GetMainWidget(); + if ( wMain ) + return (WXWindow) XtWindow(wMain); else return (WXWindow) 0; } +// Get the underlying X display WXDisplay *wxWindow::GetXDisplay() const { - if (GetMainWidget()) - return (WXDisplay*) XtDisplay((Widget) GetMainWidget()); + Widget wMain = (Widget)GetMainWidget(); + if ( wMain ) + return (WXDisplay*) XtDisplay(wMain); else return (WXDisplay*) NULL; } @@ -2342,123 +1868,106 @@ WXWidget wxWindow::GetTopWidget() const return GetMainWidget(); } -void wxCanvasRepaintProc (Widget drawingArea, XtPointer clientData, - XmDrawingAreaCallbackStruct * cbs) +WXWidget wxWindow::GetLabelWidget() const +{ + return GetMainWidget(); +} + +// ---------------------------------------------------------------------------- +// Motif callbacks +// ---------------------------------------------------------------------------- + +// 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 (!wxWidgetHashTable->Get ((long) (Widget) drawingArea)) + if (!wxGetWindowFromTable(drawingArea)) return; - + XEvent * event = cbs->event; wxWindow * win = (wxWindow *) clientData; - Display * display = (Display *) win->GetXDisplay(); - + switch (event->type) { case Expose: { - wxRect* rect = new wxRect(event->xexpose.x, event->xexpose.y, - event->xexpose.width, event->xexpose.height); - /* - cout << "Expose proc. wxRect: " << rect->x << ", " << rect->y << ", "; - cout << rect->width << ", " << rect->height << "\n\n"; - */ - - win->m_updateRects.Append((wxObject*) rect); + win->AddUpdateRect(event->xexpose.x, event->xexpose.y, + event->xexpose.width, event->xexpose.height); if (event -> xexpose.count == 0) { - /* - wxPaintEvent event(win->GetId()); - event.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(event); - */ - win->DoPaint(); win->ClearUpdateRects(); } break; } - default: - { - cout << "\n\nNew Event ! is = " << event -> type << "\n"; - break; - } } } // Unable to deal with Enter/Leave without a separate EventHandler (Motif 1.1.4) -void -wxCanvasEnterLeave (Widget drawingArea, XtPointer clientData, XCrossingEvent * event) +static void wxCanvasEnterLeave(Widget drawingArea, + XtPointer WXUNUSED(clientData), + XCrossingEvent * event) { XmDrawingAreaCallbackStruct cbs; XEvent ev; - - //if (event->mode!=NotifyNormal) - // return ; - - // ev = *((XEvent *) event); // Causes Purify error (copying too many bytes) + ((XCrossingEvent &) ev) = *event; - + cbs.reason = XmCR_INPUT; cbs.event = &ev; - - wxCanvasInputEvent (drawingArea, (XtPointer) NULL, &cbs); + + wxCanvasInputEvent(drawingArea, (XtPointer) NULL, &cbs); } // Fix to make it work under Motif 1.0 (!) -void wxCanvasMotionEvent (Widget drawingArea, XButtonEvent * event) +static void wxCanvasMotionEvent (Widget WXUNUSED(drawingArea), XButtonEvent * WXUNUSED(event)) { -#if XmVersion<=1000 - +#if XmVersion <= 1000 XmDrawingAreaCallbackStruct cbs; XEvent ev; - - //ev.xbutton = *event; + ev = *((XEvent *) event); cbs.reason = XmCR_INPUT; cbs.event = &ev; - + wxCanvasInputEvent (drawingArea, (XtPointer) NULL, &cbs); -#endif +#endif // XmVersion <= 1000 } -void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallbackStruct * cbs) +static void wxCanvasInputEvent(Widget drawingArea, + XtPointer WXUNUSED(data), + XmDrawingAreaCallbackStruct * cbs) { - wxWindow *canvas = (wxWindow *) wxWidgetHashTable->Get ((long) (Widget) drawingArea); + wxWindow *canvas = wxGetWindowFromTable(drawingArea); XEvent local_event; - + if (canvas==NULL) - return ; - + return; + if (cbs->reason != XmCR_INPUT) return; - - local_event = *(cbs->event); // We must keep a copy! - - /* - switch (local_event.xany.type) - { - case EnterNotify: - cout << "EnterNotify\n"; - break; - case LeaveNotify: - cout << "LeaveNotify\n"; - break; - case ButtonPress: - cout << "ButtonPress\n"; - break; - case ButtonRelease: - cout << "ButtonRelease\n"; - break; - case MotionNotify: - cout << "MotionNotify\n"; - break; - default: - cout << "Something else\n"; - break; - } - */ - + + local_event = *(cbs->event); // We must keep a copy! + switch (local_event.xany.type) { case EnterNotify: @@ -2467,8 +1976,11 @@ void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallba 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) @@ -2478,7 +1990,7 @@ void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallba } else if (local_event.xany.type == LeaveNotify) { - //if (local_event.xcrossing.mode!=NotifyNormal) + //if (local_event.xcrossingr.mode!=NotifyNormal) // return ; // Ignore grab events eventType = wxEVT_LEAVE_WINDOW; // canvas->GetEventHandler()->OnKillFocus(); @@ -2486,40 +1998,24 @@ void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallba else if (local_event.xany.type == MotionNotify) { 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 - { - } } - + else if (local_event.xany.type == ButtonPress) { if (local_event.xbutton.button == Button1) { eventType = wxEVT_LEFT_DOWN; - canvas->m_button1Pressed = TRUE; + canvas->SetButton1(TRUE); } else if (local_event.xbutton.button == Button2) { eventType = wxEVT_MIDDLE_DOWN; - canvas->m_button2Pressed = TRUE; + canvas->SetButton2(TRUE); } else if (local_event.xbutton.button == Button3) { eventType = wxEVT_RIGHT_DOWN; - canvas->m_button3Pressed = TRUE; + canvas->SetButton3(TRUE); } } else if (local_event.xany.type == ButtonRelease) @@ -2527,109 +2023,135 @@ void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallba if (local_event.xbutton.button == Button1) { eventType = wxEVT_LEFT_UP; - canvas->m_button1Pressed = FALSE; + canvas->SetButton1(FALSE); } else if (local_event.xbutton.button == Button2) { eventType = wxEVT_MIDDLE_UP; - canvas->m_button2Pressed = FALSE; + canvas->SetButton2(FALSE); } else if (local_event.xbutton.button == Button3) { eventType = wxEVT_RIGHT_UP; - canvas->m_button3Pressed = FALSE; + canvas->SetButton3(FALSE); } } - + wxMouseEvent wxevent (eventType); - wxevent.m_eventHandle = (char *) &local_event; - + wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN) - || (event_left_is_down (&local_event) + || (event_left_is_down (&local_event) && (eventType != wxEVT_LEFT_UP))); wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN) - || (event_middle_is_down (&local_event) + || (event_middle_is_down (&local_event) && (eventType != wxEVT_MIDDLE_UP))); wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN) - || (event_right_is_down (&local_event) + || (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()) ; - + 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; + 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 - if (canvas->m_lastButton && canvas->m_lastButton==button && (ts - canvas->m_lastTS) < dclickTime) + int buttonLast = canvas->GetLastClickedButton(); + long lastTS = canvas->GetLastClickTime(); + if ( buttonLast && buttonLast == button && (ts - lastTS) < dclickTime ) { // I have a dclick - canvas->m_lastButton = 0; - switch ( eventType ) + 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 ) { - case wxEVT_LEFT_DOWN: - wxevent.SetEventType(wxEVT_LEFT_DCLICK); - break; - case wxEVT_MIDDLE_DOWN: - wxevent.SetEventType(wxEVT_MIDDLE_DCLICK); - break; - case wxEVT_RIGHT_DOWN: - wxevent.SetEventType(wxEVT_RIGHT_DCLICK); - break; - - default : - break; + wxevent.SetEventType(typeDouble); } - } else { // not fast enough or different button - canvas->m_lastTS = ts; - canvas->m_lastButton = 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; - */ + eventType == wxEVT_LEAVE_WINDOW || + eventType == wxEVT_MOTION + ) + return; +#endif // 0 break; } case KeyPress: { KeySym keySym; - // XComposeStatus compose; - // (void) XLookupString ((XKeyEvent *) & local_event, wxBuffer, 20, &keySym, &compose); +#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) @@ -2641,14 +2163,14 @@ void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallba 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); @@ -2665,7 +2187,7 @@ void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallba { event.SetEventType(wxEVT_CHAR); canvas->GetEventHandler()->ProcessEvent (event); - } + } } break; } @@ -2674,9 +2196,9 @@ void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallba 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) @@ -2688,7 +2210,7 @@ void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallba event.SetEventObject(canvas); event.m_keyCode = id; event.SetTimestamp(local_event.xkey.time); - + if (id > -1) { canvas->GetEventHandler()->ProcessEvent (event); @@ -2705,89 +2227,152 @@ void wxCanvasInputEvent (Widget drawingArea, XtPointer data, XmDrawingAreaCallba } break; } - case FocusOut: + 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. wxWindow::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 + // wxWindow::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: { - if (local_event.xfocus.detail != NotifyPointer) - { - wxFocusEvent event(wxEVT_KILL_FOCUS, canvas->GetId()); - event.SetEventObject(canvas); - canvas->GetEventHandler()->ProcessEvent(event); - } + eventType = wxEVT_SCROLLWIN_BOTTOM; break; } default: - break; + { + // Should never get here + wxFAIL_MSG("Unknown scroll event."); + break; + } } + + wxScrollWinEvent event(eventType, + cbs->value, + ((orientation == XmHORIZONTAL) ? + wxHORIZONTAL : wxVERTICAL)); + event.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent(event); } -void wxWindow::DoPaint() +// For repainting arbitrary windows +void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *) { - //TODO : make a temporary gc so we can do the XCopyArea below - if (m_backingPixmap && !m_needsRefresh) - { - wxPaintDC dc(this); - - GC tempGC = (GC) dc.GetBackingGC(); - - Widget widget = (Widget) GetMainWidget(); - - int scrollPosX = 0; - int scrollPosY = 0; - - // We have to test whether it's a wxScrolledWindow (hack!) - // because otherwise we don't know how many pixels have been - // scrolled. We might solve this in the future by defining - // virtual wxWindow functions to get the scroll position in pixels. - // Or, each kind of scrolled window has to implement backing - // stores itself, using generic wxWindows code. - if (this->IsKindOf(CLASSINFO(wxScrolledWindow))) - { - wxScrolledWindow* scrolledWindow = (wxScrolledWindow*) this; - int x, y; - scrolledWindow->CalcScrolledPosition(0, 0, & x, & y); - - scrollPosX = - x; - scrollPosY = - y; - } - - // TODO: This could be optimized further by only copying the - // areas in the current update region. - - // Only blit the part visible in the client area. The backing pixmap - // always starts at 0, 0 but we may be looking at only a portion of it. - wxSize clientArea = GetClientSize(); - int toBlitX = m_pixmapWidth - scrollPosX; - int toBlitY = m_pixmapHeight - scrollPosY; + Window window; + Display *display; - // Copy whichever is samller, the amount of pixmap we have to copy, - // or the size of the client area. - toBlitX = wxMin(toBlitX, clientArea.x); - toBlitY = wxMin(toBlitY, clientArea.y); + wxWindow* win = wxGetWindowFromTable(w); + if (!win) + return; - // Make sure we're not negative - toBlitX = wxMax(0, toBlitX); - toBlitY = wxMax(0, toBlitY); - - XCopyArea (XtDisplay (widget), (Pixmap) m_backingPixmap, XtWindow (widget), tempGC, - scrollPosX, scrollPosY, // Start at the scroll position - toBlitX, toBlitY, // How much of the pixmap to copy - 0, 0); // Destination - } - else + switch(event -> type) { - // Set an erase event first - wxEraseEvent eraseEvent(GetId()); - eraseEvent.SetEventObject(this); - GetEventHandler()->ProcessEvent(eraseEvent); + case Expose: + { + window = (Window) win -> GetXWindow(); + display = (Display *) win -> GetXDisplay(); - wxPaintEvent event(GetId()); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + if (event -> xexpose.count == 0) + { + win->DoPaint(); - m_needsRefresh = FALSE; + win->ClearUpdateRects(); + } + else + { + win->AddUpdateRect(event->xexpose.x, event->xexpose.y, + event->xexpose.width, event->xexpose.height); + } + + break; + } } } +// ---------------------------------------------------------------------------- +// CanvaseXXXSize() functions +// ---------------------------------------------------------------------------- + // SetSize, but as per old wxCanvas (with drawing widget etc.) void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags) { @@ -2795,38 +2380,38 @@ void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags) int oldX, oldY, oldW, oldH; GetSize(& oldW, & oldH); GetPosition(& oldX, & oldY); - + bool useOldPos = FALSE; bool useOldSize = FALSE; - + if ((x == -1) && (x == -1) && ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)) useOldPos = TRUE; else if (x == oldX && y == oldY) useOldPos = TRUE; - + if ((w == -1) && (h == -1)) useOldSize = TRUE; else if (w == oldW && h == oldH) useOldSize = TRUE; - + if (!wxNoOptimize::CanOptimize()) { useOldSize = FALSE; useOldPos = 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((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL); - + XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL); + int xx = x; int yy = y; AdjustForParentClientOrigin(xx, yy, sizeFlags); - + if (!useOldPos) { if (x > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) @@ -2834,17 +2419,17 @@ void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags) XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNx, xx, NULL); } - + if (y > -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) { XtVaSetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNy, yy, NULL); } } - + if (!useOldSize) { - + if (w > -1) { if (m_borderWidget) @@ -2857,9 +2442,9 @@ void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags) NULL); w -= 2 * (thick + margin); } - + XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL); - + Dimension spacing; Widget sbar; XtVaGetValues ((Widget) m_scrolledWindow, @@ -2871,10 +2456,12 @@ void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags) XtVaGetValues (sbar, XmNwidth, &wsbar, NULL); else wsbar = 0; - + w -= (spacing + wsbar); - - // XtVaSetValues ((Widget) m_drawingArea, XmNwidth, w, NULL); + +#if 0 + XtVaSetValues(drawingArea, XmNwidth, w, NULL); +#endif // 0 } if (h > -1) { @@ -2888,9 +2475,9 @@ void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags) NULL); h -= 2 * (thick + margin); } - + XtVaSetValues ((Widget) m_scrolledWindow, XmNheight, h, NULL); - + Dimension spacing; Widget sbar; XtVaGetValues ((Widget) m_scrolledWindow, @@ -2902,65 +2489,65 @@ void wxWindow::CanvasSetSize (int x, int y, int w, int h, int sizeFlags) XtVaGetValues (sbar, XmNheight, &wsbar, NULL); else wsbar = 0; - + h -= (spacing + wsbar); - - // XtVaSetValues ((Widget) m_drawingArea, XmNheight, h, NULL); - + +#if 0 + XtVaSetValues(drawingArea, XmNheight, h, NULL); +#endif // 0 } } - + if (managed) XtManageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow); - XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL); - - /* + XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL); + +#if 0 int ww, hh; GetClientSize (&ww, &hh); wxSizeEvent sizeEvent(wxSize(ww, hh), GetId()); sizeEvent.SetEventObject(this); - - GetEventHandler()->ProcessEvent(sizeEvent); - */ - + + GetEventHandler()->ProcessEvent(sizeEvent); +#endif // 0 } void wxWindow::CanvasSetClientSize (int w, int h) { Widget drawingArea = (Widget) m_drawingArea; - - XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL); - + + XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL); + if (w > -1) - XtVaSetValues ((Widget) m_drawingArea, XmNwidth, w, NULL); + XtVaSetValues(drawingArea, XmNwidth, w, NULL); if (h > -1) - XtVaSetValues ((Widget) m_drawingArea, XmNheight, h, NULL); - /* TODO: is this necessary? - allowRepainting = FALSE; - - XSync (XtDisplay (drawingArea), FALSE); - XEvent event; - while (XtAppPending (wxTheApp->appContext)) - { - XFlush (XtDisplay (drawingArea)); - XtAppNextEvent (wxTheApp->appContext, &event); - XtDispatchEvent (&event); - } - */ - - XtVaSetValues((Widget) m_drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL); - - /* TODO + XtVaSetValues(drawingArea, XmNheight, h, NULL); + +#if 0 + // TODO: is this necessary? + allowRepainting = FALSE; + + XSync (XtDisplay (drawingArea), FALSE); + XEvent event; + while (XtAppPending (wxTheApp->appContext)) + { + XFlush (XtDisplay (drawingArea)); + XtAppNextEvent (wxTheApp->appContext, &event); + XtDispatchEvent (&event); + } +#endif // 0 + + XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL); + +#if 0 allowRepainting = TRUE; DoRefresh (); - */ - - /* + wxSizeEvent sizeEvent(wxSize(w, h), GetId()); sizeEvent.SetEventObject(this); - - GetEventHandler()->ProcessEvent(sizeEvent); - */ + + GetEventHandler()->ProcessEvent(sizeEvent); +#endif // 0 } void wxWindow::CanvasGetClientSize (int *w, int *h) const @@ -2978,206 +2565,56 @@ void wxWindow::CanvasGetSize (int *w, int *h) const 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; -} - -void wxWindow::CanvasGetPosition (int *x, int *y) const -{ - Position xx, yy; - XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, 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()) - { - wxPoint pt(GetParent()->GetClientAreaOrigin()); - xx -= pt.x; - yy -= pt.y; - } - - *x = xx; - *y = yy; -} - -// Add to hash table, add event handler -bool wxWindow::AttachWidget (wxWindow* parent, WXWidget mainWidget, - WXWidget formWidget, int x, int y, int width, int height) -{ - wxAddWindowToTable((Widget) mainWidget, this); - 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); - } - - 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 wxWindow::DetachWidget(WXWidget widget) -{ - if (CanAddEventHandler()) - { - XtRemoveEventHandler((Widget) widget, - ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask, - False, - wxPanelItemEventHandler, - (XtPointer)this); - } - - wxDeleteWindowFromTable((Widget) widget); - return TRUE; -} - -void wxPanelItemEventHandler (Widget wid, - XtPointer client_data, - XEvent* event, - Boolean *continueToDispatch) -{ - // Widget can be a label or the actual widget. - - wxWindow *window = (wxWindow *)wxWidgetHashTable->Get((long)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. wxWindow::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 - // wxWindow::OnWhatever. - // ALSO, maybe we can use this instead of the current way of handling - // drawing area events, to simplify things. - *continueToDispatch = True; + XtVaGetValues ((Widget) m_scrolledWindow, XmNwidth, &xx, XmNheight, &yy, NULL); + else + XtVaGetValues ((Widget) m_drawingArea, XmNwidth, &xx, XmNheight, &yy, NULL); + + *w = xx; + *h = yy; } -static void wxScrollBarCallback(Widget scrollbar, XtPointer clientData, - XmScaleCallbackStruct *cbs) +void wxWindow::CanvasGetPosition (int *x, int *y) const { - Widget scrolledWindow = XtParent (scrollbar); - wxWindow *win = (wxWindow *) wxWidgetHashTable->Get ((long) scrolledWindow); - int orientation = (int) clientData; - - wxEventType eventType = wxEVT_NULL; - switch (cbs->reason) + Position xx, yy; + XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, 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()) { - case XmCR_INCREMENT: - { - eventType = wxEVT_SCROLL_LINEDOWN; - break; - } - case XmCR_DECREMENT: - { - eventType = wxEVT_SCROLL_LINEUP; - break; - } - case XmCR_DRAG: - { - eventType = wxEVT_SCROLL_THUMBTRACK; - break; - } - case XmCR_VALUE_CHANGED: - { - // TODO: Should this be intercepted too, or will it cause - // duplicate events? - eventType = wxEVT_SCROLL_THUMBTRACK; - break; - } - case XmCR_PAGE_INCREMENT: - { - eventType = wxEVT_SCROLL_PAGEDOWN; - break; - } - case XmCR_PAGE_DECREMENT: - { - eventType = wxEVT_SCROLL_PAGEUP; - break; - } - case XmCR_TO_TOP: - { - eventType = wxEVT_SCROLL_TOP; - break; - } - case XmCR_TO_BOTTOM: - { - eventType = wxEVT_SCROLL_BOTTOM; - break; - } - default: - { - // Should never get here - wxFAIL_MSG("Unknown scroll event."); - break; - } + wxPoint pt(GetParent()->GetClientAreaOrigin()); + xx -= pt.x; + yy -= pt.y; } - - wxScrollEvent event(eventType, win->GetId()); - event.SetEventObject(win); - event.SetPosition(cbs->value); - event.SetOrientation( (orientation == XmHORIZONTAL) ? wxHORIZONTAL : wxVERTICAL ); - - win->GetEventHandler()->ProcessEvent(event); + + *x = xx; + *y = yy; } +// ---------------------------------------------------------------------------- +// TranslateXXXEvent() functions +// ---------------------------------------------------------------------------- + bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent) { switch (xevent->xany.type) { - case EnterNotify: - case LeaveNotify: - case ButtonPress: - case ButtonRelease: - case MotionNotify: + case EnterNotify: // never received here - yes ? MB + case LeaveNotify: // never received here - yes ? MB + case ButtonPress: + case ButtonRelease: + case MotionNotify: { wxEventType eventType = wxEVT_NULL; - + + // FIXME: this is never true I think - MB + // if (xevent->xany.type == LeaveNotify) { - win->m_button1Pressed = FALSE; - win->m_button2Pressed = FALSE; - win->m_button3Pressed = FALSE; + win->SetButton1(FALSE); + win->SetButton2(FALSE); + win->SetButton3(FALSE); return FALSE; } else if (xevent->xany.type == MotionNotify) @@ -3186,20 +2623,49 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, } else if (xevent->xany.type == ButtonPress) { + wxevent.SetTimestamp(xevent->xbutton.time); + int button = 0; if (xevent->xbutton.button == Button1) { eventType = wxEVT_LEFT_DOWN; - win->m_button1Pressed = TRUE; + win->SetButton1(TRUE); + button = 1; } else if (xevent->xbutton.button == Button2) { eventType = wxEVT_MIDDLE_DOWN; - win->m_button2Pressed = TRUE; + win->SetButton2(TRUE); + button = 2; } else if (xevent->xbutton.button == Button3) { eventType = wxEVT_RIGHT_DOWN; - win->m_button3Pressed = TRUE; + win->SetButton3(TRUE); + button = 3; + } + + // check for a double click + // + long dclickTime = XtGetMultiClickTime((Display*) wxGetDisplay()); + long ts = wxevent.GetTimestamp(); + + int buttonLast = win->GetLastClickedButton(); + long lastTS = win->GetLastClickTime(); + if ( buttonLast && buttonLast == button && (ts - lastTS) < dclickTime ) + { + // I have a dclick + win->SetLastClick(0, ts); + if ( eventType == wxEVT_LEFT_DOWN ) + eventType = wxEVT_LEFT_DCLICK; + else if ( eventType == wxEVT_MIDDLE_DOWN ) + eventType = wxEVT_MIDDLE_DCLICK; + else if ( eventType == wxEVT_RIGHT_DOWN ) + eventType = wxEVT_RIGHT_DCLICK; + } + else + { + // not fast enough or different button + win->SetLastClick(button, ts); } } else if (xevent->xany.type == ButtonRelease) @@ -3207,31 +2673,33 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, if (xevent->xbutton.button == Button1) { eventType = wxEVT_LEFT_UP; - win->m_button1Pressed = FALSE; + win->SetButton1(FALSE); } else if (xevent->xbutton.button == Button2) { eventType = wxEVT_MIDDLE_UP; - win->m_button2Pressed = FALSE; + win->SetButton2(FALSE); } else if (xevent->xbutton.button == Button3) { eventType = wxEVT_RIGHT_UP; - win->m_button3Pressed = FALSE; + win->SetButton3(FALSE); } else return FALSE; } - else return FALSE; - - wxevent.m_eventHandle = (char *)xevent; + else + { + return FALSE; + } + 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. @@ -3242,42 +2710,51 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, dx = x1; dy = y1; } - + wxevent.m_x = xevent->xbutton.x + dx; wxevent.m_y = xevent->xbutton.y + dy; - + wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN) - || (event_left_is_down (xevent) + || (event_left_is_down (xevent) && (eventType != wxEVT_LEFT_UP))); wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN) - || (event_middle_is_down (xevent) + || (event_middle_is_down (xevent) && (eventType != wxEVT_MIDDLE_UP))); wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN) - || (event_right_is_down (xevent) + || (event_right_is_down (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.SetId(win->GetId()); + wxevent.SetEventObject(win); + return TRUE; } } return FALSE; } -bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent) +bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget WXUNUSED(widget), XEvent *xevent) { switch (xevent->xany.type) { case KeyPress: + case KeyRelease: { char buf[20]; - + KeySym keySym; - // XComposeStatus compose; - // (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, &compose); +#if 0 + XComposeStatus compose; + (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, &compose); +#endif // 0 (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) @@ -3289,10 +2766,10 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEve wxevent.SetEventObject(win); wxevent.m_keyCode = id; wxevent.SetTimestamp(xevent->xkey.time); - + wxevent.m_x = xevent->xbutton.x; wxevent.m_y = xevent->xbutton.y; - + if (id > -1) return TRUE; else @@ -3305,15 +2782,19 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEve return FALSE; } +// ---------------------------------------------------------------------------- +// Colour stuff +// ---------------------------------------------------------------------------- + #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); @@ -3343,10 +2824,10 @@ int wxComputeColours (Display *display, wxColour * back, wxColour * fore) if (result == wxNO_COLORS) result = wxFORE_COLORS; } - + Display *dpy = display; Colormap cmap = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dpy); - + if (back) { /* 5 Colours to allocate */ @@ -3360,30 +2841,30 @@ int wxComputeColours (Display *display, wxColour * back, wxColour * fore) if (!YAllocColor (dpy, cmap, &g_itemColors[wxFORE_INDEX])) result = wxNO_COLORS; } - + return (result); - + } -// Changes the foreground and background colours to be derived -// from the current background colour. -// To change the foreground colour, you must call SetForegroundColour -// explicitly. +// 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 wxWindow::ChangeBackgroundColour() { - if (GetMainWidget()) - DoChangeBackgroundColour(GetMainWidget(), m_backgroundColour); - + WXWidget mainWidget = GetMainWidget(); + if ( mainWidget ) + DoChangeBackgroundColour(mainWidget, m_backgroundColour); + // This not necessary #if 0 - + if (m_scrolledWindow && (GetMainWidget() != m_scrolledWindow)) { DoChangeBackgroundColour(m_scrolledWindow, m_backgroundColour); // Have to set the scrollbar colours back since // the scrolled window seemed to change them - wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ; - + wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE); + if (m_hScrollBar) DoChangeBackgroundColour(m_hScrollBar, backgroundColour); if (m_vScrollBar) @@ -3394,14 +2875,14 @@ void wxWindow::ChangeBackgroundColour() void wxWindow::ChangeForegroundColour() { - if (GetMainWidget()) - DoChangeForegroundColour(GetMainWidget(), m_foregroundColour); - if (m_scrolledWindow && (GetMainWidget() != m_scrolledWindow)) + WXWidget mainWidget = GetMainWidget(); + if ( mainWidget ) + DoChangeForegroundColour(mainWidget, m_foregroundColour); + if ( m_scrolledWindow && mainWidget != m_scrolledWindow ) DoChangeForegroundColour(m_scrolledWindow, m_foregroundColour); } // Change a widget's foreground and background colours. - void wxWindow::DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour) { // When should we specify the foreground, if it's calculated @@ -3412,40 +2893,51 @@ void wxWindow::DoChangeForegroundColour(WXWidget widget, wxColour& foregroundCol // Therefore SetBackgroundColour computes the foreground colour, and // SetForegroundColour changes the foreground colour. The ordering is // important. - - XtVaSetValues ((Widget) widget, - XmNforeground, foregroundColour.AllocColour(XtDisplay((Widget) widget)), - NULL); + + Widget w = (Widget)widget; + XtVaSetValues( + w, + XmNforeground, foregroundColour.AllocColour(XtDisplay(w)), + NULL + ); } void wxWindow::DoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour) { 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); } -void wxWindow::SetBackgroundColour(const wxColour& col) +bool wxWindow::SetBackgroundColour(const wxColour& col) { - m_backgroundColour = col; + if ( !wxWindowBase::SetBackgroundColour(col) ) + return FALSE; + ChangeBackgroundColour(); + + return TRUE; } -void wxWindow::SetForegroundColour(const wxColour& col) +bool wxWindow::SetForegroundColour(const wxColour& col) { - m_foregroundColour = col; + if ( !wxWindowBase::SetForegroundColour(col) ) + return FALSE; + ChangeForegroundColour(); + + return TRUE; } void wxWindow::ChangeFont(bool keepOriginalSize) @@ -3454,18 +2946,18 @@ void wxWindow::ChangeFont(bool keepOriginalSize) // 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_windowFont.Ok()) + if (w && m_font.Ok()) { int width, height, width1, height1; GetSize(& width, & height); - + // lesstif 0.87 hangs here -#ifndef LESSTIF_VERSION +#ifndef LESSTIF_VERSION XtVaSetValues (w, - XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(w)), + XmNfontList, (XmFontList) m_font.GetFontList(1.0, XtDisplay(w)), NULL); #endif - + GetSize(& width1, & height1); if (keepOriginalSize && (width != width1 || height != height1)) { @@ -3474,152 +2966,47 @@ void wxWindow::ChangeFont(bool keepOriginalSize) } } -void wxWindow::SetFont(const wxFont& font) -{ - m_windowFont = font; - ChangeFont(); -} +// ---------------------------------------------------------------------------- +// global functions +// ---------------------------------------------------------------------------- -void wxWindow::SetToolTip(const wxString& tooltip) +wxWindow *wxGetActiveWindow() { // TODO + wxFAIL_MSG("Not implemented"); + return NULL; } -void wxWindow::ClearUpdateRects() +// Find the wxWindow at the current mouse position, returning the mouse +// position. +wxWindow* wxFindWindowAtPointer(wxPoint& pt) { - wxNode* node = m_updateRects.First(); - while (node) - { - wxRect* rect = (wxRect*) node->Data(); - delete rect; - node = node->Next(); - } - m_updateRects.Clear(); + return wxFindWindowAtPoint(wxGetMousePosition()); } -bool wxWindow::ProcessAccelerator(wxKeyEvent& event) +// Get the current mouse position. +wxPoint wxGetMousePosition() { - 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->IsKindOf(CLASSINFO(wxFrame)) && !parent->IsKindOf(CLASSINFO(wxDialog))) - parent = parent->GetParent(); - - if (!parent) - return FALSE; - - if (parent->IsKindOf(CLASSINFO(wxFrame))) - { - // Try for a menu command - wxFrame* frame = (wxFrame*) parent; - if (frame->GetMenuBar()) - { - wxMenuItem* item = frame->GetMenuBar()->FindItemForId(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 (child->IsKindOf(CLASSINFO(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; -} + Display *display = (Display*) wxGetDisplay(); + Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display)); + Window rootReturn, childReturn; + int rootX, rootY, winX, winY; + unsigned int maskReturn; -/* -* wxNoOptimize: switch off size optimization -*/ + XQueryPointer (display, + rootWindow, + &rootReturn, + &childReturn, + &rootX, &rootY, &winX, &winY, &maskReturn); + return wxPoint(rootX, rootY); +} -int wxNoOptimize::m_count = 0; +// ---------------------------------------------------------------------------- +// wxNoOptimize: switch off size optimization +// ---------------------------------------------------------------------------- -wxNoOptimize::wxNoOptimize() -{ - m_count ++; -} +int wxNoOptimize::ms_count = 0; -wxNoOptimize::~wxNoOptimize() -{ - m_count --; -} -bool wxNoOptimize::CanOptimize() -{ - return (m_count == 0); -} -// For repainting arbitrary windows -void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *) -{ - Window window; - Display *display; - - wxWindow* win = (wxWindow *)wxWidgetHashTable->Get((long)w); - if (!win) - return; - - switch(event -> type) - { - case Expose : - { - window = (Window) win -> GetXWindow(); - display = (Display *) win -> GetXDisplay(); - - wxRect* rect = new wxRect(event->xexpose.x, event->xexpose.y, - event->xexpose.width, event->xexpose.height); - win->m_updateRects.Append((wxObject*) rect); - - if (event -> xexpose.count == 0) - { - win->DoPaint(); - - win->ClearUpdateRects(); - } - break; - } - default : - { - cout << "\n\nNew Event ! is = " << event -> type << "\n"; - break; - } - } -}