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 - Compile fix
[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
f1774a8
..
1d83314
100644
(file)
--- a/
Usermode/Applications/axwin3_src/WM/main.c
+++ b/
Usermode/Applications/axwin3_src/WM/main.c
@@
-46,8
+46,6
@@
const char *gsInstallRoot = __INSTALL_ROOT;
*/
int main(int argc, char *argv[])
{
*/
int main(int argc, char *argv[])
{
- int server_tid = gettid();
-
ParseCommandline(argc, argv);
if( gsTerminalDevice == NULL ) {
ParseCommandline(argc, argv);
if( gsTerminalDevice == NULL ) {
@@
-68,22
+66,30
@@
int main(int argc, char *argv[])
Renderer_RichText_Init();
WM_Initialise();
Renderer_RichText_Init();
WM_Initialise();
- // TODO:
C
onfig
+ // TODO:
Move these to c
onfig
uint32_t keys[4];
keys[0] = KEYSYM_LEFTGUI; keys[1] = KEYSYM_r;
WM_Hotkey_Register(2, keys, "Interface>Run");
uint32_t keys[4];
keys[0] = KEYSYM_LEFTGUI; keys[1] = KEYSYM_r;
WM_Hotkey_Register(2, keys, "Interface>Run");
+ keys[0] = KEYSYM_LEFTGUI; keys[1] = KEYSYM_t;
+ WM_Hotkey_Register(2, keys, "Interface>Terminal");
+ keys[0] = KEYSYM_LEFTGUI; keys[1] = KEYSYM_e;
+ WM_Hotkey_Register(2, keys, "Interface>TextEdit");
// Spawn interface root
// Spawn interface root
- if( clone(CLONE_VM, 0) == 0 )
{
{
+ int server_tid = gettid();
+ _SysDebug("server_tid = %i", server_tid);
static char csInterfaceApp[] = __INSTALL_ROOT"/AxWinUI";
char server_info[] = "AXWIN3_SERVER=00000";
static char csInterfaceApp[] = __INSTALL_ROOT"/AxWinUI";
char server_info[] = "AXWIN3_SERVER=00000";
- c
har
*envp[] = {server_info, NULL};
- c
har
*argv[] = {csInterfaceApp, NULL};
+ c
onst char
*envp[] = {server_info, NULL};
+ c
onst char
*argv[] = {csInterfaceApp, NULL};
_SysDebug("server_tid = %i, &server_tid = %p", server_tid, &server_tid);
sprintf(server_info, "AXWIN3_SERVER=%i", server_tid);
_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);
+ // TODO: Does the client need FDs?
+ int rv = _SysSpawn(csInterfaceApp, argv, envp, 0, NULL, NULL);
+ if( rv < 0 ) {
+ _SysDebug("_SysSpawn chucked a sad, rv=%i, errno=%i", rv, _errno);
+ }
}
// Main Loop
}
// Main Loop
UCC
git Repository :: git.ucc.asn.au