[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51866] trunk/blender: Possible bugfix 32474
Ton Roosendaal
ton at blender.org
Sun Nov 4 14:34:15 CET 2012
Revision: 51866
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51866
Author: ton
Date: 2012-11-04 13:34:13 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
Possible bugfix 32474
Windows systems: text editor, text object, doesn't allow to input the standard
set of ALT+key characters (the ones coming from the OS).
- Reverted fix january 2012 - that meant to use text object ALT+keys
- Removed old (90ies) feature for hardcoded special characters in Text object.
(OS delivers this now)
Will wait for confirmation by windows compiler :)
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
trunk/blender/source/blender/editors/curve/editfont.c
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2012-11-04 12:46:48 UTC (rev 51865)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2012-11-04 13:34:13 UTC (rev 51866)
@@ -742,8 +742,6 @@
ascii = utf8_char[0] & 0x80 ? '?' : utf8_char[0];
}
- if (0x80 & state[VK_MENU]) utf8_char[0] = '\0';
-
event = new GHOST_EventKey(system->getMilliSeconds(), keyDown ? GHOST_kEventKeyDown : GHOST_kEventKeyUp, window, key, ascii, utf8_char);
#ifdef GHOST_DEBUG
Modified: trunk/blender/source/blender/editors/curve/editfont.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editfont.c 2012-11-04 12:46:48 UTC (rev 51865)
+++ trunk/blender/source/blender/editors/curve/editfont.c 2012-11-04 13:34:13 UTC (rev 51866)
@@ -1289,32 +1289,6 @@
insert_into_textbuf(obedit, ascii);
accentcode = 0;
}
- else if (cu->len < MAXTEXT - 1) {
- if (alt) {
- /* might become obsolete, apple has default values for this, other OS's too? */
- if (ascii == 't') ascii = 137;
- else if (ascii == 'c') ascii = 169;
- else if (ascii == 'f') ascii = 164;
- else if (ascii == 'g') ascii = 176;
- else if (ascii == 'l') ascii = 163;
- else if (ascii == 'r') ascii = 174;
- else if (ascii == 's') ascii = 223;
- else if (ascii == 'y') ascii = 165;
- else if (ascii == '.') ascii = 138;
- else if (ascii == '1') ascii = 185;
- else if (ascii == '2') ascii = 178;
- else if (ascii == '3') ascii = 179;
- else if (ascii == '%') ascii = 139;
- else if (ascii == '?') ascii = 191;
- else if (ascii == '!') ascii = 161;
- else if (ascii == 'x') ascii = 215;
- else if (ascii == '>') ascii = 187;
- else if (ascii == '<') ascii = 171;
- }
-
- inserted_text[0] = ascii;
- insert_into_textbuf(obedit, ascii);
- }
kill_selection(obedit, 1);
text_update_edited(C, scene, obedit, 1, FO_EDIT);
More information about the Bf-blender-cvs
mailing list