switch to clang-format-3.8 (#2547)

https://llvm.org/bugs/show_bug.cgi?id=30353 was filed for the unintended
line break between in e.g. “TAILQ_ENTRY(foo)\nbar;”.

Until that’s fixed or a workaround is known, we’ll live with line
breaks. To make it a bit easier for readers to see what’s going on, I
added extra line breaks around each such struct member/variable
definition, so that they at least visually are a single unit.

fixes #2174
This commit is contained in:
Michael Stapelberg
2016-11-08 13:46:43 -08:00
committed by GitHub
parent 4ccac59932
commit fff3f79da9
24 changed files with 907 additions and 837 deletions

View File

@ -74,10 +74,12 @@ struct status_block {
char *name;
char *instance;
TAILQ_ENTRY(status_block) blocks;
TAILQ_ENTRY(status_block)
blocks;
};
TAILQ_HEAD(statusline_head, status_block) statusline_head;
TAILQ_HEAD(statusline_head, status_block)
statusline_head;
#include "child.h"
#include "ipc.h"

View File

@ -28,18 +28,23 @@ typedef struct binding_t {
int input_code;
char *command;
TAILQ_ENTRY(binding_t) bindings;
TAILQ_ENTRY(binding_t)
bindings;
} binding_t;
typedef struct tray_output_t {
char *output;
TAILQ_ENTRY(tray_output_t) tray_outputs;
TAILQ_ENTRY(tray_output_t)
tray_outputs;
} tray_output_t;
typedef struct config_t {
int modifier;
TAILQ_HEAD(bindings_head, binding_t) bindings;
TAILQ_HEAD(bindings_head, binding_t)
bindings;
position_t position;
int verbose;
struct xcb_color_strings_t colors;
@ -50,7 +55,10 @@ typedef struct config_t {
char *command;
char *fontname;
i3String *separator_symbol;
TAILQ_HEAD(tray_outputs_head, tray_output_t) tray_outputs;
TAILQ_HEAD(tray_outputs_head, tray_output_t)
tray_outputs;
int tray_padding;
int num_outputs;
char **outputs;

View File

@ -67,5 +67,6 @@ struct i3_output {
struct ws_head* workspaces; /* The workspaces on this output */
struct tc_head* trayclients; /* The tray clients on this output */
SLIST_ENTRY(i3_output) slist; /* Pointer for the SLIST-Macro */
SLIST_ENTRY(i3_output)
slist; /* Pointer for the SLIST-Macro */
};

View File

@ -18,5 +18,6 @@ struct trayclient {
bool mapped; /* Whether this window is mapped */
int xe_version; /* The XEMBED version supported by the client */
TAILQ_ENTRY(trayclient) tailq; /* Pointer for the TAILQ-Macro */
TAILQ_ENTRY(trayclient)
tailq; /* Pointer for the TAILQ-Macro */
};

View File

@ -40,5 +40,6 @@ struct i3_ws {
rect rect; /* The rect of the ws (not used (yet)) */
struct i3_output *output; /* The current output of the ws */
TAILQ_ENTRY(i3_ws) tailq; /* Pointer for the TAILQ-Macro */
TAILQ_ENTRY(i3_ws)
tailq; /* Pointer for the TAILQ-Macro */
};