X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b0b798d77b7b93b81d62162b290441bc9175e3e..cd72551c2b6cbf67a4a5caf0ba00ba64e41183b2:/src/x11/window.cpp diff --git a/src/x11/window.cpp b/src/x11/window.cpp index 5e15ddd3a2..a83a67877c 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -47,13 +47,12 @@ #include "wx/x11/private.h" #include "X11/Xutil.h" -#include - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- +#if wxUSE_NANOX +// For wxGetLocalTime, used by XButtonEventGetTime +#include "wx/timer.h" +#endif -static const int SCROLL_MARGIN = 4; +#include // ---------------------------------------------------------------------------- // global variables for this module @@ -78,7 +77,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxWindowX11, wxWindowBase) BEGIN_EVENT_TABLE(wxWindowX11, wxWindowBase) EVT_SYS_COLOUR_CHANGED(wxWindowX11::OnSysColourChanged) - EVT_IDLE(wxWindowX11::OnIdle) END_EVENT_TABLE() // ============================================================================ @@ -100,12 +98,10 @@ void wxWindowX11::Init() // X11-specific m_mainWidget = (WXWindow) 0; - m_winCaptured = FALSE; - + m_needsInputFocus = FALSE; m_isShown = TRUE; m_isBeingDeleted = FALSE; - m_lastTS = 0; m_lastButton = 0; } @@ -121,11 +117,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, CreateBase(parent, id, pos, size, style, wxDefaultValidator, name); - if (parent) - parent->AddChild(this); - - m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); - m_foregroundColour = *wxBLACK; + parent->AddChild(this); int w = size.GetWidth(); int h = size.GetHeight(); @@ -136,37 +128,90 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, if (x == -1) x = 0; if (y == -1) y = 0; - int screen = DefaultScreen(wxGlobalDisplay()); + Display *xdisplay = (Display*) wxGlobalDisplay(); + int xscreen = DefaultScreen( xdisplay ); + Visual *xvisual = DefaultVisual( xdisplay, xscreen ); + Colormap cm = DefaultColormap( xdisplay, xscreen ); - Window parentWindow; - if (parent) - parentWindow = (Window) parent->GetMainWindow(); - else - parentWindow = RootWindow(wxGlobalDisplay(), screen); + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); + m_backgroundColour.CalcPixel( (WXColormap) cm ); + + m_foregroundColour = *wxBLACK; + m_foregroundColour.CalcPixel( (WXColormap) cm ); - Window window = XCreateSimpleWindow(wxGlobalDisplay(), parentWindow, - x, y, w, h, 0, - m_backgroundColour.AllocColour(wxGlobalDisplay()), - m_foregroundColour.AllocColour(wxGlobalDisplay())); + Window xparent = (Window) parent->GetMainWindow(); - // Select event types wanted - XSelectInput(wxGlobalDisplay(), window, +#if !wxUSE_NANOX + XSetWindowAttributes xattributes; + + long xattributes_mask = + CWEventMask | + CWBorderPixel | CWBackPixel; + + xattributes.background_pixel = m_backgroundColour.GetPixel(); + xattributes.border_pixel = BlackPixel( xdisplay, xscreen ); + + xattributes.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | - PropertyChangeMask); + PropertyChangeMask; +#endif + + wxSize size2(size); + if (size2.x == -1) + size2.x = 20; + if (size2.y == -1) + size2.y = 20; + + wxPoint pos2(pos); + if (pos2.x == -1) + pos2.x = 0; + if (pos2.y == -1) + pos2.y = 0; + +#if wxUSE_NANOX + 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, + extraFlags | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | + ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | + KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | + PropertyChangeMask ); + +#else + + Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y, + 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes ); - wxAddWindowToTable(window, (wxWindow*) this); +#endif + + m_mainWidget = (WXWindow) xwindow; + + wxAddWindowToTable( xwindow, (wxWindow*) this ); // Is a subwindow, so map immediately m_isShown = TRUE; - XMapWindow(wxGlobalDisplay(), window); + XMapWindow( xdisplay, xwindow ); // Without this, the cursor may not be restored properly (e.g. in splitter // sample). SetCursor(*wxSTANDARD_CURSOR); SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - SetSize(pos.x, pos.y, size.x, size.y); + + // Set background to None which will prevent X11 from clearing the + // background comletely. + XSetWindowBackgroundPixmap( xdisplay, xwindow, None ); + + // Don't call this, it can have nasty repercussions for composite controls, + // for example + // SetSize(pos.x, pos.y, size.x, size.y); return TRUE; } @@ -180,12 +225,7 @@ wxWindowX11::~wxWindowX11() 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 ); @@ -193,11 +233,11 @@ wxWindowX11::~wxWindowX11() 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; } } @@ -208,33 +248,31 @@ wxWindowX11::~wxWindowX11() void wxWindowX11::SetFocus() { - Window wMain = (Window) GetMainWindow(); - if (wMain) + Window xwindow = (Window) GetMainWindow(); + + wxCHECK_RET( xwindow, wxT("invalid window") ); + + if (wxWindowIsVisible(xwindow)) { - XSetInputFocus(wxGlobalDisplay(), wMain, RevertToParent, CurrentTime); - - XWMHints wmhints; - wmhints.flags = InputHint; - wmhints.input = True; - XSetWMHints(wxGlobalDisplay(), wMain, &wmhints); + XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime ); + m_needsInputFocus = FALSE; + } + else + { + m_needsInputFocus = TRUE; } } // Get the window with the focus wxWindow *wxWindowBase::FindFocus() { - Window wFocus = (Window) 0; + Window xfocus = (Window) 0; int revert = 0; - XGetInputFocus(wxGlobalDisplay(), & wFocus, & revert); - if (wFocus) + XGetInputFocus( wxGlobalDisplay(), &xfocus, &revert); + if (xfocus) { - wxWindow *win = NULL; - do - { - win = wxGetWindowFromTable(wFocus); - wFocus = wxGetWindowParent(wFocus); - } while (wFocus && !win); + wxWindow *win = wxGetWindowFromTable( xfocus ); return win; } @@ -242,6 +280,19 @@ wxWindow *wxWindowBase::FindFocus() 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) @@ -254,17 +305,19 @@ bool wxWindowX11::Enable(bool enable) bool wxWindowX11::Show(bool show) { - if ( !wxWindowBase::Show(show) ) - return FALSE; + wxWindowBase::Show(show); Window xwin = (Window) GetXWindow(); Display *xdisp = (Display*) GetXDisplay(); if (show) { + // wxLogDebug( "Mapping window of type %s", GetName().c_str() ); XMapWindow(xdisp, xwin); + XSync(xdisp, False); } else { + // wxLogDebug( "Unmapping window of type %s", GetName().c_str() ); XUnmapWindow(xdisp, xwin); } @@ -287,27 +340,52 @@ void wxWindowX11::Lower() void wxWindowX11::DoCaptureMouse() { - g_captureWindow = (wxWindow*) this; - if ( m_winCaptured ) + 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; + + Window xwindow = (Window) GetMainWindow(); + + wxCHECK_RET( xwindow, wxT("invalid window") ); + + g_captureWindow = (wxWindow*) this; - if (GetMainWindow()) + if (xwindow) { - int res = XGrabPointer(wxGlobalDisplay(), (Window) GetMainWindow(), + int res = XGrabPointer(wxGlobalDisplay(), xwindow, FALSE, ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, GrabModeAsync, GrabModeAsync, None, None, /* cursor */ // TODO: This may need to be set to the cursor of this window - CurrentTime); + CurrentTime ); if (res != GrabSuccess) { - wxLogDebug("Failed to grab pointer."); + 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 in %s", GetName().c_str() ); + +#if 0 res = XGrabButton(wxGlobalDisplay(), AnyButton, AnyModifier, (Window) GetMainWindow(), FALSE, @@ -316,20 +394,19 @@ void wxWindowX11::DoCaptureMouse() GrabModeAsync, None, None); - + if (res != GrabSuccess) { wxLogDebug("Failed to grab mouse buttons."); XUngrabPointer(wxGlobalDisplay(), CurrentTime); return; } +#endif - res = XGrabKeyboard(wxGlobalDisplay(), (Window) GetMainWindow(), #if 0 + res = XGrabKeyboard(wxGlobalDisplay(), (Window) GetMainWindow(), ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask, -#else FALSE, -#endif GrabModeAsync, GrabModeAsync, CurrentTime); @@ -342,7 +419,8 @@ void wxWindowX11::DoCaptureMouse() (Window) GetMainWindow()); return; } - +#endif + m_winCaptured = TRUE; } } @@ -350,18 +428,22 @@ void wxWindowX11::DoCaptureMouse() void wxWindowX11::DoReleaseMouse() { g_captureWindow = NULL; + if ( !m_winCaptured ) return; - Window wMain = (Window)GetMainWindow(); + Window xwindow = (Window) GetMainWindow(); - if ( wMain ) + if (xwindow) { - XUngrabPointer(wxGlobalDisplay(), wMain); - XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier, - wMain); - XUngrabKeyboard(wxGlobalDisplay(), CurrentTime); + XUngrabPointer( wxGlobalDisplay(), CurrentTime ); +#if 0 + XUngrabButton( wxGlobalDisplay(), AnyButton, AnyModifier, xwindow); + XUngrabKeyboard( wxGlobalDisplay(), CurrentTime ); +#endif } + + // wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() ); m_winCaptured = FALSE; } @@ -385,17 +467,19 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor) return FALSE; } - wxCursor* cursor2 = NULL; + Window xwindow = (Window) GetMainWindow(); + + wxCHECK_MSG( xwindow, FALSE, wxT("invalid window") ); + + wxCursor cursorToUse; if (m_cursor.Ok()) - cursor2 = & m_cursor; + cursorToUse = m_cursor; else - cursor2 = wxSTANDARD_CURSOR; + cursorToUse = *wxSTANDARD_CURSOR; - WXDisplay *dpy = GetXDisplay(); - WXCursor x_cursor = cursor2->GetXCursor(dpy); + Cursor xcursor = (Cursor) cursorToUse.GetCursor(); - Window win = (Window) GetMainWindow(); - XDefineCursor((Display*) dpy, win, (Cursor) x_cursor); + XDefineCursor( wxGlobalDisplay(), xwindow, xcursor ); return TRUE; } @@ -403,179 +487,105 @@ bool wxWindowX11::SetCursor(const wxCursor& cursor) // Coordinates relative to the window void wxWindowX11::WarpPointer (int x, int y) { - if (m_mainWidget) - XWarpPointer( wxGlobalDisplay(), None, (Window) m_mainWidget, 0, 0, 0, 0, x, y); + Window xwindow = (Window) GetMainWindow(); + + wxCHECK_RET( xwindow, wxT("invalid window") ); + + XWarpPointer( wxGlobalDisplay(), None, xwindow, 0, 0, 0, 0, x, y); } // Does a physical scroll void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect) { - 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; + m_clearRegion.Offset( dx, 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); + 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(); - } - - // TODO - - // XmUpdateDisplay((Widget) GetMainWidget()); + XFreeGC( xdisplay, xgc ); } // --------------------------------------------------------------------------- @@ -622,18 +632,20 @@ bool wxWindowX11::PreResize() // Get total size void wxWindowX11::DoGetSize(int *x, int *y) const { - Window window = (Window) m_mainWidget; - if (window) - { - XWindowAttributes attr; - Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr); - wxASSERT(status); + Window xwindow = (Window) GetMainWindow(); + + wxCHECK_RET( xwindow, wxT("invalid window") ); + + // XSync(wxGlobalDisplay(), False); + + XWindowAttributes attr; + Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr ); + wxASSERT(status); - if (status) - { - *x = attr.width /* + 2*m_borderSize */ ; - *y = attr.height /* + 2*m_borderSize */ ; - } + if (status) + { + *x = attr.width /* + 2*m_borderSize */ ; + *y = attr.height /* + 2*m_borderSize */ ; } } @@ -642,6 +654,7 @@ void wxWindowX11::DoGetPosition(int *x, int *y) const Window window = (Window) m_mainWidget; if (window) { + // XSync(wxGlobalDisplay(), False); XWindowAttributes attr; Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr); wxASSERT(status); @@ -695,8 +708,9 @@ void wxWindowX11::DoGetClientSize(int *x, int *y) const if (window) { + // XSync(wxGlobalDisplay(), False); // Is this really a good idea? XWindowAttributes attr; - Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr); + Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr ); wxASSERT(status); if (status) @@ -709,58 +723,70 @@ void wxWindowX11::DoGetClientSize(int *x, int *y) const void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags) { - if (!GetMainWindow()) - return; + Window xwindow = (Window) GetMainWindow(); - XWindowChanges windowChanges; - 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)) { - windowChanges.x = x; - valueMask |= CWX; + int yy = 0; + AdjustForParentClientOrigin( x, yy, sizeFlags); + new_x = x; } if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) { - windowChanges.y = y; - valueMask |= CWY; + int xx = 0; + AdjustForParentClientOrigin( xx, y, sizeFlags); + new_y = y; } - if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (width != -1) { - windowChanges.width = width /* - m_borderSize*2 */; - 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*/; - valueMask |= CWHeight; + new_h = height; + if (new_h <= 0) + new_h = 20; } - AdjustForParentClientOrigin( x, y, sizeFlags); - - XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(), - valueMask, & windowChanges); + + 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") ); + 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); + new_h = height; + + DoMoveWindow( new_x, new_y, new_w, new_h ); } // For implementation purposes - sometimes decorations make the client area @@ -770,17 +796,6 @@ wxPoint wxWindowX11::GetClientAreaOrigin() const return wxPoint(0, 0); } -// Makes an adjustment to the window position (for example, a frame that has -// a toolbar that it manages itself). -void wxWindowX11::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) -{ - 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; @@ -788,6 +803,7 @@ void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, m_maxWidth = maxW; m_maxHeight = maxH; +#if !wxUSE_NANOX XSizeHints sizeHints; sizeHints.flags = 0; @@ -811,11 +827,24 @@ void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, } 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") ); + + 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 ); } // --------------------------------------------------------------------------- @@ -856,13 +885,12 @@ void wxWindowX11::GetTextExtent(const wxString& string, int *descent, int *externalLeading, const wxFont *theFont) const { - wxFont *fontToUse = (wxFont *)theFont; - if (!fontToUse) - fontToUse = (wxFont *) & m_font; + wxFont fontToUse = m_font; + if (theFont) fontToUse = *theFont; - wxCHECK_RET( fontToUse->Ok(), "valid window font needed" ); - - WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay()); + wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") ); + + WXFontStructPtr pFontStruct = fontToUse.GetFontStruct(1.0, GetXDisplay()); int direction, ascent, descent2; XCharStruct overall; @@ -874,7 +902,7 @@ void wxWindowX11::GetTextExtent(const wxString& string, &ascent, &descent2, &overall); #endif - XTextExtents((XFontStruct*) pFontStruct, string, slen, + XTextExtents((XFontStruct*) pFontStruct, (char*) string.c_str(), slen, &direction, &ascent, &descent2, &overall); if ( x ) @@ -919,23 +947,25 @@ void wxWindowX11::Refresh(bool eraseBack, const wxRect *rect) } else { - int height,width; - GetSize( &width, &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 ); } - - // Actually don't schedule yet.. - Update(); } void wxWindowX11::Update() { if (!m_updateRegion.IsEmpty()) { - X11SendPaintEvents(); + // wxLogDebug("wxWindowX11::Update: %s", GetClassInfo()->GetClassName()); + // Actually send erase events. + SendEraseEvents(); + + // Actually send paint events. + SendPaintEvents(); } } @@ -947,29 +977,44 @@ void wxWindowX11::Clear() dc.Clear(); } -void wxWindowX11::X11SendPaintEvents() +void wxWindowX11::SendEraseEvents() { - m_clipPaintRegion = TRUE; - if (!m_clearRegion.IsEmpty()) { + m_clipPaintRegion = TRUE; + 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) { - // XClearArea( ... , upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() ); + XFillRectangle( xdisplay, xwindow, xgc, + upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() ); upd ++; } + XFreeGC( xdisplay, xgc ); } m_clearRegion.Clear(); + + m_clipPaintRegion = FALSE; } +} + + +void wxWindowX11::SendPaintEvents() +{ + m_clipPaintRegion = TRUE; wxNcPaintEvent nc_paint_event( GetId() ); nc_paint_event.SetEventObject( this ); @@ -978,7 +1023,8 @@ void wxWindowX11::X11SendPaintEvents() wxPaintEvent paint_event( GetId() ); paint_event.SetEventObject( this ); GetEventHandler()->ProcessEvent( paint_event ); - + + m_updateRegion.Clear(); m_clipPaintRegion = FALSE; } @@ -1005,11 +1051,20 @@ void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event) } } -void wxWindowX11::OnIdle(wxIdleEvent& WXUNUSED(event)) +void wxWindowX11::OnInternalIdle() { + // Update invalidated regions. + Update(); + // This calls the UI-update mechanism (querying windows for // menu/toolbar/control state information) UpdateWindowUI(); + + // Set the input focus if couldn't do it before + if (m_needsInputFocus) + { + SetFocus(); + } } // ---------------------------------------------------------------------------- @@ -1075,7 +1130,7 @@ WXWindow wxWindowX11::GetMainWindow() const bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, XEvent *xevent) { - switch (xevent->xany.type) + switch (XEventGetType(xevent)) { case EnterNotify: case LeaveNotify: @@ -1085,39 +1140,39 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, { wxEventType eventType = wxEVT_NULL; - if (xevent->xany.type == EnterNotify) + if (XEventGetType(xevent) == EnterNotify) { //if (local_event.xcrossing.mode!=NotifyNormal) // return ; // Ignore grab events eventType = wxEVT_ENTER_WINDOW; // canvas->GetEventHandler()->OnSetFocus(); } - else if (xevent->xany.type == LeaveNotify) + else if (XEventGetType(xevent) == LeaveNotify) { //if (local_event.xcrossingr.mode!=NotifyNormal) // return ; // Ignore grab events eventType = wxEVT_LEAVE_WINDOW; // canvas->GetEventHandler()->OnKillFocus(); } - else if (xevent->xany.type == MotionNotify) + else if (XEventGetType(xevent) == MotionNotify) { eventType = wxEVT_MOTION; } - else if (xevent->xany.type == ButtonPress) + else if (XEventGetType(xevent) == ButtonPress) { - wxevent.SetTimestamp(xevent->xbutton.time); + wxevent.SetTimestamp(XButtonEventGetTime(xevent)); int button = 0; - if (xevent->xbutton.button == Button1) + if (XButtonEventLChanged(xevent)) { eventType = wxEVT_LEFT_DOWN; button = 1; } - else if (xevent->xbutton.button == Button2) + else if (XButtonEventMChanged(xevent)) { eventType = wxEVT_MIDDLE_DOWN; button = 2; } - else if (xevent->xbutton.button == Button3) + else if (XButtonEventRChanged(xevent)) { eventType = wxEVT_RIGHT_DOWN; button = 3; @@ -1148,17 +1203,17 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, win->SetLastClick(button, ts); } } - else if (xevent->xany.type == ButtonRelease) + else if (XEventGetType(xevent) == ButtonRelease) { - if (xevent->xbutton.button == Button1) + if (XButtonEventLChanged(xevent)) { eventType = wxEVT_LEFT_UP; } - else if (xevent->xbutton.button == Button2) + else if (XButtonEventMChanged(xevent)) { eventType = wxEVT_MIDDLE_UP; } - else if (xevent->xbutton.button == Button3) + else if (XButtonEventRChanged(xevent)) { eventType = wxEVT_RIGHT_UP; } @@ -1171,23 +1226,23 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, wxevent.SetEventType(eventType); - wxevent.m_x = xevent->xbutton.x; - wxevent.m_y = xevent->xbutton.y; + wxevent.m_x = XButtonEventGetX(xevent); + wxevent.m_y = XButtonEventGetY(xevent); wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN) - || (event_left_is_down (xevent) + || (XButtonEventLIsDown(xevent) && (eventType != wxEVT_LEFT_UP))); wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN) - || (event_middle_is_down (xevent) + || (XButtonEventMIsDown(xevent) && (eventType != wxEVT_MIDDLE_UP))); wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN) - || (event_right_is_down (xevent) + || (XButtonEventRIsDown (xevent) && (eventType != wxEVT_RIGHT_UP))); - wxevent.m_shiftDown = xevent->xbutton.state & ShiftMask; - wxevent.m_controlDown = xevent->xbutton.state & ControlMask; - wxevent.m_altDown = xevent->xbutton.state & Mod3Mask; - wxevent.m_metaDown = xevent->xbutton.state & Mod1Mask; + wxevent.m_shiftDown = XButtonEventShiftIsDown(xevent); + wxevent.m_controlDown = XButtonEventCtrlIsDown(xevent); + wxevent.m_altDown = XButtonEventAltIsDown(xevent); + wxevent.m_metaDown = XButtonEventMetaIsDown(xevent); wxevent.SetId(win->GetId()); wxevent.SetEventObject(win); @@ -1200,7 +1255,7 @@ bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win), XEvent *xevent) { - switch (xevent->xany.type) + switch (XEventGetType(xevent)) { case KeyPress: case KeyRelease: @@ -1211,20 +1266,16 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win (void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL); int id = wxCharCodeXToWX (keySym); - if (xevent->xkey.state & ShiftMask) - wxevent.m_shiftDown = TRUE; - if (xevent->xkey.state & ControlMask) - wxevent.m_controlDown = TRUE; - if (xevent->xkey.state & Mod3Mask) - wxevent.m_altDown = TRUE; - if (xevent->xkey.state & Mod1Mask) - wxevent.m_metaDown = TRUE; + wxevent.m_shiftDown = XKeyEventShiftIsDown(xevent); + wxevent.m_controlDown = XKeyEventCtrlIsDown(xevent); + wxevent.m_altDown = XKeyEventAltIsDown(xevent); + wxevent.m_metaDown = XKeyEventMetaIsDown(xevent); wxevent.SetEventObject(win); wxevent.m_keyCode = id; - wxevent.SetTimestamp(xevent->xkey.time); + wxevent.SetTimestamp(XKeyEventGetTime(xevent)); - wxevent.m_x = xevent->xbutton.x; - wxevent.m_y = xevent->xbutton.y; + wxevent.m_x = XKeyEventGetX(xevent); + wxevent.m_y = XKeyEventGetY(xevent); if (id > -1) return TRUE; @@ -1242,85 +1293,28 @@ bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win // Colour stuff // ---------------------------------------------------------------------------- -#if 0 - -#define YAllocColor XAllocColor -XColor g_itemColors[5]; -int wxComputeColours (Display *display, wxColour * back, wxColour * fore) -{ - int result; - static XmColorProc colorProc; - - result = wxNO_COLORS; - - if (back) - { - g_itemColors[0].red = (((long) back->Red ()) << 8); - g_itemColors[0].green = (((long) back->Green ()) << 8); - g_itemColors[0].blue = (((long) back->Blue ()) << 8); - g_itemColors[0].flags = DoRed | DoGreen | DoBlue; - if (colorProc == (XmColorProc) NULL) - { - // Get a ptr to the actual function - colorProc = XmSetColorCalculation ((XmColorProc) NULL); - // And set it back to motif. - XmSetColorCalculation (colorProc); - } - (*colorProc) (&g_itemColors[wxBACK_INDEX], - &g_itemColors[wxFORE_INDEX], - &g_itemColors[wxSELE_INDEX], - &g_itemColors[wxTOPS_INDEX], - &g_itemColors[wxBOTS_INDEX]); - result = wxBACK_COLORS; - } - if (fore) - { - g_itemColors[wxFORE_INDEX].red = (((long) fore->Red ()) << 8); - g_itemColors[wxFORE_INDEX].green = (((long) fore->Green ()) << 8); - g_itemColors[wxFORE_INDEX].blue = (((long) fore->Blue ()) << 8); - g_itemColors[wxFORE_INDEX].flags = DoRed | DoGreen | DoBlue; - if (result == wxNO_COLORS) - result = wxFORE_COLORS; - } - - Display *dpy = display; - Colormap cmap = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dpy); - - if (back) - { - /* 5 Colours to allocate */ - for (int i = 0; i < 5; i++) - if (!YAllocColor (dpy, cmap, &g_itemColors[i])) - result = wxNO_COLORS; - } - else if (fore) - { - /* Only 1 colour to allocate */ - if (!YAllocColor (dpy, cmap, &g_itemColors[wxFORE_INDEX])) - result = wxNO_COLORS; - } - - return (result); - -} -#endif - bool wxWindowX11::SetBackgroundColour(const wxColour& col) { - if ( !wxWindowBase::SetBackgroundColour(col) ) - return FALSE; + wxWindowBase::SetBackgroundColour(col); + Display *xdisplay = (Display*) wxGlobalDisplay(); + int xscreen = DefaultScreen( xdisplay ); + Colormap cm = DefaultColormap( xdisplay, xscreen ); + + m_backgroundColour.CalcPixel( (WXColormap) cm ); + if (!GetMainWindow()) return FALSE; - wxColour colour( col ); +/* XSetWindowAttributes attrib; - attrib.background_pixel = colour.AllocColour(wxGlobalDisplay()); + attrib.background_pixel = colour.GetPixel(); XChangeWindowAttributes(wxGlobalDisplay(), (Window) GetMainWindow(), CWBackPixel, & attrib); +*/ return TRUE; } @@ -1361,6 +1355,10 @@ wxWindow* wxFindWindowAtPointer(wxPoint& pt) // Get the current mouse position. wxPoint wxGetMousePosition() { +#if wxUSE_NANOX + /* TODO */ + return wxPoint(0, 0); +#else Display *display = wxGlobalDisplay(); Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display)); Window rootReturn, childReturn; @@ -1373,6 +1371,7 @@ wxPoint wxGetMousePosition() &childReturn, &rootX, &rootY, &winX, &winY, &maskReturn); return wxPoint(rootX, rootY); +#endif }