Author: Frank Heckenbach Description: Adapt font size in alevt to modern screen sizes Last-Update: 2019-04-09 Bug-Debian: https://bugs.debian.org/926702 --- a/util/alevt/alevt.1 +++ b/util/alevt/alevt.1 @@ -21,6 +21,9 @@ child window .TP .B \-cs -charset character set +.BR \-doublefont / \-df +Instructs alevt to use double sized fonts. +.TP .TP .B \-h -help print this page --- a/util/alevt/exp-gfx.c +++ b/util/alevt/exp-gfx.c @@ -15,7 +15,16 @@ static inline void draw_char(unsigned ch int c, int dbl, int _x, int _y, int sep) { int x,y; - unsigned char* src= (latin1==LATIN1 ? font1_bits : font2_bits); + unsigned char* src = double_font ? + ( (latin1==LATIN1) ? font1_bits : + ( (latin1==LATIN2) ? font2_bits : + ( (latin1==KOI8) ? font3_bits : + ( (latin1==GREEK) ? font4_bits : /* fallback */ font1_bits) ) ) ) + : + ( (latin1==LATIN1) ? font1d_bits : + ( (latin1==LATIN2) ? font2d_bits : + ( (latin1==KOI8) ? font3d_bits : + ( (latin1==GREEK) ? font4d_bits : /* fallback */ font1d_bits) ) ) ); int dest_x=_x*CW; int dest_y=_y*CH; --- a/util/alevt/font.c +++ b/util/alevt/font.c @@ -3,3 +3,14 @@ #include "font2.xbm" #include "font3.xbm" #include "font4.xbm" + +#include "font1d.xbm" +#include "font2d.xbm" +#include "font3d.xbm" +#include "font4d.xbm" + +int CW; +int CH; +int double_font = 0; +int font_width; +int font_height; --- a/util/alevt/font.h +++ b/util/alevt/font.h @@ -1,19 +1,31 @@ #ifndef FONT_H #define FONT_H -#include "fontsize.h" /* the #defines from font?.xbm */ +// #include "fontsize.h" /* the #defines from font?.xbm */ -#if font1_width != font2_width || font1_height != font2_height -#error different font sizes. -#endif +//#if font1_width != font2_width || font1_height != font2_height +//#error different font sizes. +//#endif extern unsigned char font1_bits[]; extern unsigned char font2_bits[]; extern unsigned char font3_bits[]; extern unsigned char font4_bits[]; -#define font_width font1_width -#define font_height font1_height -#define CW (font_width/32) /* pixel width of a character */ -#define CH (font_height/8) /* pixel height of a character */ +extern unsigned char font1d_bits[]; +extern unsigned char font2d_bits[]; +extern unsigned char font3d_bits[]; +extern unsigned char font4d_bits[]; + +//#define font_width font1_width +//#define font_height font1_height +//#define CW (font_width/32) /* pixel width of a character */ +//#define CH (font_height/8) /* pixel height of a character */ + +extern int CW; +extern int CH; +extern int double_font; +extern int font_width; +extern int font_height; + #endif --- a/util/alevt/main.c +++ b/util/alevt/main.c @@ -22,6 +22,12 @@ static char *channel; static int ttpid = -1; u_int16_t sid = 0; +/* Double font size related variables */ +extern int double_font; +extern int font_width; +extern int font_height; +extern int CW; +extern int CH; static void usage(FILE *fp, int exitval) { @@ -33,6 +39,7 @@ static void usage(FILE *fp, int exitval) " -ch -child \t\t(none)\n" " -cs -charset\t\tlatin-1\n" " \n" + " -doublefont\n" " -h -help\n" " -o \t\t(none;dvb only)\n" " -p -parent \t\t900\n" @@ -127,6 +134,7 @@ static int option(int argc, char **argv, { "-sid", "-s", 1 }, { "-ttpid", "-t", 1 }, { "-vbi", "-v", 1 }, + { "-doublefont", "-df", 0 }, }; int i; if (*ind >= argc) @@ -159,6 +167,12 @@ int main(int argc, char **argv) char *arg; sid = 0; + font_width = 288; + font_height = 128; + + CW = (font_width/32); + CH = (font_height/8); + setprgname(argv[0]); fdset_init(fds); @@ -189,6 +203,13 @@ int main(int argc, char **argv) else fatal("bad charset (not latin-1/2/koi8-r/iso8859-7)"); break; + case 10: // Doublefont + double_font = 1; + font_width = 576; + font_height = 256; + CW = (font_width/32); + CH = (font_height/8); + break; case 4: // help usage(stdout, 0); break; --- a/util/alevt/Makefile +++ b/util/alevt/Makefile @@ -33,9 +33,10 @@ alevt-date: $(TOBJS) alevt-cap: $(COBJS) $(CC) $(OPT) $(COBJS) $(LDFLAGS) -o alevt-cap $(EXPLIBS) -font.o: font1.xbm font2.xbm font3.xbm font4.xbm -fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm +font.o: font1.xbm font2.xbm font3.xbm font4.xbm font1d.xbm font2d.xbm font3d.xbm font4d.xbm +fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm font1d.xbm font2d.xbm font3d.xbm font4d.xbm fgrep -h "#define" font1.xbm font2.xbm font3.xbm font4.xbm >fontsize.h + fgrep -h "#define" font1d.xbm font2d.xbm font3d.xbm font4d.xbm >> fontsize.h font1.xbm: bdf2xbm $(FONT)-latin-1.bdf ./bdf2xbm font1 <$(FONT)-latin-1.bdf >font1.xbm @@ -49,11 +50,23 @@ font3.xbm: bdf2xbm vtxt-koi8.bdf font4.xbm: bdf2xbm vtxt-iso8859-7.bdf ./bdf2xbm font4 font4.xbm +font1d.xbm: font1.xbm + /usr/bin/convert -filter Point -resize 200% font1.xbm font1d.xbm + +font2d.xbm: font2.xbm + /usr/bin/convert -filter Point -resize 200% font2.xbm font2d.xbm + +font3d.xbm: font3.xbm + /usr/bin/convert -filter Point -resize 200% font3.xbm font3d.xbm + +font4d.xbm: font4.xbm + /usr/bin/convert -filter Point -resize 200% font4.xbm font4d.xbm + bdf2xbm: bdf2xbm.c $(HOSTCC) bdf2xbm.c -o bdf2xbm clean: - rm -f *.o page*.txt a.out core bdf2xbm font?.xbm fontsize.h + rm -f *.o page*.txt a.out core bdf2xbm font?.xbm font?d.xbm fontsize.h rm -f alevt alevt-date alevt-cap rpm-install: all --- a/util/alevt/xio.c +++ b/util/alevt/xio.c @@ -122,12 +122,22 @@ static int get_fonts(struct xio *xio) GC gc; int i; unsigned char *font_bits; - switch(latin1) { - case LATIN1: font_bits=font1_bits; break; - case LATIN2: font_bits=font2_bits; break; - case KOI8: font_bits=font3_bits; break; - case GREEK: font_bits=font4_bits; break; - default: font_bits=font1_bits; break; + if(!double_font) { + switch(latin1) { + case LATIN1: font_bits=font1_bits; break; + case LATIN2: font_bits=font2_bits; break; + case KOI8: font_bits=font3_bits; break; + case GREEK: font_bits=font4_bits; break; + default: font_bits=font1_bits; break; + } + } else { + switch(latin1) { + case LATIN1: font_bits=font1d_bits; break; + case LATIN2: font_bits=font2d_bits; break; + case KOI8: font_bits=font3d_bits; break; + case GREEK: font_bits=font4d_bits; break; + default: font_bits=font1d_bits; break; + } } xio->font[0] = XCreateBitmapFromData(xio->dpy, xio->root,