X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=pager.c;h=4d99ae321f358498d36251dc6eb0c57474a021ca;hb=HEAD;hp=85dfd5fb9d55f44e5dd3335021d37648c1d5c4a1;hpb=73198f96e32d9dbd88abe5bc35d4dac3dc1647a6;p=pager.git

diff --git a/pager.c b/pager.c
index 85dfd5f..4d99ae3 100644
--- a/pager.c
+++ b/pager.c
@@ -1,9 +1,7 @@
 /* gcc -o pager pager.c -lX11 -lXmu -ldockapp */
-#if 0
-#include <X11/extensions/Xrender.h>
-#endif
 #include <X11/Xatom.h>
 #include <dockapp.h>
+#include <string.h>
 
 #define DOCKAPP_SIZE 56
 #define SPEED 100
@@ -13,17 +11,17 @@
 
 static GC dockapp_border1GC, dockapp_border2GC, window_border1GC, window_border2GC, active_desktopGC, inactive_desktopGC, active_windowGC, inactive_windowGC;
 static Atom supported_atom, num_desktops_atom, desktop_geometry_atom, current_desktop_atom, client_list_atom, client_desktop_atom, client_state_atom, active_window_atom, moveresize_window_atom;
-static Atom above_state, below_state, shaded_state, skip_pager_state, hidden_state;
-static long desktop = -1;
+static Atom shaded_state, skip_pager_state, hidden_state;
+static int desktop = -1;
 static Window drag_window;
 static int drag_x, drag_y;
 static int drag_button;
-static int dockapp_x, dockapp_y, dockapp_width, dockapp_height;
-static unsigned int dockapp_border, dockapp_depth;
-static double scale;
+static XWindowAttributes dockapp_attr;
+static double aspect, scale;
 
 static int desktop_geometry_supported;
 static int current_desktop_supported;
+static int client_list_supported;
 static int active_window_supported;
 static int moveresize_supported;
 
