*** empty log message ***

diff --git a/Changes b/Changes
index 6c4bc8e..96c58f6 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,15 @@
+2.4  Tue Mar 16 07:06:51 CET 2004
+       - fix stupid double-free() bug on exit.
+       - implement xterm private mode 1049.
+        - fix manpages (debian bug #236824).
+        - removed old selection style completely.
+        - selection works _better_ for non-8-bit and double-width chars.
+        - remove native->unicode translation tables. they aren't used anymore.
+          reduces binary and distro size a bit.
+        - add string representation for JIS X 0213:2000 so these fonts can
+          be used from within rxvt.
+        - less buggy complete set of line-drawing-characters (0x2500-0x259f).
+

 2.3  Sun Mar 14 19:00:07 CET 2004
        - code cleanup release.
        - fix compile problems without --enable-combining.
 2.3  Sun Mar 14 19:00:07 CET 2004
        - code cleanup release.
        - fix compile problems without --enable-combining.


@@ -17,8 +29,8 @@
        - tis620-2529 is, of course, thai, not vietnamese...
         - a typoe prevented characters >65535 to be stored properly.
         - wcwidth is unreliable in non-unicode-locales on GNU/Linux.
        - tis620-2529 is, of course, thai, not vietnamese...
         - a typoe prevented characters >65535 to be stored properly.
         - wcwidth is unreliable in non-unicode-locales on GNU/Linux.

-          working around this fixes line-drawing characters in on-utf-8 mode.
-        - improve rounding when emulating line-drawing characters.
+          working around this fixes line-drawing characters in non-utf-8 mode.
+        - improved rounding when emulating line-drawing characters.

         - implement continuation lines in xresource parsing when
           --disable-xgetdefault.
         - changed locale-setting esc-sequence from code 9 to code 701.
         - implement continuation lines in xresource parsing when
           --disable-xgetdefault.
         - changed locale-setting esc-sequence from code 9 to code 701.

diff --git a/MANIFEST b/MANIFEST
index 761a550..95a1b26 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -164,7 +164,10 @@ src/test/strings-memmove.c
 
 src/gentables
 src/gencompose
 
 src/gentables
 src/gencompose

+src/genlinedraw

 src/table/compose.h
 src/table/compose.h

+src/table/category.h
+src/table/linedraw.h

 src/table/viscii.h
 src/table/ksc5601_1987_0.h
 src/table/gb2312_1980_0.h
 src/table/viscii.h
 src/table/ksc5601_1987_0.h
 src/table/gb2312_1980_0.h


@@ -197,7 +200,7 @@ src/table/iso8859_14.h
 src/table/iso8859_15.h
 src/table/iso8859_16.h
 src/table/jis0201_1976_0.h
 src/table/iso8859_15.h
 src/table/iso8859_16.h
 src/table/jis0201_1976_0.h

-src/table/jis0208_1983_0.h
+src/table/jis0208_1990_0.h

 src/table/jis0212_1990_0.h
 src/table/jis0213_1.h
 src/table/jis0213_2.h
 src/table/jis0212_1990_0.h
 src/table/jis0213_1.h
 src/table/jis0213_2.h

diff --git a/doc/yodl/versioninfo.yo b/doc/yodl/versioninfo.yo
index a489a4b..5e232a3 100644 (file)
--- a/doc/yodl/versioninfo.yo
+++ b/doc/yodl/versioninfo.yo
@@ -1,8 +1,8 @@
-COMMENT(-- $Id: versioninfo.yo,v 1.4 2004-03-16 05:59:16 pcg Exp $ --)
+COMMENT(-- $Id: versioninfo.yo,v 1.5 2004-03-16 06:00:41 pcg Exp $ --)

 DEFINEMACRO(RXVTNAME)(0)
        (rxvt)
 DEFINEMACRO(RXVTDATE)(0)
 DEFINEMACRO(RXVTNAME)(0)
        (rxvt)
 DEFINEMACRO(RXVTDATE)(0)

-       (2004-03-14)
+       (2004-03-16)

 DEFINEMACRO(RXVTVERSION)(0)
        (2.4)
 DEFINEMACRO(RXVTMAINT)(0)
 DEFINEMACRO(RXVTVERSION)(0)
        (2.4)
 DEFINEMACRO(RXVTMAINT)(0)

diff --git a/src/defaultfont.C b/src/defaultfont.C
index d10bed6..87b8d33 100644 (file)
--- a/src/defaultfont.C
+++ b/src/defaultfont.C
@@ -235,8 +235,7 @@ struct rxvt_font_default : rxvt_font {
     if (unicode >= 0x0080 && unicode <= 0x009f)
       return true;
 
     if (unicode >= 0x0080 && unicode <= 0x009f)
       return true;
 

-    if (unicode >= 0x2500 && unicode <= 0x259f
-        && linedraw_offs[unicode - 0x2500] & 15)
+    if (unicode >= 0x2500 && unicode <= 0x259f)

       return true;
 
     if (IS_COMPOSE (unicode))
       return true;
 
     if (IS_COMPOSE (unicode))


@@ -272,18 +271,15 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
 #endif
       text_t t = *text++;
 
 #endif
       text_t t = *text++;
 

-      int W = r->TermWin.fwidth , w = (W - 1) / 2;
-      int H = r->TermWin.fheight, h = (H - 1) / 2;
-      int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
-      int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
-
-      if (0x2500 <= t && t <= 0x259f
-          && linedraw_offs[t - 0x2500] & 15)
+      if (0x2500 <= t && t <= 0x259f)

         {
           uint16_t offs = linedraw_offs[t - 0x2500];
           uint32_t *a = linedraw_command + (offs >> 4);
           uint32_t *b = a + (offs & 15);
 
         {
           uint16_t offs = linedraw_offs[t - 0x2500];
           uint32_t *a = linedraw_command + (offs >> 4);
           uint32_t *b = a + (offs & 15);
 

+          int W = r->TermWin.fwidth;
+          int H = r->TermWin.fheight;
+

           int x_[16];
           int y_[16];
 
           int x_[16];
           int y_[16];
 


@@ -335,7 +331,6 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
                                    &gcv);
                       }
 
                                    &gcv);
                       }
 

