AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-08 17:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'display-cleanup' into 'master'

Browse Source 
Display cleanup

See merge request GNOME/gtk!2319
This commit is contained in:
Matthias Clasen 2020-07-30 03:55:23 +00:00
commit 0b11e78064
10 changed files with 20 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gdk/gdk4-sections.txt
View File

@ -81,7 +81,6 @@ gdk_display_close
gdk_display_is_closed
gdk_display_is_rgba
gdk_display_is_composited
gdk_display_get_default_group
gdk_display_supports_input_shapes
gdk_display_get_app_launch_context
gdk_display_notify_startup_complete
@ -817,6 +816,7 @@ gdk_x11_display_get_xrootwindow
gdk_x11_display_get_xcursor
gdk_x11_display_grab
gdk_x11_display_ungrab
gdk_x11_display_get_default_group
gdk_x11_display_error_trap_push
gdk_x11_display_error_trap_pop
gdk_x11_display_error_trap_pop_ignored

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

@ -265,14 +265,6 @@ gdk_broadway_display_has_pending (GdkDisplay *display)
return FALSE;
}
static GdkSurface *
gdk_broadway_display_get_default_group (GdkDisplay *display)
{
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
return NULL;
}
static void
gdk_broadway_display_dispose (GObject *object)
{
@ -441,7 +433,6 @@ gdk_broadway_display_class_init (GdkBroadwayDisplayClass * class)
display_class->flush = gdk_broadway_display_flush;
display_class->has_pending = gdk_broadway_display_has_pending;
display_class->queue_events = _gdk_broadway_display_queue_events;
display_class->get_default_group = gdk_broadway_display_get_default_group;
display_class->get_next_serial = gdk_broadway_display_get_next_serial;
display_class->notify_startup_complete = gdk_broadway_display_notify_startup_complete;

23
gdk/gdkdisplay.c
View File

@ -994,25 +994,6 @@ gdk_display_flush (GdkDisplay *display)
GDK_DISPLAY_GET_CLASS (display)->flush (display);
}
/**
* gdk_display_get_default_group:
* @display: a #GdkDisplay
*
* Returns the default group leader surface for all toplevel surfaces
* on @display. This surface is implicitly created by GDK.
* See gdk_surface_set_group().
*
* Returns: (transfer none): The default group leader surface
* for @display
**/
GdkSurface *
gdk_display_get_default_group (GdkDisplay *display)
{
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
return GDK_DISPLAY_GET_CLASS (display)->get_default_group (display);
}
/**
* gdk_display_get_clipboard:
* @display: a #GdkDisplay
@ -1057,9 +1038,11 @@ gdk_display_get_primary_clipboard (GdkDisplay *display)
* gdk_display_supports_input_shapes:
* @display: a #GdkDisplay
*
* Returns %TRUE if gdk_surface_input_shape_combine_mask() can
* Returns %TRUE if gdk_surface_set_input_region() can
* be used to modify the input shape of surfaces on @display.
*
* On modern displays, this value is always %TRUE.
*
* Returns: %TRUE if surfaces with modified input shape are supported
*/
gboolean

3
gdk/gdkdisplay.h
View File

@ -71,9 +71,6 @@ gboolean gdk_display_supports_input_shapes (GdkDisplay *display);
GDK_AVAILABLE_IN_ALL
GdkDisplay *gdk_display_get_default (void);
GDK_AVAILABLE_IN_ALL
GdkSurface *gdk_display_get_default_group (GdkDisplay *display);
GDK_AVAILABLE_IN_ALL
GdkClipboard * gdk_display_get_clipboard (GdkDisplay *display);
GDK_AVAILABLE_IN_ALL

1
gdk/gdkdisplayprivate.h
View File

@ -123,7 +123,6 @@ struct _GdkDisplayClass
gboolean (*has_pending) (GdkDisplay *display);
void (*queue_events) (GdkDisplay *display);
void (*make_default) (GdkDisplay *display);
GdkSurface * (*get_default_group) (GdkDisplay *display);
GdkAppLaunchContext * (*get_app_launch_context) (GdkDisplay *display);

