Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverse hierarchy of wxPizza GdkWindows

Browse Source 
widget->window must be topmost in order for GTK+ to calculate DND drop coordinates correctly
fixes #11834


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2010-03-29 01:16:06 +00:00
parent 27297c823a
commit f089940f68
6 changed files with 89 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/private/win_gtk.h
View File

@@ -24,10 +24,12 @@ struct WXDLLIMPEXP_CORE wxPizza
static GtkWidget* New(long windowStyle = 0); static GtkWidget* New(long windowStyle = 0);
static GType type(); static GType type();
void move(GtkWidget* widget, int x, int y); void move(GtkWidget* widget, int x, int y);
void put(GtkWidget* widget, int x, int y);
void scroll(int dx, int dy); void scroll(int dx, int dy);
void get_border_widths(int& x, int& y); void get_border_widths(int& x, int& y);
GtkFixed m_fixed; GtkFixed m_fixed;
GdkWindow* m_draw_window;
int m_scroll_x; int m_scroll_x;
int m_scroll_y; int m_scroll_y;
int m_border_style; int m_border_style;

4
include/wx/gtk/window.h
View File

@@ -323,8 +323,8 @@ protected:
virtual void DoFreeze(); virtual void DoFreeze();
virtual void DoThaw(); virtual void DoThaw();
static void GTKFreezeWidget(GtkWidget *w); void GTKFreezeWidget(GtkWidget *w);
static void GTKThawWidget(GtkWidget *w); void GTKThawWidget(GtkWidget *w);
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
virtual void DoSetToolTip( wxToolTip *tip ); virtual void DoSetToolTip( wxToolTip *tip );

4
src/gtk/dcclient.cpp
View File

