summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2019-10-26 18:18:03 +0200
committerBoris Faure <billiob@gmail.com>2019-10-26 18:18:03 +0200
commit1195c022f35306808f81ce5abc3bde949a82d5ec (patch)
tree0d13da6fdc7c9edc5dcfcea1440c22de8db0b686
parentc130c6f683ae1a552f6411813937e9dbcb824124 (diff)
default.edc: move tab selector on the tab line
-rw-r--r--ChangeLog.theme5
-rw-r--r--data/themes/default.edc250
-rw-r--r--data/themes/mild.edc14
-rw-r--r--src/bin/win.c119
4 files changed, 323 insertions, 65 deletions
diff --git a/ChangeLog.theme b/ChangeLog.theme
index a6acf98..2b2ba8d 100644
--- a/ChangeLog.theme
+++ b/ChangeLog.theme
@@ -9,6 +9,11 @@ Changes since 1.5.0:
9 * In group "terminology/background", add signals "tab,bell,on" and 9 * In group "terminology/background", add signals "tab,bell,on" and
10 "tab,bell,off" from "terminology" to set bell status on tab if there is a 10 "tab,bell,off" from "terminology" to set bell status on tab if there is a
11 tab. 11 tab.
12 * In group "terminology/background", change signals "tabcount,go",
13 "tabcount,prev", "tabcount,next" to "tab,go", "tab,prev" and "tab,next"
14 respectively.
15 * In group "terminology/background", add signal "tab,new" from "terminology"
16 to create a new tab.
12 17
13Changes since 1.2.0: 18Changes since 1.2.0:
14-------------------- 19--------------------
diff --git a/data/themes/default.edc b/data/themes/default.edc
index c98e91d..a7c4226 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -629,15 +629,19 @@ collections {
629 } 629 }
630 program { 630 program {
631 signal: "mouse,clicked,1"; source: "tabcount_ev"; 631 signal: "mouse,clicked,1"; source: "tabcount_ev";
632 action: SIGNAL_EMIT "tabcount,go" "terminology"; 632 action: SIGNAL_EMIT "tab,go" "terminology";
633 }
634 program {
635 signal: "mouse,clicked,3"; source: "tabcount_ev";
636 action: SIGNAL_EMIT "tab,new" "terminology";
633 } 637 }
634 program { 638 program {
635 signal: "mouse,wheel,0,1"; source: "tabcount_ev"; 639 signal: "mouse,wheel,0,1"; source: "tabcount_ev";
636 action: SIGNAL_EMIT "tabcount,prev" "terminology"; 640 action: SIGNAL_EMIT "tab,prev" "terminology";
637 } 641 }
638 program { 642 program {
639 signal: "mouse,wheel,0,-1"; source: "tabcount_ev"; 643 signal: "mouse,wheel,0,-1"; source: "tabcount_ev";
640 action: SIGNAL_EMIT "tabcount,next" "terminology"; 644 action: SIGNAL_EMIT "tab,next" "terminology";
641 } 645 }
642 program { 646 program {
643 signal: "tabcount,off"; source: "terminology"; 647 signal: "tabcount,off"; source: "terminology";
@@ -1332,6 +1336,233 @@ collections {
1332 target: "tabtitle"; 1336 target: "tabtitle";
1333 target: "tabclose"; 1337 target: "tabclose";
1334 } 1338 }
1339 program {
1340 signal: "tab_btn,on"; source: "terminology";
1341 action: STATE_SET "on" 0.0;
1342 target: "tab_btn_clip";
1343 target: "terminology.tab_btn";
1344 }
1345 program {
1346 signal: "tab_btn,off"; source: "terminology";
1347 action: STATE_SET "default" 0.0;
1348 target: "tab_btn_clip";
1349 target: "terminology.tab_btn";
1350 }
1351 part { name: "tab_btn_clip"; type: RECT;
1352 description { state: "default" 0.0;
1353 color: 255 255 255 0;
1354 visible: 0;
1355 }
1356 description { state: "on" 0.0;
1357 inherit: "default" 0.0;
1358 visible: 1;
1359 color: 255 255 255 255;
1360 }
1361 }
1362 part { name: "tab_btn_glow_r0";
1363 clip_to: "tab_btn_clip";
1364 description { state: "default" 0.0;
1365 fixed: 1 1;
1366 rel1.to: "tab_btn_r0";
1367 rel2.to: "tab_btn_r0";
1368 rel1.offset: -4 -4;
1369 rel2.offset: 3 3;
1370 image {
1371 normal: "cr_glow.png";
1372 border: 9 9 9 9;
1373 }
1374 color: 51 153 255 32;
1375 }
1376 description { state: "over" 0.0;
1377 inherit: "default" 0.0;
1378 color: 51 153 255 255;
1379 }
1380 }
1381 part { name: "tab_btn_glow_r1";
1382 clip_to: "tab_btn_clip";
1383 description { state: "default" 0.0;
1384 fixed: 1 1;
1385 rel1.to: "tab_btn_r1";
1386 rel2.to: "tab_btn_r1";
1387 rel1.offset: -4 -4;
1388 rel2.offset: 3 3;
1389 image {
1390 normal: "cr_glow.png";
1391 border: 9 9 9 9;
1392 }
1393 color: 51 153 255 32;
1394 }
1395 description { state: "over" 0.0;
1396 inherit: "default" 0.0;
1397 color: 51 153 255 255;
1398 }
1399 }
1400 part { name: "tab_btn_glow_r2";
1401 clip_to: "tab_btn_clip";
1402 description { state: "default" 0.0;
1403 fixed: 1 1;
1404 rel1.to: "tab_btn_r2";
1405 rel2.to: "tab_btn_r2";
1406 rel1.offset: -4 -4;
1407 rel2.offset: 3 3;
1408 image {
1409 normal: "cr_glow.png";
1410 border: 9 9 9 9;
1411 }
1412 color: 51 153 255 32;
1413 }
1414 description { state: "over" 0.0;
1415 inherit: "default" 0.0;
1416 color: 51 153 255 255;
1417 }
1418 }
1419 part { name: "tab_btn_glow_r3";
1420 clip_to: "tab_btn_clip";
1421 description { state: "default" 0.0;
1422 fixed: 1 1;
1423 rel1.to: "tab_btn_r3";
1424 rel2.to: "tab_btn_r3";
1425 rel1.offset: -4 -4;
1426 rel2.offset: 3 3;
1427 image {
1428 normal: "cr_glow.png";
1429 border: 9 9 9 9;
1430 }
1431 color: 51 153 255 32;
1432 }
1433 description { state: "over" 0.0;
1434 inherit: "default" 0.0;
1435 color: 51 153 255 255;
1436 }
1437 }
1438 part { name: "tab_btn_r0"; type: RECT;
1439 clip_to: "tab_btn_clip";
1440 description { state: "default" 0.0;
1441 fixed: 1 1;
1442 rel1.to: "terminology.tab_btn";
1443 rel2.to: "terminology.tab_btn";
1444 rel1.relative: 0.05 0.05;
1445 rel2.relative: 0.45 0.45;
1446 color: 255 255 255 32;
1447 }
1448 description { state: "over" 0.0;
1449 inherit: "default" 0.0;
1450 color: 255 255 255 255;
1451 }
1452 }
1453 part { name: "tab_btn_r1"; type: RECT;
1454 clip_to: "tab_btn_clip";
1455 description { state: "default" 0.0;
1456 fixed: 1 1;
1457 rel1.to: "terminology.tab_btn";
1458 rel2.to: "terminology.tab_btn";
1459 rel1.relative: 0.55 0.05;
1460 rel2.relative: 0.95 0.45;
1461 color: 255 255 255 32;
1462 }
1463 description { state: "over" 0.0;
1464 inherit: "default" 0.0;
1465 color: 255 255 255 255;
1466 }
1467 }
1468 part { name: "tab_btn_r2"; type: RECT;
1469 clip_to: "tab_btn_clip";
1470 description { state: "default" 0.0;
1471 fixed: 1 1;
1472 rel1.to: "terminology.tab_btn";
1473 rel2.to: "terminology.tab_btn";
1474 rel1.relative: 0.05 0.55;
1475 rel2.relative: 0.45 0.95;
1476 color: 255 255 255 32;
1477 }
1478 description { state: "over" 0.0;
1479 inherit: "default" 0.0;
1480 color: 255 255 255 255;
1481 }
1482 }
1483 part { name: "tab_btn_r3"; type: RECT;
1484 clip_to: "tab_btn_clip";
1485 description { state: "default" 0.0;
1486 fixed: 1 1;
1487 rel1.to: "terminology.tab_btn";
1488 rel2.to: "terminology.tab_btn";
1489 rel1.relative: 0.55 0.55;
1490 rel2.relative: 0.95 0.95;
1491 color: 255 255 255 32;
1492 }
1493 description { state: "over" 0.0;
1494 inherit: "default" 0.0;
1495 color: 255 255 255 255;
1496 }
1497 }
1498 part { name: "terminology.tab_btn"; type: SWALLOW;
1499 clip_to: "tab_btn_clip";
1500 mouse_events: 0;
1501 description { state: "default" 0.0;
1502 rel1.relative: 1.0 0.0;
1503 rel2.to_y: "tabmiddle";
1504 color: 250 0 250 255;
1505 visible: 0;
1506 align: 1.0 0.0;
1507 fixed: 1 1;
1508 }
1509 description { state: "on" 0.0;
1510 inherit: "default" 0.0;
1511 min: 16 16;
1512 visible: 1;
1513 }
1514 }
1515 part { name: "tab_btn_ev"; type: RECT; repeat_events: 1;
1516 clip_to: "tab_btn_clip";
1517 description { state: "default" 0.0;
1518 fixed: 1 1;
1519 rel1.to: "terminology.tab_btn";
1520 rel2.to: "terminology.tab_btn";
1521 color: 0 0 0 0;
1522 }
1523 }
1524 program {
1525 signal: "mouse,in"; source: "tab_btn_ev";
1526 action: STATE_SET "over" 0.0;
1527 transition: DECELERATE 0.5;
1528 target: "tab_btn_r0";
1529 target: "tab_btn_r1";
1530 target: "tab_btn_r2";
1531 target: "tab_btn_r3";
1532 target: "tab_btn_glow_r0";
1533 target: "tab_btn_glow_r1";
1534 target: "tab_btn_glow_r2";
1535 target: "tab_btn_glow_r3";
1536 }
1537 program {
1538 signal: "mouse,out"; source: "tab_btn_ev";
1539 action: STATE_SET "default" 0.0;
1540 transition: DECELERATE 2.0;
1541 target: "tab_btn_r0";
1542 target: "tab_btn_r1";
1543 target: "tab_btn_r2";
1544 target: "tab_btn_r3";
1545 target: "tab_btn_glow_r0";
1546 target: "tab_btn_glow_r1";
1547 target: "tab_btn_glow_r2";
1548 target: "tab_btn_glow_r3";
1549 }
1550 program {
1551 signal: "mouse,clicked,1"; source: "tab_btn_ev";
1552 action: SIGNAL_EMIT "tab,go" "terminology";
1553 }
1554 program {
1555 signal: "mouse,clicked,3"; source: "tab_btn_ev";
1556 action: SIGNAL_EMIT "tab,new" "terminology";
1557 }
1558 program {
1559 signal: "mouse,wheel,0,1"; source: "tab_btn_ev";
1560 action: SIGNAL_EMIT "tab,prev" "terminology";
1561 }
1562 program {
1563 signal: "mouse,wheel,0,-1"; source: "tab_btn_ev";
1564 action: SIGNAL_EMIT "tab,next" "terminology";
1565 }
1335 1566
1336 part { name: "terminology.tab"; type: SWALLOW; 1567 part { name: "terminology.tab"; type: SWALLOW;
1337 mouse_events: 0; 1568 mouse_events: 0;
@@ -1348,11 +1579,12 @@ collections {
1348 // some slot for dragable parts to stay in along top edge of bg 1579 // some slot for dragable parts to stay in along top edge of bg
1349 part { name: "tabdrag"; type: SPACER; 1580 part { name: "tabdrag"; type: SPACER;
1350 description { state: "default" 0.0; 1581 description { state: "default" 0.0;
1351 rel2.relative: 1.0 0.0; 1582 rel2.relative: 0.0 0.0;
1583 rel2.to_x: "terminology.tab_btn";
1352 fixed: 1 1; 1584 fixed: 1 1;
1353 } 1585 }
1354 } 1586 }
1355 // left boundary of the active tab (ragable 0.0 -> 1.0) 1587 // left boundary of the active tab (dragable 0.0 -> 1.0)
1356 part { name: "terminology.tabl"; type: SPACER; 1588 part { name: "terminology.tabl"; type: SPACER;
1357 dragable.x: 1 1 0; 1589 dragable.x: 1 1 0;
1358 dragable.confine: "tabdrag"; 1590 dragable.confine: "tabdrag";
@@ -1362,12 +1594,13 @@ collections {
1362 fixed: 1 1; 1594 fixed: 1 1;
1363 } 1595 }
1364 } 1596 }
1365 // right boundary of the active tab (ragable 0.0 -> 1.0) 1597 // right boundary of the active tab (dragable 0.0 -> 1.0)
1366 part { name: "terminology.tabr"; type: SPACER; 1598 part { name: "terminology.tabr"; type: SPACER;
1367 dragable.x: 1 1 0; 1599 dragable.x: 1 1 0;
1368 dragable.confine: "tabdrag"; 1600 dragable.confine: "tabdrag";
1369 description { state: "default" 0.0; 1601 description { state: "default" 0.0;
1370 rel2.relative: 1.0 0.0; 1602 rel2.relative: 0.0 0.0;
1603 rel2.to_x: "terminology.tab_btn";
1371 max: 1 1; 1604 max: 1 1;
1372 fixed: 1 1; 1605 fixed: 1 1;
1373 } 1606 }
@@ -1461,12 +1694,15 @@ collections {
1461 visible: 1; 1694 visible: 1;
1462 } 1695 }
1463 } 1696 }
1697 /*TODO boris */
1464 part { name: "tabright"; type: RECT; 1698 part { name: "tabright"; type: RECT;
1465 mouse_events: 0; 1699 mouse_events: 0;
1466 description { state: "default" 0.0; 1700 description { state: "default" 0.0;
1467 rel1.to: "terminology.tab"; 1701 rel1.to: "terminology.tab";
1468 rel1.relative: 1.0 0.0; 1702 rel1.relative: 1.0 0.0;
1703 rel2.to_x: "terminology.tab_btn";
1469 rel2.to_y: "tabmiddle"; 1704 rel2.to_y: "tabmiddle";
1705 rel2.relative: 0.0 1.0;
1470 color: 0 0 0 0; 1706 color: 0 0 0 0;
1471 visible: 0; 1707 visible: 0;
1472 fixed: 1 1; 1708 fixed: 1 1;
diff --git a/data/themes/mild.edc b/data/themes/mild.edc
index f8a79d0..7559035 100644
--- a/data/themes/mild.edc
+++ b/data/themes/mild.edc
@@ -442,7 +442,19 @@ collections {
442 } 442 }
443 program { 443 program {
444 signal: "mouse,clicked,1"; source: "tabcount_ev"; 444 signal: "mouse,clicked,1"; source: "tabcount_ev";
445 action: SIGNAL_EMIT "tabcount,go" "terminology"; 445 action: SIGNAL_EMIT "tab,go" "terminology";
446 }
447 program {
448 signal: "mouse,clicked,3"; source: "tabcount_ev";
449 action: SIGNAL_EMIT "tab,new" "terminology";
450 }
451 program {
452 signal: "mouse,wheel,0,1"; source: "tabcount_ev";
453 action: SIGNAL_EMIT "tab,prev" "terminology";
454 }
455 program {
456 signal: "mouse,wheel,0,-1"; source: "tabcount_ev";
457 action: SIGNAL_EMIT "tab,next" "terminology";
446 } 458 }
447 program { 459 program {
448 signal: "tabcount,off"; source: "terminology"; 460 signal: "tabcount,off"; source: "terminology";
diff --git a/src/bin/win.c b/src/bin/win.c
index 387331b..56d44a8 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -91,7 +91,6 @@ struct _Term
91 Evas_Object *sendfile_request; 91 Evas_Object *sendfile_request;
92 Evas_Object *sendfile_progress; 92 Evas_Object *sendfile_progress;
93 Evas_Object *sendfile_progress_bar; 93 Evas_Object *sendfile_progress_bar;
94 Evas_Object *tabcount_spacer;
95 Evas_Object *tab_spacer; 94 Evas_Object *tab_spacer;
96 Evas_Object *tab_region_base; 95 Evas_Object *tab_region_base;
97 Evas_Object *tab_region_bg; 96 Evas_Object *tab_region_bg;
@@ -3353,11 +3352,13 @@ _tabs_close(Term_Container *tc, Term_Container *child)
3353 next_term = next_solo->term; 3352 next_term = next_solo->term;
3354 config = next_term->config; 3353 config = next_term->config;
3355 3354
3356 edje_object_signal_emit(next_term->bg, "tabcount,off", "terminology"); 3355 edje_object_signal_emit(term->bg, "tab_btn,off", "terminology");
3357 if (next_term->tabcount_spacer && !config->show_tabs) 3356 evas_object_del(term->tab_spacer);
3357 term->tab_spacer = NULL;
3358 if (next_term->tab_spacer && !config->show_tabs)
3358 { 3359 {
3359 evas_object_del(next_term->tabcount_spacer); 3360 evas_object_del(next_term->tab_spacer);
3360 next_term->tabcount_spacer = NULL; 3361 next_term->tab_spacer = NULL;
3361 } 3362 }
3362 if (config->show_tabs) 3363 if (config->show_tabs)
3363 _solo_title_show(next_child); 3364 _solo_title_show(next_child);
@@ -3563,10 +3564,10 @@ _tabs_swallow(Term_Container *tc, Term_Container *orig,
3563 solo = (Solo*)orig; 3564 solo = (Solo*)orig;
3564 term = solo->term; 3565 term = solo->term;
3565 edje_object_signal_emit(term->bg, "tabcount,off", "terminology"); 3566 edje_object_signal_emit(term->bg, "tabcount,off", "terminology");
3566 if (term->tabcount_spacer) 3567 if (term->tab_spacer)
3567 { 3568 {
3568 evas_object_del(term->tabcount_spacer); 3569 evas_object_del(term->tab_spacer);
3569 term->tabcount_spacer = NULL; 3570 term->tab_spacer = NULL;
3570 } 3571 }
3571 3572
3572 o = orig->get_evas_object(orig); 3573 o = orig->get_evas_object(orig);
@@ -3872,56 +3873,48 @@ _tabs_refresh(Tabs *tabs)
3872 3873
3873 _tabbar_clear(term); 3874 _tabbar_clear(term);
3874 3875
3875 if (!term->tabcount_spacer) 3876 if (!term->tab_spacer)
3876 { 3877 {
3877 term->tabcount_spacer = evas_object_rectangle_add(evas_object_evas_get(term->bg)); 3878 term->tab_spacer = evas_object_rectangle_add(evas_object_evas_get(term->bg));
3878 evas_object_color_set(term->tabcount_spacer, 0, 0, 0, 0); 3879 evas_object_color_set(term->tab_spacer, 0, 0, 0, 0);
3879 } 3880 }
3880 elm_coords_finger_size_adjust(1, &w, 1, &h); 3881 elm_coords_finger_size_adjust(1, &w, 1, &h);
3881 evas_object_size_hint_min_set(term->tabcount_spacer, w, h); 3882 evas_object_size_hint_min_set(term->tab_spacer, w, h);
3882 edje_object_part_swallow(term->bg, "terminology.tabcount.control",
3883 term->tabcount_spacer);
3884 edje_object_part_text_set(term->bg, "terminology.tabcount.label", buf);
3885 edje_object_part_text_set(term->bg, "terminology.tabmissed.label", bufmissed);
3886 edje_object_signal_emit(term->bg, "tabcount,on", "terminology");
3887 // this is all below just for tab bar at the top 3883 // this is all below just for tab bar at the top
3888 if (term->config->show_tabs) 3884 if (term->config->show_tabs)
3889 { 3885 {
3890 double v1, v2; 3886 double v1, v2;
3891 3887
3888 edje_object_part_swallow(term->bg, "terminology.tab_btn",
3889 term->tab_spacer);
3890
3892 v1 = (double)(i-1) / (double)n; 3891 v1 = (double)(i-1) / (double)n;
3893 v2 = (double)i / (double)n; 3892 v2 = (double)i / (double)n;
3894 if (!term->tab_spacer) 3893 edje_object_signal_emit(term->bg, "tabcount,off", "terminology");
3895 { 3894
3896 term->tab_spacer = evas_object_rectangle_add( 3895 edje_object_part_swallow(term->bg, "terminology.tab", term->tab_spacer);
3897 evas_object_evas_get(term->bg)); 3896 edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 0.0);
3898 evas_object_color_set(term->tab_spacer, 0, 0, 0, 0); 3897 edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2, 0.0);
3899 elm_coords_finger_size_adjust(1, &w, 1, &h); 3898 edje_object_part_text_set(term->bg, "terminology.tab.title",
3900 evas_object_size_hint_min_set(term->tab_spacer, w, h); 3899 solo->tc.title);
3901 edje_object_part_swallow(term->bg, "terminology.tab", term->tab_spacer); 3900 edje_object_signal_emit(term->bg, "tabbar,on", "terminology");
3902 edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 0.0); 3901 edje_object_signal_emit(term->bg, "tab_btn,on", "terminology");
3903 edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2, 0.0);
3904 edje_object_part_text_set(term->bg, "terminology.tab.title",
3905 solo->tc.title);
3906 edje_object_signal_emit(term->bg, "tabbar,on", "terminology");
3907 edje_object_message_signal_process(term->bg);
3908 }
3909 else
3910 {
3911 edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 0.0);
3912 edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2, 0.0);
3913 edje_object_message_signal_process(term->bg);
3914 }
3915 _tabbar_fill(tabs); 3902 _tabbar_fill(tabs);
3916 } 3903 }
3917 else 3904 else
3918 { 3905 {
3906 edje_object_part_swallow(term->bg, "terminology.tabcount.control",
3907 term->tab_spacer);
3908 edje_object_part_text_set(term->bg, "terminology.tabcount.label", buf);
3909 edje_object_part_text_set(term->bg, "terminology.tabmissed.label", bufmissed);
3910 edje_object_signal_emit(term->bg, "tabcount,on", "terminology");
3919 _tabbar_clear(term); 3911 _tabbar_clear(term);
3912 if (missed > 0)
3913 edje_object_signal_emit(term->bg, "tabmissed,on", "terminology");
3914 else
3915 edje_object_signal_emit(term->bg, "tabmissed,off", "terminology");
3920 } 3916 }
3921 if (missed > 0) 3917 edje_object_message_signal_process(term->bg);
3922 edje_object_signal_emit(term->bg, "tabmissed,on", "terminology");
3923 else
3924 edje_object_signal_emit(term->bg, "tabmissed,off", "terminology");
3925} 3918}
3926 3919
3927static Tab_Item* 3920static Tab_Item*
@@ -5184,15 +5177,25 @@ _cb_command(void *data,
5184} 5177}
5185 5178
5186static void 5179static void
5187_cb_tabcount_go(void *data, 5180_cb_tab_go(void *data,
5188 Evas_Object *_obj EINA_UNUSED, 5181 Evas_Object *_obj EINA_UNUSED,
5189 const char *_sig EINA_UNUSED, 5182 const char *_sig EINA_UNUSED,
5190 const char *_src EINA_UNUSED) 5183 const char *_src EINA_UNUSED)
5191{ 5184{
5192 _cb_select(data, NULL, NULL); 5185 _cb_select(data, NULL, NULL);
5193} 5186}
5194 5187
5195static void 5188static void
5189_cb_tab_new(void *data,
5190 Evas_Object *_obj EINA_UNUSED,
5191 const char *_sig EINA_UNUSED,
5192 const char *_src EINA_UNUSED)
5193{
5194 Term *term = data;
5195 main_new(term->termio);
5196}
5197
5198static void
5196_cb_prev(void *data, 5199_cb_prev(void *data,
5197 Evas_Object *_obj EINA_UNUSED, 5200 Evas_Object *_obj EINA_UNUSED,
5198 void *_event EINA_UNUSED) 5201 void *_event EINA_UNUSED)
@@ -5659,16 +5662,16 @@ _term_free(Term *term)
5659 5662
5660 _term_tabregion_free(term); 5663 _term_tabregion_free(term);
5661 5664
5662 if (term->tabcount_spacer) 5665 if (term->tab_spacer)
5663 { 5666 {
5664 evas_object_del(term->tabcount_spacer); 5667 evas_object_del(term->tab_spacer);
5665 term->tabcount_spacer = NULL; 5668 term->tab_spacer = NULL;
5666 } 5669 }
5667 free(term); 5670 free(term);
5668} 5671}
5669 5672
5670static void 5673static void
5671_cb_tabcount_prev(void *data, 5674_cb_tab_prev(void *data,
5672 Evas_Object *_obj EINA_UNUSED, 5675 Evas_Object *_obj EINA_UNUSED,
5673 const char *_sig EINA_UNUSED, 5676 const char *_sig EINA_UNUSED,
5674 const char *_src EINA_UNUSED) 5677 const char *_src EINA_UNUSED)
@@ -5677,7 +5680,7 @@ _cb_tabcount_prev(void *data,
5677} 5680}
5678 5681
5679static void 5682static void
5680_cb_tabcount_next(void *data, 5683_cb_tab_next(void *data,
5681 Evas_Object *_obj EINA_UNUSED, 5684 Evas_Object *_obj EINA_UNUSED,
5682 const char *_sig EINA_UNUSED, 5685 const char *_sig EINA_UNUSED,
5683 const char *_src EINA_UNUSED) 5686 const char *_src EINA_UNUSED)
@@ -5695,12 +5698,14 @@ _term_bg_config(Term *term)
5695 termio_theme_set(term->termio, term->bg); 5698 termio_theme_set(term->termio, term->bg);
5696 edje_object_signal_callback_add(term->bg, "popmedia,done", "terminology", 5699 edje_object_signal_callback_add(term->bg, "popmedia,done", "terminology",
5697 _cb_popmedia_done, term); 5700 _cb_popmedia_done, term);
5698 edje_object_signal_callback_add(term->bg, "tabcount,go", "terminology", 5701 edje_object_signal_callback_add(term->bg, "tab,go", "terminology",
5699 _cb_tabcount_go, term); 5702 _cb_tab_go, term);
5700 edje_object_signal_callback_add(term->bg, "tabcount,prev", "terminology", 5703 edje_object_signal_callback_add(term->bg, "tab,new", "terminology",
5701 _cb_tabcount_prev, term); 5704 _cb_tab_new, term);
5702 edje_object_signal_callback_add(term->bg, "tabcount,next", "terminology", 5705 edje_object_signal_callback_add(term->bg, "tab,prev", "terminology",
5703 _cb_tabcount_next, term); 5706 _cb_tab_prev, term);
5707 edje_object_signal_callback_add(term->bg, "tab,next", "terminology",
5708 _cb_tab_next, term);
5704 edje_object_signal_callback_add(term->bg, "tab,close", "terminology", 5709 edje_object_signal_callback_add(term->bg, "tab,close", "terminology",
5705 _cb_tab_close, term); 5710 _cb_tab_close, term);
5706 edje_object_signal_callback_add(term->bg, "tab,title", "terminology", 5711 edje_object_signal_callback_add(term->bg, "tab,title", "terminology",