enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests Projects Releases Wiki Activity

bring --split option back to life

This commit is contained in:
Boris Faure 2015-02-15 13:45:38 +01:00
parent a31d982338
commit 9a75587d34
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/main.c
View File

@ -875,8 +875,6 @@ remote:
evas_object_show(win); evas_object_show(win);
if (startup_split) if (startup_split)
{ {
/* TODO: bring it back to life */
#if 0
unsigned int i = 0; unsigned int i = 0;
void *pch = NULL; void *pch = NULL;
Term *next = term; Term *next = term;
@ -886,17 +884,19 @@ remote:
if (startup_split[i] == 'v') if (startup_split[i] == 'v')
{ {
pch = eina_list_nth(cmds_list, 1); pch = eina_list_nth(cmds_list, 1);
main_split_v(next->wn->win, next->term, pch); main_split_v(win_evas_object_get(term_win_get(next)),
main_term_evas_object_get(next), pch);
cmds_list = eina_list_remove(cmds_list, pch); cmds_list = eina_list_remove(cmds_list, pch);
} }
else if (startup_split[i] == 'h') else if (startup_split[i] == 'h')
{ {
pch = eina_list_nth(cmds_list, 1); pch = eina_list_nth(cmds_list, 1);
main_split_h(next->wn->win, next->term, pch); main_split_h(win_evas_object_get(term_win_get(next)),
main_term_evas_object_get(next), pch);
cmds_list = eina_list_remove(cmds_list, pch); cmds_list = eina_list_remove(cmds_list, pch);
} }
else if (startup_split[i] == '-') else if (startup_split[i] == '-')
next = _term_next_get(next); next = term_next_get(next);
else else
{ {
ERR(_("invalid argument found for option -S/--split. See --help.")); ERR(_("invalid argument found for option -S/--split. See --help."));
@ -904,7 +904,6 @@ remote:
} }
} }
if (cmds_list) eina_list_free(cmds_list); if (cmds_list) eina_list_free(cmds_list);
#endif
} }
if (pos_set) if (pos_set)
{ {

12
src/bin/win.c
View File

@ -1247,8 +1247,8 @@ _split_flatten(Split *sp)
return flat; return flat;
} }
static Term * Term *
_term_next_get(Term *termin) term_next_get(Term *termin)
{ {
Split *sp; Split *sp;
Eina_List *flat, *l; Eina_List *flat, *l;
@ -1278,8 +1278,8 @@ _term_next_get(Term *termin)
return sp->term; return sp->term;
} }
static Term * Term *
_term_prev_get(Term *termin) term_prev_get(Term *termin)
{ {
Split *sp; Split *sp;
Eina_List *flat, *l; Eina_List *flat, *l;
@ -1448,7 +1448,7 @@ term_prev(Term *term)
Term *term2 = NULL; Term *term2 = NULL;
Config *config = termio_config_get(term->term); Config *config = termio_config_get(term->term);
if (term->focused) term2 = _term_prev_get(term); if (term->focused) term2 = term_prev_get(term);
if ((term2 != NULL) && (term2 != term)) if ((term2 != NULL) && (term2 != term))
{ {
Split *sp, *sp0; Split *sp, *sp0;
@ -1476,7 +1476,7 @@ term_next(Term *term)
Term *term2 = NULL; Term *term2 = NULL;
Config *config = termio_config_get(term->term); Config *config = termio_config_get(term->term);
if (term->focused) term2 = _term_next_get(term); if (term->focused) term2 = term_next_get(term);
if ((term2 != NULL) && (term2 != term)) if ((term2 != NULL) && (term2 != term))
{ {
Split *sp, *sp0; Split *sp, *sp0;

2
src/bin/win.h
View File

@ -40,6 +40,8 @@ void win_term_swallow(Win *wn, Term *term);
void win_add_split(Win *wn, Term *term); void win_add_split(Win *wn, Term *term);
void win_sizing_handle(Win *wn); void win_sizing_handle(Win *wn);
Term *term_next_get(Term *term);
Term *term_prev_get(Term *term);
void term_next(Term *term); void term_next(Term *term);
void term_prev(Term *term); void term_prev(Term *term);
Win * term_win_get(Term *term); Win * term_win_get(Term *term);