Public_Skunkworks/roo_e
Public_Skunkworks/roo_e
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Progress on SDL2 backend. Very broken.

Browse source
This commit is contained in:
Scott Duensing 2022-05-26 21:22:38 -05:00
parent e807f883b4
commit e6c514b0ea
10 changed files with 749 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
client/client.pro
View file

@ -4,8 +4,8 @@ CONFIG -= qt
CONFIG -= console CONFIG -= console
CONFIG += c99 CONFIG += c99
CONFIG += BACKEND_GRX #CONFIG += BACKEND_GRX
#CONFIG += BACKEND_SDL2 CONFIG += BACKEND_SDL2
#CONFIG += BACKEND_DJGPP #CONFIG += BACKEND_DJGPP
SHARED = $$PWD/../shared SHARED = $$PWD/../shared
@ -57,9 +57,12 @@ BACKEND_GRX {
BACKEND_SDL2 { BACKEND_SDL2 {
DEFINES += BACKEND_SDL2 DEFINES += BACKEND_SDL2
LIBS += \
-lSDL2 \
-lSDL2_image
} }
BACKEND_DJGPP BACKEND_DJGPP {
DEFINES += BACKEND_DJGPP DEFINES += BACKEND_DJGPP
} }

37
client/client.pro.user
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 5.0.2, 2022-05-12T20:34:53. --> <!-- Written by QtCreator 5.0.2, 2022-05-25T17:14:18. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
@ -56,6 +56,35 @@
<value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value> <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
</valuemap> </valuemap>
</data> </data>
<data>
<variable>ProjectExplorer.Project.PluginSettings</variable>
<valuemap type="QVariantMap">
<valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
<value type="bool" key="AutoTest.Framework.Boost">true</value>
<value type="bool" key="AutoTest.Framework.CTest">false</value>
<value type="bool" key="AutoTest.Framework.Catch">true</value>
<value type="bool" key="AutoTest.Framework.GTest">true</value>
<value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
<value type="bool" key="AutoTest.Framework.QtTest">true</value>
</valuemap>
<valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
<value type="int" key="AutoTest.RunAfterBuild">0</value>
<value type="bool" key="AutoTest.UseGlobal">true</value>
<valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
<value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
<value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.BuildSystem</value>
<valuemap type="QVariantMap" key="ClangTools">
<value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
<value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
<value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
<value type="int" key="ClangTools.ParallelJobs">4</value>
<valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
<valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
<valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
<value type="bool" key="ClangTools.UseGlobalSettings">true</value>
</valuemap>
</valuemap>
</data>
<data> <data>
<variable>ProjectExplorer.Project.Target.0</variable> <variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap"> <valuemap type="QVariantMap">
@ -206,12 +235,14 @@
<valuelist type="QVariantList" key="CustomOutputParsers"/> <valuelist type="QVariantList" key="CustomOutputParsers"/>
<value type="int" key="PE.EnvironmentAspect.Base">2</value> <value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/scott/code/gui/client/client.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value> <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/home/scott/code/gui/client/client.pro</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value> <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/scott/code/gui/build-client-Desktop_Qt_5_15_0_GCC_64bit-Debug/bin</value>
</valuemap> </valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap> </valuemap>

7
client/src/gui/gui.c
View file

