X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Futil.c;h=7990b56e3f460420969fb8570e787815b600d31d;hb=095de9eaabbb680cee893a8151c113fa682dd10c;hp=3a3890f1635716b2709d26d1d87354cf65dd2920;hpb=eae0b18dbd096a393147472495fa4388a742815a;p=i3%2Fi3 diff --git a/src/util.c b/src/util.c index 3a3890f1..7990b56e 100644 --- a/src/util.c +++ b/src/util.c @@ -18,6 +18,9 @@ #include #include #include +#if defined(__OpenBSD__) +#include +#endif #include @@ -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,13 +72,13 @@ void die(char *fmt, ...) { */ void *smalloc(size_t size) { void *result = malloc(size); - exit_if_null(result, "Error: out of memory (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, "Error: out of memory (calloc(%d))\n", size); + exit_if_null(result, "Error: out of memory (calloc(%zd))\n", size); return result; } @@ -238,65 +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 given workspace */ - int unmapped_clients = 0; - FOR_TABLE(u_ws) - CIRCLEQ_FOREACH(client, &(u_ws->table[cols][rows]->clients), clients) { - LOG("unmapping normal client %p / %p / %p\n", client, client->frame, client->child); - xcb_unmap_window(conn, client->frame); - unmapped_clients++; - } - - /* To find floating clients, we traverse the focus stack */ - SLIST_FOREACH(client, &(u_ws->focus_stack), focus_clients) { - if (!client_is_floating(client)) - continue; - - LOG("unmapping floating client %p / %p / %p\n", client, client->frame, client->child); - - xcb_unmap_window(conn, client->frame); - unmapped_clients++; - } - - /* If we did not unmap any clients, the workspace is empty and we can destroy it, at least - * if it is not the current workspace. */ - if (unmapped_clients == 0 && u_ws != c_ws) { - /* Re-assign the workspace of all dock clients which use this workspace */ - Client *dock; - LOG("workspace %p is empty\n", u_ws); - SLIST_FOREACH(dock, &(u_ws->screen->dock_clients), dock_clients) { - if (dock->workspace != u_ws) - continue; - - LOG("Re-assigning dock client to c_ws (%p)\n", c_ws); - dock->workspace = c_ws; - } - u_ws->screen = NULL; - } - - /* Unmap the stack windows on the given 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, @@ -313,10 +243,8 @@ void set_focus(xcb_connection_t *conn, Client *client, bool set_anyways) { 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; @@ -334,7 +262,7 @@ void set_focus(xcb_connection_t *conn, Client *client, bool set_anyways) { 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); @@ -345,7 +273,8 @@ void set_focus(xcb_connection_t *conn, Client *client, bool set_anyways) { 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->workspace->fullscreen_client == NULL) { + 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); @@ -362,14 +291,30 @@ void set_focus(xcb_connection_t *conn, Client *client, bool set_anyways) { redecorate_window(conn, last_focused); } + /* 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; + } + + } + + 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->workspace->focus_stack), client, Client, focus_clients); - SLIST_INSERT_HEAD(&(client->workspace->focus_stack), client, focus_clients); - /* redecorate_window flushes, so we don’t need to */ redecorate_window(conn, client); } @@ -385,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; @@ -397,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]; @@ -421,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 */ @@ -500,7 +458,7 @@ 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++) { + for (int workspace = 0; workspace < num_workspaces; workspace++) { if (workspaces[workspace].screen == NULL) continue; @@ -520,3 +478,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 +