X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbsequence.C;h=304b7edf28080550495a084e8717f14c4c983af8;hb=4e4ebe5d4d675348bbd7f75b9ca6424b6727a253;hp=29b7d453b0ffdb1d62206291f25ea0a94fe91b08;hpb=d8afc7c4bb332296b779e5ccbe1ae0ebc011bf72;p=lyx.git

diff --git a/src/kbsequence.C b/src/kbsequence.C
index 29b7d453b0..304b7edf28 100644
--- a/src/kbsequence.C
+++ b/src/kbsequence.C
@@ -4,12 +4,12 @@
  *           LyX, The Document Processor
  * 	 
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
-#include <cstring>
+//#include <cstring>
 #include <X11/Xlib.h>
 
 #include "gettext.h"
@@ -103,7 +103,7 @@ int kb_sequence::parse(string const & s)
 		if (s[i] && (s[i]) <= ' ') ++i;
 		if (i >= s.length()) break;
 		
-		if (s[i + 1] == '-')	{ // is implicit that s[i] == true
+		if (i + 1 < s.length() && s[i + 1] == '-')	{
 			switch (s[i]) {
 			case 's': case 'S':
 				mod |= ShiftMask;
@@ -120,7 +120,8 @@ int kb_sequence::parse(string const & s)
 			default:
 				return i + 1;
 			}
-		} else if (s[i] == '~' && s[i + 1] && s[i + 2] == '-') {
+		} else if (i + 2 < s.length() && s[i] == '~'
+			   && s[i + 2] == '-') {
 			switch (s[i + 1]) {
 			case 's': case 'S':
 				nmod |= ShiftMask;
@@ -262,8 +263,11 @@ char kb_sequence::getiso() const
 {
 	unsigned int const c = getsym();
 
-	lyxerr << "Raw keysym: " << std::hex << c << std::dec << endl;
-	lyxerr << "byte 3: " << std::hex << (c & 0x0000FF00) << std::dec << endl;
+	lyxerr[Debug::KBMAP] << "Raw keysym: "
+			     << std::hex << c << std::dec << endl;
+	lyxerr[Debug::KBMAP] << "byte 3: "
+			     << std::hex << (c & 0x0000FF00) << std::dec
+			     << endl;
 	
 	switch (c & 0x0000FF00) {
 		// latin 1 byte 3 = 0