Merge lp:~bregma/geis/lp-824101 into lp:geis

[Stephen M. Webb]

Prevents the geistest tool from crashing when run without explicitly specifying a window by watching the root window(s) instead of walking the entire window heirarchy.

Fixes lp:824101.

[Chase Douglas (chasedouglas)]

I would change the function "subscribe_all_windows" to "subscribe_all_root_windows" so it's more clear what is going on. I think this is a good change :).

review: Approve

=== modified file 'testsuite/geistest/geistest.c'
--- testsuite/geistest/geistest.c	2011-08-17 15:48:51 +0000
+++ testsuite/geistest/geistest.c	2012-02-14 19:03:08 +0000
@@ -280,67 +280,7 @@
 }
 
 
-static size_t
-subscribe_windows_preorder(xcb_connection_t *xcb,
-                           xcb_window_t      window,
-                           size_t            instance_table_size,
-                           GeisInstance    **instance_table)
-{
-  ++instance_table_size;
-  GeisInstance  *new_instance_table;
-  new_instance_table = realloc(*instance_table,
-                               instance_table_size * sizeof(GeisInstance));
-  new_instance_table[instance_table_size-1] = subscribe_window(window);
-  if (!new_instance_table[instance_table_size-1])
-  {
-    fprintf(stderr, "error creating geis instance for window 0x%08x\n", window);
-    free(new_instance_table);
-    instance_table_size = 0;
-    goto error_exit;
-  }
-
-  xcb_generic_error_t *error;
-  xcb_query_tree_cookie_t tree_cookie = xcb_query_tree(xcb, window);
-  xcb_query_tree_reply_t *tree_reply = xcb_query_tree_reply(xcb,
-                                                            tree_cookie,
-                                                            &error);
-  if (!tree_reply)
-  {
-    fprintf(stderr, "failed to query tree for window 0x%x\n", window);
-    goto error_exit;
-  }
-
-  int num_children = xcb_query_tree_children_length(tree_reply);
-  if (num_children <= 0)
-    goto tree_exit;
-
-  xcb_window_t *children = xcb_query_tree_children(tree_reply);
-  if (!children)
-  {
-    fprintf(stderr, "failed to retrieve children of window 0x%x\n", window);
-    goto tree_exit;
-  }
-
-  int i;
-  for (i = 0; i < num_children; i++)
-  {
-    instance_table_size = subscribe_windows_preorder(xcb,
-                                                     children[i],
-                                                     instance_table_size,
-                                                     &new_instance_table);
-    if (instance_table_size == 0)
-      break;
-  }
-  
-tree_exit:
-  free(tree_reply);
-error_exit:
-  *instance_table = new_instance_table;
-  return instance_table_size;
-}
-
-
-static size_t
+static void
 subscribe_all_windows(GeisInstance **instance_table)
 {
   int instance_table_size = 0;
@@ -348,29 +288,32 @@
   xcb_connection_t *xcb = xcb_connect(NULL, NULL);
   if (!xcb) {
     fprintf(stderr, "error connecting to X server\n");
-    return -1;
+    exit(1);
   }
 
   const xcb_setup_t *setup = xcb_get_setup(xcb);
   if (!setup)
   {
     fprintf(stderr, "error getting xcb setup\n");
-    return -1;
+    exit(1);
   }
 
   xcb_screen_iterator_t screen = xcb_setup_roots_iterator(setup);
   while (screen.rem)
   {
-    instance_table_size = subscribe_windows_preorder(xcb,
-                                                     screen.data->root,
-                                                     instance_table_size,
-                                                     instance_table);
-
+    ++instance_table_size;
     xcb_screen_next(&screen);
   }
 
+  *instance_table = calloc(instance_table_size, sizeof(GeisInstance));
+
+  screen = xcb_setup_roots_iterator(setup);
+  for (int i = 0; screen.rem; ++i, xcb_screen_next(&screen))
+  {
+    *instance_table[i] = subscribe_window(screen.data->root);
+  }
+
   xcb_disconnect(xcb);
-  return instance_table_size;
 }
 
 int
@@ -402,12 +345,7 @@
   }
   else
   {
-    instance_table_size = subscribe_all_windows(&instance_table);
-    if (instance_table_size == 0)
-    {
-      fprintf(stderr, "can not continue, exiting....\n");
-      goto error_exit;
-    }
+    subscribe_all_windows(&instance_table);
   }
 
   status = geis_configuration_supported(instance_table[0], GEIS_CONFIG_UNIX_FD);