X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e5a4c69c540b430fba8efe5dae1bc1ffd5caeca..caa2490c0fb8053b1d416117a9619695d75af9e4:/src/gtk1/win_gtk.c diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c index e2845ae082..526fd5e116 100644 --- a/src/gtk1/win_gtk.c +++ b/src/gtk1/win_gtk.c @@ -1,12 +1,12 @@ /* /////////////////////////////////////////////////////////////////////////// // Name: win_gtk.c -// Purpose: Native GTK+ widget for wxWindows, based on GtkLayout and +// 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. // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////// */ #ifdef VMS @@ -23,6 +23,8 @@ extern "C" { #endif /* __cplusplus */ +#ifndef __WXGTK20__ + #include #include #include @@ -30,6 +32,8 @@ extern "C" { #define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \ (y >= G_MINSHORT) && (y <= G_MAXSHORT)) +#endif + typedef struct _GtkPizzaAdjData GtkPizzaAdjData; struct _GtkPizzaAdjData @@ -56,6 +60,8 @@ static void gtk_pizza_draw (GtkWidget *widget, #endif /* __WXGTK20__ */ static gint gtk_pizza_expose (GtkWidget *widget, GdkEventExpose *event); +static void gtk_pizza_style_set (GtkWidget *widget, + GtkStyle *previous_style); static void gtk_pizza_add (GtkContainer *container, GtkWidget *widget); static void gtk_pizza_remove (GtkContainer *container, @@ -64,30 +70,16 @@ static void gtk_pizza_forall (GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data); - -static void gtk_pizza_position_child (GtkPizza *pizza, - GtkPizzaChild *child); + static void gtk_pizza_allocate_child (GtkPizza *pizza, GtkPizzaChild *child); -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); - - -/* unused */ -#if 0 -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); -#endif + +#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, @@ -95,7 +87,7 @@ static GdkFilterReturn gtk_pizza_filter (GdkXEvent *gdk_xevent, static GdkFilterReturn gtk_pizza_main_filter (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data); - +#endif /* __WXGTK20__ */ static GtkType gtk_pizza_child_type (GtkContainer *container); @@ -104,33 +96,96 @@ static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, 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 +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), + 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; } +#if __WXGTK20__ +/* 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); +} +#endif /* __WXGTK20__ */ + static void gtk_pizza_class_init (GtkPizzaClass *klass) { @@ -141,7 +196,7 @@ 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; @@ -152,6 +207,7 @@ gtk_pizza_class_init (GtkPizzaClass *klass) widget_class->draw = gtk_pizza_draw; #endif widget_class->expose_event = gtk_pizza_expose; + widget_class->style_set = gtk_pizza_style_set; container_class->add = gtk_pizza_add; container_class->remove = gtk_pizza_remove; @@ -162,16 +218,27 @@ gtk_pizza_class_init (GtkPizzaClass *klass) klass->set_scroll_adjustments = gtk_pizza_scroll_set_adjustments; widget_class->set_scroll_adjustments_signal = +#if __WXGTK20__ + 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); +#else 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); +#endif /* __WXGTK20__ */ } static GtkType @@ -298,32 +365,17 @@ gtk_pizza_put (GtkPizza *pizza, pizza->children = g_list_append (pizza->children, child_info); - gtk_widget_set_parent (widget, GTK_WIDGET (pizza)); - if (GTK_WIDGET_REALIZED (pizza)) gtk_widget_set_parent_window (widget, pizza->bin_window); + 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 -/* - if (GTK_WIDGET_REALIZED (pizza)) - gtk_widget_realize (widget); -*/ - 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 @@ -352,7 +404,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; @@ -514,7 +566,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; @@ -567,6 +618,9 @@ 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 | @@ -588,15 +642,17 @@ 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); @@ -626,8 +682,8 @@ gtk_pizza_unrealize (GtkWidget *widget) 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 @@ -706,7 +762,9 @@ 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); } } @@ -756,9 +814,11 @@ 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); @@ -766,18 +826,20 @@ gtk_pizza_expose (GtkWidget *widget, pizza = GTK_PIZZA (widget); -#ifdef __WXGTK20__ - - (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event); - -#else + if (event->window != pizza->bin_window) + return FALSE; - /* Sometimes, We handle all expose events in window.cpp now. */ + /* We handle all expose events in window.cpp now. */ if (pizza->external_expose) return FALSE; - if (event->window != pizza->bin_window) - return FALSE; +#ifdef __WXGTK20__ + + (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, event); + + return FALSE; + +#else children = pizza->children; while (children) @@ -794,9 +856,22 @@ gtk_pizza_expose (GtkWidget *widget, gtk_widget_event (child->widget, (GdkEvent*) &child_event); } } + + return TRUE; + #endif +} - return TRUE; +static void +gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style) +{ + if (GTK_WIDGET_REALIZED(widget)) + { + gtk_style_set_background(widget->style, widget->window, GTK_STATE_NORMAL); + gtk_style_set_background(widget->style, GTK_PIZZA(widget)->bin_window, GTK_STATE_NORMAL ); + } + + (* GTK_WIDGET_CLASS (pizza_parent_class)->style_set) (widget, previous_style); } static void @@ -880,46 +955,6 @@ gtk_pizza_forall (GtkContainer *container, } } - -/* Operations on children - */ - -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); - } - -#ifndef __WXGTK20__ - if (GTK_WIDGET_IS_OFFSCREEN (child->widget)) - GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN); -#endif - } - else - { -#ifndef __WXGTK20__ - if (!GTK_WIDGET_IS_OFFSCREEN (child->widget)) - GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN); -#endif - - if (GTK_WIDGET_MAPPED (child->widget)) - gtk_widget_unmap (child->widget); - } -} - static void gtk_pizza_allocate_child (GtkPizza *pizza, GtkPizzaChild *child) @@ -936,21 +971,6 @@ gtk_pizza_allocate_child (GtkPizza *pizza, gtk_widget_size_allocate (child->widget, &allocation); } -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); - } -} - static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget, gpointer cb_data) @@ -998,40 +1018,55 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza, } } -/* Callbacks */ - -/* unused */ -#if 0 -/* Send a synthetic expose event to the widget - */ +#ifndef __WXGTK20__ static void -gtk_pizza_expose_area (GtkPizza *pizza, - gint x, gint y, gint width, gint height) +gtk_pizza_position_child (GtkPizza *pizza, + GtkPizzaChild *child) { - if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED) - { - GdkEventExpose event; + gint x; + gint y; - event.type = GDK_EXPOSE; - event.send_event = TRUE; - event.window = pizza->bin_window; - event.count = 0; + x = child->x - pizza->xoffset; + y = child->y - pizza->yoffset; - event.area.x = x; - event.area.y = y; - event.area.width = width; - event.area.height = height; + 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); + } - gdk_window_ref (event.window); - gtk_widget_event (GTK_WIDGET (pizza), (GdkEvent *)&event); - gdk_window_unref (event.window); + 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); } } -#endif /* unused */ -/* This function is used to find events to process while scrolling - */ +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, @@ -1044,6 +1079,7 @@ gtk_pizza_expose_predicate (Display *display, 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 @@ -1060,6 +1096,15 @@ gtk_pizza_expose_predicate (Display *display, void gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) { +#ifdef __WXGTK20__ + pizza->xoffset += dx; + pizza->yoffset += dy; + + gtk_pizza_adjust_allocations (pizza, -dx, -dy); + + if (pizza->bin_window) + gdk_window_scroll( pizza->bin_window, -dx, -dy ); +#else GtkWidget *widget; XEvent xevent; XID win; @@ -1191,8 +1236,11 @@ gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) } } } +#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 @@ -1280,6 +1328,7 @@ gtk_pizza_main_filter (GdkXEvent *gdk_xevent, return GDK_FILTER_CONTINUE; } +#endif /* __WXGTK20__ */ #ifdef __cplusplus