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

reformated with "astyle -s3" because of inconsistent formating 

-> NO CODE CHANGES!


SVN revision: 40150
This commit is contained in:
Andreas Volz 2009-04-17 20:35:04 +00:00
parent ea29023652
commit 71173bb012
1 changed files with 150 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

300
src/modules/pager/e_mod_config.c
View File

@ -5,31 +5,31 @@
#define BUTTON_NOPLACE 1 #define BUTTON_NOPLACE 1
#define BUTTON_DESK 2 #define BUTTON_DESK 2
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
struct struct
{ {
int show, urgent_show, urgent_stick; int show, urgent_show, urgent_stick;
double speed, urgent_speed; double speed, urgent_speed;
int height; int height;
int act_height; int act_height;
} popup; } popup;
int drag_resist, flip_desk, show_desk_names; int drag_resist, flip_desk, show_desk_names;
struct struct
{ {
unsigned int drag, noplace, desk; unsigned int drag, noplace, desk;
} btn; } btn;
struct struct
{ {
Ecore_X_Window bind_win; Ecore_X_Window bind_win;
E_Dialog *dia; E_Dialog *dia;
Eina_List *hdls; Eina_List *hdls;
int btn; int btn;
} grab; } grab;
struct struct
{ {
Evas_Object *o_btn1, *o_btn2, *o_btn3; Evas_Object *o_btn1, *o_btn2, *o_btn3;
} gui; } gui;
}; };
static void *_create_data(E_Config_Dialog *cfd); static void *_create_data(E_Config_Dialog *cfd);
@ -45,8 +45,8 @@ static int _grab_cb_key_down(void *data, int type, void *event);
static void _grab_wnd_hide(E_Config_Dialog_Data *cfdata); static void _grab_wnd_hide(E_Config_Dialog_Data *cfdata);
static void _adv_update_btn_lbl(E_Config_Dialog_Data *cfdata); static void _adv_update_btn_lbl(E_Config_Dialog_Data *cfdata);
void void
_config_pager_module(Config_Item *ci) _config_pager_module(Config_Item *ci)
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
E_Config_Dialog_View *v; E_Config_Dialog_View *v;
@ -56,8 +56,8 @@ _config_pager_module(Config_Item *ci)
v = E_NEW(E_Config_Dialog_View, 1); v = E_NEW(E_Config_Dialog_View, 1);
if (!v) return; if (!v) return;
snprintf(buf, sizeof(buf), "%s/e-module-pager.edj", snprintf(buf, sizeof(buf), "%s/e-module-pager.edj",
e_module_dir_get(pager_config->module)); e_module_dir_get(pager_config->module));
v->create_cfdata = _create_data; v->create_cfdata = _create_data;
v->free_cfdata = _free_data; v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create; v->basic.create_widgets = _basic_create;
@ -66,13 +66,13 @@ _config_pager_module(Config_Item *ci)
v->advanced.apply_cfdata = _adv_apply; v->advanced.apply_cfdata = _adv_apply;
con = e_container_current_get(e_manager_current_get()); con = e_container_current_get(e_manager_current_get());
cfd = e_config_dialog_new(con, _("Pager Settings"), "E", cfd = e_config_dialog_new(con, _("Pager Settings"), "E",
"_e_mod_pager_config_dialog", buf, 0, v, ci); "_e_mod_pager_config_dialog", buf, 0, v, ci);
pager_config->config_dialog = cfd; pager_config->config_dialog = cfd;
} }
static void * static void *
_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
@ -81,8 +81,8 @@ _create_data(E_Config_Dialog *cfd)
return cfdata; return cfdata;
} }
static void static void
_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata) _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
{ {
cfdata->popup.show = pager_config->popup; cfdata->popup.show = pager_config->popup;
cfdata->popup.speed = pager_config->popup_speed; cfdata->popup.speed = pager_config->popup_speed;
@ -99,42 +99,42 @@ _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
cfdata->flip_desk = pager_config->flip_desk; cfdata->flip_desk = pager_config->flip_desk;
} }
static void static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
pager_config->config_dialog = NULL; pager_config->config_dialog = NULL;
E_FREE(cfdata); E_FREE(cfdata);
} }
static Evas_Object * static Evas_Object *
_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o = NULL, *of = NULL, *ow = NULL; Evas_Object *o = NULL, *of = NULL, *ow = NULL;
o = e_widget_list_add(evas, 0, 0); o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("General Settings"), 0); of = e_widget_framelist_add(evas, _("General Settings"), 0);
ow = e_widget_check_add(evas, _("Flip desktop on mouse wheel"), ow = e_widget_check_add(evas, _("Flip desktop on mouse wheel"),
&(cfdata->flip_desk)); &(cfdata->flip_desk));
e_widget_framelist_object_append(of, ow); e_widget_framelist_object_append(of, ow);
ow = e_widget_check_add(evas, _("Show desktop names"), ow = e_widget_check_add(evas, _("Show desktop names"),
&(cfdata->show_desk_names)); &(cfdata->show_desk_names));
e_widget_framelist_object_append(of, ow); e_widget_framelist_object_append(of, ow);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Popup Settings"), 0); of = e_widget_framelist_add(evas, _("Popup Settings"), 0);
ow = e_widget_check_add(evas, _("Show popup on desktop change"), ow = e_widget_check_add(evas, _("Show popup on desktop change"),
&(cfdata->popup.show)); &(cfdata->popup.show));
e_widget_framelist_object_append(of, ow); e_widget_framelist_object_append(of, ow);
ow = e_widget_check_add(evas, _("Show popup for urgent windows"), ow = e_widget_check_add(evas, _("Show popup for urgent windows"),
&(cfdata->popup.urgent_show)); &(cfdata->popup.urgent_show));
e_widget_framelist_object_append(of, ow); e_widget_framelist_object_append(of, ow);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
return o; return o;
} }
static int static int
_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
pager_config->popup = cfdata->popup.show; pager_config->popup = cfdata->popup.show;
pager_config->flip_desk = cfdata->flip_desk; pager_config->flip_desk = cfdata->flip_desk;
@ -146,90 +146,90 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
} }
static Evas_Object * static Evas_Object *
_adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _adv_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *o = NULL, *of = NULL, *ow = NULL; Evas_Object *o = NULL, *of = NULL, *ow = NULL;
o = e_widget_list_add(evas, 0, 0); o = e_widget_list_add(evas, 0, 0);
of = e_widget_frametable_add(evas, _("General Settings"), 0); of = e_widget_frametable_add(evas, _("General Settings"), 0);
ow = e_widget_check_add(evas, _("Flip desktop on mouse wheel"), ow = e_widget_check_add(evas, _("Flip desktop on mouse wheel"),
&(cfdata->flip_desk)); &(cfdata->flip_desk));
e_widget_frametable_object_append(of, ow, 0, 0, 2, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 0, 0, 2, 1, 1, 0, 1, 0);
ow = e_widget_check_add(evas, _("Show desktop names"), ow = e_widget_check_add(evas, _("Show desktop names"),
&(cfdata->show_desk_names)); &(cfdata->show_desk_names));
e_widget_frametable_object_append(of, ow, 0, 1, 2, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 0, 1, 2, 1, 1, 0, 1, 0);
ow = e_widget_label_add(evas, _("Select and Slide button")); ow = e_widget_label_add(evas, _("Select and Slide button"));
e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0);
ow = e_widget_button_add(evas, _("Click to set"), NULL, ow = e_widget_button_add(evas, _("Click to set"), NULL,
_grab_wnd_show, (void *)BUTTON_DRAG, cfdata); _grab_wnd_show, (void *)BUTTON_DRAG, cfdata);
cfdata->gui.o_btn1 = ow; cfdata->gui.o_btn1 = ow;
e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 0, 0, 1, 0); e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 0, 0, 1, 0);
ow = e_widget_label_add(evas, _("Drag and Drop button")); ow = e_widget_label_add(evas, _("Drag and Drop button"));
e_widget_frametable_object_append(of, ow, 0, 3, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 0, 3, 1, 1, 1, 0, 1, 0);
ow = e_widget_button_add(evas, _("Click to set"), NULL, ow = e_widget_button_add(evas, _("Click to set"), NULL,
_grab_wnd_show, (void *)BUTTON_NOPLACE, cfdata); _grab_wnd_show, (void *)BUTTON_NOPLACE, cfdata);
cfdata->gui.o_btn2 = ow; cfdata->gui.o_btn2 = ow;
e_widget_frametable_object_append(of, ow, 1, 3, 1, 1, 0, 0, 1, 0); e_widget_frametable_object_append(of, ow, 1, 3, 1, 1, 0, 0, 1, 0);
ow = e_widget_label_add(evas, _("Drag whole desktop")); ow = e_widget_label_add(evas, _("Drag whole desktop"));
e_widget_frametable_object_append(of, ow, 0, 4, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 0, 4, 1, 1, 1, 0, 1, 0);
ow = e_widget_button_add(evas, _("Click to set"), NULL, ow = e_widget_button_add(evas, _("Click to set"), NULL,
_grab_wnd_show, (void *)BUTTON_DESK, cfdata); _grab_wnd_show, (void *)BUTTON_DESK, cfdata);
cfdata->gui.o_btn3 = ow; cfdata->gui.o_btn3 = ow;
e_widget_frametable_object_append(of, ow, 1, 4, 1, 1, 0, 0, 1, 0); e_widget_frametable_object_append(of, ow, 1, 4, 1, 1, 0, 0, 1, 0);
_adv_update_btn_lbl(cfdata); _adv_update_btn_lbl(cfdata);
/* TODO find better name */ /* TODO find better name */
ow = e_widget_label_add(evas, _("Keyaction popup height")); ow = e_widget_label_add(evas, _("Keyaction popup height"));
e_widget_frametable_object_append(of, ow, 0, 5, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 0, 5, 1, 1, 1, 0, 1, 0);
ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 20.0, 200.0, 1.0, 0, NULL, ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 20.0, 200.0, 1.0, 0, NULL,
&(cfdata->popup.act_height), 100); &(cfdata->popup.act_height), 100);
e_widget_frametable_object_append(of, ow, 1, 5, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 1, 5, 1, 1, 1, 0, 1, 0);
ow = e_widget_label_add(evas, _("Resistance to dragging")); ow = e_widget_label_add(evas, _("Resistance to dragging"));
e_widget_frametable_object_append(of, ow, 0, 6, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 0, 6, 1, 1, 1, 0, 1, 0);
ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 0.0, 10.0, 1.0, 0, NULL, ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 0.0, 10.0, 1.0, 0, NULL,
&(cfdata->drag_resist), 100); &(cfdata->drag_resist), 100);
e_widget_frametable_object_append(of, ow, 1, 6, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 1, 6, 1, 1, 1, 0, 1, 0);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_frametable_add(evas, _("Popup Settings"), 0); of = e_widget_frametable_add(evas, _("Popup Settings"), 0);
ow = e_widget_check_add(evas, _("Show popup on desktop change"), ow = e_widget_check_add(evas, _("Show popup on desktop change"),
&(cfdata->popup.show)); &(cfdata->popup.show));
e_widget_frametable_object_append(of, ow, 0, 0, 2, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 0, 0, 2, 1, 1, 0, 1, 0);
ow = e_widget_label_add(evas, _("Popup pager height")); ow = e_widget_label_add(evas, _("Popup pager height"));
e_widget_frametable_object_append(of, ow, 0, 1, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 0, 1, 1, 1, 1, 0, 1, 0);
ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 20.0, 200.0, 1.0, 0, NULL, ow = e_widget_slider_add(evas, 1, 0, _("%.0f px"), 20.0, 200.0, 1.0, 0, NULL,
&(cfdata->popup.height), 100); &(cfdata->popup.height), 100);
e_widget_frametable_object_append(of, ow, 1, 1, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 1, 1, 1, 1, 1, 0, 1, 0);
ow = e_widget_label_add(evas, _("Popup speed")); ow = e_widget_label_add(evas, _("Popup speed"));
e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0);
ow = e_widget_slider_add(evas, 1, 0, _("%1.1f seconds"), 0.1, 10.0, 0.1, 0, ow = e_widget_slider_add(evas, 1, 0, _("%1.1f seconds"), 0.1, 10.0, 0.1, 0,
&(cfdata->popup.speed), NULL, 100); &(cfdata->popup.speed), NULL, 100);
e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 1, 0, 1, 0);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_frametable_add(evas, _("Urgent Window Settings"), 0); of = e_widget_frametable_add(evas, _("Urgent Window Settings"), 0);
ow = e_widget_check_add(evas, _("Show popup on urgent window"), ow = e_widget_check_add(evas, _("Show popup on urgent window"),
&(cfdata->popup.urgent_show)); &(cfdata->popup.urgent_show));
e_widget_frametable_object_append(of, ow, 0, 0, 2, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 0, 0, 2, 1, 1, 0, 1, 0);
ow = e_widget_check_add(evas, _("Popup on urgent window sticks on the screen"), ow = e_widget_check_add(evas, _("Popup on urgent window sticks on the screen"),
&(cfdata->popup.urgent_stick)); &(cfdata->popup.urgent_stick));
e_widget_frametable_object_append(of, ow, 0, 1, 2, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 0, 1, 2, 1, 1, 0, 1, 0);
ow = e_widget_label_add(evas, _("Popup speed")); ow = e_widget_label_add(evas, _("Popup speed"));
e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0);
ow = e_widget_slider_add(evas, 1, 0, _("%1.1f seconds"), 0.1, 10.0, 0.1, 0, ow = e_widget_slider_add(evas, 1, 0, _("%1.1f seconds"), 0.1, 10.0, 0.1, 0,
&(cfdata->popup.urgent_speed), NULL, 100); &(cfdata->popup.urgent_speed), NULL, 100);
e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 1, 0, 1, 0); e_widget_frametable_object_append(of, ow, 1, 2, 1, 1, 1, 0, 1, 0);
e_widget_list_object_append(o, of, 1, 1, 0.5); e_widget_list_object_append(o, of, 1, 1, 0.5);
return o; return o;
} }
static int static int
_adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
pager_config->popup = cfdata->popup.show; pager_config->popup = cfdata->popup.show;
pager_config->popup_speed = cfdata->popup.speed; pager_config->popup_speed = cfdata->popup.speed;
@ -249,8 +249,8 @@ _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
return 1; return 1;
} }
static void static void
_grab_wnd_show(void *data1, void *data2) _grab_wnd_show(void *data1, void *data2)
{ {
E_Manager *man = NULL; E_Manager *man = NULL;
E_Config_Dialog_Data *cfdata = NULL; E_Config_Dialog_Data *cfdata = NULL;
@ -261,46 +261,46 @@ _grab_wnd_show(void *data1, void *data2)
cfdata->grab.btn = 0; cfdata->grab.btn = 0;
if ((int)data1 == BUTTON_DRAG) if ((int)data1 == BUTTON_DRAG)
cfdata->grab.btn = 1; cfdata->grab.btn = 1;
else if ((int)data1 == BUTTON_NOPLACE) else if ((int)data1 == BUTTON_NOPLACE)
cfdata->grab.btn = 2; cfdata->grab.btn = 2;
cfdata->grab.dia = e_dialog_new(e_container_current_get(man), "Pager", cfdata->grab.dia = e_dialog_new(e_container_current_get(man), "Pager",
"_pager_button_grab_dialog"); "_pager_button_grab_dialog");
if (!cfdata->grab.dia) return; if (!cfdata->grab.dia) return;
e_dialog_title_set(cfdata->grab.dia, _("Pager Button Grab")); e_dialog_title_set(cfdata->grab.dia, _("Pager Button Grab"));
e_dialog_icon_set(cfdata->grab.dia, "preferences-desktop-mouse", 48); e_dialog_icon_set(cfdata->grab.dia, "preferences-desktop-mouse", 48);
e_dialog_text_set(cfdata->grab.dia, _("Please press a mouse button<br>" e_dialog_text_set(cfdata->grab.dia, _("Please press a mouse button<br>"
"Press <hilight>Escape</hilight> to abort.<br>" "Press <hilight>Escape</hilight> to abort.<br>"
"Or <hilight>Del</hilight> to reset the button.")); "Or <hilight>Del</hilight> to reset the button."));
e_win_centered_set(cfdata->grab.dia->win, 1); e_win_centered_set(cfdata->grab.dia->win, 1);
e_win_borderless_set(cfdata->grab.dia->win, 1); e_win_borderless_set(cfdata->grab.dia->win, 1);
cfdata->grab.bind_win = ecore_x_window_input_new(man->root, 0, 0, cfdata->grab.bind_win = ecore_x_window_input_new(man->root, 0, 0,
man->w, man->h); man->w, man->h);
ecore_x_window_show(cfdata->grab.bind_win); ecore_x_window_show(cfdata->grab.bind_win);
if (!e_grabinput_get(cfdata->grab.bind_win, 0, cfdata->grab.bind_win)) if (!e_grabinput_get(cfdata->grab.bind_win, 0, cfdata->grab.bind_win))
{ {
ecore_x_window_free(cfdata->grab.bind_win); ecore_x_window_free(cfdata->grab.bind_win);
cfdata->grab.bind_win = 0; cfdata->grab.bind_win = 0;
e_object_del(E_OBJECT(cfdata->grab.dia)); e_object_del(E_OBJECT(cfdata->grab.dia));
cfdata->grab.dia = NULL; cfdata->grab.dia = NULL;
return; return;
} }
hdl = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, hdl = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
_grab_cb_key_down, cfdata); _grab_cb_key_down, cfdata);
cfdata->grab.hdls = eina_list_append(cfdata->grab.hdls, hdl); cfdata->grab.hdls = eina_list_append(cfdata->grab.hdls, hdl);
hdl = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, hdl = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN,
_grab_cb_mouse_down, cfdata); _grab_cb_mouse_down, cfdata);
cfdata->grab.hdls = eina_list_append(cfdata->grab.hdls, hdl); cfdata->grab.hdls = eina_list_append(cfdata->grab.hdls, hdl);
e_dialog_show(cfdata->grab.dia); e_dialog_show(cfdata->grab.dia);
ecore_x_icccm_transient_for_set(cfdata->grab.dia->win->evas_win, ecore_x_icccm_transient_for_set(cfdata->grab.dia->win->evas_win,
pager_config->config_dialog->dia->win->evas_win); pager_config->config_dialog->dia->win->evas_win);
} }
static int static int
_grab_cb_mouse_down(void *data, int type, void *event) _grab_cb_mouse_down(void *data, int type, void *event)
{ {
E_Config_Dialog_Data *cfdata = NULL; E_Config_Dialog_Data *cfdata = NULL;
Ecore_Event_Mouse_Button *ev; Ecore_Event_Mouse_Button *ev;
@ -309,34 +309,34 @@ _grab_cb_mouse_down(void *data, int type, void *event)
if (!(cfdata = data)) return 1; if (!(cfdata = data)) return 1;
if (ev->window != cfdata->grab.bind_win) return 1; if (ev->window != cfdata->grab.bind_win) return 1;
if(ev->buttons == cfdata->btn.drag) if (ev->buttons == cfdata->btn.drag)
cfdata->btn.drag = 0; cfdata->btn.drag = 0;
else if (ev->buttons == cfdata->btn.noplace) else if (ev->buttons == cfdata->btn.noplace)
cfdata->btn.noplace = 0; cfdata->btn.noplace = 0;
else if (ev->buttons == cfdata->btn.desk) else if (ev->buttons == cfdata->btn.desk)
cfdata->btn.desk = 0; cfdata->btn.desk = 0;
if (cfdata->grab.btn == 1)
cfdata->btn.drag = ev->buttons;
else if (cfdata->grab.btn == 2)
cfdata->btn.noplace = ev->buttons;
else
cfdata->btn.desk = ev->buttons;
if(ev->buttons == 3) if (cfdata->grab.btn == 1)
{ cfdata->btn.drag = ev->buttons;
e_util_dialog_show(_("Attetion"), else if (cfdata->grab.btn == 2)
_("You cannot use the right mouse button in the<br>" cfdata->btn.noplace = ev->buttons;
"shelf for this as it is already taken by internal<br>" else
"code for context menus. <br>" cfdata->btn.desk = ev->buttons;
"This button only works in the Popup"));
} if (ev->buttons == 3)
{
e_util_dialog_show(_("Attetion"),
_("You cannot use the right mouse button in the<br>"
"shelf for this as it is already taken by internal<br>"
"code for context menus. <br>"
"This button only works in the Popup"));
}
_grab_wnd_hide(cfdata); _grab_wnd_hide(cfdata);
return 1; return 1;
} }
static int static int
_grab_cb_key_down(void *data, int type, void *event) _grab_cb_key_down(void *data, int type, void *event)
{ {
E_Config_Dialog_Data *cfdata = NULL; E_Config_Dialog_Data *cfdata = NULL;
Ecore_Event_Key *ev; Ecore_Event_Key *ev;
@ -345,56 +345,56 @@ _grab_cb_key_down(void *data, int type, void *event)
if (!(cfdata = data)) return 1; if (!(cfdata = data)) return 1;
if (ev->window != cfdata->grab.bind_win) return 1; if (ev->window != cfdata->grab.bind_win) return 1;
if (!strcmp(ev->keyname, "Escape")) _grab_wnd_hide(cfdata); if (!strcmp(ev->keyname, "Escape")) _grab_wnd_hide(cfdata);
if (!strcmp(ev->keyname, "Delete")) if (!strcmp(ev->keyname, "Delete"))
{ {
if (cfdata->grab.btn == 1) if (cfdata->grab.btn == 1)
cfdata->btn.drag = 0; cfdata->btn.drag = 0;
else if (cfdata->grab.btn == 2) else if (cfdata->grab.btn == 2)
cfdata->btn.noplace = 0; cfdata->btn.noplace = 0;
else else
cfdata->btn.desk = 0; cfdata->btn.desk = 0;
_grab_wnd_hide(cfdata); _grab_wnd_hide(cfdata);
} }
return 1; return 1;
} }
static void static void
_grab_wnd_hide(E_Config_Dialog_Data *cfdata) _grab_wnd_hide(E_Config_Dialog_Data *cfdata)
{ {
while (cfdata->grab.hdls) while (cfdata->grab.hdls)
{ {
ecore_event_handler_del(cfdata->grab.hdls->data); ecore_event_handler_del(cfdata->grab.hdls->data);
cfdata->grab.hdls = eina_list_remove_list(cfdata->grab.hdls, cfdata->grab.hdls); cfdata->grab.hdls = eina_list_remove_list(cfdata->grab.hdls, cfdata->grab.hdls);
} }
cfdata->grab.hdls = NULL; cfdata->grab.hdls = NULL;
e_grabinput_release(cfdata->grab.bind_win, cfdata->grab.bind_win); e_grabinput_release(cfdata->grab.bind_win, cfdata->grab.bind_win);
if (cfdata->grab.bind_win) ecore_x_window_free(cfdata->grab.bind_win); if (cfdata->grab.bind_win) ecore_x_window_free(cfdata->grab.bind_win);
cfdata->grab.bind_win = 0; cfdata->grab.bind_win = 0;
if (cfdata->grab.dia) if (cfdata->grab.dia)
e_object_del(E_OBJECT(cfdata->grab.dia)); e_object_del(E_OBJECT(cfdata->grab.dia));
cfdata->grab.dia = NULL; cfdata->grab.dia = NULL;
_adv_update_btn_lbl(cfdata); _adv_update_btn_lbl(cfdata);
} }
static void static void
_adv_update_btn_lbl(E_Config_Dialog_Data *cfdata) _adv_update_btn_lbl(E_Config_Dialog_Data *cfdata)
{ {
char lbl[256] = ""; char lbl[256] = "";
snprintf(lbl, sizeof(lbl), _("Click to set")); snprintf(lbl, sizeof(lbl), _("Click to set"));
if (cfdata->btn.drag) if (cfdata->btn.drag)
snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.drag); snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.drag);
e_widget_button_label_set(cfdata->gui.o_btn1, lbl); e_widget_button_label_set(cfdata->gui.o_btn1, lbl);
snprintf(lbl, sizeof(lbl), _("Click to set")); snprintf(lbl, sizeof(lbl), _("Click to set"));
if (cfdata->btn.noplace) if (cfdata->btn.noplace)
snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.noplace); snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.noplace);
e_widget_button_label_set(cfdata->gui.o_btn2, lbl); e_widget_button_label_set(cfdata->gui.o_btn2, lbl);
snprintf(lbl, sizeof(lbl), _("Click to set")); snprintf(lbl, sizeof(lbl), _("Click to set"));
if (cfdata->btn.desk) if (cfdata->btn.desk)
snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.desk); snprintf(lbl, sizeof(lbl), _("Button %i"), cfdata->btn.desk);
e_widget_button_label_set(cfdata->gui.o_btn3, lbl); e_widget_button_label_set(cfdata->gui.o_btn3, lbl);
} }