wdvi

commit ff19f0a3513c47c217b62fe819586eef893b40d3
parent 14d369e4dfb29075d8de035437139978d0cf92eb
Author: Kyle Milz <krwmilz@gmail.com>
Date:   Tue,  7 Sep 2021 17:55:16 +0000

start organizing and clean up of xdvi.h

Diffstat:
M
dvi-draw.c
 | 
2
+-
M
dvi-init.c
 | 
8
++++----
M
xdvi.h
 | 
35
+++++++++++++----------------------

3 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/dvi-draw.c b/dvi-draw.c
@@ -862,7 +862,7 @@ set_char(wide_ubyte cmd, wide_ubyte ch)
 	long		dvi_h_sav;
 #endif
 
-	if (ch > maxchar) realloc_font(currinf.fontp, WIDENINT ch);
+	if (ch > maxchar) realloc_font(currinf.fontp, ch);
 	if ((g = &currinf.fontp->glyph[ch])->bitmap.bits == NULL) {
 	    if (g->addr == 0) {
 		if (!hush_chars)
diff --git a/dvi-init.c b/dvi-init.c
@@ -264,21 +264,21 @@ load_font(fontp)
 	}
 	fontp->fsize = size_found;
 	magic = two(fontp->file);
-	if (magic == PK_MAGIC) read_PK_index(fontp, WIDENINT hushcs);
+	if (magic == PK_MAGIC) read_PK_index(fontp, hushcs);
 	else
-	    if (magic == VF_MAGIC) read_VF_index(fontp, WIDENINT hushcs);
+	    if (magic == VF_MAGIC) read_VF_index(fontp, hushcs);
 	else
 	    oops("Cannot recognize format for font file %s", fontp->filename);
 
 	if (fontp->flags & FONT_VIRTUAL) {
 	    while (maxchar > 0 && fontp->macro[maxchar].pos == NULL) --maxchar;
 	    if (maxchar < 255)
-		realloc_virtual_font(fontp, WIDENINT maxchar);
+		realloc_virtual_font(fontp, maxchar);
 	}
 	else {
 	    while (maxchar > 0 && fontp->glyph[maxchar].addr == 0) --maxchar;
 	    if (maxchar < 255)
-		realloc_font(fontp, WIDENINT maxchar);
+		realloc_font(fontp, maxchar);
 	}
 	return True;
 }
diff --git a/xdvi.h b/xdvi.h
@@ -32,14 +32,12 @@ NOTE:
 #ifndef	XDVI_H
 #define	XDVI_H
 
-/********************************
- *	The C environment	*
- *******************************/
-
 #include <stddef.h>
+#include <stdio.h>
+#include <setjmp.h>
 #include <stdlib.h>
+#include <unistd.h>
 
-	/* the following works around the wchar_t problem */
 #include <X11/X.h>
 #include <X11/Xosdefs.h>
 #include <X11/Xlib.h>	/* include Xfuncs.h, if available */
@@ -48,6 +46,9 @@ NOTE:
 #include <X11/Xfuncs.h>
 #include <X11/Intrinsic.h>
 
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
 
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 #define WORDS_BIGENDIAN 1
@@ -56,23 +57,7 @@ NOTE:
 #define	MKTEXPK	1	/* automatically create missing pixel files */
 #define	TEXXET	1	/* Define to enable right-to-left typesetting.  */
 
-static const char addr_default[] = "www.0x30.net/resume.dvi";
-
-typedef	char		Bool3;		/* Yes/No/Maybe */
-
-#define	True	1
-#define	False	0
-#define	Maybe	2
-
-#include <stdio.h>
-#include <setjmp.h>
-#include <unistd.h>
-
-# include <ft2build.h>
-# include FT_FREETYPE_H
-
 #define NORETURN	__attribute__((__noreturn__))
-#define UNUSED		__attribute__((__unused__))
 
 #define	Printf	(void) printf
 #define	Puts	(void) puts
@@ -92,13 +77,19 @@ typedef	char		Bool3;		/* Yes/No/Maybe */
  *	 Types and data		*
  *******************************/
 
+static const char addr_default[] = "www.0x30.net/resume.dvi";
+
 #define	MAXDIM		32767
 
 typedef	unsigned char	ubyte;
 
 typedef	ubyte		wide_ubyte;
 typedef	Boolean		wide_bool;
-#define	WIDENINT
+
+#define	True	1
+#define	False	0
+#define	Maybe	2
+typedef	char		Bool3;		/* Yes/No/Maybe */
 
 #if defined(MAKETEXPK) && !defined(MKTEXPK)
 #define	MKTEXPK 1