home *** CD-ROM | disk | FTP | other *** search
/ Usenet 1994 January / usenetsourcesnewsgroupsinfomagicjanuary1994.iso / sources / x / volume2 / xtroff / patch3 / update.sh < prev    next >
Encoding:
Linux/UNIX/POSIX Shell Script  |  1988-11-14  |  27.3 KB  |  876 lines
  1. #! /bin/sh
  2. # Removing some junk files, and renaming the manual page
  3. if test -d xtroff ; then
  4.     cd xtroff
  5. fi
  6. if test -f suntroff.c -a -f xtroff.man ; then
  7.     thisdir=`pwd`
  8. else
  9.     echo 'Please cd to contrib/clients/xtroff before running this script'
  10.     exit 1
  11. fi
  12. rm -f Makefile.old Window.c Window.h WindowP.h make.out
  13. mv xtroff.man xtroff.manX
  14. cd XtStuff
  15. rm -f make.out
  16. cd $thisdir
  17. # Ok - this is the real thing.
  18. patch -p1 << \WhAt_A_mArOoN
  19. diff -r -c /h/xwindows/X/contrib/clients/xtroff/patchlevel.h xtroff/patchlevel.h
  20. *** /h/xwindows/X/contrib/clients/xtroff/patchlevel.h    Mon Sep 26 09:44:48 1988
  21. --- xtroff/patchlevel.h    Sat Nov 12 06:34:11 1988
  22. ***************
  23. *** 1,2 ****
  24. ! #define PATCHLEVEL 2
  25.   
  26. --- 1,2 ----
  27. ! #define PATCHLEVEL 3
  28.   
  29. Common subdirectories: /h/xwindows/X/contrib/clients/xtroff/Fixes and xtroff/Fixes
  30. diff -r -c /h/xwindows/X/contrib/clients/xtroff/Imakefile xtroff/Imakefile
  31. *** /h/xwindows/X/contrib/clients/xtroff/Imakefile    Thu Sep  1 01:57:40 1988
  32. --- xtroff/Imakefile    Sat Nov 12 06:27:36 1988
  33. ***************
  34. *** 33,39 ****
  35.   RSTFONTS=/usr/uturing/ron/rst
  36.   # Xfonts go here - wish the X11 server could read vfonts like 
  37.   # the X10 server used to.
  38. ! SUNTROFF_FONTS=/local/share/X11/fonts
  39.   #DEVICE=imp    #imagen
  40.   DEVICE=sun    #versatec - other printers like lw.
  41.   WIDTHDIR=/local/share/troff
  42. --- 33,39 ----
  43.   RSTFONTS=/usr/uturing/ron/rst
  44.   # Xfonts go here - wish the X11 server could read vfonts like 
  45.   # the X10 server used to.
  46. ! SUNTROFF_FONTS=/local/share/X11/fonts/xtroff
  47.   #DEVICE=imp    #imagen
  48.   DEVICE=sun    #versatec - other printers like lw.
  49.   WIDTHDIR=/local/share/troff
  50. ***************
  51. *** 65,76 ****
  52.   # These should be defined in an Imake.tmpl - except that the 
  53.   # normal Imake.tmpl insists on these being compiled in the 
  54.   # X directory tree.
  55. ! XAWLIB=$(USRLIBDIR)/libXaw.a
  56. ! XTOOLLIB=$(USRLIBDIR)/libXt.a
  57. ! XLIB=$(USRLIBDIR)/libX11.a
  58.   MATHLIB=-lm
  59.   
  60. ! FC = fc
  61.   XTSTUFF =     XtStuff/libXtStuff.a
  62.   OBJS1 =        xwindows.o suntroff.o parse.o font.o draw.o \
  63.           fixpoint.o curves.o
  64. --- 65,76 ----
  65.   # These should be defined in an Imake.tmpl - except that the 
  66.   # normal Imake.tmpl insists on these being compiled in the 
  67.   # X directory tree.
  68. ! #XAWLIB=$(USRLIBDIR)/libXaw.a
  69. ! #XTOOLLIB=$(USRLIBDIR)/libXt.a
  70. ! #XLIB=$(USRLIBDIR)/libX11.a
  71.   MATHLIB=-lm
  72.   
  73. ! FC = bdftosnf
  74.   XTSTUFF =     XtStuff/libXtStuff.a
  75.   OBJS1 =        xwindows.o suntroff.o parse.o font.o draw.o \
  76.           fixpoint.o curves.o
  77. ***************
  78. *** 79,92 ****
  79.   PROGRAMS =     xtroff
  80.   PREVIEWER =     xtroff
  81.   
  82. ! ComplexProgramTarget_1(xtroff,$(XTSTUFF) $(XAWLIB) $(XTOOLLIB) $(XLIB),$(MATHLIB))
  83.   
  84.   $(XTSTUFF):
  85.           cd XtStuff; make $(MFLAGS)            
  86.   
  87.   xfonts:
  88.           -mkdir $(SUNTROFF_FONTS)
  89. !         cd fontstuff; make $(MFLAGS) CFLAGS="$(CFLAGS)" \
  90.               VFONTS=$(VFONTS) \
  91.               RSTFONTS=$(RSTFONTS) PREVIEWER=$(PREVIEWER) \
  92.               FC=$(FC) PERCENT=$(PERCENT) \
  93. --- 79,99 ----
  94.   PROGRAMS =     xtroff
  95.   PREVIEWER =     xtroff
  96.   
  97. ! .SUFFIXES: .manX .man
  98.   
  99. + .manX.man:
  100. +     rm -f $*.man
  101. +     sed -e 's?WIDTHDIR?$(WIDTHDIR)?g'\
  102. +         -e 's?FONTDIR?$(SUNTROFF_FONTS)?g' $*.manX > $*.man
  103. + 
  104. + ComplexProgramTarget_1(xtroff,$(XTSTUFF) $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB),$(MATHLIB))
  105. + 
  106.   $(XTSTUFF):
  107.           cd XtStuff; make $(MFLAGS)            
  108.   
  109.   xfonts:
  110.           -mkdir $(SUNTROFF_FONTS)
  111. !         cd fontstuff; make $(MFLAGS) CDEBUGFLAGS="$(CDEBUGFLAGS)" \
  112.               VFONTS=$(VFONTS) \
  113.               RSTFONTS=$(RSTFONTS) PREVIEWER=$(PREVIEWER) \
  114.               FC=$(FC) PERCENT=$(PERCENT) \
  115. ***************
  116. *** 106,111 ****
  117. --- 113,119 ----
  118.   clean::
  119.           cd XtStuff ; make $(MFLAGS) clean
  120.           cd fontstuff ; make $(MFLAGS) clean
  121. +         rm -f xtroff.man
  122.   
  123.   depend::
  124.           cd XtStuff; make $(MFLAGS) depend
  125. Only in xtroff: RCS
  126. Common subdirectories: /h/xwindows/X/contrib/clients/xtroff/XtStuff and xtroff/XtStuff
  127. Common subdirectories: /h/xwindows/X/contrib/clients/xtroff/bitmaps and xtroff/bitmaps
  128. Only in xtroff: dave
  129. Common subdirectories: /h/xwindows/X/contrib/clients/xtroff/devsun and xtroff/devsun
  130. Common subdirectories: /h/xwindows/X/contrib/clients/xtroff/fontstuff and xtroff/fontstuff
  131. diff -r -c /h/xwindows/X/contrib/clients/xtroff/xwindows.c xtroff/xwindows.c
  132. *** /h/xwindows/X/contrib/clients/xtroff/xwindows.c    Fri Sep 23 10:16:37 1988
  133. --- xtroff/xwindows.c    Sat Nov 12 06:26:52 1988
  134. ***************
  135. *** 19,25 ****
  136.    *  X11.  - Mark Moraes.
  137.    */
  138.   #ifndef lint
  139. ! static char rcsid[]="$Header";
  140.   #endif
  141.   
  142.   #include    <stdio.h>
  143. --- 19,25 ----
  144.    *  X11.  - Mark Moraes.
  145.    */
  146.   #ifndef lint
  147. ! static char rcsid[]="$Header: xwindows.c,v 1.1 88/11/12 06:26:27 moraes Exp $";
  148.   #endif
  149.   
  150.   #include    <stdio.h>
  151. ***************
  152. *** 175,180 ****
  153. --- 175,181 ----
  154.   static XColor bg = {0, 0, 0, 0};
  155.   static XColor fg = {0, ~0, ~0, ~0};
  156.   unsigned int depth;
  157. + Dimension xwidth, xheight;
  158.   
  159.   Display *dpy;
  160.   Screen *scn;
  161. ***************
  162. *** 207,214 ****
  163.   static Arg query_args[] = {
  164.       {XtNbackground, (XtArgVal) &bgcolor},
  165.       {XtNforeground, (XtArgVal) &fgcolor},
  166. !     {XtNwidth, (XtArgVal) &ViewWidth},
  167. !     {XtNheight, (XtArgVal) &ViewHeight},
  168.   };
  169.   
  170.   /* args for the canvas window - we fill in translations by hand */
  171. --- 208,215 ----
  172.   static Arg query_args[] = {
  173.       {XtNbackground, (XtArgVal) &bgcolor},
  174.       {XtNforeground, (XtArgVal) &fgcolor},
  175. !     {XtNwidth, (XtArgVal) &xwidth},
  176. !     {XtNheight, (XtArgVal) &xheight},
  177.   };
  178.   
  179.   /* args for the canvas window - we fill in translations by hand */
  180. ***************
  181. *** 237,247 ****
  182.    *  XtNfromHoriz also changes to XtNfromVert.
  183.    */
  184.   static Arg scroll_args[] = {
  185. !     XtNlength, (XtArgVal) 850,
  186. !     XtNorientation, (XtArgVal) XtorientVertical,
  187. !     XtNfromHoriz, (XtArgVal) NULL,
  188. !     XtNscrollProc, (XtArgVal) scrollCallbacks,
  189. !     XtNthumbProc, (XtArgVal) thumbCallbacks,
  190.   };
  191.   
  192.   static MenuItemsList menu_list[] = {
  193. --- 238,250 ----
  194.    *  XtNfromHoriz also changes to XtNfromVert.
  195.    */
  196.   static Arg scroll_args[] = {
  197. !     {XtNlength, (XtArgVal) 850},
  198. !     {XtNorientation, (XtArgVal) XtorientVertical},
  199. !     {XtNfromHoriz, (XtArgVal) NULL},
  200. !     {XtNtop, (XtArgVal) 0.0},
  201. !     {XtNshown, (XtArgVal) 0.0},
  202. !     {XtNscrollProc, (XtArgVal) scrollCallbacks},
  203. !     {XtNthumbProc, (XtArgVal) thumbCallbacks},
  204.   };
  205.   
  206.   static MenuItemsList menu_list[] = {
  207. ***************
  208. *** 349,358 ****
  209. --- 352,367 ----
  210.       CanvasWidget = XtCreateManagedWidget("canvas", windowWidgetClass, 
  211.        BaseFrame, canvas_args, XtNumber(canvas_args));
  212.       XtGetValues(CanvasWidget, query_args, XtNumber(query_args));
  213. +     ViewWidth = xwidth;
  214. +     ViewHeight = xheight;
  215.       if (Scrollbars) {
  216.           /* vertical scrollbar to the right of the canvas */
  217.           XtSetArg(scroll_args[0], XtNlength, ViewHeight);
  218.           XtSetArg(scroll_args[2], XtNfromHoriz, CanvasWidget);
  219. +         XtSetArg(scroll_args[3], XtNtop, 
  220. +          (float) ((float) ViewTop / (float) PAGE_PIXEL_HEIGHT));
  221. +         XtSetArg(scroll_args[4], XtNshown, 
  222. +          (float) ((float) ViewHeight / (float) PAGE_PIXEL_HEIGHT));
  223.           VertScroll = XtCreateManagedWidget("vscroll", 
  224.            scrollbarWidgetClass, BaseFrame, 
  225.            scroll_args, XtNumber(scroll_args));
  226. ***************
  227. *** 360,365 ****
  228. --- 369,378 ----
  229.           XtSetArg(scroll_args[0], XtNlength, ViewWidth);
  230.           XtSetArg(scroll_args[1], XtNorientation, XtorientHorizontal);
  231.           XtSetArg(scroll_args[2], XtNfromVert, CanvasWidget);
  232. +         XtSetArg(scroll_args[3], XtNtop, 
  233. +          (float) ((float) ViewLeft / (float) PAGE_PIXEL_WIDTH));
  234. +         XtSetArg(scroll_args[4], XtNshown, 
  235. +          (float) ((float) ViewWidth / (float) PAGE_PIXEL_WIDTH));
  236.           HorizScroll = XtCreateManagedWidget("hscroll", 
  237.            scrollbarWidgetClass, BaseFrame, 
  238.            scroll_args, XtNumber(scroll_args));
  239. ***************
  240. *** 388,397 ****
  241.           minibuf_args[2].value = (XtArgVal) CanvasWidget;
  242.       InputWidget = XtCreateManagedWidget("minibuf", minibufWidgetClass,
  243.           BaseFrame, minibuf_args, XtNumber(minibuf_args));
  244. -     if (Scrollbars)
  245. -         SetScrollBar();
  246.       XtRealizeWidget(topLevel);
  247.       XFlush(dpy);
  248.       DrawingCanvas = XtWindow(CanvasWidget);
  249.       OuterFrame = XtWindow(topLevel);
  250.       InputWin = XtWindow(InputWidget);
  251. --- 401,410 ----
  252.           minibuf_args[2].value = (XtArgVal) CanvasWidget;
  253.       InputWidget = XtCreateManagedWidget("minibuf", minibufWidgetClass,
  254.           BaseFrame, minibuf_args, XtNumber(minibuf_args));
  255.       XtRealizeWidget(topLevel);
  256.       XFlush(dpy);
  257. +     if (Scrollbars)
  258. +         SetScrollBar();
  259.       DrawingCanvas = XtWindow(CanvasWidget);
  260.       OuterFrame = XtWindow(topLevel);
  261.       InputWin = XtWindow(InputWidget);
  262. ***************
  263. *** 768,778 ****
  264.   }
  265.   
  266.   
  267. ! static void Thumbed(w, closure, top)
  268.   Widget w;
  269.   caddr_t closure;
  270. ! float top;
  271.   {
  272.   #ifdef WINDOWDEBUG
  273.       printf( "thumbed to %f%%\n", top );
  274.   #endif
  275. --- 781,792 ----
  276.   }
  277.   
  278.   
  279. ! static void Thumbed(w, closure, percent)
  280.   Widget w;
  281.   caddr_t closure;
  282. ! caddr_t percent;
  283.   {
  284. +     float top = *((float *) percent);
  285.   #ifdef WINDOWDEBUG
  286.       printf( "thumbed to %f%%\n", top );
  287.   #endif
  288. diff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/CheckItem.c xtroff/XtStuff/CheckItem.c
  289. *** /h/xwindows/X/contrib/clients/xtroff/XtStuff/CheckItem.c    Fri Jun 10 01:20:10 1988
  290. --- xtroff/XtStuff/CheckItem.c    Fri Nov 11 23:53:27 1988
  291. ***************
  292. *** 121,126 ****
  293. --- 121,128 ----
  294.       NULL,                                  /* callback_private    */
  295.       defaultTranslations,           /* tm_table          */
  296.       NULL,                                  /* query_geometry    */
  297. +     /* display_accelerator    */    XtInheritDisplayAccelerator,
  298. +     /* extension        */    NULL
  299.     },  /* CoreClass fields initialization */
  300.     {
  301.       0,                                     /* field not used    */
  302. diff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/CheckItem.h xtroff/XtStuff/CheckItem.h
  303. *** /h/xwindows/X/contrib/clients/xtroff/XtStuff/CheckItem.h    Fri Jun 10 01:20:10 1988
  304. --- xtroff/XtStuff/CheckItem.h    Fri Nov 11 23:44:49 1988
  305. ***************
  306. *** 43,61 ****
  307.    *
  308.    ***********************************************************************/
  309.   
  310. - #ifndef _XtJustify_e
  311. - #define _XtJustify_e
  312. - 
  313. - 
  314. - 
  315. - 
  316. - typedef enum {
  317. -     XtJustifyLeft,       /* justify text to left side of button   */
  318. -     XtJustifyCenter,     /* justify text in center of button      */
  319. -     XtJustifyRight       /* justify text to right side of button  */
  320. - } XtJustify;
  321. - #endif _XtJustify_e
  322. - 
  323.   #define XtNcallback        "callback"
  324.   #define XtNhighlightThickness   "hightlightThickness"
  325.   #define XtNtranslations        "translations"
  326. --- 43,48 ----
  327. diff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/Menu.c xtroff/XtStuff/Menu.c
  328. *** /h/xwindows/X/contrib/clients/xtroff/XtStuff/Menu.c    Fri Jun 10 01:20:11 1988
  329. --- xtroff/XtStuff/Menu.c    Sat Nov 12 00:20:49 1988
  330. ***************
  331. *** 37,47 ****
  332.   
  333.   #include    <X11/IntrinsicP.h>
  334.   #include    <X11/StringDefs.h>
  335. ! #include    <X11/Misc.h>
  336.   #include    "MenuP.h"
  337.   #include    "MenuItem.h"
  338.   #include    "CheckItem.h"
  339. ! #include        <X11/Label.h>
  340.   #include    <ctype.h>
  341.   
  342.   /****************************************************************
  343. --- 37,48 ----
  344.   
  345.   #include    <X11/IntrinsicP.h>
  346.   #include    <X11/StringDefs.h>
  347. ! #include    <X11/XawMisc.h>
  348. ! #include    <X11/Xmu.h>
  349.   #include    "MenuP.h"
  350.   #include    "MenuItem.h"
  351.   #include    "CheckItem.h"
  352. ! #include     <X11/Label.h>
  353.   #include    <ctype.h>
  354.   
  355.   /****************************************************************
  356. ***************
  357. *** 56,64 ****
  358.        XtOffset(MenuWidget, menu.x_margin), XtRString, "0"},
  359.       {XtNyMargin, XtCVSpace, XtRInt, sizeof(int),
  360.        XtOffset(MenuWidget, menu.y_margin), XtRString, "0"},
  361. !     {XtNx, XtCPosition, XtRInt, sizeof(int),
  362.            XtOffset(MenuWidget,core.x),XtRString, "800"},
  363. !     {XtNy, XtCPosition, XtRInt, sizeof(int),
  364.            XtOffset(MenuWidget,core.y),XtRString, "800"},
  365.       {XtNborder,"MyBorder",XtRPixel,sizeof(Pixel),
  366.            XtOffset(MenuWidget,core.border_pixel),XtRString, "Black"},
  367. --- 57,65 ----
  368.        XtOffset(MenuWidget, menu.x_margin), XtRString, "0"},
  369.       {XtNyMargin, XtCVSpace, XtRInt, sizeof(int),
  370.        XtOffset(MenuWidget, menu.y_margin), XtRString, "0"},
  371. !     {XtNx, XtCPosition, XtRPosition, sizeof(Position),
  372.            XtOffset(MenuWidget,core.x),XtRString, "800"},
  373. !     {XtNy, XtCPosition, XtRPosition, sizeof(Position),
  374.            XtOffset(MenuWidget,core.y),XtRString, "800"},
  375.       {XtNborder,"MyBorder",XtRPixel,sizeof(Pixel),
  376.            XtOffset(MenuWidget,core.border_pixel),XtRString, "Black"},
  377. ***************
  378. *** 72,78 ****
  379.            XtOffset(MenuWidget,menu.check_foreground_pixel),XtRString, "Black"},
  380.       {XtNbackground, XtCBackground,XtRPixel, sizeof(Pixel),
  381.            XtOffset(MenuWidget,core.background_pixel),XtRString, "White"},
  382. !     {XtNborderWidth, XtCBorderWidth, XtRInt, sizeof(int),
  383.            XtOffset(MenuWidget,core.border_width),XtRString, "2"},
  384.       {XtNorientation, XtCOrientation, XtROrientation, sizeof(XtOrientation),
  385.            XtOffset(MenuWidget,menu.orient),XtRString, "vertical"},
  386. --- 73,79 ----
  387.            XtOffset(MenuWidget,menu.check_foreground_pixel),XtRString, "Black"},
  388.       {XtNbackground, XtCBackground,XtRPixel, sizeof(Pixel),
  389.            XtOffset(MenuWidget,core.background_pixel),XtRString, "White"},
  390. !     {XtNborderWidth, XtCBorderWidth, XtRDimension, sizeof(Dimension),
  391.            XtOffset(MenuWidget,core.border_width),XtRString, "2"},
  392.       {XtNorientation, XtCOrientation, XtROrientation, sizeof(XtOrientation),
  393.            XtOffset(MenuWidget,menu.orient),XtRString, "vertical"},
  394. ***************
  395. *** 126,131 ****
  396. --- 127,134 ----
  397.       /* callback_private   */    NULL,
  398.       /* tm_table           */    NULL,
  399.       /* query_geometry     */    NULL,
  400. +     /* display_accelerator    */    XtInheritDisplayAccelerator,
  401. +     /* extension        */    NULL
  402.     },{
  403.   /* composite_class fields */
  404.       /* geometry_manager   */    GeometryManager,
  405. ***************
  406. *** 132,139 ****
  407.       /* change_managed     */    ChangeManaged,
  408.       /* insert_child      */    NULL,    /* Inherit from superclass */
  409.       /* delete_child      */    NULL,    /* Inherit from superclass */
  410. -     /* move_focus_to_next */    NULL,
  411. -     /* move_focus_to_prev */    NULL
  412.     },{
  413.       /* mumble          */    0    /* Make C compiler happy   */
  414.     }
  415. --- 135,140 ----
  416. diff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/Menu.h xtroff/XtStuff/Menu.h
  417. *** /h/xwindows/X/contrib/clients/xtroff/XtStuff/Menu.h    Fri Jun 10 01:20:11 1988
  418. --- xtroff/XtStuff/Menu.h    Fri Nov 11 23:44:49 1988
  419. ***************
  420. *** 58,68 ****
  421.   #define XtitemCheckable        0x02    /* 0=uncheckable, 1=checkable    */
  422.   #define XtitemIsChecked        0x01    /* 0=unchecked, 1=checked    */
  423.   
  424. - #ifndef _XtOrientation_e
  425. - #define _XtOrientation_e
  426. - typedef enum {XtorientHorizontal, XtorientVertical} XtOrientation;
  427. - #endif _XtOrientation_e
  428. - 
  429.   /* Class record constants */
  430.   
  431.   extern WidgetClass menuWidgetClass;
  432. --- 58,63 ----
  433. diff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/MenuItem.c xtroff/XtStuff/MenuItem.c
  434. *** /h/xwindows/X/contrib/clients/xtroff/XtStuff/MenuItem.c    Fri Jul  8 05:42:16 1988
  435. --- xtroff/XtStuff/MenuItem.c    Fri Nov 11 23:53:27 1988
  436. ***************
  437. *** 116,121 ****
  438. --- 116,123 ----
  439.       NULL,                                  /* callback_private    */
  440.       defaultTranslations,           /* tm_table          */
  441.       NULL,                                  /* query_geometry    */
  442. +     /* display_accelerator    */    XtInheritDisplayAccelerator,
  443. +     /* extension        */    NULL
  444.     },  /* CoreClass fields initialization */
  445.     {
  446.       0,                                     /* field not used    */
  447. diff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/MenuItem.h xtroff/XtStuff/MenuItem.h
  448. *** /h/xwindows/X/contrib/clients/xtroff/XtStuff/MenuItem.h    Fri Jun 10 01:20:11 1988
  449. --- xtroff/XtStuff/MenuItem.h    Fri Nov 11 23:42:35 1988
  450. ***************
  451. *** 43,61 ****
  452.    *
  453.    ***********************************************************************/
  454.   
  455. - #ifndef _XtJustify_e
  456. - #define _XtJustify_e
  457. - 
  458. - 
  459. - 
  460. - 
  461. - typedef enum {
  462. -     XtJustifyLeft,       /* justify text to left side of button   */
  463. -     XtJustifyCenter,     /* justify text in center of button      */
  464. -     XtJustifyRight       /* justify text to right side of button  */
  465. - } XtJustify;
  466. - #endif _XtJustify_e
  467. - 
  468.   #define XtNcallback        "callback"
  469.   #define XtNhighlightThickness   "hightlightThickness"
  470.   #define XtNtranslations        "translations"
  471. --- 43,48 ----
  472. diff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/Minibuf.c xtroff/XtStuff/Minibuf.c
  473. *** /h/xwindows/X/contrib/clients/xtroff/XtStuff/Minibuf.c    Wed Aug 31 18:23:45 1988
  474. --- xtroff/XtStuff/Minibuf.c    Sat Nov 12 04:35:06 1988
  475. ***************
  476. *** 79,85 ****
  477.   #define BUF_BLOCK         128
  478.   
  479.   #define MIN_COLS         5
  480. ! #define DEFAULTFONT        "Fixed"
  481.   #define ABORT_MSG        "[Aborted]"
  482.   #define DELAY            300000        /*
  483.                                        *  Microseconds of delay for cursor
  484. --- 79,85 ----
  485.   #define BUF_BLOCK         128
  486.   
  487.   #define MIN_COLS         5
  488. ! #define DEFAULTFONT        "8x13"
  489.   #define ABORT_MSG        "[Aborted]"
  490.   #define DELAY            300000        /*
  491.                                        *  Microseconds of delay for cursor
  492. ***************
  493. *** 170,176 ****
  494.       {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
  495.        offset(minibuf.foreground), XtRString, "Black"},
  496.       {XtNfont,  XtCFont, XtRFontStruct, sizeof(XFontStruct *),
  497. !      offset(minibuf.finfo),XtRString, "Fixed"},
  498.       {XtNcursor, XtCCursor, XtRCursor, sizeof(Cursor),
  499.        offset(minibuf.cursor), XtRString, "xterm"},
  500.       {XtNfinishedCallback, XtCCallback, XtRCallback, sizeof(XtProc),
  501. --- 170,176 ----
  502.       {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
  503.        offset(minibuf.foreground), XtRString, "Black"},
  504.       {XtNfont,  XtCFont, XtRFontStruct, sizeof(XFontStruct *),
  505. !      offset(minibuf.finfo),XtRString, DEFAULTFONT},
  506.       {XtNcursor, XtCCursor, XtRCursor, sizeof(Cursor),
  507.        offset(minibuf.cursor), XtRString, "xterm"},
  508.       {XtNfinishedCallback, XtCCallback, XtRCallback, sizeof(XtProc),
  509. ***************
  510. *** 220,225 ****
  511. --- 220,227 ----
  512.           NULL,                            /* callback_private          */
  513.           defaultTranslations,            /* tm_table                  */
  514.           NULL,                            /* query_geometry          */
  515. +         XtInheritDisplayAccelerator,    /* display_accelerator    */
  516. +         NULL                            /* extension        */
  517.       },  /* CoreClass fields initialization */
  518.       {
  519.           0,                                /* field not used        */
  520. ***************
  521. *** 257,264 ****
  522.           mcore(height) = fontheight(mbuf(finfo));
  523.   
  524.       if (mbuf(finfo)->per_char != NULL) {
  525.           /* default font since we must have a fixed width font */
  526. !         XtConvert(new, XtRString, (XrmValuePtr) DEFAULTFONT,
  527.            XtRFontStruct, (XrmValuePtr) mbuf(finfo));
  528.   #ifdef DEBUG
  529.           fprintf(stderr, "Need fixed font - falling back on default \"%s\"\n",
  530. --- 259,269 ----
  531.           mcore(height) = fontheight(mbuf(finfo));
  532.   
  533.       if (mbuf(finfo)->per_char != NULL) {
  534. +         XrmValue value;
  535. +         value.size = sizeof(DEFAULTFONT);
  536. +         value.addr = DEFAULTFONT;
  537.           /* default font since we must have a fixed width font */
  538. !         XtConvert(new, XtRString, &value,
  539.            XtRFontStruct, (XrmValuePtr) mbuf(finfo));
  540.   #ifdef DEBUG
  541.           fprintf(stderr, "Need fixed font - falling back on default \"%s\"\n",
  542. diff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/Window.c xtroff/XtStuff/Window.c
  543. *** /h/xwindows/X/contrib/clients/xtroff/XtStuff/Window.c    Thu Aug 18 23:55:31 1988
  544. --- xtroff/XtStuff/Window.c    Sat Nov 12 01:10:51 1988
  545. ***************
  546. *** 79,84 ****
  547. --- 79,87 ----
  548.       /* version            */    XtVersion,
  549.       /* callback_private   */    NULL,
  550.       /* tm_table           */    NULL,
  551. +     /* query_geometry     */    NULL,
  552. +     /* display_accelerator*/    XtInheritDisplayAccelerator,
  553. +     /* extension          */    NULL
  554.     }
  555.   };
  556.   
  557. diff -r -c /h/xwindows/X/contrib/clients/xtroff/XtStuff/Window.h xtroff/XtStuff/Window.h
  558. *** /h/xwindows/X/contrib/clients/xtroff/XtStuff/Window.h    Thu Aug 18 23:55:44 1988
  559. --- xtroff/XtStuff/Window.h    Sat Nov 12 00:02:01 1988
  560. ***************
  561. *** 11,17 ****
  562.    *
  563.    ***********************************************************************/
  564.   
  565. - #define XtNpixmap    "Pixmap"
  566.   #define XtCpixmap    "Pixmap"
  567.   
  568.   /* Class record constants */
  569. --- 11,16 ----
  570. diff -r -c /h/xwindows/X/contrib/clients/xtroff/fontstuff/MakeImFonts xtroff/fontstuff/MakeImFonts
  571. *** /h/xwindows/X/contrib/clients/xtroff/fontstuff/MakeImFonts    Thu Sep  1 00:06:10 1988
  572. --- xtroff/fontstuff/MakeImFonts    Sat Nov 12 02:34:18 1988
  573. ***************
  574. *** 23,29 ****
  575.   if test x$XWIN != x ; then
  576.       if test $XWIN != suntroff ; then
  577.           XWIN=x
  578. !         FC=${5-fc}
  579.       else
  580.           XWIN=
  581.           FC=
  582. --- 23,29 ----
  583.   if test x$XWIN != x ; then
  584.       if test $XWIN != suntroff ; then
  585.           XWIN=x
  586. !         FC=${5-bdftosnf}
  587.       else
  588.           XWIN=
  589.           FC=
  590. ***************
  591. *** 62,68 ****
  592.           NewSize=`expr $Size \* 100 / $PERCENT`
  593.           if test x$XWIN != x ; then
  594.               fname=`echo $Font | tr A-Z a-z`
  595. !             fname=$DEVICE.$fname.$NewSize.snf
  596.           else
  597.               fname=$Font.$NewSize
  598.           fi
  599. --- 62,69 ----
  600.           NewSize=`expr $Size \* 100 / $PERCENT`
  601.           if test x$XWIN != x ; then
  602.               fname=`echo $Font | tr A-Z a-z`
  603. !             fontname=$DEVICE.$fname.$NewSize
  604. !             fname=$fontname.snf
  605.           else
  606.               fname=$Font.$NewSize
  607.           fi
  608. ***************
  609. *** 76,82 ****
  610.                       $SUNTROFF_FONTS/$fname
  611.               else
  612.                   $BIN_DIR/ch2vft $TEMP > $TEMP2
  613. !                 $BIN_DIR/vf2bdf $TEMP2 $NewSize |
  614.                   $FC > $SUNTROFF_FONTS/$fname
  615.               fi
  616.   
  617. --- 77,84 ----
  618.                       $SUNTROFF_FONTS/$fname
  619.               else
  620.                   $BIN_DIR/ch2vft $TEMP > $TEMP2
  621. !                 $BIN_DIR/vf2bdf $TEMP2 $NewSize | \
  622. !                 sed 's?^FONT .*$?FONT '$fontname'?' | \
  623.                   $FC > $SUNTROFF_FONTS/$fname
  624.               fi
  625.   
  626. ***************
  627. *** 103,118 ****
  628.           else
  629.               extension=
  630.           fi
  631. !         f1=$SUNTROFF_FONTS/$Font.`expr $Size - 1`$extension
  632. !         f2=$SUNTROFF_FONTS/$Font.`expr $Size`$extension
  633. !         f3=$SUNTROFF_FONTS/$Font.`expr $Size + 1`$extension
  634.   
  635.           if [ -r $f1 -o -r $f2 -o -r $f3 ]
  636.           then
  637.               true
  638.           else
  639.               echo scaling and converting $RSTFONTS/$i to \
  640. !                 $SUNTROFF_FONTS/$DEVICE.$Font.$Size$extension
  641.               $BIN_DIR/rst2ch $RSTFONTS/$i > $TEMP
  642.               $BIN_DIR/scalech -s$PERCENT  $TEMP > $TEMP2
  643.               if test x$XWIN = x ; then
  644. --- 105,129 ----
  645.           else
  646.               extension=
  647.           fi
  648. !         if [ x$XWIN = x ]
  649. !         then
  650. !             f1=$SUNTROFF_FONTS/$Font.`expr $Size - 1`$extension
  651. !             f2=$SUNTROFF_FONTS/$Font.`expr $Size`$extension
  652. !             f3=$SUNTROFF_FONTS/$Font.`expr $Size + 1`$extension
  653. !         else
  654. !             f1=$SUNTROFF_FONTS/$DEVICE.$Font.`expr $Size - 1`$extension
  655. !             f2=$SUNTROFF_FONTS/$DEVICE.$Font.`expr $Size`$extension
  656. !             f3=$SUNTROFF_FONTS/$DEVICE.$Font.`expr $Size + 1`$extension
  657. !         fi
  658.   
  659.           if [ -r $f1 -o -r $f2 -o -r $f3 ]
  660.           then
  661.               true
  662.           else
  663. +             fontname=$DEVICE.$Font.$Size
  664. +             fname=$fontname$extension
  665.               echo scaling and converting $RSTFONTS/$i to \
  666. !                 $SUNTROFF_FONTS/$fname
  667.               $BIN_DIR/rst2ch $RSTFONTS/$i > $TEMP
  668.               $BIN_DIR/scalech -s$PERCENT  $TEMP > $TEMP2
  669.               if test x$XWIN = x ; then
  670. ***************
  671. *** 120,127 ****
  672.               else
  673.                   $BIN_DIR/ch2vft $TEMP2 > $TEMP
  674.                   $BIN_DIR/vf2bdf $TEMP $Size |
  675. !                 $FC > $SUNTROFF_FONTS/$DEVICE.$Font.$Size$extension
  676.               fi
  677.           fi
  678.       fi
  679.   done
  680. --- 131,142 ----
  681.               else
  682.                   $BIN_DIR/ch2vft $TEMP2 > $TEMP
  683.                   $BIN_DIR/vf2bdf $TEMP $Size |
  684. !                 sed 's?^FONT .*$?FONT '$fontname'?' | \
  685. !                 $FC > $SUNTROFF_FONTS/$fname
  686.               fi
  687.           fi
  688.       fi
  689.   done
  690. + if [ x$XWIN != x ]; then
  691. +     mkfontdir $SUNTROFF_FONTS
  692. + fi
  693. diff -r -c /h/xwindows/X/contrib/clients/xtroff/fontstuff/MakeSunFonts xtroff/fontstuff/MakeSunFonts
  694. *** /h/xwindows/X/contrib/clients/xtroff/fontstuff/MakeSunFonts    Thu Sep  1 01:42:57 1988
  695. --- xtroff/fontstuff/MakeSunFonts    Sat Nov 12 02:34:17 1988
  696. ***************
  697. *** 22,28 ****
  698.   if test x$XWIN != x ; then
  699.       if test $XWIN != suntroff ; then
  700.           XWIN=x
  701. !         FC=${5-fc}
  702.       else
  703.           XWIN=
  704.           FC=
  705. --- 22,28 ----
  706.   if test x$XWIN != x ; then
  707.       if test $XWIN != suntroff ; then
  708.           XWIN=x
  709. !         FC=${5-bdftosnf}
  710.       else
  711.           XWIN=
  712.           FC=
  713. ***************
  714. *** 69,75 ****
  715.           NewSize=`expr $Size \* 100 / $PERCENT`
  716.           if test x$XWIN != x ; then
  717.               fname=`echo $Font | tr A-Z a-z`
  718. !             fname=$DEVICE.$fname.$NewSize.snf
  719.           else
  720.               fname=$Font.$NewSize
  721.           fi
  722. --- 69,76 ----
  723.           NewSize=`expr $Size \* 100 / $PERCENT`
  724.           if test x$XWIN != x ; then
  725.               fname=`echo $Font | tr A-Z a-z`
  726. !             fontname=$DEVICE.$fname.$NewSize
  727. !             fname=$fontname.snf
  728.           else
  729.               fname=$Font.$NewSize
  730.           fi
  731. ***************
  732. *** 82,87 ****
  733. --- 83,89 ----
  734.                             $SUNTROFF_FONTS/$fname
  735.               else
  736.                   $BIN_DIR/vf2bdf $VFONTS/$i $NewSize | \
  737. +                 sed 's?^FONT .*$?FONT '$fontname'?' | \
  738.                   $FC > $SUNTROFF_FONTS/$fname
  739.               fi
  740.           fi
  741. ***************
  742. *** 107,122 ****
  743.           else
  744.               extension=
  745.           fi
  746. !         f1=$SUNTROFF_FONTS/$Font.`expr $Size - 1`$extension
  747. !         f2=$SUNTROFF_FONTS/$Font.`expr $Size`$extension
  748. !         f3=$SUNTROFF_FONTS/$Font.`expr $Size + 1`$extension
  749.   
  750.           if [ -r $f1 -o -r $f2 -o -r $f3 ]
  751.           then
  752.               true
  753.           else
  754.               echo scaling and converting $VFONTS/$i to \
  755. !                 $SUNTROFF_FONTS/$DEVICE.$Font.$Size$extension
  756.               $BIN_DIR/vft2ch $VFONTS/$i > $TEMP
  757.               $BIN_DIR/scalech -s$PERCENT  $TEMP > $TEMP2
  758.               if test x$XWIN = x ; then
  759. --- 109,133 ----
  760.           else
  761.               extension=
  762.           fi
  763. !         if [ x$XWIN = x ]
  764. !         then
  765. !             f1=$SUNTROFF_FONTS/$Font.`expr $Size - 1`$extension
  766. !             f2=$SUNTROFF_FONTS/$Font.`expr $Size`$extension
  767. !             f3=$SUNTROFF_FONTS/$Font.`expr $Size + 1`$extension
  768. !         else
  769. !             f1=$SUNTROFF_FONTS/$DEVICE.$Font.`expr $Size - 1`$extension
  770. !             f2=$SUNTROFF_FONTS/$DEVICE.$Font.`expr $Size`$extension
  771. !             f3=$SUNTROFF_FONTS/$DEVICE.$Font.`expr $Size + 1`$extension
  772. !         fi
  773.   
  774.           if [ -r $f1 -o -r $f2 -o -r $f3 ]
  775.           then
  776.               true
  777.           else
  778. +             fontname=$DEVICE.$Font.$Size
  779. +             fname=$fontname$extension
  780.               echo scaling and converting $VFONTS/$i to \
  781. !                 $SUNTROFF_FONTS/$fname
  782.               $BIN_DIR/vft2ch $VFONTS/$i > $TEMP
  783.               $BIN_DIR/scalech -s$PERCENT  $TEMP > $TEMP2
  784.               if test x$XWIN = x ; then
  785. ***************
  786. *** 124,131 ****
  787.               else
  788.                   $BIN_DIR/ch2vft $TEMP2 > $TEMP
  789.                   $BIN_DIR/vf2bdf $TEMP $Size |
  790. !                 $FC > $SUNTROFF_FONTS/$DEVICE.$Font.$Size$extension
  791.               fi
  792.           fi
  793.       fi
  794.   done
  795. --- 135,146 ----
  796.               else
  797.                   $BIN_DIR/ch2vft $TEMP2 > $TEMP
  798.                   $BIN_DIR/vf2bdf $TEMP $Size |
  799. !                 sed 's?^FONT .*$?FONT '$fontname'?' | \
  800. !                 $FC > $SUNTROFF_FONTS/$fname
  801.               fi
  802.           fi
  803.       fi
  804.   done
  805. + if [ x$XWIN != x ]; then
  806. +     mkfontdir $SUNTROFF_FONTS
  807. + fi
  808. diff -r -c /h/xwindows/X/contrib/clients/xtroff/fontstuff/Makefile xtroff/fontstuff/Makefile
  809. *** /h/xwindows/X/contrib/clients/xtroff/fontstuff/Makefile    Thu Sep  1 00:13:25 1988
  810. --- xtroff/fontstuff/Makefile    Sat Nov 12 01:37:44 1988
  811. ***************
  812. *** 1,5 ****
  813.   #    Not standalone - it gets a lot of variables from the invocation.
  814. ! #    VFONTS, RSTFONTS, SUNTROFF_FONTS, PERCENT, PREVIEWER, FC
  815.   
  816.   all: install
  817.   
  818. --- 1,7 ----
  819.   #    Not standalone - it gets a lot of variables from the invocation.
  820. ! #    VFONTS, RSTFONTS, SUNTROFF_FONTS, PERCENT, PREVIEWER, FC, CDEBUGFLAGS
  821. ! 
  822. ! CFLAGS = $(CDEBUGFLAGS)
  823.   
  824.   all: install
  825.   
  826. diff -r -c /h/xwindows/X/contrib/clients/xtroff/fontstuff/vf2bdf.c xtroff/fontstuff/vf2bdf.c
  827. *** /h/xwindows/X/contrib/clients/xtroff/fontstuff/vf2bdf.c    Fri Jun 10 02:13:08 1988
  828. --- xtroff/fontstuff/vf2bdf.c    Sat Nov 12 02:04:12 1988
  829. ***************
  830. *** 127,133 ****
  831.           {
  832.               for (k = (pd->left + pd->right + 7) / 8; --k >= 0; )
  833.                   printf("%02x", *p++);
  834. !             printf(" \n");
  835.           }
  836.           printf("ENDCHAR\n");
  837.       }
  838. --- 127,133 ----
  839.           {
  840.               for (k = (pd->left + pd->right + 7) / 8; --k >= 0; )
  841.                   printf("%02x", *p++);
  842. !             printf("\n");
  843.           }
  844.           printf("ENDCHAR\n");
  845.       }
  846. diff -r -c /h/xwindows/X/contrib/clients/xtroff/xtroff.man xtroff/xtroff.manX
  847. *** /h/xwindows/X/contrib/clients/xtroff/xtroff.man    Thu Jul 14 18:59:28 1988
  848. --- xtroff/xtroff.manX    Sat Nov 12 03:03:22 1988
  849. ***************
  850. *** 234,244 ****
  851.   "-xrm".
  852.   Some of the options are meaningless for \fIxtroff\fP. 
  853.   .SH "FILES"
  854. ! .na
  855. ! .ta \w'/usr/local/lib/xtroff/*   'u
  856. ! /usr/local/lib/troff/*    - troff width tables
  857. ! /usr/local/lib/xtroff/*    - bitmap fonts for xtroff
  858. ! .ad
  859.   .SH "SEE ALSO"
  860.   .LP
  861.   .I Using and Specifiying X Resources
  862. --- 234,242 ----
  863.   "-xrm".
  864.   Some of the options are meaningless for \fIxtroff\fP. 
  865.   .SH "FILES"
  866. ! WIDTHDIR/*    - troff width tables
  867. ! .br
  868. ! FONTDIR/*    - bitmap fonts for xtroff
  869.   .SH "SEE ALSO"
  870.   .LP
  871.   .I Using and Specifiying X Resources
  872. WhAt_A_mArOoN
  873. echo 'Now run ximake in this directory, and XtStuff to generate the Makefiles'
  874. echo 'And you are ready to go...'
  875. exit
  876.