[mutter] monitor-manager-dummy: Add non-preferred mode
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] monitor-manager-dummy: Add non-preferred mode
- Date: Thu, 9 Mar 2017 02:21:32 +0000 (UTC)
commit 3ace913aed939868f8592c4fdf742157c903b392
Author: Jonas Ådahl <jadahl gmail com>
Date: Wed Mar 8 11:58:44 2017 +0800
monitor-manager-dummy: Add non-preferred mode
Add an extra mode besides the preferred one. This makes it possible to
test monitor configuration paths when running nested.
https://bugzilla.gnome.org/show_bug.cgi?id=779745
src/backends/meta-monitor-manager-dummy.c | 32 +++++++++++++++++++----------
1 files changed, 21 insertions(+), 11 deletions(-)
---
diff --git a/src/backends/meta-monitor-manager-dummy.c b/src/backends/meta-monitor-manager-dummy.c
index 84fbce3..b824f03 100644
--- a/src/backends/meta-monitor-manager-dummy.c
+++ b/src/backends/meta-monitor-manager-dummy.c
@@ -60,17 +60,25 @@ append_monitor (GArray *modes,
GArray *outputs,
int scale)
{
- MetaCrtcMode mode;
+ MetaCrtcMode modes_decl[] = {
+ {
+ .width = 800,
+ .height = 600,
+ .refresh_rate = 60.0
+ },
+ {
+ .width = 1024,
+ .height = 768,
+ .refresh_rate = 60.0
+ }
+ };
MetaCrtc crtc;
MetaOutput output;
+ unsigned int i;
- mode = (MetaCrtcMode) {
- .mode_id = modes->len,
- .width = 1024,
- .height = 768,
- .refresh_rate = 60.0
- };
- g_array_append_val (modes, mode);
+ for (i = 0; i < G_N_ELEMENTS (modes_decl); i++)
+ modes_decl[i].mode_id = modes->len + i;
+ g_array_append_vals (modes, modes_decl, G_N_ELEMENTS (modes_decl));
crtc = (MetaCrtc) {
.crtc_id = crtcs->len + 1,
@@ -96,9 +104,11 @@ append_monitor (GArray *modes,
.scale = scale,
};
- output.modes = g_new0 (MetaCrtcMode *, 1);
- output.modes[0] = &array_last (modes, MetaCrtcMode);
- output.n_modes = 1;
+ output.modes = g_new0 (MetaCrtcMode *, G_N_ELEMENTS (modes_decl));
+ for (i = 0; i < G_N_ELEMENTS (modes_decl); i++)
+ output.modes[i] = &g_array_index (modes, MetaCrtcMode,
+ modes->len - (i + 1));
+ output.n_modes = G_N_ELEMENTS (modes_decl);
output.possible_crtcs = g_new0 (MetaCrtc *, 1);
output.possible_crtcs[0] = &array_last (crtcs, MetaCrtc);
output.n_possible_crtcs = 1;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]