@ -62,24 +62,21 @@ void guiShutdown(void) {
hmfree(_widgetCatalog); hmfree(_widgetCatalog);
wmShutdown(); wmShutdown();
mouseShutdown();
videoSurfaceDestroy(_mousePointer); videoSurfaceDestroy(_mousePointer);
videoSurfaceDestroy(__guiBackBuffer); videoSurfaceDestroy(__guiBackBuffer);
videoShutdown(); platformShutdown();
} }
void guiStartup(int16_t width, int16_t height, int16_t depth) { void guiStartup(int16_t width, int16_t height, int16_t depth) {
videoStartup(width, height, depth); platformStartup(width, height, depth);
__guiScreenBuffer = videoSurfaceScreenGet(); __guiScreenBuffer = videoSurfaceScreenGet();
__guiBackBuffer = videoSurfaceCreate(videoDisplayWidthGet(), videoDisplayHeightGet()); __guiBackBuffer = videoSurfaceCreate(videoDisplayWidthGet(), videoDisplayHeightGet());
mouseStartup();
_mousePointer = imageLoad("mouse.png"); _mousePointer = imageLoad("mouse.png");
_mouseTransparency = videoSurfacePixelGet(_mousePointer, videoSurfaceWidthGet(_mousePointer) - 2, 0); // Find our transparency color. _mouseTransparency = videoSurfacePixelGet(_mousePointer, videoSurfaceWidthGet(_mousePointer) - 2, 0); // Find our transparency color.

121
client/src/platform/djgpp.c
View file

@ -4,4 +4,125 @@
#include "djgpp.h" #include "djgpp.h"
FontT *__font8x14 = NULL;
void fontWrite(char *message, int16_t x, int16_t y, FontT *font, ColorT foreground, ColorT background) {
}
SurfaceT *imageLoad(char *filename) {
SurfaceT *image = NULL;
return image;
}
void platformEventGet(EventT *event) {
}
void platformShutdown(void) {
}
void platformStartup(int16_t width, int16_t height, int16_t depth) {
}
uint16_t videoDisplayHeightGet(void) {
return 0;
}
uint16_t videoDisplayWidthGet(void) {
return 0;
}
void videoModesShow(void) {
}
void videoSurfaceBlit(SurfaceT *target, int16_t targetX, int16_t targetY, SurfaceT *source) {
}
void videoSurfaceBlitWithTransparency(SurfaceT *target, int16_t targetX, int16_t targetY, SurfaceT *source, ColorT transparent) {
}
void videoSurfaceClear(ColorT color) {
}
SurfaceT *videoSurfaceCreate(int16_t width, int16_t height) {
SurfaceT *surface = NULL;
return surface;
}
void videoSurfaceDestroy(SurfaceT *surface) {
}
void videoSurfaceBox(int16_t x1, int16_t y1, int16_t x2, int16_t y2, ColorT c) {
}
void videoSurfaceBoxFilled(int16_t x1, int16_t y1, int16_t x2, int16_t y2, ColorT c) {
}
int16_t videoSurfaceHeightGet(SurfaceT *surface) {
return surface->height;
}
void videoSurfaceLineH(int16_t x1, int16_t y1, int16_t x, ColorT c) {
}
void videoSurfaceLineV(int16_t x, int16_t x2, int16_t y2, ColorT c) {
}
ColorT videoSurfacePixelGet(SurfaceT *surface, int16_t x, int16_t y) {
return 0;
}
void videoSurfacePixelSet(int16_t x, int16_t y, ColorT c) {
}
void videoSurfaceSet(SurfaceT *surface) {
}
SurfaceT *videoSurfaceScreenGet(void) {
return NULL;
}
int16_t videoSurfaceWidthGet(SurfaceT *surface) {
return surface->width;
}
#endif // BACKEND_DJGPP #endif // BACKEND_DJGPP

83
client/src/platform/djgpp.h
View file

@ -1,4 +1,87 @@
#ifndef DJGPP_H #ifndef DJGPP_H
#define DJGPP_H #define DJGPP_H
#include <stdint.h>
#include <stdlib.h>
typedef uint32_t ColorT;
typedef struct SurfaceS {
uint16_t width;
uint16_t height;
size_t scanline;
size_t bytes;
union {
uint8_t *bits8;
uint16_t *bits16;
uint32_t *bits32;
} buffer;
} SurfaceT;
typedef struct EventS {
int32_t flags;
int32_t x;
int32_t y;
int32_t buttons;
int32_t key;
int32_t kbstat;
int32_t dtime;
} EventT;
typedef struct FontS {
uint8_t width; // Width of each character in pixels.
uint8_t height; // Height of each character in pixels.
uint8_t span; // Number of characters per line in font data.
uint8_t count; // Number of characters in font, minus 1.
uint16_t widthPixels; // Width of line of font data in pixels/bits.
uint16_t heightPixels; // Number of lines of font data in pixels/bits.
uint8_t *bits; // Actual font bits.
} FontT;
#define EVENT_FLAG_KEYPRESS 1
#define EVENT_FLAG_LEFT_DOWN 2
#define EVENT_FLAG_LEFT_UP 4
#define EVENT_FLAG_RIGHT_DOWN 8
#define EVENT_FLAG_RIGHT_UP 16
#define BUTTON_LEFT 1
#define BUTTON_RIGHT 2
#define META_ALT 1
#define META_CTRL 2
#define META_SHIFT 4
#define KEY_ESC 27
#define FONT_VGA_8x14 __font8x14
extern FontT *__font8x14;
void fontWrite(char *message, int16_t x, int16_t y, FontT *font, ColorT foreground, ColorT background);
SurfaceT *imageLoad(char *filename);
void platformEventGet(EventT *event);
uint16_t videoDisplayHeightGet(void);
uint16_t videoDisplayWidthGet(void);
void videoSurfaceBlit(SurfaceT *target, int16_t targetX, int16_t targetY, SurfaceT *source);
void videoSurfaceBlitWithTransparency(SurfaceT *target, int16_t targetX, int16_t targetY, SurfaceT *source, ColorT transparent);
void videoSurfaceClear(ColorT color);
SurfaceT *videoSurfaceCreate(int16_t width, int16_t height);
void videoSurfaceDestroy(SurfaceT *surface);
void videoSurfaceBox(int16_t x1, int16_t y1, int16_t x2, int16_t y2, ColorT c);
void videoSurfaceBoxFilled(int16_t x1, int16_t y1, int16_t x2, int16_t y2, ColorT c);
int16_t videoSurfaceHeightGet(SurfaceT *surface);
void videoSurfaceLineH(int16_t x1, int16_t y1, int16_t x, ColorT c);
void videoSurfaceLineV(int16_t x, int16_t x2, int16_t y2, ColorT c);
ColorT videoSurfacePixelGet(SurfaceT *surface, int16_t x, int16_t y);
void videoSurfacePixelSet(int16_t x, int16_t y, ColorT c);
void videoSurfaceSet(SurfaceT *surface);
SurfaceT *videoSurfaceScreenGet(void);
int16_t videoSurfaceWidthGet(SurfaceT *surface);
#endif // DJGPP_H #endif // DJGPP_H

28
client/src/platform/grx.c
View file

@ -50,13 +50,22 @@ SurfaceT *imageLoad(char *filename) {
} }
void mouseShutdown(void) { void platformShutdown(void) {
GrMouseEraseCursor(); GrMouseEraseCursor();
GrMouseUnInit(); GrMouseUnInit();
GrSetMode(GR_default_text);
} }
void mouseStartup(void) { void platformStartup(int16_t width, int16_t height, int16_t depth) {
// Set up graphics environment.
if (!GrSetMode(GR_width_height_bpp_graphics, width, height, depth)) {
//***TODO*** Die
}
GrSetRGBcolorMode();
__guiBaseColors = GrAllocEgaColors(); // This does not need released.
// Set up mouse. // Set up mouse.
GrMouseInit(); GrMouseInit();
GrMouseEventEnable(1, 1); GrMouseEventEnable(1, 1);
@ -105,21 +114,6 @@ void videoModesShow(void) {
} }
void videoShutdown(void) {
GrSetMode(GR_default_text);
}
void videoStartup(int16_t width, int16_t height, int16_t depth) {
// Set up graphics environment.
if (!GrSetMode(GR_width_height_bpp_graphics, width, height, depth)) {
//***TODO*** Die
}
GrSetRGBcolorMode();
__guiBaseColors = GrAllocEgaColors(); // This does not need released.
}
void videoSurfaceBlit(SurfaceT *target, int16_t targetX, int16_t targetY, SurfaceT *source) { void videoSurfaceBlit(SurfaceT *target, int16_t targetX, int16_t targetY, SurfaceT *source) {
GrBitBlt(target, targetX, targetY, source, 0, 0, videoSurfaceWidthGet(source) - 1, videoSurfaceHeightGet(source) - 1, GrWRITE); GrBitBlt(target, targetX, targetY, source, 0, 0, videoSurfaceWidthGet(source) - 1, videoSurfaceHeightGet(source) - 1, GrWRITE);
} }

10
client/src/platform/grx.h
View file

@ -2,7 +2,7 @@
#define GRX_H #define GRX_H
#include "stdint.h" #include <stdint.h>
#include "grx20.h" #include "grx20.h"
#include "grxkeys.h" #include "grxkeys.h"
@ -16,8 +16,16 @@ typedef GrFont FontT;
#define EVENT_FLAG_KEYPRESS GR_M_KEYPRESS #define EVENT_FLAG_KEYPRESS GR_M_KEYPRESS
#define EVENT_FLAG_LEFT_DOWN GR_M_LEFT_DOWN #define EVENT_FLAG_LEFT_DOWN GR_M_LEFT_DOWN
#define EVENT_FLAG_LEFT_UP GR_M_LEFT_UP
#define EVENT_FLAG_RIGHT_DOWN GR_M_RIGHT_DOWN
#define EVENT_FLAG_RIGHT_UP GR_M_RIGHT_UP
#define BUTTON_LEFT GR_M_LEFT #define BUTTON_LEFT GR_M_LEFT
#define BUTTON_RIGHT GR_M_RIGHT
#define META_ALT GR_KB_ALT
#define META_CTRL GR_KB_CTRL
#define META_SHIFT GR_KB_SHIFT
#define KEY_ESC GrKey_Escape #define KEY_ESC GrKey_Escape

6
client/src/platform/platform.h
View file

@ -18,12 +18,10 @@
#endif #endif
void mouseShutdown(void); void platformShutdown(void);
void mouseStartup(void); void platformStartup(int16_t width, int16_t height, int16_t depth);
void videoModesShow(void); void videoModesShow(void);
void videoShutdown(void);
void videoStartup(int16_t width, int16_t height, int16_t depth);
#endif // PLATFORM_H #endif // PLATFORM_H

397
client/src/platform/sdl2.c
View file

@ -1,7 +1,402 @@
#ifdef BACKEND_SDL2 #ifdef BACKEND_SDL2
#include "linux.h" #include "sdl2.h"
#define BYTES_PER_PIXEL 4
FontT *__font8x14 = NULL;
static SDL_Window *_window = NULL;
static SDL_Renderer *_renderer = NULL;
static SDL_Surface *_surface = NULL;
static SDL_Texture *_texture = NULL;
static uint16_t _width = 0;
static uint16_t _height = 0;
static uint8_t _windowScale = 1;
static uint32_t _pixelFormat = SDL_PIXELFORMAT_RGBA8888;
static SurfaceT *_activeSurface = NULL;
extern ColorT *__guiBaseColors;
#define PUTPIXEL(s,x,y,c) s->buffer.bits32[y*s->width+x]=c
#define COLOR(r,g,b) ((r<<24)|(g<<16)|(b<<8)|255)
void fontWrite(char *message, int16_t x, int16_t y, FontT *font, ColorT foreground, ColorT background) {
}
SurfaceT *imageLoad(char *filename) {
SurfaceT *image = NULL;
SDL_Surface *i = NULL;
SDL_Surface *s = IMG_Load(filename);
if (s) {
i = SDL_ConvertSurfaceFormat(s, _pixelFormat, 0);
if (i) {
image = videoSurfaceCreate(s->w, s->h);
if (image) {
SDL_LockSurface(i);
memcpy(image->buffer.bits8, i->pixels, image->bytes);
SDL_UnlockSurface(i);
}
SDL_FreeSurface(i);
}
SDL_FreeSurface(s);
}
return image;
}
void platformEventGet(EventT *event) {
SDL_Event e;
static uint8_t ASCII = 0;
static uint8_t debounce = 0;
static uint8_t buttons = 0;
static int16_t x = 0;
static int16_t y = 0;
memset(event, 0, sizeof(EventT));
while (SDL_PollEvent(&e)) {
switch (e.type) {
case SDL_MOUSEMOTION:
x = e.motion.x;
y = e.motion.y;
break;
case SDL_MOUSEBUTTONUP:
if (e.button.button == SDL_BUTTON_LEFT) {
buttons &= ~BUTTON_LEFT;
event->flags |= EVENT_FLAG_LEFT_UP;
}
if (e.button.button == SDL_BUTTON_RIGHT) {
buttons &= ~BUTTON_RIGHT;
event->flags |= EVENT_FLAG_RIGHT_UP;
}
break;
case SDL_MOUSEBUTTONDOWN:
if (e.button.button == SDL_BUTTON_LEFT) {
buttons |= BUTTON_LEFT;
event->flags |= EVENT_FLAG_LEFT_DOWN;
}
if (e.button.button == SDL_BUTTON_RIGHT) {
buttons |= BUTTON_RIGHT;
event->flags |= EVENT_FLAG_RIGHT_DOWN;
}
break;
case SDL_TEXTINPUT:
ASCII = e.text.text[0]; //***TODO*** This is horrifically wrong.
break;
case SDL_KEYUP:
ASCII = 0;
debounce = 0;
break;
case SDL_KEYDOWN:
if (debounce == 0) {
if (e.key.keysym.scancode != 0) {
// Not a meta key
debounce = 1;
if (e.key.keysym.scancode == SDL_SCANCODE_ESCAPE) ASCII = 27;
event->key = ASCII;
}
}
break;
}
}
event->x = x;
event->y = y;
event->buttons = buttons;
if ((SDL_GetModState() & KMOD_ALT) != 0) event->kbstat |= META_ALT;
if ((SDL_GetModState() & KMOD_CTRL) != 0) event->kbstat |= META_CTRL;
if ((SDL_GetModState() & KMOD_SHIFT) != 0) event->kbstat |= META_SHIFT;
}
void platformShutdown(void) {
free(__guiBaseColors);
SDL_StopTextInput();
if (_texture) {
SDL_DestroyTexture(_texture);
_texture = NULL;
}
if (_renderer) {
SDL_DestroyRenderer(_renderer);
_renderer = NULL;
}
if (_window) {
SDL_DestroyWindow(_window);
_window = NULL;
}
IMG_Quit();
SDL_Quit();
}
void platformStartup(int16_t width, int16_t height, int16_t depth) {
uint8_t i;
uint8_t red;
uint8_t green;
uint8_t blue;
(void)depth;
SDL_Init(SDL_INIT_EVERYTHING);
IMG_Init(IMG_INIT_PNG);
_windowScale = 3;
_window = SDL_CreateWindow("GUI Debug", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, SDL_WINDOW_ALLOW_HIGHDPI);
_surface = SDL_GetWindowSurface(_window);
_renderer = SDL_CreateRenderer(_window, -1, SDL_RENDERER_ACCELERATED);
_texture = SDL_CreateTexture(_renderer, _pixelFormat, SDL_TEXTUREACCESS_STREAMING, width, height);
SDL_RenderSetLogicalSize(_renderer, width, height);
SDL_SetWindowSize(_window, width * _windowScale, height * _windowScale);
_width = width;
_height = height;
SDL_StartTextInput();
__guiBaseColors = (ColorT *)malloc(sizeof(ColorT) * 16);
for (i=0; i<16; i++) {
red = 85 * (((i >> 1) & 2) | ((i >> 5) & 1));
green = 85 * (( i & 2) | ((i >> 4) & 1));
blue = 85 * (((i << 1) & 2) | ((i >> 3) & 1));
__guiBaseColors[i] = COLOR(red, green, blue);
}
}
uint16_t videoDisplayHeightGet(void) {
return _height;
}
uint16_t videoDisplayWidthGet(void) {
return _width;
}
void videoModesShow(void) {
// Nada
}
void videoSurfaceBlit(SurfaceT *target, int16_t targetX, int16_t targetY, SurfaceT *source) {
uint16_t y1;
size_t offsetTarget;
size_t offsetSource;
void *pixels;
int temp;
// HACK! Are we copying to the screen? This assumes a full screen update.
if (!target) {
SDL_LockTexture(_texture, NULL, &pixels, &temp);
memcpy(pixels, source->buffer.bits8, source->bytes);
SDL_UnlockTexture(_texture);
SDL_RenderCopy(_renderer, _texture, NULL, NULL);
SDL_RenderPresent(_renderer);
// Throttle this to some sane frame rate.
SDL_Delay(32);
return;
}
if (targetX == 0 && targetY == 0 && target->width == source->width && target->height == source->height) {
// Direct blit of entire surface.
memcpy(target->buffer.bits8, source->buffer.bits8, source->bytes);
} else {
// Blit into larger surface.
offsetTarget = targetY * _activeSurface->scanline + targetX * BYTES_PER_PIXEL;
offsetSource = 0;
for (y1=targetY; y1<targetY+source->height; y1++) {
memcpy(&target->buffer.bits8[offsetTarget], &source->buffer.bits8[offsetSource], source->scanline);
offsetTarget += target->scanline;
offsetSource += source->scanline;
}
}
}
void videoSurfaceBlitWithTransparency(SurfaceT *target, int16_t targetX, int16_t targetY, SurfaceT *source, ColorT transparent) {
uint16_t x1;
uint16_t y1;
uint16_t x2 = source->width;
uint16_t y2 = source->height;
ColorT pixel;
// Clip on right and bottom
if (targetX + x2 > target->width) x2 -= targetX + x2 - target->width;
if (targetY + y2 > target->height) y2 -= targetY + y2 - target->height;
for (y1=0; y1<y2; y1++) {
for (x1=0; x1<x2; x1++) {
pixel = source->buffer.bits32[y1 * source->width + x1];
if (transparent != pixel) {
PUTPIXEL(target, targetX + x1, targetY + y1, pixel);
}
}
}
}
void videoSurfaceClear(ColorT color) {
uint16_t x;
size_t offsetTarget;
// Draw the top line.
for (x=0; x<_activeSurface->width; x++) {
PUTPIXEL(_activeSurface, x, 0, color);
}
// Copy it to the other lines.
offsetTarget = _activeSurface->scanline;
for (x=1; x<_activeSurface->height; x++) {
memcpy(&_activeSurface->buffer.bits8[offsetTarget], &_activeSurface->buffer.bits8[0], _activeSurface->scanline);
offsetTarget += _activeSurface->scanline;
}
}
SurfaceT *videoSurfaceCreate(int16_t width, int16_t height) {
SurfaceT *surface = (SurfaceT *)malloc(sizeof(SurfaceT));
if (!surface) return NULL;
surface->width = width;
surface->height = height;
surface->scanline = width * BYTES_PER_PIXEL;
surface->bytes = surface->scanline * height;
surface->buffer.bits8 = malloc(surface->bytes);
if (!surface->buffer.bits8) {
free(surface);
return NULL;
}
memset(surface->buffer.bits8, 0, surface->bytes);
return surface;
}
void videoSurfaceDestroy(SurfaceT *surface) {
free(surface->buffer.bits8);
free(surface);
}
void videoSurfaceBox(int16_t x1, int16_t y1, int16_t x2, int16_t y2, ColorT c) {
videoSurfaceLineH(x1, x2, y1, c);
videoSurfaceLineH(x1, x2, y2, c);
videoSurfaceLineV(x1, y1, y2, c);
videoSurfaceLineV(x2, y1, y2, c);
}
void videoSurfaceBoxFilled(int16_t x1, int16_t y1, int16_t x2, int16_t y2, ColorT c) {
uint16_t x;
size_t offsetTarget;
uint16_t width = x2 - x1;
// Draw the top line.
for (x=x1; x<=x2; x++) {
PUTPIXEL(_activeSurface, x, 0, c);
}
// Copy it to the other lines.
offsetTarget = _activeSurface->scanline;
for (x=y1; x<=y2; x++) {
memcpy(&_activeSurface->buffer.bits8[offsetTarget], &_activeSurface->buffer.bits8[0], width * BYTES_PER_PIXEL);
offsetTarget += _activeSurface->scanline;
}
}
int16_t videoSurfaceHeightGet(SurfaceT *surface) {
return surface->height;
}
void videoSurfaceLineH(int16_t x1, int16_t x2, int16_t y, ColorT c) {
int16_t i;
int16_t t;
if (x1 > x2) {
t = x2;
x2 = x1;
x1 = t;
}
for (i=x1; i<=x2; i++) {
PUTPIXEL(_activeSurface, i, y, c);
}
}
void videoSurfaceLineV(int16_t x, int16_t y1, int16_t y2, ColorT c) {
int16_t i;
int16_t t;
if (y1 > y2) {
t = y2;
y2 = y1;
y1 = t;
}
for (i=y1; i<=y2; i++) {
PUTPIXEL(_activeSurface, x, i, c);
}
}
ColorT videoSurfacePixelGet(SurfaceT *surface, int16_t x, int16_t y) {
return surface->buffer.bits32[y * surface->width + x];
}
void videoSurfacePixelSet(int16_t x, int16_t y, ColorT c) {
PUTPIXEL(_activeSurface, x, y, c);
}
void videoSurfaceSet(SurfaceT *surface) {
_activeSurface = surface;
}
SurfaceT *videoSurfaceScreenGet(void) {
return NULL;
}
int16_t videoSurfaceWidthGet(SurfaceT *surface) {
return surface->width;
}
#endif // BACKEND_SDL2 #endif // BACKEND_SDL2

85
client/src/platform/sdl2.h
View file

@ -1,4 +1,89 @@
#ifndef SDL2_H #ifndef SDL2_H
#define SDL2_H #define SDL2_H
#include <stdint.h>
#include <SDL2/SDL.h>
#include <SDL2/SDL_image.h>
typedef uint32_t ColorT;
typedef struct SurfaceS {
uint16_t width;
uint16_t height;
size_t scanline;
size_t bytes;
union {
uint8_t *bits8;
uint16_t *bits16;
uint32_t *bits32;
} buffer;
} SurfaceT;
typedef struct EventS {
int32_t flags;
int32_t x;
int32_t y;
int32_t buttons;
int32_t key;
int32_t kbstat;
int32_t dtime;
} EventT;
typedef struct FontS {
uint8_t width; // Width of each character in pixels.
uint8_t height; // Height of each character in pixels.
uint8_t span; // Number of characters per line in font data.
uint8_t count; // Number of characters in font, minus 1.
uint16_t widthPixels; // Width of line of font data in pixels/bits.
uint16_t heightPixels; // Number of lines of font data in pixels/bits.
uint8_t *bits; // Actual font bits.
} FontT;
#define EVENT_FLAG_KEYPRESS 1
#define EVENT_FLAG_LEFT_DOWN 2
#define EVENT_FLAG_LEFT_UP 4
#define EVENT_FLAG_RIGHT_DOWN 8
#define EVENT_FLAG_RIGHT_UP 16
#define BUTTON_LEFT 1
#define BUTTON_RIGHT 2
#define META_ALT 1
#define META_CTRL 2
#define META_SHIFT 4
#define KEY_ESC 27
#define FONT_VGA_8x14 (*__font8x14)
extern FontT *__font8x14;
void fontWrite(char *message, int16_t x, int16_t y, FontT *font, ColorT foreground, ColorT background);
SurfaceT *imageLoad(char *filename);
void platformEventGet(EventT *event);
uint16_t videoDisplayHeightGet(void);
uint16_t videoDisplayWidthGet(void);
void videoSurfaceBlit(SurfaceT *target, int16_t targetX, int16_t targetY, SurfaceT *source);
void videoSurfaceBlitWithTransparency(SurfaceT *target, int16_t targetX, int16_t targetY, SurfaceT *source, ColorT transparent);
void videoSurfaceClear(ColorT color);
SurfaceT *videoSurfaceCreate(int16_t width, int16_t height);
void videoSurfaceDestroy(SurfaceT *surface);
void videoSurfaceBox(int16_t x1, int16_t y1, int16_t x2, int16_t y2, ColorT c);
void videoSurfaceBoxFilled(int16_t x1, int16_t y1, int16_t x2, int16_t y2, ColorT c);
int16_t videoSurfaceHeightGet(SurfaceT *surface);
void videoSurfaceLineH(int16_t x1, int16_t x2, int16_t y, ColorT c);
void videoSurfaceLineV(int16_t x, int16_t y1, int16_t y2, ColorT c);
ColorT videoSurfacePixelGet(SurfaceT *surface, int16_t x, int16_t y);
void videoSurfacePixelSet(int16_t x, int16_t y, ColorT c);
void videoSurfaceSet(SurfaceT *surface);
SurfaceT *videoSurfaceScreenGet(void);
int16_t videoSurfaceWidthGet(SurfaceT *surface);
#endif // SDL2_H #endif // SDL2_H