Corrigindo save/restore da janela principal

perry.werneck@gmail.com
1 parent 2b9270e0
Showing 7 changed files with 56 additions and 23 deletions Show diff stats
src/include/pw3270.h
src/pw3270/common/common.h
src/pw3270/common/config.c
src/pw3270/main.c
src/pw3270/tools.c
src/pw3270/uiparser/parser.c
src/pw3270/window.c
@@ -58,8 +58,8 @@
  LIB3270_EXPORT	GtkWidget	* pw3270_get_terminal_widget(GtkWidget *widget);
  LIB3270_EXPORT gchar		* pw3270_build_filename(GtkWidget *widget, const gchar *first_element, ...);
- LIB3270_EXPORT void		  pw3270_save_window_state(GtkWidget *widget, const gchar *name);
- LIB3270_EXPORT void		  pw3270_restore_window_state(GtkWidget *widget, const gchar *name);
+ LIB3270_EXPORT void		  pw3270_save_window_size(GtkWidget *widget, const gchar *name);
+ LIB3270_EXPORT void		  pw3270_restore_window(GtkWidget *widget, const gchar *name);
 #ifdef HAVE_GTKMAC
  #include <gtk-mac-bundle.h>
@@ -82,7 +82,10 @@
  gchar 		* build_data_filename(const gchar *first_element, ...);
  gchar		* filename_from_va(const gchar *first_element, va_list args);
- void		  save_window_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd);
+
+ void 		  save_window_state_to_config(const gchar *group, const gchar *key, GdkWindowState CurrentState);
+ void		  save_window_size_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd);
+
  void		  restore_window_from_config(const gchar *group, const gchar *key, GtkWidget *hwnd);
 #ifdef WIN_REGISTRY_ENABLED
@@ -680,12 +680,8 @@ GKeyFile * get_application_keyfile(void)
         { "Sticky",		GDK_WINDOW_STATE_STICKY,	gtk_window_stick                }
  };
-void save_window_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
+void save_window_state_to_config(const gchar *group, const gchar *key, GdkWindowState CurrentState)
 {
-	GdkWindowState CurrentState = gdk_window_get_state(gtk_widget_get_window(hwnd));
-
-	if( !(CurrentState & (GDK_WINDOW_STATE_FULLSCREEN|GDK_WINDOW_STATE_MAXIMIZED|GDK_WINDOW_STATE_ICONIFIED)) )
-	{
 #if defined( WIN_REGISTRY_ENABLED )
         gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
@@ -696,17 +692,13 @@ void save_window_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd
 		if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
 		{
 			int f;
-			int pos[2];
-
 			for(f=0;f<G_N_ELEMENTS(WindowState);f++)
 			{
 				DWORD value = (CurrentState & WindowState[f].flag) ? 1 : 0;
+//				trace("%s=%s",WindowState[f].name,value ? "Yes" : "No");
 				RegSetValueEx(hKey, WindowState[f].name, 0, REG_DWORD,(const BYTE *) &value,sizeof(value));
 			}
-			gtk_window_get_size(GTK_WINDOW(hwnd),&pos[0],&pos[1]);
-			RegSetValueEx(hKey, "Size", 0, REG_BINARY,(const BYTE *) pos,sizeof(pos));
-
 			RegCloseKey(hKey);
 		}
@@ -714,20 +706,50 @@ void save_window_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd
 #else
 		int			  f;
-		int 		  pos[2];
 		GKeyFile	* conf 	= get_application_keyfile();
 		gchar		* id	= g_strconcat(group,".",key,NULL);
 		for(f=0;f<G_N_ELEMENTS(WindowState);f++)
 			g_key_file_set_boolean(conf,id,WindowState[f].name,CurrentState & WindowState[f].flag);
+		g_free(id);
+
+#endif // WIN_REGISTRY_ENABLED
+}
+
+void save_window_size_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
+{
+#if defined( WIN_REGISTRY_ENABLED )
+
+        gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
+
+        HKEY    hKey;
+        DWORD   disp;
+
+		if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
+		{
+			int pos[2];
+
+			gtk_window_get_size(GTK_WINDOW(hwnd),&pos[0],&pos[1]);
+
+			RegSetValueEx(hKey, "Size", 0, REG_BINARY,(const BYTE *) pos,sizeof(pos));
+
+			RegCloseKey(hKey);
+		}
+
+		g_free(path);
+
+#else
+		int 		  pos[2];
+		GKeyFile	* conf 	= get_application_keyfile();
+		gchar		* id	= g_strconcat(group,".",key,NULL);
+
         gtk_window_get_size(GTK_WINDOW(hwnd),&pos[0],&pos[1]);
         g_key_file_set_integer_list(conf,id,"size",pos,2);
 		g_free(id);
 #endif // WIN_REGISTRY_ENABLED
-	}
 }
 void restore_window_from_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
