Skip to content

configure idle time and debug protocol from .wslgconfig #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hideyuki Nagase (hideyukn88) merged 1 commit into from
Apr 29, 2021
Merged

configure idle time and debug protocol from .wslgconfig #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions compositor/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3148,11 +3148,13 @@ wet_main(int argc, char *argv[])
char *log_scopes_env = NULL;
char *flight_rec_scopes = NULL;
char *server_socket = NULL;
char *idle_time_env = NULL;
int32_t idle_time = -1;
int32_t help = 0;
char *socket_name = NULL;
int32_t version = 0;
int32_t noconfig = 0;
char *debug_protocol_env = NULL;
int32_t debug_protocol = 0;
bool numlock_on;
char *config_file = NULL;
Expand Down Expand Up @@ -3325,6 +3327,10 @@ wet_main(int argc, char *argv[])
protologger = wl_display_add_protocol_logger(display,
protocol_log_fn,
NULL);

debug_protocol_env = getenv("WESTON_DEBUG_PROTOCOL");
if (debug_protocol_env && (strcmp(debug_protocol_env, "true") == 0))
debug_protocol = 1;
if (debug_protocol)
weston_compositor_enable_debug_protocol(wet.compositor);

Expand All @@ -3347,6 +3353,9 @@ wet_main(int argc, char *argv[])
if (wet.init_failed)
goto out;

idle_time_env = getenv("WESTON_IDLE_TIME");
if (!idle_time_env || !safe_strtoint(idle_time_env, &idle_time))
idle_time = -1;
if (idle_time < 0)
weston_config_section_get_int(section, "idle-time", &idle_time, -1);
if (idle_time < 0)
Expand Down