qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-29 15:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/video/targets/context_sdl.c

72 lines
1.4 KiB
C
Raw Normal View History

Merging common SDL video code into context_sdl.c, to make adding SDL features easier.
2002-08-21 00:05:27 +00:00
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
re-arrange things so __attribute__ and __builtin_expect are properly autoconfiscated so rcsid will continue to work with gcc 3.3
2003-01-15 15:31:36 +00:00
Merging common SDL video code into context_sdl.c, to make adding SDL features easier.
2002-08-21 00:05:27 +00:00
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <stdlib.h>
#include <SDL.h>
#include "QF/cvar.h"
Add return value checking for in_grab. Also some dead code removal, dangling comment and white space cleanup.
2003-02-13 19:03:48 +00:00
#include "QF/input.h"
nuke Con_Printf and Con_DPrintf and use Sys_* instead
2007-11-06 10:17:14 +00:00
#include "QF/sys.h"
Merging common SDL video code into context_sdl.c, to make adding SDL features easier.
2002-08-21 00:05:27 +00:00
#include "QF/va.h"
#include "QF/vid.h"
make gcc more anal about prototypes, string constants and function visibility (ie, global functions must have a prototype)
2003-01-06 18:28:13 +00:00
#include "context_sdl.h"
Make a bit of progress cleaning up vid for plugins.
2012-02-17 07:13:56 +00:00
#include "vid_internal.h"
make gcc more anal about prototypes, string constants and function visibility (ie, global functions must have a prototype)
2003-01-06 18:28:13 +00:00
Merging common SDL video code into context_sdl.c, to make adding SDL features easier.
2002-08-21 00:05:27 +00:00
void
VID_SDL_GammaCheck (void)
{
Uint16 redtable[256], greentable[256], bluetable[256];
if (SDL_GetGammaRamp(redtable, greentable, bluetable) < 0)
vid_gamma_avail = false;
else
vid_gamma_avail = true;
}
void
VID_SetCaption (const char *text)
{
if (text && *text) {
char *temp = strdup (text);
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
SDL_WM_SetCaption (va (0, "%s: %s", PACKAGE_STRING, temp), NULL);
Merging common SDL video code into context_sdl.c, to make adding SDL features easier.
2002-08-21 00:05:27 +00:00
free (temp);
} else {
[util] Make va thread-safe It now takes a context pointer (opaque data) that holds the buffers it uses for the temporary strings. If the context pointer is null, a static context is used (making those uses of va NOT thread-safe). Most calls to va use the static context, but all such calls have been formatted consistently so they are easy to find when it comes time to do a full audit.
2021-01-31 07:01:20 +00:00
SDL_WM_SetCaption (va (0, "%s", PACKAGE_STRING), NULL);
Merging common SDL video code into context_sdl.c, to make adding SDL features easier.
2002-08-21 00:05:27 +00:00
}
}
Nuke qboolean from orbit I never liked it, but with C2x coming out, it's best to handle bools properly. I haven't gone through all the uses of int as bool (I'll leave that for fixing when I encounter them), but this gets QF working with both c2x (really, gnu2x because of raw strings).
2023-06-13 09:06:11 +00:00
bool
Merging common SDL video code into context_sdl.c, to make adding SDL features easier.
2002-08-21 00:05:27 +00:00
VID_SetGamma (double gamma)
{
Massive whitespace cleanup. Lots of trailing whitespace and otherwise blank lines.
2012-05-21 23:23:22 +00:00
return SDL_SetGamma((float) gamma, (float) gamma, (float) gamma);
Merging common SDL video code into context_sdl.c, to make adding SDL features easier.
2002-08-21 00:05:27 +00:00
}
make gcc more anal about prototypes, string constants and function visibility (ie, global functions must have a prototype)
2003-01-06 18:28:13 +00:00
static void
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
VID_UpdateFullscreen (void *data, const cvar_t *cvar)
Merging common SDL video code into context_sdl.c, to make adding SDL features easier.
2002-08-21 00:05:27 +00:00
{
Remove viddef in favor of vid in the renderers. This fixes the status bar refresh issues in sw. The problem was that with two viddef's hanging around, things got a little confused and recalc_refdef wasn't getting into the renderer.
2013-01-16 02:23:47 +00:00
if (!r_data || !viddef.initialized)
Merging common SDL video code into context_sdl.c, to make adding SDL features easier.
2002-08-21 00:05:27 +00:00
return;
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
if ((cvar && !(sdl_screen->flags & SDL_FULLSCREEN))
|| (!cvar && sdl_screen->flags & SDL_FULLSCREEN))
Separate render and presentation initialization This paves the way for clean initialization of the Vulkan renderer, and very much cleans up the older renderer initialization code as gl and sw are no longer intertwined.
2019-07-08 16:00:47 +00:00
if (!SDL_WM_ToggleFullScreen (sdl_screen))
nuke Con_Printf and Con_DPrintf and use Sys_* instead
2007-11-06 10:17:14 +00:00
Sys_Printf ("VID_UpdateFullscreen: error setting fullscreen\n");
Move a test inside function, rather than repeated all over the place.
2003-02-25 06:04:42 +00:00
IN_UpdateGrab (in_grab);
Merging common SDL video code into context_sdl.c, to make adding SDL features easier.
2002-08-21 00:05:27 +00:00
}
void
Fix gl and glsl support in sdl.
2012-04-12 07:47:37 +00:00
SDL_Init_Cvars (void)
Merging common SDL video code into context_sdl.c, to make adding SDL features easier.
2002-08-21 00:05:27 +00:00
{
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
Cvar_Register (&vid_fullscreen_cvar, VID_UpdateFullscreen, 0);
Cvar_Register (&vid_system_gamma_cvar, 0, 0);
Merging common SDL video code into context_sdl.c, to make adding SDL features easier.
2002-08-21 00:05:27 +00:00
}
Reference in a new issue Copy permalink