Allowing image formats on clipboard.

Perry Werneck
1 parent e0f66cff
Showing 5 changed files with 40 additions and 3 deletions Show diff stats
src/dialogs/settings/clipboard.c
src/include/clipboard.h
src/include/terminal.h
src/selection/linux/copy.c
v3270.cbp
@@ -163,11 +163,22 @@
 		.label = N_("Smart copy"),
 		.tooltip = N_("When set the first copy operation after the selection will set the clipboard contents and the next ones will append"),
 		.left = 1,
+		.top = 4,
+		.width = 1,
+		.height = 1,
+		.grid = COPY_SETTINGS
+	},
+
+	{
+		.label = N_("Image copy"),
+		.tooltip = N_("When set allow image formats on clipboard"),
+		.left = 1,
 		.top = 3,
 		.width = 1,
 		.height = 1,
 		.grid = COPY_SETTINGS
 	}
+
  };
 /*--[ Globals ]--------------------------------------------------------------------------------------*/
@@ -472,6 +483,7 @@ static void load(GtkWidget *w, GtkWidget *t) {
 	gtk_toggle_button_set_active(widget->input.checkboxes[0],(terminal->selection.options & V3270_SELECTION_NON_BREAKABLE_SPACE) != 0);
 	gtk_toggle_button_set_active(widget->input.checkboxes[1],(terminal->selection.options & V3270_SELECTION_SCREEN_PASTE) != 0);
 	gtk_toggle_button_set_active(widget->input.checkboxes[2],(terminal->selection.options & V3270_SELECTION_SMART_COPY) != 0);
+	gtk_toggle_button_set_active(widget->input.checkboxes[3],(terminal->selection.options & V3270_SELECTION_PIXBUFF) != 0);
 	//
 	// Set font combo-box
@@ -559,6 +571,12 @@ static void apply(GtkWidget *w, GtkWidget *t) {
 			terminal->selection.options &= ~V3270_SELECTION_SMART_COPY;
 		}
+		if(gtk_toggle_button_get_active(widget->input.checkboxes[3])) {
+			terminal->selection.options |= V3270_SELECTION_PIXBUFF;
+		} else {
+			terminal->selection.options &= ~V3270_SELECTION_PIXBUFF;
+		}
+
 		// Get font settings
 		switch(get_active_id(widget,0)) {
 		case '0':
@@ -45,7 +45,8 @@
 		CLIPBOARD_TYPE_TEXT,
 		CLIPBOARD_TYPE_CSV,
 		CLIPBOARD_TYPE_HTML,
-		CLIPBOARD_TYPE_V3270_FORMATTED
+		CLIPBOARD_TYPE_V3270_FORMATTED,
+		CLIPBOARD_TYPE_PIXBUFF
 	};
 	/// @brief Column from selection.
@@ -127,6 +127,7 @@ G_BEGIN_DECLS
  	V3270_SELECTION_SCREEN_PASTE		= 0x08,	///< @brief Enable screen paste.
  	V3270_SELECTION_SMART_COPY			= 0x10,	///< @brief Enable copy/append based on current selection state.
  	V3270_SELECTION_DIALOG_STATE		= 0x20,	///< @brief Used for settings dialog.
+ 	V3270_SELECTION_PIXBUFF				= 0x40,	///< @brief Allow pixbuf formats.
  } V3270SelectionOption;
@@ -104,6 +104,20 @@ static void clipboard_get(G_GNUC_UNUSED  GtkClipboard *clipboard, GtkSelectionDa
 		}
 		break;
+	case CLIPBOARD_TYPE_PIXBUFF:
+		{
+			GdkPixbuf * pixbuff = v3270_get_selection_as_pixbuf(terminal, terminal->selection.blocks, FALSE);
+
+			debug("%s: pixbuff=%p (blocks=%p)",__FUNCTION__,pixbuff,terminal->selection.blocks);
+
+			if(pixbuff)
+			{
+				gtk_selection_data_set_pixbuf(selection,pixbuff);
+				g_object_unref(pixbuff);
+			}
+		}
+		break;
+
 	default:
 		g_warning("Unexpected clipboard type %d\n",target);
 	}
