mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-29 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed to used list_getp

Browse source
This commit is contained in:
Scott Anderson 2017-05-13 13:52:45 +12:00
parent a4eeedfa34
commit 508200e83d
38 changed files with 249 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

22
swaybar/bar.c
View file

@ -68,7 +68,7 @@ static void mouse_button_notify(struct window *window, int x, int y,
struct output *clicked_output = NULL;
for (size_t i = 0; i < swaybar.outputs->length; i++) {
struct output *output = *(struct output **)list_get(swaybar.outputs, i);
struct output *output = list_getp(swaybar.outputs, i);
if (window == output->window) {
clicked_output = output;
break;
@ -81,7 +81,7 @@ static void mouse_button_notify(struct window *window, int x, int y,
double button_x = 0.5;
for (size_t i = 0; i < clicked_output->workspaces->length; i++) {
struct workspace *workspace = *(struct workspace **)list_get(clicked_output->workspaces, i);
struct workspace *workspace = list_getp(clicked_output->workspaces, i);
int button_width, button_height;
workspace_button_size(window, workspace->name, &button_width, &button_height);
@ -102,7 +102,7 @@ static void mouse_scroll_notify(struct window *window, enum scroll_direction dir
// Find output this window lives on
struct output *output = NULL;
for (i = 0; i < swaybar.outputs->length; ++i) {
output = *(struct output **)list_get(swaybar.outputs, i);
output = list_getp(swaybar.outputs, i);
if (output->window == window) {
break;
}
@ -112,7 +112,7 @@ static void mouse_scroll_notify(struct window *window, enum scroll_direction dir
}
int focused = -1;
for (i = 0; i < output->workspaces->length; ++i) {
struct workspace *ws = *(struct workspace **)list_get(output->workspaces, i);
struct workspace *ws = list_getp(output->workspaces, i);
if (ws->focused) {
focused = i;
break;
@ -143,7 +143,7 @@ void bar_setup(struct bar *bar, const char *socket_path, const char *bar_id) {
ipc_bar_init(bar, bar_id);
for (size_t i = 0; i < bar->outputs->length; ++i) {
struct output *bar_output = *(struct output **)list_get(bar->outputs, i);
struct output *bar_output = list_getp(bar->outputs, i);
bar_output->registry = registry_poll();
@ -151,7 +151,7 @@ void bar_setup(struct bar *bar, const char *socket_path, const char *bar_id) {
sway_abort("swaybar requires the compositor to support the desktop-shell extension.");
}
struct output_state *output = *(struct output_state **)list_get(bar_output->registry->outputs, bar_output->idx);
struct output_state *output = list_getp(bar_output->registry->outputs, bar_output->idx);
bar_output->window = window_setup(bar_output->registry,
output->width / output->scale, 30, output->scale, false);
@ -190,7 +190,7 @@ void bar_run(struct bar *bar) {
pfd[1].events = POLLIN;
for (size_t i = 0; i < bar->outputs->length; ++i) {
struct output *output = *(struct output **)list_get(bar->outputs, i);
struct output *output = list_getp(bar->outputs, i);
pfd[i+2].fd = wl_display_get_fd(output->registry->display);
pfd[i+2].events = POLLIN;
}
@ -198,7 +198,7 @@ void bar_run(struct bar *bar) {
while (1) {
if (dirty) {
for (size_t i = 0; i < bar->outputs->length; ++i) {
struct output *output = *(struct output **)list_get(bar->outputs, i);
struct output *output = list_getp(bar->outputs, i);
if (window_prerender(output->window) && output->window->cairo) {
render(output, bar->config, bar->status);
window_render(output->window);
@ -223,7 +223,7 @@ void bar_run(struct bar *bar) {
// dispatch wl_display events
for (size_t i = 0; i < bar->outputs->length; ++i) {
struct output *output = *(struct output **)list_get(bar->outputs, i);
struct output *output = list_getp(bar->outputs, i);
if (pfd[i+2].revents & POLLIN) {
if (wl_display_dispatch(output->registry->display) == -1) {
sway_log(L_ERROR, "failed to dispatch wl: %d", errno);
@ -237,7 +237,7 @@ void bar_run(struct bar *bar) {
void free_workspaces(list_t *workspaces) {
for (size_t i = 0; i < workspaces->length; ++i) {
struct workspace *ws = *(struct workspace **)list_get(workspaces, i);
struct workspace *ws = list_getp(workspaces, i);
free(ws->name);
free(ws);
}
@ -261,7 +261,7 @@ static void free_output(struct output *output) {
static void free_outputs(list_t *outputs) {
for (size_t i = 0; i < outputs->length; ++i) {
struct output *item = *(struct output **)list_get(outputs, i);
struct output *item = list_getp(outputs, i);
free_output(item);
}
list_free(outputs);

8
swaybar/ipc.c
View file

@ -85,7 +85,7 @@ static void ipc_parse_config(struct config *config, const char *payload) {
// free previous outputs list
for (size_t i = 0; i < config->outputs->length; ++i) {
free(*(char **)list_get(config->outputs, i));
free(list_getp(config->outputs, i));
}
list_free(config->outputs);
config->outputs = list_new(sizeof(char *), 0);
@ -215,7 +215,7 @@ static void ipc_parse_config(struct config *config, const char *payload) {
static void ipc_update_workspaces(struct bar *bar) {
for (size_t i = 0; i < bar->outputs->length; ++i) {
struct output *output = *(struct output **)list_get(bar->outputs, i);
struct output *output = list_getp(bar->outputs, i);
if (output->workspaces) {
free_workspaces(output->workspaces);
}
@ -244,7 +244,7 @@ static void ipc_update_workspaces(struct bar *bar) {
json_object_object_get_ex(ws_json, "urgent", &urgent);
for (size_t j = 0; j < bar->outputs->length; ++j) {
struct output *output = *(struct output **)list_get(bar->outputs, j);
struct output *output = list_getp(bar->outputs, j);
if (strcmp(json_object_get_string(out), output->name) == 0) {
struct workspace *ws = malloc(sizeof(struct workspace));
ws->num = json_object_get_int(num);
@ -300,7 +300,7 @@ void ipc_bar_init(struct bar *bar, const char *bar_id) {
use_output = true;
} else {
for (size_t j = 0; j < bar->config->outputs->length; ++j) {
const char *conf_name = *(char **)list_get(bar->config->outputs, j);
const char *conf_name = list_getp(bar->config->outputs, j);
if (strcasecmp(name, conf_name) == 0) {
use_output = true;
break;

4
swaybar/render.c
View file

@ -315,7 +315,7 @@ void render(struct output *output, struct config *config, struct status_line *li
double pos = (window->width * window->scale) - 0.5;
bool edge = true;
for (ssize_t i = line->block_line->length - 1; i >= 0; --i) {
struct status_block *block = *(struct status_block **)list_get(line->block_line, i);
struct status_block *block = list_getp(line->block_line, i);
if (block->full_text && block->full_text[0]) {
render_block(window, config, block, &pos, edge, is_focused);
edge = false;
@ -329,7 +329,7 @@ void render(struct output *output, struct config *config, struct status_line *li
// Workspaces
if (config->workspace_buttons) {
for (size_t i = 0; i < output->workspaces->length; ++i) {
struct workspace *ws = *(struct workspace **)list_get(output->workspaces, i);
struct workspace *ws = list_getp(output->workspaces, i);
render_workspace_button(window, config, ws, &x);
}
}

4
swaybar/status_line.c
View file

@ -64,7 +64,7 @@ static void parse_json(struct bar *bar, const char *text) {
if (bar->status->block_line) {
//list_foreach(bar->status->block_line, free_status_block);
for (size_t i = 0; i < bar->status->block_line->length; ++i) {
struct status_block *item = *(struct status_block **)list_get(bar->status->block_line, i);
struct status_block *item = list_getp(bar->status->block_line, i);
free_status_block(item);
}
list_free(bar->status->block_line);
@ -453,7 +453,7 @@ void free_status_line(struct status_line *line) {
if (line->block_line) {
//list_foreach(line->block_line, free_status_block);
for (size_t i = 0; i < line->block_line->length; ++i) {
struct status_block *item = *(struct status_block **)list_get(line->block_line, i);
struct status_block *item = list_getp(line->block_line, i);
free_status_block(item);
}
list_free(line->block_line);