RPJosh
/
wayvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: Use 1 client cleanup function

pull/261/head
Andri Yngvason 2023-09-03 18:25:59 +00:00
parent 945f5909d5
commit 8ed08d6f33
1 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/main.c
View File

@ -1036,6 +1036,30 @@ static struct wayvnc_client* client_create(struct wayvnc* wayvnc,
static void client_destroy(void* obj) static void client_destroy(void* obj)
{ {
struct wayvnc_client* self = obj; struct wayvnc_client* self = obj;
struct nvnc* nvnc = nvnc_client_get_server(self->nvnc_client);
struct wayvnc* wayvnc = nvnc_get_userdata(nvnc);
if (self->seat)
self->seat->occupancy--;
wayvnc->nr_clients--;
nvnc_log(NVNC_LOG_DEBUG, "Client disconnected, new client count: %d",
wayvnc->nr_clients);
struct ctl_server_client_info info = {
.id = self->id,
.hostname = nvnc_client_get_hostname(self->nvnc_client),
.username = nvnc_client_get_auth_username(self->nvnc_client),
.seat = self->seat->name,
};
ctl_server_event_disconnected(wayvnc->ctl, &info, wayvnc->nr_clients);
if (wayvnc->nr_clients == 0) {
nvnc_log(NVNC_LOG_INFO, "Stopping screen capture");
screencopy_stop(&wayvnc->screencopy);
stop_performance_ticker(wayvnc);
}
if (self->keyboard.virtual_keyboard) { if (self->keyboard.virtual_keyboard) {
zwp_virtual_keyboard_v1_destroy( zwp_virtual_keyboard_v1_destroy(
@ -1052,35 +1076,6 @@ static void client_destroy(void* obj)
free(self); free(self);
} }
static void on_nvnc_client_cleanup(struct nvnc_client* client)
{
struct wayvnc_client* wayvnc_client = nvnc_get_userdata(client);
struct nvnc* nvnc = nvnc_client_get_server(client);
struct wayvnc* self = nvnc_get_userdata(nvnc);
if (wayvnc_client->seat)
wayvnc_client->seat->occupancy--;
self->nr_clients--;
nvnc_log(NVNC_LOG_DEBUG, "Client disconnected, new client count: %d",
self->nr_clients);
struct ctl_server_client_info info = {
.id = wayvnc_client->id,
.hostname = nvnc_client_get_hostname(client),
.username = nvnc_client_get_auth_username(client),
.seat = wayvnc_client->seat->name,
};
ctl_server_event_disconnected(self->ctl, &info, self->nr_clients);
if (self->nr_clients == 0) {
nvnc_log(NVNC_LOG_INFO, "Stopping screen capture");
screencopy_stop(&self->screencopy);
stop_performance_ticker(self);
}
}
static void on_nvnc_client_new(struct nvnc_client* client) static void on_nvnc_client_new(struct nvnc_client* client)
{ {
struct nvnc* nvnc = nvnc_client_get_server(client); struct nvnc* nvnc = nvnc_client_get_server(client);
@ -1096,7 +1091,6 @@ static void on_nvnc_client_new(struct nvnc_client* client)
wayvnc_start_capture_immediate(self); wayvnc_start_capture_immediate(self);
} }
self->nr_clients++; self->nr_clients++;
nvnc_set_client_cleanup_fn(client, on_nvnc_client_cleanup);
nvnc_log(NVNC_LOG_DEBUG, "Client connected, new client count: %d", nvnc_log(NVNC_LOG_DEBUG, "Client connected, new client count: %d",
self->nr_clients); self->nr_clients);