Merge branch 'master' into chaz

[chaz/openbox] / tests / title.c

diff --git a/tests/title.c b/tests/title.c
index 8bf730819bed4b121b8ab02c09259eea979688a0..799bdf54dc804e335b8689c9710b6d2d9757d8c9 100644 (file)
--- a/tests/title.c
+++ b/tests/title.c
@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
-   noresize.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   title.c for the Openbox window manager
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
    See the COPYING file for a copy of the GNU General Public License.
 */
 
+#include <string.h>
 #include <stdio.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -27,6 +28,7 @@ int main (int argc, char **argv) {
   int        x=10,y=10,h=100,w=400;
   XSizeHints size;
   XTextProperty name;
+  Atom nameprop,nameenc;
 
   if (argc < 2) return 1;
 
@@ -37,17 +39,28 @@ int main (int argc, char **argv) {
     return 0;
   }
 
+  if (argc > 2)
+    nameprop = XInternAtom(display,argv[2],False);
+  else
+    nameprop = XInternAtom(display,"WM_NAME",False);
+  if (argc > 3)
+    nameenc = XInternAtom(display,argv[3],False);
+  else
+    nameenc = XInternAtom(display,"STRING",False);
+
   win = XCreateWindow(display, RootWindow(display, 0),
                      x, y, w, h, 10, CopyFromParent, CopyFromParent,
                      CopyFromParent, 0, NULL);
 
-  XSetWindowBackground(display,win,WhitePixel(display,0)); 
+  XSetWindowBackground(display,win,WhitePixel(display,0));
+
+//  XStringListToTextProperty(&argv[1], 1, &name);
+//  XSetWMName(display, win, &name);
+  XChangeProperty(display, win, nameprop, nameenc, 8,
+                  PropModeAppend, argv[1], strlen(argv[1]));
 
-  XStringListToTextProperty(&argv[1], 1, &name);
-  XSetWMName(display, win, &name);
-  
-  XMapWindow(display, win);
   XFlush(display);
+  XMapWindow(display, win);
 
   XSelectInput(display, win, ExposureMask | StructureNotifyMask);