/[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 974 by astrand, Thu Aug 4 12:50:15 2005 UTC revision 975 by astrand, Thu Aug 4 12:51:44 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 205  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                  return True;                  return True;
210          }          }
211    
# Line 444  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    
Legend:
Removed from v.974  
changed lines
  Added in v.975
  ViewVC Help
Powered by ViewVC 1.1.26