X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmain.cc;h=831974fb63aaf8a251a57d21dd4799cdda1409dd;hb=9247a7a616809e45bd26774d5aed7d24c618e6f2;hp=f192c0a191fe4f771e38f4cee57a52dfba9390aa;hpb=296c12c0361d64ad612d22154440ad4046938300;p=chaz%2Fopenbox diff --git a/src/main.cc b/src/main.cc index f192c0a1..831974fb 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,25 +1,4 @@ // -*- mode: C++; indent-tabs-mode: nil; -*- -// main.cc for Blackbox - an X11 Window manager -// Copyright (c) 2001 - 2002 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. #include "../version.h" @@ -52,62 +31,55 @@ extern "C" { #include 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(mainSet, mainUsage, - "Openbox %s : (c) 2002 - 2002 Ben Jansens\n" - " 2001 - 2002 Sean 'Shaleh' Perry\n" - " 1997 - 2000, 2002 Brad Hughes\n\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); + 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 - 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"), + 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(CommonSet, CommonYes, "yes"), + "yes", #else // !DEBUG - i18n(CommonSet, CommonNo, "no"), + "no", #endif // DEBUG #ifdef SHAPE - i18n(CommonSet, CommonYes, "yes"), + "yes", #else // !SHAPE - i18n(CommonSet, CommonNo, "no"), + "no", #endif // SHAPE #ifdef XFT - i18n(CommonSet, CommonYes, "yes"), + "yes", #else // !XFT - i18n(CommonSet, CommonNo, "no"), + "no", #endif // XFT #ifdef XINERAMA - i18n(CommonSet, CommonYes, "yes"), + "yes", #else // !XINERAMA - i18n(CommonSet, CommonNo, "no"), + "no", #endif // XINERAMA #ifdef ORDEREDPSEUDO - i18n(CommonSet, CommonYes, "yes") + "yes" #else // !ORDEREDPSEUDO - i18n(CommonSet, CommonNo, "no") + "no" #endif // ORDEREDPSEUDO ); @@ -119,16 +91,12 @@ int main(int argc, char **argv) { char *rc_file = (char *) 0; char *menu_file = (char *) 0; - i18n.openCatalog("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(mainSet, mainRCRequiresArg, - "error: '-rc' requires and argument\n")); + fprintf(stderr, "error: '-rc' requires and argument\n"); ::exit(1); } @@ -138,9 +106,7 @@ int main(int argc, char **argv) { // look for alternative menu file to use if ((++i) >= argc) { - fprintf(stderr, - i18n(mainSet, mainMENURequiresArg, - "error: '-menu' requires and argument\n")); + fprintf(stderr, "error: '-menu' requires and argument\n"); ::exit(1); } @@ -151,9 +117,7 @@ int main(int argc, char **argv) { // set by the environment variable DISPLAY if ((++i) >= argc) { - fprintf(stderr, - i18n(mainSet, mainDISPLAYRequiresArg, - "error: '-display' requires an argument\n")); + fprintf(stderr, "error: '-display' requires an argument\n"); ::exit(1); } @@ -163,16 +127,14 @@ int main(int argc, char **argv) { dtmp += session_display; if (putenv(const_cast(dtmp.c_str()))) { - fprintf(stderr, i18n(mainSet, mainWarnDisplaySet, - "warning: couldn't set environment variable 'DISPLAY'\n")); + 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) 2002 - 2002 Ben Jansens\n" - " 2001 - 2002 Sean 'Shaleh' Perry\n" - " 1997 - 2000, 2002 Brad Hughes\n\n", - __openbox_version); + printf("Openbox %s : (c) 2002 - 2002 Ben Jansens\n", + OPENBOX_VERSION); ::exit(0); } else if (! strcmp(argv[i], "-help")) { @@ -186,7 +148,7 @@ int main(int argc, char **argv) { _chdir2(getenv("X11ROOT")); #endif // __EMX__ - Blackbox blackbox(argv, session_display, rc_file, menu_file); + Blackbox blackbox(argv, session_display, rc_file); blackbox.eventLoop(); return(0);