From 34b345e11bf53548073fb110b5fa71e1dc7d9b42 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Tue, 13 Mar 2012 13:22:40 +0000
Subject: [PATCH] Incluindo testes

---
 pw3270.cbp                |  3 ++-
 src/gtk/actions.c         |  8 ++++++++
 src/gtk/mainwindow.c      |  4 ++++
 src/gtk/uiparser/parser.c |  2 +-
 src/gtk/v3270/draw.c      |  1 +
 src/lib3270/screen.c      | 17 ++++-------------
 ui/99debug.xml            |  1 +
 7 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/pw3270.cbp b/pw3270.cbp
index fb7c41e..9e93dba 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -305,7 +305,8 @@
 		</Unit>
 		<Unit filename="src/lib3270/xioc.h" />
 		<Unit filename="src/lib3270/xl.h" />
-		<Unit filename="ui/default.xml" />
+		<Unit filename="ui/00default.xml" />
+		<Unit filename="ui/99debug.xml" />
 		<Unit filename="valgrind.suppression" />
 		<Extensions>
 			<code_completion />
diff --git a/src/gtk/actions.c b/src/gtk/actions.c
index a71b410..4f6c442 100644
--- a/src/gtk/actions.c
+++ b/src/gtk/actions.c
@@ -61,12 +61,19 @@ static void activate_action(GtkAction *action, GtkWidget *widget)
 	gtk_widget_activate(widget);
 }
 
+static void reload_action(GtkAction *action, GtkWidget *widget)
+{
+	trace("Action %s activated on widget %p",gtk_action_get_name(action),widget);
+	v3270_reload(widget);
+}
+
 static void copy_action(GtkAction *action, GtkWidget *widget)
 {
 	trace("Action %s activated on widget %p",gtk_action_get_name(action),widget);
 	v3270_copy_clipboard(GTK_V3270(widget));
 }
 
+
 void ui_connect_action(GtkAction *action, GtkWidget *widget, const gchar *name, const gchar *id)
 {
 	#undef DECLARE_LIB3270_ACTION
@@ -98,6 +105,7 @@ void ui_connect_action(GtkAction *action, GtkWidget *widget, const gchar *name, 
 	gtk_action[] =
 	{
 		{ "activate", 	activate_action		},
+		{ "reload",		reload_action		},
 		{ "connect", 	connect_action		},
 		{ "copy", 		copy_action			},
 		{ "disconnect", disconnect_action	},
diff --git a/src/gtk/mainwindow.c b/src/gtk/mainwindow.c
index 4e708e3..edaa48e 100644
--- a/src/gtk/mainwindow.c
+++ b/src/gtk/mainwindow.c
@@ -273,6 +273,10 @@
 	if(lib3270_get_toggle(host,LIB3270_TOGGLE_FULL_SCREEN))
 		gtk_window_fullscreen(GTK_WINDOW(window));
 
+#ifdef DEBUG
+	lib3270_testpattern(host);
+#endif
+
  	return window;
  }
 
diff --git a/src/gtk/uiparser/parser.c b/src/gtk/uiparser/parser.c
index a9cbd20..2c3b51b 100644
--- a/src/gtk/uiparser/parser.c
+++ b/src/gtk/uiparser/parser.c
@@ -211,7 +211,7 @@ static void release_popups(GtkWidget **popup)
 	int f;
 	for(f=0;popup[f] != ((GtkWidget *) -1);f++)
 	{
-		trace("%s[%d]=%p",__FUNCTION__,f,popup[f]);
+//		trace("%s[%d]=%p",__FUNCTION__,f,popup[f]);
 		if(popup[f])
 			g_object_unref(popup[f]);
 	}
diff --git a/src/gtk/v3270/draw.c b/src/gtk/v3270/draw.c
index c623dd6..8f4792f 100644
--- a/src/gtk/v3270/draw.c
+++ b/src/gtk/v3270/draw.c
@@ -28,6 +28,7 @@
  */
 
  #include <gtk/gtk.h>
+ #include <pw3270.h>
  #include <lib3270.h>
  #include <lib3270/session.h>
  #include "v3270.h"
diff --git a/src/lib3270/screen.c b/src/lib3270/screen.c
index 4541e77..d691b58 100644
--- a/src/lib3270/screen.c
+++ b/src/lib3270/screen.c
@@ -72,18 +72,10 @@
 #define get_color_pair(fg,bg) (((bg&0x0F) << 4) | (fg&0x0F))
 #define DEFCOLOR_MAP(f) ((((f) & FA_PROTECT) >> 4) | (((f) & FA_INT_HIGH_SEL) >> 3))
 
-// #if defined(WC3270)
-// extern char *profile_name;
-// #endif
-
 static int logpopup(H3270 *session, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, va_list arg);
 
 static int (*popup_handler)(H3270 *, LIB3270_NOTIFY, const char *, const char *, const char *, va_list) = logpopup;
 
-// static const struct lib3270_screen_callbacks *callbacks = NULL;
-// static SCRIPT_STATE script_state = SCRIPT_STATE_NONE;
-
-
 enum ts { TS_AUTO, TS_ON, TS_OFF };
 
 static void screen_update(H3270 *session, int bstart, int bend);
@@ -755,12 +747,14 @@ LIB3270_ACTION( testpattern )
 	};
 
 	int row = 0;
-	int max = (hSession->maxROWS * hSession->maxCOLS);
+	int max;
 	int pos = 0;
 	int f;
 	int fg = COLOR_BLUE;
 
-	Trace("%s begins",__FUNCTION__);
+	CHECK_SESSION_HANDLE(hSession);
+
+	max = (hSession->maxROWS * hSession->maxCOLS);
 	for(f=0;f<max;f++)
 	{
 		if(!pat[row].cc[pos])
@@ -779,11 +773,8 @@ LIB3270_ACTION( testpattern )
 		hSession->ea_buf[f].cc = pat[row].cc[pos++];
 	}
 
-	Trace("%s display",__FUNCTION__);
-
 	screen_disp(hSession);
 
-	Trace("%s ends",__FUNCTION__);
 	return 0;
 }
 
diff --git a/ui/99debug.xml b/ui/99debug.xml
index 7b1027a..69be3ff 100644
--- a/ui/99debug.xml
+++ b/ui/99debug.xml
@@ -40,6 +40,7 @@
 
 		<menu name='debugmenu' label='Debug' >
 			<menuitem action='testpattern' group='offline' label='Show test pattern' />
+			<menuitem action='reload' label='Reload buffer contents' />
 		</menu>
 
 	</menubar>
--
libgit2 0.21.2