handle most of the rest of the wm properties

5 files changed, 46 insertions, 9 deletions

diff --git a/runes.c b/runes.c
index fac77b9..b1a513f 100644
--- a/runes.c
+++ b/runes.c
@@ -12,7 +12,7 @@ int main (int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    t = runes_term_create();
+    t = runes_term_create(argc, argv);
 
     runes_display_init(t);
 
diff --git a/term.c b/term.c
index 1e910b2..8c23619 100644
--- a/term.c
+++ b/term.c
@@ -2,13 +2,13 @@
 
 #include "runes.h"
 
-RunesTerm *runes_term_create()
+RunesTerm *runes_term_create(int argc, char *argv[])
 {
     RunesTerm *t;
 
     t = malloc(sizeof(RunesTerm));
 
-    t->w       = runes_window_create();
+    t->w       = runes_window_create(argc, argv);
     t->surface = runes_surface_create(t);
     t->cr      = cairo_create(t->surface);
     t->loop    = runes_loop_create(t);
diff --git a/term.h b/term.h
index 04ea3c2..68b3f9c 100644
--- a/term.h
+++ b/term.h
@@ -11,7 +11,7 @@ struct runes_term {
     uv_loop_t *loop;
 };
 
-RunesTerm *runes_term_create();
+RunesTerm *runes_term_create(int argc, char *argv[]);
 void runes_term_destroy(RunesTerm *t);
 
 #endif
diff --git a/xlib.c b/xlib.c
index 171ba12..88ee81f 100644
--- a/xlib.c
+++ b/xlib.c
@@ -1,16 +1,49 @@
 #include <cairo-xlib.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <X11/Xutil.h>
 
 #include "runes.h"
 
 static char *atom_names[RUNES_NUM_ATOMS] = {
     "WM_DELETE_WINDOW",
-    "_NET_WM_PING"
+    "_NET_WM_PING",
+    "_NET_WM_PID",
+    "_NET_WM_ICON_NAME",
+    "_NET_WM_NAME",
+    "UTF8_STRING"
 };
 
-RunesWindow *runes_window_create()
+static void runes_init_wm_properties(RunesWindow *w, int argc, char *argv[])
+{
+    pid_t pid;
+    XClassHint class_hints = { "runes", "runes" };
+    XWMHints wm_hints;
+    XSizeHints normal_hints;
+
+    wm_hints.flags = InputHint | StateHint;
+    wm_hints.input = True;
+    wm_hints.initial_state = NormalState;
+
+    /* XXX */
+    normal_hints.flags = 0;
+
+    XInternAtoms(w->dpy, atom_names, RUNES_NUM_ATOMS, False, w->atoms);
+    XSetWMProtocols(w->dpy, w->w, w->atoms, RUNES_NUM_PROTOCOL_ATOMS);
+
+    Xutf8SetWMProperties(w->dpy, w->w, "runes", "runes", argv, argc, &normal_hints, &wm_hints, &class_hints);
+
+    pid = getpid();
+    XChangeProperty(w->dpy, w->w, w->atoms[RUNES_ATOM_NET_WM_PID], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&pid, 1);
+
+    XChangeProperty(w->dpy, w->w, w->atoms[RUNES_ATOM_NET_WM_ICON_NAME], w->atoms[RUNES_ATOM_UTF8_STRING], 8, PropModeReplace, (unsigned char *)"runes", 5);
+    XChangeProperty(w->dpy, w->w, w->atoms[RUNES_ATOM_NET_WM_NAME], w->atoms[RUNES_ATOM_UTF8_STRING], 8, PropModeReplace, (unsigned char *)"runes", 5);
+}
+
+RunesWindow *runes_window_create(int argc, char *argv[])
 {
     RunesWindow *w;
     unsigned long white;
@@ -53,8 +86,7 @@ RunesWindow *runes_window_create()
         exit(1);
     }
 
-    XInternAtoms(w->dpy, atom_names, RUNES_NUM_ATOMS, False, w->atoms);
-    XSetWMProtocols(w->dpy, w->w, w->atoms, RUNES_NUM_ATOMS);
+    runes_init_wm_properties(w, argc, argv);
 
     return w;
 }
diff --git a/xlib.h b/xlib.h
index b26d6ee..2039f45 100644
--- a/xlib.h
+++ b/xlib.h
@@ -6,6 +6,11 @@
 enum runes_atoms {
     RUNES_ATOM_WM_DELETE_WINDOW,
     RUNES_ATOM_NET_WM_PING,
+    RUNES_NUM_PROTOCOL_ATOMS,
+    RUNES_ATOM_NET_WM_PID = 2,
+    RUNES_ATOM_NET_WM_ICON_NAME,
+    RUNES_ATOM_NET_WM_NAME,
+    RUNES_ATOM_UTF8_STRING,
     RUNES_NUM_ATOMS
 };
 
@@ -23,7 +28,7 @@ struct xlib_loop_data {
     XEvent e;
 };
 
-RunesWindow *runes_window_create();
+RunesWindow *runes_window_create(int argc, char *argv[]);
 cairo_surface_t *runes_surface_create(RunesTerm *t);
 void runes_loop_init(RunesTerm *t, uv_loop_t *loop);
 void runes_window_destroy(RunesWindow *w);