head	1.7;
access;
symbols
	RELEASE_4_2_0:1.6
	RELEASE_4_1_1:1.6
	RELEASE_4_1_0:1.6
	RELEASE_3_5_0:1.6
	RELEASE_4_0_0:1.5
	RELEASE_3_4_0:1.4
	RELEASE_3_3_0:1.4
	RELEASE_3_2_0:1.4
	RELEASE_3_1_0:1.3
	RELEASE_2_2_8:1.2
	RELEASE_3_0_0:1.2
	RELEASE_2_2_7:1.1.1.1
	RELEASE_2_2_6:1.1.1.1
	zh_rxvt_2_4_4:1.1.1.1
	FRANKCH:1.1.1;
locks; strict;
comment	@# @;


1.7
date	2001.02.14.22.22.35;	author sf;	state dead;
branches;
next	1.6;

1.6
date	2000.04.01.00.05.46;	author mharo;	state Exp;
branches;
next	1.5;

1.5
date	2000.02.23.13.50.48;	author imura;	state Exp;
branches;
next	1.4;

1.4
date	99.03.15.01.25.10;	author steve;	state Exp;
branches;
next	1.3;

1.3
date	98.12.09.05.05.33;	author vanilla;	state Exp;
branches;
next	1.2;

1.2
date	98.10.10.01.04.31;	author vanilla;	state Exp;
branches;
next	1.1;

1.1
date	97.12.04.01.56.16;	author vanilla;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	97.12.04.01.56.16;	author vanilla;	state Exp;
branches;
next	;


desc
@@


1.7
log
@o update to 2.7.5.
o change maintainer.

PR:		24870
Submitted by:	maintainer

add USE_LIBTOOL and --enable-shared to install shared library.
@
text
@--- src/init.c.orig	Mon Mar 27 19:50:56 2000
+++ src/init.c	Mon Mar 27 19:51:44 2000
@@@@ -866,6 +866,16 @@@@
 			       GCForeground | GCBackground |
 			       GCFont | GCGraphicsExposures,
 			       &gcvalue);
+#ifdef FIX_ALIGNMENT
+	TermWin.ngc = TermWin.gc;
+#ifdef MULTICHAR_SET
+	gcvalue.font = TermWin.mfont->fid;
+	TermWin.mgc = XCreateGC(Xdisplay, TermWin.vt,
+					GCForeground | GCBackground |
+					GCFont | GCGraphicsExposures,
+					&gcvalue);
+#endif
+#endif
     }
 }
 /*----------------------------------------------------------------------*/
--- src/main.c.orig	Mon Mar 27 19:53:37 2000
+++ src/main.c	Mon Mar 27 19:54:04 2000
@@@@ -546,7 +546,11 @@@@
 
 /* alter existing GC */
     if (!init) {
+#ifdef FIX_ALIGNMENT
+	XSetFont(Xdisplay, TermWin.ngc, TermWin.font->fid);
+#else
 	XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
+#endif
 	menubar_expose();
     }
 
--- src/rxvt.h.orig	Mon Mar 27 19:54:20 2000
+++ src/rxvt.h	Mon Mar 27 19:55:36 2000
@@@@ -172,12 +172,19 @@@@
     Window          parent[KNOW_PARENTS], /* parent[0] is our window        */
 		    vt;		/* vt100 window                             */
     GC              gc;		/* GC for drawing text                      */
+#ifdef FIX_ALIGNMENT
+    GC              ngc;
+    int             vascent;
+#endif
     XFontStruct    *font;	/* main font structure                      */
 #ifndef NO_BOLDFONT
     XFontStruct    *boldFont;	/* bold font                                */
 #endif
 #ifdef MULTICHAR_SET
     XFontStruct    *mfont;	/* Multichar font structure                 */
+#endif
+#ifdef FIX_ALIGNMENT
+	GC              mgc;
 #endif
     XFontSet        fontset;
 #ifdef XPM_BACKGROUND
