summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkdroptarget.c4
-rw-r--r--gtk/gtkdroptargetasync.c4
-rw-r--r--gtk/gtkeventcontrollerlegacy.c4
-rw-r--r--gtk/gtkgesturerotate.c2
-rw-r--r--gtk/gtkgesturestylus.c4
-rw-r--r--gtk/gtkgesturezoom.c2
-rw-r--r--gtk/gtkiconview.c7
-rw-r--r--gtk/gtkimcontextsimple.c2
-rw-r--r--gtk/gtkmain.c33
-rw-r--r--gtk/gtkmarshalers.list1
-rw-r--r--gtk/gtkpadcontroller.c4
-rw-r--r--gtk/gtkwidget.c6
-rw-r--r--gtk/gtkwindow.c14
13 files changed, 46 insertions, 41 deletions
diff --git a/gtk/gtkdroptarget.c b/gtk/gtkdroptarget.c
index 632a8699a3..dac70c7da5 100644
--- a/gtk/gtkdroptarget.c
+++ b/gtk/gtkdroptarget.c
@@ -384,7 +384,7 @@ gtk_drop_target_handle_event (GtkEventController *controller,
GdkDragAction preferred;
/* sanity check */
- g_return_val_if_fail (self->drop == gdk_drag_event_get_drop (event), FALSE);
+ g_return_val_if_fail (self->drop == gdk_dnd_event_get_drop (event), FALSE);
graphene_point_init (&self->coords, x, y);
g_signal_emit (self, signals[MOTION], 0, x, y, &preferred);
@@ -403,7 +403,7 @@ gtk_drop_target_handle_event (GtkEventController *controller,
case GDK_DROP_START:
{
/* sanity check */
- g_return_val_if_fail (self->drop == gdk_drag_event_get_drop (event), FALSE);
+ g_return_val_if_fail (self->drop == gdk_dnd_event_get_drop (event), FALSE);
graphene_point_init (&self->coords, x, y);
self->dropping = TRUE;
diff --git a/gtk/gtkdroptargetasync.c b/gtk/gtkdroptargetasync.c
index 0c2061927a..4eb2ec0622 100644
--- a/gtk/gtkdroptargetasync.c
+++ b/gtk/gtkdroptargetasync.c
@@ -220,7 +220,7 @@ gtk_drop_target_async_handle_event (GtkEventController *controller,
GtkWidget *widget = gtk_event_controller_get_widget (controller);
GdkDragAction preferred_action;
- drop = gdk_drag_event_get_drop (event);
+ drop = gdk_dnd_event_get_drop (event);
/* sanity check */
g_return_val_if_fail (self->drop == drop, FALSE);
if (self->rejected)
@@ -243,7 +243,7 @@ gtk_drop_target_async_handle_event (GtkEventController *controller,
{
gboolean handled;
- drop = gdk_drag_event_get_drop (event);
+ drop = gdk_dnd_event_get_drop (event);
/* sanity check */
g_return_val_if_fail (self->drop == drop, FALSE);
if (self->rejected)
diff --git a/gtk/gtkeventcontrollerlegacy.c b/gtk/gtkeventcontrollerlegacy.c
index 8b4d69693f..406e6a6ff2 100644
--- a/gtk/gtkeventcontrollerlegacy.c
+++ b/gtk/gtkeventcontrollerlegacy.c
@@ -92,12 +92,12 @@ gtk_event_controller_legacy_class_init (GtkEventControllerLegacyClass *klass)
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0, _gtk_boolean_handled_accumulator, NULL,
- _gtk_marshal_BOOLEAN__BOXED,
+ _gtk_marshal_BOOLEAN__POINTER,
G_TYPE_BOOLEAN, 1,
GDK_TYPE_EVENT);
g_signal_set_va_marshaller (signals[EVENT], G_TYPE_FROM_CLASS (klass),
- _gtk_marshal_BOOLEAN__BOXEDv);
+ _gtk_marshal_BOOLEAN__POINTERv);
}
static void
diff --git a/gtk/gtkgesturerotate.c b/gtk/gtkgesturerotate.c
index 2f0541ab78..5498244d77 100644
--- a/gtk/gtkgesturerotate.c
+++ b/gtk/gtkgesturerotate.c
@@ -206,7 +206,7 @@ gtk_gesture_rotate_handle_event (GtkEventController *controller,
if (gdk_event_get_event_type (event) == GDK_TOUCHPAD_PINCH)
{
phase = gdk_touchpad_event_get_gesture_phase (event);
- delta = gdk_touchpad_pinch_event_get_angle_delta (event);
+ delta = gdk_touchpad_event_get_pinch_angle_delta (event);
if (phase == GDK_TOUCHPAD_GESTURE_PHASE_BEGIN ||
phase == GDK_TOUCHPAD_GESTURE_PHASE_END)
priv->accum_touchpad_angle = 0;
diff --git a/gtk/gtkgesturestylus.c b/gtk/gtkgesturestylus.c
index 5d98a08b24..5944f0252e 100644
--- a/gtk/gtkgesturestylus.c
+++ b/gtk/gtkgesturestylus.c
@@ -290,8 +290,8 @@ gtk_gesture_stylus_get_backlog (GtkGestureStylus *gesture,
event = gesture_get_current_event (gesture);
- if (event)
- history = gdk_event_get_motion_history (event);
+ if (event && GDK_IS_EVENT_TYPE (event, GDK_MOTION_NOTIFY))
+ history = gdk_motion_event_get_history (event);
if (!history)
return FALSE;
diff --git a/gtk/gtkgesturezoom.c b/gtk/gtkgesturezoom.c
index 3eefa3f60a..83f8e3a276 100644
--- a/gtk/gtkgesturezoom.c
+++ b/gtk/gtkgesturezoom.c
@@ -104,7 +104,7 @@ _gtk_gesture_zoom_get_distance (GtkGestureZoom *zoom,
double scale;
/* Touchpad pinch */
- scale = gdk_touchpad_pinch_event_get_scale (last_event);
+ scale = gdk_touchpad_event_get_pinch_scale (last_event);
*distance = scale;
}
else
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index b078d69531..0bb039517c 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -2275,11 +2275,10 @@ gtk_icon_view_button_press (GtkGestureClick *gesture,
}
static gboolean
-button_event_modifies_selection (GdkEventButton *event)
+button_event_modifies_selection (GdkEvent *event)
{
- guint state;
+ guint state = gdk_event_get_modifier_state (event);
- state = gdk_event_get_modifier_state ((GdkEvent *) event);
return (state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0;
}
@@ -2293,7 +2292,7 @@ gtk_icon_view_button_release (GtkGestureClick *gesture,
GtkIconView *icon_view = user_data;
int button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture));
GdkEventSequence *sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture));
- GdkEventButton *event = (GdkEventButton *)gtk_gesture_get_last_event (GTK_GESTURE (gesture), sequence);
+ GdkEvent *event = gtk_gesture_get_last_event (GTK_GESTURE (gesture), sequence);
if (icon_view->priv->pressed_button == button)
icon_view->priv->pressed_button = -1;
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index da85eee183..17e8f68505 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -806,7 +806,7 @@ no_sequence_matches (GtkIMContextSimple *context_simple,
translated.consumed = 0;
translated.layout = 0;
translated.level = 0;
- GdkEvent *tmp_event = gdk_event_key_new (GDK_KEY_PRESS,
+ GdkEvent *tmp_event = gdk_key_event_new (GDK_KEY_PRESS,
gdk_event_get_surface (event),
gdk_event_get_device (event),
gdk_event_get_source_device (event),
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 59af57fb7d..6b80dbf817 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -660,6 +660,7 @@ do_post_parse_initialization (void)
gtk_widget_set_default_direction (gtk_get_locale_direction ());
+ gdk_event_init_types ();
gsk_ensure_resources ();
gsk_render_node_init_types ();
_gtk_ensure_resources ();
@@ -1109,7 +1110,7 @@ rewrite_event_for_surface (GdkEvent *event,
{
case GDK_BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
- return gdk_event_button_new (type,
+ return gdk_button_event_new (type,
new_surface,
gdk_event_get_device (event),
gdk_event_get_source_device (event),
@@ -1120,7 +1121,7 @@ rewrite_event_for_surface (GdkEvent *event,
x, y,
NULL); // FIXME copy axes
case GDK_MOTION_NOTIFY:
- return gdk_event_motion_new (new_surface,
+ return gdk_motion_event_new (new_surface,
gdk_event_get_device (event),
gdk_event_get_source_device (event),
gdk_event_get_device_tool (event),
@@ -1132,7 +1133,7 @@ rewrite_event_for_surface (GdkEvent *event,
case GDK_TOUCH_UPDATE:
case GDK_TOUCH_END:
case GDK_TOUCH_CANCEL:
- return gdk_event_touch_new (type,
+ return gdk_touch_event_new (type,
gdk_event_get_event_sequence (event),
new_surface,
gdk_event_get_device (event),
@@ -1144,7 +1145,7 @@ rewrite_event_for_surface (GdkEvent *event,
gdk_touch_event_get_emulating_pointer (event));
case GDK_TOUCHPAD_SWIPE:
gdk_touchpad_event_get_deltas (event, &dx, &dy);
- return gdk_event_touchpad_swipe_new (new_surface,
+ return gdk_touchpad_event_new_swipe (new_surface,
gdk_event_get_device (event),
gdk_event_get_source_device (event),
gdk_event_get_time (event),
@@ -1155,7 +1156,7 @@ rewrite_event_for_surface (GdkEvent *event,
dx, dy);
case GDK_TOUCHPAD_PINCH:
gdk_touchpad_event_get_deltas (event, &dx, &dy);
- return gdk_event_touchpad_pinch_new (new_surface,
+ return gdk_touchpad_event_new_pinch (new_surface,
gdk_event_get_device (event),
gdk_event_get_source_device (event),
gdk_event_get_time (event),
@@ -1164,8 +1165,8 @@ rewrite_event_for_surface (GdkEvent *event,
x, y,
gdk_touchpad_event_get_n_fingers (event),
dx, dy,
- gdk_touchpad_pinch_event_get_scale (event),
- gdk_touchpad_pinch_event_get_angle_delta (event));
+ gdk_touchpad_event_get_pinch_scale (event),
+ gdk_touchpad_event_get_pinch_angle_delta (event));
default:
break;
}
@@ -1230,6 +1231,7 @@ static GdkEvent *
rewrite_event_for_toplevel (GdkEvent *event)
{
GdkSurface *surface;
+ GdkKeyEvent *key_event;
surface = gdk_event_get_surface (event);
if (!surface->parent)
@@ -1238,7 +1240,10 @@ rewrite_event_for_toplevel (GdkEvent *event)
while (surface->parent)
surface = surface->parent;
- return gdk_event_key_new (gdk_event_get_event_type (event),
+ key_event = (GdkKeyEvent *) event;
+
+ /* FIXME: Avoid direct access to the translated[] field */
+ return gdk_key_event_new (gdk_event_get_event_type (event),
surface,
gdk_event_get_device (event),
gdk_event_get_source_device (event),
@@ -1246,8 +1251,8 @@ rewrite_event_for_toplevel (GdkEvent *event)
gdk_key_event_get_keycode (event),
gdk_event_get_modifier_state (event),
gdk_key_event_is_modifier (event),
- &event->key.translated[0],
- &event->key.translated[1]);
+ &key_event->translated[0],
+ &key_event->translated[1]);
}
static gboolean
@@ -1505,7 +1510,7 @@ handle_pointing_event (GdkEvent *event)
break;
case GDK_DRAG_LEAVE:
{
- GdkDrop *drop = gdk_drag_event_get_drop (event);
+ GdkDrop *drop = gdk_dnd_event_get_drop (event);
old_target = update_pointer_focus_state (toplevel, event, NULL);
gtk_drop_begin_event (drop, GDK_DRAG_LEAVE);
gtk_synthesize_crossing_events (GTK_ROOT (toplevel), GTK_CROSSING_DROP, old_target, NULL,
@@ -1544,10 +1549,10 @@ handle_pointing_event (GdkEvent *event)
else if ((old_target != target) &&
(type == GDK_DRAG_ENTER || type == GDK_DRAG_MOTION || type == GDK_DROP_START))
{
- GdkDrop *drop = gdk_drag_event_get_drop (event);
+ GdkDrop *drop = gdk_dnd_event_get_drop (event);
gtk_drop_begin_event (drop, type);
gtk_synthesize_crossing_events (GTK_ROOT (toplevel), GTK_CROSSING_DROP, old_target, target,
- event, GDK_CROSSING_NORMAL, gdk_drag_event_get_drop (event));
+ event, GDK_CROSSING_NORMAL, gdk_dnd_event_get_drop (event));
gtk_drop_end_event (drop);
}
else if (type == GDK_TOUCH_BEGIN)
@@ -1740,7 +1745,7 @@ gtk_main_do_event (GdkEvent *event)
case GDK_DRAG_MOTION:
case GDK_DROP_START:
{
- GdkDrop *drop = gdk_drag_event_get_drop (event);
+ GdkDrop *drop = gdk_dnd_event_get_drop (event);
gtk_drop_begin_event (drop, gdk_event_get_event_type (event));
gtk_propagate_event (target_widget, event);
gtk_drop_end_event (drop);
diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index 6e91f452b5..e6c2606c50 100644
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -50,6 +50,7 @@ BOOLEAN:VOID
BOOLEAN:BOOLEAN
BOOLEAN:BOOLEAN,BOOLEAN,BOOLEAN
BOOLEAN:STRING
+BOOLEAN:POINTER
ENUM:ENUM
ENUM:VOID
INT:POINTER
diff --git a/gtk/gtkpadcontroller.c b/gtk/gtkpadcontroller.c
index ef86f8c76a..833bf42338 100644
--- a/gtk/gtkpadcontroller.c
+++ b/gtk/gtkpadcontroller.c
@@ -243,13 +243,13 @@ gtk_pad_controller_handle_event (GtkEventController *controller,
{
case GDK_PAD_BUTTON_PRESS:
type = GTK_PAD_ACTION_BUTTON;
- index = gdk_pad_button_event_get_button (event);
+ index = gdk_pad_event_get_button (event);
break;
case GDK_PAD_RING:
case GDK_PAD_STRIP:
type = event_type == GDK_PAD_RING ?
GTK_PAD_ACTION_RING : GTK_PAD_ACTION_STRIP;
- gdk_pad_axis_event_get_value (event, &index, &value);
+ gdk_pad_event_get_axis_value (event, &index, &value);
break;
default:
return GDK_EVENT_PROPAGATE;
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 50cdc28caf..91527f8d28 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1963,7 +1963,7 @@ _gtk_widget_emulate_press (GtkWidget *widget,
case GDK_TOUCH_BEGIN:
case GDK_TOUCH_UPDATE:
case GDK_TOUCH_END:
- press = gdk_event_touch_new (GDK_TOUCH_BEGIN,
+ press = gdk_touch_event_new (GDK_TOUCH_BEGIN,
gdk_event_get_event_sequence (event),
gdk_event_get_surface (event),
gdk_event_get_device (event),
@@ -1976,7 +1976,7 @@ _gtk_widget_emulate_press (GtkWidget *widget,
break;
case GDK_BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
- press = gdk_event_button_new (GDK_BUTTON_PRESS,
+ press = gdk_button_event_new (GDK_BUTTON_PRESS,
gdk_event_get_surface (event),
gdk_event_get_device (event),
gdk_event_get_source_device (event),
@@ -2002,7 +2002,7 @@ _gtk_widget_emulate_press (GtkWidget *widget,
button = 1;
}
- press = gdk_event_button_new (GDK_BUTTON_PRESS,
+ press = gdk_button_event_new (GDK_BUTTON_PRESS,
gdk_event_get_surface (event),
gdk_event_get_device (event),
gdk_event_get_source_device (event),
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 3bd8d30e9f..fdc0cf8f1b 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -476,7 +476,7 @@ static void gtk_window_activate_default_activate (GtkWidget *widget,
GVariant *parameter);
static void gtk_window_do_popup (GtkWindow *window,
- GdkEventButton *event);
+ GdkEvent *event);
static void gtk_window_css_changed (GtkWidget *widget,
GtkCssStyleChange *change);
static void gtk_window_state_flags_changed (GtkWidget *widget,
@@ -1211,7 +1211,7 @@ gtk_window_titlebar_action (GtkWindow *window,
else if (g_str_equal (action, "minimize"))
gdk_toplevel_minimize (GDK_TOPLEVEL (priv->surface));
else if (g_str_equal (action, "menu"))
- gtk_window_do_popup (window, (GdkEventButton*) event);
+ gtk_window_do_popup (window, event);
else
{
g_warning ("Unsupported titlebar action %s", action);
@@ -5895,8 +5895,8 @@ close_window_clicked (GtkModelButton *button,
}
static void
-gtk_window_do_popup_fallback (GtkWindow *window,
- GdkEventButton *event)
+gtk_window_do_popup_fallback (GtkWindow *window,
+ GdkEvent *event)
{
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
GtkWidget *menuitem;
@@ -6005,12 +6005,12 @@ gtk_window_do_popup_fallback (GtkWindow *window,
}
static void
-gtk_window_do_popup (GtkWindow *window,
- GdkEventButton *event)
+gtk_window_do_popup (GtkWindow *window,
+ GdkEvent *event)
{
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
- if (!gdk_toplevel_show_window_menu (GDK_TOPLEVEL (priv->surface), (GdkEvent *) event))
+ if (!gdk_toplevel_show_window_menu (GDK_TOPLEVEL (priv->surface), event))
gtk_window_do_popup_fallback (window, event);
}
View Lorry Controller Status