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

expose exit_with_error

Browse source
This commit is contained in:
Dana Jansens 2003-07-31 16:56:35 +00:00
parent 732990d277
commit 52a6fc0830
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
openbox/openbox.c
View file

@ -67,8 +67,6 @@ static gchar *sm_save_file;
static void signal_handler(const ObEvent *e, void *data); static void signal_handler(const ObEvent *e, void *data);
static void parse_args(int argc, char **argv); static void parse_args(int argc, char **argv);
static void exit_with_error(gchar *msg);
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct sigaction action; struct sigaction action;
@ -132,7 +130,7 @@ int main(int argc, char **argv)
if (ob_display == NULL) if (ob_display == NULL)
exit_with_error("Failed to open the display."); exit_with_error("Failed to open the display.");
if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1) if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1)
exit_with_error("Failed to set display as close-on-exec."); ob_exit_with_error("Failed to set display as close-on-exec.");
if (sm_save_file) if (sm_save_file)
session_load(sm_save_file); session_load(sm_save_file);
@ -146,7 +144,7 @@ int main(int argc, char **argv)
ob_rr_inst = RrInstanceNew(ob_display, ob_screen); ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
if (ob_rr_inst == NULL) if (ob_rr_inst == NULL)
exit_with_error("Failed to initialize the render library."); ob_exit_with_error("Failed to initialize the render library.");
/* XXX fork self onto other screens */ /* XXX fork self onto other screens */
@ -238,7 +236,7 @@ int main(int argc, char **argv)
/* load the theme specified in the rc file */ /* load the theme specified in the rc file */
ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme); ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
if (ob_rr_theme == NULL) if (ob_rr_theme == NULL)
exit_with_error("Unable to load a theme."); ob_exit_with_error("Unable to load a theme.");
moveresize_startup(); moveresize_startup();
screen_startup(); screen_startup();
@ -404,7 +402,7 @@ static void parse_args(int argc, char **argv)
} }
} }
static void exit_with_error(gchar *msg) void ob_exit_with_error(gchar *msg)
{ {
g_critical(msg); g_critical(msg);
session_shutdown(); session_shutdown();

2
openbox/openbox.h
View file

@ -38,6 +38,8 @@ void ob_restart_other(const gchar *path);
void ob_restart(); void ob_restart();
void ob_exit(); void ob_exit();
void ob_exit_with_error(gchar *msg);
Cursor ob_cursor(ObCursor cursor); Cursor ob_cursor(ObCursor cursor);
KeyCode ob_keycode(ObKey key); KeyCode ob_keycode(ObKey key);