nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add -help -version -sync and -rc cmd line options

Browse source
This commit is contained in:
Dana Jansens 2003-03-20 22:14:15 +00:00
parent 17cc975cc9
commit 35c095014e
2 changed files with 54 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
openbox/openbox.c
View file

@ -49,10 +49,12 @@ gboolean ob_shutdown = FALSE;
gboolean ob_restart = FALSE; gboolean ob_restart = FALSE;
char *ob_restart_path = NULL; char *ob_restart_path = NULL;
gboolean ob_remote = FALSE; gboolean ob_remote = FALSE;
gboolean ob_sync = TRUE; gboolean ob_sync = FALSE;
Cursors ob_cursors; Cursors ob_cursors;
char *ob_rc_path = NULL;
void signal_handler(const ObEvent *e, void *data); void signal_handler(const ObEvent *e, void *data);
void parse_args(int argc, char **argv);
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@ -89,8 +91,8 @@ int main(int argc, char **argv)
/* anything that died while we were restarting won't give us a SIGCHLD */ /* anything that died while we were restarting won't give us a SIGCHLD */
while (waitpid(-1, NULL, WNOHANG) > 0); while (waitpid(-1, NULL, WNOHANG) > 0);
/* XXX parse out command line args */ /* parse out command line args */
(void)argc;(void)argv; parse_args(argc, argv);
ob_display = XOpenDisplay(NULL); ob_display = XOpenDisplay(NULL);
if (ob_display == NULL) { if (ob_display == NULL) {
@ -194,7 +196,7 @@ int main(int argc, char **argv)
/* re-run me */ /* re-run me */
execvp(argv[0], argv); /* try how we were run */ execvp(argv[0], argv); /* try how we were run */
execlp("ob3", "ob3", NULL); /* try this as a last resort */ execlp(BINARY, BINARY, NULL); /* try this as a last resort */
} }
return 0; return 0;
@ -228,3 +230,46 @@ void signal_handler(const ObEvent *e, void *data)
g_error("Caught signal %d. Aborting and dumping core.", s); g_error("Caught signal %d. Aborting and dumping core.", s);
} }
} }
void print_version()
{
g_print("Openbox %s\n\n", VERSION);
g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
g_print("This is free software, and you are welcome to redistribute it\n");
g_print("under certain conditions. See the file COPYING for details.\n\n");
}
void print_help()
{
print_version();
g_print("Syntax: %s [options]\n\n", BINARY);
g_print("Options:\n\n");
g_print(" -rc PATH Specify the path to the rc file to use\n");
g_print(" -help Display this help and exit\n");
g_print(" -version Display the version and exit\n");
g_print(" -sync Run in synchronous mode (this is slow and meant\n"
" for debugging X routines)\n");
g_print("\nPlease report bugs at %s\n", BUGURL);
}
void parse_args(int argc, char **argv)
{
int i;
for (i = 1; i < argc; ++i) {
if (!strcmp(argv[i], "-version")) {
print_version();
exit(0);
} else if (!strcmp(argv[i], "-help")) {
print_help();
exit(0);
} else if (!strcmp(argv[i], "-sync")) {
ob_sync = TRUE;
} else if (!strcmp(argv[i], "-rc")) {
if (i == argc - 1) /* no args left */
g_printerr("-rc requires an argument\n");
else
ob_rc_path = argv[++i];
}
}
}

7
openbox/openbox.h
View file

@ -19,7 +19,7 @@ typedef enum {
} State; } State;
/* The state of execution of the window manager */ /* The state of execution of the window manager */
State ob_state; extern State ob_state;
/*! When set to true, Openbox will exit */ /*! When set to true, Openbox will exit */
extern gboolean ob_shutdown; extern gboolean ob_shutdown;
@ -39,6 +39,9 @@ typedef struct Cursors {
Cursor ll_angle; Cursor ll_angle;
Cursor lr_angle; Cursor lr_angle;
} Cursors; } Cursors;
Cursors ob_cursors; extern Cursors ob_cursors;
/*! The path of the rc file. If NULL the default paths are searched for one. */
extern char *ob_rc_path;
#endif #endif