koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang-format: use TypenameMacros

Browse Source 
This commit removes line breaks and extra empty lines introduced in
commit fff3f79da9.
This commit is contained in:
Albert Safin
2020-02-28 03:09:02 +00:00
committed by Orestis Floros
parent 83078a1e16
commit e3a1c5b294
18 changed files with 57 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.clang-format
View File

@ -10,3 +10,4 @@ ColumnLimit: 0
SpaceBeforeParens: ControlStatements SpaceBeforeParens: ControlStatements
SortIncludes: false SortIncludes: false
ForEachMacros: [ TAILQ_FOREACH, TAILQ_FOREACH_REVERSE, SLIST_FOREACH, CIRCLEQ_FOREACH, CIRCLEQ_FOREACH_REVERSE, NODES_FOREACH, NODES_FOREACH_REVERSE, FOREACH_NONINTERNAL] ForEachMacros: [ TAILQ_FOREACH, TAILQ_FOREACH_REVERSE, SLIST_FOREACH, CIRCLEQ_FOREACH, CIRCLEQ_FOREACH_REVERSE, NODES_FOREACH, NODES_FOREACH_REVERSE, FOREACH_NONINTERNAL]
TypenameMacros: [ SLIST_HEAD, SLIST_ENTRY, LIST_HEAD, LIST_ENTRY, SIMPLEQ_HEAD, SIMPLEQ_ENTRY, TAILQ_HEAD, TAILQ_ENTRY, CIRCLEQ_HEAD, CIRCLEQ_ENTRY ]

6
i3bar/include/common.h
View File

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

16
i3bar/include/configuration.h
View File

