From 4ddc32f8eec7f8d99f99cb72c9aa548a90acc287 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 23 Oct 2011 13:12:52 +0100 Subject: [PATCH] i3-config-wizard: use IPC functions from libi3 --- i3-config-wizard/Makefile | 9 +++++++-- i3-config-wizard/ipc.c | 31 ------------------------------- i3-config-wizard/ipc.h | 3 --- i3-config-wizard/main.c | 37 +------------------------------------ 4 files changed, 8 insertions(+), 72 deletions(-) diff --git a/i3-config-wizard/Makefile b/i3-config-wizard/Makefile index 1a9638ec..27d5bf54 100644 --- a/i3-config-wizard/Makefile +++ b/i3-config-wizard/Makefile @@ -8,6 +8,8 @@ AUTOGENERATED:=cfgparse.tab.c cfgparse.yy.c FILES:=$(patsubst %.c,%.o,$(filter-out $(AUTOGENERATED),$(wildcard *.c))) HEADERS:=$(wildcard *.h) +CPPFLAGS += -I$(TOPDIR)/include + # Depend on the specific file (.c for each .o) and on all headers %.o: %.c ${HEADERS} echo "[i3-config-wizard] CC $<" @@ -15,9 +17,12 @@ HEADERS:=$(wildcard *.h) all: i3-config-wizard -i3-config-wizard: cfgparse.y.o cfgparse.yy.o ${FILES} +i3-config-wizard: $(TOPDIR)/libi3/libi3.a cfgparse.y.o cfgparse.yy.o ${FILES} echo "[i3-config-wizard] LINK i3-config-wizard" - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) + $(CC) $(LDFLAGS) -o $@ $(filter-out libi3/libi3.a,$^) $(LIBS) + +$(TOPDIR)/libi3/%.a: $(TOPDIR)/libi3/*.c + $(MAKE) -C $(TOPDIR)/libi3 cfgparse.yy.o: cfgparse.l cfgparse.y.o ${HEADERS} echo "[i3-config-wizard] LEX $<" diff --git a/i3-config-wizard/ipc.c b/i3-config-wizard/ipc.c index 597a86ef..1d99e90a 100644 --- a/i3-config-wizard/ipc.c +++ b/i3-config-wizard/ipc.c @@ -16,37 +16,6 @@ #include #include -/* - * Formats a message (payload) of the given size and type and sends it to i3 via - * the given socket file descriptor. - * - */ -void ipc_send_message(int sockfd, uint32_t message_size, - uint32_t message_type, uint8_t *payload) { - int buffer_size = strlen("i3-ipc") + sizeof(uint32_t) + sizeof(uint32_t) + message_size; - char msg[buffer_size]; - char *walk = msg; - - strcpy(walk, "i3-ipc"); - walk += strlen("i3-ipc"); - memcpy(walk, &message_size, sizeof(uint32_t)); - walk += sizeof(uint32_t); - memcpy(walk, &message_type, sizeof(uint32_t)); - walk += sizeof(uint32_t); - memcpy(walk, payload, message_size); - - int sent_bytes = 0; - int bytes_to_go = buffer_size; - while (sent_bytes < bytes_to_go) { - int n = write(sockfd, msg + sent_bytes, bytes_to_go); - if (n == -1) - err(EXIT_FAILURE, "write() failed"); - - sent_bytes += n; - bytes_to_go -= n; - } -} - /* * Connects to the i3 IPC socket and returns the file descriptor for the * socket. die()s if anything goes wrong. diff --git a/i3-config-wizard/ipc.h b/i3-config-wizard/ipc.h index c40c909d..a6e3e0dd 100644 --- a/i3-config-wizard/ipc.h +++ b/i3-config-wizard/ipc.h @@ -1,9 +1,6 @@ #ifndef _IPC_H #define _IPC_H -void ipc_send_message(int sockfd, uint32_t message_size, - uint32_t message_type, uint8_t *payload); - int connect_ipc(char *socket_path); #endif diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c index da1f76a3..56ebf3b2 100644 --- a/i3-config-wizard/main.c +++ b/i3-config-wizard/main.c @@ -52,6 +52,7 @@ while (0) #include "xcb.h" #include "ipc.h" +#include "libi3.h" enum { STEP_WELCOME, STEP_GENERATE } current_step = STEP_WELCOME; enum { MOD_Mod1, MOD_Mod4 } modifier = MOD_Mod4; @@ -130,42 +131,6 @@ static char *resolve_tilde(const char *path) { return result; } -/* - * Try to get the socket path from X11 and return NULL if it doesn’t work. - * As i3-msg is a short-running tool, we don’t bother with cleaning up the - * connection and leave it up to the operating system on exit. - * - */ -static char *socket_path_from_x11() { - xcb_connection_t *conn; - int screen; - if ((conn = xcb_connect(NULL, &screen)) == NULL || - xcb_connection_has_error(conn)) - return NULL; - xcb_screen_t *root_screen = xcb_aux_get_screen(conn, screen); - xcb_window_t root = root_screen->root; - - xcb_intern_atom_cookie_t atom_cookie; - xcb_intern_atom_reply_t *atom_reply; - - atom_cookie = xcb_intern_atom(conn, 0, strlen("I3_SOCKET_PATH"), "I3_SOCKET_PATH"); - atom_reply = xcb_intern_atom_reply(conn, atom_cookie, NULL); - if (atom_reply == NULL) - return NULL; - - xcb_get_property_cookie_t prop_cookie; - xcb_get_property_reply_t *prop_reply; - prop_cookie = xcb_get_property_unchecked(conn, false, root, atom_reply->atom, - XCB_GET_PROPERTY_TYPE_ANY, 0, PATH_MAX); - prop_reply = xcb_get_property_reply(conn, prop_cookie, NULL); - if (prop_reply == NULL || xcb_get_property_value_length(prop_reply) == 0) - return NULL; - if (asprintf(&socket_path, "%.*s", xcb_get_property_value_length(prop_reply), - (char*)xcb_get_property_value(prop_reply)) == -1) - return NULL; - return socket_path; -} - /* * Handles expose events, that is, draws the window contents. * -- 2.39.5