@@ -269,6 +269,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) :
m_font = window->GetFont(); m_font = window->GetFont();
GtkWidget *widget = window->m_wxwindow; GtkWidget *widget = window->m_wxwindow;
m_gdkwindow = window->GTKGetDrawingWindow();
// Some controls don't have m_wxwindow - like wxStaticBox, but the user // Some controls don't have m_wxwindow - like wxStaticBox, but the user
// code should still be able to create wxClientDCs for them // code should still be able to create wxClientDCs for them
@@ -278,6 +279,7 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) :
wxCHECK_RET(widget, "DC needs a widget"); wxCHECK_RET(widget, "DC needs a widget");
m_gdkwindow = widget->window;
if (GTK_WIDGET_NO_WINDOW(widget)) if (GTK_WIDGET_NO_WINDOW(widget))
SetDeviceLocalOrigin(widget->allocation.x, widget->allocation.y); SetDeviceLocalOrigin(widget->allocation.x, widget->allocation.y);
} }
@@ -286,8 +288,6 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) :
m_layout = pango_layout_new( m_context ); m_layout = pango_layout_new( m_context );
m_fontdesc = pango_font_description_copy( widget->style->font_desc ); m_fontdesc = pango_font_description_copy( widget->style->font_desc );
m_gdkwindow = widget->window;
// Window not realized ? // Window not realized ?
if (!m_gdkwindow) if (!m_gdkwindow)
{ {

2
src/gtk/glcanvas.cpp
View File

@@ -247,7 +247,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
Window wxGLCanvas::GetXWindow() const Window wxGLCanvas::GetXWindow() const
{ {
GdkWindow *window = m_wxwindow->window; GdkWindow* window = GTKGetDrawingWindow();
return window ? GDK_WINDOW_XWINDOW(window) : 0; return window ? GDK_WINDOW_XWINDOW(window) : 0;
} }

88
src/gtk/win_gtk.cpp
View File

@@ -19,7 +19,7 @@ borders, and RTL.
For scrolling, the "set_scroll_adjustments" signal is implemented For scrolling, the "set_scroll_adjustments" signal is implemented
to make wxPizza appear scrollable to GTK+, allowing it to be put in a to make wxPizza appear scrollable to GTK+, allowing it to be put in a
GtkScrolledWindow. Child widget positions are adjusted for the scrolling GtkScrolledWindow. Child widget positions are adjusted for the scrolling
position in size_allocate. A second same-size GdkWindow is placed behind position in size_allocate. A second same-size GdkWindow is placed in front of
widget->window, to allow GDK to use a more efficient scrolling technique. widget->window, to allow GDK to use a more efficient scrolling technique.
For borders, space is reserved in realize and size_allocate. The border is For borders, space is reserved in realize and size_allocate. The border is
@@ -30,14 +30,6 @@ For RTL, child widget positions are mirrored in size_allocate.
static GtkWidgetClass* parent_class; static GtkWidgetClass* parent_class;
static inline GdkWindow* get_backing_window(GtkWidget* widget)
{
GdkWindow* w = NULL;
if (widget->window && WX_PIZZA(widget)->m_is_scrollable)
w = gdk_window_get_parent(widget->window);
return w;
}
extern "C" { extern "C" {
struct wxPizzaClass struct wxPizzaClass
@@ -66,14 +58,13 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
int h = alloc->height - 2 * border_y; int h = alloc->height - 2 * border_y;
if (h < 0) h = 0; if (h < 0) h = 0;
if (pizza->m_is_scrollable) if (pizza->m_draw_window != widget->window)
{ {
// two windows, both same size // two windows, both same size
GdkWindow* backing_window = gdk_window_get_parent(widget->window); gdk_window_move_resize(widget->window,
gdk_window_move_resize(backing_window,
alloc->x + border_x, alloc->y + border_y, w, h); alloc->x + border_x, alloc->y + border_y, w, h);
if (is_resize) if (is_resize)
gdk_window_resize(widget->window, w, h); gdk_window_resize(pizza->m_draw_window, w, h);
} }
else else
{ {
@@ -85,12 +76,9 @@ static void size_allocate(GtkWidget* widget, GtkAllocation* alloc)
{ {
// old and new border areas need to be invalidated, // old and new border areas need to be invalidated,
// otherwise they will not be erased/redrawn properly // otherwise they will not be erased/redrawn properly
const GtkAllocation& a1 = widget->allocation; GdkWindow* parent = gtk_widget_get_parent_window(widget);
const GtkAllocation& a2 = *alloc; gdk_window_invalidate_rect(parent, &widget->allocation, false);
GdkRectangle r1 = { a1.x, a1.y, a1.width, a1.height }; gdk_window_invalidate_rect(parent, alloc, false);
GdkRectangle r2 = { a2.x, a2.y, a2.width, a2.height };
gdk_window_invalidate_rect(widget->parent->window, &r1, false);
gdk_window_invalidate_rect(widget->parent->window, &r2, false);
} }
} }
} }
@@ -125,6 +113,7 @@ static void realize(GtkWidget* widget)
parent_class->realize(widget); parent_class->realize(widget);
wxPizza* pizza = WX_PIZZA(widget); wxPizza* pizza = WX_PIZZA(widget);
pizza->m_draw_window = widget->window;
if (pizza->m_border_style || pizza->m_is_scrollable) if (pizza->m_border_style || pizza->m_is_scrollable)
{ {
int border_x, border_y; int border_x, border_y;
@@ -149,19 +138,27 @@ static void realize(GtkWidget* widget)
attr.colormap = gtk_widget_get_colormap(widget); attr.colormap = gtk_widget_get_colormap(widget);
attr.window_type = GDK_WINDOW_CHILD; attr.window_type = GDK_WINDOW_CHILD;
GdkWindow* backing_window = gdk_window_new( // existing widget->window becomes m_draw_window,
// new widget->window created as parent of m_draw_window
widget->window = gdk_window_new(
gdk_window_get_parent(widget->window), gdk_window_get_parent(widget->window),
&attr, &attr,
GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP); GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP);
gdk_window_set_user_data(backing_window, widget); gdk_window_set_user_data(widget->window, widget);
gdk_window_reparent(widget->window, backing_window, 0, 0); gdk_window_reparent(pizza->m_draw_window, widget->window, 0, 0);
gdk_window_resize(widget->window, w, h); gdk_window_resize(pizza->m_draw_window, w, h);
// Parts of backing window may be exposed temporarily while // Parts of backing window may be exposed temporarily while
// resizing. Setting the backing pixmap to None prevents those // resizing. Setting the backing pixmap to None prevents those
// areas from being briefly painted black. // areas from being briefly painted black.
gdk_window_set_back_pixmap(backing_window, NULL, false); gdk_window_set_back_pixmap(widget->window, NULL, false);
for (const GList* list = pizza->m_fixed.children; list; list = list->next)
{
const GtkFixedChild* child = static_cast<GtkFixedChild*>(list->data);
gtk_widget_set_parent_window(child->widget, pizza->m_draw_window);
}
} }
else else
gdk_window_move_resize(widget->window, x, y, w, h); gdk_window_move_resize(widget->window, x, y, w, h);
@@ -170,34 +167,33 @@ static void realize(GtkWidget* widget)
static void unrealize(GtkWidget* widget) static void unrealize(GtkWidget* widget)
{ {
GdkWindow* backing_window = get_backing_window(widget); wxPizza* pizza = WX_PIZZA(widget);
if (pizza->m_draw_window != widget->window)
{
gdk_window_set_user_data(pizza->m_draw_window, NULL);
gdk_window_destroy(pizza->m_draw_window);
}
pizza->m_draw_window = NULL;
parent_class->unrealize(widget); parent_class->unrealize(widget);
if (backing_window)
{
gdk_window_set_user_data(backing_window, NULL);
gdk_window_destroy(backing_window);
}
} }
static void map(GtkWidget* widget) static void map(GtkWidget* widget)
{ {
GdkWindow* backing_window = get_backing_window(widget);
if (backing_window)
gdk_window_show(backing_window);
parent_class->map(widget); parent_class->map(widget);
GdkWindow* window = WX_PIZZA(widget)->m_draw_window;
if (window != widget->window)
gdk_window_show(window);
} }
static void unmap(GtkWidget* widget) static void unmap(GtkWidget* widget)
{ {
GdkWindow* backing_window = get_backing_window(widget); GdkWindow* window = WX_PIZZA(widget)->m_draw_window;
if (window != widget->window)
gdk_window_hide(window);
parent_class->unmap(widget); parent_class->unmap(widget);
if (backing_window)
gdk_window_hide(backing_window);
} }
// not used, but needs to exist so gtk_widget_set_scroll_adjustments will work // not used, but needs to exist so gtk_widget_set_scroll_adjustments will work
@@ -294,6 +290,7 @@ GtkWidget* wxPizza::New(long windowStyle)
{ {
GtkWidget* widget = GTK_WIDGET(g_object_new(type(), NULL)); GtkWidget* widget = GTK_WIDGET(g_object_new(type(), NULL));
wxPizza* pizza = WX_PIZZA(widget); wxPizza* pizza = WX_PIZZA(widget);
pizza->m_draw_window = NULL;
pizza->m_scroll_x = 0; pizza->m_scroll_x = 0;
pizza->m_scroll_y = 0; pizza->m_scroll_y = 0;
pizza->m_is_scrollable = (windowStyle & (wxHSCROLL | wxVSCROLL)) != 0; pizza->m_is_scrollable = (windowStyle & (wxHSCROLL | wxVSCROLL)) != 0;
@@ -336,6 +333,13 @@ void wxPizza::move(GtkWidget* widget, int x, int y)
} }
} }
void wxPizza::put(GtkWidget* widget, int x, int y)
{
gtk_fixed_put(&m_fixed, widget, x, y);
if (m_draw_window != GTK_WIDGET(this)->window)
gtk_widget_set_parent_window(widget, m_draw_window);
}
struct AdjustData { struct AdjustData {
GdkWindow* window; GdkWindow* window;
int dx, dy; int dx, dy;
@@ -368,12 +372,12 @@ void wxPizza::scroll(int dx, int dy)
dx = -dx; dx = -dx;
m_scroll_x -= dx; m_scroll_x -= dx;
m_scroll_y -= dy; m_scroll_y -= dy;
if (widget->window) if (m_draw_window)
{ {
gdk_window_scroll(widget->window, dx, dy); gdk_window_scroll(m_draw_window, dx, dy);
// Adjust child allocations. Doing a queue_resize on the children is not // Adjust child allocations. Doing a queue_resize on the children is not
// enough, sometimes they redraw in the wrong place during fast scrolling. // enough, sometimes they redraw in the wrong place during fast scrolling.
AdjustData data = { widget->window, dx, dy }; AdjustData data = { m_draw_window, dx, dy };
gtk_container_forall(GTK_CONTAINER(widget), scroll_adjust, &data); gtk_container_forall(GTK_CONTAINER(widget), scroll_adjust, &data);
} }
} }

