Rename remaining refs to wlr_list

This commit is contained in:
Drew DeVault 2017-10-21 22:00:04 -04:00
parent d3f0878d71
commit 169b68b17c
14 changed files with 51 additions and 51 deletions

View file

@ -2,13 +2,13 @@
#define WLR_TYPES_WLR_DATA_SOURCE_H
#include <wayland-server.h>
#include <wlr/util/list.h>
#include <wlr/types/wlr_list.h>
struct wlr_data_source_impl;
struct wlr_data_source {
struct wlr_data_source_impl *impl;
list_t *types;
struct wlr_list *types;
void *data;
struct {

View file

@ -3,57 +3,57 @@
#include <stddef.h>
typedef struct {
struct wlr_list {
size_t capacity;
size_t length;
void **items;
} list_t;
};
/**
* Creates a new list, may return `NULL` on failure
*/
list_t *list_create(void);
void list_free(list_t *list);
void list_foreach(list_t *list, void (*callback)(void *item));
struct wlr_list *list_create(void);
void list_free(struct wlr_list *list);
void list_foreach(struct wlr_list *list, void (*callback)(void *item));
/**
* Add `item` to the end of a list.
* Returns: new list length or `-1` on failure
*/
int list_add(list_t *list, void *item);
int list_add(struct wlr_list *list, void *item);
/**
* Add `item` to the end of a list.
* Returns: new list length or `-1` on failure
*/
int list_push(list_t *list, void *item);
int list_push(struct wlr_list *list, void *item);
/**
* Place `item` into index `index` in the list
* Returns: new list length or `-1` on failure
*/
int list_insert(list_t *list, size_t index, void *item);
int list_insert(struct wlr_list *list, size_t index, void *item);
/**
* Remove an item from the list
*/
void list_del(list_t *list, size_t index);
void list_del(struct wlr_list *list, size_t index);
/**
* Remove and return an item from the end of the list
*/
void *list_pop(list_t *list);
void *list_pop(struct wlr_list *list);
/**
* Get a reference to the last item of a list without removal
*/
void *list_peek(list_t *list);
void *list_peek(struct wlr_list *list);
/**
* Append each item in `source` to `list`
* Does not modify `source`
* Returns: new list length or `-1` on failure
*/
int list_cat(list_t *list, list_t *source);
int list_cat(struct wlr_list *list, struct wlr_list *source);
// 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));
void list_qsort(struct wlr_list *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 list_seq_find(struct wlr_list *list,
int compare(const void *item, const void *cmp_to),
const void *cmp_to);

View file

@ -5,7 +5,7 @@
#include <stdbool.h>
#include <wlr/types/wlr_compositor.h>
#include <xcb/xcb.h>
#include <wlr/util/list.h>
#include <wlr/types/wlr_list.h>
#ifdef HAS_XCB_ICCCM
#include <xcb/xcb_icccm.h>
@ -79,7 +79,7 @@ struct wlr_xwayland_surface {
char *class;
char *instance;
struct wlr_xwayland_surface *parent;
list_t *state; // list of xcb_atom_t
struct wlr_list *state; // list of xcb_atom_t
pid_t pid;
xcb_atom_t *window_type;