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

Set the I3_SOCKET_PATH and I3_CONFIG_PATH atoms on the X11 root window

This commit is contained in:
Michael Stapelberg 2011-03-19 21:20:38 +01:00
parent 8b9aedd2bf
commit 65a3259b3c
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/atoms.xmacro
View File

@ -29,3 +29,5 @@ xmacro(WM_NAME)
xmacro(WM_CLASS) xmacro(WM_CLASS)
xmacro(STRING) xmacro(STRING)
xmacro(CARDINAL) xmacro(CARDINAL)
xmacro(I3_SOCKET_PATH)
xmacro(I3_CONFIG_PATH)

1
include/config.h
View File

@ -22,6 +22,7 @@
#include "i3.h" #include "i3.h"
typedef struct Config Config; typedef struct Config Config;
extern const char *saved_configpath;
extern Config config; extern Config config;
extern SLIST_HEAD(modes_head, Mode) modes; extern SLIST_HEAD(modes_head, Mode) modes;

2
src/config.c
View File

@ -19,6 +19,7 @@
#include "all.h" #include "all.h"
const char *saved_configpath = NULL;
Config config; Config config;
struct modes_head modes; struct modes_head modes;
@ -232,7 +233,6 @@ static char *get_config_path() {
* *
*/ */
static void parse_configuration(const char *override_configpath) { static void parse_configuration(const char *override_configpath) {
static const char *saved_configpath = NULL;
if (override_configpath != NULL) { if (override_configpath != NULL) {
saved_configpath = override_configpath; saved_configpath = override_configpath;

4
src/main.c
View File

@ -350,6 +350,10 @@ int main(int argc, char *argv[]) {
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_SUPPORTING_WM_CHECK, A_WINDOW, 32, 1, &root); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_SUPPORTING_WM_CHECK, A_WINDOW, 32, 1, &root);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_WM_NAME, A_UTF8_STRING, 8, strlen("i3"), "i3"); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_WM_NAME, A_UTF8_STRING, 8, strlen("i3"), "i3");
/* Set up i3 specific atoms like I3_SOCKET_PATH and I3_CONFIG_PATH */
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_SOCKET_PATH, A_UTF8_STRING, 8, strlen(config.ipc_socket_path), config.ipc_socket_path);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_CONFIG_PATH, A_UTF8_STRING, 8, strlen(saved_configpath), saved_configpath);
keysyms = xcb_key_symbols_alloc(conn); keysyms = xcb_key_symbols_alloc(conn);
xcb_get_numlock_mask(conn); xcb_get_numlock_mask(conn);