60
src/gtk/window.cpp
View File

@@ -281,11 +281,11 @@ wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget),
extern "C" { extern "C" {
static gboolean static gboolean
gtk_window_expose_callback( GtkWidget* widget, gtk_window_expose_callback( GtkWidget*,
GdkEventExpose *gdk_event, GdkEventExpose *gdk_event,
wxWindow *win ) wxWindow *win )
{ {
if (gdk_event->window == widget->window) if (gdk_event->window == win->GTKGetDrawingWindow())
{ {
win->GetUpdateRegion() = wxRegion( gdk_event->region ); win->GetUpdateRegion() = wxRegion( gdk_event->region );
win->GtkSendPaintEvents(); win->GtkSendPaintEvents();
@@ -304,7 +304,7 @@ extern "C" {
static gboolean static gboolean
expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win) expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win)
{ {
if (gdk_event->window != widget->window) if (gdk_event->window != gtk_widget_get_parent_window(win->m_wxwindow))
return false; return false;
const GtkAllocation& alloc = win->m_wxwindow->allocation; const GtkAllocation& alloc = win->m_wxwindow->allocation;
@@ -1831,7 +1831,7 @@ gtk_window_realized_callback(GtkWidget* widget, wxWindow* win)
if (win->m_imData) if (win->m_imData)
{ {
gtk_im_context_set_client_window( win->m_imData->context, gtk_im_context_set_client_window( win->m_imData->context,
widget->window); win->m_wxwindow ? win->GTKGetDrawingWindow() : widget->window);
} }
// We cannot set colours and fonts before the widget // We cannot set colours and fonts before the widget
@@ -1949,8 +1949,7 @@ void wxWindowGTK::AddChildGTK(wxWindowGTK* child)
gtk_widget_set_size_request( gtk_widget_set_size_request(
child->m_widget, child->m_width, child->m_height); child->m_widget, child->m_width, child->m_height);
gtk_fixed_put( pizza->put(child->m_widget, child->m_x, child->m_y);
GTK_FIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -2572,7 +2571,7 @@ void wxWindowGTK::OnInternalIdle()
if (m_wxwindow && (m_wxwindow != m_widget)) if (m_wxwindow && (m_wxwindow != m_widget))
{ {
GdkWindow *window = m_wxwindow->window; GdkWindow* window = GTKGetDrawingWindow();
if (window) if (window)
gdk_window_set_cursor( window, cursor.GetCursor() ); gdk_window_set_cursor( window, cursor.GetCursor() );
@@ -3538,6 +3537,7 @@ void wxWindowGTK::Refresh(bool WXUNUSED(eraseBackground),
if (!GTK_WIDGET_MAPPED (w)) if (!GTK_WIDGET_MAPPED (w))
return; return;
GdkWindow* window = GTKGetDrawingWindow();
if (rect) if (rect)
{ {
int x = rect->x; int x = rect->x;
@@ -3548,23 +3548,26 @@ void wxWindowGTK::Refresh(bool WXUNUSED(eraseBackground),
r.y = rect->y; r.y = rect->y;
r.width = rect->width; r.width = rect->width;
r.height = rect->height; r.height = rect->height;
gdk_window_invalidate_rect( m_wxwindow->window, &r, TRUE ); gdk_window_invalidate_rect(window, &r, true);
} }
else else
gdk_window_invalidate_rect( m_wxwindow->window, NULL, TRUE ); gdk_window_invalidate_rect(window, NULL, true);
} }
} }
void wxWindowGTK::Update() void wxWindowGTK::Update()
{ {
if (m_widget && m_widget->window) if (m_widget && GTK_WIDGET_MAPPED(m_widget))
{ {
GdkDisplay* display = gtk_widget_get_display(m_widget); GdkDisplay* display = gtk_widget_get_display(m_widget);
// Flush everything out to the server, and wait for it to finish. // Flush everything out to the server, and wait for it to finish.
// This ensures nothing will overwrite the drawing we are about to do. // This ensures nothing will overwrite the drawing we are about to do.
gdk_display_sync(display); gdk_display_sync(display);
gdk_window_process_updates(m_widget->window, TRUE); GdkWindow* window = GTKGetDrawingWindow();
if (window == NULL)
window = m_widget->window;
gdk_window_process_updates(window, true);
// Flush again, but no need to wait for it to finish // Flush again, but no need to wait for it to finish
gdk_display_flush(display); gdk_display_flush(display);
@@ -3669,7 +3672,7 @@ void wxWindowGTK::GtkSendPaintEvents()
rect.height = upd.GetHeight(); rect.height = upd.GetHeight();
gtk_paint_flat_box( parent->m_widget->style, gtk_paint_flat_box( parent->m_widget->style,
m_wxwindow->window, GTKGetDrawingWindow(),
(GtkStateType)GTK_WIDGET_STATE(m_wxwindow), (GtkStateType)GTK_WIDGET_STATE(m_wxwindow),
GTK_SHADOW_NONE, GTK_SHADOW_NONE,
&rect, &rect,
@@ -3918,7 +3921,7 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style)
GdkWindow *window; GdkWindow *window;
if ( m_wxwindow ) if ( m_wxwindow )
{ {
window = m_wxwindow->window; window = GTKGetDrawingWindow();
} }
else else
{ {
@@ -4084,7 +4087,7 @@ bool wxWindowGTK::GTKIsOwnWindow(GdkWindow *window) const
GdkWindow *wxWindowGTK::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const GdkWindow *wxWindowGTK::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{ {
return m_wxwindow ? m_wxwindow->window : m_widget->window; return m_wxwindow ? GTKGetDrawingWindow() : m_widget->window;
} }
bool wxWindowGTK::SetFont( const wxFont &font ) bool wxWindowGTK::SetFont( const wxFont &font )
@@ -4107,7 +4110,7 @@ void wxWindowGTK::DoCaptureMouse()
GdkWindow *window = NULL; GdkWindow *window = NULL;
if (m_wxwindow) if (m_wxwindow)
window = m_wxwindow->window; window = GTKGetDrawingWindow();
else else
window = GetConnectWidget()->window; window = GetConnectWidget()->window;
@@ -4140,7 +4143,7 @@ void wxWindowGTK::DoReleaseMouse()
GdkWindow *window = NULL; GdkWindow *window = NULL;
if (m_wxwindow) if (m_wxwindow)
window = m_wxwindow->window; window = GTKGetDrawingWindow();
else else
window = GetConnectWidget()->window; window = GetConnectWidget()->window;
@@ -4412,7 +4415,7 @@ GdkWindow* wxWindowGTK::GTKGetDrawingWindow() const
{ {
GdkWindow* window = NULL; GdkWindow* window = NULL;
if (m_wxwindow) if (m_wxwindow)
window = m_wxwindow->window; window = WX_PIZZA(m_wxwindow)->m_draw_window;
return window; return window;
} }
@@ -4425,7 +4428,7 @@ extern "C"
// this is called if we attempted to freeze unrealized widget when it finally // this is called if we attempted to freeze unrealized widget when it finally
// is realized (and so can be frozen): // is realized (and so can be frozen):
static void wx_frozen_widget_realize(GtkWidget* w, void* WXUNUSED(data)) static void wx_frozen_widget_realize(GtkWidget* w, wxWindowGTK* win)
{ {
wxASSERT( w && !GTK_WIDGET_NO_WINDOW(w) ); wxASSERT( w && !GTK_WIDGET_NO_WINDOW(w) );
wxASSERT( GTK_WIDGET_REALIZED(w) ); wxASSERT( GTK_WIDGET_REALIZED(w) );
@@ -4434,10 +4437,13 @@ static void wx_frozen_widget_realize(GtkWidget* w, void* WXUNUSED(data))
( (
w, w,
(void*)wx_frozen_widget_realize, (void*)wx_frozen_widget_realize,
NULL win
); );
gdk_window_freeze_updates(w->window); GdkWindow* window = win->GTKGetDrawingWindow();
if (window == NULL)
window = w->window;
gdk_window_freeze_updates(window);
} }
} // extern "C" } // extern "C"
@@ -4456,12 +4462,15 @@ void wxWindowGTK::GTKFreezeWidget(GtkWidget *w)
w, w,
"realize", "realize",
G_CALLBACK(wx_frozen_widget_realize), G_CALLBACK(wx_frozen_widget_realize),
NULL this
); );
return; return;
} }
gdk_window_freeze_updates(w->window); GdkWindow* window = GTKGetDrawingWindow();
if (window == NULL)
window = w->window;
gdk_window_freeze_updates(window);
} }
void wxWindowGTK::GTKThawWidget(GtkWidget *w) void wxWindowGTK::GTKThawWidget(GtkWidget *w)
@@ -4476,12 +4485,15 @@ void wxWindowGTK::GTKThawWidget(GtkWidget *w)
( (
w, w,
(void*)wx_frozen_widget_realize, (void*)wx_frozen_widget_realize,
NULL this
); );
return; return;
} }
gdk_window_thaw_updates(w->window); GdkWindow* window = GTKGetDrawingWindow();
if (window == NULL)
window = w->window;
gdk_window_thaw_updates(window);
} }
void wxWindowGTK::DoFreeze() void wxWindowGTK::DoFreeze()