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

lots of warnings-- 

SVN revision: 64920
This commit is contained in:
Mike Blumenkrantz 2011-11-08 00:10:45 +00:00
parent 86a057cdbb
commit b626c228fa
5 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/conf_randr/e_int_config_randr.c
View File

@ -45,7 +45,6 @@ static int basic_check_changed (E_Config_Dialog *c
static int basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static Eina_Bool _deferred_noxrandr_error (void *data); static Eina_Bool _deferred_noxrandr_error (void *data);
static Eina_Bool _deferred_norates_error (void *data);
// Functions for the arrangement subdialog interaction // Functions for the arrangement subdialog interaction
extern Eina_Bool e_config_randr_dialog_subdialog_arrangement_create_data (E_Config_Dialog_Data *cfdata); extern Eina_Bool e_config_randr_dialog_subdialog_arrangement_create_data (E_Config_Dialog_Data *cfdata);
@ -106,7 +105,6 @@ _e_config_randr_dialog_output_dialog_data_new(E_Randr_Crtc_Info *crtc_info, E_Ra
} }
return dialog_data; return dialog_data;
_e_conf_randr_dialog_create_output_data_failed:
free(dialog_data); free(dialog_data);
return NULL; return NULL;
} }

17
src/modules/conf_randr/e_int_config_randr_arrangement.c
View File

