X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmain.cc;h=831974fb63aaf8a251a57d21dd4799cdda1409dd;hb=1824e6b1006397ae3233dc164d3d026c54a20bb3;hp=84e0d90e6616ce29e6e6830d23fb6e80db97d9e2;hpb=a3a23c28f0fa4ed8b42ccde4a4b99aec60583df5;p=chaz%2Fopenbox diff --git a/src/main.cc b/src/main.cc index 84e0d90e..831974fb 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,30 +1,4 @@ -// main.cc for Openbox -// Copyright (c) 2001 Sean 'Shaleh' Perry -// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// 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 +// -*- mode: C++; indent-tabs-mode: nil; -*- #include "../version.h" @@ -32,18 +6,16 @@ # include "../config.h" #endif // HAVE_CONFIG_H -#include "i18n.h" -#include "openbox.h" - +extern "C" { #ifdef HAVE_STDIO_H # include #endif // HAVE_STDIO_H -#ifdef HAVE_STDLIB_H +#ifdef HAVE_STDLIB_H # include #endif // HAVE_STDLIB_H -#ifdef HAVE_STRING_H +#ifdef HAVE_STRING_H # include #endif // HAVE_STRING_H @@ -54,71 +26,62 @@ #ifdef HAVE_SYS_PARAM_H # include #endif // HAVE_SYS_PARAM_H +} + +#include +using std::string; -#ifndef MAXPATHLEN -#define MAXPATHLEN 255 -#endif // MAXPATHLEN +#include "blackbox.hh" 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 \t\tuse display connection.\n" - " -rc \t\t\tuse alternate resource file.\n" - " -menu \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("Openbox %s : (c) 2002 - 2002 Ben Jansens\n" + " -display \t\tuse display connection.\n" + " -rc \t\t\tuse alternate resource file.\n" + " -menu \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("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"), + "yes", #else // !DEBUG - i18n->getMessage(CommonSet, CommonNo, "no"), + "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"), + "yes", #else // !SHAPE - i18n->getMessage(CommonSet, CommonNo, "no"), + "no", #endif // SHAPE -#ifdef SLIT - i18n->getMessage(CommonSet, CommonYes, "yes"), -#else // !SLIT - i18n->getMessage(CommonSet, CommonNo, "no"), -#endif // SLIT +#ifdef XFT + "yes", +#else // !XFT + "no", +#endif // XFT + +#ifdef XINERAMA + "yes", +#else // !XINERAMA + "no", +#endif // XINERAMA #ifdef ORDEREDPSEUDO - i18n->getMessage(CommonSet, CommonYes, "yes"), + "yes" #else // !ORDEREDPSEUDO - i18n->getMessage(CommonSet, CommonNo, "no"), + "no" #endif // ORDEREDPSEUDO - -#ifndef NOCLOBBER - i18n->getMessage(CommonSet, CommonYes, "yes") -#else // !NOCLOBBER - i18n->getMessage(CommonSet, CommonNo, "no") -#endif // NOCLOBBER - ); + ); ::exit(exitval); } @@ -128,16 +91,12 @@ int main(int argc, char **argv) { char *rc_file = (char *) 0; char *menu_file = (char *) 0; - NLSInit("openbox.cat"); - for (int i = 1; i < argc; ++i) { if (! strcmp(argv[i], "-rc")) { // look for alternative rc file to use if ((++i) >= argc) { - fprintf(stderr, - i18n->getMessage(mainSet, mainRCRequiresArg, - "error: '-rc' requires and argument\n")); + fprintf(stderr, "error: '-rc' requires and argument\n"); ::exit(1); } @@ -147,9 +106,7 @@ int main(int argc, char **argv) { // look for alternative menu file to use if ((++i) >= argc) { - fprintf(stderr, - i18n->getMessage(mainSet, mainMENURequiresArg, - "error: '-menu' requires and argument\n")); + fprintf(stderr, "error: '-menu' requires and argument\n"); ::exit(1); } @@ -160,29 +117,24 @@ int main(int argc, char **argv) { // set by the environment variable DISPLAY if ((++i) >= argc) { - fprintf(stderr, - i18n->getMessage(mainSet, mainDISPLAYRequiresArg, - "error: '-display' requires an argument\n")); + fprintf(stderr, "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(dtmp.c_str()))) { + fprintf(stderr, + "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", + OPENBOX_VERSION); ::exit(0); } else if (! strcmp(argv[i], "-help")) { @@ -196,8 +148,8 @@ int main(int argc, char **argv) { _chdir2(getenv("X11ROOT")); #endif // __EMX__ - Openbox openbox(argc, argv, session_display, rc_file, menu_file); - openbox.eventLoop(); + Blackbox blackbox(argv, session_display, rc_file); + blackbox.eventLoop(); return(0); }