callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Don't invent our own unstable protocol semantics

Browse Source 
The gtk_shell protocol used some half baked unstable protocol semantics
that worked by only allowing binding the exact version of the
interface. This hack is a bit too confusing and it makes it impossible
to do any compatible changes without breaking things.

So, instead rename it to include a number in the interface names. This
way we can add requests and events without causing compatibility issues,
and we can later remove requests and events by bumping the number in
the interface names.

https://bugzilla.gnome.org/show_bug.cgi?id=763001
This commit is contained in:
Jonas Ådahl
2016-03-07 11:49:35 +08:00
parent 30faa9a2a9
commit f68cf698fc
6 changed files with 43 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,17 +262,14 @@ gdk_registry_handle_global (void *data,
xdg_shell_use_unstable_version (display_wayland->xdg_shell, XDG_SHELL_VERSION_CURRENT);
xdg_shell_add_listener (display_wayland->xdg_shell, &xdg_shell_listener, display_wayland);
}
else if (strcmp (interface, "gtk_shell") == 0)
else if (strcmp (interface, "gtk_shell1") == 0)
{
if (version >= MINIMUM_GTK_SHELL_VERSION)
{
version = MIN (version, SUPPORTED_GTK_SHELL_VERSION);
display_wayland->gtk_shell =
wl_registry_bind(display_wayland->wl_registry, id,
&gtk_shell_interface, version);
_gdk_wayland_screen_set_has_gtk_shell (display_wayland->screen);
display_wayland->gtk_shell_version = version;
}
display_wayland->gtk_shell =
wl_registry_bind(display_wayland->wl_registry, id,
&gtk_shell1_interface,
1);
_gdk_wayland_screen_set_has_gtk_shell (display_wayland->screen);
display_wayland->gtk_shell_version = version;
}
else if (strcmp (interface, "wl_output") == 0)
{
@ -666,8 +663,8 @@ gdk_wayland_display_notify_startup_complete (GdkDisplay *display,
return;
}
if (display_wayland->gtk_shell_version >= GTK_SHELL_HAS_SET_STARTUP_ID)
gtk_shell_set_startup_id (display_wayland->gtk_shell, startup_id);
if (display_wayland->gtk_shell)
gtk_shell1_set_startup_id (display_wayland->gtk_shell, startup_id);
g_free (free_this);
}