@ -29,23 +29,18 @@ typedef struct binding_t {
char *command; char *command;
bool release; bool release;
TAILQ_ENTRY(binding_t) TAILQ_ENTRY(binding_t) bindings;
bindings;
} binding_t; } binding_t;
typedef struct tray_output_t { typedef struct tray_output_t {
char *output; char *output;
TAILQ_ENTRY(tray_output_t) TAILQ_ENTRY(tray_output_t) tray_outputs;
tray_outputs;
} tray_output_t; } tray_output_t;
typedef struct config_t { typedef struct config_t {
uint32_t modifier; uint32_t modifier;
TAILQ_HEAD(bindings_head, binding_t) bindings;
TAILQ_HEAD(bindings_head, binding_t)
bindings;
position_t position; position_t position;
bool verbose; bool verbose;
bool transparency; bool transparency;
@ -59,10 +54,7 @@ typedef struct config_t {
char *command; char *command;
char *fontname; char *fontname;
i3String *separator_symbol; 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 tray_padding;
int num_outputs; int num_outputs;
char **outputs; char **outputs;

3
i3bar/include/outputs.h
View File

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

3
i3bar/include/trayclients.h
View File

@ -21,6 +21,5 @@ struct trayclient {
char *class_class; char *class_class;
char *class_instance; char *class_instance;
TAILQ_ENTRY(trayclient) TAILQ_ENTRY(trayclient) tailq; /* Pointer for the TAILQ-Macro */
tailq; /* Pointer for the TAILQ-Macro */
}; };

3
i3bar/include/workspaces.h
View File

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

21
include/configuration.h
View File

@ -66,8 +66,7 @@ struct Variable {
char *value; char *value;
char *next_match; char *next_match;
SLIST_ENTRY(Variable) SLIST_ENTRY(Variable) variables;
variables;
}; };
/** /**
@ -81,8 +80,7 @@ struct Mode {
bool pango_markup; bool pango_markup;
struct bindings_head *bindings; struct bindings_head *bindings;
SLIST_ENTRY(Mode) SLIST_ENTRY(Mode) modes;
modes;
}; };
/** /**
@ -272,8 +270,7 @@ struct Barconfig {
/* List of outputs on which the tray is allowed to be shown, in order. /* List of outputs on which the tray is allowed to be shown, in order.
* The special value "none" disables it (per default, it will be shown) and * The special value "none" disables it (per default, it will be shown) and
* the special value "primary" enabled it on the primary output. */ * the special value "primary" enabled it on the primary output. */
TAILQ_HEAD(tray_outputs_head, tray_output_t) TAILQ_HEAD(tray_outputs_head, tray_output_t) tray_outputs;
tray_outputs;
/* Padding around the tray icons. */ /* Padding around the tray icons. */
int tray_padding; int tray_padding;
@ -295,8 +292,7 @@ struct Barconfig {
/** Bar modifier (to show bar when in hide mode). */ /** Bar modifier (to show bar when in hide mode). */
uint32_t modifier; uint32_t modifier;
TAILQ_HEAD(bar_bindings_head, Barbinding) TAILQ_HEAD(bar_bindings_head, Barbinding) bar_bindings;
bar_bindings;
/** Bar position (bottom by default). */ /** Bar position (bottom by default). */
enum { P_BOTTOM = 0, enum { P_BOTTOM = 0,
@ -370,8 +366,7 @@ struct Barconfig {
char *binding_mode_text; char *binding_mode_text;
} colors; } colors;
TAILQ_ENTRY(Barconfig) TAILQ_ENTRY(Barconfig) configs;
configs;
}; };
/** /**
@ -389,15 +384,13 @@ struct Barbinding {
/** If true, the command will be executed after the button is released. */ /** If true, the command will be executed after the button is released. */
bool release; bool release;
TAILQ_ENTRY(Barbinding) TAILQ_ENTRY(Barbinding) bindings;
bindings;
}; };
struct tray_output_t { struct tray_output_t {
char *output; char *output;
TAILQ_ENTRY(tray_output_t) TAILQ_ENTRY(tray_output_t) tray_outputs;
tray_outputs;
}; };
typedef enum { typedef enum {

77
include/data.h
View File

@ -206,8 +206,7 @@ struct Workspace_Assignment {
char *name; char *name;
char *output; char *output;
TAILQ_ENTRY(Workspace_Assignment) TAILQ_ENTRY(Workspace_Assignment) ws_assignments;
ws_assignments;
}; };
struct Ignore_Event { struct Ignore_Event {
@ -215,8 +214,7 @@ struct Ignore_Event {
int response_type; int response_type;
time_t added; time_t added;
SLIST_ENTRY(Ignore_Event) SLIST_ENTRY(Ignore_Event) ignore_events;
ignore_events;
}; };
/** /**
@ -235,8 +233,7 @@ struct Startup_Sequence {
* completed) */ * completed) */
time_t delete_at; time_t delete_at;
TAILQ_ENTRY(Startup_Sequence) TAILQ_ENTRY(Startup_Sequence) sequences;
sequences;
}; };
/** /**
@ -262,9 +259,7 @@ struct regex {
struct Binding_Keycode { struct Binding_Keycode {
xcb_keycode_t keycode; xcb_keycode_t keycode;
i3_event_state_mask_t modifiers; i3_event_state_mask_t modifiers;
TAILQ_ENTRY(Binding_Keycode) keycodes;
TAILQ_ENTRY(Binding_Keycode)
keycodes;
}; };
/****************************************************************************** /******************************************************************************
@ -325,14 +320,12 @@ struct Binding {
/** Only in use if symbol != NULL. Contains keycodes which generate the /** Only in use if symbol != NULL. Contains keycodes which generate the
* specified symbol. Useful for unbinding and checking which binding was * specified symbol. Useful for unbinding and checking which binding was
* used when a key press event comes in. */ * used when a key press event comes in. */
TAILQ_HEAD(keycodes_head, Binding_Keycode) TAILQ_HEAD(keycodes_head, Binding_Keycode) keycodes_head;
keycodes_head;
/** Command, like in command mode */ /** Command, like in command mode */
char *command; char *command;
TAILQ_ENTRY(Binding) TAILQ_ENTRY(Binding) bindings;
bindings;
}; };
/** /**
@ -348,19 +341,13 @@ struct Autostart {
/** no_startup_id flag for start_application(). Determines whether a /** no_startup_id flag for start_application(). Determines whether a
* startup notification context/ID should be created. */ * startup notification context/ID should be created. */
bool no_startup_id; bool no_startup_id;
TAILQ_ENTRY(Autostart) autostarts;
TAILQ_ENTRY(Autostart) TAILQ_ENTRY(Autostart) autostarts_always;
autostarts;
TAILQ_ENTRY(Autostart)
autostarts_always;
}; };
struct output_name { struct output_name {
char *name; char *name;
SLIST_ENTRY(output_name) names;
SLIST_ENTRY(output_name)
names;
}; };
/** /**
@ -387,8 +374,7 @@ struct xoutput {
/** List of names for the output. /** List of names for the output.
* An output always has at least one name; the first name is * An output always has at least one name; the first name is
* considered the primary one. */ * considered the primary one. */
SLIST_HEAD(names_head, output_name) SLIST_HEAD(names_head, output_name) names_head;
names_head;
/** Pointer to the Con which represents this output */ /** Pointer to the Con which represents this output */
Con *con; Con *con;
@ -396,8 +382,7 @@ struct xoutput {
/** x, y, width, height */ /** x, y, width, height */
Rect rect; Rect rect;
TAILQ_ENTRY(xoutput) TAILQ_ENTRY(xoutput) outputs;
outputs;
}; };
/** /**
@ -548,8 +533,7 @@ struct Match {
M_ASSIGN_WS, M_ASSIGN_WS,
M_BELOW } insert_where; M_BELOW } insert_where;
TAILQ_ENTRY(Match) TAILQ_ENTRY(Match) matches;
matches;
/* Whether this match was generated when restarting i3 inplace. /* Whether this match was generated when restarting i3 inplace.
* Leads to not setting focus when managing a new window, because the old * Leads to not setting focus when managing a new window, because the old
@ -596,8 +580,7 @@ struct Assignment {
char *output; char *output;
} dest; } dest;
TAILQ_ENTRY(Assignment) TAILQ_ENTRY(Assignment) assignments;
assignments;
}; };
/** Fullscreen modes. Used by Con.fullscreen_mode. */ /** Fullscreen modes. Used by Con.fullscreen_mode. */
@ -608,8 +591,7 @@ typedef enum { CF_NONE = 0,
struct mark_t { struct mark_t {
char *name; char *name;
TAILQ_ENTRY(mark_t) TAILQ_ENTRY(mark_t) marks;
marks;
}; };
/** /**
@ -673,8 +655,7 @@ struct Con {
char *sticky_group; char *sticky_group;
/* user-definable marks to jump to this container later */ /* user-definable marks to jump to this container later */
TAILQ_HEAD(marks_head, mark_t) TAILQ_HEAD(marks_head, mark_t) marks_head;
marks_head;
/* cached to decide whether a redraw is needed */ /* cached to decide whether a redraw is needed */
bool mark_changed; bool mark_changed;
@ -693,17 +674,12 @@ struct Con {
struct deco_render_params *deco_render_params; struct deco_render_params *deco_render_params;
/* Only workspace-containers can have floating clients */ /* Only workspace-containers can have floating clients */
TAILQ_HEAD(floating_head, Con) TAILQ_HEAD(floating_head, Con) floating_head;
floating_head;
TAILQ_HEAD(nodes_head, Con) TAILQ_HEAD(nodes_head, Con) nodes_head;
nodes_head; TAILQ_HEAD(focus_head, Con) focus_head;
TAILQ_HEAD(focus_head, Con) TAILQ_HEAD(swallow_head, Match) swallow_head;
focus_head;
TAILQ_HEAD(swallow_head, Match)
swallow_head;
fullscreen_mode_t fullscreen_mode; fullscreen_mode_t fullscreen_mode;
@ -741,17 +717,10 @@ struct Con {
FLOATING_USER_ON = 3 FLOATING_USER_ON = 3
} floating; } floating;
TAILQ_ENTRY(Con) TAILQ_ENTRY(Con) nodes;
nodes; TAILQ_ENTRY(Con) focused;
TAILQ_ENTRY(Con) all_cons;
TAILQ_ENTRY(Con) TAILQ_ENTRY(Con) floating_windows;
focused;
TAILQ_ENTRY(Con)
all_cons;
TAILQ_ENTRY(Con)
floating_windows;
/** callbacks */ /** callbacks */
void (*on_remove_child)(Con *); void (*on_remove_child)(Con *);

2
include/i3.h
View File

@ -57,7 +57,7 @@ extern xcb_key_symbols_t *keysyms;
extern char **start_argv; extern char **start_argv;
extern Display *xlibdpy, *xkbdpy; extern Display *xlibdpy, *xkbdpy;
extern int xkb_current_group; extern int xkb_current_group;
extern TAILQ_HEAD(bindings_head, Binding) * bindings; extern TAILQ_HEAD(bindings_head, Binding) *bindings;
extern const char *current_binding_mode; extern const char *current_binding_mode;
extern TAILQ_HEAD(autostarts_head, Autostart) autostarts; extern TAILQ_HEAD(autostarts_head, Autostart) autostarts;
extern TAILQ_HEAD(autostarts_always_head, Autostart) autostarts_always; extern TAILQ_HEAD(autostarts_always_head, Autostart) autostarts_always;

3
include/ipc.h
View File

@ -40,8 +40,7 @@ typedef struct ipc_client {
uint8_t *buffer; uint8_t *buffer;
size_t buffer_size; size_t buffer_size;
TAILQ_ENTRY(ipc_client) TAILQ_ENTRY(ipc_client) clients;
clients;
} ipc_client; } ipc_client;
/* /*

6
libi3/get_colorpixel.c
View File

@ -15,12 +15,10 @@ struct Colorpixel {
char hex[8]; char hex[8];
uint32_t pixel; uint32_t pixel;
SLIST_ENTRY(Colorpixel) SLIST_ENTRY(Colorpixel) colorpixels;
colorpixels;
}; };
SLIST_HEAD(colorpixel_head, Colorpixel) SLIST_HEAD(colorpixel_head, Colorpixel) colorpixels;
colorpixels;
/* /*
* Returns the colorpixel to use for the given hex color (think of HTML). * Returns the colorpixel to use for the given hex color (think of HTML).

4
src/commands.c
View File

@ -129,9 +129,7 @@ static Con *maybe_auto_back_and_forth_workspace(Con *workspace) {
*/ */
typedef struct owindow { typedef struct owindow {
Con *con; Con *con;
TAILQ_ENTRY(owindow) owindows;
TAILQ_ENTRY(owindow)
owindows;
} owindow; } owindow;
typedef TAILQ_HEAD(owindows_head, owindow) owindows_head; typedef TAILQ_HEAD(owindows_head, owindow) owindows_head;