--- src/screen.c.orig	Mon Mar 27 19:56:10 2000
+++ src/screen.c	Mon Mar 27 20:00:03 2000
@@@@ -2162,7 +2162,12 @@@@
  * always go back to the base font - it's much safer
  */
     wbyte = 0;
-    XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
+#ifdef FIX_ALIGNMENT
+	TermWin.gc = TermWin.ngc;
+	TermWin.vascent = TermWin.font->ascent;
+#else
+	XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
+#endif
     draw_string = XDrawString;
     draw_image_string = XDrawImageString;
     clearfirst = clearlast = 0;
@@@@ -2371,7 +2376,11 @@@@
 	    len = 0;
 	    buffer[len++] = stp[col];
 	    ypixelc = Row2Pixel(row);
+#ifdef FIX_ALIGNMENT
+		ypixel = ypixelc + TermWin.vascent;
+#else
 	    ypixel = ypixelc + TermWin.font->ascent;
+#endif
 	    xpixel = Col2Pixel(col);
 	    fontdiff = 0;
 	    wlen = 1;
@@@@ -2392,7 +2401,13 @@@@
 		fprop = TermWin.mprop;
 		if (!wbyte && TermWin.mfont) {
 		    wbyte = 1;
+#ifdef FIX_ALIGNMENT
+			TermWin.gc = TermWin.mgc;
+			ypixel += TermWin.mfont->ascent - TermWin.vascent;
+			TermWin.vascent = TermWin.mfont->ascent;
+#else
 		    XSetFont(Xdisplay, TermWin.gc, TermWin.mfont->fid);
+#endif
 		    fontdiff = TermWin.mprop;
 		    draw_string = XDrawString16;
 		    draw_image_string = XDrawImageString16;
@@@@ -2439,7 +2454,13 @@@@
 		}
 		if (wbyte) {
 		    wbyte = 0;
+#ifdef FIX_ALIGNMENT
+			TermWin.gc = TermWin.ngc;
+			ypixel += TermWin.font->ascent - TermWin.vascent;
+			TermWin.vascent = TermWin.font->ascent;
+#else
 		    XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
+#endif
 		    draw_string = XDrawString;
 		    draw_image_string = XDrawImageString;
 		}
@@@@ -2537,7 +2558,11 @@@@
 		rend &= ~RS_Bold;	/* we've taken care of it */
 	    } else if (bfont) {
 		bfont = 0;
+#ifdef FIX_ALIGNMENT
+		XSetFont(Xdisplay, TermWin.ngc, TermWin.font->fid);
+#else
 		XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
+#endif
 	    }
 #endif
 /*
@@@@ -2672,6 +2697,9 @@@@
     end_row = TermWin.saveLines - TermWin.view_start;
     if (selection.op && current_screen == selection.screen) {
 	i = selection.beg.row + TermWin.saveLines;
+#ifdef FIX_ALIGNMENT
+	TermWin.gc = TermWin.ngc;
+#endif
 	row = selection.end.row + TermWin.saveLines;
 	if (i >= end_row)
 	    col = selection.beg.col;
--- src/feature.h.orig	Mon Mar 27 20:06:40 2000
+++ src/feature.h	Mon Mar 27 20:07:27 2000
@@@@ -55,18 +55,18 @@@@
  * overstrike just for multi char fonts
  * Note: NO_BOLDOVERSTRIKE implies NO_BOLDOVERSTRIKE_MULTI
  */
-/* #define NO_BOLDOVERSTRIKE */
+#define NO_BOLDOVERSTRIKE
 /* #define NO_BOLDOVERSTRIKE_MULTI */
 
 /*
  * Also use bold font or overstrike even if we use colour for bold
  */
-#define VERYBOLD
+/* #define VERYBOLD */
 
 /*
  * Compile without support for real bold fonts
  */
