openbox.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "openbox.h"
#include "session.h"
#include "dock.h"
+#include "modkeys.h"
#include "event.h"
#include "menu.h"
#include "client.h"
gint main(gint argc, gchar **argv)
{
-#ifdef DEBUG
- ob_debug_show_output(TRUE);
-#endif
-
state = OB_STATE_STARTING;
/* initialize the locale */
if (!setlocale(LC_ALL, ""))
- g_warning("Couldn't set locale from environment.\n");
+ g_message(_("Couldn't set locale from environment."));
bindtextdomain(PACKAGE_NAME, LOCALEDIR);
bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
textdomain(PACKAGE_NAME);
g_set_prgname(argv[0]);
if (chdir(g_get_home_dir()) == -1)
- g_warning("Unable to change to home directory (%s): %s",
+ g_message(_("Unable to change to home directory '%s': %s"),
g_get_home_dir(), g_strerror(errno));
/* parse out command line args */
* remote_control = 1 -> reconfigure
* remote_control = 2 -> restart */
PROP_MSG(RootWindow(ob_display, ob_screen),
- ob_control, remote_control, 0, 0, 0);
+ openbox_control, remote_control, 0, 0, 0);
XCloseDisplay(ob_display);
exit(EXIT_SUCCESS);
}
/* check for locale support */
if (!XSupportsLocale())
- g_warning("X server does not support locale.");
+ g_message(_("X server does not support locale."));
if (!XSetLocaleModifiers(""))
- g_warning("Cannot set locale modifiers for the X server.");
+ g_message(_("Cannot set locale modifiers for the X server."));
/* set our error handler */
XSetErrorHandler(xerror_handler);
xmlDocPtr doc;
xmlNodePtr node;
+ modkeys_startup(reconfigure);
+
/* startup the parsing so everything can register sections
of the rc */
i = parse_startup();
PROP_SETS(RootWindow(ob_display, ob_screen),
openbox_rc, config_file);
parse_tree(i, doc, node->xmlChildrenNode);
- } else
+ } else {
+ g_message(_("Unable to find a valid config file, using some simple defaults"));
PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_rc);
+ }
/* we're done with parsing now, kill it */
parse_close(doc);
parse_shutdown(i);
config_font_activewindow,
config_font_inactivewindow,
config_font_menutitle,
- config_font_menuitem)))
+ config_font_menuitem,
+ config_font_osd)))
{
RrThemeFree(ob_rr_theme);
ob_rr_theme = theme;
window_shutdown(reconfigure);
event_shutdown(reconfigure);
config_shutdown();
+ modkeys_shutdown(reconfigure);
} while (reconfigure);
}
execvp(argvp[0], argvp);
g_strfreev(argvp);
} else {
- g_warning("failed to execute '%s': %s", restart_path,
- err->message);
+ g_message(
+ _("Restart failed to execute new executable '%s': %s"),
+ restart_path, err->message);
g_error_free(err);
}
}
static void print_version()
{
g_print("Openbox %s\n", PACKAGE_VERSION);
- g_print("Copyright (c) 2007 Mikael Magnusson\n");
- g_print("Copyright (c) 2003-2007 Dana Jansens\n\n");
+ g_print(_("Copyright (c)"));
+ g_print(" 2007 Mikael Magnusson\n");
+ g_print(_("Copyright (c)"));
+ g_print(" 2003-2007 Dana Jansens\n\n");
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");
static void print_help()
{
- g_print("Syntax: openbox [options]\n\n");
- g_print("Options:\n\n");
- g_print(" --reconfigure Tell the currently running instance of "
- "Openbox to\n"
- " reconfigure (and then exit immediately)\n");
- g_print(" --config-file FILE Specify the file to load for the config "
- "file\n");
+ g_print(_("Syntax: openbox [options]\n"));
+ g_print(_("\nOptions:\n\n"));
+ g_print(_(" --config-file FILE Specify the file to load for the config file\n"));
#ifdef USE_SM
- g_print(" --sm-disable Disable connection to session manager\n");
- g_print(" --sm-client-id ID Specify session management ID\n");
- g_print(" --sm-save-file FILE Specify file to load a saved session"
- "from\n");
+ g_print(_(" --sm-disable Disable connection to session manager\n"));
+ g_print(_(" --sm-client-id ID Specify session management ID\n"));
+ g_print(_(" --sm-save-file FILE Specify file to load a saved session from\n"));
#endif
- g_print(" --replace Replace the currently running window "
- "manager\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 for\n"
- " debugging X routines)\n");
- g_print(" --debug Display debugging output\n");
- g_print(" --debug-focus Display debugging output\n");
- g_print("\nPlease report bugs at %s\n\n", PACKAGE_BUGREPORT);
+ g_print(_(" --replace Replace the currently running window manager\n"));
+ g_print(_(" --help Display this help and exit\n"));
+ g_print(_(" --version Display the version and exit\n"));
+ g_print(_("\nPassing messages to a running Openbox instance:\n\n"));
+ g_print(_(" --reconfigure Reload Openbox's configuration\n"));
+ g_print(_("\nDebugging options:\n\n"));
+ g_print(_(" --sync Run in synchronous mode\n"));
+ g_print(_(" --debug Display debugging output\n"));
+ g_print(_(" --debug-focus Display debugging output for focus handling\n"));
+ g_print(_("\nPlease report bugs at %s\n\n"), PACKAGE_BUGREPORT);
}
static void parse_args(gint argc, gchar **argv)
xsync = TRUE;
} else if (!strcmp(argv[i], "--debug")) {
ob_debug_show_output(TRUE);
+ ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
} else if (!strcmp(argv[i], "--debug-focus")) {
ob_debug_show_output(TRUE);
+ ob_debug_enable(OB_DEBUG_APP_BUGS, TRUE);
ob_debug_enable(OB_DEBUG_FOCUS, TRUE);
} else if (!strcmp(argv[i], "--reconfigure")) {
remote_control = 1;
projects / chaz / openbox / blobdiff