From 42d355f2b75376cdb42bf6c634aa5a9d4b36c447 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 22 Oct 2011 23:40:02 +0100 Subject: [PATCH] normalize modelines/headers across src/*.c --- src/assignments.c | 2 ++ src/click.c | 13 ++++--------- src/con.c | 8 ++++---- src/config.c | 13 ++++--------- src/debug.c | 11 ++++------- src/ewmh.c | 8 ++------ src/floating.c | 9 ++------- src/handlers.c | 10 +++++----- src/ipc.c | 11 ++++------- src/load_layout.c | 10 ++++++++-- src/log.c | 7 ++----- src/main.c | 6 ++++++ src/manage.c | 4 +--- src/match.c | 1 - src/move.c | 8 +++++++- src/output.c | 7 ++++++- src/randr.c | 10 +++------- src/regex.c | 2 +- src/render.c | 8 +++++++- src/resize.c | 6 ++++++ src/sighandler.c | 19 +++++-------------- src/startup.c | 14 ++++++-------- src/tree.c | 7 ++++++- src/util.c | 12 +++++------- src/window.c | 2 ++ src/workspace.c | 3 ++- src/x.c | 8 +++++++- src/xcb.c | 6 +----- src/xcursor.c | 6 ++++++ src/xinerama.c | 9 +++------ 30 files changed, 121 insertions(+), 119 deletions(-) diff --git a/src/assignments.c b/src/assignments.c index 50f48526..1aeacce6 100644 --- 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 8ea182eb..04f5b871 100644 --- 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 #include @@ -19,9 +17,6 @@ #include -#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 805d33b8..b126ec06 100644 --- 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 0830add8..a75d0aa6 100644 --- 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 -#include "all.h" - char *current_configpath = NULL; Config config; struct modes_head modes; diff --git a/src/debug.c b/src/debug.c index 1e0f828d..30822353 100644 --- 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 diff --git a/src/ewmh.c b/src/ewmh.c index 0c1b6941..68fac63a 100644 --- 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 e43f4703..0f2d9b05 100644 --- 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 340e24aa..01a720af 100644 --- 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 +#include "all.h" +#include #include - #include - #define SN_API_NOT_YET_FROZEN 1 #include -#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 97937c05..b94ef613 100644 --- 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 #include #include @@ -19,8 +18,6 @@ #include #include -#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 37322c4e..eeb0cc75 100644 --- 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 #include #include #include -#include "all.h" - /* TODO: refactor the whole parsing thing */ static char *last_key; diff --git a/src/log.c b/src/log.c index c258b19b..a6159780 100644 --- 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 diff --git a/src/main.c b/src/main.c index 1bf6862d..4f1dc78b 100644 --- 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 #include diff --git a/src/manage.c b/src/manage.c index ec9e7173..b0d3f2f7 100644 --- 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 745989ba..25644c60 100644 --- 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 37fc0d34..00bcf2d9 100644 --- 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 68487924..a54cb6f3 100644 --- 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 96cc880a..0329038b 100644 --- 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 +#include "all.h" +#include #include -#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 64a2f3a4..a0b51f66 100644 --- 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 a7a9be56..e1a56d9a 100644 --- 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 9c465e18..8f8c04d7 100644 --- 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 1d3e4ab7..61e5d4a9 100644 --- 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 -#include -#include -#include -#include #include #include -#include -#include #include -#include #include -#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 388ac502..6a98f3cd 100644 --- 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 #include #define SN_API_NOT_YET_FROZEN 1 #include -#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 8c73b6ab..53993b99 100644 --- 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 036dce9a..81ef083d 100644 --- 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 #include #include @@ -24,8 +24,6 @@ #define SN_API_NOT_YET_FROZEN 1 #include -#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 bc8d28ac..ab9bdb69 100644 --- 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 2aad2a10..cca85e83 100644 --- 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 c2daca4c..028987c8 100644 --- 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 32537388..858e4985 100644 --- 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 5d209b56..f04a3959 100644 --- 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 #include diff --git a/src/xinerama.c b/src/xinerama.c index c116deaa..6f3a30db 100644 --- 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 -#include "all.h" static int num_screens; -- 2.39.5