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

Merge pull request #2138 from Alexis211/factor 

Refactor extern definition of conn and root_screen
This commit is contained in:
Michael Stapelberg 2015-12-29 13:51:15 +01:00
parent f6021c957b 19fd6817af
commit 0ee9e65a3b
8 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i3bar/include/xcb.h
View File

@ -24,8 +24,6 @@
#define XEMBED_MAPPED (1 << 0) #define XEMBED_MAPPED (1 << 0)
#define XEMBED_EMBEDDED_NOTIFY 0 #define XEMBED_EMBEDDED_NOTIFY 0
xcb_connection_t *xcb_connection;
/* We define xcb_request_failed as a macro to include the relevant line number */ /* We define xcb_request_failed as a macro to include the relevant line number */
#define xcb_request_failed(cookie, err_msg) _xcb_request_failed(cookie, err_msg, __LINE__) #define xcb_request_failed(cookie, err_msg) _xcb_request_failed(cookie, err_msg, __LINE__)
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);

2
include/i3.h
View File

@ -35,7 +35,6 @@ extern struct rlimit original_rlimit_core;
extern bool debug_build; extern bool debug_build;
/** The number of file descriptors passed via socket activation. */ /** The number of file descriptors passed via socket activation. */
extern int listen_fds; extern int listen_fds;
extern xcb_connection_t *conn;
extern int conn_screen; extern int conn_screen;
/** /**
* The EWMH support window that is used to indicate that an EWMH-compliant * The EWMH support window that is used to indicate that an EWMH-compliant
@ -61,7 +60,6 @@ extern TAILQ_HEAD(autostarts_always_head, Autostart) autostarts_always;
extern TAILQ_HEAD(ws_assignments_head, Workspace_Assignment) ws_assignments; extern TAILQ_HEAD(ws_assignments_head, Workspace_Assignment) ws_assignments;
extern TAILQ_HEAD(assignments_head, Assignment) assignments; extern TAILQ_HEAD(assignments_head, Assignment) assignments;
extern SLIST_HEAD(stack_wins_head, Stack_Window) stack_wins; extern SLIST_HEAD(stack_wins_head, Stack_Window) stack_wins;
extern xcb_screen_t *root_screen;
/* Color depth, visual id and colormap to use when creating windows and /* Color depth, visual id and colormap to use when creating windows and
* pixmaps. Will use 32 bit depth and an appropriate visual, if available, * pixmaps. Will use 32 bit depth and an appropriate visual, if available,

7
include/libi3.h
View File

@ -26,6 +26,13 @@
#define DEFAULT_DIR_MODE (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) #define DEFAULT_DIR_MODE (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
/**
* XCB connection and root screen
*
*/
extern xcb_connection_t *conn;
extern xcb_screen_t *root_screen;
/** /**
* Opaque data structure for storing strings. * Opaque data structure for storing strings.
* *

2
libi3/dpi.c
View File

@ -8,8 +8,6 @@
#include "libi3.h" #include "libi3.h"
#include <math.h> #include <math.h>
extern xcb_screen_t *root_screen;
/* /*
* Convert a logical amount of pixels (e.g. 2 pixels on a “standard” 96 DPI * Convert a logical amount of pixels (e.g. 2 pixels on a “standard” 96 DPI
* screen) to a corresponding amount of physical pixels on a standard or retina * screen) to a corresponding amount of physical pixels on a standard or retina

3
libi3/font.c
View File

@ -19,9 +19,6 @@
#include "libi3.h" #include "libi3.h"
extern xcb_connection_t *conn;
extern xcb_screen_t *root_screen;
static const i3Font *savedFont = NULL; static const i3Font *savedFont = NULL;
#if PANGO_SUPPORT #if PANGO_SUPPORT

2
libi3/get_mod_mask.c
View File

@ -12,8 +12,6 @@
#include "libi3.h" #include "libi3.h"
extern xcb_connection_t *conn;
/* /*
* All-in-one function which returns the modifier mask (XCB_MOD_MASK_*) for the * All-in-one function which returns the modifier mask (XCB_MOD_MASK_*) for the
* given keysymbol, for example for XCB_NUM_LOCK (usually configured to mod2). * given keysymbol, for example for XCB_NUM_LOCK (usually configured to mod2).

2
src/floating.c
View File

@ -11,8 +11,6 @@
*/ */
#include "all.h" #include "all.h"
extern xcb_connection_t *conn;
/* /*
* Calculates sum of heights and sum of widths of all currently active outputs * Calculates sum of heights and sum of widths of all currently active outputs
* *

2
src/resize.c
View File

@ -11,8 +11,6 @@
*/ */
#include "all.h" #include "all.h"
extern xcb_connection_t *conn;
/* /*
* This is an ugly data structure which we need because there is no standard * This is an ugly data structure which we need because there is no standard
* way of having nested functions (only available as a gcc extension at the * way of having nested functions (only available as a gcc extension at the