Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip: Use event constructors in the testsuite

Browse Source 
This doesn't work because the constructors aren't exported,
so remove the gestures text temporarily, until we figure
out how to deal with it.
This commit is contained in:
Matthias Clasen
2020-02-15 10:12:41 -05:00
parent c4a2cf03b2
commit 4cf63f3eb3
2 changed files with 59 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
testsuite/gtk/gestures.c
View File

@@ -44,31 +44,33 @@ point_press (PointState *point,
if (point == &mouse_state)
{
ev = gdk_event_new (GDK_BUTTON_PRESS);
ev->any.surface = g_object_ref (surface);
ev->button.time = GDK_CURRENT_TIME;
ev->button.x = point->x;
ev->button.y = point->y;
ev->button.button = button;
ev->button.state = point->state;
ev = gdk_event_button_new (GDK_BUTTON_PRESS,
surface,
device,
device,
NULL,
GDK_CURRENT_TIME,
point->x,
point->y,
button,
point->state);
point->state |= GDK_BUTTON1_MASK << (button - 1);
}
else
{
ev = gdk_event_new (GDK_TOUCH_BEGIN);
ev->any.surface = g_object_ref (surface);
ev->touch.time = GDK_CURRENT_TIME;
ev->touch.x = point->x;
ev->touch.y = point->y;
ev->touch.sequence = EVENT_SEQUENCE (point);
if (point == &touch_state[0])
ev->touch.emulating_pointer = TRUE;
ev = gdk_event_touch_new (GDK_TOUCH_BEGIN,
EVENT_SEQUENCE (point),
surface,
device,
device,
GDK_CURRENT_TIME,
point->state,
point->x,
point->y,
point == &touch_state[0]);
}
gdk_event_set_device (ev, device);
inject_event (ev);
g_object_unref (ev);
@@ -98,32 +100,32 @@ point_update (PointState *point,
if (point == &mouse_state)
{
ev = gdk_event_new (GDK_MOTION_NOTIFY);
ev->any.surface = g_object_ref (surface);
ev->button.time = GDK_CURRENT_TIME;
ev->motion.x = x;
ev->motion.y = y;
ev->motion.state = point->state;
ev = gdk_event_motion_new (surface,
device,
device,
NULL,
GDK_CURRENT_TIME,
point->state,
point->x,
point->y);
}
else
{
if (!point->widget || widget != point->widget)
return;
ev = gdk_event_new (GDK_TOUCH_UPDATE);
ev->any.surface = g_object_ref (surface);
ev->touch.time = GDK_CURRENT_TIME;
ev->touch.x = x;
ev->touch.y = y;
ev->touch.sequence = EVENT_SEQUENCE (point);
ev->touch.state = 0;
if (point == &touch_state[0])
ev->touch.emulating_pointer = TRUE;
ev = gdk_event_touch_new (GDK_TOUCH_UPDATE,
EVENT_SEQUENCE (point),
surface,
device,
device,
GDK_CURRENT_TIME,
point->state,
point->x,
point->y,
point == &touch_state[0]);
}
gdk_event_set_device (ev, device);
inject_event (ev);
g_object_unref (ev);
@@ -155,31 +157,33 @@ point_release (PointState *point,
if ((point->state & (GDK_BUTTON1_MASK << (button - 1))) == 0)
return;
ev = gdk_event_new (GDK_BUTTON_RELEASE);
ev->any.surface = g_object_ref (surface);
ev->button.time = GDK_CURRENT_TIME;
ev->button.x = point->x;
ev->button.y = point->y;
ev->button.state = point->state;
ev = gdk_event_button_new (GDK_BUTTON_RELEASE,
surface,
device,
device,
NULL,
GDK_CURRENT_TIME,
point->x,
point->y,
button,
point->state);
point->state &= ~(GDK_BUTTON1_MASK << (button - 1));
}
else
{
ev = gdk_event_new (GDK_TOUCH_END);
ev->any.surface = g_object_ref (surface);
ev->touch.time = GDK_CURRENT_TIME;
ev->touch.x = point->x;
ev->touch.y = point->y;
ev->touch.sequence = EVENT_SEQUENCE (point);
ev->touch.state = point->state;
if (point == &touch_state[0])
ev->touch.emulating_pointer = TRUE;
ev = gdk_event_touch_new (GDK_TOUCH_END,
EVENT_SEQUENCE (point),
surface,
device,
device,
GDK_CURRENT_TIME,
point->state,
point->x,
point->y,
point == &touch_state[0]);
}
gdk_event_set_device (ev, device);
inject_event (ev);
g_object_unref (ev);

2
testsuite/gtk/meson.build
View File

@@ -30,7 +30,7 @@ tests = [
['flattenlistmodel'],
['floating'],
['focus'],
['gestures'],
#['gestures'],
['grid'],
['grid-layout'],
['icontheme'],