Merge branch 'fix-dump-log-errmsg'

[i3/i3] / src / main.c

diff --git a/src/main.c b/src/main.c
index c4cffa5cfc3984ff1591480b23e67781aae8c299..44c3f3cb6ce05ebfb021c0daef1a70b8e99685e2 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -25,9 +25,6 @@
  * 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;
 
@@ -212,7 +209,7 @@ static void xkb_got_event(EV_P_ struct ev_io *w, int revents) {
  * 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. */
@@ -246,12 +243,13 @@ static void handle_signal(int sig, siginfo_t *info, void *data) {
 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 = I3_VERSION;
+    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'},
@@ -267,6 +265,8 @@ int main(int argc, char *argv[]) {
         {"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;
@@ -288,16 +288,8 @@ int main(int argc, char *argv[]) {
      * (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;
 
@@ -321,7 +313,7 @@ int main(int argc, char *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);
@@ -368,6 +360,11 @@ int main(int argc, char *argv[]) {
                     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:
@@ -467,7 +464,7 @@ int main(int argc, char *argv[]) {
     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);
 
@@ -656,10 +653,18 @@ int main(int argc, char *argv[]) {
 
     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");