enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

Tiling2: Cleaned up some more code.

This commit is contained in:
Tom Hacohen 2014-01-13 17:10:37 +00:00
parent ea19439b72
commit 29693d93b3
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/tiling/e_mod_tiling.c
View File

@ -100,11 +100,6 @@ static struct tiling_mod_main_g
E_Action *act_togglefloat, E_Action *act_togglefloat,
*act_swap, *act_swap,
*act_move,
*act_move_left,
*act_move_right,
*act_move_up,
*act_move_down,
*act_toggle_split_mode; *act_toggle_split_mode;
int warp_x, int warp_x,
@ -696,6 +691,7 @@ change_desk_conf(struct _Config_vdesk *newconf)
static void static void
_add_client(E_Client *ec) _add_client(E_Client *ec)
{ {
/* Should I need to check that the client is not already added? */
if (!ec) { if (!ec) {
return; return;
} }
@ -1140,7 +1136,6 @@ _desk_before_show_hook(void *data __UNUSED__, int type __UNUSED__, void *event _
static bool static bool
_desk_set_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client_Desk_Set *ev) _desk_set_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client_Desk_Set *ev)
{ {
// FIXME: Fix this function
DBG("%p: from (%d,%d) to (%d,%d)", ev->ec, DBG("%p: from (%d,%d) to (%d,%d)", ev->ec,
ev->desk->x, ev->desk->y, ev->desk->x, ev->desk->y,
ev->ec->desk->x, ev->ec->desk->y); ev->ec->desk->x, ev->ec->desk->y);
@ -1153,21 +1148,16 @@ _desk_set_hook(void *data __UNUSED__, int type __UNUSED__, E_Event_Client_Desk_S
if (is_floating_window(ev->ec)) { if (is_floating_window(ev->ec)) {
EINA_LIST_REMOVE(_G.tinfo->floating_windows, ev->ec); EINA_LIST_REMOVE(_G.tinfo->floating_windows, ev->ec);
} else { } else {
#if 0 if (tiling_window_tree_client_find(_G.tinfo->tree, ev->ec)) {
if (get_stack(ev->ec) >= 0) {
_remove_client(ev->ec); _remove_client(ev->ec);
_restore_client(ev->ec); _restore_client(ev->ec);
} }
#endif
} }
if (!desk_should_tile_check(ev->ec->desk)) if (!desk_should_tile_check(ev->ec->desk))
return true; return true;
#if 0 _add_client(ev->ec);
if (get_stack(ev->ec) < 0)
_add_client(ev->ec);
#endif
return true; return true;
} }
@ -1454,12 +1444,6 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
ACTION_DEL(_G.act_togglefloat, "Toggle floating", "toggle_floating"); ACTION_DEL(_G.act_togglefloat, "Toggle floating", "toggle_floating");
ACTION_DEL(_G.act_swap, "Swap a window with an other", "swap"); ACTION_DEL(_G.act_swap, "Swap a window with an other", "swap");
ACTION_DEL(_G.act_move, "Move window", "move");
ACTION_DEL(_G.act_move_left, "Move window to the left", "move_left");
ACTION_DEL(_G.act_move_right, "Move window to the right", "move_right");
ACTION_DEL(_G.act_move_up, "Move window up", "move_up");
ACTION_DEL(_G.act_move_down, "Move window down", "move_down");
ACTION_DEL(_G.act_toggle_split_mode, "Toggle split mode", ACTION_DEL(_G.act_toggle_split_mode, "Toggle split mode",
"toggle_split_mode"); "toggle_split_mode");
#undef ACTION_DEL #undef ACTION_DEL