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

Prevent capture and performance counter when idle 

Fixes #80
pull/154/head
Consolatis 2022-08-19 02:41:31 +02:00 committed by Andri Yngvason
parent 50aec16a5e
commit f3247ad933
1 changed files with 53 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main.c
View File

@ -99,10 +99,14 @@ struct wayvnc {
uint32_t n_frames_captured; uint32_t n_frames_captured;
bool disable_input; bool disable_input;
int nr_clients;
struct aml_ticker* performance_ticker;
}; };
void wayvnc_exit(struct wayvnc* self); void wayvnc_exit(struct wayvnc* self);
void on_capture_done(struct screencopy* sc); void on_capture_done(struct screencopy* sc);
static void on_client_new(struct nvnc_client* client);
#if defined(GIT_VERSION) #if defined(GIT_VERSION)
static const char wayvnc_version[] = GIT_VERSION; static const char wayvnc_version[] = GIT_VERSION;
@ -318,6 +322,9 @@ void wayvnc_destroy(struct wayvnc* self)
if (self->screencopy.manager) if (self->screencopy.manager)
zwlr_screencopy_manager_v1_destroy(self->screencopy.manager); zwlr_screencopy_manager_v1_destroy(self->screencopy.manager);
if (self->performance_ticker)
aml_unref(self->performance_ticker);
wl_registry_destroy(self->registry); wl_registry_destroy(self->registry);
wl_display_disconnect(self->display); wl_display_disconnect(self->display);
} }
@ -553,6 +560,8 @@ int init_nvnc(struct wayvnc* self, const char* addr, uint16_t port, bool is_unix
nvnc_set_key_code_fn(self->nvnc, on_key_code_event); nvnc_set_key_code_fn(self->nvnc, on_key_code_event);
} }
nvnc_set_new_client_fn(self->nvnc, on_client_new);
nvnc_set_cut_text_receive_fn(self->nvnc, on_client_cut_text); nvnc_set_cut_text_receive_fn(self->nvnc, on_client_cut_text);
struct nvnc_fb* placeholder_fb = struct nvnc_fb* placeholder_fb =
@ -770,13 +779,49 @@ static void on_perf_tick(void* obj)
static void start_performance_ticker(struct wayvnc* self) static void start_performance_ticker(struct wayvnc* self)
{ {
struct aml_ticker* ticker = aml_ticker_new(1000, on_perf_tick, self, if (!self->performance_ticker)
NULL);
if (!ticker)
return; return;
aml_start(aml_get_default(), ticker); aml_start(aml_get_default(), self->performance_ticker);
aml_unref(ticker); }
static void stop_performance_ticker(struct wayvnc* self)
{
if (!self->performance_ticker)
return;
aml_stop(aml_get_default(), self->performance_ticker);
}
static void on_client_cleanup(struct nvnc_client* client)
{
struct nvnc* nvnc = nvnc_client_get_server(client);
struct wayvnc* self = nvnc_get_userdata(nvnc);
self->nr_clients--;
nvnc_log(NVNC_LOG_DEBUG, "Client disconnected, new client count: %d",
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_client_new(struct nvnc_client* client)
{
struct nvnc* nvnc = nvnc_client_get_server(client);
struct wayvnc* self = nvnc_get_userdata(nvnc);
if (self->nr_clients == 0) {
nvnc_log(NVNC_LOG_INFO, "Starting screen capture");
start_performance_ticker(self);
wayvnc_start_capture_immediate(self);
}
self->nr_clients++;
nvnc_set_client_cleanup_fn(client, on_client_cleanup);
nvnc_log(NVNC_LOG_DEBUG, "Client connected, new client count: %d",
self->nr_clients);
} }
void parse_keyboard_option(struct wayvnc* self, char* arg) void parse_keyboard_option(struct wayvnc* self, char* arg)
@ -1061,13 +1106,11 @@ int main(int argc, char* argv[])
self.screencopy.overlay_cursor = overlay_cursor; self.screencopy.overlay_cursor = overlay_cursor;
if (wayvnc_start_capture(&self) < 0)
goto capture_failure;
if (show_performance) if (show_performance)
start_performance_ticker(&self); self.performance_ticker = aml_ticker_new(1000, on_perf_tick,
&self, NULL);
wl_display_dispatch(self.display); wl_display_dispatch_pending(self.display);
while (!self.do_exit) { while (!self.do_exit) {
wl_display_flush(self.display); wl_display_flush(self.display);