[Bf-blender-cvs] [47ccb64] tmp_text_copy_paste: FONT_OT_text_copy_to_clipboard

Dalai Felinto noreply at git.blender.org
Thu Feb 11 15:44:15 CET 2016


Commit: 47ccb64ae2914bdd0b974a4fff4c1b9351972f49
Author: Dalai Felinto
Date:   Thu Feb 11 12:25:58 2016 -0200
Branches: tmp_text_copy_paste
https://developer.blender.org/rB47ccb64ae2914bdd0b974a4fff4c1b9351972f49

FONT_OT_text_copy_to_clipboard

===================================================================

M	source/blender/editors/curve/curve_intern.h
M	source/blender/editors/curve/curve_ops.c
M	source/blender/editors/curve/editfont.c

===================================================================

diff --git a/source/blender/editors/curve/curve_intern.h b/source/blender/editors/curve/curve_intern.h
index ce7487f..a522837 100644
--- a/source/blender/editors/curve/curve_intern.h
+++ b/source/blender/editors/curve/curve_intern.h
@@ -76,6 +76,7 @@ void FONT_OT_style_set(struct wmOperatorType *ot);
 void FONT_OT_select_all(struct wmOperatorType *ot);
 
 void FONT_OT_text_copy(struct wmOperatorType *ot);
+void FONT_OT_text_copy_to_clipboard(struct wmOperatorType *ot);
 void FONT_OT_text_cut(struct wmOperatorType *ot);
 void FONT_OT_text_paste(struct wmOperatorType *ot);
 void FONT_OT_text_paste_from_file(struct wmOperatorType *ot);
diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c
index d508be4..f9edfb6 100644
--- a/source/blender/editors/curve/curve_ops.c
+++ b/source/blender/editors/curve/curve_ops.c
@@ -63,6 +63,7 @@ void ED_operatortypes_curve(void)
 	WM_operatortype_append(FONT_OT_select_all);
 
 	WM_operatortype_append(FONT_OT_text_copy);
+	WM_operatortype_append(FONT_OT_text_copy_to_clipboard);
 	WM_operatortype_append(FONT_OT_text_cut);
 	WM_operatortype_append(FONT_OT_text_paste);
 	WM_operatortype_append(FONT_OT_text_paste_from_file);
@@ -211,11 +212,13 @@ void ED_keymap_curve(wmKeyConfig *keyconf)
 	WM_keymap_add_item(keymap, "FONT_OT_select_all", AKEY, KM_PRESS, KM_CTRL, 0);
 
 	WM_keymap_add_item(keymap, "FONT_OT_text_copy", CKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "FONT_OT_text_copy_to_clipboard", CKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "FONT_OT_text_cut", XKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "FONT_OT_text_paste", VKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "FONT_OT_text_paste_from_clipboard", VKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0);
 #ifdef __APPLE__
 	WM_keymap_add_item(keymap, "FONT_OT_text_copy", CKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "FONT_OT_text_copy_to_clipboard", CKEY, KM_PRESS, KM_SHIFT | KM_OSKEY, 0);
 	WM_keymap_add_item(keymap, "FONT_OT_text_cut", XKEY, KM_PRESS, KM_OSKEY, 0);
 	WM_keymap_add_item(keymap, "FONT_OT_text_paste", VKEY, KM_PRESS, KM_OSKEY, 0);
 	WM_keymap_add_item(keymap, "FONT_OT_text_paste_from_clipboard", VKEY, KM_PRESS, KM_SHIFT | KM_OSKEY, 0);
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index 807334d..49e4c45 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -789,6 +789,49 @@ void FONT_OT_text_copy(wmOperatorType *ot)
 	ot->poll = ED_operator_editfont;
 }
 
+/* Copy To Clipboard */
+
+static void copy_selection_to_clipboard(Object *obedit)
+{
+	int selstart, selend;
+	size_t len;
+	char *buf = NULL;
+
+	if (BKE_vfont_select_get(obedit, &selstart, &selend)) {
+		Curve *cu = obedit->data;
+		EditFont *ef = cu->editfont;
+
+		len = selend - selstart + 1;
+		buf = MEM_mallocN(len * sizeof(char), __func__);
+		BLI_strncpy_wchar_as_utf8(buf, ef->textbuf + selstart, len - 1);
+		WM_clipboard_text_set(buf, false);
+	}
+
+	if (buf)
+		MEM_freeN(buf);
+}
+
+static int copy_to_clipboard_exec(bContext *C, wmOperator *UNUSED(op))
+{
+	Object *obedit = CTX_data_edit_object(C);
+
+	copy_selection_to_clipboard(obedit);
+
+	return OPERATOR_FINISHED;
+}
+
+void FONT_OT_text_copy_to_clipboard(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name = "Copy Text";
+	ot->description = "Copy selected text to system clipboard";
+	ot->idname = "FONT_OT_text_copy_to_clipboard";
+
+	/* api callbacks */
+	ot->exec = copy_to_clipboard_exec;
+	ot->poll = ED_operator_editfont;
+}
+
 /******************* cut text operator ********************/
 
 static int cut_text_exec(bContext *C, wmOperator *UNUSED(op))




More information about the Bf-blender-cvs mailing list