7
src/con.c
View File

@ -514,8 +514,7 @@ Con *con_parent_with_orientation(Con *con, orientation_t orientation) {
struct bfs_entry { struct bfs_entry {
Con *con; Con *con;
TAILQ_ENTRY(bfs_entry) TAILQ_ENTRY(bfs_entry) entries;
entries;
}; };
/* /*
@ -527,9 +526,7 @@ Con *con_get_fullscreen_con(Con *con, fullscreen_mode_t fullscreen_mode) {
/* TODO: is breadth-first-search really appropriate? (check as soon as /* TODO: is breadth-first-search really appropriate? (check as soon as
* fullscreen levels and fullscreen for containers is implemented) */ * fullscreen levels and fullscreen for containers is implemented) */
TAILQ_HEAD(bfs_head, bfs_entry) TAILQ_HEAD(bfs_head, bfs_entry) bfs_head = TAILQ_HEAD_INITIALIZER(bfs_head);
bfs_head = TAILQ_HEAD_INITIALIZER(bfs_head);
struct bfs_entry *entry = smalloc(sizeof(struct bfs_entry)); struct bfs_entry *entry = smalloc(sizeof(struct bfs_entry));
entry->con = con; entry->con = con;
TAILQ_INSERT_TAIL(&bfs_head, entry, entries); TAILQ_INSERT_TAIL(&bfs_head, entry, entries);

