]> git.sur5r.net Git - i3/i3/blobdiff - src/util.c
Bugfix: Use more precise floating point arithmetic (Thanks helgiks)
[i3/i3] / src / util.c
index 5b51bd5b39bb8ca70a2bd14d15f68d5c16f0c4cd..149af2dae32d43f0ac25f7f0ffe05387c1a0c846 100644 (file)
@@ -18,6 +18,9 @@
 #include <stdarg.h>
 #include <assert.h>
 #include <iconv.h>
+#if defined(__OpenBSD__)
+#include <sys/cdefs.h>
+#endif
 
 #include <xcb/xcb_icccm.h>
 
@@ -62,20 +65,6 @@ void slog(char *fmt, ...) {
         va_end(args);
 }
 
-/*
- * Prints the message (see printf()) to stderr, then exits the program.
- *
- */
-void die(char *fmt, ...) {
-        va_list args;
-
-        va_start(args, fmt);
-        vfprintf(stderr, fmt, args);
-        va_end(args);
-
-        exit(EXIT_FAILURE);
-}
-
 /*
  * The s* functions (safe) are wrappers around malloc, strdup, …, which exits if one of
  * the called functions returns NULL, meaning that there is no more memory available
@@ -83,19 +72,19 @@ void die(char *fmt, ...) {
  */
 void *smalloc(size_t size) {
         void *result = malloc(size);
-        exit_if_null(result, "Too less memory for malloc(%d)\n", size);
+        exit_if_null(result, "Error: out of memory (malloc(%zd))\n", size);
         return result;
 }
 
 void *scalloc(size_t size) {
         void *result = calloc(size, 1);
-        exit_if_null(result, "Too less memory for calloc(%d)\n", size);
+        exit_if_null(result, "Error: out of memory (calloc(%zd))\n", size);
         return result;
 }
 
 char *sstrdup(const char *str) {
         char *result = strdup(str);
-        exit_if_null(result, "Too less memory for strdup()\n");
+        exit_if_null(result, "Error: out of memory (strdup())\n");
         return result;
 }
 
@@ -238,41 +227,6 @@ Client *get_last_focused_client(xcb_connection_t *conn, Container *container, Cl
         return NULL;
 }
 
-/*
- * Unmaps all clients (and stack windows) of the given workspace.
- *
- * This needs to be called separately when temporarily rendering
- * a workspace which is not the active workspace to force
- * reconfiguration of all clients, like in src/xinerama.c when
- * re-assigning a workspace to another screen.
- *
- */
-void unmap_workspace(xcb_connection_t *conn, Workspace *u_ws) {
-        Client *client;
-        struct Stack_Window *stack_win;
-
-        /* Ignore notify events because they would cause focus to be changed */
-        ignore_enter_notify_forall(conn, u_ws, true);
-
-        /* Unmap all clients of the current workspace */
-        int unmapped_clients = 0;
-        FOR_TABLE(u_ws)
-                CIRCLEQ_FOREACH(client, &(u_ws->table[cols][rows]->clients), clients) {
-                        xcb_unmap_window(conn, client->frame);
-                        unmapped_clients++;
-                }
-
-        /* If we did not unmap any clients, the workspace is empty and we can destroy it */
-        if (unmapped_clients == 0)
-                u_ws->screen = NULL;
-
-        /* Unmap the stack windows on the current workspace, if any */
-        SLIST_FOREACH(stack_win, &stack_wins, stack_windows)
-                if (stack_win->container->workspace == u_ws)
-                        xcb_unmap_window(conn, stack_win->window);
-
-        ignore_enter_notify_forall(conn, u_ws, false);
-}
 
 /*
  * Sets the given client as focused by updating the data structures correctly,
@@ -286,59 +240,81 @@ void set_focus(xcb_connection_t *conn, Client *client, bool set_anyways) {
                 return;
 
         /* Store the old client */
-        Client *old_client = CUR_CELL->currently_focused;
+        Client *old_client = SLIST_FIRST(&(c_ws->focus_stack));
 
         /* Check if the focus needs to be changed at all */
-        if (!set_anyways && (old_client == client)) {
-                LOG("old_client == client, not changing focus\n");
+        if (!set_anyways && (old_client == client))
                 return;
-        }
 
         /* Store current_row/current_col */
         c_ws->current_row = current_row;
         c_ws->current_col = current_col;
-        c_ws = client->container->workspace;
+        c_ws = client->workspace;
+        /* Load current_col/current_row if we switch to a client without a container */
+        current_col = c_ws->current_col;
+        current_row = c_ws->current_row;
 
         /* Update container */
-        client->container->currently_focused = client;
+        if (client->container != NULL) {
+                client->container->currently_focused = client;
 
-        current_col = client->container->col;
-        current_row = client->container->row;
+                current_col = client->container->col;
+                current_row = client->container->row;
+        }
 
