normalize modelines/headers across src/*.c

diff --git a/src/assignments.c b/src/assignments.c
index 50f4852644f3386d9b7d0269ff03fae899399447..1aeacce630d3831a640e57b155fd24ed374c5c55 100644 (file)
--- a/src/assignments.c
+++ b/src/assignments.c
@@ -4,6 +4,8 @@
  * i3 - an improved dynamic tiling window manager
  * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
+ * assignments.c: Assignments for specific windows (for_window).
+ *
  */
 #include "all.h"
 

diff --git a/src/click.c b/src/click.c
index 8ea182eb99647218f368ec8d1e34ca6f6b93bb1b..04f5b871db5cc62966e66b763b41c012d21e6829 100644 (file)
--- a/src/click.c
+++ b/src/click.c
@@ -2,15 +2,13 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2011 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
- *
- * src/click.c: Contains the handlers for button press (mouse click) events
- *              because they are quite large.
+ * click.c: Button press (mouse click) events.
  *
  */
+#include "all.h"
+
 #include <time.h>
 #include <math.h>
 
@@ -19,9 +17,6 @@
 
 #include <X11/XKBlib.h>
 
-#include "all.h"
-
-
 typedef enum { CLICK_BORDER = 0, CLICK_DECORATION = 1, CLICK_INSIDE = 2 } click_destination_t;
 
 /*

diff --git a/src/con.c b/src/con.c
index 805d33b8c36f05a845db439ef8432142a3947d9e..b126ec062983104ca0bddc77f11d28e9f139acb7 100644 (file)
--- a/src/con.c
+++ b/src/con.c
@@ -2,11 +2,11 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2010 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * con.c contains all functions which deal with containers directly (creating
- * containers, searching containers, getting specific properties from
- * containers, …).
+ * con.c: Functions which deal with containers directly (creating containers,
+ *        searching containers, getting specific properties from containers,
+ *        …).
  *
  */
 #include "all.h"

diff --git a/src/config.c b/src/config.c
index 0830add8a38030db09f47bec62c9d3000f25e453..a75d0aa6ebce506f00deb81b9090a25136880625 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -2,22 +2,17 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
- *
- * src/config.c: Contains all functions handling the configuration file (calling
- * the parser (src/cfgparse.y) with the correct path, switching key bindings
- * mode).
+ * config.c: Configuration file (calling the parser (src/cfgparse.y) with the
+ *           correct path, switching key bindings mode).
  *
  */
+#include "all.h"
 
 /* We need Xlib for XStringToKeysym */
 #include <X11/Xlib.h>
 
-#include "all.h"
-
 char *current_configpath = NULL;
 Config config;
 struct modes_head modes;

diff --git a/src/debug.c b/src/debug.c
index 1e0f828df76bc027d63736de610bad320662401c..30822353db2ab69a4e48e801759e12209f4a011c 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,14 +1,11 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
- *
- * debug.c: Contains debugging functions, especially FormatEvent, which prints unhandled events.
- *          This code is from xcb-util.
+ * debug.c: Debugging functions, especially FormatEvent, which prints unhandled
+ *          events.  This code is from xcb-util.
  *
  */
 #include <stdio.h>

diff --git a/src/ewmh.c b/src/ewmh.c
index 0c1b6941e1a4008d787812bbd0adcf95bfc134e0..68fac63acde790e79ffebc7d15aa004597346b01 100644 (file)
--- a/src/ewmh.c
+++ b/src/ewmh.c
@@ -2,15 +2,11 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2011 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
- *
- * ewmh.c: Functions to get/set certain EWMH properties easily.
+ * ewmh.c: Get/set certain EWMH properties easily.
  *
  */
-
 #include "all.h"
 
 /*

diff --git a/src/floating.c b/src/floating.c
index e43f4703fa4d8ad7876f7500880bd90e26e271f1..0f2d9b05a8a9b0f5e1009e2a4543ac6112a282fb 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -2,16 +2,11 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
- *
- * src/floating.c: contains all functions for handling floating clients
+ * floating.c: Floating windows.
  *
  */
-
-
 #include "all.h"
 
 extern xcb_connection_t *conn;

diff --git a/src/handlers.c b/src/handlers.c
index 340e24aa6c25f9b66ba0d21ed25469146a33ab65..01a720af0c8307f2813d75c3cb39f447b8b59cd8 100644 (file)
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -4,18 +4,18 @@
  * i3 - an improved dynamic tiling window manager
  * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