-/* #define NO_BOLDFONT */
+#define NO_BOLDFONT
 
 /*
  * If the screen has 24 bit mode, use that even if the default is 8 bit.
@


1.6
log
@o update chinese/rxvt to 2.7.3
o merge MASTER_SITES from x11/rxvt
o kick over-bolded font out
o now it's happy with chinese/kcfonts and chinese/arphicttf

PR:		17618
Submitted by:	clive@@cirx.org
@
text
@@


1.5
log
@Update to version 2.7.2.

PR:		16596
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- src/main.c.orig	Wed Feb  9 11:57:04 2000
+++ src/main.c	Wed Feb  9 12:02:43 2000
@@@@ -460,6 +460,16 @@@@
d12 3
a14 3
+			       GCForeground | GCBackground |
+			       GCFont | GCGraphicsExposures,
+			       &gcvalue);
d19 4
a22 2
 /* window resizing - assuming the parent window is the correct size */
@@@@ -969,7 +979,11 @@@@
d34 3
a36 12
--- src/rxvt.h.orig	Wed Feb  9 12:01:07 2000
+++ src/rxvt.h	Wed Feb  9 12:04:17 2000
@@@@ -7,6 +7,8 @@@@
 
 #include "feature.h"
 
+#define FIX_ALIGNMENT
+
 /*
  *****************************************************************************
  * SYSTEM HACKS
@@@@ -170,12 +172,19 @@@@
d52 1
a52 1
+    GC              mgc;
d56 3
a58 3
--- src/screen.c.orig	Wed Feb  9 12:04:29 2000
+++ src/screen.c	Wed Feb  9 12:23:07 2000
@@@@ -2169,7 +2169,12 @@@@
d62 1
d64 2
a65 2
+    TermWin.gc = TermWin.ngc;
+    TermWin.vascent = TermWin.font->ascent;
d67 1
a67 1
     XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
d72 1
a72 1
@@@@ -2378,7 +2383,11 @@@@
d77 1
a77 1
+	    ypixel = ypixelc + TermWin.vascent;
d84 1
a84 1
@@@@ -2399,7 +2408,13 @@@@
d89 3
a91 3
+		    TermWin.gc = TermWin.mgc;
+		    ypixel += TermWin.mfont->ascent - TermWin.vascent;
+		    TermWin.vascent = TermWin.mfont->ascent;
d98 1
a98 1
@@@@ -2446,7 +2461,13 @@@@
d103 3
a105 3
+		    TermWin.gc = TermWin.ngc;
+		    ypixel += TermWin.font->ascent - TermWin.vascent;
+		    TermWin.vascent = TermWin.font->ascent;
d112 1
a112 1
@@@@ -2544,7 +2565,11 @@@@
d124 1
a124 1
@@@@ -2679,6 +2704,9 @@@@
d134 24
@


1.4
log
@Update to version 2.6PRE2.

PR:		10394
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- src/main.c.orig	Fri Mar  5 12:26:41 1999
+++ src/main.c	Fri Mar  5 12:30:58 1999
@@@@ -453,6 +453,16 @@@@
d12 3
a14 3
+			GCForeground | GCBackground |
+			GCFont | GCGraphicsExposures,
+			&gcvalue);
d20 1
a20 1
@@@@ -976,7 +986,11 @@@@
d31 5
a35 5
 /* set the sizes */
--- src/rxvt.h.orig	Fri Mar  5 12:31:15 1999
+++ src/rxvt.h	Fri Mar  5 12:42:25 1999
@@@@ -8,6 +8,8 @@@@
 #include "../config.h"
d43 2
a44 1
@@@@ -170,11 +172,18 @@@@
a46 1
     XFontStruct    *font;	/* main font structure                      */
d51 1
d61 1
a61 1
     XFontSet       fontset;
d63 3
a65 3
--- src/screen.c.orig	Fri Mar  5 12:32:53 1999
+++ src/screen.c	Fri Mar  5 12:40:43 1999
@@@@ -2134,7 +2134,12 @@@@
d77 2
a78 3
     boldlast = 0;
@@@@ -2318,7 +2323,11 @@@@
 
d81 1
d83 1
a83 1
+	    ypixel = TermWin.vascent + Row2Pixel(row);
d85 1
a85 1
 	    ypixel = TermWin.font->ascent + Row2Pixel(row);
d88 1
d90 29
a118 30
 
