#endif
#include "wx/x11/private.h"
+#include "X11/Xutil.h"
#include <string.h>
// event tables
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxWindowX11, wxWindowBase)
+IMPLEMENT_ABSTRACT_CLASS(wxWindowX11, wxWindowBase)
BEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase)
EVT_SYS_COLOUR_CHANGED(wxWindowX11::OnSysColourChanged)
// generic initializations first
InitBase();
- // Motif-specific
- m_needsRefresh = TRUE;
- m_mainWidget = (WXWidget) 0;
-
- m_button1Pressed =
- m_button2Pressed =
- m_button3Pressed = FALSE;
+ // X11-specific
+ m_mainWidget = (WXWindow) 0;
m_winCaptured = FALSE;
m_isShown = TRUE;
m_isBeingDeleted = FALSE;
- m_hScrollBar =
- m_vScrollBar =
- m_borderWidget =
- m_scrolledWindow =
- m_drawingArea = (WXWidget) 0;
-
- m_hScroll =
- m_vScroll = FALSE;
-
- m_scrollPosX =
- m_scrollPosY = 0;
-
- m_backingPixmap = (WXPixmap) 0;
- m_pixmapWidth =
- m_pixmapHeight = 0;
-
- m_pixmapOffsetX =
- m_pixmapOffsetY = 0;
-
m_lastTS = 0;
m_lastButton = 0;
- m_canAddEventHandler = FALSE;
}
// real construction (Init() must have been called before!)
parent->AddChild(this);
+ int w = size.GetWidth();
+ int h = size.GetHeight();
+ int x = size.GetX();
+ int y = size.GetY();
+ if (w == -1) w = 20;
+ if (h == -1) h = 20;
+ if (x == -1) x = 0;
+ if (y == -1) y = 0;
+
+ Display *xdisplay = (Display*) wxGlobalDisplay();
+ int xscreen = DefaultScreen( xdisplay );
+ Colormap cm = DefaultColormap( xdisplay, xscreen );
+
m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+ m_backgroundColour.CalcPixel( (WXColormap) cm );
+ m_hasBgCol = TRUE;
+
m_foregroundColour = *wxBLACK;
+ m_foregroundColour.CalcPixel( (WXColormap) cm );
+
- if (style & wxSIMPLE_BORDER)
- {
- } else if (style & wxSUNKEN_BORDER)
- {
- } else if (style & wxRAISED_BORDER)
- {
- }
+ Window parentWindow = (Window) parent->GetMainWindow();
- // TODO: create XWindow
+ Window window = XCreateSimpleWindow(
+ xdisplay, parentWindow,
+ x, y, w, h, 0,
+ m_backgroundColour.GetPixel(),
+ m_backgroundColour.GetPixel() );
+
+ m_mainWidget = (WXWindow) window;
-#if 0
- wxAddWindowToTable((Window) m_drawingArea, this);
- wxAddWindowToTable((Window) m_scrolledWindow, this);
-#endif
+ // Select event types wanted
+ XSelectInput(wxGlobalDisplay(), window,
+ ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+ ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+ KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+ PropertyChangeMask);
+
+ wxAddWindowToTable(window, (wxWindow*) this);
+
+ // Is a subwindow, so map immediately
+ m_isShown = TRUE;
+ XMapWindow(wxGlobalDisplay(), window);
// Without this, the cursor may not be restored properly (e.g. in splitter
// sample).
}
// Destructor
-wxWindowX11::~wxWindow()
+wxWindowX11::~wxWindowX11()
{
if (g_captureWindow == this)
g_captureWindow = NULL;
m_isBeingDeleted = TRUE;
- // Motif-specific actions first
- WXWindow wMain = GetMainWindow();
- if ( wMain )
+ // X11-specific actions first
+ Window main = (Window) m_mainWidget;
+ if ( main )
{
// Removes event handlers
- //DetachWidget(wMain);
+ //DetachWidget(main);
}
- ClearUpdateRects();
-
- if ( m_parent )
+ if (m_parent)
m_parent->RemoveChild( this );
- // TODO
-
-#if 0
- // If m_drawingArea, we're a fully-fledged window with drawing area,
- // scrollbars etc. (what wxCanvas used to be)
- if ( m_drawingArea )
- {
- // Destroy children before destroying self
- DestroyChildren();
-
- 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
-#endif
- DestroyChildren();
-
+ DestroyChildren();
// Destroy the window
- if (GetMainWindow())
- {
- // TODO
- // XtDestroyWidget((Widget) GetMainWidget());
- SetMainWindow((WXWindow) NULL);
- }
-}
-
-// ----------------------------------------------------------------------------
-// scrollbar management
-// ----------------------------------------------------------------------------
-
-// Helper function
-void wxWindowX11::CreateScrollbar(wxOrientation orientation)
-{
- // TODO
-#if 0
- wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
-
- XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
-
- // Add scrollbars if required
- if (orientation == wxHORIZONTAL)
- {
- Widget hScrollBar = XtVaCreateManagedWidget ("hsb",
- xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
- XmNorientation, XmHORIZONTAL,
- NULL);
- XtAddCallback (hScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
- XtAddCallback (hScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmHORIZONTAL);
-
- XtVaSetValues (hScrollBar,
- XmNincrement, 1,
- XmNvalue, 0,
- NULL);
-
- m_hScrollBar = (WXWidget) hScrollBar;
-
- wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
- DoChangeBackgroundColour(m_hScrollBar, backgroundColour, TRUE);
-
- XtRealizeWidget(hScrollBar);
-
- XtVaSetValues((Widget) m_scrolledWindow,
- XmNhorizontalScrollBar, (Widget) m_hScrollBar,
- NULL);
-
- m_hScroll = TRUE;
-
- wxAddWindowToTable( hScrollBar, this );
- }
-
- if (orientation == wxVERTICAL)
- {
- Widget vScrollBar = XtVaCreateManagedWidget ("vsb",
- xmScrollBarWidgetClass, (Widget) m_scrolledWindow,
- XmNorientation, XmVERTICAL,
- NULL);
- XtAddCallback (vScrollBar, XmNvalueChangedCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNdragCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNincrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNdecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNpageIncrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNpageDecrementCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNtoTopCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
- XtAddCallback (vScrollBar, XmNtoBottomCallback, (XtCallbackProc) wxScrollBarCallback, (XtPointer) XmVERTICAL);
-
- XtVaSetValues (vScrollBar,
- XmNincrement, 1,
- XmNvalue, 0,
- NULL);
-
- m_vScrollBar = (WXWidget) vScrollBar;
- wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
- DoChangeBackgroundColour(m_vScrollBar, backgroundColour, TRUE);
-
- XtRealizeWidget(vScrollBar);
-
- XtVaSetValues((Widget) m_scrolledWindow,
- XmNverticalScrollBar, (Widget) m_vScrollBar,
- NULL);
-
- m_vScroll = TRUE;
-
- wxAddWindowToTable( vScrollBar, this );
- }
-
- XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
-#endif
-}
-
-void wxWindowX11::DestroyScrollbar(wxOrientation orientation)
-{
- // TODO
-#if 0
- wxCHECK_RET( m_drawingArea, "this window can't have scrollbars" );
-
- XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_NONE, NULL);
- // Add scrollbars if required
- if (orientation == wxHORIZONTAL)
+ if (main)
{
- 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 = FALSE;
-
- XtVaSetValues((Widget) m_scrolledWindow,
- XmNverticalScrollBar, (Widget) 0,
- NULL);
-
+ XSelectInput( wxGlobalDisplay(), main, NoEventMask);
+ wxDeleteWindowFromTable( main );
+ XDestroyWindow( wxGlobalDisplay(), main );
+ m_mainWidget = NULL;
}
- XtVaSetValues((Widget) m_scrolledWindow, XmNresizePolicy, XmRESIZE_ANY, NULL);
-#endif
}
// ---------------------------------------------------------------------------
void wxWindowX11::SetFocus()
{
- // TODO
-#if 0
- Widget wMain = (Widget) GetMainWidget();
- XmProcessTraversal(wMain, XmTRAVERSE_CURRENT);
- XmProcessTraversal((Widget) GetMainWidget(), XmTRAVERSE_CURRENT);
-#endif
+ Window wMain = (Window) GetMainWindow();
+ if (wMain)
+ {
+ XSetInputFocus(wxGlobalDisplay(), wMain, RevertToParent, CurrentTime);
+
+ XWMHints wmhints;
+ wmhints.flags = InputHint;
+ wmhints.input = True;
+ XSetWMHints(wxGlobalDisplay(), wMain, &wmhints);
+ }
}
// Get the window with the focus
wxWindow *wxWindowBase::FindFocus()
{
- // TODO
- return NULL;
-#if 0
+ Window wFocus = (Window) 0;
+ int revert = 0;
- // TODO Problems:
- // (1) Can there be multiple focussed widgets in an application?
- // In which case we need to find the top-level window that's
- // currently active.
- // (2) The widget with the focus may not be in the widget table
- // depending on which widgets I put in the table
- wxWindow *winFocus = (wxWindow *)NULL;
- for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
- node;
- node = node->GetNext() )
+ XGetInputFocus(wxGlobalDisplay(), & wFocus, & revert);
+ if (wFocus)
{
- wxWindow *win = node->GetData();
-
- Widget w = XmGetFocusWidget ((Widget) win->GetTopWidget());
-
- if (w != (Widget) NULL)
+ wxWindow *win = NULL;
+ do
{
- winFocus = wxGetWindowFromTable(w);
- if ( winFocus )
- break;
- }
+ win = wxGetWindowFromTable(wFocus);
+ wFocus = wxGetWindowParent(wFocus);
+ } while (wFocus && !win);
+
+ return win;
}
- return winFocus;
-#endif
+ return NULL;
}
+// Enabling/disabling handled by event loop, and not sending events
+// if disabled.
bool wxWindowX11::Enable(bool enable)
{
if ( !wxWindowBase::Enable(enable) )
return FALSE;
-
- // TODO
-#if 0
- Widget wMain = (Widget)GetMainWidget();
- if ( wMain )
- {
- XtSetSensitive(wMain, enable);
- XmUpdateDisplay(wMain);
- }
-#endif
-
+
return TRUE;
}
bool wxWindowX11::Show(bool show)
{
- if ( !wxWindowBase::Show(show) )
- return FALSE;
+ wxWindowBase::Show(show);
Window xwin = (Window) GetXWindow();
Display *xdisp = (Display*) GetXDisplay();
if (show)
+ {
+ wxString msg;
+ msg.Printf("Mapping window of type %s", GetClassInfo()->GetClassName());
+ wxLogDebug(msg);
XMapWindow(xdisp, xwin);
+ XSync(xdisp, False);
+ }
else
+ {
+ wxString msg;
+ msg.Printf("Unmapping window of type %s", GetClassInfo()->GetClassName());
+ wxLogDebug(msg);
XUnmapWindow(xdisp, xwin);
+ }
return TRUE;
}
// Raise the window to the top of the Z order
void wxWindowX11::Raise()
{
- Window window = GetTopWindow();
- if (window)
- XRaiseWindow(wxGetDisplay(), window);
+ if (m_mainWidget)
+ XRaiseWindow( wxGlobalDisplay(), (Window) m_mainWidget );
}
// Lower the window to the bottom of the Z order
void wxWindowX11::Lower()
{
- Window window = GetTopWindow();
- if (window)
- XLowerWindow(wxGetDisplay(), window);
-}
-
-void wxWindowX11::SetTitle(const wxString& title)
-{
- // TODO
-// XtVaSetValues((Widget)GetMainWidget(), XmNtitle, title.c_str(), NULL);
-}
-
-wxString wxWindowX11::GetTitle() const
-{
- // TODO
- return wxEmptyString;
-#if 0
- char *title;
- XtVaGetValues((Widget)GetMainWidget(), XmNtitle, &title, NULL);
-
- return wxString(title);
-#endif
+ if (m_mainWidget)
+ XLowerWindow( wxGlobalDisplay(), (Window) m_mainWidget );
}
void wxWindowX11::DoCaptureMouse()
{
- g_captureWindow = this;
+ if ((g_captureWindow != NULL) && (g_captureWindow != this))
+ {
+ wxASSERT_MSG(FALSE, "Trying to capture before mouse released.");
+
+ // Core dump now
+ int *tmp = NULL;
+ (*tmp) = 1;
+ return;
+ }
+
if ( m_winCaptured )
return;
- // TODO
+ g_captureWindow = (wxWindow*) this;
+
+ if (GetMainWindow())
+ {
+ int res = XGrabPointer(wxGlobalDisplay(), (Window) GetMainWindow(),
+ FALSE,
+ ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
+ GrabModeAsync,
+ GrabModeAsync,
+ None,
+ None, /* cursor */ // TODO: This may need to be set to the cursor of this window
+ CurrentTime);
+
+ if (res != GrabSuccess)
+ {
+ wxString msg;
+ msg.Printf("Failed to grab pointer for window %s", this->GetClassInfo()->GetClassName());
+ wxLogDebug(msg);
+ if (res == GrabNotViewable)
+ {
+ wxLogDebug("This is not a viewable window - perhaps not shown yet?");
+ }
+ g_captureWindow = NULL;
+ return;
+ }
+ wxLogDebug("Grabbed pointer");
+
#if 0
- Widget wMain = (Widget)GetMainWidget();
- if ( wMain )
- XtAddGrab(wMain, TRUE, FALSE);
+ res = XGrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
+ (Window) GetMainWindow(),
+ FALSE,
+ ButtonPressMask | ButtonReleaseMask | ButtonMotionMask,
+ GrabModeAsync,
+ GrabModeAsync,
+ None,
+ None);
+
+ if (res != GrabSuccess)
+ {
+ wxLogDebug("Failed to grab mouse buttons.");
+ XUngrabPointer(wxGlobalDisplay(), CurrentTime);
+ return;
+ }
+#endif
+
+#if 0
+ res = XGrabKeyboard(wxGlobalDisplay(), (Window) GetMainWindow(),
+#if 0
+ ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask,
+#else
+ FALSE,
#endif
+ GrabModeAsync,
+ GrabModeAsync,
+ CurrentTime);
- m_winCaptured = TRUE;
+ if (res != GrabSuccess)
+ {
+ wxLogDebug("Failed to grab keyboard.");
+ XUngrabPointer(wxGlobalDisplay(), CurrentTime);
+#if 0
+ XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
+ (Window) GetMainWindow());
+#endif
+ return;
+ }
+#endif
+
+ m_winCaptured = TRUE;
+ }
}
void wxWindowX11::DoReleaseMouse()
if ( !m_winCaptured )
return;
- // TODO
-#if 0
- Widget wMain = (Widget)GetMainWidget();
+ Window wMain = (Window)GetMainWindow();
+
if ( wMain )
- XtRemoveGrab(wMain);
+ {
+ XUngrabPointer(wxGlobalDisplay(), wMain);
+#if 0
+ XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
+ wMain);
+ XUngrabKeyboard(wxGlobalDisplay(), CurrentTime);
#endif
+ }
+ wxLogDebug("Ungrabbed pointer");
m_winCaptured = FALSE;
}
return FALSE;
}
- ChangeFont();
-
return TRUE;
}
// Coordinates relative to the window
void wxWindowX11::WarpPointer (int x, int y)
{
- Window wClient = (Window) GetClientWindow();
-
- XWarpPointer(wxGetDisplay(), None, wClient, 0, 0, 0, 0, x, y);
-}
-
-// ---------------------------------------------------------------------------
-// scrolling stuff
-// ---------------------------------------------------------------------------
-
-int wxWindowX11::GetScrollPos(int orient) const
-{
- if (orient == wxHORIZONTAL)
- return m_scrollPosX;
- else
- return m_scrollPosY;
-}
-
-// This now returns the whole range, not just the number of positions that we
-// can scroll.
-int wxWindowX11::GetScrollRange(int WXUNUSED(orient)) const
-{
- // TODO
- return 0;
-#if 0
- Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
- wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
-
- int range;
- XtVaGetValues(scrollBar, XmNmaximum, &range, NULL);
- return range;
-#endif
-}
-
-int wxWindowX11::GetScrollThumb(int orient) const
-{
- // TODO
- return 0;
-
-#if 0
- Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
- wxCHECK_MSG( scrollBar, 0, "no such scrollbar" );
-
- int thumb;
- XtVaGetValues(scrollBar, XmNsliderSize, &thumb, NULL);
- return thumb;
-#endif
-}
-
-void wxWindowX11::SetScrollPos(int WXUNUSED(orient), int WXUNUSED(pos), bool WXUNUSED(refresh))
-{
- // TODO
-
-#if 0
- Widget scrollBar = (Widget)GetScrollbar((wxOrientation)orient);
-
- if ( scrollBar )
- {
- XtVaSetValues (scrollBar, XmNvalue, pos, NULL);
- }
-#endif
- SetInternalScrollPos((wxOrientation)orient, pos);
-}
-
-// New function that will replace some of the above.
-void wxWindowX11::SetScrollbar(int WXUNUSED(orient), int WXUNUSED(pos), int WXUNUSED(thumbVisible),
- int WXUNUSED(range), bool WXUNUSED(refresh))
-{
- // TODO
-#if 0
- int oldW, oldH;
- GetSize(& oldW, & oldH);
-
- if (range == 0)
- range = 1;
- if (thumbVisible == 0)
- thumbVisible = 1;
-
- if (thumbVisible > range)
- thumbVisible = range;
-
- // Save the old state to see if it changed
- WXWidget oldScrollBar = GetScrollbar((wxOrientation)orient);
-
- if (orient == wxHORIZONTAL)
- {
- if (thumbVisible == range)
- {
- if (m_hScrollBar)
- DestroyScrollbar(wxHORIZONTAL);
- }
- else
- {
- if (!m_hScrollBar)
- CreateScrollbar(wxHORIZONTAL);
- }
- }
- if (orient == wxVERTICAL)
- {
- if (thumbVisible == range)
- {
- if (m_vScrollBar)
- DestroyScrollbar(wxVERTICAL);
- }
- else
- {
- if (!m_vScrollBar)
- CreateScrollbar(wxVERTICAL);
- }
- }
- WXWidget newScrollBar = GetScrollbar((wxOrientation)orient);
-
- if (oldScrollBar != newScrollBar)
- {
- // This is important! Without it, scrollbars misbehave badly.
- XtUnrealizeWidget((Widget) m_scrolledWindow);
- XmScrolledWindowSetAreas ((Widget) m_scrolledWindow, (Widget) m_hScrollBar, (Widget) m_vScrollBar, (Widget) m_drawingArea);
- XtRealizeWidget((Widget) m_scrolledWindow);
- XtManageChild((Widget) m_scrolledWindow);
- }
-
- if (newScrollBar)
- {
- XtVaSetValues((Widget) newScrollBar,
- XmNvalue, pos,
- XmNminimum, 0,
- XmNmaximum, range,
- XmNsliderSize, thumbVisible,
- NULL);
- }
-
- SetInternalScrollPos((wxOrientation)orient, pos);
-
- int newW, newH;
- GetSize(& newW, & newH);
-
- // Adjusting scrollbars can resize the canvas accidentally
- if (newW != oldW || newH != oldH)
- SetSize(-1, -1, oldW, oldH);
-#endif
+ if (m_mainWidget)
+ XWarpPointer( wxGlobalDisplay(), None, (Window) m_mainWidget, 0, 0, 0, 0, x, y);
}
// Does a physical scroll
void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
{
+#if 0
int x, y, w, h;
if (rect)
{
int x2 = (dx >= 0) ? x + dx : x;
int y2 = (dy >= 0) ? y + dy : y;
- wxClientDC dc(this);
+ wxClientDC dc((wxWindow*) this);
dc.SetLogicalFunction (wxCOPY);
Window window = (Window) GetMainWindow();
- Display* display = wxGetDisplay();
+ Display* display = wxGlobalDisplay();
XCopyArea(display, window, window, (GC) dc.GetGC(),
x1, y1, w1, h1, x2, y2);
delete rect;
node = node->Next();
}
-
- // TODO
-
- // XmUpdateDisplay((Widget) GetMainWidget());
+#endif
}
// ---------------------------------------------------------------------------
// Get total size
void wxWindowX11::DoGetSize(int *x, int *y) const
{
- // TODO
-#if 0
- if (m_drawingArea)
+ Window window = (Window) m_mainWidget;
+ if (window)
{
- CanvasGetSize(x, y);
- return;
+ XWindowAttributes attr;
+ Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
+ wxASSERT(status);
+
+ if (status)
+ {
+ *x = attr.width /* + 2*m_borderSize */ ;
+ *y = attr.height /* + 2*m_borderSize */ ;
+ }
}
-
- Widget widget = (Widget) GetTopWidget();
- Dimension xx, yy;
- XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
- if(x) *x = xx; if(y) *y = yy;
-#endif
}
void wxWindowX11::DoGetPosition(int *x, int *y) const
{
- // TODO
-#if 0
- if (m_drawingArea)
- {
- CanvasGetPosition(x, y);
- return;
- }
- Widget widget = (Widget) GetTopWidget();
- Position xx, yy;
- XtVaGetValues(widget, XmNx, &xx, XmNy, &yy, NULL);
-
- // We may be faking the client origin. So a window that's really at (0, 30)
- // may appear (to wxWin apps) to be at (0, 0).
- if (GetParent())
+ Window window = (Window) m_mainWidget;
+ if (window)
{
- wxPoint pt(GetParent()->GetClientAreaOrigin());
- xx -= pt.x;
- yy -= pt.y;
+ XWindowAttributes attr;
+ Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
+ wxASSERT(status);
+
+ if (status)
+ {
+ *x = attr.x;
+ *y = attr.y;
+
+ // We may be faking the client origin. So a window that's really at (0, 30)
+ // may appear (to wxWin apps) to be at (0, 0).
+ if (GetParent())
+ {
+ wxPoint pt(GetParent()->GetClientAreaOrigin());
+ *x -= pt.x;
+ *y -= pt.y;
+ }
+ }
}
-
- if(x) *x = xx; if(y) *y = yy;
-#endif
}
void wxWindowX11::DoScreenToClient(int *x, int *y) const
{
- Display *display = wxGetDisplay();
+ Display *display = wxGlobalDisplay();
Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));
- Window thisWindow = (Window) GetClientWindow();
+ Window thisWindow = (Window) m_mainWidget;
Window childWindow;
int xx = *x;
void wxWindowX11::DoClientToScreen(int *x, int *y) const
{
- Display *display = wxGetDisplay();
+ Display *display = wxGlobalDisplay();
Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));
- Window thisWindow = (Window) GetClientWindow();
+ Window thisWindow = (Window) m_mainWidget;
Window childWindow;
int xx = *x;
// Get size *available for subwindows* i.e. excluding menu bar etc.
void wxWindowX11::DoGetClientSize(int *x, int *y) const
{
- // TODO
-#if 0
- Widget widget = (Widget) GetClientWidget();
- Dimension xx, yy;
- XtVaGetValues(widget, XmNwidth, &xx, XmNheight, &yy, NULL);
- if(x) *x = xx; if(y) *y = yy;
-#endif
+ Window window = (Window) m_mainWidget;
+
+ if (window)
+ {
+ XWindowAttributes attr;
+ Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr );
+ wxASSERT(status);
+
+ if (status)
+ {
+ *x = attr.width ;
+ *y = attr.height ;
+ }
+ }
}
void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- // TODO
-#if 0
- // A bit of optimization to help sort out the flickers.
- int oldX, oldY, oldW, oldH;
- GetSize(& oldW, & oldH);
- GetPosition(& oldX, & oldY);
+ if (!GetMainWindow())
+ return;
+
+ XWindowChanges windowChanges;
+ int valueMask = 0;
- if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+ if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
- if ( x == -1 )
- x = oldX;
- if ( y == -1 )
- y = oldY;
+ int yy = 0;
+ AdjustForParentClientOrigin( x, yy, sizeFlags);
+ windowChanges.x = x;
+ valueMask |= CWX;
}
-
- if ( width == -1 )
- width = oldW;
- if ( height == -1 )
- height = oldH;
-
- bool nothingChanged = (x == oldX) && (y == oldY) &&
- (width == oldW) && (height == oldH);
-
- if (!wxNoOptimize::CanOptimize())
+ if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
- nothingChanged = FALSE;
+ int xx = 0;
+ AdjustForParentClientOrigin( xx, y, sizeFlags);
+ windowChanges.y = y;
+ valueMask |= CWY;
}
-
- if ( !nothingChanged )
+ if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
- if (m_drawingArea)
- {
- CanvasSetSize(x, y, width, height, sizeFlags);
- return;
- }
-
- Widget widget = (Widget) GetTopWidget();
- if (!widget)
- return;
-
- bool managed = XtIsManaged( widget );
- if (managed)
- XtUnmanageChild(widget);
-
- int xx = x;
- int yy = y;
- AdjustForParentClientOrigin(xx, yy, sizeFlags);
-
- DoMoveWindow(xx, yy, width, height);
-
- if (managed)
- XtManageChild(widget);
-
+ windowChanges.width = width /* - m_borderSize*2 */;
+ valueMask |= CWWidth;
}
-#endif
+ if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ {
+ windowChanges.height = height /* -m_borderSize*2*/;
+ valueMask |= CWHeight;
+ }
+
+ XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
+ valueMask, & windowChanges);
}
void wxWindowX11::DoSetClientSize(int width, int height)
{
- // TODO
-#if 0
- if (m_drawingArea)
- {
- CanvasSetClientSize(width, height);
+ if (!GetMainWindow())
return;
- }
- Widget widget = (Widget) GetTopWidget();
+ XWindowChanges windowChanges;
+ int valueMask = 0;
- 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);
-#endif
+ if (width != -1)
+ {
+ windowChanges.width = width ;
+ valueMask |= CWWidth;
+ }
+ if (height != -1)
+ {
+ windowChanges.height = height ;
+ valueMask |= CWHeight;
+ }
+ XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
+ valueMask, & windowChanges);
}
// For implementation purposes - sometimes decorations make the client area
void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
{
- // TODO
-#if 0
m_minWidth = minW;
m_minHeight = minH;
m_maxWidth = maxW;
m_maxHeight = maxH;
- wxFrame *frame = wxDynamicCast(this, wxFrame);
- if ( !frame )
+ XSizeHints sizeHints;
+ sizeHints.flags = 0;
+
+ if (minW > -1 && minH > -1)
{
- // TODO what about dialogs?
- return;
+ sizeHints.flags |= PMinSize;
+ sizeHints.min_width = minW;
+ sizeHints.min_height = minH;
+ }
+ if (maxW > -1 && maxH > -1)
+ {
+ sizeHints.flags |= PMaxSize;
+ sizeHints.max_width = maxW;
+ sizeHints.max_height = maxH;
+ }
+ if (incW > -1 && incH > -1)
+ {
+ sizeHints.flags |= PResizeInc;
+ sizeHints.width_inc = incW;
+ sizeHints.height_inc = incH;
}
- Widget widget = (Widget) frame->GetShellWidget();
-
- if (minW > -1)
- XtVaSetValues(widget, XmNminWidth, minW, NULL);
- if (minH > -1)
- XtVaSetValues(widget, XmNminHeight, minH, NULL);
- if (maxW > -1)
- XtVaSetValues(widget, XmNmaxWidth, maxW, NULL);
- if (maxH > -1)
- XtVaSetValues(widget, XmNmaxHeight, maxH, NULL);
- if (incW > -1)
- XtVaSetValues(widget, XmNwidthInc, incW, NULL);
- if (incH > -1)
- XtVaSetValues(widget, XmNheightInc, incH, NULL);
-#endif
+ XSetWMNormalHints(wxGlobalDisplay(), (Window) GetMainWindow(), & sizeHints);
}
void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
{
- // TODO
-#if 0
- XtVaSetValues((Widget)GetTopWidget(),
- XmNx, x,
- XmNy, y,
- XmNwidth, width,
- XmNheight, height,
- NULL);
-#endif
+ DoSetSize(x, y, width, height);
}
// ---------------------------------------------------------------------------
void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect)
{
- m_needsRefresh = TRUE;
- Display *display = wxGetDisplay();
- Window thisWindow = (Widget) GetMainWindow();
-
- XExposeEvent dummyEvent;
- int width, height;
- GetSize(&width, &height);
-
- dummyEvent.type = Expose;
- dummyEvent.display = display;
- dummyEvent.send_event = True;
- dummyEvent.window = thisWindow;
+ if (eraseBack)
+ {
+ if (rect)
+ {
+ // Schedule for later Updating in ::Update() or ::OnInternalIdle().
+ m_clearRegion.Union( rect->x, rect->y, rect->width, rect->height );
+ }
+ else
+ {
+ int height,width;
+ GetSize( &width, &height );
+
+ // Schedule for later Updating in ::Update() or ::OnInternalIdle().
+ m_clearRegion.Clear();
+ m_clearRegion.Union( 0, 0, width, height );
+ }
+ }
+
if (rect)
{
- dummyEvent.x = rect->x;
- dummyEvent.y = rect->y;
- dummyEvent.width = rect->width;
- dummyEvent.height = rect->height;
+ // Schedule for later Updating in ::Update() or ::OnInternalIdle().
+ m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height );
}
else
{
- dummyEvent.x = 0;
- dummyEvent.y = 0;
- dummyEvent.width = width;
- dummyEvent.height = height;
+ int height,width;
+ GetSize( &width, &height );
+
+ // Schedule for later Updating in ::Update() or ::OnInternalIdle().
+ m_updateRegion.Clear();
+ m_updateRegion.Union( 0, 0, width, height );
}
- dummyEvent.count = 0;
+
+ // Actually don't schedule yet..
+ Update();
+}
- if (eraseBack)
+void wxWindowX11::Update()
+{
+ if (!m_updateRegion.IsEmpty())
{
- wxClientDC dc(this);
- wxBrush backgroundBrush(GetBackgroundColour(), wxSOLID);
- dc.SetBackground(backgroundBrush);
- if (rect)
- dc.Clear(*rect);
- else
- dc.Clear();
+ X11SendPaintEvents();
}
-
- XSendEvent(display, thisWindow, False, ExposureMask, (XEvent *)&dummyEvent);
}
void wxWindowX11::Clear()
{
- wxClientDC dc(this);
+ wxClientDC dc((wxWindow*) this);
wxBrush brush(GetBackgroundColour(), wxSOLID);
dc.SetBackground(brush);
dc.Clear();
}
-void wxWindowX11::ClearUpdateRects()
+void wxWindowX11::X11SendPaintEvents()
{
- wxRectList::Node* node = m_updateRects.GetFirst();
- while (node)
+ m_clipPaintRegion = TRUE;
+
+ // if (!m_clearRegion.IsEmpty())
{
- wxRect* rect = node->GetData();
- delete rect;
- node = node->GetNext();
+ wxWindowDC dc( (wxWindow*)this );
+ dc.SetClippingRegion( m_clearRegion );
+
+ wxEraseEvent erase_event( GetId(), &dc );
+ erase_event.SetEventObject( this );
+
+ if (!GetEventHandler()->ProcessEvent(erase_event))
+ {
+ wxRegionIterator upd( m_clearRegion );
+ while (upd)
+ {
+ XClearArea( wxGlobalDisplay(), (Window) m_mainWidget,
+ upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight(), False );
+ upd ++;
+ }
+ }
+ m_clearRegion.Clear();
}
- m_updateRects.Clear();
-}
+ wxNcPaintEvent nc_paint_event( GetId() );
+ nc_paint_event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent( nc_paint_event );
-void wxWindowX11::DoPaint()
-{
- // Set an erase event first
- wxEraseEvent eraseEvent(GetId());
- eraseEvent.SetEventObject(this);
- GetEventHandler()->ProcessEvent(eraseEvent);
-
- wxPaintEvent event(GetId());
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
-
- m_needsRefresh = FALSE;
+ wxPaintEvent paint_event( GetId() );
+ paint_event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent( paint_event );
+
+ m_clipPaintRegion = FALSE;
}
// ----------------------------------------------------------------------------
UpdateWindowUI();
}
-// ----------------------------------------------------------------------------
-// accelerators
-// ----------------------------------------------------------------------------
-
-bool wxWindowX11::ProcessAccelerator(wxKeyEvent& event)
-{
- if (!m_acceleratorTable.Ok())
- return FALSE;
-
- int count = m_acceleratorTable.GetCount();
- wxAcceleratorEntry* entries = m_acceleratorTable.GetEntries();
- int i;
- for (i = 0; i < count; i++)
- {
- wxAcceleratorEntry* entry = & (entries[i]);
- if (entry->MatchesEvent(event))
- {
- // Bingo, we have a match. Now find a control that matches the
- // entry command id.
-
- // Need to go up to the top of the window hierarchy, since it might
- // be e.g. a menu item
- wxWindow* parent = this;
- while ( parent && !parent->IsTopLevel() )
- parent = parent->GetParent();
-
- if (!parent)
- return FALSE;
-
- wxFrame* frame = wxDynamicCast(parent, wxFrame);
- if ( frame )
- {
- // Try for a menu command
- if (frame->GetMenuBar())
- {
- wxMenuItem* item = frame->GetMenuBar()->FindItem(entry->GetCommand());
- if (item)
- {
- wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
- commandEvent.SetEventObject(frame);
-
- // If ProcessEvent returns TRUE (it was handled), then
- // the calling code will skip the event handling.
- return frame->GetEventHandler()->ProcessEvent(commandEvent);
- }
- }
- }
-
- // Find a child matching the command id
- wxWindow* child = parent->FindWindow(entry->GetCommand());
-
- // No such child
- if (!child)
- return FALSE;
-
- // Now we process those kinds of windows that we can.
- // For now, only buttons.
- if ( wxDynamicCast(child, wxButton) )
- {
- wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId());
- commandEvent.SetEventObject(child);
- return child->GetEventHandler()->ProcessEvent(commandEvent);
- }
-
- return FALSE;
- } // matches event
- }// for
-
- // We didn't match the key event against an accelerator.
- return FALSE;
-}
-
-// ============================================================================
-// X11-specific stuff from here on
-// ============================================================================
-
// ----------------------------------------------------------------------------
// function which maintain the global hash table mapping Widgets to wxWindows
// ----------------------------------------------------------------------------
// add/remove window from the table
// ----------------------------------------------------------------------------
-// Add to hash table, add event handler
-bool wxWindowX11::AttachWidget (wxWindow* WXUNUSED(parent), WXWindow mainWidget,
- int x, int y, int width, int height)
-{
- wxAddWindowToTable((Window ) mainWidget, this);
-
- // TODO
-#if 0
- if (CanAddEventHandler())
- {
- XtAddEventHandler((Widget) mainWidget,
- ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
- False,
- wxPanelItemEventHandler,
- (XtPointer) this);
- }
-
- if (!formWidget)
- {
- XtTranslations ptr;
- XtOverrideTranslations ((Widget) mainWidget,
- ptr = XtParseTranslationTable ("<Configure>: 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 ("<Configure>: resize()"));
- XtFree ((char *) ptr);
- }
-#endif
- if (x == -1)
- x = 0;
- if (y == -1)
- y = 0;
-
- SetSize (x, y, width, height);
-
- return TRUE;
-}
-
-// Remove event handler, remove from hash table
-bool wxWindowX11::DetachWidget(WXWindow widget)
-{
- // TODO
-#if 0
- if (CanAddEventHandler())
- {
- XtRemoveEventHandler((Widget) widget,
- ButtonPressMask | ButtonReleaseMask | PointerMotionMask, // | KeyPressMask,
- False,
- wxPanelItemEventHandler,
- (XtPointer)this);
- }
-#endif
-
- wxDeleteWindowFromTable((Window) widget);
- return TRUE;
-}
-
// ----------------------------------------------------------------------------
// X11-specific accessors
// ----------------------------------------------------------------------------
WXWindow wxWindowX11::GetMainWindow() const
{
- if (m_drawingArea)
- return m_drawingArea;
- else
- return m_mainWidget;
-}
-
-WXWindow wxWindowX11::GetClientWidget() const
-{
- if (m_drawingArea != (WXWindow) 0)
- return m_drawingArea;
- else
- return GetMainWindow();
-}
-
-WXWindow wxWindowX11::GetTopWindow() const
-{
- return GetMainWindow();
-}
-
-WXWindow wxWindowX11::GetLabelWindow() const
-{
- return GetMainWindow();
-}
-
-// ----------------------------------------------------------------------------
-// callbacks
-// ----------------------------------------------------------------------------
-
-// TODO: implement wxWindow scrollbar, presumably using wxScrollBar
-#if 0
-static void wxScrollBarCallback(Widget scrollbar,
- XtPointer clientData,
- XmScrollBarCallbackStruct *cbs)
-{
- wxWindow *win = wxGetWindowFromTable(scrollbar);
- int orientation = (int) clientData;
-
- wxEventType eventType = wxEVT_NULL;
- switch (cbs->reason)
- {
- case XmCR_INCREMENT:
- {
- eventType = wxEVT_SCROLLWIN_LINEDOWN;
- break;
- }
- case XmCR_DECREMENT:
- {
- eventType = wxEVT_SCROLLWIN_LINEUP;
- break;
- }
- case XmCR_DRAG:
- {
- eventType = wxEVT_SCROLLWIN_THUMBTRACK;
- break;
- }
- case XmCR_VALUE_CHANGED:
- {
- eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
- break;
- }
- case XmCR_PAGE_INCREMENT:
- {
- eventType = wxEVT_SCROLLWIN_PAGEDOWN;
- break;
- }
- case XmCR_PAGE_DECREMENT:
- {
- eventType = wxEVT_SCROLLWIN_PAGEUP;
- break;
- }
- case XmCR_TO_TOP:
- {
- eventType = wxEVT_SCROLLWIN_TOP;
- break;
- }
- case XmCR_TO_BOTTOM:
- {
- eventType = wxEVT_SCROLLWIN_BOTTOM;
- break;
- }
- default:
- {
- // Should never get here
- wxFAIL_MSG("Unknown scroll event.");
- break;
- }
- }
-
- wxScrollWinEvent event(eventType,
- cbs->value,
- ((orientation == XmHORIZONTAL) ?
- wxHORIZONTAL : wxVERTICAL));
- event.SetEventObject( win );
- win->GetEventHandler()->ProcessEvent(event);
-}
-#endif
-
-
-// ----------------------------------------------------------------------------
-// CanvaseXXXSize() functions
-// ----------------------------------------------------------------------------
-
-// SetSize, but as per old wxCanvas (with drawing widget etc.)
-void wxWindowX11::CanvasSetSize (int x, int y, int w, int h, int sizeFlags)
-{
- // TODO
-#if 0
- // A bit of optimization to help sort out the flickers.
- int oldX, oldY, oldW, oldH;
- GetSize(& oldW, & oldH);
- GetPosition(& oldX, & oldY);
-
- bool useOldPos = FALSE;
- bool useOldSize = FALSE;
-
- 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(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))
- {
- 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)
- {
- XtVaSetValues ((Widget) m_borderWidget, XmNwidth, w, NULL);
- short thick, margin;
- XtVaGetValues ((Widget) m_borderWidget,
- XmNshadowThickness, &thick,
- XmNmarginWidth, &margin,
- NULL);
- w -= 2 * (thick + margin);
- }
-
- XtVaSetValues ((Widget) m_scrolledWindow, XmNwidth, w, NULL);
-
- Dimension spacing;
- Widget sbar;
- XtVaGetValues ((Widget) m_scrolledWindow,
- XmNspacing, &spacing,
- XmNverticalScrollBar, &sbar,
- NULL);
- Dimension wsbar;
- if (sbar)
- XtVaGetValues (sbar, XmNwidth, &wsbar, NULL);
- else
- wsbar = 0;
-
- w -= (spacing + wsbar);
-
-#if 0
- XtVaSetValues(drawingArea, XmNwidth, w, NULL);
-#endif // 0
- }
- if (h > -1)
- {
- if (m_borderWidget)
- {
- XtVaSetValues ((Widget) m_borderWidget, XmNheight, h, NULL);
- short thick, margin;
- XtVaGetValues ((Widget) m_borderWidget,
- XmNshadowThickness, &thick,
- XmNmarginHeight, &margin,
- NULL);
- h -= 2 * (thick + margin);
- }
-
- XtVaSetValues ((Widget) m_scrolledWindow, XmNheight, h, NULL);
-
- Dimension spacing;
- Widget sbar;
- XtVaGetValues ((Widget) m_scrolledWindow,
- XmNspacing, &spacing,
- XmNhorizontalScrollBar, &sbar,
- NULL);
- Dimension wsbar;
- if (sbar)
- XtVaGetValues (sbar, XmNheight, &wsbar, NULL);
- else
- wsbar = 0;
-
- h -= (spacing + wsbar);
-
-#if 0
- XtVaSetValues(drawingArea, XmNheight, h, NULL);
-#endif // 0
- }
- }
-
- if (managed)
- XtManageChild (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow);
- XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
-#endif
- // 0
-}
-
-void wxWindowX11::CanvasSetClientSize (int w, int h)
-{
-// TODO
-#if 0
- Widget drawingArea = (Widget) m_drawingArea;
-
- XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_ANY, NULL);
-
- if (w > -1)
- XtVaSetValues(drawingArea, XmNwidth, w, NULL);
- if (h > -1)
- XtVaSetValues(drawingArea, XmNheight, h, NULL);
-
- XtVaSetValues(drawingArea, XmNresizePolicy, XmRESIZE_NONE, NULL);
-#endif // 0
-}
-
-void wxWindowX11::CanvasGetClientSize (int *w, int *h) const
-{
-// TODO
-#if 0
- // Must return the same thing that was set via SetClientSize
- Dimension xx, yy;
- XtVaGetValues ((Widget) m_drawingArea, XmNwidth, &xx, XmNheight, &yy, NULL);
- *w = xx;
- *h = yy;
-#endif
-}
-
-void wxWindowX11::CanvasGetSize (int *w, int *h) const
-{
-// TODO
-#if 0
- Dimension xx, yy;
- if ((Widget) m_borderWidget)
- XtVaGetValues ((Widget) m_borderWidget, XmNwidth, &xx, XmNheight, &yy, NULL);
- else if ((Widget) m_scrolledWindow)
- XtVaGetValues ((Widget) m_scrolledWindow, XmNwidth, &xx, XmNheight, &yy, NULL);
- else
- XtVaGetValues ((Widget) m_drawingArea, XmNwidth, &xx, XmNheight, &yy, NULL);
-
- *w = xx;
- *h = yy;
-#endif
-}
-
-void wxWindowX11::CanvasGetPosition (int *x, int *y) const
-{
-// TODO
-#if 0
- Position xx, yy;
- XtVaGetValues (m_borderWidget ? (Widget) m_borderWidget : (Widget) m_scrolledWindow, XmNx, &xx, XmNy, &yy, NULL);
-
- // 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;
-#endif
+ return m_mainWidget;
}
// ----------------------------------------------------------------------------
if (xevent->xbutton.button == Button1)
{
eventType = wxEVT_LEFT_DOWN;
- win->SetButton1(TRUE);
button = 1;
}
else if (xevent->xbutton.button == Button2)
{
eventType = wxEVT_MIDDLE_DOWN;
- win->SetButton2(TRUE);
button = 2;
}
else if (xevent->xbutton.button == Button3)
{
eventType = wxEVT_RIGHT_DOWN;
- win->SetButton3(TRUE);
button = 3;
}
// check for a double click
// TODO: where can we get this value from?
- //long dclickTime = XtGetMultiClickTime((Display*) wxGetDisplay());
- long dClickTime = 200;
+ //long dclickTime = XtGetMultiClickTime(wxGlobalDisplay());
+ long dclickTime = 200;
long ts = wxevent.GetTimestamp();
int buttonLast = win->GetLastClickedButton();
if (xevent->xbutton.button == Button1)
{
eventType = wxEVT_LEFT_UP;
- win->SetButton1(FALSE);
}
else if (xevent->xbutton.button == Button2)
{
eventType = wxEVT_MIDDLE_UP;
- win->SetButton2(FALSE);
}
else if (xevent->xbutton.button == Button3)
{
eventType = wxEVT_RIGHT_UP;
- win->SetButton3(FALSE);
}
else return FALSE;
}
}
#endif
-// Changes the foreground and background colours to be derived from the current
-// background colour. To change the foreground colour, you must call
-// SetForegroundColour explicitly.
-void wxWindowX11::ChangeBackgroundColour()
+bool wxWindowX11::SetBackgroundColour(const wxColour& col)
{
- // TODO
-#if 0
- WXWidget mainWidget = GetMainWidget();
- if ( mainWidget )
- DoChangeBackgroundColour(mainWidget, m_backgroundColour);
-#endif
-}
+ wxWindowBase::SetBackgroundColour(col);
-void wxWindowX11::ChangeForegroundColour()
-{
- // TODO
-#if 0
- WXWidget mainWidget = GetMainWidget();
- if ( mainWidget )
- DoChangeForegroundColour(mainWidget, m_foregroundColour);
- if ( m_scrolledWindow && mainWidget != m_scrolledWindow )
- DoChangeForegroundColour(m_scrolledWindow, m_foregroundColour);
-#endif
-}
+ if (!GetMainWindow())
+ return FALSE;
-// Change a widget's foreground and background colours.
-void wxWindowX11::DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour)
-{
- // TODO
-#if 0
- // When should we specify the foreground, if it's calculated
- // by wxComputeColours?
- // Solution: say we start with the default (computed) foreground colour.
- // If we call SetForegroundColour explicitly for a control or window,
- // then the foreground is changed.
- // Therefore SetBackgroundColour computes the foreground colour, and
- // SetForegroundColour changes the foreground colour. The ordering is
- // important.
-
- Widget w = (Widget)widget;
- XtVaSetValues(
- w,
- XmNforeground, foregroundColour.AllocColour(XtDisplay(w)),
- NULL
- );
-#endif
-}
+ Display *xdisplay = (Display*) wxGlobalDisplay();
+ int xscreen = DefaultScreen( xdisplay );
+ Colormap cm = DefaultColormap( xdisplay, xscreen );
-void wxWindowX11::DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour)
-{
- // TODO
-#if 0
- wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
- (wxColour*) NULL);
-
- XtVaSetValues ((Widget) widget,
- XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
- XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
- XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
- XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
- NULL);
-
- if (changeArmColour)
- XtVaSetValues ((Widget) widget,
- XmNarmColor, g_itemColors[wxSELE_INDEX].pixel,
- NULL);
-#endif
-}
-
-bool wxWindowX11::SetBackgroundColour(const wxColour& col)
-{
- if ( !wxWindowBase::SetBackgroundColour(col) )
- return FALSE;
+ wxColour colour( col );
+ colour.CalcPixel( (WXColormap) cm );
+
+ XSetWindowAttributes attrib;
+ attrib.background_pixel = colour.GetPixel();
- ChangeBackgroundColour();
+ XChangeWindowAttributes(wxGlobalDisplay(),
+ (Window) GetMainWindow(),
+ CWBackPixel,
+ & attrib);
return TRUE;
}
if ( !wxWindowBase::SetForegroundColour(col) )
return FALSE;
- ChangeForegroundColour();
-
return TRUE;
}
-void wxWindowX11::ChangeFont(bool keepOriginalSize)
-{
- // TODO
-#if 0
- // Note that this causes the widget to be resized back
- // to its original size! We therefore have to set the size
- // back again. TODO: a better way in Motif?
- Widget w = (Widget) GetLabelWidget(); // Usually the main widget
- if (w && m_font.Ok())
- {
- int width, height, width1, height1;
- GetSize(& width, & height);
-
- // lesstif 0.87 hangs here
-#ifndef LESSTIF_VERSION
- XtVaSetValues (w,
- XmNfontList, (XmFontList) m_font.GetFontList(1.0, XtDisplay(w)),
- NULL);
-#endif
-
- GetSize(& width1, & height1);
- if (keepOriginalSize && (width != width1 || height != height1))
- {
- SetSize(-1, -1, width, height);
- }
- }
-#endif
-}
-
// ----------------------------------------------------------------------------
// global functions
// ----------------------------------------------------------------------------
// Get the current mouse position.
wxPoint wxGetMousePosition()
{
- Display *display = (Display*) wxGetDisplay();
+ Display *display = wxGlobalDisplay();
Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
Window rootReturn, childReturn;
int rootX, rootY, winX, winY;
projects / wxWidgets.git / blobdiff