+ * handlers.c: Small handlers for various events (keypresses, focus changes,
+ *             …).
+ *
  */
-#include <time.h>
+#include "all.h"
 
+#include <time.h>
 #include <xcb/randr.h>
-
 #include <X11/XKBlib.h>
-
 #define SN_API_NOT_YET_FROZEN 1
 #include <libsn/sn-monitor.h>
 
-#include "all.h"
-
 int randr_base = -1;
 
 /* After mapping/unmapping windows, a notify event is generated. However, we don’t want it,

diff --git a/src/ipc.c b/src/ipc.c
index 97937c058538738ef3a68f083b5c34d3ff5271cd..b94ef6131b70ebcf0cab89edb3efd6ead60972a2 100644 (file)
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -2,14 +2,13 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2011 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
- *
- * ipc.c: Everything about the UNIX domain sockets for IPC
+ * ipc.c: UNIX domain socket IPC (initialization, client handling, protocol).
  *
  */
+#include "all.h"
+
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <fcntl.h>
@@ -19,8 +18,6 @@
 #include <yajl/yajl_parse.h>
 #include <yajl/yajl_version.h>
 
-#include "all.h"
-
 char *current_socketpath = NULL;
 
 /* Shorter names for all those yajl_gen_* functions */

diff --git a/src/load_layout.c b/src/load_layout.c
index 37322c4ea3857f2b92e85f05c5ee843054f8e975..eeb0cc75fc9f3c0db192b34cf130837627ad138b 100644 (file)
--- a/src/load_layout.c
+++ b/src/load_layout.c
@@ -1,14 +1,20 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * load_layout.c: Restore (parts of) the layout, for example after an inplace
+ *                restart.
+ *
  */
+#include "all.h"
+
 #include <yajl/yajl_common.h>
 #include <yajl/yajl_gen.h>
 #include <yajl/yajl_parse.h>
 #include <yajl/yajl_version.h>
 
-#include "all.h"
-
 /* TODO: refactor the whole parsing thing */
 
 static char *last_key;

diff --git a/src/log.c b/src/log.c
index c258b19ba38414a6b9b1717a5ae9be7bb05d0feb..a615978065eaf8570f96e970c706cf95ffcfa518 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -2,12 +2,9 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
- *
- * src/log.c: handles the setting of loglevels, contains the logging functions.
+ * log.c: Setting of loglevels, logging functions.
  *
  */
 #include <stdarg.h>

diff --git a/src/main.c b/src/main.c
index 1bf6862d30bfc276d7573d17869f04a2fb6fc3f9..4f1dc78b57f3bf633bf4ba6d43618e24a92aa04e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,11 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * main.c: Initialization, main loop
+ *
  */
 #include <ev.h>
 #include <fcntl.h>

diff --git a/src/manage.c b/src/manage.c
index ec9e7173ae07acaedb8a5e47af8d180a9cace0b5..b0d3f2f79d87b06923f5bc9f299bff2398d05cc2 100644 (file)
--- a/src/manage.c
+++ b/src/manage.c
@@ -4,11 +4,9 @@
  * i3 - an improved dynamic tiling window manager
  * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * manage.c: Contains all functions for initially managing new windows
- *           (or existing ones on restart).
+ * manage.c: Initially managing new windows (or existing ones on restart).
  *
  */
-
 #include "all.h"
 
 /*

diff --git a/src/match.c b/src/match.c
index 745989ba6ef378c5b59755f0eac8a01a6a8a39b5..25644c604ef93627d919d76f5076bb04e29c2f97 100644 (file)
--- a/src/match.c
+++ b/src/match.c
@@ -11,7 +11,6 @@
  * match_matches_window() to find the windows affected by this command.
  *
  */
-
 #include "all.h"
 
 /*

diff --git a/src/move.c b/src/move.c
index 37fc0d34d7b3ac9082a88a08be9f4a65577837f3..00bcf2d9c4d3bd8e44be67845cbc08a2b954536f 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -1,8 +1,14 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * move.c: Moving containers into some direction.
+ *
  */
-
 #include "all.h"
+
 #include "cmdparse.tab.h"
 
 typedef enum { BEFORE, AFTER } position_t;

diff --git a/src/output.c b/src/output.c
index 684879240bad55366a261bdc231384d42ab0c059..a54cb6f35fb54ace23ff77faf2011083eb77343e 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,7 +1,12 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * output.c: Output (monitor) related functions.
+ *
  */
