X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22aff5795eb2923fd6f56c8b4d894daabaea0879..f3a5f83a66a21089fa1c52f962d127d0fe7b5ee0:/src/gtk/win_gtk.c diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index 29414cd913..4f098ee8ea 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -1,5 +1,5 @@ /* /////////////////////////////////////////////////////////////////////////// -// Name: win_gtk.c +// Name: src/gtk/win_gtk.c // Purpose: Native GTK+ widget for wxWidgets, based on GtkLayout and // GtkFixed. It makes use of the gravity window property and // therefore does not work with GTK 1.0. @@ -13,7 +13,7 @@ #define XCheckIfEvent XCHECKIFEVENT #endif -#include "wx/setup.h" +#include "wx/platform.h" #include "wx/gtk/win_gtk.h" #include "gtk/gtksignal.h" #include "gtk/gtkprivate.h" @@ -23,17 +23,6 @@ extern "C" { #endif /* __cplusplus */ -#ifndef __WXGTK20__ - -#include -#include -#include - -#define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \ - (y >= G_MINSHORT) && (y <= G_MAXSHORT)) - -#endif - typedef struct _GtkPizzaAdjData GtkPizzaAdjData; struct _GtkPizzaAdjData @@ -54,10 +43,6 @@ 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_style_set (GtkWidget *widget, @@ -70,49 +55,28 @@ 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_adjust_allocations_recurse (GtkWidget *widget, gpointer cb_data); -#ifndef __WXGTK20__ -static void gtk_pizza_position_child (GtkPizza *pizza, - GtkPizzaChild *child); -static void gtk_pizza_position_children (GtkPizza *pizza); - -static GdkFilterReturn gtk_pizza_filter (GdkXEvent *gdk_xevent, - GdkEvent *event, - gpointer data); -static GdkFilterReturn gtk_pizza_main_filter (GdkXEvent *gdk_xevent, - GdkEvent *event, - gpointer data); -#endif /* __WXGTK20__ */ - static GtkType gtk_pizza_child_type (GtkContainer *container); static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, GtkAdjustment *hadj, GtkAdjustment *vadj); +/* static */ +GtkContainerClass *pizza_parent_class = NULL; -#ifdef __WXGTK20__ - GtkContainerClass *pizza_parent_class = NULL; -#else -static GtkContainerClass *pizza_parent_class = NULL; -#endif - -static gboolean gravity_works; - -guint +GtkType gtk_pizza_get_type () { - static guint pizza_type = 0; + static GtkType pizza_type = 0; if (!pizza_type) { - -#ifdef __WXGTK20__ static const GTypeInfo pizza_info = { sizeof (GtkPizzaClass), @@ -125,26 +89,51 @@ gtk_pizza_get_type () 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, - }; - pizza_type = gtk_type_unique (gtk_container_get_type (), &pizza_info); -#endif + pizza_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPizza", &pizza_info, (GTypeFlags)0); } return pizza_type; } +/* Marshaller needed for set_scroll_adjustments signal, + generated with GLib-2.4.6 glib-genmarshal */ +#define g_marshal_value_peek_object(v) g_value_get_object (v) +static void +g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, + gpointer arg_1, + gpointer arg_2, + gpointer data2); + register GMarshalFunc_VOID__OBJECT_OBJECT callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); + + callback (data1, + g_marshal_value_peek_object (param_values + 1), + g_marshal_value_peek_object (param_values + 2), + data2); +} + static void gtk_pizza_class_init (GtkPizzaClass *klass) { @@ -162,9 +151,6 @@ gtk_pizza_class_init (GtkPizzaClass *klass) 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; widget_class->style_set = gtk_pizza_style_set; @@ -177,16 +163,18 @@ gtk_pizza_class_init (GtkPizzaClass *klass) klass->set_scroll_adjustments = gtk_pizza_scroll_set_adjustments; 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); + g_signal_new( + "set_scroll_adjustments", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkPizzaClass, set_scroll_adjustments), + NULL, + NULL, + g_cclosure_user_marshal_VOID__OBJECT_OBJECT, + G_TYPE_NONE, + 2, + GTK_TYPE_ADJUSTMENT, + GTK_TYPE_ADJUSTMENT); } static GtkType @@ -318,12 +306,7 @@ gtk_pizza_put (GtkPizza *pizza, gtk_widget_set_parent (widget, GTK_WIDGET (pizza)); -#ifndef __WXGTK20__ /* FIXME? */ - if (!IS_ONSCREEN (x, y)) - GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN); -#endif - - gtk_widget_set_usize (widget, width, height); + gtk_widget_set_size_request (widget, width, height); } void @@ -352,7 +335,7 @@ gtk_pizza_move (GtkPizza *pizza, child->x = x; child->y = y; - + if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza)) gtk_widget_queue_resize (widget); break; @@ -387,7 +370,7 @@ gtk_pizza_resize (GtkPizza *pizza, child->width = width; child->height = height; - gtk_widget_set_usize (widget, width, height); + gtk_widget_set_size_request (widget, width, height); if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza)) gtk_widget_queue_resize (widget); @@ -411,6 +394,14 @@ gtk_pizza_set_size (GtkPizza *pizza, g_return_if_fail (GTK_IS_PIZZA (pizza)); g_return_if_fail (widget != NULL); + /* this really shouldn't happen -- but it does, a lot, right now and we + can't pass negative values to gtk_widget_set_size_request(), so filter + them out here */ + if ( width < 0 ) + width = 0; + if ( height < 0 ) + height = 0; + children = pizza->children; while (children) { @@ -429,7 +420,7 @@ gtk_pizza_set_size (GtkPizza *pizza, child->width = width; child->height = height; - gtk_widget_set_usize (widget, width, height); + gtk_widget_set_size_request (widget, width, height); if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza)) gtk_widget_queue_resize (widget); @@ -487,11 +478,7 @@ 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); } @@ -566,9 +553,7 @@ gtk_pizza_realize (GtkWidget *widget) attributes.event_mask = gtk_widget_get_events (widget); 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 | @@ -590,21 +575,12 @@ 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 ); - + /* 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); - /* cannot be done before realisation */ children = pizza->children; while (children) @@ -710,63 +686,15 @@ gtk_pizza_size_allocate (GtkWidget *widget, child = children->data; children = children->next; -#ifndef __WXGTK20__ - gtk_pizza_position_child (pizza, child); -#endif gtk_pizza_allocate_child (pizza, child); } } -#ifndef __WXGTK20__ - -static void -gtk_pizza_draw (GtkWidget *widget, - GdkRectangle *area) -{ - GtkPizza *pizza; - GtkPizzaChild *child; - GdkRectangle child_area; - GList *children; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_PIZZA (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)) - { - gdk_window_clear_area( pizza->bin_window, - area->x, area->y, area->width, area->height); - } - - while (children) - { - child = children->data; - children = children->next; - - if (gtk_widget_intersect (child->widget, area, &child_area)) - gtk_widget_draw (child->widget, &child_area); - } -} - -#endif /* __WXGTK20__ */ - static gint gtk_pizza_expose (GtkWidget *widget, GdkEventExpose *event) { GtkPizza *pizza; -#ifndef __WXGTK20__ - GtkPizzaChild *child; - GdkEventExpose child_event; - GList *children; -#endif g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE); @@ -781,33 +709,9 @@ gtk_pizza_expose (GtkWidget *widget, 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) - { - child = children->data; - children = children->next; - - child_event = *event; - if (GTK_WIDGET_NO_WINDOW (child->widget) && - GTK_WIDGET_DRAWABLE (child->widget) && - gtk_widget_intersect (child->widget, &event->area, &child_event.area)) - { - gtk_widget_event (child->widget, (GdkEvent*) &child_event); - } - } - - return TRUE; - -#endif + return FALSE; } static void @@ -866,10 +770,6 @@ 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; } @@ -966,68 +866,6 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza, } } -#ifndef __WXGTK20__ -static void -gtk_pizza_position_child (GtkPizza *pizza, - GtkPizzaChild *child) -{ - gint x; - gint y; - - x = child->x - pizza->xoffset; - y = child->y - pizza->yoffset; - - if (IS_ONSCREEN (x,y)) - { - if (GTK_WIDGET_MAPPED (pizza) && - GTK_WIDGET_VISIBLE (child->widget)) - { - if (!GTK_WIDGET_MAPPED (child->widget)) - gtk_widget_map (child->widget); - } - - if (GTK_WIDGET_IS_OFFSCREEN (child->widget)) - GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN); - } - else - { - if (!GTK_WIDGET_IS_OFFSCREEN (child->widget)) - GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN); - - if (GTK_WIDGET_MAPPED (child->widget)) - gtk_widget_unmap (child->widget); - } -} - -static void -gtk_pizza_position_children (GtkPizza *pizza) -{ - GList *tmp_list; - - tmp_list = pizza->children; - while (tmp_list) - { - GtkPizzaChild *child = tmp_list->data; - tmp_list = tmp_list->next; - - gtk_pizza_position_child (pizza, child); - } -} - -/* 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) && - (xevent->type == ConfigureNotify))) - return True; - else - return False; -} -#endif /* __WXGTK20__ */ /* This is the main routine to do the scrolling. Scrolling is * done by "Guffaw" scrolling, as in the Mozilla XFE, with @@ -1044,7 +882,6 @@ gtk_pizza_expose_predicate (Display *display, void gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) { -#ifdef __WXGTK20__ pizza->xoffset += dx; pizza->yoffset += dy; @@ -1052,234 +889,8 @@ gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) if (pizza->bin_window) gdk_window_scroll( pizza->bin_window, -dx, -dy ); -#else - GtkWidget *widget; - XEvent xevent; - XID win; - - gint x,y,w,h,border; - - widget = GTK_WIDGET (pizza); - - pizza->xoffset += dx; - pizza->yoffset += dy; - - if (!GTK_WIDGET_MAPPED (pizza)) - { - gtk_pizza_position_children (pizza); - return; - } - - 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; - - x = 0; - y = 0; - w = widget->allocation.width - 2*border; - h = widget->allocation.height - 2*border; - - if (dx > 0) - { - if (gravity_works) - { - gdk_window_resize (pizza->bin_window, - w + dx, - h); - gdk_window_move (pizza->bin_window, x-dx, y); - gdk_window_move_resize (pizza->bin_window, x, y, w, h ); - } - else - { - /* FIXME */ - } - } - else if (dx < 0) - { - if (gravity_works) - { - gdk_window_move_resize (pizza->bin_window, - x + dx, - y, - w - dx, - h); - gdk_window_move (pizza->bin_window, x, y); - gdk_window_resize (pizza->bin_window, w, h ); - } - else - { - /* FIXME */ - } - } - - if (dy > 0) - { - 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 - { - /* FIXME */ - } - } - else if (dy < 0) - { - 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 - { - /* FIXME */ - } - } - - 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; - - if ((xevent.xany.window == GDK_WINDOW_XWINDOW (pizza->bin_window)) ) - gtk_pizza_filter (&xevent, &event, pizza); - - if (xevent.type == Expose) - { - event.expose.window = gdk_window_lookup (xevent.xany.window); - gdk_window_get_user_data (event.expose.window, - (gpointer *)&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); - } - } - } -#endif /* __WXGTK20__ */ } - -#ifndef __WXGTK20__ -/* The main event filter. Actually, we probably don't really need - * to install this as a filter at all, since we are calling it - * directly above in the expose-handling hack. But in case scrollbars - * are fixed up in some manner... - * - * This routine identifies expose events that are generated when - * we've temporarily moved the bin_window_origin, and translates - * them or discards them, depending on whether we are obscured - * or not. - */ -static GdkFilterReturn -gtk_pizza_filter (GdkXEvent *gdk_xevent, - GdkEvent *event, - gpointer data) -{ - XEvent *xevent; - GtkPizza *pizza; - - xevent = (XEvent *)gdk_xevent; - - pizza = GTK_PIZZA (data); - - if (!pizza->use_filter) - return GDK_FILTER_CONTINUE; - - switch (xevent->type) - { - case Expose: - if (xevent->xexpose.serial == pizza->configure_serial) - { - xevent->xexpose.x += pizza->scroll_x; - xevent->xexpose.y += pizza->scroll_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; -} - -/* Although GDK does have a GDK_VISIBILITY_NOTIFY event, - * there is no corresponding event in GTK, so we have - * to get the events from a filter - */ -static GdkFilterReturn -gtk_pizza_main_filter (GdkXEvent *gdk_xevent, - GdkEvent *event, - gpointer data) -{ - XEvent *xevent; - GtkPizza *pizza; - - xevent = (XEvent *)gdk_xevent; - pizza = GTK_PIZZA (data); - - if (!pizza->use_filter) - return GDK_FILTER_CONTINUE; - - if (xevent->type == VisibilityNotify) - { - switch (xevent->xvisibility.state) - { - case VisibilityFullyObscured: - pizza->visibility = GDK_VISIBILITY_FULLY_OBSCURED; - break; - - case VisibilityPartiallyObscured: - pizza->visibility = GDK_VISIBILITY_PARTIAL; - break; - - case VisibilityUnobscured: - pizza->visibility = GDK_VISIBILITY_UNOBSCURED; - break; - } - - return GDK_FILTER_REMOVE; - } - - return GDK_FILTER_CONTINUE; -} -#endif /* __WXGTK20__ */ - - #ifdef __cplusplus } #endif /* __cplusplus */ -