X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86fd8bda3817a22588e5ff92b932dfaecc1eb37a..2da6105611475cb08135997c587df72be67840bd:/src/x11/window.cpp?ds=sidebyside diff --git a/src/x11/window.cpp b/src/x11/window.cpp index 3e2f313bae..31875c8e7d 100644 --- a/src/x11/window.cpp +++ b/src/x11/window.cpp @@ -93,12 +93,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; } @@ -131,40 +129,57 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id, m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); m_backgroundColour.CalcPixel( (WXColormap) cm ); - m_hasBgCol = TRUE; m_foregroundColour = *wxBLACK; m_foregroundColour.CalcPixel( (WXColormap) cm ); - Window parentWindow = (Window) parent->GetMainWindow(); - Window window = XCreateSimpleWindow( + wxSize size2(size); + if (size2.x == -1) + size2.x = 100; + if (size2.y == -1) + size2.y = 100; + + wxPoint pos2(pos); + if (pos2.x == -1) + pos2.x = 100; + if (pos2.y == -1) + pos2.y = 100; + + Window xwindow = XCreateSimpleWindow( xdisplay, parentWindow, - x, y, w, h, 0, + pos2.x, pos2.y, size2.x, size2.y, 0, m_backgroundColour.GetPixel(), m_backgroundColour.GetPixel() ); - m_mainWidget = (WXWindow) window; + m_mainWidget = (WXWindow) xwindow; // Select event types wanted - XSelectInput( wxGlobalDisplay(), window, + XSelectInput( xdisplay, xwindow, ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask | PropertyChangeMask); - wxAddWindowToTable(window, (wxWindow*) this); + 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; } @@ -209,8 +224,16 @@ void wxWindowX11::SetFocus() Window xwindow = (Window) GetMainWindow(); wxCHECK_RET( xwindow, wxT("invalid window") ); - - XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime ); + + if (wxWindowIsVisible(xwindow)) + { + XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime ); + m_needsInputFocus = FALSE; + } + else + { + m_needsInputFocus = TRUE; + } } // Get the window with the focus @@ -230,6 +253,21 @@ wxWindow *wxWindowBase::FindFocus() return NULL; } +#if 0 +wxWindow *wxWindowX11::GetFocusWidget() +{ + wxWindow *win = (wxWindow*) this; + while (!win->IsTopLevel()) + { + win = win->GetParent(); + if (!win) + return (wxWindow*) NULL; + } + + return win; +} +#endif + // Enabling/disabling handled by event loop, and not sending events // if disabled. bool wxWindowX11::Enable(bool enable) @@ -249,16 +287,16 @@ bool wxWindowX11::Show(bool show) if (show) { wxString msg; - msg.Printf("Mapping window of type %s", GetClassInfo()->GetClassName()); - wxLogDebug(msg); + msg.Printf("Mapping window of type %s", GetClassInfo()->GetClassName()); + wxLogDebug(msg); XMapWindow(xdisp, xwin); - XSync(xdisp, False); + XSync(xdisp, False); } else { wxString msg; - msg.Printf("Unmapping window of type %s", GetClassInfo()->GetClassName()); - wxLogDebug(msg); + msg.Printf("Unmapping window of type %s", GetClassInfo()->GetClassName()); + wxLogDebug(msg); XUnmapWindow(xdisp, xwin); } @@ -437,170 +475,93 @@ void wxWindowX11::WarpPointer (int x, int y) // 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; + 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; + int s_y; + 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); - - rect->x = rect->x; - rect->y = rect->y; - rect->width = rect->width; - rect->height = rect->height; - - updateRects.Append((wxObject*) rect); + s_x = rect->x; + s_y = rect->y; + 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); - - rect->x = rect->x; - rect->y = rect->y; - rect->width = rect->width; - rect->height = rect->height; + + wxPoint offset = GetClientAreaOrigin(); + s_x += offset.x; + s_y += offset.y; + + 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); - - node = node->Next(); + wxRect rect; + if (dx < 0) rect.x = cw+dx; else rect.x = s_x; + if (dy < 0) rect.y = ch+dy; else rect.y = s_y; + if (dy != 0) rect.width = cw; else rect.width = abs(dx); + if (dx != 0) rect.height = ch; else rect.height = abs(dy); + + int d_x = s_x; + int d_y = s_y; + if (dx < 0) s_x += -dx; + if (dy < 0) s_y += -dy; + if (dx > 0) d_x = dx; + if (dy > 0) d_y = dy; + + XCopyArea( xdisplay, xwindow, xwindow, xgc, s_x, s_y, w, h, d_x, d_y ); + // printf( "s_x %d s_y %d w %d h %d d_x %d d_y %d\n", s_x, s_y, w, h, d_x, d_y ); + + // printf( "rect %d %d %d %d\n", 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 ); } // --------------------------------------------------------------------------- @@ -651,6 +612,7 @@ void wxWindowX11::DoGetSize(int *x, int *y) const wxCHECK_RET( xwindow, wxT("invalid window") ); + XSync(wxGlobalDisplay(), False); XWindowAttributes attr; Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr ); wxASSERT(status); @@ -667,6 +629,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); @@ -720,6 +683,7 @@ 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 ); wxASSERT(status); @@ -734,61 +698,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)) { - 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 */; - 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; } - - 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 @@ -843,7 +816,19 @@ void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, 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 ); } // --------------------------------------------------------------------------- @@ -959,6 +944,7 @@ void wxWindowX11::Update() { if (!m_updateRegion.IsEmpty()) { + // Actually send erase and paint events. X11SendPaintEvents(); } } @@ -975,7 +961,7 @@ void wxWindowX11::X11SendPaintEvents() { m_clipPaintRegion = TRUE; - // if (!m_clearRegion.IsEmpty()) + if (!m_clearRegion.IsEmpty()) { wxWindowDC dc( (wxWindow*)this ); dc.SetClippingRegion( m_clearRegion ); @@ -985,13 +971,19 @@ void wxWindowX11::X11SendPaintEvents() 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( wxGlobalDisplay(), (Window) m_mainWidget, - upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight(), False ); + XFillRectangle( xdisplay, xwindow, xgc, + upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() ); upd ++; } + XFreeGC( xdisplay, xgc ); } m_clearRegion.Clear(); } @@ -1040,6 +1032,10 @@ void wxWindowX11::OnInternalIdle() // 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(); } // ---------------------------------------------------------------------------- @@ -1276,16 +1272,16 @@ bool wxWindowX11::SetBackgroundColour(const wxColour& col) { wxWindowBase::SetBackgroundColour(col); - if (!GetMainWindow()) - return FALSE; - Display *xdisplay = (Display*) wxGlobalDisplay(); int xscreen = DefaultScreen( xdisplay ); Colormap cm = DefaultColormap( xdisplay, xscreen ); - wxColour colour( col ); - colour.CalcPixel( (WXColormap) cm ); + m_backgroundColour.CalcPixel( (WXColormap) cm ); + if (!GetMainWindow()) + return FALSE; + +/* XSetWindowAttributes attrib; attrib.background_pixel = colour.GetPixel(); @@ -1293,6 +1289,7 @@ bool wxWindowX11::SetBackgroundColour(const wxColour& col) (Window) GetMainWindow(), CWBackPixel, & attrib); +*/ return TRUE; }