3
src/ipc.c
View File

@ -25,8 +25,7 @@
char *current_socketpath = NULL; char *current_socketpath = NULL;
TAILQ_HEAD(ipc_client_head, ipc_client) TAILQ_HEAD(ipc_client_head, ipc_client) all_clients = TAILQ_HEAD_INITIALIZER(all_clients);
all_clients = TAILQ_HEAD_INITIALIZER(all_clients);
/* /*
* Puts the given socket file descriptor into non-blocking mode or dies if * Puts the given socket file descriptor into non-blocking mode or dies if

4
src/load_layout.c
View File

@ -44,9 +44,7 @@ struct pending_marks {
* array. */ * array. */
struct focus_mapping { struct focus_mapping {
int old_id; int old_id;
TAILQ_ENTRY(focus_mapping) focus_mappings;
TAILQ_ENTRY(focus_mapping)
focus_mappings;
}; };
static TAILQ_HEAD(focus_mappings_head, focus_mapping) focus_mappings = static TAILQ_HEAD(focus_mappings_head, focus_mapping) focus_mappings =

3
src/restore_layout.c
View File

@ -29,8 +29,7 @@ typedef struct placeholder_state {
/** The drawable surface */ /** The drawable surface */
surface_t surface; surface_t surface;
TAILQ_ENTRY(placeholder_state) TAILQ_ENTRY(placeholder_state) state;
state;
} placeholder_state; } placeholder_state;
static TAILQ_HEAD(state_head, placeholder_state) state_head = static TAILQ_HEAD(state_head, placeholder_state) state_head =

4
src/sighandler.c
View File

@ -16,9 +16,7 @@ typedef struct dialog_t {
xcb_colormap_t colormap; xcb_colormap_t colormap;
Rect dims; Rect dims;
surface_t surface; surface_t surface;
TAILQ_ENTRY(dialog_t) dialogs;
TAILQ_ENTRY(dialog_t)
dialogs;
} dialog_t; } dialog_t;
static TAILQ_HEAD(dialogs_head, dialog_t) dialogs = TAILQ_HEAD_INITIALIZER(dialogs); static TAILQ_HEAD(dialogs_head, dialog_t) dialogs = TAILQ_HEAD_INITIALIZER(dialogs);

20
src/x.c
View File

@ -63,26 +63,18 @@ typedef struct con_state {
char *name; char *name;
CIRCLEQ_ENTRY(con_state) CIRCLEQ_ENTRY(con_state) state;
state; CIRCLEQ_ENTRY(con_state) old_state;
TAILQ_ENTRY(con_state) initial_mapping_order;
CIRCLEQ_ENTRY(con_state)
old_state;
TAILQ_ENTRY(con_state)
initial_mapping_order;
} con_state; } con_state;
CIRCLEQ_HEAD(state_head, con_state) CIRCLEQ_HEAD(state_head, con_state) state_head =
state_head =
CIRCLEQ_HEAD_INITIALIZER(state_head); CIRCLEQ_HEAD_INITIALIZER(state_head);
CIRCLEQ_HEAD(old_state_head, con_state) CIRCLEQ_HEAD(old_state_head, con_state) old_state_head =
old_state_head =
CIRCLEQ_HEAD_INITIALIZER(old_state_head); CIRCLEQ_HEAD_INITIALIZER(old_state_head);
TAILQ_HEAD(initial_mapping_head, con_state) TAILQ_HEAD(initial_mapping_head, con_state) initial_mapping_head =
initial_mapping_head =
TAILQ_HEAD_INITIALIZER(initial_mapping_head); TAILQ_HEAD_INITIALIZER(initial_mapping_head);
/* /*