STYLE_SET,
ADD_ACCELERATOR,
REMOVE_ACCELERATOR,
+ GRAB_FOCUS,
EVENT,
BUTTON_PRESS_EVENT,
BUTTON_RELEASE_EVENT,
ARG_HEIGHT,
ARG_VISIBLE,
ARG_SENSITIVE,
+ ARG_APP_PAINTABLE,
ARG_CAN_FOCUS,
ARG_HAS_FOCUS,
ARG_CAN_DEFAULT,
ARG_HAS_DEFAULT,
+ ARG_RECEIVES_DEFAULT,
ARG_COMPOSITE_CHILD,
ARG_STYLE,
ARG_EVENTS,
GdkEventKey *event);
static void gtk_widget_style_set (GtkWidget *widget,
GtkStyle *previous_style);
+static void gtk_widget_real_grab_focus (GtkWidget *focus_widget);
+
+static void gtk_widget_redraw_queue_remove (GtkWidget *widget);
+
static GdkColormap* gtk_widget_peek_colormap (void);
static GdkVisual* gtk_widget_peek_visual (void);
gpointer client_data);
static void gtk_widget_propagate_state (GtkWidget *widget,
GtkStateData *data);
-static void gtk_widget_draw_children_recurse (GtkWidget *widget,
- gpointer client_data);
static void gtk_widget_set_style_internal (GtkWidget *widget,
GtkStyle *style,
gboolean initial_emission);
static const gchar *colormap_key = "gtk-colormap";
static const gchar *visual_key = "gtk-visual";
-
+static const gchar *rc_style_key = "gtk-rc-style";
+static guint rc_style_key_id = 0;
/*****************************************
* gtk_widget_get_type:
if (!widget_type)
{
- GtkTypeInfo widget_info =
+ static const GtkTypeInfo widget_info =
{
"GtkWidget",
sizeof (GtkWidget),
gtk_object_add_arg_type ("GtkWidget::height", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_HEIGHT);
gtk_object_add_arg_type ("GtkWidget::visible", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_VISIBLE);
gtk_object_add_arg_type ("GtkWidget::sensitive", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_SENSITIVE);
+ gtk_object_add_arg_type ("GtkWidget::app_paintable", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_APP_PAINTABLE);
gtk_object_add_arg_type ("GtkWidget::can_focus", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_CAN_FOCUS);
gtk_object_add_arg_type ("GtkWidget::has_focus", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_HAS_FOCUS);
gtk_object_add_arg_type ("GtkWidget::can_default", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_CAN_DEFAULT);
gtk_object_add_arg_type ("GtkWidget::has_default", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_HAS_DEFAULT);
+ gtk_object_add_arg_type ("GtkWidget::receives_default", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_RECEIVES_DEFAULT);
gtk_object_add_arg_type ("GtkWidget::composite_child", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_COMPOSITE_CHILD);
gtk_object_add_arg_type ("GtkWidget::style", GTK_TYPE_STYLE, GTK_ARG_READWRITE, ARG_STYLE);
gtk_object_add_arg_type ("GtkWidget::events", GTK_TYPE_GDK_EVENT_MASK, GTK_ARG_READWRITE, ARG_EVENTS);
widget_signals[REMOVE_ACCELERATOR] =
gtk_accel_group_create_remove (object_class->type, GTK_RUN_LAST,
GTK_SIGNAL_OFFSET (GtkWidgetClass, remove_accelerator));
+ widget_signals[GRAB_FOCUS] =
+ gtk_signal_new ("grab_focus",
+ GTK_RUN_LAST | GTK_RUN_ACTION,
+ object_class->type,
+ GTK_SIGNAL_OFFSET (GtkWidgetClass, grab_focus),
+ gtk_marshal_NONE__NONE,
+ GTK_TYPE_NONE, 0);
widget_signals[EVENT] =
gtk_signal_new ("event",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_get),
gtk_marshal_NONE__POINTER_UINT_UINT,
- GTK_TYPE_NONE, 2,
+ GTK_TYPE_NONE, 3,
GTK_TYPE_SELECTION_DATA,
GTK_TYPE_UINT,
GTK_TYPE_UINT);
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_received),
- gtk_marshal_NONE__POINTER_POINTER_UINT_UINT,
- GTK_TYPE_NONE, 4,
+ gtk_marshal_NONE__POINTER_INT_INT_POINTER_UINT_UINT,
+ GTK_TYPE_NONE, 6,
GTK_TYPE_GDK_DRAG_CONTEXT,
+ GTK_TYPE_INT,
+ GTK_TYPE_INT,
GTK_TYPE_SELECTION_DATA,
GTK_TYPE_UINT,
GTK_TYPE_UINT);
object_class->finalize = gtk_widget_finalize;
klass->activate_signal = 0;
+ klass->set_scroll_adjustments_signal = 0;
klass->show = gtk_widget_real_show;
klass->show_all = gtk_widget_show;
klass->hide = gtk_widget_real_hide;
klass->style_set = gtk_widget_style_set;
klass->add_accelerator = (void*) gtk_accel_group_handle_add;
klass->remove_accelerator = (void*) gtk_accel_group_handle_remove;
+ klass->grab_focus = gtk_widget_real_grab_focus;
klass->event = NULL;
klass->button_press_event = NULL;
klass->button_release_event = NULL;
case ARG_SENSITIVE:
gtk_widget_set_sensitive (widget, GTK_VALUE_BOOL (*arg));
break;
+ case ARG_APP_PAINTABLE:
+ gtk_widget_set_app_paintable (widget, GTK_VALUE_BOOL (*arg));
+ break;
case ARG_CAN_FOCUS:
saved_flags = GTK_WIDGET_FLAGS (widget);
if (GTK_VALUE_BOOL (*arg))
if (GTK_VALUE_BOOL (*arg))
gtk_widget_grab_default (widget);
break;
+ case ARG_RECEIVES_DEFAULT:
+ if (GTK_VALUE_BOOL (*arg))
+ GTK_WIDGET_SET_FLAGS (widget, GTK_RECEIVES_DEFAULT);
+ else
+ GTK_WIDGET_UNSET_FLAGS (widget, GTK_RECEIVES_DEFAULT);
+ break;
case ARG_COMPOSITE_CHILD:
if (GTK_VALUE_BOOL(*arg))
GTK_WIDGET_SET_FLAGS (widget, GTK_COMPOSITE_CHILD);
case ARG_SENSITIVE:
GTK_VALUE_BOOL (*arg) = (GTK_WIDGET_SENSITIVE (widget) != FALSE);
break;
+ case ARG_APP_PAINTABLE:
+ GTK_VALUE_BOOL (*arg) = (GTK_WIDGET_APP_PAINTABLE (widget) != FALSE);
+ break;
case ARG_CAN_FOCUS:
GTK_VALUE_BOOL (*arg) = (GTK_WIDGET_CAN_FOCUS (widget) != FALSE);
break;
case ARG_HAS_DEFAULT:
GTK_VALUE_BOOL (*arg) = (GTK_WIDGET_HAS_DEFAULT (widget) != FALSE);
break;
+ case ARG_RECEIVES_DEFAULT:
+ GTK_VALUE_BOOL (*arg) = (GTK_WIDGET_RECEIVES_DEFAULT (widget) != FALSE);
+ break;
case ARG_COMPOSITE_CHILD:
GTK_VALUE_BOOL (*arg) = (GTK_WIDGET_COMPOSITE_CHILD (widget) != FALSE);
break;
gtk_args_collect_cleanup (arg_list, info_list);
}
+ if (!GTK_OBJECT_CONSTRUCTED (object))
+ gtk_object_default_construct (object);
+
return GTK_WIDGET (object);
}
guint nargs,
GtkArg *args)
{
- g_return_val_if_fail (gtk_type_is_a (type, gtk_widget_get_type ()), NULL);
+ g_return_val_if_fail (gtk_type_is_a (type, GTK_TYPE_WIDGET), NULL);
return GTK_WIDGET (gtk_object_newv (type, nargs, args));
}
GtkArg *arg)
{
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (arg != NULL);
gtk_object_getv (GTK_OBJECT (widget), 1, arg);
guint nargs,
GtkArg *args)
{
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
gtk_object_getv (GTK_OBJECT (widget), nargs, args);
}
guint nargs,
GtkArg *args)
{
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
gtk_object_setv (GTK_OBJECT (widget), nargs, args);
}
-/*****************************************
- * gtk_widget_unparent:
- * do any cleanup necessary necessary
- * for setting parent = NULL.
- *
- * arguments:
- *
- * results:
- *****************************************/
+static inline void
+gtk_widget_queue_clear_child (GtkWidget *widget)
+{
+ GtkWidget *parent;
+
+ parent = widget->parent;
+ if (parent && GTK_WIDGET_DRAWABLE (parent))
+ gtk_widget_queue_clear_area (parent,
+ widget->allocation.x,
+ widget->allocation.y,
+ widget->allocation.width,
+ widget->allocation.height);
+}
void
gtk_widget_unparent (GtkWidget *widget)
GtkWidget *old_parent;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
if (widget->parent == NULL)
return;
* should eventually move into some gtk_window_unparent_branch() or
* similar function.
*/
+
toplevel = gtk_widget_get_toplevel (widget);
if (GTK_CONTAINER (widget->parent)->focus_child == widget)
{
gtk_window_set_default (GTK_WINDOW (toplevel), NULL);
}
+ if (GTK_WIDGET_REDRAW_PENDING (widget))
+ gtk_widget_redraw_queue_remove (widget);
+
if (GTK_IS_RESIZE_CONTAINER (widget))
gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
toplevel = toplevel->parent;
}
-
- if (widget->window &&
- GTK_WIDGET_NO_WINDOW (widget) &&
- GTK_WIDGET_DRAWABLE (widget))
- gdk_window_clear_area (widget->window,
- widget->allocation.x,
- widget->allocation.y,
- widget->allocation.width,
- widget->allocation.height);
+
+ gtk_widget_queue_clear_child (widget);
/* Reset the width and height here, to force reallocation if we
* get added back to a new parent. This won't work if our new
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_WIDGET (widget));
-
+ g_return_if_fail (GTK_OBJECT_CONSTRUCTED (widget));
+
gtk_object_destroy ((GtkObject*) widget);
}
gtk_widget_show (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
if (!GTK_WIDGET_VISIBLE (widget))
- gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SHOW]);
+ {
+ gtk_widget_queue_resize (widget);
+ gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SHOW]);
+ }
}
+static void
+gtk_widget_real_show (GtkWidget *widget)
+{
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
+ if (!GTK_WIDGET_VISIBLE (widget))
+ {
+ GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
+
+ if (widget->parent && GTK_WIDGET_MAPPED (widget->parent))
+ gtk_widget_map (widget);
+ }
+}
/*************************************************************
* gtk_widget_show_now:
{
gint flag = FALSE;
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
/* make sure we will get event */
if (!GTK_WIDGET_MAPPED (widget) &&
GTK_WIDGET_TOPLEVEL (widget))
g_return_if_fail (GTK_IS_WIDGET (widget));
if (GTK_WIDGET_VISIBLE (widget))
- gtk_signal_emit (GTK_OBJECT (widget), widget_signals[HIDE]);
+ {
+ gtk_signal_emit (GTK_OBJECT (widget), widget_signals[HIDE]);
+ gtk_widget_queue_resize (widget);
+ }
+}
+
+static void
+gtk_widget_real_hide (GtkWidget *widget)
+{
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
+ if (GTK_WIDGET_VISIBLE (widget))
+ {
+ GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
+
+ if (GTK_WIDGET_MAPPED (widget))
+ gtk_widget_unmap (widget);
+ }
}
gint
gtk_widget_map (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
if (!GTK_WIDGET_MAPPED (widget))
{
if (!GTK_WIDGET_REALIZED (widget))
gtk_widget_realize (widget);
-
+
gtk_signal_emit (GTK_OBJECT (widget), widget_signals[MAP]);
+
+ if (GTK_WIDGET_NO_WINDOW (widget))
+ gtk_widget_queue_draw (widget);
}
}
gtk_widget_unmap (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
if (GTK_WIDGET_MAPPED (widget))
- gtk_signal_emit (GTK_OBJECT (widget), widget_signals[UNMAP]);
+ {
+ if (GTK_WIDGET_NO_WINDOW (widget))
+ gtk_widget_queue_clear_child (widget);
+ gtk_signal_emit (GTK_OBJECT (widget), widget_signals[UNMAP]);
+ }
}
/*****************************************
GtkWidgetShapeInfo *shape_info;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
if (!GTK_WIDGET_REALIZED (widget))
{
gtk_widget_unrealize (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
-
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
if (GTK_WIDGET_REDRAW_PENDING (widget))
- {
- gtk_widget_redraw_queue = g_slist_remove (gtk_widget_redraw_queue, widget);
- GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_PENDING);
- }
+ gtk_widget_redraw_queue_remove (widget);
if (GTK_WIDGET_HAS_SHAPE_MASK (widget))
gtk_widget_shape_combine_mask (widget, NULL, -1, -1);
* results:
*****************************************/
-static gint
-gtk_widget_idle_draw (gpointer data)
+typedef struct _GtkDrawData GtkDrawData;
+struct _GtkDrawData {
+ GdkRectangle rect;
+ GdkWindow *window;
+};
+
+static GMemChunk *draw_data_mem_chunk = NULL;
+static GSList *draw_data_free_list = NULL;
+static const gchar *draw_data_key = "gtk-draw-data";
+static GQuark draw_data_key_id = 0;
+static const gchar *draw_data_tmp_key = "gtk-draw-data-tmp";
+static GQuark draw_data_tmp_key_id = 0;
+
+static gint gtk_widget_idle_draw (gpointer data);
+
+static void
+gtk_widget_queue_draw_data (GtkWidget *widget,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ GdkWindow *window)
{
- while (gtk_widget_redraw_queue)
- gtk_widget_draw (gtk_widget_redraw_queue->data, NULL);
+ GSList *node;
+ GtkDrawData *data;
+
+ g_return_if_fail (widget != NULL);
- return FALSE;
+ if ((width != 0) && (height != 0) && GTK_WIDGET_DRAWABLE (widget))
+ {
+ if (!draw_data_key_id)
+ draw_data_key_id = g_quark_from_static_string (draw_data_key);
+
+ if (draw_data_free_list)
+ {
+ node = draw_data_free_list;
+ data = node->data;
+ draw_data_free_list = draw_data_free_list->next;
+ }
+ else
+ {
+ if (!draw_data_mem_chunk)
+ draw_data_mem_chunk = g_mem_chunk_create (GtkDrawData, 64,
+ G_ALLOC_ONLY);
+ data = g_chunk_new (GtkDrawData, draw_data_mem_chunk);
+ node = g_slist_alloc();
+ node->data = data;
+ }
+
+ data->rect.x = x;
+ data->rect.y = y;
+
+ if ((width < 0) || (height < 0))
+ {
+ data->rect.width = 0;
+ data->rect.height = 0;
+ }
+ else
+ {
+ data->rect.width = width;
+ data->rect.height = height;
+ }
+ data->window = window;
+
+ if ((width < 0) || (height < 0))
+ {
+ GSList *draw_data_list =
+ gtk_object_get_data_by_id (GTK_OBJECT (widget),
+ draw_data_key_id);
+ if (draw_data_list)
+ draw_data_free_list = g_slist_concat (draw_data_list,
+ draw_data_free_list);
+ node->next = NULL;
+ }
+ else
+ node->next = gtk_object_get_data_by_id (GTK_OBJECT (widget),
+ draw_data_key_id);
+
+ if (!GTK_WIDGET_REDRAW_PENDING (widget))
+ {
+ GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_PENDING);
+ if (gtk_widget_redraw_queue == NULL)
+ gtk_idle_add_priority (GTK_PRIORITY_REDRAW,
+ gtk_widget_idle_draw,
+ NULL);
+ gtk_widget_redraw_queue = g_slist_prepend (gtk_widget_redraw_queue, widget);
+ }
+
+ gtk_object_set_data_by_id (GTK_OBJECT (widget), draw_data_key_id, node);
+ }
}
-void
+void
+gtk_widget_queue_draw_area (GtkWidget *widget,
+ gint x,
+ gint y,
+ gint width,
+ gint height)
+{
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
+ if (widget->window && gdk_window_is_viewable (widget->window))
+ gtk_widget_queue_draw_data (widget, x, y, width, height, NULL);
+}
+
+void
gtk_widget_queue_draw (GtkWidget *widget)
+{
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
+ if (widget->window && gdk_window_is_viewable (widget->window))
+ gtk_widget_queue_draw_data (widget, 0, 0, -1, -1, NULL);
+}
+
+void
+gtk_widget_queue_clear_area (GtkWidget *widget,
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
GtkWidget *parent;
g_return_if_fail (widget != NULL);
-
- if (GTK_WIDGET_DRAWABLE (widget))
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
+ if (!(widget->window && gdk_window_is_viewable (widget->window)))
+ return;
+
+ /* Find the correct widget */
+
+ if (GTK_WIDGET_NO_WINDOW (widget))
{
- /* We queue the redraw if:
- * a) the widget is not already queued for redraw and
- * b) non of the widgets ancestors are queued for redraw.
- */
parent = widget;
- while (parent)
+ while (parent && GTK_WIDGET_NO_WINDOW (parent))
+ parent = parent->parent;
+
+ if (parent)
+ gtk_widget_queue_draw_data (parent, x, y, width, height, widget->window);
+ }
+ else
+ {
+ gint wx, wy, wwidth, wheight;
+ /* Translate widget relative to window-relative */
+
+ gdk_window_get_position (widget->window, &wx, &wy);
+ x -= wx - widget->allocation.x;
+ y -= wy - widget->allocation.y;
+
+ gdk_window_get_size (widget->window, &wwidth, &wheight);
+
+ if (x < 0)
{
- if (GTK_WIDGET_REDRAW_PENDING (parent))
- return;
- parent = parent->parent;
+ width += x; x = 0;
}
+ if (y < 0)
+ {
+ height += y; y = 0;
+ }
+ if (x + width > wwidth)
+ width = wwidth - x;
+ if (y + height > wheight)
+ height = wheight - y;
+
+ gtk_widget_queue_draw_data (widget, x, y, width, height, NULL);
+ }
+}
+
+static void
+gtk_widget_redraw_queue_remove (GtkWidget *widget)
+{
+ GSList *draw_data_list;
+ GSList *tmp_list;
+
+ g_return_if_fail (GTK_WIDGET_REDRAW_PENDING (widget));
+
+ gtk_widget_redraw_queue = g_slist_remove (gtk_widget_redraw_queue, widget);
+
+ draw_data_list = gtk_object_get_data_by_id (GTK_OBJECT (widget),
+ draw_data_key_id);
+ tmp_list = g_slist_last (draw_data_list);
+ if (tmp_list)
+ {
+ tmp_list->next = draw_data_free_list;
+ draw_data_free_list = draw_data_list;
+ }
+
+ gtk_object_set_data_by_id (GTK_OBJECT (widget),
+ draw_data_key_id,
+ NULL);
+
+ GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_PENDING);
+}
+
+void
+gtk_widget_queue_clear (GtkWidget *widget)
+{
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
+ if (widget->allocation.width || widget->allocation.height)
+ {
+ if (GTK_WIDGET_NO_WINDOW (widget))
+ gtk_widget_queue_clear_area (widget, widget->allocation.x,
+ widget->allocation.y,
+ widget->allocation.width,
+ widget->allocation.height);
+ else
+ gtk_widget_queue_clear_area (widget, 0, 0,
+ widget->allocation.width,
+ widget->allocation.height);
+ }
+}
+
+static gint
+gtk_widget_draw_data_combine (GtkDrawData *parent, GtkDrawData *child)
+{
+ gint parent_x2, parent_y2;
+ gint child_x2, child_y2;
+
+ /* Check for intersection */
+
+ parent_x2 = parent->rect.x + parent->rect.width;
+ child_x2 = child->rect.x + child->rect.width;
+ parent_y2 = parent->rect.y + parent->rect.height;
+ child_y2 = child->rect.y + child->rect.height;
+
+ if ((child->rect.x > parent_x2) || (parent->rect.x > child_x2) ||
+ (child->rect.y > parent_y2) || (parent->rect.y > child_y2))
+ return FALSE;
+ else
+ {
+ parent->rect.x = MIN (parent->rect.x, child->rect.x);
+ parent->rect.y = MIN (parent->rect.y, child->rect.y);
+ parent->rect.width = MAX (parent_x2, child_x2) - parent->rect.x;
+ parent->rect.height = MAX (parent_y2, child_y2) - parent->rect.y;
+ }
+
+ return TRUE;
+}
+
+/* Take a rectangle with respect to window, and translate it
+ * to coordinates relative to widget's allocation, clipping through
+ * intermediate windows. Returns whether translation failed. If the
+ * translation failed, we have something like a handlebox, where
+ * the child widget's GdkWindow is not a child of the parents GdkWindow.
+ */
+static gboolean
+gtk_widget_clip_rect (GtkWidget *widget,
+ GdkWindow *window,
+ GdkRectangle *rect,
+ gint *x_offset,
+ gint *y_offset)
+{
+ gint x,y, width, height;
+
+ while (window && (window != widget->window))
+ {
+ gdk_window_get_position (window, &x, &y);
+ rect->x += x;
+ if (x_offset)
+ *x_offset += x;
+ rect->y += y;
+ if (y_offset)
+ *y_offset += y;
- GTK_PRIVATE_SET_FLAG (widget, GTK_REDRAW_PENDING);
- if (gtk_widget_redraw_queue == NULL)
- gtk_idle_add_priority (GTK_PRIORITY_INTERNAL,
- gtk_widget_idle_draw,
- NULL);
+ window = gdk_window_get_parent (window);
+ if (!window)
+ return FALSE;
- gtk_widget_redraw_queue = g_slist_prepend (gtk_widget_redraw_queue, widget);
+ gdk_window_get_size (window, &width, &height);
+
+ if (rect->x < 0)
+ {
+ rect->width = (rect->width > -rect->x) ? rect->width + rect->x : 0;
+ rect->x = 0;
+ }
+ if (rect->y < 0)
+ {
+ rect->height = (rect->height > -rect->y) ? rect->width + rect->y : 0;
+ rect->y = 0;
+ }
+ if (rect->x + rect->width > width)
+ rect->width = (width > rect->x) ? width - rect->x : 0;
+ if (rect->y + rect->height > height)
+ rect->height = (height > rect->y) ? height - rect->y : 0;
}
+
+ if (!window)
+ return FALSE;
+
+ if (!GTK_WIDGET_NO_WINDOW (widget))
+ {
+ if (gdk_window_get_toplevel (window) != window)
+ {
+ gdk_window_get_position (window, &x, &y);
+ rect->x += x - widget->allocation.x;
+ if (x_offset)
+ *x_offset += x - widget->allocation.x;
+ rect->y += y - widget->allocation.y;
+ if (y_offset)
+ *y_offset += y - widget->allocation.y;
+ }
+ }
+
+ return TRUE;
+}
+
+static gint
+gtk_widget_idle_draw (gpointer cb_data)
+{
+ GSList *widget_list;
+ GSList *old_queue;
+ GSList *draw_data_list;
+ GtkWidget *widget;
+
+ if (!draw_data_tmp_key_id)
+ draw_data_tmp_key_id = g_quark_from_static_string (draw_data_tmp_key);
+
+ GDK_THREADS_ENTER ();
+
+ old_queue = gtk_widget_redraw_queue;
+ gtk_widget_redraw_queue = NULL;
+
+ /* Translate all draw requests to be allocation-relative.
+ * At the same time, move all the data out of the way,
+ * so when we get down to the draw step, we can queue
+ * more information for "next time", if the application
+ * is that foolhardy.
+ */
+ widget_list = old_queue;
+
+ while (widget_list)
+ {
+ widget = widget_list->data;
+ draw_data_list = gtk_object_get_data_by_id (GTK_OBJECT (widget),
+ draw_data_key_id);
+ gtk_object_set_data_by_id (GTK_OBJECT (widget),
+ draw_data_key_id,
+ NULL);
+ gtk_object_set_data_by_id (GTK_OBJECT (widget),
+ draw_data_tmp_key_id,
+ draw_data_list);
+
+ /* XXX: Since we are unsetting this flag here, further
+ * down the only way we can check if a redraw is queued
+ * on a given widget is by calling gtk_object_get_data.
+ * for speed purposes we might well want a private
+ * flag GTK_REDRAW_PROCESSING or something.
+ */
+ GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_PENDING);
+
+ while (draw_data_list)
+ {
+ gboolean full_allocation = FALSE;
+ GtkDrawData *data = draw_data_list->data;
+
+ if (data->window)
+ {
+ /* If the translation fails, we have a handlebox,
+ * so redraw the whole widget. Could be done better?
+ */
+ full_allocation = !gtk_widget_clip_rect (widget,
+ data->window,
+ &data->rect,
+ NULL, NULL);
+ data->window = NULL;
+ }
+ else
+ {
+ if ((data->rect.width == 0) && (data->rect.height == 0))
+ {
+ if (GTK_WIDGET_NO_WINDOW (widget))
+ {
+ data->rect.x = widget->allocation.x;
+ data->rect.y = widget->allocation.y;
+ }
+ else
+ {
+ data->rect.x = 0;
+ data->rect.y = 0;
+ }
+ data->rect.width = widget->allocation.width;
+ data->rect.height = widget->allocation.height;
+ }
+ }
+
+ draw_data_list = draw_data_list->next;
+ }
+
+ widget_list = widget_list->next;
+ }
+
+ /* Coalesce redraws.
+ */
+ widget_list = old_queue;
+ while (widget_list)
+ {
+ GSList *prev_node = NULL;
+ widget = widget_list->data;
+ draw_data_list = gtk_object_get_data_by_id (GTK_OBJECT (widget),
+ draw_data_tmp_key_id);
+
+ while (draw_data_list)
+ {
+ gint x_offset, y_offset;
+ GtkDrawData *data = draw_data_list->data;
+ GSList *parent_list = draw_data_list->next;
+ GtkWidget *parent;
+ GdkWindow *window;
+
+ x_offset = 0;
+ y_offset = 0;
+
+ parent = widget;
+ while (parent)
+ {
+ while (parent_list)
+ {
+ if (gtk_widget_draw_data_combine (parent_list->data, data))
+ {
+ GSList *tmp;
+ if (prev_node)
+ prev_node->next = draw_data_list->next;
+ else
+ gtk_object_set_data_by_id (GTK_OBJECT (widget),
+ draw_data_tmp_key_id,
+ draw_data_list->next);
+
+ tmp = draw_data_list->next;
+ draw_data_list->next = draw_data_free_list;
+ draw_data_free_list = draw_data_list;
+ draw_data_list = tmp;
+
+ goto next_rect;
+ }
+
+ parent_list = parent_list->next;
+ }
+
+ window = parent->window;
+
+ if (parent->parent && parent->parent->window != window)
+ {
+ if (!GTK_WIDGET_NO_WINDOW (parent))
+ {
+ gint x, y;
+ gdk_window_get_position (window, &x, &y);
+ data->rect.x -= x - parent->allocation.x;
+ x_offset -= x - parent->allocation.x;
+ data->rect.y -= y - parent->allocation.y;
+ y_offset -= y - parent->allocation.y;
+ }
+ /* If we can't translate the rectangle, stop trying to
+ * merge. (This occurs for a handlebox)
+ */
+ if (!gtk_widget_clip_rect (parent->parent, window, &data->rect,
+ &x_offset, &y_offset))
+ parent = NULL;
+ }
+
+ if (parent)
+ parent = parent->parent;
+
+ if (parent)
+ parent_list = gtk_object_get_data_by_id (GTK_OBJECT (parent),
+ draw_data_tmp_key_id);
+ else
+ parent_list = NULL;
+ }
+
+ /* OK, this rectangle stays around. But take advantage
+ * of the work we've done to clip it to the visible area -
+ * rect.width/height have already been appropriately
+ * decreased
+ */
+ data->rect.x -= x_offset;
+ data->rect.y -= y_offset;
+
+
+ prev_node = draw_data_list;
+
+ draw_data_list = draw_data_list->next;
+ next_rect:
+ continue;
+ }
+ widget_list = widget_list->next;
+ }
+
+ /* Process the draws */
+
+ widget_list = old_queue;
+
+ while (widget_list)
+ {
+ widget = widget_list->data;
+ draw_data_list = gtk_object_get_data_by_id (GTK_OBJECT (widget),
+ draw_data_tmp_key_id);
+ gtk_object_set_data_by_id (GTK_OBJECT (widget),
+ draw_data_tmp_key_id,
+ NULL);
+
+ while (draw_data_list)
+ {
+ GtkDrawData *data = draw_data_list->data;
+ if ((data->rect.width != 0) || (data->rect.height != 0))
+ gtk_widget_draw (widget, &data->rect);
+
+ if (draw_data_list->next)
+ draw_data_list = draw_data_list->next;
+ else
+ {
+ draw_data_list->next = draw_data_free_list;
+ draw_data_free_list = draw_data_list;
+ break;
+ }
+ }
+
+ widget_list = widget_list->next;
+ }
+
+ g_slist_free (old_queue);
+
+ GDK_THREADS_LEAVE ();
+
+ return FALSE;
}
void
if (GTK_IS_RESIZE_CONTAINER (widget))
gtk_container_clear_resize_widgets (GTK_CONTAINER (widget));
+ if (GTK_WIDGET_DRAWABLE (widget))
+ gtk_widget_queue_clear (widget);
+
if (widget->parent)
gtk_container_queue_resize (GTK_CONTAINER (widget->parent));
else if (GTK_WIDGET_TOPLEVEL (widget))
GdkRectangle temp_area;
g_return_if_fail (widget != NULL);
-
- if (GTK_WIDGET_REDRAW_PENDING (widget))
- {
- gtk_widget_redraw_queue = g_slist_remove (gtk_widget_redraw_queue, widget);
- GTK_PRIVATE_UNSET_FLAG (widget, GTK_REDRAW_PENDING);
-
- area = NULL;
- }
+ g_return_if_fail (GTK_IS_WIDGET (widget));
if (GTK_WIDGET_DRAWABLE (widget))
{
gtk_widget_draw_focus (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
gtk_signal_emit (GTK_OBJECT (widget), widget_signals[DRAW_FOCUS]);
}
gtk_widget_draw_default (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
gtk_signal_emit (GTK_OBJECT (widget), widget_signals[DRAW_DEFAULT]);
}
-/*****************************************
- * gtk_widget_draw_children:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-void
-gtk_widget_draw_children (GtkWidget *widget)
-{
- g_return_if_fail (widget != NULL);
-
- if (GTK_IS_CONTAINER (widget))
- gtk_container_forall (GTK_CONTAINER (widget),
- gtk_widget_draw_children_recurse,
- NULL);
-}
-
/*****************************************
* gtk_widget_size_request:
*
GtkWidgetAuxInfo *aux_info;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
gtk_widget_ref (widget);
gtk_widget_ensure_style (widget);
{
GtkWidgetAuxInfo *aux_info;
GtkAllocation real_allocation;
+ gboolean needs_draw = FALSE;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
real_allocation = *allocation;
aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
real_allocation.y = aux_info->y;
}
+ if (GTK_WIDGET_NO_WINDOW (widget))
+ {
+ if (widget->allocation.x != real_allocation.x ||
+ widget->allocation.y != real_allocation.y ||
+ widget->allocation.width != real_allocation.width ||
+ widget->allocation.height != real_allocation.height)
+ {
+ gtk_widget_queue_clear_child (widget);
+ needs_draw = TRUE;
+ }
+ }
+ else if (widget->allocation.width != real_allocation.width ||
+ widget->allocation.height != real_allocation.height)
+ {
+ needs_draw = TRUE;
+ }
+
gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SIZE_ALLOCATE], &real_allocation);
+
+ if (needs_draw)
+ gtk_widget_queue_draw (widget);
+}
+
+static void
+gtk_widget_real_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
+ widget->allocation = *allocation;
+
+ if (GTK_WIDGET_REALIZED (widget) &&
+ !GTK_WIDGET_NO_WINDOW (widget))
+ {
+ gdk_window_move_resize (widget->window,
+ allocation->x, allocation->y,
+ allocation->width, allocation->height);
+ }
}
static void
}
void
-gtk_widget_freeze_accelerators (GtkWidget *widget)
+gtk_widget_lock_accelerators (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_WIDGET (widget));
}
void
-gtk_widget_thaw_accelerators (GtkWidget *widget)
+gtk_widget_unlock_accelerators (GtkWidget *widget)
{
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_WIDGET (widget));
gint signal_num;
g_return_val_if_fail (widget != NULL, TRUE);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), TRUE);
gtk_widget_ref (widget);
return_val = FALSE;
signal_num = CLIENT_EVENT;
break;
case GDK_EXPOSE:
- /* there is no sense in providing a widget with bogus expose events
+ /* there is no sense in providing a widget with bogus expose events.
*/
if (!event->any.window)
{
* results:
*****************************************/
-void
+gboolean
gtk_widget_activate (GtkWidget *widget)
{
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_WIDGET (widget));
+ g_return_val_if_fail (widget != NULL, FALSE);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
if (WIDGET_CLASS (widget)->activate_signal)
- gtk_signal_emit (GTK_OBJECT (widget), WIDGET_CLASS (widget)->activate_signal);
+ {
+ /* FIXME: we should eventually check the signals signature here */
+ gtk_signal_emit (GTK_OBJECT (widget), WIDGET_CLASS (widget)->activate_signal);
+
+ return TRUE;
+ }
+ else
+ return FALSE;
+}
+
+gboolean
+gtk_widget_set_scroll_adjustments (GtkWidget *widget,
+ GtkAdjustment *hadjustment,
+ GtkAdjustment *vadjustment)
+{
+ g_return_val_if_fail (widget != NULL, FALSE);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+ if (hadjustment)
+ g_return_val_if_fail (GTK_IS_ADJUSTMENT (hadjustment), FALSE);
+ if (vadjustment)
+ g_return_val_if_fail (GTK_IS_ADJUSTMENT (vadjustment), FALSE);
+
+ if (WIDGET_CLASS (widget)->set_scroll_adjustments_signal)
+ {
+ /* FIXME: we should eventually check the signals signature here */
+ gtk_signal_emit (GTK_OBJECT (widget),
+ WIDGET_CLASS (widget)->set_scroll_adjustments_signal,
+ hadjustment, vadjustment);
+ return TRUE;
+ }
+ else
+ return FALSE;
}
/*****************************************
*****************************************/
static void
-gtk_widget_reparent_container_child(GtkWidget *widget,
- gpointer client_data)
+gtk_widget_reparent_container_child (GtkWidget *widget,
+ gpointer client_data)
{
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (client_data != NULL);
if (GTK_WIDGET_NO_WINDOW (widget))
gint y)
{
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
if (!GTK_WIDGET_VISIBLE (widget))
{
gint return_val;
g_return_val_if_fail (widget != NULL, FALSE);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
g_return_val_if_fail (area != NULL, FALSE);
if (intersection)
if (return_val && intersection && !GTK_WIDGET_NO_WINDOW (widget))
{
- intersection->x -= widget->allocation.x;
- intersection->y -= widget->allocation.y;
- }
-
- return return_val;
-}
-
-
-gint
-gtk_widget_basic (GtkWidget *widget)
-{
- GList *children;
- GList *tmp_list;
- gint return_val;
-
- g_return_val_if_fail (widget != NULL, FALSE);
-
- if (!GTK_WIDGET_BASIC (widget))
- return FALSE;
- else if (GTK_IS_CONTAINER (widget))
- {
- children = gtk_container_children (GTK_CONTAINER (widget));
- if (children)
- {
- return_val = TRUE;
- tmp_list = children;
-
- while (tmp_list)
- {
- if (!gtk_widget_basic (GTK_WIDGET (tmp_list->data)))
- {
- return_val = FALSE;
- break;
- }
-
- tmp_list = tmp_list->next;
- }
-
- g_list_free (children);
- return return_val;
- }
+ intersection->x -= widget->allocation.x;
+ intersection->y -= widget->allocation.y;
}
- return TRUE;
+ return return_val;
}
-
/*****************************************
* gtk_widget_grab_focus:
*
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_WIDGET (widget));
- if (GTK_WIDGET_CAN_FOCUS (widget))
+ gtk_signal_emit (GTK_OBJECT (widget), widget_signals[GRAB_FOCUS]);
+}
+
+static void
+reset_focus_recurse (GtkWidget *widget,
+ gpointer data)
+{
+ if (GTK_IS_CONTAINER (widget))
{
- GtkWidget *parent;
- GtkWidget *child;
- GtkType window_type;
-
- window_type = gtk_window_get_type ();
- parent = widget->parent;
- child = widget;
+ GtkContainer *container;
+
+ container = GTK_CONTAINER (widget);
+ gtk_container_set_focus_child (container, NULL);
+
+ gtk_container_foreach (container,
+ reset_focus_recurse,
+ NULL);
+ }
+}
+
+static void
+gtk_widget_real_grab_focus (GtkWidget *focus_widget)
+{
+ g_return_if_fail (focus_widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (focus_widget));
+
+ if (GTK_WIDGET_CAN_FOCUS (focus_widget))
+ {
+ GtkWidget *toplevel;
+ GtkWidget *widget;
- while (parent && !gtk_type_is_a (GTK_WIDGET_TYPE (parent), window_type))
+ /* clear the current focus setting, break if the current widget
+ * is the focus widget's parent, since containers above that will
+ * be set by the next loop.
+ */
+ toplevel = gtk_widget_get_toplevel (focus_widget);
+ if (GTK_IS_WINDOW (toplevel))
{
- gtk_container_set_focus_child (GTK_CONTAINER (parent), child);
- child = parent;
- parent = parent->parent;
+ widget = GTK_WINDOW (toplevel)->focus_widget;
+
+ if (widget == focus_widget)
+ return;
+
+ if (widget)
+ {
+ while (widget->parent && widget->parent != focus_widget->parent)
+ {
+ widget = widget->parent;
+ gtk_container_set_focus_child (GTK_CONTAINER (widget), NULL);
+ }
+ }
}
-
- if (parent && gtk_type_is_a (GTK_WIDGET_TYPE (parent), window_type))
+ else if (toplevel != focus_widget)
{
- gtk_container_set_focus_child (GTK_CONTAINER (parent), child);
- gtk_window_set_focus (GTK_WINDOW (parent), widget);
+ /* gtk_widget_grab_focus() operates on a tree without window...
+ * actually, this is very questionable behaviour.
+ */
+
+ gtk_container_foreach (GTK_CONTAINER (toplevel),
+ reset_focus_recurse,
+ NULL);
+ }
+
+ /* now propagate the new focus up the widget tree and finally
+ * set it on the window
+ */
+ widget = focus_widget;
+ while (widget->parent)
+ {
+ gtk_container_set_focus_child (GTK_CONTAINER (widget->parent), widget);
+ widget = widget->parent;
}
+ if (GTK_IS_WINDOW (widget))
+ gtk_window_set_focus (GTK_WINDOW (widget), focus_widget);
}
}
GtkType window_type;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (GTK_WIDGET_CAN_DEFAULT (widget));
window_type = gtk_window_get_type ();
const gchar *name)
{
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
if (widget->name)
g_free (widget->name);
gtk_widget_get_name (GtkWidget *widget)
{
g_return_val_if_fail (widget != NULL, NULL);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
if (widget->name)
return widget->name;
data.parent_sensitive = TRUE;
gtk_widget_propagate_state (widget, &data);
- gtk_widget_queue_draw (widget);
+
+ if (GTK_WIDGET_DRAWABLE (widget))
+ gtk_widget_queue_clear (widget);
+ }
+}
+
+void
+gtk_widget_set_app_paintable (GtkWidget *widget,
+ gboolean app_paintable)
+{
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
+ app_paintable = (app_paintable != FALSE);
+
+ if (GTK_WIDGET_APP_PAINTABLE (widget) != app_paintable)
+ {
+ if (app_paintable)
+ GTK_WIDGET_SET_FLAGS (widget, GTK_APP_PAINTABLE);
+ else
+ GTK_WIDGET_UNSET_FLAGS (widget, GTK_APP_PAINTABLE);
+
+ if (GTK_WIDGET_DRAWABLE (widget))
+ gtk_widget_queue_clear (widget);
}
}
data.parent_sensitive = TRUE;
gtk_widget_propagate_state (widget, &data);
- gtk_widget_queue_draw (widget);
+ if (GTK_WIDGET_DRAWABLE (widget))
+ gtk_widget_queue_clear (widget);
}
/*****************************************
GtkStateData data;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (widget->parent == NULL);
g_return_if_fail (!GTK_WIDGET_TOPLEVEL (widget));
g_return_if_fail (parent != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (parent));
g_return_if_fail (widget != parent);
/* keep this function in sync with gtk_menu_attach_to_widget()
gboolean initial_emission;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (style != NULL);
initial_emission = !GTK_WIDGET_RC_STYLE (widget) && !GTK_WIDGET_USER_STYLE (widget);
void
gtk_widget_ensure_style (GtkWidget *widget)
{
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
if (!GTK_WIDGET_USER_STYLE (widget) &&
!GTK_WIDGET_RC_STYLE (widget))
gtk_widget_set_rc_style (widget);
gboolean initial_emission;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
initial_emission = !GTK_WIDGET_RC_STYLE (widget) && !GTK_WIDGET_USER_STYLE (widget);
GtkStyle *default_style;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
GTK_PRIVATE_UNSET_FLAG (widget, GTK_USER_STYLE);
gtk_widget_get_style (GtkWidget *widget)
{
g_return_val_if_fail (widget != NULL, NULL);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
return widget->style;
}
+void
+gtk_widget_modify_style (GtkWidget *widget,
+ GtkRcStyle *style)
+{
+ GtkRcStyle *old_style;
+
+ if (!rc_style_key_id)
+ rc_style_key_id = g_quark_from_static_string (rc_style_key);
+
+ old_style = gtk_object_get_data_by_id (GTK_OBJECT (widget), rc_style_key_id);
+
+ if (style != old_style)
+ gtk_object_set_data_by_id_full (GTK_OBJECT (widget),
+ rc_style_key_id,
+ style,
+ (GtkDestroyNotify)gtk_rc_style_unref);
+}
+
static void
gtk_widget_style_set (GtkWidget *widget,
GtkStyle *previous_style)
gboolean initial_emission)
{
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (style != NULL);
if (widget->style != style)
GtkStyle *previous_style;
if (GTK_WIDGET_REALIZED (widget))
- gtk_style_detach (widget->style);
+ {
+ gtk_widget_reset_shapes (widget);
+ gtk_style_detach (widget->style);
+ }
previous_style = widget->style;
widget->style = style;
(old_requisition.height != widget->requisition.height))
gtk_widget_queue_resize (widget);
else if (GTK_WIDGET_DRAWABLE (widget))
- gtk_widget_queue_draw (widget);
+ gtk_widget_queue_clear (widget);
}
}
else if (initial_emission)
void
gtk_widget_reset_rc_styles (GtkWidget *widget)
{
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+
gtk_widget_set_style_recurse (widget, NULL);
}
void
gtk_widget_set_default_style (GtkStyle *style)
{
- if (style != gtk_default_style)
+ if (style != gtk_default_style)
{
if (gtk_default_style)
gtk_style_unref (gtk_default_style);
GdkWindow *old_parent_window;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
old_parent_window = gtk_object_get_data_by_id (GTK_OBJECT (widget),
parent_window_key_id);
GtkWidgetAuxInfo *aux_info;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
if (!aux_info)
GtkWidgetAuxInfo *aux_info;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
aux_info = gtk_object_get_data_by_id (GTK_OBJECT (widget), aux_info_key_id);
if (!aux_info)
gint *eventp;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (!GTK_WIDGET_NO_WINDOW (widget));
g_return_if_fail (!GTK_WIDGET_REALIZED (widget));
gint *eventp;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (!GTK_WIDGET_NO_WINDOW (widget));
eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), event_key_id);
GdkExtensionMode *modep;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
modep = gtk_object_get_data_by_id (GTK_OBJECT (widget), extension_event_key_id);
gtk_widget_get_toplevel (GtkWidget *widget)
{
g_return_val_if_fail (widget != NULL, NULL);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
while (widget->parent)
widget = widget->parent;
GtkType widget_type)
{
g_return_val_if_fail (widget != NULL, NULL);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
while (widget && !gtk_type_is_a (GTK_WIDGET_TYPE (widget), widget_type))
widget = widget->parent;
GdkColormap *colormap;
g_return_val_if_fail (widget != NULL, NULL);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
if (widget->window)
{
GdkVisual *visual;
g_return_val_if_fail (widget != NULL, NULL);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
if (widget->window)
{
gint *events;
g_return_val_if_fail (widget != NULL, 0);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
events = gtk_object_get_data_by_id (GTK_OBJECT (widget), event_key_id);
if (events)
GdkExtensionMode *mode;
g_return_val_if_fail (widget != NULL, 0);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
mode = gtk_object_get_data_by_id (GTK_OBJECT (widget), extension_event_key_id);
if (mode)
gint *y)
{
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
if (x)
*x = -1;
GtkWidget *ancestor)
{
g_return_val_if_fail (widget != NULL, FALSE);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
g_return_val_if_fail (ancestor != NULL, FALSE);
while (widget)
return FALSE;
}
-/*****************************************
- * gtk_widget_is_child:
- *
- * arguments:
- *
- * results:
- *****************************************/
+static GQuark quark_composite_name = 0;
-gint
-gtk_widget_is_child (GtkWidget *widget,
- GtkWidget *child)
+void
+gtk_widget_set_composite_name (GtkWidget *widget,
+ gchar *name)
{
- g_return_val_if_fail (widget != NULL, FALSE);
- g_return_val_if_fail (child != NULL, FALSE);
-
- return (child->parent == widget);
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+ g_return_if_fail (GTK_WIDGET_COMPOSITE_CHILD (widget));
+ g_return_if_fail (name != NULL);
+
+ if (!quark_composite_name)
+ quark_composite_name = g_quark_from_static_string ("gtk-composite-name");
+
+ gtk_object_set_data_by_id_full (GTK_OBJECT (widget),
+ quark_composite_name,
+ g_strdup (name),
+ g_free);
+}
+
+gchar*
+gtk_widget_get_composite_name (GtkWidget *widget)
+{
+ g_return_val_if_fail (widget != NULL, NULL);
+ g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+
+ if (GTK_WIDGET_COMPOSITE_CHILD (widget) && widget->parent)
+ return gtk_container_child_composite_name (GTK_CONTAINER (widget->parent),
+ widget);
+ else
+ return NULL;
+}
+
+void
+gtk_widget_push_composite_child (void)
+{
+ composite_child_stack++;
+}
+
+void
+gtk_widget_pop_composite_child (void)
+{
+ if (composite_child_stack)
+ composite_child_stack--;
}
/*****************************************
visual_stack = g_slist_prepend (visual_stack, visual);
}
-void
-gtk_widget_push_composite (void)
-{
- composite_child_stack++;
-}
-
-void
-gtk_widget_pop_composite (void)
-{
- if (composite_child_stack)
- composite_child_stack--;
-}
-
/*****************************************
* gtk_widget_pop_colormap:
*
parent_class->finalize (object);
}
-/*****************************************
- * gtk_widget_real_show:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-static void
-gtk_widget_real_show (GtkWidget *widget)
-{
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
- if (!GTK_WIDGET_VISIBLE (widget))
- {
- GTK_WIDGET_SET_FLAGS (widget, GTK_VISIBLE);
-
- if (widget->parent)
- {
- gtk_widget_queue_resize (widget->parent);
-
- if (GTK_WIDGET_MAPPED (widget->parent))
- gtk_widget_map (widget);
- }
- }
-}
-
-/*****************************************
- * gtk_widget_real_hide:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-static void
-gtk_widget_real_hide (GtkWidget *widget)
-{
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
- if (GTK_WIDGET_VISIBLE (widget))
- {
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
-
- if (GTK_WIDGET_MAPPED (widget))
- gtk_widget_unmap (widget);
-
- if (widget->parent)
- gtk_widget_queue_resize (widget->parent);
- }
-}
-
/*****************************************
* gtk_widget_real_map:
*
if (!GTK_WIDGET_NO_WINDOW (widget))
gdk_window_show (widget->window);
- else
- gtk_widget_queue_draw (widget);
}
}
if (GTK_WIDGET_MAPPED (widget))
{
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
-
- if (GTK_WIDGET_NO_WINDOW (widget))
- gdk_window_clear_area (widget->window,
- widget->allocation.x,
- widget->allocation.y,
- widget->allocation.width,
- widget->allocation.height);
- else
+
+ if (!GTK_WIDGET_NO_WINDOW (widget))
gdk_window_hide (widget->window);
}
}
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_WIDGET (widget));
- if (GTK_WIDGET_NO_WINDOW (widget) && GTK_WIDGET_MAPPED (widget))
+ if (GTK_WIDGET_MAPPED (widget))
gtk_widget_real_unmap (widget);
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED | GTK_MAPPED);
+ GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
/* printf ("unrealizing %s\n", gtk_type_name (GTK_OBJECT(widget)->klass->type));
*/
+ /* We must do unrealize child widget BEFORE container widget.
+ * gdk_window_destroy() destroys specified xwindow and it's sub-xwindows.
+ * So, unrealizing container widget bofore it's children causes the problem
+ * (for example, gdk_ic_destroy () with destroyed window causes crash. )
+ */
+
+ if (GTK_IS_CONTAINER (widget))
+ gtk_container_foreach (GTK_CONTAINER (widget),
+ (GtkCallback) gtk_widget_unrealize,
+ NULL);
+
gtk_style_detach (widget->style);
if (!GTK_WIDGET_NO_WINDOW (widget))
{
widget->window = NULL;
}
- /* Unrealize afterwards to improve visual effect */
-
- if (GTK_IS_CONTAINER (widget))
- gtk_container_forall (GTK_CONTAINER (widget),
- (GtkCallback) gtk_widget_unrealize,
- NULL);
+ GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
}
-/*****************************************
- * gtk_widget_real_draw:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
static void
gtk_widget_real_draw (GtkWidget *widget,
GdkRectangle *area)
requisition->height = widget->requisition.height;
}
-static void
-gtk_widget_real_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
-{
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_WIDGET (widget));
-
- if (GTK_WIDGET_NO_WINDOW (widget) &&
- GTK_WIDGET_MAPPED (widget) &&
- ((widget->allocation.x != allocation->x) ||
- (widget->allocation.y != allocation->y) ||
- (widget->allocation.width != allocation->width) ||
- (widget->allocation.height != allocation->height)) &&
- (widget->allocation.width != 0) &&
- (widget->allocation.height != 0))
- gdk_window_clear_area (widget->window,
- widget->allocation.x,
- widget->allocation.y,
- widget->allocation.width,
- widget->allocation.height);
-
- widget->allocation = *allocation;
-
- if (GTK_WIDGET_REALIZED (widget) &&
- !GTK_WIDGET_NO_WINDOW (widget))
- gdk_window_move_resize (widget->window,
- allocation->x, allocation->y,
- allocation->width, allocation->height);
-}
-
/*****************************************
* gtk_widget_peek_colormap:
*
}
}
-/*****************************************
- * gtk_widget_draw_children_recurse:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-static void
-gtk_widget_draw_children_recurse (GtkWidget *widget,
- gpointer client_data)
-{
- gtk_widget_draw (widget, NULL);
- gtk_widget_draw_children (widget);
-}
-
/*****************************************
* gtk_widget_aux_info_new:
*
GtkWidgetShapeInfo* shape_info;
g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
/* set_shape doesn't work on widgets without gdk window */
g_return_if_fail (!GTK_WIDGET_NO_WINDOW (widget));
}
}
+static void
+gtk_reset_shapes_recurse (GtkWidget *widget,
+ GdkWindow *window)
+{
+ GdkWindowPrivate *private;
+ gpointer data;
+ GList *list;
+
+ private = (GdkWindowPrivate*) window;
+
+ if (private->destroyed)
+ return;
+ gdk_window_get_user_data (window, &data);
+ if (data != widget)
+ return;
+
+ gdk_window_shape_combine_mask (window, NULL, 0, 0);
+ for (list = private->children; list; list = list->next)
+ gtk_reset_shapes_recurse (widget, list->data);
+}
+
+void
+gtk_widget_reset_shapes (GtkWidget *widget)
+{
+ g_return_if_fail (widget != NULL);
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+ g_return_if_fail (GTK_WIDGET_REALIZED (widget));
+
+ if (!GTK_WIDGET_HAS_SHAPE_MASK (widget))
+ gtk_reset_shapes_recurse (widget, widget->window);
+}
+
void
gtk_widget_ref (GtkWidget *widget)
{
projects / ~andy / gtk / blobdiff