From 093014ccca1811b15c3b63ea5003fc7bb75d017a Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Thu, 24 Oct 2019 17:08:20 -0300
Subject: [PATCH] Adjustments for integration.

---
 pw3270.cbp                    |   6 +++---
 src/include/pw3270.h          |  52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/objects/toolbar/core.c    | 258 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/objects/toolbar/toolbar.c | 258 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 313 insertions(+), 261 deletions(-)
 create mode 100644 src/include/pw3270.h
 delete mode 100644 src/objects/toolbar/core.c
 create mode 100644 src/objects/toolbar/toolbar.c

diff --git a/pw3270.cbp b/pw3270.cbp
index 55e52f7..daadc23 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -14,7 +14,6 @@
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option use_console_runner="0" />
-				<Option parameters="--remap=./charsets/bracket.xml" />
 				<Compiler>
 					<Add option="-g" />
 					<Add option="-DDEBUG=1" />
@@ -43,6 +42,7 @@
 		</Linker>
 		<Unit filename="Makefile.in" />
 		<Unit filename="configure.ac" />
+		<Unit filename="src/include/pw3270.h" />
 		<Unit filename="src/include/pw3270/actions.h" />
 		<Unit filename="src/include/pw3270/application.h" />
 		<Unit filename="src/include/pw3270/toolbar.h" />
@@ -70,10 +70,10 @@
 		<Unit filename="src/objects/actions/window.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/objects/toolbar/core.c">
+		<Unit filename="src/objects/toolbar/private.h" />
+		<Unit filename="src/objects/toolbar/toolbar.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="src/objects/toolbar/private.h" />
 		<Unit filename="src/objects/window/actions.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/src/include/pw3270.h b/src/include/pw3270.h
