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

force user title one window when set through -T option. Closes T5704

This commit is contained in:
Boris Faure 2017-08-26 19:27:39 +02:00
parent 6bb1552c84
commit 61ce65c700
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/main.c
View File

@ -98,7 +98,7 @@ main_ipc_new(Ipc_Instance *inst)
} }
if (inst->title) if (inst->title)
{ {
nargv[i++] = "-t"; nargv[i++] = "-T";
nargv[i++] = (char *)inst->title; nargv[i++] = (char *)inst->title;
} }
if (inst->font) if (inst->font)

8
src/bin/win.c
View File

@ -161,6 +161,7 @@ struct _Win
Ecore_Timer *cmdbox_focus_timer; Ecore_Timer *cmdbox_focus_timer;
unsigned char focused : 1; unsigned char focused : 1;
unsigned char cmdbox_up : 1; unsigned char cmdbox_up : 1;
unsigned char forced_title : 1;
}; };
/* }}} */ /* }}} */
@ -1003,6 +1004,9 @@ _win_set_title(Term_Container *tc,
wn = (Win*) tc; wn = (Win*) tc;
if (wn->forced_title)
return;
eina_stringshare_del(tc->title); eina_stringshare_del(tc->title);
tc->title = eina_stringshare_ref(title); tc->title = eina_stringshare_ref(title);
@ -1138,10 +1142,12 @@ win_new(const char *name, const char *role, const char *title,
tc->bell = _win_bell; tc->bell = _win_bell;
tc->close = _win_close; tc->close = _win_close;
tc->update = _win_update; tc->update = _win_update;
tc->title = eina_stringshare_add("Terminology"); tc->title = eina_stringshare_add(title? title : "Terminology");
tc->type = TERM_CONTAINER_TYPE_WIN; tc->type = TERM_CONTAINER_TYPE_WIN;
tc->wn = wn; tc->wn = wn;
wn->forced_title = (title != NULL);
config_default_font_set(config, evas_object_evas_get(wn->win)); config_default_font_set(config, evas_object_evas_get(wn->win));
wn->config = config_fork(config); wn->config = config_fork(config);