X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fmain.cc;h=71f7a75eb7c72473577a83938206ade40027e4b7;hb=652addd232e3f2a7c6c681b9669917e0a416331f;hp=3d5185350f121ba3d01d8738af03d6bdd47e0d3c;hpb=06413d7e30d8344ac09b64281c37fa2792a275f2;p=chaz%2Fopenbox

diff --git a/util/epist/main.cc b/util/epist/main.cc
index 3d518535..71f7a75e 100644
--- a/util/epist/main.cc
+++ b/util/epist/main.cc
@@ -1,5 +1,5 @@
 // -*- mode: C++; indent-tabs-mode: nil; -*-
-// main.cc for Epistory - a key handler for NETWM/EWMH window managers.
+// main.cc for Epistophy - a key handler for NETWM/EWMH window managers.
 // Copyright (c) 2002 - 2002 Ben Jansens <ben at orodu.net>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
@@ -21,9 +21,62 @@
 // DEALINGS IN THE SOFTWARE.
 
 #ifdef    HAVE_CONFIG_H
-#  include "../config.h"
+#  include "../../config.h"
 #endif // HAVE_CONFIG_H
 
-int main(int, char **) {
+extern "C" {
+#ifdef    HAVE_UNISTD_H
+#  include <sys/types.h>
+#  include <unistd.h>
+#endif // HAVE_UNISTD_H
+
+#ifdef    HAVE_STDIO_H
+#  include <stdio.h>
+#endif // HAVE_STDIO_H
+
+#ifdef    HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+}
+
+#include <iostream>
+#include <string>
+
+using std::cout;
+using std::endl;
+using std::string;
+
+#include "epist.hh"
+#include "../../src/i18n.hh"
+
+I18n i18n;
+
+int main(int argc, char **argv) {
+  i18n.openCatalog("openbox.cat");
+
+  // parse the command line
+  char *display_name = 0;
+  char *rc_file = 0;
+
+  for (int i = 1; i < argc; ++i) {
+    if (string(argv[i]) == "-display") {
+      if (++i >= argc) {
+        fprintf(stderr, i18n(mainSet, mainDISPLAYRequiresArg,
+                             "error: '-display' requires an argument\n"));
+        exit(1);
+      }
+      display_name = argv[i];
+    } else if (string(argv[i]) == "-rc") {
+      if (++i >= argc) {
+        fprintf(stderr, i18n(mainSet, mainRCRequiresArg,
+                             "error: '-rc' requires an argument\n"));
+        exit(1);
+      }
+      rc_file = argv[i];
+    }
+  }
+  
+  epist ep(argv, display_name, rc_file);
+  ep.eventLoop();
   return 0;
 }