formatting

SVN revision: 75788
This commit is contained in:
Mike Blumenkrantz 2012-08-28 12:41:17 +00:00
parent 8764eebc1d
commit 4f75c57c75
1 changed files with 258 additions and 254 deletions

View File

@ -4,21 +4,21 @@
#define POLLINTERVAL 128 #define POLLINTERVAL 128
// Set functions for the global e_randr_screen_info struct // Set functions for the global e_randr_screen_info struct
static void _screen_primary_output_assign(E_Randr_Output_Info *removed); static void _screen_primary_output_assign(E_Randr_Output_Info *removed);
// Init helper functions // Init helper functions
static void _outputs_init(void); static void _outputs_init(void);
static void _crtcs_init(void); static void _crtcs_init(void);
static Eina_Bool _structs_init(void); static Eina_Bool _structs_init(void);
// Retrieval helper functions // Retrieval helper functions
static Ecore_X_Randr_Mode_Info *_mode_geo_identical_find(Eina_List *modes, Ecore_X_Randr_Mode_Info *mode); static Ecore_X_Randr_Mode_Info *_mode_geo_identical_find(Eina_List *modes, Ecore_X_Randr_Mode_Info *mode);
// Event helper functions // Event helper functions
static Eina_Bool _x_poll_cb(void *data __UNUSED__); static Eina_Bool _x_poll_cb(void *data __UNUSED__);
static Eina_Bool _crtc_change_event_cb(void *data, int type, void *e); static Eina_Bool _crtc_change_event_cb(void *data, int type, void *e);
static Eina_Bool _output_change_event_cb(void *data, int type, void *e); static Eina_Bool _output_change_event_cb(void *data, int type, void *e);
static Eina_Bool _output_property_change_event_cb(void *data, int type, void *e); static Eina_Bool _output_property_change_event_cb(void *data, int type, void *e);
static Ecore_Poller *poller = NULL; static Ecore_Poller *poller = NULL;
static Eina_List *_event_handlers = NULL; static Eina_List *_event_handlers = NULL;
@ -52,14 +52,14 @@ _screen_info_12_new(void)
randr_info_12->alignment = ECORE_X_RANDR_RELATIVE_ALIGNMENT_NONE; randr_info_12->alignment = ECORE_X_RANDR_RELATIVE_ALIGNMENT_NONE;
ecore_x_randr_screen_size_range_get(e_randr_screen_info.root, ecore_x_randr_screen_size_range_get(e_randr_screen_info.root,
&randr_info_12->min_size.width, &randr_info_12->min_size.width,
&randr_info_12->min_size.height, &randr_info_12->min_size.height,
&randr_info_12->max_size.width, &randr_info_12->max_size.width,
&randr_info_12->max_size.height); &randr_info_12->max_size.height);
ecore_x_randr_screen_current_size_get(e_randr_screen_info.root, ecore_x_randr_screen_current_size_get(e_randr_screen_info.root,
&randr_info_12->current_size.width, &randr_info_12->current_size.width,
&randr_info_12->current_size.height, &randr_info_12->current_size.height,
NULL, NULL); NULL, NULL);
return randr_info_12; return randr_info_12;
} }
@ -128,7 +128,7 @@ _crtcs_init(void)
EINA_SAFETY_ON_TRUE_RETURN(E_RANDR_12_NO); EINA_SAFETY_ON_TRUE_RETURN(E_RANDR_12_NO);
EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, iter, crtc) EINA_LIST_FOREACH(e_randr_screen_info.rrvd_info.randr_info_12->crtcs, iter, crtc)
_crtc_refs_set(crtc); _crtc_refs_set(crtc);
} }
static void static void
@ -188,25 +188,25 @@ _12_screen_info_free(E_Randr_Screen_Info_12 *screen_info)
if (screen_info->crtcs) if (screen_info->crtcs)
{ {
EINA_LIST_FREE (screen_info->crtcs, crtc_info) EINA_LIST_FREE(screen_info->crtcs, crtc_info)
_crtc_info_free(crtc_info); _crtc_info_free(crtc_info);
free(eina_list_nth(screen_info->crtcs, 0)); free(eina_list_nth(screen_info->crtcs, 0));
} }
if (screen_info->outputs) if (screen_info->outputs)
{ {
EINA_LIST_FREE (screen_info->outputs, output_info) EINA_LIST_FREE(screen_info->outputs, output_info)
_output_info_free(output_info); _output_info_free(output_info);
free(eina_list_nth(screen_info->outputs, 0)); free(eina_list_nth(screen_info->outputs, 0));
} }
if (screen_info->modes) if (screen_info->modes)
{ {
EINA_LIST_FREE (screen_info->modes, mode_info) EINA_LIST_FREE(screen_info->modes, mode_info)
ecore_x_randr_mode_info_free(mode_info); ecore_x_randr_mode_info_free(mode_info);
} }
free (screen_info); free(screen_info);
} }
/* /*
@ -279,6 +279,7 @@ _12_screen_info_edid_is_available(const E_Randr_Edid_Hash *hash)
} }
return EINA_FALSE; return EINA_FALSE;
} }
/* /*
* returns a mode within a given list of modes that is gemetrically identical. * returns a mode within a given list of modes that is gemetrically identical.
* If none is found, NULL is returned. * If none is found, NULL is returned.
@ -311,7 +312,7 @@ _12_screen_info_refresh(void)
if (e_randr_screen_info.rrvd_info.randr_info_12) if (e_randr_screen_info.rrvd_info.randr_info_12)
_12_screen_info_free(e_randr_screen_info.rrvd_info.randr_info_12); _12_screen_info_free(e_randr_screen_info.rrvd_info.randr_info_12);
if (!(e_randr_screen_info.rrvd_info.randr_info_12 = _screen_info_12_new()) || if (!(e_randr_screen_info.rrvd_info.randr_info_12 = _screen_info_12_new()) ||
!_structs_init()) !_structs_init())
return EINA_FALSE; return EINA_FALSE;
_screen_primary_output_assign(NULL); _screen_primary_output_assign(NULL);
@ -364,7 +365,7 @@ _12_event_listeners_add(void)
static Eina_Bool static Eina_Bool
_output_change_event_cb(void *data __UNUSED__, int type, void *ev) _output_change_event_cb(void *data __UNUSED__, int type, void *ev)
{ {
Ecore_X_Event_Randr_Output_Change *oce = (Ecore_X_Event_Randr_Output_Change*)ev; Ecore_X_Event_Randr_Output_Change *oce = (Ecore_X_Event_Randr_Output_Change *)ev;
E_Randr_Output_Info *output_info = NULL; E_Randr_Output_Info *output_info = NULL;
E_Randr_Crtc_Info *crtc_info = NULL; E_Randr_Crtc_Info *crtc_info = NULL;
Eina_Bool policy_success = EINA_FALSE, con_state_changed = EINA_FALSE; Eina_Bool policy_success = EINA_FALSE, con_state_changed = EINA_FALSE;
@ -380,25 +381,25 @@ _output_change_event_cb(void *data __UNUSED__, int type, void *ev)
Ecore_X_Randr_Orientation orientation; Ecore_X_Randr_Orientation orientation;
Ecore_X_Randr_Connection_Status connection; Ecore_X_Randr_Connection_Status connection;
Ecore_X_Render_Subpixel_Order subpixel_order; Ecore_X_Render_Subpixel_Order subpixel_order;
*/ */
EINA_SAFETY_ON_FALSE_RETURN_VAL((output_info = _12_screen_info_output_info_get(oce->output)), ECORE_CALLBACK_RENEW); EINA_SAFETY_ON_FALSE_RETURN_VAL((output_info = _12_screen_info_output_info_get(oce->output)), ECORE_CALLBACK_RENEW);
DBG("E_RANDR: Output event: \n" DBG("E_RANDR: Output event: \n"
"\t\t: relative to win: %d\n" "\t\t: relative to win: %d\n"
"\t\t: output (xid): %d\n" "\t\t: output (xid): %d\n"
"\t\t: used by crtc (xid): %d\n" "\t\t: used by crtc (xid): %d\n"
"\t\t: mode: %d\n" "\t\t: mode: %d\n"
"\t\t: orientation: %d\n" "\t\t: orientation: %d\n"
"\t\t: connection state: %s\n" "\t\t: connection state: %s\n"
"\t\t: subpixel_order: %d", "\t\t: subpixel_order: %d",
oce->win, oce->win,
oce->output, oce->output,
oce->crtc, oce->crtc,
oce->mode, oce->mode,
oce->orientation, oce->orientation,
_CONNECTION_STATES_STRINGS[oce->connection], _CONNECTION_STATES_STRINGS[oce->connection],
oce->subpixel_order); oce->subpixel_order);
crtc_info = _12_screen_info_crtc_info_get(oce->crtc); crtc_info = _12_screen_info_crtc_info_get(oce->crtc);
//WORKAROUND //WORKAROUND
@ -434,8 +435,8 @@ _output_change_event_cb(void *data __UNUSED__, int type, void *ev)
if (con_state_changed) if (con_state_changed)
{ {
_monitor_info_free(output_info->monitor); _monitor_info_free(output_info->monitor);
output_info->monitor = NULL; output_info->monitor = NULL;
if (oce->connection == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) if (oce->connection == ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED)
{ {
@ -444,7 +445,7 @@ _output_change_event_cb(void *data __UNUSED__, int type, void *ev)
INF("E_RANDR: Output %d was newly connected.", output_info->xid); INF("E_RANDR: Output %d was newly connected.", output_info->xid);
//only try to enable the monitor if there is no serialized setup //only try to enable the monitor if there is no serialized setup
if(!_12_try_restore_configuration()) if (!_12_try_restore_configuration())
{ {
policy_success = e_randr_12_try_enable_output(output_info, output_info->policy, EINA_FALSE); //maybe give a success message? policy_success = e_randr_12_try_enable_output(output_info, output_info->policy, EINA_FALSE); //maybe give a success message?
INF("E_RANDR: Policy \"%s\" was enforced %ssuccesfully.", _POLICIES_STRINGS[output_info->policy - 1], (policy_success ? "" : "un")); INF("E_RANDR: Policy \"%s\" was enforced %ssuccesfully.", _POLICIES_STRINGS[output_info->policy - 1], (policy_success ? "" : "un"));
@ -477,40 +478,39 @@ _output_change_event_cb(void *data __UNUSED__, int type, void *ev)
static Eina_Bool static Eina_Bool
_crtc_change_event_cb(void *data __UNUSED__, int type, void *ev) _crtc_change_event_cb(void *data __UNUSED__, int type, void *ev)
{ {
Ecore_X_Event_Randr_Crtc_Change *cce = (Ecore_X_Event_Randr_Crtc_Change*)ev; Ecore_X_Event_Randr_Crtc_Change *cce = (Ecore_X_Event_Randr_Crtc_Change *)ev;
E_Randr_Crtc_Info *crtc_info; E_Randr_Crtc_Info *crtc_info;
EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO, ECORE_CALLBACK_CANCEL); EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO, ECORE_CALLBACK_CANCEL);
EINA_SAFETY_ON_TRUE_RETURN_VAL((type != ECORE_X_EVENT_RANDR_CRTC_CHANGE), ECORE_CALLBACK_RENEW); EINA_SAFETY_ON_TRUE_RETURN_VAL((type != ECORE_X_EVENT_RANDR_CRTC_CHANGE), ECORE_CALLBACK_RENEW);
/* event information: /* event information:
Ecore_X_Window win; Ecore_X_Window win;
Ecore_X_Randr_Crtc crtc; Ecore_X_Randr_Crtc crtc;
Ecore_X_Randr_Mode mode; Ecore_X_Randr_Mode mode;
Ecore_X_Randr_Orientation orientation; Ecore_X_Randr_Orientation orientation;
int x; int x;
int y; int y;
int width; int width;
int height; int height;
*/ */
DBG("E_RANDR: CRTC event: \n" DBG("E_RANDR: CRTC event: \n"
"\t\t: relative to win: %d\n" "\t\t: relative to win: %d\n"
"\t\t: crtc (xid): %d\n" "\t\t: crtc (xid): %d\n"
"\t\t: mode (xid): %d\n" "\t\t: mode (xid): %d\n"
"\t\t: orientation: %d\n" "\t\t: orientation: %d\n"
"\t\t: x: %d\n" "\t\t: x: %d\n"
"\t\t: y: %d\n" "\t\t: y: %d\n"
"\t\t: width: %d\n" "\t\t: width: %d\n"
"\t\t: height: %d", "\t\t: height: %d",
cce->win, cce->win,
cce->crtc, cce->crtc,
cce->mode, cce->mode,
cce->orientation, cce->orientation,
cce->geo.x, cce->geo.x,
cce->geo.y, cce->geo.y,
cce->geo.w, cce->geo.w,
cce->geo.h); cce->geo.h);
crtc_info = _12_screen_info_crtc_info_get(cce->crtc); crtc_info = _12_screen_info_crtc_info_get(cce->crtc);
EINA_SAFETY_ON_NULL_RETURN_VAL(crtc_info, ECORE_CALLBACK_RENEW); EINA_SAFETY_ON_NULL_RETURN_VAL(crtc_info, ECORE_CALLBACK_RENEW);
@ -551,7 +551,7 @@ _crtc_change_event_cb(void *data __UNUSED__, int type, void *ev)
static Eina_Bool static Eina_Bool
_output_property_change_event_cb(void *data __UNUSED__, int type, void *ev) _output_property_change_event_cb(void *data __UNUSED__, int type, void *ev)
{ {
Ecore_X_Event_Randr_Output_Property_Notify *opce = (Ecore_X_Event_Randr_Output_Property_Notify*)ev; Ecore_X_Event_Randr_Output_Property_Notify *opce = (Ecore_X_Event_Randr_Output_Property_Notify *)ev;
E_Randr_Output_Info *output_info; E_Randr_Output_Info *output_info;
EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO, ECORE_CALLBACK_CANCEL); EINA_SAFETY_ON_TRUE_RETURN_VAL(E_RANDR_12_NO, ECORE_CALLBACK_CANCEL);
@ -563,7 +563,7 @@ _output_property_change_event_cb(void *data __UNUSED__, int type, void *ev)
Ecore_X_Atom property; Ecore_X_Atom property;
Ecore_X_Time time; Ecore_X_Time time;
Ecore_X_Randr_Property_Change state; Ecore_X_Randr_Property_Change state;
*/ */
EINA_SAFETY_ON_FALSE_RETURN_VAL((output_info = _12_screen_info_output_info_get(opce->output)), ECORE_CALLBACK_RENEW); EINA_SAFETY_ON_FALSE_RETURN_VAL((output_info = _12_screen_info_output_info_get(opce->output)), ECORE_CALLBACK_RENEW);
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
@ -613,200 +613,203 @@ e_randr_12_try_enable_output(E_Randr_Output_Info *output_info, Ecore_X_Randr_Out
switch (policy) switch (policy)
{ {
case ECORE_X_RANDR_OUTPUT_POLICY_NONE: case ECORE_X_RANDR_OUTPUT_POLICY_NONE:
return EINA_TRUE; return EINA_TRUE;
case ECORE_X_RANDR_OUTPUT_POLICY_ASK: case ECORE_X_RANDR_OUTPUT_POLICY_ASK:
e_randr_12_ask_dialog_new(output_info); e_randr_12_ask_dialog_new(output_info);
return EINA_TRUE; //This is a bit incorrect (dialog feedback is async), but probably not worth a lock. return EINA_TRUE; //This is a bit incorrect (dialog feedback is async), but probably not worth a lock.
case ECORE_X_RANDR_OUTPUT_POLICY_CLONE: case ECORE_X_RANDR_OUTPUT_POLICY_CLONE:
/* /*
* Order of approaches to enable a clone (of the primary output): * Order of approaches to enable a clone (of the primary output):
* *
* 0. Get Primary output from Server * 0. Get Primary output from Server
* 1. Try to add new Output to primary output's CRTC, using the mode used * 1. Try to add new Output to primary output's CRTC, using the mode used
* by the primary output * by the primary output
* 2. Try to enable clone in the same * 2. Try to enable clone in the same
* 2a. exact mode or a * 2a. exact mode or a
* 2b. geometrically identical mode * 2b. geometrically identical mode
* 3. Find a most high resolution mode in common to enable on primary output's CRTC and the new * 3. Find a most high resolution mode in common to enable on primary output's CRTC and the new
* output's CRTC * output's CRTC
* 4. fail. * 4. fail.
*/ */
//Assign new output, if necessary //Assign new output, if necessary
_screen_primary_output_assign(output_info); _screen_primary_output_assign(output_info);
if ((primary_output = e_randr_screen_info.rrvd_info.randr_info_12->primary_output)) if ((primary_output = e_randr_screen_info.rrvd_info.randr_info_12->primary_output))
{ {
if (primary_output->crtc && primary_output->crtc->current_mode && eina_list_data_find(output_info->monitor->modes, primary_output->crtc->current_mode)) if (primary_output->crtc && primary_output->crtc->current_mode && eina_list_data_find(output_info->monitor->modes, primary_output->crtc->current_mode))
{ {
/* /*
* mode currently used by primary output's CRTC is also supported by the new output * mode currently used by primary output's CRTC is also supported by the new output
*/ */
if (eina_list_data_find(primary_output->crtc->possible_outputs, output_info) && eina_list_data_find(output_info->monitor->modes, primary_output->crtc->current_mode)) if (eina_list_data_find(primary_output->crtc->possible_outputs, output_info) && eina_list_data_find(output_info->monitor->modes, primary_output->crtc->current_mode))
{ {
/* /*
* 1. Try to add new Output to primary output's CRTC, using the mode used * 1. Try to add new Output to primary output's CRTC, using the mode used
* by the primary output * by the primary output
* TODO: check with compatibility list in RandRR >= 1.3 * TODO: check with compatibility list in RandRR >= 1.3
* if available * if available
* *
* The new output is also usable by the primary output's * The new output is also usable by the primary output's
* CRTC. Try to enable this output together with the already * CRTC. Try to enable this output together with the already
* enabled outputs on the CRTC in already used mode. * enabled outputs on the CRTC in already used mode.
*/ */
outputs_list = primary_output->crtc->outputs; outputs_list = primary_output->crtc->outputs;
outputs_list = eina_list_append(outputs_list, output_info); outputs_list = eina_list_append(outputs_list, output_info);
outputs = _outputs_to_array(outputs_list); outputs = _outputs_to_array(outputs_list);
primary_output->crtc->outputs = NULL; primary_output->crtc->outputs = NULL;
ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, primary_output->crtc->xid, outputs, eina_list_count(outputs_list), primary_output->crtc->current_mode->xid); ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, primary_output->crtc->xid, outputs, eina_list_count(outputs_list), primary_output->crtc->current_mode->xid);
free(outputs); free(outputs);
eina_list_free(outputs_list); eina_list_free(outputs_list);
return ret; return ret;
} }
else else
{ {
/* /*
* 2. Try to enable clone in the same * 2. Try to enable clone in the same
*/ */
/* /*
* 2a. exact mode. * 2a. exact mode.
*/ */
ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, primary_output->crtc->current_mode->xid); ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, primary_output->crtc->current_mode->xid);
ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info.root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info.rrvd_info.randr_info_12->alignment); ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info.root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info.rrvd_info.randr_info_12->alignment);
return ret; return ret;
} }
} }
else else
{ {
/* /*
* 2b. geometrically identical mode * 2b. geometrically identical mode
*/ */
if (primary_output->crtc && (mode_info = _mode_geo_identical_find(output_info->monitor->modes, primary_output->crtc->current_mode))) if (primary_output->crtc && (mode_info = _mode_geo_identical_find(output_info->monitor->modes, primary_output->crtc->current_mode)))
{ {
ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid); ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid);
ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info.root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info.rrvd_info.randr_info_12->alignment); ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info.root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info.rrvd_info.randr_info_12->alignment);
return ret; return ret;
} }
/* /*
* 3. Find the highest resolution mode common to enable on primary output's CRTC and the new one. * 3. Find the highest resolution mode common to enable on primary output's CRTC and the new one.
*/ */
if (((outputs_list = eina_list_append(outputs_list, primary_output)) && (outputs_list = eina_list_append(outputs_list, output_info)))) if (((outputs_list = eina_list_append(outputs_list, primary_output)) && (outputs_list = eina_list_append(outputs_list, output_info))))
{ {
if (primary_output->crtc) if (primary_output->crtc)
{ {
common_modes = _outputs_common_modes_get(outputs_list, primary_output->crtc->current_mode); common_modes = _outputs_common_modes_get(outputs_list, primary_output->crtc->current_mode);
if ((mode_info = eina_list_nth(common_modes, 0))) if ((mode_info = eina_list_nth(common_modes, 0)))
{ {
eina_list_free(common_modes); eina_list_free(common_modes);
INF("Will try to set mode: %dx%d for primary and clone.", mode_info->width, mode_info->height); INF("Will try to set mode: %dx%d for primary and clone.", mode_info->width, mode_info->height);
ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, primary_output->crtc->xid, ((Ecore_X_Randr_Output *)Ecore_X_Randr_Unset), Ecore_X_Randr_Unset, mode_info->xid); ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, primary_output->crtc->xid, ((Ecore_X_Randr_Output *)Ecore_X_Randr_Unset), Ecore_X_Randr_Unset, mode_info->xid);
ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid); ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid);
ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info.root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info.rrvd_info.randr_info_12->alignment); ret &= ecore_x_randr_crtc_pos_relative_set(e_randr_screen_info.root, usable_crtc->xid, primary_output->crtc->xid, ECORE_X_RANDR_OUTPUT_POLICY_CLONE, e_randr_screen_info.rrvd_info.randr_info_12->alignment);
} }
} }
eina_list_free(outputs_list); eina_list_free(outputs_list);
} }
} }
} }
else else
ERR("E_RANDR: Failed to clone, because of missing or disabled primary output!"); ERR("E_RANDR: Failed to clone, because of missing or disabled primary output!");
/* /*
* 4. FAIL * 4. FAIL
*/ */
break; break;
default: default:
//enable and position according to used policies //enable and position according to used policies
if (!(mode_info = ((Ecore_X_Randr_Mode_Info *)eina_list_data_get(output_info->monitor->preferred_modes)))) if (!(mode_info = ((Ecore_X_Randr_Mode_Info *)eina_list_data_get(output_info->monitor->preferred_modes))))
{ {
ERR("E_RANDR: Could not enable output(%d), as it has no preferred modes (and there for none at all)!", output_info->xid); ERR("E_RANDR: Could not enable output(%d), as it has no preferred modes (and there for none at all)!", output_info->xid);
ret = EINA_FALSE; ret = EINA_FALSE;
break; break;
} }
//get the crtc we will place our's relative to. If it's NULL, this is the //get the crtc we will place our's relative to. If it's NULL, this is the
//only output attached, work done. //only output attached, work done.
if (!(crtc_rel = _crtc_according_to_policy_get(usable_crtc, policy))) if (!(crtc_rel = _crtc_according_to_policy_get(usable_crtc, policy)))
{ {
INF("E_RANDR: CRTC %d enabled. No other CRTC had to be moved.", usable_crtc->xid); INF("E_RANDR: CRTC %d enabled. No other CRTC had to be moved.", usable_crtc->xid);
ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid); ret &= ecore_x_randr_crtc_mode_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, mode_info->xid);
return ret; return ret;
} }
//Calculate new CRTC's position according to policy //Calculate new CRTC's position according to policy
switch (policy) switch (policy)
{ {
case ECORE_X_RANDR_OUTPUT_POLICY_ABOVE: case ECORE_X_RANDR_OUTPUT_POLICY_ABOVE:
usable_crtc->geometry.x = crtc_rel->geometry.x; usable_crtc->geometry.x = crtc_rel->geometry.x;
usable_crtc->geometry.y = 0; usable_crtc->geometry.y = 0;
break; break;
case ECORE_X_RANDR_OUTPUT_POLICY_RIGHT:
usable_crtc->geometry.x = (crtc_rel->geometry.x + crtc_rel->geometry.w);
usable_crtc->geometry.y = crtc_rel->geometry.y;
break;
case ECORE_X_RANDR_OUTPUT_POLICY_BELOW:
usable_crtc->geometry.x = crtc_rel->geometry.x;
usable_crtc->geometry.y = (crtc_rel->geometry.y + crtc_rel->geometry.h);
break;
case ECORE_X_RANDR_OUTPUT_POLICY_LEFT:
usable_crtc->geometry.y = crtc_rel->geometry.y;
usable_crtc->geometry.x = 0;
break;
default:
usable_crtc->geometry.y = 0;
usable_crtc->geometry.x = 0;
}
if ((ret &= ecore_x_randr_crtc_settings_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, usable_crtc->geometry.x, usable_crtc->geometry.y, mode_info->xid, ECORE_X_RANDR_ORIENTATION_ROT_0))) case ECORE_X_RANDR_OUTPUT_POLICY_RIGHT:
{ usable_crtc->geometry.x = (crtc_rel->geometry.x + crtc_rel->geometry.w);
//WORKAROUND usable_crtc->geometry.y = crtc_rel->geometry.y;
//Reason: the CRTC event, that'd bring the new info about the set break;
//mode is arriving too late here.
usable_crtc->current_mode = mode_info;
usable_crtc->geometry.w = mode_info->width;
usable_crtc->geometry.h = mode_info->height;
//WORKAROUND END
INF("E_RANDR: Moved CRTC %d has geometry (x,y,wxh): %d, %d, %dx%d.", usable_crtc->xid, usable_crtc->geometry.x, usable_crtc->geometry.y, usable_crtc->geometry.w, usable_crtc->geometry.h); case ECORE_X_RANDR_OUTPUT_POLICY_BELOW:
//following is policy dependend. usable_crtc->geometry.x = crtc_rel->geometry.x;
switch (policy) usable_crtc->geometry.y = (crtc_rel->geometry.y + crtc_rel->geometry.h);
{ break;
case ECORE_X_RANDR_OUTPUT_POLICY_ABOVE:
dy = (crtc_rel->geometry.y - usable_crtc->geometry.h);
if (dy < 0)
{
//virtual move (move other CRTCs as nessesary)
dy = -dy;
ret &= ecore_x_randr_move_all_crtcs_but(e_randr_screen_info.root,
&usable_crtc->xid,
1,
dx,
dy);
INF("E_RANDR: Moving all CRTCs but %d, by %dx%d delta.", usable_crtc->xid, dx, dy);
}
break;
case ECORE_X_RANDR_OUTPUT_POLICY_LEFT: case ECORE_X_RANDR_OUTPUT_POLICY_LEFT:
dx = (crtc_rel->geometry.x - usable_crtc->geometry.w); usable_crtc->geometry.y = crtc_rel->geometry.y;
if (dx < 0) usable_crtc->geometry.x = 0;
{ break;
//virtual move (move other CRTCs as nessesary)
dx = -dx;
ret &= ecore_x_randr_move_all_crtcs_but(e_randr_screen_info.root,
&usable_crtc->xid,
1,
dx,
dy);
INF("E_RANDR: Moving all CRTCs but %d, by %dx%d delta.", usable_crtc->xid, dx, dy);
}
break;
default: default:
break; usable_crtc->geometry.y = 0;
} usable_crtc->geometry.x = 0;
}
} if ((ret &= ecore_x_randr_crtc_settings_set(e_randr_screen_info.root, usable_crtc->xid, &output_info->xid, 1, usable_crtc->geometry.x, usable_crtc->geometry.y, mode_info->xid, ECORE_X_RANDR_ORIENTATION_ROT_0)))
{
//WORKAROUND
//Reason: the CRTC event, that'd bring the new info about the set
//mode is arriving too late here.
usable_crtc->current_mode = mode_info;
usable_crtc->geometry.w = mode_info->width;
usable_crtc->geometry.h = mode_info->height;
//WORKAROUND END
INF("E_RANDR: Moved CRTC %d has geometry (x,y,wxh): %d, %d, %dx%d.", usable_crtc->xid, usable_crtc->geometry.x, usable_crtc->geometry.y, usable_crtc->geometry.w, usable_crtc->geometry.h);
//following is policy dependend.
switch (policy)
{
case ECORE_X_RANDR_OUTPUT_POLICY_ABOVE:
dy = (crtc_rel->geometry.y - usable_crtc->geometry.h);
if (dy < 0)
{
//virtual move (move other CRTCs as nessesary)
dy = -dy;
ret &= ecore_x_randr_move_all_crtcs_but(e_randr_screen_info.root,
&usable_crtc->xid,
1,
dx,
dy);
INF("E_RANDR: Moving all CRTCs but %d, by %dx%d delta.", usable_crtc->xid, dx, dy);
}
break;
case ECORE_X_RANDR_OUTPUT_POLICY_LEFT:
dx = (crtc_rel->geometry.x - usable_crtc->geometry.w);
if (dx < 0)
{
//virtual move (move other CRTCs as nessesary)
dx = -dx;
ret &= ecore_x_randr_move_all_crtcs_but(e_randr_screen_info.root,
&usable_crtc->xid,
1,
dx,
dy);
INF("E_RANDR: Moving all CRTCs but %d, by %dx%d delta.", usable_crtc->xid, dx, dy);
}
break;
default:
break;
}
}
} }
if (ret) if (ret)
@ -820,8 +823,9 @@ _12_event_listeners_remove(void)
{ {
Ecore_Event_Handler *_event_handler = NULL; Ecore_Event_Handler *_event_handler = NULL;
EINA_LIST_FREE (_event_handlers, _event_handler) EINA_LIST_FREE(_event_handlers, _event_handler)
ecore_event_handler_del(_event_handler); ecore_event_handler_del(_event_handler);
ecore_poller_del(poller); ecore_poller_del(poller);
poller = NULL; poller = NULL;
} }