From af9aeaa3c6a42d8af27dd4539923321302f3d814 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Fri, 10 Jan 2020 12:36:38 -0300
Subject: [PATCH] Updating plugin engine.

---
 server/pw3270-plugin-ipc.cbp      |  1 +
 server/src/core/getproperties.c   |  2 +-
 server/src/core/linux/gobject.c   |  1 +
 server/src/core/linux/gobject.h   |  8 ++------
 server/src/core/linux/start.c     | 13 +++----------
 server/src/core/methods/private.h |  2 +-
 server/src/include/internals.h    | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 server/src/include/ipc-glib.h     |  6 ------
 server/src/plugin/plugin.c        | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
 server/src/plugin/private.h       | 13 +++++++------
 10 files changed, 125 insertions(+), 50 deletions(-)
 create mode 100644 server/src/include/internals.h

diff --git a/server/pw3270-plugin-ipc.cbp b/server/pw3270-plugin-ipc.cbp
index 661f134..5f4e4e7 100644
--- a/server/pw3270-plugin-ipc.cbp
+++ b/server/pw3270-plugin-ipc.cbp
@@ -131,6 +131,7 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="src/include/config.h.in" />
+		<Unit filename="src/include/internals.h" />
 		<Unit filename="src/include/ipc-glib.h" />
 		<Unit filename="src/plugin/plugin.c">
 			<Option compilerVar="CC" />
diff --git a/server/src/core/getproperties.c b/server/src/core/getproperties.c
index 751b48c..c55ae81 100644
--- a/server/src/core/getproperties.c
+++ b/server/src/core/getproperties.c
@@ -32,7 +32,7 @@
  *
  */
 
-#include <config.h>
+#include <internals.h>
 #include <ipc-glib.h>
 #include <lib3270.h>
 #include <lib3270/properties.h>
diff --git a/server/src/core/linux/gobject.c b/server/src/core/linux/gobject.c
index 4640b93..bd69102 100644
--- a/server/src/core/linux/gobject.c
+++ b/server/src/core/linux/gobject.c
@@ -32,6 +32,7 @@
  *
  */
 
+#include <internals.h>
 #include "gobject.h"
 #include <lib3270.h>
 #include <lib3270/actions.h>
diff --git a/server/src/core/linux/gobject.h b/server/src/core/linux/gobject.h
index 6c2c711..01b0a80 100644
--- a/server/src/core/linux/gobject.h
+++ b/server/src/core/linux/gobject.h
@@ -37,13 +37,9 @@
 
 	#define LINUX_GOBJECT_H_INCLUDED
 
-	#include <config.h>
+	#include <internals.h>
 
-	#define ENABLE_NLS
-	#define GETTEXT_PACKAGE PACKAGE_NAME
-
-	#include <libintl.h>
-	#include <glib/gi18n.h>
+	#include <glib.h>
 	#include <gio/gio.h>
 
 	#include <lib3270.h>
diff --git a/server/src/core/linux/start.c b/server/src/core/linux/start.c
index 93f50db..4b51633 100644
--- a/server/src/core/linux/start.c
+++ b/server/src/core/linux/start.c
@@ -226,31 +226,24 @@ void ipc3270_export_object(GObject *object, const char *name, GError **error) {
 		return;
 	}
 
-	g_autofree gchar *basename = g_strdup(name);
-	{
-		gchar *ptr = strrchr(basename,':');
-		if(ptr)
-			*ptr = 0;
-	}
-
 	g_dbus_connection_set_exit_on_close(ipc->dbus.connection,FALSE);
 
 	char id = lib3270_get_session_id(ipc->hSession);
 
 	if(id) {
 
-		if(register_object(ipc,basename,id))
+		if(register_object(ipc,name,id))
 			return;
 
 	}
 
 	for(id='a'; id < 'z' && !ipc->dbus.id && !*error; id++) {
 
-		if(register_object(ipc,basename,id))
+		if(register_object(ipc,name,id))
 			return;
 
 	}
 
