X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Futil.c;h=149af2dae32d43f0ac25f7f0ffe05387c1a0c846;hb=8622cf3917e53585b62c8be0d72cddf3c440b30b;hp=8de4d665853a02fe0f2f2c98e61141723813bdfa;hpb=f85990b27aaf8138efe968188931fdbb0dd2bcd1;p=i3%2Fi3 diff --git a/src/util.c b/src/util.c index 8de4d665..149af2da 100644 --- a/src/util.c +++ b/src/util.c @@ -18,6 +18,11 @@ #include #include #include +#if defined(__OpenBSD__) +#include +#endif + +#include #include "i3.h" #include "data.h" @@ -25,8 +30,11 @@ #include "layout.h" #include "util.h" #include "xcb.h" +#include "client.h" static iconv_t conversion_descriptor = 0; +struct keyvalue_table_head by_parent = TAILQ_HEAD_INITIALIZER(by_parent); +struct keyvalue_table_head by_child = TAILQ_HEAD_INITIALIZER(by_child); int min(int a, int b) { return (a < b ? a : b); @@ -57,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 @@ -78,22 +72,60 @@ 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; } +/* + * The table_* functions emulate the behaviour of libxcb-wm, which in libxcb 0.3.4 suddenly + * vanished. Great. + * + */ +bool table_put(struct keyvalue_table_head *head, uint32_t key, void *value) { + struct keyvalue_element *element = scalloc(sizeof(struct keyvalue_element)); + element->key = key; + element->value = value; + + TAILQ_INSERT_TAIL(head, element, elements); + return true; +} + +void *table_remove(struct keyvalue_table_head *head, uint32_t key) { + struct keyvalue_element *element; + + TAILQ_FOREACH(element, head, elements) + if (element->key == key) { + void *value = element->value; + TAILQ_REMOVE(head, element, elements); + free(element); + return value; + } + + return NULL; +} + +void *table_get(struct keyvalue_table_head *head, uint32_t key) { + struct keyvalue_element *element; + + TAILQ_FOREACH(element, head, elements) + if (element->key == key) + return element->value; + + return NULL; +} + /* * Starts the given application by passing it through a shell. We use double fork * to avoid zombie processes. As the started application’s parent exits (immediately), @@ -145,11 +177,10 @@ void check_error(xcb_connection_t *conn, xcb_void_cookie_t cookie, char *err_mes * returned. It has to be freed when done. * */ -char *convert_utf8_to_ucs2(const char *input, int *real_strlen) { +char *convert_utf8_to_ucs2(char *input, int *real_strlen) { size_t input_size = strlen(input) + 1; /* UCS-2 consumes exactly two bytes for each glyph */ int buffer_size = input_size * 2; - printf("reserving %d bytes\n", buffer_size); char *buffer = smalloc(buffer_size); size_t output_size = buffer_size; @@ -169,76 +200,121 @@ char *convert_utf8_to_ucs2(const char *input, int *real_strlen) { iconv(conversion_descriptor, NULL, NULL, NULL, NULL); /* Convert our text */ - int rc = iconv(conversion_descriptor, &input, &input_size, &output, &output_size); + int rc = iconv(conversion_descriptor, (void*)&input, &input_size, &output, &output_size); if (rc == (size_t)-1) { - fprintf(stderr, "Converting to UCS-2 failed\n"); - perror("erron\n"); - exit(1); + perror("Converting to UCS-2 failed"); + if (real_strlen != NULL) + *real_strlen = 0; + return NULL; } - *real_strlen = ((buffer_size - output_size) / 2) - 1; + if (real_strlen != NULL) + *real_strlen = ((buffer_size - output_size) / 2) - 1; return buffer; } /* - * Removes the given client from the container, either because it will be inserted into another - * one or because it was unmapped + * Returns the client which comes next in focus stack (= was selected before) for + * the given container, optionally excluding the given client. * */ -void remove_client_from_container(xcb_connection_t *conn, Client *client, Container *container) { - CIRCLEQ_REMOVE(&(container->clients), client, clients); - - /* If the container will be empty now and is in stacking mode, we need to - unmap the stack_win */ - if (CIRCLEQ_EMPTY(&(container->clients)) && container->mode == MODE_STACK) { - struct Stack_Window *stack_win = &(container->stack_win); - stack_win->rect.height = 0; - xcb_unmap_window(conn, stack_win->window); - } +Client *get_last_focused_client(xcb_connection_t *conn, Container *container, Client *exclude) { + Client *current; + SLIST_FOREACH(current, &(container->workspace->focus_stack), focus_clients) + if ((current->container == container) && ((exclude == NULL) || (current != exclude))) + return current; + return NULL; } + /* * Sets the given client as focused by updating the data structures correctly, * updating the X input focus and finally re-decorating both windows (to signalize * the user the new focus situation) * */ -void set_focus(xcb_connection_t *conn, Client *client) { - /* The dock window cannot be focused */ - /* TODO: does this play well with dzen2’s popup menus? or do we just need to set the input - focus but not update our internal structures? */ +void set_focus(xcb_connection_t *conn, Client *client, bool set_anyways) { + /* The dock window cannot be focused, but enter notifies are still handled correctly */ if (client->dock) 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)) + return; - /* TODO: check if the focus needs to be changed at all */ /* 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); + 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); + } + } + + /* 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 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)) + 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); } @@ -254,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; @@ -266,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]; @@ -285,23 +369,29 @@ void switch_layout_mode(xcb_connection_t *conn, Container *container, int mode) /* We want to know when… */ mask |= XCB_CW_EVENT_MASK; - values[1] = XCB_EVENT_MASK_BUTTON_PRESS | /* …mouse is pressed */ + values[1] = XCB_EVENT_MASK_ENTER_WINDOW | /* …mouse is moved into our window */ + XCB_EVENT_MASK_BUTTON_PRESS | /* …mouse is pressed */ 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); + + stack_win->rect.height = 0; - /* 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); + /* 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 */ @@ -311,69 +401,118 @@ void switch_layout_mode(xcb_connection_t *conn, Container *container, int mode) client->force_reconfigure = true; render_layout(conn); + + 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); + + CIRCLEQ_FOREACH(client, &(container->clients), clients) { + if (client == container->currently_focused || client == last_focused) + continue; + + 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 (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); + } + + + set_focus(conn, container->currently_focused, true); + } } /* - * Warps the pointer into the given client (in the middle of it, to be specific), therefore - * selecting it + * Gets the first matching client for the given window class/window title. + * If the paramater specific is set to a specific client, only this one + * will be checked. * */ -void warp_pointer_into(xcb_connection_t *conn, Client *client) { - int mid_x = client->rect.width / 2, - mid_y = client->rect.height / 2; - xcb_warp_pointer(conn, XCB_NONE, client->child, 0, 0, 0, 0, mid_x, mid_y); +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 = 0; + Client *matching = NULL; + + to_class = sstrdup(window_classtitle); + + /* If a title was specified, split both strings at the slash */ + if ((to_title = strstr(to_class, "/")) != NULL) { + *(to_title++) = '\0'; + /* Convert to UCS-2 */ + to_title_ucs = convert_utf8_to_ucs2(to_title, &to_title_ucs_len); + } + + /* If we were given a specific client we only check if that one matches */ + if (specific != NULL) { + if (client_matches_class_name(specific, to_class, to_title, to_title_ucs, to_title_ucs_len)) + matching = specific; + goto done; + } + + LOG("Getting clients for class \"%s\" / title \"%s\"\n", to_class, to_title); + Workspace *ws; + TAILQ_FOREACH(ws, workspaces, workspaces) { + if (ws->screen == NULL) + 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; + } + } + +done: + free(to_class); + FREE(to_title_ucs); + return matching; } +#if defined(__OpenBSD__) + /* - * 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. + * Taken from FreeBSD + * Find the first occurrence of the byte string s in byte string l. * */ -void toggle_fullscreen(xcb_connection_t *conn, Client *client) { - /* clients without a container (docks) cannot be focused */ - assert(client->container != NULL); - - Workspace *workspace = client->container->workspace; +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; - workspace->fullscreen_client = (client->fullscreen ? NULL : client); + /* we need something to compare */ + if (l_len == 0 || s_len == 0) + return NULL; - client->fullscreen = !client->fullscreen; + /* "s" must be smaller or equal to "l" */ + if (l_len < s_len) + return NULL; - if (client->fullscreen) { - 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}; + /* special case where s_len == 1 */ + if (s_len == 1) + return memchr(l, (int)*cs, l_len); - LOG("child itself will be at %dx%d with size %dx%d\n", - values[0], values[1], values[2], values[3]); + /* the last position where its possible to find "s" in "l" */ + last = (char *)cl + l_len - s_len; - xcb_configure_window(conn, client->frame, mask, values); + for (cur = (char *)cl; cur <= last; cur++) + if (cur[0] == cs[0] && memcmp(cur, cs, s_len) == 0) + return cur; - /* Child’s coordinates are relative to the parent (=frame) */ - values[0] = 0; - values[1] = 0; - xcb_configure_window(conn, client->child, mask, values); + return NULL; +} - /* Raise the window */ - values[0] = XCB_STACK_MODE_ABOVE; - xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_STACK_MODE, values); +#endif - } else { - LOG("leaving fullscreen mode\n"); - /* 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 container */ - render_container(conn, client->container); - } - - xcb_flush(conn); -}