@@@@ -2332,7 +2341,13 @@@@
 		    && ((srp[col + 1]) & RS_multiMask) == RS_multi2) {
 		    if (!wbyte) {
 			wbyte = 1;
+#ifdef FIX_ALIGNMENT
+			TermWin.gc = TermWin.mgc;
+			ypixel += TermWin.mfont->ascent - TermWin.vascent;
+			TermWin.vascent = TermWin.mfont->ascent;
+#else
 			XSetFont(Xdisplay, TermWin.gc, TermWin.mfont->fid);
+#endif
 			draw_string = XDrawString16;
 			draw_image_string = XDrawImageString16;
 		    }
@@@@ -2370,7 +2385,13 @@@@
 		    }
 		    if (wbyte) {
 			wbyte = 0;
+#ifdef FIX_ALIGNMENT
+			TermWin.gc = TermWin.ngc;
+			ypixel += TermWin.font->ascent - TermWin.vascent;
+			TermWin.vascent = TermWin.font->ascent;
+#else
 			XSetFont(Xdisplay, TermWin.gc, TermWin.font->fid);
+#endif
 			draw_string = XDrawString;
 			draw_image_string = XDrawImageString;
 		    }
@@@@ -2466,7 +2487,11 @@@@
d130 1
a130 34
@@@@ -2478,12 +2503,20 @@@@
 		    gcmask |= (GCForeground | GCBackground);
 		    XChangeGC(Xdisplay, TermWin.gc, gcmask, &gcvalue);
 		    XFillRectangle(Xdisplay, drawBuffer, TermWin.gc,
+#ifdef FIX_ALIGNMENT
+				   xpixel, ypixel - TermWin.vascent,
+#else
 				   xpixel, ypixel - TermWin.font->ascent,
+#endif
 				   Width2Pixel(1), Height2Pixel(1));
 		    SWAP_IT(gcvalue.foreground, gcvalue.background, ltmp);
 		    XChangeGC(Xdisplay, TermWin.gc, gcmask, &gcvalue);
 		} else
+#ifdef FIX_ALIGNMENT
+		    CLEAR_CHARS(xpixel, ypixel - TermWin.vascent, 1);
+#else
 		    CLEAR_CHARS(xpixel, ypixel - TermWin.font->ascent, 1);
+#endif
 		DRAW_STRING(draw_string, xpixel, ypixel, buffer, 1);
 #ifndef NO_BOLDOVERSTRIKE
 		if (MONO_BOLD(rend))
@@@@ -2498,7 +2531,11 @@@@
 #endif
 #ifdef XPM_BACKGROUND
 	    if (TermWin.pixmap != None && back == Color_bg) {
+#ifdef FIX_ALIGNMENT
+		CLEAR_CHARS(xpixel, ypixel - TermWin.vascent, len);
+#else
 		CLEAR_CHARS(xpixel, ypixel - TermWin.font->ascent, len);
+#endif
 		DRAW_STRING(draw_string, xpixel, ypixel, buffer, wlen);
 	    } else
 #endif
@@@@ -2612,6 +2649,9 @@@@
@


1.3
log
@Upgrade to 2.4.11
PR:		ports/9015
Submitted by:	maintainer
@
text
@d1 171
a171 69
--- configure.orig	Tue Dec  8 23:17:30 1998
+++ configure	Tue Dec  8 23:18:24 1998
@@@@ -32,6 +32,8 @@@@
 ac_help="$ac_help
   --enable-big5           enable big5 support"
 ac_help="$ac_help
+  --enable-xcin           enable Chinese input support"
+ac_help="$ac_help
   --enable-greek          enable greek keyboard support"
 ac_help="$ac_help
   --enable-ttygid         enable tty setting to group \"tty\" - use only if
@@@@ -722,6 +724,18 @@@@
   if test x$enableval = xyes; then
     cat >> confdefs.h <<\EOF
 #define ZH 1
