clang-format: use TypenameMacros

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

View File

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

View File

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

View File

@ -57,7 +57,7 @@ extern xcb_key_symbols_t *keysyms;
extern char **start_argv;
extern Display *xlibdpy, *xkbdpy;
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 TAILQ_HEAD(autostarts_head, Autostart) autostarts;
extern TAILQ_HEAD(autostarts_always_head, Autostart) autostarts_always;

View File

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