@@ -247,7 +247,7 @@ int main(int argc, char *argv[])
 		if(pw3270_get_toggle(toplevel,LIB3270_TOGGLE_FULL_SCREEN))
 			gtk_window_fullscreen(GTK_WINDOW(toplevel));
 		else
-			pw3270_restore_window_state(toplevel,"toplevel");
+			pw3270_restore_window(toplevel,"toplevel");
 		init_plugins(toplevel);
 		gtk_window_present(GTK_WINDOW(toplevel));
@@ -260,8 +260,6 @@ int main(int argc, char *argv[])
 		deinit_plugins(toplevel);
-		pw3270_save_window_state(toplevel,"toplevel");
-
 	}
 	return rc;
@@ -89,12 +89,13 @@ LIB3270_EXPORT gchar * pw3270_build_filename(GtkWidget *widget, const gchar *fir
 	return path;
 }
-LIB3270_EXPORT void pw3270_save_window_state(GtkWidget *widget, const gchar *name)
+LIB3270_EXPORT void pw3270_save_window_size(GtkWidget *widget, const gchar *name)
 {
-	save_window_to_config("window", name, widget);
+	trace("%s",__FUNCTION__);
+	save_window_size_to_config("window", name, widget);
 }
-LIB3270_EXPORT void pw3270_restore_window_state(GtkWidget *widget, const gchar *name)
+LIB3270_EXPORT void pw3270_restore_window(GtkWidget *widget, const gchar *name)
 {
 	restore_window_from_config("window", name, widget);
 }
@@ -192,7 +192,7 @@ void parser_build(struct parser *p, GtkWidget *widget)
 	g_object_set_data_full(G_OBJECT(p->toplevel),"action_groups",a_info.group,(GDestroyNotify) release_action_group);
 	g_object_set_data_full(G_OBJECT(p->toplevel),"string_chunk",p->strings,(GDestroyNotify) g_string_chunk_free);
-	g_signal_connect(p->toplevel, "destroy", G_CALLBACK (gtk_main_quit), NULL);
+	g_signal_connect(p->toplevel, "destroy", G_CALLBACK(gtk_main_quit), NULL);
 	// Has "view" menu? Update it.
 	parent = GTK_WIDGET(g_hash_table_lookup(p->element_list[UI_ELEMENT_MENU],"view"));
@@ -110,7 +110,7 @@
  }
-  static gboolean window_state_event(GtkWidget *window, GdkEventWindowState *event, GtkWidget *widget)
+ static gboolean window_state_event(GtkWidget *window, GdkEventWindowState *event, GtkWidget *widget)
  {
 	gboolean	  fullscreen	= event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN ? TRUE : FALSE;
 	GtkAction	**action		= (GtkAction **) g_object_get_data(G_OBJECT(widget),"named_actions");
@@ -124,6 +124,14 @@
 	lib3270_set_toggle(v3270_get_session(widget),LIB3270_TOGGLE_FULL_SCREEN,fullscreen);
+	save_window_state_to_config("window", "toplevel", event->new_window_state);
+
+	return 0;
+ }
+
+ static gboolean configure_event(GtkWidget *widget, GdkEvent  *event, gpointer   user_data)
+ {
+ 	save_window_size_to_config("window","toplevel",widget);
 	return 0;
  }
@@ -484,6 +492,7 @@
 	// Connect window signals
 	g_signal_connect(widget,"window_state_event",G_CALLBACK(window_state_event),widget->terminal);
+	g_signal_connect(widget,"configure_event",G_CALLBACK(configure_event),widget->terminal);
 	// Finish setup
	@@ -192,7 +192,7 @@ void parser_build(struct parser p, GtkWidget widget)		@@ -192,7 +192,7 @@ void parser_build(struct parser p, GtkWidget widget)
192	g_object_set_data_full(G_OBJECT(p->toplevel),"action_groups",a_info.group,(GDestroyNotify) release_action_group);	192	g_object_set_data_full(G_OBJECT(p->toplevel),"action_groups",a_info.group,(GDestroyNotify) release_action_group);
193	g_object_set_data_full(G_OBJECT(p->toplevel),"string_chunk",p->strings,(GDestroyNotify) g_string_chunk_free);	193	g_object_set_data_full(G_OBJECT(p->toplevel),"string_chunk",p->strings,(GDestroyNotify) g_string_chunk_free);
194		194
195	- g_signal_connect(p->toplevel, "destroy", G_CALLBACK (gtk_main_quit), NULL);	195	+ g_signal_connect(p->toplevel, "destroy", G_CALLBACK(gtk_main_quit), NULL);
196		196
197	// Has "view" menu? Update it.	197	// Has "view" menu? Update it.
198	parent = GTK_WIDGET(g_hash_table_lookup(p->element_list[UI_ELEMENT_MENU],"view"));	198	parent = GTK_WIDGET(g_hash_table_lookup(p->element_list[UI_ELEMENT_MENU],"view"));