git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:thepowersgang/acess2
[tpg/acess2.git]
/
Usermode
/
Applications
/
axwin3_src
/
WM
/
wm_input.c
diff --git
a/Usermode/Applications/axwin3_src/WM/wm_input.c
b/Usermode/Applications/axwin3_src/WM/wm_input.c
index
1fc49f8
..
751bcbb
100644
(file)
--- a/
Usermode/Applications/axwin3_src/WM/wm_input.c
+++ b/
Usermode/Applications/axwin3_src/WM/wm_input.c
@@
-8,6
+8,7
@@
#include <common.h>
#include <wm_internals.h>
#include <wm_messages.h>
#include <common.h>
#include <wm_internals.h>
#include <wm_messages.h>
+#include <wm_hotkeys.h>
#define MAX_BUTTONS 3
#define MAX_BUTTONS 3
@@
-22,7
+23,7
@@
tWindow *gpWM_DownStartWindow[MAX_BUTTONS];
// === CODE ===
tWindow *WM_int_GetWindowAtPos(int X, int Y)
{
// === CODE ===
tWindow *WM_int_GetWindowAtPos(int X, int Y)
{
- tWindow *win, *next_win, *ret;
+ tWindow *win, *next_win, *ret
= NULL
;
next_win = gpWM_RootWindow;
next_win = gpWM_RootWindow;
@@
-70,7
+71,7
@@
void WM_Input_MouseMoved(int OldX, int OldY, int NewX, int NewY)
WM_SendMessage(NULL, win, WNDMSG_MOUSEMOVE, sizeof(msg), &msg);
}
WM_SendMessage(NULL, win, WNDMSG_MOUSEMOVE, sizeof(msg), &msg);
}
-
inline
void WM_Input_int_SendBtnMsg(tWindow *Win, int X, int Y, int Index, int Pressed)
+void WM_Input_int_SendBtnMsg(tWindow *Win, int X, int Y, int Index, int Pressed)
{
struct sWndMsg_MouseButton msg;
{
struct sWndMsg_MouseButton msg;
@@
-114,6
+115,9
@@
void WM_Input_MouseButton(int X, int Y, int ButtonIndex, int Pressed)
void WM_Input_KeyDown(uint32_t Character, uint32_t Scancode)
{
struct sWndMsg_KeyAction msg;
void WM_Input_KeyDown(uint32_t Character, uint32_t Scancode)
{
struct sWndMsg_KeyAction msg;
+
+ WM_Hotkey_KeyDown(Scancode);
+
msg.KeySym = Scancode;
msg.UCS32 = Character;
WM_SendMessage(NULL, gpWM_FocusedWindow, WNDMSG_KEYDOWN, sizeof(msg), &msg);
msg.KeySym = Scancode;
msg.UCS32 = Character;
WM_SendMessage(NULL, gpWM_FocusedWindow, WNDMSG_KEYDOWN, sizeof(msg), &msg);
@@
-133,6
+137,9
@@
void WM_Input_KeyFire(uint32_t Character, uint32_t Scancode)
void WM_Input_KeyUp(uint32_t Character, uint32_t Scancode)
{
struct sWndMsg_KeyAction msg;
void WM_Input_KeyUp(uint32_t Character, uint32_t Scancode)
{
struct sWndMsg_KeyAction msg;
+
+ WM_Hotkey_KeyUp(Scancode);
+
msg.KeySym = Scancode;
msg.UCS32 = Character;
WM_SendMessage(NULL, gpWM_FocusedWindow, WNDMSG_KEYUP, sizeof(msg), &msg);
msg.KeySym = Scancode;
msg.UCS32 = Character;
WM_SendMessage(NULL, gpWM_FocusedWindow, WNDMSG_KEYUP, sizeof(msg), &msg);
UCC
git Repository :: git.ucc.asn.au