external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-06-16 16:25:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

modules/i3: Use uint64_t for workspace ids

Browse source
This commit is contained in:
optimus-prime 2023-01-05 13:24:47 +05:30
parent f75168796a
commit 090931b336
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/i3.c
View file

@ -29,7 +29,7 @@ struct ws_content {
}; };
struct workspace { struct workspace {
int id; uint64_t id;
char *name; char *name;
int name_as_int; /* -1 if name is not a decimal number */ int name_as_int; /* -1 if name is not a decimal number */
bool persistent; bool persistent;
@ -134,7 +134,7 @@ workspace_from_json(const struct json_object *json, struct workspace *ws)
int name_as_int = workspace_name_as_int(name_as_string); int name_as_int = workspace_name_as_int(name_as_string);
*ws = (struct workspace) { *ws = (struct workspace) {
.id = json_object_get_int(id), .id = json_object_get_int64(id),
.name = strdup(name_as_string), .name = strdup(name_as_string),
.name_as_int = name_as_int, .name_as_int = name_as_int,
.persistent = false, .persistent = false,
@ -232,7 +232,7 @@ workspace_add(struct private *m, struct workspace ws)
} }
static void static void
workspace_del(struct private *m, int id) workspace_del(struct private *m, uint64_t id)
{ {
tll_foreach(m->workspaces, it) { tll_foreach(m->workspaces, it) {
struct workspace *ws = &it->item; struct workspace *ws = &it->item;
@ -247,7 +247,7 @@ workspace_del(struct private *m, int id)
} }
static struct workspace * static struct workspace *
workspace_lookup(struct private *m, int id) workspace_lookup(struct private *m, uint64_t id)
{ {
tll_foreach(m->workspaces, it) { tll_foreach(m->workspaces, it) {
struct workspace *ws = &it->item; struct workspace *ws = &it->item;
@ -305,7 +305,7 @@ workspace_update_or_add(struct private *m, const struct json_object *ws_json)
if (!json_object_object_get_ex(ws_json, "id", &_id)) if (!json_object_object_get_ex(ws_json, "id", &_id))
return false; return false;
const int id = json_object_get_int(_id); const uint64_t id = json_object_get_int64(_id);
struct workspace *already_exists = workspace_lookup(m, id); struct workspace *already_exists = workspace_lookup(m, id);
if (already_exists == NULL) { if (already_exists == NULL) {
@ -412,7 +412,7 @@ handle_workspace_event(int sock, int type, const struct json_object *json, void
return false; return false;
} }
int current_id = json_object_get_int(_current_id); uint64_t current_id = json_object_get_int64(_current_id);
mtx_lock(&mod->lock); mtx_lock(&mod->lock);
@ -461,7 +461,7 @@ handle_workspace_event(int sock, int type, const struct json_object *json, void
w->visible = true; w->visible = true;
/* Old workspace is no longer focused */ /* Old workspace is no longer focused */
int old_id = json_object_get_int(_old_id); uint64_t old_id = json_object_get_int64(_old_id);
struct workspace *old_w = workspace_lookup(m, old_id); struct workspace *old_w = workspace_lookup(m, old_id);
if (old_w != NULL) if (old_w != NULL)
old_w->focused = false; old_w->focused = false;
@ -607,7 +607,7 @@ handle_window_event(int sock, int type, const struct json_object *json, void *_m
return false; return false;
} }
if (is_title && ws->window.id != json_object_get_int(id)) { if (is_title && ws->window.id != json_object_get_int64(id)) {
/* Ignore title changed event if it's not current window */ /* Ignore title changed event if it's not current window */
mtx_unlock(&mod->lock); mtx_unlock(&mod->lock);
return true; return true;
@ -617,7 +617,7 @@ handle_window_event(int sock, int type, const struct json_object *json, void *_m
const char *title = json_object_get_string(name); const char *title = json_object_get_string(name);
ws->window.title = title != NULL ? strdup(title) : NULL; ws->window.title = title != NULL ? strdup(title) : NULL;
ws->window.id = json_object_get_int(id); ws->window.id = json_object_get_int64(id);
/* /*
* Sway only! * Sway only!
@ -641,9 +641,9 @@ handle_window_event(int sock, int type, const struct json_object *json, void *_m
/* If PID has changed, update application name from /proc/<pid>/comm */ /* If PID has changed, update application name from /proc/<pid>/comm */
else if (json_object_object_get_ex(container, "pid", &pid) && else if (json_object_object_get_ex(container, "pid", &pid) &&
ws->window.pid != json_object_get_int(pid)) ws->window.pid != json_object_get_int64(pid))
{ {
ws->window.pid = json_object_get_int(pid); ws->window.pid = json_object_get_int64(pid);
char path[64]; char path[64];
snprintf(path, sizeof(path), "/proc/%u/comm", ws->window.pid); snprintf(path, sizeof(path), "/proc/%u/comm", ws->window.pid);
@ -831,7 +831,7 @@ content(struct module *mod)
* template if this workspace doesn't have a specific * template if this workspace doesn't have a specific
* template */ * template */
if (ws->name == NULL) { if (ws->name == NULL) {
LOG_ERR("%d %d", ws->name_as_int, ws->id); LOG_ERR("%d %"PRIu64, ws->name_as_int, ws->id);
} }
template = ws_content_for_name(m, ws->name); template = ws_content_for_name(m, ws->name);
if (template == NULL) { if (template == NULL) {