X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fkbmap.C;h=e861392c4f4eb793937c4bf80b949e402977c192;hb=5d3718cad2a2ef6a4d6a495054ab0705ba27b6b5;hp=26f7bbe66a13a923b4e0075e1499a9f4bca4b9eb;hpb=8b8741cd5d7e960c5663911f8b69972419f6d37b;p=lyx.git

diff --git a/src/kbmap.C b/src/kbmap.C
index 26f7bbe66a..e861392c4f 100644
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -1,21 +1,14 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file kbmap.C
+ * Copyright 1995-2002 the LyX Team
+ * Read the file COPYING
  *
- *           LyX, The Document Processor
- * 	
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * \author unknown
+ * \author John Levon <moz@compsoc.man.ac.uk>
+ */
 
 #include <config.h>
 
-#include <X11/Xlib.h>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "kbmap.h"
 #include "commandtags.h"
 #include "kbsequence.h"
@@ -23,52 +16,23 @@
 
 using std::endl;
 
-// The only modifiers that we handle. We want to throw away things
-// like NumLock.
-enum { ModsMask = ShiftMask | ControlMask | Mod1Mask };
-
-
-string const kb_keymap::printKeysym(unsigned int key, unsigned int mod)
+string const kb_keymap::printKeysym(LyXKeySymPtr key,
+				    key_modifier::state mod)
 {
 	string buf;
-	mod &= ModsMask;
-
-	char const * const s = XKeysymToString(key);
-	
-	if (mod & ShiftMask) buf += "S-";
-	if (mod & ControlMask) buf += "C-";
-	if (mod & Mod1Mask) buf += "M-";
-	if (s) buf += s;
-	return buf;
-}
 
+	string const s = key->getSymbolName();
 
-char kb_keymap::getiso(unsigned int c)
-{
-	switch (c & 0x0000FF00) {
-		// latin 1 byte 3 = 0
-	case 0x00000000: break;
-		// latin 2 byte 3 = 1
-	case 0x00000100:
-		// latin 3 byte 3 = 2
-	case 0x00000200:
-		// latin 4 byte 3 = 3
-	case 0x00000300:
-		// latin 8 byte 3 = 18 (0x12)
-	case 0x00001200:
-		// latin 9 byte 3 = 19 (0x13)
-	case 0x00001300:
-		c &= 0x000000FF;
-		break;
-	default:
-		c = 0;
-	}
-	return c;
+	if (mod & key_modifier::shift) buf += "S-";
+	if (mod & key_modifier::ctrl) buf += "C-";
+	if (mod & key_modifier::alt) buf += "M-";
+	buf += s;
+	return buf;
 }
 
 string const kb_keymap::printKey(kb_key const & key) const
 {
-	return printKeysym(key.code, key.mod & 0xffff);
+	return printKeysym(key.code, key.mod.first);
 }
 
 
@@ -77,9 +41,9 @@ string::size_type kb_keymap::bind(string const & seq, int action)
 	if (lyxerr.debugging(Debug::KBMAP)) {
 		lyxerr << "BIND: Sequence `"
 		       << seq << "' Action `"
-		       << action << "'" << endl;
+		       << action << '\'' << endl;
 	}
-	
+
 	kb_sequence k(0, 0);
 
 	string::size_type const res = k.parse(seq);
@@ -95,8 +59,8 @@ string::size_type kb_keymap::bind(string const & seq, int action)
 }
 
 
-int kb_keymap::lookup(unsigned int key,
-		      unsigned int mod, kb_sequence * seq) const
+int kb_keymap::lookup(LyXKeySymPtr key,
+		      key_modifier::state mod, kb_sequence * seq) const
 {
 	if (table.empty()) {
 		seq->curmap = seq->stdmap;
@@ -104,14 +68,13 @@ int kb_keymap::lookup(unsigned int key,
 		return LFUN_UNKNOWN_ACTION;
 	}
 
-	//suppress modifier bits we do not handle
-	mod &= ModsMask;
-
 	for (Table::const_iterator cit = table.begin();
 	     cit != table.end(); ++cit) {
-		unsigned int const msk1 = cit->mod & 0xffff;
-		unsigned int const msk0 = (cit->mod >> 16) & 0xffff;
-		if (cit->code == key && (mod & ~msk0) == msk1) {
+		key_modifier::state mask(cit->mod.second);
+		key_modifier::state check =
+			static_cast<key_modifier::state>(mod & ~mask);
+
+		if (*(cit->code) == *key && cit->mod.first == check) {
 			// match found
 			if (cit->table.get()) {
 				// this is a prefix key - set new map
@@ -147,14 +110,18 @@ string const kb_keymap::print() const
 
 void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
 {
-	unsigned int const code = seq->sequence[r];
-	if (code == NoSymbol) return;
+	LyXKeySymPtr code = seq->sequence[r];
+	if (!code->isOK())
+		return;
 
-	unsigned int const modmsk = seq->modifiers[r];
+	key_modifier::state const mod1 = seq->modifiers[r].first;
+	key_modifier::state const mod2 = seq->modifiers[r].second;
 
 	// check if key is already there
 	for (Table::iterator it = table.begin(); it != table.end(); ++it) {
-		if (code == it->code && modmsk == it->mod) {
+		if (*(code) == *(it->code)
+		    && mod1 == it->mod.first
+		    && mod2 == it->mod.second) {
 			// overwrite binding
 			if (r + 1 == seq->length()) {
 				lyxerr[Debug::KBMAP]
@@ -162,8 +129,8 @@ void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
 					<< seq->print()
 					<< "' is overriding old binding..."
 					<< endl;
-					if (it->table.get()) {
-					it->table.reset(0);
+				if (it->table.get()) {
+					it->table.reset();
 				}
 				it->action = action;
 				return;
@@ -178,13 +145,13 @@ void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
 			}
 		}
 	}
-	
+
 	Table::iterator newone = table.insert(table.end(), kb_key());
 	newone->code = code;
-	newone->mod = modmsk;
+	newone->mod = seq->modifiers[r];
 	if (r + 1 == seq->length()) {
 		newone->action = action;
-		newone->table.reset(0);
+		newone->table.reset();
 		return;
 	} else {
 		newone->table.reset(new kb_keymap);
@@ -206,9 +173,9 @@ string const kb_keymap::findbinding(int act, string const & prefix) const
 			res += cit->table->findbinding(act,
 						       prefix
 						       + printKey((*cit))
-						       + " ");
+						       + ' ');
 		} else if (cit->action == act) {
-			res += "[";
+			res += '[';
 			res += prefix + printKey((*cit));
 			res += "] ";
 		}