diff --git a/accessible.c b/accessible.c
index 4114ef3..2a749ec 100644
--- a/accessible.c
+++ b/accessible.c
@@ -38,7 +38,7 @@
 
  #include <pw3270.h>
  #include <lib3270/log.h>
- #include <v3270.h>
+ #include <pw3270/v3270.h>
  #include "private.h"
  #include "accessible.h"
 
diff --git a/draw.c b/draw.c
index 3f57aaa..2d78191 100644
--- a/draw.c
+++ b/draw.c
@@ -32,7 +32,7 @@
  #include <pw3270.h>
  #include <lib3270.h>
  #include <lib3270/session.h>
- #include <v3270.h>
+ #include <pw3270/v3270.h>
  #include "private.h"
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
diff --git a/keyboard.c b/keyboard.c
index 76685e0..bac54cb 100644
--- a/keyboard.c
+++ b/keyboard.c
@@ -38,7 +38,7 @@
  #include <string.h>
  #include <gdk/gdk.h>
 
- #include <v3270.h>
+ #include <pw3270/v3270.h>
  #include "private.h"
 
 #if GTK_CHECK_VERSION(3,0,0)
diff --git a/mouse.c b/mouse.c
index 235c2b8..ce91a66 100644
--- a/mouse.c
+++ b/mouse.c
@@ -30,7 +30,7 @@
  #include <gtk/gtk.h>
  #include <gdk/gdk.h>
  #include <pw3270.h>
- #include <v3270.h>
+ #include <pw3270/v3270.h>
  #include "private.h"
  #include <lib3270/selection.h>
  #include <lib3270/actions.h>
diff --git a/oia.c b/oia.c
index 24c6d3a..0e2c654 100644
--- a/oia.c
+++ b/oia.c
@@ -40,7 +40,7 @@
 	#include <math.h>
  #endif // HAVE_LIBM
 
- #include <v3270.h>
+ #include <pw3270/v3270.h>
  #include "private.h"
  #include "accessible.h"
 
@@ -505,9 +505,7 @@ void v3270_draw_oia(cairo_t *cr, H3270 *host, int row, int cols, struct v3270_me
 #ifdef HAVE_PRINTER
 		{ V3270_OIA_PRINTER,			setup_single_char_right		},
 #endif // HAVE_PRINTER
-#ifdef HAVE_SCRIPT
 		{ V3270_OIA_SCRIPT,				setup_single_char_right		},
-#endif // HAVE_SCRIPT
 		{ V3270_OIA_INSERT,				setup_insert_position		},
 		{ V3270_OIA_TYPEAHEAD,			setup_single_char_right		},
 		{ V3270_OIA_SHIFT,				setup_double_char_position	},
@@ -858,10 +856,11 @@ void v3270_draw_shift_status(v3270 *terminal)
 
 }
 
-static void update_text_field(v3270 *terminal, gboolean flag, V3270_OIA_FIELD id, const gchar *text)
+static void update_text_field(v3270 *terminal, gboolean flag, V3270_OIA_FIELD id, const gchar chr)
 {
-	GdkRectangle *r;
-	cairo_t *cr;
+	GdkRectangle	* r;
+	cairo_t 		* cr;
+	gchar			  text[] = { chr, 0 };
 
 	if(!terminal->surface)
 		return;
@@ -882,7 +881,7 @@ static void update_text_field(v3270 *terminal, gboolean flag, V3270_OIA_FIELD id
 
 void v3270_draw_alt_status(v3270 *terminal)
 {
-	update_text_field(terminal,terminal->keyflags & KEY_FLAG_ALT,V3270_OIA_ALT,"A");
+	update_text_field(terminal,terminal->keyflags & KEY_FLAG_ALT,V3270_OIA_ALT,'A');
 }
 
 void v3270_draw_ins_status(v3270 *terminal)
@@ -1050,23 +1049,76 @@ void v3270_update_oia(H3270 *session, LIB3270_FLAG id, unsigned char on)
 		break;
 
 	case LIB3270_FLAG_TYPEAHEAD:
-		update_text_field(terminal,on,V3270_OIA_TYPEAHEAD,"T");
+		update_text_field(terminal,on,V3270_OIA_TYPEAHEAD,'T');
 		break;
 
 #ifdef HAVE_PRINTER
 	case LIB3270_FLAG_PRINTER:
-		update_text_field(terminal,on,V3270_OIA_PRINTER,"P");
+		update_text_field(terminal,on,V3270_OIA_PRINTER,'P');
 		break;
 #endif // HAVE_PRINTER
 
-#ifdef HAVE_SCRIPT
+/*
 	case LIB3270_FLAG_SCRIPT:
-		update_text_field(terminal,on,V3270_OIA_SCRIPT,"S");
+		update_text_field(terminal,on,V3270_OIA_SCRIPT,terminal->script_id);
 		break;
-#endif // HAVE_SCRIPT
+*/
 
 	default:
 		return;
 	}
 
 }
