From 018813c6e5f2b1d7e1809cde0ebae790d57aa3fd Mon Sep 17 00:00:00 2001
From: Francesco Abbate <francesco.bbt@gmail.com>
Date: Fri, 9 Nov 2012 14:11:57 +0100
Subject: Introduce a flag to create a window without showing it
---
 agg-plot/window.cpp &#124; 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)
(limited to 'agg-plot/window.cpp')
diff --git a/agg-plot/window.cpp b/agg-plot/window.cpp
index 3868de85..3114f430 100644
--- a/agg-plot/window.cpp
+++ b/agg-plot/window.cpp
@@ -19,7 +19,6 @@ extern "C" {
 
 __BEGIN_DECLS
 
-static int window_show (lua_State *L);
 static int window_free (lua_State *L);
 static int window_split (lua_State *L);
 static int window_save_svg (lua_State *L);
@@ -406,17 +405,22 @@ void window::start (lua_State *L, gslshell::ret_status& st)
 }
 }
 
-int
-window_new (lua_State *L)
+static void
+show_window(lua_State* L, window* win)
 {
- window *win = push_new_object<window>(L, GS_WINDOW, global_state);
- const char *spec = lua_tostring (L, 1);
-
 gslshell::ret_status st;
 win->start(L, st);
 
 if (st.error_msg())
- return luaL_error (L, "%s (reported during %s)", st.error_msg(), st.context());
+ luaL_error (L, "%s (reported during %s)", st.error_msg(), st.context());
+}
+
+int
+window_new (lua_State *L)
+{
+ window *win = push_new_object<window>(L, GS_WINDOW, global_state);
+ const char *spec = lua_tostring (L, 1);
+ int defer_show = lua_toboolean(L, 2);
 
 if (spec)
 {
@@ -424,6 +428,11 @@ window_new (lua_State *L)
 return luaL_error(L, "invalid layout specification");
 }
 
+ if (!defer_show)
+ {
+ show_window(L, win);
+ }
+
 return 1;
 }
 
@@ -431,13 +440,7 @@ int
 window_show (lua_State *L)
 {
 window *win = object_check<window>(L, 1, GS_WINDOW);
-
- gslshell::ret_status st;
- win->start(L, st);
-
- if (st.error_msg())
- return luaL_error (L, "%s (reported during %s)", st.error_msg(), st.context());
-
+ show_window(L, win);
 return 0;
 }
 
-- 
cgit v1.2.3
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://cgit.git.savannah.gnu.org/cgit/gsl-shell.git/patch/agg-plot/window.cpp?id=018813c6e5f2b1d7e1809cde0ebae790d57aa3fd">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://cgit.git.savannah.gnu.org/cgit/gsl-shell.git/patch/agg-plot/window.cpp?id=018813c6e5f2b1d7e1809cde0ebae790d57aa3fd" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>