/[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 452 by astrand, Sun Aug 31 19:45:56 2003 UTC revision 548 by astrand, Tue Nov 11 14:01:31 2003 UTC
# Line 1  Line 1 
1  /*  /*
2     rdesktop: A Remote Desktop Protocol client.     rdesktop: A Remote Desktop Protocol client.
3     User interface services - X keyboard mapping     User interface services - X keyboard mapping
4    
5     Copyright (C) Matthew Chapman 1999-2002     Copyright (C) Matthew Chapman 1999-2002
6       Copyright (C) Peter Astrand <peter@cendio.se> 2003
7        
8     This program is free software; you can redistribute it and/or modify     This program is free software; you can redistribute it and/or modify
9     it under the terms of the GNU General Public License as published by     it under the terms of the GNU General Public License as published by
# Line 36  Line 38 
38  #define KEYMAP_MAX_LINE_LENGTH 80  #define KEYMAP_MAX_LINE_LENGTH 80
39    
40  extern Display *g_display;  extern Display *g_display;
41    extern Window g_wnd;
42  extern char keymapname[16];  extern char keymapname[16];
43  extern int keylayout;  extern int keylayout;
44  extern int g_win_button_size;  extern int g_win_button_size;
# Line 183  xkeymap_read(char *mapname) Line 186  xkeymap_read(char *mapname)
186                          MASK_ADD_BITS(modifiers, MapLeftShiftMask);                          MASK_ADD_BITS(modifiers, MapLeftShiftMask);
187                  }                  }
188    
                 if (strstr(line_rest, "numlock"))  
                 {  
                         MASK_ADD_BITS(modifiers, MapNumLockMask);  
                 }  
   
189                  if (strstr(line_rest, "localstate"))                  if (strstr(line_rest, "localstate"))
190                  {                  {
191                          MASK_ADD_BITS(modifiers, MapLocalStateMask);                          MASK_ADD_BITS(modifiers, MapLocalStateMask);
# Line 278  send_winkey(uint32 ev_time, BOOL pressed Line 276  send_winkey(uint32 ev_time, BOOL pressed
276          }          }
277  }  }
278    
279    static void
280    reset_winkey(uint32 ev_time)
281    {
282            if (g_use_rdp5)
283            {
284                    /* For some reason, it seems to suffice to release
285                     *either* the left or right winkey. */
286                    rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LWIN);
287            }
288    }
289    
290  /* Handles, for example, multi-scancode keypresses (which is not  /* Handles, for example, multi-scancode keypresses (which is not
291     possible via keymap-files) */     possible via keymap-files) */
292  BOOL  BOOL
# Line 448  get_ksname(uint32 keysym) Line 457  get_ksname(uint32 keysym)
457          return ksname;          return ksname;
458  }  }
459    
460    static BOOL
461    is_modifier(uint8 scancode)
462    {
463            switch (scancode)
464            {
465                    case SCANCODE_CHAR_LSHIFT:
466                    case SCANCODE_CHAR_RSHIFT:
467                    case SCANCODE_CHAR_LCTRL:
468                    case SCANCODE_CHAR_RCTRL:
469                    case SCANCODE_CHAR_LALT:
470                    case SCANCODE_CHAR_RALT:
471                    case SCANCODE_CHAR_LWIN:
472                    case SCANCODE_CHAR_RWIN:
473                    case SCANCODE_CHAR_NUMLOCK:
474                            return True;
475                    default:
476                            break;
477            }
478            return False;
479    }
480    
481  void  void
482  save_remote_modifiers()  save_remote_modifiers(uint8 scancode)
483  {  {
484            if (is_modifier(scancode))
485                    return;
486    
487          saved_remote_modifier_state = remote_modifier_state;          saved_remote_modifier_state = remote_modifier_state;
488  }  }
489    
490  void  void
491  restore_remote_modifiers(uint32 ev_time)  restore_remote_modifiers(uint32 ev_time, uint8 scancode)
492  {  {
493          key_translation dummy;          key_translation dummy;
494    
495            if (is_modifier(scancode))
496                    return;
497    
498          dummy.scancode = 0;          dummy.scancode = 0;
499          dummy.modifiers = saved_remote_modifier_state;          dummy.modifiers = saved_remote_modifier_state;
500          ensure_remote_modifiers(ev_time, dummy);          ensure_remote_modifiers(ev_time, dummy);
# Line 468  void Line 504  void
504  ensure_remote_modifiers(uint32 ev_time, key_translation tr)  ensure_remote_modifiers(uint32 ev_time, key_translation tr)
505  {  {
506          /* If this key is a modifier, do nothing */          /* If this key is a modifier, do nothing */
507          switch (tr.scancode)          if (is_modifier(tr.scancode))
508          {                  return;
                 case SCANCODE_CHAR_LSHIFT:  
                 case SCANCODE_CHAR_RSHIFT:  
                 case SCANCODE_CHAR_LCTRL:  
                 case SCANCODE_CHAR_RCTRL:  
                 case SCANCODE_CHAR_LALT:  
                 case SCANCODE_CHAR_RALT:  
                 case SCANCODE_CHAR_LWIN:  
                 case SCANCODE_CHAR_RWIN:  
                 case SCANCODE_CHAR_NUMLOCK:  
                         return;  
                 default:  
                         break;  
         }  
   
         /* NumLock */  
         if (MASK_HAS_BITS(tr.modifiers, MapNumLockMask)  
             != MASK_HAS_BITS(remote_modifier_state, MapNumLockMask))  
         {  
                 /* The remote modifier state is not correct */  
                 uint16 new_remote_state;  
   
                 if (MASK_HAS_BITS(tr.modifiers, MapNumLockMask))  
                 {  
                         DEBUG_KBD(("Remote NumLock state is incorrect, activating NumLock.\n"));  
                         new_remote_state = KBD_FLAG_NUMLOCK;  
                         remote_modifier_state = MapNumLockMask;  
                 }  
                 else  
                 {  
                         DEBUG_KBD(("Remote NumLock state is incorrect, deactivating NumLock.\n"));  
                         new_remote_state = 0;  
                         remote_modifier_state = 0;  
                 }  
   
                 rdp_send_input(0, RDP_INPUT_SYNCHRONIZE, 0, new_remote_state, 0);  
         }  
509    
510          /* Shift. Left shift and right shift are treated as equal; either is fine. */          /* Shift. Left shift and right shift are treated as equal; either is fine. */
511          if (MASK_HAS_BITS(tr.modifiers, MapShiftMask)          if (MASK_HAS_BITS(tr.modifiers, MapShiftMask)
# Line 555  ensure_remote_modifiers(uint32 ev_time, Line 555  ensure_remote_modifiers(uint32 ev_time,
555  }  }
556    
557    
558    unsigned int
559    read_keyboard_state()
560    {
561            unsigned int state;
562            Window wdummy;
563            int dummy;
564    
565            XQueryPointer(g_display, g_wnd, &wdummy, &wdummy, &dummy, &dummy, &dummy, &dummy, &state);
566            return state;
567    }
568    
569    
570    uint16
571    ui_get_numlock_state(unsigned int state)
572    {
573            uint16 numlock_state = 0;
574    
575            if (get_key_state(state, XK_Num_Lock))
576                    numlock_state = KBD_FLAG_NUMLOCK;
577    
578            return numlock_state;
579    }
580    
581    
582  void  void
583  reset_modifier_keys(unsigned int state)  reset_modifier_keys()
584  {  {
585            unsigned int state = read_keyboard_state();
586    
587          /* reset keys */          /* reset keys */
588          uint32 ev_time;          uint32 ev_time;
589          ev_time = time(NULL);          ev_time = time(NULL);
# Line 584  reset_modifier_keys(unsigned int state) Line 610  reset_modifier_keys(unsigned int state)
610          if (MASK_HAS_BITS(remote_modifier_state, MapRightAltMask) &&          if (MASK_HAS_BITS(remote_modifier_state, MapRightAltMask) &&
611              !get_key_state(state, XK_Alt_R) && !get_key_state(state, XK_Mode_switch))              !get_key_state(state, XK_Alt_R) && !get_key_state(state, XK_Mode_switch))
612                  rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RALT);                  rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RALT);
613    
614            reset_winkey(ev_time);
615    
616            rdp_send_input(ev_time, RDP_INPUT_SYNCHRONIZE, 0, ui_get_numlock_state(state), 0);
617  }  }
618    
619    
# Line 622  update_modifier_state(uint8 scancode, BO Line 652  update_modifier_state(uint8 scancode, BO
652                  case SCANCODE_CHAR_RWIN:                  case SCANCODE_CHAR_RWIN:
653                          MASK_CHANGE_BIT(remote_modifier_state, MapRightWinMask, pressed);                          MASK_CHANGE_BIT(remote_modifier_state, MapRightWinMask, pressed);
654                          break;                          break;
                 case SCANCODE_CHAR_NUMLOCK:  
                         /* KeyReleases for NumLocks are sent immediately. Toggle the  
                            modifier state only on Keypress */  
                         if (pressed)  
                         {  
                                 BOOL newNumLockState;  
                                 newNumLockState =  
                                         (MASK_HAS_BITS  
                                          (remote_modifier_state, MapNumLockMask) == False);  
                                 MASK_CHANGE_BIT(remote_modifier_state,  
                                                 MapNumLockMask, newNumLockState);  
                         }  
                         break;  
655          }          }
656    
657  #ifdef WITH_DEBUG_KBD  #ifdef WITH_DEBUG_KBD
Legend:
Removed from v.452  
changed lines
  Added in v.548
  ViewVC Help
Powered by ViewVC 1.1.26