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
/
input.c
diff --git
a/Usermode/Applications/axwin3_src/WM/input.c
b/Usermode/Applications/axwin3_src/WM/input.c
index
bd23c0b
..
352bdee
100644
(file)
--- a/
Usermode/Applications/axwin3_src/WM/input.c
+++ b/
Usermode/Applications/axwin3_src/WM/input.c
@@
-21,7
+21,7
@@
typedef struct
// === IMPORTS ===
extern void Video_SetCursorPos(short X, short Y);
const char *gsMouseDevice;
// === IMPORTS ===
extern void Video_SetCursorPos(short X, short Y);
const char *gsMouseDevice;
-extern int giTerminalFD;
+extern int giTerminalFD
_Input
;
extern int giScreenWidth;
extern int giScreenHeight;
extern int giScreenWidth;
extern int giScreenHeight;
@@
-57,24
+57,25
@@
int Input_Init(void)
void Input_FillSelect(int *nfds, fd_set *set)
{
void Input_FillSelect(int *nfds, fd_set *set)
{
- if(*nfds < giTerminalFD
) *nfds = giTerminalFD
;
+ if(*nfds < giTerminalFD
_Input) *nfds = giTerminalFD_Input
;
if(*nfds < giMouseFD) *nfds = giMouseFD;
if(*nfds < giMouseFD) *nfds = giMouseFD;
- FD_SET(giTerminalFD, set);
+ FD_SET(giTerminalFD
_Input
, set);
FD_SET(giMouseFD, set);
}
void Input_HandleSelect(fd_set *set)
{
FD_SET(giMouseFD, set);
}
void Input_HandleSelect(fd_set *set)
{
- if(FD_ISSET(giTerminalFD, set))
+ if(FD_ISSET(giTerminalFD
_Input
, set))
{
uint32_t codepoint;
static uint32_t scancode;
#define KEY_CODEPOINT_MASK 0x3FFFFFFF
{
uint32_t codepoint;
static uint32_t scancode;
#define KEY_CODEPOINT_MASK 0x3FFFFFFF
- if( read(giTerminalFD, &codepoint, sizeof(codepoint)) != sizeof(codepoint) )
+ size_t readlen = read(giTerminalFD_Input, &codepoint, sizeof(codepoint));
+ if( readlen != sizeof(codepoint) )
{
// oops, error
{
// oops, error
- _SysDebug("Terminal read failed?
"
);
+ _SysDebug("Terminal read failed?
(%i != %i)", readlen, sizeof(codepoint)
);
}
// _SysDebug("Keypress 0x%x", codepoint);
}
// _SysDebug("Keypress 0x%x", codepoint);
UCC
git Repository :: git.ucc.asn.au