Incluindo opcao "copy as table"

perry.werneck@gmail.com
1 parent 0098cc85
Showing 7 changed files with 165 additions and 27 deletions Show diff stats
src/gtk/actions.c
src/gtk/v3270/clipboard.c
src/gtk/v3270/private.h
src/gtk/v3270/v3270.h
src/include/lib3270.h
src/lib3270/screen.c
ui/00default.xml
@@ -97,8 +97,35 @@ static void reload_action(GtkAction *action, GtkWidget *widget)
 static void copy_action(GtkAction *action, GtkWidget *widget)
 {
-	trace("Action %s activated on widget %p",gtk_action_get_name(action),widget);
-	v3270_copy(widget);
+	V3270_SELECT_FORMAT	  mode = V3270_SELECT_TEXT;
+	const gchar 		* str = (const gchar *) g_object_get_data(G_OBJECT(action),"format");
+
+	if(str)
+	{
+		static const struct _format
+		{
+			V3270_SELECT_FORMAT	  mode;
+			const gchar			* name;
+		} format[] =
+		{
+			{ V3270_SELECT_TEXT,	"text"		},
+			{ V3270_SELECT_TABLE,	"table"		},
+		};
+
+		int f;
+
+		for(f=0;f<G_N_ELEMENTS(format);f++)
+		{
+			if(!g_strcasecmp(format[f].name,str))
+			{
+				mode = format[f].mode;
+				break;
+			}
+		}
+	}
+
+	trace("Action %s activated on widget %p mode=%d",gtk_action_get_name(action),widget,(int) mode);
+	v3270_copy(widget,mode);
 }
 static void append_action(GtkAction *action, GtkWidget *widget)
@@ -455,23 +482,13 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
 	}
 	else if(!g_strcasecmp(name,"copy"))
 	{
-		static const gchar * src[] = 	{	"begin",
-											"table",
-											"image",
-											"append",
-											NULL
-											};
-
 		static const GCallback cbk[] =	{	G_CALLBACK(copy_action),
-											G_CALLBACK(nop_action),
-											G_CALLBACK(nop_action),
 											G_CALLBACK(append_action)
 											};
 		callback	= cbk;
 		action_type	= ACTION_TYPE_TABLE;
-		id = get_attribute_id(name,"mode",&nm,src,names,values,error);
-		if(id < 0)
-			return NULL;
+		id 			= ui_get_bool_attribute("append",names,values,FALSE) ? 1 : 0;
+		nm 			= g_strconcat(id == 0 ? "copy" : "append",ui_get_attribute("format",names,values),NULL);
 	}
 	else if(!g_strcasecmp(name,"select"))
 	{
@@ -96,6 +96,18 @@ gchar * v3270_get_text(GtkWidget *widget, int offset, int len)
 	return text;
 }
+static gchar * v3270_get_selected(v3270 *widget)
+{
+	gchar *text = lib3270_get_selected(widget->host);
+	if(text)
+	{
+		gchar *str = g_strdup(text);
+		free(text);
+		return str;
+	}
+	return NULL;
+}
+
 const gchar * v3270_get_selected_text(GtkWidget *widget)
 {
 	v3270 *terminal;
@@ -111,7 +123,7 @@ const gchar * v3270_get_selected_text(GtkWidget *widget)
 		terminal->clipboard = NULL;
 	}
-	text = lib3270_get_selected(terminal->host);
+	text = v3270_get_selected(terminal);
 	if(!text)
 	{
@@ -120,9 +132,85 @@ const gchar * v3270_get_selected_text(GtkWidget *widget)
 		return NULL;
 	}
