|
|
|
|
#ifndef _SWAY_LIST_H
|
|
|
|
|
#define _SWAY_LIST_H
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
|
int capacity;
|
|
|
|
|
int length;
|
|
|
|
|
void **items;
|
|
|
|
|
} list_t;
|
|
|
|
|
|
|
|
|
|
list_t *create_list(void);
|
|
|
|
|
void list_free(list_t *list);
|
|
|
|
|
void list_foreach(list_t *list, void (*callback)(void* item));
|
|
|
|
|
void list_add(list_t *list, void *item);
|
|
|
|
|
void list_insert(list_t *list, int index, void *item);
|
|
|
|
|
void list_del(list_t *list, int index);
|
|
|
|
|
void list_cat(list_t *list, list_t *source);
|
replace non-standard qsort_r with qsort
I've tried to make as few changes, as possible.
Usually the reason for using qsort_r is, that you can pass an extra userdata pointer to the
compare function. However, in sway list_sort wrapped qsort_r and always called a wrapper
function for comparing, the wrapper function then had the real compare function as argument.
The only thing, that the wrapper function does, is dereferencing the 'left' and 'right' function
arguments before passing them to the real compare function.
I have renamed list_sort to list_qsort to avoid confusion (so nobody tries to use list_qsort like
list_sort) and removed the wrapper functionality. Now the dereferencing must be done in the
compare function, that gets passed.
Some compare functions were used in both list_sort and list_seq_find. To make the difference
clear, I've added a '_qsort' suffix to the compare functions, that are intended to be used with
the new list_qsort. (In other words: list_qsort is not compatible anymore with list_seq_find).
- Changed and renamed function (it isn't used anywhere but in commands.c, and only for sorting):
compare_set -> compare_set_qsort
- New wrapper functions:
sway_binding_cmp_qsort (for sway_binding_cmp)
sway_mouse_binding_cmp_qsort (for sway_mouse_binding_cmp)
9 years ago
|
|
|
// See qsort. Remember to use *_qsort functions as compare functions,
|
|
|
|
|
// because they dereference the left and right arguments first!
|
|
|
|
|
void list_qsort(list_t *list, int compare(const void *left, const void *right));
|
|
|
|
|
// Return index for first item in list that returns 0 for given compare
|
|
|
|
|
// function or -1 if none matches.
|
|
|
|
|
int list_seq_find(list_t *list, int compare(const void *item, const void *cmp_to), const void *cmp_to);
|
Use list_find in more places and refactor/fix workspace prev_next functions
The original purpose of this commit is to replace some for loops with
list_find. But while doing this I found the workspace_prev_next_impl
functions to be difficult to read and also contained a bug, so I
refactored them and fixed the bug.
To reproduce the bug:
* Have two outputs, where the left output has workspaces 1, 2, 3 and the
right output has workspaces 4, 5, 6. Make workspace 2 focused_inactive
and workspace 4 focused.
* Run `workspace prev`.
* Previously it would visit the left output, then apply `workspace prev`
to workspace 2, which focuses workspace 1.
* Now it will focus the rightmost workspace on the left output
(workspace 3).
The refactoring I made to the workspace functions are:
* Added the static keyword.
* They now accept an int dir rather than bool, to avoid an unnecessary
conversion.
* Rather than preparing start and end variables for the purpose of
iterating, just iterate everything.
* Replace for loops with list_find.
* Don't call workspace_output_prev_next_impl (this fixes the bug).
6 years ago
|
|
|
int list_find(list_t *list, const void *item);
|
|
|
|
|
// stable sort since qsort is not guaranteed to be stable
|
|
|
|
|
void list_stable_sort(list_t *list, int compare(const void *a, const void *b));
|
|
|
|
|
// swap two elements in a list
|
|
|
|
|
void list_swap(list_t *list, int src, int dest);
|
|
|
|
|
// move item to end of list
|
|
|
|
|
void list_move_to_end(list_t *list, void *item);
|
|
|
|
|
#endif
|
