billiob pushed a commit to branch terminology-0.9.

http://git.enlightenment.org/apps/terminology.git/commit/?id=8fe96c06a80b5894558c94f4065c071d553332cf

commit 8fe96c06a80b5894558c94f4065c071d553332cf
Author: Boris Faure <bill...@gmail.com>
Date:   Sat Sep 26 12:01:42 2015 +0200

    fix --split option
---
 src/bin/main.c    | 6 +++++-
 src/bin/private.h | 1 +
 src/bin/win.c     | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

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 @@
 #include "gravatar.h"
 #include "keyin.h"
 
-
+int terminology_starting_up;
 int _log_domain = -1;
 
 static Config *_main_config = NULL;
@@ -523,6 +523,8 @@ elm_main(int argc, char **argv)
    Eina_List *cmds_list = NULL;
 #endif
 
+   terminology_starting_up = EINA_TRUE;
+
    elm_language_set("");
    elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
    elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
@@ -930,6 +932,8 @@ remote:
    ecore_con_init();
    ecore_con_url_init();
 
+   terminology_starting_up = EINA_FALSE;
+
    elm_run();
 
    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 @@
 #endif
 #define gettext_noop(String) String
 
+extern int terminology_starting_up;
 extern int _log_domain;
 
 #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)
    int w = 0, h = 0, c_w = 0, c_h = 0;
    Term *tm;
 
+   if (terminology_starting_up)
+     return EINA_TRUE;
+
    tm = tc->term_first(tc);
    evas_object_geometry_get(tm->bg, NULL, NULL, &w, &h);
    evas_object_textgrid_cell_size_get(termio_textgrid_get(tm->termio),
@@ -974,6 +977,10 @@ _win_split(Term_Container *tc, Term_Container *child,
         tc_split->is_focused = tc->is_focused;
         tc->swallow(tc, NULL, tc_split);
      }
+   else
+     {
+        DBG("term is not splittable");
+     }
 }
 
 static void

-- 


Reply via email to