-
 #include "all.h"
 
 /*

diff --git a/src/randr.c b/src/randr.c
index 96cc880abcf5c359b09a3816b50c61e12c535c74..0329038ba2db31b379bb2e32463fb7d4fd728599 100644 (file)
--- a/src/randr.c
+++ b/src/randr.c
@@ -2,22 +2,18 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009-2011 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * For more information on RandR, please see the X.org RandR specification at
  * http://cgit.freedesktop.org/xorg/proto/randrproto/tree/randrproto.txt
  * (take your time to read it completely, it answers all questions).
  *
  */
-#include <time.h>
+#include "all.h"
 
+#include <time.h>
 #include <xcb/randr.h>
 
-#include "all.h"
-
 /* While a clean namespace is usually a pretty good thing, we really need
  * to use shorter names than the whole xcb_randr_* default names. */
 typedef xcb_randr_get_crtc_info_reply_t crtc_info;

diff --git a/src/regex.c b/src/regex.c
index 64a2f3a4ffd4fd7a5cd73ad3a0037f37c714a2bc..a0b51f66d2be15cfc4670d3e5011e42a902ad4d7 100644 (file)
--- a/src/regex.c
+++ b/src/regex.c
@@ -4,9 +4,9 @@
  * i3 - an improved dynamic tiling window manager
  * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
+ * regex.c: Interface to libPCRE (perl compatible regular expressions).
  *
  */
-
 #include "all.h"
 
 /*

diff --git a/src/render.c b/src/render.c
index a7a9be56ed90baf077dad26e1d43ddaeae58925e..e1a56d9a7735992109072081d8093fab491850cd 100644 (file)
--- a/src/render.c
+++ b/src/render.c
@@ -1,7 +1,13 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * render.c: Renders (determines position/sizes) the layout tree, updating the
+ *           various rects. Needs to be pushed to X11 (see x.c) to be visible.
+ *
  */
-
 #include "all.h"
 
 /* change this to 'true' if you want to have additional borders around every

diff --git a/src/resize.c b/src/resize.c
index 9c465e183ea812700ab46236ad25306a49aab46c..8f8c04d75c15b6d8f427e047de468a6d72c115fb 100644 (file)
--- a/src/resize.c
+++ b/src/resize.c
@@ -1,5 +1,11 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * resize.c: Interactive resizing.
+ *
  */
 #include "all.h"
 

diff --git a/src/sighandler.c b/src/sighandler.c
index 1d3e4ab719979832be0066b2314509e2aa3ec58b..61e5d4a9049f54c35810a149764697c270363541 100644 (file)
--- a/src/sighandler.c
+++ b/src/sighandler.c
@@ -2,32 +2,23 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009-2010 Michael Stapelberg and contributors
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  * © 2009-2010 Jan-Erik Rediger
  *
- * See file LICENSE for license information.
- *
- * sighandler.c: contains all functions for signal handling
+ * sighandler.c: Interactive crash dialog upon SIGSEGV/SIGABRT/SIGFPE (offers
+ *               to restart inplace).
  *
  */
+#include "all.h"
+
 #include <ev.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include <iconv.h>
 #include <signal.h>
 
-#include <xcb/xcb.h>
-#include <xcb/xcb_aux.h>
 #include <xcb/xcb_event.h>
-#include <xcb/xcb_keysyms.h>
 
 #include <X11/keysym.h>
 
-#include "all.h"
-
 static xcb_gcontext_t pixmap_gc;
 static xcb_pixmap_t pixmap;
 static int raised_signal;

diff --git a/src/startup.c b/src/startup.c
index 388ac5028f933413043c4dd0c1a8f375913f8f29..6a98f3cdab3f5dc04ec5245fdbf04995f77c3d20 100644 (file)
--- a/src/startup.c
+++ b/src/startup.c
@@ -2,24 +2,22 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009-2011 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * startup.c: Startup notification code. Ensures a startup notification context
- * is setup when launching applications. We store the current workspace to open
- * windows in that startup notification context on the appropriate workspace.
+ *            is setup when launching applications. We store the current
+ *            workspace to open windows in that startup notification context on
+ *            the appropriate workspace.
  *
  */
+#include "all.h"
+
 #include <sys/types.h>
 #include <sys/wait.h>
 
 #define SN_API_NOT_YET_FROZEN 1
 #include <libsn/sn-launcher.h>
 
-#include "all.h"
-
 static TAILQ_HEAD(startup_sequence_head, Startup_Sequence) startup_sequences =
     TAILQ_HEAD_INITIALIZER(startup_sequences);
 

