nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i3bar: Make header declarations extern 

See #3914
This commit is contained in:
Orestis Floros 2020-01-25 16:26:54 +01:00
parent e9f011397a
commit d14e59b3a7
No known key found for this signature in database
GPG Key ID: A09DBD7D3222C1C3
8 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
i3bar/include/common.h
View File

@ -17,7 +17,7 @@
typedef struct rect_t rect; typedef struct rect_t rect;
struct ev_loop *main_loop; extern struct ev_loop *main_loop;
struct rect_t { struct rect_t {
int x; int x;
@ -82,8 +82,8 @@ struct status_block {
blocks; blocks;
}; };
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"

2
i3bar/include/configuration.h
View File

@ -74,7 +74,7 @@ typedef struct config_t {
S_SHOW = 1 } hidden_state; S_SHOW = 1 } hidden_state;
} config_t; } config_t;
config_t config; extern config_t config;
/** /**
* Start parsing the received bar configuration JSON string * Start parsing the received bar configuration JSON string

2
i3bar/include/outputs.h
View File

@ -19,7 +19,7 @@
typedef struct i3_output i3_output; typedef struct i3_output i3_output;
SLIST_HEAD(outputs_head, i3_output); SLIST_HEAD(outputs_head, i3_output);
struct outputs_head* outputs; extern struct outputs_head* outputs;
/* /*
* Start parsing the received JSON string * Start parsing the received JSON string

2
i3bar/include/xcb.h
View File

@ -53,7 +53,7 @@ struct xcb_color_strings_t {
typedef struct xcb_colors_t xcb_colors_t; typedef struct xcb_colors_t xcb_colors_t;
/* Cached width of the custom separator if one was set */ /* Cached width of the custom separator if one was set */
int separator_symbol_width; extern int separator_symbol_width;
/* /*
* Early initialization of the connection to X11: Everything which does not * Early initialization of the connection to X11: Everything which does not

1
i3bar/src/config.c
View File

@ -19,6 +19,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
config_t config;
static char *cur_key; static char *cur_key;
static bool parsing_bindings; static bool parsing_bindings;
static bool parsing_tray_outputs; static bool parsing_tray_outputs;

2
i3bar/src/main.c
View File

@ -17,6 +17,8 @@
#include <getopt.h> #include <getopt.h>
#include <glob.h> #include <glob.h>
struct ev_loop *main_loop;
/* /*
* Having verboselog(), errorlog() and debuglog() is necessary when using libi3. * Having verboselog(), errorlog() and debuglog() is necessary when using libi3.
* *

1
i3bar/src/outputs.c
View File

@ -252,6 +252,7 @@ static yajl_callbacks outputs_callbacks = {
.yajl_end_map = outputs_end_map_cb, .yajl_end_map = outputs_end_map_cb,
}; };
struct outputs_head *outputs;
/* /*
* Initiate the outputs list * Initiate the outputs list
* *

3
i3bar/src/xcb.c
View File

@ -140,6 +140,9 @@ static const int tray_loff_px = 2;
/* Vertical offset between the bar and a separator */ /* Vertical offset between the bar and a separator */
static const int sep_voff_px = 4; static const int sep_voff_px = 4;
/* Cached width of the custom separator if one was set */
int separator_symbol_width;
int _xcb_request_failed(xcb_void_cookie_t cookie, char *err_msg, int line) { int _xcb_request_failed(xcb_void_cookie_t cookie, char *err_msg, int line) {
xcb_generic_error_t *err; xcb_generic_error_t *err;
if ((err = xcb_request_check(xcb_connection, cookie)) != NULL) { if ((err = xcb_request_check(xcb_connection, cookie)) != NULL) {