/[rdesktop]/sourceforge.net/trunk/rdesktop/xkeymap.c
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /sourceforge.net/trunk/rdesktop/xkeymap.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 260 by astrand, Mon Nov 18 15:31:19 2002 UTC revision 300 by matthewc, Thu Jan 30 11:20:30 2003 UTC
# Line 27  Line 27 
27  #include "rdesktop.h"  #include "rdesktop.h"
28  #include "scancodes.h"  #include "scancodes.h"
29    
30  #define KEYMAP_SIZE 4096  #define KEYMAP_SIZE 0xffff+1
31  #define KEYMAP_MASK (KEYMAP_SIZE - 1)  #define KEYMAP_MASK 0xffff
32  #define KEYMAP_MAX_LINE_LENGTH 80  #define KEYMAP_MAX_LINE_LENGTH 80
33    
34  extern Display *display;  extern Display *display;
# Line 51  add_to_keymap(char *keyname, uint8 scanc Line 51  add_to_keymap(char *keyname, uint8 scanc
51          keysym = XStringToKeysym(keyname);          keysym = XStringToKeysym(keyname);
52          if (keysym == NoSymbol)          if (keysym == NoSymbol)
53          {          {
54                  error("Bad keysym %s in keymap %s\n", keyname, mapname);                  warning("Bad keysym %s in keymap %s\n", keyname, mapname);
55                  return;                  return;
56          }          }
57    
# Line 198  xkeymap_read(char *mapname) Line 198  xkeymap_read(char *mapname)
198                          /* Automatically add uppercase key, with same modifiers                          /* Automatically add uppercase key, with same modifiers
199                             plus shift */                             plus shift */
200                          for (p = keyname; *p; p++)                          for (p = keyname; *p; p++)
201                                  *p = toupper(*p);                                  *p = toupper((int)*p);
202                          MASK_ADD_BITS(modifiers, MapLeftShiftMask);                          MASK_ADD_BITS(modifiers, MapLeftShiftMask);
203                          add_to_keymap(keyname, scancode, modifiers, mapname);                          add_to_keymap(keyname, scancode, modifiers, mapname);
204                  }                  }
# Line 220  xkeymap_init(void) Line 220  xkeymap_init(void)
220          mapname_ptr = keymapname;          mapname_ptr = keymapname;
221          while (*mapname_ptr)          while (*mapname_ptr)
222          {          {
223                  *mapname_ptr = tolower(*mapname_ptr);                  *mapname_ptr = tolower((int)*mapname_ptr);
224                  mapname_ptr++;                  mapname_ptr++;
225          }          }
226    
# Line 344  xkeymap_translate_key(uint32 keysym, uns Line 344  xkeymap_translate_key(uint32 keysym, uns
344          }          }
345    
346          if (keymap_loaded)          if (keymap_loaded)
347                  error("No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym));                  warning("No translation for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym));
348    
349          /* not in keymap, try to interpret the raw scancode */          /* not in keymap, try to interpret the raw scancode */
350          if ((keycode >= min_keycode) && (keycode <= 0x60))          if ((keycode >= min_keycode) && (keycode <= 0x60))
Legend:
Removed from v.260  
changed lines
  Added in v.300
  ViewVC Help
Powered by ViewVC 1.1.26