summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2019-05-22 23:03:03 +0200
committerBoris Faure <billiob@gmail.com>2019-05-24 21:47:25 +0200
commit3c12162dcfa7d2d3b5553f133d093f03999144d1 (patch)
treed7304b3cbf74ff4ebba9699a38fd437bf8dbcec6
parent5c0167c5e150df06b15008370c539c9aad19d3eb (diff)
win: use elm_layout for the base objects
-rw-r--r--src/bin/utils.c26
-rw-r--r--src/bin/utils.h1
-rw-r--r--src/bin/win.c109
-rw-r--r--src/bin/win.h1
4 files changed, 77 insertions, 60 deletions
diff --git a/src/bin/utils.c b/src/bin/utils.c
index 57cdb1e..ecd2da3 100644
--- a/src/bin/utils.c
+++ b/src/bin/utils.c
@@ -50,6 +50,32 @@ theme_apply(Evas_Object *edje, const Config *config, const char *group)
50} 50}
51 51
52Eina_Bool 52Eina_Bool
53theme_apply_elm(Evas_Object *layout, const Config *config, const char *group)
54{
55 const char *errmsg;
56 Evas_Object *edje;
57
58 EINA_SAFETY_ON_NULL_RETURN_VAL(layout, EINA_FALSE);
59 EINA_SAFETY_ON_NULL_RETURN_VAL(config, EINA_FALSE);
60 EINA_SAFETY_ON_NULL_RETURN_VAL(group, EINA_FALSE);
61
62 if (elm_layout_file_set(layout, config_theme_path_get(config), group))
63 return EINA_TRUE;
64
65 edje = elm_layout_edje_get(layout);
66 errmsg = edje_load_error_str(edje_object_load_error_get(edje));
67 INF("Cannot find theme: file=%s group=%s error='%s', trying default...",
68 config_theme_path_get(config), group, errmsg);
69
70 if (elm_layout_file_set(layout, config_theme_path_default_get(config), group))
71 return EINA_TRUE;
72
73 errmsg = edje_load_error_str(edje_object_load_error_get(edje));
74 ERR(_("Could not load any theme for group=%s: %s"), group, errmsg);
75 return EINA_FALSE;
76}
77
78Eina_Bool
53theme_apply_default(Evas_Object *edje, const Config *config, const char *group) 79theme_apply_default(Evas_Object *edje, const Config *config, const char *group)
54{ 80{
55 const char *errmsg; 81 const char *errmsg;
diff --git a/src/bin/utils.h b/src/bin/utils.h
index cf25322..73476de 100644
--- a/src/bin/utils.h
+++ b/src/bin/utils.h
@@ -5,6 +5,7 @@
5#include "config.h" 5#include "config.h"
6 6
7Eina_Bool theme_apply(Evas_Object *edje, const Config *config, const char *group); 7Eina_Bool theme_apply(Evas_Object *edje, const Config *config, const char *group);
8Eina_Bool theme_apply_elm(Evas_Object *edje, const Config *config, const char *group);
8Eina_Bool theme_apply_default(Evas_Object *edje, const Config *config, const char *group); 9Eina_Bool theme_apply_default(Evas_Object *edje, const Config *config, const char *group);
9void theme_reload(Evas_Object *edje); 10void theme_reload(Evas_Object *edje);
10void theme_auto_reload_enable(Evas_Object *edje); 11void theme_auto_reload_enable(Evas_Object *edje);
diff --git a/src/bin/win.c b/src/bin/win.c
index 06ba7db..fd87a8c 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -385,11 +385,11 @@ _solo_bell(Term_Container *tc,
385 if (!tc->wn->config->disable_visual_bell) 385 if (!tc->wn->config->disable_visual_bell)
386 { 386 {
387 edje_object_signal_emit(term->bg, "bell", "terminology"); 387 edje_object_signal_emit(term->bg, "bell", "terminology");
388 edje_object_signal_emit(term->base, "bell", "terminology"); 388 elm_layout_signal_emit(term->base, "bell", "terminology");
389 if (tc->wn->config->bell_rings) 389 if (tc->wn->config->bell_rings)
390 { 390 {
391 edje_object_signal_emit(term->bg, "bell,ring", "terminology"); 391 edje_object_signal_emit(term->bg, "bell,ring", "terminology");
392 edje_object_signal_emit(term->base, "bell,ring", "terminology"); 392 elm_layout_signal_emit(term->base, "bell,ring", "terminology");
393 } 393 }
394 } 394 }
395 tc->parent->bell(tc->parent, tc); 395 tc->parent->bell(tc->parent, tc);
@@ -419,7 +419,7 @@ _solo_unfocus(Term_Container *tc, Term_Container *relative)
419 if (!term->config->disable_focus_visuals) 419 if (!term->config->disable_focus_visuals)
420 { 420 {
421 edje_object_signal_emit(term->bg, "focus,out", "terminology"); 421 edje_object_signal_emit(term->bg, "focus,out", "terminology");
422 edje_object_signal_emit(term->base, "focus,out", "terminology"); 422 elm_layout_signal_emit(term->base, "focus,out", "terminology");
423 } 423 }
424} 424}
425 425
@@ -454,12 +454,12 @@ _solo_focus(Term_Container *tc, Term_Container *relative)
454 if (term->config->disable_focus_visuals) 454 if (term->config->disable_focus_visuals)
455 { 455 {
456 edje_object_signal_emit(term->bg, "focused,set", "terminology"); 456 edje_object_signal_emit(term->bg, "focused,set", "terminology");
457 edje_object_signal_emit(term->base, "focused,set", "terminology"); 457 elm_layout_signal_emit(term->base, "focused,set", "terminology");
458 } 458 }
459 else 459 else
460 { 460 {
461 edje_object_signal_emit(term->bg, "focus,in", "terminology"); 461 edje_object_signal_emit(term->bg, "focus,in", "terminology");
462 edje_object_signal_emit(term->base, "focus,in", "terminology"); 462 elm_layout_signal_emit(term->base, "focus,in", "terminology");
463 } 463 }
464 if (term->wn->cmdbox) 464 if (term->wn->cmdbox)
465 elm_object_focus_set(term->wn->cmdbox, EINA_FALSE); 465 elm_object_focus_set(term->wn->cmdbox, EINA_FALSE);
@@ -574,7 +574,7 @@ _cb_win_focus_in(void *data,
574 if (!term->config->disable_focus_visuals) 574 if (!term->config->disable_focus_visuals)
575 { 575 {
576 edje_object_signal_emit(term->bg, "focus,out", "terminology"); 576 edje_object_signal_emit(term->bg, "focus,out", "terminology");
577 edje_object_signal_emit(term->base, "focus,out", "terminology"); 577 elm_layout_signal_emit(term->base, "focus,out", "terminology");
578 } 578 }
579 } 579 }
580 term = term_mouse; 580 term = term_mouse;
@@ -624,8 +624,6 @@ _win_is_focused(Win *wn)
624int win_term_set(Win *wn, Term *term) 624int win_term_set(Win *wn, Term *term)
625{ 625{
626 Term_Container *tc_win = NULL, *tc_child = NULL; 626 Term_Container *tc_win = NULL, *tc_child = NULL;
627 Evas_Object *base = win_base_get(wn);
628 Evas *evas = evas_object_evas_get(base);
629 627
630 tc_child = _solo_new(term, wn); 628 tc_child = _solo_new(term, wn);
631 if (!tc_child) 629 if (!tc_child)
@@ -635,7 +633,7 @@ int win_term_set(Win *wn, Term *term)
635 633
636 tc_win->swallow(tc_win, NULL, tc_child); 634 tc_win->swallow(tc_win, NULL, tc_child);
637 635
638 _cb_size_hint(term, evas, term->termio, NULL); 636 _cb_size_hint(term, NULL, term->termio, NULL);
639 637
640 return 0; 638 return 0;
641 639
@@ -645,12 +643,6 @@ bad:
645} 643}
646 644
647 645
648Evas_Object *
649win_base_get(const Win *wn)
650{
651 return wn->base;
652}
653
654Config * 646Config *
655win_config_get(const Win *wn) 647win_config_get(const Win *wn)
656{ 648{
@@ -673,13 +665,14 @@ static void
673_win_trans(Win *wn, Term *term, Eina_Bool trans) 665_win_trans(Win *wn, Term *term, Eina_Bool trans)
674{ 666{
675 Edje_Message_Int msg; 667 Edje_Message_Int msg;
668 Evas_Object *edje = elm_layout_edje_get(term->base);
676 669
677 if (term->config->translucent) 670 if (term->config->translucent)
678 msg.val = term->config->opacity; 671 msg.val = term->config->opacity;
679 else 672 else
680 msg.val = 100; 673 msg.val = 100;
681 edje_object_message_send(term->bg, EDJE_MESSAGE_INT, 1, &msg); 674 edje_object_message_send(term->bg, EDJE_MESSAGE_INT, 1, &msg);
682 edje_object_message_send(term->base, EDJE_MESSAGE_INT, 1, &msg); 675 edje_object_message_send(edje, EDJE_MESSAGE_INT, 1, &msg);
683 676
684 if (trans) 677 if (trans)
685 { 678 {
@@ -949,24 +942,21 @@ _win_swallow(Term_Container *tc, Term_Container *orig,
949 Term_Container *new_child) 942 Term_Container *new_child)
950{ 943{
951 Win *wn; 944 Win *wn;
952 Evas_Object *base;
953 Evas_Object *o; 945 Evas_Object *o;
954 946
955 assert (tc->type == TERM_CONTAINER_TYPE_WIN); 947 assert (tc->type == TERM_CONTAINER_TYPE_WIN);
956 948
957 wn = (Win*) tc; 949 wn = (Win*) tc;
958 base = win_base_get(wn);
959 950
960 DBG("orig:%p", orig); 951 DBG("orig:%p", orig);
961 952
962 if (orig) 953 if (orig)
963 { 954 {
964 o = orig->get_evas_object(orig); 955 elm_layout_content_unset(wn->base, "terminology.content");
965 edje_object_part_unswallow(base, o);
966 } 956 }
967 957
968 o = new_child->get_evas_object(new_child); 958 o = new_child->get_evas_object(new_child);
969 edje_object_part_swallow(base, "terminology.content", o); 959 elm_layout_content_set(wn->base, "terminology.content", o);
970 960
971 evas_object_show(o); 961 evas_object_show(o);
972 new_child->parent = tc; 962 new_child->parent = tc;
@@ -1124,8 +1114,6 @@ _win_split(Term_Container *tc, Term_Container *child,
1124 Term_Container *tc_split, *tc_solo_new; 1114 Term_Container *tc_split, *tc_solo_new;
1125 char *wdir = NULL; 1115 char *wdir = NULL;
1126 char buf[PATH_MAX]; 1116 char buf[PATH_MAX];
1127 Evas_Object *base;
1128 Evas_Object *o;
1129 1117
1130 // copy the current path to wdir if we should change the directory, 1118 // copy the current path to wdir if we should change the directory,
1131 // passing wdir NULL otherwise: 1119 // passing wdir NULL otherwise:
@@ -1144,9 +1132,7 @@ _win_split(Term_Container *tc, Term_Container *child,
1144 tc_solo_new = _solo_new(tm_new, wn); 1132 tc_solo_new = _solo_new(tm_new, wn);
1145 evas_object_data_set(tm_new->termio, "sizedone", tm_new->termio); 1133 evas_object_data_set(tm_new->termio, "sizedone", tm_new->termio);
1146 1134
1147 base = win_base_get(wn); 1135 elm_layout_content_unset(wn->base, "terminology.content");
1148 o = child->get_evas_object(child);
1149 edje_object_part_unswallow(base, o);
1150 1136
1151 tc_split = _split_new(child, tc_solo_new, is_horizontal); 1137 tc_split = _split_new(child, tc_solo_new, is_horizontal);
1152 1138
@@ -1686,8 +1672,8 @@ win_new(const char *name, const char *role, const char *title,
1686 elm_win_resize_object_add(wn->win, o); 1672 elm_win_resize_object_add(wn->win, o);
1687 evas_object_show(o); 1673 evas_object_show(o);
1688 1674
1689 wn->base = o = edje_object_add(evas_object_evas_get(wn->win)); 1675 wn->base = o = elm_layout_add(wn->win);
1690 theme_apply(o, config, "terminology/base"); 1676 theme_apply_elm(o, config, "terminology/base");
1691 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1677 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1692 evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 1678 evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
1693 elm_object_content_set(wn->conform, o); 1679 elm_object_content_set(wn->conform, o);
@@ -2429,10 +2415,11 @@ _cb_size_hint(void *data,
2429{ 2415{
2430 Term *term = data; 2416 Term *term = data;
2431 Evas_Coord mw, mh, rw, rh, w = 0, h = 0; 2417 Evas_Coord mw, mh, rw, rh, w = 0, h = 0;
2418 Evas_Object *edje_base = elm_layout_edje_get(term->base);
2432 2419
2433 evas_object_size_hint_min_get(obj, &mw, &mh); 2420 evas_object_size_hint_min_get(obj, &mw, &mh);
2434 evas_object_size_hint_request_get(obj, &rw, &rh); 2421 evas_object_size_hint_request_get(obj, &rw, &rh);
2435 edje_object_size_min_calc(term->base, &w, &h); 2422 edje_object_size_min_calc(edje_base, &w, &h);
2436 evas_object_size_hint_min_set(term->base, w, h); 2423 evas_object_size_hint_min_set(term->base, w, h);
2437 edje_object_size_min_calc(term->bg, &w, &h); 2424 edje_object_size_min_calc(term->bg, &w, &h);
2438 evas_object_size_hint_min_set(term->bg, w, h); 2425 evas_object_size_hint_min_set(term->bg, w, h);
@@ -3753,8 +3740,10 @@ _set_trans(Config *config, Evas_Object *bg, Evas_Object *base)
3753 3740
3754 if (bg) 3741 if (bg)
3755 edje_object_message_send(bg, EDJE_MESSAGE_INT, 1, &msg); 3742 edje_object_message_send(bg, EDJE_MESSAGE_INT, 1, &msg);
3756 if (base) 3743 if (base) {
3757 edje_object_message_send(base, EDJE_MESSAGE_INT, 1, &msg); 3744 Evas_Object *edje = elm_layout_edje_get(base);
3745 edje_object_message_send(edje, EDJE_MESSAGE_INT, 1, &msg);
3746 }
3758} 3747}
3759 3748
3760static void 3749static void
@@ -4976,8 +4965,9 @@ _cb_cmd_activated(void *data,
4976 Term *term; 4965 Term *term;
4977 Term_Container *tc; 4966 Term_Container *tc;
4978 4967
4979 if (wn->cmdbox) elm_object_focus_set(wn->cmdbox, EINA_FALSE); 4968 if (wn->cmdbox)
4980 edje_object_signal_emit(wn->base, "cmdbox,hide", "terminology"); 4969 elm_object_focus_set(wn->cmdbox, EINA_FALSE);
4970 elm_layout_signal_emit(wn->base, "cmdbox,hide", "terminology");
4981 tc = (Term_Container *) wn; 4971 tc = (Term_Container *) wn;
4982 term = tc->focused_term_get(tc); 4972 term = tc->focused_term_get(tc);
4983 if (wn->cmdbox) cmd = (char *)elm_entry_entry_get(wn->cmdbox); 4973 if (wn->cmdbox) cmd = (char *)elm_entry_entry_get(wn->cmdbox);
@@ -5007,8 +4997,9 @@ _cb_cmd_aborted(void *data,
5007{ 4997{
5008 Win *wn = data; 4998 Win *wn = data;
5009 4999
5010 if (wn->cmdbox) elm_object_focus_set(wn->cmdbox, EINA_FALSE); 5000 if (wn->cmdbox)
5011 edje_object_signal_emit(wn->base, "cmdbox,hide", "terminology"); 5001 elm_object_focus_set(wn->cmdbox, EINA_FALSE);
5002 elm_layout_signal_emit(wn->base, "cmdbox,hide", "terminology");
5012 if (wn->cmdbox_focus_timer) 5003 if (wn->cmdbox_focus_timer)
5013 { 5004 {
5014 ecore_timer_del(wn->cmdbox_focus_timer); 5005 ecore_timer_del(wn->cmdbox_focus_timer);
@@ -5055,7 +5046,7 @@ _cb_cmd_hints_changed(void *data,
5055 if (wn->cmdbox) 5046 if (wn->cmdbox)
5056 { 5047 {
5057 evas_object_show(wn->cmdbox); 5048 evas_object_show(wn->cmdbox);
5058 edje_object_part_swallow(wn->base, "terminology.cmdbox", wn->cmdbox); 5049 elm_layout_content_set(wn->base, "terminology.cmdbox", wn->cmdbox);
5059 } 5050 }
5060} 5051}
5061 5052
@@ -5088,9 +5079,9 @@ _cb_cmdbox(void *data,
5088 evas_object_smart_callback_add(o, "changed,user", _cb_cmd_changed, wn); 5079 evas_object_smart_callback_add(o, "changed,user", _cb_cmd_changed, wn);
5089 evas_object_event_callback_add(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 5080 evas_object_event_callback_add(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
5090 _cb_cmd_hints_changed, wn); 5081 _cb_cmd_hints_changed, wn);
5091 edje_object_part_swallow(wn->base, "terminology.cmdbox", o); 5082 elm_layout_content_set(wn->base, "terminology.cmdbox", o);
5092 } 5083 }
5093 edje_object_signal_emit(term->wn->base, "cmdbox,show", "terminology"); 5084 elm_layout_signal_emit(term->wn->base, "cmdbox,show", "terminology");
5094 elm_entry_entry_set(term->wn->cmdbox, ""); 5085 elm_entry_entry_set(term->wn->cmdbox, "");
5095 evas_object_show(term->wn->cmdbox); 5086 evas_object_show(term->wn->cmdbox);
5096 if (term->wn->cmdbox_focus_timer) 5087 if (term->wn->cmdbox_focus_timer)
@@ -5120,7 +5111,7 @@ _cb_media_del(void *data,
5120 if (term->bg) 5111 if (term->bg)
5121 { 5112 {
5122 edje_object_signal_emit(term->bg, "media,off", "terminology"); 5113 edje_object_signal_emit(term->bg, "media,off", "terminology");
5123 edje_object_signal_emit(term->base, "media,off", "terminology"); 5114 elm_layout_signal_emit(term->base, "media,off", "terminology");
5124 } 5115 }
5125 if (!config) return; 5116 if (!config) return;
5126 if (config->temporary) 5117 if (config->temporary)
@@ -5148,26 +5139,26 @@ _term_media_update(Term *term, const Config *config)
5148 MEDIA_BG, type); 5139 MEDIA_BG, type);
5149 evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, 5140 evas_object_event_callback_add(o, EVAS_CALLBACK_DEL,
5150 _cb_media_del, term); 5141 _cb_media_del, term);
5151 edje_object_part_swallow(term->base, "terminology.background", o); 5142 elm_layout_content_set(term->base, "terminology.background", o);
5152 evas_object_show(o); 5143 evas_object_show(o);
5153 term->mediatype = type; 5144 term->mediatype = type;
5154 switch (type) 5145 switch (type)
5155 { 5146 {
5156 case MEDIA_TYPE_IMG: 5147 case MEDIA_TYPE_IMG:
5157 edje_object_signal_emit(term->bg, "media,image", "terminology"); 5148 edje_object_signal_emit(term->bg, "media,image", "terminology");
5158 edje_object_signal_emit(term->base, "media,image", "terminology"); 5149 elm_layout_signal_emit(term->base, "media,image", "terminology");
5159 break; 5150 break;
5160 case MEDIA_TYPE_SCALE: 5151 case MEDIA_TYPE_SCALE:
5161 edje_object_signal_emit(term->bg, "media,scale", "terminology"); 5152 edje_object_signal_emit(term->bg, "media,scale", "terminology");
5162 edje_object_signal_emit(term->base, "media,scale", "terminology"); 5153 elm_layout_signal_emit(term->base, "media,scale", "terminology");
5163 break; 5154 break;
5164 case MEDIA_TYPE_EDJE: 5155 case MEDIA_TYPE_EDJE:
5165 edje_object_signal_emit(term->bg, "media,edje", "terminology"); 5156 edje_object_signal_emit(term->bg, "media,edje", "terminology");
5166 edje_object_signal_emit(term->base, "media,edje", "terminology"); 5157 elm_layout_signal_emit(term->base, "media,edje", "terminology");
5167 break; 5158 break;
5168 case MEDIA_TYPE_MOV: 5159 case MEDIA_TYPE_MOV:
5169 edje_object_signal_emit(term->bg, "media,movie", "terminology"); 5160 edje_object_signal_emit(term->bg, "media,movie", "terminology");
5170 edje_object_signal_emit(term->base, "media,movie", "terminology"); 5161 elm_layout_signal_emit(term->base, "media,movie", "terminology");
5171 break; 5162 break;
5172 case MEDIA_TYPE_UNKNOWN: 5163 case MEDIA_TYPE_UNKNOWN:
5173 default: 5164 default:
@@ -5182,7 +5173,7 @@ _term_media_update(Term *term, const Config *config)
5182 EVAS_CALLBACK_DEL, 5173 EVAS_CALLBACK_DEL,
5183 _cb_media_del); 5174 _cb_media_del);
5184 edje_object_signal_emit(term->bg, "media,off", "terminology"); 5175 edje_object_signal_emit(term->bg, "media,off", "terminology");
5185 edje_object_signal_emit(term->base, "media,off", "terminology"); 5176 elm_layout_signal_emit(term->base, "media,off", "terminology");
5186 evas_object_del(term->media); 5177 evas_object_del(term->media);
5187 term->media = NULL; 5178 term->media = NULL;
5188 } 5179 }
@@ -5384,7 +5375,7 @@ _term_bg_config(Term *term)
5384 _cb_tab_close, term); 5375 _cb_tab_close, term);
5385 edje_object_signal_callback_add(term->bg, "tab,title", "terminology", 5376 edje_object_signal_callback_add(term->bg, "tab,title", "terminology",
5386 _cb_tab_title, term); 5377 _cb_tab_title, term);
5387 edje_object_part_swallow(term->base, "terminology.content", term->termio); 5378 elm_layout_content_set(term->base, "terminology.content", term->termio);
5388 edje_object_part_swallow(term->bg, "terminology.content", term->base); 5379 edje_object_part_swallow(term->bg, "terminology.content", term->base);
5389 edje_object_part_swallow(term->bg, "terminology.miniview", term->miniview); 5380 edje_object_part_swallow(term->bg, "terminology.miniview", term->miniview);
5390 if (term->popmedia) 5381 if (term->popmedia)
@@ -5410,24 +5401,24 @@ _term_bg_config(Term *term)
5410 } 5401 }
5411 if (term->media) 5402 if (term->media)
5412 { 5403 {
5413 edje_object_part_swallow(term->base, "terminology.background", term->media); 5404 elm_layout_content_set(term->base, "terminology.background", term->media);
5414 switch (term->mediatype) 5405 switch (term->mediatype)
5415 { 5406 {
5416 case MEDIA_TYPE_IMG: 5407 case MEDIA_TYPE_IMG:
5417 edje_object_signal_emit(term->bg, "media,image", "terminology"); 5408 edje_object_signal_emit(term->bg, "media,image", "terminology");
5418 edje_object_signal_emit(term->base, "media,image", "terminology"); 5409 elm_layout_signal_emit(term->base, "media,image", "terminology");
5419 break; 5410 break;
5420 case MEDIA_TYPE_SCALE: 5411 case MEDIA_TYPE_SCALE:
5421 edje_object_signal_emit(term->bg, "media,scale", "terminology"); 5412 edje_object_signal_emit(term->bg, "media,scale", "terminology");
5422 edje_object_signal_emit(term->base, "media,scale", "terminology"); 5413 elm_layout_signal_emit(term->base, "media,scale", "terminology");
5423 break; 5414 break;
5424 case MEDIA_TYPE_EDJE: 5415 case MEDIA_TYPE_EDJE:
5425 edje_object_signal_emit(term->bg, "media,edje", "terminology"); 5416 edje_object_signal_emit(term->bg, "media,edje", "terminology");
5426 edje_object_signal_emit(term->base, "media,edje", "terminology"); 5417 elm_layout_signal_emit(term->base, "media,edje", "terminology");
5427 break; 5418 break;
5428 case MEDIA_TYPE_MOV: 5419 case MEDIA_TYPE_MOV:
5429 edje_object_signal_emit(term->bg, "media,movie", "terminology"); 5420 edje_object_signal_emit(term->bg, "media,movie", "terminology");
5430 edje_object_signal_emit(term->base, "media,movie", "terminology"); 5421 elm_layout_signal_emit(term->base, "media,movie", "terminology");
5431 break; 5422 break;
5432 case MEDIA_TYPE_UNKNOWN: 5423 case MEDIA_TYPE_UNKNOWN:
5433 default: 5424 default:
@@ -5441,12 +5432,12 @@ _term_bg_config(Term *term)
5441 if (term->config->disable_focus_visuals) 5432 if (term->config->disable_focus_visuals)
5442 { 5433 {
5443 edje_object_signal_emit(term->bg, "focused,set", "terminology"); 5434 edje_object_signal_emit(term->bg, "focused,set", "terminology");
5444 edje_object_signal_emit(term->base, "focused,set", "terminology"); 5435 elm_layout_signal_emit(term->base, "focused,set", "terminology");
5445 } 5436 }
5446 else 5437 else
5447 { 5438 {
5448 edje_object_signal_emit(term->bg, "focus,in", "terminology"); 5439 edje_object_signal_emit(term->bg, "focus,in", "terminology");
5449 edje_object_signal_emit(term->base, "focus,in", "terminology"); 5440 elm_layout_signal_emit(term->base, "focus,in", "terminology");
5450 } 5441 }
5451 if (term->wn->cmdbox) 5442 if (term->wn->cmdbox)
5452 elm_object_focus_set(term->wn->cmdbox, EINA_FALSE); 5443 elm_object_focus_set(term->wn->cmdbox, EINA_FALSE);
@@ -5468,8 +5459,8 @@ _cb_tabregion_change(void *data,
5468 5459
5469 evas_object_geometry_get(obj, NULL, NULL, &w, &h); 5460 evas_object_geometry_get(obj, NULL, NULL, &w, &h);
5470 evas_object_size_hint_min_set(term->tab_region_base, w, h); 5461 evas_object_size_hint_min_set(term->tab_region_base, w, h);
5471 edje_object_part_swallow(term->base, "terminology.tabregion", 5462 elm_layout_content_set(term->base, "terminology.tabregion",
5472 term->tab_region_base); 5463 term->tab_region_base);
5473} 5464}
5474 5465
5475static void 5466static void
@@ -5486,7 +5477,7 @@ _term_tabregion_setup(Term *term)
5486 5477
5487 term->tab_region_base = o = evas_object_rectangle_add(evas_object_evas_get(term->bg)); 5478 term->tab_region_base = o = evas_object_rectangle_add(evas_object_evas_get(term->bg));
5488 evas_object_color_set(o, 0, 0, 0, 0); 5479 evas_object_color_set(o, 0, 0, 0, 0);
5489 edje_object_part_swallow(term->base, "terminology.tabregion", o); 5480 elm_layout_content_set(term->base, "terminology.tabregion", o);
5490} 5481}
5491 5482
5492static void 5483static void
@@ -5612,8 +5603,8 @@ term_new(Win *wn, Config *config, const char *cmd,
5612 term->hold = hold; 5603 term->hold = hold;
5613 term->config = config; 5604 term->config = config;
5614 5605
5615 term->base = o = edje_object_add(canvas); 5606 term->base = o = elm_layout_add(wn->win);
5616 theme_apply(o, term->config, "terminology/core"); 5607 theme_apply_elm(o, term->config, "terminology/core");
5617 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 5608 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
5618 evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); 5609 evas_object_size_hint_fill_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
5619 5610
@@ -5664,7 +5655,7 @@ term_new(Win *wn, Config *config, const char *cmd,
5664 evas_object_size_hint_fill_set(o, 0, EVAS_HINT_FILL); 5655 evas_object_size_hint_fill_set(o, 0, EVAS_HINT_FILL);
5665 evas_object_event_callback_add(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 5656 evas_object_event_callback_add(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
5666 _cb_size_hint, term); 5657 _cb_size_hint, term);
5667 edje_object_part_swallow(term->base, "terminology.content", o); 5658 elm_layout_content_set(term->base, "terminology.content", o);
5668 edje_object_part_swallow(term->bg, "terminology.content", term->base); 5659 edje_object_part_swallow(term->bg, "terminology.content", term->base);
5669 edje_object_part_swallow(term->bg, "terminology.miniview", term->miniview); 5660 edje_object_part_swallow(term->bg, "terminology.miniview", term->miniview);
5670 evas_object_smart_callback_add(o, "options", _cb_options, term); 5661 evas_object_smart_callback_add(o, "options", _cb_options, term);
diff --git a/src/bin/win.h b/src/bin/win.h
index 1152484..c1b799f 100644
--- a/src/bin/win.h
+++ b/src/bin/win.h
@@ -40,7 +40,6 @@ int win_term_set(Win *wn, Term *term);
40Eina_List * 40Eina_List *
41terms_from_win_object(Evas_Object *win); 41terms_from_win_object(Evas_Object *win);
42 42
43Evas_Object *win_base_get(const Win *wn);
44Evas_Object *win_evas_object_get(const Win *win); 43Evas_Object *win_evas_object_get(const Win *win);
45Eina_List * win_terms_get(const Win *wn); 44Eina_List * win_terms_get(const Win *wn);
46Config *win_config_get(const Win *wn); 45Config *win_config_get(const Win *wn);