[groff] 02/04: gxditview: Migrate extern declarations to headers.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 298ed558036fa4aba397a432007f871019ecea75
Author: G. Branden Robinson <address@hidden>
Date:   Sat Nov 11 16:30:39 2017 -0500

    gxditview: Migrate extern declarations to headers.
    
    Also mark some private functions as static.
    
    Signed-off-by: G. Branden Robinson <address@hidden>
---
 ChangeLog                    |  6 ++++++
 src/devices/xditview/Dvi.c   | 18 ++++--------------
 src/devices/xditview/DviP.h  |  2 ++
 src/devices/xditview/draw.c  | 18 ++++++++++++++----
 src/devices/xditview/draw.h  | 18 ++++++++++++++++++
 src/devices/xditview/font.c  |  6 ++++--
 src/devices/xditview/font.h  |  6 ++++++
 src/devices/xditview/lex.c   |  2 ++
 src/devices/xditview/lex.h   |  1 +
 src/devices/xditview/page.c  |  2 ++
 src/devices/xditview/page.h  |  5 +++++
 src/devices/xditview/parse.c | 37 ++++++-------------------------------
 src/devices/xditview/parse.h |  1 +
 13 files changed, 71 insertions(+), 51 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed95763..f413921 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-11  G. Branden Robinson <address@hidden>
+
+       gxditview: Migrate extern declarations to headers.
+
+       Also mark some private functions as static.
+
 2017-11-11  Bjarni Ingi Gislason <address@hidden>
 
        src: Declare function protypes where necessary.
diff --git a/src/devices/xditview/Dvi.c b/src/devices/xditview/Dvi.c
index f849fb1..28512ae 100644
--- a/src/devices/xditview/Dvi.c
+++ b/src/devices/xditview/Dvi.c
@@ -20,7 +20,11 @@ static char Xrcsid[] = "$XConsortium: Dvi.c,v 1.9 89/12/10 
16:12:25 rws Exp $";
 #include <X11/Xmu/Converters.h>
 #include <stdio.h>
 #include <ctype.h>
+
 #include "DviP.h"
+#include "font.h"
+#include "page.h"
+#include "parse.h"
 
 /****************************************************************
  *
@@ -116,20 +120,6 @@ static void                FindPage (DviWidget);
 
 static void            SaveToFile (Widget, FILE *);
 
-/* font.c */
-extern void ParseFontMap(DviWidget);
-extern void DestroyFontMap(DviFontMap *);
-extern void ForgetFonts(DviWidget);
-
-/* page.c */
-extern void DestroyFileMap(DviFileMap *);
-extern long SearchPagePosition(DviWidget, int);
-extern void FileSeek(DviWidget, long);
-extern void ForgetPagePositions(DviWidget);
-
-/* parse.c */
-extern int ParseInput(register DviWidget);
-
 DviClassRec dviClassRec = {
 {
        &widgetClassRec,                /* superclass             */    
diff --git a/src/devices/xditview/DviP.h b/src/devices/xditview/DviP.h
index cfd05cb..8b71c69 100644
--- a/src/devices/xditview/DviP.h
+++ b/src/devices/xditview/DviP.h
@@ -230,4 +230,6 @@ DeviceFont  *QueryDeviceFont (DviWidget, int);
 
 char *GetWord(DviWidget, char *, int);
 char *GetLine(DviWidget, char *, int);
+
+void SetDevice (DviWidget dw, const char *name);
 #endif /* _XtDviP_h */
diff --git a/src/devices/xditview/draw.c b/src/devices/xditview/draw.c
index 4729c37..f529801 100644
--- a/src/devices/xditview/draw.c
+++ b/src/devices/xditview/draw.c
@@ -20,22 +20,28 @@
 #endif
 
 #include "DviP.h"
+#include "draw.h"
+#include "font.h"
 
 #define DeviceToX(dw, n) ((int)((n) * (dw)->dvi.scale_factor + .5))
 #define XPos(dw) (DeviceToX((dw), (dw)->dvi.state->x - \
                   (dw)->dvi.text_device_width) + (dw)->dvi.text_x_width)
 #define YPos(dw) (DeviceToX((dw), (dw)->dvi.state->y))
 
