]> git.sur5r.net Git - i3/i3/commitdiff
Rework the IPC-Code
authorAxel Wagner <mail@merovius.de>
Fri, 23 Jul 2010 02:43:43 +0000 (04:43 +0200)
committerAxel Wagner <mail@merovius.de>
Fri, 23 Jul 2010 02:43:43 +0000 (04:43 +0200)
i3bar/include/ipc.h
i3bar/include/outputs.h
i3bar/include/workspaces.h
i3bar/src/ipc.c
i3bar/src/main.c
i3bar/src/outputs.c
i3bar/src/workspaces.c

index 45565618bec029f4852a5259d82da82abfb40e57..278077e0d105a645645412a81fa9d5daf0bb40b7 100644 (file)
@@ -2,13 +2,10 @@
 #define IPC_H_
 
 #include <ev.h>
+#include <stdint.h>
 
-ev_io* i3_events;
-ev_io* outputs_watcher;
-ev_io* workspaces_watcher;
-
-void init_i3(const char* socket_path);
-void get_outputs_json(void (*callback)(char*, void*), void* params);
-void get_workspaces_json(void (*callback)(char*, void*), void* params);
+int init_connection(const char *socket_path);
+int i3_send_msg(uint32_t type, const char* payload);
+void subscribe_events();
 
 #endif
index 83364c2fa317c80f15f62f5c8060e0bcfb86daa4..0c24152752ca40472cfcd4cac2b73010ff3e566d 100644 (file)
@@ -8,7 +8,7 @@ typedef struct i3_output_t i3_output;
 
 i3_output* outputs;
 
-void           refresh_outputs();
+void           parse_outputs_json(char* json);
 void           free_outputs();
 i3_output*     get_output_by_name(char* name);
 
index ad6ac787775fac6cd3711379af3e33c115fbb573..339b889020f52a997de9e67ceb59aee0dc14a805 100644 (file)
@@ -8,7 +8,7 @@ typedef struct i3_ws_t i3_ws;
 
 i3_ws* workspaces;
 
