[Bf-committers] partial patch for bug #1546 and related

bjornmose bjornmose at gmx.net
Fri Nov 5 22:52:28 CET 2004


hi ton, and all
this patch fixes ghost's unawareness of the *<>* (wParam = 0xE2)key on 
german keyboards running on MS-windows with german keyboard mapping.
2nd row bottum up --> [shift][<>|][y][x][c][v]....
Ghost should be fine so far.
I did a quick hack in /src/ghostwinlay.c remapping it to COMMAKEY, which 
may have some *undesired* results, since i did not track key mapping 
within blender :) ole --> lazy bum !

jens ole wund

-------------- next part --------------
? config.opts
? obj
? bin/debug
? bin/.blender/.Blog
? intern/make/msvc_6_0/Debug
? intern/make/msvc_6_0/Release
? intern/make/msvc_6_0/build_install_all.plg
? intern/make/msvc_6_0/intern.ncb
? intern/make/msvc_6_0/intern.opt
? projectfiles/obj
? projectfiles/blender/blender.ncb
? projectfiles/blender/blender.opt
? projectfiles/blender/blender.plg
? projectfiles/blender/yafray/Debug
? projectfiles/gameengine/physics/PHY_Physics/PHY_Sumo/Debug
? projectfiles/gameengine/physics/PHY_Physics/PHY_Sumo/Release
? source/blender/makesdna/intern/DNA_makesdna.ilk
? source/blender/makesdna/intern/dna.c
? source/creator/winbuildinfo.h
? source/icons/winblender.res
? tools/__init__.pyc
? tools/scons/__init__.pyc
? tools/scons/bs/__init__.pyc
? tools/scons/bs/bs_arc.pyc
? tools/scons/bs/bs_bincopy.pyc
? tools/scons/bs/bs_clean.pyc
? tools/scons/bs/bs_config.pyc
? tools/scons/bs/bs_default.pyc
? tools/scons/bs/bs_dirs.pyc
? tools/scons/bs/bs_globals.pyc
? tools/scons/bs/bs_libs.pyc
? tools/scons/bs/bs_nsis.pyc
Index: intern/ghost/GHOST_Types.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/ghost/GHOST_Types.h,v
retrieving revision 1.9
diff -u -r1.9 GHOST_Types.h
--- intern/ghost/GHOST_Types.h	12 Oct 2003 23:43:25 -0000	1.9
+++ intern/ghost/GHOST_Types.h	5 Nov 2004 20:40:01 -0000
@@ -232,6 +232,7 @@
 	GHOST_kKeyLeftAlt,
 	GHOST_kKeyRightAlt,
     GHOST_kKeyCommand,				// APPLE only!
+    GHOST_kKeyGrLess ,		// German PC only!
 
 	GHOST_kKeyCapsLock,
 	GHOST_kKeyNumLock,
Index: intern/ghost/intern/GHOST_EventPrinter.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/ghost/intern/GHOST_EventPrinter.cpp,v
retrieving revision 1.4
diff -u -r1.4 GHOST_EventPrinter.cpp
--- intern/ghost/intern/GHOST_EventPrinter.cpp	23 Jan 2003 21:39:29 -0000	1.4
+++ intern/ghost/intern/GHOST_EventPrinter.cpp	5 Nov 2004 20:24:07 -0000
@@ -193,6 +193,10 @@
             // APPLE only!
 			str = "Command";
 			break;
+		case GHOST_kKeyGrLess:
+            // PC german!
+			str = "GrLess";
+			break;
 		case GHOST_kKeyCapsLock:
 			str = "CapsLock";
 			break;
Index: intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/ghost/intern/GHOST_SystemWin32.cpp,v
retrieving revision 1.9
diff -u -r1.9 GHOST_SystemWin32.cpp
--- intern/ghost/intern/GHOST_SystemWin32.cpp	12 Dec 2003 20:21:35 -0000	1.9
+++ intern/ghost/intern/GHOST_SystemWin32.cpp	5 Nov 2004 20:02:55 -0000
@@ -103,6 +103,9 @@
 #ifndef VK_CLOSE_BRACKET
 #define VK_CLOSE_BRACKET 0xDD
 #endif // VK_CLOSE_BRACKET
+#ifndef VK_GR_LESS
+#define VK_GR_LESS 0xE2
+#endif // VK_GR_LESS
 
 
 GHOST_SystemWin32::GHOST_SystemWin32()
@@ -407,6 +410,7 @@
 		case VK_BACK_SLASH:		key = GHOST_kKeyBackslash;		break;
 		case VK_CLOSE_BRACKET:	key = GHOST_kKeyRightBracket;	break;
 		case VK_QUOTE:			key = GHOST_kKeyQuote;			break;
+		case VK_GR_LESS:		key = GHOST_kKeyGrLess;			break;
 
 		// Process these keys separately because we need to distinguish right from left modifier keys
 		case VK_SHIFT:
Index: source/blender/include/mydevice.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/include/mydevice.h,v
retrieving revision 1.15
diff -u -r1.15 mydevice.h
--- source/blender/include/mydevice.h	11 Oct 2004 11:54:14 -0000	1.15
+++ source/blender/include/mydevice.h	5 Nov 2004 20:51:54 -0000
@@ -187,6 +187,7 @@
 
 #define UNKNOWNKEY	171
 #define COMMANDKEY	172
+#define GRLESSKEY	173
 
 /* used as fake leftmouse event, special handled in interface.c */
 #define BUT_ACTIVATE	200
Index: source/blender/src/ghostwinlay.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/ghostwinlay.c,v
retrieving revision 1.30
diff -u -r1.30 ghostwinlay.c
--- source/blender/src/ghostwinlay.c	18 Sep 2004 13:25:29 -0000	1.30
+++ source/blender/src/ghostwinlay.c	5 Nov 2004 21:13:36 -0000
@@ -267,6 +267,8 @@
 		case GHOST_kKeyNumpadMinus:		return PADMINUS;
 		case GHOST_kKeyNumpadAsterisk:	return PADASTERKEY;
 		case GHOST_kKeyNumpadSlash:		return PADSLASHKEY;
+
+		case GHOST_kKeyGrLess:		    return COMMAKEY; /* very bad hack here .. switches transform center too! */
 		
 		case GHOST_kKeyUnknown:			return UNKNOWNKEY;
 


More information about the Bf-committers mailing list