moved dos tgfx.c to src/dos

diff --git a/.gitignore b/.gitignore
index 9a0d302..1ec8f24 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 *.d
 oftp
 *.exe
+*.obj
+*.lnk
+*.map

diff --git a/Makefile b/Makefile
index 26c7bac..dd0f1bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,26 @@
 obj = main.obj tgfx.obj tui.obj darray.obj util.obj
 bin = oftp.exe
 
+!ifdef __UNIX__
+incpath = -Isrc -Isrc/dos
+!else
+incpath = -Isrc -Isrc\dos
+!endif
+
 #opt = -otexan
 warn = -w=3
 dbg = -d3
 
 CC = wcc386
 LD = wlink
-CFLAGS = $(warn) $(dbg) $(opt) $(def) -zq -bt=dos
+CFLAGS = $(warn) $(dbg) $(opt) $(incpath) $(def) -zq -bt=dos
 
 $(bin): $(obj)
        %write objects.lnk $(obj)
        $(LD) debug all option map name $@ system dos4g file { @objects } $(LDFLAGS)
 
-.c: src
-.asm: src
+.c: src;src/dos
+.asm: src;src/dos
 
 .c.obj: .autodepend
        $(CC) -fo=$@ $(CFLAGS) $<

diff --git a/src/dos/tgfx.c b/src/dos/tgfx.c
new file mode 100644 (file)
index 0000000..9818286
--- /dev/null
+++ b/src/dos/tgfx.c
@@ -0,0 +1,104 @@
+#include <stdio.h>
+#include <stdarg.h>
+#include <dos.h>
+#include <conio.h>
+#include "tgfx.h"
+
+static unsigned short attr = 0x0700;
+static int bgcol = 0, fgcol = 7;
+static int bgchar = ' ';
+static unsigned short *framebuf = (unsigned short*)0xb8000;
+
+#define UPD_ATTR       attr = (fgcol << 8) | (bgcol << 12)
+
+void tg_clear(void)
+{
+       tg_rect(0, 0, 0, 80, 25, 0);
+}
+
+void tg_fgcolor(int col)
+{
+       fgcol = col & 0xf;
+       UPD_ATTR;
+}
+
+void tg_bgcolor(int col)
+{
+       bgcol = col & 0xf;
+       UPD_ATTR;
+}
+
+void tg_color(int col)
+{
+       fgcol = col & 0xf;
+       bgcol = (col >> 4) & 0xf;
+       attr = col << 8;
+}
+
+void tg_bgchar(int c)
+{
+       bgchar = c;
+}
+
+#define CRTC_ADDR_PORT 0x3d4
+#define CRTC_DATA_PORT 0x3d5
+#define REG_CRTC_CURH  0xe
+#define REG_CRTC_CURL  0xf
+
+void tg_setcursor(int x, int y)
+{
+       unsigned int addr = y * 80 + x;
+
+       outpw(CRTC_ADDR_PORT, (addr & 0xff00) | REG_CRTC_CURH);
+       outpw(CRTC_ADDR_PORT, (addr << 8) | REG_CRTC_CURL);
+}
+
+void tg_text(int x, int y, const char *fmt, ...)
+{
+       va_list ap;
+       char buf[128], *ptr;
+       unsigned short *fbptr = framebuf + y * 80 + x;
+
+       va_start(ap, fmt);
+       vsprintf(buf, fmt, ap);
+       va_end(ap);
+
+       ptr = buf;
+       while(*ptr) {
+               *fbptr++ = *ptr++ | attr;
+       }
+}
+
+void tg_rect(const char *label, int x, int y, int xsz, int ysz, unsigned int flags)
+{
+       int i, j;
+       unsigned short *fbptr = framebuf + y * 80 + x;
+
+       for(i=0; i<ysz; i++) {
+               for(j=0; j<xsz; j++) {
+                       fbptr[j] = attr | bgchar;
+               }
+               fbptr += 80;
+       }
+
+       if(flags & TGFX_FRAME) {
+               fbptr = framebuf + y * 80 + x;
+               for(i=0; i<xsz-2; i++) {
+                       fbptr[i + 1] = attr | 0xcd;
+                       fbptr[(ysz-1) * 80 + i + 1] = attr | 0xcd;
+               }
+               for(i=0; i<ysz-2; i++) {
+                       fbptr[(i + 1) * 80] = attr | 0xba;
+                       fbptr[(xsz-1) + (i + 1) * 80] = attr | 0xba;
+               }
+               fbptr[0] = attr | 0xc9;
+               fbptr[xsz-1] = attr | 0xbb;
+               fbptr += (ysz - 1) * 80;
+               fbptr[0] = attr | 0xc8;
+               fbptr[xsz-1] = attr | 0xbc;
+       }
+
+       if(label) {
+               tg_text(x + 2, y, "%s", label);
+       }
+}

