X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d345e841da6719c3de9de784220aafafb5eb1e93..77c8787c164beb31e6a0eafbd3215bc377af6946:/src/gtk/win_gtk.c diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index ebbcadb5ac..09bd29432c 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -1,539 +1,751 @@ /* /////////////////////////////////////////////////////////////////////////// -// 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 /////////////////////////////////////////////////////////////////////////// */ -#include "wx/gtk/win_gtk.h" -#include - -/*------------------------------------------------------------------------- -// conditional compilation -//------------------------------------------------------------------------- */ - -#if (GTK_MINOR_VERSION > 0) -#define NEW_GTK_CONSTRUCT_CODE +#ifdef VMS +#define XCheckIfEvent XCHECKIFEVENT #endif +#include "wx/platform.h" +#include "wx/gtk/win_gtk.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); -#ifndef NEW_GTK_CONSTRUCT_CODE -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); -#ifdef NEW_GTK_CONSTRUCT_CODE -static GtkType gtk_myfixed_child_type (GtkContainer *container); -#endif +typedef struct _GtkPizzaChild GtkPizzaChild; +typedef struct _GtkPizzaClass GtkPizzaClass; +typedef struct _GtkPizzaAdjData GtkPizzaAdjData; +struct _GtkPizzaClass +{ + GtkContainerClass parent_class; -static GtkContainerClass *parent_class = NULL; + void (*set_scroll_adjustments) (GtkPizza *pizza, + GtkAdjustment *hadjustment, + GtkAdjustment *vadjustment); +}; +struct _GtkPizzaChild +{ + GtkWidget *widget; + gint x; + gint y; +}; -guint -gtk_myfixed_get_type () +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 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 GtkWidgetClass* pizza_parent_class; + +GtkType +gtk_pizza_get_type () { - static guint myfixed_type = 0; + static GtkType pizza_type = 0; - if (!myfixed_type) + if (!pizza_type) { - GtkTypeInfo myfixed_info = - { - "GtkMyFixed", - sizeof (GtkMyFixed), - sizeof (GtkMyFixedClass), - (GtkClassInitFunc) gtk_myfixed_class_init, - (GtkObjectInitFunc) gtk_myfixed_init, -#ifndef NEW_GTK_CONSTRUCT_CODE - (GtkArgSetFunc) NULL, - (GtkArgGetFunc) NULL, -#else - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, -#endif - }; - - myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info); + 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, + NULL + }; + pizza_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkPizza", &pizza_info, (GTypeFlags)0); } - return myfixed_type; + 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 -gtk_myfixed_class_init (GtkMyFixedClass *klass) +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) { - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; - - object_class = (GtkObjectClass*) klass; - widget_class = (GtkWidgetClass*) klass; - container_class = (GtkContainerClass*) klass; - -#ifndef NEW_GTK_CONSTRUCT_CODE - parent_class = gtk_type_class (gtk_container_get_type ()); -#else - parent_class = gtk_type_class (GTK_TYPE_CONTAINER); -#endif + 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; - widget_class->map = gtk_myfixed_map; -#ifndef NEW_GTK_CONSTRUCT_CODE - 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 + g_return_if_fail (n_param_values == 3); -#ifdef NEW_GTK_CONSTRUCT_CODE - container_class->child_type = gtk_myfixed_child_type; -#endif + 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) +{ + GtkObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkContainerClass *container_class; + + object_class = (GtkObjectClass*) klass; + widget_class = (GtkWidgetClass*) klass; + container_class = (GtkContainerClass*) klass; + 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; + widget_class->style_set = gtk_pizza_style_set; + + container_class->add = gtk_pizza_add; + container_class->remove = gtk_pizza_remove; + container_class->forall = gtk_pizza_forall; + + container_class->child_type = gtk_pizza_child_type; + + klass->set_scroll_adjustments = gtk_pizza_scroll_set_adjustments; + + widget_class->set_scroll_adjustments_signal = + 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); } -#ifdef NEW_GTK_CONSTRUCT_CODE static GtkType -gtk_myfixed_child_type (GtkContainer *container) +gtk_pizza_child_type (GtkContainer *container) { - return GTK_TYPE_WIDGET; + 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); - -#ifndef NEW_GTK_CONSTRUCT_CODE - GTK_WIDGET_SET_FLAGS (myfixed, GTK_BASIC); -#endif + GTK_WIDGET_UNSET_FLAGS (pizza, GTK_NO_WINDOW); - myfixed->children = NULL; + pizza->children = NULL; + + pizza->bin_window = NULL; + + pizza->m_xoffset = 0; + pizza->m_yoffset = 0; } 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); } -void -gtk_myfixed_put (GtkMyFixed *myfixed, - GtkWidget *widget, - gint16 x, - gint16 y) +gint gtk_pizza_get_xoffset (GtkPizza *pizza) { - GtkMyFixedChild *child_info; + g_return_val_if_fail ( (pizza != NULL), -1 ); + g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), -1 ); - g_return_if_fail (myfixed != NULL); - g_return_if_fail (GTK_IS_MYFIXED (myfixed)); - g_return_if_fail (widget != NULL); + return pizza->m_xoffset; +} + +gint gtk_pizza_get_yoffset (GtkPizza *pizza) +{ + g_return_val_if_fail ( (pizza != NULL), -1 ); + g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), -1 ); + + return pizza->m_yoffset; +} + +void gtk_pizza_set_xoffset (GtkPizza *pizza, gint xoffset) +{ + g_return_if_fail (pizza != NULL); + g_return_if_fail (GTK_IS_PIZZA (pizza)); + + pizza->m_xoffset = xoffset; + // do something +} + +void gtk_pizza_set_yoffset (GtkPizza *pizza, gint yoffset) +{ + g_return_if_fail (pizza != NULL); + g_return_if_fail (GTK_IS_PIZZA (pizza)); - child_info = g_new (GtkMyFixedChild, 1); - child_info->widget = widget; - child_info->x = x; - child_info->y = y; - - gtk_widget_set_parent (widget, GTK_WIDGET (myfixed)); + pizza->m_xoffset = yoffset; + // do something +} - myfixed->children = g_list_append (myfixed->children, child_info); +gint gtk_pizza_get_rtl_offset (GtkPizza *pizza) +{ + gint border; - if (GTK_WIDGET_REALIZED (myfixed) && !GTK_WIDGET_REALIZED (widget)) - gtk_widget_realize (widget); + g_return_val_if_fail ( (pizza != NULL), 0 ); + g_return_val_if_fail ( (GTK_IS_PIZZA (pizza)), 0 ); + + if (!pizza->bin_window) return 0; + + border = pizza->container.border_width; + + return GTK_WIDGET(pizza)->allocation.width - border*2; +} - if (GTK_WIDGET_MAPPED (myfixed) && !GTK_WIDGET_MAPPED (widget)) - gtk_widget_map (widget); - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed)) - gtk_widget_queue_resize (GTK_WIDGET (myfixed)); +static void +gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, + GtkAdjustment *hadj, + GtkAdjustment *vadj) +{ + /* We handle scrolling in the wxScrolledWindow, not here. */ } void -gtk_myfixed_move (GtkMyFixed *myfixed, - GtkWidget *widget, - gint16 x, - gint16 y) +gtk_pizza_put (GtkPizza *pizza, + GtkWidget *widget, + gint x, + gint y, + gint width, + gint height) { - GtkMyFixedChild *child; - GList *children; + GtkPizzaChild *child_info; + + g_return_if_fail (pizza != NULL); + g_return_if_fail (GTK_IS_PIZZA (pizza)); + g_return_if_fail (widget != NULL); + + child_info = g_new (GtkPizzaChild, 1); + + child_info->widget = widget; + child_info->x = x; + child_info->y = y; + + pizza->children = g_list_append (pizza->children, child_info); + + if (GTK_WIDGET_REALIZED (pizza)) + gtk_widget_set_parent_window (widget, pizza->bin_window); + + gtk_widget_set_parent (widget, GTK_WIDGET (pizza)); - g_return_if_fail (myfixed != NULL); - g_return_if_fail (GTK_IS_MYFIXED (myfixed)); - g_return_if_fail (widget != NULL); + gtk_widget_set_size_request( widget, width, height ); + if (GTK_WIDGET_REALIZED (pizza)) + gtk_pizza_allocate_child (pizza, child_info); +} + +void +gtk_pizza_set_size (GtkPizza *pizza, + GtkWidget *widget, + gint x, + gint y, + gint width, + gint height) +{ + GtkPizzaChild *child; + GList *children; + + g_return_if_fail (pizza != NULL); + g_return_if_fail (GTK_IS_PIZZA (pizza)); + 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; - while (children) + children = pizza->children; + while (children) { - child = children->data; - children = children->next; + child = children->data; + children = children->next; - if (child->widget == widget) + if (child->widget == widget) { - if ((child->x == x) && (child->y == y)) return; - - child->x = x; - child->y = y; + child->x = x; + child->y = y; - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed)) - gtk_widget_queue_resize (GTK_WIDGET (myfixed)); + gtk_widget_set_size_request (widget, width, height); - break; + return; } } } static void -gtk_myfixed_map (GtkWidget *widget) +gtk_pizza_map (GtkWidget *widget) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; - GList *children; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED (widget)); + GtkPizza *pizza; + GtkPizzaChild *child; + GList *children; - GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED); - myfixed = GTK_MYFIXED (widget); + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_PIZZA (widget)); - gdk_window_show (widget->window); + GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED); + pizza = GTK_PIZZA (widget); - children = myfixed->children; - while (children) + children = pizza->children; + while (children) { - child = children->data; - children = children->next; + 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); + gdk_window_show (pizza->bin_window); } -#ifndef NEW_GTK_CONSTRUCT_CODE static void -gtk_myfixed_unmap (GtkWidget *widget) +gtk_pizza_realize (GtkWidget *widget) { - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED (widget)); + GtkPizza *pizza; + GdkWindowAttr attributes; + gint attributes_mask; + GtkPizzaChild *child; + GList *children; + int border; + + g_return_if_fail (widget != NULL); + 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; + + attributes.x = widget->allocation.x; + attributes.y = widget->allocation.y; + attributes.width = widget->allocation.width; + attributes.height = widget->allocation.height; + + border = pizza->container.border_width; + attributes.x += border; + attributes.y += border; + attributes.width -= 2 * border; + attributes.height -= 2 * border; + + /* minimal size */ + if (attributes.width < 2) attributes.width = 2; + if (attributes.height < 2) attributes.height = 2; + + 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_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); + 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_UNSET_FLAGS (widget, GTK_MAPPED); + gtk_widget_set_parent_window (child->widget, pizza->bin_window); + } } -#endif static void -gtk_myfixed_realize (GtkWidget *widget) +gtk_pizza_unrealize (GtkWidget *widget) { - GtkMyFixed *myfixed; - GdkWindowAttr attributes; - gint attributes_mask; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED (widget)); - - myfixed = GTK_MYFIXED (widget); - - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x; - attributes.y = widget->allocation.y; - attributes.width = 32000; - attributes.height = 32000; - 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_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); - gdk_window_set_user_data (widget->window, widget); - - widget->style = gtk_style_attach (widget->style, widget->window); - gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); + 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 (pizza_parent_class->unrealize) + 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; - GList *children; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED (widget)); - g_return_if_fail (requisition != NULL); - - myfixed = GTK_MYFIXED (widget); - - requisition->width = 0; - requisition->height = 0; - - children = myfixed->children; - while (children) + GtkPizza *pizza; + GtkPizzaChild *child; + GList *children; + GtkRequisition child_requisition; + + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_PIZZA (widget)); + g_return_if_fail (requisition != NULL); + + pizza = GTK_PIZZA (widget); + + children = pizza->children; + while (children) { - child = children->data; - children = children->next; + child = children->data; + children = children->next; - if (GTK_WIDGET_VISIBLE (child->widget)) - { - gtk_widget_size_request (child->widget, &child->widget->requisition); - } + 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; + requisition->height = 2; } static void -gtk_myfixed_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) +gtk_pizza_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; - GtkAllocation child_allocation; - GList *children; - guint16 border_width; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED(widget)); - g_return_if_fail (allocation != NULL); - - myfixed = GTK_MYFIXED (widget); - - widget->allocation = *allocation; - if (GTK_WIDGET_REALIZED (widget)) - gdk_window_move_resize (widget->window, allocation->x, allocation->y, 32000, 32000 ); - - border_width = GTK_CONTAINER (myfixed)->border_width; - - children = myfixed->children; - while (children) + GtkPizza *pizza; + gint border; + gint x,y,w,h; + GtkPizzaChild *child; + GList *children; + gboolean only_resize; + + g_return_if_fail (widget != NULL); + g_return_if_fail (GTK_IS_PIZZA(widget)); + g_return_if_fail (allocation != NULL); + + pizza = GTK_PIZZA (widget); + + only_resize = ((widget->allocation.x == allocation->x) && + (widget->allocation.y == allocation->y)); + widget->allocation = *allocation; + + border = pizza->container.border_width; + + x = allocation->x + border; + y = allocation->y + border; + w = allocation->width - border*2; + h = allocation->height - border*2; + if (w < 0) + w = 0; + if (h < 0) + h = 0; + + if (GTK_WIDGET_REALIZED (widget)) + { + if (only_resize) + gdk_window_resize( widget->window, w, h ); + else + gdk_window_move_resize( widget->window, x, y, w, h ); + + gdk_window_resize( pizza->bin_window, w, h ); + } + + children = pizza->children; + while (children) { - child = children->data; - children = children->next; - - if (GTK_WIDGET_VISIBLE (child->widget)) - { - child_allocation.x = child->x + border_width; - child_allocation.y = child->y + border_width; - child_allocation.width = child->widget->requisition.width; - child_allocation.height = child->widget->requisition.height; - gtk_widget_size_allocate (child->widget, &child_allocation); - } + child = children->data; + children = children->next; + + gtk_pizza_allocate_child (pizza, child); } } static void -gtk_myfixed_paint (GtkWidget *widget, - GdkRectangle *area) +gtk_pizza_style_set(GtkWidget *widget, GtkStyle *previous_style) { - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED (widget)); - g_return_if_fail (area != NULL); - - if (GTK_WIDGET_DRAWABLE (widget)) - gdk_window_clear_area (widget->window, - area->x, area->y, - area->width, area->height); + 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 ); + } + + pizza_parent_class->style_set(widget, previous_style); } static void -gtk_myfixed_draw (GtkWidget *widget, - GdkRectangle *area) +gtk_pizza_add (GtkContainer *container, + GtkWidget *widget) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; - GdkRectangle child_area; - GList *children; + g_return_if_fail (container != NULL); + g_return_if_fail (GTK_IS_PIZZA (container)); + g_return_if_fail (widget != NULL); - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_MYFIXED (widget)); - - if (GTK_WIDGET_DRAWABLE (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_pizza_put (GTK_PIZZA (container), widget, 0, 0, 20, 20 ); } -static gint -gtk_myfixed_expose (GtkWidget *widget, - GdkEventExpose *event) +static void +gtk_pizza_remove (GtkContainer *container, + GtkWidget *widget) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; - GdkEventExpose child_event; - GList *children; + GtkPizza *pizza; + GtkPizzaChild *child; + GList *children; - 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); + g_return_if_fail (container != NULL); + g_return_if_fail (GTK_IS_PIZZA (container)); + g_return_if_fail (widget != NULL); - if (GTK_WIDGET_DRAWABLE (widget)) + pizza = GTK_PIZZA (container); + + 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); + 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) - { - gtk_widget_unparent (widget); - - myfixed->children = g_list_remove_link (myfixed->children, children); - g_list_free (children); - g_free (child); + (* callback) (child->widget, callback_data); + } +} - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (container)) - gtk_widget_queue_resize (GTK_WIDGET (container)); +static void +gtk_pizza_allocate_child (GtkPizza *pizza, + GtkPizzaChild *child) +{ + GtkAllocation allocation; + GtkRequisition requisition; - break; - } + allocation.x = child->x - pizza->m_xoffset; + allocation.y = child->y - pizza->m_yoffset; + gtk_widget_get_child_requisition (child->widget, &requisition); + allocation.width = requisition.width; + allocation.height = requisition.height; - children = children->next; + if (gtk_widget_get_direction( GTK_WIDGET(pizza) ) == GTK_TEXT_DIR_RTL) + { + /* reverse horizontal placement */ + gint offset,border; + + offset = GTK_WIDGET(pizza)->allocation.width; + border = pizza->container.border_width; + offset -= border*2; + + allocation.x = offset - child->x - allocation.width + pizza->m_xoffset; } + + gtk_widget_size_allocate (child->widget, &allocation); } 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_recurse (GtkWidget *widget, + gpointer cb_data) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; - GList *children; + GtkPizzaAdjData *data = cb_data; - g_return_if_fail (container != NULL); - g_return_if_fail (GTK_IS_MYFIXED (container)); - g_return_if_fail (callback != NULL); + widget->allocation.x += data->dx; + widget->allocation.y += data->dy; - myfixed = GTK_MYFIXED (container); + 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_pizza_adjust_allocations (GtkPizza *pizza, + gint dx, + gint dy) +{ + GList *tmp_list; + GtkPizzaAdjData data; - children = myfixed->children; - while (children) + data.dx = dx; + data.dy = dy; + + tmp_list = pizza->children; + while (tmp_list) { - child = children->data; - children = children->next; + GtkPizzaChild *child = tmp_list->data; + tmp_list = tmp_list->next; + + child->widget->allocation.x += dx; + child->widget->allocation.y += dy; - (* callback) (child->widget, callback_data); + 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->m_xoffset += dx; + pizza->m_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 */ -