+EOF
+
+  fi
+fi
+
+
+# Check whether --enable-xcin or --disable-xcin was given.
+if test "${enable_xcin+set}" = set; then
+  enableval="$enable_xcin"
+  if test x$enableval = xyes; then
+    cat >> confdefs.h <<\EOF
+#define XCIN 1
 EOF
 
   fi
--- autoconf/acconfig.h.orig	Tue Dec  8 21:26:28 1998
+++ autoconf/acconfig.h	Tue Dec  8 21:27:20 1998
@@@@ -34,6 +34,9 @@@@
 /* after compilation, rename executable as `crxvt' */
 #undef ZH
 
+/* Define if you want chinese input support */
+#undef XCIN
+
 /* Define if Xlocale support doesn't work */
 #undef NO_XLOCALE
 
--- autoconf/config.h.in.orig	Tue Dec  8 21:27:34 1998
+++ autoconf/config.h.in	Tue Dec  8 21:28:02 1998
@@@@ -76,6 +76,9 @@@@
 /* after compilation, rename executable as `crxvt' */
 #undef ZH
 
+/* Define if you want chinese input support */
+#undef XCIN
+
 /* Define if Xlocale support doesn't work */
 #undef NO_XLOCALE
 
--- autoconf/configure.in.orig	Tue Dec  8 21:28:18 1998
+++ autoconf/configure.in	Tue Dec  8 21:29:12 1998
@@@@ -82,6 +82,12 @@@@
     AC_DEFINE(ZH)
   fi])
 
+AC_ARG_ENABLE(xcin,
+  [  --enable-xcin           enable Chinese input support],
+  [if test x$enableval = xyes; then
+    AC_DEFINE(XCIN)
+  fi])
+
 AC_ARG_ENABLE(greek,
   [  --enable-greek          enable greek keyboard support],
   [if test x$enableval = xyes; then
@


1.2
log
@Upgrade to 2.4.8.
Submitted by:	maintainer
@
text
@d1 33
a33 3
--- autoconf/acconfig.h.orig	Fri Oct  9 16:09:57 1998
+++ autoconf/acconfig.h	Fri Oct  9 16:10:32 1998
@@@@ -35,6 +35,9 @@@@
d37 1
a37 1
+/* Define if you want XCIN Chinese Input support */
d43 3
a45 3
--- autoconf/config.h.in.orig	Fri Oct  9 16:10:46 1998
+++ autoconf/config.h.in	Fri Oct  9 16:11:23 1998
@@@@ -80,6 +80,9 @@@@
d49 1
a49 1
+/* Define if you want XCIN Chinese Input support */
d55 2
a56 2
--- autoconf/configure.in.orig	Fri Oct  9 16:11:33 1998
+++ autoconf/configure.in	Fri Oct  9 16:12:13 1998
d62 4
a65 4
+[  --enable-xcin           enable XCIN support],
+[if test x$enableval = xyes; then
+  AC_DEFINE(XCIN)
+fi])
@


1.1
log
@Initial revision
@
text
@d1 3
a3 3
--- autoconf/acconfig.h.orig	Mon Nov  3 02:00:52 1997
+++ autoconf/acconfig.h	Sat Nov 29 00:58:47 1997
@@@@ -13,6 +13,9 @@@@
d5 1
a5 1
 #undef BIG5
d13 3
a15 3
--- autoconf/config.h.in.orig	Mon Nov  3 02:00:52 1997
+++ autoconf/config.h.in	Sat Nov 29 00:58:47 1997
@@@@ -58,6 +58,9 @@@@
d17 1
a17 1
 #undef BIG5
d25 4
a28 4
--- autoconf/configure.in.orig	Mon Nov  3 02:00:52 1997
+++ autoconf/configure.in	Sat Nov 29 00:58:47 1997
@@@@ -63,6 +63,12 @@@@
     AC_DEFINE(BIG5)
@


1.1.1.1
log
@zh-rxvt enable the BIG5 support of rxvt-2.4.4,
Extra patchs have been applied to add support for XCIN
PR:		ports/5066
Submitted by:	Frankch Chen Hsiung Chan <frankch@@waru.life.nthu.edu.tw>
@
text
@@
