X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fxftlsfonts.cc;h=d02758e28b5dfbc21012c5d42217e91785ac98c5;hb=d9e7a7b8cd667cc6e11add9062d3c12ef21b6fda;hp=0651065bbd6096d6feaed4101d48fe3b347c3005;hpb=b065c29aa6c95e3342612867ca160c9c43a6f364;p=chaz%2Fopenbox

diff --git a/util/xftlsfonts.cc b/util/xftlsfonts.cc
index 0651065b..d02758e2 100644
--- a/util/xftlsfonts.cc
+++ b/util/xftlsfonts.cc
@@ -1,3 +1,24 @@
+const char *NAME = "xftlsfonts";
+const char *VERSION = "1.0";
+
+#ifdef    HAVE_CONFIG_H
+#include "../config.h"
+#endif // HAVE_CONFIG_H
+
+#ifndef   XFT
+#include <iostream>
+using std::cout;
+using std::endl;
+
+int main(int, char **) {
+  cout << NAME << " version " << VERSION << endl;
+  cout << "Copyright (c) 2002, Ben Jansens <ben@orodu.net>" << endl;
+  cout << endl;
+  cout << "Openbox was built without support for Xft fonts. This utility must"
+    << endl;
+  cout << "must be built with Xft support in order to function." << endl;
+}
+#else  // XFT
 extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
@@ -7,9 +28,6 @@ extern "C" {
 #include <string>
 #include <vector>
 
-const char *NAME = "xftlsfonts";
-const char *VERSION = "1.0";
-
 using std::string;
 using std::cout;
 using std::endl;
@@ -34,11 +52,15 @@ int main(int argc, char **argv) {
       }
 
   Display *display = XOpenDisplay(NULL);
+  if (! display) {
+    cout << "Failed to open connection to X display\n";
+    return 2;
+  }
 
   XftObjectSet *obj = XftObjectSetCreate();
   if (! obj) {
     cout << "Failed to create an XftObjectSet\n";
-    exit(2);
+    return 2;
   }
 
   XftObjectSetAdd(obj, XFT_FAMILY);
@@ -106,12 +128,14 @@ int main(int argc, char **argv) {
           cout << val.u.b;
           break;
 
+#ifdef XFT_UTF8
         case XftTypeMatrix:
           cout << "xx(" << val.u.m->xx << ") ";
           cout << "xy(" << val.u.m->xy << ") ";
           cout << "yx(" << val.u.m->yx << ") ";
           cout << "yy(" << val.u.m->yy << ")";
           break;
+#endif
         }
       } while ((vallist = vallist->next));
       cout << endl;
@@ -125,3 +149,5 @@ int main(int argc, char **argv) {
   XCloseDisplay(display);
   return 0;
 }
+#endif // XFT
+