BSD 4_3_Reno release

[unix-history] / usr / src / usr.bin / window / ttf100.c

diff --git a/usr/src/usr.bin/window/ttf100.c b/usr/src/usr.bin/window/ttf100.c
index ccea275..df5a8a6 100644 (file)
--- a/usr/src/usr.bin/window/ttf100.c
+++ b/usr/src/usr.bin/window/ttf100.c
@@ -1,6 +1,28 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Edward Wang at The University of California, Berkeley.
+ *
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * Neither the name of the University nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)ttf100.c    3.3 3.3";
-#endif
+static char sccsid[] = "@(#)ttf100.c   3.12 (Berkeley) 6/6/90";
+#endif /* not lint */

 
 #include "ww.h"
 #include "tt.h"
 
 #include "ww.h"
 #include "tt.h"


@@ -9,21 +31,25 @@ static       char *sccsid = "@(#)ttf100.c    3.3 3.3";
  * Freedom 100
  */
 
  * Freedom 100
  */
 

-char f100_frame[16] = {
-       ' ',      'J'|0x80, 'K'|0x80, 'A'|0x80,
-       'J'|0x80, 'J'|0x80, 'B'|0x80, 'M'|0x80,
-       'K'|0x80, 'D'|0x80, 'K'|0x80, 'O'|0x80,
-       'C'|0x80, 'L'|0x80, 'N'|0x80, 'I'|0x80
+#define G (WWM_GRP << WWC_MSHIFT)
+short f100_frame[16] = {
+       ' ',    'J'|G,  'K'|G,  'A'|G,
+       'J'|G,  'J'|G,  'B'|G,  'M'|G,
+       'K'|G,  'D'|G,  'K'|G,  'O'|G,
+       'C'|G,  'L'|G,  'N'|G,  'I'|G

 };
 };

-extern char *gen_GE, *gen_GS;
+extern struct tt_str *gen_AE, *gen_AS;

 
 tt_f100()
 {
 
 tt_f100()
 {

-       int ret;
+       static struct tt_str ae = { "\033%", 2 };
+       static struct tt_str as = { "\033$", 2 };

 
 

-       ret = tt_generic();
+       if (tt_generic() < 0)
+               return -1;

        tt.tt_frame = f100_frame;
        tt.tt_frame = f100_frame;

-       gen_GS = "\033$";
-       gen_GE = "\033%";
-       return ret;
+       tt.tt_availmodes |= WWM_GRP;
+       gen_AS = &as;
+       gen_AE = &ae;
+       return 0;

 }
 }