X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtk-contrib%2Fgtkxpaned.c;h=9be83311f0f19b7562a8d8332c0c6930f43e7a01;hb=221cc7e7fd1cf6fa89d9c5f94f6e08c4beecefb2;hp=e5382f3c3e6710489260aecd28bfaebdc280835c;hpb=0ac284dc7a541a01ce80ea86e4077bcf21fed0ca;p=pspp diff --git a/lib/gtk-contrib/gtkxpaned.c b/lib/gtk-contrib/gtkxpaned.c index e5382f3c3e..9be83311f0 100644 --- a/lib/gtk-contrib/gtkxpaned.c +++ b/lib/gtk-contrib/gtkxpaned.c @@ -72,19 +72,66 @@ static void gtk_xpaned_class_init (GtkXPanedClass * klass); static void gtk_xpaned_init (GtkXPaned * xpaned); -static void gtk_xpaned_size_request (GtkWidget * widget, - GtkRequisition * requisition); - static void gtk_xpaned_get_preferred_width (GtkWidget *widget, - gint *minimal_width, - gint *natural_width) + gint *minimal_width, + gint *natural_width) { - GtkRequisition requisition; + GtkXPaned *xpaned = GTK_XPANED (widget); + gint tl[2], tr[2], bl[2], br[2]; + gint overhead; + gint w[2]; + int i; + + if (xpaned->top_left_child + && gtk_widget_get_visible (xpaned->top_left_child)) + gtk_widget_get_preferred_width (xpaned->top_left_child, &tl[0], &tl[1]); + else + tl[0] = tl[1] = 0; + + if (xpaned->top_right_child + && gtk_widget_get_visible (xpaned->top_right_child)) + gtk_widget_get_preferred_width (xpaned->top_right_child, &tr[0], &tr[1]); + else + tr[0] = tr[1] = 0; + + if (xpaned->bottom_left_child + && gtk_widget_get_visible (xpaned->bottom_left_child)) + gtk_widget_get_preferred_width (xpaned->bottom_left_child, &bl[0], &bl[1]); + else + bl[0] = bl[1] = 0; + + if (xpaned->bottom_right_child + && gtk_widget_get_visible (xpaned->bottom_right_child)) + gtk_widget_get_preferred_width (xpaned->bottom_right_child, + &br[0], &br[1]); + else + br[0] = br[1] = 0; - gtk_xpaned_size_request (widget, &requisition); + /* add 2 times the set border-width to the GtkXPaneds requisition */ + overhead = gtk_container_get_border_width (GTK_CONTAINER (xpaned)) * 2; + + /* also add the handle "thickness" to GtkXPaned's width requisition */ + if (xpaned->top_left_child + && gtk_widget_get_visible (xpaned->top_left_child) + && xpaned->top_right_child + && gtk_widget_get_visible (xpaned->top_right_child) + && xpaned->bottom_left_child + && gtk_widget_get_visible (xpaned->bottom_left_child) + && xpaned->bottom_right_child + && gtk_widget_get_visible (xpaned->bottom_right_child)) + { + gint handle_size; - *minimal_width = *natural_width = requisition.width; + gtk_widget_style_get (widget, "handle-size", &handle_size, NULL); + overhead += handle_size; + } + + for (i = 0; i < 2; i++) + w[i] = (br[i] ? br[i] : MAX (tl[i] + tr[i], bl[i])) + overhead; + + *minimal_width = w[0]; + *natural_width = w[1]; } static void @@ -92,11 +139,62 @@ gtk_xpaned_get_preferred_height (GtkWidget *widget, gint *minimal_height, gint *natural_height) { - GtkRequisition requisition; + GtkXPaned *xpaned = GTK_XPANED (widget); + gint tl[2], tr[2], bl[2], br[2]; + gint overhead; + gint h[2]; + int i; + + if (xpaned->top_left_child + && gtk_widget_get_visible (xpaned->top_left_child)) + gtk_widget_get_preferred_height (xpaned->top_left_child, &tl[0], &tl[1]); + else + tl[0] = tl[1] = 0; + + if (xpaned->top_right_child + && gtk_widget_get_visible (xpaned->top_right_child)) + gtk_widget_get_preferred_height (xpaned->top_right_child, &tr[0], &tr[1]); + else + tr[0] = tr[1] = 0; + + if (xpaned->bottom_left_child + && gtk_widget_get_visible (xpaned->bottom_left_child)) + gtk_widget_get_preferred_height (xpaned->bottom_left_child, + &bl[0], &bl[1]); + else + bl[0] = bl[1] = 0; + + if (xpaned->bottom_right_child + && gtk_widget_get_visible (xpaned->bottom_right_child)) + gtk_widget_get_preferred_height (xpaned->bottom_right_child, + &br[0], &br[1]); + else + br[0] = br[1] = 0; + + /* add 2 times the set border-width to the GtkXPaneds requisition */ + overhead = gtk_container_get_border_width (GTK_CONTAINER (xpaned)) * 2; + + /* also add the handle "thickness" to GtkXPaned's height-requisition */ + if (xpaned->top_left_child + && gtk_widget_get_visible (xpaned->top_left_child) + && xpaned->top_right_child + && gtk_widget_get_visible (xpaned->top_right_child) + && xpaned->bottom_left_child + && gtk_widget_get_visible (xpaned->bottom_left_child) + && xpaned->bottom_right_child + && gtk_widget_get_visible (xpaned->bottom_right_child)) + { + gint handle_size; - gtk_xpaned_size_request (widget, &requisition); + gtk_widget_style_get (widget, "handle-size", &handle_size, NULL); + overhead += handle_size; + } - *minimal_height = *natural_height = requisition.height; + for (i = 0; i < 2; i++) + h[i] = (br[i] ? br[i] : bl[i] + MAX (tl[i], tr[i])) + overhead; + + *minimal_height = h[0]; + *natural_height = h[1]; } static void gtk_xpaned_size_allocate (GtkWidget * widget, @@ -690,75 +788,6 @@ gtk_xpaned_init (GtkXPaned * xpaned) xpaned->drag_pos.y = -1; } -static void -gtk_xpaned_size_request (GtkWidget * widget, GtkRequisition * requisition) -{ - GtkXPaned *xpaned = GTK_XPANED (widget); - GtkRequisition child_requisition; - - requisition->width = 0; - requisition->height = 0; - - if (xpaned->top_left_child - && gtk_widget_get_visible (xpaned->top_left_child)) - { - gtk_widget_size_request (xpaned->top_left_child, &child_requisition); - - requisition->width = child_requisition.width; - requisition->height = child_requisition.height; - } - - if (xpaned->top_right_child - && gtk_widget_get_visible (xpaned->top_right_child)) - { - gtk_widget_size_request (xpaned->top_right_child, &child_requisition); - - requisition->width += child_requisition.width; - requisition->height = - MAX (requisition->height, child_requisition.height); - } - - if (xpaned->bottom_left_child - && gtk_widget_get_visible (xpaned->bottom_left_child)) - { - gtk_widget_size_request (xpaned->bottom_left_child, &child_requisition); - - requisition->width = MAX (requisition->width, child_requisition.width); - requisition->height += child_requisition.height; - } - - if (xpaned->bottom_right_child - && gtk_widget_get_visible (xpaned->bottom_right_child)) - { - gtk_widget_size_request (xpaned->bottom_right_child, - &child_requisition); - - requisition->width = child_requisition.width; - requisition->height = child_requisition.height; - } - - /* add 2 times the set border-width to the GtkXPaneds requisition */ - requisition->width += gtk_container_get_border_width (GTK_CONTAINER (xpaned)) * 2; - requisition->height += gtk_container_get_border_width (GTK_CONTAINER (xpaned)) * 2; - - /* also add the handle "thickness" to GtkXPaneds width- and height-requisitions */ - if (xpaned->top_left_child - && gtk_widget_get_visible (xpaned->top_left_child) - && xpaned->top_right_child - && gtk_widget_get_visible (xpaned->top_right_child) - && xpaned->bottom_left_child - && gtk_widget_get_visible (xpaned->bottom_left_child) - && xpaned->bottom_right_child - && gtk_widget_get_visible (xpaned->bottom_right_child)) - { - gint handle_size; - - gtk_widget_style_get (widget, "handle-size", &handle_size, NULL); - requisition->width += handle_size; - requisition->height += handle_size; - } -} - void gtk_xpaned_compute_position (GtkXPaned * xpaned, const GtkAllocation * allocation, @@ -798,14 +827,14 @@ gtk_xpaned_size_allocate (GtkWidget * widget, GtkAllocation * allocation) && gtk_widget_get_visible (xpaned->bottom_right_child)) { /* what sizes do the children want to be at least at */ - gtk_widget_get_child_requisition (xpaned->top_left_child, - &top_left_child_requisition); - gtk_widget_get_child_requisition (xpaned->top_right_child, - &top_right_child_requisition); - gtk_widget_get_child_requisition (xpaned->bottom_left_child, - &bottom_left_child_requisition); - gtk_widget_get_child_requisition (xpaned->bottom_right_child, - &bottom_right_child_requisition); + gtk_widget_get_preferred_size (xpaned->top_left_child, + &top_left_child_requisition, NULL); + gtk_widget_get_preferred_size (xpaned->top_right_child, + &top_right_child_requisition, NULL); + gtk_widget_get_preferred_size (xpaned->bottom_left_child, + &bottom_left_child_requisition, NULL); + gtk_widget_get_preferred_size (xpaned->bottom_right_child, + &bottom_right_child_requisition, NULL); /* determine the total requisition-sum of all requisitions of borders, * handles, children etc. */ @@ -1282,18 +1311,11 @@ gtk_xpaned_realize (GtkWidget * widget) gdk_window_set_user_data (xpaned->handle_south, xpaned); gdk_window_set_user_data (xpaned->handle_middle, xpaned); - gdk_cursor_unref (attributes_east.cursor); - gdk_cursor_unref (attributes_west.cursor); - gdk_cursor_unref (attributes_north.cursor); - gdk_cursor_unref (attributes_south.cursor); - gdk_cursor_unref (attributes_middle.cursor); - - { - GtkStyle *style = gtk_widget_get_style (widget); - style = gtk_style_attach (style, gtk_widget_get_window (widget)); - gtk_widget_set_style (widget, style); - } - + g_object_unref (attributes_east.cursor); + g_object_unref (attributes_west.cursor); + g_object_unref (attributes_north.cursor); + g_object_unref (attributes_south.cursor); + g_object_unref (attributes_middle.cursor); if (xpaned->top_left_child && gtk_widget_get_visible (xpaned->top_left_child) @@ -1413,44 +1435,18 @@ gtk_xpaned_draw (GtkWidget * widget, cairo_t *cr) && xpaned->bottom_right_child && gtk_widget_get_visible (xpaned->bottom_right_child)) { - GtkStateType state; + GtkStyleContext *context; - if (gtk_widget_is_focus (widget)) - state = GTK_STATE_SELECTED; - else if (xpaned->handle_prelit) - state = GTK_STATE_PRELIGHT; - else - state = gtk_widget_get_state (widget); - - gtk_paint_handle (gtk_widget_get_style (widget), - cr, - state, - GTK_SHADOW_NONE, - widget, - "paned", - xpaned->handle_pos_east.x - handle_size - 256 / 2, - xpaned->handle_pos_west.y + 1, - 256 + handle_size, handle_size - 2, - /*xpaned->handle_pos_west.x, - xpaned->handle_pos_west.y + 1, - xpaned->handle_pos_west.width + handle_size + xpaned->handle_pos_east.width, - handle_size - 2, */ - GTK_ORIENTATION_HORIZONTAL); - - gtk_paint_handle (gtk_widget_get_style (widget), - cr, - state, - GTK_SHADOW_NONE, - widget, - "paned", - xpaned->handle_pos_north.x + 1, - xpaned->handle_pos_south.y - handle_size - 256 / 2, - handle_size - 2, 256 + handle_size, - /*xpaned->handle_pos_north.x + 1, - xpaned->handle_pos_north.y, - handle_size - 2, - xpaned->handle_pos_north.height + handle_size + xpaned->handle_pos_south.height, */ - GTK_ORIENTATION_VERTICAL); + context = gtk_widget_get_style_context (widget); + gtk_render_handle (context, cr, + xpaned->handle_pos_east.x - handle_size - 256 / 2, + xpaned->handle_pos_west.y + 1, + 256 + handle_size, handle_size - 2); + + gtk_render_handle (context, cr, + xpaned->handle_pos_north.x + 1, + xpaned->handle_pos_south.y - handle_size - 256 / 2, + handle_size - 2, 256 + handle_size); } /* Chain up to draw children */ @@ -1472,12 +1468,23 @@ static void update_drag (GtkXPaned * xpaned) { GdkPoint pos; + GtkWidget *widget = GTK_WIDGET (xpaned); gint handle_size; GtkRequisition size; GtkAllocation allocation; - gtk_widget_get_allocation (GTK_WIDGET (xpaned), &allocation); - gtk_widget_get_pointer (GTK_WIDGET (xpaned), &pos.x, &pos.y); + gtk_widget_get_allocation (widget, &allocation); + + gdk_window_get_device_position (gtk_widget_get_window (widget), + gdk_device_manager_get_client_pointer ( + gdk_display_get_device_manager ( + gtk_widget_get_display (widget))), + &pos.x, &pos.y, NULL); + if (!gtk_widget_get_has_window (widget)) + { + pos.x -= allocation.x; + pos.y -= allocation.y; + } if (xpaned->in_drag_vert) { @@ -1485,8 +1492,7 @@ update_drag (GtkXPaned * xpaned) if (is_rtl (xpaned)) { - gtk_widget_style_get (GTK_WIDGET (xpaned), - "handle-size", &handle_size, NULL); + gtk_widget_style_get (widget, "handle-size", &handle_size, NULL); size.height = allocation.height - pos.y - handle_size; } @@ -1510,8 +1516,7 @@ update_drag (GtkXPaned * xpaned) if (is_rtl (xpaned)) { - gtk_widget_style_get (GTK_WIDGET (xpaned), - "handle-size", &handle_size, NULL); + gtk_widget_style_get (widget, "handle-size", &handle_size, NULL); size.width = allocation.width - pos.x - handle_size; } @@ -1536,8 +1541,7 @@ update_drag (GtkXPaned * xpaned) if (is_rtl (xpaned)) { - gtk_widget_style_get (GTK_WIDGET (xpaned), - "handle-size", &handle_size, NULL); + gtk_widget_style_get (widget, "handle-size", &handle_size, NULL); size.width = allocation.width - pos.x - handle_size; size.height = allocation.height - pos.y - handle_size; @@ -1672,6 +1676,22 @@ gtk_xpaned_focus (GtkWidget * widget, GtkDirectionType direction) return retval; } +static void +gtk_xpaned_button_press_grab (GdkWindow *handle, GdkEventButton *event) +{ + /* We need a server grab here, not gtk_grab_add(), since + * we don't want to pass events on to the widget's children */ + gdk_device_grab (event->device, handle, + GDK_OWNERSHIP_NONE, + FALSE, + (GDK_POINTER_MOTION_HINT_MASK + | GDK_BUTTON1_MOTION_MASK + | GDK_BUTTON_RELEASE_MASK + | GDK_ENTER_NOTIFY_MASK + | GDK_LEAVE_NOTIFY_MASK), + NULL, event->time); +} + static gboolean gtk_xpaned_button_press (GtkWidget * widget, GdkEventButton * event) { @@ -1693,20 +1713,7 @@ gtk_xpaned_button_press (GtkWidget * widget, GdkEventButton * event) event->window == xpaned->handle_middle && event->button == 1) { xpaned->in_drag_vert_and_horiz = TRUE; - - /* We need a server grab here, not gtk_grab_add(), since - * we don't want to pass events on to the widget's children */ - if (gdk_pointer_grab (xpaned->handle_middle, - FALSE, - GDK_POINTER_MOTION_HINT_MASK - | GDK_BUTTON1_MOTION_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_ENTER_NOTIFY_MASK - | GDK_LEAVE_NOTIFY_MASK, - NULL, NULL, event->time) == GDK_GRAB_SUCCESS) - { - } - + gtk_xpaned_button_press_grab (xpaned->handle_middle, event); xpaned->drag_pos.x = event->x; xpaned->drag_pos.y = event->y; @@ -1720,20 +1727,7 @@ gtk_xpaned_button_press (GtkWidget * widget, GdkEventButton * event) event->window != xpaned->handle_middle && event->button == 1) { xpaned->in_drag_vert = TRUE; - - /* We need a server grab here, not gtk_grab_add(), since - * we don't want to pass events on to the widget's children */ - if (gdk_pointer_grab (xpaned->handle_east, - FALSE, - GDK_POINTER_MOTION_HINT_MASK - | GDK_BUTTON1_MOTION_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_ENTER_NOTIFY_MASK - | GDK_LEAVE_NOTIFY_MASK, - NULL, NULL, event->time) == GDK_GRAB_SUCCESS) - { - } - + gtk_xpaned_button_press_grab (xpaned->handle_east, event); xpaned->drag_pos.y = event->y; return TRUE; @@ -1746,20 +1740,7 @@ gtk_xpaned_button_press (GtkWidget * widget, GdkEventButton * event) event->window != xpaned->handle_middle && event->button == 1) { xpaned->in_drag_vert = TRUE; - - /* We need a server grab here, not gtk_grab_add(), since - * we don't want to pass events on to the widget's children */ - if (gdk_pointer_grab (xpaned->handle_west, - FALSE, - GDK_POINTER_MOTION_HINT_MASK - | GDK_BUTTON1_MOTION_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_ENTER_NOTIFY_MASK - | GDK_LEAVE_NOTIFY_MASK, - NULL, NULL, event->time) == GDK_GRAB_SUCCESS) - { - } - + gtk_xpaned_button_press_grab (xpaned->handle_west, event); xpaned->drag_pos.y = event->y; return TRUE; @@ -1772,20 +1753,7 @@ gtk_xpaned_button_press (GtkWidget * widget, GdkEventButton * event) event->window != xpaned->handle_middle && event->button == 1) { xpaned->in_drag_horiz = TRUE; - - /* We need a server grab here, not gtk_grab_add(), since - * we don't want to pass events on to the widget's children */ - if (gdk_pointer_grab (xpaned->handle_north, - FALSE, - GDK_POINTER_MOTION_HINT_MASK - | GDK_BUTTON1_MOTION_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_ENTER_NOTIFY_MASK - | GDK_LEAVE_NOTIFY_MASK, - NULL, NULL, event->time) == GDK_GRAB_SUCCESS) - { - } - + gtk_xpaned_button_press_grab (xpaned->handle_north, event); xpaned->drag_pos.x = event->x; return TRUE; @@ -1798,20 +1766,7 @@ gtk_xpaned_button_press (GtkWidget * widget, GdkEventButton * event) event->window != xpaned->handle_middle && event->button == 1) { xpaned->in_drag_horiz = TRUE; - - /* We need a server grab here, not gtk_grab_add(), since - * we don't want to pass events on to the widget's children */ - if (gdk_pointer_grab (xpaned->handle_south, - FALSE, - GDK_POINTER_MOTION_HINT_MASK - | GDK_BUTTON1_MOTION_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_ENTER_NOTIFY_MASK - | GDK_LEAVE_NOTIFY_MASK, - NULL, NULL, event->time) == GDK_GRAB_SUCCESS) - { - } - + gtk_xpaned_button_press_grab (xpaned->handle_south, event); xpaned->drag_pos.x = event->x; return TRUE; @@ -1829,8 +1784,7 @@ gtk_xpaned_button_release (GtkWidget * widget, GdkEventButton * event) xpaned->in_drag_vert = FALSE; xpaned->drag_pos.y = -1; xpaned->position_set = TRUE; - gdk_display_pointer_ungrab (gtk_widget_get_display (widget), - event->time); + gdk_device_ungrab (event->device, event->time); return TRUE; } else if (xpaned->in_drag_horiz && (event->button == 1)) @@ -1838,8 +1792,7 @@ gtk_xpaned_button_release (GtkWidget * widget, GdkEventButton * event) xpaned->in_drag_horiz = FALSE; xpaned->drag_pos.x = -1; xpaned->position_set = TRUE; - gdk_display_pointer_ungrab (gtk_widget_get_display (widget), - event->time); + gdk_device_ungrab (event->device, event->time); return TRUE; } else if (xpaned->in_drag_vert_and_horiz && (event->button == 1)) @@ -1848,8 +1801,7 @@ gtk_xpaned_button_release (GtkWidget * widget, GdkEventButton * event) xpaned->drag_pos.x = -1; xpaned->drag_pos.y = -1; xpaned->position_set = TRUE; - gdk_display_pointer_ungrab (gtk_widget_get_display (widget), - event->time); + gdk_device_ungrab (event->device, event->time); return TRUE; }