+/* forward reference */
 static int FakeCharacter(DviWidget, char *, int);
 
 /* font.c */
 extern int MaxFontPosition(DviWidget);
 
-void
+// shadowed by a macro definition in parse.c, and unused elsewhere
+#if 0
+static void
 HorizontalMove(DviWidget dw, int delta)
 {
        dw->dvi.state->x += delta;
 }
+#endif
 
 void
 HorizontalGoto(DviWidget dw, int NewPosition)
@@ -55,7 +61,7 @@ VerticalGoto(DviWidget dw, int NewPosition)
        dw->dvi.state->y = NewPosition;
 }
 
-void
+static void
 AdjustCacheDeltas (DviWidget dw)
 {
        int extra;
@@ -274,7 +280,8 @@ int FindCharWidth (DviWidget dw, char *buf, int *widp)
 
 /* Return the width of the character in device units. */
 
-int PutCharacter (DviWidget dw, char *buf)
+int
+PutCharacter (DviWidget dw, char *buf)
 {
        int             prevFont;
        int             c = -1;
@@ -382,11 +389,14 @@ PutNumberedCharacter (DviWidget dw, int c)
        }
 }
 
-void
+// unused
+#if 0
+static void
 ClearPage (DviWidget dw)
 {
        XClearWindow (XtDisplay (dw), XtWindow (dw));
 }
+#endif
 
 static void
 setGC (DviWidget dw)
diff --git a/src/devices/xditview/draw.h b/src/devices/xditview/draw.h
new file mode 100644
index 0000000..7a3772c
--- /dev/null
+++ b/src/devices/xditview/draw.h
@@ -0,0 +1,18 @@
+void HorizontalGoto(DviWidget, int);
+void VerticalGoto(DviWidget, int);
+void VerticalMove(DviWidget, int);
+void FlushCharCache(DviWidget);
+void Newline(DviWidget);
+void Word(DviWidget);
+int PutCharacter(DviWidget, char *);
+void PutNumberedCharacter(DviWidget, int);
+void DrawLine(DviWidget, int, int);
+void DrawCircle(DviWidget, int);
+void DrawFilledCircle(DviWidget, int);
+void DrawEllipse(DviWidget, int, int);
+void DrawFilledEllipse(DviWidget, int, int);
+void DrawArc(DviWidget, int, int, int, int);
+void DrawPolygon(DviWidget, int *, int);
+void DrawFilledPolygon(DviWidget, int *, int);
+void DrawSpline(DviWidget, int *, int);
+
diff --git a/src/devices/xditview/font.c b/src/devices/xditview/font.c
index c111a7b..0958cd5 100644
--- a/src/devices/xditview/font.c
+++ b/src/devices/xditview/font.c
@@ -10,11 +10,13 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
+
 #include "DviP.h"
 #include "XFontName.h"
+#include "font.h"
 
+// forward reference
 static void DisposeFontSizes(DviWidget, DviFontSizeList *);
-void DestroyFontMap(DviFontMap *);
 
 static char *
 savestr (const char *s)
@@ -135,7 +137,7 @@ ConvertFontNameToEncoding (char *n)
        return n;
 }
 
