From f6cc35cecc5b373ac0b84f8e148d8b94678af38e Mon Sep 17 00:00:00 2001 From: Emmanuel Lepage Vallee Date: Sat, 15 Jun 2019 01:14:27 -0400 Subject: [PATCH] screen: Disable screen creation when --screen manual is used. Now that the previous commits add a proper fallback and a way to test this, enable the second half. As long as the default screen mode (`--screen auto`) *or* the `rc.lua` doesn't execute too much code in the global context, this wont break much. --- awesome.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/awesome.c b/awesome.c index cc3c0b412..d2ba6fedd 100644 --- a/awesome.c +++ b/awesome.c @@ -912,8 +912,14 @@ main(int argc, char **argv) ewmh_init_lua(); /* Parse and run configuration file before adding the screens */ - if (globalconf.no_auto_screen && !luaA_parserc(&xdg, confpath)) - fatal("couldn't find any rc file"); + if (globalconf.no_auto_screen) + { + /* Disable automatic screen creation, awful.screen has a fallback */ + globalconf.ignore_screens = true; + + if(!luaA_parserc(&xdg, confpath)) + fatal("couldn't find any rc file"); + } /* init screens information */ screen_scan();