-void refresh_workspaces();
+void parse_workspaces_json();
 void free_workspaces();
 
 struct i3_ws_t {
index 35d3d5be288348c9a3bf05a6b3b7c95bad5e258e..b753c0883e8e27f4bac4dfba79399a95cdb2b09a 100644 (file)
@@ -1,24 +1,19 @@
+#include <stdlib.h>
 #include <stdio.h>
-#include <ev.h>
+#include <unistd.h>
+#include <stdint.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <string.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <i3/ipc.h>
 
 #include "common.h"
+#include "outputs.h"
+#include "workspaces.h"
 #include "ipc.h"
 
-struct callback_t {
-       void                    (*callback)(char*, void*);
-       void*                   params;
-       struct callback_t*      next;
-};
+ev_io* i3_connection;
 
-struct callback_t* outputs_cb_queue;
-struct callback_t* workspaces_cb_queue;
+typedef void(*handler_t)(char*);
 
 int get_ipc_fd(const char* socket_path) {
        int sockfd = socket(AF_LOCAL, SOCK_STREAM, 0);
@@ -38,271 +33,164 @@ int get_ipc_fd(const char* socket_path) {
        return sockfd;
 }
 
-void get_outputs_cb(struct ev_loop* loop, ev_io *watcher, int revents) {
-
+void got_command_reply(char *reply) {
 }
 
-void init_i3(const char* socket_path) {
-       int sockfd = get_ipc_fd(socket_path);
-
-       struct get_outputs_callback* cb = malloc(sizeof(struct get_outputs_callback));
-       cb->callback = callback;
-       cb->params = params;
-
-       ev_io* get_outputs_write = malloc(sizeof(ev_io));
-
-       ev_io_init(get_outputs_write, &get_outputs_write_cb, sockfd, EV_WRITE);
-       get_outputs_write->data = (void*) cb;
-       ev_io_start(main_loop, get_outputs_write);
-
-       ev_io* get_outputs_read = malloc(sizeof(ev_io));
-       ev_io_init(get_outputs_read, &get_outputs_read_cb, sockfd, EV_READ);
-       get_outputs_read->data = (void*) cb;
-       ev_io_start(main_loop, get_outputs_read);
+void got_workspace_reply(char *reply) {
+       printf("Got Workspace-Data!\n");
+       parse_workspaces_json(reply);
 }
 
+void got_subscribe_reply(char *reply) {
+       printf("Got Subscribe Reply: %s\n", reply); 
+}
 
-void get_outputs_write_cb(struct ev_loop* loop, ev_io *watcher, int revents) {
-       ev_io_stop(loop, watcher);
-
-       int buffer_size = strlen(I3_IPC_MAGIC) + sizeof(uint32_t) + sizeof(uint32_t);
-       char msg[buffer_size];
-       char *walk = msg;
-       uint32_t msg_size = 0;
-       uint32_t msg_type = I3_IPC_MESSAGE_TYPE_GET_OUTPUTS;
-       int sockfd = watcher->fd;
+void got_output_reply(char *reply) {
+       parse_outputs_json(reply);
+       printf("Got Outputs-Data!\n");
+}
 
-       strcpy(walk, I3_IPC_MAGIC);
-       walk += strlen(I3_IPC_MAGIC);
-       memcpy(walk, &msg_size, sizeof(uint32_t));
-       walk += sizeof(uint32_t);
-       memcpy(walk, &msg_type, sizeof(uint32_t));
-       
-       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) {
-                       printf("ERROR: write() failed!\n");
-                       exit(EXIT_FAILURE);
-               }
+handler_t reply_handlers[] = {
+       &got_command_reply,
+       &got_workspace_reply,
+       &got_subscribe_reply,
+       &got_output_reply,
+};
 
-               sent_bytes += n;
-               bytes_to_go -= n;
-       }
-       FREE(watcher);
+void got_workspace_event(char *event) {
+       printf("Got Workspace Event!\n");
+       i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_WORKSPACES, NULL);
 }
 
-void get_outputs_read_cb(struct ev_loop* loop, ev_io *watcher, int revents) {
-       ev_io_stop(loop, watcher);
+void got_output_event(char *event) {
+       printf("Got Output Event!\n");
+       i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_OUTPUTS, NULL);
+}
 
-       int to_read = strlen(I3_IPC_MAGIC) + sizeof(uint32_t) + sizeof(uint32_t);
-       char msg[to_read];
-       char *walk = msg;
-       int sockfd = watcher->fd;
-       uint8_t *reply;
-       struct get_outputs_callback* cb = watcher->data;
+handler_t event_handlers[] = {
+       &got_workspace_event,
+       &got_output_event
+};
 
-       uint32_t reply_length;
+void got_data(struct ev_loop *loop, ev_io *watcher, int events) {
+       printf("Got data!\n");
+       int fd = watcher->fd;
+       uint32_t header_len = strlen(I3_IPC_MAGIC) + sizeof(uint32_t)*2;
+       char *header = malloc(header_len);
+       if (header == NULL) {
+               printf("ERROR: Could not allocate memory!\n");
+               exit(EXIT_FAILURE);
+       }
 
-       uint32_t read_bytes = 0;
-       while (read_bytes < to_read) {
-               int n = read(sockfd, msg + read_bytes, to_read);
+       uint32_t rec = 0;
+       while (rec < header_len) {
+               int n = read(fd, header + rec, header_len - rec);
                if (n == -1) {
                        printf("ERROR: read() failed!\n");
                        exit(EXIT_FAILURE);
                }
                if (n == 0) {
-                       printf("ERROR: No reply!\n");
+                       printf("ERROR: Nothing to read!\n");
                        exit(EXIT_FAILURE);
                }
-
-               read_bytes += n;
-               to_read -= n;
+               rec += n;
        }
-
-       if (memcmp(walk, I3_IPC_MAGIC, strlen(I3_IPC_MAGIC)) != 0) {
-               printf("ERROR: Wrong magic!\n");
+       
+       if (strncmp(header, I3_IPC_MAGIC, strlen(I3_IPC_MAGIC))) {
+               printf("ERROR: Wrong magic code: %.*s\n Expected: %s\n",
+                      (int) strlen(I3_IPC_MAGIC),
+                      header,
+                      I3_IPC_MAGIC);
                exit(EXIT_FAILURE);
        }
 
-       walk += strlen(I3_IPC_MAGIC);
-       reply_length = *((uint32_t*) walk);
-       walk += sizeof(uint32_t);
-       if (*((uint32_t*) walk) != I3_IPC_MESSAGE_TYPE_GET_OUTPUTS) {
-               printf("ERROR: Wrong reply type (%d) expected %d!\n",
-                       *((uint32_t*) walk),
-                       I3_IPC_MESSAGE_TYPE_GET_OUTPUTS);
-               exit(EXIT_FAILURE);
-       }
+       char *walk = header + strlen(I3_IPC_MAGIC);
+       uint32_t size = *((uint32_t*) walk);
        walk += sizeof(uint32_t);
-
-       reply = malloc(reply_length);
-       if (reply == NULL) {
-               printf("ERROR: malloc() failed!\n");
+       uint32_t type = *((uint32_t*) walk);
+       char *buffer = malloc(size + 1);
+       if (buffer == NULL) {
+               printf("ERROR: Could not allocate memory!\n");
                exit(EXIT_FAILURE);
        }
+       rec = 0;
 
-       to_read = reply_length;
-       read_bytes = 0;
-       while (read_bytes < to_read) {
-               int n = read(sockfd, reply + read_bytes, to_read);
+       while (rec < size) {
+               int n = read(fd, buffer + rec, size - rec);
                if (n == -1) {
                        printf("ERROR: read() failed!\n");
                        exit(EXIT_FAILURE);
                }
-
-               read_bytes += n;
-               to_read -= n;
-       }
-       
-       cb->callback((char*) reply, cb->params);
-       FREE(cb);
-       FREE(watcher);
-}
-
-void get_outputs_json(void (*callback)(char*, void*), void* params) {
-}
-
-
-
-struct get_workspaces_callback {
-       void (*callback)(char*, void*);
-       void* params;
-};
-
-void get_workspaces_write_cb(struct ev_loop* loop, ev_io *watcher, int revents) {
-       ev_io_stop(loop, watcher);
-       //FREE(watcher);
-
-       int buffer_size = strlen(I3_IPC_MAGIC) + sizeof(uint32_t) + sizeof(uint32_t);
-       char msg[buffer_size];
-       char *walk = msg;
-       uint32_t msg_size = 0;
-       uint32_t msg_type = I3_IPC_MESSAGE_TYPE_GET_WORKSPACES;
-       int sockfd = watcher->fd;
-
-       strcpy(walk, I3_IPC_MAGIC);
-       walk += strlen(I3_IPC_MAGIC);
-       memcpy(walk, &msg_size, sizeof(uint32_t));
-       walk += sizeof(uint32_t);
-       memcpy(walk, &msg_type, sizeof(uint32_t));
-       
-       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) {
-                       printf("ERROR: write() failed!\n");
+               if (n == 0) {
+                       printf("ERROR: Nothing to read!\n");
                        exit(EXIT_FAILURE);
                }
-
-               sent_bytes += n;
-               bytes_to_go -= n;
+               rec += n;
+       }
+       buffer[size] = '\0';
+       
+       if (type & (1 << 31)) {
+               type ^= 1 << 31;
+               event_handlers[type](buffer);
+       } else {
+               reply_handlers[type](buffer);
        }
-       FREE(watcher);
-}
-
-void get_workspaces_read_cb(struct ev_loop* loop, ev_io *watcher, int revents) {
-       ev_io_stop(loop, watcher);
-       //FREE(watcher);
-
-       int to_read = strlen(I3_IPC_MAGIC) + sizeof(uint32_t) + sizeof(uint32_t);
-       char msg[to_read];
-       char *walk = msg;
-       int sockfd = watcher->fd;
-       uint8_t *reply;
-       struct get_workspaces_callback* cb = watcher->data;
-
-       uint32_t reply_length;
 
-       uint32_t read_bytes = 0;
-       while (read_bytes < to_read) {
-               int n = read(sockfd, msg + read_bytes, to_read);
-               if (n == -1) {
-                       printf("ERROR: read() failed!\n");
-                       exit(EXIT_FAILURE);
-               }
-               if (n == 0) {
-                       printf("ERROR: No reply!\n");
-                       exit(EXIT_FAILURE);
-               }
+       FREE(buffer);
+}
 
-               read_bytes += n;
-               to_read -= n;
+int i3_send_msg(uint32_t type, const char* payload) {
+       uint32_t len = 0;
+       if (payload != NULL) {
+               len = strlen(payload);
        }
 
-       if (memcmp(walk, I3_IPC_MAGIC, strlen(I3_IPC_MAGIC)) != 0) {
-               printf("ERROR: Wrong magic!\n");
+       uint32_t to_write = strlen (I3_IPC_MAGIC) + sizeof(uint32_t)*2 + len; 
+       char *buffer = malloc(to_write);
+       if (buffer == NULL) {
+               printf("ERROR: Could not allocate memory\n");
                exit(EXIT_FAILURE);
        }
 
+       char *walk = buffer;
+
+       strncpy(buffer, I3_IPC_MAGIC, strlen(I3_IPC_MAGIC));
        walk += strlen(I3_IPC_MAGIC);
-       reply_length = *((uint32_t*) walk);
+       memcpy(walk, &len, sizeof(uint32_t));
        walk += sizeof(uint32_t);
-       if (*((uint32_t*) walk) != I3_IPC_MESSAGE_TYPE_GET_WORKSPACES) {
-               printf("ERROR: Wrong reply type (%d) expected %d!\n",
-                       *((uint32_t*) walk),
-                       I3_IPC_MESSAGE_TYPE_GET_WORKSPACES);
-               exit(EXIT_FAILURE);
-       }
+       memcpy(walk, &type, sizeof(uint32_t));
        walk += sizeof(uint32_t);
 
-       reply = malloc(reply_length);
-       if (reply == NULL) {
-               printf("ERROR: malloc() failed!\n");
-               exit(EXIT_FAILURE);
-       }
+       strncpy(walk, payload, len);
+       
+       uint32_t written = 0;
 
-       to_read = reply_length;
-       read_bytes = 0;
-       while (read_bytes < to_read) {
-               int n = read(sockfd, reply + read_bytes, to_read);
+       while (to_write > 0) {
+               int n = write(i3_connection->fd, buffer + written, to_write);
                if (n == -1) {
-                       printf("ERROR: read() failed!\n");
+                       printf("ERROR: write() failed!\n");
                        exit(EXIT_FAILURE);
                }
 
-               read_bytes += n;
-               to_read -= n;
+               to_write -= n;
+               written += n;
        }
-       
-       cb->callback((char*) reply, cb->params);
-       FREE(cb);
-
-       FREE(watcher);
-}
-
-void get_workspaces_json(void (*callback)(char*, void*), void* params) {
-       socket_path = "/home/mero/.i3/ipc.sock";
 
-       int sockfd = socket(AF_LOCAL, SOCK_STREAM, 0);
-       if (sockfd == -1) {
-               printf("ERROR: Could not create Socket!\n");
-               exit(EXIT_FAILURE);
-       }
+       FREE(buffer);
 
-       struct sockaddr_un addr;
-       memset(&addr, 0, sizeof(struct sockaddr_un));
-       addr.sun_family = AF_LOCAL;
-       strcpy(addr.sun_path, socket_path);
-       if (connect(sockfd, (const struct sockaddr*) &addr, sizeof(struct sockaddr_un)) < 0) {
-               printf("ERROR: Could not connct to i3\n");
-               exit(EXIT_FAILURE);
-       }
+       return 1;
+}
 
-       struct get_workspaces_callback* cb = malloc(sizeof(struct get_workspaces_callback));
-       cb->callback = callback;
-       cb->params = params;
+int init_connection(const char *socket_path) {
+       int sockfd = get_ipc_fd(socket_path);
 
-       ev_io* get_workspaces_write = malloc(sizeof(ev_io));
+       i3_connection = malloc(sizeof(ev_io));
+       ev_io_init(i3_connection, &got_data, sockfd, EV_READ);
+       ev_io_start(main_loop, i3_connection);
 
-       ev_io_init(get_workspaces_write, &get_workspaces_write_cb, sockfd, EV_WRITE);
-       get_workspaces_write->data = (void*) cb;
-       ev_io_start(main_loop, get_workspaces_write);
+       return 1;
+}
 
-       ev_io* get_workspaces_read = malloc(sizeof(ev_io));
-       ev_io_init(get_workspaces_read, &get_workspaces_read_cb, sockfd, EV_READ);
-       get_workspaces_read->data = (void*) cb;
-       ev_io_start(main_loop, get_workspaces_read);
+void subscribe_events() {
+       i3_send_msg(I3_IPC_MESSAGE_TYPE_SUBSCRIBE, "[ \"workspace\", \"output\" ]");
 }
index 90a48ee23872d5a2b1019db595a052e2636a9085..dbb6104c40f68345021588f16970a970689a1cbc 100644 (file)
@@ -1,21 +1,21 @@
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <ev.h>
+
 #include "ipc.h"
 #include "outputs.h"
 #include "workspaces.h"
 #include "common.h"
 #include "xcb.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <ev.h>
-
 int main(int argc, char **argv) {
        main_loop = ev_default_loop(0);
 
        init_xcb();
+       init_connection("/home/mero/.i3/ipc.sock");
 
-       refresh_outputs(&create_windows, NULL);
-       refresh_workspaces(NULL, NULL);
+       subscribe_events();
 
        ev_loop(main_loop, 0);
 
@@ -24,6 +24,5 @@ int main(int argc, char **argv) {
        free_outputs();
        free_workspaces();
 
-       //sleep(5);
        return 0;       
 }
index 2b2600b51ca1a53387126c7cf06a18fd56461306..6ddfa8c91e6f8646910e50f4bdfa5c2134b107ac 100644 (file)
@@ -1,6 +1,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <i3/ipc.h>
 
 #include <yajl/yajl_parse.h>
 
@@ -13,8 +14,6 @@ struct outputs_json_params {
        i3_output*      outputs_walk;
        char*           cur_key;
        char*           json;
-       void            (*callback)(void*);
-       void*           cb_params;
 };
 
 static int outputs_null_cb(void* params_) {
@@ -144,18 +143,20 @@ yajl_callbacks outputs_callbacks = {
        NULL
 };
 
-void got_outputs_json_cb(char* json, void* params_) {
+void parse_outputs_json(char* json) {
        /* FIXME: Fasciliate stream-processing, i.e. allow starting to interpret
         * JSON in chunks */
-       struct outputs_json_params* params = (struct outputs_json_params*) params_;
+       struct outputs_json_params params;
+       params.outputs = NULL;
+       params.outputs_walk = NULL;
+       params.cur_key = NULL;
+       params.json = json;
 
        yajl_handle handle;
        yajl_parser_config parse_conf = { 0, 0 };
        yajl_status state;
        
-       params->json = json;
-
-       handle = yajl_alloc(&outputs_callbacks, &parse_conf, NULL, (void*) params);
+       handle = yajl_alloc(&outputs_callbacks, &parse_conf, NULL, (void*) &params);
 
        state = yajl_parse(handle, (const unsigned char*) json, strlen(json));
 
@@ -174,27 +175,7 @@ void got_outputs_json_cb(char* json, void* params_) {
        yajl_free(handle);
 
        free_outputs();
-       outputs = params->outputs;
-
-       if (params->callback != NULL) {
-               params->callback(params->cb_params);
-       }
-       
-       FREE(params->json);
-       FREE(params);
-}
-
-void refresh_outputs(void (*callback)(void*), void* cb_params) {
-       struct outputs_json_params* params = malloc(sizeof(struct outputs_json_params));
-
-       params->outputs = NULL;
-       params->outputs_walk = NULL;
-       params->cur_key = NULL;
-       params->json = NULL;
-       params->callback = callback;
-       params->cb_params = cb_params;
-
-       get_outputs_json(&got_outputs_json_cb, params);
+       outputs = params.outputs;
 }
 
 void free_outputs() {
@@ -209,7 +190,7 @@ void free_outputs() {
 
 i3_output* get_output_by_name(char* name) {
        if (outputs == NULL) {
-               refresh_outputs(NULL, NULL);
+               i3_send_msg(I3_IPC_MESSAGE_TYPE_GET_OUTPUTS, NULL);
                return NULL;
        }
 
index 1592763197873e9952af4851d6307df5022063ee..aa97bccc29f671b4ade57e2b25e0b8bb2577e186 100644 (file)
@@ -91,6 +91,7 @@ static int workspaces_integer_cb(void* params_, long val) {
 }
 
 static int workspaces_string_cb(void* params_, const unsigned char* val, unsigned int len) {
+
         struct workspaces_json_params* params = (struct workspaces_json_params*) params_;
 
         char* output_name;
@@ -151,6 +152,10 @@ static int workspaces_map_key_cb(void* params_, const unsigned char* keyVal, uns
        FREE(params->cur_key);
 
        params->cur_key = malloc(sizeof(unsigned char) * (keyLen + 1));
+       if (params->cur_key == NULL) {
+               printf("ERROR: Could not allocate memory!\n");
+               exit(EXIT_FAILURE);
+       }
        strncpy(params->cur_key, (const char*) keyVal, keyLen);
        params->cur_key[keyLen] = '\0';
 
@@ -171,18 +176,20 @@ yajl_callbacks workspaces_callbacks = {
        NULL
 };
 
-void got_workspaces_json_cb(char* json, void* params_) {
+void parse_workspaces_json(char* json) {
        /* FIXME: Fasciliate stream-processing, i.e. allow starting to interpret
         * JSON in chunks */
-       struct workspaces_json_params* params = (struct workspaces_json_params*) params_;
+       struct workspaces_json_params params;
+       params.workspaces = NULL;
+       params.workspaces_walk = NULL;
+       params.cur_key = NULL;
+       params.json = json;
 
        yajl_handle handle;
        yajl_parser_config parse_conf = { 0, 0 };
        yajl_status state;
        
-       params->json = json;
-
-       handle = yajl_alloc(&workspaces_callbacks, &parse_conf, NULL, (void*) params);
+       handle = yajl_alloc(&workspaces_callbacks, &parse_conf, NULL, (void*) &params);
 
        state = yajl_parse(handle, (const unsigned char*) json, strlen(json));
 
@@ -201,21 +208,9 @@ void got_workspaces_json_cb(char* json, void* params_) {
        yajl_free(handle);
 
        free_workspaces();
-       workspaces = params->workspaces;
+       workspaces = params.workspaces;
        
-       FREE(params->json);
-       FREE(params);
-}
-
-void refresh_workspaces() {
-       struct workspaces_json_params* params = malloc(sizeof(struct workspaces_json_params));
-
-       params->workspaces = NULL;
-       params->workspaces_walk = NULL;
-       params->cur_key = NULL;
-       params->json = NULL;
-
-       get_workspaces_json(&got_workspaces_json_cb, params);
+       FREE(params.cur_key);
 }
 
 void free_workspaces() {