+	if(terminal->table)
+	{
+		// Convert text to table
+		gchar 		**ln = g_strsplit(text,"\n",-1);
+		int			  width = lib3270_get_width(terminal->host);
+		gboolean	  cols[width];
+		int 		  l;
+		GString		* buffer;
+
+		memset(cols,0,sizeof(gboolean)*width);
+
+		// Find column delimiters
+		for(l=0;ln[l];l++)
+		{
+			int		  c;
+			gchar 	* ptr = ln[l];
+			GString	* buffer;
+
+			for(c=0;c<width && *ptr;c++)
+			{
+				if(!g_ascii_isspace(*ptr))
+					cols[c] = TRUE;
+
+				ptr++;
+			}
+
+		}
+
+		// Read screen contents
+		buffer = g_string_sized_new(strlen(text));
+		for(l=0;ln[l];l++)
+		{
+			int 	  col	= 0;
+			gchar	* src	= ln[l];
+
+			while(col < width && *src)
+			{
+				if(col)
+					g_string_append_c(buffer,'\t');
+
+				// Find column start
+				while(!cols[col] && col < width && *src)
+				{
+					col++;
+					src++;
+				}
+
+				if(col < width && *src)
+				{
+					gchar	  tmp[width+1];
+					gchar	* dst = tmp;
+
+					// Copy column content
+					while(cols[col] && col < width && *src)
+					{
+						*dst = *src;
+						col++;
+						dst++;
+						src++;
+					}
+					*dst = 0;
+					g_string_append(buffer,g_strstrip(tmp));
+				}
+
+			}
+			g_string_append_c(buffer,'\n');
+
+		}
+
+		g_strfreev(ln);
+		g_free(text);
+
+		text = g_string_free(buffer,FALSE);
+	}
+
 	terminal->clipboard = g_convert(text, -1, "UTF-8", lib3270_get_charset(terminal->host), NULL, NULL, NULL);
-	free(text);
+	g_free(text);
+
 	return terminal->clipboard;
 }
@@ -175,11 +263,17 @@ const gchar * v3270_copy_append(GtkWidget *widget)
 	return terminal->clipboard;
 }