-

                     XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
 
                     if (a)
                     XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
 
                     if (a)


@@ -345,7 +340,6 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
                         gcv.fill_style = FillSolid;
                         XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
                       }
                         gcv.fill_style = FillSolid;
                         XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
                       }

-

                     break;
                   case 2: // arc
                     XDrawArc (d.display->display, d, TGC,
                     break;
                   case 2: // arc
                     XDrawArc (d.display->display, d, TGC,

diff --git a/src/genlinedraw b/src/genlinedraw
index 1d302be..fec6af5 100755 (executable)
--- a/src/genlinedraw
+++ b/src/genlinedraw
@@ -227,10 +227,10 @@ r9,0,11,1 r9,2,11,3 r9,4,11,5 r9,6,11,7
 1h3HvV
 3hHvV
 
 1h3HvV
 3hHvV
 

--
--
--
--
+r0,10,3,10 r5,10,8,10
+r0,9,3,11 r5,9,8,11
+r10,0,10,3 r10,5,10,8
+r9,0,11,3 r9,5,11,8

 
 
 // 2550
 
 
 // 2550

diff --git a/src/table/linedraw.h b/src/table/linedraw.h
index e76a6de..c7a3e21 100644 (file)
--- a/src/table/linedraw.h
+++ b/src/table/linedraw.h
@@ -75,10 +75,10 @@ static uint32_t linedraw_command[] = {
  0x000009a9, 0x00000aaa, 0x00000bab, 0x0000aa8a, 0x0000909a, 0x0000a0aa, 0x0000b0ba, 0x00009a98, 0x0000aaa8, 0x0000bab8, // 2549
  0x00000aaa, 0x0000a989, 0x0000aa8a, 0x0000ab8b, 0x0000909a, 0x0000a0aa, 0x0000b0ba, 0x00009a98, 0x0000aaa8, 0x0000bab8, // 254a
  0x000009a9, 0x00000aaa, 0x00000bab, 0x0000a989, 0x0000aa8a, 0x0000ab8b, 0x0000909a, 0x0000a0aa, 0x0000b0ba, 0x00009a98, 0x0000aaa8, 0x0000bab8, // 254b
  0x000009a9, 0x00000aaa, 0x00000bab, 0x0000aa8a, 0x0000909a, 0x0000a0aa, 0x0000b0ba, 0x00009a98, 0x0000aaa8, 0x0000bab8, // 2549
  0x00000aaa, 0x0000a989, 0x0000aa8a, 0x0000ab8b, 0x0000909a, 0x0000a0aa, 0x0000b0ba, 0x00009a98, 0x0000aaa8, 0x0000bab8, // 254a
  0x000009a9, 0x00000aaa, 0x00000bab, 0x0000a989, 0x0000aa8a, 0x0000ab8b, 0x0000909a, 0x0000a0aa, 0x0000b0ba, 0x00009a98, 0x0000aaa8, 0x0000bab8, // 254b

- // 254c
- // 254d
- // 254e
- // 254f
+ 0x01000a3a, 0x01005a8a, // 254c
+ 0x0100093b, 0x0100598b, // 254d
+ 0x0100a0a3, 0x0100a5a8, // 254e
+ 0x010090b3, 0x010095b8, // 254f

  0x000009a9, 0x00000bab, 0x0000a989, 0x0000ab8b, // 2550
  0x0000909a, 0x0000b0ba, 0x00009a98, 0x0000bab8, // 2551
  0x0000a989, 0x0000ab8b, 0x0000aaa8, // 2552
  0x000009a9, 0x00000bab, 0x0000a989, 0x0000ab8b, // 2550
  0x0000909a, 0x0000b0ba, 0x00009a98, 0x0000bab8, // 2551
  0x0000a989, 0x0000ab8b, 0x0000aaa8, // 2552


@@ -177,22 +177,22 @@ static uint16_t linedraw_offs[] = {
  0x12c4, 0x1306, 0x1366, 0x13c8, 0x1446,
  0x14a6, 0x1508, 0x1588, 0x1608, 0x1688,
  0x1708, 0x178a, 0x182a, 0x18ca, 0x196a,
  0x12c4, 0x1306, 0x1366, 0x13c8, 0x1446,
  0x14a6, 0x1508, 0x1588, 0x1608, 0x1688,
  0x1708, 0x178a, 0x182a, 0x18ca, 0x196a,

- 0x1a0c, 0x1ac0, 0x1ac0, 0x1ac0, 0x1ac0,
- 0x1ac4, 0x1b04, 0x1b43, 0x1b73, 0x1ba4,
- 0x1be3, 0x1c13, 0x1c44, 0x1c83, 0x1cb3,
- 0x1ce4, 0x1d23, 0x1d53, 0x1d84, 0x1dc4,
- 0x1e05, 0x1e56, 0x1eb4, 0x1ef5, 0x1f46,
- 0x1fa5, 0x1ff4, 0x2036, 0x2095, 0x20e4,
- 0x2126, 0x2186, 0x21e6, 0x2248, 0x22c1,
- 0x22d1, 0x22e1, 0x22f1, 0x2301, 0x2311,
- 0x2322, 0x2341, 0x2351, 0x2361, 0x2371,
- 0x2383, 0x23b3, 0x23e3, 0x2413, 0x2444,
- 0x2484, 0x24c4, 0x2504, 0x2541, 0x2551,
- 0x2561, 0x2571, 0x2581, 0x2591, 0x25a1,
- 0x25b1, 0x25c1, 0x25d1, 0x25e1, 0x25f1,
- 0x2601, 0x2611, 0x2621, 0x2631, 0x2641,
- 0x2651, 0x2661, 0x2671, 0x2681, 0x2691,
- 0x26a1, 0x26b1, 0x26c1, 0x26d3, 0x2702,
- 0x2723, 0x2753, 0x2781, 0x2792, 0x27b3,
+ 0x1a0c, 0x1ac2, 0x1ae2, 0x1b02, 0x1b22,
+ 0x1b44, 0x1b84, 0x1bc3, 0x1bf3, 0x1c24,
+ 0x1c63, 0x1c93, 0x1cc4, 0x1d03, 0x1d33,
+ 0x1d64, 0x1da3, 0x1dd3, 0x1e04, 0x1e44,
+ 0x1e85, 0x1ed6, 0x1f34, 0x1f75, 0x1fc6,
+ 0x2025, 0x2074, 0x20b6, 0x2115, 0x2164,
+ 0x21a6, 0x2206, 0x2266, 0x22c8, 0x2341,
+ 0x2351, 0x2361, 0x2371, 0x2381, 0x2391,
+ 0x23a2, 0x23c1, 0x23d1, 0x23e1, 0x23f1,
+ 0x2403, 0x2433, 0x2463, 0x2493, 0x24c4,
+ 0x2504, 0x2544, 0x2584, 0x25c1, 0x25d1,
+ 0x25e1, 0x25f1, 0x2601, 0x2611, 0x2621,
+ 0x2631, 0x2641, 0x2651, 0x2661, 0x2671,
+ 0x2681, 0x2691, 0x26a1, 0x26b1, 0x26c1,
+ 0x26d1, 0x26e1, 0x26f1, 0x2701, 0x2711,
+ 0x2721, 0x2731, 0x2741, 0x2753, 0x2782,
+ 0x27a3, 0x27d3, 0x2801, 0x2812, 0x2833,

 };
 
 };
 

diff --git a/src/version.h b/src/version.h
index 91ae79f..bbe2ccb 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
-#define VERSION "2.3"
-#define VSTRING "20300"
-#define DATE   "2004-03-14"
-#define LSMDATE        "14MAR04"
-#define LIBVERSION "2:3:0"
+#define VERSION "2.4"
+#define VSTRING "20400"
+#define DATE   "2004-03-16"
+#define LSMDATE        "16MAR04"
+#define LIBVERSION "2:4:0"