9
gdk/wayland/gdkdisplay-wayland.c
View File

@ -846,14 +846,6 @@ gdk_wayland_display_has_pending (GdkDisplay *display)
return FALSE;
}
static GdkSurface *
gdk_wayland_display_get_default_group (GdkDisplay *display)
{
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
return NULL;
}
static gulong
gdk_wayland_display_get_next_serial (GdkDisplay *display)
{
@ -1012,7 +1004,6 @@ gdk_wayland_display_class_init (GdkWaylandDisplayClass *class)
display_class->make_default = gdk_wayland_display_make_default;
display_class->has_pending = gdk_wayland_display_has_pending;
display_class->queue_events = _gdk_wayland_display_queue_events;
display_class->get_default_group = gdk_wayland_display_get_default_group;
display_class->get_app_launch_context = _gdk_wayland_display_get_app_launch_context;
display_class->get_next_serial = gdk_wayland_display_get_next_serial;
display_class->get_startup_notification_id = gdk_wayland_display_get_startup_notification_id;

11
gdk/win32/gdkdisplay-win32.c
View File

@ -612,16 +612,6 @@ gdk_win32_display_get_name (GdkDisplay *display)
return display_name_cache;
}
static GdkSurface *
gdk_win32_display_get_default_group (GdkDisplay *display)
{
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
g_warning ("gdk_display_get_default_group not yet implemented");
return NULL;
}
static void
gdk_win32_display_beep (GdkDisplay *display)
{
@ -1061,7 +1051,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
display_class->flush = gdk_win32_display_flush;
display_class->has_pending = _gdk_win32_display_has_pending;
display_class->queue_events = _gdk_win32_display_queue_events;
display_class->get_default_group = gdk_win32_display_get_default_group;
//? display_class->get_app_launch_context = _gdk_win32_display_get_app_launch_context;

14
gdk/x11/gdkdisplay-x11.c
View File

@ -1829,7 +1829,18 @@ gdk_x11_display_has_pending (GdkDisplay *display)
return XPending (GDK_DISPLAY_XDISPLAY (display));
}
static GdkSurface *
/**
* gdk_x11_display_get_default_group:
* @display: a #GdkDisplay
*
* Returns the default group leader surface for all toplevel surfaces
* on @display. This surface is implicitly created by GDK.
* See gdk_surface_set_group().
*
* Returns: (transfer none): The default group leader surface
* for @display
*/
GdkSurface *
gdk_x11_display_get_default_group (GdkDisplay *display)
{
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
@ -2937,7 +2948,6 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
display_class->make_default = gdk_x11_display_make_default;
display_class->has_pending = gdk_x11_display_has_pending;
display_class->queue_events = _gdk_x11_display_queue_events;
display_class->get_default_group = gdk_x11_display_get_default_group;
display_class->get_app_launch_context = _gdk_x11_display_get_app_launch_context;
display_class->get_next_serial = gdk_x11_display_get_next_serial;

2
gdk/x11/gdksurface-x11.c
View File

@ -3392,7 +3392,7 @@ gdk_x11_surface_set_group (GdkSurface *surface,
toplevel = _gdk_x11_surface_get_toplevel (surface);
if (leader == NULL)
leader = gdk_display_get_default_group (gdk_surface_get_display (surface));
leader = gdk_x11_display_get_default_group (gdk_surface_get_display (surface));
if (toplevel->group_leader != leader)
{

3
gdk/x11/gdkx11display.h
View File

@ -128,6 +128,9 @@ void gdk_x11_display_error_trap_pop_ignored (GdkDispla
GDK_AVAILABLE_IN_ALL
void gdk_x11_set_sm_client_id (const char *sm_client_id);
GDK_AVAILABLE_IN_ALL
GdkSurface * gdk_x11_display_get_default_group (GdkDisplay *display);
G_END_DECLS
#endif /* __GDK_X11_DISPLAY_H__ */