From 726f2a1e5a6e6567b3c880277986b9d1d7bca931 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Tue, 25 Oct 2011 21:19:38 +0100 Subject: [PATCH] normalize file headers across **/*.{h,c} --- i3-config-wizard/main.c | 7 +- i3-input/main.c | 7 +- i3-input/ucs2_to_utf8.c | 130 ++++++++++++++++------------------ i3-msg/main.c | 5 +- i3-nagbar/main.c | 8 +-- i3bar/include/child.h | 7 +- i3bar/include/common.h | 7 +- i3bar/include/config.h | 9 +++ i3bar/include/ipc.h | 7 +- i3bar/include/outputs.h | 7 +- i3bar/include/trayclients.h | 7 +- i3bar/include/ucs2_to_utf8.h | 14 ++++ i3bar/include/util.h | 7 +- i3bar/include/workspaces.h | 7 +- i3bar/include/xcb.h | 7 +- i3bar/src/child.c | 7 +- i3bar/src/config.c | 7 +- i3bar/src/ipc.c | 7 +- i3bar/src/main.c | 5 +- i3bar/src/outputs.c | 7 +- i3bar/src/ucs2_to_utf8.c | 105 ++++++++++++++------------- i3bar/src/workspaces.c | 7 +- i3bar/src/xcb.c | 7 +- include/all.h | 5 ++ include/assignments.h | 5 ++ include/click.h | 5 +- include/cmdparse.h | 9 +++ include/con.h | 11 +++ include/config.h | 6 +- include/data.h | 1 - include/debug.h | 8 +-- include/ewmh.h | 5 +- include/floating.h | 7 +- include/handlers.h | 8 +-- include/i3.h | 11 ++- include/i3/ipc.h | 8 +-- include/ipc.h | 8 +-- include/libi3.h | 8 ++- include/load_layout.h | 10 +++ include/log.h | 5 +- include/manage.h | 12 ++-- include/match.h | 13 ++++ include/move.h | 7 +- include/output.h | 7 +- include/randr.h | 15 ++-- include/regex.h | 5 ++ include/render.h | 8 ++- include/resize.h | 9 +++ include/sighandler.h | 6 +- include/startup.h | 8 ++- include/tree.h | 7 +- include/util.h | 14 ++-- include/window.h | 9 +++ include/workspace.h | 13 ++-- include/x.h | 8 ++- include/xcb.h | 5 +- include/xcb_compat.h | 11 +++ include/xcursor.h | 6 ++ include/xinerama.h | 13 ++-- libi3/fake_configure_notify.c | 5 +- libi3/get_colorpixel.c | 5 +- libi3/get_mod_mask.c | 5 +- libi3/get_socket_path.c | 5 +- libi3/ipc_connect.c | 5 +- libi3/ipc_recv_message.c | 5 +- libi3/ipc_send_message.c | 5 +- libi3/load_font.c | 5 +- libi3/safewrappers.c | 5 +- libi3/strndup.c | 5 +- src/cmdparse.y | 1 - 70 files changed, 400 insertions(+), 335 deletions(-) diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c index b9862f2b..cdce0653 100644 --- a/i3-config-wizard/main.c +++ b/i3-config-wizard/main.c @@ -2,13 +2,10 @@ * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * - * © 2011 Michael Stapelberg and contributors - * - * See file LICENSE for license information. + * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) * * i3-config-wizard: Program to convert configs using keycodes to configs using - * keysyms. + * keysyms. * */ #include diff --git a/i3-input/main.c b/i3-input/main.c index 2d4def7c..def68481 100644 --- a/i3-input/main.c +++ b/i3-input/main.c @@ -2,13 +2,10 @@ * 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) * * i3-input/main.c: Utility which lets the user input commands and sends them - * to i3. + * to i3. * */ #include diff --git a/i3-input/ucs2_to_utf8.c b/i3-input/ucs2_to_utf8.c index 4557c9da..4d73493c 100644 --- a/i3-input/ucs2_to_utf8.c +++ b/i3-input/ucs2_to_utf8.c @@ -1,11 +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 Michael Stapelberg and contributors - * - * See file LICENSE for license information. + * ucs2_to_utf8.c: Converts between UCS-2 and UTF-8, both of which are used in + * different contexts in X11. * */ #include @@ -14,6 +14,8 @@ #include #include +#include "libi3.h" + static iconv_t conversion_descriptor = 0; static iconv_t conversion_descriptor2 = 0; @@ -23,37 +25,33 @@ static iconv_t conversion_descriptor2 = 0; * */ char *convert_ucs_to_utf8(char *input) { - size_t input_size = 2; - /* UTF-8 may consume up to 4 byte */ - int buffer_size = 8; - - char *buffer = calloc(buffer_size, 1); - if (buffer == NULL) - err(EXIT_FAILURE, "malloc() failed\n"); - size_t output_size = buffer_size; - /* We need to use an additional pointer, because iconv() modifies it */ - char *output = buffer; - - /* We convert the input into UCS-2 big endian */ - if (conversion_descriptor == 0) { - conversion_descriptor = iconv_open("UTF-8", "UCS-2BE"); - if (conversion_descriptor == 0) { - fprintf(stderr, "error opening the conversion context\n"); - exit(1); - } - } - - /* Get the conversion descriptor back to original state */ - iconv(conversion_descriptor, NULL, NULL, NULL, NULL); - - /* Convert our text */ - int rc = iconv(conversion_descriptor, (void*)&input, &input_size, &output, &output_size); - if (rc == (size_t)-1) { - perror("Converting to UCS-2 failed"); - return NULL; - } - - return buffer; + size_t input_size = 2; + /* UTF-8 may consume up to 4 byte */ + int buffer_size = 8; + + char *buffer = scalloc(buffer_size); + size_t output_size = buffer_size; + /* We need to use an additional pointer, because iconv() modifies it */ + char *output = buffer; + + /* We convert the input into UCS-2 big endian */ + if (conversion_descriptor == 0) { + conversion_descriptor = iconv_open("UTF-8", "UCS-2BE"); + if (conversion_descriptor == 0) + errx(EXIT_FAILURE, "Error opening the conversion context"); + } + + /* Get the conversion descriptor back to original state */ + iconv(conversion_descriptor, NULL, NULL, NULL, NULL); + + /* Convert our text */ + int rc = iconv(conversion_descriptor, (void*)&input, &input_size, &output, &output_size); + if (rc == (size_t)-1) { + perror("Converting to UCS-2 failed"); + return NULL; + } + + return buffer; } /* @@ -64,41 +62,37 @@ char *convert_ucs_to_utf8(char *input) { * */ char *convert_utf8_to_ucs2(char *input, int *real_strlen) { - size_t input_size = strlen(input) + 1; - /* UCS-2 consumes exactly two bytes for each glyph */ - int buffer_size = input_size * 2; - - char *buffer = malloc(buffer_size); - if (buffer == NULL) - err(EXIT_FAILURE, "malloc() failed\n"); - size_t output_size = buffer_size; - /* We need to use an additional pointer, because iconv() modifies it */ - char *output = buffer; - - /* We convert the input into UCS-2 big endian */ - if (conversion_descriptor2 == 0) { - conversion_descriptor2 = iconv_open("UCS-2BE", "UTF-8"); - if (conversion_descriptor2 == 0) { - fprintf(stderr, "error opening the conversion context\n"); - exit(1); - } - } - - /* Get the conversion descriptor back to original state */ - iconv(conversion_descriptor2, NULL, NULL, NULL, NULL); - - /* Convert our text */ - int rc = iconv(conversion_descriptor2, (void*)&input, &input_size, &output, &output_size); - if (rc == (size_t)-1) { - perror("Converting to UCS-2 failed"); - if (real_strlen != NULL) - *real_strlen = 0; - return NULL; - } + size_t input_size = strlen(input) + 1; + /* UCS-2 consumes exactly two bytes for each glyph */ + int buffer_size = input_size * 2; + + char *buffer = smalloc(buffer_size); + size_t output_size = buffer_size; + /* We need to use an additional pointer, because iconv() modifies it */ + char *output = buffer; + + /* We convert the input into UCS-2 big endian */ + if (conversion_descriptor2 == 0) { + conversion_descriptor2 = iconv_open("UCS-2BE", "UTF-8"); + if (conversion_descriptor2 == 0) + errx(EXIT_FAILURE, "Error opening the conversion context"); + } + /* Get the conversion descriptor back to original state */ + iconv(conversion_descriptor2, NULL, NULL, NULL, NULL); + + /* Convert our text */ + int rc = iconv(conversion_descriptor2, (void*)&input, &input_size, &output, &output_size); + if (rc == (size_t)-1) { + perror("Converting to UCS-2 failed"); if (real_strlen != NULL) - *real_strlen = ((buffer_size - output_size) / 2) - 1; + *real_strlen = 0; + return NULL; + } + + if (real_strlen != NULL) + *real_strlen = ((buffer_size - output_size) / 2) - 1; - return buffer; + return buffer; } diff --git a/i3-msg/main.c b/i3-msg/main.c index 13cf0ccb..6a3b29d3 100644 --- a/i3-msg/main.c +++ b/i3-msg/main.c @@ -2,10 +2,7 @@ * 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-2010 Michael Stapelberg and contributors (see also: LICENSE) * * i3-msg/main.c: Utility which sends messages to a running i3-instance using * IPC via UNIX domain sockets. diff --git a/i3-nagbar/main.c b/i3-nagbar/main.c index 120503c6..70ded8d8 100644 --- a/i3-nagbar/main.c +++ b/i3-nagbar/main.c @@ -2,12 +2,10 @@ * 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. - * - * i3-nagbar is a utility which displays a nag message. + * i3-nagbar is a utility which displays a nag message, for example in the case + * when the user has an error in his configuration file. * */ #include diff --git a/i3bar/include/child.h b/i3bar/include/child.h index 2622b3b0..ceb18336 100644 --- a/i3bar/include/child.h +++ b/i3bar/include/child.h @@ -1,9 +1,10 @@ /* - * i3bar - an xcb-based status- and ws-bar for i3 + * vim:ts=4:sw=4:expandtab * - * © 2010-2011 Axel Wagner and contributors + * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * - * See file LICNSE for license information + * child.c: Getting Input for the statusline * */ #ifndef CHILD_H_ diff --git a/i3bar/include/common.h b/i3bar/include/common.h index 4b0d4485..3b6967fa 100644 --- a/i3bar/include/common.h +++ b/i3bar/include/common.h @@ -1,9 +1,8 @@ /* - * i3bar - an xcb-based status- and ws-bar for i3 - * - * © 2010-2011 Axel Wagner and contributors + * vim:ts=4:sw=4:expandtab * - * See file LICNSE for license information + * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * */ #ifndef COMMON_H_ diff --git a/i3bar/include/config.h b/i3bar/include/config.h index c5fc218c..1015cc5f 100644 --- a/i3bar/include/config.h +++ b/i3bar/include/config.h @@ -1,3 +1,12 @@ +/* + * vim:ts=4:sw=4:expandtab + * + * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) + * + * config.c: Parses the configuration (received from i3). + * + */ #ifndef CONFIG_H_ #define CONFIG_H_ diff --git a/i3bar/include/ipc.h b/i3bar/include/ipc.h index 35f2d0f7..a0c49704 100644 --- a/i3bar/include/ipc.h +++ b/i3bar/include/ipc.h @@ -1,9 +1,10 @@ /* - * i3bar - an xcb-based status- and ws-bar for i3 + * vim:ts=4:sw=4:expandtab * - * © 2010-2011 Axel Wagner and contributors + * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * - * See file LICNSE for license information + * ipc.c: Communicating with i3 * */ #ifndef IPC_H_ diff --git a/i3bar/include/outputs.h b/i3bar/include/outputs.h index c6402a5b..6501c318 100644 --- a/i3bar/include/outputs.h +++ b/i3bar/include/outputs.h @@ -1,9 +1,10 @@ /* - * i3bar - an xcb-based status- and ws-bar for i3 + * vim:ts=4:sw=4:expandtab * - * © 2010-2011 Axel Wagner and contributors + * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * - * See file LICNSE for license information + * outputs.c: Maintaining the output-list * */ #ifndef OUTPUTS_H_ diff --git a/i3bar/include/trayclients.h b/i3bar/include/trayclients.h index 1113daeb..e1e795fa 100644 --- a/i3bar/include/trayclients.h +++ b/i3bar/include/trayclients.h @@ -1,9 +1,8 @@ /* - * i3bar - an xcb-based status- and ws-bar for i3 - * - * © 2010-2011 Axel Wagner and contributors + * vim:ts=4:sw=4:expandtab * - * See file LICNSE for license information + * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * */ #ifndef TRAYCLIENT_H_ diff --git a/i3bar/include/ucs2_to_utf8.h b/i3bar/include/ucs2_to_utf8.h index 2fb3862a..a77ed20e 100644 --- a/i3bar/include/ucs2_to_utf8.h +++ b/i3bar/include/ucs2_to_utf8.h @@ -1 +1,15 @@ +/* + * vim:ts=4:sw=4:expandtab + * + * i3 - an improved dynamic tiling window manager + * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * + * ucs2_to_utf8.c: Converts between UCS-2 and UTF-8, both of which are used in + * different contexts in X11. + */ +#ifndef _UCS2_TO_UTF8 +#define _UCS2_TO_UTF8 + char *convert_utf8_to_ucs2(char *input, int *real_strlen); + +#endif diff --git a/i3bar/include/util.h b/i3bar/include/util.h index 60949320..eb05ed08 100644 --- a/i3bar/include/util.h +++ b/i3bar/include/util.h @@ -1,9 +1,8 @@ /* - * i3bar - an xcb-based status- and ws-bar for i3 + * vim:ts=4:sw=4:expandtab * - * © 2010-2011 Axel Wagner and contributors - * - * See file LICNSE for license information + * i3 - an improved dynamic tiling window manager + * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) * */ #ifndef UTIL_H_ diff --git a/i3bar/include/workspaces.h b/i3bar/include/workspaces.h index 6f5ca72b..dfd93d9b 100644 --- a/i3bar/include/workspaces.h +++ b/i3bar/include/workspaces.h @@ -1,9 +1,10 @@ /* - * i3bar - an xcb-based status- and ws-bar for i3 + * vim:ts=4:sw=4:expandtab * - * © 2010-2011 Axel Wagner and contributors + * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * - * See file LICNSE for license information + * workspaces.c: Maintaining the workspace-lists * */ #ifndef WORKSPACES_H_ diff --git a/i3bar/include/xcb.h b/i3bar/include/xcb.h index 51da5d3e..8067a193 100644 --- a/i3bar/include/xcb.h +++ b/i3bar/include/xcb.h @@ -1,9 +1,10 @@ /* - * i3bar - an xcb-based status- and ws-bar for i3 + * vim:ts=4:sw=4:expandtab * - * © 2010-2011 Axel Wagner and contributors + * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * - * See file LICNSE for license information + * xcb.c: Communicating with X * */ #ifndef XCB_H_ diff --git a/i3bar/src/child.c b/i3bar/src/child.c index c7acd2e6..44e237f8 100644 --- a/i3bar/src/child.c +++ b/i3bar/src/child.c @@ -2,12 +2,9 @@ * vim:ts=4:sw=4:expandtab * * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * - * © 2010-2011 Axel Wagner and contributors - * - * See file LICNSE for license information - * - * src/child.c: Getting Input for the statusline + * child.c: Getting Input for the statusline * */ #include diff --git a/i3bar/src/config.c b/i3bar/src/config.c index 1b4dc0ec..5f3338a6 100644 --- a/i3bar/src/config.c +++ b/i3bar/src/config.c @@ -2,12 +2,9 @@ * vim:ts=4:sw=4:expandtab * * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * - * © 2010-2011 Axel Wagner and contributors - * - * See file LICENSE for license information - * - * src/outputs.c: Maintaining the output-list + * config.c: Parses the configuration (received from i3). * */ #include diff --git a/i3bar/src/ipc.c b/i3bar/src/ipc.c index c704b4f9..8f8174e5 100644 --- a/i3bar/src/ipc.c +++ b/i3bar/src/ipc.c @@ -2,12 +2,9 @@ * vim:ts=4:sw=4:expandtab * * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * - * © 2010-2011 Axel Wagner and contributors - * - * See file LICNSE for license information - * - * src/ipc.c: Communicating with i3 + * ipc.c: Communicating with i3 * */ #include diff --git a/i3bar/src/main.c b/i3bar/src/main.c index f018f2ab..4dc55603 100644 --- a/i3bar/src/main.c +++ b/i3bar/src/main.c @@ -2,10 +2,7 @@ * vim:ts=4:sw=4:expandtab * * i3bar - an xcb-based status- and ws-bar for i3 - * - * © 2010-2011 Axel Wagner and contributors - * - * See file LICNSE for license information + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * */ #include diff --git a/i3bar/src/outputs.c b/i3bar/src/outputs.c index 6278974f..9dc5cab8 100644 --- a/i3bar/src/outputs.c +++ b/i3bar/src/outputs.c @@ -2,12 +2,9 @@ * vim:ts=4:sw=4:expandtab * * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * - * © 2010-2011 Axel Wagner and contributors - * - * See file LICNSE for license information - * - * src/outputs.c: Maintaining the output-list + * outputs.c: Maintaining the output-list * */ #include diff --git a/i3bar/src/ucs2_to_utf8.c b/i3bar/src/ucs2_to_utf8.c index c07f63fd..7797dc1f 100644 --- a/i3bar/src/ucs2_to_utf8.c +++ b/i3bar/src/ucs2_to_utf8.c @@ -1,12 +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 Michael Stapelberg and contributors - * - * See file LICENSE for license information. - * + * ucs2_to_utf8.c: Converts between UCS-2 and UTF-8, both of which are used in + * different contexts in X11. */ #include #include @@ -25,35 +24,35 @@ static iconv_t conversion_descriptor2 = 0; * */ char *convert_ucs_to_utf8(char *input) { - size_t input_size = 2; - /* UTF-8 may consume up to 4 byte */ - int buffer_size = 8; + size_t input_size = 2; + /* UTF-8 may consume up to 4 byte */ + int buffer_size = 8; - char *buffer = scalloc(buffer_size); - size_t output_size = buffer_size; - /* We need to use an additional pointer, because iconv() modifies it */ - char *output = buffer; + char *buffer = scalloc(buffer_size); + size_t output_size = buffer_size; + /* We need to use an additional pointer, because iconv() modifies it */ + char *output = buffer; - /* We convert the input into UCS-2 big endian */ + /* We convert the input into UCS-2 big endian */ + if (conversion_descriptor == 0) { + conversion_descriptor = iconv_open("UTF-8", "UCS-2BE"); if (conversion_descriptor == 0) { - conversion_descriptor = iconv_open("UTF-8", "UCS-2BE"); - if (conversion_descriptor == 0) { - fprintf(stderr, "error opening the conversion context\n"); - exit(1); - } + fprintf(stderr, "error opening the conversion context\n"); + exit(1); } + } - /* Get the conversion descriptor back to original state */ - iconv(conversion_descriptor, NULL, NULL, NULL, NULL); + /* Get the conversion descriptor back to original state */ + iconv(conversion_descriptor, NULL, NULL, NULL, NULL); - /* Convert our text */ - int rc = iconv(conversion_descriptor, (void*)&input, &input_size, &output, &output_size); - if (rc == (size_t)-1) { - perror("Converting to UCS-2 failed"); - return NULL; - } + /* Convert our text */ + int rc = iconv(conversion_descriptor, (void*)&input, &input_size, &output, &output_size); + if (rc == (size_t)-1) { + perror("Converting to UCS-2 failed"); + return NULL; + } - return buffer; + return buffer; } /* @@ -64,38 +63,38 @@ char *convert_ucs_to_utf8(char *input) { * */ char *convert_utf8_to_ucs2(char *input, int *real_strlen) { - size_t input_size = strlen(input) + 1; - /* UCS-2 consumes exactly two bytes for each glyph */ - int buffer_size = input_size * 2; + size_t input_size = strlen(input) + 1; + /* UCS-2 consumes exactly two bytes for each glyph */ + int buffer_size = input_size * 2; - char *buffer = smalloc(buffer_size); - size_t output_size = buffer_size; - /* We need to use an additional pointer, because iconv() modifies it */ - char *output = buffer; + char *buffer = smalloc(buffer_size); + size_t output_size = buffer_size; + /* We need to use an additional pointer, because iconv() modifies it */ + char *output = buffer; - /* We convert the input into UCS-2 big endian */ + /* We convert the input into UCS-2 big endian */ + if (conversion_descriptor2 == 0) { + conversion_descriptor2 = iconv_open("UCS-2BE", "UTF-8"); if (conversion_descriptor2 == 0) { - conversion_descriptor2 = iconv_open("UCS-2BE", "UTF-8"); - if (conversion_descriptor2 == 0) { - fprintf(stderr, "error opening the conversion context\n"); - exit(1); - } + fprintf(stderr, "error opening the conversion context\n"); + exit(1); } + } - /* Get the conversion descriptor back to original state */ - iconv(conversion_descriptor2, NULL, NULL, NULL, NULL); - - /* Convert our text */ - int rc = iconv(conversion_descriptor2, (void*)&input, &input_size, &output, &output_size); - if (rc == (size_t)-1) { - perror("Converting to UCS-2 failed"); - if (real_strlen != NULL) - *real_strlen = 0; - return NULL; - } + /* Get the conversion descriptor back to original state */ + iconv(conversion_descriptor2, NULL, NULL, NULL, NULL); + /* Convert our text */ + int rc = iconv(conversion_descriptor2, (void*)&input, &input_size, &output, &output_size); + if (rc == (size_t)-1) { + perror("Converting to UCS-2 failed"); if (real_strlen != NULL) - *real_strlen = ((buffer_size - output_size) / 2) - 1; + *real_strlen = 0; + return NULL; + } + + if (real_strlen != NULL) + *real_strlen = ((buffer_size - output_size) / 2) - 1; - return buffer; + return buffer; } diff --git a/i3bar/src/workspaces.c b/i3bar/src/workspaces.c index bb00f0ba..7cfbeffd 100644 --- a/i3bar/src/workspaces.c +++ b/i3bar/src/workspaces.c @@ -2,12 +2,9 @@ * vim:ts=4:sw=4:expandtab * * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * - * © 2010-2011 Axel Wagner and contributors - * - * See file LICNSE for license information - * - * src/workspaces.c: Maintaining the workspace-lists + * workspaces.c: Maintaining the workspace-lists * */ #include diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c index bb7e5c77..93b7b0a1 100644 --- a/i3bar/src/xcb.c +++ b/i3bar/src/xcb.c @@ -2,12 +2,9 @@ * vim:ts=4:sw=4:expandtab * * i3bar - an xcb-based status- and ws-bar for i3 + * © 2010-2011 Axel Wagner and contributors (see also: LICENSE) * - * © 2010-2011 Axel Wagner and contributors - * - * See file LICNSE for license information - * - * src/xcb.c: Communicating with X + * xcb.c: Communicating with X * */ #include diff --git a/include/all.h b/include/all.h index fd25629e..8ae4e0a2 100644 --- a/include/all.h +++ b/include/all.h @@ -1,4 +1,9 @@ /* + * vim:ts=4:sw=4:expandtab + * + * i3 - an improved dynamic tiling window manager + * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * * This header file includes all relevant files of i3 and the most often used * system header files. This reduces boilerplate (the amount of code duplicated * at the beginning of each source file) and is not significantly slower at diff --git a/include/assignments.h b/include/assignments.h index f72dd2e5..f4ef8e88 100644 --- a/include/assignments.h +++ b/include/assignments.h @@ -1,6 +1,11 @@ /* * vim:ts=4:sw=4:expandtab * + * i3 - an improved dynamic tiling window manager + * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * + * assignments.c: Assignments for specific windows (for_window). + * */ #ifndef _ASSIGNMENTS_H #define _ASSIGNMENTS_H diff --git a/include/click.h b/include/click.h index 2de32d04..6261613b 100644 --- a/include/click.h +++ b/include/click.h @@ -2,10 +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-2011 Michael Stapelberg and contributors - * - * See file LICENSE for license information. + * click.c: Button press (mouse click) events. * */ #ifndef _CLICK_H diff --git a/include/cmdparse.h b/include/cmdparse.h index 09d56bae..d619b97c 100644 --- a/include/cmdparse.h +++ b/include/cmdparse.h @@ -1,3 +1,12 @@ +/* + * vim:ts=4:sw=4:expandtab + * + * i3 - an improved dynamic tiling window manager + * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * + * cmdparse.y: the parser for commands you send to i3 (or bind on keys) + * + */ #ifndef _CMDPARSE_H #define _CMDPARSE_H diff --git a/include/con.h b/include/con.h index 155bb7d8..34c6450c 100644 --- a/include/con.h +++ b/include/con.h @@ -1,3 +1,14 @@ +/* + * vim:ts=4:sw=4:expandtab + * + * i3 - an improved dynamic tiling window manager + * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * + * con.c: Functions which deal with containers directly (creating containers, + * searching containers, getting specific properties from containers, + * …). + * + */ #ifndef _CON_H #define _CON_H diff --git a/include/config.h b/include/config.h index 8f0b71c9..b4128caf 100644 --- a/include/config.h +++ b/include/config.h @@ -2,10 +2,7 @@ * 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) * * include/config.h: Contains all structs/variables for the configurable * part of i3 as well as functions handling the configuration file (calling @@ -13,7 +10,6 @@ * mode). * */ - #ifndef _CONFIG_H #define _CONFIG_H diff --git a/include/data.h b/include/data.h index fa866b61..cd58ec26 100644 --- a/include/data.h +++ b/include/data.h @@ -7,7 +7,6 @@ * include/data.h: This file defines all data structures used by i3 * */ - #ifndef _DATA_H #define _DATA_H diff --git a/include/debug.h b/include/debug.h index 3d722120..abf9c76d 100644 --- a/include/debug.h +++ b/include/debug.h @@ -1,11 +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) * - * (c) 2009 Michael Stapelberg and contributors - * - * See file LICENSE for license information. + * debug.c: Debugging functions, especially FormatEvent, which prints unhandled + * events. This code is from xcb-util. * */ #ifndef _DEBUG_H diff --git a/include/ewmh.h b/include/ewmh.h index 54c83f40..0a0cbc29 100644 --- a/include/ewmh.h +++ b/include/ewmh.h @@ -2,10 +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 Michael Stapelberg and contributors - * - * See file LICENSE for license information. + * ewmh.c: Get/set certain EWMH properties easily. * */ #ifndef _EWMH_C diff --git a/include/floating.h b/include/floating.h index 6ab4cf2e..417e47ea 100644 --- a/include/floating.h +++ b/include/floating.h @@ -1,11 +1,10 @@ /* - * 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. + * floating.c: Floating windows. * */ #ifndef _FLOATING_H diff --git a/include/handlers.h b/include/handlers.h index 0aaaf158..ebec34cf 100644 --- a/include/handlers.h +++ b/include/handlers.h @@ -1,11 +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. + * handlers.c: Small handlers for various events (keypresses, focus changes, + * …). * */ #ifndef _HANDLERS_H diff --git a/include/i3.h b/include/i3.h index fca983ec..fa23ccf3 100644 --- a/include/i3.h +++ b/include/i3.h @@ -2,12 +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 Michael Stapelberg and contributors - * - * See file LICENSE for license information. + * i3.h: global variables that are used all over i3. * */ +#ifndef _I3_H +#define _I3_H + #include #include @@ -19,9 +21,6 @@ #include "data.h" #include "xcb.h" -#ifndef _I3_H -#define _I3_H - extern xcb_connection_t *conn; extern int conn_screen; /** The last timestamp we got from X11 (timestamps are included in some events diff --git a/include/i3/ipc.h b/include/i3/ipc.h index a12d5cd7..bfadf4cf 100644 --- a/include/i3/ipc.h +++ b/include/i3/ipc.h @@ -1,17 +1,13 @@ /* - * vim:ts=8:expandtab + * 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-2010 Michael Stapelberg and contributors (see also: LICENSE) * * This public header defines the different constants and message types to use * for the IPC interface to i3 (see docs/ipc for more information). * */ - #ifndef _I3_IPC_H #define _I3_IPC_H diff --git a/include/ipc.h b/include/ipc.h index a5de487a..9b59fb01 100644 --- a/include/ipc.h +++ b/include/ipc.h @@ -1,14 +1,12 @@ /* - * 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. + * ipc.c: UNIX domain socket IPC (initialization, client handling, protocol). * */ - #ifndef _IPC_H #define _IPC_H diff --git a/include/libi3.h b/include/libi3.h index 2477bd6b..71fba764 100644 --- a/include/libi3.h +++ b/include/libi3.h @@ -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) + * + * libi3: contains functions which are used by i3 *and* accompanying tools such + * as i3-msg, i3-config-wizard, … + * */ - #ifndef _LIBI3_H #define _LIBI3_H diff --git a/include/load_layout.h b/include/load_layout.h index f3a60a09..a2cd6d14 100644 --- a/include/load_layout.h +++ b/include/load_layout.h @@ -1,3 +1,13 @@ +/* + * 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. + * + */ #ifndef _LOAD_LAYOUT_H #define _LOAD_LAYOUT_H diff --git a/include/log.h b/include/log.h index c1e10b06..ef6deb20 100644 --- a/include/log.h +++ b/include/log.h @@ -2,10 +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-2011 Michael Stapelberg and contributors - * - * See file LICENSE for license information. + * log.c: Setting of loglevels, logging functions. * */ #ifndef _LOG_H diff --git a/include/manage.h b/include/manage.h index e23eccf3..833d614f 100644 --- a/include/manage.h +++ b/include/manage.h @@ -1,19 +1,17 @@ /* - * 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 Michael Stapelberg and contributors - * - * See file LICENSE for license information. + * manage.c: Initially managing new windows (or existing ones on restart). * */ - -#include "data.h" - #ifndef _MANAGE_H #define _MANAGE_H +#include "data.h" + /** * Go through all existing windows (if the window manager is restarted) and * manage them diff --git a/include/match.h b/include/match.h index 6c0694ef..6d9cb915 100644 --- a/include/match.h +++ b/include/match.h @@ -1,3 +1,16 @@ +/* + * vim:ts=4:sw=4:expandtab + * + * i3 - an improved dynamic tiling window manager + * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * + * A "match" is a data structure which acts like a mask or expression to match + * certain windows or not. For example, when using commands, you can specify a + * command like this: [title="*Firefox*"] kill. The title member of the match + * data structure will then be filled and i3 will check each window using + * match_matches_window() to find the windows affected by this command. + * + */ #ifndef _MATCH_H #define _MATCH_H diff --git a/include/move.h b/include/move.h index d0c97014..22b6e809 100644 --- a/include/move.h +++ b/include/move.h @@ -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) + * + * move.c: Moving containers into some direction. + * */ - #ifndef _MOVE_H #define _MOVE_H diff --git a/include/output.h b/include/output.h index 67652fa1..d488ad30 100644 --- a/include/output.h +++ b/include/output.h @@ -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. + * */ - #ifndef _OUTPUT_H #define _OUTPUT_H diff --git a/include/randr.h b/include/randr.h index 9c09f2b1..4cefba80 100644 --- a/include/randr.h +++ b/include/randr.h @@ -1,19 +1,20 @@ /* - * 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. + * 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 "data.h" -#include - #ifndef _RANDR_H #define _RANDR_H +#include "data.h" +#include + TAILQ_HEAD(outputs_head, xoutput); extern struct outputs_head outputs; diff --git a/include/regex.h b/include/regex.h index adfa6656..d55bb6cb 100644 --- a/include/regex.h +++ b/include/regex.h @@ -1,6 +1,11 @@ /* * vim:ts=4:sw=4:expandtab * + * 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). + * */ #ifndef _REGEX_H #define _REGEX_H diff --git a/include/render.h b/include/render.h index 94084489..1f31fb0f 100644 --- a/include/render.h +++ b/include/render.h @@ -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. + * */ - #ifndef _RENDER_H #define _RENDER_H diff --git a/include/resize.h b/include/resize.h index 5c8ea5d5..d530294b 100644 --- a/include/resize.h +++ b/include/resize.h @@ -1,3 +1,12 @@ +/* + * 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. + * + */ #ifndef _RESIZE_H #define _RESIZE_H diff --git a/include/sighandler.h b/include/sighandler.h index 02a4f5dd..5ffef2a3 100644 --- a/include/sighandler.h +++ b/include/sighandler.h @@ -2,11 +2,11 @@ * 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: Interactive crash dialog upon SIGSEGV/SIGABRT/SIGFPE (offers + * to restart inplace). * */ #ifndef _SIGHANDLER_H diff --git a/include/startup.h b/include/startup.h index 555a1191..9d110c6d 100644 --- a/include/startup.h +++ b/include/startup.h @@ -2,10 +2,12 @@ * 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. + * 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. * */ #ifndef _STARTUP_H diff --git a/include/tree.h b/include/tree.h index b483434f..81fdbe6a 100644 --- a/include/tree.h +++ b/include/tree.h @@ -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. + * */ - #ifndef _TREE_H #define _TREE_H diff --git a/include/util.h b/include/util.h index 68009442..4a5920d2 100644 --- a/include/util.h +++ b/include/util.h @@ -1,20 +1,20 @@ /* - * 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 Michael Stapelberg and contributors - * - * See file LICENSE for license information. + * util.c: Utility functions, which can be useful everywhere within i3 (see + * also libi3). * */ +#ifndef _UTIL_H +#define _UTIL_H + #include #include "data.h" -#ifndef _UTIL_H -#define _UTIL_H - #define die(...) errx(EXIT_FAILURE, __VA_ARGS__); #define exit_if_null(pointer, ...) { if (pointer == NULL) die(__VA_ARGS__); } #define STARTS_WITH(string, needle) (strncasecmp(string, needle, strlen(needle)) == 0) diff --git a/include/window.h b/include/window.h index cb9fbbc5..61ec8614 100644 --- a/include/window.h +++ b/include/window.h @@ -1,3 +1,12 @@ +/* + * vim:ts=4:sw=4:expandtab + * + * i3 - an improved dynamic tiling window manager + * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * + * window.c: Updates window attributes (X11 hints/properties). + * + */ #ifndef _WINDOW_H #define _WINDOW_H diff --git a/include/workspace.h b/include/workspace.h index 1dce680a..995499f2 100644 --- a/include/workspace.h +++ b/include/workspace.h @@ -1,21 +1,20 @@ /* - * 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. + * workspace.c: Modifying workspaces, accessing them, moving containers to + * workspaces. * */ +#ifndef _WORKSPACE_H +#define _WORKSPACE_H #include "data.h" #include "tree.h" #include "randr.h" -#ifndef _WORKSPACE_H -#define _WORKSPACE_H - /** * Returns a pointer to the workspace with the given number (starting at 0), * creating the workspace if necessary (by allocating the necessary amount of diff --git a/include/x.h b/include/x.h index 29a8bec2..2d41b437 100644 --- a/include/x.h +++ b/include/x.h @@ -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. + * */ - #ifndef _X_H #define _X_H diff --git a/include/xcb.h b/include/xcb.h index 16e444f9..01e2b667 100644 --- a/include/xcb.h +++ b/include/xcb.h @@ -2,10 +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-2011 Michael Stapelberg and contributors - * - * See file LICENSE for license information. + * xcb.c: Helper functions for easier usage of XCB * */ #ifndef _XCB_H diff --git a/include/xcb_compat.h b/include/xcb_compat.h index ec872a3a..260ac4e5 100644 --- a/include/xcb_compat.h +++ b/include/xcb_compat.h @@ -1,3 +1,14 @@ +/* + * vim:ts=4:sw=4:expandtab + * + * i3 - an improved dynamic tiling window manager + * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * + * xcb_compat.h: uses #define to create aliases for xcb functions which got + * renamed. Makes the code work with >= 0.3.8 xcb-util and + * older versions. + * + */ #ifndef _XCB_COMPAT_H #define _XCB_COMPAT_H diff --git a/include/xcursor.h b/include/xcursor.h index f3ff4f25..b512ca23 100644 --- a/include/xcursor.h +++ b/include/xcursor.h @@ -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. + * */ #ifndef _XCURSOR_CURSOR_H #define _XCURSOR_CURSOR_H diff --git a/include/xinerama.h b/include/xinerama.h index 600b77f3..e6304b56 100644 --- a/include/xinerama.h +++ b/include/xinerama.h @@ -1,18 +1,19 @@ /* - * 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. + * 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 2011 *sigh*. * */ -#include "data.h" - #ifndef _XINERAMA_H #define _XINERAMA_H +#include "data.h" + /** * We have just established a connection to the X server and need the initial * Xinerama information to setup workspaces for each screen. diff --git a/libi3/fake_configure_notify.c b/libi3/fake_configure_notify.c index 5f954cfa..472d2351 100644 --- a/libi3/fake_configure_notify.c +++ b/libi3/fake_configure_notify.c @@ -2,10 +2,7 @@ * 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) * */ #include diff --git a/libi3/get_colorpixel.c b/libi3/get_colorpixel.c index bdd9f5a5..73bbef3d 100644 --- a/libi3/get_colorpixel.c +++ b/libi3/get_colorpixel.c @@ -2,10 +2,7 @@ * 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) * */ #include diff --git a/libi3/get_mod_mask.c b/libi3/get_mod_mask.c index 76549220..752cea57 100644 --- a/libi3/get_mod_mask.c +++ b/libi3/get_mod_mask.c @@ -2,10 +2,7 @@ * 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) * */ #include diff --git a/libi3/get_socket_path.c b/libi3/get_socket_path.c index 839bcd42..d623b6c3 100644 --- a/libi3/get_socket_path.c +++ b/libi3/get_socket_path.c @@ -2,10 +2,7 @@ * 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) * */ #include diff --git a/libi3/ipc_connect.c b/libi3/ipc_connect.c index d19d2fab..44ff7056 100644 --- a/libi3/ipc_connect.c +++ b/libi3/ipc_connect.c @@ -2,10 +2,7 @@ * 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) * */ #include diff --git a/libi3/ipc_recv_message.c b/libi3/ipc_recv_message.c index 47d6dea3..2a2f85c5 100644 --- a/libi3/ipc_recv_message.c +++ b/libi3/ipc_recv_message.c @@ -2,10 +2,7 @@ * 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) * */ #include diff --git a/libi3/ipc_send_message.c b/libi3/ipc_send_message.c index 05b18747..850fbdd2 100644 --- a/libi3/ipc_send_message.c +++ b/libi3/ipc_send_message.c @@ -2,10 +2,7 @@ * 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) * */ #include diff --git a/libi3/load_font.c b/libi3/load_font.c index 13a121c8..acb52c00 100644 --- a/libi3/load_font.c +++ b/libi3/load_font.c @@ -2,10 +2,7 @@ * 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) * */ #include diff --git a/libi3/safewrappers.c b/libi3/safewrappers.c index ec62aa34..cf634ad4 100644 --- a/libi3/safewrappers.c +++ b/libi3/safewrappers.c @@ -2,10 +2,7 @@ * 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) * */ #include diff --git a/libi3/strndup.c b/libi3/strndup.c index f02e0af5..eec1a0ed 100644 --- a/libi3/strndup.c +++ b/libi3/strndup.c @@ -2,10 +2,7 @@ * 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) * */ #include diff --git a/src/cmdparse.y b/src/cmdparse.y index 17621389..ab26fa59 100644 --- a/src/cmdparse.y +++ b/src/cmdparse.y @@ -7,7 +7,6 @@ * * cmdparse.y: the parser for commands you send to i3 (or bind on keys) * - */ #include #include -- 2.39.5