wdvi

commit 01cfd7c88881a4505bcb162a5e34c04885db8200
parent d6d9af32c3e2c0a96727bb1f70eeb3a2f9062c75
Author: Kyle Milz <krwmilz@gmail.com>
Date:   Sat, 11 Sep 2021 21:22:27 +0000

move more globals into header files

Diffstat:
M
events.c
 | 
4
+++-
M
special.c
 | 
3
+--
M
special.h
 | 
5
+++++
M
xdvi.h
 | 
7
-------

4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/events.c b/events.c
@@ -46,7 +46,7 @@ NOTE:
 #include "events.h"
 #include "http.h"
 #include "popups.h"	/* WARN, Act_print() */
-#include "special.h"	/* page_colors */
+#include "special.h"	/* page_colors, scanned_page, ... */
 #include "util.h"	/* xmalloc() */
 #include "xdvi.h"
 
@@ -602,6 +602,8 @@ scrollwindow(windowrec, x0, y0)
  *	routines for X11 toolkit
  */
 
+Dimension	window_w, window_h;
+
 static	Arg	arg_wh[] = {
 	{XtNwidth,	(XtArgVal) &window_w},
 	{XtNheight,	(XtArgVal) &window_h},
diff --git a/special.c b/special.c
@@ -542,8 +542,7 @@ init_prescan()
 	    scanned_page_color = total_pages + 1;
 
 	if (ignore_papersize_specials)
-	    scanned_page =
-	      scanned_page_color;
+	    scanned_page = scanned_page_color;
 }
 
 
diff --git a/special.h b/special.h
@@ -33,6 +33,11 @@ struct pagecolor {
 /* Information on background color and initial color stack for each page.  */
 struct pagecolor	*page_colors	= NULL;
 
+int	scanned_page;		/* last page prescanned */
+int	scanned_page_color;	/* last page scanned for color spcls */
+int	scanned_page_reset;	/* number to reset the above to */
+
+
 void	 applicationDoSpecial(char *);
 void	 geom_do_special(struct geom_info *, char *, double);
 void	 init_prescan(void);
diff --git a/xdvi.h b/xdvi.h
@@ -49,8 +49,6 @@ NOTE:
 
 #define	TEXXET	1	/* Define to enable right-to-left typesetting.  */
 
-#define NORETURN	__attribute__((__noreturn__))
-
 #define	Printf	(void) printf
 #define	Sprintf	(void) sprintf
 #define	Fseek	(void) fseek
@@ -92,10 +90,6 @@ double	dimconv;
 double	tpic_conv;
 unsigned int	page_w, page_h;
 
-int	scanned_page;		/* last page prescanned */
-int	scanned_page_color;	/* last page scanned for color spcls */
-int	scanned_page_reset;	/* number to reset the above to */
-
 /*
  * Set if the -paper option overrides papersize specials.
  */
@@ -248,7 +242,6 @@ Boolean		dvi_file_ready	= False;
 				/* done with font generation and prescanning */
 						/* replace icon/window titles */
 int		bak_shrink;		/* last shrink factor != 1 */
-Dimension	window_w, window_h;
 XImage		*image;
 int		backing_store;