-DviFontSizeList *
+static DviFontSizeList *
 InstallFontSizes (DviWidget dw, const char *x_name, Boolean *scalablep)
 {
        char    fontNameString[2048];
diff --git a/src/devices/xditview/font.h b/src/devices/xditview/font.h
new file mode 100644
index 0000000..ae6c765
--- /dev/null
+++ b/src/devices/xditview/font.h
@@ -0,0 +1,6 @@
+void DestroyFontMap(DviFontMap *);
+void ForgetFonts (DviWidget dw);
+int MaxFontPosition (DviWidget dw);
+void ParseFontMap (DviWidget dw);
+void SetFontPosition (DviWidget dw, int position, const char *dvi_name,
+                      const char *extra);
diff --git a/src/devices/xditview/lex.c b/src/devices/xditview/lex.c
index dfe1e0d..7571101 100644
--- a/src/devices/xditview/lex.c
+++ b/src/devices/xditview/lex.c
@@ -2,7 +2,9 @@
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <stdio.h>
+
 #include "DviP.h"
+#include "lex.h"
 
 int
 DviGetAndPut(DviWidget dw, int *cp)
diff --git a/src/devices/xditview/lex.h b/src/devices/xditview/lex.h
new file mode 100644
index 0000000..0a4cba0
--- /dev/null
+++ b/src/devices/xditview/lex.h
@@ -0,0 +1 @@
+int GetNumber(DviWidget);
diff --git a/src/devices/xditview/page.c b/src/devices/xditview/page.c
index d1c5c9f..dcc655a 100644
--- a/src/devices/xditview/page.c
+++ b/src/devices/xditview/page.c
@@ -9,7 +9,9 @@
 #include <X11/StringDefs.h>
 #include <stdio.h>
 #include <ctype.h>
+
 #include "DviP.h"
+#include "page.h"
 
 #ifdef X_NOT_STDC_ENV
 extern long    ftell();
diff --git a/src/devices/xditview/page.h b/src/devices/xditview/page.h
new file mode 100644
index 0000000..e2c938d
--- /dev/null
+++ b/src/devices/xditview/page.h
@@ -0,0 +1,5 @@
+void DestroyFileMap(DviFileMap *);
+void FileSeek(DviWidget, long);
+void ForgetPagePositions(DviWidget);
+void RememberPagePosition(DviWidget, int);
+long SearchPagePosition(DviWidget, int);
diff --git a/src/devices/xditview/parse.c b/src/devices/xditview/parse.c
index de7d6ba..2584a8c 100644
--- a/src/devices/xditview/parse.c
+++ b/src/devices/xditview/parse.c
@@ -9,7 +9,13 @@
 #include <X11/StringDefs.h>
 #include <stdio.h>
 #include <ctype.h>
+
 #include "DviP.h"
+#include "draw.h"
+#include "font.h"
+#include "lex.h"
+#include "page.h"
+#include "parse.h"
 
 static int StopSeen = 0;
 static void ParseDrawFunction(DviWidget, char *);
@@ -17,37 +23,6 @@ static void ParseDeviceControl(DviWidget);
 static void push_env(DviWidget);
 static void pop_env(DviWidget);
 
-/* draw.c */
-extern int PutCharacter(DviWidget, char *);
-extern int PutNumberedCharacter(DviWidget, int);
-extern void HorizontalGoto(DviWidget, int);
-extern void Word(DviWidget);
-extern void VerticalGoto(DviWidget, int);
-extern void VerticalMove(DviWidget, int);
-extern void FlushCharCache(DviWidget);
-extern void Newline(DviWidget);
-extern void DrawLine(DviWidget, int, int);
-extern void DrawCircle(DviWidget, int);
-extern void DrawFilledCircle(DviWidget, int);
-extern void DrawEllipse(DviWidget, int, int);
-extern void DrawFilledEllipse(DviWidget, int, int);
-extern void DrawArc(DviWidget, int, int, int, int);
-extern void DrawPolygon(DviWidget, int *, int);
-extern void DrawFilledPolygon(DviWidget, int *, int);
-extern void DrawSpline(DviWidget, int *, int);
-
-/* Dvi.c */
-extern void SetDevice(DviWidget, const char *);
-
-/* page.c */
-extern void RememberPagePosition(DviWidget, int);
-
-/* font.c */
-extern void SetFontPosition(DviWidget, int, const char *, const char *);
-
-/* lex.c */
-extern int GetNumber(DviWidget);
-
 #define HorizontalMove(dw, delta)      ((dw)->dvi.state->x += (delta))
 
 
diff --git a/src/devices/xditview/parse.h b/src/devices/xditview/parse.h
new file mode 100644
index 0000000..636f3a6
--- /dev/null
+++ b/src/devices/xditview/parse.h
@@ -0,0 +1 @@
+int ParseInput(register DviWidget dw);