AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

treeview: Update to using GdkEvent API

Browse Source
This commit is contained in:
Carlos Garnacho 2017-08-25 16:56:15 +02:00
parent b4f88e1544
commit 14a28224e4
2 changed files with 73 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
gtk/gtktreeview.c
View File

@ -4467,8 +4467,10 @@ gtk_tree_view_motion (GtkWidget *widget,
gint new_y; gint new_y;
GList *list; GList *list;
gboolean cursor_set = FALSE; gboolean cursor_set = FALSE;
gdouble x, y;
tree_view = (GtkTreeView *) widget; tree_view = (GtkTreeView *) widget;
gdk_event_get_coords ((GdkEvent *) event, &x, &y);
if (tree_view->priv->tree) if (tree_view->priv->tree)
{ {
@ -4477,20 +4479,20 @@ gtk_tree_view_motion (GtkWidget *widget,
gtk_gesture_is_active (tree_view->priv->multipress_gesture)) gtk_gesture_is_active (tree_view->priv->multipress_gesture))
node = NULL; node = NULL;
new_y = MAX (0, TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, event->y)); new_y = MAX (0, TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, y));
_gtk_rbtree_find_offset (tree_view->priv->tree, new_y, &tree, &node); _gtk_rbtree_find_offset (tree_view->priv->tree, new_y, &tree, &node);
tree_view->priv->event_last_x = event->x; tree_view->priv->event_last_x = x;
tree_view->priv->event_last_y = event->y; tree_view->priv->event_last_y = y;
prelight_or_select (tree_view, tree, node, event->x, event->y); prelight_or_select (tree_view, tree, node, x, y);
} }
for (list = tree_view->priv->columns; list; list = list->next) for (list = tree_view->priv->columns; list; list = list->next)
{ {
GtkTreeViewColumn *column = list->data; GtkTreeViewColumn *column = list->data;
if (_gtk_tree_view_column_coords_in_resize_rect (column, event->x, event->y)) if (_gtk_tree_view_column_coords_in_resize_rect (column, x, y))
{ {
GdkDisplay *display = gtk_widget_get_display (widget); GdkDisplay *display = gtk_widget_get_display (widget);
GdkCursor *cursor = gdk_cursor_new_from_name (display, "col-resize"); GdkCursor *cursor = gdk_cursor_new_from_name (display, "col-resize");
@ -5591,10 +5593,15 @@ gtk_tree_view_key_press (GtkWidget *widget,
{ {
GtkTreeView *tree_view = (GtkTreeView *) widget; GtkTreeView *tree_view = (GtkTreeView *) widget;
GtkWidget *button; GtkWidget *button;
guint keyval, state;
if (!gdk_event_get_keyval ((GdkEvent *) event, &keyval) ||
!gdk_event_get_state ((GdkEvent *) event, &state))
return GDK_EVENT_PROPAGATE;
if (tree_view->priv->rubber_band_status) if (tree_view->priv->rubber_band_status)
{ {
if (event->keyval == GDK_KEY_Escape) if (keyval == GDK_KEY_Escape)
gtk_tree_view_stop_rubber_band (tree_view); gtk_tree_view_stop_rubber_band (tree_view);
return TRUE; return TRUE;
@ -5602,7 +5609,7 @@ gtk_tree_view_key_press (GtkWidget *widget,
if (tree_view->priv->in_column_drag) if (tree_view->priv->in_column_drag)
{ {
if (event->keyval == GDK_KEY_Escape) if (keyval == GDK_KEY_Escape)
gtk_gesture_set_state (GTK_GESTURE (tree_view->priv->column_drag_gesture), gtk_gesture_set_state (GTK_GESTURE (tree_view->priv->column_drag_gesture),
GTK_EVENT_SEQUENCE_DENIED); GTK_EVENT_SEQUENCE_DENIED);
return TRUE; return TRUE;
@ -5627,9 +5634,9 @@ gtk_tree_view_key_press (GtkWidget *widget,
} }
if (focus_column && if (focus_column &&
(event->state & GDK_SHIFT_MASK) && (event->state & GDK_MOD1_MASK) && (state & GDK_SHIFT_MASK) && (state & GDK_MOD1_MASK) &&
(event->keyval == GDK_KEY_Left || event->keyval == GDK_KEY_KP_Left (keyval == GDK_KEY_Left || keyval == GDK_KEY_KP_Left
|| event->keyval == GDK_KEY_Right || event->keyval == GDK_KEY_KP_Right)) || keyval == GDK_KEY_Right || keyval == GDK_KEY_KP_Right))
{ {
GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (focus_column->data); GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (focus_column->data);
gint column_width; gint column_width;
@ -5642,13 +5649,13 @@ gtk_tree_view_key_press (GtkWidget *widget,
column_width = gtk_tree_view_column_get_width (column); column_width = gtk_tree_view_column_get_width (column);
if (event->keyval == (rtl ? GDK_KEY_Right : GDK_KEY_Left) if (keyval == (rtl ? GDK_KEY_Right : GDK_KEY_Left)
|| event->keyval == (rtl ? GDK_KEY_KP_Right : GDK_KEY_KP_Left)) || keyval == (rtl ? GDK_KEY_KP_Right : GDK_KEY_KP_Left))
{ {
column_width = MAX (column_width - 2, 0); column_width = MAX (column_width - 2, 0);
} }
else if (event->keyval == (rtl ? GDK_KEY_Left : GDK_KEY_Right) else if (keyval == (rtl ? GDK_KEY_Left : GDK_KEY_Right)
|| event->keyval == (rtl ? GDK_KEY_KP_Left : GDK_KEY_KP_Right)) || keyval == (rtl ? GDK_KEY_KP_Left : GDK_KEY_KP_Right))
{ {
column_width = column_width + 2; column_width = column_width + 2;
} }
@ -5659,16 +5666,16 @@ gtk_tree_view_key_press (GtkWidget *widget,
} }
if (focus_column && if (focus_column &&
(event->state & GDK_MOD1_MASK) && (state & GDK_MOD1_MASK) &&
(event->keyval == GDK_KEY_Left || event->keyval == GDK_KEY_KP_Left (keyval == GDK_KEY_Left || keyval == GDK_KEY_KP_Left
|| event->keyval == GDK_KEY_Right || event->keyval == GDK_KEY_KP_Right || keyval == GDK_KEY_Right || keyval == GDK_KEY_KP_Right
|| event->keyval == GDK_KEY_Home || event->keyval == GDK_KEY_KP_Home || keyval == GDK_KEY_Home || keyval == GDK_KEY_KP_Home
|| event->keyval == GDK_KEY_End || event->keyval == GDK_KEY_KP_End)) || keyval == GDK_KEY_End || keyval == GDK_KEY_KP_End))
{ {
GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (focus_column->data); GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (focus_column->data);
if (event->keyval == (rtl ? GDK_KEY_Right : GDK_KEY_Left) if (keyval == (rtl ? GDK_KEY_Right : GDK_KEY_Left)
|| event->keyval == (rtl ? GDK_KEY_KP_Right : GDK_KEY_KP_Left)) || keyval == (rtl ? GDK_KEY_KP_Right : GDK_KEY_KP_Left))
{ {
GtkTreeViewColumn *col; GtkTreeViewColumn *col;
col = gtk_tree_view_get_drop_column (tree_view, column, DROP_LEFT); col = gtk_tree_view_get_drop_column (tree_view, column, DROP_LEFT);
@ -5677,8 +5684,8 @@ gtk_tree_view_key_press (GtkWidget *widget,
else else
gtk_widget_error_bell (widget); gtk_widget_error_bell (widget);
} }
else if (event->keyval == (rtl ? GDK_KEY_Left : GDK_KEY_Right) else if (keyval == (rtl ? GDK_KEY_Left : GDK_KEY_Right)
|| event->keyval == (rtl ? GDK_KEY_KP_Left : GDK_KEY_KP_Right)) || keyval == (rtl ? GDK_KEY_KP_Left : GDK_KEY_KP_Right))
{ {
GtkTreeViewColumn *col; GtkTreeViewColumn *col;
col = gtk_tree_view_get_drop_column (tree_view, column, DROP_RIGHT); col = gtk_tree_view_get_drop_column (tree_view, column, DROP_RIGHT);
@ -5687,7 +5694,7 @@ gtk_tree_view_key_press (GtkWidget *widget,
else else
gtk_widget_error_bell (widget); gtk_widget_error_bell (widget);
} }
else if (event->keyval == GDK_KEY_Home || event->keyval == GDK_KEY_KP_Home) else if (keyval == GDK_KEY_Home || keyval == GDK_KEY_KP_Home)
{ {
GtkTreeViewColumn *col; GtkTreeViewColumn *col;
col = gtk_tree_view_get_drop_column (tree_view, column, DROP_HOME); col = gtk_tree_view_get_drop_column (tree_view, column, DROP_HOME);
@ -5696,7 +5703,7 @@ gtk_tree_view_key_press (GtkWidget *widget,
else else
gtk_widget_error_bell (widget); gtk_widget_error_bell (widget);
} }
else if (event->keyval == GDK_KEY_End || event->keyval == GDK_KEY_KP_End) else if (keyval == GDK_KEY_End || keyval == GDK_KEY_KP_End)
{ {
GtkTreeViewColumn *col; GtkTreeViewColumn *col;
col = gtk_tree_view_get_drop_column (tree_view, column, DROP_END); col = gtk_tree_view_get_drop_column (tree_view, column, DROP_END);
@ -5729,7 +5736,7 @@ gtk_tree_view_key_press (GtkWidget *widget,
if (gtk_widget_has_focus (GTK_WIDGET (tree_view)) if (gtk_widget_has_focus (GTK_WIDGET (tree_view))
&& tree_view->priv->enable_search && tree_view->priv->enable_search
&& !tree_view->priv->search_custom_entry_set && !tree_view->priv->search_custom_entry_set
&& !gtk_tree_view_search_key_cancels_search (event->keyval)) && !gtk_tree_view_search_key_cancels_search (keyval))
{ {
GtkWidget *search_window; GtkWidget *search_window;
@ -5814,23 +5821,25 @@ gtk_tree_view_enter_notify (GtkWidget *widget,
GtkTreeView *tree_view = GTK_TREE_VIEW (widget); GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
GtkRBTree *tree; GtkRBTree *tree;
GtkRBNode *node; GtkRBNode *node;
gdouble x, y;
gint new_y; gint new_y;
if (tree_view->priv->tree == NULL) if (tree_view->priv->tree == NULL ||
!gdk_event_get_coords ((GdkEvent *) event, &x, &y))
return FALSE; return FALSE;
/* find the node internally */ /* find the node internally */
new_y = TREE_WINDOW_Y_TO_RBTREE_Y(tree_view, event->y); new_y = TREE_WINDOW_Y_TO_RBTREE_Y(tree_view, y);
if (new_y < 0) if (new_y < 0)
new_y = 0; new_y = 0;
_gtk_rbtree_find_offset (tree_view->priv->tree, new_y, &tree, &node); _gtk_rbtree_find_offset (tree_view->priv->tree, new_y, &tree, &node);
tree_view->priv->event_last_x = event->x; tree_view->priv->event_last_x = x;
tree_view->priv->event_last_y = event->y; tree_view->priv->event_last_y = y;
if ((tree_view->priv->button_pressed_node == NULL) || if ((tree_view->priv->button_pressed_node == NULL) ||
(tree_view->priv->button_pressed_node == node)) (tree_view->priv->button_pressed_node == node))
prelight_or_select (tree_view, tree, node, event->x, event->y); prelight_or_select (tree_view, tree, node, x, y);
return TRUE; return TRUE;
} }
@ -14547,7 +14556,7 @@ gtk_tree_view_search_button_press_event (GtkWidget *widget,
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
keyb_device = gdk_device_get_associated_device (event->device); keyb_device = gdk_device_get_associated_device (gdk_event_get_device ((GdkEvent *) event));
gtk_tree_view_search_window_hide (widget, tree_view, keyb_device); gtk_tree_view_search_window_hide (widget, tree_view, keyb_device);
return TRUE; return TRUE;
@ -14559,13 +14568,17 @@ gtk_tree_view_search_scroll_event (GtkWidget *widget,
GtkTreeView *tree_view) GtkTreeView *tree_view)
{ {
gboolean retval = FALSE; gboolean retval = FALSE;
GdkScrollDirection direction;
if (event->direction == GDK_SCROLL_UP) if (!gdk_event_get_scroll_direction ((GdkEvent *) event, &direction))
return retval;
if (direction == GDK_SCROLL_UP)
{ {
gtk_tree_view_search_move (widget, tree_view, TRUE); gtk_tree_view_search_move (widget, tree_view, TRUE);
retval = TRUE; retval = TRUE;
} }
else if (event->direction == GDK_SCROLL_DOWN) else if (direction == GDK_SCROLL_DOWN)
{ {
gtk_tree_view_search_move (widget, tree_view, FALSE); gtk_tree_view_search_move (widget, tree_view, FALSE);
retval = TRUE; retval = TRUE;
@ -14593,13 +14606,18 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget,
{ {
GdkModifierType default_accel; GdkModifierType default_accel;
gboolean retval = FALSE; gboolean retval = FALSE;
guint keyval, state;
g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE); g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
if (!gdk_event_get_keyval ((GdkEvent *) event, &keyval) ||
!gdk_event_get_state ((GdkEvent *) event, &state))
return GDK_EVENT_PROPAGATE;
/* close window and cancel the search */ /* close window and cancel the search */
if (!tree_view->priv->search_custom_entry_set if (!tree_view->priv->search_custom_entry_set
&& gtk_tree_view_search_key_cancels_search (event->keyval)) && gtk_tree_view_search_key_cancels_search (keyval))
{ {
gtk_tree_view_search_window_hide (widget, tree_view, gtk_tree_view_search_window_hide (widget, tree_view,
gdk_event_get_device ((GdkEvent *) event)); gdk_event_get_device ((GdkEvent *) event));
@ -14610,7 +14628,7 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget,
GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR); GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR);
/* select previous matching iter */ /* select previous matching iter */
if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up) if (keyval == GDK_KEY_Up || keyval == GDK_KEY_KP_Up)
{ {
if (!gtk_tree_view_search_move (widget, tree_view, TRUE)) if (!gtk_tree_view_search_move (widget, tree_view, TRUE))
gtk_widget_error_bell (widget); gtk_widget_error_bell (widget);
@ -14618,8 +14636,8 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget,
retval = TRUE; retval = TRUE;
} }
if (((event->state & (default_accel | GDK_SHIFT_MASK)) == (default_accel | GDK_SHIFT_MASK)) if (((state & (default_accel | GDK_SHIFT_MASK)) == (default_accel | GDK_SHIFT_MASK))
&& (event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G)) && (keyval == GDK_KEY_g || keyval == GDK_KEY_G))
{ {
if (!gtk_tree_view_search_move (widget, tree_view, TRUE)) if (!gtk_tree_view_search_move (widget, tree_view, TRUE))
gtk_widget_error_bell (widget); gtk_widget_error_bell (widget);
@ -14628,7 +14646,7 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget,
} }
/* select next matching iter */ /* select next matching iter */
if (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down) if (keyval == GDK_KEY_Down || keyval == GDK_KEY_KP_Down)
{ {
if (!gtk_tree_view_search_move (widget, tree_view, FALSE)) if (!gtk_tree_view_search_move (widget, tree_view, FALSE))
gtk_widget_error_bell (widget); gtk_widget_error_bell (widget);
@ -14636,8 +14654,8 @@ gtk_tree_view_search_key_press_event (GtkWidget *widget,
retval = TRUE; retval = TRUE;
} }
if (((event->state & (default_accel | GDK_SHIFT_MASK)) == default_accel) if (((state & (default_accel | GDK_SHIFT_MASK)) == default_accel)
&& (event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G)) && (keyval == GDK_KEY_g || keyval == GDK_KEY_G))
{ {
if (!gtk_tree_view_search_move (widget, tree_view, FALSE)) if (!gtk_tree_view_search_move (widget, tree_view, FALSE))
gtk_widget_error_bell (widget); gtk_widget_error_bell (widget);

22
gtk/gtktreeviewcolumn.c
View File

@ -1017,24 +1017,30 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
{ {
GtkTreeViewColumn *column = (GtkTreeViewColumn *) data; GtkTreeViewColumn *column = (GtkTreeViewColumn *) data;
GtkTreeViewColumnPrivate *priv = column->priv; GtkTreeViewColumnPrivate *priv = column->priv;
GdkEventType event_type;
g_return_val_if_fail (event != NULL, FALSE); g_return_val_if_fail (event != NULL, FALSE);
if (event->type == GDK_BUTTON_PRESS && event_type = gdk_event_get_event_type (event);
if (event_type == GDK_BUTTON_PRESS &&
priv->reorderable && priv->reorderable &&
((GdkEventButton *)event)->button == GDK_BUTTON_PRIMARY) ((GdkEventButton *)event)->button == GDK_BUTTON_PRIMARY)
{ {
gdouble x, y;
gdk_event_get_coords (event, &x, &y);
priv->maybe_reordered = TRUE; priv->maybe_reordered = TRUE;
priv->drag_x = event->button.x; priv->drag_x = x;
priv->drag_y = event->button.y; priv->drag_y = y;
gtk_widget_grab_focus (widget); gtk_widget_grab_focus (widget);
} }
if (event->type == GDK_BUTTON_RELEASE || if (event_type == GDK_BUTTON_RELEASE ||
event->type == GDK_LEAVE_NOTIFY) event_type == GDK_LEAVE_NOTIFY)
priv->maybe_reordered = FALSE; priv->maybe_reordered = FALSE;
if (event->type == GDK_MOTION_NOTIFY && if (event_type == GDK_MOTION_NOTIFY &&
priv->maybe_reordered && priv->maybe_reordered &&
(gtk_drag_check_threshold (widget, (gtk_drag_check_threshold (widget,
priv->drag_x, priv->drag_x,
@ -1044,13 +1050,13 @@ gtk_tree_view_column_button_event (GtkWidget *widget,
{ {
priv->maybe_reordered = FALSE; priv->maybe_reordered = FALSE;
_gtk_tree_view_column_start_drag (GTK_TREE_VIEW (priv->tree_view), column, _gtk_tree_view_column_start_drag (GTK_TREE_VIEW (priv->tree_view), column,
event->motion.device); gdk_event_get_device (event));
return TRUE; return TRUE;
} }
if (priv->clickable == FALSE) if (priv->clickable == FALSE)
{ {
switch (event->type) switch (event_type)
{ {
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS: case GDK_2BUTTON_PRESS: