use I3__FILE__ for DLOG, leave __FILE__ as is

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

diff --git a/common.mk b/common.mk
index 0d2ad51e5b5f613e70f2ab35249c0c9685770cc4..a6d6c4e3f23fc30eb38e105cbdfbfc68523424e0 100644 (file)
--- a/common.mk
+++ b/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

diff --git a/include/log.h b/include/log.h
index a8209cca58e3a2afff487a848c07e31b3368a312..0854628daf581a8958ab854a61e6f0b26a1faa31 100644 (file)
--- a/include/log.h
+++ b/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;

diff --git a/src/assignments.c b/src/assignments.c
index 696eca49953d5f7b505f4cbb24cb06613a0c0424..655816a3bc0ffd1ad464c92a3adbffe0f7c42c26 100644 (file)
--- a/src/assignments.c
+++ b/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
  *

diff --git a/src/click.c b/src/click.c
index 52a7d3b5996840a7c0d468ebef611cb5acc608a0..23b6be4f15483d417101221f8f7a778c9cf0c2c5 100644 (file)
--- a/src/click.c
+++ b/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
  *

diff --git a/src/commands.c b/src/commands.c
index 6d508af91a14bce5a70ad91330056feabd90a0fa..02d602f0e5112219bae0356bf0a7d92388c85f0e 100644 (file)
--- a/src/commands.c
+++ b/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
  *

diff --git a/src/commands_parser.c b/src/commands_parser.c
index 71f1c149d4f054a92bcc441ced69570f9ef5e894..20a7d67a16848a0106e3037f4f904a8708d83223 100644 (file)
--- a/src/commands_parser.c
+++ b/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
  *

diff --git a/src/con.c b/src/con.c
index 8f51df31a4683dc36ddfcf70a9615259c5ea7764..0c82163a436818b1d4c85dec72a4729711be531b 100644 (file)
--- a/src/con.c
+++ b/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
  *

diff --git a/src/config.c b/src/config.c
index 4757db20708458cec43adcbf5be0519b077c15d0..c256a3b74ce1aa5cfdc18c0b0cc091fd310c1ad9 100644 (file)
--- a/src/config.c
+++ b/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
  *

diff --git a/src/debug.c b/src/debug.c
index 4841840f9501f65113283c18e5b763f95440b72e..2dcdb56a428ee4b8ba7df87824c2121c305d83a4 100644 (file)
--- a/src/debug.c
+++ b/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
  *

diff --git a/src/ewmh.c b/src/ewmh.c
index afc4eb905864abf8b5086cdbaad1d493de48680f..45d4e5fec19bff8578f40cb2cd4d3876fda211e1 100644 (file)
--- a/src/ewmh.c
+++ b/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
  *

diff --git a/src/fake_outputs.c b/src/fake_outputs.c
index 7c95722532190320871ecc072db312aad398d3f9..e115329952fc14f0a2860276d856b11a8f354ba9 100644 (file)
--- a/src/fake_outputs.c
+++ b/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
  *

diff --git a/src/floating.c b/src/floating.c
index 69241b586b6073be265f53f5ee0272a8d9b29bb7..3d2c1d3191fb4f8b1367bf19a2f2aaf9cf64e691 100644 (file)
--- a/src/floating.c
+++ b/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
  *

diff --git a/src/handlers.c b/src/handlers.c
index 3a8d2344de9e186778ca6fc28025b635c3dfa488..a69a62690fc40ba804abd0d4a63e342ee777dedf 100644 (file)
--- a/src/handlers.c
+++ b/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
  *

diff --git a/src/ipc.c b/src/ipc.c
index 967e887154499237c8ef75cbf0d0e0dd179fec01..8db69259fcdf91cf711e6deb6ca9d649be5df510 100644 (file)
--- a/src/ipc.c
+++ b/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
  *

diff --git a/src/key_press.c b/src/key_press.c
index e8fbe17cce1c5114c6c7be0bb86d4c40a022917f..2a578d66d65adac4c44e63beafbbe6c6d9c93954 100644 (file)
--- a/src/key_press.c
+++ b/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
  *

diff --git a/src/load_layout.c b/src/load_layout.c
index 2f2d5a64c0aa5dfe305437b1e8b203fcf4a6c525..795fb6d8ce516e86ecb9e40df40751bdae09b4a8 100644 (file)
--- a/src/load_layout.c
+++ b/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
  *

diff --git a/src/log.c b/src/log.c
index 944edb3f4c5db63c2d6e2d3a5bf0076c1d6a9e23..ab75395ff8c0a8b127e3c2d4c19b5cf331eda984 100644 (file)
--- a/src/log.c
+++ b/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
  *

diff --git a/src/main.c b/src/main.c
index d6a7f617b801c93e43c043afdd5641174cb35fee..b60bb6d7cbbe155881fee2d9790711d3fbc8e167 100644 (file)
--- a/src/main.c
+++ b/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
  *

