use I3__FILE__ for DLOG, leave __FILE__ as is

See also commit 0e752070ac, which broke
source code listings in gdb unless you cd into i3/src. This should give
us best of both :-).

common.mk

@@ -56,6 +56,7 @@ I3_CPPFLAGS += -DMAJOR_VERSION=${MAJOR_VERSION}
 I3_CPPFLAGS += -DMINOR_VERSION=${MINOR_VERSION}
 I3_CPPFLAGS += -DPATCH_VERSION=${PATCH_VERSION}
 I3_CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
+I3_CPPFLAGS += -DI3__FILE__=__FILE__
 
 
 ## Libraries flags

include/log.h

@@ -17,7 +17,7 @@
    is, delete the preceding comma */
 #define LOG(fmt, ...) verboselog(fmt, ##__VA_ARGS__)
 #define ELOG(fmt, ...) errorlog("ERROR: " fmt, ##__VA_ARGS__)
-#define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, __FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__)
+#define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, I3__FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__)
 
 extern char *errorfilename;
 extern char *shmlogname;

src/assignments.c

@@ -1,4 +1,5 @@
-#line 2 "assignments.c"
+#undef I3__FILE__
+#define I3__FILE__ "assignments.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/click.c

@@ -1,4 +1,5 @@
-#line 2 "click.c"
+#undef I3__FILE__
+#define I3__FILE__ "click.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/commands.c

@@ -1,4 +1,5 @@
-#line 2 "commands.c"
+#undef I3__FILE__
+#define I3__FILE__ "commands.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/commands_parser.c

@@ -1,4 +1,5 @@
-#line 2 "commands_parser.c"
+#undef I3__FILE__
+#define I3__FILE__ "commands_parser.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/con.c

@@ -1,4 +1,5 @@
-#line 2 "con.c"
+#undef I3__FILE__
+#define I3__FILE__ "con.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/config.c

@@ -1,4 +1,5 @@
-#line 2 "config.c"
+#undef I3__FILE__
+#define I3__FILE__ "config.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/debug.c

@@ -1,4 +1,5 @@
-#line 2 "debug.c"
+#undef I3__FILE__
+#define I3__FILE__ "debug.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/ewmh.c

@@ -1,4 +1,5 @@
-#line 2 "ewmh.c"
+#undef I3__FILE__
+#define I3__FILE__ "ewmh.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/fake_outputs.c

@@ -1,4 +1,5 @@
-#line 2 "fake_outputs.c"
+#undef I3__FILE__
+#define I3__FILE__ "fake_outputs.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/floating.c

@@ -1,4 +1,5 @@
-#line 2 "floating.c"
+#undef I3__FILE__
+#define I3__FILE__ "floating.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/handlers.c

@@ -1,4 +1,5 @@
-#line 2 "handlers.c"
+#undef I3__FILE__
+#define I3__FILE__ "handlers.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/ipc.c

@@ -1,4 +1,5 @@
-#line 2 "ipc.c"
+#undef I3__FILE__
+#define I3__FILE__ "ipc.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/key_press.c

@@ -1,4 +1,5 @@
-#line 2 "key_press.c"
+#undef I3__FILE__
+#define I3__FILE__ "key_press.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/load_layout.c

@@ -1,4 +1,5 @@
-#line 2 "load_layout.c"
+#undef I3__FILE__
+#define I3__FILE__ "load_layout.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/log.c

@@ -1,4 +1,5 @@
-#line 2 "log.c"
+#undef I3__FILE__
+#define I3__FILE__ "log.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/main.c

@@ -1,4 +1,5 @@
-#line 2 "main.c"
+#undef I3__FILE__
+#define I3__FILE__ "main.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/manage.c

@@ -1,4 +1,5 @@
-#line 2 "manage.c"
+#undef I3__FILE__
+#define I3__FILE__ "manage.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/match.c

@@ -1,4 +1,5 @@
-#line 2 "match.c"
+#undef I3__FILE__
+#define I3__FILE__ "match.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/move.c

@@ -1,4 +1,5 @@
-#line 2 "move.c"
+#undef I3__FILE__
+#define I3__FILE__ "move.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/output.c

@@ -1,4 +1,5 @@
-#line 2 "output.c"
+#undef I3__FILE__
+#define I3__FILE__ "output.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/randr.c

@@ -1,4 +1,5 @@
-#line 2 "randr.c"
+#undef I3__FILE__
+#define I3__FILE__ "randr.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/regex.c

@@ -1,4 +1,5 @@
-#line 2 "regex.c"
+#undef I3__FILE__
+#define I3__FILE__ "regex.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/render.c

@@ -1,4 +1,5 @@
-#line 2 "render.c"
+#undef I3__FILE__
+#define I3__FILE__ "render.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/resize.c

@@ -1,4 +1,5 @@
-#line 2 "resize.c"
+#undef I3__FILE__
+#define I3__FILE__ "resize.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/scratchpad.c

@@ -1,4 +1,5 @@
-#line 2 "scratchpad.c"
+#undef I3__FILE__
+#define I3__FILE__ "scratchpad.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/sighandler.c

@@ -1,4 +1,5 @@
-#line 2 "sighandler.c"
+#undef I3__FILE__
+#define I3__FILE__ "sighandler.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/startup.c

@@ -1,4 +1,5 @@
-#line 2 "startup.c"
+#undef I3__FILE__
+#define I3__FILE__ "startup.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/tree.c

@@ -1,4 +1,5 @@
-#line 2 "tree.c"
+#undef I3__FILE__
+#define I3__FILE__ "tree.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/util.c

@@ -1,4 +1,5 @@
-#line 2 "util.c"
+#undef I3__FILE__
+#define I3__FILE__ "util.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/window.c

@@ -1,4 +1,5 @@
-#line 2 "window.c"
+#undef I3__FILE__
+#define I3__FILE__ "window.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/workspace.c

@@ -1,4 +1,5 @@
-#line 2 "workspace.c"
+#undef I3__FILE__
+#define I3__FILE__ "workspace.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/x.c

@@ -1,4 +1,5 @@
-#line 2 "x.c"
+#undef I3__FILE__
+#define I3__FILE__ "x.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/xcb.c

@@ -1,4 +1,5 @@
-#line 2 "xcb.c"
+#undef I3__FILE__
+#define I3__FILE__ "xcb.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/xcursor.c

@@ -1,4 +1,5 @@
-#line 2 "xcursor.c"
+#undef I3__FILE__
+#define I3__FILE__ "xcursor.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *

src/xinerama.c

@@ -1,4 +1,5 @@
-#line 2 "xinerama.c"
+#undef I3__FILE__
+#define I3__FILE__ "xinerama.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *