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
Usermode/AxWin3 - Implemented Focus/Raising support
[tpg/acess2.git]
/
Usermode
/
Applications
/
axwin3_src
/
WM
/
main.c
diff --git
a/Usermode/Applications/axwin3_src/WM/main.c
b/Usermode/Applications/axwin3_src/WM/main.c
index
0562d7d
..
a9c34b7
100644
(file)
--- a/
Usermode/Applications/axwin3_src/WM/main.c
+++ b/
Usermode/Applications/axwin3_src/WM/main.c
@@
-11,9
+11,12
@@
#include <stdio.h>
// === IMPORTS ===
#include <stdio.h>
// === IMPORTS ===
-extern void WM_Update(void);
extern void Video_Setup(void);
extern void Video_Setup(void);
+extern void WM_Initialise(void);
+extern int Renderer_Menu_Init(void);
extern int Renderer_Widget_Init(void);
extern int Renderer_Widget_Init(void);
+extern int Renderer_Background_Init(void);
+extern void WM_Update(void);
// === PROTOTYPES ===
void ParseCommandline(int argc, char **argv);
// === PROTOTYPES ===
void ParseCommandline(int argc, char **argv);
@@
-54,7
+57,10
@@
int main(int argc, char *argv[])
IPC_Init();
Input_Init();
IPC_Init();
Input_Init();
+ Renderer_Menu_Init();
Renderer_Widget_Init();
Renderer_Widget_Init();
+ Renderer_Background_Init();
+ WM_Initialise();
// Spawn interface root
if( clone(CLONE_VM, 0) == 0 )
// Spawn interface root
if( clone(CLONE_VM, 0) == 0 )
@@
-63,6
+69,7
@@
int main(int argc, char *argv[])
char server_info[] = "AXWIN3_SERVER=00000";
char *envp[] = {server_info, NULL};
char *argv[] = {csInterfaceApp, NULL};
char server_info[] = "AXWIN3_SERVER=00000";
char *envp[] = {server_info, NULL};
char *argv[] = {csInterfaceApp, NULL};
+ _SysDebug("server_tid = %i, &server_tid = %p", server_tid, &server_tid);
sprintf(server_info, "AXWIN3_SERVER=%i", server_tid);
execve(csInterfaceApp, argv, envp);
exit(1);
sprintf(server_info, "AXWIN3_SERVER=%i", server_tid);
execve(csInterfaceApp, argv, envp);
exit(1);
UCC
git Repository :: git.ucc.asn.au