Implementando save/restore de sessao.

perry
1 parent 2489c02f
Showing 3 changed files with 39 additions and 25 deletions Show diff stats
src/actions.c
src/g3270.h
src/main.c
@@ -29,6 +29,7 @@
  const struct action_callback action_callbacks[] =
  {
 	{ "print",					action_print					},
+	{ "save",					action_save						},
 	{ "toggle",					action_toggle					},
 #ifdef __GTK_ABOUT_DIALOG_H__
 	{ "about",					action_AboutBox					},
@@ -166,6 +166,8 @@
  gboolean KeyboardAction(GtkWidget *widget, GdkEventKey *event, gpointer user_data);
+ void action_save(GtkWidget *w, gpointer data);
+
  void action_crosshair( GtkWidget *w, gpointer data );
  void action_disconnect(GtkWidget *w, gpointer data);
  void action_connect(GtkWidget *w, gpointer data);
@@ -79,7 +79,7 @@
 /*---[ Main program ]---------------------------------------------------------*/
- void action_exit(GtkWidget *w, gpointer data)
+ void action_save(GtkWidget *w, gpointer data)
  {
  	char	filename[4096];
  	char	*home	= getenv("HOME");
@@ -163,7 +163,11 @@
 		}
 	}
 #endif
+ }
+ void action_exit(GtkWidget *w, gpointer data)
+ {
+ 	action_save(w,data);
  	gtk_main_quit();
  }
@@ -361,33 +365,35 @@ static gint save_session (GnomeClient *client, gint phase, GnomeSaveStyle save_s
               gint is_shutdown, GnomeInteractStyle interact_style,
               gint is_fast, gpointer client_data)
 {
-  gchar** argv;
-  guint argc;
+	gchar** argv;
+	guint argc;
+
+	Log("Saving session for %s",(char *) client_data);
-  Log("Saving session for %s",(char *) client_data);
+	action_save(0,0);
-  /* allocate 0-filled, so it will be NULL-terminated */
-  argv = g_malloc0(sizeof(gchar*)*4);
-  argc = 0;
+	/* allocate 0-filled, so it will be NULL-terminated */
+	argv = g_malloc0(sizeof(gchar*)*4);
+	argc = 0;
-  argv[argc++] = client_data;
+	argv[argc++] = client_data;
-  if(cl_hostname)
-  {
-  	argv[argc++] = ((gchar *) cl_hostname);
-  }
+	if(cl_hostname)
+	{
+		argv[argc++] = ((gchar *) cl_hostname);
+	}
-  gnome_client_set_clone_command(client, argc, argv);
-  gnome_client_set_restart_command(client, argc, argv);
+	gnome_client_set_clone_command(client, argc, argv);
+	gnome_client_set_restart_command(client, argc, argv);
-  return TRUE;
+	return TRUE;
 }
-static void session_die(GnomeClient* client, gpointer client_data)
+static gint session_die(GnomeClient* client, gpointer client_data)
 {
 	Log("Exiting by gnome's request");
-	action_exit(0,0);
-	Log("Session Die");
+	gtk_exit(0);
+	return FALSE;
 }
 #endif
@@ -407,13 +413,6 @@ static void session_die(GnomeClient* client, gpointer client_data)
     CHKPoint();
     set_3270_keyboard(&g3270_keyboard_info);
-    g_thread_init(NULL);
-    gdk_threads_init();
-    gtk_init(&argc, &argv);
-
-    MainThread = g_thread_self();
-    DBGPrintf("Main thread: %p",MainThread);
-
 #ifdef USE_GNOME
 	gnome_init(PROJECT_NAME, PROJECT_VERSION, argc, argv);
@@ -423,8 +422,20 @@ static void session_die(GnomeClient* client, gpointer client_data)
 	gtk_signal_connect(GTK_OBJECT (client), "save_yourself", GTK_SIGNAL_FUNC(save_session), argv[0]);
 	gtk_signal_connect(GTK_OBJECT (client), "die", GTK_SIGNAL_FUNC(session_die), NULL);
 	DBGMessage("Gnome session setup finished");
+
+#else
+
+	g_thread_init(NULL);
+	gdk_threads_init();
+	gtk_init(&argc, &argv);
+
+
 #endif
+
+    MainThread = g_thread_self();
+    DBGPrintf("Main thread: %p",MainThread);
+
     /* Parse 3270 command line */
     parse_3270_command_line(argc, (const char **) argv, &cl_hostname);
	@@ -166,6 +166,8 @@		@@ -166,6 +166,8 @@
166		166
167	gboolean KeyboardAction(GtkWidget widget, GdkEventKey event, gpointer user_data);	167	gboolean KeyboardAction(GtkWidget widget, GdkEventKey event, gpointer user_data);
168		168
		169	+ void action_save(GtkWidget *w, gpointer data);
		170	+
169	void action_crosshair( GtkWidget *w, gpointer data );	171	void action_crosshair( GtkWidget *w, gpointer data );
170	void action_disconnect(GtkWidget *w, gpointer data);	172	void action_disconnect(GtkWidget *w, gpointer data);
171	void action_connect(GtkWidget *w, gpointer data);	173	void action_connect(GtkWidget *w, gpointer data);