Commit 771b7cfc authored by Pekka Paalanen's avatar Pekka Paalanen Committed by Daniel Stone

compositor: add option to enable weston_debug

Let users enable the compositor debug protocol on the compositor command
line. This allows weston-debug tool to work.
Signed-off-by: Pekka Paalanen's avatarPekka Paalanen <>
Signed-off-by: default avatarManiraj Devadoss <>
Reviewed-by: Pekka Paalanen's avatarPekka Paalanen <>
parent a5630eaf
......@@ -60,6 +60,7 @@
#include "compositor-x11.h"
#include "compositor-wayland.h"
#include "windowed-output-api.h"
#include "weston-debug.h"
#define WINDOW_TITLE "Weston Compositor"
......@@ -508,6 +509,7 @@ usage(int error_code)
" -c, --config=FILE\tConfig file to load, defaults to weston.ini\n"
" --no-config\t\tDo not read weston.ini\n"
" --wait-for-debugger\tRaise SIGSTOP on start-up\n"
" --debug\t\tEnable debug extension\n"
" -h, --help\t\tThis help message\n\n");
......@@ -2375,6 +2377,7 @@ int main(int argc, char *argv[])
char *socket_name = NULL;
int32_t version = 0;
int32_t noconfig = 0;
int32_t debug_protocol = 0;
int32_t numlock_on;
char *config_file = NULL;
struct weston_config *config = NULL;
......@@ -2399,6 +2402,7 @@ int main(int argc, char *argv[])
{ WESTON_OPTION_BOOLEAN, "no-config", 0, &noconfig },
{ WESTON_OPTION_STRING, "config", 'c', &config_file },
{ WESTON_OPTION_BOOLEAN, "wait-for-debugger", 0, &wait_for_debugger },
{ WESTON_OPTION_BOOLEAN, "debug", 0, &debug_protocol },
......@@ -2486,6 +2490,9 @@ int main(int argc, char *argv[])
segv_compositor = wet.compositor;
if (debug_protocol)
if (weston_compositor_init_config(wet.compositor, config) < 0)
goto out;
......@@ -133,6 +133,17 @@ If also
.B --no-config
is given, no configuration file will be read.
.BR \-\-debug
Enable debug protocol extension
.I weston_debug_v1
which any client can use to receive debugging messages from the compositor.
This is risky for two reasons. First, a client may cause a denial-of-service
blocking the compositor by providing an unsuitable file descriptor, and
second, the debug messages may expose sensitive information. This option
should not be used in production.
.BR \-\-version
Print the program version.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment