5 files changed, 66 insertions, 20 deletions
diff --git a/src/devices/xditview/GXditview-color.ad b/src/devices/xditview/GXditview-color.ad
new file mode 100644
index 00000000..61abd8f3
--- /dev/null
+++ b/src/devices/xditview/GXditview-color.ad
@@ -0,0 +1,15 @@
+
+#include "GXditview"
+
+GXditview.paned.viewport.Scrollbar.background: Thistle
+GXditview.paned.viewport.Scrollbar.foreground: Orchid
+GXditview.paned.viewport.Scrollbar.thumb: None
+GXditview.paned.viewport.dvi.background: LemonChiffon
+GXditview.paned.viewport.background: Thistle
+GXditview.paned.label.background: PeachPuff
+GXditview.menu.background: Gold
+GXditview.promptShell.promptDialog*background: Gold
+GXditview.promptShell.promptDialog.accept.background: DarkOliveGreen1
+GXditview.promptShell.promptDialog.cancel.background: RosyBrown1
+GXditview.promptShell.promptDialog.value.background: Khaki
+
diff --git a/src/devices/xditview/GXditview.ad b/src/devices/xditview/GXditview.ad
index 37070afa..7b8cb945 100644
--- a/src/devices/xditview/GXditview.ad
+++ b/src/devices/xditview/GXditview.ad
@@ -17,18 +17,6 @@ GXditview.paned.viewport.width:      635
 GXditview.paned.viewport.height:     892
 GXditview.paned.viewport.Scrollbar.thickness: 14
 
-GXditview.paned.viewport.Scrollbar.background: Thistle
-GXditview.paned.viewport.Scrollbar.foreground: Orchid
-GXditview.paned.viewport.Scrollbar.thumb: None
-GXditview.paned.viewport.dvi.background: LemonChiffon
-GXditview.paned.viewport.background: Thistle
-GXditview.paned.label.background: PeachPuff
-GXditview.menu.background: Gold
-GXditview.promptShell.promptDialog*background: Gold
-GXditview.promptShell.promptDialog.accept.background: DarkOliveGreen1
-GXditview.promptShell.promptDialog.cancel.background: RosyBrown1
-GXditview.promptShell.promptDialog.value.background: Khaki
-
 GXditview.paned.translations: #augment \
   <Key>Next:      NextPage()\n\
   <Key>n:         NextPage()\n\
diff --git a/src/devices/xditview/Makefile.sub b/src/devices/xditview/Makefile.sub
index 51cfbf13..f1958447 100644
--- a/src/devices/xditview/Makefile.sub
+++ b/src/devices/xditview/Makefile.sub
@@ -36,15 +36,22 @@ GXditview-ad.h: $(srcdir)/GXditview.ad
 	@-rm -f $@
 	$(SHELL) $(srcdir)/ad2c $(srcdir)/GXditview.ad >GXditview-ad.h
 
-install_data: $(srcdir)/GXditview.ad
+install_data: $(srcdir)/GXditview.ad $(srcdir)/GXditview-color.ad
 	-test -d $(DESTDIR)$(appresdir) \
 	  || $(mkinstalldirs) $(DESTDIR)$(appresdir)
 	if test -f $(DESTDIR)$(appresdir)/GXditview; then \
 	  mv $(DESTDIR)$(appresdir)/GXditview \
 	    $(DESTDIR)$(appresdir)/GXditview.old; \
 	fi
+	if test -f $(DESTDIR)$(appresdir)/GXditview-color; then \
+	  mv $(DESTDIR)$(appresdir)/GXditview-color \
+	    $(DESTDIR)$(appresdir)/GXditview-color.old; \
+	fi
 	$(INSTALL_DATA) $(srcdir)/GXditview.ad \
 	  $(DESTDIR)$(appresdir)/GXditview
+	$(INSTALL_DATA) $(srcdir)/GXditview-color.ad \
+	  $(DESTDIR)$(appresdir)/GXditview-color
 
 uninstall_sub:
 	-rm -f $(DESTDIR)$(appresdir)/GXditview
+	-rm -f $(DESTDIR)$(appresdir)/GXditview-color
diff --git a/src/devices/xditview/TODO b/src/devices/xditview/TODO
index 54cdfc8a..98bbbad7 100644
--- a/src/devices/xditview/TODO
+++ b/src/devices/xditview/TODO
@@ -1,5 +1,3 @@
-Make the arrow keys do the obvious (perhaps behaving similar to gv).
-
 Open the main window with the correct width and height, depending on
 both the selected device and the paper dimensions.
 
diff --git a/src/devices/xditview/gxditview.man b/src/devices/xditview/gxditview.man
index 97fa96ec..5da53c20 100644
--- a/src/devices/xditview/gxditview.man
+++ b/src/devices/xditview/gxditview.man
@@ -166,23 +166,40 @@ Exit from
 .PP
 The
 .IR n ,
-.I Space
+.IR Space ,
+.IR Return ,
 and
-.I Return
+.I Next
+.RI ( PgDn )
 keys are bound to the
 .B Next\ Page
 action.
 .
 The
 .IR p ,
-.I BackSpace
+.IR b ,
+.IR BackSpace ,
+.IR Delete ,
 and
-.I Delete
+.I Prior
+.RI ( PgUp )
 keys are bound to the
 .B Previous\ Page
 action.
 .
 The
+.I g
+key is bound to the
+.B SelectPage
+action.
+.
+The
+.I o
+key is bound to the
+.B OpenFile
+action.
+.
+The
 .I q
 key is bound to the
 .B Quit
@@ -196,6 +213,25 @@ action which rereads the current file, and redisplays the current
 page; if the current file is a command, the command will be
 reexecuted.
 .
+Vertical scrolling can be done with the
+.I k
+and
+.I j
+keys;
+horizontal scrolling is bound to the
+.I h
+and
+.I l
+keys.
+.
+The arrow keys
+.RI ( up ,
+.IR down ,
+.IR left ,
+and
+.IR right )
+are also bound to the obvious scrolling actions.
+.
 .
 .PP
 The
@@ -402,7 +438,9 @@ for more details.
 .SH FILES
 .TP
 .B @APPRESDIR@/GXditview
-The default resource file of
+.TQ
+.B @APPRESDIR@/GXditview-color
+The default resource files of
 .BR \%gxditview .
 Users should override these values in the
 .B .Xdefaults