isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-11 00:26:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland-surface: Remove some properties from the double-buffered state

Browse Source 
Now that we can always set them on the MetaWindow...
This commit is contained in:
Jasper St. Pierre 2013-11-19 16:04:14 -05:00
parent 153d8efcf5
commit 0cc5cf940b
2 changed files with 9 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/wayland/meta-wayland-surface.c
View File

@ -322,27 +322,6 @@ meta_wayland_surface_commit (struct wl_client *client,
meta_window_set_opaque_region (surface->window, surface->pending.opaque_region); meta_window_set_opaque_region (surface->window, surface->pending.opaque_region);
meta_window_set_input_region (surface->window, surface->pending.input_region); meta_window_set_input_region (surface->window, surface->pending.input_region);
surface_process_damage (surface, surface->pending.damage); surface_process_damage (surface, surface->pending.damage);
meta_window_set_title (surface->window, surface->pending.title);
g_clear_pointer (&surface->pending.title, g_free);
meta_window_set_wm_class (surface->window, surface->pending.app_id, surface->pending.app_id);
g_clear_pointer (&surface->pending.app_id, g_free);
meta_window_set_gtk_dbus_properties (surface->window,
surface->pending.gtk_application_id,
surface->pending.gtk_unique_bus_name,
surface->pending.gtk_app_menu_path,
surface->pending.gtk_menubar_path,
surface->pending.gtk_application_object_path,
surface->pending.gtk_window_object_path);
g_clear_pointer (&surface->pending.gtk_application_id, g_free);
g_clear_pointer (&surface->pending.gtk_unique_bus_name, g_free);
g_clear_pointer (&surface->pending.gtk_app_menu_path, g_free);
g_clear_pointer (&surface->pending.gtk_menubar_path, g_free);
g_clear_pointer (&surface->pending.gtk_application_object_path, g_free);
g_clear_pointer (&surface->pending.gtk_window_object_path, g_free);
} }
if (surface->pending.buffer) if (surface->pending.buffer)
@ -570,8 +549,7 @@ xdg_surface_set_title (struct wl_client *client,
MetaWaylandSurfaceExtension *xdg_surface = wl_resource_get_user_data (resource); MetaWaylandSurfaceExtension *xdg_surface = wl_resource_get_user_data (resource);
MetaWaylandSurface *surface = wl_container_of (xdg_surface, surface, xdg_surface); MetaWaylandSurface *surface = wl_container_of (xdg_surface, surface, xdg_surface);
g_clear_pointer (&surface->pending.title, g_free); meta_window_set_title (surface->window, title);
surface->pending.title = g_strdup (title);
} }
static void static void
@ -582,8 +560,7 @@ xdg_surface_set_app_id (struct wl_client *client,
MetaWaylandSurfaceExtension *xdg_surface = wl_resource_get_user_data (resource); MetaWaylandSurfaceExtension *xdg_surface = wl_resource_get_user_data (resource);
MetaWaylandSurface *surface = wl_container_of (xdg_surface, surface, xdg_surface); MetaWaylandSurface *surface = wl_container_of (xdg_surface, surface, xdg_surface);
g_clear_pointer (&surface->pending.app_id, g_free); meta_window_set_wm_class (surface->window, app_id, app_id);
surface->pending.app_id = g_strdup (app_id);
} }
static void static void
@ -829,18 +806,13 @@ set_dbus_properties (struct wl_client *client,
MetaWaylandSurfaceExtension *gtk_surface = wl_resource_get_user_data (resource); MetaWaylandSurfaceExtension *gtk_surface = wl_resource_get_user_data (resource);
MetaWaylandSurface *surface = wl_container_of (gtk_surface, surface, gtk_surface); MetaWaylandSurface *surface = wl_container_of (gtk_surface, surface, gtk_surface);
g_clear_pointer (&surface->pending.gtk_application_id, g_free); meta_window_set_gtk_dbus_properties (surface->window,
surface->pending.gtk_application_id = g_strdup (application_id); application_id,
g_clear_pointer (&surface->pending.gtk_unique_bus_name, g_free); unique_bus_name,
surface->pending.gtk_unique_bus_name = g_strdup (unique_bus_name); app_menu_path,
g_clear_pointer (&surface->pending.gtk_app_menu_path, g_free); menubar_path,
surface->pending.gtk_app_menu_path = g_strdup (app_menu_path); application_object_path,
g_clear_pointer (&surface->pending.gtk_menubar_path, g_free); window_object_path);
surface->pending.gtk_menubar_path = g_strdup (menubar_path);
g_clear_pointer (&surface->pending.gtk_application_object_path, g_free);
surface->pending.gtk_application_object_path = g_strdup (application_object_path);
g_clear_pointer (&surface->pending.gtk_window_object_path, g_free);
surface->pending.gtk_window_object_path = g_strdup (window_object_path);
} }
static const struct gtk_surface_interface meta_wayland_gtk_surface_interface = { static const struct gtk_surface_interface meta_wayland_gtk_surface_interface = {

12
src/wayland/meta-wayland-surface.h
View File

@ -64,18 +64,6 @@ typedef struct
/* wl_surface.frame */ /* wl_surface.frame */
struct wl_list frame_callback_list; struct wl_list frame_callback_list;
/* xdg_surface */
char *title;
char *app_id;
/* gtk_surface */
char *gtk_application_id;
char *gtk_unique_bus_name;
char *gtk_app_menu_path;
char *gtk_menubar_path;
char *gtk_application_object_path;
char *gtk_window_object_path;
} MetaWaylandDoubleBufferedState; } MetaWaylandDoubleBufferedState;
typedef struct typedef struct