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

monitor: Move get_suggested() behind behind vfunc

Browse Source 
Only support suggested monitor positioning if the monitor is non-tiled.
Normally this functionality is used by virtual machines to provide a
hint of how to place the virtual monitors, and they don't tend to use
tiled monitors anyway.

https://bugzilla.gnome.org/show_bug.cgi?id=781723
This commit is contained in:
Jonas Ådahl 2017-05-01 11:55:10 +08:00
parent a6678a262c
commit d8adfa9a31
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/backends/meta-monitor.c
View File

@ -384,6 +384,23 @@ meta_monitor_normal_derive_dimensions (MetaMonitor *monitor,
*height = output->crtc->rect.height; *height = output->crtc->rect.height;
} }
static gboolean
meta_monitor_normal_get_suggested_position (MetaMonitor *monitor,
int *x,
int *y)
{
MetaOutput *output;
output = meta_monitor_get_main_output (monitor);
if (output->suggested_x < 0 && output->suggested_y < 0)
return FALSE;
*x = output->suggested_x;
*y = output->suggested_y;
return TRUE;
}
static void static void
meta_monitor_normal_init (MetaMonitorNormal *monitor) meta_monitor_normal_init (MetaMonitorNormal *monitor)
{ {
@ -396,6 +413,7 @@ meta_monitor_normal_class_init (MetaMonitorNormalClass *klass)
monitor_class->get_main_output = meta_monitor_normal_get_main_output; monitor_class->get_main_output = meta_monitor_normal_get_main_output;
monitor_class->derive_dimensions = meta_monitor_normal_derive_dimensions; monitor_class->derive_dimensions = meta_monitor_normal_derive_dimensions;
monitor_class->get_suggested_position = meta_monitor_normal_get_suggested_position;
} }
uint32_t uint32_t
@ -409,16 +427,8 @@ meta_monitor_get_suggested_position (MetaMonitor *monitor,
int *x, int *x,
int *y) int *y)
{ {
MetaOutput *main_output; return META_MONITOR_GET_CLASS (monitor)->get_suggested_position (monitor,
x, y);
main_output = meta_monitor_get_main_output (monitor);
if (main_output->suggested_x < 0 && main_output->suggested_y < 0)
return FALSE;
*x = main_output->suggested_x;
*y = main_output->suggested_y;
return TRUE;
} }
static void static void
@ -729,6 +739,14 @@ meta_monitor_tiled_derive_dimensions (MetaMonitor *monitor,
*out_height = max_y - min_y; *out_height = max_y - min_y;
} }
static gboolean
meta_monitor_tiled_get_suggested_position (MetaMonitor *monitor,
int *x,
int *y)
{
return FALSE;
}
static void static void
meta_monitor_tiled_finalize (GObject *object) meta_monitor_tiled_finalize (GObject *object)
{ {
@ -756,6 +774,7 @@ meta_monitor_tiled_class_init (MetaMonitorTiledClass *klass)
monitor_class->get_main_output = meta_monitor_tiled_get_main_output; monitor_class->get_main_output = meta_monitor_tiled_get_main_output;
monitor_class->derive_dimensions = meta_monitor_tiled_derive_dimensions; monitor_class->derive_dimensions = meta_monitor_tiled_derive_dimensions;
monitor_class->get_suggested_position = meta_monitor_tiled_get_suggested_position;
} }
static void static void

3
src/backends/meta-monitor.h
View File

@ -68,6 +68,9 @@ struct _MetaMonitorClass
void (* derive_dimensions) (MetaMonitor *monitor, void (* derive_dimensions) (MetaMonitor *monitor,
int *width, int *width,
int *height); int *height);
gboolean (* get_suggested_position) (MetaMonitor *monitor,
int *width,
int *height);
}; };
#define META_TYPE_MONITOR_NORMAL (meta_monitor_normal_get_type ()) #define META_TYPE_MONITOR_NORMAL (meta_monitor_normal_get_type ())