-const gchar * v3270_copy(GtkWidget *widget)
+const gchar * v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode)
 {
-	const gchar		* text		= v3270_get_selected_text(widget);
+	const gchar		* text;
 	GtkClipboard	* clipboard	= gtk_widget_get_clipboard(widget,GDK_SELECTION_CLIPBOARD);
+	g_return_val_if_fail(GTK_IS_V3270(widget),NULL);
+
+	GTK_V3270(widget)->table = (mode == V3270_SELECT_TABLE ? 1 : 0);
+
+	text = v3270_get_selected_text(widget);
+
 	if(text)
 	{
 		if(gtk_clipboard_set_with_owner(	clipboard,
@@ -121,10 +121,11 @@ G_BEGIN_DECLS
  {
 	GtkWidget parent;
-	// private
+	// flags
 	int selecting	: 1;	/**< Selecting region */
 	int moving		: 1;	/**< Moving selected region */
 	int resizing	: 1;	/**< Resizing selected region */
+	int table		: 1;	/**< Copy mode is table */
 #if GTK_CHECK_VERSION(3,0,0)
@@ -142,11 +142,20 @@
  void			  v3270_disconnect(GtkWidget *widget);
  // Clipboard
+ typedef enum _v3270_select_format
+ {
+	V3270_SELECT_TEXT,
+	V3270_SELECT_TABLE,
+
+	V3270_SELECT_MAX
+ } V3270_SELECT_FORMAT;
+
+ const gchar	* v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode);
+ const gchar	* v3270_copy_append(GtkWidget *widget);
+
  const gchar	* v3270_get_selected_text(GtkWidget *widget);
  const gchar	* v3270_get_copy(GtkWidget *widget);
  gchar			* v3270_get_text(GtkWidget *widget,int offset, int len);
- const gchar	* v3270_copy(GtkWidget *widget);
- const gchar	* v3270_copy_append(GtkWidget *widget);
  void 			  v3270_paste(GtkWidget *widget);
  void 			  v3270_paste_string(GtkWidget *widget, const gchar *text, const gchar *encoding);
@@ -267,6 +267,17 @@
 	 */
 	LIB3270_EXPORT void lib3270_get_screen_size(H3270 *h, int *r, int *c);
+
+	/**
+	 * Get current screen width in columns.
+	 *
+	 * @param h	Handle of the desired session.
+	 *
+	 * @return screen width.
+	 *
+	 */
+	LIB3270_EXPORT int lib3270_get_width(H3270 *h);
+
 	LIB3270_EXPORT unsigned int lib3270_get_length(H3270 *h);
 	/**
@@ -244,6 +244,12 @@ LIB3270_EXPORT void lib3270_get_screen_size(H3270 *h, int *r, int *c)
 	*c = h->cols;
 }
+LIB3270_EXPORT int lib3270_get_width(H3270 *h)
+{
+	CHECK_SESSION_HANDLE(h);
+	return h->cols;
+}
+
 void update_model_info(H3270 *session, int model, int cols, int rows)
 {
 	if(model == session->model_num && session->maxROWS == rows && session->maxCOLS == cols)
@@ -57,10 +57,10 @@
 		</menu>
 		<menu name='EditMenu' label='_Edit' >
-			<menuitem action='copy' mode='begin' key='<ctrl>c' icon='copy' group='selection' label='Copy' />
-			<!-- menuitem action='copy' mode='table' key='<ctrl><alt>c' group='selection' label='Copy as table' /-->
+			<menuitem action='copy' append='no' format='text' key='<ctrl>c' icon='copy' group='selection' label='Copy' />
+			<menuitem action='copy' append='no' format='table' key='<ctrl><alt>c' group='selection' label='Copy as table' />
 			<!-- menuitem action='copy' mode='image' group='selection' label='Copy as image' /-->
-			<menuitem action='copy' mode='append' key='<shift><ctrl>c' group='selection' label='Add to copy' />
+			<menuitem action='copy' append='yes' key='<shift><ctrl>c' group='selection' label='Add to copy' />
 			<menuitem action='paste' src='clipboard' key='<ctrl>v' icon='paste' group='paste' label='Paste' />
 			<menuitem action='paste' src='next' key='<shift><ctrl>v' label='Paste next' />
@@ -144,7 +144,7 @@
 	<toolbar name='toolbar.default' label='Toolbar' key='<alt>t' >
 		<toolitem action='selectall' />
-		<toolitem action='copy' mode='begin'  />
+		<toolitem action='copy' append='no' format='text' />
 		<toolitem action='paste' src='clipboard' />
 		<toolitem action='EraseInput' />
@@ -161,8 +161,8 @@
 	</toolbar>
 	<popup name='selectionpopup' type='selection'>
-		<menuitem action='copy' mode='begin' />
-		<menuitem action='copy' mode='append' />
+		<menuitem action='copy' append='no' format='text' />
+		<menuitem action='copy' append='yes' />
 		<menuitem action='select' target='none'/>
 		<menuitem action='select' target='all'/>
	@@ -96,6 +96,18 @@ gchar * v3270_get_text(GtkWidget *widget, int offset, int len)		@@ -96,6 +96,18 @@ gchar * v3270_get_text(GtkWidget *widget, int offset, int len)
96	return text;	96	return text;
97	}	97	}
98		98
		99	+static gchar * v3270_get_selected(v3270 *widget)
		100	+{
		101	+ gchar *text = lib3270_get_selected(widget->host);
		102	+ if(text)
		103	+ {
		104	+ gchar *str = g_strdup(text);
		105	+ free(text);
		106	+ return str;
		107	+ }
		108	+ return NULL;
		109	+}
		110	+
99	const gchar * v3270_get_selected_text(GtkWidget *widget)	111	const gchar * v3270_get_selected_text(GtkWidget *widget)
100	{	112	{
101	v3270 *terminal;	113	v3270 *terminal;
	@@ -111,7 +123,7 @@ const gchar * v3270_get_selected_text(GtkWidget *widget)		@@ -111,7 +123,7 @@ const gchar * v3270_get_selected_text(GtkWidget *widget)
111	terminal->clipboard = NULL;	123	terminal->clipboard = NULL;
112	}	124	}
113		125
114	- text = lib3270_get_selected(terminal->host);	126	+ text = v3270_get_selected(terminal);
115		127
116	if(!text)	128	if(!text)
117	{	129	{
	@@ -120,9 +132,85 @@ const gchar * v3270_get_selected_text(GtkWidget *widget)		@@ -120,9 +132,85 @@ const gchar * v3270_get_selected_text(GtkWidget *widget)
120	return NULL;	132	return NULL;
121	}	133	}
122		134
		135	+ if(terminal->table)
		136	+ {
		137	+ // Convert text to table
		138	+ gchar **ln = g_strsplit(text,"\n",-1);
		139	+ int width = lib3270_get_width(terminal->host);
		140	+ gboolean cols[width];
		141	+ int l;
		142	+ GString * buffer;
		143	+
		144	+ memset(cols,0,sizeof(gboolean)*width);
		145	+
		146	+ // Find column delimiters
		147	+ for(l=0;ln[l];l++)
		148	+ {
		149	+ int c;
		150	+ gchar * ptr = ln[l];
		151	+ GString * buffer;
		152	+
		153	+ for(c=0;c<width && *ptr;c++)
		154	+ {
		155	+ if(!g_ascii_isspace(*ptr))
		156	+ cols[c] = TRUE;
		157	+
		158	+ ptr++;
		159	+ }
		160	+
		161	+ }
		162	+
		163	+ // Read screen contents
		164	+ buffer = g_string_sized_new(strlen(text));
		165	+ for(l=0;ln[l];l++)
		166	+ {
		167	+ int col = 0;
		168	+ gchar * src = ln[l];
		169	+
		170	+ while(col < width && *src)
		171	+ {
		172	+ if(col)
		173	+ g_string_append_c(buffer,'\t');
		174	+
		175	+ // Find column start
		176	+ while(!cols[col] && col < width && *src)
		177	+ {
		178	+ col++;
		179	+ src++;
		180	+ }
		181	+
		182	+ if(col < width && *src)
		183	+ {
		184	+ gchar tmp[width+1];
		185	+ gchar * dst = tmp;
		186	+
		187	+ // Copy column content
		188	+ while(cols[col] && col < width && *src)
		189	+ {
		190	+ dst = src;
		191	+ col++;
		192	+ dst++;
		193	+ src++;
		194	+ }
		195	+ *dst = 0;
		196	+ g_string_append(buffer,g_strstrip(tmp));
		197	+ }
		198	+
		199	+ }
		200	+ g_string_append_c(buffer,'\n');
		201	+
		202	+ }
		203	+
		204	+ g_strfreev(ln);
		205	+ g_free(text);
		206	+
		207	+ text = g_string_free(buffer,FALSE);
		208	+ }
		209	+
123	terminal->clipboard = g_convert(text, -1, "UTF-8", lib3270_get_charset(terminal->host), NULL, NULL, NULL);	210	terminal->clipboard = g_convert(text, -1, "UTF-8", lib3270_get_charset(terminal->host), NULL, NULL, NULL);
124		211
125	- free(text);	212	+ g_free(text);
		213	+
126		214
127	return terminal->clipboard;	215	return terminal->clipboard;
128	}	216	}
	@@ -175,11 +263,17 @@ const gchar * v3270_copy_append(GtkWidget *widget)		@@ -175,11 +263,17 @@ const gchar * v3270_copy_append(GtkWidget *widget)
175	return terminal->clipboard;	263	return terminal->clipboard;
176	}	264	}
177		265
178	-const gchar * v3270_copy(GtkWidget *widget)	266	+const gchar * v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode)
179	{	267	{
180	- const gchar * text = v3270_get_selected_text(widget);	268	+ const gchar * text;
181	GtkClipboard * clipboard = gtk_widget_get_clipboard(widget,GDK_SELECTION_CLIPBOARD);	269	GtkClipboard * clipboard = gtk_widget_get_clipboard(widget,GDK_SELECTION_CLIPBOARD);
182		270
		271	+ g_return_val_if_fail(GTK_IS_V3270(widget),NULL);
		272	+
		273	+ GTK_V3270(widget)->table = (mode == V3270_SELECT_TABLE ? 1 : 0);
		274	+
		275	+ text = v3270_get_selected_text(widget);
		276	+
183	if(text)	277	if(text)
184	{	278	{
185	if(gtk_clipboard_set_with_owner( clipboard,	279	if(gtk_clipboard_set_with_owner( clipboard,
	@@ -142,11 +142,20 @@		@@ -142,11 +142,20 @@
142	void v3270_disconnect(GtkWidget *widget);	142	void v3270_disconnect(GtkWidget *widget);
143		143
144	// Clipboard	144	// Clipboard
		145	+ typedef enum _v3270_select_format
		146	+ {
		147	+ V3270_SELECT_TEXT,
		148	+ V3270_SELECT_TABLE,
		149	+
		150	+ V3270_SELECT_MAX
		151	+ } V3270_SELECT_FORMAT;
		152	+
		153	+ const gchar * v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode);
		154	+ const gchar * v3270_copy_append(GtkWidget *widget);
		155	+
145	const gchar * v3270_get_selected_text(GtkWidget *widget);	156	const gchar * v3270_get_selected_text(GtkWidget *widget);
146	const gchar * v3270_get_copy(GtkWidget *widget);	157	const gchar * v3270_get_copy(GtkWidget *widget);
147	gchar * v3270_get_text(GtkWidget *widget,int offset, int len);	158	gchar * v3270_get_text(GtkWidget *widget,int offset, int len);
148	- const gchar * v3270_copy(GtkWidget *widget);
149	- const gchar * v3270_copy_append(GtkWidget *widget);
150		159
151	void v3270_paste(GtkWidget *widget);	160	void v3270_paste(GtkWidget *widget);
152	void v3270_paste_string(GtkWidget widget, const gchar text, const gchar *encoding);	161	void v3270_paste_string(GtkWidget widget, const gchar text, const gchar *encoding);
	@@ -267,6 +267,17 @@		@@ -267,6 +267,17 @@
267	*/	267	*/
268	LIB3270_EXPORT void lib3270_get_screen_size(H3270 h, int r, int *c);	268	LIB3270_EXPORT void lib3270_get_screen_size(H3270 h, int r, int *c);
269		269
		270	+
		271	+ /**
		272	+ * Get current screen width in columns.
		273	+ *
		274	+ * @param h Handle of the desired session.
		275	+ *
		276	+ * @return screen width.
		277	+ *
		278	+ */
		279	+ LIB3270_EXPORT int lib3270_get_width(H3270 *h);
		280	+
270	LIB3270_EXPORT unsigned int lib3270_get_length(H3270 *h);	281	LIB3270_EXPORT unsigned int lib3270_get_length(H3270 *h);
271		282
272	/**	283	/**
	@@ -244,6 +244,12 @@ LIB3270_EXPORT void lib3270_get_screen_size(H3270 h, int r, int *c)		@@ -244,6 +244,12 @@ LIB3270_EXPORT void lib3270_get_screen_size(H3270 h, int r, int *c)
244	*c = h->cols;	244	*c = h->cols;
245	}	245	}
246		246
		247	+LIB3270_EXPORT int lib3270_get_width(H3270 *h)
		248	+{
		249	+ CHECK_SESSION_HANDLE(h);
		250	+ return h->cols;
		251	+}
		252	+
247	void update_model_info(H3270 *session, int model, int cols, int rows)	253	void update_model_info(H3270 *session, int model, int cols, int rows)
248	{	254	{
249	if(model == session->model_num && session->maxROWS == rows && session->maxCOLS == cols)	255	if(model == session->model_num && session->maxROWS == rows && session->maxCOLS == cols)