added a regex to be used when the system is missing one, use noinst instead of pkglib...

[lyx.git] / src / kbmap.h

diff --git a/src/kbmap.h b/src/kbmap.h
index 04822c399d87400d1068e21e785af18730f4a908..3cb9a69f299bffbd7d68f9294bf91ffd649e21cf 100644 (file)
--- a/src/kbmap.h
+++ b/src/kbmap.h
@@ -4,7 +4,7 @@
    Author : chb, 30.Oct.1995
    Docu   : see kbmap.C
    Purpose: class definitions for XKeyEvent keymap handling
-   \* ======================================================================= */
+   \* ==================================================================== */
 
 #ifndef KBMAP_H
 #define KBMAP_H
@@ -17,10 +17,13 @@
 
 #include "LString.h"
 
+#define NO_HASH 1
+
 #define KB_PREALLOC  16
+#ifndef NO_HASH
 #define KB_HASHSIZE 128   // yes, yes - I know. 128 is not exactly prime :-)
 // ... but we are dealing with ASCII chars mostly.
-
+#endif
 class kb_keymap;
 class kb_sequence;
 
@@ -33,7 +36,7 @@ struct kb_key {
        unsigned int mod;
        
        /// Keymap for prefix keys
-       kb_keymap *table;
+       kb_keymap * table;
        
        /// Action for !prefix keys
        int action;
@@ -53,34 +56,37 @@ public:
        
        /// Bind a key-sequence to an action
        /** Returns 0 on success. Otherwise, position in string where
-         error occured. */
-       int bind(char const* seq, int action);
-       
+           error occured. */
+       int bind(char const * seq, int action);
+
        ///
-       int print(char* buf, int maxlen) const;
+       void print(string & buf) const;
        
        /// Look up a key in the keymap
-       int lookup(KeySym key, unsigned mod, kb_sequence *seq);
+       int lookup(KeySym key, unsigned mod, kb_sequence * seq);
 
        /// Given an action, find all keybindings.
        string findbinding(int action) const;
 private:
        /// Define a new key sequence
-       int defkey(kb_sequence *seq, int action, int idx = 0);
+       int defkey(kb_sequence * seq, int action, int idx = 0);
        
        /// Size of the table (<0: hashtab)
-       int size;
+       int size;
        
        /// Holds the defined keys
        /** Both kinds of tables ends with NoSymbol */
+#ifndef NO_HASH
        union
        {
+#endif
                /// Table for linear array
-               kb_key *table;
-               
+               kb_key * table;
+#ifndef NO_HASH        
                /// Hash table holding key lists
-               kb_key **htable;
+               kb_key ** htable;
        };
+#endif
 };
 
 
@@ -101,23 +107,23 @@ public:
        
        ///
        ~kb_sequence()
-       {
-               if (sequence != staticseq) {
-                       delete sequence;
-                       delete modifiers;
+               {
+                       if (sequence != staticseq) {
+                               delete sequence;
+                               delete modifiers;
+                       }
                }
-       }
        
        /// Add a key to the key sequence and look it up in the curmap
        /** Add a key to the key sequence and look it up in the curmap
-         if the latter is defined. */
+           if the latter is defined. */
        int addkey(KeySym key, unsigned mod, unsigned nmod = 0);
-       
+
        ///
-       int print(char *buf, int maxlen, bool when_defined = false) const; //RVDK_PATCH_5
+       int print(string & buf, bool when_defined = false) const;
        
         ///
-       int printOptions(char *buf, int maxlen) const;
+       int printOptions(string & buf) const;
        
        /// Make length negative to mark the sequence as deleted
        void delseq();
@@ -132,20 +138,20 @@ public:
        void reset();
        
        ///
-       int parse(char const *s);
+       int parse(char const * s);
        
        /// Keymap to use if a new sequence is starting
-       kb_keymap *stdmap;
+       kb_keymap * stdmap;
        
        /// Keymap to use for the next key
-       kb_keymap *curmap;
+       kb_keymap * curmap;
        
        /// Array holding the current key sequence
        /** If sequence[length-1] < 0xff it can be used as ISO8859 char */
-       unsigned int *sequence;
+       unsigned int * sequence;
        
        ///
-       unsigned int *modifiers;
+       unsigned int * modifiers;
        
        /// Current length of key sequence
        int length;