diff --git a/src/manage.c b/src/manage.c
index 2d08afaadcc44726d2f720e09c71e03355b53ce3..1dc39b9eabe18a2c88acc5e5b29e252c281721bd 100644 (file)
--- a/src/manage.c
+++ b/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
  *

diff --git a/src/match.c b/src/match.c
index 08ec0310e9782ebdc045e0119d7d1678315fe519..1014de848d358bb6a0e089cc76515331334774e0 100644 (file)
--- a/src/match.c
+++ b/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
  *

diff --git a/src/move.c b/src/move.c
index a4fc77b3b3b3267dd3976bdbf691d2a5336d2a54..46b90177dd27dbbd27024bf8d820994155754760 100644 (file)
--- a/src/move.c
+++ b/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
  *

diff --git a/src/output.c b/src/output.c
index dc676ba4537aa9bf9fc09865fa057e76dd82ea2a..fe8d49837adc0dc3c517850dc0dc705ade1f7694 100644 (file)
--- a/src/output.c
+++ b/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
  *

diff --git a/src/randr.c b/src/randr.c
index e117547313d801a8736425e236f4828d468763aa..6971ba9778c4396f90992d97c25d352105b760fe 100644 (file)
--- a/src/randr.c
+++ b/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
  *

diff --git a/src/regex.c b/src/regex.c
index 93e1af2d6e9edd0a94375d66270cf2ba60394ce0..60dee5cc92a24d57e42eddefb78a7436a3ed728b 100644 (file)
--- a/src/regex.c
+++ b/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
  *

diff --git a/src/render.c b/src/render.c
index f933433f3032073969b202079c4059567a58a67d..9c0debb36943991ddcc427dbd573f11aaf21870b 100644 (file)
--- a/src/render.c
+++ b/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
  *

diff --git a/src/resize.c b/src/resize.c
index b0c7a052a60b74fb6cf6cc1bc7271a192e292fdb..b65344a276c5edbefdee04f260e0856d45ca9441 100644 (file)
--- a/src/resize.c
+++ b/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
  *

diff --git a/src/scratchpad.c b/src/scratchpad.c
index da50cee76442c5d8c9d712065adc7896ee0625d0..6bba823fa2893512ad1f66924414935b08f0c744 100644 (file)
--- a/src/scratchpad.c
+++ b/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
  *

diff --git a/src/sighandler.c b/src/sighandler.c
index a218b02185528bf7cc4f00bcb314f6cbc9443965..bae73c164b3033387499725d25a55dcffbf1a179 100644 (file)
--- a/src/sighandler.c
+++ b/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
  *

diff --git a/src/startup.c b/src/startup.c
index b462a8535c61fa6dd3ae57d400ae806b514cec4d..b0aa2ca3625bd4bc603172cbb3736c115da3b0a1 100644 (file)
--- a/src/startup.c
+++ b/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
  *

diff --git a/src/tree.c b/src/tree.c
index cee61b9dcee4ba85607331628e3e82a31a6df1e9..d2dc10ea470eda18ba6a670c3306b6d5e751c270 100644 (file)
--- a/src/tree.c
+++ b/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
  *

diff --git a/src/util.c b/src/util.c
index 45e63e1ce188036c44367a6ad89e084c24bf8f10..db2f0204d24a0ddb83a166c28fae1737ed0589bf 100644 (file)
--- a/src/util.c
+++ b/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
  *

diff --git a/src/window.c b/src/window.c
index 15f722e2a11d58c8be02687f728e27387a7c1a7f..6ec63a8b43d60bb9717e0a8d92b82b6b7dd96127 100644 (file)
--- a/src/window.c
+++ b/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
  *

diff --git a/src/workspace.c b/src/workspace.c
index 8e834dbd29a4b77035da983448d9c48648e1b202..853311816538f516caf9200f94c9d354abf78247 100644 (file)
--- a/src/workspace.c
+++ b/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
  *

diff --git a/src/x.c b/src/x.c
index 661dece60cf215f336a0c1b70862bdf834e38cc6..65b3eb1f0ff07a0ab71138c6b2d88eb3748f136e 100644 (file)
--- a/src/x.c
+++ b/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
  *

diff --git a/src/xcb.c b/src/xcb.c
index 3d2ff67003744dceeea6951a7ca3346fb4634bb5..be3f536a65dd8a1526e1a7650344c5b1dd676dfc 100644 (file)
--- a/src/xcb.c
+++ b/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
  *

diff --git a/src/xcursor.c b/src/xcursor.c
index 48f713a76a6aa58e69f4fab2ff92828dd42a9fe7..7683b0d37ed8fd76c0330200b4650440ea8b53ab 100644 (file)
--- a/src/xcursor.c
+++ b/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
  *

diff --git a/src/xinerama.c b/src/xinerama.c
index 5c0504ca7ba22e6eb6699c90cbb92bcbf0af5bc4..7e5b5aebb4acb60e64379ceed47ed17c0428f42e 100644 (file)
--- a/src/xinerama.c
+++ b/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
  *