princeamd pushed a commit to branch enlightenment-0.17.
commit ef10745993d98b4aa7216906d87616c8b3f84b39
Author: Chris Michael <[email protected]>
Date: Fri May 24 11:28:34 2013 +0100
Backport: 7bd21a7 :: Preliminary support for Primary Output of XRandR
NB: If you have more than one output, XRandR has the option/support to
set a specific monitor as the primary output. These changes allow some
distinction in the dialog between which output is primary (a faint
glow around the monitor). This is just the "display" portion of
Primary Output support ... next is a method to Change that.
Signed-off-by: Chris Michael <[email protected]>
Signed-off-by: Deon Thomas <[email protected]>
---
src/bin/e_randr.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/src/bin/e_randr.c b/src/bin/e_randr.c
index 180ceec..eefe094 100644
--- a/src/bin/e_randr.c
+++ b/src/bin/e_randr.c
@@ -212,6 +212,7 @@ _e_randr_config_new(void)
{
Ecore_X_Window root = 0;
Ecore_X_Randr_Crtc *crtcs = NULL;
+ Ecore_X_Randr_Output primary = 0;
int ncrtcs = 0, i = 0;
/* create new randr cfg */
@@ -230,6 +231,9 @@ _e_randr_config_new(void)
/* grab the root window once */
root = ecore_x_window_root_first_get();
+ /* get which output is primary */
+ primary = ecore_x_randr_primary_output_get(root);
+
/* record the current screen size in our config */
ecore_x_randr_screen_current_size_get(root, &e_randr_cfg->screen.width,
&e_randr_cfg->screen.height,
@@ -273,6 +277,23 @@ _e_randr_config_new(void)
/* assign crtc for this output */
output_cfg->crtc = crtcs[i];
output_cfg->exists = EINA_TRUE;
+ if (outputs[j] == primary)
+ output_cfg->primary = EINA_TRUE;
+
+ if (!primary)
+ {
+ /* X has no primary output set */
+ if (j == 0)
+ {
+ /* if no primary is set, then we should
+ * use the first output listed by xrandr */
+ output_cfg->primary = EINA_TRUE;
+ primary = outputs[j];
+
+ ecore_x_randr_primary_output_set(root,
+ primary);
+ }
+ }
/* add this output to the list for this crtc */
crtc_cfg->outputs =
@@ -527,6 +548,14 @@ _e_randr_config_restore(void)
crtc_cfg->y,
crtc_cfg->mode,
crtc_cfg->orient);
+
+ EINA_LIST_FOREACH(valid_outputs, o, out)
+ if (out->primary)
+ {
+ ecore_x_randr_primary_output_set(root, out->xid);
+ break;
+ }
+
free(couts);
}
}
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
