|
 |
63725c6 |
diff '--color=auto' -Naur alevt-v1.8.1/alevt.1x.in alevt-v1.8.1-mod/alevt.1x.in
|
|
|
63725c6 |
--- alevt-v1.8.1/alevt.1x.in 2021-08-20 21:35:44.000000000 +0200
|
|
|
63725c6 |
+++ alevt-v1.8.1-mod/alevt.1x.in 2023-01-30 10:08:58.742932130 +0100
|
|
|
63725c6 |
@@ -73,6 +73,9 @@
|
|
|
63725c6 |
.BI \-pid \ pid
|
|
|
63725c6 |
Specifies the teletext PID if using the DVB interface.
|
|
|
4f0f027 |
.TP
|
|
|
4f0f027 |
+.BR \-doublefont / \-df
|
|
|
4f0f027 |
+Instructs alevt to use double sized fonts.
|
|
|
4f0f027 |
+.TP
|
|
|
4f0f027 |
.B \-\-help
|
|
|
4f0f027 |
Show summary of options.
|
|
|
4f0f027 |
.TP
|
|
|
63725c6 |
diff '--color=auto' -Naur alevt-v1.8.1/exp-gfx.c alevt-v1.8.1-mod/exp-gfx.c
|
|
|
63725c6 |
--- alevt-v1.8.1/exp-gfx.c 2021-08-20 21:35:44.000000000 +0200
|
|
|
63725c6 |
+++ alevt-v1.8.1-mod/exp-gfx.c 2023-01-30 10:08:59.141932965 +0100
|
|
|
4f0f027 |
@@ -21,7 +21,16 @@
|
|
|
67ef7e0 |
int sep)
|
|
|
67ef7e0 |
{
|
|
|
67ef7e0 |
int x,y;
|
|
|
4f0f027 |
- unsigned char* src= (latin1==LATIN1 ? font1_bits : font2_bits);
|
|
|
4f0f027 |
+ unsigned char* src = double_font ?
|
|
|
4f0f027 |
+ ( (latin1==LATIN1) ? font1_bits :
|
|
|
4f0f027 |
+ ( (latin1==LATIN2) ? font2_bits :
|
|
|
4f0f027 |
+ ( (latin1==KOI8) ? font3_bits :
|
|
|
4f0f027 |
+ ( (latin1==GREEK) ? font4_bits : /* fallback */ font1_bits) ) ) )
|
|
|
4f0f027 |
+ :
|
|
|
4f0f027 |
+ ( (latin1==LATIN1) ? font1d_bits :
|
|
|
4f0f027 |
+ ( (latin1==LATIN2) ? font2d_bits :
|
|
|
4f0f027 |
+ ( (latin1==KOI8) ? font3d_bits :
|
|
|
4f0f027 |
+ ( (latin1==GREEK) ? font4d_bits : /* fallback */ font1d_bits) ) ) );
|
|
|
67ef7e0 |
int dest_x=_x*CW;
|
|
|
67ef7e0 |
int dest_y=_y*CH;
|
|
|
67ef7e0 |
|
|
|
63725c6 |
diff '--color=auto' -Naur alevt-v1.8.1/font.c alevt-v1.8.1-mod/font.c
|
|
|
63725c6 |
--- alevt-v1.8.1/font.c 2021-08-20 21:35:44.000000000 +0200
|
|
|
63725c6 |
+++ alevt-v1.8.1-mod/font.c 2023-01-30 10:12:05.895323926 +0100
|
|
|
63725c6 |
@@ -4,3 +4,13 @@
|
|
|
4f0f027 |
#include "font3.xbm"
|
|
|
4f0f027 |
#include "font4.xbm"
|
|
|
4f0f027 |
|
|
|
4f0f027 |
+#include "font1d.xbm"
|
|
|
4f0f027 |
+#include "font2d.xbm"
|
|
|
4f0f027 |
+#include "font3d.xbm"
|
|
|
4f0f027 |
+#include "font4d.xbm"
|
|
|
63725c6 |
+
|
|
|
4f0f027 |
+int CW;
|
|
|
4f0f027 |
+int CH;
|
|
|
4f0f027 |
+int double_font = 0;
|
|
|
4f0f027 |
+int font_width;
|
|
|
4f0f027 |
+int font_height;
|
|
|
63725c6 |
diff '--color=auto' -Naur alevt-v1.8.1/font.h alevt-v1.8.1-mod/font.h
|
|
|
63725c6 |
--- alevt-v1.8.1/font.h 2021-08-20 21:35:44.000000000 +0200
|
|
|
63725c6 |
+++ alevt-v1.8.1-mod/font.h 2023-01-30 10:09:00.366935529 +0100
|
|
|
4f0f027 |
@@ -1,20 +1,31 @@
|
|
|
4f0f027 |
#ifndef FONT_H
|
|
|
4f0f027 |
#define FONT_H
|
|
|
4f0f027 |
|
|
|
4f0f027 |
-#include "fontsize.h" /* the #defines from font?.xbm */
|
|
|
4f0f027 |
+// #include "fontsize.h" /* the #defines from font?.xbm */
|
|
|
4f0f027 |
|
|
|
4f0f027 |
-#if font1_width != font2_width || font1_height != font2_height
|
|
|
4f0f027 |
-#error different font sizes.
|
|
|
4f0f027 |
-#endif
|
|
|
4f0f027 |
+//#if font1_width != font2_width || font1_height != font2_height
|
|
|
4f0f027 |
+//#error different font sizes.
|
|
|
4f0f027 |
+//#endif
|
|
|
67ef7e0 |
|
|
|
67ef7e0 |
extern unsigned char font1_bits[];
|
|
|
67ef7e0 |
extern unsigned char font2_bits[];
|
|
|
4f0f027 |
extern unsigned char font3_bits[];
|
|
|
4f0f027 |
extern unsigned char font4_bits[];
|
|
|
67ef7e0 |
|
|
|
67ef7e0 |
-#define font_width font1_width
|
|
|
67ef7e0 |
-#define font_height font1_height
|
|
|
67ef7e0 |
-#define CW (font_width/32) /* pixel width of a character */
|
|
|
67ef7e0 |
-#define CH (font_height/8) /* pixel height of a character */
|
|
|
4f0f027 |
+extern unsigned char font1d_bits[];
|
|
|
4f0f027 |
+extern unsigned char font2d_bits[];
|
|
|
4f0f027 |
+extern unsigned char font3d_bits[];
|
|
|
4f0f027 |
+extern unsigned char font4d_bits[];
|
|
|
67ef7e0 |
+
|
|
|
67ef7e0 |
+//#define font_width font1_width
|
|
|
67ef7e0 |
+//#define font_height font1_height
|
|
|
67ef7e0 |
+//#define CW (font_width/32) /* pixel width of a character */
|
|
|
4f0f027 |
+//#define CH (font_height/8) /* pixel height of a character */
|
|
|
4f0f027 |
+
|
|
|
4f0f027 |
+extern int CW;
|
|
|
4f0f027 |
+extern int CH;
|
|
|
4f0f027 |
+extern int double_font;
|
|
|
4f0f027 |
+extern int font_width;
|
|
|
4f0f027 |
+extern int font_height;
|
|
|
67ef7e0 |
|
|
|
67ef7e0 |
#endif
|
|
|
63725c6 |
diff '--color=auto' -Naur alevt-v1.8.1/main.c alevt-v1.8.1-mod/main.c
|
|
|
63725c6 |
--- alevt-v1.8.1/main.c 2021-08-20 21:35:44.000000000 +0200
|
|
|
63725c6 |
+++ alevt-v1.8.1-mod/main.c 2023-01-30 10:24:51.045929716 +0100
|
|
|
63725c6 |
@@ -49,6 +49,7 @@
|
|
|
63725c6 |
" -[no]bell\t\t\tenabled\n"
|
|
|
63725c6 |
" -charset
|
|
|
63725c6 |
" iso8859-7>\tlatin-1\n"
|
|
|
63725c6 |
+ " -doublefont\n"
|
|
|
63725c6 |
" -progname <name>\n"
|
|
|
63725c6 |
" -pid <pid>\n"
|
|
|
63725c6 |
"\n"
|
|
|
63725c6 |
@@ -75,6 +76,12 @@
|
|
|
63725c6 |
exit(exitval);
|
|
|
63725c6 |
}
|
|
|
67ef7e0 |
|
|
|
4f0f027 |
+/* Double font size related variables */
|
|
|
4f0f027 |
+extern int double_font;
|
|
|
4f0f027 |
+extern int font_width;
|
|
|
4f0f027 |
+extern int font_height;
|
|
|
4f0f027 |
+extern int CW;
|
|
|
4f0f027 |
+extern int CH;
|
|
|
67ef7e0 |
|
|
|
63725c6 |
static int
|
|
|
63725c6 |
arg_pgno(char *p, int *subno)
|
|
|
63725c6 |
@@ -162,6 +169,7 @@
|
|
|
67ef7e0 |
{ "-charset", "-latin", 1 },
|
|
|
63725c6 |
{ "-progname", "-pn", 1 },
|
|
|
63725c6 |
{ "-pid", "--pid", 1 },
|
|
|
67ef7e0 |
+ { "-doublefont", "-df", 0 },
|
|
|
67ef7e0 |
};
|
|
|
67ef7e0 |
int i;
|
|
|
67ef7e0 |
|
|
|
63725c6 |
@@ -284,6 +292,13 @@
|
|
|
63725c6 |
case 20: // pid
|
|
|
63725c6 |
txtpid = strtoul(arg, NULL, 0);
|
|
|
67ef7e0 |
break;
|
|
|
63725c6 |
+ case 21: // Doublefont
|
|
|
67ef7e0 |
+ double_font = 1;
|
|
|
14131aa |
+ font_width = 576;
|
|
|
14131aa |
+ font_height = 256;
|
|
|
14131aa |
+ CW = (font_width/32);
|
|
|
14131aa |
+ CH = (font_height/8);
|
|
|
67ef7e0 |
+ break;
|
|
|
63725c6 |
case 6: // parent
|
|
|
63725c6 |
case -1: // non-option arg
|
|
|
63725c6 |
pgno = arg_pgno(arg, &subno;;
|
|
|
63725c6 |
diff '--color=auto' -Naur alevt-v1.8.1/Makefile alevt-v1.8.1-mod/Makefile
|
|
|
63725c6 |
--- alevt-v1.8.1/Makefile 2021-08-20 21:35:44.000000000 +0200
|
|
|
63725c6 |
+++ alevt-v1.8.1-mod/Makefile 2023-01-30 10:09:01.423937742 +0100
|
|
|
63725c6 |
@@ -44,9 +44,10 @@
|
|
|
67ef7e0 |
alevt-cap: $(COBJS)
|
|
|
67ef7e0 |
$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
|
|
|
67ef7e0 |
|
|
|
4f0f027 |
-font.o: font1.xbm font2.xbm font3.xbm font4.xbm
|
|
|
4f0f027 |
-fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm
|
|
|
4f0f027 |
+font.o: font1.xbm font2.xbm font3.xbm font4.xbm font1d.xbm font2d.xbm font3d.xbm font4d.xbm
|
|
|
4f0f027 |
+fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm font1d.xbm font2d.xbm font3d.xbm font4d.xbm
|
|
|
4f0f027 |
fgrep -h "#define" font1.xbm font2.xbm font3.xbm font4.xbm >fontsize.h
|
|
|
4f0f027 |
+ fgrep -h "#define" font1d.xbm font2d.xbm font3d.xbm font4d.xbm >> fontsize.h
|
|
|
67ef7e0 |
|
|
|
67ef7e0 |
font1.xbm: bdf2xbm $(FONT)-latin-1.bdf
|
|
|
4f0f027 |
./bdf2xbm font1 <$(FONT)-latin-1.bdf >font1.xbm
|
|
|
63725c6 |
@@ -60,6 +61,18 @@
|
|
|
4f0f027 |
font4.xbm: bdf2xbm vtxt-iso8859-7.bdf
|
|
|
4f0f027 |
./bdf2xbm font4 <vtxt-iso8859-7.bdf >font4.xbm
|
|
|
67ef7e0 |
|
|
|
4f0f027 |
+font1d.xbm: font1.xbm
|
|
|
4f0f027 |
+ /usr/bin/convert -filter Point -resize 200% font1.xbm font1d.xbm
|
|
|
4f0f027 |
+
|
|
|
4f0f027 |
+font2d.xbm: font2.xbm
|
|
|
4f0f027 |
+ /usr/bin/convert -filter Point -resize 200% font2.xbm font2d.xbm
|
|
|
67ef7e0 |
+
|
|
|
4f0f027 |
+font3d.xbm: font3.xbm
|
|
|
4f0f027 |
+ /usr/bin/convert -filter Point -resize 200% font3.xbm font3d.xbm
|
|
|
4f0f027 |
+
|
|
|
4f0f027 |
+font4d.xbm: font4.xbm
|
|
|
4f0f027 |
+ /usr/bin/convert -filter Point -resize 200% font4.xbm font4d.xbm
|
|
|
67ef7e0 |
+
|
|
|
67ef7e0 |
bdf2xbm: bdf2xbm.c
|
|
|
67ef7e0 |
$(HOSTCC) bdf2xbm.c -o bdf2xbm
|
|
|
67ef7e0 |
|
|
|
63725c6 |
@@ -73,7 +86,7 @@
|
|
|
4f0f027 |
sed s/VERSION/$(VER)/g <alevt-cap.1.in >alevt-cap.1
|
|
|
4f0f027 |
|
|
|
4f0f027 |
clean:
|
|
|
4f0f027 |
- rm -f *.o page*.txt a.out core bdf2xbm font?.xbm fontsize.h Makefile.bak
|
|
|
4f0f027 |
+ rm -f *.o page*.txt a.out core bdf2xbm font?.xbm font?d.xbm fontsize.h Makefile.bak
|
|
|
4f0f027 |
rm -f alevt alevt-date alevt-cap
|
|
|
4f0f027 |
rm -f alevt.1x alevt-date.1 alevt-cap.1
|
|
|
4f0f027 |
rm -f contrib/a.out ttext-*.*
|
|
|
63725c6 |
diff '--color=auto' -Naur alevt-v1.8.1/xio.c alevt-v1.8.1-mod/xio.c
|
|
|
63725c6 |
--- alevt-v1.8.1/xio.c 2021-08-20 21:35:44.000000000 +0200
|
|
|
63725c6 |
+++ alevt-v1.8.1-mod/xio.c 2023-01-30 10:09:01.922938787 +0100
|
|
|
4f0f027 |
@@ -130,12 +130,22 @@
|
|
|
67ef7e0 |
int i;
|
|
|
4f0f027 |
unsigned char *font_bits;
|
|
|
4f0f027 |
|
|
|
4f0f027 |
- switch(latin1) {
|
|
|
4f0f027 |
- case LATIN1: font_bits=font1_bits; break;
|
|
|
4f0f027 |
- case LATIN2: font_bits=font2_bits; break;
|
|
|
4f0f027 |
- case KOI8: font_bits=font3_bits; break;
|
|
|
4f0f027 |
- case GREEK: font_bits=font4_bits; break;
|
|
|
4f0f027 |
- default: font_bits=font1_bits; break;
|
|
|
4f0f027 |
+ if(!double_font) {
|
|
|
4f0f027 |
+ switch(latin1) {
|
|
|
4f0f027 |
+ case LATIN1: font_bits=font1_bits; break;
|
|
|
4f0f027 |
+ case LATIN2: font_bits=font2_bits; break;
|
|
|
4f0f027 |
+ case KOI8: font_bits=font3_bits; break;
|
|
|
4f0f027 |
+ case GREEK: font_bits=font4_bits; break;
|
|
|
4f0f027 |
+ default: font_bits=font1_bits; break;
|
|
|
4f0f027 |
+ }
|
|
|
4f0f027 |
+ } else {
|
|
|
4f0f027 |
+ switch(latin1) {
|
|
|
4f0f027 |
+ case LATIN1: font_bits=font1d_bits; break;
|
|
|
4f0f027 |
+ case LATIN2: font_bits=font2d_bits; break;
|
|
|
4f0f027 |
+ case KOI8: font_bits=font3d_bits; break;
|
|
|
4f0f027 |
+ case GREEK: font_bits=font4d_bits; break;
|
|
|
4f0f027 |
+ default: font_bits=font1d_bits; break;
|
|
|
4f0f027 |
+ }
|
|
|
4f0f027 |
}
|
|
|
67ef7e0 |
|
|
|
67ef7e0 |
xio->font[0] = XCreateBitmapFromData(xio->dpy, xio->root,
|