Indent fixes.
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@225 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
835a6f43b1
commit
a3004e7f30
43
xkeymap.c
43
xkeymap.c
@ -218,8 +218,8 @@ xkeymap_init(void)
|
|||||||
|
|
||||||
/* Make keymapname lowercase */
|
/* Make keymapname lowercase */
|
||||||
mapname_ptr = keymapname;
|
mapname_ptr = keymapname;
|
||||||
while (*mapname_ptr)
|
while (*mapname_ptr)
|
||||||
*mapname_ptr++ = tolower(*mapname_ptr);
|
*mapname_ptr++ = tolower(*mapname_ptr);
|
||||||
|
|
||||||
if (strcmp(keymapname, "none"))
|
if (strcmp(keymapname, "none"))
|
||||||
{
|
{
|
||||||
@ -240,7 +240,8 @@ handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, BOOL pres
|
|||||||
case XK_Break:
|
case XK_Break:
|
||||||
case XK_Pause:
|
case XK_Pause:
|
||||||
if ((get_key_state(state, XK_Alt_L) || get_key_state(state, XK_Alt_R))
|
if ((get_key_state(state, XK_Alt_L) || get_key_state(state, XK_Alt_R))
|
||||||
&& (get_key_state(state, XK_Control_L) || get_key_state(state, XK_Control_R)))
|
&& (get_key_state(state, XK_Control_L)
|
||||||
|
|| get_key_state(state, XK_Control_R)))
|
||||||
{
|
{
|
||||||
/* Ctrl-Alt-Break: toggle full screen */
|
/* Ctrl-Alt-Break: toggle full screen */
|
||||||
if (pressed)
|
if (pressed)
|
||||||
@ -259,7 +260,7 @@ handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, BOOL pres
|
|||||||
}
|
}
|
||||||
/* No break sequence */
|
/* No break sequence */
|
||||||
}
|
}
|
||||||
else /* XK_Pause */
|
else /* XK_Pause */
|
||||||
{
|
{
|
||||||
/* According to MS Keyboard Scan Code
|
/* According to MS Keyboard Scan Code
|
||||||
Specification, pressing Pause should result
|
Specification, pressing Pause should result
|
||||||
@ -271,18 +272,24 @@ handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, BOOL pres
|
|||||||
is released. */
|
is released. */
|
||||||
if (pressed)
|
if (pressed)
|
||||||
{
|
{
|
||||||
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0xe1, 0);
|
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS,
|
||||||
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0x1d, 0);
|
0xe1, 0);
|
||||||
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0x45, 0);
|
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS,
|
||||||
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0xe1, 0);
|
0x1d, 0);
|
||||||
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0x9d, 0);
|
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS,
|
||||||
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS, 0xc5, 0);
|
0x45, 0);
|
||||||
|
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS,
|
||||||
|
0xe1, 0);
|
||||||
|
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS,
|
||||||
|
0x9d, 0);
|
||||||
|
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYPRESS,
|
||||||
|
0xc5, 0);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Release Left Ctrl */
|
/* Release Left Ctrl */
|
||||||
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYRELEASE, 0x1d,
|
rdp_send_input(ev_time, RDP_INPUT_SCANCODE, RDP_KEYRELEASE,
|
||||||
0);
|
0x1d, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return True;
|
return True;
|
||||||
@ -494,16 +501,20 @@ reset_modifier_keys(unsigned int state)
|
|||||||
uint32 ev_time;
|
uint32 ev_time;
|
||||||
ev_time = time(NULL);
|
ev_time = time(NULL);
|
||||||
|
|
||||||
if (MASK_HAS_BITS(remote_modifier_state, MapLeftShiftMask) && !get_key_state(state, XK_Shift_L))
|
if (MASK_HAS_BITS(remote_modifier_state, MapLeftShiftMask)
|
||||||
|
&& !get_key_state(state, XK_Shift_L))
|
||||||
rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LSHIFT);
|
rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LSHIFT);
|
||||||
|
|
||||||
if (MASK_HAS_BITS(remote_modifier_state, MapRightShiftMask) && !get_key_state(state, XK_Shift_R))
|
if (MASK_HAS_BITS(remote_modifier_state, MapRightShiftMask)
|
||||||
|
&& !get_key_state(state, XK_Shift_R))
|
||||||
rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RSHIFT);
|
rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RSHIFT);
|
||||||
|
|
||||||
if (MASK_HAS_BITS(remote_modifier_state, MapLeftCtrlMask) && !get_key_state(state, XK_Control_L))
|
if (MASK_HAS_BITS(remote_modifier_state, MapLeftCtrlMask)
|
||||||
|
&& !get_key_state(state, XK_Control_L))
|
||||||
rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LCTRL);
|
rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LCTRL);
|
||||||
|
|
||||||
if (MASK_HAS_BITS(remote_modifier_state, MapRightCtrlMask) && !get_key_state(state, XK_Control_R))
|
if (MASK_HAS_BITS(remote_modifier_state, MapRightCtrlMask)
|
||||||
|
&& !get_key_state(state, XK_Control_R))
|
||||||
rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RCTRL);
|
rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RCTRL);
|
||||||
|
|
||||||
if (MASK_HAS_BITS(remote_modifier_state, MapLeftAltMask) && !get_key_state(state, XK_Alt_L))
|
if (MASK_HAS_BITS(remote_modifier_state, MapLeftAltMask) && !get_key_state(state, XK_Alt_L))
|
||||||
|
Loading…
Reference in New Issue
Block a user