-// main.cc for Openbox
-// Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
+// -*- mode: C++; indent-tabs-mode: nil; -*-
+// main.cc for Blackbox - an X11 Window manager
+// Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh@debian.org>
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
//
// Permission is hereby granted, free of charge, to any person obtaining a
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
-// stupid macros needed to access some functions in version 2 of the GNU C
-// library
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
#include "../version.h"
#ifdef HAVE_CONFIG_H
# include "../config.h"
#endif // HAVE_CONFIG_H
-#include "i18n.h"
-#include "openbox.h"
-
+extern "C" {
#ifdef HAVE_STDIO_H
# include <stdio.h>
#endif // HAVE_STDIO_H
-#ifdef HAVE_STDLIB_H
+#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif // HAVE_STDLIB_H
-#ifdef HAVE_STRING_H
+#ifdef HAVE_STRING_H
# include <string.h>
#endif // HAVE_STRING_H
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif // HAVE_SYS_PARAM_H
+}
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 255
-#endif // MAXPATHLEN
+#include <string>
+using std::string;
+#include "i18n.hh"
+#include "blackbox.hh"
+
+
+I18n i18n; // initialized in main
static void showHelp(int exitval) {
// print program usage and command line options
- printf(i18n->getMessage(mainSet, mainUsage,
- "Openbox %s : (c) 2002 - 2002 Ben Jansens\n"
- "\t\t\t 2001 - 2002 Sean 'Shaleh' Perry\n\n"
- "\t\t\t 1997 - 2000 Brad Hughes\n\n"
- " -display <string>\t\tuse display connection.\n"
- " -rc <string>\t\t\tuse alternate resource file.\n"
- " -menu <string>\t\t\tuse alternate menu file.\n"
- " -version\t\t\tdisplay version and exit.\n"
- " -help\t\t\t\tdisplay this help text and exit.\n\n"),
- __openbox_version);
+ printf(i18n(mainSet, mainUsage,
+ "Openbox %s : (c) 2002 - 2002 Ben Jansens\n"
+ " 2001 - 2002 Sean 'Shaleh' Perry\n"
+ " 1997 - 2000, 2002 Brad Hughes\n\n"
+ " -display <string>\t\tuse display connection.\n"
+ " -rc <string>\t\t\tuse alternate resource file.\n"
+ " -menu <string>\t\tuse alternate menu file.\n"
+ " -version\t\t\tdisplay version and exit.\n"
+ " -help\t\t\t\tdisplay this help text and exit.\n\n"),
+ OPENBOX_VERSION);
// some people have requested that we print out compile options
// as well
- fprintf(stdout,i18n->getMessage(mainSet, mainCompileOptions,
- "Compile time options:\n"
- " Debugging:\t\t\t%s\n"
- " Interlacing:\t\t\t%s\n"
- " Shape:\t\t\t%s\n"
- " Slit:\t\t\t\t%s\n"
- " 8bpp Ordered Dithering:\t%s\n"
- " Event Clobbering:\t\t%s\n\n"),
+ printf(i18n(mainSet, mainCompileOptions,
+ "Compile time options:\n"
+ " Debugging:\t\t\t%s\n"
+ " Shape:\t\t\t%s\n"
+ " Xft:\t\t\t\t%s\n"
+ " Xinerama:\t\t\t%s\n"
+ " 8bpp Ordered Dithering:\t%s\n\n"),
#ifdef DEBUG
- i18n->getMessage(CommonSet, CommonYes, "yes"),
+ i18n(CommonSet, CommonYes, "yes"),
#else // !DEBUG
- i18n->getMessage(CommonSet, CommonNo, "no"),
+ i18n(CommonSet, CommonNo, "no"),
#endif // DEBUG
-#ifdef INTERLACE
- i18n->getMessage(CommonSet, CommonYes, "yes"),
-#else // !INTERLACE
- i18n->getMessage(CommonSet, CommonNo, "no"),
-#endif // INTERLACE
-
#ifdef SHAPE
- i18n->getMessage(CommonSet, CommonYes, "yes"),
+ i18n(CommonSet, CommonYes, "yes"),
#else // !SHAPE
- i18n->getMessage(CommonSet, CommonNo, "no"),
+ i18n(CommonSet, CommonNo, "no"),
#endif // SHAPE
-#ifdef SLIT
- i18n->getMessage(CommonSet, CommonYes, "yes"),
-#else // !SLIT
- i18n->getMessage(CommonSet, CommonNo, "no"),
-#endif // SLIT
+#ifdef XFT
+ i18n(CommonSet, CommonYes, "yes"),
+#else // !XFT
+ i18n(CommonSet, CommonNo, "no"),
+#endif // XFT
+
+#ifdef XINERAMA
+ i18n(CommonSet, CommonYes, "yes"),
+#else // !XINERAMA
+ i18n(CommonSet, CommonNo, "no"),
+#endif // XINERAMA
#ifdef ORDEREDPSEUDO
- i18n->getMessage(CommonSet, CommonYes, "yes"),
+ i18n(CommonSet, CommonYes, "yes")
#else // !ORDEREDPSEUDO
- i18n->getMessage(CommonSet, CommonNo, "no"),
+ i18n(CommonSet, CommonNo, "no")
#endif // ORDEREDPSEUDO
-
-#ifndef NOCLOBBER
- i18n->getMessage(CommonSet, CommonYes, "yes")
-#else // !NOCLOBBER
- i18n->getMessage(CommonSet, CommonNo, "no")
-#endif // NOCLOBBER
- );
+ );
::exit(exitval);
}
char *rc_file = (char *) 0;
char *menu_file = (char *) 0;
- NLSInit("openbox.cat");
+ i18n.openCatalog("openbox.cat");
for (int i = 1; i < argc; ++i) {
if (! strcmp(argv[i], "-rc")) {
if ((++i) >= argc) {
fprintf(stderr,
- i18n->getMessage(mainSet, mainRCRequiresArg,
+ i18n(mainSet, mainRCRequiresArg,
"error: '-rc' requires and argument\n"));
::exit(1);
if ((++i) >= argc) {
fprintf(stderr,
- i18n->getMessage(mainSet, mainMENURequiresArg,
- "error: '-menu' requires and argument\n"));
+ i18n(mainSet, mainMENURequiresArg,
+ "error: '-menu' requires and argument\n"));
::exit(1);
}
// set by the environment variable DISPLAY
if ((++i) >= argc) {
- fprintf(stderr,
- i18n->getMessage(mainSet, mainDISPLAYRequiresArg,
- "error: '-display' requires an argument\n"));
+ fprintf(stderr,
+ i18n(mainSet, mainDISPLAYRequiresArg,
+ "error: '-display' requires an argument\n"));
- ::exit(1);
+ ::exit(1);
}
session_display = argv[i];
- char dtmp[MAXPATHLEN];
- sprintf(dtmp, "DISPLAY=%s", session_display);
-
- if (putenv(dtmp)) {
- fprintf(stderr,
- i18n->
- getMessage(mainSet, mainWarnDisplaySet,
- "warning: couldn't set environment variable 'DISPLAY'\n"));
- perror("putenv()");
+ string dtmp = "DISPLAY=";
+ dtmp += session_display;
+
+ if (putenv(const_cast<char*>(dtmp.c_str()))) {
+ fprintf(stderr, i18n(mainSet, mainWarnDisplaySet,
+ "warning: couldn't set environment variable 'DISPLAY'\n"));
+ perror("putenv()");
}
} else if (! strcmp(argv[i], "-version")) {
// print current version string
- printf("Openbox %s : (c) 1997 - 2000 Brad Hughes\n"
- "\t\t\t 2001 - 2002 Sean 'Shaleh' Perry\n",
- __openbox_version);
+ printf("Openbox %s : (c) 2002 - 2002 Ben Jansens\n"
+ " 2001 - 2002 Sean 'Shaleh' Perry\n"
+ " 1997 - 2000, 2002 Brad Hughes\n\n",
+ OPENBOX_VERSION);
::exit(0);
} else if (! strcmp(argv[i], "-help")) {
_chdir2(getenv("X11ROOT"));
#endif // __EMX__
- Openbox openbox(argc, argv, session_display, rc_file, menu_file);
- openbox.eventLoop();
+ Blackbox blackbox(argv, session_display, rc_file, menu_file);
+ blackbox.eventLoop();
return(0);
}
projects / chaz / openbox / blobdiff