AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-14 20:51:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
broadway: Don't create overlarge images

See merge request GNOME/gtk!1916
This commit is contained in:
Matthias Clasen 2020-05-16 17:01:30 +00:00
commit b41aeabbec
4 changed files with 67 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gdk/broadway/gdkdisplay-broadway.c
View File

@ -136,6 +136,30 @@ create_core_keyboard (GdkDisplay *display)
NULL); NULL);
} }
static GdkDevice *
create_pointer (GdkDisplay *display)
{
return g_object_new (GDK_TYPE_BROADWAY_DEVICE,
"name", "Pointer",
"type", GDK_DEVICE_TYPE_SLAVE,
"source", GDK_SOURCE_MOUSE,
"has-cursor", TRUE,
"display", display,
NULL);
}
static GdkDevice *
create_keyboard (GdkDisplay *display)
{
return g_object_new (GDK_TYPE_BROADWAY_DEVICE,
"name", "Keyboard",
"type", GDK_DEVICE_TYPE_SLAVE,
"source", GDK_SOURCE_KEYBOARD,
"has-cursor", FALSE,
"display", display,
NULL);
}
static GdkDevice * static GdkDevice *
create_touchscreen (GdkDisplay *display) create_touchscreen (GdkDisplay *display)
{ {
@ -161,16 +185,23 @@ _gdk_broadway_display_open (const gchar *display_name)
broadway_display->core_pointer = create_core_pointer (display); broadway_display->core_pointer = create_core_pointer (display);
broadway_display->core_keyboard = create_core_keyboard (display); broadway_display->core_keyboard = create_core_keyboard (display);
broadway_display->pointer = create_pointer (display);
broadway_display->keyboard = create_keyboard (display);
broadway_display->touchscreen = create_touchscreen (display); broadway_display->touchscreen = create_touchscreen (display);
_gdk_device_set_associated_device (broadway_display->core_pointer, broadway_display->core_keyboard); _gdk_device_set_associated_device (broadway_display->core_pointer, broadway_display->core_keyboard);
_gdk_device_set_associated_device (broadway_display->core_keyboard, broadway_display->core_pointer); _gdk_device_set_associated_device (broadway_display->core_keyboard, broadway_display->core_pointer);
_gdk_device_set_associated_device (broadway_display->pointer, broadway_display->core_pointer);
_gdk_device_set_associated_device (broadway_display->keyboard, broadway_display->core_keyboard);
_gdk_device_set_associated_device (broadway_display->touchscreen, broadway_display->core_pointer); _gdk_device_set_associated_device (broadway_display->touchscreen, broadway_display->core_pointer);
_gdk_device_add_slave (broadway_display->core_pointer, broadway_display->touchscreen); _gdk_device_add_slave (broadway_display->core_pointer, broadway_display->touchscreen);
seat = gdk_seat_default_new_for_master_pair (broadway_display->core_pointer, seat = gdk_seat_default_new_for_master_pair (broadway_display->core_pointer,
broadway_display->core_keyboard); broadway_display->core_keyboard);
gdk_display_add_seat (display, seat); gdk_display_add_seat (display, seat);
gdk_seat_default_add_slave (GDK_SEAT_DEFAULT (seat), broadway_display->pointer);
gdk_seat_default_add_slave (GDK_SEAT_DEFAULT (seat), broadway_display->keyboard);
gdk_seat_default_add_slave (GDK_SEAT_DEFAULT (seat), broadway_display->touchscreen); gdk_seat_default_add_slave (GDK_SEAT_DEFAULT (seat), broadway_display->touchscreen);
g_object_unref (seat); g_object_unref (seat);

2
gdk/broadway/gdkdisplay-broadway.h
View File

@ -42,6 +42,8 @@ struct _GdkBroadwayDisplay
GdkDevice *core_pointer; GdkDevice *core_pointer;
GdkDevice *core_keyboard; GdkDevice *core_keyboard;
GdkDevice *pointer;
GdkDevice *keyboard;
GdkDevice *touchscreen; GdkDevice *touchscreen;
GSource *event_source; GSource *event_source;

54
gdk/broadway/gdkeventsource.c
View File

@ -18,7 +18,6 @@
#include "config.h" #include "config.h"
#include "gdkeventsource.h" #include "gdkeventsource.h"
#include "gdkseat.h"
#include "gdksurfaceprivate.h" #include "gdksurfaceprivate.h"
#include "gdkframeclockprivate.h" #include "gdkframeclockprivate.h"
@ -87,13 +86,11 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
BroadwayInputMsg *message) BroadwayInputMsg *message)
{ {
GdkBroadwayDisplay *display_broadway; GdkBroadwayDisplay *display_broadway;
GdkSeat *seat;
GdkSurface *surface; GdkSurface *surface;
GdkEvent *event = NULL; GdkEvent *event = NULL;
GList *node; GList *node;
display_broadway = GDK_BROADWAY_DISPLAY (display); display_broadway = GDK_BROADWAY_DISPLAY (display);
seat = gdk_display_get_default_seat (display);
switch (message->base.type) { switch (message->base.type) {
case BROADWAY_EVENT_ENTER: case BROADWAY_EVENT_ENTER:
@ -102,8 +99,8 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
{ {
event = gdk_crossing_event_new (GDK_ENTER_NOTIFY, event = gdk_crossing_event_new (GDK_ENTER_NOTIFY,
surface, surface,
gdk_seat_get_pointer (seat), display_broadway->core_pointer,
gdk_seat_get_pointer (seat), display_broadway->pointer,
message->base.time, message->base.time,
message->pointer.state, message->pointer.state,
message->pointer.win_x, message->pointer.win_x,
@ -121,8 +118,8 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
{ {
event = gdk_crossing_event_new (GDK_LEAVE_NOTIFY, event = gdk_crossing_event_new (GDK_LEAVE_NOTIFY,
surface, surface,
gdk_seat_get_pointer (seat), display_broadway->core_pointer,
gdk_seat_get_pointer (seat), display_broadway->pointer,
message->base.time, message->base.time,
message->pointer.state, message->pointer.state,
message->pointer.win_x, message->pointer.win_x,
@ -142,8 +139,8 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
if (surface) if (surface)
{ {
event = gdk_motion_event_new (surface, event = gdk_motion_event_new (surface,
gdk_seat_get_pointer (seat), display_broadway->core_pointer,
gdk_seat_get_pointer (seat), display_broadway->pointer,
NULL, NULL,
message->base.time, message->base.time,
message->pointer.state, message->pointer.state,
@ -169,8 +166,8 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
? GDK_BUTTON_PRESS ? GDK_BUTTON_PRESS
: GDK_BUTTON_RELEASE, : GDK_BUTTON_RELEASE,
surface, surface,
gdk_seat_get_pointer (seat), display_broadway->core_pointer,
gdk_seat_get_pointer (seat), display_broadway->pointer,
NULL, NULL,
message->base.time, message->base.time,
message->pointer.state, message->pointer.state,
@ -189,8 +186,8 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
if (surface) if (surface)
{ {
event = gdk_scroll_event_new_discrete (surface, event = gdk_scroll_event_new_discrete (surface,
gdk_seat_get_pointer (seat), display_broadway->core_pointer,
gdk_seat_get_pointer (seat), display_broadway->pointer,
NULL, NULL,
message->base.time, message->base.time,
0, 0,
@ -210,7 +207,6 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
{ {
GdkEventType event_type = 0; GdkEventType event_type = 0;
GdkModifierType state; GdkModifierType state;
GdkDevice *source_device;
switch (message->touch.touch_type) { switch (message->touch.touch_type) {
case 0: case 0:
@ -230,15 +226,6 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
message->touch.is_emulated && _gdk_broadway_moveresize_handle_event (display, message)) message->touch.is_emulated && _gdk_broadway_moveresize_handle_event (display, message))
break; break;
source_device = gdk_seat_get_pointer (seat);
{
GList *devices;
devices = gdk_seat_get_slaves (seat, GDK_SEAT_CAPABILITY_TOUCH);
if (devices)
source_device = GDK_DEVICE (devices->data);
g_list_free (devices);
}
state = message->touch.state; state = message->touch.state;
if (event_type == GDK_TOUCH_BEGIN || event_type == GDK_TOUCH_UPDATE) if (event_type == GDK_TOUCH_BEGIN || event_type == GDK_TOUCH_UPDATE)
state |= GDK_BUTTON1_MASK; state |= GDK_BUTTON1_MASK;
@ -246,8 +233,8 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
event = gdk_touch_event_new (event_type, event = gdk_touch_event_new (event_type,
GUINT_TO_POINTER (message->touch.sequence_id), GUINT_TO_POINTER (message->touch.sequence_id),
surface, surface,
gdk_seat_get_pointer (seat), display_broadway->core_pointer,
source_device, display_broadway->touchscreen,
message->base.time, message->base.time,
state, state,
message->touch.win_x, message->touch.win_x,
@ -275,8 +262,8 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
? GDK_KEY_PRESS ? GDK_KEY_PRESS
: GDK_KEY_RELEASE, : GDK_KEY_RELEASE,
surface, surface,
gdk_seat_get_keyboard (seat), display_broadway->core_keyboard,
gdk_seat_get_keyboard (seat), display_broadway->keyboard,
message->base.time, message->base.time,
message->key.key, message->key.key,
message->key.state, message->key.state,
@ -291,7 +278,10 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
break; break;
case BROADWAY_EVENT_GRAB_NOTIFY: case BROADWAY_EVENT_GRAB_NOTIFY:
case BROADWAY_EVENT_UNGRAB_NOTIFY: case BROADWAY_EVENT_UNGRAB_NOTIFY:
_gdk_display_device_grab_update (display, gdk_seat_get_pointer (seat), gdk_seat_get_pointer (seat), message->base.serial); _gdk_display_device_grab_update (display,
display_broadway->core_pointer,
display_broadway->pointer,
message->base.serial);
break; break;
case BROADWAY_EVENT_CONFIGURE_NOTIFY: case BROADWAY_EVENT_CONFIGURE_NOTIFY:
@ -330,8 +320,8 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
if (surface) if (surface)
{ {
event = gdk_focus_event_new (surface, event = gdk_focus_event_new (surface,
gdk_seat_get_keyboard (seat), display_broadway->core_keyboard,
gdk_seat_get_keyboard (seat), display_broadway->keyboard,
FALSE); FALSE);
node = _gdk_event_queue_append (display, event); node = _gdk_event_queue_append (display, event);
@ -341,8 +331,8 @@ _gdk_broadway_events_got_input (GdkDisplay *display,
if (surface) if (surface)
{ {
event = gdk_focus_event_new (surface, event = gdk_focus_event_new (surface,
gdk_seat_get_keyboard (seat), display_broadway->core_keyboard,
gdk_seat_get_keyboard (seat), display_broadway->keyboard,
TRUE); TRUE);
node = _gdk_event_queue_append (display, event); node = _gdk_event_queue_append (display, event);

9
gsk/broadway/gskbroadwayrenderer.c
View File

@ -756,7 +756,14 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer,
int height = ceil (node->bounds.origin.y + node->bounds.size.height) - y; int height = ceil (node->bounds.origin.y + node->bounds.size.height) - y;
int scale = broadway_display->scale_factor; int scale = broadway_display->scale_factor;
surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width * scale, height * scale); #define MAX_IMAGE_SIZE 32767
surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
MIN (width * scale, MAX_IMAGE_SIZE),
MIN (height * scale, MAX_IMAGE_SIZE));
#undef MAX_IMAGE_SIZE
cr = cairo_create (surface); cr = cairo_create (surface);
cairo_scale (cr, scale, scale); cairo_scale (cr, scale, scale);
cairo_translate (cr, -x, -y); cairo_translate (cr, -x, -y);