diff --git a/src/tree.c b/src/tree.c
index 8c73b6ab57eff07531b90e3c96faabe6eaadd668..53993b998164362ad4a64911d42c58cfbed415f0 100644 (file)
--- a/src/tree.c
+++ b/src/tree.c
@@ -1,7 +1,12 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * tree.c: Everything that primarily modifies the layout tree data structure.
+ *
  */
-
 #include "all.h"
 
 struct Con *croot;

diff --git a/src/util.c b/src/util.c
index 036dce9ab616c09bb425e4700a0bc04f6bdeeca7..81ef083d9fb4703d43fdeda3dda9488c61fbaa13 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -2,14 +2,14 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2011 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
- *
- * util.c: Utility functions, which can be useful everywhere.
+ * util.c: Utility functions, which can be useful everywhere within i3 (see
+ *         also libi3).
  *
  */
+#include "all.h"
+
 #include <sys/wait.h>
 #include <stdarg.h>
 #include <iconv.h>
@@ -24,8 +24,6 @@
 #define SN_API_NOT_YET_FROZEN 1
 #include <libsn/sn-launcher.h>
 
-#include "all.h"
-
 static iconv_t conversion_descriptor = 0;
 
 int min(int a, int b) {

diff --git a/src/window.c b/src/window.c
index bc8d28ac75b04939f156acbcf019e6877a51a7d3..ab9bdb697e2a62408205cccf71fcb99ee05d290f 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -4,6 +4,8 @@
  * i3 - an improved dynamic tiling window manager
  * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
+ * window.c: Updates window attributes (X11 hints/properties).
+ *
  */
 #include "all.h"
 

diff --git a/src/workspace.c b/src/workspace.c
index 2aad2a100d20dc9fad0da2414d86057ef619da06..cca85e8333515e088337bc080a5654d88ec751d1 100644 (file)
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -4,7 +4,8 @@
  * i3 - an improved dynamic tiling window manager
  * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * workspace.c: Functions for modifying workspaces
+ * workspace.c: Modifying workspaces, accessing them, moving containers to
+ *              workspaces.
  *
  */
 #include "all.h"

diff --git a/src/x.c b/src/x.c
index c2daca4c2f8538b18e6720fa06194e9cf2438639..028987c89c334d7901b5fd005d2b269476d08e0a 100644 (file)
--- a/src/x.c
+++ b/src/x.c
@@ -1,7 +1,13 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * x.c: Interface to X11, transfers our in-memory state to X11 (see also
+ *      render.c). Basically a big state machine.
+ *
  */
-
 #include "all.h"
 
 /* Stores the X11 window ID of the currently focused window */

diff --git a/src/xcb.c b/src/xcb.c
index 32537388bd3e8f93fe8e92e152b004815a363518..858e4985005ca926d575a6099fd4d27d1bc61990 100644 (file)
--- a/src/xcb.c
+++ b/src/xcb.c
@@ -2,15 +2,11 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009-2010 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * xcb.c: Helper functions for easier usage of XCB
  *
  */
-
 #include "all.h"
 
 TAILQ_HEAD(cached_fonts_head, Font) cached_fonts = TAILQ_HEAD_INITIALIZER(cached_fonts);

diff --git a/src/xcursor.c b/src/xcursor.c
index 5d209b56baf465057f65dd1ef6f8702352463867..f04a3959922612e766fdcd991ee9e839274abc70 100644 (file)
--- a/src/xcursor.c
+++ b/src/xcursor.c
@@ -1,5 +1,11 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * xcursor.c: libXcursor support for themed cursors.
+ *
  */
 #include <assert.h>
 #include <X11/Xcursor/Xcursor.h>

diff --git a/src/xinerama.c b/src/xinerama.c
index c116deaa954fb0bd709a1e5ec44a23c0f1b5e7a9..6f3a30db22d758d0ec9021c17f2e64dc55c28195 100644 (file)
--- a/src/xinerama.c
+++ b/src/xinerama.c
@@ -2,20 +2,17 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009-2011 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * This is LEGACY code (we support RandR, which can do much more than
  * Xinerama), but necessary for the poor users of the nVidia binary
- * driver which does not support RandR in 2010 *sigh*.
+ * driver which does not support RandR in 2011 *sigh*.
  *
  */
+#include "all.h"
 
 #include <xcb/xinerama.h>
 
-#include "all.h"
 
 static int num_screens;