Rename remaining refs to wlr_list
This commit is contained in:
parent
d3f0878d71
commit
169b68b17c
|
@ -9,7 +9,7 @@
|
|||
#include <wlr/backend/session.h>
|
||||
#include <wlr/backend/interface.h>
|
||||
#include <wlr/interfaces/wlr_output.h>
|
||||
#include <wlr/util/list.h>
|
||||
#include <wlr/types/wlr_list.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include <wlr/egl.h>
|
||||
#include "backend/drm/drm.h"
|
||||
|
|
|
@ -99,7 +99,7 @@ static void wlr_libinput_backend_destroy(struct wlr_backend *_backend) {
|
|||
}
|
||||
struct wlr_libinput_backend *backend = (struct wlr_libinput_backend *)_backend;
|
||||
for (size_t i = 0; i < backend->wlr_device_lists->length; i++) {
|
||||
list_t *wlr_devices = backend->wlr_device_lists->items[i];
|
||||
struct wlr_list *wlr_devices = backend->wlr_device_lists->items[i];
|
||||
for (size_t j = 0; j < wlr_devices->length; j++) {
|
||||
struct wlr_input_device *wlr_dev = wlr_devices->items[j];
|
||||
wl_signal_emit(&backend->backend.events.input_remove, wlr_dev);
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include <wlr/xcursor.h>
|
||||
#include <wlr/types/wlr_cursor.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include <wlr/util/list.h>
|
||||
#include <wlr/types/wlr_list.h>
|
||||
#include "shared.h"
|
||||
#include "config.h"
|
||||
#include "cat.h"
|
||||
|
@ -46,7 +46,7 @@ struct sample_state {
|
|||
struct wl_listener touch_up;
|
||||
struct wl_listener touch_down;
|
||||
struct wl_listener touch_cancel;
|
||||
list_t *touch_points;
|
||||
struct wlr_list *touch_points;
|
||||
|
||||
struct wl_listener tablet_tool_axis;
|
||||
struct wl_listener tablet_tool_proxmity;
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include <wlr/render.h>
|
||||
#include <wlr/backend.h>
|
||||
#include <wlr/backend/session.h>
|
||||
#include <wlr/util/list.h>
|
||||
#include <wlr/types/wlr_list.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include "shared.h"
|
||||
#include "cat.h"
|
||||
|
@ -24,7 +24,7 @@
|
|||
struct sample_state {
|
||||
struct wlr_renderer *renderer;
|
||||
struct wlr_texture *cat_texture;
|
||||
list_t *touch_points;
|
||||
struct wlr_list *touch_points;
|
||||
};
|
||||
|
||||
struct touch_point {
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include <wlr/types/wlr_input_device.h>
|
||||
#include <wlr/backend/interface.h>
|
||||
#include <wlr/interfaces/wlr_input_device.h>
|
||||
#include <wlr/util/list.h>
|
||||
#include <wlr/types/wlr_list.h>
|
||||
|
||||
struct wlr_libinput_backend {
|
||||
struct wlr_backend backend;
|
||||
|
@ -18,7 +18,7 @@ struct wlr_libinput_backend {
|
|||
|
||||
struct wl_listener session_signal;
|
||||
|
||||
list_t *wlr_device_lists;
|
||||
struct wlr_list *wlr_device_lists;
|
||||
};
|
||||
|
||||
struct wlr_libinput_input_device {
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <wlr/types/wlr_xdg_shell_v6.h>
|
||||
#include <wlr/types/wlr_gamma_control.h>
|
||||
#include <wlr/types/wlr_screenshooter.h>
|
||||
#include <wlr/util/list.h>
|
||||
#include <wlr/types/wlr_list.h>
|
||||
#include "rootston/view.h"
|
||||
#include "rootston/config.h"
|
||||
|
||||
|
@ -22,7 +22,7 @@ struct roots_output {
|
|||
};
|
||||
|
||||
struct roots_desktop {
|
||||
list_t *views;
|
||||
struct wlr_list *views;
|
||||
|
||||
struct wl_list outputs;
|
||||
struct timespec last_frame;
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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);
|
||||
|
|
@ -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;
|
||||
|
|
|
@ -1,15 +1,20 @@
|
|||
lib_wlr_types = static_library(
|
||||
'wlr_types',
|
||||
files(
|
||||
'wlr_box.c',
|
||||
'wlr_compositor.c',
|
||||
'wlr_cursor.c',
|
||||
'wlr_data_device_manager.c',
|
||||
'wlr_data_source.c',
|
||||
'wlr_gamma_control.c',
|
||||
'wlr_input_device.c',
|
||||
'wlr_keyboard.c',
|
||||
'wlr_list.c',
|
||||
'wlr_output.c',
|
||||
'wlr_output_layout.c',
|
||||
'wlr_pointer.c',
|
||||
'wlr_cursor.c',
|
||||
'wlr_region.c',
|
||||
'wlr_screenshooter.c',
|
||||
'wlr_seat.c',
|
||||
'wlr_surface.c',
|
||||
'wlr_tablet_pad.c',
|
||||
|
@ -17,10 +22,6 @@ lib_wlr_types = static_library(
|
|||
'wlr_touch.c',
|
||||
'wlr_xdg_shell_v6.c',
|
||||
'wlr_wl_shell.c',
|
||||
'wlr_compositor.c',
|
||||
'wlr_box.c',
|
||||
'wlr_gamma_control.c',
|
||||
'wlr_screenshooter.c',
|
||||
),
|
||||
include_directories: wlr_inc,
|
||||
dependencies: [wayland_server, pixman, wlr_protos],
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <wayland-server.h>
|
||||
#include <wlr/util/list.h>
|
||||
#include <wlr/types/wlr_list.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include <wlr/types/wlr_data_source.h>
|
||||
#include <wlr/types/wlr_data_device_manager.h>
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include <stddef.h>
|
||||
#include <wlr/util/list.h>
|
||||
#include <wlr/types/wlr_list.h>
|
||||
|
||||
list_t *list_create(void) {
|
||||
list_t *list = malloc(sizeof(list_t));
|
||||
struct wlr_list *list_create(void) {
|
||||
struct wlr_list *list = malloc(sizeof(struct wlr_list));
|
||||
if (!list) {
|
||||
return NULL;
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ list_t *list_create(void) {
|
|||
return list;
|
||||
}
|
||||
|
||||
static bool list_resize(list_t *list) {
|
||||
static bool list_resize(struct wlr_list *list) {
|
||||
if (list->length == list->capacity) {
|
||||
void *new_items = realloc(list->items, sizeof(void*) * (list->capacity + 10));
|
||||
if (!new_items) {
|
||||
|
@ -32,7 +32,7 @@ static bool list_resize(list_t *list) {
|
|||
return true;
|
||||
}
|
||||
|
||||
void list_free(list_t *list) {
|
||||
void list_free(struct wlr_list *list) {
|
||||
if (list == NULL) {
|
||||
return;
|
||||
}
|
||||
|
@ -40,7 +40,7 @@ void list_free(list_t *list) {
|
|||
free(list);
|
||||
}
|
||||
|
||||
void list_foreach(list_t *list, void (*callback)(void *item)) {
|
||||
void list_foreach(struct wlr_list *list, void (*callback)(void *item)) {
|
||||
if (list == NULL || callback == NULL) {
|
||||
return;
|
||||
}
|
||||
|
@ -49,7 +49,7 @@ void list_foreach(list_t *list, void (*callback)(void *item)) {
|
|||
}
|
||||
}
|
||||
|
||||
int list_add(list_t *list, void *item) {
|
||||
int list_add(struct wlr_list *list, void *item) {
|
||||
if (!list_resize(list)) {
|
||||
return -1;
|
||||
}
|
||||
|
@ -57,11 +57,11 @@ int list_add(list_t *list, void *item) {
|
|||
return list->length;
|
||||
}
|
||||
|
||||
int list_push(list_t *list, void *item) {
|
||||
int list_push(struct wlr_list *list, void *item) {
|
||||
return list_add(list, item);
|
||||
}
|
||||
|
||||
int list_insert(list_t *list, size_t index, void *item) {
|
||||
int list_insert(struct wlr_list *list, size_t index, void *item) {
|
||||
if (!list_resize(list)) {
|
||||
return -1;
|
||||
}
|
||||
|
@ -71,22 +71,22 @@ int list_insert(list_t *list, size_t index, void *item) {
|
|||
return list->length;
|
||||
}
|
||||
|
||||
void list_del(list_t *list, size_t index) {
|
||||
void list_del(struct wlr_list *list, size_t index) {
|
||||
list->length--;
|
||||
memmove(&list->items[index], &list->items[index + 1], sizeof(void*) * (list->length - index));
|
||||
}
|
||||
|
||||
void *list_pop(list_t *list) {
|
||||
void *list_pop(struct wlr_list *list) {
|
||||
void *_ = list->items[list->length - 1];
|
||||
list_del(list, list->length - 1);
|
||||
return _;
|
||||
}
|
||||
|
||||
void *list_peek(list_t *list) {
|
||||
void *list_peek(struct wlr_list *list) {
|
||||
return list->items[list->length - 1];
|
||||
}
|
||||
|
||||
int list_cat(list_t *list, list_t *source) {
|
||||
int list_cat(struct wlr_list *list, struct wlr_list *source) {
|
||||
size_t old_len = list->length;
|
||||
size_t i;
|
||||
for (i = 0; i < source->length; ++i) {
|
||||
|
@ -98,11 +98,11 @@ int list_cat(list_t *list, list_t *source) {
|
|||
return list->length;
|
||||
}
|
||||
|
||||
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)) {
|
||||
qsort(list->items, list->length, sizeof(void *), compare);
|
||||
}
|
||||
|
||||
int list_seq_find(list_t *list,
|
||||
int list_seq_find(struct wlr_list *list,
|
||||
int compare(const void *item, const void *data),
|
||||
const void *data) {
|
||||
for (size_t i = 0; i < list->length; i++) {
|
|
@ -8,7 +8,7 @@
|
|||
#include <wlr/types/wlr_output.h>
|
||||
#include <wlr/types/wlr_surface.h>
|
||||
#include <wlr/interfaces/wlr_output.h>
|
||||
#include <wlr/util/list.h>
|
||||
#include <wlr/types/wlr_list.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include <GLES2/gl2.h>
|
||||
#include <wlr/render/matrix.h>
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
lib_wlr_util = static_library(
|
||||
'wlr_util',
|
||||
files(
|
||||
'list.c',
|
||||
'log.c',
|
||||
),
|
||||
include_directories: wlr_inc,
|
||||
|
|
Loading…
Reference in New Issue