gwh/libx48ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename x48* ⇒ ui*; move SDL specific code from ui.h ⇒ ui_sdl.c

Browse source
This commit is contained in:
Gwenhael Le Moine 2023-09-15 16:26:23 +02:00
parent 6c7f590440
commit 5bf401d8c9
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
10 changed files with 148 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -32,7 +32,7 @@ DOTOS = src/main.o \
src/romio.o \
src/timer.o \
src/error_handling.o \
src/x48.o
src/ui_sdl.o
### debugger
DOTOS += src/debugger.o \

2
src/debugger.c
View file

@ -11,7 +11,7 @@
#include "hp48.h"
#include "romio.h"
#include "timer.h"
#include "x48.h" /* init_display(); update_display(); */
#include "ui.h" /* init_display(); update_display(); */
#include "debugger.h"
#define MAX_ARGS 16

2
src/hp48_emulate.c
View file

@ -7,7 +7,7 @@
#include "hp48.h" /* word_20; register_to_address(); exchange_reg(); add_address(); store(); recall(); store_n(); recall_n(); */
#include "hp48emu.h"
#include "timer.h"
#include "x48.h" /* get_ui_event(); adjust_contrast(); update_display(); draw_annunc(); */
#include "ui.h" /* get_ui_event(); adjust_contrast(); update_display(); draw_annunc(); */
#include "debugger.h" /* enter_debugger, TRAP_INSTRUCTION, ILLEGAL_INSTRUCTION */
static long jumpaddr;

2
src/hp48emu_actions.c
View file

@ -6,7 +6,7 @@
#include "hp48emu.h"
#include "romio.h"
#include "timer.h"
#include "x48.h" /* get_ui_event(); update_display(); */
#include "ui.h" /* get_ui_event(); update_display(); */
#include "debugger.h" /* in_debugger, enter_debugger */

2
src/hp48emu_memory.c
View file

@ -7,7 +7,7 @@
#include "hp48.h"
#include "hp48emu.h"
#include "romio.h"
#include "x48.h" /* disp; disp_draw_nibble(); menu_draw_nibble(); */
#include "ui.h" /* disp; disp_draw_nibble(); menu_draw_nibble(); */
#include "options.h"
#define MCTL_MMIO_SX 0

2
src/main.c
View file

