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

Fix function prototypes to match border_hook_add callback. 

Add detection for 'Home' window(s).



SVN revision: 43782
This commit is contained in:
Christopher Michael 2009-11-18 17:29:40 +00:00
parent 8f7fcb77e6
commit ca227c2f4e
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/illume2/e_mod_layout.c
View File

@ -4,10 +4,10 @@
#include "e_mod_layout_illume.h" #include "e_mod_layout_illume.h"
// internal calls // internal calls
static void _e_mod_layout_cb_hook_container_layout(void *data, E_Container *con); static void _e_mod_layout_cb_hook_container_layout(void *data, void *data2);
static void _e_mod_layout_cb_hook_post_fetch(void *data, E_Border *bd); static void _e_mod_layout_cb_hook_post_fetch(void *data, void *data2);
static void _e_mod_layout_cb_hook_post_border_assign(void *data, E_Border *bd); static void _e_mod_layout_cb_hook_post_border_assign(void *data, void *data2);
static void _e_mod_layout_cb_hook_end(void *data, E_Border *bd); static void _e_mod_layout_cb_hook_end(void *data, void *data2);
static int _cb_event_border_add(void *data, int type, void *event); static int _cb_event_border_add(void *data, int type, void *event);
static int _cb_event_border_remove(void *data, int type, void *event); static int _cb_event_border_remove(void *data, int type, void *event);
static int _cb_event_border_focus_in(void *data, int type, void *event); static int _cb_event_border_focus_in(void *data, int type, void *event);
@ -219,7 +219,9 @@ illume_border_is_notification(E_Border *bd)
Eina_Bool Eina_Bool
illume_border_is_home(E_Border *bd) illume_border_is_home(E_Border *bd)
{ {
// FIXME: detect if ((bd->client.icccm.name) &&
(strstr(bd->client.icccm.name, "Illume-Home")))
return 1;
return 0; return 0;
} }
@ -274,11 +276,13 @@ illume_border_min_get(E_Border *bd, int *mw, int *mh)
} }
static void static void
_e_mod_layout_cb_hook_container_layout(void *data, E_Container *con) _e_mod_layout_cb_hook_container_layout(void *data, void *data2)
{ {
Eina_List *l; Eina_List *l;
E_Zone *zone; E_Zone *zone;
E_Container *con;
if (!(con = data2)) return;
EINA_LIST_FOREACH(con->zones, l, zone) EINA_LIST_FOREACH(con->zones, l, zone)
{ {
if ((mode) && (mode->funcs.zone_layout)) if ((mode) && (mode->funcs.zone_layout))
@ -287,8 +291,11 @@ _e_mod_layout_cb_hook_container_layout(void *data, E_Container *con)
} }
static void static void
_e_mod_layout_cb_hook_post_fetch(void *data, E_Border *bd) _e_mod_layout_cb_hook_post_fetch(void *data, void *data2)
{ {
E_Border *bd;
if (!(bd = data2)) return;
if (bd->stolen) return; if (bd->stolen) return;
if (bd->new_client) if (bd->new_client)
{ {
@ -310,10 +317,12 @@ _e_mod_layout_cb_hook_post_fetch(void *data, E_Border *bd)
} }
static void static void
_e_mod_layout_cb_hook_post_border_assign(void *data, E_Border *bd) _e_mod_layout_cb_hook_post_border_assign(void *data, void *data2)
{ {
E_Border *bd;
int zx, zy, zw, zh, pbx, pby, pbw, pbh; int zx, zy, zw, zh, pbx, pby, pbw, pbh;
if (!(bd = data2)) return;
if (bd->stolen) return; if (bd->stolen) return;
pbx = bd->x; pby = bd->y; pbw = bd->w; pbh = bd->h; pbx = bd->x; pby = bd->y; pbw = bd->w; pbh = bd->h;
@ -379,8 +388,9 @@ _e_mod_layout_cb_hook_post_border_assign(void *data, E_Border *bd)
} }
static void static void
_e_mod_layout_cb_hook_end(void *data, E_Border *bd) _e_mod_layout_cb_hook_end(void *data, void *data2)
{ {
} }
static int static int