arti/dulcepan
1
0
Fork 0
mirror of https://codeberg.org/vyivel/dulcepan/ synced 2025-03-12 10:49:15 +02:00
Code Issues Releases Activity

output,seat: name => global_name

Browse Source
This commit is contained in:
Kirill Primak 2024-06-24 16:32:47 +03:00
parent 8a9a5689c4
commit 29c6ebf48c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dulcepan.h
View File

@ -28,7 +28,7 @@ struct dp_buffer {
struct dp_output { struct dp_output {
struct dp_state *state; struct dp_state *state;
uint32_t name; uint32_t global_name;
struct wl_output *wl_output; struct wl_output *wl_output;
struct wl_surface *main_surface; struct wl_surface *main_surface;
@ -71,7 +71,7 @@ struct dp_output {
struct dp_seat { struct dp_seat {
struct dp_state *state; struct dp_state *state;
uint32_t name; uint32_t global_name;
struct wl_seat *wl_seat; struct wl_seat *wl_seat;
struct wl_keyboard *keyboard; struct wl_keyboard *keyboard;

4
src/main.c
View File

@ -51,14 +51,14 @@ static void registry_handle_global_remove(void *data, struct wl_registry *regist
struct dp_output *output; struct dp_output *output;
wl_list_for_each (output, &state->outputs, link) { wl_list_for_each (output, &state->outputs, link) {
if (output->name == name) { if (output->global_name == name) {
dp_log_fatal("An output was removed"); dp_log_fatal("An output was removed");
} }
} }
struct dp_seat *seat; struct dp_seat *seat;
wl_list_for_each (seat, &state->seats, link) { wl_list_for_each (seat, &state->seats, link) {
if (seat->name == name) { if (seat->global_name == name) {
dp_seat_destroy(seat); dp_seat_destroy(seat);
return; return;
} }

2
src/output.c
View File

@ -320,7 +320,7 @@ void dp_output_hide_surface(struct dp_output *output) {
void dp_output_create(struct dp_state *state, uint32_t name, struct wl_output *wl_output) { void dp_output_create(struct dp_state *state, uint32_t name, struct wl_output *wl_output) {
struct dp_output *output = dp_zalloc(sizeof(*output)); struct dp_output *output = dp_zalloc(sizeof(*output));
output->state = state; output->state = state;
output->name = name; output->global_name = name;
output->wl_output = wl_output; output->wl_output = wl_output;
wl_output_add_listener(output->wl_output, &output_listener, output); wl_output_add_listener(output->wl_output, &output_listener, output);

2
src/seat.c
View File

@ -238,7 +238,7 @@ static const struct wl_seat_listener seat_listener = {
void dp_seat_create(struct dp_state *state, uint32_t name, struct wl_seat *wl_seat) { void dp_seat_create(struct dp_state *state, uint32_t name, struct wl_seat *wl_seat) {
struct dp_seat *seat = dp_zalloc(sizeof(*seat)); struct dp_seat *seat = dp_zalloc(sizeof(*seat));
seat->state = state; seat->state = state;
seat->name = name; seat->global_name = name;
seat->wl_seat = wl_seat; seat->wl_seat = wl_seat;
seat->xkb_keymap = seat->xkb_keymap =