new file mode 100644
index 0000000..b7ce97f
--- /dev/null
+++ b/src/include/pw3270.h
@@ -0,0 +1,52 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como - e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ */
+
+/**
+ * @brief Declares the pw3270 Action objects.
+ *
+ */
+
+#ifndef PW3270_H_INCLUDED
+
+	#define PW3270_H_INCLUDED
+
+	#include <config.h>
+
+	#ifndef GETTEXT_PACKAGE
+		#define GETTEXT_PACKAGE PACKAGE_NAME
+	#endif
+
+	#include <libintl.h>
+	#include <glib/gi18n.h>
+	#include <gtk/gtk.h>
+
+	/* not really I18N-related, but also a string marker macro */
+	#define I_(string) g_intern_static_string (string)
+
+#endif // PW3270_H_INCLUDED
diff --git a/src/objects/toolbar/core.c b/src/objects/toolbar/core.c
deleted file mode 100644
index 4906df1..0000000
--- a/src/objects/toolbar/core.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como - e possui - linhas de código.
- *
- * Contatos:
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- *
- */
-
- #include "private.h"
-
- static gboolean popup_context_menu(GtkToolbar *toolbar, gint x, gint y, gint button_number);
- static void finalize(GObject *object);
-
-
- struct _pw3270ToolBar {
- 	GtkToolbar parent;
-
- 	/// @brief Popup Menu
-	GtkWidget * popup_menu;
-
- };
-
- struct _pw3270ToolBarClass {
-
-	GtkToolbarClass parent_class;
-
-
- };
-
- G_DEFINE_TYPE(pw3270ToolBar, pw3270ToolBar, GTK_TYPE_TOOLBAR);
-
- static void pw3270ToolBar_class_init(pw3270ToolBarClass *klass) {
-
- 	GtkToolbarClass * toolbar = GTK_TOOLBAR_CLASS(klass);
-
- 	toolbar->popup_context_menu = popup_context_menu;
-
- 	G_OBJECT_CLASS(klass)->finalize = finalize;
-
- }
-
- static void detacher(GtkWidget *attach_widget, GtkMenu *menu) {
-
- 	pw3270ToolBar * toolbar = PW3270_TOOLBAR(attach_widget);
- 	toolbar->popup_menu = NULL;
-
- }
-
- static void set_icon_size(GtkMenuItem *menuitem, GtkWidget *toolbar) {
-
-	GtkIconSize * icon_size = g_object_get_data(G_OBJECT(menuitem),"icon_size");
-
-	if(icon_size)
-		gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar),*icon_size);
-	else
-		gtk_toolbar_unset_icon_size(GTK_TOOLBAR(toolbar));
-
- }
-
- static void set_style(GtkMenuItem *menuitem, GtkWidget *toolbar) {
-
-	GtkToolbarStyle * style = g_object_get_data(G_OBJECT(menuitem),"toolbar_style");
-
-	if(style)
-		gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),*style);
-	else
-		gtk_toolbar_unset_style(GTK_TOOLBAR(toolbar));
-
- }
-
- static void pw3270ToolBar_init(pw3270ToolBar *widget) {
-
-	widget->popup_menu = gtk_menu_new();
-
-	// Size options
-	{
-		static const struct {
-			const gchar			* label;
-			GtkIconSize			  icon_size;
-		} itens[] = {
-
-			{
-				.label = N_( "System default" )
-
-			},
-
-			{
-				.label = N_( "Small" ),
-				.icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR
-			},
-
-			{
-				.label = N_( "Large" ),
-				.icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR
-			},
-		};
-
-		size_t ix;
-
-		GtkWidget * item = gtk_menu_item_new_with_mnemonic( _("Icon _size") );
-		gtk_menu_shell_append(GTK_MENU_SHELL(widget->popup_menu),item);
-
-		GtkWidget * submenu = gtk_menu_new();
-		gtk_menu_item_set_submenu(GTK_MENU_ITEM(item),submenu);
-
-		for(ix = 0; ix < G_N_ELEMENTS(itens); ix++) {
-
-			item = gtk_menu_item_new_with_mnemonic(gettext(itens[ix].label));
-
-			if(ix > 0)
-				g_object_set_data(G_OBJECT(item),"icon_size", (gpointer) &itens[ix].icon_size);
-
-			g_signal_connect(item, "activate", G_CALLBACK(set_icon_size), widget);
-
-			gtk_menu_shell_append(GTK_MENU_SHELL(submenu),item);
-
-		}
-
-	}
-
-	// Style option
-	{
-		static const struct {
-			const gchar * label;
-			GtkToolbarStyle style;
-		} itens[] = {
-
-			{
-				.label = N_( "System default" )
-			},
-
-			{
-				.label = N_( "Icons only" ),
-				.style = GTK_TOOLBAR_ICONS
-			},
-
-			{
-				.label = N_( "Text only" ),
-				.style = GTK_TOOLBAR_TEXT
-			},
-
-			{
-				.label = N_( "Icons & text" ),
-				.style = GTK_TOOLBAR_BOTH
-			},
-		};
-
-		size_t ix;
-
-		GtkWidget * item = gtk_menu_item_new_with_mnemonic( _("S_tyle") );
-		gtk_menu_shell_append(GTK_MENU_SHELL(widget->popup_menu),item);
-
-		GtkWidget * submenu = gtk_menu_new();
-		gtk_menu_item_set_submenu(GTK_MENU_ITEM(item),submenu);
-
-		for(ix = 0; ix < G_N_ELEMENTS(itens); ix++) {
-
-			item = gtk_menu_item_new_with_mnemonic(gettext(itens[ix].label));
-
-			if(ix > 0)
-				g_object_set_data(G_OBJECT(item),"toolbar_style", (gpointer) &itens[ix].style);
-
-			g_signal_connect(item, "activate", G_CALLBACK(set_style), widget);
-
-			gtk_menu_shell_append(GTK_MENU_SHELL(submenu),item);
-
-		}
-
-	}
-
-	// gtk_container_set_border_width(GTK_CONTAINER(widget->popup_menu),6);
-	gtk_widget_show_all(widget->popup_menu);
-	gtk_menu_attach_to_widget(GTK_MENU(widget->popup_menu),GTK_WIDGET(widget),detacher);
-
- }
-
- static void finalize(GObject *object) {
-
-// 	pw3270ToolBar * toolbar = PW3270_TOOLBAR(object);
-
-
-	G_OBJECT_CLASS(pw3270ToolBar_parent_class)->finalize(object);
-
- }
-
- GtkWidget * pw3270_toolbar_new(void) {
-	return g_object_new(PW3270_TYPE_TOOLBAR, NULL);
- }
-
- GtkWidget * pw3270_toolbar_insert_lib3270_action(GtkWidget *toolbar, const LIB3270_ACTION *action, gint pos) {
-
-	g_return_val_if_fail(GTK_IS_TOOLBAR(toolbar),NULL);
-
-	if(!action) {
-		g_message(_("Invalid action identifier"));
-		return NULL;
-	}
-
-	if(!action->icon) {
-		g_message(_("Action \"%s\" doesn't have an icon"), action->name);
-		return NULL;
-	}
-
-	if(!action->label) {
-		g_message(_("Action \"%s\" doesn't have a label"), action->name);
-		return NULL;
-	}
-
-	debug("Action: %s icon: %s", action->name, action->icon);
-
-	GtkToolItem * item = gtk_tool_button_new(gtk_image_new_from_icon_name(action->icon,GTK_ICON_SIZE_LARGE_TOOLBAR),gettext(action->label));
-	gtk_tool_button_set_use_underline(GTK_TOOL_BUTTON(item),TRUE);
-
-	gtk_widget_set_name(GTK_WIDGET(item), action->name);
-
-	if(action->summary)
-		gtk_tool_item_set_tooltip_text(item,gettext(action->summary));
-
-	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, pos);
-
-	return GTK_WIDGET(item);
- }
-
- gboolean popup_context_menu(GtkToolbar *widget, gint x, gint y, gint button_number) {
-
- 	pw3270ToolBar * toolbar = PW3270_TOOLBAR(widget);
-
-	debug("%s button_number=%d",__FUNCTION__,button_number);
-
-	if(toolbar->popup_menu) {
-		gtk_menu_popup_at_pointer(GTK_MENU(toolbar->popup_menu),NULL);
-	}
-
-
-	return TRUE;
-
- }
diff --git a/src/objects/toolbar/toolbar.c b/src/objects/toolbar/toolbar.c
new file mode 100644
index 0000000..4906df1
--- /dev/null
+++ b/src/objects/toolbar/toolbar.c
@@ -0,0 +1,258 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como - e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ */
+
+ #include "private.h"
+
+ static gboolean popup_context_menu(GtkToolbar *toolbar, gint x, gint y, gint button_number);
+ static void finalize(GObject *object);
+
+
+ struct _pw3270ToolBar {
+ 	GtkToolbar parent;
+
+ 	/// @brief Popup Menu
+	GtkWidget * popup_menu;
+
+ };
+
+ struct _pw3270ToolBarClass {
+
+	GtkToolbarClass parent_class;
+
+
+ };
+
+ G_DEFINE_TYPE(pw3270ToolBar, pw3270ToolBar, GTK_TYPE_TOOLBAR);
+
+ static void pw3270ToolBar_class_init(pw3270ToolBarClass *klass) {
+
+ 	GtkToolbarClass * toolbar = GTK_TOOLBAR_CLASS(klass);
+
+ 	toolbar->popup_context_menu = popup_context_menu;
+
+ 	G_OBJECT_CLASS(klass)->finalize = finalize;
+
+ }
+
+ static void detacher(GtkWidget *attach_widget, GtkMenu *menu) {
+
+ 	pw3270ToolBar * toolbar = PW3270_TOOLBAR(attach_widget);
+ 	toolbar->popup_menu = NULL;
+
+ }
+
+ static void set_icon_size(GtkMenuItem *menuitem, GtkWidget *toolbar) {
+
+	GtkIconSize * icon_size = g_object_get_data(G_OBJECT(menuitem),"icon_size");
+
+	if(icon_size)
+		gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar),*icon_size);
+	else
+		gtk_toolbar_unset_icon_size(GTK_TOOLBAR(toolbar));
+
+ }
+
+ static void set_style(GtkMenuItem *menuitem, GtkWidget *toolbar) {
+
+	GtkToolbarStyle * style = g_object_get_data(G_OBJECT(menuitem),"toolbar_style");
+
+	if(style)
+		gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),*style);
+	else
+		gtk_toolbar_unset_style(GTK_TOOLBAR(toolbar));
+
+ }
+
+ static void pw3270ToolBar_init(pw3270ToolBar *widget) {
+
+	widget->popup_menu = gtk_menu_new();
+
+	// Size options
+	{
+		static const struct {
+			const gchar			* label;
+			GtkIconSize			  icon_size;
+		} itens[] = {
+
+			{
+				.label = N_( "System default" )
+
+			},
+
+			{
+				.label = N_( "Small" ),
+				.icon_size = GTK_ICON_SIZE_SMALL_TOOLBAR
+			},
+
+			{
+				.label = N_( "Large" ),
+				.icon_size = GTK_ICON_SIZE_LARGE_TOOLBAR
+			},
+		};
+
+		size_t ix;
+
+		GtkWidget * item = gtk_menu_item_new_with_mnemonic( _("Icon _size") );
+		gtk_menu_shell_append(GTK_MENU_SHELL(widget->popup_menu),item);
+
+		GtkWidget * submenu = gtk_menu_new();
+		gtk_menu_item_set_submenu(GTK_MENU_ITEM(item),submenu);
+
+		for(ix = 0; ix < G_N_ELEMENTS(itens); ix++) {
+
+			item = gtk_menu_item_new_with_mnemonic(gettext(itens[ix].label));
+
+			if(ix > 0)
+				g_object_set_data(G_OBJECT(item),"icon_size", (gpointer) &itens[ix].icon_size);
+
+			g_signal_connect(item, "activate", G_CALLBACK(set_icon_size), widget);
+
+			gtk_menu_shell_append(GTK_MENU_SHELL(submenu),item);
+
+		}
+
+	}
+
+	// Style option
+	{
+		static const struct {
+			const gchar * label;
+			GtkToolbarStyle style;
+		} itens[] = {
+
+			{
+				.label = N_( "System default" )
+			},
+
+			{
+				.label = N_( "Icons only" ),
+				.style = GTK_TOOLBAR_ICONS
+			},
+
+			{
+				.label = N_( "Text only" ),
+				.style = GTK_TOOLBAR_TEXT
+			},
+
+			{
+				.label = N_( "Icons & text" ),
+				.style = GTK_TOOLBAR_BOTH
+			},
+		};
+
+		size_t ix;
+
+		GtkWidget * item = gtk_menu_item_new_with_mnemonic( _("S_tyle") );
+		gtk_menu_shell_append(GTK_MENU_SHELL(widget->popup_menu),item);
+
+		GtkWidget * submenu = gtk_menu_new();
+		gtk_menu_item_set_submenu(GTK_MENU_ITEM(item),submenu);
+
+		for(ix = 0; ix < G_N_ELEMENTS(itens); ix++) {
+
+			item = gtk_menu_item_new_with_mnemonic(gettext(itens[ix].label));
+
+			if(ix > 0)
+				g_object_set_data(G_OBJECT(item),"toolbar_style", (gpointer) &itens[ix].style);
+
+			g_signal_connect(item, "activate", G_CALLBACK(set_style), widget);
+
+			gtk_menu_shell_append(GTK_MENU_SHELL(submenu),item);
+
+		}
+
+	}
+
+	// gtk_container_set_border_width(GTK_CONTAINER(widget->popup_menu),6);
+	gtk_widget_show_all(widget->popup_menu);
+	gtk_menu_attach_to_widget(GTK_MENU(widget->popup_menu),GTK_WIDGET(widget),detacher);
+
+ }
+
+ static void finalize(GObject *object) {
+
+// 	pw3270ToolBar * toolbar = PW3270_TOOLBAR(object);
+
+
+	G_OBJECT_CLASS(pw3270ToolBar_parent_class)->finalize(object);
+
+ }
+
+ GtkWidget * pw3270_toolbar_new(void) {
+	return g_object_new(PW3270_TYPE_TOOLBAR, NULL);
+ }
+
+ GtkWidget * pw3270_toolbar_insert_lib3270_action(GtkWidget *toolbar, const LIB3270_ACTION *action, gint pos) {
+
+	g_return_val_if_fail(GTK_IS_TOOLBAR(toolbar),NULL);
+
+	if(!action) {
+		g_message(_("Invalid action identifier"));
+		return NULL;
+	}
+
+	if(!action->icon) {
+		g_message(_("Action \"%s\" doesn't have an icon"), action->name);
+		return NULL;
+	}
+
+	if(!action->label) {
+		g_message(_("Action \"%s\" doesn't have a label"), action->name);
+		return NULL;
+	}
+
+	debug("Action: %s icon: %s", action->name, action->icon);
+
+	GtkToolItem * item = gtk_tool_button_new(gtk_image_new_from_icon_name(action->icon,GTK_ICON_SIZE_LARGE_TOOLBAR),gettext(action->label));
+	gtk_tool_button_set_use_underline(GTK_TOOL_BUTTON(item),TRUE);
+
+	gtk_widget_set_name(GTK_WIDGET(item), action->name);
+
+	if(action->summary)
+		gtk_tool_item_set_tooltip_text(item,gettext(action->summary));
+
+	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, pos);
+
+	return GTK_WIDGET(item);
+ }
+
+ gboolean popup_context_menu(GtkToolbar *widget, gint x, gint y, gint button_number) {
+
+ 	pw3270ToolBar * toolbar = PW3270_TOOLBAR(widget);
+
+	debug("%s button_number=%d",__FUNCTION__,button_number);
+
+	if(toolbar->popup_menu) {
+		gtk_menu_popup_at_pointer(GTK_MENU(toolbar->popup_menu),NULL);
+	}
+
+
+	return TRUE;
+
+ }
--
libgit2 0.21.2