From 152ddf9b25e5ff6705d08401b1af6a997c108a11 Mon Sep 17 00:00:00 2001 From: Michael Januszewski Date: Tue, 13 Jul 2004 18:04:13 +0000 Subject: Fixed savelines patch for CJK users. --- x11-terms/aterm/ChangeLog | 7 +- x11-terms/aterm/Manifest | 27 ++--- x11-terms/aterm/aterm-0.4.2-r10.ebuild | 9 +- .../aterm/files/aterm-0.4.2-ja-savelines.patch | 130 +++++++++++++++++++++ 4 files changed, 157 insertions(+), 16 deletions(-) create mode 100644 x11-terms/aterm/files/aterm-0.4.2-ja-savelines.patch (limited to 'x11-terms') diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog index e0a5da95df97..e6c9b8d46d47 100644 --- a/x11-terms/aterm/ChangeLog +++ b/x11-terms/aterm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-terms/aterm # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.36 2004/07/13 03:37:20 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.37 2004/07/13 18:04:13 spock Exp $ + + 13 Jul 2004; Michal Januszewski + +files/aterm-0.4.2-ja-savelines.patch, aterm-0.4.2-r10.ebuild: + Added a special savelines patch for CJK users, the standard one can't be + applied cleany after the -ja patch. This closes #56904. 12 Jul 2004; Tom Gall aterm-0.4.2-r9.ebuild: added ~ppc64, bug #55255 diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest index aeedcc3cab2f..1275c2454b89 100644 --- a/x11-terms/aterm/Manifest +++ b/x11-terms/aterm/Manifest @@ -1,25 +1,26 @@ -MD5 14b1baacf912e683eaaa25a7e02b73e3 ChangeLog 6308 -MD5 477341401a10ec6b77eb225f4702ae2e aterm-0.4.2-r4.ebuild 1635 -MD5 afe0fc08df362a634be9e9e9ca4d20cb aterm-0.4.2-r5.ebuild 1693 MD5 94afa6d1796000410eb4e041bdfbe587 aterm-0.4.2-r6.ebuild 1738 -MD5 63102af3b03f129145c4923b3db98ba7 aterm-0.4.2-r7.ebuild 1871 MD5 0074e8fa3d2d91f2136f53b31625ce80 aterm-0.4.2-r8.ebuild 2077 +MD5 afe0fc08df362a634be9e9e9ca4d20cb aterm-0.4.2-r5.ebuild 1693 +MD5 fb8209ea6dde38f1ec4cf1a554a0ee87 aterm-0.4.2-r10.ebuild 2292 +MD5 63102af3b03f129145c4923b3db98ba7 aterm-0.4.2-r7.ebuild 1871 +MD5 844e0539c6c6c741b495abcb7fc8a939 ChangeLog 6560 MD5 268cd24642660f63dc4a2d4120bfebaa aterm-0.4.2-r9.ebuild 2165 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255 -MD5 3c7266b6da456776620ec0326542f239 aterm-0.4.2-r10.ebuild 2209 -MD5 56383dccdb085d09e33858081b774724 files/aterm-0.4.2-borderless.patch 4692 -MD5 cc3291cba64add4b46d22268878043f7 files/aterm-0.4.2-copynpaste-r2.patch 5308 -MD5 80558db5a2d61eaaf6998877b616bbd0 files/aterm-0.4.2-copynpaste-r3.patch 6358 -MD5 1c869d8199dea55badd3758c5967e182 files/aterm-0.4.2-copynpaste.patch 3668 +MD5 477341401a10ec6b77eb225f4702ae2e aterm-0.4.2-r4.ebuild 1635 MD5 c2aedeeb3e7cc1dcc9361a021a570973 files/aterm-0.4.2-paste.patch 2160 -MD5 e91e244a20f4bff5ed4238e4cdb4d87a files/aterm-0.4.2-paste_mouse_outside.patch 6267 -MD5 1ddbe9b625c32cb9e67d8ee23af57110 files/aterm-0.4.2-patch-pack000.patch 4124 -MD5 df2652026f1f4f3e4444db9cddc145b6 files/aterm-0.4.2-qtpaste.patch 2510 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r4 128 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r5 128 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r6 128 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r7 128 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r8 128 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r9 128 -MD5 8faf173b6f8032958f1bc48d7877353c files/aterm-0.4.2-savelines.patch 4081 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r10 128 +MD5 1ddbe9b625c32cb9e67d8ee23af57110 files/aterm-0.4.2-patch-pack000.patch 4124 +MD5 df2652026f1f4f3e4444db9cddc145b6 files/aterm-0.4.2-qtpaste.patch 2510 +MD5 cc3291cba64add4b46d22268878043f7 files/aterm-0.4.2-copynpaste-r2.patch 5308 +MD5 80558db5a2d61eaaf6998877b616bbd0 files/aterm-0.4.2-copynpaste-r3.patch 6358 +MD5 e91e244a20f4bff5ed4238e4cdb4d87a files/aterm-0.4.2-paste_mouse_outside.patch 6267 +MD5 1c869d8199dea55badd3758c5967e182 files/aterm-0.4.2-copynpaste.patch 3668 +MD5 001fefd640df8a6318e8597f86c6e08c files/aterm-0.4.2-ja-savelines.patch 4459 +MD5 56383dccdb085d09e33858081b774724 files/aterm-0.4.2-borderless.patch 4692 +MD5 8faf173b6f8032958f1bc48d7877353c files/aterm-0.4.2-savelines.patch 4081 diff --git a/x11-terms/aterm/aterm-0.4.2-r10.ebuild b/x11-terms/aterm/aterm-0.4.2-r10.ebuild index 552fd84ef85e..695c96bf6ca4 100644 --- a/x11-terms/aterm/aterm-0.4.2-r10.ebuild +++ b/x11-terms/aterm/aterm-0.4.2-r10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r10.ebuild,v 1.1 2004/07/12 13:30:46 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r10.ebuild,v 1.2 2004/07/13 18:04:13 spock Exp $ inherit eutils @@ -38,7 +38,12 @@ src_unpack() { fi epatch ${FILESDIR}/aterm-0.4.2-patch-pack000.patch - epatch ${FILESDIR}/aterm-0.4.2-savelines.patch + + if use cjk ; then + epatch ${FILESDIR}/aterm-0.4.2-ja-savelines.patch + else + epatch ${FILESDIR}/aterm-0.4.2-savelines.patch + fi } src_compile() { diff --git a/x11-terms/aterm/files/aterm-0.4.2-ja-savelines.patch b/x11-terms/aterm/files/aterm-0.4.2-ja-savelines.patch new file mode 100644 index 000000000000..53fae0f0377a --- /dev/null +++ b/x11-terms/aterm/files/aterm-0.4.2-ja-savelines.patch @@ -0,0 +1,130 @@ +diff -Naur aterm-0.4.2-ja/src/main.c aterm-0.4.2-ja-savelines/src/main.c +--- aterm-0.4.2-ja/src/main.c 2004-07-13 19:53:44.000000000 +0200 ++++ aterm-0.4.2-ja-savelines/src/main.c 2004-07-13 19:51:04.000000000 +0200 +@@ -1589,6 +1589,7 @@ + int saved_argc = argc; + char **saved_argv = (char **)MALLOC((argc + 1) * sizeof(char *)); + ++ int t; + + PixColors = &(PixColorsFocused[0]); + +@@ -1768,16 +1769,27 @@ + rs_title = rs_name; + if (!rs_iconName) + rs_iconName = rs_title; +- if (!rs_minBufferWidth || (TermWin.min_bcol = atoi(rs_minBufferWidth)) < 0) +- TermWin.min_bcol = 1; +- if (!rs_saveLines || (TermWin.saveLines = atoi(rs_saveLines)) < 0) +- TermWin.saveLines = SAVELINES; ++ if (!rs_minBufferWidth || (t = atoi(rs_minBufferWidth)) < 0) ++ TermWin.min_bcol = 1; ++ else ++ TermWin.min_bcol = t; ++ ++ if (!rs_saveLines || (t = atoi(rs_saveLines)) < 0) ++ TermWin.saveLines = SAVELINES; ++ else ++ TermWin.saveLines = t; ++ ++ if (!rs_borderWidth || (t = atoi(rs_borderWidth)) < 0) ++ TermWin.borderWidth = BORDERWIDTH; ++ else ++ TermWin.borderWidth = t; ++ + #ifdef USE_LINESPACE +- if (!rs_lineSpace || (TermWin.lineSpace = atoi(rs_lineSpace)) < 0) ++ if (!rs_lineSpace || (t = atoi(rs_lineSpace)) < 0) + TermWin.lineSpace = LINESPACE; ++ else ++ TermWin.lineSpace = t; + #endif +- if (!rs_borderWidth || (TermWin.borderWidth = atoi(rs_borderWidth)) < 0) +- TermWin.borderWidth = BORDERWIDTH; + + /* no point having a scrollbar without having any scrollback! */ + if (!TermWin.saveLines) +diff -Naur aterm-0.4.2-ja/src/rxvt.h aterm-0.4.2-ja-savelines/src/rxvt.h +--- aterm-0.4.2-ja/src/rxvt.h 2004-07-13 19:53:44.000000000 +0200 ++++ aterm-0.4.2-ja-savelines/src/rxvt.h 2004-07-13 19:45:41.000000000 +0200 +@@ -259,7 +259,7 @@ + + + typedef struct { +- R_int16_t width, /* window width [pixels] */ ++ R_u_int16_t width, /* window width [pixels] */ + height, /* window height [pixels] */ + fwidth, /* font width [pixels] */ + fheight, /* font height [pixels] */ +diff -Naur aterm-0.4.2-ja/src/screen.c aterm-0.4.2-ja-savelines/src/screen.c +--- aterm-0.4.2-ja/src/screen.c 2004-07-13 19:53:44.000000000 +0200 ++++ aterm-0.4.2-ja-savelines/src/screen.c 2004-07-13 19:45:41.000000000 +0200 +@@ -239,12 +239,13 @@ + + if (TermWin.bcol == prev_bcol && TermWin.nrow == prev_nrow) + return; +- ++#if 0 + #ifdef DEBUG_STRICT + assert(TermWin.saveLines >= 0); + #else /* drive with your eyes closed */ + MAX_IT(TermWin.saveLines, 0); + #endif ++#endif + + total_rows = TermWin.nrow + TermWin.saveLines; + prev_total_rows = prev_nrow + TermWin.saveLines; +@@ -754,7 +755,10 @@ + return 0; + + if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) { +- TermWin.nscrolled += count; ++ if (TermWin.saveLines - TermWin.nscrolled < count) ++ TermWin.nscrolled += TermWin.saveLines - TermWin.nscrolled; ++ else ++ TermWin.nscrolled += count; + MIN_IT(TermWin.nscrolled, TermWin.saveLines); + } else if (!spec) + row1 += TermWin.saveLines; +@@ -1868,15 +1872,17 @@ + int + scr_move_to(int y, int len) + { +- int start; ++ int start, t; + + start = TermWin.view_start; +- TermWin.view_start = ((len - y) * (TermWin.nrow - 1 + TermWin.nscrolled) ++ t = ((len - y) * (TermWin.nrow - 1 + TermWin.nscrolled) + / (len)) - (TermWin.nrow - 1); +- D_SCREEN((stderr, "scr_move_to(%d, %d) view_start:%d", y, len, TermWin.view_start)); ++ D_SCREEN((stderr, "scr_move_to(%d, %d) view_start:%d", y, len, t)); + +- MAX_IT(TermWin.view_start, 0); +- MIN_IT(TermWin.view_start, TermWin.nscrolled); ++ MAX_IT(t, 0); ++ MIN_IT(t, TermWin.nscrolled); ++ ++ TermWin.view_start = t; + + if (Gr_Displayed()) + Gr_scroll(0); +@@ -1899,8 +1905,16 @@ + start = TermWin.view_start; + MAX_IT(nlines, 1); + MIN_IT(nlines, TermWin.nrow); +- TermWin.view_start += (nlines * dirn); +- MAX_IT(TermWin.view_start, 0); ++ ++ if ((dirn == -1 && TermWin.view_start < nlines)) ++ TermWin.view_start = 0; ++ else ++ TermWin.view_start += (nlines * dirn); ++ ++ if (dirn == 1 && start > TermWin.view_start) ++ TermWin.view_start = TermWin.nscrolled; ++ ++// MAX_IT(TermWin.view_start, 0); + MIN_IT(TermWin.view_start, TermWin.nscrolled); + + if (Gr_Displayed()) -- cgit v1.2.3-65-gdbad