diff --git a/src/tgfx.c b/src/tgfx.c
deleted file mode 100644 (file)
index 9818286..0000000
--- a/src/tgfx.c
+++ /dev/null
@@ -1,104 +0,0 @@
-#include <stdio.h>
-#include <stdarg.h>
-#include <dos.h>
-#include <conio.h>
-#include "tgfx.h"
-
-static unsigned short attr = 0x0700;
-static int bgcol = 0, fgcol = 7;
-static int bgchar = ' ';
-static unsigned short *framebuf = (unsigned short*)0xb8000;
-
-#define UPD_ATTR       attr = (fgcol << 8) | (bgcol << 12)
-
-void tg_clear(void)
-{
-       tg_rect(0, 0, 0, 80, 25, 0);
-}
-
-void tg_fgcolor(int col)
-{
-       fgcol = col & 0xf;
-       UPD_ATTR;
-}
-
-void tg_bgcolor(int col)
-{
-       bgcol = col & 0xf;
-       UPD_ATTR;
-}
-
-void tg_color(int col)
-{
-       fgcol = col & 0xf;
-       bgcol = (col >> 4) & 0xf;
-       attr = col << 8;
-}
-
-void tg_bgchar(int c)
-{
-       bgchar = c;
-}
-
-#define CRTC_ADDR_PORT 0x3d4
-#define CRTC_DATA_PORT 0x3d5
-#define REG_CRTC_CURH  0xe
-#define REG_CRTC_CURL  0xf
-
-void tg_setcursor(int x, int y)
-{
-       unsigned int addr = y * 80 + x;
-
-       outpw(CRTC_ADDR_PORT, (addr & 0xff00) | REG_CRTC_CURH);
-       outpw(CRTC_ADDR_PORT, (addr << 8) | REG_CRTC_CURL);
-}
-
-void tg_text(int x, int y, const char *fmt, ...)
-{
-       va_list ap;
-       char buf[128], *ptr;
-       unsigned short *fbptr = framebuf + y * 80 + x;
-
-       va_start(ap, fmt);
-       vsprintf(buf, fmt, ap);
-       va_end(ap);
-
-       ptr = buf;
-       while(*ptr) {
-               *fbptr++ = *ptr++ | attr;
-       }
-}
-
-void tg_rect(const char *label, int x, int y, int xsz, int ysz, unsigned int flags)
-{
-       int i, j;
-       unsigned short *fbptr = framebuf + y * 80 + x;
-
-       for(i=0; i<ysz; i++) {
-               for(j=0; j<xsz; j++) {
-                       fbptr[j] = attr | bgchar;
-               }
-               fbptr += 80;
-       }
-
-       if(flags & TGFX_FRAME) {
-               fbptr = framebuf + y * 80 + x;
-               for(i=0; i<xsz-2; i++) {
-                       fbptr[i + 1] = attr | 0xcd;
-                       fbptr[(ysz-1) * 80 + i + 1] = attr | 0xcd;
-               }
-               for(i=0; i<ysz-2; i++) {
-                       fbptr[(i + 1) * 80] = attr | 0xba;
-                       fbptr[(xsz-1) + (i + 1) * 80] = attr | 0xba;
-               }
-               fbptr[0] = attr | 0xc9;
-               fbptr[xsz-1] = attr | 0xbb;
-               fbptr += (ysz - 1) * 80;
-               fbptr[0] = attr | 0xc8;
-               fbptr[xsz-1] = attr | 0xbc;
-       }
-
-       if(label) {
-               tg_text(x + 2, y, "%s", label);
-       }
-}

diff --git a/src/tgfx.h b/src/tgfx.h
index a9af11d..d1cd371 100644 (file)
--- a/src/tgfx.h
+++ b/src/tgfx.h
@@ -15,7 +15,7 @@ void tg_bgchar(int c);
 
 void tg_setcursor(int x, int y);
 
-void tg_printf(int x, int y, const char *fmt, ...);
+void tg_text(int x, int y, const char *fmt, ...);
 
 void tg_rect(const char *label, int x, int y, int xsz, int ysz, unsigned int flags);