* pixmaps. Will use 32 bit depth and an appropriate visual, if available,
* otherwise the root window’s default (usually 24 bit TrueColor). */
uint8_t root_depth;
-xcb_visualid_t visual_id;
+xcb_visualtype_t *visual_type;
xcb_colormap_t colormap;
struct ev_loop *main_loop;
/* We hope that those are supported and set them to true */
bool xcursor_supported = true;
+bool xkb_supported = true;
/*
* This callback is only a dummy, see xcb_prepare_cb and xcb_check_cb.
#include "atoms.xmacro"
#undef xmacro
- /* By default, we use the same depth and visual as the root window, which
- * usually is TrueColor (24 bit depth) and the corresponding visual.
- * However, we also check if a 32 bit depth and visual are available (for
- * transparency) and use it if so. */
root_depth = root_screen->root_depth;
- visual_id = root_screen->root_visual;
colormap = root_screen->default_colormap;
+ visual_type = xcb_aux_find_visual_by_attrs(root_screen, -1, 32);
+ if (visual_type != NULL) {
+ root_depth = xcb_aux_get_depth_of_visual(root_screen, visual_type->visual_id);
+ colormap = xcb_generate_id(conn);
+
+ xcb_void_cookie_t cm_cookie = xcb_create_colormap_checked(conn,
+ XCB_COLORMAP_ALLOC_NONE,
+ colormap,
+ root,
+ visual_type->visual_id);
+
+ xcb_generic_error_t *error = xcb_request_check(conn, cm_cookie);
+ if (error != NULL) {
+ ELOG("Could not create colormap. Error code: %d\n", error->error_code);
+ exit(EXIT_FAILURE);
+ }
+ } else {
+ visual_type = get_visualtype(root_screen);
+ }
- DLOG("root_depth = %d, visual_id = 0x%08x.\n", root_depth, visual_id);
+ DLOG("root_depth = %d, visual_id = 0x%08x.\n", root_depth, visual_type->visual_id);
DLOG("root_screen->height_in_pixels = %d, root_screen->height_in_millimeters = %d, dpi = %d\n",
root_screen->height_in_pixels, root_screen->height_in_millimeters,
(int)((double)root_screen->height_in_pixels * 25.4 / (double)root_screen->height_in_millimeters));
const xcb_query_extension_reply_t *extreply;
extreply = xcb_get_extension_data(conn, &xcb_xkb_id);
+ xkb_supported = extreply->present;
if (!extreply->present) {
DLOG("xkb is not present on this server\n");
} else {
0xff,
0xff,
NULL);
+
+ /* Setting both, XCB_XKB_PER_CLIENT_FLAG_GRABS_USE_XKB_STATE and
+ * XCB_XKB_PER_CLIENT_FLAG_LOOKUP_STATE_WHEN_GRABBED, will lead to the
+ * X server sending us the full XKB state in KeyPress and KeyRelease:
+ * https://sources.debian.net/src/xorg-server/2:1.17.2-1.1/xkb/xkbEvents.c/?hl=927#L927
+ */
+ xcb_xkb_per_client_flags_reply_t *pcf_reply;
+ /* The last three parameters are unset because they are only relevant
+ * when using a feature called “automatic reset of boolean controls”:
+ * http://www.x.org/releases/X11R7.7/doc/kbproto/xkbproto.html#Automatic_Reset_of_Boolean_Controls
+ * */
+ pcf_reply = xcb_xkb_per_client_flags_reply(
+ conn,
+ xcb_xkb_per_client_flags(
+ conn,
+ XCB_XKB_ID_USE_CORE_KBD,
+ XCB_XKB_PER_CLIENT_FLAG_GRABS_USE_XKB_STATE | XCB_XKB_PER_CLIENT_FLAG_LOOKUP_STATE_WHEN_GRABBED,
+ XCB_XKB_PER_CLIENT_FLAG_GRABS_USE_XKB_STATE | XCB_XKB_PER_CLIENT_FLAG_LOOKUP_STATE_WHEN_GRABBED,
+ 0 /* uint32_t ctrlsToChange */,
+ 0 /* uint32_t autoCtrls */,
+ 0 /* uint32_t autoCtrlsValues */),
+ NULL);
+ if (pcf_reply == NULL ||
+ !(pcf_reply->value & XCB_XKB_PER_CLIENT_FLAG_GRABS_USE_XKB_STATE)) {
+ ELOG("Could not set XCB_XKB_PER_CLIENT_FLAG_GRABS_USE_XKB_STATE\n");
+ }
+ if (pcf_reply == NULL ||
+ !(pcf_reply->value & XCB_XKB_PER_CLIENT_FLAG_LOOKUP_STATE_WHEN_GRABBED)) {
+ ELOG("Could not set XCB_XKB_PER_CLIENT_FLAG_LOOKUP_STATE_WHEN_GRABBED\n");
+ }
+ free(pcf_reply);
xkb_base = extreply->first_event;
}
xcb_numlock_mask = aio_get_mod_mask_for(XCB_NUM_LOCK, keysyms);
+ if (!load_keymap())
+ die("Could not load keymap\n");
+
translate_keysyms();
- grab_all_keys(conn, false);
+ grab_all_keys(conn);
bool needs_tree_init = true;
if (layout_path) {
ELOG("ERROR: No screen at (%d, %d), starting on the first screen\n",
pointerreply->root_x, pointerreply->root_y);
output = get_first_output();
- if (!output)
- die("No usable outputs available.\n");
}
con_focus(con_descend_focused(output_get_content(output->con)));
+ free(pointerreply);
}
tree_render();
xcb_free_pixmap(conn, pixmap);
}
+#if defined(__OpenBSD__)
+ if (pledge("stdio rpath wpath cpath proc exec unix", NULL) == -1)
+ err(EXIT_FAILURE, "pledge");
+#endif
+
struct sigaction action;
action.sa_sigaction = handle_signal;
/* Autostarting exec-lines */
if (autostart) {
- struct Autostart *exec;
- TAILQ_FOREACH(exec, &autostarts, autostarts) {
+ while (!TAILQ_EMPTY(&autostarts)) {
+ struct Autostart *exec = TAILQ_FIRST(&autostarts);
+
LOG("auto-starting %s\n", exec->command);
start_application(exec->command, exec->no_startup_id);
+
+ FREE(exec->command);
+ TAILQ_REMOVE(&autostarts, exec, autostarts);
+ FREE(exec);
}
}
/* Autostarting exec_always-lines */
- struct Autostart *exec_always;
- TAILQ_FOREACH(exec_always, &autostarts_always, autostarts_always) {
+ while (!TAILQ_EMPTY(&autostarts_always)) {
+ struct Autostart *exec_always = TAILQ_FIRST(&autostarts_always);
+
LOG("auto-starting (always!) %s\n", exec_always->command);
start_application(exec_always->command, exec_always->no_startup_id);
+
+ FREE(exec_always->command);
+ TAILQ_REMOVE(&autostarts_always, exec_always, autostarts_always);
+ FREE(exec_always);
}
/* Start i3bar processes for all configured bars */
projects / i3 / i3 / blobdiff