* RLIM_INFINITY for i3 debugging versions. */
struct rlimit original_rlimit_core;
-/* Whether this version of i3 is a debug build or a release build. */
-bool debug_build = false;
-
/** The number of file descriptors passed via socket activation. */
int listen_fds;
xcb_screen_t *root_screen;
xcb_window_t root;
+
+/* Color depth, visual id and colormap to use when creating windows and
+ * 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_colormap_t colormap;
struct ev_loop *main_loop;
* Exit handler which destroys the main_loop. Will trigger cleanup handlers.
*
*/
-static void i3_exit() {
+static void i3_exit(void) {
/* We need ev >= 4 for the following code. Since it is not *that* important (it
* only makes sure that there are no i3-nagbar instances left behind) we still
* support old systems with libev 3. */
}
int main(int argc, char *argv[]) {
+ /* Keep a symbol pointing to the I3_VERSION string constant so that we have
+ * it in gdb backtraces. */
+ const char *i3_version __attribute__ ((unused)) = I3_VERSION;
char *override_configpath = NULL;
bool autostart = true;
char *layout_path = NULL;
bool delete_layout_path = false;
bool force_xinerama = false;
+ char *fake_outputs = NULL;
bool disable_signalhandler = false;
static struct option long_options[] = {
{"no-autostart", no_argument, 0, 'a'},
{"shmlog_size", required_argument, 0, 0},
{"get-socketpath", no_argument, 0, 0},
{"get_socketpath", no_argument, 0, 0},
+ {"fake_outputs", required_argument, 0, 0},
+ {"fake-outputs", required_argument, 0, 0},
{0, 0, 0, 0}
};
int option_index = 0, opt;
+ xcb_void_cookie_t colormap_cookie;
setlocale(LC_ALL, "");
* (file) logging. */
init_logging();
- /* I3_VERSION contains either something like this:
- * "4.0.2 (2011-11-11, branch "release")".
- * or: "4.0.2-123-gCOFFEEBABE (2011-11-11, branch "next")".
- *
- * So we check for the offset of the first opening round bracket to
- * determine whether this is a git version or a release version. */
- debug_build = ((strchr(I3_VERSION, '(') - I3_VERSION) > 10);
-
/* On non-release builds, disable SHM logging by default. */
- shmlog_size = (debug_build ? 25 * 1024 * 1024 : 0);
+ shmlog_size = (is_debug_build() ? 25 * 1024 * 1024 : 0);
start_argv = argv;
only_check_config = true;
break;
case 'v':
- printf("i3 version " I3_VERSION " © 2009-2011 Michael Stapelberg and contributors\n");
+ printf("i3 version " I3_VERSION " © 2009-2012 Michael Stapelberg and contributors\n");
exit(EXIT_SUCCESS);
case 'V':
set_verbosity(true);
layout_path = sstrdup(optarg);
delete_layout_path = true;
break;
+ } else if (strcmp(long_options[option_index].name, "fake-outputs") == 0 ||
+ strcmp(long_options[option_index].name, "fake_outputs") == 0) {
+ LOG("Initializing fake outputs: %s\n", optarg);
+ fake_outputs = sstrdup(optarg);
+ break;
}
/* fall-through */
default:
init_logging();
/* Try to enable core dumps by default when running a debug build */
- if (debug_build) {
+ if (is_debug_build()) {
struct rlimit limit = { RLIM_INFINITY, RLIM_INFINITY };
setrlimit(RLIMIT_CORE, &limit);
root_screen = xcb_aux_get_screen(conn, conn_screen);
root = root_screen->root;
+
+ /* 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;
+
+ DLOG("root_depth = %d, visual_id = 0x%08x.\n", root_depth, visual_id);
+
xcb_get_geometry_cookie_t gcookie = xcb_get_geometry(conn, root);
xcb_query_pointer_cookie_t pointercookie = xcb_query_pointer(conn, root);
cookie = xcb_change_window_attributes_checked(conn, root, mask, values);
check_error(conn, cookie, "Another window manager seems to be running");
+ /* By now we already checked for replies once, so let’s see if colormap
+ * creation worked (if requested). */
+ if (colormap != root_screen->default_colormap) {
+ xcb_generic_error_t *error = xcb_request_check(conn, colormap_cookie);
+ if (error != NULL) {
+ ELOG("Could not create ColorMap for 32 bit visual, falling back to X11 default.\n");
+ root_depth = root_screen->root_depth;
+ visual_id = root_screen->root_visual;
+ colormap = root_screen->default_colormap;
+ DLOG("root_depth = %d, visual_id = 0x%08x.\n", root_depth, visual_id);
+ free(error);
+ }
+ }
+
xcb_get_geometry_reply_t *greply = xcb_get_geometry_reply(conn, gcookie, NULL);
if (greply == NULL) {
ELOG("Could not get geometry of the root window, exiting\n");
free(greply);
- /* Force Xinerama (for drivers which don't support RandR yet, esp. the
- * nVidia binary graphics driver), when specified either in the config
- * file or on command-line */
- if (force_xinerama || config.force_xinerama) {
+ /* Setup fake outputs for testing */
+ if (fake_outputs == NULL && config.fake_outputs != NULL)
+ fake_outputs = config.fake_outputs;
+
+ if (fake_outputs != NULL) {
+ fake_outputs_init(fake_outputs);
+ FREE(fake_outputs);
+ config.fake_outputs = NULL;
+ } else if (force_xinerama || config.force_xinerama) {
+ /* Force Xinerama (for drivers which don't support RandR yet, esp. the
+ * nVidia binary graphics driver), when specified either in the config
+ * file or on command-line */
xinerama_init();
} else {
DLOG("Checking for XRandR...\n");
projects / i3 / i3 / blobdiff