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
/
axwin2_src
/
WM
/
main.c
diff --git
a/Usermode/Applications/axwin2_src/WM/main.c
b/Usermode/Applications/axwin2_src/WM/main.c
index
1234b66
..
48e47ff
100644
(file)
--- a/
Usermode/Applications/axwin2_src/WM/main.c
+++ b/
Usermode/Applications/axwin2_src/WM/main.c
@@
-6,14
+6,12
@@
#include <acess/sys.h>
// === IMPORTS ===
#include <acess/sys.h>
// === IMPORTS ===
-extern void ParseCommandline(int argc, char *argv[]);
-extern void Video_Setup(void);
extern void WM_Update(void);
extern void WM_Update(void);
-extern
void Messages_PollIPC
(void);
+extern
int Input_Init
(void);
// === GLOBALS ===
// === GLOBALS ===
-c
har
*gsTerminalDevice = NULL;
-c
har
*gsMouseDevice = NULL;
+c
onst char
*gsTerminalDevice = NULL;
+c
onst char
*gsMouseDevice = NULL;
int giScreenWidth = 640;
int giScreenHeight = 480;
int giScreenWidth = 640;
int giScreenHeight = 480;
@@
-34,17
+32,33
@@
int main(int argc, char *argv[])
if( gsTerminalDevice == NULL ) {
gsTerminalDevice = "/Devices/VTerm/6";
}
if( gsTerminalDevice == NULL ) {
gsTerminalDevice = "/Devices/VTerm/6";
}
+ if( gsMouseDevice == NULL ) {
+ gsMouseDevice = "/Devices/PS2Mouse";
+ }
Video_Setup();
Interface_Init();
Video_Setup();
Interface_Init();
+ IPC_Init();
+ Input_Init();
WM_Update();
// Main Loop
for(;;)
{
WM_Update();
// Main Loop
for(;;)
{
- Messages_PollIPC();
- //yield();
+ fd_set fds;
+ int nfds = 0;
+ FD_ZERO(&fds);
+
+ Input_FillSelect(&nfds, &fds);
+ IPC_FillSelect(&nfds, &fds);
+
+ nfds ++;
+ select(nfds, &fds, NULL, NULL, NULL);
+
+ Input_HandleSelect(&fds);
+ IPC_HandleSelect(&fds);
}
return 0;
}
}
return 0;
}
+
UCC
git Repository :: git.ucc.asn.au