qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-19 15:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qwaq] Move builtin printf to main.c

Browse source 
and add traceon/traceoff defs (that don't need PF_Cmds). This lets
gcd.dat load in the second progs thread.
This commit is contained in:
Bill Currie 2020-03-25 00:41:14 +09:00
parent 0ad9f559ea
commit 48c65b3363
2 changed files with 42 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
ruamoko/qwaq/main.c
View file

@ -203,9 +203,6 @@ spawn_progs (qwaq_thread_t *thread, progsinit_f *funcs)
Sys_Error ("couldn't load %s", name); Sys_Error ("couldn't load %s", name);
} }
//pr->pr_trace = 1;
//pr->pr_trace_depth = -1;
PR_PushFrame (pr); PR_PushFrame (pr);
if (thread->args.size > 2) { if (thread->args.size > 2) {
pr_argc = thread->args.size - 1; pr_argc = thread->args.size - 1;
@ -323,16 +320,57 @@ done:
return qargs_ind; return qargs_ind;
} }
static void
bi_printf (progs_t *pr)
{
const char *fmt = P_GSTRING (pr, 0);
int count = pr->pr_argc - 1;
pr_type_t **args = pr->pr_params + 1;
dstring_t *dstr = dstring_new ();
PR_Sprintf (pr, dstr, "bi_printf", fmt, count, args);
if (dstr->str)
Sys_Printf (dstr->str, stdout);
dstring_delete (dstr);
}
static void
bi_traceon (progs_t *pr)
{
pr->pr_trace = true;
pr->pr_trace_depth = pr->pr_depth;
}
static void
bi_traceoff (progs_t *pr)
{
pr->pr_trace = false;
}
static builtin_t common_builtins[] = {
{"printf", bi_printf, -1},
{"traceon", bi_traceon, -1},
{"traceoff", bi_traceoff, -1},
{},
};
static void
common_builtins_init (progs_t *pr)
{
PR_RegisterBuiltins (pr, common_builtins);
}
static progsinit_f main_app[] = { static progsinit_f main_app[] = {
Key_Progs_Init, Key_Progs_Init,
PR_Cmds_Init,
BI_Init, BI_Init,
common_builtins_init,
QWAQ_EditBuffer_Init, QWAQ_EditBuffer_Init,
QWAQ_Debug_Init, QWAQ_Debug_Init,
0 0
}; };
static progsinit_f target_app[] = { static progsinit_f target_app[] = {
common_builtins_init,
QWAQ_DebugTarget_Init, QWAQ_DebugTarget_Init,
0 0
}; };

16
ruamoko/qwaq/qwaq-curses.c
View file

@ -1544,20 +1544,6 @@ bi_initialize (progs_t *pr)
create_thread (qwaq_curses_thread, res); create_thread (qwaq_curses_thread, res);
} }
static void
bi_printf (progs_t *pr)
{
const char *fmt = P_GSTRING (pr, 0);
int count = pr->pr_argc - 1;
pr_type_t **args = pr->pr_params + 1;
dstring_t *dstr = dstring_new ();
PR_Sprintf (pr, dstr, "bi_printf", fmt, count, args);
if (dstr->str)
Sys_Printf (dstr->str, stdout);
dstring_delete (dstr);
}
static void static void
bi_c_TextContext__is_initialized (progs_t *pr) bi_c_TextContext__is_initialized (progs_t *pr)
{ {
@ -1824,8 +1810,6 @@ static builtin_t builtins[] = {
{"wresize", bi_wresize, -1}, {"wresize", bi_wresize, -1},
{"resizeterm", bi_resizeterm, -1}, {"resizeterm", bi_resizeterm, -1},
{"printf", bi_printf, -1},
{"_c_TextContext__is_initialized", bi_c_TextContext__is_initialized, -1}, {"_c_TextContext__is_initialized", bi_c_TextContext__is_initialized, -1},
{"_c_TextContext__max_colors", bi_c_TextContext__max_colors, -1}, {"_c_TextContext__max_colors", bi_c_TextContext__max_colors, -1},
{"_c_TextContext__max_color_pairs", bi_c_TextContext__max_color_pairs, -1}, {"_c_TextContext__max_color_pairs", bi_c_TextContext__max_color_pairs, -1},