summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2015-09-26 12:01:42 +0200
committerBoris Faure <billiob@gmail.com>2015-09-26 12:02:33 +0200
commit8fe96c06a80b5894558c94f4065c071d553332cf (patch)
tree07f4f41b72530593537c55dc0f3906d5955cd7f7
parent2e2c3f0a26ab4319b358257dffc1212107ac05d6 (diff)
fix --split optionterminology-0.9
-rw-r--r--src/bin/main.c6
-rw-r--r--src/bin/private.h1
-rw-r--r--src/bin/win.c7
3 files changed, 13 insertions, 1 deletions
diff --git a/src/bin/main.c b/src/bin/main.c
index 9f08234..3559410 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -20,7 +20,7 @@
20#include "gravatar.h" 20#include "gravatar.h"
21#include "keyin.h" 21#include "keyin.h"
22 22
23 23int terminology_starting_up;
24int _log_domain = -1; 24int _log_domain = -1;
25 25
26static Config *_main_config = NULL; 26static Config *_main_config = NULL;
@@ -523,6 +523,8 @@ elm_main(int argc, char **argv)
523 Eina_List *cmds_list = NULL; 523 Eina_List *cmds_list = NULL;
524#endif 524#endif
525 525
526 terminology_starting_up = EINA_TRUE;
527
526 elm_language_set(""); 528 elm_language_set("");
527 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); 529 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
528 elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); 530 elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
@@ -930,6 +932,8 @@ remote:
930 ecore_con_init(); 932 ecore_con_init();
931 ecore_con_url_init(); 933 ecore_con_url_init();
932 934
935 terminology_starting_up = EINA_FALSE;
936
933 elm_run(); 937 elm_run();
934 938
935 ecore_con_url_shutdown(); 939 ecore_con_url_shutdown();
diff --git a/src/bin/private.h b/src/bin/private.h
index 7f7d7fc..c797499 100644
--- a/src/bin/private.h
+++ b/src/bin/private.h
@@ -12,6 +12,7 @@
12#endif 12#endif
13#define gettext_noop(String) String 13#define gettext_noop(String) String
14 14
15extern int terminology_starting_up;
15extern int _log_domain; 16extern int _log_domain;
16 17
17#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_domain, __VA_ARGS__) 18#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_domain, __VA_ARGS__)
diff --git a/src/bin/win.c b/src/bin/win.c
index d0fb95e..56129f8 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -919,6 +919,9 @@ _term_container_is_splittable(Term_Container *tc, Eina_Bool is_horizontal)
919 int w = 0, h = 0, c_w = 0, c_h = 0; 919 int w = 0, h = 0, c_w = 0, c_h = 0;
920 Term *tm; 920 Term *tm;
921 921
922 if (terminology_starting_up)
923 return EINA_TRUE;
924
922 tm = tc->term_first(tc); 925 tm = tc->term_first(tc);
923 evas_object_geometry_get(tm->bg, NULL, NULL, &w, &h); 926 evas_object_geometry_get(tm->bg, NULL, NULL, &w, &h);
924 evas_object_textgrid_cell_size_get(termio_textgrid_get(tm->termio), 927 evas_object_textgrid_cell_size_get(termio_textgrid_get(tm->termio),
@@ -974,6 +977,10 @@ _win_split(Term_Container *tc, Term_Container *child,
974 tc_split->is_focused = tc->is_focused; 977 tc_split->is_focused = tc->is_focused;
975 tc->swallow(tc, NULL, tc_split); 978 tc->swallow(tc, NULL, tc_split);
976 } 979 }
980 else
981 {
982 DBG("term is not splittable");
983 }
977} 984}
978 985
979static void 986static void