-	g_message("Can't register IPC object for session \"%s\"",basename);
+	g_message("Can't register IPC object for session \"%s\"",name);
 
 }
diff --git a/server/src/core/methods/private.h b/server/src/core/methods/private.h
index a73fbaf..c7c410e 100644
--- a/server/src/core/methods/private.h
+++ b/server/src/core/methods/private.h
@@ -36,7 +36,7 @@
 
 	#define IPC_METHODS_H_INCLUDED
 
-	#include <config.h>
+	#include <internals.h>
 	#include <lib3270.h>
 	#include <ipc-glib.h>
 
diff --git a/server/src/include/internals.h b/server/src/include/internals.h
new file mode 100644
index 0000000..1c3fc78
--- /dev/null
+++ b/server/src/include/internals.h
@@ -0,0 +1,59 @@
+/*
+ * "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. 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 Internal definitions for pw3270 IPC plugin.
+  *
+  * @author Perry Werneck <perry.werneck@gmail.com>
+  *
+  */
+
+#ifndef INTERNALS_H_INCLUDED
+
+	#define INTERNALS_H_INCLUDED
+
+	#include <config.h>
+
+	#define ENABLE_NLS
+	#define GETTEXT_PACKAGE PACKAGE_NAME
+
+	#include <glib.h>
+	#include <glib/gi18n-lib.h>
+
+	#include <lib3270.h>
+	#include <lib3270/log.h>
+	#include <v3270.h>
+
+	G_BEGIN_DECLS
+
+
+	G_END_DECLS
+
+#endif // PW3270_IPC_H_INCLUDED
diff --git a/server/src/include/ipc-glib.h b/server/src/include/ipc-glib.h
index 0908276..98d2652 100644
--- a/server/src/include/ipc-glib.h
+++ b/server/src/include/ipc-glib.h
@@ -157,12 +157,6 @@
         #define g_autofree __attribute__((cleanup(ipc3270_autoptr_cleanup_generic_gfree)))
 	#endif // ! GLIB(2,44,0)
 
