* 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;
* 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;
- bool enable_32bit_visual = false;
static struct option long_options[] = {
{"no-autostart", no_argument, 0, 'a'},
{"config", required_argument, 0, 'c'},
{"shmlog_size", required_argument, 0, 0},
{"get-socketpath", no_argument, 0, 0},
{"get_socketpath", no_argument, 0, 0},
- {"enable-32bit-visual", no_argument, 0, 0},
- {"enable_32bit_visual", 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);
break;
case 'd':
- LOG("Enabling debug loglevel %s\n", optarg);
- add_loglevel(optarg);
+ LOG("Enabling debug logging\n");
+ set_debug_logging(true);
break;
case 'l':
/* DEPRECATED, ignored for the next 3 versions (3.e, 3.f, 3.g) */
layout_path = sstrdup(optarg);
delete_layout_path = true;
break;
- } else if (strcmp(long_options[option_index].name, "enable_32bit_visual") == 0 ||
- strcmp(long_options[option_index].name, "enable-32bit-visual") == 0) {
- LOG("Enabling 32 bit visual (if available)\n");
- enable_32bit_visual = true;
+ } 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:
- fprintf(stderr, "Usage: %s [-c configfile] [-d loglevel] [-a] [-v] [-V] [-C]\n", argv[0]);
+ fprintf(stderr, "Usage: %s [-c configfile] [-d all] [-a] [-v] [-V] [-C]\n", argv[0]);
fprintf(stderr, "\n");
fprintf(stderr, "\t-a disable autostart ('exec' lines in config)\n");
fprintf(stderr, "\t-c <file> use the provided configfile instead\n");
fprintf(stderr, "\t-C validate configuration file and exit\n");
- fprintf(stderr, "\t-d <level> enable debug output with the specified loglevel\n");
+ fprintf(stderr, "\t-d all enable debug output\n");
fprintf(stderr, "\t-L <file> path to the serialized layout during restarts\n");
fprintf(stderr, "\t-v display version and exit\n");
fprintf(stderr, "\t-V enable verbose mode\n");
"\tto 0 disables SHM logging entirely.\n"
"\tThe default is %d bytes.\n", shmlog_size);
fprintf(stderr, "\n");
- fprintf(stderr, "\t--enable-32bit-visual\n"
- "\tMakes i3 use a 32 bit visual, if available. Necessary for\n"
- "\tpseudo-transparency with xcompmgr.\n");
- fprintf(stderr, "\n");
fprintf(stderr, "If you pass plain text arguments, i3 will interpret them as a command\n"
"to send to a currently running i3 (like i3-msg). This allows you to\n"
"use nice and logical commands, such as:\n"
/* If the user passes more arguments, we act like i3-msg would: Just send
* the arguments as an IPC message to i3. This allows for nice semantic
* commands such as 'i3 border none'. */
- if (optind < argc) {
+ if (!only_check_config && optind < argc) {
/* We enable verbose mode so that the user knows what’s going on.
* This should make it easier to find mistakes when the user passes
* arguments by mistake. */
}
optind++;
}
- LOG("Command is: %s (%d bytes)\n", payload, strlen(payload));
+ DLOG("Command is: %s (%zd bytes)\n", payload, strlen(payload));
char *socket_path = root_atom_contents("I3_SOCKET_PATH");
if (!socket_path) {
ELOG("Could not get i3 IPC socket path\n");
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);
visual_id = root_screen->root_visual;
colormap = root_screen->default_colormap;
- if (enable_32bit_visual) {
- xcb_depth_iterator_t depth_iter;
- xcb_visualtype_iterator_t visual_iter;
- for (depth_iter = xcb_screen_allowed_depths_iterator(root_screen);
- depth_iter.rem;
- xcb_depth_next(&depth_iter)) {
- if (depth_iter.data->depth != 32)
- continue;
- visual_iter = xcb_depth_visuals_iterator(depth_iter.data);
- if (!visual_iter.rem)
- continue;
-
- visual_id = visual_iter.data->visual_id;
- root_depth = depth_iter.data->depth;
- colormap = xcb_generate_id(conn);
- colormap_cookie = xcb_create_colormap_checked(conn, XCB_COLORMAP_ALLOC_NONE, colormap, root, visual_id);
- DLOG("Found a visual with 32 bit depth.\n");
- break;
- }
- }
-
DLOG("root_depth = %d, visual_id = 0x%08x.\n", root_depth, visual_id);
xcb_get_geometry_cookie_t gcookie = xcb_get_geometry(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");
Output *output = NULL;
if (!(pointerreply = xcb_query_pointer_reply(conn, pointercookie, NULL))) {
ELOG("Could not query pointer position, using first screen\n");
- output = get_first_output();
} else {
DLOG("Pointer at %d, %d\n", pointerreply->root_x, pointerreply->root_y);
output = get_output_containing(pointerreply->root_x, pointerreply->root_y);
projects / i3 / i3 / blobdiff