@@ -143,6 +157,11 @@ void v3270_update_system_clipboard(GtkWidget *widget)
 	}
+	if(terminal->selection.options & V3270_SELECTION_PIXBUFF)
+	{
+		gtk_target_list_add_image_targets(list,CLIPBOARD_TYPE_PIXBUFF,TRUE);
+	}
+
 	int				  n_targets;
 	GtkTargetEntry	* targets = gtk_target_table_new_from_list(list, &n_targets);
@@ -6,7 +6,6 @@
 		<Option makefile_is_custom="1" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
-		<Option virtualFolders="src/selection/" />
 		<Build>
 			<Target title="Debug">
 				<Option output=".bin/Debug/libv3270" prefix_auto="1" extension_auto="1" />
@@ -214,7 +213,6 @@
 		</Unit>
 		<Unit filename="src/selection/linux/copy.c">
 			<Option compilerVar="CC" />
-			<Option virtualFolder="src/selection/" />
 		</Unit>
 		<Unit filename="src/selection/linux/paste.c">
 			<Option compilerVar="CC" />
	@@ -127,6 +127,7 @@ G_BEGIN_DECLS		@@ -127,6 +127,7 @@ G_BEGIN_DECLS
127	V3270_SELECTION_SCREEN_PASTE = 0x08, ///< @brief Enable screen paste.	127	V3270_SELECTION_SCREEN_PASTE = 0x08, ///< @brief Enable screen paste.
128	V3270_SELECTION_SMART_COPY = 0x10, ///< @brief Enable copy/append based on current selection state.	128	V3270_SELECTION_SMART_COPY = 0x10, ///< @brief Enable copy/append based on current selection state.
129	V3270_SELECTION_DIALOG_STATE = 0x20, ///< @brief Used for settings dialog.	129	V3270_SELECTION_DIALOG_STATE = 0x20, ///< @brief Used for settings dialog.
		130	+ V3270_SELECTION_PIXBUFF = 0x40, ///< @brief Allow pixbuf formats.
130		131
131	} V3270SelectionOption;	132	} V3270SelectionOption;
132		133
	@@ -104,6 +104,20 @@ static void clipboard_get(G_GNUC_UNUSED GtkClipboard *clipboard, GtkSelectionDa		@@ -104,6 +104,20 @@ static void clipboard_get(G_GNUC_UNUSED GtkClipboard *clipboard, GtkSelectionDa
104	}	104	}
105	break;	105	break;
106		106
		107	+ case CLIPBOARD_TYPE_PIXBUFF:
		108	+ {
		109	+ GdkPixbuf * pixbuff = v3270_get_selection_as_pixbuf(terminal, terminal->selection.blocks, FALSE);
		110	+
		111	+ debug("%s: pixbuff=%p (blocks=%p)",__FUNCTION__,pixbuff,terminal->selection.blocks);
		112	+
		113	+ if(pixbuff)
		114	+ {
		115	+ gtk_selection_data_set_pixbuf(selection,pixbuff);
		116	+ g_object_unref(pixbuff);
		117	+ }
		118	+ }
		119	+ break;
		120	+
107	default:	121	default:
108	g_warning("Unexpected clipboard type %d\n",target);	122	g_warning("Unexpected clipboard type %d\n",target);
109	}	123	}
	@@ -143,6 +157,11 @@ void v3270_update_system_clipboard(GtkWidget *widget)		@@ -143,6 +157,11 @@ void v3270_update_system_clipboard(GtkWidget *widget)
143		157
144	}	158	}
145		159
		160	+ if(terminal->selection.options & V3270_SELECTION_PIXBUFF)
		161	+ {
		162	+ gtk_target_list_add_image_targets(list,CLIPBOARD_TYPE_PIXBUFF,TRUE);
		163	+ }
		164	+
146	int n_targets;	165	int n_targets;
147	GtkTargetEntry * targets = gtk_target_table_new_from_list(list, &n_targets);	166	GtkTargetEntry * targets = gtk_target_table_new_from_list(list, &n_targets);
148		167