/*
- * i3bar - an xcb-based status- and ws-bar for i3
- *
- * © 2010-2011 Axel Wagner and contributors
+ * vim:ts=4:sw=4:expandtab
*
- * See file LICNSE for license information
+ * i3bar - an xcb-based status- and ws-bar for i3
+ * © 2010-2012 Axel Wagner and contributors (see also: LICENSE)
*
- * src/workspaces.c: Maintaining the workspace-lists
+ * workspaces.c: Maintaining the workspace-lists
*
*/
#include <string.h>
* Parse an integer (num or the rect)
*
*/
-#if YAJL_MAJOR >= 2
static int workspaces_integer_cb(void *params_, long long val) {
-#else
-static int workspaces_integer_cb(void *params_, long val) {
-#endif
struct workspaces_json_params *params = (struct workspaces_json_params*) params_;
if (!strcmp(params->cur_key, "num")) {
* Parse a string (name, output)
*
*/
-#if YAJL_MAJOR >= 2
static int workspaces_string_cb(void *params_, const unsigned char *val, size_t len) {
-#else
-static int workspaces_string_cb(void *params_, const unsigned char *val, unsigned int len) {
-#endif
struct workspaces_json_params *params = (struct workspaces_json_params*) params_;
char *output_name;
if (!strcmp(params->cur_key, "name")) {
/* Save the name */
- params->workspaces_walk->name = malloc(sizeof(const unsigned char) * (len + 1));
- strncpy(params->workspaces_walk->name, (const char*) val, len);
- params->workspaces_walk->name[len] = '\0';
-
- /* Convert the name to ucs2, save its length in glyphs and calculate its rendered width */
- int ucs2_len;
- xcb_char2b_t *ucs2_name = (xcb_char2b_t*) convert_utf8_to_ucs2(params->workspaces_walk->name, &ucs2_len);
- params->workspaces_walk->ucs2_name = ucs2_name;
- params->workspaces_walk->name_glyphs = ucs2_len;
+ params->workspaces_walk->name = i3string_from_utf8_with_length((const char *)val, len);
+
+ /* Save its rendered width */
params->workspaces_walk->name_width =
- predict_text_extents(params->workspaces_walk->ucs2_name,
- params->workspaces_walk->name_glyphs);
+ predict_text_width(params->workspaces_walk->name);
- DLOG("Got Workspace %s, name_width: %d, glyphs: %d\n",
- params->workspaces_walk->name,
+ DLOG("Got Workspace %s, name_width: %d, glyphs: %zu\n",
+ i3string_as_utf8(params->workspaces_walk->name),
params->workspaces_walk->name_width,
- params->workspaces_walk->name_glyphs);
+ i3string_get_num_glyphs(params->workspaces_walk->name));
FREE(params->cur_key);
return 1;
if (!strcmp(params->cur_key, "output")) {
/* We add the ws to the TAILQ of the output, it belongs to */
- output_name = malloc(sizeof(const unsigned char) * (len + 1));
+ output_name = smalloc(sizeof(const unsigned char) * (len + 1));
strncpy(output_name, (const char*) val, len);
output_name[len] = '\0';
- params->workspaces_walk->output = get_output_by_name(output_name);
+ i3_output *target = get_output_by_name(output_name);
+ if (target) {
+ params->workspaces_walk->output = target;
- TAILQ_INSERT_TAIL(params->workspaces_walk->output->workspaces,
- params->workspaces_walk,
- tailq);
+ TAILQ_INSERT_TAIL(params->workspaces_walk->output->workspaces,
+ params->workspaces_walk,
+ tailq);
+ }
FREE(output_name);
return 1;
i3_ws *new_workspace = NULL;
if (params->cur_key == NULL) {
- new_workspace = malloc(sizeof(i3_ws));
+ new_workspace = smalloc(sizeof(i3_ws));
new_workspace->num = -1;
new_workspace->name = NULL;
new_workspace->visible = 0;
* Essentially we just save it in the parsing-state
*
*/
-#if YAJL_MAJOR >= 2
static int workspaces_map_key_cb(void *params_, const unsigned char *keyVal, size_t keyLen) {
-#else
-static int workspaces_map_key_cb(void *params_, const unsigned char *keyVal, unsigned int keyLen) {
-#endif
struct workspaces_json_params *params = (struct workspaces_json_params*) params_;
FREE(params->cur_key);
- params->cur_key = malloc(sizeof(unsigned char) * (keyLen + 1));
- if (params->cur_key == NULL) {
- ELOG("Could not allocate memory: %s\n", strerror(errno));
- exit(EXIT_FAILURE);
- }
+ params->cur_key = smalloc(sizeof(unsigned char) * (keyLen + 1));
strncpy(params->cur_key, (const char*) keyVal, keyLen);
params->cur_key[keyLen] = '\0';
}
/* A datastructure to pass all these callbacks to yajl */
-yajl_callbacks workspaces_callbacks = {
- NULL,
- &workspaces_boolean_cb,
- &workspaces_integer_cb,
- NULL,
- NULL,
- &workspaces_string_cb,
- &workspaces_start_map_cb,
- &workspaces_map_key_cb,
- NULL,
- NULL,
- NULL
+static yajl_callbacks workspaces_callbacks = {
+ .yajl_boolean = workspaces_boolean_cb,
+ .yajl_integer = workspaces_integer_cb,
+ .yajl_string = workspaces_string_cb,
+ .yajl_start_map = workspaces_start_map_cb,
+ .yajl_map_key = workspaces_map_key_cb,
};
/*
yajl_handle handle;
yajl_status state;
-#if YAJL_MAJOR < 2
- yajl_parser_config parse_conf = { 0, 0 };
-
- handle = yajl_alloc(&workspaces_callbacks, &parse_conf, NULL, (void*) ¶ms);
-#else
handle = yajl_alloc(&workspaces_callbacks, NULL, (void*) ¶ms);
-#endif
state = yajl_parse(handle, (const unsigned char*) json, strlen(json));
case yajl_status_ok:
break;
case yajl_status_client_canceled:
-#if YAJL_MAJOR < 2
- case yajl_status_insufficient_data:
-#endif
case yajl_status_error:
ELOG("Could not parse workspaces-reply!\n");
exit(EXIT_FAILURE);
* free() all workspace data-structures. Does not free() the heads of the tailqueues.
*
*/
-void free_workspaces() {
+void free_workspaces(void) {
i3_output *outputs_walk;
if (outputs == NULL) {
return;
SLIST_FOREACH(outputs_walk, outputs, slist) {
if (outputs_walk->workspaces != NULL && !TAILQ_EMPTY(outputs_walk->workspaces)) {
TAILQ_FOREACH(ws_walk, outputs_walk->workspaces, tailq) {
- FREE(ws_walk->name);
- FREE(ws_walk->ucs2_name);
+ I3STRING_FREE(ws_walk->name);
}
FREE_TAILQ(outputs_walk->workspaces, i3_ws);
}
projects / i3 / i3 / blobdiff