summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2015-03-22 15:11:10 +0100
committerBoris Faure <billiob@gmail.com>2015-03-22 15:11:10 +0100
commite6c45c593d0907fded8120e865a3cc8f682ab0f1 (patch)
tree20cc299af5d7b78c9001365cc10f233ca36533ba /src
parent6aee349409c6d2d6cc1327e60c42636aeb6c1e10 (diff)
win: cleanup: rename Term.term to Term.termio
Diffstat (limited to 'src')
-rw-r--r--src/bin/win.c194
1 files changed, 99 insertions, 95 deletions
diff --git a/src/bin/win.c b/src/bin/win.c
index d07e444..0446efc 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -38,9 +38,10 @@ struct _Term
38{ 38{
39 Win *wn; 39 Win *wn;
40 Config *config; 40 Config *config;
41
41 Evas_Object *bg; 42 Evas_Object *bg;
42 Evas_Object *base; 43 Evas_Object *base;
43 Evas_Object *term; 44 Evas_Object *termio;
44 Evas_Object *media; 45 Evas_Object *media;
45 Evas_Object *popmedia; 46 Evas_Object *popmedia;
46 Evas_Object *miniview; 47 Evas_Object *miniview;
@@ -190,14 +191,14 @@ _cb_win_focus_in(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUS
190 { 191 {
191 edje_object_signal_emit(term->bg, "focus,out", "terminology"); 192 edje_object_signal_emit(term->bg, "focus,out", "terminology");
192 edje_object_signal_emit(term->base, "focus,out", "terminology"); 193 edje_object_signal_emit(term->base, "focus,out", "terminology");
193 if (!wn->cmdbox_up) elm_object_focus_set(term->term, EINA_FALSE); 194 if (!wn->cmdbox_up) elm_object_focus_set(term->termio, EINA_FALSE);
194 } 195 }
195 term = term_mouse; 196 term = term_mouse;
196 } 197 }
197 } 198 }
198 199
199 if (!term) return; 200 if (!term) return;
200 sp = _split_find(wn->win, term->term, NULL); 201 sp = _split_find(wn->win, term->termio, NULL);
201 if (sp->sel) 202 if (sp->sel)
202 { 203 {
203 if (!wn->cmdbox_up) elm_object_focus_set(sp->sel, EINA_TRUE); 204 if (!wn->cmdbox_up) elm_object_focus_set(sp->sel, EINA_TRUE);
@@ -206,7 +207,7 @@ _cb_win_focus_in(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUS
206 { 207 {
207 edje_object_signal_emit(term->bg, "focus,in", "terminology"); 208 edje_object_signal_emit(term->bg, "focus,in", "terminology");
208 edje_object_signal_emit(term->base, "focus,in", "terminology"); 209 edje_object_signal_emit(term->base, "focus,in", "terminology");
209 if (!wn->cmdbox_up) elm_object_focus_set(term->term, EINA_TRUE); 210 if (!wn->cmdbox_up) elm_object_focus_set(term->termio, EINA_TRUE);
210 } 211 }
211} 212}
212 213
@@ -224,7 +225,7 @@ _cb_win_focus_out(void *data, Evas_Object *obj EINA_UNUSED,
224 if (!term) return; 225 if (!term) return;
225 edje_object_signal_emit(term->bg, "focus,out", "terminology"); 226 edje_object_signal_emit(term->bg, "focus,out", "terminology");
226 edje_object_signal_emit(term->base, "focus,out", "terminology"); 227 edje_object_signal_emit(term->base, "focus,out", "terminology");
227 if (!wn->cmdbox_up) elm_object_focus_set(term->term, EINA_FALSE); 228 if (!wn->cmdbox_up) elm_object_focus_set(term->termio, EINA_FALSE);
228} 229}
229 230
230static void 231static void
@@ -234,9 +235,9 @@ _cb_term_mouse_in(void *data, Evas *e EINA_UNUSED,
234 Term *term = data; 235 Term *term = data;
235 Config *config; 236 Config *config;
236 237
237 if ((!term) || (!term->term)) return; 238 if ((!term) || (!term->termio)) return;
238 239
239 config = termio_config_get(term->term); 240 config = termio_config_get(term->termio);
240 241
241 if ((!config) || (!config->mouse_over_focus)) return; 242 if ((!config) || (!config->mouse_over_focus)) return;
242 if ((!term->wn) || (!term->wn->focused)) return; 243 if ((!term->wn) || (!term->wn->focused)) return;
@@ -673,9 +674,9 @@ _split_size_walk(Split *sp, Sizeinfo *info)
673 info->req_w = sp->term->req_w; 674 info->req_w = sp->term->req_w;
674 info->req_h = sp->term->req_h; 675 info->req_h = sp->term->req_h;
675 // XXXX sp->terms sizedone too? 676 // XXXX sp->terms sizedone too?
676 if (!evas_object_data_get(sp->term->term, "sizedone")) 677 if (!evas_object_data_get(sp->term->termio, "sizedone"))
677 { 678 {
678 evas_object_data_set(sp->term->term, "sizedone", sp->term->term); 679 evas_object_data_set(sp->term->termio, "sizedone", sp->term->termio);
679 info->req = 1; 680 info->req = 1;
680 } 681 }
681 } 682 }
@@ -787,7 +788,7 @@ _cb_size_hint(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event EIN
787} 788}
788 789
789static Split * 790static Split *
790_split_split_find(Split *sp, Evas_Object *term, Term **ptm) 791_split_split_find(Split *sp, Evas_Object *termio, Term **ptm)
791{ 792{
792 Split *sp2; 793 Split *sp2;
793 Eina_List *l; 794 Eina_List *l;
@@ -795,14 +796,14 @@ _split_split_find(Split *sp, Evas_Object *term, Term **ptm)
795 796
796 if (sp->term) 797 if (sp->term)
797 { 798 {
798 if (sp->term->term == term) 799 if (sp->term->termio == termio)
799 { 800 {
800 if (ptm) *ptm = sp->term; 801 if (ptm) *ptm = sp->term;
801 return sp; 802 return sp;
802 } 803 }
803 EINA_LIST_FOREACH(sp->terms, l, tm) 804 EINA_LIST_FOREACH(sp->terms, l, tm)
804 { 805 {
805 if (tm->term == term) 806 if (tm->termio == termio)
806 { 807 {
807 if (ptm) *ptm = tm; 808 if (ptm) *ptm = tm;
808 return sp; 809 return sp;
@@ -811,12 +812,12 @@ _split_split_find(Split *sp, Evas_Object *term, Term **ptm)
811 } 812 }
812 if (sp->s1) 813 if (sp->s1)
813 { 814 {
814 sp2 = _split_split_find(sp->s1, term, ptm); 815 sp2 = _split_split_find(sp->s1, termio, ptm);
815 if (sp2) return sp2; 816 if (sp2) return sp2;
816 } 817 }
817 if (sp->s2) 818 if (sp->s2)
818 { 819 {
819 sp2 = _split_split_find(sp->s2, term, ptm); 820 sp2 = _split_split_find(sp->s2, termio, ptm);
820 if (sp2) return sp2; 821 if (sp2) return sp2;
821 } 822 }
822 return NULL; 823 return NULL;
@@ -923,7 +924,7 @@ _split_tabbar_fill(Split *sp, Term *tm)
923 theme_apply(o, term->config, "terminology/tabbar_back"); 924 theme_apply(o, term->config, "terminology/tabbar_back");
924 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 925 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
925 evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 926 evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
926 edje_object_part_text_set(o, "terminology.title", termio_title_get(term->term)); 927 edje_object_part_text_set(o, "terminology.title", termio_title_get(term->termio));
927 edje_object_size_min_calc(o, &w, &h); 928 edje_object_size_min_calc(o, &w, &h);
928 evas_object_size_hint_min_set(o, w, h); 929 evas_object_size_hint_min_set(o, w, h);
929 if (j < i) 930 if (j < i)
@@ -999,7 +1000,7 @@ _split_tabcount_update(Split *sp, Term *tm)
999 edje_object_part_swallow(term->bg, "terminology.tab", term->tab_spacer); 1000 edje_object_part_swallow(term->bg, "terminology.tab", term->tab_spacer);
1000 edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 0.0); 1001 edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 0.0);
1001 edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2, 0.0); 1002 edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2, 0.0);
1002 edje_object_part_text_set(term->bg, "terminology.tab.title", termio_title_get(term->term)); 1003 edje_object_part_text_set(term->bg, "terminology.tab.title", termio_title_get(term->termio));
1003 edje_object_signal_emit(term->bg, "tabbar,on", "terminology"); 1004 edje_object_signal_emit(term->bg, "tabbar,on", "terminology");
1004 edje_object_message_signal_process(term->bg); 1005 edje_object_message_signal_process(term->bg);
1005 } 1006 }
@@ -1112,7 +1113,7 @@ _split_split(Split *sp, Eina_Bool horizontal, char *cmd)
1112 sp2->parent = sp; 1113 sp2->parent = sp;
1113 sp2->wn = sp->wn; 1114 sp2->wn = sp->wn;
1114 config = config_fork(sp->term->config); 1115 config = config_fork(sp->term->config);
1115 if (termio_cwd_get(sp->term->term, buf, sizeof(buf))) wdir = buf; 1116 if (termio_cwd_get(sp->term->termio, buf, sizeof(buf))) wdir = buf;
1116 sp2->term = term_new(sp->wn, config, 1117 sp2->term = term_new(sp->wn, config,
1117 cmd, config->login_shell, wdir, 1118 cmd, config->login_shell, wdir,
1118 80, 24, EINA_FALSE); 1119 80, 24, EINA_FALSE);
@@ -1121,7 +1122,7 @@ _split_split(Split *sp, Eina_Bool horizontal, char *cmd)
1121 _term_focus(sp2->term); 1122 _term_focus(sp2->term);
1122 _term_media_update(sp2->term, config); 1123 _term_media_update(sp2->term, config);
1123 _split_tabcount_update(sp2, sp2->term); 1124 _split_tabcount_update(sp2, sp2->term);
1124 evas_object_data_set(sp2->term->term, "sizedone", sp2->term->term); 1125 evas_object_data_set(sp2->term->termio, "sizedone", sp2->term->termio);
1125 elm_object_part_content_set(sp->panes, PANES_TOP, sp1->term->bg); 1126 elm_object_part_content_set(sp->panes, PANES_TOP, sp1->term->bg);
1126 elm_object_part_content_set(sp->panes, PANES_BOTTOM, sp2->term->bg); 1127 elm_object_part_content_set(sp->panes, PANES_BOTTOM, sp2->term->bg);
1127 1128
@@ -1186,7 +1187,7 @@ main_new_with_dir(Evas_Object *win, Evas_Object *term, const char *wdir)
1186 _term_resize_track_stop(sp); 1187 _term_resize_track_stop(sp);
1187 evas_object_hide(sp->term->bg); 1188 evas_object_hide(sp->term->bg);
1188 config = config_fork(sp->term->config); 1189 config = config_fork(sp->term->config);
1189 termio_size_get(sp->term->term, &w, &h); 1190 termio_size_get(sp->term->termio, &w, &h);
1190 sp->term = term_new(sp->wn, config, 1191 sp->term = term_new(sp->wn, config,
1191 NULL, config->login_shell, wdir, 1192 NULL, config->login_shell, wdir,
1192 w, h, EINA_FALSE); 1193 w, h, EINA_FALSE);
@@ -1194,7 +1195,7 @@ main_new_with_dir(Evas_Object *win, Evas_Object *term, const char *wdir)
1194 _term_resize_track_start(sp); 1195 _term_resize_track_start(sp);
1195 _term_focus(sp->term); 1196 _term_focus(sp->term);
1196 _term_media_update(sp->term, config); 1197 _term_media_update(sp->term, config);
1197 evas_object_data_set(sp->term->term, "sizedone", sp->term->term); 1198 evas_object_data_set(sp->term->termio, "sizedone", sp->term->termio);
1198 _term_focus_show(sp, sp->term); 1199 _term_focus_show(sp, sp->term);
1199 _split_tabcount_update(sp, sp->term); 1200 _split_tabcount_update(sp, sp->term);
1200} 1201}
@@ -1205,7 +1206,7 @@ main_new(Evas_Object *win, Evas_Object *term)
1205 Split *sp = _split_find(win, term, NULL); 1206 Split *sp = _split_find(win, term, NULL);
1206 char buf[PATH_MAX], *wdir = NULL; 1207 char buf[PATH_MAX], *wdir = NULL;
1207 1208
1208 if (termio_cwd_get(sp->term->term, buf, sizeof(buf))) wdir = buf; 1209 if (termio_cwd_get(sp->term->termio, buf, sizeof(buf))) wdir = buf;
1209 main_new_with_dir(win, term, wdir); 1210 main_new_with_dir(win, term, wdir);
1210} 1211}
1211 1212
@@ -1254,7 +1255,7 @@ term_next_get(Term *termin)
1254 Split *sp; 1255 Split *sp;
1255 Eina_List *flat, *l; 1256 Eina_List *flat, *l;
1256 1257
1257 sp = _split_find(termin->wn->win, termin->term, NULL); 1258 sp = _split_find(termin->wn->win, termin->termio, NULL);
1258 l = eina_list_data_find_list(sp->terms, termin); 1259 l = eina_list_data_find_list(sp->terms, termin);
1259 if ((l) && (l->next)) return l->next->data; 1260 if ((l) && (l->next)) return l->next->data;
1260 if (!sp->parent) return sp->terms->data; 1261 if (!sp->parent) return sp->terms->data;
@@ -1285,7 +1286,7 @@ term_prev_get(Term *termin)
1285 Split *sp; 1286 Split *sp;
1286 Eina_List *flat, *l; 1287 Eina_List *flat, *l;
1287 1288
1288 sp = _split_find(termin->wn->win, termin->term, NULL); 1289 sp = _split_find(termin->wn->win, termin->termio, NULL);
1289 l = eina_list_data_find_list(sp->terms, termin); 1290 l = eina_list_data_find_list(sp->terms, termin);
1290 if ((l) && (l->prev)) return l->prev->data; 1291 if ((l) && (l->prev)) return l->prev->data;
1291 if (!sp->parent) return eina_list_data_get(eina_list_last(sp->terms)); 1292 if (!sp->parent) return eina_list_data_get(eina_list_last(sp->terms));
@@ -1382,7 +1383,7 @@ void win_term_swallow(Win *wn, Term *term)
1382 Evas *evas = evas_object_evas_get(base); 1383 Evas *evas = evas_object_evas_get(base);
1383 1384
1384 edje_object_part_swallow(base, "terminology.content", term->bg); 1385 edje_object_part_swallow(base, "terminology.content", term->bg);
1385 _cb_size_hint(term, evas, term->term, NULL); 1386 _cb_size_hint(term, evas, term->termio, NULL);
1386} 1387}
1387 1388
1388void change_theme(Evas_Object *win, Config *config) 1389void change_theme(Evas_Object *win, Config *config)
@@ -1395,12 +1396,12 @@ void change_theme(Evas_Object *win, Config *config)
1395 1396
1396 EINA_LIST_FOREACH(terms, l, term) 1397 EINA_LIST_FOREACH(terms, l, term)
1397 { 1398 {
1398 Evas_Object *edje = termio_theme_get(term->term); 1399 Evas_Object *edje = termio_theme_get(term->termio);
1399 1400
1400 if (!theme_apply(edje, config, "terminology/background")) 1401 if (!theme_apply(edje, config, "terminology/background"))
1401 ERR("Couldn't find terminology theme!"); 1402 ERR("Couldn't find terminology theme!");
1402 colors_term_init(termio_textgrid_get(term->term), edje, config); 1403 colors_term_init(termio_textgrid_get(term->termio), edje, config);
1403 termio_config_set(term->term, config); 1404 termio_config_set(term->termio, config);
1404 } 1405 }
1405 1406
1406 l = elm_theme_overlay_list_get(NULL); 1407 l = elm_theme_overlay_list_get(NULL);
@@ -1426,7 +1427,7 @@ _term_focus(Term *term)
1426 term2->focused = EINA_FALSE; 1427 term2->focused = EINA_FALSE;
1427 edje_object_signal_emit(term2->bg, "focus,out", "terminology"); 1428 edje_object_signal_emit(term2->bg, "focus,out", "terminology");
1428 edje_object_signal_emit(term2->base, "focus,out", "terminology"); 1429 edje_object_signal_emit(term2->base, "focus,out", "terminology");
1429 elm_object_focus_set(term2->term, EINA_FALSE); 1430 elm_object_focus_set(term2->termio, EINA_FALSE);
1430 } 1431 }
1431 } 1432 }
1432 } 1433 }
@@ -1434,12 +1435,12 @@ _term_focus(Term *term)
1434 edje_object_signal_emit(term->bg, "focus,in", "terminology"); 1435 edje_object_signal_emit(term->bg, "focus,in", "terminology");
1435 edje_object_signal_emit(term->base, "focus,in", "terminology"); 1436 edje_object_signal_emit(term->base, "focus,in", "terminology");
1436 if (term->wn->cmdbox) elm_object_focus_set(term->wn->cmdbox, EINA_FALSE); 1437 if (term->wn->cmdbox) elm_object_focus_set(term->wn->cmdbox, EINA_FALSE);
1437 elm_object_focus_set(term->term, EINA_TRUE); 1438 elm_object_focus_set(term->termio, EINA_TRUE);
1438 elm_win_title_set(term->wn->win, termio_title_get(term->term)); 1439 elm_win_title_set(term->wn->win, termio_title_get(term->termio));
1439 if (term->missed_bell) 1440 if (term->missed_bell)
1440 term->missed_bell = EINA_FALSE; 1441 term->missed_bell = EINA_FALSE;
1441 1442
1442 sp = _split_find(term->wn->win, term->term, NULL); 1443 sp = _split_find(term->wn->win, term->termio, NULL);
1443 if (sp) _split_tabcount_update(sp, term); 1444 if (sp) _split_tabcount_update(sp, term);
1444} 1445}
1445 1446
@@ -1447,15 +1448,15 @@ void
1447term_prev(Term *term) 1448term_prev(Term *term)
1448{ 1449{
1449 Term *term2 = NULL; 1450 Term *term2 = NULL;
1450 Config *config = termio_config_get(term->term); 1451 Config *config = termio_config_get(term->termio);
1451 1452
1452 if (term->focused) term2 = term_prev_get(term); 1453 if (term->focused) term2 = term_prev_get(term);
1453 if ((term2 != NULL) && (term2 != term)) 1454 if ((term2 != NULL) && (term2 != term))
1454 { 1455 {
1455 Split *sp, *sp0; 1456 Split *sp, *sp0;
1456 1457
1457 sp0 = _split_find(term->wn->win, term->term, NULL); 1458 sp0 = _split_find(term->wn->win, term->termio, NULL);
1458 sp = _split_find(term2->wn->win, term2->term, NULL); 1459 sp = _split_find(term2->wn->win, term2->termio, NULL);
1459 if ((sp == sp0) && (config->tab_zoom >= 0.01) && (config->notabs)) 1460 if ((sp == sp0) && (config->tab_zoom >= 0.01) && (config->notabs))
1460 _sel_go(sp, term2); 1461 _sel_go(sp, term2);
1461 else 1462 else
@@ -1475,15 +1476,15 @@ void
1475term_next(Term *term) 1476term_next(Term *term)
1476{ 1477{
1477 Term *term2 = NULL; 1478 Term *term2 = NULL;
1478 Config *config = termio_config_get(term->term); 1479 Config *config = termio_config_get(term->termio);
1479 1480
1480 if (term->focused) term2 = term_next_get(term); 1481 if (term->focused) term2 = term_next_get(term);
1481 if ((term2 != NULL) && (term2 != term)) 1482 if ((term2 != NULL) && (term2 != term))
1482 { 1483 {
1483 Split *sp, *sp0; 1484 Split *sp, *sp0;
1484 1485
1485 sp0 = _split_find(term->wn->win, term->term, NULL); 1486 sp0 = _split_find(term->wn->win, term->termio, NULL);
1486 sp = _split_find(term2->wn->win, term2->term, NULL); 1487 sp = _split_find(term2->wn->win, term2->termio, NULL);
1487 if ((sp == sp0) && (config->tab_zoom >= 0.01) && (config->notabs)) 1488 if ((sp == sp0) && (config->tab_zoom >= 0.01) && (config->notabs))
1488 _sel_go(sp, term2); 1489 _sel_go(sp, term2);
1489 else 1490 else
@@ -1538,7 +1539,7 @@ _cb_popmedia_done(void *data, Evas_Object *obj EINA_UNUSED, const char *sig EINA
1538 term->popmedia = NULL; 1539 term->popmedia = NULL;
1539 } 1540 }
1540 term->popmedia_deleted = EINA_FALSE; 1541 term->popmedia_deleted = EINA_FALSE;
1541 termio_mouseover_suspend_pushpop(term->term, -1); 1542 termio_mouseover_suspend_pushpop(term->termio, -1);
1542 _popmedia_queue_process(term); 1543 _popmedia_queue_process(term);
1543 } 1544 }
1544} 1545}
@@ -1559,7 +1560,7 @@ static void
1559_popmedia_show(Term *term, const char *src, Media_Type type) 1560_popmedia_show(Term *term, const char *src, Media_Type type)
1560{ 1561{
1561 Evas_Object *o; 1562 Evas_Object *o;
1562 Config *config = termio_config_get(term->term); 1563 Config *config = termio_config_get(term->termio);
1563 1564
1564 EINA_SAFETY_ON_NULL_RETURN(config); 1565 EINA_SAFETY_ON_NULL_RETURN(config);
1565 ty_dbus_link_hide(); 1566 ty_dbus_link_hide();
@@ -1576,7 +1577,7 @@ _popmedia_show(Term *term, const char *src, Media_Type type)
1576 edje_object_signal_emit(term->bg, "popmedia,off", "terminology"); 1577 edje_object_signal_emit(term->bg, "popmedia,off", "terminology");
1577 return; 1578 return;
1578 } 1579 }
1579 termio_mouseover_suspend_pushpop(term->term, 1); 1580 termio_mouseover_suspend_pushpop(term->termio, 1);
1580 term->popmedia = o = media_add(win_evas_object_get(term->wn), 1581 term->popmedia = o = media_add(win_evas_object_get(term->wn),
1581 src, config, MEDIA_POP, type); 1582 src, config, MEDIA_POP, type);
1582 term->popmedia_deleted = EINA_FALSE; 1583 term->popmedia_deleted = EINA_FALSE;
@@ -1695,7 +1696,7 @@ static void
1695_popmedia(Term *term, const char *src) 1696_popmedia(Term *term, const char *src)
1696{ 1697{
1697 Media_Type type; 1698 Media_Type type;
1698 Config *config = termio_config_get(term->term); 1699 Config *config = termio_config_get(term->termio);
1699 1700
1700#ifdef HAVE_ECORE_CON_URL_HEAD 1701#ifdef HAVE_ECORE_CON_URL_HEAD
1701 Ty_Http_Head *ty_head = calloc(1, sizeof(Ty_Http_Head)); 1702 Ty_Http_Head *ty_head = calloc(1, sizeof(Ty_Http_Head));
@@ -1751,7 +1752,7 @@ _term_miniview_check(Term *term)
1751 1752
1752 EINA_LIST_FOREACH(wn_list, l, term) 1753 EINA_LIST_FOREACH(wn_list, l, term)
1753 { 1754 {
1754 Split *sp = _split_find(term->wn->win, term->term, NULL); 1755 Split *sp = _split_find(term->wn->win, term->termio, NULL);
1755 if (term->miniview_shown) 1756 if (term->miniview_shown)
1756 { 1757 {
1757 if (term->focused) 1758 if (term->focused)
@@ -1821,7 +1822,7 @@ _cb_popup(void *data, Evas_Object *obj EINA_UNUSED, void *event)
1821{ 1822{
1822 Term *term = data; 1823 Term *term = data;
1823 const char *src = event; 1824 const char *src = event;
1824 if (!src) src = termio_link_get(term->term); 1825 if (!src) src = termio_link_get(term->termio);
1825 if (!src) return; 1826 if (!src) return;
1826 _popmedia(term, src); 1827 _popmedia(term, src);
1827} 1828}
@@ -1831,7 +1832,7 @@ _cb_popup_queue(void *data, Evas_Object *obj EINA_UNUSED, void *event)
1831{ 1832{
1832 Term *term = data; 1833 Term *term = data;
1833 const char *src = event; 1834 const char *src = event;
1834 if (!src) src = termio_link_get(term->term); 1835 if (!src) src = termio_link_get(term->termio);
1835 if (!src) return; 1836 if (!src) return;
1836 _popmedia_queue_add(term, src); 1837 _popmedia_queue_add(term, src);
1837} 1838}
@@ -1891,7 +1892,7 @@ _cb_command(void *data, Evas_Object *obj EINA_UNUSED, void *event)
1891 { 1892 {
1892 if (cmd[1] == 't') // temporary 1893 if (cmd[1] == 't') // temporary
1893 { 1894 {
1894 Config *config = termio_config_get(term->term); 1895 Config *config = termio_config_get(term->termio);
1895 1896
1896 if (config) 1897 if (config)
1897 { 1898 {
@@ -1905,7 +1906,7 @@ _cb_command(void *data, Evas_Object *obj EINA_UNUSED, void *event)
1905 } 1906 }
1906 else if (cmd[1] == 'p') // permanent 1907 else if (cmd[1] == 'p') // permanent
1907 { 1908 {
1908 Config *config = termio_config_get(term->term); 1909 Config *config = termio_config_get(term->termio);
1909 1910
1910 if (config) 1911 if (config)
1911 { 1912 {
@@ -1922,9 +1923,9 @@ _cb_command(void *data, Evas_Object *obj EINA_UNUSED, void *event)
1922 else if (cmd[0] == 'a') // set alpha 1923 else if (cmd[0] == 'a') // set alpha
1923 { 1924 {
1924 if (cmd[1] == 't') // temporary 1925 if (cmd[1] == 't') // temporary
1925 _set_alpha(termio_config_get(term->term), cmd + 2, EINA_FALSE); 1926 _set_alpha(termio_config_get(term->termio), cmd + 2, EINA_FALSE);
1926 else if (cmd[1] == 'p') // permanent 1927 else if (cmd[1] == 'p') // permanent
1927 _set_alpha(termio_config_get(term->term), cmd + 2, EINA_TRUE); 1928 _set_alpha(termio_config_get(term->termio), cmd + 2, EINA_TRUE);
1928 } 1929 }
1929} 1930}
1930 1931
@@ -1934,7 +1935,7 @@ _cb_tabcount_go(void *data, Evas_Object *obj EINA_UNUSED, const char *sig EINA_U
1934 Term *term = data; 1935 Term *term = data;
1935 Split *sp; 1936 Split *sp;
1936 1937
1937 sp = _split_find(term->wn->win, term->term, NULL); 1938 sp = _split_find(term->wn->win, term->termio, NULL);
1938 _sel_go(sp, term); 1939 _sel_go(sp, term);
1939} 1940}
1940 1941
@@ -1959,7 +1960,7 @@ _cb_new(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
1959{ 1960{
1960 Term *term = data; 1961 Term *term = data;
1961 1962
1962 main_new(term->wn->win, term->term); 1963 main_new(term->wn->win, term->termio);
1963 _term_miniview_check(term); 1964 _term_miniview_check(term);
1964} 1965}
1965 1966
@@ -1968,7 +1969,7 @@ main_term_focus(Term *term EINA_UNUSED)
1968{ 1969{
1969 Split *sp; 1970 Split *sp;
1970 1971
1971 sp = _split_find(term->wn->win, term->term, NULL); 1972 sp = _split_find(term->wn->win, term->termio, NULL);
1972 if (sp->terms->next != NULL) 1973 if (sp->terms->next != NULL)
1973 _sel_go(sp, term); 1974 _sel_go(sp, term);
1974} 1975}
@@ -1985,7 +1986,7 @@ _cb_split_h(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
1985{ 1986{
1986 Term *term = data; 1987 Term *term = data;
1987 1988
1988 main_split_h(term->wn->win, term->term, NULL); 1989 main_split_h(term->wn->win, term->termio, NULL);
1989} 1990}
1990 1991
1991static void 1992static void
@@ -1993,7 +1994,7 @@ _cb_split_v(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
1993{ 1994{
1994 Term *term = data; 1995 Term *term = data;
1995 1996
1996 main_split_v(term->wn->win, term->term, NULL); 1997 main_split_v(term->wn->win, term->termio, NULL);
1997} 1998}
1998 1999
1999static void 2000static void
@@ -2001,11 +2002,12 @@ _cb_title(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
2001{ 2002{
2002 Term *term = data; 2003 Term *term = data;
2003 if (term->focused) 2004 if (term->focused)
2004 elm_win_title_set(term->wn->win, termio_title_get(term->term)); 2005 elm_win_title_set(term->wn->win, termio_title_get(term->termio));
2005 edje_object_part_text_set(term->bg, "terminology.tab.title", termio_title_get(term->term)); 2006 edje_object_part_text_set(term->bg, "terminology.tab.title",
2007 termio_title_get(term->termio));
2006 if (term->config->notabs) 2008 if (term->config->notabs)
2007 { 2009 {
2008 Split *sp = _split_find(term->wn->win, term->term, NULL); 2010 Split *sp = _split_find(term->wn->win, term->termio, NULL);
2009 if (sp) 2011 if (sp)
2010 { 2012 {
2011 Eina_List *l, *ll; 2013 Eina_List *l, *ll;
@@ -2018,13 +2020,15 @@ _cb_title(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
2018 { 2020 {
2019 term2 = evas_object_data_get(o, "term"); 2021 term2 = evas_object_data_get(o, "term");
2020 if (term2) 2022 if (term2)
2021 edje_object_part_text_set(o, "terminology.title", termio_title_get(term2->term)); 2023 edje_object_part_text_set(o, "terminology.title",
2024 termio_title_get(term2->termio));
2022 } 2025 }
2023 EINA_LIST_FOREACH(term->tabbar.r.tabs, ll, o) 2026 EINA_LIST_FOREACH(term->tabbar.r.tabs, ll, o)
2024 { 2027 {
2025 term2 = evas_object_data_get(o, "term"); 2028 term2 = evas_object_data_get(o, "term");
2026 if (term2) 2029 if (term2)
2027 edje_object_part_text_set(o, "terminology.title", termio_title_get(term2->term)); 2030 edje_object_part_text_set(o, "terminology.title",
2031 termio_title_get(term2->termio));
2028 } 2032 }
2029 } 2033 }
2030 } 2034 }
@@ -2036,14 +2040,14 @@ _cb_icon(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
2036{ 2040{
2037 Term *term = data; 2041 Term *term = data;
2038 if (term->focused) 2042 if (term->focused)
2039 elm_win_icon_name_set(term->wn->win, termio_icon_name_get(term->term)); 2043 elm_win_icon_name_set(term->wn->win, termio_icon_name_get(term->termio));
2040} 2044}
2041 2045
2042static void 2046static void
2043_tab_go(Term *term, int tnum) 2047_tab_go(Term *term, int tnum)
2044{ 2048{
2045 Term *term2; 2049 Term *term2;
2046 Split *sp = _split_find(term->wn->win, term->term, NULL); 2050 Split *sp = _split_find(term->wn->win, term->termio, NULL);
2047 if (!sp) return; 2051 if (!sp) return;
2048 2052
2049 term2 = eina_list_nth(sp->terms, tnum); 2053 term2 = eina_list_nth(sp->terms, tnum);
@@ -2081,7 +2085,7 @@ _cb_cmd_focus(void *data)
2081 term = win_focused_term_get(wn); 2085 term = win_focused_term_get(wn);
2082 if (term) 2086 if (term)
2083 { 2087 {
2084 elm_object_focus_set(term->term, EINA_FALSE); 2088 elm_object_focus_set(term->termio, EINA_FALSE);
2085 if (term->wn->cmdbox) elm_object_focus_set(wn->cmdbox, EINA_TRUE); 2089 if (term->wn->cmdbox) elm_object_focus_set(wn->cmdbox, EINA_TRUE);
2086 } 2090 }
2087 return EINA_FALSE; 2091 return EINA_FALSE;
@@ -2111,14 +2115,14 @@ _cb_cmd_activated(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNU
2111 if (wn->cmdbox) elm_object_focus_set(wn->cmdbox, EINA_FALSE); 2115 if (wn->cmdbox) elm_object_focus_set(wn->cmdbox, EINA_FALSE);
2112 edje_object_signal_emit(wn->base, "cmdbox,hide", "terminology"); 2116 edje_object_signal_emit(wn->base, "cmdbox,hide", "terminology");
2113 term = win_focused_term_get(wn); 2117 term = win_focused_term_get(wn);
2114 if (term) elm_object_focus_set(term->term, EINA_TRUE); 2118 if (term) elm_object_focus_set(term->termio, EINA_TRUE);
2115 if (wn->cmdbox) cmd = (char *)elm_entry_entry_get(wn->cmdbox); 2119 if (wn->cmdbox) cmd = (char *)elm_entry_entry_get(wn->cmdbox);
2116 if (cmd) 2120 if (cmd)
2117 { 2121 {
2118 cmd = elm_entry_markup_to_utf8(cmd); 2122 cmd = elm_entry_markup_to_utf8(cmd);
2119 if (cmd) 2123 if (cmd)
2120 { 2124 {
2121 if (term) termcmd_do(term->term, term->wn->win, term->bg, cmd); 2125 if (term) termcmd_do(term->termio, term->wn->win, term->bg, cmd);
2122 free(cmd); 2126 free(cmd);
2123 } 2127 }
2124 } 2128 }
@@ -2141,7 +2145,7 @@ _cb_cmd_aborted(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSE
2141 if (wn->cmdbox) elm_object_focus_set(wn->cmdbox, EINA_FALSE); 2145 if (wn->cmdbox) elm_object_focus_set(wn->cmdbox, EINA_FALSE);
2142 edje_object_signal_emit(wn->base, "cmdbox,hide", "terminology"); 2146 edje_object_signal_emit(wn->base, "cmdbox,hide", "terminology");
2143 term = win_focused_term_get(wn); 2147 term = win_focused_term_get(wn);
2144 if (term) elm_object_focus_set(term->term, EINA_TRUE); 2148 if (term) elm_object_focus_set(term->termio, EINA_TRUE);
2145 if (wn->cmdbox_focus_timer) 2149 if (wn->cmdbox_focus_timer)
2146 { 2150 {
2147 ecore_timer_del(wn->cmdbox_focus_timer); 2151 ecore_timer_del(wn->cmdbox_focus_timer);
@@ -2167,7 +2171,7 @@ _cb_cmd_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSE
2167 cmd = elm_entry_markup_to_utf8(cmd); 2171 cmd = elm_entry_markup_to_utf8(cmd);
2168 if (cmd) 2172 if (cmd)
2169 { 2173 {
2170 termcmd_watch(term->term, term->wn->win, term->bg, cmd); 2174 termcmd_watch(term->termio, term->wn->win, term->bg, cmd);
2171 free(cmd); 2175 free(cmd);
2172 } 2176 }
2173 } 2177 }
@@ -2215,7 +2219,7 @@ _cb_cmdbox(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
2215 edje_object_part_swallow(wn->base, "terminology.cmdbox", o); 2219 edje_object_part_swallow(wn->base, "terminology.cmdbox", o);
2216 } 2220 }
2217 edje_object_signal_emit(term->wn->base, "cmdbox,show", "terminology"); 2221 edje_object_signal_emit(term->wn->base, "cmdbox,show", "terminology");
2218 elm_object_focus_set(term->term, EINA_FALSE); 2222 elm_object_focus_set(term->termio, EINA_FALSE);
2219 elm_entry_entry_set(term->wn->cmdbox, ""); 2223 elm_entry_entry_set(term->wn->cmdbox, "");
2220 evas_object_show(term->wn->cmdbox); 2224 evas_object_show(term->wn->cmdbox);
2221 if (term->wn->cmdbox_focus_timer) 2225 if (term->wn->cmdbox_focus_timer)
@@ -2236,7 +2240,7 @@ _cb_media_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
2236 Term *term = data; 2240 Term *term = data;
2237 Config *config = NULL; 2241 Config *config = NULL;
2238 2242
2239 if (term->term) config = termio_config_get(term->term); 2243 if (term->termio) config = termio_config_get(term->termio);
2240 term->media = NULL; 2244 term->media = NULL;
2241 if (term->bg) 2245 if (term->bg)
2242 { 2246 {
@@ -2340,7 +2344,7 @@ main_media_mute_update(const Config *config)
2340 EINA_LIST_FOREACH(wn->terms, ll, term) 2344 EINA_LIST_FOREACH(wn->terms, ll, term)
2341 { 2345 {
2342 if (term->media) media_mute_set(term->media, config->mute); 2346 if (term->media) media_mute_set(term->media, config->mute);
2343 termio_media_mute_set(term->term, config->mute); 2347 termio_media_mute_set(term->termio, config->mute);
2344 } 2348 }
2345 } 2349 }
2346} 2350}
@@ -2357,7 +2361,7 @@ main_media_visualize_update(const Config *config)
2357 EINA_LIST_FOREACH(wn->terms, ll, term) 2361 EINA_LIST_FOREACH(wn->terms, ll, term)
2358 { 2362 {
2359 if (term->media) media_visualize_set(term->media, config->visualize); 2363 if (term->media) media_visualize_set(term->media, config->visualize);
2360 termio_media_visualize_set(term->term, config->visualize); 2364 termio_media_visualize_set(term->termio, config->visualize);
2361 } 2365 }
2362 } 2366 }
2363} 2367}
@@ -2381,17 +2385,17 @@ main_config_sync(const Config *config)
2381 Evas_Coord mw = 1, mh = 1, w, h, tsize_w = 0, tsize_h = 0; 2385 Evas_Coord mw = 1, mh = 1, w, h, tsize_w = 0, tsize_h = 0;
2382 2386
2383 config_sync(config, term->config); 2387 config_sync(config, term->config);
2384 evas_object_geometry_get(term->term, NULL, NULL, 2388 evas_object_geometry_get(term->termio, NULL, NULL,
2385 &tsize_w, &tsize_h); 2389 &tsize_w, &tsize_h);
2386 evas_object_data_del(term->term, "sizedone"); 2390 evas_object_data_del(term->termio, "sizedone");
2387 termio_config_update(term->term); 2391 termio_config_update(term->termio);
2388 evas_object_size_hint_min_get(term->term, &mw, &mh); 2392 evas_object_size_hint_min_get(term->termio, &mw, &mh);
2389 if (mw < 1) mw = 1; 2393 if (mw < 1) mw = 1;
2390 if (mh < 1) mh = 1; 2394 if (mh < 1) mh = 1;
2391 w = tsize_w / mw; 2395 w = tsize_w / mw;
2392 h = tsize_h / mh; 2396 h = tsize_h / mh;
2393 evas_object_data_del(term->term, "sizedone"); 2397 evas_object_data_del(term->termio, "sizedone");
2394 evas_object_size_hint_request_set(term->term, 2398 evas_object_size_hint_request_set(term->termio,
2395 w * mw, h * mh); 2399 w * mw, h * mh);
2396 } 2400 }
2397 } 2401 }
@@ -2447,8 +2451,8 @@ term_free(Term *term)
2447 evas_object_del(term->tab_region_base); 2451 evas_object_del(term->tab_region_base);
2448 term->tab_region_base = NULL; 2452 term->tab_region_base = NULL;
2449 } 2453 }
2450 evas_object_del(term->term); 2454 evas_object_del(term->termio);
2451 term->term = NULL; 2455 term->termio = NULL;
2452 evas_object_del(term->base); 2456 evas_object_del(term->base);
2453 term->base = NULL; 2457 term->base = NULL;
2454 evas_object_del(term->bg); 2458 evas_object_del(term->bg);
@@ -2481,7 +2485,7 @@ main_term_bg_config(Term *term)
2481 edje_object_message_send(term->bg, EDJE_MESSAGE_INT, 1, &msg); 2485 edje_object_message_send(term->bg, EDJE_MESSAGE_INT, 1, &msg);
2482 edje_object_message_send(term->base, EDJE_MESSAGE_INT, 1, &msg); 2486 edje_object_message_send(term->base, EDJE_MESSAGE_INT, 1, &msg);
2483 2487
2484 termio_theme_set(term->term, term->bg); 2488 termio_theme_set(term->termio, term->bg);
2485 edje_object_signal_callback_add(term->bg, "popmedia,done", "terminology", 2489 edje_object_signal_callback_add(term->bg, "popmedia,done", "terminology",
2486 _cb_popmedia_done, term); 2490 _cb_popmedia_done, term);
2487 edje_object_signal_callback_add(term->bg, "tabcount,go", "terminology", 2491 edje_object_signal_callback_add(term->bg, "tabcount,go", "terminology",
@@ -2490,7 +2494,7 @@ main_term_bg_config(Term *term)
2490 _cb_tabcount_prev, term); 2494 _cb_tabcount_prev, term);
2491 edje_object_signal_callback_add(term->bg, "tabcount,next", "terminology", 2495 edje_object_signal_callback_add(term->bg, "tabcount,next", "terminology",
2492 _cb_tabcount_next, term); 2496 _cb_tabcount_next, term);
2493 edje_object_part_swallow(term->base, "terminology.content", term->term); 2497 edje_object_part_swallow(term->base, "terminology.content", term->termio);
2494 edje_object_part_swallow(term->bg, "terminology.content", term->base); 2498 edje_object_part_swallow(term->bg, "terminology.content", term->base);
2495 edje_object_part_swallow(term->bg, "terminology.miniview", term->miniview); 2499 edje_object_part_swallow(term->bg, "terminology.miniview", term->miniview);
2496 if (term->popmedia) 2500 if (term->popmedia)
@@ -2547,7 +2551,7 @@ main_term_bg_config(Term *term)
2547 edje_object_signal_emit(term->base, "focus,in", "terminology"); 2551 edje_object_signal_emit(term->base, "focus,in", "terminology");
2548 if (term->wn->cmdbox) 2552 if (term->wn->cmdbox)
2549 elm_object_focus_set(term->wn->cmdbox, EINA_FALSE); 2553 elm_object_focus_set(term->wn->cmdbox, EINA_FALSE);
2550 elm_object_focus_set(term->term, EINA_TRUE); 2554 elm_object_focus_set(term->termio, EINA_TRUE);
2551 } 2555 }
2552 if (term->miniview_shown) 2556 if (term->miniview_shown)
2553 edje_object_signal_emit(term->bg, "miniview,on", "terminology"); 2557 edje_object_signal_emit(term->bg, "miniview,on", "terminology");
@@ -2631,7 +2635,7 @@ _main_term_bg_redo(Term *term)
2631 2635
2632 _term_tabregion_setup(term); 2636 _term_tabregion_setup(term);
2633 2637
2634 term->miniview = o = miniview_add(term->wn->win, term->term); 2638 term->miniview = o = miniview_add(term->wn->win, term->termio);
2635 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 2639 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
2636 evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 2640 evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
2637 2641
@@ -2662,7 +2666,7 @@ term_win_get(Term *term)
2662Evas_Object * 2666Evas_Object *
2663main_term_evas_object_get(Term *term) 2667main_term_evas_object_get(Term *term)
2664{ 2668{
2665 return term->term; 2669 return term->termio;
2666} 2670}
2667 2671
2668Evas_Object * 2672Evas_Object *
@@ -2678,7 +2682,7 @@ static void
2678_cb_bell(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED) 2682_cb_bell(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
2679{ 2683{
2680 Term *term = data; 2684 Term *term = data;
2681 Config *config = termio_config_get(term->term); 2685 Config *config = termio_config_get(term->termio);
2682 2686
2683 if (!config) return; 2687 if (!config) return;
2684 if (!config->disable_visual_bell) 2688 if (!config->disable_visual_bell)
@@ -2692,7 +2696,7 @@ _cb_bell(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
2692 edje_object_signal_emit(term->bg, "bell,ring", "terminology"); 2696 edje_object_signal_emit(term->bg, "bell,ring", "terminology");
2693 edje_object_signal_emit(term->base, "bell,ring", "terminology"); 2697 edje_object_signal_emit(term->base, "bell,ring", "terminology");
2694 } 2698 }
2695 sp = _split_find(term->wn->win, term->term, NULL); 2699 sp = _split_find(term->wn->win, term->termio, NULL);
2696 if (sp) 2700 if (sp)
2697 { 2701 {
2698 if (sp->term != term) 2702 if (sp->term != term)
@@ -2721,8 +2725,8 @@ _cb_options_done(void *data EINA_UNUSED)
2721 { 2725 {
2722 if (term->focused) 2726 if (term->focused)
2723 { 2727 {
2724 elm_object_focus_set(term->term, EINA_TRUE); 2728 elm_object_focus_set(term->termio, EINA_TRUE);
2725 termio_event_feed_mouse_in(term->term); 2729 termio_event_feed_mouse_in(term->termio);
2726 } 2730 }
2727 } 2731 }
2728} 2732}
@@ -2733,7 +2737,7 @@ _cb_options(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
2733{ 2737{
2734 Term *term = data; 2738 Term *term = data;
2735 2739
2736 controls_toggle(term->wn->win, term->wn->base, term->term, 2740 controls_toggle(term->wn->win, term->wn->base, term->termio,
2737 _cb_options_done, term->wn); 2741 _cb_options_done, term->wn);
2738} 2742}
2739 2743
@@ -2744,7 +2748,7 @@ _cb_exited(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
2744 if (!term->hold) 2748 if (!term->hold)
2745 { 2749 {
2746 Evas_Object *win = win_evas_object_get(term->wn); 2750 Evas_Object *win = win_evas_object_get(term->wn);
2747 main_close(win, term->term); 2751 main_close(win, term->termio);
2748 } 2752 }
2749} 2753}
2750 2754
@@ -2824,25 +2828,25 @@ term_new(Win *wn, Config *config, const char *cmd,
2824 edje_object_message_send(term->bg, EDJE_MESSAGE_INT, 1, &msg); 2828 edje_object_message_send(term->bg, EDJE_MESSAGE_INT, 1, &msg);
2825 edje_object_message_send(term->base, EDJE_MESSAGE_INT, 1, &msg); 2829 edje_object_message_send(term->base, EDJE_MESSAGE_INT, 1, &msg);
2826 2830
2827 term->term = o = termio_add(wn->win, config, cmd, login_shell, cd, 2831 term->termio = o = termio_add(wn->win, config, cmd, login_shell, cd,
2828 size_w, size_h, term); 2832 size_w, size_h, term);
2829 if (!term->term) 2833 if (!term->termio)
2830 { 2834 {
2831 CRITICAL(_("Could not create termio widget.")); 2835 CRITICAL(_("Could not create termio widget."));
2832 evas_object_del(term->bg); 2836 evas_object_del(term->bg);
2833 free(term); 2837 free(term);
2834 return NULL; 2838 return NULL;
2835 } 2839 }
2836 colors_term_init(termio_textgrid_get(term->term), term->bg, config); 2840 colors_term_init(termio_textgrid_get(term->termio), term->bg, config);
2837 2841
2838 termio_win_set(o, wn->win); 2842 termio_win_set(o, wn->win);
2839 termio_theme_set(o, term->bg); 2843 termio_theme_set(o, term->bg);
2840 2844
2841 term->miniview = o = miniview_add(wn->win, term->term); 2845 term->miniview = o = miniview_add(wn->win, term->termio);
2842 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 2846 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
2843 evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 2847 evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
2844 2848
2845 o = term->term; 2849 o = term->termio;
2846 2850
2847 edje_object_signal_callback_add(term->bg, "popmedia,done", "terminology", 2851 edje_object_signal_callback_add(term->bg, "popmedia,done", "terminology",
2848 _cb_popmedia_done, term); 2852 _cb_popmedia_done, term);
@@ -3012,7 +3016,7 @@ _sel_go(Split *sp, Term *term)
3012 evas_object_image_source_set(img, tm->base); 3016 evas_object_image_source_set(img, tm->base);
3013 evas_object_geometry_get(tm->base, NULL, NULL, &w, &h); 3017 evas_object_geometry_get(tm->base, NULL, NULL, &w, &h);
3014 evas_object_resize(img, w, h); 3018 evas_object_resize(img, w, h);
3015 evas_object_data_set(img, "termio", tm->term); 3019 evas_object_data_set(img, "termio", tm->termio);
3016 tm->sel = img; 3020 tm->sel = img;
3017 3021
3018 sel_entry_add(sp->sel, tm->sel, (tm == sp->term), 3022 sel_entry_add(sp->sel, tm->sel, (tm == sp->term),