AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-19 13:30:02 +00:00
Code Issues Projects Releases Wiki Activity

GDK/Win32: Drop global variable on both shifts pressed

Browse Source
This commit is contained in:
Chun-wei Fan 2024-09-13 16:34:40 +08:00
parent 96717f8e20
commit 0bc5be78a9
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/win32/gdkdisplay-win32.h
View File

@ -191,6 +191,9 @@ typedef struct
/* for tracking whether we are using IME */
guint in_ime_composition : 1;
/* to store keycodes for shift keys */
int both_shift_pressed[2];
} event_records;
struct _GdkWin32Display

23
gdk/win32/gdkevents-win32.c
View File

@ -145,8 +145,6 @@ static HKL latin_locale = NULL;
static int debug_indent = 0;
static int both_shift_pressed[2]; /* to store keycodes for shift keys */
/* low-level keyboard hook handle */
static HHOOK keyboard_hook = NULL;
static UINT aerosnap_message;
@ -2013,29 +2011,30 @@ gdk_event_translate (MSG *msg,
if (msg->message == WM_KEYDOWN && msg->wParam == VK_SHIFT)
{
int pressed_shift = msg->lParam & 0xffffff; /* mask shift modifier */
if (both_shift_pressed[0] == 0)
both_shift_pressed[0] = pressed_shift;
else if (both_shift_pressed[0] != pressed_shift)
both_shift_pressed[1] = pressed_shift;
if (win32_display->event_record->both_shift_pressed[0] == 0)
win32_display->event_record->both_shift_pressed[0] = pressed_shift;
else if (win32_display->event_record->both_shift_pressed[0] != pressed_shift)
win32_display->event_record->both_shift_pressed[1] = pressed_shift;
}
if (msg->message == WM_KEYUP && msg->wParam == VK_SHIFT)
{
if (both_shift_pressed[0] != 0 && both_shift_pressed[1] != 0)
if (win32_display->event_record->both_shift_pressed[0] != 0 &&
win32_display->event_record->both_shift_pressed[1] != 0)
{
int tmp_retval;
MSG fake_release = *msg;
int pressed_shift = msg->lParam & 0xffffff;
if (both_shift_pressed[0] == pressed_shift)
fake_release.lParam = both_shift_pressed[1];
if (win32_display->event_record->both_shift_pressed[0] == pressed_shift)
fake_release.lParam = win32_display->event_record->both_shift_pressed[1];
else
fake_release.lParam = both_shift_pressed[0];
fake_release.lParam = win32_display->event_record->both_shift_pressed[0];
both_shift_pressed[0] = both_shift_pressed[1] = 0;
win32_display->event_record->both_shift_pressed[0] = win32_display->event_record->both_shift_pressed[1] = 0;
gdk_event_translate (&fake_release, &tmp_retval);
}
both_shift_pressed[0] = both_shift_pressed[1] = 0;
win32_display->event_record->both_shift_pressed[0] = win32_display->event_record->both_shift_pressed[1] = 0;
}
/* Reset ALT_MASK if it is the Alt key itself */