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

pager: add config whether to show urgent popup on focused windows 

SVN revision: 54464
This commit is contained in:
Boris Faure 2010-11-11 17:58:23 +00:00
parent 6d1de4d853
commit e9d8b9b3a7
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,26 +5,26 @@
#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, urgent_focus;
double speed, urgent_speed; double speed, urgent_speed;
int height, act_height; int height, act_height;
} popup; } popup;
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 *ob1, *ob2, *ob3; Evas_Object *ob1, *ob2, *ob3;
Eina_List *popup_list, *urgent_list; Eina_List *popup_list, *urgent_list;
@ -88,13 +88,14 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
return cfdata; return cfdata;
} }
static void static void
_fill_data(E_Config_Dialog_Data *cfdata) _fill_data(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;
cfdata->popup.urgent_show = pager_config->popup_urgent; cfdata->popup.urgent_show = pager_config->popup_urgent;
cfdata->popup.urgent_stick = pager_config->popup_urgent_stick; cfdata->popup.urgent_stick = pager_config->popup_urgent_stick;
cfdata->popup.urgent_focus = pager_config->popup_urgent_focus;
cfdata->popup.urgent_speed = pager_config->popup_urgent_speed; cfdata->popup.urgent_speed = pager_config->popup_urgent_speed;
cfdata->popup.height = pager_config->popup_height; cfdata->popup.height = pager_config->popup_height;
cfdata->popup.act_height = pager_config->popup_act_height; cfdata->popup.act_height = pager_config->popup_act_height;
@ -252,11 +253,19 @@ _adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *c
uc = e_widget_check_add(evas, _("Show popup on urgent window"), uc = e_widget_check_add(evas, _("Show popup on urgent window"),
&(cfdata->popup.urgent_show)); &(cfdata->popup.urgent_show));
e_widget_list_object_append(ol, uc, 1, 0, 0.5); e_widget_list_object_append(ol, uc, 1, 0, 0.5);
ow = e_widget_check_add(evas, _("Urgent popup sticks on screen"),
ow = e_widget_check_add(evas, _("Urgent popup sticks on screen"),
&(cfdata->popup.urgent_stick)); &(cfdata->popup.urgent_stick));
cfdata->gui.urgent_list = eina_list_append(cfdata->gui.urgent_list, ow); cfdata->gui.urgent_list = eina_list_append(cfdata->gui.urgent_list, ow);
e_widget_disabled_set(ow, !cfdata->popup.urgent_show); e_widget_disabled_set(ow, !cfdata->popup.urgent_show);
e_widget_list_object_append(ol, ow, 1, 0, 0.5); e_widget_list_object_append(ol, ow, 1, 0, 0.5);
ow = e_widget_check_add(evas, _("Show popup for focused windows"),
&(cfdata->popup.urgent_focus));
cfdata->gui.urgent_list = eina_list_append(cfdata->gui.urgent_list, ow);
e_widget_disabled_set(ow, !cfdata->popup.urgent_show);
e_widget_list_object_append(ol, ow, 1, 0, 0.5);
ow = e_widget_label_add(evas, _("Urgent popup speed")); ow = e_widget_label_add(evas, _("Urgent popup speed"));
cfdata->gui.urgent_list = eina_list_append(cfdata->gui.urgent_list, ow); cfdata->gui.urgent_list = eina_list_append(cfdata->gui.urgent_list, ow);
e_widget_disabled_set(ow, !cfdata->popup.urgent_show); e_widget_disabled_set(ow, !cfdata->popup.urgent_show);
@ -283,6 +292,7 @@ _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
pager_config->flip_desk = cfdata->flip_desk; pager_config->flip_desk = cfdata->flip_desk;
pager_config->popup_urgent = cfdata->popup.urgent_show; pager_config->popup_urgent = cfdata->popup.urgent_show;
pager_config->popup_urgent_stick = cfdata->popup.urgent_stick; pager_config->popup_urgent_stick = cfdata->popup.urgent_stick;
pager_config->popup_urgent_focus = cfdata->popup.urgent_focus;
pager_config->popup_urgent_speed = cfdata->popup.urgent_speed; pager_config->popup_urgent_speed = cfdata->popup.urgent_speed;
pager_config->show_desk_names = cfdata->show_desk_names; pager_config->show_desk_names = cfdata->show_desk_names;
pager_config->popup_height = cfdata->popup.height; pager_config->popup_height = cfdata->popup.height;
@ -304,6 +314,7 @@ _adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata
if (pager_config->popup_urgent != cfdata->popup.urgent_show) return 1; if (pager_config->popup_urgent != cfdata->popup.urgent_show) return 1;
if (pager_config->popup_speed != cfdata->popup.speed) return 1; if (pager_config->popup_speed != cfdata->popup.speed) return 1;
if (pager_config->popup_urgent_stick != cfdata->popup.urgent_stick) return 1; if (pager_config->popup_urgent_stick != cfdata->popup.urgent_stick) return 1;
if (pager_config->popup_urgent_focus != cfdata->popup.urgent_focus) return 1;
if (pager_config->popup_urgent_speed != cfdata->popup.urgent_speed) return 1; if (pager_config->popup_urgent_speed != cfdata->popup.urgent_speed) return 1;
if (pager_config->popup_height != cfdata->popup.height) return 1; if (pager_config->popup_height != cfdata->popup.height) return 1;
if (pager_config->popup_act_height != cfdata->popup.act_height) return 1; if (pager_config->popup_act_height != cfdata->popup.act_height) return 1;

3
src/modules/pager/e_mod_main.c
View File

@ -1335,7 +1335,8 @@ _pager_cb_event_border_urgent_change(void *data __UNUSED__, int type __UNUSED__,
zone = ev->border->zone; zone = ev->border->zone;
urgent = ev->border->client.icccm.urgent; urgent = ev->border->client.icccm.urgent;
if (pager_config->popup_urgent) if (pager_config->popup_urgent && (pager_config->popup_urgent_focus ||
(!pager_config->popup_urgent_focus && !ev->border->focused)))
{ {
pp = _pager_popup_find(zone); pp = _pager_popup_find(zone);

1
src/modules/pager/e_mod_main.h
View File

@ -21,6 +21,7 @@ struct _Config
double popup_speed; double popup_speed;
unsigned int popup_urgent; unsigned int popup_urgent;
unsigned int popup_urgent_stick; unsigned int popup_urgent_stick;
unsigned int popup_urgent_focus;
double popup_urgent_speed; double popup_urgent_speed;
unsigned int show_desk_names; unsigned int show_desk_names;
int popup_act_height; /*keyaction popup */ int popup_act_height; /*keyaction popup */