X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fa056ab78be920eacac56e51864fe7a45d1a31a..48d011c8968d3cbbba6e0cd1c616949789fde0be:/src/gtk1/win_gtk.c diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c index f97158acf9..d2d3ecdec5 100644 --- a/src/gtk1/win_gtk.c +++ b/src/gtk1/win_gtk.c @@ -9,11 +9,12 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////// */ -#include "wx/gtk/win_gtk.h" -#ifdef __VMS -#define gtk_widget_get_child_requisition gtk_widget_get_child_requisitio -#define gtk_marshal_NONE__POINTER_POINTER gtk_marshal_NONE__POINTER_POINT +#ifdef VMS +#define XCheckIfEvent XCHECKIFEVENT #endif + +#include "wx/setup.h" +#include "wx/gtk/win_gtk.h" #include "gtk/gtksignal.h" #include "gtk/gtkprivate.h" #include "gdk/gdkx.h" @@ -22,6 +23,8 @@ extern "C" { #endif /* __cplusplus */ +#ifndef __WXGTK20__ + #include #include #include @@ -29,8 +32,9 @@ extern "C" { #define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \ (y >= G_MINSHORT) && (y <= G_MAXSHORT)) +#endif + typedef struct _GtkPizzaAdjData GtkPizzaAdjData; -typedef struct _GtkPizzaChild GtkPizzaChild; struct _GtkPizzaAdjData { @@ -38,76 +42,66 @@ struct _GtkPizzaAdjData gint dy; }; -struct _GtkPizzaChild -{ - GtkWidget *widget; - gint x; - gint y; - gint width; - gint height; -}; - -static void gtk_pizza_class_init (GtkPizzaClass *klass); -static void gtk_pizza_init (GtkPizza *pizza); +static void gtk_pizza_class_init (GtkPizzaClass *klass); +static void gtk_pizza_init (GtkPizza *pizza); -static void gtk_pizza_realize (GtkWidget *widget); -static void gtk_pizza_unrealize (GtkWidget *widget); +static void gtk_pizza_realize (GtkWidget *widget); +static void gtk_pizza_unrealize (GtkWidget *widget); -static void gtk_pizza_map (GtkWidget *widget); +static void gtk_pizza_map (GtkWidget *widget); static void gtk_pizza_size_request (GtkWidget *widget, GtkRequisition *requisition); static void gtk_pizza_size_allocate (GtkWidget *widget, GtkAllocation *allocation); +#ifndef __WXGTK20__ static void gtk_pizza_draw (GtkWidget *widget, GdkRectangle *area); +#endif /* __WXGTK20__ */ static gint gtk_pizza_expose (GtkWidget *widget, GdkEventExpose *event); static void gtk_pizza_add (GtkContainer *container, GtkWidget *widget); static void gtk_pizza_remove (GtkContainer *container, GtkWidget *widget); -static void gtk_pizza_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data); +static void gtk_pizza_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data); +static void gtk_pizza_allocate_child (GtkPizza *pizza, + GtkPizzaChild *child); static void gtk_pizza_position_child (GtkPizza *pizza, - GtkPizzaChild *child); -static void gtk_pizza_allocate_child (GtkPizza *pizza, - GtkPizzaChild *child); + GtkPizzaChild *child); +#ifndef __WXGTK20__ static void gtk_pizza_position_children (GtkPizza *pizza); static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget, - gpointer cb_data); -static void gtk_pizza_adjust_allocations (GtkPizza *pizza, - gint dx, - gint dy); - - -static void gtk_pizza_expose_area (GtkPizza *pizza, - gint x, - gint y, - gint width, - gint height); -static void gtk_pizza_adjustment_changed (GtkAdjustment *adjustment, - GtkPizza *pizza); + gpointer cb_data); +static void gtk_pizza_adjust_allocations (GtkPizza *pizza, + gint dx, + gint dy); static GdkFilterReturn gtk_pizza_filter (GdkXEvent *gdk_xevent, - GdkEvent *event, - gpointer data); + GdkEvent *event, + gpointer data); static GdkFilterReturn gtk_pizza_main_filter (GdkXEvent *gdk_xevent, - GdkEvent *event, - gpointer data); - + GdkEvent *event, + gpointer data); +#endif /* __WXGTK20__ */ static GtkType gtk_pizza_child_type (GtkContainer *container); -static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, +static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, GtkAdjustment *hadj, GtkAdjustment *vadj); -static GtkContainerClass *parent_class = NULL; +#ifdef __WXGTK20__ + GtkContainerClass *pizza_parent_class = NULL; +#else +static GtkContainerClass *pizza_parent_class = NULL; +#endif + static gboolean gravity_works; guint @@ -117,18 +111,35 @@ gtk_pizza_get_type () if (!pizza_type) { + +#ifdef __WXGTK20__ + static const GTypeInfo pizza_info = + { + sizeof (GtkPizzaClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gtk_pizza_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GtkPizza), + 16, /* n_preallocs */ + (GInstanceInitFunc) gtk_pizza_init, + }; + pizza_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPizza", &pizza_info, 0); +#else GtkTypeInfo pizza_info = { - "GtkPizza", - sizeof (GtkPizza), - sizeof (GtkPizzaClass), - (GtkClassInitFunc) gtk_pizza_class_init, - (GtkObjectInitFunc) gtk_pizza_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, + "GtkPizza", + sizeof (GtkPizza), + sizeof (GtkPizzaClass), + (GtkClassInitFunc) gtk_pizza_class_init, + (GtkObjectInitFunc) gtk_pizza_init, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, + (GtkClassInitFunc) NULL, }; pizza_type = gtk_type_unique (gtk_container_get_type (), &pizza_info); +#endif } return pizza_type; @@ -144,14 +155,16 @@ gtk_pizza_class_init (GtkPizzaClass *klass) object_class = (GtkObjectClass*) klass; widget_class = (GtkWidgetClass*) klass; container_class = (GtkContainerClass*) klass; - parent_class = gtk_type_class (GTK_TYPE_CONTAINER); + pizza_parent_class = gtk_type_class (GTK_TYPE_CONTAINER); widget_class->map = gtk_pizza_map; widget_class->realize = gtk_pizza_realize; widget_class->unrealize = gtk_pizza_unrealize; widget_class->size_request = gtk_pizza_size_request; widget_class->size_allocate = gtk_pizza_size_allocate; +#ifndef __WXGTK20__ widget_class->draw = gtk_pizza_draw; +#endif widget_class->expose_event = gtk_pizza_expose; container_class->add = gtk_pizza_add; @@ -165,7 +178,11 @@ gtk_pizza_class_init (GtkPizzaClass *klass) widget_class->set_scroll_adjustments_signal = gtk_signal_new ("set_scroll_adjustments", GTK_RUN_LAST, +#ifdef __WXGTK20__ + GTK_CLASS_TYPE(object_class), +#else object_class->type, +#endif GTK_SIGNAL_OFFSET (GtkPizzaClass, set_scroll_adjustments), gtk_marshal_NONE__POINTER_POINTER, GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); @@ -190,7 +207,7 @@ gtk_pizza_init (GtkPizza *pizza) pizza->height = 20; pizza->bin_window = NULL; - + pizza->xoffset = 0; pizza->yoffset = 0; @@ -200,7 +217,8 @@ gtk_pizza_init (GtkPizza *pizza) pizza->visibility = GDK_VISIBILITY_PARTIAL; pizza->clear_on_draw = TRUE; - pizza->use_filter = FALSE; + pizza->use_filter = TRUE; + pizza->external_expose = FALSE; } GtkWidget* @@ -222,7 +240,7 @@ gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, } void -gtk_pizza_set_shadow_type (GtkPizza *pizza, +gtk_pizza_set_shadow_type (GtkPizza *pizza, GtkMyShadowType type) { g_return_if_fail (pizza != NULL); @@ -241,8 +259,8 @@ gtk_pizza_set_shadow_type (GtkPizza *pizza, } void -gtk_pizza_set_clear (GtkPizza *pizza, - gboolean clear) +gtk_pizza_set_clear (GtkPizza *pizza, + gboolean clear) { g_return_if_fail (pizza != NULL); g_return_if_fail (GTK_IS_PIZZA (pizza)); @@ -250,23 +268,33 @@ gtk_pizza_set_clear (GtkPizza *pizza, pizza->clear_on_draw = clear; } -void -gtk_pizza_set_filter (GtkPizza *pizza, - gboolean use) +void +gtk_pizza_set_filter (GtkPizza *pizza, + gboolean use) { g_return_if_fail (pizza != NULL); g_return_if_fail (GTK_IS_PIZZA (pizza)); pizza->use_filter = use; -} - +} + void -gtk_pizza_put (GtkPizza *pizza, - GtkWidget *widget, - gint x, - gint y, - gint width, - gint height) +gtk_pizza_set_external (GtkPizza *pizza, + gboolean expose) +{ + g_return_if_fail (pizza != NULL); + g_return_if_fail (GTK_IS_PIZZA (pizza)); + + pizza->external_expose = expose; +} + +void +gtk_pizza_put (GtkPizza *pizza, + GtkWidget *widget, + gint x, + gint y, + gint width, + gint height) { GtkPizzaChild *child_info; @@ -289,32 +317,19 @@ gtk_pizza_put (GtkPizza *pizza, if (GTK_WIDGET_REALIZED (pizza)) gtk_widget_set_parent_window (widget, pizza->bin_window); +#ifndef __WXGTK20__ /* FIXME? */ if (!IS_ONSCREEN (x, y)) GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN); - -/* - if (GTK_WIDGET_REALIZED (pizza)) - gtk_widget_realize (widget); -*/ +#endif gtk_widget_set_usize (widget, width, height); - -/* - if (GTK_WIDGET_VISIBLE (pizza) && GTK_WIDGET_VISIBLE (widget)) - { - if (GTK_WIDGET_MAPPED (pizza)) - gtk_widget_map (widget); - - gtk_widget_queue_resize (widget); - } -*/ } void -gtk_pizza_move (GtkPizza *pizza, - GtkWidget *widget, - gint x, - gint y) +gtk_pizza_move (GtkPizza *pizza, + GtkWidget *widget, + gint x, + gint y) { GtkPizzaChild *child; GList *children; @@ -345,10 +360,10 @@ gtk_pizza_move (GtkPizza *pizza, } void -gtk_pizza_resize (GtkPizza *pizza, - GtkWidget *widget, - gint width, - gint height) +gtk_pizza_resize (GtkPizza *pizza, + GtkWidget *widget, + gint width, + gint height) { GtkPizzaChild *child; GList *children; @@ -381,12 +396,12 @@ gtk_pizza_resize (GtkPizza *pizza, } void -gtk_pizza_set_size (GtkPizza *pizza, - GtkWidget *widget, - gint x, - gint y, - gint width, - gint height) +gtk_pizza_set_size (GtkPizza *pizza, + GtkWidget *widget, + gint x, + gint y, + gint width, + gint height) { GtkPizzaChild *child; GList *children; @@ -423,6 +438,33 @@ gtk_pizza_set_size (GtkPizza *pizza, } } +gint +gtk_pizza_child_resized (GtkPizza *pizza, + GtkWidget *widget) +{ + GtkPizzaChild *child; + GList *children; + + g_return_val_if_fail (pizza != NULL, FALSE); + g_return_val_if_fail (GTK_IS_PIZZA (pizza), FALSE); + g_return_val_if_fail (widget != NULL, FALSE); + + children = pizza->children; + while (children) + { + child = children->data; + children = children->next; + + if (child->widget == widget) + { + return ((child->width == widget->allocation.width) && + (child->height == widget->allocation.height)); + } + } + + return FALSE; +} + static void gtk_pizza_map (GtkWidget *widget) { @@ -444,7 +486,11 @@ gtk_pizza_map (GtkWidget *widget) if ( GTK_WIDGET_VISIBLE (child->widget) && !GTK_WIDGET_MAPPED (child->widget) && +#ifdef __WXGTK20__ + TRUE) +#else !GTK_WIDGET_IS_OFFSCREEN (child->widget)) +#endif { gtk_widget_map (child->widget); } @@ -467,7 +513,6 @@ gtk_pizza_realize (GtkWidget *widget) g_return_if_fail (GTK_IS_PIZZA (widget)); pizza = GTK_PIZZA (widget); - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); attributes.window_type = GDK_WINDOW_CHILD; @@ -477,18 +522,20 @@ gtk_pizza_realize (GtkWidget *widget) attributes.width = widget->allocation.width; attributes.height = widget->allocation.height; +#ifndef __WXUNIVERSAL__ if (pizza->shadow_type == GTK_MYSHADOW_NONE) { /* no border, no changes to sizes */ - } else - if (pizza->shadow_type == GTK_MYSHADOW_THIN) + } + else if (pizza->shadow_type == GTK_MYSHADOW_THIN) { /* GTK_MYSHADOW_THIN == wxSIMPLE_BORDER */ attributes.x += 1; attributes.y += 1; attributes.width -= 2; attributes.height -= 2; - } else + } + else { /* GTK_MYSHADOW_IN == wxSUNKEN_BORDER */ /* GTK_MYSHADOW_OUT == wxRAISED_BORDER */ @@ -497,6 +544,7 @@ gtk_pizza_realize (GtkWidget *widget) attributes.width -= 4; attributes.height -= 4; } +#endif /* __WXUNIVERSAL__ */ /* minimal size */ if (attributes.width < 2) attributes.width = 2; @@ -505,8 +553,7 @@ gtk_pizza_realize (GtkWidget *widget) attributes.wclass = GDK_INPUT_OUTPUT; attributes.visual = gtk_widget_get_visual (widget); attributes.colormap = gtk_widget_get_colormap (widget); - attributes.event_mask = - GDK_VISIBILITY_NOTIFY_MASK; + attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK; attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; widget->window = gdk_window_new(gtk_widget_get_parent_window (widget), @@ -517,21 +564,23 @@ gtk_pizza_realize (GtkWidget *widget) attributes.y = 0; attributes.event_mask = gtk_widget_get_events (widget); - attributes.event_mask |= - GDK_EXPOSURE_MASK | - GDK_POINTER_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK | - GDK_BUTTON_MOTION_MASK | - GDK_BUTTON1_MOTION_MASK | - GDK_BUTTON2_MOTION_MASK | - GDK_BUTTON3_MOTION_MASK | - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_KEY_PRESS_MASK | - GDK_KEY_RELEASE_MASK | - GDK_ENTER_NOTIFY_MASK | - GDK_LEAVE_NOTIFY_MASK | - GDK_FOCUS_CHANGE_MASK; + attributes.event_mask |= GDK_EXPOSURE_MASK | +#ifdef __WXGTK20__ + GDK_SCROLL_MASK | +#endif + GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK | + GDK_BUTTON_MOTION_MASK | + GDK_BUTTON1_MOTION_MASK | + GDK_BUTTON2_MOTION_MASK | + GDK_BUTTON3_MOTION_MASK | + GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_KEY_PRESS_MASK | + GDK_KEY_RELEASE_MASK | + GDK_ENTER_NOTIFY_MASK | + GDK_LEAVE_NOTIFY_MASK | + GDK_FOCUS_CHANGE_MASK; pizza->bin_window = gdk_window_new(widget->window, &attributes, attributes_mask); @@ -539,11 +588,18 @@ gtk_pizza_realize (GtkWidget *widget) widget->style = gtk_style_attach (widget->style, widget->window); gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); - gtk_style_set_background (widget->style, pizza->bin_window, GTK_STATE_NORMAL); + gtk_style_set_background (widget->style, pizza->bin_window, GTK_STATE_NORMAL ); + +/* + gdk_window_set_back_pixmap( widget->window, NULL, FALSE ); + gdk_window_set_back_pixmap( pizza->bin_window, NULL, FALSE ); +*/ +#ifndef __WXGTK20__ /* add filters for intercepting visibility and expose events */ gdk_window_add_filter (widget->window, gtk_pizza_main_filter, pizza); gdk_window_add_filter (pizza->bin_window, gtk_pizza_filter, pizza); +#endif /* we NEED gravity or we'll give up */ gravity_works = gdk_window_set_static_gravities (pizza->bin_window, TRUE); @@ -562,24 +618,24 @@ gtk_pizza_realize (GtkWidget *widget) static void gtk_pizza_unrealize (GtkWidget *widget) { - GtkPizza *pizza; + GtkPizza *pizza; - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_PIZZA (widget)); + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_PIZZA (widget)); - pizza = GTK_PIZZA (widget); + pizza = GTK_PIZZA (widget); - gdk_window_set_user_data (pizza->bin_window, NULL); - gdk_window_destroy (pizza->bin_window); - pizza->bin_window = NULL; + gdk_window_set_user_data (pizza->bin_window, NULL); + gdk_window_destroy (pizza->bin_window); + pizza->bin_window = NULL; - if (GTK_WIDGET_CLASS (parent_class)->unrealize) - (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); + if (GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) + (* GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) (widget); } static void gtk_pizza_size_request (GtkWidget *widget, - GtkRequisition *requisition) + GtkRequisition *requisition) { GtkPizza *pizza; GtkPizzaChild *child; @@ -612,7 +668,7 @@ gtk_pizza_size_request (GtkWidget *widget, static void gtk_pizza_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) + GtkAllocation *allocation) { GtkPizza *pizza; gint border; @@ -658,9 +714,11 @@ gtk_pizza_size_allocate (GtkWidget *widget, } } +#ifndef __WXGTK20__ + static void gtk_pizza_draw (GtkWidget *widget, - GdkRectangle *area) + GdkRectangle *area) { GtkPizza *pizza; GtkPizzaChild *child; @@ -672,6 +730,10 @@ gtk_pizza_draw (GtkWidget *widget, pizza = GTK_PIZZA (widget); + /* Sometimes, We handle all expose events in window.cpp now. */ + if (pizza->external_expose) + return; + children = pizza->children; if ( !(GTK_WIDGET_APP_PAINTABLE (widget)) && (pizza->clear_on_draw)) @@ -690,9 +752,11 @@ gtk_pizza_draw (GtkWidget *widget, } } +#endif /* __WXGTK20__ */ + static gint gtk_pizza_expose (GtkWidget *widget, - GdkEventExpose *event) + GdkEventExpose *event) { GtkPizza *pizza; GtkPizzaChild *child; @@ -708,6 +772,18 @@ gtk_pizza_expose (GtkWidget *widget, if (event->window != pizza->bin_window) return FALSE; + /* We handle all expose events in window.cpp now. */ + if (pizza->external_expose) + return FALSE; + +#ifdef __WXGTK20__ + + (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, event); + + return FALSE; + +#else + children = pizza->children; while (children) { @@ -723,8 +799,10 @@ gtk_pizza_expose (GtkWidget *widget, gtk_widget_event (child->widget, (GdkEvent*) &child_event); } } - - return FALSE; + + return TRUE; + +#endif } static void @@ -740,7 +818,7 @@ gtk_pizza_add (GtkContainer *container, static void gtk_pizza_remove (GtkContainer *container, - GtkWidget *widget) + GtkWidget *widget) { GtkPizza *pizza; GtkPizzaChild *child; @@ -771,7 +849,9 @@ gtk_pizza_remove (GtkContainer *container, /* security checks */ g_return_if_fail (GTK_IS_WIDGET (widget)); +#ifndef __WXGTK20__ GTK_PRIVATE_UNSET_FLAG (widget, GTK_IS_OFFSCREEN); +#endif break; } @@ -782,9 +862,9 @@ gtk_pizza_remove (GtkContainer *container, static void gtk_pizza_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data) + gboolean include_internals, + GtkCallback callback, + gpointer callback_data) { GtkPizza *pizza; GtkPizzaChild *child; @@ -792,7 +872,7 @@ gtk_pizza_forall (GtkContainer *container, g_return_if_fail (container != NULL); g_return_if_fail (GTK_IS_PIZZA (container)); - g_return_if_fail (callback != NULL); + g_return_if_fail (callback != (GtkCallback)NULL); pizza = GTK_PIZZA (container); @@ -806,13 +886,25 @@ gtk_pizza_forall (GtkContainer *container, } } +static void +gtk_pizza_allocate_child (GtkPizza *pizza, + GtkPizzaChild *child) +{ + GtkAllocation allocation; + GtkRequisition requisition; -/* Operations on children - */ + allocation.x = child->x - pizza->xoffset; + allocation.y = child->y - pizza->yoffset; + gtk_widget_get_child_requisition (child->widget, &requisition); + allocation.width = requisition.width; + allocation.height = requisition.height; + + gtk_widget_size_allocate (child->widget, &allocation); +} static void gtk_pizza_position_child (GtkPizza *pizza, - GtkPizzaChild *child) + GtkPizzaChild *child) { gint x; gint y; @@ -820,6 +912,7 @@ gtk_pizza_position_child (GtkPizza *pizza, x = child->x - pizza->xoffset; y = child->y - pizza->yoffset; +#ifndef __WXGTK20__ if (IS_ONSCREEN (x,y)) { if (GTK_WIDGET_MAPPED (pizza) && @@ -840,23 +933,10 @@ gtk_pizza_position_child (GtkPizza *pizza, if (GTK_WIDGET_MAPPED (child->widget)) gtk_widget_unmap (child->widget); } +#endif } -static void -gtk_pizza_allocate_child (GtkPizza *pizza, - GtkPizzaChild *child) -{ - GtkAllocation allocation; - GtkRequisition requisition; - - allocation.x = child->x - pizza->xoffset; - allocation.y = child->y - pizza->yoffset; - gtk_widget_get_child_requisition (child->widget, &requisition); - allocation.width = requisition.width; - allocation.height = requisition.height; - - gtk_widget_size_allocate (child->widget, &allocation); -} +#ifndef __WXGTK20__ static void gtk_pizza_position_children (GtkPizza *pizza) @@ -920,48 +1000,19 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza, } } -/* Callbacks */ - -/* Send a synthetic expose event to the widget - */ -static void -gtk_pizza_expose_area (GtkPizza *pizza, - gint x, gint y, gint width, gint height) -{ - if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED) - { - GdkEventExpose event; - - event.type = GDK_EXPOSE; - event.send_event = TRUE; - event.window = pizza->bin_window; - event.count = 0; - - event.area.x = x; - event.area.y = y; - event.area.width = width; - event.area.height = height; - - gdk_window_ref (event.window); - gtk_widget_event (GTK_WIDGET (pizza), (GdkEvent *)&event); - gdk_window_unref (event.window); - } -} - -/* This function is used to find events to process while scrolling - */ +/* This function is used to find events to process while scrolling */ static Bool gtk_pizza_expose_predicate (Display *display, XEvent *xevent, XPointer arg) { - if ((xevent->type == Expose) || - ((xevent->xany.window == *(Window *)arg) && + if ((xevent->type == Expose) || + ((xevent->xany.window == *(Window *)arg) && (xevent->type == ConfigureNotify))) - return True; - else - return False; + return True; + else + return False; } /* This is the main routine to do the scrolling. Scrolling is @@ -979,40 +1030,41 @@ gtk_pizza_expose_predicate (Display *display, void gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) { - GtkWidget *widget; - XEvent xevent; + GtkWidget *widget; + XEvent xevent; + XID win; - gint x,y,w,h,border; + gint x,y,w,h,border; - widget = GTK_WIDGET (pizza); + widget = GTK_WIDGET (pizza); - pizza->xoffset += dx; - pizza->yoffset += dy; + pizza->xoffset += dx; + pizza->yoffset += dy; - if (!GTK_WIDGET_MAPPED (pizza)) + if (!GTK_WIDGET_MAPPED (pizza)) { - gtk_pizza_position_children (pizza); - return; + gtk_pizza_position_children (pizza); + return; } - gtk_pizza_adjust_allocations (pizza, -dx, -dy); + gtk_pizza_adjust_allocations (pizza, -dx, -dy); - if (pizza->shadow_type == GTK_MYSHADOW_NONE) - border = 0; - else - if (pizza->shadow_type == GTK_MYSHADOW_THIN) - border = 1; - else - border = 2; + if (pizza->shadow_type == GTK_MYSHADOW_NONE) + border = 0; + else + if (pizza->shadow_type == GTK_MYSHADOW_THIN) + border = 1; + else + border = 2; - x = 0; - y = 0; - w = widget->allocation.width - 2*border; - h = widget->allocation.height - 2*border; + x = 0; + y = 0; + w = widget->allocation.width - 2*border; + h = widget->allocation.height - 2*border; - if (dx > 0) + if (dx > 0) { - if (gravity_works) + if (gravity_works) { gdk_window_resize (pizza->bin_window, w + dx, @@ -1020,20 +1072,14 @@ gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) gdk_window_move (pizza->bin_window, x-dx, y); gdk_window_move_resize (pizza->bin_window, x, y, w, h ); } - else + else { /* FIXME */ } - - gtk_pizza_expose_area (pizza, - MAX ((gint)w - dx, 0), - 0, - MIN (dx, w), - h); } - else if (dx < 0) + else if (dx < 0) { - if (gravity_works) + if (gravity_works) { gdk_window_move_resize (pizza->bin_window, x + dx, @@ -1043,102 +1089,75 @@ gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) gdk_window_move (pizza->bin_window, x, y); gdk_window_resize (pizza->bin_window, w, h ); } - else + else { /* FIXME */ } - - gtk_pizza_expose_area (pizza, - 0, - 0, - MIN (-dx, w), - h); } - if (dy > 0) + if (dy > 0) { - if (gravity_works) + if (gravity_works) { gdk_window_resize (pizza->bin_window, w, h + dy); gdk_window_move (pizza->bin_window, x, y-dy); gdk_window_move_resize (pizza->bin_window, x, y, w, h ); } - else + else { /* FIXME */ } - - gtk_pizza_expose_area (pizza, - 0, - MAX ((gint)h - dy, 0), - w, - MIN (dy, h)); } - else if (dy < 0) + else if (dy < 0) { - if (gravity_works) + if (gravity_works) { gdk_window_move_resize (pizza->bin_window, x, y+dy, w, h - dy ); gdk_window_move (pizza->bin_window, x, y); gdk_window_resize (pizza->bin_window, w, h ); } - else + else { /* FIXME */ } - gtk_pizza_expose_area (pizza, - 0, - 0, - w, - MIN (-dy, (gint)h)); } - gtk_pizza_position_children (pizza); - - /* We have to make sure that all exposes from this scroll get - * processed before we scroll again, or the expose events will - * have invalid coordinates. - * - * We also do expose events for other windows, since otherwise - * their updating will fall behind the scrolling - * - * This also avoids a problem in pre-1.0 GTK where filters don't - * have access to configure events that were compressed. - */ - - gdk_flush(); - while (XCheckIfEvent(GDK_WINDOW_XDISPLAY (pizza->bin_window), - &xevent, - gtk_pizza_expose_predicate, - (XPointer)&GDK_WINDOW_XWINDOW (pizza->bin_window))) + gtk_pizza_position_children (pizza); + + gdk_flush(); + + win = GDK_WINDOW_XWINDOW (pizza->bin_window); + while (XCheckIfEvent(GDK_WINDOW_XDISPLAY (pizza->bin_window), + &xevent, + gtk_pizza_expose_predicate, + (XPointer)&win)) { - GdkEvent event; - GtkWidget *event_widget; + GdkEvent event; + GtkWidget *event_widget; - if ((xevent.xany.window == GDK_WINDOW_XWINDOW (pizza->bin_window)) && - (gtk_pizza_filter (&xevent, &event, pizza) == GDK_FILTER_REMOVE)) - continue; + if ((xevent.xany.window == GDK_WINDOW_XWINDOW (pizza->bin_window)) ) + gtk_pizza_filter (&xevent, &event, pizza); - if (xevent.type == Expose) + if (xevent.type == Expose) { - event.expose.window = gdk_window_lookup (xevent.xany.window); - gdk_window_get_user_data (event.expose.window, + event.expose.window = gdk_window_lookup (xevent.xany.window); + gdk_window_get_user_data (event.expose.window, (gpointer *)&event_widget); - if (event_widget) + if (event_widget) { - event.expose.type = GDK_EXPOSE; - event.expose.area.x = xevent.xexpose.x; - event.expose.area.y = xevent.xexpose.y; - event.expose.area.width = xevent.xexpose.width; - event.expose.area.height = xevent.xexpose.height; - event.expose.count = xevent.xexpose.count; - - gdk_window_ref (event.expose.window); - gtk_widget_event (event_widget, &event); - gdk_window_unref (event.expose.window); + event.expose.type = GDK_EXPOSE; + event.expose.area.x = xevent.xexpose.x; + event.expose.area.y = xevent.xexpose.y; + event.expose.area.width = xevent.xexpose.width; + event.expose.area.height = xevent.xexpose.height; + event.expose.count = xevent.xexpose.count; + + gdk_window_ref (event.expose.window); + gtk_widget_event (event_widget, &event); + gdk_window_unref (event.expose.window); } } } @@ -1163,34 +1182,29 @@ gtk_pizza_filter (GdkXEvent *gdk_xevent, GtkPizza *pizza; xevent = (XEvent *)gdk_xevent; - + pizza = GTK_PIZZA (data); - - switch (xevent->type) + + if (!pizza->use_filter) + return GDK_FILTER_CONTINUE; + + switch (xevent->type) { - case Expose: - if (xevent->xexpose.serial == pizza->configure_serial) - { - if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED) - return GDK_FILTER_REMOVE; - else + case Expose: + if (xevent->xexpose.serial == pizza->configure_serial) { - xevent->xexpose.x += pizza->scroll_x; - xevent->xexpose.y += pizza->scroll_y; - - break; + xevent->xexpose.x += pizza->scroll_x; + xevent->xexpose.y += pizza->scroll_y; } - } - break; + break; - case ConfigureNotify: - if ((xevent->xconfigure.x != 0) || (xevent->xconfigure.y != 0)) - { - pizza->configure_serial = xevent->xconfigure.serial; - pizza->scroll_x = xevent->xconfigure.x; - pizza->scroll_y = xevent->xconfigure.y; - } - break; + case ConfigureNotify: + { + pizza->configure_serial = xevent->xconfigure.serial; + pizza->scroll_x = xevent->xconfigure.x; + pizza->scroll_y = xevent->xconfigure.y; + } + break; } return GDK_FILTER_CONTINUE; @@ -1211,6 +1225,9 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent, xevent = (XEvent *)gdk_xevent; pizza = GTK_PIZZA (data); + if (!pizza->use_filter) + return GDK_FILTER_CONTINUE; + if (xevent->type == VisibilityNotify) { switch (xevent->xvisibility.state) @@ -1227,14 +1244,14 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent, pizza->visibility = GDK_VISIBILITY_UNOBSCURED; break; } - + return GDK_FILTER_REMOVE; } return GDK_FILTER_CONTINUE; } - +#endif /* __WXGTK20__ */ #ifdef __cplusplus