[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14089] trunk/blender/source/blender: Patch #8488: UserPref to switch between pan/paste on MMB in text editor.

[Ricki Myers]

Revision: 14089
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14089
Author:   themyers
Date:     2008-03-13 16:12:19 +0100 (Thu, 13 Mar 2008)

Log Message:
-----------
Patch #8488: UserPref to switch between pan/paste on MMB in text editor.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_userdef_types.h
    trunk/blender/source/blender/src/drawtext.c
    trunk/blender/source/blender/src/space.c

Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2008-03-13 14:38:29 UTC (rev 14088)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2008-03-13 15:12:19 UTC (rev 14089)
@@ -266,6 +266,7 @@
 // old flag for #define USER_KEYINSERTNEED		(1 << 19)
 #define USER_ZOOM_TO_MOUSEPOS	(1 << 20)
 #define USER_SHOW_FPS			(1 << 21)
+#define USER_MMB_PASTE			(1 << 22)
 
 /* Auto-Keying mode */
 	/* AUTOKEY_ON is a bitflag */

Modified: trunk/blender/source/blender/src/drawtext.c
===================================================================
--- trunk/blender/source/blender/src/drawtext.c	2008-03-13 14:38:29 UTC (rev 14088)
+++ trunk/blender/source/blender/src/drawtext.c	2008-03-13 15:12:19 UTC (rev 14089)
@@ -1546,13 +1546,16 @@
 		}
 	} else if (event==MIDDLEMOUSE) {
 		if (val) {
-			#if defined(_WIN32) || defined(__APPLE__)
-				do_textscroll(st, 1);
-			#else
+			if (U.uiflag & USER_MMB_PASTE)
+			{
 				do_selection(st, G.qual&LR_SHIFTKEY);
 				get_selection_buffer(text);
 				do_draw= 1;
-			#endif
+			}
+			else
+			{
+				do_textscroll(st, 1);
+			}
 		}
 	} else if (event==RIGHTMOUSE) {
 		if (val) {

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c	2008-03-13 14:38:29 UTC (rev 14088)
+++ trunk/blender/source/blender/src/space.c	2008-03-13 15:12:19 UTC (rev 14089)
@@ -3694,6 +3694,11 @@
 			(xpos+edgsp+(3*mpref)+(4*midsp)),y3,mpref,buth,
 			&(U.flag), 0, 0, 0, 0,
 			"Emulates Middle Mouse with Alt+LeftMouse (doesnt work with Left Mouse Select option)");
+		uiDefButBitI(block, TOG, USER_MMB_PASTE, B_DRAWINFO, "Paste on MMB",
+			(xpos+edgsp+(3*mpref)+(4*midsp)),y2,mpref,buth,
+			&(U.uiflag), 0, 0, 0, 0,
+			"In text window, paste with MMB instead of panning");
+		uiBlockEndAlign(block);
 		
 		uiBlockBeginAlign(block);
 		uiDefButBitI(block, TOG, USER_SHOW_ROTVIEWICON, B_DRAWINFO, "Mini Axis",