-        LOG("set_focus(frame %08x, child %08x, name %s)\n", client->frame, client->child, client->name);
+        CLIENT_LOG(client);
         /* Set focus to the entered window, and flush xcb buffer immediately */
         xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, client->child, XCB_CURRENT_TIME);
         //xcb_warp_pointer(conn, XCB_NONE, client->child, 0, 0, 0, 0, 10, 10);
 
-        /* Get the client which was last focused in this particular container, it may be a different
-           one than old_client */
-        Client *last_focused = get_last_focused_client(conn, client->container, NULL);
+        if (client->container != NULL) {
+                /* Get the client which was last focused in this particular container, it may be a different
+                   one than old_client */
+                Client *last_focused = get_last_focused_client(conn, client->container, NULL);
+
+                /* In stacking containers, raise the client in respect to the one which was focused before */
+                if ((client->container->mode == MODE_STACK || client->container->mode == MODE_TABBED) &&
+                    client->container->workspace->fullscreen_client == NULL) {
+                        /* We need to get the client again, this time excluding the current client, because
+                         * we might have just gone into stacking mode and need to raise */
+                        Client *last_focused = get_last_focused_client(conn, client->container, client);
+
+                        if (last_focused != NULL) {
+                                LOG("raising above frame %p / child %p\n", last_focused->frame, last_focused->child);
+                                uint32_t values[] = { last_focused->frame, XCB_STACK_MODE_ABOVE };
+                                xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE, values);
+                        }
+                }
 
-        /* In stacking containers, raise the client in respect to the one which was focused before */
-        if (client->container->mode == MODE_STACK && client->container->workspace->fullscreen_client == NULL) {
-                /* We need to get the client again, this time excluding the current client, because
-                 * we might have just gone into stacking mode and need to raise */
-                Client *last_focused = get_last_focused_client(conn, client->container, client);
+                /* If it is the same one as old_client, we save us the unnecessary redecorate */
+                if ((last_focused != NULL) && (last_focused != old_client))
+                        redecorate_window(conn, last_focused);
+        }
 
-                if (last_focused != NULL) {
-                        LOG("raising above frame %p / child %p\n", last_focused->frame, last_focused->child);
-                        uint32_t values[] = { last_focused->frame, XCB_STACK_MODE_ABOVE };
-                        xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE, values);
+        /* If the last client was a floating client, we need to go to the next
+         * tiling client in stack and re-decorate it. */
+        if (old_client != NULL && client_is_floating(old_client)) {
+                LOG("Coming from floating client, searching next tiling...\n");
+                Client *current;
+                SLIST_FOREACH(current, &(client->workspace->focus_stack), focus_clients) {
+                        if (client_is_floating(current))
+                                continue;
+
+                        LOG("Found window: %p / child %p\n", current->frame, current->child);
+                        redecorate_window(conn, current);
+                        break;
                 }
+
         }
 
-        /* If it is the same one as old_client, we save us the unnecessary redecorate */
-        if ((last_focused != NULL) && (last_focused != old_client))
-                redecorate_window(conn, last_focused);
+        SLIST_REMOVE(&(client->workspace->focus_stack), client, Client, focus_clients);
+        SLIST_INSERT_HEAD(&(client->workspace->focus_stack), client, focus_clients);
 
         /* If we’re in stacking mode, this renders the container to update changes in the title
            bars and to raise the focused client */
         if ((old_client != NULL) && (old_client != client) && !old_client->dock)
                 redecorate_window(conn, old_client);
 
-        SLIST_REMOVE(&(client->container->workspace->focus_stack), client, Client, focus_clients);
-        SLIST_INSERT_HEAD(&(client->container->workspace->focus_stack), client, focus_clients);
-
         /* redecorate_window flushes, so we don’t need to */
         redecorate_window(conn, client);
 }