@ -11,7 +11,7 @@
#include "options.h"
#include "hp48.h"
#include "x48.h" /* SDLInit(); SDLCreateHP(); init_display(); */
#include "ui.h" /* SDLInit(); SDLCreateHP(); init_display(); */
#include "debugger.h"
void signal_handler( int sig ) {

34
src/ui.h Normal file
View file

@ -0,0 +1,34 @@
#ifndef _X48_GUI_H
#define _X48_GUI_H 1
#include "hp48.h" /* word_4; word_20; */
/**************/
/* public API */
/**************/
/* used in: hp48emu_memory.c */
typedef struct disp_t {
unsigned int w, h;
short mapped;
int offset;
int lines;
} disp_t;
extern disp_t disp;
extern void disp_draw_nibble( word_20 addr, word_4 val );
extern void menu_draw_nibble( word_20 addr, word_4 val );
/* used in: hp48emu_actions.c, hp48_emulate.c */
extern int get_ui_event( void );
extern void update_display( void );
/* used in: hp48_emulate.c */
extern void adjust_contrast();
extern void draw_annunc( void );
/* used in: main.c */
extern void SDLInit( void );
extern void SDLCreateHP( void );
extern void init_display( void );
#endif /* !_X48_GUI_H */

0
src/x48_bitmaps.h → src/ui_bitmaps.h
View file

110
src/x48.c → src/ui_sdl.c
View file

@ -18,8 +18,8 @@
#include "hp48emu.h" /* do_kbd_int(); */
#include "romio.h"
#include "timer.h"
#include "x48.h"
#include "x48_bitmaps.h"
#include "ui.h"
#include "ui_bitmaps.h"
#define ANN_LEFT 0x81
#define ANN_RIGHT 0x82
@ -138,6 +138,112 @@
#define _KEYBOARD_OFFSET_X SIDE_SKIP
#define _KEYBOARD_OFFSET_Y ( TOP_SKIP + DISPLAY_HEIGHT + DISP_KBD_SKIP )
/***********/
/* typedef */
/***********/
typedef struct letter_t {
unsigned int w, h;
unsigned char* bits;
} letter_t;
typedef struct color_t {
const char* name;
int r, g, b;
} color_t;
typedef struct keypad_t {
unsigned int width;
unsigned int height;
} keypad_t;
typedef struct button_t {
const char* name;
short pressed;
short extra;
int code;
int x, y;
unsigned int w, h;
int lc;
const char* label;
short font_size;
unsigned int lw, lh;
unsigned char* lb;
const char* letter;
const char* left;
short is_menu;
const char* right;
const char* sub;
SDL_Surface* surfaceup;
SDL_Surface* surfacedown;
} button_t;
// This mimicks the structure formerly lcd.c, except with SDL surfaces instead
// of Pixmaps.
typedef struct ann_struct {
int bit;
int x;
int y;
unsigned int width;
unsigned int height;
unsigned char* bits;
SDL_Surface* surfaceon;
SDL_Surface* surfaceoff;
} ann_struct_t;
typedef struct SDLWINDOW {
SDL_Surface *oldsurf, *surf;
int x, y;
} SDLWINDOW_t;
/*************************/
/* Functions' prototypes */
/*************************/
void redraw_annunc( void );
void redraw_display( void );
void ShowConnections();
void SDLDrawAnnunc( char* annunc );
void SDLCreateAnnunc( void );
void SDLDrawNibble( int nx, int ny, int val );
void SDLDrawKeypad( void );
void SDLDrawButtons( void );
SDL_Surface* SDLCreateSurfFromData( unsigned int w, unsigned int h,
unsigned char* data, unsigned int coloron,
unsigned int coloroff );
SDL_Surface* SDLCreateARGBSurfFromData( unsigned int w, unsigned int h,
unsigned char* data,
unsigned int xpcolor );
void SDLDrawSmallString( int x, int y, const char* string, unsigned int length,
unsigned int coloron, unsigned int coloroff );
void SDLCreateColors( void );
void SDLDrawKeyLetter( void );
unsigned SDLBGRA2ARGB( unsigned color );
void SDLDrawBezel();
void SDLDrawMore( unsigned int cut, unsigned int offset_y, int keypad_width,
int keypad_height );
void SDLDrawLogo();
void SDLDrawBackground( int width, int height, int w_top, int h_top );
void SDLUIShowKey( int hpkey );
void SDLUIHideKey( void );
void SDLUIFeedback( void );
SDLWINDOW_t SDLCreateWindow( int x, int y, int w, int h, unsigned color,
int framewidth, int inverted );
void SDLShowWindow( SDLWINDOW_t* win );
void SDLSHideWindow( SDLWINDOW_t* win );
void SDLARGBTo( unsigned color, unsigned* a, unsigned* r, unsigned* g,
unsigned* b );
unsigned SDLToARGB( unsigned a, unsigned r, unsigned g, unsigned b );
void SDLMessageBox( int w, int h, const char* title, const char* text[],
unsigned color, unsigned colortext, int center );
void SDLEventWaitClickOrKey( void );
void SDLShowInformation( void );
disp_t disp;
keypad_t keypad;

139
src/x48.h
View file

@ -1,139 +0,0 @@
#ifndef _X48_GUI_H
#define _X48_GUI_H 1
#include <SDL/SDL.h>
#include "hp48.h" /* word_4; word_20; */
typedef struct letter_t {
unsigned int w, h;
unsigned char* bits;
} letter_t;
typedef struct color_t {
const char* name;
int r, g, b;
} color_t;
typedef struct keypad_t {
unsigned int width;
unsigned int height;
} keypad_t;
typedef struct button_t {
const char* name;
short pressed;
short extra;
int code;
int x, y;
unsigned int w, h;
int lc;
const char* label;
short font_size;
unsigned int lw, lh;
unsigned char* lb;
const char* letter;
const char* left;
short is_menu;
const char* right;
const char* sub;
SDL_Surface* surfaceup;
SDL_Surface* surfacedown;
} button_t;
// This mimicks the structure formerly lcd.c, except with SDL surfaces instead
// of Pixmaps.
typedef struct ann_struct {
int bit;
int x;
int y;
unsigned int width;
unsigned int height;
unsigned char* bits;
SDL_Surface* surfaceon;
SDL_Surface* surfaceoff;
} ann_struct_t;
typedef struct SDLWINDOW {
SDL_Surface *oldsurf, *surf;
int x, y;
} SDLWINDOW_t;
/*************************/
/* Functions' prototypes */
/*************************/
void redraw_annunc( void );
void redraw_display( void );
void ShowConnections();
void SDLDrawAnnunc( char* annunc );
void SDLCreateAnnunc( void );
void SDLDrawNibble( int nx, int ny, int val );
void SDLDrawKeypad( void );
void SDLDrawButtons( void );
SDL_Surface* SDLCreateSurfFromData( unsigned int w, unsigned int h,
unsigned char* data, unsigned int coloron,
unsigned int coloroff );
SDL_Surface* SDLCreateARGBSurfFromData( unsigned int w, unsigned int h,
unsigned char* data,
unsigned int xpcolor );
void SDLDrawSmallString( int x, int y, const char* string, unsigned int length,
unsigned int coloron, unsigned int coloroff );
void SDLCreateColors( void );
void SDLDrawKeyLetter( void );
unsigned SDLBGRA2ARGB( unsigned color );
void SDLDrawBezel();
void SDLDrawMore( unsigned int cut, unsigned int offset_y, int keypad_width,
int keypad_height );
void SDLDrawLogo();
void SDLDrawBackground( int width, int height, int w_top, int h_top );
void SDLUIShowKey( int hpkey );
void SDLUIHideKey( void );
void SDLUIFeedback( void );
SDLWINDOW_t SDLCreateWindow( int x, int y, int w, int h, unsigned color,
int framewidth, int inverted );
void SDLShowWindow( SDLWINDOW_t* win );
void SDLSHideWindow( SDLWINDOW_t* win );
void SDLARGBTo( unsigned color, unsigned* a, unsigned* r, unsigned* g,
unsigned* b );
unsigned SDLToARGB( unsigned a, unsigned r, unsigned g, unsigned b );
void SDLMessageBox( int w, int h, const char* title, const char* text[],
unsigned color, unsigned colortext, int center );
void SDLEventWaitClickOrKey( void );
void SDLShowInformation( void );
/**************/
/* public API */
/**************/
/* used in: hp48emu_memory.c */
typedef struct disp_t {
unsigned int w, h;
short mapped;
int offset;
int lines;
} disp_t;
extern disp_t disp;
extern void disp_draw_nibble( word_20 addr, word_4 val );
extern void menu_draw_nibble( word_20 addr, word_4 val );
/* used in: hp48emu_actions.c, hp48_emulate.c */
extern int get_ui_event( void );
extern void update_display( void );
/* used in: hp48_emulate.c */
extern void adjust_contrast();
extern void draw_annunc( void );
/* used in: main.c */
extern void SDLInit( void );
extern void SDLCreateHP( void );
extern void init_display( void );
#endif /* !_X48_GUI_H */