[16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / src / lib / 16_vl.h

diff --git a/src/lib/16_vl.h b/src/lib/16_vl.h
index d0af774f43f1e8edb90403f9e7b32d9d31a1e4d7..cec79507ad5189ec035ab3b06fe07a36ea6aabf7 100755 (executable)
--- a/src/lib/16_vl.h
+++ b/src/lib/16_vl.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -26,7 +26,6 @@
 #define MODEX16_H\r
 \r
 #include "src/lib/16_head.h"\r
-#include "src/lib/bitmap.h"\r
 //#include "src/lib/planar.h"\r
 //#include "src/lib/modex16/16planar.h"\r
 #include "src/lib/16text.h"\r
@@ -52,11 +51,12 @@
 #define TILEWHD        TILEWH*2\r
 #define QUADWH                 TILEWH/2\r
 \r
+//#define OLDBGPRESERVE\r
+\r
 /* -========================== Types & Macros ==========================- */\r
 #define PAGE_OFFSET(x,y) (((y)<<6)+((y)<<4)+((x)>>2))\r
 #define PLANE(x) (1 << ((x) & 3))\r
 #define SELECT_ALL_PLANES() outpw(0x03c4, 0xff02)\r
-#define     PALSIZE            768\r
 \r
 typedef union\r
 {\r
@@ -84,6 +84,9 @@ extern byte far*  VGA;  /* The VGA Memory */
 #define LOW_ADDRESS            0x0D\r
 #define VRETRACE               0x08\r
 //#define INPUT_STATUS_1               0x03da  defined in 16_head\r
+#define STATUS_REGISTER_1      INPUT_STATUS_1\r
+#define ATR_INDEX                      AC_INDEX\r
+#define ATR_OVERSCAN           17\r
 #define DISPLAY_ENABLE         0x01\r
 #define MAP_MASK               0x02\r
 #define PAL_READ_REG                   0x03C7   /* Color register, read address */\r
@@ -102,8 +105,10 @@ page_t modexDefaultPage(page_t *p);
 page_t modexNextPage(page_t *p);\r
 page_t modexNextPageFlexibleSize(page_t *p, word x, word y);\r
 void modexCalcVmemRemain(video_t *video);\r
+void VL_Initofs(video_t *video);\r
 void modexHiganbanaPageSetup(video_t *video);\r
-void modexShowPage(page_t *page);\r
+//void modexShowPage(page_t *page);\r
+void VL_ShowPage(page_t *page, boolean vsync, boolean sr);\r
 void modexPanPage(page_t *page, int dx, int dy);\r
 void modexSelectPlane(byte plane);\r
 void modexClearRegion(page_t *page, int x, int y, int w, int h, byte color);\r
@@ -118,8 +123,11 @@ void modexFlashOff(word fade, byte *palette);
 \r
 /* palette loading and saving */\r
 void modexPalSave(byte *palette);\r
-byte *modexNewPal();\r
-void modexLoadPalFile(char *filename, byte **palette);\r
+//byte *modexNewPal();\r
+void modexLoadPalFile(char *filename, byte *palette);\r
+void VL_LoadPalFile(const char *filename, byte *palette);\r
+void VL_LoadPalFilewithoffset(const char *filename, byte *palette, word o);\r
+void VL_UpdatePaletteWrite(byte *palette, word o);\r
 void modexSavePalFile(char *filename, byte *palette);\r
 \r
 /* fixed palette functions */\r
@@ -127,11 +135,9 @@ void modexPalBlack();
 void modexPalWhite();\r
 \r
 /* utility functions */\r
-void modexPalUpdate(bitmap_t *bmp, word *i, word qp, word aqoffset);\r
-void modexPalUpdate1(byte *p);\r
+void modexPalUpdate(byte *p);\r
 void modexPalUpdate0(byte *p);\r
 void modexPalOverscan(word col);\r
-void modexchkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);\r
 void modexputPixel(page_t *page, int x, int y, byte color);\r
 byte modexgetPixel(page_t *page, int x, int y);\r
 \r
@@ -162,11 +168,14 @@ static inline byte modexreadPixel(page_t *page, int x, int y, word addr)
 #endif\r
 \r
 void modexDrawChar(page_t *page, int x/*for planar selection only*/, word t, word col, word bgcol, word addr);\r
-void modexprint(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);\r
+void modexprint(page_t *page, sword x, sword y, word t, boolean tlsw, word col, word bgcol, const byte *str);\r
 void modexprintbig(page_t *page, word x, word y, word t, word col, word bgcol, const byte *str);\r
 void modexpdump(page_t *pee);\r
 void modexcls(page_t *page, byte color, byte *Where);\r
+void VL_PatternDraw(video_t *video, word pn, boolean sw, boolean allsw);\r
 void modexWaitBorder();\r
-void modexprintmeminfo(video_t *v);\r
+void modexWaitBorder_start();\r
+void modexWaitBorder_end();\r
+void VL_PrintmodexmemInfo(video_t *v);\r
 \r
 #endif\r