brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Make surface role vfunc better named

Browse Source 
It checks whether a surface is on a given "logical monitor", not
output. Output here is the Wayland name for the same thing, but should
not be confused with MetaOutput.

https://bugzilla.gnome.org/show_bug.cgi?id=777732
This commit is contained in:
Jonas Ådahl 2016-11-25 14:38:28 +08:00
parent 920cc15ea9
commit 36f2d5b0f1
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wayland/meta-wayland-surface-role-cursor.c
View File

@ -177,8 +177,8 @@ cursor_surface_role_commit (MetaWaylandSurfaceRole *surface_role,
} }
static gboolean static gboolean
cursor_surface_role_is_on_output (MetaWaylandSurfaceRole *role, cursor_surface_role_is_on_logical_monitor (MetaWaylandSurfaceRole *role,
MetaLogicalMonitor *logical_monitor) MetaLogicalMonitor *logical_monitor)
{ {
MetaWaylandSurface *surface = MetaWaylandSurface *surface =
meta_wayland_surface_role_get_surface (role); meta_wayland_surface_role_get_surface (role);
@ -271,7 +271,7 @@ meta_wayland_surface_role_cursor_class_init (MetaWaylandSurfaceRoleCursorClass *
surface_role_class->assigned = cursor_surface_role_assigned; surface_role_class->assigned = cursor_surface_role_assigned;
surface_role_class->pre_commit = cursor_surface_role_pre_commit; surface_role_class->pre_commit = cursor_surface_role_pre_commit;
surface_role_class->commit = cursor_surface_role_commit; surface_role_class->commit = cursor_surface_role_commit;
surface_role_class->is_on_output = cursor_surface_role_is_on_output; surface_role_class->is_on_logical_monitor = cursor_surface_role_is_on_logical_monitor;
object_class->constructed = cursor_surface_role_constructed; object_class->constructed = cursor_surface_role_constructed;
object_class->dispose = cursor_surface_role_dispose; object_class->dispose = cursor_surface_role_dispose;

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

@ -147,8 +147,8 @@ meta_wayland_surface_role_commit (MetaWaylandSurfaceRole *surface_role,
MetaWaylandPendingState *pending); MetaWaylandPendingState *pending);
static gboolean static gboolean
meta_wayland_surface_role_is_on_output (MetaWaylandSurfaceRole *surface_role, meta_wayland_surface_role_is_on_logical_monitor (MetaWaylandSurfaceRole *surface_role,
MetaLogicalMonitor *logical_monitor); MetaLogicalMonitor *logical_monitor);
static MetaWaylandSurface * static MetaWaylandSurface *
meta_wayland_surface_role_get_toplevel (MetaWaylandSurfaceRole *surface_role); meta_wayland_surface_role_get_toplevel (MetaWaylandSurfaceRole *surface_role);
@ -1170,8 +1170,8 @@ set_surface_is_on_output (MetaWaylandSurface *surface,
} }
static gboolean static gboolean
actor_surface_is_on_output (MetaWaylandSurfaceRole *surface_role, actor_surface_is_on_logical_monitor (MetaWaylandSurfaceRole *surface_role,
MetaLogicalMonitor *logical_monitor) MetaLogicalMonitor *logical_monitor)
{ {
MetaWaylandSurface *surface = MetaWaylandSurface *surface =
meta_wayland_surface_role_get_surface (surface_role); meta_wayland_surface_role_get_surface (surface_role);
@ -1187,7 +1187,7 @@ update_surface_output_state (gpointer key, gpointer value, gpointer user_data)
MetaWaylandOutput *wayland_output = value; MetaWaylandOutput *wayland_output = value;
MetaWaylandSurface *surface = user_data; MetaWaylandSurface *surface = user_data;
MetaLogicalMonitor *logical_monitor; MetaLogicalMonitor *logical_monitor;
gboolean is_on_output; gboolean is_on_logical_monitor;
g_assert (surface->role); g_assert (surface->role);
@ -1198,8 +1198,10 @@ update_surface_output_state (gpointer key, gpointer value, gpointer user_data)
return; return;
} }
is_on_output = meta_wayland_surface_role_is_on_output (surface->role, logical_monitor); is_on_logical_monitor =
set_surface_is_on_output (surface, wayland_output, is_on_output); meta_wayland_surface_role_is_on_logical_monitor (surface->role,
logical_monitor);
set_surface_is_on_output (surface, wayland_output, is_on_logical_monitor);
} }
static void static void
@ -1924,14 +1926,14 @@ meta_wayland_surface_role_commit (MetaWaylandSurfaceRole *surface_role,
} }
static gboolean static gboolean
meta_wayland_surface_role_is_on_output (MetaWaylandSurfaceRole *surface_role, meta_wayland_surface_role_is_on_logical_monitor (MetaWaylandSurfaceRole *surface_role,
MetaLogicalMonitor *logical_monitor) MetaLogicalMonitor *logical_monitor)
{ {
MetaWaylandSurfaceRoleClass *klass; MetaWaylandSurfaceRoleClass *klass;
klass = META_WAYLAND_SURFACE_ROLE_GET_CLASS (surface_role); klass = META_WAYLAND_SURFACE_ROLE_GET_CLASS (surface_role);
if (klass->is_on_output) if (klass->is_on_logical_monitor)
return klass->is_on_output (surface_role, logical_monitor); return klass->is_on_logical_monitor (surface_role, logical_monitor);
else else
return FALSE; return FALSE;
} }
@ -2066,7 +2068,7 @@ meta_wayland_surface_role_actor_surface_class_init (MetaWaylandSurfaceRoleActorS
surface_role_class->assigned = actor_surface_assigned; surface_role_class->assigned = actor_surface_assigned;
surface_role_class->commit = actor_surface_commit; surface_role_class->commit = actor_surface_commit;
surface_role_class->is_on_output = actor_surface_is_on_output; surface_role_class->is_on_logical_monitor = actor_surface_is_on_logical_monitor;
} }
static void static void

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

@ -60,8 +60,8 @@ struct _MetaWaylandSurfaceRoleClass
MetaWaylandPendingState *pending); MetaWaylandPendingState *pending);
void (*commit) (MetaWaylandSurfaceRole *surface_role, void (*commit) (MetaWaylandSurfaceRole *surface_role,
MetaWaylandPendingState *pending); MetaWaylandPendingState *pending);
gboolean (*is_on_output) (MetaWaylandSurfaceRole *surface_role, gboolean (*is_on_logical_monitor) (MetaWaylandSurfaceRole *surface_role,
MetaLogicalMonitor *logical_monitor); MetaLogicalMonitor *logical_monitor);
MetaWaylandSurface * (*get_toplevel) (MetaWaylandSurfaceRole *surface_role); MetaWaylandSurface * (*get_toplevel) (MetaWaylandSurfaceRole *surface_role);
}; };