Set pager window properties

[pager.git] / pager.c

diff --git a/pager.c b/pager.c
index e18a3d1..e7aa43a 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -56,6 +56,22 @@ void setup_atom(Atom *atom, const char *prop) {
   exit(111);
 }
 
+/* Don't page the pager. */
+void setup_pager() {
+  long states = { skip_pager_state };
+  char buffer[16];
+
+  XChangeProperty(DADisplay, DAWindow, client_state_atom, XA_ATOM, 32, PropModeAppend, &states, 1);
+
+  if (desktop >= 0) {
+    if (snprintf(buffer, sizeof(buffer), "Desktop %d", desktop + 1) < 0) return;
+  }
+  else {
+    if (snprintf(buffer, sizeof(buffer), "All desktops") < 0) return;
+  }
+  XStoreName(DADisplay, DAWindow, buffer);
+}
+
 void get_atom_longs(Atom atom, Atom type, Window window, long **data, unsigned long *num_items) {
   Atom actual;
   int format;
@@ -148,9 +164,6 @@ void enumerate_clients(client_t ***clients, unsigned long *num_clients, unsigned
     if (client_list_supported) client = data[i];
     else client = XmuClientWindow(DADisplay, wins[i]);
 
-    /* Don't page the pager. */
-    if (client == DAWindow) continue;
-
     /* Check the window is on our desktop (or all desktops). */
     client_desktop = get_atom_long(client_desktop_atom, XA_CARDINAL, client);
     if (desktop > -1) {
@@ -298,6 +311,25 @@ void release(int button, int state, int x, int y) {
   if (button == drag_button) drag_window = 0;
 }
 
+void draw_window(Pixmap pixmap, GC gc, client_t *client) {
+  /* Draw a blob for the window. */
+  XFillRectangle(DADisplay, pixmap, gc, client->rect.x, client->rect.y, client->rect.width, client->rect.height);
+  if (client->rect.width < 2 || client->rect.height < 2) return;
+
+  /* Draw a border around the window. */
+  XDrawLine(DADisplay, pixmap, window_border1GC, client->rect.x, client->rect.y, client->rect.x, client->rect.y + client->rect.height - 2);
+  XDrawLine(DADisplay, pixmap, window_border1GC, client->rect.x + 1, client->rect.y, client->rect.x + client->rect.width - 1, client->rect.y);
+  XDrawLine(DADisplay, pixmap, window_border2GC, client->rect.x, client->rect.y + client->rect.height - 1, client->rect.x + client->rect.width - 1, client->rect.y + client->rect.height - 1);
+  XDrawLine(DADisplay, pixmap, window_border2GC, client->rect.x + client->rect.width - 1, client->rect.y + 1, client->rect.x + client->rect.width - 1, client->rect.y + client->rect.height - 2);
+
+  if (dockapp_attr.width <= DOCKAPP_SIZE * 2) return;
+  if (dockapp_attr.height <= DOCKAPP_SIZE * 2) return;
+
+  /* Draw a drop shadow. */
+  XDrawLine(DADisplay, pixmap, dockapp_border2GC, client->rect.x + 1, client->rect.y + client->rect.height, client->rect.x + client->rect.width, client->rect.y + client->rect.height);
+  XDrawLine(DADisplay, pixmap, dockapp_border2GC, client->rect.x + client->rect.width, client->rect.y + 1, client->rect.x + client->rect.width, client->rect.y + client->rect.height);
+}
+
 void page() {
   Window active_window;
   Pixmap pixmap;
@@ -332,13 +364,7 @@ void page() {
     else if ((long) clients[i]->window == active_window) gc = active_windowGC;
     else gc = inactive_windowGC;
 
-    XFillRectangle(DADisplay, pixmap, gc, clients[i]->rect.x, clients[i]->rect.y, clients[i]->rect.width, clients[i]->rect.height);
-    if (clients[i]->rect.width < 2 || clients[i]->rect.height < 2) continue;
-
-    XDrawLine(DADisplay, pixmap, window_border1GC, clients[i]->rect.x, clients[i]->rect.y, clients[i]->rect.x, clients[i]->rect.y + clients[i]->rect.height - 2);
-    XDrawLine(DADisplay, pixmap, window_border1GC, clients[i]->rect.x + 1, clients[i]->rect.y, clients[i]->rect.x + clients[i]->rect.width - 1, clients[i]->rect.y);
-    XDrawLine(DADisplay, pixmap, window_border2GC, clients[i]->rect.x, clients[i]->rect.y + clients[i]->rect.height - 1, clients[i]->rect.x + clients[i]->rect.width - 1, clients[i]->rect.y + clients[i]->rect.height - 1);
-    XDrawLine(DADisplay, pixmap, window_border2GC, clients[i]->rect.x + clients[i]->rect.width - 1, clients[i]->rect.y + 1, clients[i]->rect.x + clients[i]->rect.width - 1, clients[i]->rect.y + clients[i]->rect.height - 2);
+    draw_window(pixmap, gc, clients[i]);
   }
 
   destroy_clients(&clients, num_clients);
@@ -426,6 +452,7 @@ int main(int argc, char **argv) {
 
   XSetErrorHandler(error_handler);
   setup_GCs();
+  setup_pager();
   DAShow();
   DAEventLoop();