X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/053f9cc122c63048d9607a3d684e9dca28ae96ac..955e46d25d6ac0f9fa55ec9fe11f0c21da3a494d:/src/gtk/win_gtk.c diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index 1c885094af..4862d3b493 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -1,92 +1,138 @@ /* /////////////////////////////////////////////////////////////////////////// -// Name: win_gtk.c -// Purpose: native GTK+ widget for wxWindows +// 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. // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWidgets licence /////////////////////////////////////////////////////////////////////////// */ +#ifdef VMS +#define XCheckIfEvent XCHECKIFEVENT +#endif + +#include "wx/platform.h" #include "wx/gtk/win_gtk.h" -#include "gtk/gtksignal.h" -#include "gtk/gtknotebook.h" #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -static void gtk_myfixed_class_init (GtkMyFixedClass *klass); -static void gtk_myfixed_init (GtkMyFixed *myfixed); -static void gtk_myfixed_map (GtkWidget *widget); -#if (GTK_MINOR_VERSION == 0) -static void gtk_myfixed_unmap (GtkWidget *widget); -#endif -static void gtk_myfixed_realize (GtkWidget *widget); -static void gtk_myfixed_size_request (GtkWidget *widget, - GtkRequisition *requisition); -static void gtk_myfixed_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); -static void gtk_myfixed_paint (GtkWidget *widget, - GdkRectangle *area); -static void gtk_myfixed_draw (GtkWidget *widget, - GdkRectangle *area); -static gint gtk_myfixed_expose (GtkWidget *widget, - GdkEventExpose *event); -static void gtk_myfixed_add (GtkContainer *container, - GtkWidget *widget); -static void gtk_myfixed_remove (GtkContainer *container, - GtkWidget *widget); -static void gtk_myfixed_foreach (GtkContainer *container, -#if (GTK_MINOR_VERSION > 0) - gboolean include_internals, -#endif - GtkCallback callback, - gpointer callback_data); -#if (GTK_MINOR_VERSION > 0) -static GtkType gtk_myfixed_child_type (GtkContainer *container); -#endif - -#if (GTK_MINOR_VERSION > 0) -static void gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed, - GtkAdjustment *hadj, - GtkAdjustment *vadj); -#endif +typedef struct _GtkPizzaAdjData GtkPizzaAdjData; +struct _GtkPizzaAdjData +{ + gint dx; + gint dy; +}; + +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_map (GtkWidget *widget); + +static void gtk_pizza_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void gtk_pizza_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); +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, + GtkWidget *widget); +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); + +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; + +GtkType +gtk_pizza_get_type () +{ + static GtkType pizza_type = 0; + if (!pizza_type) + { + 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, (GTypeFlags)0); + } -static GtkContainerClass *parent_class = NULL; + return pizza_type; +} -guint -gtk_myfixed_get_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) { - static guint myfixed_type = 0; + 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; - if (!myfixed_type) + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) { - GtkTypeInfo myfixed_info = - { - "GtkMyFixed", - sizeof (GtkMyFixed), - sizeof (GtkMyFixedClass), - (GtkClassInitFunc) gtk_myfixed_class_init, - (GtkObjectInitFunc) gtk_myfixed_init, -#if (GTK_MINOR_VERSION > 0) - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, -#else - (GtkArgSetFunc) NULL, - (GtkArgGetFunc) NULL, -#endif - }; - myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info); + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); } - - return myfixed_type; + 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_myfixed_class_init (GtkMyFixedClass *klass) +gtk_pizza_class_init (GtkPizzaClass *klass) { GtkObjectClass *object_class; GtkWidgetClass *widget_class; @@ -95,219 +141,173 @@ gtk_myfixed_class_init (GtkMyFixedClass *klass) object_class = (GtkObjectClass*) klass; widget_class = (GtkWidgetClass*) klass; container_class = (GtkContainerClass*) klass; - -#if (GTK_MINOR_VERSION > 0) - parent_class = gtk_type_class (GTK_TYPE_CONTAINER); -#else - parent_class = gtk_type_class (gtk_container_get_type ()); -#endif + pizza_parent_class = gtk_type_class (GTK_TYPE_CONTAINER); - widget_class->map = gtk_myfixed_map; -#if (GTK_MINOR_VERSION == 0) - widget_class->unmap = gtk_myfixed_unmap; -#endif - widget_class->realize = gtk_myfixed_realize; - widget_class->size_request = gtk_myfixed_size_request; - widget_class->size_allocate = gtk_myfixed_size_allocate; - widget_class->draw = gtk_myfixed_draw; - widget_class->expose_event = gtk_myfixed_expose; - - container_class->add = gtk_myfixed_add; - container_class->remove = gtk_myfixed_remove; -#if (GTK_MINOR_VERSION > 0) - container_class->forall = gtk_myfixed_foreach; -#else - container_class->foreach = gtk_myfixed_foreach; -#endif + 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; + widget_class->expose_event = gtk_pizza_expose; + widget_class->style_set = gtk_pizza_style_set; -#if (GTK_MINOR_VERSION > 0) - container_class->child_type = gtk_myfixed_child_type; -#endif + container_class->add = gtk_pizza_add; + container_class->remove = gtk_pizza_remove; + container_class->forall = gtk_pizza_forall; -#if (GTK_MINOR_VERSION > 0) - klass->set_scroll_adjustments = gtk_myfixed_scroll_set_adjustments; + container_class->child_type = gtk_pizza_child_type; + + klass->set_scroll_adjustments = gtk_pizza_scroll_set_adjustments; widget_class->set_scroll_adjustments_signal = - gtk_signal_new ("set_scroll_adjustments", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (GtkMyFixedClass, set_scroll_adjustments), - gtk_marshal_NONE__POINTER_POINTER, - GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); -#endif + 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); } -#if (GTK_MINOR_VERSION > 0) static GtkType -gtk_myfixed_child_type (GtkContainer *container) +gtk_pizza_child_type (GtkContainer *container) { return GTK_TYPE_WIDGET; } -#endif static void -gtk_myfixed_init (GtkMyFixed *myfixed) +gtk_pizza_init (GtkPizza *pizza) { - GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW); - -#if (GTK_MINOR_VERSION == 0) - GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC); -#endif + GTK_WIDGET_UNSET_FLAGS (pizza, GTK_NO_WINDOW); -#if (GTK_MINOR_VERSION > 0) - myfixed->shadow_type = GTK_SHADOW_NONE; -#endif + pizza->shadow_type = GTK_MYSHADOW_NONE; + + pizza->children = NULL; + + pizza->width = 20; + pizza->height = 20; - myfixed->children = NULL; + pizza->bin_window = NULL; + + pizza->xoffset = 0; + pizza->yoffset = 0; + + pizza->scroll_x = 0; + pizza->scroll_y = 0; + + pizza->external_expose = FALSE; } GtkWidget* -gtk_myfixed_new () +gtk_pizza_new () { - GtkMyFixed *myfixed; + GtkPizza *pizza; - myfixed = gtk_type_new (gtk_myfixed_get_type ()); - - return GTK_WIDGET (myfixed); + pizza = g_object_new (gtk_pizza_get_type (), NULL); + + return GTK_WIDGET (pizza); } -#if (GTK_MINOR_VERSION > 0) -void -gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed, - GtkAdjustment *hadj, - GtkAdjustment *vadj) +static void +gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, + GtkAdjustment *hadj, + GtkAdjustment *vadj) { - /* OK, this is embarassing, but this function has to be here */ + /* We handle scrolling in the wxScrolledWindow, not here. */ } -void -gtk_myfixed_set_shadow_type (GtkMyFixed *myfixed, - GtkShadowType type) +void +gtk_pizza_set_shadow_type (GtkPizza *pizza, + GtkMyShadowType type) { - g_return_if_fail (myfixed != NULL); - g_return_if_fail (GTK_IS_MYFIXED (myfixed)); + g_return_if_fail (pizza != NULL); + g_return_if_fail (GTK_IS_PIZZA (pizza)); - if ((GtkShadowType) myfixed->shadow_type != type) + if (pizza->shadow_type != type) { - myfixed->shadow_type = type; + pizza->shadow_type = type; - if (GTK_WIDGET_VISIBLE (myfixed)) - { - gtk_widget_size_allocate (GTK_WIDGET (myfixed), &(GTK_WIDGET (myfixed)->allocation)); - gtk_widget_queue_draw (GTK_WIDGET (myfixed)); - } + if (GTK_WIDGET_VISIBLE (pizza)) + { + gtk_widget_size_allocate (GTK_WIDGET (pizza), &(GTK_WIDGET (pizza)->allocation)); + gtk_widget_queue_draw (GTK_WIDGET (pizza)); + } } } -#endif void -gtk_myfixed_put (GtkMyFixed *myfixed, - GtkWidget *widget, - gint16 x, - gint16 y, - gint16 width, - gint16 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) { - GtkMyFixedChild *child_info; + GtkPizzaChild *child_info; - g_return_if_fail (myfixed != NULL); - g_return_if_fail (GTK_IS_MYFIXED (myfixed)); + g_return_if_fail (pizza != NULL); + g_return_if_fail (GTK_IS_PIZZA (pizza)); g_return_if_fail (widget != NULL); - child_info = g_new (GtkMyFixedChild, 1); + child_info = g_new (GtkPizzaChild, 1); + child_info->widget = widget; child_info->x = x; child_info->y = y; child_info->width = width; child_info->height = height; - - gtk_widget_set_parent (widget, GTK_WIDGET (myfixed)); - myfixed->children = g_list_append (myfixed->children, child_info); + pizza->children = g_list_append (pizza->children, child_info); - if (GTK_WIDGET_REALIZED (myfixed)) - gtk_widget_realize (widget); + if (GTK_WIDGET_REALIZED (pizza)) + gtk_widget_set_parent_window (widget, pizza->bin_window); - if (GTK_WIDGET_VISIBLE (myfixed) && GTK_WIDGET_VISIBLE (widget)) - { - if (GTK_WIDGET_MAPPED (myfixed)) - gtk_widget_map (widget); - - gtk_widget_queue_resize (GTK_WIDGET (myfixed)); - } -} + gtk_widget_set_parent (widget, GTK_WIDGET (pizza)); -void -gtk_myfixed_move (GtkMyFixed *myfixed, - GtkWidget *widget, - gint16 x, - gint16 y) -{ - GtkMyFixedChild *child; - GList *children; - - g_return_if_fail (myfixed != NULL); - g_return_if_fail (GTK_IS_MYFIXED (myfixed)); - g_return_if_fail (widget != NULL); - - children = myfixed->children; - while (children) - { - child = children->data; - children = children->next; - - if (child->widget == widget) - { - gtk_myfixed_set_size( myfixed, widget, x, y, child->width, child->height ); - break; - } - } + gtk_widget_set_size_request (widget, width, height); } void -gtk_myfixed_resize (GtkMyFixed *myfixed, - GtkWidget *widget, - gint16 width, - gint16 height) +gtk_pizza_set_size (GtkPizza *pizza, + GtkWidget *widget, + gint x, + gint y, + gint width, + gint height) { - GtkMyFixedChild *child; + GtkPizzaChild *child; GList *children; - g_return_if_fail (myfixed != NULL); - g_return_if_fail (GTK_IS_MYFIXED (myfixed)); + g_return_if_fail (pizza != NULL); + g_return_if_fail (GTK_IS_PIZZA (pizza)); g_return_if_fail (widget != NULL); - children = myfixed->children; - while (children) - { - child = children->data; - children = children->next; - - if (child->widget == widget) - { - gtk_myfixed_set_size( myfixed, widget, child->x, child->y, width, height ); - break; - } - } -} - -void -gtk_myfixed_set_size (GtkMyFixed *myfixed, - GtkWidget *widget, - gint16 x, - gint16 y, - gint16 width, - gint16 height) -{ - GtkMyFixedChild *child; - GList *children; - GtkAllocation child_allocation; - - g_return_if_fail (myfixed != NULL); - g_return_if_fail (GTK_IS_MYFIXED (myfixed)); - g_return_if_fail (widget != NULL); +#ifndef WX_WARN_ILLEGAL_SETSIZE + /* 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() without getting + a warning printed out, so filter them out here */ + if ( width < 0 ) + width = 0; + if ( height < 0 ) + height = 0; +#endif - children = myfixed->children; + children = pizza->children; while (children) { child = children->data; @@ -315,175 +315,205 @@ gtk_myfixed_set_size (GtkMyFixed *myfixed, if (child->widget == widget) { - if ((child->x == x) && - (child->y == y) && - (child->width == width) && - (child->height == height)) return; - + if ((child->x == x) && + (child->y == y) && + (child->width == width) && + (child->height == height)) return; + child->x = x; child->y = y; child->width = width; child->height = height; - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed)) - { - if ((child->width > 1) && (child->height > 1) && (GTK_WIDGET_REALIZED(widget))) - { - child_allocation.x = child->x; - child_allocation.y = child->y; - child_allocation.width = MAX( child->width, 1 ); - child_allocation.height = MAX( child->height, 1 ); - - /* work around for GTK bug when moving widgets outside - the X window -> do NOT move them entirely outside */ - if (child_allocation.y + child_allocation.height < 0) - child_allocation.y = -child_allocation.height; - if (child_allocation.x + child_allocation.width < 0) - child_allocation.x = -child_allocation.width; - - gtk_widget_size_allocate (widget, &child_allocation); - } - else - { - gtk_widget_queue_resize (GTK_WIDGET (myfixed)); - } - } - break; + gtk_widget_set_size_request (widget, width, height); + + if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza)) + gtk_widget_queue_resize (widget); + + return; } } } static void -gtk_myfixed_map (GtkWidget *widget) +gtk_pizza_map (GtkWidget *widget) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; + GtkPizza *pizza; + GtkPizzaChild *child; GList *children; g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED (widget)); + g_return_if_fail (GTK_IS_PIZZA (widget)); GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED); - myfixed = GTK_MYFIXED (widget); + pizza = GTK_PIZZA (widget); - children = myfixed->children; + children = pizza->children; while (children) { child = children->data; children = children->next; - if (GTK_WIDGET_VISIBLE (child->widget) && !GTK_WIDGET_MAPPED (child->widget)) - gtk_widget_map (child->widget); + if ( GTK_WIDGET_VISIBLE (child->widget) && + !GTK_WIDGET_MAPPED (child->widget) ) + { + gtk_widget_map (child->widget); + } } - - gdk_window_show (widget->window); -} -#if (GTK_MINOR_VERSION == 0) -static void -gtk_myfixed_unmap (GtkWidget *widget) -{ - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED (widget)); - - GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); + gdk_window_show (widget->window); + gdk_window_show (pizza->bin_window); } -#endif static void -gtk_myfixed_realize (GtkWidget *widget) +gtk_pizza_realize (GtkWidget *widget) { - GtkMyFixed *myfixed; + GtkPizza *pizza; GdkWindowAttr attributes; gint attributes_mask; + GtkPizzaChild *child; + GList *children; g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED (widget)); + g_return_if_fail (GTK_IS_PIZZA (widget)); - myfixed = GTK_MYFIXED (widget); - + pizza = GTK_PIZZA (widget); GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); attributes.window_type = GDK_WINDOW_CHILD; - -#if (GTK_MINOR_VERSION > 0) + attributes.x = widget->allocation.x; attributes.y = widget->allocation.y; attributes.width = widget->allocation.width; attributes.height = widget->allocation.height; - if (myfixed->shadow_type != GTK_SHADOW_NONE) +#ifndef __WXUNIVERSAL__ + if (pizza->shadow_type == GTK_MYSHADOW_NONE) { + /* no border, no changes to sizes */ + } + 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 + { + /* GTK_MYSHADOW_IN == wxSUNKEN_BORDER */ + /* GTK_MYSHADOW_OUT == wxRAISED_BORDER */ attributes.x += 2; attributes.y += 2; attributes.width -= 4; attributes.height -= 4; } - +#endif /* __WXUNIVERSAL__ */ + + /* minimal size */ if (attributes.width < 2) attributes.width = 2; if (attributes.height < 2) attributes.height = 2; -#else - attributes.x = widget->allocation.x; - attributes.y = widget->allocation.y; - attributes.width = 32000; - attributes.height = 32000; -#endif + attributes.wclass = GDK_INPUT_OUTPUT; attributes.visual = gtk_widget_get_visual (widget); attributes.colormap = gtk_widget_get_colormap (widget); - 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_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), &attributes, - attributes_mask); + widget->window = gdk_window_new(gtk_widget_get_parent_window (widget), + &attributes, attributes_mask); gdk_window_set_user_data (widget->window, widget); - + + attributes.x = 0; + attributes.y = 0; + + attributes.event_mask = gtk_widget_get_events (widget); + attributes.event_mask |= GDK_EXPOSURE_MASK | + GDK_SCROLL_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; + + pizza->bin_window = gdk_window_new(widget->window, + &attributes, attributes_mask); + gdk_window_set_user_data (pizza->bin_window, 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 ); +*/ + + /* cannot be done before realisation */ + children = pizza->children; + while (children) + { + child = children->data; + children = children->next; + + gtk_widget_set_parent_window (child->widget, pizza->bin_window); + } +} + +static void +gtk_pizza_unrealize (GtkWidget *widget) +{ + GtkPizza *pizza; + + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_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; + + if (GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) + (* GTK_WIDGET_CLASS (pizza_parent_class)->unrealize) (widget); } static void -gtk_myfixed_size_request (GtkWidget *widget, - GtkRequisition *requisition) +gtk_pizza_size_request (GtkWidget *widget, + GtkRequisition *requisition) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; + GtkPizza *pizza; + GtkPizzaChild *child; GList *children; GtkRequisition child_requisition; - + g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED (widget)); + g_return_if_fail (GTK_IS_PIZZA (widget)); g_return_if_fail (requisition != NULL); - myfixed = GTK_MYFIXED (widget); - - children = myfixed->children; + pizza = GTK_PIZZA (widget); + + children = pizza->children; while (children) { child = children->data; children = children->next; if (GTK_WIDGET_VISIBLE (child->widget)) - { + { gtk_widget_size_request (child->widget, &child_requisition); - } + } } - + /* request very little, I'm not sure if requesting nothing will always have positive effects on stability... */ requisition->width = 2; @@ -491,235 +521,240 @@ gtk_myfixed_size_request (GtkWidget *widget, } static void -gtk_myfixed_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) +gtk_pizza_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) { - GtkMyFixed *myfixed; + GtkPizza *pizza; gint border; - GtkMyFixedChild *child; - GtkAllocation child_allocation; - GList *children; + gint x,y,w,h; + GtkPizzaChild *child; + GList *children; g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED(widget)); + g_return_if_fail (GTK_IS_PIZZA(widget)); g_return_if_fail (allocation != NULL); - myfixed = GTK_MYFIXED (widget); - + pizza = GTK_PIZZA (widget); + widget->allocation = *allocation; -#if (GTK_MINOR_VERSION > 0) - if (myfixed->shadow_type == GTK_SHADOW_NONE) + + if (pizza->shadow_type == GTK_MYSHADOW_NONE) border = 0; + else + if (pizza->shadow_type == GTK_MYSHADOW_THIN) + border = 1; else border = 2; -#else - border = 0; -#endif + + x = allocation->x + border; + y = allocation->y + border; + w = allocation->width - border*2; + h = allocation->height - border*2; if (GTK_WIDGET_REALIZED (widget)) { - gdk_window_move_resize( widget->window, - allocation->x+border, allocation->y+border, -#if (GTK_MINOR_VERSION > 0) - allocation->width-border*2, allocation->height-border*2 -#else - 32000, 32000 -#endif - ); + gdk_window_move_resize( widget->window, x, y, w, h ); + gdk_window_move_resize( pizza->bin_window, 0, 0, w, h ); } - children = myfixed->children; + children = pizza->children; while (children) { child = children->data; children = children->next; - - /* please look at the text in wxWindow::DoSetSize() on why the - test GTK_WIDGET_REALIZED() has to be here */ - if (GTK_WIDGET_VISIBLE (child->widget)) - { -/* if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget)) - { - gtk_widget_queue_resize( child->widget ); - } - else */ - { - child_allocation.x = child->x; - child_allocation.y = child->y; - child_allocation.width = MAX( child->width, 1 ); - child_allocation.height = MAX( child->height, 1 ); - - /* work around for GTK bug when moving widgets outside - the X window -> do NOT move them entirely outside */ - if (child_allocation.y + child_allocation.height < 0) - child_allocation.y = -child_allocation.height; - if (child_allocation.x + child_allocation.width < 0) - child_allocation.x = -child_allocation.width; - - gtk_widget_size_allocate (child->widget, &child_allocation); - } - } + + gtk_pizza_allocate_child (pizza, child); } } -static void -gtk_myfixed_paint (GtkWidget *widget, - GdkRectangle *area) +static gint +gtk_pizza_expose (GtkWidget *widget, + GdkEventExpose *event) { - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED (widget)); - g_return_if_fail (area != NULL); + GtkPizza *pizza; - if (GTK_WIDGET_DRAWABLE (widget)) - gdk_window_clear_area (widget->window, - area->x, area->y, - area->width, area->height); + g_return_val_if_fail (widget != NULL, FALSE); + g_return_val_if_fail (GTK_IS_PIZZA (widget), FALSE); + g_return_val_if_fail (event != NULL, FALSE); + + pizza = GTK_PIZZA (widget); + + if (event->window != pizza->bin_window) + return FALSE; + + /* We handle all expose events in window.cpp now. */ + if (pizza->external_expose) + return FALSE; + + (* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, event); + + return FALSE; } static void -gtk_myfixed_draw (GtkWidget *widget, - GdkRectangle *area) +gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; - GdkRectangle child_area; - GList *children; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED (widget)); - - if (GTK_WIDGET_DRAWABLE (widget)) + if (GTK_WIDGET_REALIZED(widget)) { - myfixed = GTK_MYFIXED (widget); - gtk_myfixed_paint (widget, area); - - children = myfixed->children; - while (children) - { - child = children->data; - children = children->next; - - if (gtk_widget_intersect (child->widget, area, &child_area)) - gtk_widget_draw (child->widget, &child_area); - } + 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 gint -gtk_myfixed_expose (GtkWidget *widget, - GdkEventExpose *event) +static void +gtk_pizza_add (GtkContainer *container, + GtkWidget *widget) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; - GdkEventExpose child_event; - GList *children; + g_return_if_fail (container != NULL); + g_return_if_fail (GTK_IS_PIZZA (container)); + g_return_if_fail (widget != NULL); + + gtk_pizza_put (GTK_PIZZA (container), widget, 0, 0, 20, 20 ); +} + +static void +gtk_pizza_remove (GtkContainer *container, + GtkWidget *widget) +{ + GtkPizza *pizza; + GtkPizzaChild *child; + GList *children; + + g_return_if_fail (container != NULL); + g_return_if_fail (GTK_IS_PIZZA (container)); + g_return_if_fail (widget != NULL); - g_return_val_if_fail (widget != NULL, FALSE); - g_return_val_if_fail (GTK_IS_MYFIXED (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); + pizza = GTK_PIZZA (container); - if (GTK_WIDGET_DRAWABLE (widget)) + children = pizza->children; + while (children) { - myfixed = GTK_MYFIXED (widget); + child = children->data; - child_event = *event; + if (child->widget == widget) + { + gtk_widget_unparent (widget); - children = myfixed->children; - while (children) - { - child = children->data; - children = children->next; + /* security checks */ + g_return_if_fail (GTK_IS_WIDGET (widget)); - if (GTK_WIDGET_NO_WINDOW (child->widget) && - gtk_widget_intersect (child->widget, &event->area, - &child_event.area)) - gtk_widget_event (child->widget, (GdkEvent*) &child_event); - } - } + pizza->children = g_list_remove_link (pizza->children, children); + g_list_free (children); + g_free (child); - return FALSE; -} + /* security checks */ + g_return_if_fail (GTK_IS_WIDGET (widget)); -static void -gtk_myfixed_add (GtkContainer *container, - GtkWidget *widget) -{ - g_return_if_fail (container != NULL); - g_return_if_fail (GTK_IS_MYFIXED (container)); - g_return_if_fail (widget != NULL); + break; + } - gtk_myfixed_put (GTK_MYFIXED (container), widget, 0, 0, 20, 20 ); + children = children->next; + } } static void -gtk_myfixed_remove (GtkContainer *container, - GtkWidget *widget) +gtk_pizza_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; - GList *children; + GtkPizza *pizza; + GtkPizzaChild *child; + GList *children; - g_return_if_fail (container != NULL); - g_return_if_fail (GTK_IS_MYFIXED (container)); - g_return_if_fail (widget != NULL); + g_return_if_fail (container != NULL); + g_return_if_fail (GTK_IS_PIZZA (container)); + g_return_if_fail (callback != (GtkCallback)NULL); - myfixed = GTK_MYFIXED (container); + pizza = GTK_PIZZA (container); - children = myfixed->children; - while (children) + children = pizza->children; + while (children) { - child = children->data; + child = children->data; + children = children->next; - if (child->widget == widget) - { - gboolean was_visible = GTK_WIDGET_VISIBLE (widget); - - gtk_widget_unparent (widget); + (* callback) (child->widget, callback_data); + } +} - myfixed->children = g_list_remove_link (myfixed->children, children); - g_list_free (children); - g_free (child); +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); +} - if (was_visible && GTK_WIDGET_VISIBLE (container)) - gtk_widget_queue_resize (GTK_WIDGET (container)); +static void +gtk_pizza_adjust_allocations_recurse (GtkWidget *widget, + gpointer cb_data) +{ + GtkPizzaAdjData *data = cb_data; - break; - } + widget->allocation.x += data->dx; + widget->allocation.y += data->dy; - children = children->next; + if (GTK_WIDGET_NO_WINDOW (widget) && GTK_IS_CONTAINER (widget)) + { + gtk_container_forall (GTK_CONTAINER (widget), + gtk_pizza_adjust_allocations_recurse, + cb_data); } } static void -gtk_myfixed_foreach (GtkContainer *container, -#if (GTK_MINOR_VERSION > 0) - gboolean include_internals, -#endif - GtkCallback callback, - gpointer callback_data) +gtk_pizza_adjust_allocations (GtkPizza *pizza, + gint dx, + gint dy) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; - GList *children; - - g_return_if_fail (container != NULL); - g_return_if_fail (GTK_IS_MYFIXED (container)); - g_return_if_fail (callback != NULL); + GList *tmp_list; + GtkPizzaAdjData data; - myfixed = GTK_MYFIXED (container); + data.dx = dx; + data.dy = dy; - children = myfixed->children; - while (children) + tmp_list = pizza->children; + while (tmp_list) { - child = children->data; - children = children->next; + GtkPizzaChild *child = tmp_list->data; + tmp_list = tmp_list->next; - (* callback) (child->widget, callback_data); + child->widget->allocation.x += dx; + child->widget->allocation.y += dy; + + if (GTK_WIDGET_NO_WINDOW (child->widget) && + GTK_IS_CONTAINER (child->widget)) + { + gtk_container_forall (GTK_CONTAINER (child->widget), + gtk_pizza_adjust_allocations_recurse, + &data); + } } } +void +gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) +{ + 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 ); +} #ifdef __cplusplus } #endif /* __cplusplus */ -