@@ -354,7 +330,8 @@ void leave_stack_mode(xcb_connection_t *conn, Container *container) {
 
         SLIST_REMOVE(&stack_wins, stack_win, Stack_Window, stack_windows);
 
-        xcb_free_gc(conn, stack_win->gc);
+        xcb_free_gc(conn, stack_win->pixmap.gc);
+        xcb_free_pixmap(conn, stack_win->pixmap.id);
         xcb_destroy_window(conn, stack_win->window);
 
         stack_win->rect.width = -1;
@@ -366,15 +343,22 @@ void leave_stack_mode(xcb_connection_t *conn, Container *container) {
  *
  */
 void switch_layout_mode(xcb_connection_t *conn, Container *container, int mode) {
-        if (mode == MODE_STACK) {
+        if (mode == MODE_STACK || mode == MODE_TABBED) {
                 /* When we’re already in stacking mode, nothing has to be done */
-                if (container->mode == MODE_STACK)
+                if ((mode == MODE_STACK && container->mode == MODE_STACK) ||
+                    (mode == MODE_TABBED && container->mode == MODE_TABBED))
                         return;
 
-                /* When entering stacking mode, we need to open a window on which we can draw the
-                   title bars of the clients, it has height 1 because we don’t bother here with
-                   calculating the correct height - it will be adjusted when rendering anyways. */
-                Rect rect = {container->x, container->y, container->width, 1 };
+                if (container->mode == MODE_STACK || container->mode == MODE_TABBED)
+                        goto after_stackwin;
+
+                /* When entering stacking mode, we need to open a window on
+                 * which we can draw the title bars of the clients, it has
+                 * height 1 because we don’t bother here with calculating the
+                 * correct height - it will be adjusted when rendering anyways.
+                 * Also, we need to use max(width, 1) because windows cannot
+                 * be created with either width == 0 or height == 0. */
+                Rect rect = {container->x, container->y, max(container->width, 1), 1};
 
                 uint32_t mask = 0;
                 uint32_t values[2];
@@ -390,19 +374,24 @@ void switch_layout_mode(xcb_connection_t *conn, Container *container, int mode)
                                 XCB_EVENT_MASK_EXPOSURE;        /* …our window needs to be redrawn */
 
                 struct Stack_Window *stack_win = &(container->stack_win);
-                stack_win->window = create_window(conn, rect, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_CURSOR_LEFT_PTR, mask, values);
+                stack_win->window = create_window(conn, rect, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_CURSOR_LEFT_PTR, false, mask, values);
 
-                /* Generate a graphics context for the titlebar */
-                stack_win->gc = xcb_generate_id(conn);
-                xcb_create_gc(conn, stack_win->gc, stack_win->window, 0, 0);
+                stack_win->rect.height = 0;
+
+                /* Initialize the entry for our cached pixmap. It will be
+                 * created as soon as it’s needed (see cached_pixmap_prepare). */
+                memset(&(stack_win->pixmap), 0, sizeof(struct Cached_Pixmap));
+                stack_win->pixmap.referred_rect = &stack_win->rect;
+                stack_win->pixmap.referred_drawable = stack_win->window;
 
                 stack_win->container = container;
 
                 SLIST_INSERT_HEAD(&stack_wins, stack_win, stack_windows);
         } else {
-                if (container->mode == MODE_STACK)
+                if (container->mode == MODE_STACK || container->mode == MODE_TABBED)
                         leave_stack_mode(conn, container);
         }
+after_stackwin:
         container->mode = mode;
 
         /* Force reconfiguration of each client */
@@ -413,69 +402,31 @@ void switch_layout_mode(xcb_connection_t *conn, Container *container, int mode)
 
         render_layout(conn);
 
-        if (container->currently_focused != NULL)
-                set_focus(conn, container->currently_focused, true);
-}
+        if (container->currently_focused != NULL) {
+                /* We need to make sure that this client is above *each* of the
+                 * other clients in this container */
+                Client *last_focused = get_last_focused_client(conn, container, container->currently_focused);
 
-/*
- * Toggles fullscreen mode for the given client. It updates the data structures and
- * reconfigures (= resizes/moves) the client and its frame to the full size of the
- * screen. When leaving fullscreen, re-rendering the layout is forced.
- *
- */
-void toggle_fullscreen(xcb_connection_t *conn, Client *client) {
-        /* clients without a container (docks) cannot be focused */
-        assert(client->container != NULL);
+                CIRCLEQ_FOREACH(client, &(container->clients), clients) {
+                        if (client == container->currently_focused || client == last_focused)
+                                continue;
 
-        Workspace *workspace = client->container->workspace;
+                        LOG("setting %08x below %08x / %08x\n", client->frame, container->currently_focused->frame);
+                        uint32_t values[] = { container->currently_focused->frame, XCB_STACK_MODE_BELOW };
+                        xcb_configure_window(conn, client->frame,
+                                             XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE, values);
+                }
 
-        if (!client->fullscreen) {
-                if (workspace->fullscreen_client != NULL) {
-                        LOG("Not entering fullscreen mode, there already is a fullscreen client.\n");
-                        return;
+                if (last_focused != NULL) {
+                        LOG("Putting last_focused directly underneath the currently focused\n");
+                        uint32_t values[] = { container->currently_focused->frame, XCB_STACK_MODE_BELOW };
+                        xcb_configure_window(conn, last_focused->frame,
+                                             XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE, values);
                 }
-                client->fullscreen = true;
-                workspace->fullscreen_client = client;
-                LOG("Entering fullscreen mode...\n");
-                /* We just entered fullscreen mode, let’s configure the window */
-                 uint32_t mask = XCB_CONFIG_WINDOW_X |
-                                 XCB_CONFIG_WINDOW_Y |
-                                 XCB_CONFIG_WINDOW_WIDTH |
-                                 XCB_CONFIG_WINDOW_HEIGHT;
-                uint32_t values[4] = {workspace->rect.x,
-                                      workspace->rect.y,
-                                      workspace->rect.width,
-                                      workspace->rect.height};
-
-                LOG("child itself will be at %dx%d with size %dx%d\n",
-                                values[0], values[1], values[2], values[3]);
-
-                xcb_configure_window(conn, client->frame, mask, values);
-
-                /* Child’s coordinates are relative to the parent (=frame) */
-                values[0] = 0;
-                values[1] = 0;
-                xcb_configure_window(conn, client->child, mask, values);
-
-                /* Raise the window */
-                values[0] = XCB_STACK_MODE_ABOVE;
-                xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_STACK_MODE, values);
-
-                Rect child_rect = workspace->rect;
-                child_rect.x = child_rect.y = 0;
-                fake_configure_notify(conn, child_rect, client->child);
-        } else {
-                LOG("leaving fullscreen mode\n");
-                client->fullscreen = false;
-                workspace->fullscreen_client = NULL;
-                /* Because the coordinates of the window haven’t changed, it would not be
-                   re-configured if we don’t set the following flag */
-                client->force_reconfigure = true;
-                /* We left fullscreen mode, redraw the whole layout to ensure enternotify events are disabled */
-                render_layout(conn);
-        }
 
-        xcb_flush(conn);
+
+                set_focus(conn, container->currently_focused, true);
+        }
 }
 
 /*
@@ -487,7 +438,7 @@ void toggle_fullscreen(xcb_connection_t *conn, Client *client) {
 Client *get_matching_client(xcb_connection_t *conn, const char *window_classtitle,
                             Client *specific) {
         char *to_class, *to_title, *to_title_ucs = NULL;
-        int to_title_ucs_len;
+        int to_title_ucs_len = 0;
         Client *matching = NULL;
 
         to_class = sstrdup(window_classtitle);
@@ -507,22 +458,19 @@ Client *get_matching_client(xcb_connection_t *conn, const char *window_classtitl
         }
 
         LOG("Getting clients for class \"%s\" / title \"%s\"\n", to_class, to_title);
-        for (int workspace = 0; workspace < 10; workspace++) {
-                if (workspaces[workspace].screen == NULL)
+        Workspace *ws;
+        TAILQ_FOREACH(ws, workspaces, workspaces) {
+                if (ws->screen == NULL)
                         continue;
 
-                FOR_TABLE(&(workspaces[workspace])) {
-                        Container *con = workspaces[workspace].table[cols][rows];
-                        Client *client;
-
-                        CIRCLEQ_FOREACH(client, &(con->clients), clients) {
-                                LOG("Checking client with class=%s, name=%s\n", client->window_class, client->name);
-                                if (!client_matches_class_name(client, to_class, to_title, to_title_ucs, to_title_ucs_len))
-                                        continue;
+                Client *client;
+                SLIST_FOREACH(client, &(ws->focus_stack), focus_clients) {
+                        LOG("Checking client with class=%s, name=%s\n", client->window_class, client->name);
+                        if (!client_matches_class_name(client, to_class, to_title, to_title_ucs, to_title_ucs_len))
+                                continue;
 
-                                matching = client;
-                                goto done;
-                        }
+                        matching = client;
+                        goto done;
                 }
         }
 
@@ -531,3 +479,40 @@ done:
         FREE(to_title_ucs);
         return matching;
 }
+
+#if defined(__OpenBSD__)
+
+/*
+ * Taken from FreeBSD
+ * Find the first occurrence of the byte string s in byte string l.
+ *
+ */
+void *memmem(const void *l, size_t l_len, const void *s, size_t s_len) {
+        register char *cur, *last;
+        const char *cl = (const char *)l;
+        const char *cs = (const char *)s;
+
+        /* we need something to compare */
+        if (l_len == 0 || s_len == 0)
+                return NULL;
+
+        /* "s" must be smaller or equal to "l" */
+        if (l_len < s_len)
+                return NULL;
+
+        /* special case where s_len == 1 */
+        if (s_len == 1)
+                return memchr(l, (int)*cs, l_len);
+
+        /* the last position where its possible to find "s" in "l" */
+        last = (char *)cl + l_len - s_len;
+
+        for (cur = (char *)cl; cur <= last; cur++)
+                if (cur[0] == cs[0] && memcmp(cur, cs, s_len) == 0)
+                        return cur;
+
+        return NULL;
+}
+
+#endif
+