/[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 965 by astrand, Wed Aug 3 11:47:20 2005 UTC revision 976 by astrand, Thu Aug 4 13:39:57 2005 UTC
# Line 40  Line 40 
40    
41  extern Display *g_display;  extern Display *g_display;
42  extern Window g_wnd;  extern Window g_wnd;
43  extern char keymapname[16];  extern char g_keymapname[16];
44  extern int g_keylayout;  extern int g_keylayout;
45  extern int g_keyboard_type;  extern int g_keyboard_type;
46  extern int g_keyboard_subtype;  extern int g_keyboard_subtype;
# Line 159  add_sequence(char *rest, char *mapname) Line 159  add_sequence(char *rest, char *mapname)
159          DEBUG_KBD(("\n"));          DEBUG_KBD(("\n"));
160  }  }
161    
162  void  BOOL
163  xkeymap_from_locale(const char *locale)  xkeymap_from_locale(const char *locale)
164  {  {
165          char *str, *ptr;          char *str, *ptr;
166          FILE *fp;          FILE *fp;
167    
168          /* Create a working copy */          /* Create a working copy */
169          str = strdup(locale);          str = xstrdup(locale);
         if (str == NULL)  
         {  
                 perror("strdup");  
                 exit(1);  
         }  
170    
171          /* Truncate at dot and at */          /* Truncate at dot and at */
172          ptr = strrchr(str, '.');          ptr = strrchr(str, '.');
# Line 210  xkeymap_from_locale(const char *locale) Line 205  xkeymap_from_locale(const char *locale)
205          if (fp)          if (fp)
206          {          {
207                  fclose(fp);                  fclose(fp);
208                  STRNCPY(keymapname, str, sizeof(keymapname));                  STRNCPY(g_keymapname, str, sizeof(g_keymapname));
209                  fprintf(stderr, "Autoselected keyboard map %s.\n", keymapname);                  return True;
210          }          }
211    
212            return False;
213  }  }
214    
215    
# Line 447  xkeymap_init(void) Line 444  xkeymap_init(void)
444  {  {
445          unsigned int max_keycode;          unsigned int max_keycode;
446    
447          if (strcmp(keymapname, "none"))          if (strcmp(g_keymapname, "none"))
448          {          {
449                  if (xkeymap_read(keymapname))                  if (xkeymap_read(g_keymapname))
450                          keymap_loaded = True;                          keymap_loaded = True;
451          }          }
452    
# Line 673  xkeymap_translate_key(uint32 keysym, uns Line 670  xkeymap_translate_key(uint32 keysym, uns
670    
671  void  void
672  xkeymap_send_keys(uint32 keysym, unsigned int keycode, unsigned int state, uint32 ev_time,  xkeymap_send_keys(uint32 keysym, unsigned int keycode, unsigned int state, uint32 ev_time,
673                    BOOL pressed)                    BOOL pressed, uint8 nesting)
674  {  {
675          key_translation tr, *ptr;          key_translation tr, *ptr;
676          tr = xkeymap_translate_key(keysym, keycode, state);          tr = xkeymap_translate_key(keysym, keycode, state);
# Line 706  xkeymap_send_keys(uint32 keysym, unsigne Line 703  xkeymap_send_keys(uint32 keysym, unsigne
703                  {                  {
704                          DEBUG_KBD(("Handling sequence element, keysym=0x%x\n",                          DEBUG_KBD(("Handling sequence element, keysym=0x%x\n",
705                                     (unsigned int) ptr->seq_keysym));                                     (unsigned int) ptr->seq_keysym));
706                          xkeymap_send_keys(ptr->seq_keysym, keycode, state, ev_time, True);  
707                          xkeymap_send_keys(ptr->seq_keysym, keycode, state, ev_time, False);                          if (nesting++ > 32)
708                            {
709                                    error("Sequence nesting too deep\n");
710                                    return;
711                            }
712    
713                            xkeymap_send_keys(ptr->seq_keysym, keycode, state, ev_time, True, nesting);
714                            xkeymap_send_keys(ptr->seq_keysym, keycode, state, ev_time, False, nesting);
715                          ptr = ptr->next;                          ptr = ptr->next;
716                  }                  }
717                  while (ptr);                  while (ptr);
Legend:
Removed from v.965  
changed lines
  Added in v.976
  ViewVC Help
Powered by ViewVC 1.1.26