From 59faadcf82e90b099fad4ac9a8ba9d67e4b3851a Mon Sep 17 00:00:00 2001 From: bjornstahl Date: Fri, 13 Oct 2023 11:00:04 +0200 Subject: [PATCH] (build) unbreak master from 277a229 Accidentally included partial changes from another branch poking at the possible interface for arcan-net <-> arcan <-> lua netapi --- src/engine/arcan_frameserver.h | 1 + src/engine/arcan_monitor.c | 5 +++++ src/engine/arcan_monitor.h | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/src/engine/arcan_frameserver.h b/src/engine/arcan_frameserver.h index e68d4cbc7..c7362250b 100644 --- a/src/engine/arcan_frameserver.h +++ b/src/engine/arcan_frameserver.h @@ -174,6 +174,7 @@ struct arcan_frameserver { bool external : 1; bool networked : 1; bool sandboxed : 1; + bool wrapped : 1; /* tristate: 0 (default) empty, 1 (preroll-ok), 2 (preroll-lock) */ int activated; diff --git a/src/engine/arcan_monitor.c b/src/engine/arcan_monitor.c index 1f46fa656..65248ecce 100644 --- a/src/engine/arcan_monitor.c +++ b/src/engine/arcan_monitor.c @@ -259,3 +259,8 @@ void arcan_monitor_tick() m_ctr = m_srate; arcan_lua_statesnap(m_out, buf, true); } + +arcan_vobj_id arcan_monitor_fsrvvid(intptr_t ref) +{ + return ARCAN_EID; +} diff --git a/src/engine/arcan_monitor.h b/src/engine/arcan_monitor.h index 97b3d3574..3ac6a66bd 100644 --- a/src/engine/arcan_monitor.h +++ b/src/engine/arcan_monitor.h @@ -48,4 +48,10 @@ void arcan_monitor_tick(); */ void arcan_monitor_finish(bool ok); +/* + * get a vobj id bound to ref handler for mapping the monitor connection + * to the net api + */ +arcan_vobj_id arcan_monitor_fsrvvid(intptr_t ref); + #endif