@ -25,7 +25,7 @@ void e_config_randr_dialog_subdialo
static inline Eina_List *_e_config_randr_dialog_subdialog_arrangement_neighbors_get (Evas_Object *obj); static inline Eina_List *_e_config_randr_dialog_subdialog_arrangement_neighbors_get (Evas_Object *obj);
static void _e_config_randr_dialog_subdialog_arrangement_determine_positions_recursive (Evas_Object *obj); static void _e_config_randr_dialog_subdialog_arrangement_determine_positions_recursive (Evas_Object *obj);
static inline E_Config_Randr_Dialog_Output_Dialog_Data *_e_config_randr_dialog_subdialog_arrangement_output_dialog_data_new (E_Randr_Crtc_Info *crtc_info, E_Randr_Output_Info *output_info); //static inline E_Config_Randr_Dialog_Output_Dialog_Data *_e_config_randr_dialog_subdialog_arrangement_output_dialog_data_new (E_Randr_Crtc_Info *crtc_info, E_Randr_Output_Info *output_info);
static inline void _e_config_randr_dialog_subdialog_arrangement_suggestion_add (Evas *evas); static inline void _e_config_randr_dialog_subdialog_arrangement_suggestion_add (Evas *evas);
static inline void _e_config_randr_dialog_subdialog_arrangement_make_suggestion (Evas_Object *obj); static inline void _e_config_randr_dialog_subdialog_arrangement_make_suggestion (Evas_Object *obj);
static void _e_config_randr_dialog_subdialog_arrangement_smart_class_resize (Evas_Object *obj, Evas_Coord w, Evas_Coord h); static void _e_config_randr_dialog_subdialog_arrangement_smart_class_resize (Evas_Object *obj, Evas_Coord w, Evas_Coord h);
@ -136,7 +136,7 @@ e_config_randr_dialog_subdialog_arrangement_basic_create_widgets(Evas *canvas)
_e_config_randr_dialog_subdialog_arrangement_output_add(Evas *canvas, E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data) _e_config_randr_dialog_subdialog_arrangement_output_add(Evas *canvas, E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data)
{ {
E_Randr_Output_Info *output_info; E_Randr_Output_Info *output_info;
Evas_Object *output, *bg; Evas_Object *output;
const char* output_name = NULL; const char* output_name = NULL;
if (!canvas || !output_dialog_data || !e_config_runtime_info) return NULL; if (!canvas || !output_dialog_data || !e_config_runtime_info) return NULL;
@ -280,9 +280,8 @@ _e_config_randr_dialog_subdialog_arrangement_smart_class_resize(Evas_Object *obj
} }
static void static void
_e_config_randr_dialog_subdialog_arrangement_output_mouse_down_cb (void *data, Evas *e, Evas_Object *obj, void *event_info) _e_config_randr_dialog_subdialog_arrangement_output_mouse_down_cb (void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{ {
Evas_Event_Mouse_Down *ev = (Evas_Event_Mouse_Down*)event_info;
Evas_Object *element = NULL; Evas_Object *element = NULL;
Eina_List *iter; Eina_List *iter;
Eina_Bool crtc_selected = EINA_FALSE; Eina_Bool crtc_selected = EINA_FALSE;
@ -329,7 +328,7 @@ _e_config_randr_dialog_subdialog_arrangement_output_mouse_down_cb (void *data, E
} }
static void static void
_e_config_randr_dialog_subdialog_arrangement_output_mouse_move_cb (void *data, Evas *e, Evas_Object *obj, void *event_info) _e_config_randr_dialog_subdialog_arrangement_output_mouse_move_cb (void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
{ {
Evas_Event_Mouse_Move *ev = event_info; Evas_Event_Mouse_Move *ev = event_info;
Eina_Rectangle geo, parent; Eina_Rectangle geo, parent;
@ -363,7 +362,7 @@ _e_config_randr_dialog_subdialog_arrangement_output_mouse_move_cb (void *data, E
} }
static void static void
_e_config_randr_dialog_subdialog_arrangement_output_mouse_up_cb (void *data, Evas *e, Evas_Object *obj, void *event_info) _e_config_randr_dialog_subdialog_arrangement_output_mouse_up_cb (void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{ {
Evas_Coord_Point coords; Evas_Coord_Point coords;
@ -523,7 +522,7 @@ _e_config_randr_dialog_subdialog_arrangement_make_suggestion (Evas_Object *obj)
} }
void void
e_config_randr_dialog_subdialog_arrangement_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) e_config_randr_dialog_subdialog_arrangement_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{ {
E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data; E_Config_Randr_Dialog_Output_Dialog_Data *dialog_data;
@ -686,7 +685,7 @@ _e_config_randr_dialog_subdialog_arrangement_determine_positions_recursive(Evas_
} }
Eina_Bool Eina_Bool
e_config_randr_dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) e_config_randr_dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
Eina_List *crtcs, *iter; Eina_List *crtcs, *iter;
Evas_Object *smart_parent, *crtc, *top_left = NULL; Evas_Object *smart_parent, *crtc, *top_left = NULL;
@ -751,7 +750,7 @@ e_config_randr_dialog_subdialog_arrangement_basic_apply_data(E_Config_Dialog *cf
} }
Eina_Bool Eina_Bool
e_config_randr_dialog_subdialog_arrangement_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) e_config_randr_dialog_subdialog_arrangement_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{ {
Eina_List *iter; Eina_List *iter;
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data; E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;

20
src/modules/conf_randr/e_int_config_randr_orientation.c
View File

@ -15,7 +15,7 @@ Eina_Bool e_config_randr_dialog_subdialog_orientation_basic_apply_data(E_Config_
void e_config_randr_dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc); void e_config_randr_dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc);
void e_config_randr_dialog_subdialog_orientation_update_edje(Evas_Object *crtc); void e_config_randr_dialog_subdialog_orientation_update_edje(Evas_Object *crtc);
static void _e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); //static void _e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
extern E_Config_Dialog_Data *e_config_runtime_info; extern E_Config_Dialog_Data *e_config_runtime_info;
extern char _theme_file_path[]; extern char _theme_file_path[];
@ -120,7 +120,7 @@ _e_config_randr_dialog_subdialog_orientation_radio_add_fail:
return NULL; return NULL;
} }
/* #if 0
static void static void
_e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) _e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{ {
@ -133,7 +133,7 @@ _e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas
* value. If that is ever changed, remove the used code below and just use the * value. If that is ever changed, remove the used code below and just use the
* 1-liner below. * 1-liner below.
* snprintf(signal, sizeof(signal), "conf,randr,dialog,orientation,%d", e_config_runtime_info->gui.subdialogs.orientation.radio_val); * snprintf(signal, sizeof(signal), "conf,randr,dialog,orientation,%d", e_config_runtime_info->gui.subdialogs.orientation.radio_val);
* / */
if (obj == e_config_runtime_info->gui.subdialogs.orientation.radio_normal) orientation = ECORE_X_RANDR_ORIENTATION_ROT_0; if (obj == e_config_runtime_info->gui.subdialogs.orientation.radio_normal) orientation = ECORE_X_RANDR_ORIENTATION_ROT_0;
if (obj == e_config_runtime_info->gui.subdialogs.orientation.radio_rot90) orientation = ECORE_X_RANDR_ORIENTATION_ROT_90; if (obj == e_config_runtime_info->gui.subdialogs.orientation.radio_rot90) orientation = ECORE_X_RANDR_ORIENTATION_ROT_90;
if (obj == e_config_runtime_info->gui.subdialogs.orientation.radio_rot180) orientation = ECORE_X_RANDR_ORIENTATION_ROT_180; if (obj == e_config_runtime_info->gui.subdialogs.orientation.radio_rot180) orientation = ECORE_X_RANDR_ORIENTATION_ROT_180;
@ -147,14 +147,13 @@ _e_config_randr_dialog_subdialog_orientation_policy_mouse_up_cb(void *data, Evas
fprintf(stderr, "CONF_RANDR: mouse button released. Emitted signal to orientation: %s\n", signal); fprintf(stderr, "CONF_RANDR: mouse button released. Emitted signal to orientation: %s\n", signal);
} }
*/ #endif
void void
e_config_randr_dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc) e_config_randr_dialog_subdialog_orientation_update_radio_buttons(Evas_Object *crtc)
{ {
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data; E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
Ecore_X_Randr_Orientation supported_oris, ori; Ecore_X_Randr_Orientation supported_oris, ori;
char signal[40];
//disable widgets, if no crtc is selected //disable widgets, if no crtc is selected
if (!crtc) if (!crtc)
@ -267,7 +266,7 @@ e_config_randr_dialog_subdialog_orientation_update_edje(Evas_Object *crtc)
} }
Eina_Bool Eina_Bool
e_config_randr_dialog_subdialog_orientation_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) e_config_randr_dialog_subdialog_orientation_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
Ecore_X_Randr_Orientation orientation; Ecore_X_Randr_Orientation orientation;
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data; E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
@ -290,14 +289,13 @@ e_config_randr_dialog_subdialog_orientation_basic_apply_data (E_Config_Dialog *c
} }
Eina_Bool Eina_Bool
e_config_randr_dialog_subdialog_orientation_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) e_config_randr_dialog_subdialog_orientation_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
Ecore_X_Randr_Orientation orientation = ECORE_X_RANDR_ORIENTATION_ROT_0;
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data; E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
if (!e_config_runtime_info->gui.subdialogs.orientation.dialog || !e_config_runtime_info->gui.selected_eo || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "output_info"))) return EINA_FALSE; if (!e_config_runtime_info->gui.subdialogs.orientation.dialog || !e_config_runtime_info->gui.selected_eo || !(output_dialog_data = evas_object_data_get(e_config_runtime_info->gui.selected_eo, "output_info"))) return EINA_FALSE;
return (output_dialog_data->previous_orientation != e_config_runtime_info->gui.subdialogs.orientation.radio_val); return ((int)output_dialog_data->previous_orientation != (int)e_config_runtime_info->gui.subdialogs.orientation.radio_val);
} }
void void
@ -310,7 +308,7 @@ e_config_randr_dialog_subdialog_orientation_keep_changes(E_Config_Dialog_Data *c
EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
{ {
if (!odd || (odd->previous_orientation == Ecore_X_Randr_Unset)) continue; if (!odd || ((int)odd->previous_orientation == Ecore_X_Randr_Unset)) continue;
odd->previous_orientation = odd->new_orientation; odd->previous_orientation = odd->new_orientation;
odd->new_orientation = Ecore_X_Randr_Unset; odd->new_orientation = Ecore_X_Randr_Unset;
} }
@ -326,7 +324,7 @@ e_config_randr_dialog_subdialog_orientation_discard_changes(E_Config_Dialog_Data
EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
{ {
if (!odd->crtc || (odd->previous_orientation == Ecore_X_Randr_Unset)) continue; if (!odd->crtc || ((int)odd->previous_orientation == Ecore_X_Randr_Unset)) continue;
if (ecore_x_randr_crtc_orientation_set(cfdata->manager->root, odd->crtc->xid, odd->previous_orientation)) if (ecore_x_randr_crtc_orientation_set(cfdata->manager->root, odd->crtc->xid, odd->previous_orientation))
{ {
odd->new_orientation = odd->previous_orientation; odd->new_orientation = odd->previous_orientation;

15
src/modules/conf_randr/e_int_config_randr_policies.c
View File

@ -155,7 +155,7 @@ _e_config_randr_dialog_subdialog_policies_radio_add_fail:
} }
static void static void
_e_config_randr_dialog_subdialog_policies_policy_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) _e_config_randr_dialog_subdialog_policies_policy_mouse_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{ {
char signal[29]; char signal[29];
int policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE; int policy = ECORE_X_RANDR_OUTPUT_POLICY_NONE;
@ -182,10 +182,8 @@ _e_config_randr_dialog_subdialog_policies_policy_mouse_up_cb(void *data, Evas *e
} }
Eina_Bool Eina_Bool
e_config_randr_dialog_subdialog_policies_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) e_config_randr_dialog_subdialog_policies_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
E_Randr_Output_Info *output_info;
if (!e_randr_screen_info || !e_config_runtime_info->gui.selected_output_dd) return EINA_FALSE; if (!e_randr_screen_info || !e_config_runtime_info->gui.selected_output_dd) return EINA_FALSE;
//policy update //policy update
@ -197,11 +195,11 @@ e_config_randr_dialog_subdialog_policies_basic_apply_data (E_Config_Dialog *cfd,
} }
Eina_Bool Eina_Bool
e_config_randr_dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) e_config_randr_dialog_subdialog_policies_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{ {
if (!e_randr_screen_info || !cfdata || !cfdata->gui.selected_output_dd) return EINA_FALSE; if (!e_randr_screen_info || !cfdata || !cfdata->gui.selected_output_dd) return EINA_FALSE;
return (cfdata->gui.selected_output_dd->previous_policy != cfdata->gui.subdialogs.policies.radio_val); return ((int)cfdata->gui.selected_output_dd->previous_policy != (int)cfdata->gui.subdialogs.policies.radio_val);
} }
void void
@ -210,7 +208,6 @@ e_config_randr_dialog_subdialog_policies_update_radio_buttons(Evas_Object *crtc)
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data; E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;
E_Randr_Output_Info *output = NULL; E_Randr_Output_Info *output = NULL;
Ecore_X_Randr_Output_Policy policy; Ecore_X_Randr_Output_Policy policy;
char signal[40];
//disable widgets, if no crtc is selected //disable widgets, if no crtc is selected
if (!crtc || !(output_dialog_data = evas_object_data_get(crtc, "output_info"))) if (!crtc || !(output_dialog_data = evas_object_data_get(crtc, "output_info")))
@ -279,7 +276,7 @@ e_config_randr_dialog_subdialog_policies_keep_changes(E_Config_Dialog_Data *cfda
EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
{ {
if (!odd || (odd->previous_policy == Ecore_X_Randr_Unset)) continue; if (!odd || ((int)odd->previous_policy == Ecore_X_Randr_Unset)) continue;
odd->previous_policy = odd->new_policy; odd->previous_policy = odd->new_policy;
odd->new_policy = Ecore_X_Randr_Unset; odd->new_policy = Ecore_X_Randr_Unset;
} }
@ -295,7 +292,7 @@ e_config_randr_dialog_subdialog_policies_discard_changes(E_Config_Dialog_Data *c
EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd) EINA_LIST_FOREACH(cfdata->output_dialog_data_list, iter, odd)
{ {
if (!odd->crtc || (odd->previous_policy == Ecore_X_Randr_Unset)) continue; if (!odd->crtc || ((int)odd->previous_policy == Ecore_X_Randr_Unset)) continue;
odd->new_policy = odd->previous_policy; odd->new_policy = odd->previous_policy;
odd->previous_policy = Ecore_X_Randr_Unset; odd->previous_policy = Ecore_X_Randr_Unset;
} }

5
src/modules/conf_randr/e_int_config_randr_resolutions.c
View File

@ -31,7 +31,6 @@ extern E_Config_Dialog_Data *e_config_runtime_info;
e_config_randr_dialog_subdialog_resolutions_create_data(E_Config_Dialog_Data *cfdata) e_config_randr_dialog_subdialog_resolutions_create_data(E_Config_Dialog_Data *cfdata)
{ {
E_Config_Randr_Dialog_Output_Dialog_Data *odd; E_Config_Randr_Dialog_Output_Dialog_Data *odd;
E_Randr_Crtc_Info *ci;
Ecore_X_Randr_Mode_Info *mi; Ecore_X_Randr_Mode_Info *mi;
Eina_List *iter; Eina_List *iter;
@ -76,7 +75,7 @@ e_config_randr_dialog_subdialog_resolutions_basic_create_widgets(Evas *canvas)
} }
Eina_Bool Eina_Bool
e_config_randr_dialog_subdialog_resolutions_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) e_config_randr_dialog_subdialog_resolutions_basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
//Apply new mode //Apply new mode
Ecore_X_Randr_Mode_Info* selected_mode; Ecore_X_Randr_Mode_Info* selected_mode;
@ -146,7 +145,7 @@ e_config_randr_dialog_subdialog_resolutions_basic_apply_data (E_Config_Dialog *c
} }
Eina_Bool Eina_Bool
e_config_randr_dialog_subdialog_resolutions_basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) e_config_randr_dialog_subdialog_resolutions_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata __UNUSED__)
{ {
Ecore_X_Randr_Mode_Info* selected_mode; Ecore_X_Randr_Mode_Info* selected_mode;
E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data; E_Config_Randr_Dialog_Output_Dialog_Data *output_dialog_data;