Page MenuHome
Files F2545

drawtext.c.patch
Public
Actions

drawtext.c.patch
View Options

Index: source/blender/src/drawtext.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawtext.c,v
retrieving revision 1.54
diff -u -r1.54 drawtext.c
--- source/blender/src/drawtext.c 9 Oct 2005 18:47:07 -0000 1.54
+++ source/blender/src/drawtext.c 3 Jan 2006 19:10:55 -0000
@@ -1292,6 +1292,8 @@
CloseClipboard();
MEM_freeN(buffer);
}
+#else
+ txt_paste(text);
#endif
}
@@ -1301,25 +1303,31 @@
if (OpenClipboard(NULL)) {
HLOCAL clipbuffer;
- char* buffer;
+ char* buffer, *newlinebuffer;
- copybuffer = winNewLine(copybuffer);
+ newlinebuffer = winNewLine(copybuffer);
EmptyClipboard();
clipbuffer = LocalAlloc(LMEM_FIXED,((bufferlength+1)));
buffer = (char *) LocalLock(clipbuffer);
- strncpy(buffer, copybuffer, bufferlength);
+ strncpy(buffer, newlinebuffer, bufferlength);
buffer[bufferlength] = '\0';
LocalUnlock(clipbuffer);
SetClipboardData(CF_TEXT,clipbuffer);
CloseClipboard();
+
+ if(newlinebuffer){
+ MEM_freeN(newlinebuffer);
+ }
}
if (copybuffer) {
MEM_freeN(copybuffer);
copybuffer= NULL;
}
+#else
+ txt_copy_sel(text);
#endif
}
@@ -1530,11 +1538,7 @@
break; /* BREAK A */
case CKEY:
if (G.qual & LR_ALTKEY || G.qual & LR_CTRLKEY) {
- if(G.qual & LR_SHIFTKEY)
- txt_copy_clipboard(text);
- else
- txt_copy_sel(text);
-
+ txt_copy_clipboard(text);
do_draw= 1;
}
break; /* BREAK C */
@@ -1720,11 +1724,7 @@
}
/* Support for both Alt-V and Ctrl-V for Paste, for backward compatibility reasons */
else if (G.qual & LR_ALTKEY || G.qual & LR_CTRLKEY) {
- /* Throwing in the Shift modifier Paste from the OS clipboard */
- if (G.qual & LR_SHIFTKEY)
- txt_paste_clipboard(text);
- else
- txt_paste(text);
+ txt_paste_clipboard(text);
if (st->showsyntax) get_format_string();
do_draw= 1;
pop_space_text(st);

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
f4/48/000dbd6592195bc264371289487b

Event Timeline