Enlightenment CVS committal
Author : iamsthitha
Project : e_modules
Module : taskbar
Dir : e_modules/taskbar
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
-Better Label Updating
-Small Theme Update
-Sticky windows appear!
-An experimental feature: make windows blink on hover
===================================================================
RCS file: /cvs/e/e_modules/taskbar/e_mod_config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_config.c 17 Jul 2006 23:30:46 -0000 1.5
+++ e_mod_config.c 7 Aug 2006 21:38:47 -0000 1.6
@@ -3,6 +3,7 @@
struct _E_Config_Dialog_Data
{
+ int highlight;
int show_label;
int show_all;
};
@@ -36,6 +37,7 @@
static void
_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
{
+ cfdata->highlight = ci->highlight;
cfdata->show_label = ci->show_label;
cfdata->show_all = ci->show_all;
}
@@ -70,6 +72,10 @@
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, D_("Display"), 0);
+ ob = e_widget_check_add(evas, D_("Highlight Window on Mouse Over"),
&(cfdata->highlight));
+ //if (cfdata->highlight)
+ //// e_widget_check_checked_set(ob, 1);
+ e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, D_("Show Labels"), &(cfdata->show_label));
//if (cfdata->show_label)
@@ -92,6 +98,7 @@
Config_Item *ci;
ci = cfd->data;
+ ci->highlight = cfdata->highlight;
ci->show_label = cfdata->show_label;
ci->show_all = cfdata->show_all;
===================================================================
RCS file: /cvs/e/e_modules/taskbar/e_mod_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_mod_main.c 18 Jul 2006 21:27:24 -0000 1.13
+++ e_mod_main.c 7 Aug 2006 21:38:47 -0000 1.14
@@ -102,7 +102,7 @@
static int _taskbar_cb_event_border_desk_set(void *data, int type, void
*event);
static int _taskbar_cb_window_focus_in(void *data, int type, void *event);
static int _taskbar_cb_window_focus_out(void *data, int type, void *event);
-static int _taskbar_cb_window_property(void *data, int type, void *event);
+static int _taskbar_cb_event_border_property(void *data, int type, void
*event);
static int _taskbar_cb_event_desk_show(void *data, int type, void *event);
static Config_Item *_taskbar_config_item_get(const char *id);
@@ -550,7 +550,7 @@
{
if (bd->zone != b->zone)
return 1;
- if ((bd->desk != e_desk_current_get(bd->zone))||bd->sticky)
+ if ((bd->desk != e_desk_current_get(bd->zone))&&!bd->sticky)
return 1;
}
@@ -715,6 +715,8 @@
ic = (Taskbar_Icon *)data;
ci = _taskbar_config_item_get(ic->taskbar->inst->gcc->id);
+ if (ci->highlight)
+ edje_object_signal_emit(ic->border->bg_object, "hung", "");
_taskbar_icon_signal_emit(ic, "active", "");
if (ci->show_label)
_taskbar_icon_signal_emit(ic, "label_active", "");
@@ -728,6 +730,8 @@
ic = (Taskbar_Icon *)data;
ci = _taskbar_config_item_get(ic->taskbar->inst->gcc->id);
+ if (ci->highlight)
+ edje_object_signal_emit(ic->border->bg_object, "unhung", "");
_taskbar_icon_signal_emit(ic, "passive", "");
if (ci->show_label)
_taskbar_icon_signal_emit(ic, "label_passive", "");
@@ -1043,13 +1047,13 @@
static int
_taskbar_cb_window_focus_in(void *data, int type, void *event)
{
- Ecore_X_Event_Window_Focus_In *ev;
+ E_Event_Border_Focus_In *ev;
E_Border *bd;
Taskbar_Icon *ic;
Evas_List *l;
ev = event;
- bd = e_border_find_by_client_window(ev->win);
+ bd = ev->border;
if (!bd)
return 1;
@@ -1067,13 +1071,13 @@
static int
_taskbar_cb_window_focus_out(void *data, int type, void *event)
{
- Ecore_X_Event_Window_Focus_Out *ev;
+ E_Event_Border_Focus_Out *ev;
E_Border *bd;
Taskbar_Icon *ic;
Evas_List *l;
ev = event;
- bd = e_border_find_by_client_window(ev->win);
+ bd = ev->border;
if (!bd)
return 1;
@@ -1090,16 +1094,16 @@
}
static int
-_taskbar_cb_window_property(void *data, int type, void *event)
+_taskbar_cb_event_border_property(void *data, int type, void *event)
{
- Ecore_X_Event_Window_Property *ev;
+ E_Event_Border_Property *ev;
E_Border *bd;
Taskbar_Icon *ic;
Evas_List *l;
char *label;
ev = event;
- bd = e_border_find_by_client_window(ev->win);
+ bd = ev->border;
if (!bd)
return 1;
@@ -1110,9 +1114,9 @@
inst = l->data;
ic = _taskbar_icon_find(inst->taskbar, bd);
if (ic) {
- label = ic->border->client.netwm.name;
+ label = bd->client.netwm.name;
if (!label)
- label = ic->border->client.icccm.title;
+ label = bd->client.icccm.title;
if (!label)
label = "?";
edje_object_part_text_set(ic->o_holder, "label", label);
@@ -1165,6 +1169,7 @@
ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add(id);
+ ci->highlight = 1;
ci->show_label = 1;
ci->show_all = 0;
@@ -1193,6 +1198,7 @@
#define T Config_Item
#define D conf_item_edd
E_CONFIG_VAL(D, T, id, STR);
+ E_CONFIG_VAL(D, T, highlight, INT);
E_CONFIG_VAL(D, T, show_label, INT);
E_CONFIG_VAL(D, T, show_all, INT);
@@ -1209,6 +1215,7 @@
taskbar_config = E_NEW(Config, 1);
ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add("0");
+ ci->highlight = 1;
ci->show_label = 1;
ci->show_all = 0;
@@ -1240,13 +1247,13 @@
(E_EVENT_BORDER_ZONE_SET, _taskbar_cb_event_border_zone_set, NULL));
taskbar_config->handlers = evas_list_append
(taskbar_config->handlers, ecore_event_handler_add
- (ECORE_X_EVENT_WINDOW_FOCUS_IN, _taskbar_cb_window_focus_in, NULL));
+ (E_EVENT_BORDER_FOCUS_IN, _taskbar_cb_window_focus_in, NULL));
taskbar_config->handlers = evas_list_append
(taskbar_config->handlers, ecore_event_handler_add
- (ECORE_X_EVENT_WINDOW_FOCUS_OUT, _taskbar_cb_window_focus_out, NULL));
+ (E_EVENT_BORDER_FOCUS_OUT, _taskbar_cb_window_focus_out, NULL));
taskbar_config->handlers = evas_list_append
(taskbar_config->handlers, ecore_event_handler_add
- (ECORE_X_EVENT_WINDOW_PROPERTY, _taskbar_cb_window_property, NULL));
+ (E_EVENT_BORDER_PROPERTY, _taskbar_cb_event_border_property, NULL));
taskbar_config->handlers = evas_list_append
(taskbar_config->handlers, ecore_event_handler_add
(E_EVENT_DESK_SHOW, _taskbar_cb_event_desk_show, NULL));
===================================================================
RCS file: /cvs/e/e_modules/taskbar/e_mod_main.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_main.h 8 Jul 2006 21:39:29 -0000 1.5
+++ e_mod_main.h 7 Aug 2006 21:38:48 -0000 1.6
@@ -23,6 +23,7 @@
struct _Config_Item
{
const char *id;
+ int highlight;
int show_label;
int show_all;
};
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
