Merge pull request #704 from pfmooney/7cf594a95f2fac1c11aab0395a96225cbab14216

Fix for issue 540: ctrl-enter toggles fullscreen
This commit is contained in:
Marc-André Moreau 2012-08-25 09:40:05 -07:00
commit 46b87c0ac0
3 changed files with 9 additions and 1 deletions

View File

@ -400,6 +400,8 @@ static boolean xf_event_FocusOut(xfInfo* xfi, XEvent* event, boolean app)
if (event->xfocus.mode == NotifyWhileGrabbed)
XUngrabKeyboard(xfi->display, CurrentTime);
xf_kbd_clear(xfi);
if (app)
xf_rail_send_activate(xfi, event->xany.window, false);

View File

@ -32,12 +32,17 @@
void xf_kbd_init(xfInfo* xfi)
{
memset(xfi->pressed_keys, 0, 256 * sizeof(boolean));
xf_kbd_clear(xfi);
xfi->keyboard_layout_id = xfi->instance->settings->kbd_layout;
xfi->keyboard_layout_id = freerdp_keyboard_init(xfi->keyboard_layout_id);
xfi->instance->settings->kbd_layout = xfi->keyboard_layout_id;
}
void xf_kbd_clear(xfInfo* xfi)
{
memset(xfi->pressed_keys, 0, 256 * sizeof(boolean));
}
void xf_kbd_set_keypress(xfInfo* xfi, uint8 keycode, KeySym keysym)
{
if (keycode >= 8)

View File

@ -25,6 +25,7 @@
#include "xfreerdp.h"
void xf_kbd_init(xfInfo* xfi);
void xf_kbd_clear(xfInfo* xfi);
void xf_kbd_set_keypress(xfInfo* xfi, uint8 keycode, KeySym keysym);
void xf_kbd_unset_keypress(xfInfo* xfi, uint8 keycode);
void xf_kbd_release_all_keypress(xfInfo* xfi);