X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed673c6a48b3479beac60a93ff8f44611e44415f..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/gtk/win_gtk.c?ds=sidebyside diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index 10f8d2ca28..2097a2db33 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -21,16 +21,16 @@ extern "C" { #define IS_ONSCREEN(x,y) ((x >= G_MINSHORT) && (x <= G_MAXSHORT) && \ (y >= G_MINSHORT) && (y <= G_MAXSHORT)) -typedef struct _GtkMyFixedAdjData GtkMyFixedAdjData; -typedef struct _GtkMyFixedChild GtkMyFixedChild; +typedef struct _GtkPizzaAdjData GtkPizzaAdjData; +typedef struct _GtkPizzaChild GtkPizzaChild; -struct _GtkMyFixedAdjData +struct _GtkPizzaAdjData { gint dx; gint dy; }; -struct _GtkMyFixedChild +struct _GtkPizzaChild { GtkWidget *widget; gint x; @@ -39,62 +39,62 @@ struct _GtkMyFixedChild gint height; }; -static void gtk_myfixed_class_init (GtkMyFixedClass *klass); -static void gtk_myfixed_init (GtkMyFixed *myfixed); +static void gtk_pizza_class_init (GtkPizzaClass *klass); +static void gtk_pizza_init (GtkPizza *pizza); -static void gtk_myfixed_realize (GtkWidget *widget); -static void gtk_myfixed_unrealize (GtkWidget *widget); +static void gtk_pizza_realize (GtkWidget *widget); +static void gtk_pizza_unrealize (GtkWidget *widget); -static void gtk_myfixed_map (GtkWidget *widget); +static void gtk_pizza_map (GtkWidget *widget); -static void gtk_myfixed_size_request (GtkWidget *widget, +static void gtk_pizza_size_request (GtkWidget *widget, GtkRequisition *requisition); -static void gtk_myfixed_size_allocate (GtkWidget *widget, +static void gtk_pizza_size_allocate (GtkWidget *widget, GtkAllocation *allocation); -static void gtk_myfixed_draw (GtkWidget *widget, +static void gtk_pizza_draw (GtkWidget *widget, GdkRectangle *area); -static gint gtk_myfixed_expose (GtkWidget *widget, +static gint gtk_pizza_expose (GtkWidget *widget, GdkEventExpose *event); -static void gtk_myfixed_add (GtkContainer *container, +static void gtk_pizza_add (GtkContainer *container, GtkWidget *widget); -static void gtk_myfixed_remove (GtkContainer *container, +static void gtk_pizza_remove (GtkContainer *container, GtkWidget *widget); -static void gtk_myfixed_forall (GtkContainer *container, +static void gtk_pizza_forall (GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data); -static void gtk_myfixed_position_child (GtkMyFixed *myfixed, - GtkMyFixedChild *child); -static void gtk_myfixed_allocate_child (GtkMyFixed *myfixed, - GtkMyFixedChild *child); -static void gtk_myfixed_position_children (GtkMyFixed *myfixed); +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_myfixed_adjust_allocations_recurse (GtkWidget *widget, +static void gtk_pizza_adjust_allocations_recurse (GtkWidget *widget, gpointer cb_data); -static void gtk_myfixed_adjust_allocations (GtkMyFixed *myfixed, +static void gtk_pizza_adjust_allocations (GtkPizza *pizza, gint dx, gint dy); -static void gtk_myfixed_expose_area (GtkMyFixed *myfixed, +static void gtk_pizza_expose_area (GtkPizza *pizza, gint x, gint y, gint width, gint height); -static void gtk_myfixed_adjustment_changed (GtkAdjustment *adjustment, - GtkMyFixed *myfixed); -static GdkFilterReturn gtk_myfixed_filter (GdkXEvent *gdk_xevent, +static void gtk_pizza_adjustment_changed (GtkAdjustment *adjustment, + GtkPizza *pizza); +static GdkFilterReturn gtk_pizza_filter (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data); -static GdkFilterReturn gtk_myfixed_main_filter (GdkXEvent *gdk_xevent, +static GdkFilterReturn gtk_pizza_main_filter (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data); -static GtkType gtk_myfixed_child_type (GtkContainer *container); +static GtkType gtk_pizza_child_type (GtkContainer *container); -static void gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed, +static void gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, GtkAdjustment *hadj, GtkAdjustment *vadj); @@ -103,31 +103,31 @@ static GtkContainerClass *parent_class = NULL; static gboolean gravity_works; guint -gtk_myfixed_get_type () +gtk_pizza_get_type () { - static guint myfixed_type = 0; + static guint pizza_type = 0; - if (!myfixed_type) + if (!pizza_type) { - GtkTypeInfo myfixed_info = + GtkTypeInfo pizza_info = { - "GtkMyFixed", - sizeof (GtkMyFixed), - sizeof (GtkMyFixedClass), - (GtkClassInitFunc) gtk_myfixed_class_init, - (GtkObjectInitFunc) gtk_myfixed_init, + "GtkPizza", + sizeof (GtkPizza), + sizeof (GtkPizzaClass), + (GtkClassInitFunc) gtk_pizza_class_init, + (GtkObjectInitFunc) gtk_pizza_init, /* reserved_1 */ NULL, /* reserved_2 */ NULL, (GtkClassInitFunc) NULL, }; - myfixed_type = gtk_type_unique (gtk_container_get_type (), &myfixed_info); + pizza_type = gtk_type_unique (gtk_container_get_type (), &pizza_info); } - return myfixed_type; + return pizza_type; } static void -gtk_myfixed_class_init (GtkMyFixedClass *klass) +gtk_pizza_class_init (GtkPizzaClass *klass) { GtkObjectClass *object_class; GtkWidgetClass *widget_class; @@ -138,69 +138,71 @@ gtk_myfixed_class_init (GtkMyFixedClass *klass) container_class = (GtkContainerClass*) klass; parent_class = gtk_type_class (GTK_TYPE_CONTAINER); - widget_class->map = gtk_myfixed_map; - widget_class->realize = gtk_myfixed_realize; - widget_class->unrealize = gtk_myfixed_unrealize; - 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; + 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->draw = gtk_pizza_draw; + widget_class->expose_event = gtk_pizza_expose; - container_class->add = gtk_myfixed_add; - container_class->remove = gtk_myfixed_remove; - container_class->forall = gtk_myfixed_forall; + container_class->add = gtk_pizza_add; + container_class->remove = gtk_pizza_remove; + container_class->forall = gtk_pizza_forall; - container_class->child_type = gtk_myfixed_child_type; + container_class->child_type = gtk_pizza_child_type; - klass->set_scroll_adjustments = gtk_myfixed_scroll_set_adjustments; + 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_SIGNAL_OFFSET (GtkPizzaClass, set_scroll_adjustments), gtk_marshal_NONE__POINTER_POINTER, GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); } static GtkType -gtk_myfixed_child_type (GtkContainer *container) +gtk_pizza_child_type (GtkContainer *container) { return GTK_TYPE_WIDGET; } static void -gtk_myfixed_init (GtkMyFixed *myfixed) +gtk_pizza_init (GtkPizza *pizza) { - GTK_WIDGET_UNSET_FLAGS (myfixed, GTK_NO_WINDOW); + GTK_WIDGET_UNSET_FLAGS (pizza, GTK_NO_WINDOW); - myfixed->shadow_type = GTK_MYSHADOW_NONE; + pizza->shadow_type = GTK_MYSHADOW_NONE; - myfixed->children = NULL; + pizza->children = NULL; - myfixed->width = 20; - myfixed->height = 20; + pizza->width = 20; + pizza->height = 20; - myfixed->bin_window = NULL; + pizza->bin_window = NULL; - myfixed->configure_serial = 0; - myfixed->scroll_x = 0; - myfixed->scroll_y = 0; - myfixed->visibility = GDK_VISIBILITY_PARTIAL; + pizza->configure_serial = 0; + pizza->scroll_x = 0; + pizza->scroll_y = 0; + pizza->visibility = GDK_VISIBILITY_PARTIAL; + + pizza->clear_on_draw = TRUE; } GtkWidget* -gtk_myfixed_new () +gtk_pizza_new () { - GtkMyFixed *myfixed; + GtkPizza *pizza; - myfixed = gtk_type_new (gtk_myfixed_get_type ()); + pizza = gtk_type_new (gtk_pizza_get_type ()); - return GTK_WIDGET (myfixed); + return GTK_WIDGET (pizza); } void -gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed, +gtk_pizza_scroll_set_adjustments (GtkPizza *pizza, GtkAdjustment *hadj, GtkAdjustment *vadj) { @@ -208,39 +210,49 @@ gtk_myfixed_scroll_set_adjustments (GtkMyFixed *myfixed, } void -gtk_myfixed_set_shadow_type (GtkMyFixed *myfixed, +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 ((GtkMyShadowType) myfixed->shadow_type != type) + if ((GtkMyShadowType) pizza->shadow_type != type) { - myfixed->shadow_type = type; + pizza->shadow_type = type; - if (GTK_WIDGET_VISIBLE (myfixed)) + if (GTK_WIDGET_VISIBLE (pizza)) { - gtk_widget_size_allocate (GTK_WIDGET (myfixed), &(GTK_WIDGET (myfixed)->allocation)); - gtk_widget_queue_draw (GTK_WIDGET (myfixed)); + gtk_widget_size_allocate (GTK_WIDGET (pizza), &(GTK_WIDGET (pizza)->allocation)); + gtk_widget_queue_draw (GTK_WIDGET (pizza)); } } } +void +gtk_pizza_set_clear (GtkPizza *pizza, + gboolean clear) +{ + g_return_if_fail (pizza != NULL); + g_return_if_fail (GTK_IS_PIZZA (pizza)); + + pizza->clear_on_draw = clear; +} + void -gtk_myfixed_put (GtkMyFixed *myfixed, +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; @@ -248,24 +260,24 @@ gtk_myfixed_put (GtkMyFixed *myfixed, child_info->width = width; child_info->height = height; - myfixed->children = g_list_append (myfixed->children, child_info); + pizza->children = g_list_append (pizza->children, child_info); - gtk_widget_set_parent (widget, GTK_WIDGET (myfixed)); + gtk_widget_set_parent (widget, GTK_WIDGET (pizza)); - if (GTK_WIDGET_REALIZED (myfixed)) - gtk_widget_set_parent_window (widget, myfixed->bin_window); + if (GTK_WIDGET_REALIZED (pizza)) + gtk_widget_set_parent_window (widget, pizza->bin_window); if (!IS_ONSCREEN (x, y)) GTK_PRIVATE_SET_FLAG (widget, GTK_IS_OFFSCREEN); - if (GTK_WIDGET_REALIZED (myfixed)) + if (GTK_WIDGET_REALIZED (pizza)) gtk_widget_realize (widget); gtk_widget_set_usize (widget, width, height); - if (GTK_WIDGET_VISIBLE (myfixed) && GTK_WIDGET_VISIBLE (widget)) + if (GTK_WIDGET_VISIBLE (pizza) && GTK_WIDGET_VISIBLE (widget)) { - if (GTK_WIDGET_MAPPED (myfixed)) + if (GTK_WIDGET_MAPPED (pizza)) gtk_widget_map (widget); gtk_widget_queue_resize (widget); @@ -273,19 +285,19 @@ gtk_myfixed_put (GtkMyFixed *myfixed, } void -gtk_myfixed_move (GtkMyFixed *myfixed, +gtk_pizza_move (GtkPizza *pizza, GtkWidget *widget, gint x, gint y) { - 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; + children = pizza->children; while (children) { child = children->data; @@ -299,7 +311,7 @@ gtk_myfixed_move (GtkMyFixed *myfixed, child->x = x; child->y = y; - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed)) + if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza)) gtk_widget_queue_resize (widget); break; } @@ -307,19 +319,19 @@ gtk_myfixed_move (GtkMyFixed *myfixed, } void -gtk_myfixed_resize (GtkMyFixed *myfixed, +gtk_pizza_resize (GtkPizza *pizza, GtkWidget *widget, 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; + children = pizza->children; while (children) { child = children->data; @@ -335,7 +347,7 @@ gtk_myfixed_resize (GtkMyFixed *myfixed, gtk_widget_set_usize (widget, width, height); - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed)) + if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza)) gtk_widget_queue_resize (widget); break; } @@ -343,22 +355,22 @@ gtk_myfixed_resize (GtkMyFixed *myfixed, } void -gtk_myfixed_set_size (GtkMyFixed *myfixed, +gtk_pizza_set_size (GtkPizza *pizza, GtkWidget *widget, gint x, gint y, gint width, gint height) { - GtkMyFixedChild *child; + GtkPizzaChild *child; GList *children; GtkAllocation child_allocation; - 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; + children = pizza->children; while (children) { child = children->data; @@ -378,28 +390,28 @@ gtk_myfixed_set_size (GtkMyFixed *myfixed, gtk_widget_set_usize (widget, width, height); - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed)) + if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza)) gtk_widget_queue_resize (widget); - break; + 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; @@ -414,22 +426,22 @@ gtk_myfixed_map (GtkWidget *widget) } gdk_window_show (widget->window); - gdk_window_show (myfixed->bin_window); + gdk_window_show (pizza->bin_window); } static void -gtk_myfixed_realize (GtkWidget *widget) +gtk_pizza_realize (GtkWidget *widget) { - GtkMyFixed *myfixed; + GtkPizza *pizza; GdkWindowAttr attributes; gint attributes_mask; - GtkMyFixedChild *child; + 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); @@ -440,11 +452,11 @@ gtk_myfixed_realize (GtkWidget *widget) attributes.width = widget->allocation.width; attributes.height = widget->allocation.height; - if (myfixed->shadow_type == GTK_MYSHADOW_NONE) + if (pizza->shadow_type == GTK_MYSHADOW_NONE) { /* no border, no changes to sizes */ } else - if (myfixed->shadow_type == GTK_MYSHADOW_THIN) + if (pizza->shadow_type == GTK_MYSHADOW_THIN) { /* GTK_MYSHADOW_THIN == wxSIMPLE_BORDER */ attributes.x += 1; @@ -496,66 +508,66 @@ gtk_myfixed_realize (GtkWidget *widget) GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK; - myfixed->bin_window = gdk_window_new (widget->window, + pizza->bin_window = gdk_window_new (widget->window, &attributes, attributes_mask); - gdk_window_set_user_data (myfixed->bin_window, widget); + 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, myfixed->bin_window, GTK_STATE_NORMAL); + gtk_style_set_background (widget->style, pizza->bin_window, GTK_STATE_NORMAL); /* add filters for intercepting visibility and expose events */ - gdk_window_add_filter (widget->window, gtk_myfixed_main_filter, myfixed); - gdk_window_add_filter (myfixed->bin_window, gtk_myfixed_filter, myfixed); + gdk_window_add_filter (widget->window, gtk_pizza_main_filter, pizza); + gdk_window_add_filter (pizza->bin_window, gtk_pizza_filter, pizza); /* we NEED gravity or we'll give up */ - gravity_works = gdk_window_set_static_gravities (myfixed->bin_window, TRUE); + gravity_works = gdk_window_set_static_gravities (pizza->bin_window, TRUE); /* cannot be done before realisation */ - children = myfixed->children; + children = pizza->children; while (children) { child = children->data; children = children->next; - gtk_widget_set_parent_window (child->widget, myfixed->bin_window); + gtk_widget_set_parent_window (child->widget, pizza->bin_window); } } static void -gtk_myfixed_unrealize (GtkWidget *widget) +gtk_pizza_unrealize (GtkWidget *widget) { - GtkMyFixed *myfixed; + GtkPizza *pizza; 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); - gdk_window_set_user_data (myfixed->bin_window, NULL); - gdk_window_destroy (myfixed->bin_window); - myfixed->bin_window = NULL; + gdk_window_set_user_data (pizza->bin_window, NULL); + gdk_window_destroy (pizza->bin_window); + pizza->bin_window = NULL; if (GTK_WIDGET_CLASS (parent_class)->unrealize) (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); } static void -gtk_myfixed_size_request (GtkWidget *widget, +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); + pizza = GTK_PIZZA (widget); - children = myfixed->children; + children = pizza->children; while (children) { child = children->data; @@ -574,38 +586,28 @@ gtk_myfixed_size_request (GtkWidget *widget, } static void -gtk_myfixed_size_allocate (GtkWidget *widget, +gtk_pizza_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { - GtkMyFixed *myfixed; + GtkPizza *pizza; gint border; gint x,y,w,h; - GtkMyFixedChild *child; + GtkPizzaChild *child; GtkAllocation child_allocation; 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); - children = myfixed->children; - while (children) - { - child = children->data; - children = children->next; - - gtk_myfixed_position_child (myfixed, child); - gtk_myfixed_allocate_child (myfixed, child); - } - widget->allocation = *allocation; - if (myfixed->shadow_type == GTK_MYSHADOW_NONE) + if (pizza->shadow_type == GTK_MYSHADOW_NONE) border = 0; else - if (myfixed->shadow_type == GTK_MYSHADOW_THIN) + if (pizza->shadow_type == GTK_MYSHADOW_THIN) border = 1; else border = 2; @@ -618,28 +620,39 @@ gtk_myfixed_size_allocate (GtkWidget *widget, if (GTK_WIDGET_REALIZED (widget)) { gdk_window_move_resize( widget->window, x, y, w, h ); - gdk_window_move_resize( myfixed->bin_window, 0, 0, w, h ); + gdk_window_move_resize( pizza->bin_window, 0, 0, w, h ); + } + + children = pizza->children; + while (children) + { + child = children->data; + children = children->next; + + gtk_pizza_position_child (pizza, child); + gtk_pizza_allocate_child (pizza, child); } } static void -gtk_myfixed_draw (GtkWidget *widget, +gtk_pizza_draw (GtkWidget *widget, GdkRectangle *area) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; + GtkPizza *pizza; + GtkPizzaChild *child; GdkRectangle child_area; 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); - children = myfixed->children; - if ( !(GTK_WIDGET_APP_PAINTABLE (widget)) ) + children = pizza->children; + if ( !(GTK_WIDGET_APP_PAINTABLE (widget)) && + (pizza->clear_on_draw)) { - gdk_window_clear_area( myfixed->bin_window, + gdk_window_clear_area( pizza->bin_window, area->x, area->y, area->width, area->height); } @@ -653,83 +666,33 @@ gtk_myfixed_draw (GtkWidget *widget, } } -/* -static void -gtk_myfixed_draw_border (GtkMyFixed *myfixed) -{ - GtkWidget *widget; - - widget = GTK_WIDGET(myfixed); - - if (myfixed->shadow_type == GTK_MYSHADOW_NONE) - return; - - if (myfixed->shadow_type == GTK_MYSHADOW_OUT) - { - gtk_draw_shadow( widget->style, - widget->window, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - 0, 0, - widget->allocation.width, - widget->allocation.height ); - return; - } - - if (myfixed->shadow_type == GTK_MYSHADOW_IN) - { - gtk_draw_shadow( widget->style, - widget->window, - GTK_STATE_NORMAL, - GTK_SHADOW_IN, - 0, 0, - widget->allocation.width, - widget->allocation.height ); - return; - } - - if (myfixed->shadow_type == GTK_MYSHADOW_THIN) - { - GdkGC *gc; - gc = gdk_gc_new( widget->window ); - gdk_gc_set_foreground( gc, &widget->style->black ); - gdk_draw_rectangle( widget->window, gc, FALSE, - 0, 0, - widget->allocation.width-1, - widget->allocation.height-1 ); - gdk_gc_unref( gc ); - return; - } -} -*/ - static gint -gtk_myfixed_expose (GtkWidget *widget, +gtk_pizza_expose (GtkWidget *widget, GdkEventExpose *event) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; + GtkPizza *pizza; + GtkPizzaChild *child; GdkEventExpose child_event; 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 (GTK_IS_PIZZA (widget), FALSE); g_return_val_if_fail (event != NULL, FALSE); - myfixed = GTK_MYFIXED (widget); + pizza = GTK_PIZZA (widget); /* if (event->window == widget->window) { - gtk_myfixed_draw_border( myfixed ); + gtk_pizza_draw_border( pizza ); return FALSE; } */ - if (event->window != myfixed->bin_window) + if (event->window != pizza->bin_window) return FALSE; - children = myfixed->children; + children = pizza->children; while (children) { child = children->data; @@ -749,31 +712,31 @@ gtk_myfixed_expose (GtkWidget *widget, } static void -gtk_myfixed_add (GtkContainer *container, +gtk_pizza_add (GtkContainer *container, GtkWidget *widget) { g_return_if_fail (container != NULL); - g_return_if_fail (GTK_IS_MYFIXED (container)); + g_return_if_fail (GTK_IS_PIZZA (container)); g_return_if_fail (widget != NULL); - gtk_myfixed_put (GTK_MYFIXED (container), widget, 0, 0, 20, 20 ); + gtk_pizza_put (GTK_PIZZA (container), widget, 0, 0, 20, 20 ); } static void -gtk_myfixed_remove (GtkContainer *container, +gtk_pizza_remove (GtkContainer *container, GtkWidget *widget) { - GtkMyFixed *myfixed; - GtkMyFixedChild *child; + GtkPizza *pizza; + GtkPizzaChild *child; GList *children; g_return_if_fail (container != NULL); - g_return_if_fail (GTK_IS_MYFIXED (container)); + g_return_if_fail (GTK_IS_PIZZA (container)); g_return_if_fail (widget != NULL); - myfixed = GTK_MYFIXED (container); + pizza = GTK_PIZZA (container); - children = myfixed->children; + children = pizza->children; while (children) { child = children->data; @@ -785,7 +748,7 @@ gtk_myfixed_remove (GtkContainer *container, /* security checks */ g_return_if_fail (GTK_IS_WIDGET (widget)); - myfixed->children = g_list_remove_link (myfixed->children, children); + pizza->children = g_list_remove_link (pizza->children, children); g_list_free (children); g_free (child); @@ -802,28 +765,28 @@ gtk_myfixed_remove (GtkContainer *container, } static void -gtk_myfixed_forall (GtkContainer *container, +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 (callback != NULL); + g_return_if_fail (container != NULL); + g_return_if_fail (GTK_IS_PIZZA (container)); + g_return_if_fail (callback != NULL); - myfixed = GTK_MYFIXED (container); + pizza = GTK_PIZZA (container); - children = myfixed->children; - while (children) + children = pizza->children; + while (children) { - child = children->data; - children = children->next; + child = children->data; + children = children->next; - (* callback) (child->widget, callback_data); + (* callback) (child->widget, callback_data); } } @@ -832,99 +795,100 @@ gtk_myfixed_forall (GtkContainer *container, */ static void -gtk_myfixed_position_child (GtkMyFixed *myfixed, - GtkMyFixedChild *child) +gtk_pizza_position_child (GtkPizza *pizza, + GtkPizzaChild *child) { - gint x; - gint y; + gint x; + gint y; - x = child->x - myfixed->xoffset; - y = child->y - myfixed->yoffset; + x = child->x - pizza->xoffset; + y = child->y - pizza->yoffset; - if (IS_ONSCREEN (x,y)) + if (IS_ONSCREEN (x,y)) { - if (GTK_WIDGET_MAPPED (myfixed) && + if (GTK_WIDGET_MAPPED (pizza) && GTK_WIDGET_VISIBLE (child->widget)) { - if (!GTK_WIDGET_MAPPED (child->widget)) - gtk_widget_map (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); + if (GTK_WIDGET_IS_OFFSCREEN (child->widget)) + GTK_PRIVATE_UNSET_FLAG (child->widget, GTK_IS_OFFSCREEN); } - else + else { - if (!GTK_WIDGET_IS_OFFSCREEN (child->widget)) - GTK_PRIVATE_SET_FLAG (child->widget, GTK_IS_OFFSCREEN); + 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); + if (GTK_WIDGET_MAPPED (child->widget)) + gtk_widget_unmap (child->widget); } } static void -gtk_myfixed_allocate_child (GtkMyFixed *myfixed, - GtkMyFixedChild *child) +gtk_pizza_allocate_child (GtkPizza *pizza, + GtkPizzaChild *child) { - GtkAllocation allocation; - GtkRequisition requisition; - - allocation.x = child->x - myfixed->xoffset; - allocation.y = child->y - myfixed->yoffset; - gtk_widget_get_child_requisition (child->widget, &requisition); - allocation.width = requisition.width; - allocation.height = requisition.height; + 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); + gtk_widget_size_allocate (child->widget, &allocation); } static void -gtk_myfixed_position_children (GtkMyFixed *myfixed) +gtk_pizza_position_children (GtkPizza *pizza) { - GList *tmp_list; + GList *tmp_list; - tmp_list = myfixed->children; - while (tmp_list) + tmp_list = pizza->children; + while (tmp_list) { - GtkMyFixedChild *child = tmp_list->data; - tmp_list = tmp_list->next; + GtkPizzaChild *child = tmp_list->data; + tmp_list = tmp_list->next; - gtk_myfixed_position_child (myfixed, child); + gtk_pizza_position_child (pizza, child); } } static void -gtk_myfixed_adjust_allocations_recurse (GtkWidget *widget, +gtk_pizza_adjust_allocations_recurse (GtkWidget *widget, gpointer cb_data) { - GtkMyFixedAdjData *data = cb_data; + GtkPizzaAdjData *data = cb_data; - widget->allocation.x += data->dx; - widget->allocation.y += data->dy; + widget->allocation.x += data->dx; + widget->allocation.y += data->dy; - if (GTK_WIDGET_NO_WINDOW (widget) && - GTK_IS_CONTAINER (widget)) - gtk_container_forall (GTK_CONTAINER (widget), - gtk_myfixed_adjust_allocations_recurse, + 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_adjust_allocations (GtkMyFixed *myfixed, +gtk_pizza_adjust_allocations (GtkPizza *pizza, gint dx, gint dy) { GList *tmp_list; - GtkMyFixedAdjData data; + GtkPizzaAdjData data; data.dx = dx; data.dy = dy; - tmp_list = myfixed->children; + tmp_list = pizza->children; while (tmp_list) { - GtkMyFixedChild *child = tmp_list->data; + GtkPizzaChild *child = tmp_list->data; tmp_list = tmp_list->next; child->widget->allocation.x += dx; @@ -933,7 +897,7 @@ gtk_myfixed_adjust_allocations (GtkMyFixed *myfixed, if (GTK_WIDGET_NO_WINDOW (child->widget) && GTK_IS_CONTAINER (child->widget)) gtk_container_forall (GTK_CONTAINER (child->widget), - gtk_myfixed_adjust_allocations_recurse, + gtk_pizza_adjust_allocations_recurse, &data); } } @@ -943,16 +907,16 @@ gtk_myfixed_adjust_allocations (GtkMyFixed *myfixed, /* Send a synthetic expose event to the widget */ static void -gtk_myfixed_expose_area (GtkMyFixed *myfixed, +gtk_pizza_expose_area (GtkPizza *pizza, gint x, gint y, gint width, gint height) { - if (myfixed->visibility == GDK_VISIBILITY_UNOBSCURED) + if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED) { GdkEventExpose event; event.type = GDK_EXPOSE; event.send_event = TRUE; - event.window = myfixed->bin_window; + event.window = pizza->bin_window; event.count = 0; event.area.x = x; @@ -961,7 +925,7 @@ gtk_myfixed_expose_area (GtkMyFixed *myfixed, event.area.height = height; gdk_window_ref (event.window); - gtk_widget_event (GTK_WIDGET (myfixed), (GdkEvent *)&event); + gtk_widget_event (GTK_WIDGET (pizza), (GdkEvent *)&event); gdk_window_unref (event.window); } } @@ -970,7 +934,7 @@ gtk_myfixed_expose_area (GtkMyFixed *myfixed, */ static Bool -gtk_myfixed_expose_predicate (Display *display, +gtk_pizza_expose_predicate (Display *display, XEvent *xevent, XPointer arg) { @@ -995,30 +959,30 @@ gtk_myfixed_expose_predicate (Display *display, */ void -gtk_myfixed_scroll (GtkMyFixed *myfixed, gint dx, gint dy) +gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy) { GtkWidget *widget; XEvent xevent; gint x,y,w,h,border; - widget = GTK_WIDGET (myfixed); + widget = GTK_WIDGET (pizza); - myfixed->xoffset += dx; - myfixed->yoffset += dy; + pizza->xoffset += dx; + pizza->yoffset += dy; - if (!GTK_WIDGET_MAPPED (myfixed)) + if (!GTK_WIDGET_MAPPED (pizza)) { - gtk_myfixed_position_children (myfixed); + gtk_pizza_position_children (pizza); return; } - gtk_myfixed_adjust_allocations (myfixed, -dx, -dy); + gtk_pizza_adjust_allocations (pizza, -dx, -dy); - if (myfixed->shadow_type == GTK_MYSHADOW_NONE) + if (pizza->shadow_type == GTK_MYSHADOW_NONE) border = 0; else - if (myfixed->shadow_type == GTK_MYSHADOW_THIN) + if (pizza->shadow_type == GTK_MYSHADOW_THIN) border = 1; else border = 2; @@ -1032,18 +996,18 @@ gtk_myfixed_scroll (GtkMyFixed *myfixed, gint dx, gint dy) { if (gravity_works) { - gdk_window_resize (myfixed->bin_window, + gdk_window_resize (pizza->bin_window, w + dx, h); - gdk_window_move (myfixed->bin_window, x-dx, y); - gdk_window_move_resize (myfixed->bin_window, x, y, w, h ); + gdk_window_move (pizza->bin_window, x-dx, y); + gdk_window_move_resize (pizza->bin_window, x, y, w, h ); } else { /* FIXME */ } - gtk_myfixed_expose_area (myfixed, + gtk_pizza_expose_area (pizza, MAX ((gint)w - dx, 0), 0, MIN (dx, w), @@ -1053,20 +1017,20 @@ gtk_myfixed_scroll (GtkMyFixed *myfixed, gint dx, gint dy) { if (gravity_works) { - gdk_window_move_resize (myfixed->bin_window, + gdk_window_move_resize (pizza->bin_window, x + dx, y, w - dx, h); - gdk_window_move (myfixed->bin_window, x, y); - gdk_window_resize (myfixed->bin_window, w, h ); + gdk_window_move (pizza->bin_window, x, y); + gdk_window_resize (pizza->bin_window, w, h ); } else { /* FIXME */ } - gtk_myfixed_expose_area (myfixed, + gtk_pizza_expose_area (pizza, 0, 0, MIN (-dx, w), @@ -1077,9 +1041,9 @@ gtk_myfixed_scroll (GtkMyFixed *myfixed, gint dx, gint dy) { if (gravity_works) { - gdk_window_resize (myfixed->bin_window, w, h + dy); - gdk_window_move (myfixed->bin_window, x, y-dy); - gdk_window_move_resize (myfixed->bin_window, + 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 @@ -1087,7 +1051,7 @@ gtk_myfixed_scroll (GtkMyFixed *myfixed, gint dx, gint dy) /* FIXME */ } - gtk_myfixed_expose_area (myfixed, + gtk_pizza_expose_area (pizza, 0, MAX ((gint)h - dy, 0), w, @@ -1097,23 +1061,23 @@ gtk_myfixed_scroll (GtkMyFixed *myfixed, gint dx, gint dy) { if (gravity_works) { - gdk_window_move_resize (myfixed->bin_window, + gdk_window_move_resize (pizza->bin_window, x, y+dy, w, h - dy ); - gdk_window_move (myfixed->bin_window, x, y); - gdk_window_resize (myfixed->bin_window, w, h ); + gdk_window_move (pizza->bin_window, x, y); + gdk_window_resize (pizza->bin_window, w, h ); } else { /* FIXME */ } - gtk_myfixed_expose_area (myfixed, + gtk_pizza_expose_area (pizza, 0, 0, w, MIN (-dy, (gint)h)); } - gtk_myfixed_position_children (myfixed); + gtk_pizza_position_children (pizza); /* We have to make sure that all exposes from this scroll get * processed before we scroll again, or the expose events will @@ -1127,16 +1091,16 @@ gtk_myfixed_scroll (GtkMyFixed *myfixed, gint dx, gint dy) */ gdk_flush(); - while (XCheckIfEvent(GDK_WINDOW_XDISPLAY (myfixed->bin_window), + while (XCheckIfEvent(GDK_WINDOW_XDISPLAY (pizza->bin_window), &xevent, - gtk_myfixed_expose_predicate, - (XPointer)&GDK_WINDOW_XWINDOW (myfixed->bin_window))) + gtk_pizza_expose_predicate, + (XPointer)&GDK_WINDOW_XWINDOW (pizza->bin_window))) { GdkEvent event; GtkWidget *event_widget; - if ((xevent.xany.window == GDK_WINDOW_XWINDOW (myfixed->bin_window)) && - (gtk_myfixed_filter (&xevent, &event, myfixed) == GDK_FILTER_REMOVE)) + if ((xevent.xany.window == GDK_WINDOW_XWINDOW (pizza->bin_window)) && + (gtk_pizza_filter (&xevent, &event, pizza) == GDK_FILTER_REMOVE)) continue; if (xevent.type == Expose) @@ -1173,27 +1137,27 @@ gtk_myfixed_scroll (GtkMyFixed *myfixed, gint dx, gint dy) * or not. */ static GdkFilterReturn -gtk_myfixed_filter (GdkXEvent *gdk_xevent, +gtk_pizza_filter (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) { XEvent *xevent; - GtkMyFixed *myfixed; + GtkPizza *pizza; xevent = (XEvent *)gdk_xevent; - myfixed = GTK_MYFIXED (data); + pizza = GTK_PIZZA (data); switch (xevent->type) { case Expose: - if (xevent->xexpose.serial == myfixed->configure_serial) + if (xevent->xexpose.serial == pizza->configure_serial) { - if (myfixed->visibility == GDK_VISIBILITY_UNOBSCURED) + if (pizza->visibility == GDK_VISIBILITY_UNOBSCURED) return GDK_FILTER_REMOVE; else { - xevent->xexpose.x += myfixed->scroll_x; - xevent->xexpose.y += myfixed->scroll_y; + xevent->xexpose.x += pizza->scroll_x; + xevent->xexpose.y += pizza->scroll_y; break; } @@ -1203,9 +1167,9 @@ gtk_myfixed_filter (GdkXEvent *gdk_xevent, case ConfigureNotify: if ((xevent->xconfigure.x != 0) || (xevent->xconfigure.y != 0)) { - myfixed->configure_serial = xevent->xconfigure.serial; - myfixed->scroll_x = xevent->xconfigure.x; - myfixed->scroll_y = xevent->xconfigure.y; + pizza->configure_serial = xevent->xconfigure.serial; + pizza->scroll_x = xevent->xconfigure.x; + pizza->scroll_y = xevent->xconfigure.y; } break; } @@ -1218,30 +1182,30 @@ gtk_myfixed_filter (GdkXEvent *gdk_xevent, * to get the events from a filter */ static GdkFilterReturn -gtk_myfixed_main_filter (GdkXEvent *gdk_xevent, +gtk_pizza_main_filter (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) { XEvent *xevent; - GtkMyFixed *myfixed; + GtkPizza *pizza; xevent = (XEvent *)gdk_xevent; - myfixed = GTK_MYFIXED (data); + pizza = GTK_PIZZA (data); if (xevent->type == VisibilityNotify) { switch (xevent->xvisibility.state) { case VisibilityFullyObscured: - myfixed->visibility = GDK_VISIBILITY_FULLY_OBSCURED; + pizza->visibility = GDK_VISIBILITY_FULLY_OBSCURED; break; case VisibilityPartiallyObscured: - myfixed->visibility = GDK_VISIBILITY_PARTIAL; + pizza->visibility = GDK_VISIBILITY_PARTIAL; break; case VisibilityUnobscured: - myfixed->visibility = GDK_VISIBILITY_UNOBSCURED; + pizza->visibility = GDK_VISIBILITY_UNOBSCURED; break; }