vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix e randr code to not block randr update events from other listeners and to properly delete poller on failure 

SVN revision: 77739
This commit is contained in:
Mike Blumenkrantz 2012-10-10 09:42:05 +00:00
parent cd7d8a6287
commit 5e4ccca27b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/e_randr_12.c
View File

@ -319,7 +319,11 @@ _12_screen_info_refresh(void)
static Eina_Bool static Eina_Bool
_x_poll_cb(void *data __UNUSED__) _x_poll_cb(void *data __UNUSED__)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(e_randr_screen_info.rrvd_info.randr_info_12, ECORE_CALLBACK_CANCEL); if (!e_randr_screen_info.rrvd_info.randr_info_12)
{
poller = NULL;
return ECORE_CALLBACK_CANCEL;
}
ecore_x_randr_screen_primary_output_orientations_get(e_randr_screen_info.root); ecore_x_randr_screen_primary_output_orientations_get(e_randr_screen_info.root);
@ -359,7 +363,7 @@ _output_change_event_cb(void *data __UNUSED__, int type, void *ev)
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;
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_RENEW);
EINA_SAFETY_ON_TRUE_RETURN_VAL((type != ECORE_X_EVENT_RANDR_OUTPUT_CHANGE), ECORE_CALLBACK_RENEW); EINA_SAFETY_ON_TRUE_RETURN_VAL((type != ECORE_X_EVENT_RANDR_OUTPUT_CHANGE), ECORE_CALLBACK_RENEW);
/* event information: /* event information:
@ -470,7 +474,7 @@ _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_RENEW);
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:
@ -543,7 +547,7 @@ _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_RENEW);
EINA_SAFETY_ON_TRUE_RETURN_VAL((type != ECORE_X_EVENT_RANDR_OUTPUT_PROPERTY_NOTIFY), ECORE_CALLBACK_RENEW); EINA_SAFETY_ON_TRUE_RETURN_VAL((type != ECORE_X_EVENT_RANDR_OUTPUT_PROPERTY_NOTIFY), ECORE_CALLBACK_RENEW);
/* event information: /* event information: