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

Tasks module - not updating task item on every border propery change anymore

This commit is contained in:
Yossi Kantor 2013-05-30 11:00:33 +03:00 committed by Mike Blumenkrantz
parent af121b1da0
commit 3a68bf115b
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/bin/e_border.c
View File

@ -122,6 +122,8 @@ static void _e_border_event_border_stack_free(void *data,
void *ev);
static void _e_border_event_border_icon_change_free(void *data,
void *ev);
static void _e_border_event_border_title_change_free(void *data,
void *ev);
static void _e_border_event_border_urgent_change_free(void *data,
void *ev);
static void _e_border_event_border_focus_in_free(void *data,
@ -239,6 +241,7 @@ EAPI int E_EVENT_BORDER_STICK = 0;
EAPI int E_EVENT_BORDER_UNSTICK = 0;
EAPI int E_EVENT_BORDER_STACK = 0;
EAPI int E_EVENT_BORDER_ICON_CHANGE = 0;
EAPI int E_EVENT_BORDER_TITLE_CHANGE = 0;
EAPI int E_EVENT_BORDER_URGENT_CHANGE = 0;
EAPI int E_EVENT_BORDER_FOCUS_IN = 0;
EAPI int E_EVENT_BORDER_FOCUS_OUT = 0;
@ -350,6 +353,7 @@ e_border_init(void)
E_EVENT_BORDER_UNSTICK = ecore_event_type_new();
E_EVENT_BORDER_STACK = ecore_event_type_new();
E_EVENT_BORDER_ICON_CHANGE = ecore_event_type_new();
E_EVENT_BORDER_TITLE_CHANGE = ecore_event_type_new();
E_EVENT_BORDER_URGENT_CHANGE = ecore_event_type_new();
E_EVENT_BORDER_FOCUS_IN = ecore_event_type_new();
E_EVENT_BORDER_FOCUS_OUT = ecore_event_type_new();
@ -7032,6 +7036,7 @@ _e_border_eval0(E_Border *bd)
{
int change_urgent = 0;
int rem_change = 0;
int title_change = 0;
Eina_Bool new_cw = !bd->cw;
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
Eina_Bool need_desk_set = EINA_FALSE;
@ -7111,8 +7116,10 @@ _e_border_eval0(E_Border *bd)
if (bd->bg_object)
edje_object_part_text_set(bd->bg_object, "e.text.title",
bd->client.icccm.title);
bd->client.icccm.fetch.title = 0;
rem_change = 1;
title_change = 1;
}
if (bd->client.netwm.fetch.name)
{
@ -7128,9 +7135,20 @@ _e_border_eval0(E_Border *bd)
if (bd->bg_object)
edje_object_part_text_set(bd->bg_object, "e.text.title",
bd->client.netwm.name);
bd->client.netwm.fetch.name = 0;
rem_change = 1;
title_change = 1;
}
if (title_change)
{
E_Event_Border_Title_Change *ev;
ev = E_NEW(E_Event_Border_Title_Change, 1);
ev->border = bd;
e_object_ref(E_OBJECT(bd));
ecore_event_add(E_EVENT_BORDER_TITLE_CHANGE, ev,
_e_border_event_border_title_change_free, NULL);
}
if (bd->client.icccm.fetch.name_class)
{
const char *pname, *pclass;
@ -9443,6 +9461,18 @@ _e_border_event_border_icon_change_free(void *data __UNUSED__,
E_FREE(e);
}
static void
_e_border_event_border_title_change_free(void *data __UNUSED__,
void *ev)
{
E_Event_Border_Title_Change *e;
e = ev;
// e_object_breadcrumb_del(E_OBJECT(e->border), "border_icon_change_event");
e_object_unref(E_OBJECT(e->border));
E_FREE(e);
}
static void
_e_border_event_border_urgent_change_free(void *data __UNUSED__,
void *ev)

2
src/bin/e_border.h
View File

@ -135,6 +135,7 @@ typedef struct _E_Event_Border_Zone_Set E_Event_Border_Zone_Set;
typedef struct _E_Event_Border_Desk_Set E_Event_Border_Desk_Set;
typedef struct _E_Event_Border_Stack E_Event_Border_Stack;
typedef struct _E_Event_Border_Simple E_Event_Border_Icon_Change;
typedef struct _E_Event_Border_Simple E_Event_Border_Title_Change;
typedef struct _E_Event_Border_Simple E_Event_Border_Urgent_Change;
typedef struct _E_Event_Border_Simple E_Event_Border_Focus_In;
typedef struct _E_Event_Border_Simple E_Event_Border_Focus_Out;
@ -835,6 +836,7 @@ extern EAPI int E_EVENT_BORDER_ZONE_SET;
extern EAPI int E_EVENT_BORDER_DESK_SET;
extern EAPI int E_EVENT_BORDER_STACK;
extern EAPI int E_EVENT_BORDER_ICON_CHANGE;
extern EAPI int E_EVENT_BORDER_TITLE_CHANGE;
extern EAPI int E_EVENT_BORDER_URGENT_CHANGE;
extern EAPI int E_EVENT_BORDER_FOCUS_IN;
extern EAPI int E_EVENT_BORDER_FOCUS_OUT;

8
src/modules/tasks/e_mod_main.c
View File

@ -78,11 +78,11 @@ static Eina_Bool _tasks_cb_event_border_remove(void *data, int type, void *ev
static Eina_Bool _tasks_cb_event_border_iconify(void *data, int type, void *event);
static Eina_Bool _tasks_cb_event_border_uniconify(void *data, int type, void *event);
static Eina_Bool _tasks_cb_event_border_icon_change(void *data, int type, void *event);
static Eina_Bool _tasks_cb_event_border_title_change(void *data, int type, void *event);
static Eina_Bool _tasks_cb_event_border_zone_set(void *data, int type, void *event);
static Eina_Bool _tasks_cb_event_border_desk_set(void *data, int type, void *event);
static Eina_Bool _tasks_cb_window_focus_in(void *data, int type, void *event);
static Eina_Bool _tasks_cb_window_focus_out(void *data, int type, void *event);
static Eina_Bool _tasks_cb_event_border_property(void *data, int type, void *event);
static Eina_Bool _tasks_cb_event_desk_show(void *data, int type, void *event);
static Eina_Bool _tasks_cb_event_border_urgent_change(void *data, int type, void *event);
@ -168,7 +168,7 @@ e_modapi_init(E_Module *m)
(E_EVENT_BORDER_FOCUS_OUT, _tasks_cb_window_focus_out, NULL));
tasks_config->handlers = eina_list_append
(tasks_config->handlers, ecore_event_handler_add
(E_EVENT_BORDER_PROPERTY, _tasks_cb_event_border_property, NULL));
(E_EVENT_BORDER_TITLE_CHANGE, _tasks_cb_event_border_title_change, NULL));
tasks_config->handlers = eina_list_append
(tasks_config->handlers, ecore_event_handler_add
(E_EVENT_DESK_SHOW, _tasks_cb_event_desk_show, NULL));
@ -924,9 +924,9 @@ _tasks_cb_event_border_urgent_change(void *data __UNUSED__, int type __UNUSED__,
}
static Eina_Bool
_tasks_cb_event_border_property(void *data __UNUSED__, int type __UNUSED__, void *event)
_tasks_cb_event_border_title_change(void *data __UNUSED__, int type __UNUSED__, void *event)
{
E_Event_Border_Property *ev;
E_Event_Border_Title_Change *ev;
E_Border *border;
ev = event;