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

correctly set working dir on split

This commit is contained in:
Boris Faure 2015-09-19 14:49:40 +02:00
parent e8bd673f20
commit e6b924a215
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/term_container.h
View File

@ -46,7 +46,7 @@ struct _Term_Container {
Term *(*find_term_at_coords)(Term_Container *container,
Evas_Coord mx, Evas_Coord my);
void (*split)(Term_Container *tc, Term_Container *child,
const char *cmd, Eina_Bool is_horizontal);
Term *from, const char *cmd, Eina_Bool is_horizontal);
void (*size_eval)(Term_Container *container, Sizeinfo *info);
void (*swallow)(Term_Container *container, Term_Container *orig,
Term_Container *new_child);

29
src/bin/win.c
View File

@ -264,9 +264,10 @@ _solo_tabs_new(Term_Container *tc)
static void
_solo_split(Term_Container *tc, Term_Container *child EINA_UNUSED,
Term *from,
const char *cmd, Eina_Bool is_horizontal)
{
tc->parent->split(tc->parent, tc, cmd, is_horizontal);
tc->parent->split(tc->parent, tc, from, cmd, is_horizontal);
}
static Term *
@ -936,8 +937,8 @@ _term_container_is_splittable(Term_Container *tc, Eina_Bool is_horizontal)
}
static void
_win_split(Term_Container *tc, Term_Container *child, const char *cmd,
Eina_Bool is_horizontal)
_win_split(Term_Container *tc, Term_Container *child,
Term *from, const char *cmd, Eina_Bool is_horizontal)
{
Win *wn;
@ -952,7 +953,10 @@ _win_split(Term_Container *tc, Term_Container *child, const char *cmd,
Evas_Object *base;
Evas_Object *o;
tm = tc->focused_term_get(tc);
if (from)
tm = from;
else
tm = tc->focused_term_get(tc);
if (tm && termio_cwd_get(tm->termio, buf, sizeof(buf)))
wdir = buf;
tm_new = term_new(wn, wn->config,
@ -1414,6 +1418,7 @@ _split_bell(Term_Container *tc, Term_Container *child EINA_UNUSED)
static void
_split_split(Term_Container *tc, Term_Container *child,
Term *from,
const char *cmd, Eina_Bool is_horizontal)
{
Split *split;
@ -1430,7 +1435,10 @@ _split_split(Term_Container *tc, Term_Container *child,
Term_Container *tc_split, *tc_solo_new;
Evas_Object *obj_split;
tm = child->focused_term_get(child);
if (from)
tm = from;
else
tm = child->focused_term_get(child);
if (tm && termio_cwd_get(tm->termio, buf, sizeof(buf)))
wdir = buf;
tm_new = term_new(wn, wn->config,
@ -1580,7 +1588,7 @@ split_horizontally(Evas_Object *win EINA_UNUSED, Evas_Object *term,
if (!tm) return;
tc = tm->container;
tc->split(tc, tc, cmd, EINA_TRUE);
tc->split(tc, tc, tm, cmd, EINA_TRUE);
}
void
@ -1594,7 +1602,7 @@ split_vertically(Evas_Object *win EINA_UNUSED, Evas_Object *term,
if (!tm) return;
tc = tm->container;
tc->split(tc, tc, cmd, EINA_FALSE);
tc->split(tc, tc, tm, cmd, EINA_FALSE);
}
/* }}} */
@ -2605,9 +2613,10 @@ tab_item_new(Tabs *tabs, Term_Container *child)
static void
_tabs_split(Term_Container *tc, Term_Container *child EINA_UNUSED,
Term *from,
const char *cmd, Eina_Bool is_horizontal)
{
tc->parent->split(tc->parent, tc, cmd, is_horizontal);
tc->parent->split(tc->parent, tc, from, cmd, is_horizontal);
}
static Term_Container *
@ -3310,7 +3319,7 @@ _cb_split_h(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
Term_Container *tc = term->container;
assert(tc->type == TERM_CONTAINER_TYPE_SOLO);
tc->split(tc, tc, NULL, EINA_TRUE);
tc->split(tc, tc, term, NULL, EINA_TRUE);
}
static void
@ -3320,7 +3329,7 @@ _cb_split_v(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
Term_Container *tc = term->container;
assert(tc->type == TERM_CONTAINER_TYPE_SOLO);
tc->split(tc, tc, NULL, EINA_FALSE);
tc->split(tc, tc, term, NULL, EINA_FALSE);
}
static void