qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-12-02 00:52:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/ruamoko/rua_input.c

533 lines
13 KiB
C
Raw Normal View History

[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
/*
bi_input.c
CSQC file builtins
Copyright (C) 2021 Bill Currie <bill@taniwha.org>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdlib.h>
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
#include "QF/cmem.h"
#include "QF/hash.h"
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
#include "QF/input.h"
#include "QF/progs.h"
#include "rua_internal.h"
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
typedef struct rua_in_cookie_s {
size_t users;
progs_t *pr;
[gamecode] Rename func_t to pr_func_t Even more consistency.
2022-01-18 06:32:43 +00:00
pr_func_t func;
[gamecode] Clean up string_t and pointer_t They are both gone, and pr_pointer_t is now pr_ptr_t (pointer may be a little clearer than ptr, but ptr is consistent with things like intptr, and keeps the type name short).
2022-01-18 03:11:14 +00:00
pr_ptr_t data;
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
} rua_in_cookie_t;
typedef struct input_resources_s {
[hash] Rename the publicly visible hashlink_t to hashctx_t I think my biggest problem with the hashlink freelist parameter was how much implementation it exposed in just the name.
2022-05-12 08:54:23 +00:00
hashctx_t *hashctx;
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
hashtab_t *cookies;
memsuper_t *cookie_super;
} input_resources_t;
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_FindDeviceId (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
const char *id = P_GSTRING (pr, 0);
R_INT (pr) = IN_FindDeviceId (id);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_GetDeviceName (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
int devid = P_INT (pr, 0);
RETURN_STRING (pr, IN_GetDeviceName (devid));
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_GetDeviceId (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
int devid = P_INT (pr, 0);
RETURN_STRING (pr, IN_GetDeviceId (devid));
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_AxisInfo (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_ButtonInfo (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_GetAxisName (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
int devid = P_INT (pr, 0);
int axis = P_INT (pr, 1);
RETURN_STRING (pr, IN_GetAxisName (devid, axis));
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_GetButtonName (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
int devid = P_INT (pr, 0);
int button = P_INT (pr, 1);
RETURN_STRING (pr, IN_GetButtonName (devid, button));
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_GetAxisNumber (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
int devid = P_INT (pr, 0);
const char *axis_name = P_GSTRING (pr, 1);
R_INT (pr) = IN_GetAxisNumber (devid, axis_name);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_GetButtonNumber (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
int devid = P_INT (pr, 0);
const char *button_name = P_GSTRING (pr, 1);
R_INT (pr) = IN_GetButtonNumber (devid, button_name);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_ProcessEvents (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
IN_ProcessEvents ();
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_ClearStates (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
IN_ClearStates ();
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_CreateButton (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
const char *name = P_GSTRING (pr, 0);
const char *desc = P_GSTRING (pr, 1);
in_button_t *button = PR_Zone_Malloc (pr, sizeof (in_button_t));
button->name = name;
button->description = desc;
IN_RegisterButton (button);
RETURN_POINTER (pr, button);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_CreateAxis (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
const char *name = P_GSTRING (pr, 0);
const char *desc = P_GSTRING (pr, 1);
in_axis_t *axis = PR_Zone_Malloc (pr, sizeof (in_axis_t));
axis->name = name;
axis->description = desc;
IN_RegisterAxis (axis);
RETURN_POINTER (pr, axis);
}
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_GetAxisInfo (progs_t *pr, void *_res)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
int devid = P_INT (pr, 0);
int axis = P_INT (pr, 1);
R_INT (pr) = 0;
in_axisinfo_t info;
if (IN_GetAxisInfo (devid, axis, &info)) {
P_STRUCT (pr, in_axisinfo_t, 2) = info;
R_INT (pr) = 1;
}
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_GetButtonInfo (progs_t *pr, void *_res)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
int devid = P_INT (pr, 0);
int button = P_INT (pr, 1);
R_INT (pr) = 0;
in_buttoninfo_t info;
if (IN_GetButtonInfo (devid, button, &info)) {
P_STRUCT (pr, in_buttoninfo_t, 2) = info;
R_INT (pr) = 1;
}
}
[ruamoko] Merge listener cookie code I know that duplication would turn around and bite me :P
2021-12-23 02:22:32 +00:00
static rua_in_cookie_t *
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
make_cookie (progs_t *pr, input_resources_t *res, pr_func_t func, pr_ptr_t data)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
rua_in_cookie_t search = {
[ruamoko] Merge listener cookie code I know that duplication would turn around and bite me :P
2021-12-23 02:22:32 +00:00
.func = func,
.data = data,
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
};
rua_in_cookie_t *cookie = Hash_FindElement (res->cookies, &search);
[ruamoko] Merge listener cookie code I know that duplication would turn around and bite me :P
2021-12-23 02:22:32 +00:00
if (!cookie) {
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
cookie = cmemalloc (res->cookie_super, sizeof (rua_in_cookie_t));
*cookie = search;
[ruamoko] Get the input bindings working With some hacks that are not included (plan on handling events and contexts properly), button inputs, including using listeners, are working nicely: my little game is working again. While the trampoline code was a bit repetitive (and I do want to clean that up), connecting button listeners directly to Ruamoko instance methods proved to be quite nice.
2021-12-21 15:27:16 +00:00
cookie->pr = pr;
[ruamoko] Actually save the cooke This fixes the listener leak.
2021-12-23 02:23:39 +00:00
Hash_AddElement (res->cookies, cookie);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
}
cookie->users++;
[ruamoko] Merge listener cookie code I know that duplication would turn around and bite me :P
2021-12-23 02:22:32 +00:00
return cookie;
}
static rua_in_cookie_t *
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
find_cookie (progs_t *pr, input_resources_t *res, pr_func_t func, pr_ptr_t data)
[ruamoko] Merge listener cookie code I know that duplication would turn around and bite me :P
2021-12-23 02:22:32 +00:00
{
rua_in_cookie_t search = {
.func = func,
.data = data,
};
return Hash_FindElement (res->cookies, &search);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
release_cookie (progs_t *pr, input_resources_t *res, rua_in_cookie_t *cookie)
[ruamoko] Merge listener cookie code I know that duplication would turn around and bite me :P
2021-12-23 02:22:32 +00:00
{
if (!--cookie->users) {
Hash_DelElement (res->cookies, cookie);
Hash_Free (res->cookies, cookie);
}
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_add_axis_listener (progs_t *pr, input_resources_t *res,
axis_listener_t listener)
[ruamoko] Merge listener cookie code I know that duplication would turn around and bite me :P
2021-12-23 02:22:32 +00:00
{
in_axis_t *axis = &P_STRUCT (pr, in_axis_t, 0);
[gamecode] Rename func_t to pr_func_t Even more consistency.
2022-01-18 06:32:43 +00:00
pr_func_t func = P_FUNCTION (pr, 1);
pr_func_t data = P_POINTER (pr, 2);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_in_cookie_t *cookie = make_cookie (pr, res, func, data);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
IN_AxisAddListener (axis, listener, cookie);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_remove_axis_listener (progs_t *pr, input_resources_t *res,
axis_listener_t listener)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
in_axis_t *axis = &P_STRUCT (pr, in_axis_t, 0);
[gamecode] Rename func_t to pr_func_t Even more consistency.
2022-01-18 06:32:43 +00:00
pr_func_t func = P_FUNCTION (pr, 1);
pr_func_t data = P_POINTER (pr, 2);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_in_cookie_t *cookie = find_cookie (pr, res, func, data);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
if (cookie) {
IN_AxisRemoveListener (axis, listener, cookie);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
release_cookie (pr, res, cookie);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
}
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_add_button_listener (progs_t *pr, input_resources_t *res,
button_listener_t listener)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
in_button_t *button = &P_STRUCT (pr, in_button_t, 0);
[gamecode] Rename func_t to pr_func_t Even more consistency.
2022-01-18 06:32:43 +00:00
pr_func_t func = P_FUNCTION (pr, 1);
pr_func_t data = P_POINTER (pr, 2);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_in_cookie_t *cookie = make_cookie (pr, res, func, data);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
IN_ButtonAddListener (button, listener, cookie);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_remove_button_listener (progs_t *pr, input_resources_t *res,
button_listener_t listener)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
in_button_t *button = &P_STRUCT (pr, in_button_t, 0);
[gamecode] Rename func_t to pr_func_t Even more consistency.
2022-01-18 06:32:43 +00:00
pr_func_t func = P_FUNCTION (pr, 1);
pr_func_t data = P_POINTER (pr, 2);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_in_cookie_t *cookie = find_cookie (pr, res, func, data);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
if (cookie) {
IN_ButtonRemoveListener (button, listener, cookie);
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
release_cookie (pr, res, cookie);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
}
}
static void
rua_listener_func (rua_in_cookie_t *cookie, const void *input)
{
progs_t *pr = cookie->pr;
PR_PushFrame (pr);
[gamecode] Wrap most uses of PR_RESET_PARAMS with push/pop frame rua_obj was skipped because that looks to be a bit more work and should be a separate commit. This is to avoid the stack getting mangled when calling progs functions with parameters.
2022-02-05 01:24:02 +00:00
PR_RESET_PARAMS (pr);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
P_POINTER (pr, 0) = cookie->data;
P_POINTER (pr, 1) = PR_SetPointer (pr, input);//FIXME check input
pr->pr_argc = 2;
PR_ExecuteProgram (pr, cookie->func);
PR_PopFrame (pr);
}
static void
rua_listener_method (rua_in_cookie_t *cookie, const void *input)
{
progs_t *pr = cookie->pr;
PR_PushFrame (pr);
[ruamoko] Reset parameters before setting in listener It's right there in the docs, even (though only on the macro, which I'd forgotten about). Fixes some nasty corruption.
2021-12-23 02:17:51 +00:00
PR_RESET_PARAMS (pr);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
P_POINTER (pr, 0) = cookie->data;
P_POINTER (pr, 1) = 0; // don't know the method name (selector)
P_POINTER (pr, 2) = PR_SetPointer (pr, input);//FIXME check input
pr->pr_argc = 3;
PR_ExecuteProgram (pr, cookie->func);
PR_PopFrame (pr);
}
static void
rua_axis_listener_func (void *data, const in_axis_t *axis)
{
rua_listener_func (data, axis);
}
static void
rua_axis_listener_method (void *data, const in_axis_t *axis)
{
rua_listener_method (data, axis);
}
static void
rua_button_listener_func (void *data, const in_button_t *button)
{
rua_listener_func (data, button);
}
static void
rua_button_listener_method (void *data, const in_button_t *button)
{
rua_listener_method (data, button);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_IN_ButtonAddListener_func (progs_t *pr, void *_res)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
input_resources_t *res = _res;
rua_add_button_listener (pr, res, rua_button_listener_func);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_IN_ButtonRemoveListener_func (progs_t *pr, void *_res)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
input_resources_t *res = _res;
rua_remove_button_listener (pr, res, rua_button_listener_func);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_IN_AxisAddListener_func (progs_t *pr, void *_res)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
input_resources_t *res = _res;
rua_add_axis_listener (pr, res, rua_axis_listener_func);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_IN_AxisRemoveListener_func (progs_t *pr, void *_res)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
input_resources_t *res = _res;
rua_remove_axis_listener (pr, res, rua_axis_listener_func);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_IN_ButtonAddListener_method (progs_t *pr, void *_res)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
input_resources_t *res = _res;
rua_add_button_listener (pr, res, rua_button_listener_method);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_IN_ButtonRemoveListener_method (progs_t *pr, void *_res)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
input_resources_t *res = _res;
rua_remove_button_listener (pr, res, rua_button_listener_method);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_IN_AxisAddListener_method (progs_t *pr, void *_res)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
input_resources_t *res = _res;
rua_add_axis_listener (pr, res, rua_axis_listener_method);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
rua_IN_AxisRemoveListener_method (progs_t *pr, void *_res)
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
input_resources_t *res = _res;
rua_remove_axis_listener (pr, res, rua_axis_listener_method);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
}
[ruamoko] Get the input bindings working With some hacks that are not included (plan on handling events and contexts properly), button inputs, including using listeners, are working nicely: my little game is working again. While the trampoline code was a bit repetitive (and I do want to clean that up), connecting button listeners directly to Ruamoko instance methods proved to be quite nice.
2021-12-21 15:27:16 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IN_LoadConfig (progs_t *pr, void *_res)
[ruamoko] Get the input bindings working With some hacks that are not included (plan on handling events and contexts properly), button inputs, including using listeners, are working nicely: my little game is working again. While the trampoline code was a bit repetitive (and I do want to clean that up), connecting button listeners directly to Ruamoko instance methods proved to be quite nice.
2021-12-21 15:27:16 +00:00
{
IN_LoadConfig (Plist_GetItem (pr, P_INT (pr, 0)));
}
[ruamoko] Add bindings for the main IMT functions IMT_SetContextCbuf is not bound as that requires cbuf to be bound. However, imt contexts can be created, fetched and set.
2021-12-22 06:03:26 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IMT_CreateContext (progs_t *pr, void *_res)
[ruamoko] Add bindings for the main IMT functions IMT_SetContextCbuf is not bound as that requires cbuf to be bound. However, imt contexts can be created, fetched and set.
2021-12-22 06:03:26 +00:00
{
const char *name = P_GSTRING (pr, 0);
R_INT (pr) = IMT_CreateContext (name);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IMT_GetContext (progs_t *pr, void *_res)
[ruamoko] Add bindings for the main IMT functions IMT_SetContextCbuf is not bound as that requires cbuf to be bound. However, imt contexts can be created, fetched and set.
2021-12-22 06:03:26 +00:00
{
R_INT (pr) = IMT_GetContext ();
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_IMT_SetContext (progs_t *pr, void *_res)
[ruamoko] Add bindings for the main IMT functions IMT_SetContextCbuf is not bound as that requires cbuf to be bound. However, imt contexts can be created, fetched and set.
2021-12-22 06:03:26 +00:00
{
IMT_SetContext (P_INT (pr, 0));
}
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
secured (progs_t *pr, void *_res)
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{
PR_RunError (pr, "Secured function called");
}
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
#define p(type) PR_PARAM(type)
#define P(a, s) { .size = (s), .alignment = BITOP_LOG2 (a), }
#define bi(x,np,params...) {#x, secured, -1, np, {params}}
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
static builtin_t secure_builtins[] = {
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
bi(IN_CreateButton, 2, p(string), p(string)),
bi(IN_CreateAxis, 2, p(string), p(string)),
bi(IN_LoadConfig, 1, p(ptr)),
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{0}
};
#undef bi
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
#define bi(x,np,params...) {#x, bi_##x, -1, np, {params}}
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
static builtin_t insecure_builtins[] = {
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
bi(IN_CreateButton, 2, p(string), p(string)),
bi(IN_CreateAxis, 2, p(string), p(string)),
bi(IN_LoadConfig, 1, p(ptr)),
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{0}
};
static builtin_t builtins[] = {
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
bi(IN_FindDeviceId, 1, p(string)),
bi(IN_GetDeviceName, 1, p(int)),
bi(IN_GetDeviceId, 1, p(int)),
bi(IN_AxisInfo, 0), //FIXME
bi(IN_ButtonInfo, 0), //FIXME
bi(IN_GetAxisName, 2, p(int), p(int)),
bi(IN_GetButtonName, 2, p(int), p(int)),
bi(IN_GetAxisNumber, 2, p(int), p(string)),
bi(IN_GetButtonNumber, 2, p(int), p(string)),
bi(IN_ProcessEvents, 0),
bi(IN_ClearStates, 0),
bi(IN_GetAxisInfo, 3, p(int), p(int), p(ptr)),
bi(IN_GetButtonInfo, 3, p(int), p(int), p(ptr)),
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{"IN_ButtonAddListener|^{tag in_button_s=}^(v^v^{tag in_button_s=})^v",
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
rua_IN_ButtonAddListener_func, -1, 3, {p(ptr), p(func), p(ptr)}},
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{"IN_ButtonRemoveListener|^{tag in_button_s=}^(v^v^{tag in_button_s=})^v",
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
rua_IN_ButtonRemoveListener_func, -1, 3, {p(ptr), p(func), p(ptr)}},
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{"IN_AxisAddListener|^{tag in_axis_s=}^(v^v^{tag in_axis_s=})^v",
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
rua_IN_AxisAddListener_func, -1, 3, {p(ptr), p(func), p(ptr)}},
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{"IN_AxisRemoveListener|^{tag in_axis_s=}^(v^v^{tag in_axis_s=})^v",
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
rua_IN_AxisRemoveListener_func, -1, 3, {p(ptr), p(func), p(ptr)}},
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{"IN_ButtonAddListener|^{tag in_button_s=}(@@:.)@",
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
rua_IN_ButtonAddListener_method, -1, 3, {p(ptr), p(func), p(ptr)}},
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{"IN_ButtonRemoveListener|^{tag in_button_s=}(@@:.)@",
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
rua_IN_ButtonRemoveListener_method, -1, 3, {p(ptr), p(func), p(ptr)}},
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{"IN_AxisAddListener|^{tag in_axis_s=}(@@:.)@",
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
rua_IN_AxisAddListener_method, -1, 3, {p(ptr), p(func), p(ptr)}},
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
{"IN_AxisRemoveListener|^{tag in_axis_s=}(@@:.)@",
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
rua_IN_AxisRemoveListener_method, -1, 3, {p(ptr), p(func), p(ptr)}},
[ruamoko] Add bindings for the main IMT functions IMT_SetContextCbuf is not bound as that requires cbuf to be bound. However, imt contexts can be created, fetched and set.
2021-12-22 06:03:26 +00:00
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
bi(IMT_CreateContext, 1, p(string)),
bi(IMT_GetContext, 0),
bi(IMT_SetContext, 1, p(int)),
[ruamoko] Add bindings for the main IMT functions IMT_SetContextCbuf is not bound as that requires cbuf to be bound. However, imt contexts can be created, fetched and set.
2021-12-22 06:03:26 +00:00
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
{0}
};
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
static void
bi_input_clear (progs_t *pr, void *_res)
{
input_resources_t *res = _res;
Hash_FlushTable (res->cookies);
}
[gamecode] Add PR_Shutdown for tearing down a VM This is meant for a "permanent" tear-down before freeing the memory holding the VM state or at program shutdown. As a consequence, builtin sub-systems registering resources are now required to pass a "destroy" function pointer that will be called just before the memory holding those resources is freed by the VM resource manager (ie, the manager owns the resource memory block, but each subsystem is responsible for cleaning up any resources held within that block). This even enhances thread-safety in rua_obj (there are some problems with cmd, cvar, and gib).
2022-05-12 09:23:32 +00:00
static void
bi_input_destroy (progs_t *pr, void *_res)
{
input_resources_t *res = _res;
Hash_DelTable (res->cookies);
delete_memsuper (res->cookie_super);
[gamecode] Make modules responsible for freeing resources It should have been this way all along, and it seems I thought they were when I did rua_gui.c as it already freed its resource block, which would have been a double free (oops). Fixes an invalid write when shutting down progs in qwaq-cmd (relevant change not committed).
2023-03-03 10:36:28 +00:00
free (res);
[gamecode] Add PR_Shutdown for tearing down a VM This is meant for a "permanent" tear-down before freeing the memory holding the VM state or at program shutdown. As a consequence, builtin sub-systems registering resources are now required to pass a "destroy" function pointer that will be called just before the memory holding those resources is freed by the VM resource manager (ie, the manager owns the resource memory block, but each subsystem is responsible for cleaning up any resources held within that block). This even enhances thread-safety in rua_obj (there are some problems with cmd, cvar, and gib).
2022-05-12 09:23:32 +00:00
}
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
static uintptr_t
rua_in_hash_cookie (const void *_cookie, void *_res)
{
const rua_in_cookie_t *cookie = _cookie;
return cookie->func + cookie->data;
}
static int
rua_in_cmp_cookies (const void *_a, const void *_b, void *_res)
{
const rua_in_cookie_t *a = _a;
const rua_in_cookie_t *b = _b;
return a->func == b->func && a->data == b->data;
}
static void
rua_in_free_cookie (void *_cookie, void *_res)
{
input_resources_t *res = _res;
rua_in_cookie_t *cookie = _cookie;
cmemfree (res->cookie_super, cookie);
}
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
void
RUA_Input_Init (progs_t *pr, int secure)
{
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
input_resources_t *res = calloc (sizeof (input_resources_t), 1);
res->cookie_super = new_memsuper ();
[ruamoko] Plug yet more memory leaks Some of them, especially in rua_obj, were quite legitimate and even a problem for thread-safety (rua_cmd is currently not thread-safe, but it needs a lock, which I don't feel like doing at this stage).
2023-03-05 08:20:04 +00:00
res->cookies = Hash_NewTable (251, 0, rua_in_free_cookie, res, pr->hashctx);
[ruamoko] Make some progress on the input bindings
2021-12-21 08:45:48 +00:00
Hash_SetHashCompare (res->cookies, rua_in_hash_cookie, rua_in_cmp_cookies);
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
[gamecode] Add PR_Shutdown for tearing down a VM This is meant for a "permanent" tear-down before freeing the memory holding the VM state or at program shutdown. As a consequence, builtin sub-systems registering resources are now required to pass a "destroy" function pointer that will be called just before the memory holding those resources is freed by the VM resource manager (ie, the manager owns the resource memory block, but each subsystem is responsible for cleaning up any resources held within that block). This even enhances thread-safety in rua_obj (there are some problems with cmd, cvar, and gib).
2022-05-12 09:23:32 +00:00
PR_Resources_Register (pr, "input", res, bi_input_clear, bi_input_destroy);
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
if (secure & 2) {
[gamecode] Add a data pointer passed to builtin functions This is part of the work for #26 (Record resource pointer with builtin function data). Currently, the data pointer gets as far as the per-instance VM function table (I don't feel like tackling the job of converting all the builtin functions tonight). All the builtin modules that register a resources data block pass that block on to PR_RegisterBuiltins.
2022-01-23 15:20:05 +00:00
PR_RegisterBuiltins (pr, secure_builtins, res);
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
} else {
[gamecode] Add a data pointer passed to builtin functions This is part of the work for #26 (Record resource pointer with builtin function data). Currently, the data pointer gets as far as the per-instance VM function table (I don't feel like tackling the job of converting all the builtin functions tonight). All the builtin modules that register a resources data block pass that block on to PR_RegisterBuiltins.
2022-01-23 15:20:05 +00:00
PR_RegisterBuiltins (pr, insecure_builtins, res);
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
}
[gamecode] Add a data pointer passed to builtin functions This is part of the work for #26 (Record resource pointer with builtin function data). Currently, the data pointer gets as far as the per-instance VM function table (I don't feel like tackling the job of converting all the builtin functions tonight). All the builtin modules that register a resources data block pass that block on to PR_RegisterBuiltins.
2022-01-23 15:20:05 +00:00
PR_RegisterBuiltins (pr, builtins, res);
[ruamoko] Replace rua_key with rua_input And create rua_game to coordinate other game builtins. Menus are broken for key handling, but have been since the input rewrite anyway. rua_input adds the ability to create buttons and axes (but not destroy them). More work needs to be done to flesh things out, though.
2021-12-20 15:47:13 +00:00
}
Reference in a new issue Copy permalink