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 git://localhost/acess2
[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
7d2d391
..
a9266b4
100644
(file)
--- a/
Usermode/Applications/axwin3_src/WM/main.c
+++ b/
Usermode/Applications/axwin3_src/WM/main.c
@@
-39,6
+39,8
@@
const char *gsMouseDevice = NULL;
#define __INSTALL_ROOT "/Acess/Apps/AxWin/3.0"
const char *gsInstallRoot = __INSTALL_ROOT;
#define __INSTALL_ROOT "/Acess/Apps/AxWin/3.0"
const char *gsInstallRoot = __INSTALL_ROOT;
+const char *gsInterfaceApp = __INSTALL_ROOT"/AxWinUI";
+ int gbNoSpawnUI = 0;
// === CODE ===
/**
// === CODE ===
/**
@@
-66,24
+68,28
@@
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( !gbNoSpawnUI )
{
int server_tid = gettid();
_SysDebug("server_tid = %i", server_tid);
{
int server_tid = gettid();
_SysDebug("server_tid = %i", server_tid);
- static char csInterfaceApp[] = __INSTALL_ROOT"/AxWinUI";
char server_info[] = "AXWIN3_SERVER=00000";
const char *envp[] = {server_info, NULL};
char server_info[] = "AXWIN3_SERVER=00000";
const char *envp[] = {server_info, NULL};
- const char *argv[] = {
c
sInterfaceApp, NULL};
+ const char *argv[] = {
g
sInterfaceApp, NULL};
_SysDebug("server_tid = %i, &server_tid = %p", server_tid, &server_tid);
sprintf(server_info, "AXWIN3_SERVER=%i", server_tid);
// TODO: Does the client need FDs?
_SysDebug("server_tid = %i, &server_tid = %p", server_tid, &server_tid);
sprintf(server_info, "AXWIN3_SERVER=%i", server_tid);
// TODO: Does the client need FDs?
- int rv = _SysSpawn(
c
sInterfaceApp, argv, envp, 0, NULL, NULL);
- if( rv ) {
+ int rv = _SysSpawn(
g
sInterfaceApp, argv, envp, 0, NULL, NULL);
+ if( rv
< 0
) {
_SysDebug("_SysSpawn chucked a sad, rv=%i, errno=%i", rv, _errno);
}
}
_SysDebug("_SysSpawn chucked a sad, rv=%i, errno=%i", rv, _errno);
}
}
@@
-112,8
+118,37
@@
int main(int argc, char *argv[])
return 0;
}
return 0;
}
+void PrintUsage(void)
+{
+ fprintf(stderr, "Arguments:\n");
+ fprintf(stderr, " --no-ui : Don't spawn the UI process\n");
+}
+
void ParseCommandline(int argc, char **argv)
{
void ParseCommandline(int argc, char **argv)
{
-
+ for( int i = 1; i < argc; i ++ )
+ {
+ if( argv[i][0] != '-' ) {
+ // Error?
+ PrintUsage();
+ exit(-1);
+ }
+ else if( argv[i][1] != '-' ) {
+ // Short
+ PrintUsage();
+ exit(-1);
+ }
+ else {
+ // Long
+ if( strcmp(argv[i], "--no-ui") == 0 ) {
+ gbNoSpawnUI = 1;
+ }
+ else {
+ // Error.
+ PrintUsage();
+ exit(-1);
+ }
+ }
+ }
}
}
UCC
git Repository :: git.ucc.asn.au