AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 14:10:30 +00:00
Code Issues Projects Releases Wiki Activity

surface: Use surface->display directly

Browse Source 
No need to go through a public getter
for internal uses.
This commit is contained in:
Matthias Clasen 2019-06-01 21:55:14 +00:00
parent 0aa9e16294
commit e08bab012c
1 changed files with 21 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
gdk/gdksurface.c
View File

@ -123,12 +123,12 @@ static GdkDisplay *
get_display_for_surface (GdkSurface *primary, get_display_for_surface (GdkSurface *primary,
GdkSurface *secondary) GdkSurface *secondary)
{ {
GdkDisplay *display = gdk_surface_get_display (primary); GdkDisplay *display = primary->display;
if (display) if (display)
return display; return display;
display = gdk_surface_get_display (secondary); display = secondary->display;
if (display) if (display)
return display; return display;
@ -606,7 +606,7 @@ gdk_surface_finalize (GObject *object)
{ {
GdkSurface *surface = GDK_SURFACE (object); GdkSurface *surface = GDK_SURFACE (object);
g_signal_handlers_disconnect_by_func (gdk_surface_get_display (surface), g_signal_handlers_disconnect_by_func (surface->display,
seat_removed_cb, surface); seat_removed_cb, surface);
if (!GDK_SURFACE_DESTROYED (surface)) if (!GDK_SURFACE_DESTROYED (surface))
@ -895,15 +895,11 @@ static void
_gdk_surface_destroy_hierarchy (GdkSurface *surface, _gdk_surface_destroy_hierarchy (GdkSurface *surface,
gboolean foreign_destroy) gboolean foreign_destroy)
{ {
GdkDisplay *display;
g_return_if_fail (GDK_IS_SURFACE (surface)); g_return_if_fail (GDK_IS_SURFACE (surface));
if (GDK_SURFACE_DESTROYED (surface)) if (GDK_SURFACE_DESTROYED (surface))
return; return;
display = gdk_surface_get_display (surface);
GDK_SURFACE_GET_CLASS (surface)->destroy (surface, foreign_destroy); GDK_SURFACE_GET_CLASS (surface)->destroy (surface, foreign_destroy);
if (surface->gl_paint_context) if (surface->gl_paint_context)
@ -926,7 +922,7 @@ _gdk_surface_destroy_hierarchy (GdkSurface *surface,
surface->state |= GDK_SURFACE_STATE_WITHDRAWN; surface->state |= GDK_SURFACE_STATE_WITHDRAWN;
surface->destroyed = TRUE; surface->destroyed = TRUE;
surface_remove_from_pointer_info (surface, display); surface_remove_from_pointer_info (surface, surface->display);
g_object_notify_by_pspec (G_OBJECT (surface), properties[PROP_STATE]); g_object_notify_by_pspec (G_OBJECT (surface), properties[PROP_STATE]);
g_object_notify_by_pspec (G_OBJECT (surface), properties[PROP_MAPPED]); g_object_notify_by_pspec (G_OBJECT (surface), properties[PROP_MAPPED]);
@ -1208,7 +1204,7 @@ gdk_surface_create_cairo_context (GdkSurface *surface)
g_return_val_if_fail (GDK_IS_SURFACE (surface), NULL); g_return_val_if_fail (GDK_IS_SURFACE (surface), NULL);
display = gdk_surface_get_display (surface); display = surface->display;
return g_object_new (GDK_DISPLAY_GET_CLASS (display)->cairo_context_type, return g_object_new (GDK_DISPLAY_GET_CLASS (display)->cairo_context_type,
"surface", surface, "surface", surface,
@ -1243,7 +1239,7 @@ gdk_surface_create_vulkan_context (GdkSurface *surface,
return NULL; return NULL;
} }
display = gdk_surface_get_display (surface); display = surface->display;
if (GDK_DISPLAY_GET_CLASS (display)->vk_extension_name == NULL) if (GDK_DISPLAY_GET_CLASS (display)->vk_extension_name == NULL)
{ {
@ -1994,7 +1990,7 @@ gdk_surface_hide (GdkSurface *surface)
GList *devices, *d; GList *devices, *d;
/* May need to break grabs on children */ /* May need to break grabs on children */
display = gdk_surface_get_display (surface); display = surface->display;
seat = gdk_display_get_default_seat (display); seat = gdk_display_get_default_seat (display);
devices = gdk_seat_get_slaves (seat, GDK_SEAT_CAPABILITY_ALL); devices = gdk_seat_get_slaves (seat, GDK_SEAT_CAPABILITY_ALL);
@ -2175,19 +2171,16 @@ gdk_surface_set_cursor_internal (GdkSurface *surface,
GdkCursor *cursor) GdkCursor *cursor)
{ {
GdkPointerSurfaceInfo *pointer_info; GdkPointerSurfaceInfo *pointer_info;
GdkDisplay *display;
if (GDK_SURFACE_DESTROYED (surface)) if (GDK_SURFACE_DESTROYED (surface))
return; return;
display = gdk_surface_get_display (surface); g_assert (surface->display == gdk_device_get_display (device));
g_assert (display == gdk_device_get_display (device)); pointer_info = _gdk_display_get_pointer_info (surface->display, device);
pointer_info = _gdk_display_get_pointer_info (display, device);
if (surface == pointer_info->surface_under_pointer) if (surface == pointer_info->surface_under_pointer)
update_cursor (display, device); update_cursor (surface->display, device);
} }
/** /**
@ -2231,12 +2224,8 @@ void
gdk_surface_set_cursor (GdkSurface *surface, gdk_surface_set_cursor (GdkSurface *surface,
GdkCursor *cursor) GdkCursor *cursor)
{ {
GdkDisplay *display;
g_return_if_fail (GDK_IS_SURFACE (surface)); g_return_if_fail (GDK_IS_SURFACE (surface));
display = gdk_surface_get_display (surface);
if (surface->cursor) if (surface->cursor)
{ {
g_object_unref (surface->cursor); g_object_unref (surface->cursor);
@ -2251,7 +2240,7 @@ gdk_surface_set_cursor (GdkSurface *surface,
if (cursor) if (cursor)
surface->cursor = g_object_ref (cursor); surface->cursor = g_object_ref (cursor);
seats = gdk_display_list_seats (display); seats = gdk_display_list_seats (surface->display);
for (s = seats; s; s = s->next) for (s = seats; s; s = s->next)
{ {
@ -2616,8 +2605,6 @@ update_cursor (GdkDisplay *display,
void void
gdk_surface_beep (GdkSurface *surface) gdk_surface_beep (GdkSurface *surface)
{ {
GdkDisplay *display;
g_return_if_fail (GDK_IS_SURFACE (surface)); g_return_if_fail (GDK_IS_SURFACE (surface));
if (GDK_SURFACE_DESTROYED (surface)) if (GDK_SURFACE_DESTROYED (surface))
@ -2626,8 +2613,7 @@ gdk_surface_beep (GdkSurface *surface)
if (GDK_SURFACE_GET_CLASS (surface)->beep (surface)) if (GDK_SURFACE_GET_CLASS (surface)->beep (surface))
return; return;
display = gdk_surface_get_display (surface); gdk_display_beep (surface->display);
gdk_display_beep (display);
} }
/** /**
@ -3244,7 +3230,7 @@ gdk_surface_fullscreen_on_monitor (GdkSurface *surface,
{ {
g_return_if_fail (GDK_IS_SURFACE (surface)); g_return_if_fail (GDK_IS_SURFACE (surface));
g_return_if_fail (GDK_IS_MONITOR (monitor)); g_return_if_fail (GDK_IS_MONITOR (monitor));
g_return_if_fail (gdk_monitor_get_display (monitor) == gdk_surface_get_display (surface)); g_return_if_fail (gdk_monitor_get_display (monitor) == surface->display);
g_return_if_fail (gdk_monitor_is_valid (monitor)); g_return_if_fail (gdk_monitor_is_valid (monitor));
if (GDK_SURFACE_GET_CLASS (surface)->fullscreen_on_monitor != NULL) if (GDK_SURFACE_GET_CLASS (surface)->fullscreen_on_monitor != NULL)
@ -3492,11 +3478,9 @@ gdk_surface_begin_resize_drag (GdkSurface *surface,
gint y, gint y,
guint32 timestamp) guint32 timestamp)
{ {
GdkDisplay *display;
GdkDevice *device; GdkDevice *device;
display = gdk_surface_get_display (surface); device = gdk_seat_get_pointer (gdk_display_get_default_seat (surface->display));
device = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
gdk_surface_begin_resize_drag_for_device (surface, edge, gdk_surface_begin_resize_drag_for_device (surface, edge,
device, button, x, y, timestamp); device, button, x, y, timestamp);
} }
@ -3545,11 +3529,9 @@ gdk_surface_begin_move_drag (GdkSurface *surface,
gint y, gint y,
guint32 timestamp) guint32 timestamp)
{ {
GdkDisplay *display;
GdkDevice *device; GdkDevice *device;
display = gdk_surface_get_display (surface); device = gdk_seat_get_pointer (gdk_display_get_default_seat (surface->display));
device = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
gdk_surface_begin_move_drag_for_device (surface, device, button, x, y, timestamp); gdk_surface_begin_move_drag_for_device (surface, device, button, x, y, timestamp);
} }
@ -3636,7 +3618,7 @@ gdk_drag_begin (GdkSurface *surface,
{ {
g_return_val_if_fail (GDK_IS_SURFACE (surface), NULL); g_return_val_if_fail (GDK_IS_SURFACE (surface), NULL);
g_return_val_if_fail (GDK_IS_DEVICE (device), NULL); g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
g_return_val_if_fail (gdk_surface_get_display (surface) == gdk_device_get_display (device), NULL); g_return_val_if_fail (surface->display == gdk_device_get_display (device), NULL);
g_return_val_if_fail (GDK_IS_CONTENT_PROVIDER (content), NULL); g_return_val_if_fail (GDK_IS_CONTENT_PROVIDER (content), NULL);
return GDK_SURFACE_GET_CLASS (surface)->drag_begin (surface, device, content, actions, dx, dy); return GDK_SURFACE_GET_CLASS (surface)->drag_begin (surface, device, content, actions, dx, dy);
@ -3646,14 +3628,10 @@ static void
gdk_surface_flush_events (GdkFrameClock *clock, gdk_surface_flush_events (GdkFrameClock *clock,
void *data) void *data)
{ {
GdkSurface *surface; GdkSurface *surface = GDK_SURFACE (data);
GdkDisplay *display;
surface = GDK_SURFACE (data); _gdk_event_queue_flush (surface->display);
_gdk_display_pause_events (surface->display);
display = gdk_surface_get_display (surface);
_gdk_event_queue_flush (display);
_gdk_display_pause_events (display);
gdk_frame_clock_request_phase (clock, GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS); gdk_frame_clock_request_phase (clock, GDK_FRAME_CLOCK_PHASE_RESUME_EVENTS);
@ -3664,13 +3642,9 @@ static void
gdk_surface_resume_events (GdkFrameClock *clock, gdk_surface_resume_events (GdkFrameClock *clock,
void *data) void *data)
{ {
GdkSurface *surface; GdkSurface *surface = GDK_SURFACE (data);
GdkDisplay *display;
surface = GDK_SURFACE (data); _gdk_display_unpause_events (surface->display);
display = gdk_surface_get_display (surface);
_gdk_display_unpause_events (display);
surface->frame_clock_events_paused = FALSE; surface->frame_clock_events_paused = FALSE;
} }