/[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 212 by matthewc, Sun Oct 6 13:25:30 2002 UTC revision 225 by astrand, Fri Oct 11 08:54:08 2002 UTC
# Line 69  static BOOL Line 69  static BOOL
69  xkeymap_read(char *mapname)  xkeymap_read(char *mapname)
70  {  {
71          FILE *fp;          FILE *fp;
72          char line[KEYMAP_MAX_LINE_LENGTH], path[PATH_MAX];          char line[KEYMAP_MAX_LINE_LENGTH];
73            char path[PATH_MAX], inplace_path[PATH_MAX];
74          unsigned int line_num = 0;          unsigned int line_num = 0;
75          unsigned int line_length = 0;          unsigned int line_length = 0;
76          char *keyname, *p;          char *keyname, *p;
# Line 84  xkeymap_read(char *mapname) Line 85  xkeymap_read(char *mapname)
85          fp = fopen(path, "r");          fp = fopen(path, "r");
86          if (fp == NULL)          if (fp == NULL)
87          {          {
88                  error("Failed to open keymap %s\n", path);                  /* in case we are running from the source tree */
89                  return False;                  strcpy(inplace_path, "keymaps/");
90                    strncat(inplace_path, mapname, sizeof(inplace_path) - sizeof("keymaps/"));
91    
92                    fp = fopen(inplace_path, "r");
93                    if (fp == NULL)
94                    {
95                            error("Failed to open keymap %s\n", path);
96                            return False;
97                    }
98          }          }
99    
100          /* FIXME: More tolerant on white space */          /* FIXME: More tolerant on white space */
# Line 205  void Line 214  void
214  xkeymap_init(void)  xkeymap_init(void)
215  {  {
216          unsigned int max_keycode;          unsigned int max_keycode;
217            char *mapname_ptr;
218    
219            /* Make keymapname lowercase */
220            mapname_ptr = keymapname;
221            while (*mapname_ptr)
222                *mapname_ptr++ = tolower(*mapname_ptr);
223    
224          if (strcmp(keymapname, "none"))          if (strcmp(keymapname, "none"))
225          {          {
Legend:
Removed from v.212  
changed lines
  Added in v.225
  ViewVC Help
Powered by ViewVC 1.1.26