#include "wx/x11/private.h"
#include "X11/Xutil.h"
+#if wxUSE_NANOX
+// For wxGetLocalTime, used by XButtonEventGetTime
+#include "wx/timer.h"
+#endif
+
#include <string.h>
// ----------------------------------------------------------------------------
Display *xdisplay = (Display*) wxGlobalDisplay();
int xscreen = DefaultScreen( xdisplay );
+ Visual *xvisual = DefaultVisual( xdisplay, xscreen );
Colormap cm = DefaultColormap( xdisplay, xscreen );
m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
m_foregroundColour = *wxBLACK;
m_foregroundColour.CalcPixel( (WXColormap) cm );
- Window parentWindow = (Window) parent->GetMainWindow();
-
+ Window xparent = (Window) parent->GetMainWindow();
+
wxSize size2(size);
if (size2.x == -1)
- size2.x = 100;
+ size2.x = 20;
if (size2.y == -1)
- size2.y = 100;
+ size2.y = 20;
wxPoint pos2(pos);
if (pos2.x == -1)
- pos2.x = 100;
+ pos2.x = 0;
if (pos2.y == -1)
- pos2.y = 100;
+ pos2.y = 0;
+
+#if !wxUSE_NANOX
+ XSetWindowAttributes xattributes;
- Window xwindow = XCreateSimpleWindow(
- xdisplay, parentWindow,
- pos2.x, pos2.y, size2.x, size2.y, 0,
- m_backgroundColour.GetPixel(),
- m_backgroundColour.GetPixel() );
+ long xattributes_mask =
+ CWBorderPixel | CWBackPixel;
- m_mainWidget = (WXWindow) xwindow;
+ xattributes.background_pixel = m_backgroundColour.GetPixel();
+ xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
+
+ xattributes_mask |= CWEventMask;
+ xattributes.event_mask =
+ ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+ ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+ KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+ PropertyChangeMask | VisibilityChangeMask ;
- // Select event types wanted
+ if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE ))
+ {
+ xattributes_mask |= CWBitGravity;
+ xattributes.bit_gravity = StaticGravity;
+ }
+
+ Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
+ 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+#else
+
+ int extraFlags = GR_EVENT_MASK_CLOSE_REQ;
+
+ long backColor, foreColor;
+ backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());
+ foreColor = GR_RGB(m_foregroundColour.Red(), m_foregroundColour.Green(), m_foregroundColour.Blue());
+
+ Window xwindow = XCreateWindowWithColor( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
+ 0, 0, InputOutput, xvisual, backColor, foreColor);
XSelectInput( xdisplay, xwindow,
- ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+ extraFlags | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
- PropertyChangeMask);
+ PropertyChangeMask );
+#endif
+
+ m_mainWidget = (WXWindow) xwindow;
wxAddWindowToTable( xwindow, (wxWindow*) this );
m_isBeingDeleted = TRUE;
// X11-specific actions first
- Window main = (Window) m_mainWidget;
- if ( main )
- {
- // Removes event handlers
- //DetachWidget(main);
- }
+ Window xwindow = (Window) m_mainWidget;
if (m_parent)
m_parent->RemoveChild( this );
DestroyChildren();
// Destroy the window
- if (main)
+ if (xwindow)
{
- XSelectInput( wxGlobalDisplay(), main, NoEventMask);
- wxDeleteWindowFromTable( main );
- XDestroyWindow( wxGlobalDisplay(), main );
+ XSelectInput( wxGlobalDisplay(), xwindow, NoEventMask);
+ wxDeleteWindowFromTable( xwindow );
+ XDestroyWindow( wxGlobalDisplay(), xwindow );
m_mainWidget = NULL;
}
}
Window xwindow = (Window) GetMainWindow();
wxCHECK_RET( xwindow, wxT("invalid window") );
-
+
+ wxCHECK_RET( AcceptsFocus(), wxT("set focus on window that doesn't accept the focus") );
+
+#if 0
+ if (GetName() == "scrollBar")
+ {
+ char *crash = NULL;
+ *crash = 0;
+ }
+#endif
+
if (wxWindowIsVisible(xwindow))
{
XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
return NULL;
}
+wxWindow *wxWindowX11::GetFocusWidget()
+{
+ wxWindow *win = (wxWindow*) this;
+ while (!win->IsTopLevel())
+ {
+ win = win->GetParent();
+ if (!win)
+ return (wxWindow*) NULL;
+ }
+
+ return win;
+}
+
// Enabling/disabling handled by event loop, and not sending events
// if disabled.
bool wxWindowX11::Enable(bool enable)
Display *xdisp = (Display*) GetXDisplay();
if (show)
{
- wxString msg;
- msg.Printf("Mapping window of type %s", GetClassInfo()->GetClassName());
- wxLogDebug(msg);
+ // wxLogDebug( "Mapping window of type %s", GetName().c_str() );
XMapWindow(xdisp, xwin);
- XSync(xdisp, False);
+ XSync(xdisp, False);
}
else
{
- wxString msg;
- msg.Printf("Unmapping window of type %s", GetClassInfo()->GetClassName());
- wxLogDebug(msg);
+ // wxLogDebug( "Unmapping window of type %s", GetName().c_str() );
XUnmapWindow(xdisp, xwin);
}
return;
}
- wxLogDebug("Grabbed pointer");
+ // wxLogDebug("Grabbed pointer in %s", GetName().c_str() );
#if 0
res = XGrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
XUngrabKeyboard( wxGlobalDisplay(), CurrentTime );
#endif
}
- wxLogDebug("Ungrabbed pointer");
+
+ // wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() );
m_winCaptured = FALSE;
}
Cursor xcursor = (Cursor) cursorToUse.GetCursor();
- XDefineCursor( (Display*) wxGlobalDisplay(), xwindow, xcursor );
+ XDefineCursor( wxGlobalDisplay(), xwindow, xcursor );
return TRUE;
}
// Does a physical scroll
void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
{
-#if 0
- int x, y, w, h;
- if (rect)
- {
- // Use specified rectangle
- x = rect->x; y = rect->y; w = rect->width; h = rect->height;
- }
- else
- {
- // Use whole client area
- x = 0; y = 0;
- GetClientSize(& w, & h);
- }
+ // No scrolling requested.
+ if ((dx == 0) && (dy == 0)) return;
- wxNode *cnode = m_children.First();
- while (cnode)
+ if (!m_updateRegion.IsEmpty())
{
- 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();
+ m_updateRegion.Offset( dx, dy );
+
+ int cw = 0;
+ int ch = 0;
+ GetSize( &cw, &ch ); // GetClientSize() ??
+ m_updateRegion.Intersect( 0, 0, cw, ch );
}
- 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((wxWindow*) this);
-
- dc.SetLogicalFunction (wxCOPY);
-
- Window window = (Window) GetMainWindow();
- Display* display = wxGlobalDisplay();
-
- XCopyArea(display, window, window, (GC) dc.GetGC(),
- x1, y1, w1, h1, x2, y2);
-
- dc.SetAutoSetting(TRUE);
- wxBrush brush(GetBackgroundColour(), wxSOLID);
- dc.SetBrush(brush); // FIXME: needed?
-
- // We'll add rectangles to the list of update rectangles according to which
- // bits we've exposed.
- wxList updateRects;
-
- if (dx > 0)
+ if (!m_clearRegion.IsEmpty())
{
- wxRect *rect = new wxRect;
- rect->x = x;
- rect->y = y;
- rect->width = dx;
- rect->height = h;
-
- XFillRectangle(display, window,
- (GC) dc.GetGC(), rect->x, rect->y, rect->width, rect->height);
+ m_clearRegion.Offset( dx, dy );
- rect->x = rect->x;
- rect->y = rect->y;
- rect->width = rect->width;
- rect->height = rect->height;
-
- updateRects.Append((wxObject*) rect);
+ int cw = 0;
+ int ch = 0;
+ GetSize( &cw, &ch ); // GetClientSize() ??
+ m_clearRegion.Intersect( 0, 0, cw, ch );
}
- else if (dx < 0)
+
+ Window xwindow = (Window) GetMainWindow();
+
+ wxCHECK_RET( xwindow, wxT("invalid window") );
+
+ Display *xdisplay = wxGlobalDisplay();
+
+ GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
+ XSetGraphicsExposures( xdisplay, xgc, True );
+
+ int s_x = 0;
+ int s_y = 0;
+ int cw;
+ int ch;
+ if (rect)
{
- 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);
+ s_x = rect->x;
+ s_y = rect->y;
- rect->x = rect->x;
- rect->y = rect->y;
- rect->width = rect->width;
- rect->height = rect->height;
-
- updateRects.Append((wxObject*) rect);
+ cw = rect->width;
+ ch = rect->height;
}
- if (dy > 0)
+ else
{
- 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);
+ s_x = 0;
+ s_y = 0;
+ GetClientSize( &cw, &ch );
}
- 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);
+
+ wxPoint offset = GetClientAreaOrigin();
+ s_x += offset.x;
+ s_y += offset.y;
- rect->x = rect->x;
- rect->y = rect->y;
- rect->width = rect->width;
- rect->height = rect->height;
+ int w = cw - abs(dx);
+ int h = ch - abs(dy);
- updateRects.Append((wxObject*) rect);
+ if ((h < 0) || (w < 0))
+ {
+ Refresh();
}
- dc.SetBrush(wxNullBrush);
-
- // Now send expose events
-
- wxNode* node = updateRects.First();
- while (node)
+ else
{
- 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);
+ wxRect rect;
+ if (dx < 0) rect.x = cw+dx + offset.x; else rect.x = s_x;
+ if (dy < 0) rect.y = ch+dy + offset.y; else rect.y = s_y;
+ if (dy != 0) rect.width = cw; else rect.width = abs(dx);
+ if (dx != 0) rect.height = ch; else rect.height = abs(dy);
+
+ int d_x = s_x;
+ int d_y = s_y;
- node = node->Next();
+ if (dx < 0) s_x += -dx;
+ if (dy < 0) s_y += -dy;
+ if (dx > 0) d_x = dx + offset.x;
+ if (dy > 0) d_y = dy + offset.y;
+
+ XCopyArea( xdisplay, xwindow, xwindow, xgc, s_x, s_y, w, h, d_x, d_y );
+ // wxLogDebug( "Copy: s_x %d s_y %d w %d h %d d_x %d d_y %d", s_x, s_y, w, h, d_x, d_y );
+
+ // wxLogDebug( "Update: %d %d %d %d", rect.x, rect.y, rect.width, rect.height );
+
+ m_updateRegion.Union( rect );
+ m_clearRegion.Union( rect );
}
- // Delete the update rects
- node = updateRects.First();
- while (node)
- {
- wxRect* rect = (wxRect*) node->Data();
- delete rect;
- node = node->Next();
- }
-#endif
+ XFreeGC( xdisplay, xgc );
}
// ---------------------------------------------------------------------------
wxCHECK_RET( xwindow, wxT("invalid window") );
- XSync(wxGlobalDisplay(), False);
+ //XSync(wxGlobalDisplay(), False);
+
XWindowAttributes attr;
Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
wxASSERT(status);
Window window = (Window) m_mainWidget;
if (window)
{
- XSync(wxGlobalDisplay(), False);
+ //XSync(wxGlobalDisplay(), False);
XWindowAttributes attr;
Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
wxASSERT(status);
if (window)
{
- XSync(wxGlobalDisplay(), False);
+ //XSync(wxGlobalDisplay(), False); // Is this really a good idea?
XWindowAttributes attr;
Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr );
wxASSERT(status);
void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- if (!GetMainWindow())
- return;
+ Window xwindow = (Window) GetMainWindow();
- XWindowChanges windowChanges;
- windowChanges.x = 0;
- windowChanges.y = 0;
- windowChanges.width = 0;
- windowChanges.height = 0;
- windowChanges.stack_mode = 0;
- int valueMask = 0;
+ wxCHECK_RET( xwindow, wxT("invalid window") );
+
+ XWindowAttributes attr;
+ Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
+ wxCHECK_RET( status, wxT("invalid window attributes") );
+
+ int new_x = attr.x;
+ int new_y = attr.y;
+ int new_w = attr.width;
+ int new_h = attr.height;
+
if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
- int yy = 0;
+ int yy = 0;
AdjustForParentClientOrigin( x, yy, sizeFlags);
- windowChanges.x = x;
- valueMask |= CWX;
+ new_x = x;
}
if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
- int xx = 0;
+ int xx = 0;
AdjustForParentClientOrigin( xx, y, sizeFlags);
- windowChanges.y = y;
- valueMask |= CWY;
+ new_y = y;
}
- if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (width != -1)
{
- windowChanges.width = width /* - m_borderSize*2 */;
- if (windowChanges.width == 0)
- windowChanges.width = 1;
- valueMask |= CWWidth;
+ new_w = width;
+ if (new_w <= 0)
+ new_w = 20;
}
- if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (height != -1)
{
- windowChanges.height = height /* -m_borderSize*2*/;
- if (windowChanges.height == 0)
- windowChanges.height = 1;
- valueMask |= CWHeight;
+ new_h = height;
+ if (new_h <= 0)
+ new_h = 20;
}
-
- XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
- valueMask, & windowChanges);
- XSync(wxGlobalDisplay(), False);
+
+ DoMoveWindow( new_x, new_y, new_w, new_h );
}
void wxWindowX11::DoSetClientSize(int width, int height)
{
- if (!GetMainWindow())
- return;
+ Window xwindow = (Window) GetMainWindow();
- XWindowChanges windowChanges;
- int valueMask = 0;
+ wxCHECK_RET( xwindow, wxT("invalid window") );
+
+#if 1
+ XResizeWindow( wxGlobalDisplay(), xwindow, width, height );
+
+#else
+
+ XWindowAttributes attr;
+ Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
+ wxCHECK_RET( status, wxT("invalid window attributes") );
+
+ int new_x = attr.x;
+ int new_y = attr.y;
+ int new_w = attr.width;
+ int new_h = attr.height;
+
if (width != -1)
- {
- windowChanges.width = width ;
- valueMask |= CWWidth;
- }
+ new_w = width;
+
if (height != -1)
- {
- windowChanges.height = height ;
- valueMask |= CWHeight;
- }
- XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
- valueMask, & windowChanges);
- XSync(wxGlobalDisplay(), False);
+ new_h = height;
+
+ DoMoveWindow( new_x, new_y, new_w, new_h );
+
+#endif
}
// For implementation purposes - sometimes decorations make the client area
return wxPoint(0, 0);
}
-// Makes an adjustment to the window position (for example, a frame that has
-// a toolbar that it manages itself).
-void wxWindowX11::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
-{
- if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
- {
- wxPoint pt(GetParent()->GetClientAreaOrigin());
- x += pt.x; y += pt.y;
- }
-}
-
void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
{
m_minWidth = minW;
m_maxWidth = maxW;
m_maxHeight = maxH;
+#if !wxUSE_NANOX
XSizeHints sizeHints;
sizeHints.flags = 0;
}
XSetWMNormalHints(wxGlobalDisplay(), (Window) GetMainWindow(), & sizeHints);
+#endif
}
void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
{
- DoSetSize(x, y, width, height);
+ Window xwindow = (Window) GetMainWindow();
+
+ wxCHECK_RET( xwindow, wxT("invalid window") );
+
+#if 1
+
+ XWindowAttributes attr;
+ Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
+ wxCHECK_RET( status, wxT("invalid window attributes") );
+
+ if (attr.width == width && attr.height == height)
+ {
+ XMoveWindow( wxGlobalDisplay(), xwindow, x, y );
+ return;
+ }
+
+ if (attr.x == x && attr.y == y)
+ {
+ XResizeWindow( wxGlobalDisplay(), xwindow, width, height );
+ return;
+ }
+
+ XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, width, height );
+
+#else
+
+ XWindowChanges windowChanges;
+ windowChanges.x = x;
+ windowChanges.y = y;
+ windowChanges.width = width;
+ windowChanges.height = height;
+ windowChanges.stack_mode = 0;
+ int valueMask = CWX | CWY | CWWidth | CWHeight;
+
+ XConfigureWindow( wxGlobalDisplay(), xwindow, valueMask, &windowChanges );
+
+#endif
}
// ---------------------------------------------------------------------------
&ascent, &descent2, &overall);
#endif
- XTextExtents((XFontStruct*) pFontStruct, string.c_str(), slen,
+ XTextExtents((XFontStruct*) pFontStruct, (char*) string.c_str(), slen,
&direction, &ascent, &descent2, &overall);
if ( x )
{
if (!m_updateRegion.IsEmpty())
{
- // Actually send erase and paint events.
- X11SendPaintEvents();
+ // wxLogDebug("wxWindowX11::Update: %s", GetClassInfo()->GetClassName());
+ // Actually send erase events.
+ SendEraseEvents();
+
+ // Actually send paint events.
+ SendPaintEvents();
}
}
dc.Clear();
}
-void wxWindowX11::X11SendPaintEvents()
+void wxWindowX11::SendEraseEvents()
{
- m_clipPaintRegion = TRUE;
+ if (m_clearRegion.IsEmpty()) return;
+
+ wxWindowDC dc( (wxWindow*)this );
+ dc.SetClippingRegion( m_clearRegion );
+
+ wxEraseEvent erase_event( GetId(), &dc );
+ erase_event.SetEventObject( this );
- if (!m_clearRegion.IsEmpty())
+ if (!GetEventHandler()->ProcessEvent(erase_event))
{
- wxWindowDC dc( (wxWindow*)this );
- dc.SetClippingRegion( m_clearRegion );
-
- wxEraseEvent erase_event( GetId(), &dc );
- erase_event.SetEventObject( this );
-
- if (!GetEventHandler()->ProcessEvent(erase_event))
+ Window xwindow = (Window) GetMainWindow();
+ Display *xdisplay = wxGlobalDisplay();
+ GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
+ XSetFillStyle( xdisplay, xgc, FillSolid );
+ XSetForeground( xdisplay, xgc, m_backgroundColour.GetPixel() );
+ wxRegionIterator upd( m_clearRegion );
+ while (upd)
{
- printf( "Hallo!\n" );
- Window xwindow = (Window) GetMainWindow();
- Display *xdisplay = wxGlobalDisplay();
- GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
- XSetFillStyle( xdisplay, xgc, FillSolid );
- XSetForeground( xdisplay, xgc, m_backgroundColour.GetPixel() );
- wxRegionIterator upd( m_clearRegion );
- while (upd)
- {
- XFillRectangle( xdisplay, xwindow, xgc,
- upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
- upd ++;
- }
+ XFillRectangle( xdisplay, xwindow, xgc,
+ upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
+ upd ++;
}
- m_clearRegion.Clear();
+ XFreeGC( xdisplay, xgc );
}
+
+ m_clearRegion.Clear();
+}
+
+void wxWindowX11::SendPaintEvents()
+{
+ m_clipPaintRegion = TRUE;
wxNcPaintEvent nc_paint_event( GetId() );
nc_paint_event.SetEventObject( this );
wxPaintEvent paint_event( GetId() );
paint_event.SetEventObject( this );
GetEventHandler()->ProcessEvent( paint_event );
-
+
m_updateRegion.Clear();
m_clipPaintRegion = FALSE;
// Set the input focus if couldn't do it before
if (m_needsInputFocus)
+ {
SetFocus();
+ }
}
// ----------------------------------------------------------------------------
bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, XEvent *xevent)
{
- switch (xevent->xany.type)
+ switch (XEventGetType(xevent))
{
case EnterNotify:
case LeaveNotify:
{
wxEventType eventType = wxEVT_NULL;
- if (xevent->xany.type == EnterNotify)
+ if (XEventGetType(xevent) == EnterNotify)
{
//if (local_event.xcrossing.mode!=NotifyNormal)
// return ; // Ignore grab events
eventType = wxEVT_ENTER_WINDOW;
// canvas->GetEventHandler()->OnSetFocus();
}
- else if (xevent->xany.type == LeaveNotify)
+ else if (XEventGetType(xevent) == LeaveNotify)
{
//if (local_event.xcrossingr.mode!=NotifyNormal)
// return ; // Ignore grab events
eventType = wxEVT_LEAVE_WINDOW;
// canvas->GetEventHandler()->OnKillFocus();
}
- else if (xevent->xany.type == MotionNotify)
+ else if (XEventGetType(xevent) == MotionNotify)
{
eventType = wxEVT_MOTION;
}
- else if (xevent->xany.type == ButtonPress)
+ else if (XEventGetType(xevent) == ButtonPress)
{
- wxevent.SetTimestamp(xevent->xbutton.time);
+ wxevent.SetTimestamp(XButtonEventGetTime(xevent));
int button = 0;
- if (xevent->xbutton.button == Button1)
+ if (XButtonEventLChanged(xevent))
{
eventType = wxEVT_LEFT_DOWN;
button = 1;
}
- else if (xevent->xbutton.button == Button2)
+ else if (XButtonEventMChanged(xevent))
{
eventType = wxEVT_MIDDLE_DOWN;
button = 2;
}
- else if (xevent->xbutton.button == Button3)
+ else if (XButtonEventRChanged(xevent))
{
eventType = wxEVT_RIGHT_DOWN;
button = 3;
win->SetLastClick(button, ts);
}
}
- else if (xevent->xany.type == ButtonRelease)
+ else if (XEventGetType(xevent) == ButtonRelease)
{
- if (xevent->xbutton.button == Button1)
+ if (XButtonEventLChanged(xevent))
{
eventType = wxEVT_LEFT_UP;
}
- else if (xevent->xbutton.button == Button2)
+ else if (XButtonEventMChanged(xevent))
{
eventType = wxEVT_MIDDLE_UP;
}
- else if (xevent->xbutton.button == Button3)
+ else if (XButtonEventRChanged(xevent))
{
eventType = wxEVT_RIGHT_UP;
}
wxevent.SetEventType(eventType);
- wxevent.m_x = xevent->xbutton.x;
- wxevent.m_y = xevent->xbutton.y;
+ wxevent.m_x = XButtonEventGetX(xevent);
+ wxevent.m_y = XButtonEventGetY(xevent);
wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
- || (event_left_is_down (xevent)
+ || (XButtonEventLIsDown(xevent)
&& (eventType != wxEVT_LEFT_UP)));
wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)
- || (event_middle_is_down (xevent)
+ || (XButtonEventMIsDown(xevent)
&& (eventType != wxEVT_MIDDLE_UP)));
wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)
- || (event_right_is_down (xevent)
+ || (XButtonEventRIsDown (xevent)
&& (eventType != wxEVT_RIGHT_UP)));
- wxevent.m_shiftDown = xevent->xbutton.state & ShiftMask;
- wxevent.m_controlDown = xevent->xbutton.state & ControlMask;
- wxevent.m_altDown = xevent->xbutton.state & Mod3Mask;
- wxevent.m_metaDown = xevent->xbutton.state & Mod1Mask;
+ wxevent.m_shiftDown = XButtonEventShiftIsDown(xevent);
+ wxevent.m_controlDown = XButtonEventCtrlIsDown(xevent);
+ wxevent.m_altDown = XButtonEventAltIsDown(xevent);
+ wxevent.m_metaDown = XButtonEventMetaIsDown(xevent);
wxevent.SetId(win->GetId());
wxevent.SetEventObject(win);
bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win), XEvent *xevent)
{
- switch (xevent->xany.type)
+ switch (XEventGetType(xevent))
{
case KeyPress:
case KeyRelease:
(void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL);
int id = wxCharCodeXToWX (keySym);
- if (xevent->xkey.state & ShiftMask)
- wxevent.m_shiftDown = TRUE;
- if (xevent->xkey.state & ControlMask)
- wxevent.m_controlDown = TRUE;
- if (xevent->xkey.state & Mod3Mask)
- wxevent.m_altDown = TRUE;
- if (xevent->xkey.state & Mod1Mask)
- wxevent.m_metaDown = TRUE;
+ wxevent.m_shiftDown = XKeyEventShiftIsDown(xevent);
+ wxevent.m_controlDown = XKeyEventCtrlIsDown(xevent);
+ wxevent.m_altDown = XKeyEventAltIsDown(xevent);
+ wxevent.m_metaDown = XKeyEventMetaIsDown(xevent);
wxevent.SetEventObject(win);
wxevent.m_keyCode = id;
- wxevent.SetTimestamp(xevent->xkey.time);
+ wxevent.SetTimestamp(XKeyEventGetTime(xevent));
- wxevent.m_x = xevent->xbutton.x;
- wxevent.m_y = xevent->xbutton.y;
+ wxevent.m_x = XKeyEventGetX(xevent);
+ wxevent.m_y = XKeyEventGetY(xevent);
if (id > -1)
return TRUE;
// Get the current mouse position.
wxPoint wxGetMousePosition()
{
+#if wxUSE_NANOX
+ /* TODO */
+ return wxPoint(0, 0);
+#else
Display *display = wxGlobalDisplay();
Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
Window rootReturn, childReturn;
&childReturn,
&rootX, &rootY, &winX, &winY, &maskReturn);
return wxPoint(rootX, rootY);
+#endif
}
projects / wxWidgets.git / blobdiff