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

Refactor output selection code 

Signed-off-by: Jim Ramsay <i.am@jimramsay.com>
pull/175/head
Jim Ramsay 2022-10-06 20:57:45 -04:00 committed by Andri Yngvason
parent 49ecbe14fa
commit a1aa69625c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.c
View File

@ -884,6 +884,14 @@ void log_selected_output(struct wayvnc* self)
} }
} }
void set_selected_output(struct wayvnc* self, struct output* output) {
self->selected_output = output;
self->screencopy.wl_output = output->wl_output;
output->on_dimension_change = on_output_dimension_change;
output->userdata = self;
log_selected_output(self);
}
static int log_level_from_string(const char* str) static int log_level_from_string(const char* str)
{ {
if (0 == strcmp(str, "quiet")) return NVNC_LOG_PANIC; if (0 == strcmp(str, "quiet")) return NVNC_LOG_PANIC;
@ -1061,6 +1069,7 @@ int main(int argc, char* argv[])
goto failure; goto failure;
} }
} }
set_selected_output(&self, out);
struct seat* seat = NULL; struct seat* seat = NULL;
if (seat_name) { if (seat_name) {
@ -1077,12 +1086,9 @@ int main(int argc, char* argv[])
} }
} }
self.selected_output = out;
self.selected_seat = seat; self.selected_seat = seat;
self.screencopy.wl_output = out->wl_output;
self.screencopy.rate_limit = max_rate; self.screencopy.rate_limit = max_rate;
self.screencopy.enable_linux_dmabuf = enable_gpu_features; self.screencopy.enable_linux_dmabuf = enable_gpu_features;
log_selected_output(&self);
if (self.keyboard_manager) { if (self.keyboard_manager) {
self.keyboard_backend.virtual_keyboard = self.keyboard_backend.virtual_keyboard =
@ -1107,9 +1113,6 @@ int main(int argc, char* argv[])
setup_pointer(&self); setup_pointer(&self);
out->on_dimension_change = on_output_dimension_change;
out->userdata = &self;
#ifdef ENABLE_SCREENCOPY_DMABUF #ifdef ENABLE_SCREENCOPY_DMABUF
if (init_render_node(&drm_fd) < 0) { if (init_render_node(&drm_fd) < 0) {
nvnc_log(NVNC_LOG_ERROR, "Failed to initialise DRM render node. No GPU acceleration will be available."); nvnc_log(NVNC_LOG_ERROR, "Failed to initialise DRM render node. No GPU acceleration will be available.");