enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Whitespace removal. 

Add some printfs to start working on window stacks.



SVN revision: 43986
This commit is contained in:
Christopher Michael 2009-11-25 19:35:24 +00:00
parent 3598e6ca4a
commit 536e398969
4 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/illume2/e_kbd.c
View File

@ -109,7 +109,7 @@ _e_kbd_free(E_Kbd *kbd)
kbds = eina_list_remove(kbds, kbd);
if (kbd->animator) ecore_animator_del(kbd->animator);
if (kbd->delay_hide) ecore_timer_del(kbd->delay_hide);
// FIXME: thought right - on shutdoiwn, this might point to freed data
// FIXME: thought right - on shutdown, this might point to freed data
// if (kbd->border) kbd->border->stolen = 0;
EINA_LIST_FREE(kbd->waiting_borders, bd)
bd->stolen = 0;

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

@ -179,8 +179,9 @@ illume_border_is_keyboard(E_Border *bd)
Eina_Bool
illume_border_is_bottom_panel(E_Border *bd)
{
if ((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DOCK) ||
(bd->client.qtopia.soft_menu))
if (((bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DOCK) ||
(bd->client.qtopia.soft_menu)) ||
(bd->client.icccm.name) && ((!strcmp(bd->client.icccm.name, "Illume-Softkey"))))
return 1;
return 0;
}
@ -190,7 +191,7 @@ Eina_Bool
illume_border_is_top_shelf(E_Border *bd)
{
if ((bd->client.icccm.name) &&
(strstr(bd->client.icccm.name, "xfce4-panel")))
(strstr(bd->client.icccm.name, "Illume-Indicator")))
return 1;
// FIXME: detect
return 0;

37
src/modules/illume2/e_mod_layout.h
View File

@ -20,25 +20,24 @@ struct _Illume_Layout_Mode
const char *name;
const char *label;
// may need more things later, but name + label will do for now
struct {
// ---
void (*border_add) (E_Border *bd);
void (*border_del) (E_Border *bd);
void (*border_focus_in) (E_Border *bd);
void (*border_focus_out) (E_Border *bd);
// ---
void (*zone_layout) (E_Zone *zone);
void (*zone_move_resize) (E_Zone *zone);
// --- add more below (activate callback, and more)
} funcs;
struct
{
void (*border_add) (E_Border *bd);
void (*border_del) (E_Border *bd);
void (*border_focus_in) (E_Border *bd);
void (*border_focus_out) (E_Border *bd);
void (*zone_layout) (E_Zone *zone);
void (*zone_move_resize) (E_Zone *zone);
// --- add more below (activate callback, and more)
} funcs;
};
void illume_layout_mode_register(const Illume_Layout_Mode *laymode);
void illume_layout_mode_unregister(const Illume_Layout_Mode *laymode);
void illume_layout_mode_register(const Illume_Layout_Mode *laymode);
void illume_layout_mode_unregister(const Illume_Layout_Mode *laymode);
void illume_border_activate(E_Border *bd);
void illume_border_show(E_Border *bd);
void illume_border_deactivate(E_Border *bd);
void illume_border_activate(E_Border *bd);
void illume_border_show(E_Border *bd);
void illume_border_deactivate(E_Border *bd);
Eina_Bool illume_border_is_dialog(E_Border *bd);
Eina_Bool illume_border_is_keyboard(E_Border *bd);
Eina_Bool illume_border_is_bottom_panel(E_Border *bd);
@ -49,7 +48,7 @@ Eina_Bool illume_border_is_home(E_Border *bd);
Eina_Bool illume_border_is_side_pane_left(E_Border *bd);
Eina_Bool illume_border_is_side_pane_right(E_Border *bd);
Eina_Bool illume_border_is_overlay(E_Border *bd);
void illume_border_slide_to(E_Border *bd, int x, int y, Illume_Anim_Class aclass);
void illume_border_min_get(E_Border *bd, int *mw, int *mh);
void illume_border_slide_to(E_Border *bd, int x, int y, Illume_Anim_Class aclass);
void illume_border_min_get(E_Border *bd, int *mw, int *mh);
#endif

8
src/modules/illume2/e_mod_layout_illume.c
View File

@ -7,6 +7,10 @@ static void
_border_add(E_Border *bd)
{ // handle a border being added
printf("Border Add\n");
if (bd->client.icccm.transient_for)
printf("Transient For\n");
else if (bd->client.icccm.client_leader)
printf("Client Leader\n");
}
static void
@ -37,7 +41,7 @@ _zone_layout(E_Zone *z)
int shelfsize = 0;
int kbdsize = 0;
int panelsize = 0;
// phase 1. loop through borders to figure out sizes of things
borders = e_border_client_list();
EINA_LIST_FOREACH(borders, l, bd)
@ -62,7 +66,7 @@ _zone_layout(E_Zone *z)
if (kbdsize < mh) kbdsize = mh;
}
}
// phase 2. actually apply the sizing, positioning and layering too
borders = e_border_client_list();
EINA_LIST_FOREACH(borders, l, bd)