@@ -34,7 +32,6 @@ typedef struct {
 
 int error_handler(Display *display, XErrorEvent *event) {
   char buffer[512];
-  int length;
 
   switch (event->error_code) {
     case BadWindow:
@@ -59,24 +56,43 @@ void setup_atom(Atom *atom, const char *prop) {
   exit(111);
 }
 
-void get_atom_longs(Atom atom, Atom type, Window window, long **data, unsigned long *num_items) {
+/* 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, (unsigned char *) &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);
+}
+
+int get_atom_longs(Atom atom, Atom type, Window window, long **data, unsigned long *num_items) {
   Atom actual;
   int format;
   unsigned long num_bytes;
 
-  XGetWindowProperty(DADisplay, window, atom, 0, 8192, False, type, &actual, &format, num_items, &num_bytes, (unsigned char **) data);
+  return XGetWindowProperty(DADisplay, window, atom, 0, 8192, False, type, &actual, &format, num_items, &num_bytes, (unsigned char **) data);
 }
 
-long get_atom_long(Atom atom, Atom type, Window window) {
+int get_atom_long(Atom atom, Atom type, Window window, long *ret) {
   long *data;
-  long ret = 0;
+  int status;
   unsigned long num_items;
 
-  get_atom_longs(atom, type, window, &data, &num_items);
-  if (num_items) ret = data[0];
+  *ret = 0;
+
+  status = get_atom_longs(atom, type, window, &data, &num_items);
+  if (status != Success) return status;
+  if (num_items) *ret = data[0];
   XFree(data);
 
-  return ret;
+  return status;
 }
 
 void check_support() {
@@ -87,6 +103,7 @@ void check_support() {
   for (i = 0; i < num_items; i++) {
     if (data[i] == desktop_geometry_atom) desktop_geometry_supported = 1;
     if (data[i] == current_desktop_atom) current_desktop_supported = 1;
+    if (data[i] == client_list_atom) client_list_supported = 1;
     if (data[i] == active_window_atom) active_window_supported = 1;
     if (data[i] == moveresize_window_atom) moveresize_supported = 1;
   }
@@ -95,7 +112,7 @@ void check_support() {
 }
 
 void enumerate_clients(client_t ***clients, unsigned long *num_clients, unsigned long *active_desktop, unsigned long *active_window) {
-  Window root, dockapp_root, child;
+  Window root, qroot, qparent, child, *wins, client;
   int x, y;
   unsigned int width, height, border, depth;
   unsigned int root_width, root_height;
@@ -108,7 +125,7 @@ void enumerate_clients(client_t ***clients, unsigned long *num_clients, unsigned
   if (desktop_geometry_supported) {
     get_atom_longs(desktop_geometry_atom, XA_CARDINAL, DefaultRootWindow(DADisplay), &states, &num_states);
     root_width = states[0];
-    root_height = states[0];
+    root_height = states[1];
     XFree(states);
   }
   else {
@@ -116,13 +133,22 @@ void enumerate_clients(client_t ***clients, unsigned long *num_clients, unsigned
     root_height = DisplayWidth(DADisplay, DefaultScreen(DADisplay));
   }
 
-  XGetGeometry(DADisplay, DAWindow, &dockapp_root, &dockapp_x, &dockapp_y, &dockapp_width, &dockapp_height, &dockapp_border, &dockapp_depth);
-  scale = (double) root_width / (double) dockapp_width;
+  *num_clients = 0;
+  *clients = 0;
 
-  *active_window = get_atom_long(active_window_atom, XA_WINDOW, dockapp_root);
-  *active_desktop = get_atom_long(current_desktop_atom, XA_CARDINAL, DefaultRootWindow(DADisplay));
+  if (! XGetWindowAttributes(DADisplay, DAWindow, &dockapp_attr)) return;
+  scale = (double) root_width / (double) dockapp_attr.width;
+  aspect = (double) root_height / (double) dockapp_attr.height;
 
-  get_atom_longs(client_list_atom, XA_WINDOW, dockapp_root, &data, num_clients);
+  if (get_atom_long(active_window_atom, XA_WINDOW, dockapp_attr.root, (long *) active_window) != Success) *active_window = 0;
+  if (get_atom_long(current_desktop_atom, XA_CARDINAL, DefaultRootWindow(DADisplay), (long *) active_desktop) != Success) *active_desktop = 0;
+
+  if (client_list_supported) {
+    if (get_atom_longs(client_list_atom, XA_WINDOW, dockapp_attr.root, &data, num_clients) != Success) XFree(data);
+  }
+  else {
+    XQueryTree(DADisplay, dockapp_attr.root, &qroot, &qparent, &wins, (unsigned int *) num_clients);
+  }
 
   *clients = (client_t **) malloc(sizeof(client_t *) * *num_clients);
   if (! *clients) {
@@ -138,34 +164,46 @@ void enumerate_clients(client_t ***clients, unsigned long *num_clients, unsigned
     }
     (*clients)[i]->window = 0;
 
+    if (client_list_supported) client = data[i];
+    else client = XmuClientWindow(DADisplay, wins[i]);
+
     /* Check the window is on our desktop (or all desktops). */
-    client_desktop = get_atom_long(client_desktop_atom, XA_CARDINAL, data[i]);
-    if (client_desktop != desktop && client_desktop != -1) continue;
+    if (get_atom_long(client_desktop_atom, XA_CARDINAL, client, &client_desktop) != Success) continue;
+    if (desktop > -1) {
+      if (client_desktop != desktop && client_desktop != -1) continue;
+    }
+    else {
+      if (client_desktop != *active_desktop && client_desktop != -1) continue;
+    }
 
     /* Try to get its dimensions. */
-    if (! XGetGeometry(DADisplay, data[i], &root, &x, &y, &width, &height, &border, &depth)) continue;
-    if (! XTranslateCoordinates(DADisplay, data[i], root, x, y, &x, &y, &child)) continue;
+    if (! XGetGeometry(DADisplay, client, &root, &x, &y, &width, &height, &border, &depth)) continue;
+    if (! XTranslateCoordinates(DADisplay, client, root, x, y, &x, &y, &child)) continue;
 
     /* Make sure it isn't hidden or shaded. */
     draw = 1;
-    get_atom_longs(client_state_atom, XA_ATOM, data[i], &states, &num_states);
-    for (j = 0; j < num_states; j++) {
-      if (states[j] == shaded_state) draw = 0;
-      if (states[j] == skip_pager_state) draw = 0;
-      if (states[j] == hidden_state) draw = 0;
+    if (get_atom_longs(client_state_atom, XA_ATOM, client, &states, &num_states) == Success) {
+      for (j = 0; j < num_states; j++) {
+        if (states[j] == shaded_state) height = 3.0 * scale;
+        if (states[j] == skip_pager_state) draw = 0;
+        if (states[j] == hidden_state) draw = 0;
+      }
+      XFree(states);
     }
+    else continue;
     if (! draw) continue;
 
-    (*clients)[i]->window = data[i];
+    (*clients)[i]->window = client;
 
     /* Scale it. */
     (*clients)[i]->rect.x = (double) x / scale;
-    (*clients)[i]->rect.y = (double) y / scale;
+    (*clients)[i]->rect.y = (double) y / aspect;
     (*clients)[i]->rect.width = (double) width / scale;
-    (*clients)[i]->rect.height = (double) height / scale;
+    (*clients)[i]->rect.height = (double) height / aspect;
   }
 
-  XFree(data);
+  if (client_list_supported) XFree(data);
+  else XFree(wins);
 }
 
 void destroy_clients(client_t ***clients, unsigned long num_clients) {
@@ -173,7 +211,7 @@ void destroy_clients(client_t ***clients, unsigned long num_clients) {
 
   if (! *clients) return;
 
-  for (i = 0; i < num_clients; i++) free((*clients)[i]);
+  for (i = 0; i < num_clients; i++) if ((*clients)[i]) free((*clients)[i]);
   free(*clients);
 }
 
@@ -259,20 +297,10 @@ void change(int button, int state, int x, int y) {
     if (! clients[i]->window) continue;
     if (! clicked(&clients[i]->rect, x, y)) continue;
 
-    if (button == 4) {
-      client_message(client_state_atom, clients[i]->window, 0, above_state, 0, 0, 0);
-      client_message(client_state_atom, clients[i]->window, 1, below_state, 0, 0, 0);
-    }
-    else if (button == 5) {
-      client_message(client_state_atom, clients[i]->window, 0, below_state, 0, 0, 0);
-      client_message(client_state_atom, clients[i]->window, 1, above_state, 0, 0, 0);
-    }
-    else {
-      drag_window = clients[i]->window;
-      drag_button = button;
-      drag_x = x - clients[i]->rect.x;
-      drag_y = y - clients[i]->rect.y;
-    }
+    drag_window = (Window) clients[i]->window;
+    drag_button = button;
+    drag_x = x - clients[i]->rect.x;
+    drag_y = y - clients[i]->rect.y;
     break;
   }
   destroy_clients(&clients, num_clients);
@@ -289,44 +317,40 @@ void release(int button, int state, int x, int y) {
   if (button == drag_button) drag_window = 0;
 }
 
-void move(int x, int y) {
-  long dest_x, dest_y;
+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;
 
-  if (! drag_window) return;
-  if (x < 0 || y < 0) return;
-  if (x >= dockapp_width || y >= dockapp_height) return;
-
-  dest_x = (long) ((double) (x - drag_x) * scale);
-  dest_y = (long) ((double) (y - drag_y) * scale);
+  /* 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 (moveresize_supported) {
-    client_message(moveresize_window_atom, drag_window, StaticGravity | (3 << 8) | (FromTool << 12), drag_x, drag_y, 0, 0);
-  }
-  else {
-    XMoveWindow(DADisplay, drag_window, dest_x, dest_y);
-  }
+  if (dockapp_attr.width <= DOCKAPP_SIZE * 2) return;
+  if (dockapp_attr.height <= DOCKAPP_SIZE * 2) return;
 
-  page();
+  /* 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 child, active_window;
-  XWindowAttributes attr;
+  Window active_window;
   Pixmap pixmap;
-  DARect rect;
-  long i, j;
+  long i;
   unsigned long num_clients;
-  long client_desktop, active_desktop;
-  int active;
+  unsigned long active_desktop;
   GC gc;
   client_t **clients;
 
   enumerate_clients(&clients, &num_clients, &active_desktop, &active_window);
 
-  pixmap = DAMakePixmap();
-  if (active_desktop == desktop) gc = active_desktopGC;
+  pixmap = XCreatePixmap(DADisplay, DAWindow, dockapp_attr.width, dockapp_attr.height, dockapp_attr.depth);
+  if (active_desktop == desktop || desktop < 0) gc = active_desktopGC;
   else gc = inactive_desktopGC;
-  draw_relief(pixmap, dockapp_width, dockapp_height, gc);
+  draw_relief(pixmap, dockapp_attr.width, dockapp_attr.height, gc);
 
   for (i = 0; i < num_clients; i++) {
     if (! clients[i]->window) continue;
@@ -343,36 +367,10 @@ void page() {
 
     /* Draw small windows. */
     if (clients[i]->rect.width < 2 || clients[i]->rect.height < 2) gc = window_border1GC;
-    else if (clients[i]->window == active_window) gc = active_windowGC;
+    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;
-
-    /* Thumbnail. */
-#if 0
-      XRenderPictureAttributes pa;
-      Pixmap client_pixmap = XCreatePixmap(DADisplay, wins[i], width, height, DefaultDepth(DADisplay, DefaultScreen(DADisplay)));
-      //XCopyArea(DADisplay, wins[i], client_pixmap, DefaultGC(DADisplay, DefaultScreen(DADisplay)), 0, 0, width, height, 0, 0);
-      Picture client_picture = XRenderCreatePicture(DADisplay, client_pixmap, XRenderFindVisualFormat(DADisplay, attr.visual), CPSubwindowMode, &pa);
-
-      XTransform xform = {{
-        { XDoubleToFixed(1.0), 0, 0 },
-        { 0, XDoubleToFixed(1.0), 0 },
-        { 0, 0, XDoubleToFixed(scale) },
-      }};
-
-      XRenderSetPictureFilter(DADisplay, client_picture, FilterBilinear, 0, 0);
-      XRenderSetPictureTransform(DADisplay, client_picture, &xform);
-      XRenderComposite(DADisplay, PictOpSrc, client_picture, None, picture, 0, 0, 0, 0, rect.x, rect.y, rect.width, rect.height);
-      XFreePixmap(DADisplay, client_pixmap);
-      XSync(DADisplay, False);
-#endif
-
-    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);
@@ -381,11 +379,30 @@ void page() {
   XFreePixmap(DADisplay, pixmap);
 }
 
+void move(int x, int y) {
+  long dest_x, dest_y;
+
+  if (! drag_window) return;
+  if (x < 0 || y < 0) return;
+  if (x >= dockapp_attr.width || y >= dockapp_attr.height) return;
+
+  dest_x = (long) ((double) (x - drag_x) * scale);
+  dest_y = (long) ((double) (y - drag_y) * scale);
+
+  if (moveresize_supported) {
+    client_message(moveresize_window_atom, drag_window, StaticGravity | (3 << 8) | (FromTool << 12), drag_x, drag_y, 0, 0);
+  }
+  else {
+    XMoveWindow(DADisplay, drag_window, dest_x, dest_y);
+  }
+
+  page();
+}
+
 int main(int argc, char **argv) {
   Display *display;
   unsigned int root_width, root_height;
   long num_desktops;
-  double aspect;
   DACallbacks callbacks = { 0, change, release, move, 0, 0, page };
   DAProgramOption options = { "-d", "--desktop", "Desktop to page", DOInteger, 0, { (int *) &desktop } };
 
@@ -398,17 +415,17 @@ int main(int argc, char **argv) {
   aspect = (double) root_width / (double) root_height;
 
   if (root_width > root_height) {
-    dockapp_width = DOCKAPP_SIZE;
-    dockapp_height = (double) DOCKAPP_SIZE / aspect;
+    dockapp_attr.width = DOCKAPP_SIZE;
+    dockapp_attr.height = (double) DOCKAPP_SIZE / aspect;
   }
   else {
-    dockapp_height = DOCKAPP_SIZE;
-    dockapp_width = (double) DOCKAPP_SIZE / aspect;
+    dockapp_attr.height = DOCKAPP_SIZE;
+    dockapp_attr.width = (double) DOCKAPP_SIZE / aspect;
   }
 
-  DAParseArguments(argc, argv, &options, 1, "BLURB", "BLORB");
+  DAParseArguments(argc, argv, &options, 1, "OPTIONS", "pager");
   DAOpenDisplay(0, argc, argv);
-  DACreateIcon("pager", dockapp_width, dockapp_height, argc, argv);
+  DACreateIcon("pager", dockapp_attr.width, dockapp_attr.height, argc, argv);
 
   DASetCallbacks(&callbacks);
   DASetTimeout(SPEED);
@@ -423,25 +440,27 @@ int main(int argc, char **argv) {
   setup_atom(&active_window_atom, "_NET_ACTIVE_WINDOW");
   setup_atom(&moveresize_window_atom, "_NET_MOVERESIZE_WINDOW");
 
-  setup_atom(&above_state, "_NET_WM_STATE_ABOVE");
-  setup_atom(&below_state, "_NET_WM_STATE_BELOW");
   setup_atom(&shaded_state, "_NET_WM_STATE_SHADED");
   setup_atom(&skip_pager_state, "_NET_WM_STATE_SKIP_PAGER");
   setup_atom(&hidden_state, "_NET_WM_STATE_HIDDEN");
 
   check_support();
 
-  num_desktops = get_atom_long(num_desktops_atom, XA_CARDINAL, DefaultRootWindow(DADisplay));
-  if (desktop < 1) {
-    desktop = get_atom_long(current_desktop_atom, XA_CARDINAL, DefaultRootWindow(DADisplay));
+  if (get_atom_long(num_desktops_atom, XA_CARDINAL, DefaultRootWindow(DADisplay), &num_desktops) != Success) num_desktops = 1;
+  if (desktop == 0) {
+    if (get_atom_long(current_desktop_atom, XA_CARDINAL, DefaultRootWindow(DADisplay), (long *) &desktop) != Success) desktop = 0;
   }
+  else if (desktop < 0) desktop = -1;
   else if (desktop-- > num_desktops) {
-    fprintf(stderr, "There are only %d desktops!\n", num_desktops);
+    fprintf(stderr, "There are only %ld desktops!\n", num_desktops);
     exit(111);
   }
 
   XSetErrorHandler(error_handler);
   setup_GCs();
+  setup_pager();
   DAShow();
   DAEventLoop();
+
+  exit(0);
 }