-	#ifdef DEBUG
-		#define debug( fmt, ... )  fprintf(stderr,"%s(%d) " fmt "\n", __FILE__, (int) __LINE__, __VA_ARGS__ ); fflush(stderr);
-	#else
-		#define debug(...) /* __VA_ARGS */
-	#endif
-
 	typedef struct _ipc_method_int_arg {
 		const gchar *name;
 		int (*call)(H3270 *hSession, int keycode);
diff --git a/server/src/plugin/plugin.c b/server/src/plugin/plugin.c
index 83b9631..411ed0b 100644
--- a/server/src/plugin/plugin.c
+++ b/server/src/plugin/plugin.c
@@ -34,41 +34,51 @@
   *
   */
 
- #define ENABLE_NLS
- #define GETTEXT_PACKAGE PACKAGE_NAME
-
- #include <libintl.h>
- #include <glib/gi18n.h>
- #include <gio/gio.h>
-
  #include "private.h"
  #include <v3270.h>
  #include <ipc-glib.h>
 
- int pw3270_plugin_stop(GtkWidget G_GNUC_UNUSED(*window), GtkWidget *terminal) {
-	debug("%s(%p)",__FUNCTION__,g_object_get_data(G_OBJECT(terminal),"ipc-object-info"));
-	g_object_set_data(G_OBJECT(terminal), "ipc-object-info", NULL);
-	return 0;
- }
+ int pw3270_plugin_page_added(GtkWidget *terminal) {
+
+ 	// Creates IPC, associate it with the terminal window.
+
+ 	g_return_val_if_fail(GTK_IS_V3270(terminal),EINVAL);
 
- int pw3270_plugin_start(GtkWidget *window, GtkWidget *terminal) {
+ 	// Build session name.
+ 	g_autofree gchar * session_name = g_strdup(v3270_get_session_name(terminal));
+ 	{
+ 		gchar *ptr = strchr(session_name,':');
+ 		if(ptr)
+			*ptr = 0;
 
-	// Creates IPC, associate it with the terminal window
+		for(ptr=session_name;*ptr;ptr++) {
+
+			if(!g_ascii_isalnum(*ptr)) {
+				*ptr = '_';
+			} else {
+				*ptr = g_ascii_tolower(*ptr);
+			}
+
+		}
+
+ 	}
+
+ 	debug("Session name for widget %p is \"%s\"",terminal,session_name);
+
+	// Create IPC object
 	GObject	* ipc = ipc3270_new();
 	g_object_set_data_full(G_OBJECT(terminal), "ipc-object-info", ipc, g_object_unref);
 
-	debug("Name: \"%s\"",v3270_get_session_name(terminal));
-
 	// Set session handle, this starts the IPC communication.
 	GError * error = NULL;
 
 	ipc3270_set_terminal_widget(ipc,terminal);
-	ipc3270_export_object(ipc,v3270_get_session_name(terminal),&error);
+	ipc3270_export_object(ipc,session_name,&error);
 
 	if(error) {
 
 		GtkWidget *dialog =  gtk_message_dialog_new(
-									GTK_WINDOW(window),
+									GTK_WINDOW(gtk_widget_get_toplevel(terminal)),
 									GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
 									GTK_MESSAGE_ERROR,
 									GTK_BUTTONS_OK,
@@ -82,7 +92,7 @@
 
         gtk_widget_show_all(dialog);
 
-		return 0;
+		return -1;
 
 	}
 
@@ -92,7 +102,27 @@
 		v3270_set_session_name(terminal, widget_name);
 	}
 
-	return 0;
+ 	return 0;
+
+ }
+
+ int pw3270_plugin_page_removed(GtkWidget *terminal) {
+
+ 	if(GTK_IS_V3270(terminal)) {
+		debug("%s(%p)",__FUNCTION__,g_object_get_data(G_OBJECT(terminal),"ipc-object-info"));
+		g_object_set_data(G_OBJECT(terminal), "ipc-object-info", NULL);
+		return 0;
+ 	}
+
+ 	return -1;
+ }
+
+ int pw3270_plugin_start(GtkWidget G_GNUC_UNUSED(*window), GtkWidget *terminal) {
+	return pw3270_plugin_page_added(terminal);
+ }
+
+ int pw3270_plugin_stop(GtkWidget G_GNUC_UNUSED(*window), GtkWidget *terminal) {
+ 	return pw3270_plugin_page_removed(terminal);
  }
 
 
diff --git a/server/src/plugin/private.h b/server/src/plugin/private.h
index 62666ff..04d33d1 100644
--- a/server/src/plugin/private.h
+++ b/server/src/plugin/private.h
@@ -37,16 +37,17 @@
 
 	#define PRIVATE_H_INCLUDED
 
-	#include <config.h>
+	#include <internals.h>
 	#include <ipc-glib.h>
 
+	G_BEGIN_DECLS
+
 	int pw3270_plugin_start(GtkWidget *window, GtkWidget *terminal);
 	int pw3270_plugin_stop(GtkWidget *window, GtkWidget *terminal);
 
-	#ifdef DEBUG
-		#define debug( fmt, ... )  fprintf(stderr,"%s(%d) " fmt "\n", __FILE__, (int) __LINE__, __VA_ARGS__ ); fflush(stderr);
-	#else
-		#define debug(...) /* __VA_ARGS */
-	#endif
+	int pw3270_plugin_page_added(GtkWidget *terminal);
+	int pw3270_plugin_page_removed(GtkWidget *terminal);
+
+	G_END_DECLS
 
 #endif // PRIVATE_H_INCLUDED
--
libgit2 0.21.2