Package-Name: aterm
Suggests: jpeg libpng
Homepage: http://aterm.sourceforge.net/
Source: sourceforge:///aterm/aterm-(\d+.\d+(.\d+)?).tar.gz $1
Zap-Before-Install: 1
Repack:
	tar xzvfp "$(SOURCE)"
Compile:
	cp -pf ChangeLog doc/{FAQ,README*} "$(PREFIX)/"
	$(MAKE) -f ../Makefile configure CONFIGURE_OPTS="--enable-background-image --enable-utmp --enable-wtmp --enable-kanji --disable-backspace-key --disable-delete-key --with-x"
	$(MAKE)
	$(MAKE) install
Install:
	$(MAKE) instbin BIN=aterm
	$(MAKE) instman SECTION=1 MAN=aterm
Patch: <<EOT
######## begin unfocused cursor outline position patch
diff -urN ../aterm-1.0.1-orig/src/screen.c src/screen.c
--- ../aterm-1.0.1-orig/src/screen.c	2006-03-30 07:32:07 +0900
+++ src/screen.c	2007-08-27 17:10:24 +0900
@@ -2572,7 +2572,7 @@
 #endif
 	    }
 	} else {
-	    currow = screen.cur.row - TermWin.view_start;
+	    currow = screen.cur.row + TermWin.view_start;
 	    col = screen.cur.col + morecur;
 	    wbyte = morecur ? 1 : 0;
 	    if (currow >= 0 && currow < TermWin.nrow) {
######## end unfocused cursor outline position patch
######## begin Makefile.in exit code patch
--- ../aterm-1.0.1-orig/Makefile.in	2007-08-02 03:06:12 +0900
+++ Makefile.in	2007-08-27 17:00:59 +0900
@@ -21,7 +21,7 @@
 #-------------------------------------------------------------------------
 
 all allbin alldoc tags clean:
-	@for I in ${subdirs}; do (cd $$I; ${MAKE} $@ || exit 1); done
+	@for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
 
 #
 # entry points for other programs
@@ -54,7 +54,7 @@
 	$(MKDIR) $(DESTDIR)$(mandir)
 
 install: installdirs
-	@for I in $(subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
+	@for I in $(subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@) || exit 1; done
 
 uninstall:
 	@for I in $(subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
######## end Makefile.in exit code patch
######## begin icon patch
diff -urN ../aterm-1.0.1-orig/src/Makefile.in src/Makefile.in
--- ../aterm-1.0.1-orig/src/Makefile.in	2005-05-27 01:44:49 +0900
+++ src/Makefile.in	2007-08-27 17:16:23 +0900
@@ -48,7 +48,7 @@
 all: aterm
 
 aterm: version.h $(PROS) $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XLIB) $(DLIB)
+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XLIB) $(DLIB) -lXpm
 
 .c.pro:
 	$(SED) -n -f $(srcdir)/makeprotos-sed $< > $@
@@ -98,7 +98,7 @@
 command.o:   command.c   command.pro   $(DEPS)
 graphics.o:  graphics.c  graphics.pro  $(DEPS)
 grkelot.o:   grkelot.c   grkelot.pro   $(DEPS)
-main.o:      main.c      main.pro      $(DEPS)
+main.o:      main.c      main.pro      $(DEPS) aterm-icon.xpm
 menubar.o:   menubar.c   menubar.pro   $(DEPS)
 misc.o:      misc.c      misc.pro      $(DEPS)
 netdisp.o:   netdisp.c   netdisp.pro   $(DEPS)
diff -urN ../aterm-1.0.1-orig/src/aterm-icon.xpm src/aterm-icon.xpm
--- ../aterm-1.0.1-orig/src/aterm-icon.xpm	1970-01-01 09:00:00 +0900
+++ src/aterm-icon.xpm	2007-08-27 17:16:23 +0900
@@ -0,0 +1,650 @@
+/* XPM */
+static char *aterm_icon[] = {
+/* width height ncolors chars_per_pixel */
+"40 40 603 2",
+/* colors */
+"   c #43424F",
+" . c #000000",
+" X c #9795A8",
+" o c #1B192B",
+" O c #3F3E4B",
+" + c #504E5F",
+" @ c #34335E",
+" # c #605E72",
+" $ c #3D3C49",
+" % c #4E4C5D",
+" & c #0A0A0D",
+" * c #2B2A34",
+" = c #3B3A47",
+" - c #54547A",
+" ; c #393845",
+" : c #383844",
+" > c #7E7D8C",
+" , c #525078",
+" < c #373643",
+" 1 c #302E50",
+" 2 c #25242E",
+" 3 c #585760",
+" 4 c #202029",
+" 5 c #ACACB9",
+" 6 c #292849",
+" 7 c #1E1E27",
+" 8 c #757383",
+" 9 c #747382",
+" 0 c #1C1C25",
+" q c #727180",
+" w c #B8B6C8",
+" e c #1A1A23",
+" r c #B7B6C7",
+" t c #706F7E",
+" y c #B6B4C6",
+" u c #181821",
+" i c #323255",
+" p c #B5B4C5",
+" a c #6E6D7C",
+" s c #B4B2C4",
+" d c #B3B2C3",
+" f c #6C6B7A",
+" g c #15141E",
+" h c #B2B0C2",
+" j c #5A5965",
+" k c #6A6978",
+" l c #494751",
+" z c #2D2C50",
+" x c #B0AEC0",
+" c c #686776",
+" v c #AEACBE",
+" b c #666574",
+" n c #777588",
+" m c #ACAABC",
+" M c #2F2E3E",
+" N c #646372",
+" B c #757386",
+" V c #484871",
+" C c #AAA8BA",
+" Z c #A9A8B9",
+" A c #2D2C3C",
+" S c #626170",
+" D c #A8A6B8",
+" F c #605F6E",
+" G c #A6A4B6",
+" H c #1C1B1E",
+" J c #5E5D6C",
+" K c #1B1B1D",
+" L c #A4A2B4",
+" P c #5C5B6A",
+" I c #19191B",
+" U c #A2A0B2",
+" Y c #5A5968",
+" T c #A09EB0",
+" R c #9F9EAF",
+" E c #1F1F38",
+" W c #585766",
+" Q c #9E9CAE",
+" ! c #575765",
+" ~ c #565564",
+" ^ c #9C9AAC",
+" / c #44434F",
+" ( c #545362",
+" ) c #9A98AA",
+" _ c #313139",
+" ` c #100F12",
+" ' c #525160",
+" ] c #5B5B80",
+" [ c #3A3959",
+" { c #9896A8",
+" } c #1C1A2B",
+" | c #0E0D10",
+".  c #514F5F",
+".. c #504F5E",
+".X c #0D0D0F",
+".o c #1E1D23",
+".O c #403D4B",
+".+ c #9694A6",
+".@ c #4F4D5D",
+".# c #4E4D5C",
+".$ c #9492A4",
+".% c #56557B",
+".& c #71707B",
+".* c #4C4B5A",
+".= c #9290A2",
+".- c #3A3945",
+".; c #4A4958",
+".: c #36344B",
+".> c #908EA0",
+"., c #282730",
+".< c #676685",
+".1 c #383743",
+".2 c #525177",
+".3 c #8F8C9F",
+".4 c #8E8C9E",
+".5 c #363541",
+".6 c #030305",
+".7 c #8C8A9C",
+".8 c #34333F",
+".9 c #5F5D87",
+".0 c #8A889A",
+".q c #111116",
+".w c #898899",
+".e c #32313D",
+".r c #100F15",
+".t c #211F29",
+".y c #888698",
+".u c #2D2C42",
+".i c #302F3B",
+".p c #868496",
+".a c #1D1D25",
+".s c #2E2D39",
+".d c #848294",
+".f c #2C2B37",
+".g c #B8B7C7",
+".h c #828092",
+".j c #45436A",
+".k c #B7B5C6",
+".l c #191921",
+".z c #2A2935",
+".x c #656590",
+".c c #706E7D",
+".v c #4B495C",
+".b c #807E90",
+".n c #B5B3C4",
+".m c #7F7E8F",
+".M c #17171F",
+".N c #282733",
+".B c #424167",
+".V c #B4B3C3",
+".C c #6E6C7B",
+".Z c #7E7C8E",
+".A c #16151E",
+".S c #262531",
+".D c #7C7A8C",
+".F c #B1AFC0",
+".G c #24232F",
+".H c #B0AFBF",
+".J c #23232E",
+".K c #7A788A",
+".L c #22212D",
+".P c #21212C",
+".I c #787688",
+".U c #777687",
+".Y c #656472",
+".T c #767486",
+".R c #28274A",
+".E c #646271",
+".W c #37375C",
+".Q c #61606E",
+".! c #A7A5B6",
+".~ c #343359",
+".^ c #5F5E6C",
+"./ c #706E80",
+".( c #A5A3B4",
+".) c #323157",
+"._ c #A3A1B2",
+".` c #23223B",
+".' c #302F55",
+".] c #3A3841",
+".[ c #363347",
+".{ c #A09FAF",
+".} c #494853",
+".| c #484852",
+"X  c #9F9DAE",
+"X. c #40405E",
+"XX c #565463",
+"Xo c #8A8996",
+"XO c #2B2A46",
+"X+ c #898795",
+"X@ c #101011",
+"X# c #1D1B2B",
+"X$ c #181630",
+"X% c #35355D",
+"X& c #1B1929",
+"X* c #4F4E5C",
+"X= c #3B3A45",
+"X- c #4B4A58",
+"X; c #080809",
+"X: c #807F8C",
+"X> c #494856",
+"X, c #20203B",
+"X< c #595869",
+"X1 c #373641",
+"X2 c #040405",
+"X3 c #474654",
+"X4 c #8C8B9B",
+"X5 c #24242B",
+"X6 c #35343F",
+"X7 c #4F4E73",
+"X8 c #2A2952",
+"X9 c #34343E",
+"X0 c #454452",
+"Xq c #020203",
+"Xw c #33323D",
+"Xe c #434250",
+"Xr c #1E1D2F",
+"Xt c #787784",
+"Xy c #42424F",
+"Xu c #434050",
+"Xi c #202027",
+"Xp c #6C6C96",
+"Xa c #41404E",
+"Xs c #3F3E4C",
+"Xd c #3D3C4A",
+"Xf c #838192",
+"Xg c #514F57",
+"Xh c #828191",
+"Xj c #38374F",
+"Xk c #B7B6C5",
+"Xl c #3B3A48",
+"Xz c #484762",
+"Xx c #706D7C",
+"Xc c #18181F",
+"Xv c #393846",
+"Xb c #5D5B66",
+"Xn c #373644",
+"Xm c #A09EAB",
+"XM c #6A6976",
+"XN c #121219",
+"XB c #22222C",
+"XV c #787787",
+"XC c #21202B",
+"XZ c #20202A",
+"XA c #666572",
+"XS c #777586",
+"XD c #767585",
+"XF c #666372",
+"XG c #39385D",
+"XH c #757384",
+"XJ c #747383",
+"XK c #1D1C27",
+"XL c #1C1C26",
+"XP c #47466E",
+"XI c #737182",
+"XU c #3D3C4D",
+"XY c #36345A",
+"XT c #727181",
+"XR c #1A1A24",
+"XE c #313055",
+"XW c #403E67",
+"XQ c #4A4953",
+"X! c #6A6979",
+"X~ c #41415E",
+"X^ c #525172",
+"X/ c #484751",
+"X( c #585564",
+"X) c #676776",
+"X_ c #46454F",
+"X` c #2A2A4E",
+"X' c #45454E",
+"X] c #2D2B47",
+"X[ c #ABAABC",
+"X{ c #43414C",
+"X} c #403F49",
+"X| c #383755",
+"o  c #34325B",
+"o. c #5E5D6D",
+"oX c #68658E",
+"oo c #9290A0",
+"oO c #5C5B6B",
+"o+ c #A2A0B3",
+"o@ c #484754",
+"o# c #050505",
+"o$ c #413F61",
+"o% c #474553",
+"o& c #030303",
+"o* c #464552",
+"o= c #565565",
+"o- c #313044",
+"o; c #9C9AAD",
+"o: c #666578",
+"o> c #010101",
+"o, c #9896A9",
+"o< c #2D2D36",
+"o1 c #3E3D4A",
+"o2 c #0B0B0E",
+"o3 c #9492A5",
+"o4 c #3C3B48",
+"o5 c #4B4B5A",
+"o6 c #292932",
+"o7 c #3A3946",
+"o8 c #54537A",
+"o9 c #686687",
+"o0 c #908EA1",
+"oq c #535179",
+"ow c #8F8EA0",
+"oe c #383744",
+"or c #45445E",
+"ot c #16151C",
+"oy c #62618B",
+"ou c #363542",
+"oi c #25232E",
+"op c #605F89",
+"oa c #8C8A9D",
+"os c #595861",
+"od c #6A6875",
+"of c #21212A",
+"og c #4C4B72",
+"oh c #2A294A",
+"oj c #1F1F28",
+"ok c #403F4F",
+"ol c #757483",
+"oz c #1D1D26",
+"ox c #605F75",
+"oc c #47476D",
+"ov c #353558",
+"ob c #252345",
+"on c #A7A5B4",
+"om c #71707F",
+"oM c #2A2936",
+"oN c #706E7E",
+"oB c #6F6E7D",
+"oV c #B5B3C5",
+"oC c #171720",
+"oZ c #383747",
+"oA c #6D6C7B",
+"oS c #B3B1C3",
+"oD c #474759",
+"oF c #2F2D52",
+"oG c #A19FAE",
+"oH c #6B6A79",
+"oJ c #A09FAD",
+"oK c #B1AFC1",
+"oL c #6A6878",
+"oP c #696877",
+"oI c #AFADBF",
+"oU c #676675",
+"oY c #424154",
+"oT c #ADABBD",
+"oR c #656673",
+"oE c #555460",
+"oW c #29274C",
+"oQ c #656473",
+"o! c #4D4C6C",
+"o~ c #ABA9BB",
+"o^ c #AAA9BA",
+"o/ c #636271",
+"o( c #A9A7B9",
+"o) c #626070",
+"o_ c #46456F",
+"o` c #61606F",
+"o' c #A7A5B7",
+"o] c #34335A",
+"o[ c #A6A5B6",
+"o{ c #605E6E",
+"o} c #5F5E6D",
+"o| c #292938",
+"O  c #A5A3B5",
+"O. c #4D4C58",
+"OX c #5D5C6B",
+"Oo c #A3A1B3",
+"OO c #302F56",
+"O+ c #5C5A6A",
+"O@ c #5B5A69",
+"O# c #363548",
+"O$ c #3F3F68",
+"O% c #2F2D55",
+"O& c #A19FB1",
+"O* c #A09FB0",
+"O= c #595867",
+"O- c #161618",
+"O; c #9F9DAF",
+"O: c #36363E",
+"O> c #575665",
+"O, c #9D9BAD",
+"O< c #565464",
+"O1 c #555463",
+"O2 c #9B99AB",
+"O3 c #403F55",
+"O4 c #43424E",
+"O5 c #5D5C82",
+"O6 c #535261",
+"O7 c #3B3A5A",
+"O8 c #9997A9",
+"O9 c #0F0E11",
+"O0 c #6C6A94",
+"Oq c #51505F",
+"Ow c #50505E",
+"Oe c #403E4B",
+"Or c #0D0C0F",
+"Ot c #4F4E5D",
+"Oy c #58587D",
+"Ou c #9593A5",
+"Oi c #73717D",
+"Op c #3D3C48",
+"Oa c #4D4C5B",
+"Os c #0A0A0C",
+"Od c #1B1A20",
+"Of c #9391A3",
+"Og c #3C3A47",
+"Oh c #4C4A5A",
+"Oj c #55547A",
+"Ok c #4B4A59",
+"Ol c #918FA1",
+"Oz c #706D7A",
+"Ox c #4B4859",
+"Oc c #908FA0",
+"Ov c #393844",
+"Ob c #8F8D9F",
+"On c #525077",
+"Om c #373642",
+"OM c #8E8B9E",
+"ON c #8D8B9D",
+"OB c #353440",
+"OV c #8B899B",
+"OC c #33323E",
+"OZ c #32323D",
+"OA c #898799",
+"OS c #101015",
+"OD c #31303C",
+"OF c #878597",
+"OG c #2F2E3A",
+"OH c #3F3E4D",
+"OJ c #858395",
+"OK c #2D2C38",
+"OL c #848194",
+"OP c #838193",
+"OI c #4D4C5E",
+"OU c #B8B6C7",
+"OY c #2B2A36",
+"OT c #383750",
+"OR c #B7B6C6",
+"OE c #827F92",
+"OW c #817F91",
+"OQ c #191821",
+"O! c #B6B4C5",
+"O~ c #181820",
+"O^ c #292834",
+"O/ c #151327",
+"O( c #B5B4C4",
+"O) c #7F7D8F",
+"O_ c #B4B2C3",
+"O` c #16161E",
+"O' c #272632",
+"O] c #7D7B8D",
+"O[ c #B2B0C1",
+"O{ c #252430",
+"O} c #24242F",
+"O| c #7B798B",
+"+  c #B0AEBF",
+"+. c #23222E",
+"+X c #413F5C",
+"+o c #3C3C61",
+"+O c #AFACBE",
+"++ c #797789",
+"+@ c #21202C",
+"+# c #31303F",
+"+$ c #666573",
+"+% c #777587",
+"+& c #767586",
+"+* c #646371",
+"+= c #757385",
+"+- c #3F3E50",
+"+; c #747384",
+"+: c #19172E",
+"+> c #A8A6B7",
+"+, c #727182",
+"+< c #3F3F46",
+"+1 c #5D5C74",
+"+2 c #605F6D",
+"+3 c #5F5F6C",
+"+4 c #3E3D45",
+"+5 c #5E5D6B",
+"+6 c #A4A2B3",
+"+7 c #6E6D7E",
+"+8 c #404068",
+"+9 c #2F2E54",
+"+0 c #908E9C",
+"+q c #232431",
+"+w c #2B2A50",
+"+e c #45454F",
+"+r c #565563",
+"+t c #44434E",
+"+y c #41414B",
+"+u c #52515F",
+"+i c #0F0F10",
+"+p c #5A597E",
+"+a c #75747E",
+"+s c #868492",
+"+d c #858491",
+"+f c #9694A5",
+"+g c #4E4D5B",
+"+h c #0B0B0C",
+"+j c #0A090B",
+"+k c #4C4B59",
+"+l c #09090A",
+"+z c #5C5B6C",
+"+x c #070708",
+"+c c #4A4957",
+"+v c #252436",
+"+b c #383742",
+"+n c #8F8C9E",
+"+m c #484755",
+"+M c #040305",
+"+N c #7C7A88",
+"+B c #030304",
+"+V c #464553",
+"+C c #34333E",
+"+Z c #33333D",
+"+A c #444351",
+"+S c #42414F",
+"+D c #4B4B6F",
+"+F c #0F0F13",
+"+G c #403F4D",
+"+H c #0E0D12",
+"+J c #0D0D11",
+"+K c #5D5C7A",
+"+L c #3C3A53",
+"+P c #1D1D24",
+"+I c #2E2D38",
+"+U c #3E3D4B",
+"+Y c #47476B",
+"+T c #848293",
+"+R c #2D2B37",
+"+E c #B8B7C6",
+"+W c #3C3B49",
+"+Q c #171628",
+"+! c #27263B",
+"+~ c #292933",
+"+^ c #3A3947",
+"+/ c #141425",
+"+( c #282732",
+"+) c #5C5C65",
+"+_ c #262530",
+"+` c #5B5A64",
+"+' c #13131A",
+"+] c #24232E",
+"+[ c #B0AFBE",
+"+{ c #595862",
+"+} c #8A889C",
+"+| c #22212C",
+"@  c #676673",
+"@. c #2E2C45",
+"@X c #201F2A",
+"@o c #3A395E",
+"@O c #1F1F29",
+"@+ c #757484",
+"@@ c #858497",
+"@# c #1D1D27",
+"@$ c #1D1B27",
+"@% c #737282",
+"@& c #36355A",
+"@* c #1B1B25",
+"@= c #333357",
+"@- c #5F5E6B",
+"@; c #A5A3B3",
+"@: c #25243C",
+"@> c #323156",
+"@, c #A4A3B2",
+"@< c #4A4853",
+"@1 c #30304A",
+"@2 c #525072",
+"@3 c #1F1E36",
+"@4 c #2C2B50",
+"@5 c #1E1E35",
+"@6 c #686677",
+"@7 c #46444F",
+"@8 c #202023",
+"@9 c #3A3A57",
+"@0 c #5A5A7D",
+"@q c #2F2E35",
+"@w c #A7A5B8",
+"@e c #2D2C33",
+"@r c #4D4C59",
+"@t c #313158",
+"@y c #5D5C6C",
+"@u c #41416B",
+"@i c #9291A0",
+"@p c #4C4A58",
+"@a c #18181B",
+"@s c #434263",
+"@d c #908F9E",
+"@f c #575570",
+"@g c #9F9DB0",
+"@h c #040404",
+"@j c #454451",
+"@k c #020202",
+"@l c #1C1C36",
+"@z c #413F57",
+"@x c #9B99AC",
+"@c c #545463",
+"@v c None",
+/* pixels */
+"@v@v@v@v@v@v@v@v@v@v@v@v@v@v@v@vOfo0ONOAOJOW.D n@v@v@v@v@v@v@v@v@v@v@v@v@v@v@v@v",
+"@v@v@v@v@v@v@v@v@v@v@v@v U T Q ^O8OuOl.4OAOJ.bO|+& qoAoU@v@v@v@v@v@v@v@v@v@v@v@v",
+"@v@v@v@v@v@v@v@v@v@vo(o( D G LO& Q ).+.=ONOA.dO)+++=./ koQo}@v@v@v@v@v@v@v@v@v@v",
+"@v@v@v@v@v@v@v@v voIoIoI voT Co'Oo TO2.+.=ONOF.hO].I+,oAoU SO+O<@v@v@v@v@v@v@v@v",
+"@v@v@v@v@v@v@v h s pO!O! s hoI m D L TO2Ou.>OV.p.b.Kol t k N J W '@v@v@v@v@v@v@v",
+"@v@v@v@v@v@v s.k.g+E+E+E.g roVoKoTo( L QO8.$.4.yOPO]XS q f b F Y (.#@v@v@v@v@v@v",
+"@v@v@v@v@v.n.g+E+E+E+E+E+E+E w yoKoT D U ^.+OlOVOJO)++ 9 a co`O@O1OtX>@v@v@v@v@v",
+"@v@v@v@vO_+E+E+E+E+E+E+E+E+E+E+E p xo~O O;O8OfONOFOWO|XHoBoPo/OXO>..+c+A@v@v@v@v",
+"@v@v@voK.k+E+E+E+E+E+E+E+E+E+E+EOUoSoT@wO&@xOu.4.y.h.D.Tom k N J WOqX-@j+U@v@v@v",
+"@v@v@v d+E+E+E+E+E+E+E+E+E+E+E+E+EoV v.{@i@d+f.>OAOPO]+%omoHoQ J W 'OkX0Xs@v@v@v",
+"@v@v+OoV+E+E+E+E+E+E+E+E+E+E+E+EXkoG+7.<oX+KoNOl.0.d.Z.U q f bo}O= '+k+V+Go7@v@v",
+"@v@voIoV+E+E+E+E+E+E+E+E+E+E+E+[Xto9XpO5+pOy.vowOV.d.Z.U q f bo}O=O6.*+V+GXv@v@v",
+"@vo( v.n+E+E+E+E+E+E+E+E+E+Eono:O0 ]X^+X -OjoY.3.0.d.Z.U q foQo}O= '+k+V+Go7+C@v",
+"@vo'oT d+E+E+E+E+E+E+E+E+EXmox.x@2o-+< l.%.2+-OM.0OPO]+% qoHoQo}O= '+kX0XsXv+Z@v",
+"@v Go~oK.k+E+E+E+E+E+E+E@;+1oyX.X1+s ZOioqX7XUoa.y.h.D.TomoH N J WOqOkX0Xs ;+Z@v",
+"@vOoo(oI s+E+E+E+E+E+E 5 #opXjXg+> xo^Ozo8+Dok.7OFOWO|@+oBoPo/OXO>Oq.;+A+UoeOZ@v",
+"O2 T Go~ xO(+E+E+E+E.VoP.9.:Xb.HO[oT DXF ,+YXy+}OJO)++ 9 a c S PO1OtX>  XdOmODOY",
+" {O, Uo' m.F.nOR+E w+d@0OT+`+  hoTo(+6+zogo$O.OAOPO]+%XT f b F Y (.#+m+S+Wou.i.z",
+"o3O8 QOo D moI h s@,@f@sXQX[ x mo(O  RX<XP@1XA@@++@-+r J k N J W '.*+V+G+^OB.s.N",
+"Ol.+ )O;Ooo' C moToROnOZoJoTo~o' L T@xX(.Bo| >odor Vo_oZoU S P ~ ++c+A+UoeOCOKO'",
+"ONOlOuO8O,O& Lo[+0o!.uX: D.!O  UO;O2 X.E+!oE.CX~@u@oX]+y.Yo}O= (.#+m+S+WOmODOYO{",
+".yONOlOu {O2 QO;+5oc+tO*._O&O; ^O8.+.=Xh jXVO3O$.Wov@X+5 S PO>OqOkX0+G+^X6OGO^+.",
+"+T.y.7.>Of.+ {+nXz@.+No; ^O2O8.+Of.>ONOAXfo5XW@&.~.`X' No}O=O6.#+mXeXdoe.eOKO'.P",
+"O)OPOF.0ON.>.=XM.j+#Oc.+.+.$Of.>.4OV.yOL Y+oo]@>XE+qo) FO@ ~Owo%+Co1 =.5.i.zO}@O",
+"@v.Z.hOJOF.0OVOI+8.OOb.>.>.4ONOV.yOJOE.^O7o].'+9oF Ao{oO W+uOg+v+(+WoeOCOK.N.L@v",
+"@v.I.DO).h.dOP@zXGXu.w.0OA.yOFOJ.hXD.@ [OO@5@3X`+w 6o1O<Ok M@4 oo4+^.5.iOYO} 4@v",
+"@v 9XS++.D.Z.D+LXY.[.mOPOP.h.b 8 '@9X% E.t@<X/Xrob.RoWXOohX8+/ *+WXn.eOKO'.Loz@v",
+"@voB qXJ.T.I+%O#.) 1OxXx.co}oDX| @X,@#+e+$oPoQX*+]+Q+:X$O/ go<+WOv.8.sO^.Goj e@v",
+"@v@v foBomXI+;@r@: z@t i@=o O%@lXKX{+* koU N F Po=o@Og+bX=OH+U.-OB.iOY+_+@ 0@v@v",
+"@v@v boPoHoAoBoA.}oiX# }X&@$o6.|.EoLoUoQo` JO@ W (..Oh+mXeXso7.5OD.fO'XB 7.l@v@v",
+"@v@v@vo/oQoU c kX!X).Q@-+3+* coU+$ No`o} PO=XX 'OtX-X3Xe Oo7ou.eOK.N.J@O e@v@v@v",
+"@v@v@v@yo}o` So/ N NoQoQ N No/o` F JO@O= ~O6..OaX>o*+S+U+^.5.e.sO^.GXZ 0oC@v@v@v",
+"@v@v@v@vO=O@ POX J J J J JOX PO@ Y W ~O6.  %X-+m+AXaXd.-.5.e.sO^ 2XZ 0 u@v@v@v@v",
+"@v@v@v@v@v@c ~O> ! W W W WO> ~O1 ( '..+gX-+mX0+SXso4 ;OBODOKO^O{of.aO~@v@v@v@v@v",
+"@v@v@v@v@v@v....Oq ' ' 'OqOq..OtOa+k+c+mX0+S+G $o7 <.8.i.f.N.GXCXL.l@v@v@v@v@v@v",
+"@v@v@v@v@v@v@v.;X-Ok+k+kX-.;+c+mX3o*+A+SXsXd+^oeOB.eOGOYO'+.XZ 0 u@v@v@v@v@v@v@v",
+"@v@v@v@v@v@v@v@v+AX0X0X0X0+AXe+SXa+G+U+Wo7 <OB.e.i.fO^.S.L@O@* u@v@v@v@v@v@v@v@v",
+"@v@v@v@v@v@v@v@v@v@vXsXs+U+UXd+WXlo7oeouOB.eOGOK.zO'.Gof 7XR@v@v@v@v@v@v@v@v@v@v",
+"@v@v@v@v@v@v@v@v@v@v@v@v ; :.1Om.5X9XwODOG.foMO'O}+|@OXL@v@v@v@v@v@v@v@v@v@v@v@v",
+"@v@v@v@v@v@v@v@v@v@v@v@v@v@v@v@v.i.s+ROY.N.S.G.L@v@v@v@v@v@v@v@v@v@v@v@v@v@v@v@v"
+};
diff -urN ../aterm-1.0.1-orig/src/main.c src/main.c
--- ../aterm-1.0.1-orig/src/main.c	2007-08-27 17:13:27 +0900
+++ src/main.c	2007-08-27 17:16:23 +0900
@@ -41,6 +41,7 @@
 #include "rxvt.h"		/* NECESSARY */
 #include "X11/Xatom.h"
 #include "X11/Xproto.h"
+#include "X11/xpm.h"
 #include <locale.h>
 
 Window ParentWin[PARENTS_NUM] = PARENTS_INIT;
@@ -437,6 +438,8 @@
 }
 #endif
 
+#include "aterm-icon.xpm"
+
 /*{{{ Create_Windows() - Open and map the window */
 /* PROTO */
 void
@@ -446,6 +449,8 @@
     XClassHint      classHint;
     XWMHints        wmHint;
     MwmHints 		mwmhints;
+    Pixmap          icon, iconmask;
+    XpmAttributes   xpmattr;
     int             i, x, y, flags;
     unsigned int    width, height;
     XSetWindowAttributes attributes;
@@ -721,6 +726,9 @@
     ParentWin[0] = TermWin.parent ;
     ParentWinNum = 1 ;
 
+    xpmattr.valuemask = 0;
+    XpmCreatePixmapFromData(Xdisplay, TermWin.parent, aterm_icon,
+			    &icon, &iconmask, &xpmattr);
     xterm_seq(XTerm_title, rs_title);
     xterm_seq(XTerm_iconName, rs_iconName);
 /* ignore warning about discarded `const' */
@@ -728,8 +736,11 @@
     classHint.res_class = APL_CLASS;
     wmHint.input = True;
     wmHint.initial_state = (Options & Opt_iconic ? IconicState : NormalState);
+    wmHint.icon_pixmap = icon;
+    wmHint.icon_mask = iconmask;
     wmHint.window_group = TermWin.parent;
-    wmHint.flags = (InputHint | StateHint | WindowGroupHint);
+    wmHint.flags = (InputHint | StateHint | IconPixmapHint | IconMaskHint | 
+		    WindowGroupHint);
 
     XSetWMProperties(Xdisplay, TermWin.parent, NULL, NULL, argv, argc,
 		     &szHint, &wmHint, &classHint);
######## end icon patch
EOT
NoPatch: <<EOT
######## begin line spacing (-lsp) patch (seems to have been added independently in 1.0.1)
diff -urN ../aterm-1.0.1-orig/src/main.c src/main.c
--- ../aterm-1.0.1-orig/src/main.c	2007-08-01 23:08:29 +0900
+++ src/main.c	2007-08-27 17:13:27 +0900
@@ -29,6 +29,8 @@
  *    1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  *    1998      Geoff Wing <gcw@pobox.com>
  *    1998      Sasha Vasko <sasha at aftercode.net>
+ *    2003      Andrew Church <achurch@achurch.org>
+ *              - add line spacing (-lsp, lineSpacing)
  *----------------------------------------------------------------------*/
 
 #ifndef lint
@@ -1537,7 +1539,7 @@
 #ifdef USE_LINESPACE
       fh = TermWin.font->ascent + TermWin.font->descent + TermWin.lineSpace;
 #else
-      fh = TermWin.font->ascent + TermWin.font->descent;
+      fh = TermWin.font->ascent + TermWin.font->descent + TermWin.lineSpacing;
 #endif
 
 	if (TermWin.font->min_bounds.width == TermWin.font->max_bounds.width)
@@ -1564,7 +1566,7 @@
 	fw = boldFont->min_bounds.width; /* can be error !!!! */
 	if( fw > 1000 ) fw = 0 ;
 
-	fh = boldFont->ascent + boldFont->descent;
+	fh = boldFont->ascent + boldFont->descent + TermWin.lineSpacing;
 	if (TermWin.fprop == 0) {	/* bold font must also be monospaced */
 	    if (fw != boldFont->max_bounds.width)
 		fw = -1;
@@ -2018,6 +2020,7 @@
 #endif
     rs_borderWidth = NULL;
     rs_internal_border = NULL;
+    rs_lineSpacing = NULL;
     rs_modifier = NULL;	/* modifier */
 #if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
 /* recognized when combined with HOTKEY */
@@ -2245,6 +2248,11 @@
         TermWin_internalBorder = t;
     TermWin_internalBorders = 2 * TermWin_internalBorder;
     
+    if (!rs_lineSpacing || (t = atoi(rs_lineSpacing)) < 0)
+        TermWin.lineSpacing = 0;
+    else
+	TermWin.lineSpacing = t;
+
 /* no point having a scrollbar without having any scrollback! */
     if (!TermWin.saveLines)
 	Options &= ~Opt_scrollBar;
diff -urN ../aterm-1.0.1-orig/src/rxvt.h src/rxvt.h
--- ../aterm-1.0.1-orig/src/rxvt.h	2006-02-18 06:35:37 +0900
+++ src/rxvt.h	2007-08-27 17:11:27 +0900
@@ -320,6 +320,7 @@
 		    focus,	/* window has focus                         */
 		    saveLines,	/* number of lines that fit in scrollback   */
 		    borderWidth,/* number of pixels in window border        */
+		    lineSpacing,/* number of pixels between lines           */
 		    nscrolled,	/* number of line actually scrolled         */
 		    view_start;	/* scrollback view starts here              */
     Window          parent, vt;	/* parent (main) and vt100 window           */
@@ -1052,6 +1053,7 @@
 #endif
 EXTERN const char      *rs_borderWidth; /* border width [pixels] */
 EXTERN const char      *rs_internal_border; /* internal border width [pixels] */
+EXTERN const char      *rs_lineSpacing; /* number of pixels between lines */
 EXTERN const char      *rs_cutchars;	/* chars for selection boundaries */
 #ifdef META8_OPTION
 EXTERN const char      *rs_modifier;
diff -urN ../aterm-1.0.1-orig/src/screen.c src/screen.c
--- ../aterm-1.0.1-orig/src/screen.c	2007-08-27 17:10:24 +0900
+++ src/screen.c	2007-08-27 17:11:27 +0900
@@ -28,6 +28,10 @@
  *
  *    Michael Bruun Petersen" <mbp@image.dk>
  *		- tinting fix
+ *
+ * Modifications:
+ *    2003      Andrew Church <achurch@achurch.org>
+ *              - add line spacing (-lsp, lineSpacing)
  *--------------------------------------------------------------------------*/
 /*
  * We handle _all_ screen updates and selections
@@ -2590,13 +2594,13 @@
 			       ThaiCol2Pixel(col,screen.text[screen.cur.row+TermWin.saveLines]),
 			       Row2Pixel(currow),
 			       Width2Pixel(1 + wbyte) - 1,
-			       Height2Pixel(1) - 1);
+			       Height2Pixel(1) - TermWin.lineSpacing - 1);
 
 #else
 		XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc,
 			       Col2Pixel(col), Row2Pixel(currow),
 			       Width2Pixel(1 + wbyte) - 1,
-			       Height2Pixel(1) - 1);
+			       Height2Pixel(1) - TermWin.lineSpacing - 1);
 #endif
 #ifndef NO_CURSORCOLOR
 		if (gcmask)	/* restore normal colours */
diff -urN ../aterm-1.0.1-orig/src/xdefaults.c src/xdefaults.c
--- ../aterm-1.0.1-orig/src/xdefaults.c	2005-12-07 02:08:44 +0900
+++ src/xdefaults.c	2007-08-27 17:12:33 +0900
@@ -22,6 +22,8 @@
  *    1994      Robert Nation <nation@rocket.sanders.lockheed.com>
  * Modifications:
  *    1997,1998 mj olesen <olesen@me.queensu.ca>
+ *    2003      Andrew Church <achurch@achurch.org>
+ *              - add line spacing (-lsp, lineSpacing)
  *----------------------------------------------------------------------*/
 /*----------------------------------------------------------------------*
  * get resources from ~/.Xdefaults or ~/.Xresources with the memory-saving
@@ -320,6 +322,8 @@
          "minimum number of columns stored in buffer"),
     STRG(rs_saveLines, "saveLines", "sl", "number",
          "number of scrolled lines to save"),
+    STRG(rs_lineSpacing, "lineSpacing", "lsp", "number",
+         "number of pixels between displayed lines"),
 #ifdef USE_LINESPACE
     STRG(rs_lineSpace, "lineSpace", "lsp", "number",
          "line space"),
######## end line spacing (-lsp) patch
EOT

/pkg/aterm/
/usr/bin/aterm
/usr/man/man1/aterm.1.gz
