Miroirs/awesome
1
0
Fork 0
mirror of https://github.com/awesomeWM/awesome synced 2024-11-17 07:47:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add a screen checker.

Browse source 
A client cannot be used any more after it was unmanaged. Similarly, Lua
shouldn't be allowed to e.g. assign a client to a screen that was removed. This
commit adds such a checker which "breaks" all screens which are not in the
global screen list.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2016-04-16 14:49:09 +02:00
parent b651373cda
commit 080609f6ec
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
objects/screen.c
View file

@ -183,6 +183,13 @@ screen_wipe(screen_t *s)
screen_output_array_wipe(&s->outputs); screen_output_array_wipe(&s->outputs);
} }
/** Check if a screen is valid */
static bool
screen_checker(screen_t *s)
{
return s->valid;
}
/** Get a screen argument from the lua stack */ /** Get a screen argument from the lua stack */
screen_t * screen_t *
luaA_checkscreen(lua_State *L, int sidx) luaA_checkscreen(lua_State *L, int sidx)
@ -455,6 +462,7 @@ screen_scan(void)
assert(globalconf.screens.len > 0); assert(globalconf.screens.len > 0);
foreach(screen, globalconf.screens) { foreach(screen, globalconf.screens) {
(*screen)->valid = true;
luaA_object_push(L, *screen); luaA_object_push(L, *screen);
luaA_object_emit_signal(L, -1, "added", 0); luaA_object_emit_signal(L, -1, "added", 0);
lua_pop(L, 1); lua_pop(L, 1);
@ -486,6 +494,7 @@ screen_refresh(void)
found |= (*new_screen)->xid == (*old_screen)->xid; found |= (*new_screen)->xid == (*old_screen)->xid;
if(!found) { if(!found) {
screen_array_append(&globalconf.screens, *new_screen); screen_array_append(&globalconf.screens, *new_screen);
(*new_screen)->valid = true;
luaA_object_push(L, *new_screen); luaA_object_push(L, *new_screen);
luaA_object_emit_signal(L, -1, "added", 0); luaA_object_emit_signal(L, -1, "added", 0);
/* Get an extra reference since both new_screens and /* Get an extra reference since both new_screens and
@ -506,6 +515,7 @@ screen_refresh(void)
lua_pop(L, 1); lua_pop(L, 1);
screen_array_take(&globalconf.screens, i); screen_array_take(&globalconf.screens, i);
luaA_object_unref(L, old_screen); luaA_object_unref(L, old_screen);
old_screen->valid = false;
i--; i--;
} }
@ -933,7 +943,7 @@ screen_class_setup(lua_State *L)
luaA_class_setup(L, &screen_class, "screen", NULL, luaA_class_setup(L, &screen_class, "screen", NULL,
(lua_class_allocator_t) screen_new, (lua_class_allocator_t) screen_new,
(lua_class_collector_t) screen_wipe, (lua_class_collector_t) screen_wipe,
NULL, (lua_class_checker_t) screen_checker,
luaA_class_index_miss_property, luaA_class_newindex_miss_property, luaA_class_index_miss_property, luaA_class_newindex_miss_property,
screen_methods, screen_meta); screen_methods, screen_meta);
luaA_class_add_property(&screen_class, "geometry", luaA_class_add_property(&screen_class, "geometry",

2
objects/screen.h
View file

@ -33,6 +33,8 @@ ARRAY_TYPE(screen_output_t, screen_output)
struct a_screen struct a_screen
{ {
LUA_OBJECT_HEADER LUA_OBJECT_HEADER
/** Is this screen still valid and may be used? */
bool valid;
/** Screen geometry */ /** Screen geometry */
area_t geometry; area_t geometry;
/** The screen outputs informations */ /** The screen outputs informations */