+
+static gboolean blink_script(v3270 *widget)
+{
+	if(!widget->script.id)
+		return FALSE;
+
+	update_text_field(widget,1,V3270_OIA_SCRIPT,widget->script.blink ? 'S' : ' ');
+	widget->script.blink = !widget->script.blink;
+
+	return TRUE;
+}
+
+static void release_script(v3270 *widget)
+{
+	widget->script.timer = NULL;
+	widget->script.id = 0;
+}
+
+LIB3270_EXPORT int v3270_set_script(GtkWidget *widget, const gchar id, unsigned char on)
+{
+	v3270 *terminal;
+	g_return_val_if_fail(GTK_IS_V3270(widget),EINVAL);
+
+	terminal = GTK_V3270(widget);
+
+	if(terminal->script.id && id != terminal->script.id)
+		return EBUSY;
+
+	terminal->script.id = on ? id : 0;
+	update_text_field(terminal,on,V3270_OIA_SCRIPT,'S');
+
+	if(on)
+	{
+		if(!terminal->script.timer)
+		{
+			terminal->script.timer = g_timeout_source_new(500);
+			g_source_set_callback(terminal->script.timer,(GSourceFunc) blink_script, terminal, (GDestroyNotify) release_script);
+
+			g_source_attach(terminal->script.timer, NULL);
+			g_source_unref(terminal->script.timer);
+		}
+	}
+	else if(terminal->script.timer)
+	{
+		if(terminal->script.timer->ref_count < 2)
+			g_source_destroy(terminal->script.timer);
+
+		if(terminal->timer)
+			g_source_unref(terminal->script.timer);
+	}
+
+	return 0;
+}
diff --git a/private.h b/private.h
index f9e1e71..e097107 100644
--- a/private.h
+++ b/private.h
@@ -180,6 +180,14 @@ G_BEGIN_DECLS
 	H3270   				* host;							/**< Related 3270 session */
 	gchar					* session_name;					/**< Session name (for window title) */
 
+	// Scripting
+	struct
+	{
+		int					  blink : 1;
+		gchar				  id;						/**< Script indicator */
+		GSource				* timer;
+	} script;
+
  };
 
 /*--[ Globals ]--------------------------------------------------------------------------------------*/
diff --git a/selection.c b/selection.c
index 60a8ca8..4213745 100644
--- a/selection.c
+++ b/selection.c
@@ -29,7 +29,7 @@
 
  #include <gtk/gtk.h>
  #include <pw3270.h>
- #include <v3270.h>
+ #include <pw3270/v3270.h>
  #include "private.h"
  #include <lib3270/selection.h>
  #include <lib3270/log.h>
diff --git a/widget.c b/widget.c
index 7997340..34ac397 100644
--- a/widget.c
+++ b/widget.c
@@ -39,7 +39,7 @@
 	#include <malloc.h>
 #endif // HAVE_MALLOC_H
 
- #include <v3270.h>
+ #include <pw3270/v3270.h>
  #include "private.h"
  #include "accessible.h"
  #include "marshal.h"
@@ -892,6 +892,13 @@ static void v3270_destroy(GtkObject *widget)
 			g_source_unref(terminal->timer);
 	}
 
+	if(terminal->script.timer)
+	{
+		g_source_destroy(terminal->script.timer);
+		while(terminal->script.timer)
+			g_source_unref(terminal->script.timer);
+	}
+
 	if(terminal->cursor.timer)
 	{
 		g_source_destroy(terminal->cursor.timer);
--
libgit2 0.21.2