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

Revert "wayland: Support always-on-top / sticky windows"

Browse Source 
This reverts commit b3cffb85f3.

Pushed by accident.
This commit is contained in:
Jasper St. Pierre 2013-10-29 17:13:03 -04:00
parent 4d41903548
commit ad59827ec8
4 changed files with 22 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,7 @@ gdk_registry_handle_global(void *data, struct wl_registry *registry, uint32_t id
wl_registry_bind(display_wayland->wl_registry, id, &wl_shell_interface, 1);
} else if (strcmp(interface, "gtk_shell") == 0) {
display_wayland->gtk_shell =
wl_registry_bind(display_wayland->wl_registry, id, &gtk_shell_interface, 2);
wl_registry_bind(display_wayland->wl_registry, id, &gtk_shell_interface, 1);
_gdk_wayland_screen_set_has_gtk_shell (display_wayland->screen);
/* We need another roundtrip to receive the shell capabilities */
wait_for_roundtrip(display_wayland);

12
gdk/wayland/gdkwindow-wayland.c
View File

@ -1647,23 +1647,15 @@ gdk_wayland_window_deiconify (GdkWindow *window)
static void
gdk_wayland_window_stick (GdkWindow *window)
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
if (GDK_WINDOW_DESTROYED (window))
return;
gtk_surface_set_on_all_workspaces (impl->gtk_surface, TRUE);
}
static void
gdk_wayland_window_unstick (GdkWindow *window)
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
if (GDK_WINDOW_DESTROYED (window))
return;
gtk_surface_set_on_all_workspaces (impl->gtk_surface, FALSE);
}
static void
@ -1777,12 +1769,10 @@ static void
gdk_wayland_window_set_keep_above (GdkWindow *window,
gboolean setting)
{
GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
g_return_if_fail (GDK_IS_WINDOW (window));
if (GDK_WINDOW_DESTROYED (window))
return;
gtk_surface_set_always_on_top (impl->gtk_surface, setting);
}
static void

32
gdk/wayland/protocol/gtk-shell.xml
View File

@ -1,11 +1,11 @@
<protocol name="gtk">
<interface name="gtk_shell" version="2">
<interface name="gtk_shell" version="1">
<enum name="capability">
<entry name="global_app_menu" value="1"/>
<entry name="global_menu_bar" value="2"/>
</enum>
<event name="capabilities">
<arg name="capabilities" type="uint"/>
</event>
@ -16,7 +16,7 @@
</request>
</interface>
<interface name="gtk_surface" version="2">
<interface name="gtk_surface" version="1">
<request name="set_dbus_properties">
<arg name="application_id" type="string" allow-null="true"/>
<arg name="app_menu_path" type="string" allow-null="true"/>
@ -25,32 +25,6 @@
<arg name="application_object_path" type="string" allow-null="true"/>
<arg name="unique_bus_name" type="string" allow-null="true"/>
</request>
<request name="set_workspace">
<arg name="workspace" type="uint" />
</request>
<event name="workspace_changed">
<arg name="new_workspace" type="uint" />
</event>
<enum name="always_on_top_state">
<entry name="not_always_on_top" value="0" />
<entry name="always_on_top" value="1" />
</enum>
<request name="set_always_on_top">
<arg name="always_on_top" type="uint" />
</request>
<enum name="on_all_workspaces">
<entry name="not_on_all_workspaces" value="0" />
<entry name="on_all_workspaces" value="1" />
</enum>
<request name="set_on_all_workspaces">
<arg name="on_all_workspaces" type="uint" />
</request>
</interface>
</protocol>

34
gtk/gtkwindow.c
View File

@ -8119,6 +8119,7 @@ ontop_window_clicked (GtkMenuItem *menuitem,
gtk_window_set_keep_above (window, !window->priv->above_initially);
}
#ifdef GDK_WINDOWING_X11
static void
stick_window_clicked (GtkMenuItem *menuitem,
gpointer user_data)
@ -8137,7 +8138,6 @@ unstick_window_clicked (GtkMenuItem *menuitem,
gtk_window_unstick (window);
}
#ifdef GDK_WINDOWING_X11
static void
workspace_change_clicked (GtkMenuItem *menuitem,
gpointer user_data)
@ -8205,25 +8205,25 @@ gtk_window_do_popup (GtkWindow *window,
G_CALLBACK (ontop_window_clicked), window);
gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem);
menuitem = gtk_check_menu_item_new_with_label (_("Always on Visible Workspace"));
gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (menuitem), TRUE);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), priv->stick_initially);
gtk_widget_show (menuitem);
g_signal_connect (G_OBJECT (menuitem), "activate",
G_CALLBACK (stick_window_clicked), window);
gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem);
menuitem = gtk_check_menu_item_new_with_label (_("Only on This Workspace"));
gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (menuitem), TRUE);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), !priv->stick_initially);
gtk_widget_show (menuitem);
g_signal_connect (G_OBJECT (menuitem), "activate",
G_CALLBACK (unstick_window_clicked), window);
gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem);
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
{
menuitem = gtk_check_menu_item_new_with_label (_("Always on Visible Workspace"));
gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (menuitem), TRUE);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), priv->stick_initially);
gtk_widget_show (menuitem);
g_signal_connect (G_OBJECT (menuitem), "activate",
G_CALLBACK (stick_window_clicked), window);
gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem);
menuitem = gtk_check_menu_item_new_with_label (_("Only on This Workspace"));
gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (menuitem), TRUE);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), !priv->stick_initially);
gtk_widget_show (menuitem);
g_signal_connect (G_OBJECT (menuitem), "activate",
G_CALLBACK (unstick_window_clicked), window);
gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem);
if (!priv->stick_initially)
{
guint32 n_desktops, desktop;