Use the same icon set in x-gtk-stock-map.

diff --git a/lisp/riece-command-join.xpm b/lisp/riece-command-join.xpm
index 03918c7..f57abae 100644 (file)
--- a/lisp/riece-command-join.xpm
+++ b/lisp/riece-command-join.xpm
@@ -1,234 +1,219 @@
 /* XPM */
 static char *riece_command_join[] = {
 /* columns rows colors chars-per-pixel */
 /* XPM */
 static char *riece_command_join[] = {
 /* columns rows colors chars-per-pixel */

-"24 24 204 2",
-"   c #000000",
-".  c #0C0600",
-"X  c #040E05",
-"o  c #040608",
-"O  c #140A00",
-"+  c #1A0E02",
-"@  c #150F0C",
-"#  c #0C130C",
-"$  c #081B09",
-"%  c #1C1105",
-"&  c #14130F",
-"*  c #1A120D",
-"=  c #0D1215",
-"-  c #0E1912",
-";  c #0D131A",
-":  c #141413",
-">  c #1A1512",
-",  c #121D13",
-"<  c #181817",
-"1  c #1D1D1D",
-"2  c #261403",
-"3  c #291704",
-"4  c #2D1803",
-"5  c #20150F",
-"6  c #221B0F",
-"7  c #341C04",
-"8  c #3A1F05",
-"9  c #231813",
-"0  c #2A1D16",
-"q  c #221E19",
-"w  c #0D2B0E",
-"e  c #132A14",
-"r  c #17201D",
-"t  c #17321B",
-"y  c #3B240B",
-"u  c #352E0C",
-"i  c #33261F",
-"p  c #39271C",
-"a  c #31281A",
-"s  c #171E27",
-"d  c #191D20",
-"f  c #1D2227",
-"g  c #1C3227",
-"h  c #182330",
-"j  c #242323",
-"k  c #292626",
-"l  c #25282C",
-"z  c #282C31",
-"x  c #452505",
-"c  c #432E0C",
-"v  c #44380F",
-"b  c #5B3107",
-"n  c #452F1A",
-"m  c #593615",
-"M  c #653607",
-"N  c #4C3A29",
-"B  c #19401B",
-"V  c #1D4D19",
-"C  c #1C541C",
-"Z  c #2F4328",
-"A  c #3A422D",
-"S  c #235023",
-"D  c #225F21",
-"F  c #216421",
-"G  c #266A26",
-"H  c #257A25",
-"J  c #2B752C",
-"K  c #277D29",
-"L  c #2A7D2A",
-"P  c #306D30",
-"I  c #2F7D30",
-"U  c #3D703D",
-"Y  c #434512",
-"T  c #575D19",
-"R  c #7A440C",
-"E  c #7F5A16",
-"W  c #6A5432",
-"Q  c #293B51",
-"!  c #374756",
-"~  c #3C4E5C",
-"^  c #3A4E63",
-"/  c #354F69",
-"(  c #3B536C",
-")  c #3D5772",
-"_  c #3F5874",
-"`  c #3F5A78",
-"'  c #444444",
-"]  c #4B4844",
-"[  c #5B544A",
-"{  c #437E44",
-"}  c #6A665D",
-"|  c #435467",
-" . c #45586B",
-".. c #405A74",
-"X. c #45617E",
-"o. c #4E667D",
-"O. c #506375",
-"+. c #52677C",
-"@. c #726F64",
-"#. c #646F7A",
-"$. c #83490F",
-"%. c #8A4C0E",
-"&. c #934F0D",
-"*. c #9B580F",
-"=. c #A55C10",
-"-. c #A95F13",
-";. c #846218",
-":. c #8E601B",
-">. c #AC6011",
-",. c #A26A1A",
-"<. c #B66514",
-"1. c #BE6A15",
-"2. c #AB7625",
-"3. c #B87B20",
-"4. c #C3741C",
-"5. c #CB7519",
-"6. c #D17B1E",
-"7. c #2B822B",
-"8. c #2D882E",
-"9. c #2F8930",
-"0. c #318231",
-"q. c #318F31",
-"w. c #369736",
-"e. c #438245",
-"r. c #49844A",
-"t. c #4C914E",
-"y. c #74A975",
-"u. c #C78523",
-"i. c #CB8622",
-"p. c #CD8D2B",
-"a. c #D08A24",
-"s. c #D18E28",
-"d. c #D3922F",
-"f. c #DA942B",
-"g. c #D79733",
-"h. c #DE9B33",
-"j. c #DF9F3A",
-"k. c #DFA03E",
-"l. c #B68A46",
-"z. c #B68C4B",
-"x. c #969471",
-"c. c #C09044",
-"v. c #496583",
-"b. c #4D6986",
-"n. c #4F6B88",
-"m. c #556C83",
-"M. c #586E84",
-"N. c #526E8B",
-"B. c #54718E",
-"V. c #5A7289",
-"C. c #597591",
-"Z. c #5D7996",
-"A. c #607285",
-"S. c #6F7A84",
-"D. c #6F7F91",
-"F. c #607C98",
-"G. c #66829D",
-"H. c #6C849B",
-"J. c #748A9E",
-"K. c #7C8A99",
-"L. c #6884A0",
-"P. c #6E8AA6",
-"I. c #738EAA",
-"U. c #7591AC",
-"Y. c #7C93AB",
-"T. c #899097",
-"R. c #90989F",
-"E. c #A7A294",
-"W. c #B3AD98",
-"Q. c #8D99A5",
-"!. c #8296AA",
-"~. c #899EB0",
-"^. c #96A1AD",
-"/. c #8FA0B2",
-"(. c #9AACBD",
-"). c #A0ABB7",
-"_. c #CFC7A4",
-"`. c #DBCAA3",
-"'. c #D1C7AB",
-"]. c #D3C8A9",
-"[. c #DFD0A9",
-"{. c #EBDEBF",
-"}. c #A7B8C7",
-"|. c #A9B8C6",
-" X c #B8C3CC",
-".X c #BAC5D1",
-"XX c #C5C6C8",
-"oX c gray80",
-"OX c #DED9C6",
-"+X c #CBD4DB",
-"@X c #E3DEC9",
-"#X c #EAE4CD",
-"$X c #F1E8CE",
-"%X c #E7E2D4",
-"&X c #EFE6D0",
-"*X c #F0E7D2",
-"=X c #F1E8D5",
-"-X c #F3EDD8",
-";X c #D5DBE1",
-":X c #E7E9EC",
-">X c #F8F3E1",
-",X c #F9F6EA",
-"<X c #F2F3F4",
-"1X c None",
+"24 24 189 2",
+"   c #EDD400",
+".  c #F2F02B",
+"X  c #F5F328",
+"o  c #F5F329",
+"O  c #F4F22A",
+"+  c #F5F32A",
+"@  c #F2F02C",
+"#  c #F4F22D",
+"$  c #EBE933",
+"%  c #EDEC32",
+"&  c #80827E",
+"*  c #D1D150",
+"=  c #D2D25E",
+"-  c #E0DF40",
+";  c #E3E242",
+":  c #EFEE4F",
+">  c #E4E351",
+",  c #F0EF55",
+"<  c #F2F152",
+"1  c #F2F157",
+"2  c #C2C261",
+"3  c #CDCD66",
+"4  c #EFEE60",
+"5  c #ECEC6B",
+"6  c #F1F063",
+"7  c #F7F66E",
+"8  c #EFEF70",
+"9  c #EEEE74",
+"0  c #E2E27D",
+"q  c #ECEB79",
+"w  c #EBEB7D",
+"e  c #EBEC7C",
+"r  c #F0EF76",
+"t  c #F1F177",
+"y  c #F7F677",
+"u  c #F1F07E",
+"i  c #838581",
+"p  c #8A8C87",
+"a  c #8B8D88",
+"s  c #8C8E88",
+"d  c #8C8E89",
+"f  c #8D8F8A",
+"g  c #8D908A",
+"h  c #8E908B",
+"j  c #8F918B",
+"k  c #90928C",
+"l  c #91938E",
+"z  c #92948F",
+"x  c #93958F",
+"c  c #939590",
+"v  c #949691",
+"b  c #959892",
+"n  c #979993",
+"m  c #989A95",
+"M  c #999B96",
+"N  c #9A9D97",
+"B  c #9C9E98",
+"V  c #9D9F9A",
+"C  c #9FA283",
+"Z  c #9EA19B",
+"A  c #9FA29C",
+"S  c #BEBF81",
+"D  c #A1A39D",
+"F  c #A2A59E",
+"G  c #ABAE9D",
+"H  c #B3B594",
+"J  c #A3A6A0",
+"K  c #A4A7A1",
+"L  c #A6A9A2",
+"P  c #A6A9A3",
+"I  c #A7A9A3",
+"U  c #A7AAA3",
+"Y  c #A7AAA4",
+"T  c #A8AAA4",
+"R  c #AAADA6",
+"E  c #ABAEA7",
+"W  c #EBEB86",
+"Q  c #EDED8D",
+"!  c #EEEE8E",
+"~  c #EFEE8F",
+"^  c #F0EF8D",
+"/  c #F1F082",
+"(  c #F9F780",
+")  c #F0F08D",
+"_  c #E9E995",
+"`  c #ECEC96",
+"'  c #EAEB98",
+"]  c #ECEB99",
+"[  c #F0F09D",
+"{  c #E7E9A2",
+"}  c #E8E8A5",
+"|  c #E8E9A5",
+" . c #E9EAA6",
+".. c #E6E8AB",
+"X. c #E7E8AD",
+"o. c #EDEDAB",
+"O. c #EBEBAF",
+"+. c #FBFAAC",
+"@. c #EFEFB5",
+"#. c #E5E7BB",
+"$. c #E7E8BE",
+"%. c #F0F0B2",
+"&. c #F1F0B5",
+"*. c #F2F2B7",
+"=. c #F7F7BB",
+"-. c #DADBD9",
+";. c #DDDEDB",
+":. c #E5E7C3",
+">. c #E4E5CB",
+",. c #E4E6CB",
+"<. c #E5E7CB",
+"1. c #F0F0C1",
+"2. c #F0F0C7",
+"3. c #FBFBCA",
+"4. c #E3E5D0",
+"5. c #E3E5D3",
+"6. c #E4E6D0",
+"7. c #E4E6D4",
+"8. c #EAEBD1",
+"9. c #E4E7D8",
+"0. c #E2E4DF",
+"q. c #E2E5DF",
+"w. c #E4E6DD",
+"e. c #E5E7DE",
+"r. c #E7E8D9",
+"t. c #ECEDDC",
+"y. c #EFF0D1",
+"u. c #EFF0DA",
+"i. c #FBFBD5",
+"p. c #FAFADA",
+"a. c #FCFBD8",
+"s. c #E2E4E0",
+"d. c #E3E4E0",
+"f. c #E2E5E0",
+"g. c #E3E5E0",
+"h. c #E3E5E1",
+"j. c #E4E6E1",
+"k. c #E4E6E2",
+"l. c #E4E7E2",
+"z. c #E5E7E2",
+"x. c #E5E7E3",
+"c. c #E6E7E3",
+"v. c #E5E8E3",
+"b. c #E6E8E4",
+"n. c #E7E8E4",
+"m. c #E7E9E5",
+"M. c #E8E9E6",
+"N. c #E8EAE6",
+"B. c #E9EAE6",
+"V. c #E9EAE7",
+"C. c #E9EBE7",
+"Z. c #EAEBE8",
+"A. c #EBECE9",
+"S. c #ECEDEA",
+"D. c #ECEEEB",
+"F. c #EDEEEB",
+"G. c #EDEFEB",
+"H. c #EDEEEC",
+"J. c #EEEEEC",
+"K. c #EEEFEC",
+"L. c #EFEFED",
+"P. c #EFF0E9",
+"I. c #EFF0ED",
+"U. c #EFF0EE",
+"Y. c #F0F0EE",
+"T. c #F0F1EF",
+"R. c #F1F1EF",
+"E. c #FDFCEA",
+"W. c #FDFCEC",
+"Q. c #FEFDEC",
+"!. c #FEFEEF",
+"~. c #F1F1F0",
+"^. c #F1F2F0",
+"/. c #F2F2F0",
+"(. c #F2F2F1",
+"). c #F2F3F1",
+"_. c #F3F3F2",
+"`. c #F3F4F2",
+"'. c #F4F4F3",
+"]. c #F5F5F4",
+"[. c #FEFEF6",
+"{. c #FEFEF7",
+"}. c #FDFDF9",
+"|. c #FEFEF8",
+" X c #FEFEFA",
+".X c #FEFEFB",
+"XX c #FEFEFE",
+"oX c gray100",
+"OX c None",

 /* pixels */
 /* pixels */

-"1X1X1X1X1X1X1X1X1X1X1X1X1X@ > 9 5 1X1X1X1X1X1X1X",
-"1X1X1X1X1X1X1X1X1X1X1X1XE.@X%X%XOX[ 1X1X1X1X1X1X",
-"1X1X1X1X1X1X1X1X1X1X1X@.%X,X,X>X-X#X* 1X1X1X1X1X",
-"1X1X1X1X1X1X          } -X*X=X&X{.$XW.p 1X1X1X1X",
-"1X1X1X1X1X:   ] ] .   j W z.l.l.l.c.'.i 1X1X1X1X",
-"1X1X1X1X1 o ] ' j       a k.j.j.g.d.[.0 1X1X1X1X",
-"1X1X1X1X< O N O . % 2 7 6 h.h.h.d.p.`.> 1X1X1X1X",
-"1X1X1X1X+ x 4.4.4.4.5.R % f.f.f.s.2.`.: 1X1X1X1X",
-"1X1X1X1X4 b 6.6.6.6.5.R y s.f.f.u.:.].& 1X1X1X1X",
-"1X1X1X1X7 -.5.5.5.5.5.<.y 3.a.i.,.v _.q 1X1X1X1X",
-"1X1X1X1X8 *.1.$.2 4 %.<.c T ;.E Y V x.A # 1X1X1X",
-"1X1X1X1X1Xx &.7 >.=.x M u F C S D D Z P r., 1X1X",
-"1X1X1X1X= k m 7 7 7 3 n g B G y.t.L J I 0.e., 1X",
-"1X1X1Xl R.~.S.q + * j #.| ~ - U w.q.9.7.7.7.e 1X",
-"1X1Xz ).I.U.O.T.oXXXQ.D.m.M. .r { q.8.7.K H w 1X",
-"1X: R.Y.P.P.V.K.<X:X}.Y.G.Z.o.! t 8.7.L H J $ 1X",
-"1X: ^.G.G.L.V.A.:X+X(.Y..XH.N.b.= H K J G   X 1X",
-"1Xd ~.Z.Z.F.F.+.+X.XG..X;X+Xb.X.=         1X1X1X",
-"1Xf !.B.C.C.C.|  X|.C.N.n.v.X.` ; 1X1X1X1X1X1X1X",
-"1Xs J.n.N.N.B.^ H./.n.b.v.X.) / o 1X1X1X1X1X1X1X",
-"1X  h ) ) ) _ _ ..) ) ) ) ( ( Q   1X1X1X1X1X1X1X",
-"1X1X                            1X1X1X1X1X1X1X1X",
-"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X",
-"1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X1X"
+"OXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOX",
+"OXOXOXE T Y Y U I P G H S 3 OXOXOXOXOXOXOXOXOXOX",
+"OXOXR ;.XXoXoXoXoXQ.p.*.] 0 = > O OXOXOXOXOXOXOX",
+"OXOXL XXG.C.N.b.9.:. .! t 6     ; @ + OXOXOXOXOX",
+"OXOXK oXN.m.b.e.<...` 5 :   {.oX  % O + OXOXOXOX",
+"OXOXJ oXb.v.l.7.#._       3.oXoX!.      + OXOXOX",
+"OXOXF oXl.k.j.6.X.  =.}.oXoXoXoXoXoXoXa.  OXOXOX",
+"OXOXD oXj.h.g.,.} w   .XoXoXoXoXoXoXoX  o + OXOX",
+"OXOXA oXg.f.f.>.{ q   y XXoXoXoXoXoXi.  o + OXOX",
+"OXOXZ oXd.f.q.4.| e ,   W.oXoXoXoXoX  . o + OXOX",
+"OXOXV oX0.f.s.5.X.W 4    XoXoXoXoXoX  $ o OXOXOX",
+"OXOXB oXf.g.h.w.$.' 9   oX[.    E.oX  - + OXOXOX",
+"OXOXN oXz.x.c.b.r.O.Q 8     # X     7 * OXOXOXOX",
+"OXOXM oXn.m.M.N.V.8.o.~ r 6 1 < 1 6 ( 2 OXOXOXOX",
+"OXOXm oXB.C.Z.A.A.S.t.@.[ ) / u / ^ +.C OXOXOXOX",
+"OXOXn oXZ.A.S.F.H.K.L.P.u.2.&.%.1.y.|.z OXOXOXOX",
+"OXOXb oXA.S.F.K.I.Y.R.^.(.).).(./.R.oXl OXOXOXOX",
+"OXOXv oXS.F.K.I.Y.R./._.'.].].'._.).oXk OXOXOXOX",
+"OXOXc oXS.F.J.L.U.T.^.)._.`.`._.)./.oXh OXOXOXOX",
+"OXOXx XXF.S.D.H.K.I.Y.T.T.R.R.R.T.~.XXh OXOXOXOX",
+"OXOXg -.XXoXoXoXoXoXoXoXoXoXoXoXoXXX-.p OXOXOXOX",
+"OXOXOXi j h h h g f f f d d d s a d & OXOXOXOXOX",
+"OXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOX",
+"OXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOXOX"

 };
 };

diff --git a/lisp/riece-command-list-addons.xpm b/lisp/riece-command-list-addons.xpm
index 31b3d9c..50f2de6 100644 (file)
--- a/lisp/riece-command-list-addons.xpm
+++ b/lisp/riece-command-list-addons.xpm
@@ -1,223 +1,106 @@
 /* XPM */
 static char *riece_command_list_addons[] = {
 /* columns rows colors chars-per-pixel */
 /* XPM */
 static char *riece_command_list_addons[] = {
 /* columns rows colors chars-per-pixel */

-"24 24 193 2",
-"   c black",
-".  c #030000",
-"X  c #020201",
-"o  c #030302",
-"O  c #040000",
-"+  c #050000",
-"@  c #060100",
-"#  c #070500",
-"$  c #040403",
-"%  c #080000",
-"&  c #080100",
-"*  c #0C0303",
-"=  c #090806",
-"-  c #080807",
-";  c #12110F",
-":  c #131210",
-">  c #201A1A",
-",  c #332C2B",
-"<  c #2C2A30",
-"1  c #4F4D4A",
-"2  c #574F4F",
-"3  c #57514F",
-"4  c #575050",
-"5  c #585251",
-"6  c #5D5954",
-"7  c #615B50",
-"8  c #625A53",
-"9  c #645E53",
-"0  c #655F54",
-"q  c #625C59",
-"w  c #615C5B",
-"e  c #625C5B",
-"r  c #6B625A",
-"t  c #696764",
-"y  c #6D6767",
-"u  c #706760",
-"i  c #716860",
-"p  c #736961",
-"a  c #746C67",
-"s  c #766D68",
-"d  c #7D7668",
-"f  c #79736C",
-"g  c #7F766D",
-"h  c #7B7975",
-"j  c #807869",
-"k  c #847C6D",
-"l  c #857D6E",
-"z  c #877F70",
-"x  c #898172",
-"c  c #8C8475",
-"v  c #8D8576",
-"b  c #84817A",
-"n  c #8D8379",
-"m  c #938B7C",
-"M  c #948A7F",
-"N  c #948C7D",
-"B  c #8C9C7A",
-"V  c #E4C041",
-"C  c #E5C144",
-"Z  c #E9CB62",
-"A  c #E9CB64",
-"S  c #EBD072",
-"D  c #ECD175",
-"F  c #878786",
-"G  c #8C8782",
-"H  c #958C80",
-"J  c #928C84",
-"K  c #908C86",
-"L  c #988D82",
-"P  c #979082",
-"I  c #989183",
-"U  c #97938E",
-"Y  c #98948F",
-"T  c gray61",
-"R  c #A09489",
-"E  c #A09A8D",
-"W  c #A49D91",
-"Q  c #A59E92",
-"!  c #A69F93",
-"~  c #A09E97",
-"^  c #A7A094",
-"/  c #A8A199",
-"(  c #A9A398",
-")  c #ABA59A",
-"_  c #A3AB9C",
-"`  c #B8AB9D",
-"'  c #BAAD9E",
-"]  c #A3A3A2",
-"[  c #B3AEA4",
-"{  c #B5B0A6",
-"}  c #B6B1A7",
-"|  c #BEB0A2",
-" . c #BFB4A6",
-".. c #B7B2A8",
-"X. c #B8B3A9",
-"o. c #B9B4AA",
-"O. c #BBB6AC",
-"+. c #BBB7AE",
-"@. c #BCB8AF",
-"#. c #B7B5B0",
-"$. c #B8B6B1",
-"%. c #BDB9B0",
-"&. c #BFBBB2",
-"*. c #BCBCBC",
-"=. c #C2B5A7",
-"-. c #C9BBAC",
-";. c #C0BCB3",
-":. c #C1BDB4",
-">. c #C2BEB5",
-",. c #C4BFB7",
-"<. c #C8BFB4",
-"1. c #C0BDBA",
-"2. c #EED787",
-"3. c #EED88B",
-"4. c #C5C0B8",
-"5. c #C9C5BE",
-"6. c #CAC6BF",
-"7. c #D7C8B8",
-"8. c #D5CCBF",
-"9. c #D8C9B9",
-"0. c #D9CABB",
-"q. c #DECFBF",
-"w. c #F2E0A3",
-"e. c #F3E3AA",
-"r. c #F4E5B1",
-"t. c #F4E5B3",
-"y. c #F5E7B6",
-"u. c #C5C4C0",
-"i. c #CBC7C0",
-"p. c #CECAC3",
-"a. c #CFCCC6",
-"s. c #D9CEC2",
-"d. c #DDCFC4",
-"f. c #D2CFC9",
-"g. c #D5D2CC",
-"h. c #D6D3CD",
-"j. c #D7D4CE",
-"k. c #DAD3C9",
-"l. c #D8D5CF",
-"z. c #DFD7CD",
-"x. c #D7D6D4",
-"c. c gray84",
-"v. c #D8D1D0",
-"b. c #D8D6D1",
-"n. c #D9D5D2",
-"m. c #D9D7D2",
-"M. c #D8D7D5",
-"N. c #DED7D5",
-"B. c #DAD8D3",
-"V. c #DBD9D4",
-"C. c #D9D8D6",
-"Z. c #DAD9D7",
-"A. c #DCDAD5",
-"S. c #DDDBD6",
-"D. c #DEDCD7",
-"F. c #DBDAD8",
-"G. c #DCDBD9",
-"H. c #DFDDD8",
-"J. c #DEDDDB",
-"K. c #E3D3C2",
-"L. c #E0DBD7",
-"P. c #E0DED9",
-"I. c #E2DFDC",
-"U. c #F0E0CE",
-"Y. c #E2E0DD",
-"T. c #F6E9D8",
-"R. c #E5E3E0",
-"E. c #E8E5E2",
-"W. c #E9E6E3",
-"Q. c #ECE4E2",
-"!. c #ECEBE9",
-"~. c #EDECEA",
-"^. c #ECECEB",
-"/. c #EEEDEB",
-"(. c #EDEDEC",
-"). c #EFEEEC",
-"_. c #F1EDE7",
-"`. c #F9EFE3",
-"'. c #F9EEE4",
-"]. c #F9F0E4",
-"[. c #F2F1EF",
-"{. c #F9F1EA",
-"}. c #FBF3EA",
-"|. c #F2F2F1",
-" X c #F3F2F2",
-".X c #FDFAF8",
-"XX c #FCFBFA",
-"oX c #FCFCFB",
-"OX c #FDFDFC",
-"+X c #FEFDFC",
-"@X c #FEFDFD",
-"#X c #FFFEFD",
-"$X c None",
+"24 24 76 1",
+"  c #2E3436",
+". c #343A3B",
+"X c #414646",
+"o c #4D5252",
+"O c #555753",
+"+ c #5A5E5D",
+"@ c #676A68",
+"# c #737673",
+"$ c #80827E",
+"% c #868984",
+"& c #888A85",
+"* c #898B86",
+"= c #898C87",
+"- c #8D908B",
+"; c #8F928C",
+": c #BABDB6",
+"> c gray78",
+", c #C8C8C8",
+"< c gray79",
+"1 c #CACBC9",
+"2 c #CACACA",
+"3 c #CBCBCB",
+"4 c gray80",
+"5 c #CDCDCD",
+"6 c #CECFCD",
+"7 c #CECECE",
+"8 c gray81",
+"9 c #D0D0D0",
+"0 c gray82",
+"q c #D2D2D2",
+"w c LightGray",
+"e c #D5D5D5",
+"r c gray86",
+"t c gainsboro",
+"y c #DDDDDD",
+"u c gray87",
+"i c #DFDFDF",
+"p c gray88",
+"a c #E1E1E0",
+"s c #E1E1E1",
+"d c #E2E2E1",
+"f c #E2E2E2",
+"g c #E3E3E2",
+"h c gray89",
+"j c #E4E4E3",
+"k c #E4E4E4",
+"l c #E5E5E4",
+"z c gray90",
+"x c #E6E6E5",
+"c c #E7E7E6",
+"v c #E8E8E6",
+"b c #E8E8E7",
+"n c #E9E9E7",
+"m c #E9E9E8",
+"M c #EAEAE8",
+"N c #EAEAE9",
+"B c #EBEBE9",
+"V c #EBEBEA",
+"C c #ECECEA",
+"Z c #ECECEB",
+"A c #EFEFEF",
+"S c gray94",
+"D c #F1F1F1",
+"F c gray95",
+"G c #F3F3F2",
+"H c #F3F3F3",
+"J c #F4F4F4",
+"K c #F5F5F4",
+"L c gray96",
+"P c #F6F6F5",
+"I c #F6F6F6",
+"U c #F7F7F6",
+"Y c gray97",
+"T c #FEFEFE",
+"R c gray100",
+"E c None",

 /* pixels */
 /* pixels */

-"$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X",
-"$X                                            $X",
-"$X  OX!.!.!.!.p.  V S S S D 3.  |.^.(.(.(.J.  $X",
-"$X  !.g.g.g.g.{   S r.r.r.r.t.  ^.x.x.M.C.#.  $X",
-"$X  !.g.g.g.g.{   S r.r.t.t.y.  (.x.M.C.C.$.  $X",
-"$X  !.g.g.g.g.{   S r.Z # A w.  ^.x.x.Z.Z.$.  $X",
-"$X  !.g.g.g.g.}   D e.2 OX  Z   G.C.C.Z.F.$.  $X",
-"$X  6.{ { { } l   2.2.4 .X  C   u.#.$.$.$.~   $X",
-"$X                    y {.                    $X",
-"$X  oX[.!.!.~.5.  c.*.e '.1       x [ Y./.a.  $X",
-"$X  !.h.j.j.l...  T   w ].a +X  #X:   k ,.%.  $X",
-"$X  !.j.j.l.l.X.     XY `.R @Xs +Xp ]   ! )   $X",
-"$X  ~.j.l.l.b.X.    E.U T.b }.K _.h F o c W   $X",
-"$X  ~.l.l.b.m.o.    I./ U.<.8.z.k.d.J o x Q   $X",
-"$X  p.X.X.o.o.m   O n.0.7.q.9.K.-.s.g o k I   $X",
-"$X                @ 1.G =. .` ' | M i o       $X",
-"$X  oX/./././.i.  ( , 6 f H n M L u   7 O.4.  $X",
-"$X  /.m.B.V.V.+.  &.d > 3 q 8 r 5 t $ 0 f.:.  $X",
-"$X  /.B.V.V.A.+.  m.;._ + * % & . < 9 j A.>.  $X",
-"$X  ).A.S.S.D.@.  H.p.O Q.N.v.L.W.XXX N H.,.  $X",
-"$X  ).S.S.D.D.%.  P.V.X - X ; . =     E Y.o.  $X",
-"$X  R.+.@.@.%.v   &.;.;.;...B   P P z N 4.^   $X",
-"$X                                            $X",
-"$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X"
+"EEEEEEEEEEEEEEEEEEEEEEEE",
+"EEEEEEEEEEEEEEEEEEEEEEEE",
+"EEEEEEEEEEEEEEEEEEEEEEEE",
+"EE-*&&&&&&&&&&&&&&&*-EEE",
+"E;6LUUIPPLLKJJHHHHHD1;EE",
+"E*LZVBNMnbcxljhfsppsD*EE",
+"E&UVOOOOOmbcxljhfsppH&EE",
+"E&UBORRROM   xl   spH&EE",
+"E&INO:::OB...cx...daH&EE",
+"E&PmOOOOOBXXXcOOOOOsH&EE",
+"E&LbmoooCBooobORRROfH&EE",
+"E&Lcb+++BB+++bO:::OgH&EE",
+"E&Lxc@@@MM@@@bOOOOOhH&EE",
+"E&Hlx###nOOOOOv###khG&EE",
+"E&Fjl$$$cORRROc$$$ljF&EE",
+"E&Dgj&&&xO:::Oc&&&ljD&EE",
+"E&SdghjllOOOOOxxxlljD&EE",
+"E&IdsfgjjllzxxxxllklY&EE",
+"E&HTRRRRRRRRRRRRRRRTA&EE",
+"E*zewq0988754322<,>,u*EE",
+"E=8hkhffspppiiuyyytr2=EE",
+"EE%*&&&&&&&&&&&&&&&*%EEE",
+"EEEEEEEEEEEEEEEEEEEEEEEE",
+"EEEEEEEEEEEEEEEEEEEEEEEE"

 };
 };

diff --git a/lisp/riece-command-next-channel.xpm b/lisp/riece-command-next-channel.xpm
index fcba2d6..8a23483 100644 (file)
--- a/lisp/riece-command-next-channel.xpm
+++ b/lisp/riece-command-next-channel.xpm
@@ -1,163 +1,113 @@
 /* XPM */
 static char *riece_command_next_channel[] = {
 /* columns rows colors chars-per-pixel */
 /* XPM */
 static char *riece_command_next_channel[] = {
 /* columns rows colors chars-per-pixel */

-"24 24 133 2",
-"   c black",
-".  c gray2",
-"X  c #0E0E0E",
-"o  c gray12",
-"O  c #282828",
-"+  c gray22",
-"@  c #676359",
-"#  c gray38",
-"$  c #6A6763",
-"%  c #72706C",
-"&  c #817D74",
-"*  c #8B867D",
-"=  c #838381",
-"-  c #848381",
-";  c #9B958A",
-":  c #9B968A",
-">  c #9D978B",
-",  c #9D978C",
-"<  c #9E988D",
-"1  c #9F998D",
-"2  c #999891",
-"3  c gray62",
-"4  c #A19B8F",
-"5  c #A19B90",
-"6  c #A19C90",
-"7  c #A29C90",
-"8  c #A39D91",
-"9  c #A39D92",
-"0  c #A39E92",
-"q  c #A49E93",
-"w  c #A4A4A3",
-"e  c gray67",
-"r  c #AFAFAE",
-"t  c #B2B1AF",
-"y  c #B2B1B0",
-"u  c #B3B2B0",
-"i  c gray70",
-"p  c #B5B4B3",
-"a  c #B6B6B4",
-"s  c #B9B7B6",
-"d  c #BABAB8",
-"f  c #BCBBBA",
-"g  c #BEBDBD",
-"h  c #C4C3C0",
-"j  c #CACAC8",
-"k  c #CDCDCD",
-"l  c #D5D3CE",
-"z  c gray82",
-"x  c LightGray",
-"c  c #D7D5D1",
-"v  c #D7D6D1",
-"b  c #D4D4D3",
-"n  c #D8D6D1",
-"m  c #D8D6D2",
-"M  c #D9D7D3",
-"N  c #DBD9D5",
-"B  c #DCDAD6",
-"V  c #DCDBD7",
-"C  c #DDDBD7",
-"Z  c #DCDAD8",
-"A  c #DDDCD8",
-"S  c #DEDCD8",
-"D  c #DEDDD9",
-"F  c #DFDEDA",
-"G  c #E0DEDA",
-"H  c #E0DFDB",
-"J  c #E1DFDB",
-"K  c #E1DFDC",
-"L  c #E1E0DC",
-"P  c #E1E0DD",
-"I  c #E2E0DD",
-"U  c #E2E1DD",
-"Y  c #E0E0DF",
-"T  c #E2E1DE",
-"R  c #E2E1DF",
-"E  c #E3E2DE",
-"W  c #E3E2DF",
-"Q  c #E4E2DF",
-"!  c #E4E3DF",
-"~  c #E4E3E0",
-"^  c #E5E4E0",
-"/  c #E5E4E1",
-"(  c #E6E4E1",
-")  c #E5E4E2",
-"_  c #E5E5E2",
-"`  c #E6E5E2",
-"'  c #E7E5E2",
-"]  c #E7E6E3",
-"[  c #E4E4E4",
-"{  c #E7E7E7",
-"}  c #E8E7E4",
-"|  c #E8E7E5",
-" . c #E9E8E5",
-".. c #E9E8E6",
-"X. c #E9E9E9",
-"o. c #EBEAE8",
-"O. c #ECEBE9",
-"+. c #EDECEA",
-"@. c #EDEDEB",
-"#. c #EEEDEB",
-"$. c gray93",
-"%. c #EFEEEC",
-"&. c #EFEFED",
-"*. c #EEEEEE",
-"=. c #EFEFEE",
-"-. c #F0EFED",
-";. c #F0F0EE",
-":. c #F1F0EE",
-">. c #F1F0EF",
-",. c gray94",
-"<. c #F2F2F0",
-"1. c #F3F2F1",
-"2. c #F3F3F1",
-"3. c gray95",
-"4. c #F4F3F2",
-"5. c #F5F4F3",
-"6. c #F5F5F3",
-"7. c #F4F4F4",
-"8. c #F6F5F4",
-"9. c #F6F6F4",
-"0. c #F7F6F5",
-"q. c #F6F6F6",
-"w. c #F8F7F6",
-"e. c #F8F8F7",
-"r. c #F9F9F8",
-"t. c #F9F9F9",
-"y. c #FAFAF9",
-"u. c #FBFBFB",
-"i. c #FCFCFB",
-"p. c #FDFDFD",
-"a. c #FEFEFE",
-"s. c gray100",
-"d. c None",
+"24 24 83 1",
+"  c #1F4884",
+". c #1F4B86",
+"X c #1F4B87",
+"o c #204A87",
+"O c #214A87",
+"+ c #204B87",
+"@ c #214C87",
+"# c #204A88",
+"$ c #204B88",
+"% c #214B88",
+"& c #214B89",
+"* c #224B88",
+"= c #224A8A",
+"- c #214C88",
+"; c #204C89",
+": c #214C89",
+"> c #224C88",
+", c #234D8A",
+"< c #244E89",
+"1 c #264F8B",
+"2 c #254F8C",
+"3 c #29528E",
+"4 c #2B548E",
+"5 c #2F5D9B",
+"6 c #365F97",
+"7 c #32619F",
+"8 c #3765A2",
+"9 c #3666A3",
+"0 c #3465A4",
+"q c #3767A5",
+"w c #3B6AA5",
+"e c #3868A6",
+"r c #3A69A6",
+"t c #3B6BA7",
+"y c #3C6AA5",
+"u c #3C6BA7",
+"i c #3F6CA6",
+"p c #3F6CA7",
+"a c #3D6CA8",
+"s c #3F70AB",
+"d c #3F70AC",
+"f c #41689E",
+"g c #466EA4",
+"h c #416EA8",
+"j c #446FA8",
+"k c #4B72A7",
+"l c #4371AB",
+"z c #4471AB",
+"x c #4772AA",
+"c c #4070AC",
+"v c #4071AC",
+"b c #4171AC",
+"n c #4070AD",
+"m c #4071AD",
+"M c #4171AD",
+"N c #4272AD",
+"B c #4872AA",
+"V c #4E76AA",
+"C c #4C76AD",
+"Z c #4E76AD",
+"A c #5178AD",
+"S c #5079AE",
+"D c #4979B3",
+"F c #4A7AB3",
+"G c #4B7AB3",
+"H c #4D79B1",
+"J c #4C7BB4",
+"K c #4E7CB5",
+"L c #4E7DB5",
+"P c #507BB0",
+"I c #537FB5",
+"U c #5B83B5",
+"Y c #5982B6",
+"T c #5883B7",
+"R c #5B84B8",
+"E c #5A86BA",
+"W c #5E87B9",
+"Q c #628BBB",
+"! c #638CBC",
+"~ c #678EBD",
+"^ c #6B8FBE",
+"/ c #6990BF",
+"( c None",

 /* pixels */
 /* pixels */

-"d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.",
-"d.d.d.                          X O # d.d.d.d.d.",
-"d.d.  x q.s.s.s.s.s.s.s.s.t.r.r.{ [ k o d.d.d.d.",
-"d.d.  q.s.s.s.s.s.s.s.s.s.s.r.=.r X.s.i + d.d.d.",
-"d.d.  s.s.s.s.s.s.s.a.s.a.p.r.*.w ,.s.7.e . d.d.",
-"d.d.  s.s.s.s.s.a.p.i.p.i.u.r.3.3           d.d.",
-"d.d.  s.s.s.a.p.i.u.y.u.y.r.r.7.b s = - $   d.d.",
-"d.d.  s.a.p.i.u.y.r.e.r.e.w.r.1.Y Z j a %   d.d.",
-"d.d.  s.i.u.y.r.e.w.  g 0.9.4.>.-.-.) h &   d.d.",
-"d.d.  s.y.r.e.w.0.9.    f 4.4.4.4.o.K K *   d.d.",
-"d.d.  s.e.w.0.9.5.4.      d &.#.@._ K K q   d.d.",
-"d.d.  s.8.6.4.4.2.<.        a O.] R ~ K q   d.d.",
-"d.d.  s.4.1.<.;.&.:.          y / ~ T K q   d.d.",
-"d.d.  s.4.1.<.;.&.:.        p | / ~ T K q   d.d.",
-"d.d.  s.;.&.&.%.#.+.      p } ] W I L H 6   d.d.",
-"d.d.  s.@.+.O.O.O.o.    u  ./ ( E F D A 5   d.d.",
-"d.d.  s.o.....| } }   t ] ' ! E H D A V 5   d.d.",
-"d.d.  s.] ` ` ` / ( ^ ( ^ ! U H D V N M 1   d.d.",
-"d.d.  t.~ W E Q ! U E U E L L D C B M m <   d.d.",
-"d.d.  $.P K L H U H L H L F G C B M n c >   d.d.",
-"d.d.  z J G F D H D G D G S S B B m v l ;   d.d.",
-"d.d.  2 0 q 9 8 9 6 7 6 7 4 5 1 1 , , : @   d.d.",
-"d.d.d.                                    d.d.d.",
-"d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d."
+"((((((((((((((((((((((((",
+"((((((((((((((((((((((((",
+"((((((((((((((((((((((((",
+"(((((((((((+*(((((((((((",
+"(((((((((((+6:((((((((((",
+"(((((((((((+^f$(((((((((",
+"(((((((((((+//g$((((((((",
+"(((%+++++++>~L!k&(((((((",
+"(((;UQQQQQQ!EDGWV>((((((",
+"(((;RKFFFFFFDDDDTA<(((((",
+"(((;YJDDDDDDDDDDDIS1((((",
+"(((;PNcsdcccvbnmmMHZ+(((",
+"(((;Bq00000000000aC4=(((",
+"(((;jq0000000000ux3$((((",
+"(((;izlzzzzzu00th2%(((((",
+"(((##oooooo@p0ry,(((((((",
+"(((((((((((+we8-((((((((",
+"(((((((((((X97%(((((((((",
+"(((((((((((.5#((((((((((",
+"(((((((((((.O(((((((((((",
+"((((((((((( ((((((((((((",
+"((((((((((((((((((((((((",
+"((((((((((((((((((((((((",
+"(((((((((((((((((((((((("

 };
 };

diff --git a/lisp/riece-command-part.xpm b/lisp/riece-command-part.xpm
index d09e15d..1dab483 100644 (file)
--- a/lisp/riece-command-part.xpm
+++ b/lisp/riece-command-part.xpm
@@ -1,145 +1,138 @@
 /* XPM */
 static char *riece_command_part[] = {
 /* columns rows colors chars-per-pixel */
 /* XPM */
 static char *riece_command_part[] = {
 /* columns rows colors chars-per-pixel */

-"24 24 115 2",
-"   c black",
-".  c #010101",
-"X  c #020202",
-"o  c #040404",
-"O  c #070404",
-"+  c #060606",
-"@  c #070707",
-"#  c #080403",
-"$  c #0D0705",
-"%  c #0E0806",
-"&  c gray3",
-"*  c #090909",
-"=  c gray4",
-"-  c #0B0B0B",
-";  c #0D0A08",
-":  c #100401",
-">  c #190603",
-",  c #1F0703",
-"<  c #1B0704",
-"1  c #1B0804",
-"2  c #180906",
-"3  c #1F0A07",
-"4  c #1D0F0C",
-"5  c #220905",
-"6  c #2C0B05",
-"7  c #2F0E07",
-"8  c #230C08",
-"9  c #2B0D08",
-"0  c #280E0A",
-"q  c #320D06",
-"w  c #24100C",
-"e  c #24100D",
-"r  c #24110E",
-"t  c #2A120D",
-"y  c #2B130E",
-"u  c #2F1510",
-"i  c #2D1714",
-"p  c #311712",
-"a  c #3B1711",
-"s  c #371813",
-"d  c #301914",
-"f  c #331914",
-"g  c #3C1812",
-"h  c #381B16",
-"j  c #3D1D17",
-"k  c #49160C",
-"l  c #4E160D",
-"z  c #411710",
-"x  c #4C1B13",
-"c  c #4E1D14",
-"v  c #422019",
-"b  c #572119",
-"n  c #5C251B",
-"m  c #652419",
-"M  c #822617",
-"N  c #822618",
-"B  c #922C1B",
-"V  c #912F1E",
-"C  c #922F1E",
-"Z  c #962E1C",
-"A  c #992F1D",
-"S  c #94301E",
-"D  c #96311E",
-"F  c #98311E",
-"G  c #A13521",
-"H  c #AD3620",
-"J  c #A23A26",
-"K  c #B03720",
-"L  c #B23821",
-"P  c #B43922",
-"I  c #B63922",
-"U  c #B73922",
-"Y  c #B43A23",
-"T  c #B63D26",
-"R  c #B93A22",
-"E  c #BA3A22",
-"W  c #BA3B22",
-"Q  c #BB3B22",
-"!  c #BC3B22",
-"~  c #BD3B22",
-"^  c #BE3B22",
-"/  c #BF3B22",
-"(  c #B93B24",
-")  c #B83E27",
-"_  c #BD3C24",
-"`  c #BD3D25",
-"'  c #BE3F27",
-"]  c #BD3F28",
-"[  c #C03B22",
-"{  c #C23B22",
-"}  c #AD4632",
-"|  c #C24129",
-" . c #C2462F",
-".. c #C34C36",
-"X. c #C24D36",
-"o. c #C44D36",
-"O. c #C64D37",
-"+. c #C84E37",
-"@. c #CE523A",
-"#. c #B45B4A",
-"$. c #B06354",
-"%. c #C95641",
-"&. c #D05F49",
-"*. c #D3634E",
-"=. c #CE6653",
-"-. c #C16E5E",
-";. c #CA6D5B",
-":. c #D66F5B",
-">. c #D9705B",
-",. c #CC7261",
-"<. c #CD7261",
-"1. c #CB7868",
-"2. c #D17F70",
-"3. c #DD8D7D",
-"4. c None",
+"24 24 108 2",
+"   c #4F514E",
+".  c #51524F",
+"X  c #535550",
+"o  c #535652",
+"O  c #545552",
+"+  c #545553",
+"@  c #555653",
+"#  c #545753",
+"$  c #565753",
+"%  c #555754",
+"&  c #565754",
+"*  c #565854",
+"=  c #565954",
+"-  c #575954",
+";  c #565855",
+":  c #575855",
+">  c #565955",
+",  c #575955",
+"<  c #575A55",
+"1  c #575A56",
+"2  c #585955",
+"3  c #585A55",
+"4  c #585956",
+"5  c #585A56",
+"6  c #595A56",
+"7  c #585B56",
+"8  c #585A57",
+"9  c #585B57",
+"0  c #595B57",
+"q  c #71726E",
+"w  c #747672",
+"e  c #757773",
+"r  c #767874",
+"t  c #777974",
+"y  c #767875",
+"u  c #777975",
+"i  c #7A7B78",
+"p  c #7A7C78",
+"a  c #7D7F7A",
+"s  c #7D7F7C",
+"d  c #7F817D",
+"f  c #81827E",
+"g  c #80827F",
+"h  c #828480",
+"j  c #828481",
+"k  c #838481",
+"l  c #848582",
+"z  c #858783",
+"x  c #858784",
+"c  c #868784",
+"v  c #888A85",
+"b  c #888986",
+"n  c #888A86",
+"m  c #898B86",
+"M  c #898A87",
+"N  c #8B8D8A",
+"B  c #8C8E89",
+"V  c #8C8D8A",
+"C  c #8C8E8A",
+"Z  c #8E8F8B",
+"A  c #8E8F8C",
+"S  c #8F8F8C",
+"D  c #8F908C",
+"F  c #8F918C",
+"G  c #90928D",
+"H  c #90928E",
+"J  c #91928E",
+"K  c #91938E",
+"L  c #919390",
+"P  c #929490",
+"I  c #929590",
+"U  c #939590",
+"Y  c #939591",
+"T  c #949691",
+"R  c #949692",
+"E  c #959792",
+"W  c #959793",
+"Q  c #969793",
+"!  c #969893",
+"~  c #979994",
+"^  c #989A95",
+"/  c #999B97",
+"(  c #9A9B97",
+")  c #9B9D99",
+"_  c #9C9E9A",
+"`  c #9E9F9B",
+"'  c #A0A19D",
+"]  c #A0A29D",
+"[  c #A0A29E",
+"{  c #A1A39F",
+"}  c #A2A4A0",
+"|  c #A4A6A1",
+" . c #A8A9A5",
+".. c #A9AAA6",
+"X. c #A9ABA7",
+"o. c #AAACA8",
+"O. c #ABACA8",
+"+. c #ABADA9",
+"@. c #ACADA9",
+"#. c #ACAEAA",
+"$. c #ADAEAA",
+"%. c #ADAEAB",
+"&. c #AEAFAC",
+"*. c #AEB0AC",
+"=. c #AFB0AC",
+"-. c #AEB0AD",
+";. c #AFB1AE",
+":. c None",

 /* pixels */
 /* pixels */

-"4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.",
-"4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.",
-"4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.",
-"4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.",
-"4.4.4.4.4.v h - 4.4.4.4.4.4.4.4.4.. o 4.4.4.4.4.",
-"4.4.4.4.p 3.&.c - 4.4.4.4.4.4.4.i -.} # 4.4.4.4.",
-"4.4.4.4.j *.%.O.x = 4.4.4.4.4.d >.| Z : 4.4.4.4.",
-"4.4.4.4.; ..[ / o.m * 4.4.4.4 :.( B l   4.4.4.4.",
-"4.4.4.4.4.u ..^ ^ ..n & 4.$ ;.) M 6   4.4.4.4.4.",
-"4.4.4.4.4.4.t ..~ ! L a o $. .N > . 4.4.4.4.4.4.",
-"4.4.4.4.4.4.4.y ..Q W U #.@.A , . 4.4.4.4.4.4.4.",
-"4.4.4.4.4.4.4.@ g ..E E +.I 7 . 4.4.4.4.4.4.4.4.",
-"4.4.4.4.4.4.4.4.. k =._ E E L g + 4.4.4.4.4.4.4.",
-"4.4.4.4.4.4.4.4.q 2.' T U W Q P y 4.4.4.4.4.4.4.",
-"4.4.4.4.4.4.4.< 1.] C & a X.! ~ K t 4.4.4.4.4.4.",
-"4.4.4.4.4.4.s 1.( D 3 4.@ a ..^ ^ Y r 4.4.4.4.4.",
-"4.4.4.4.  b ,.R Z 8 . 4.4.* z o./ [ J O 4.4.4.4.",
-"4.4.4.4.5 <.` F 0 X 4.4.4.4.- x O.{ H w 4.4.4.4.",
-"4.4.4.4.% V S 2 o 4.4.4.4.4.4.= c +.G e 4.4.4.4.",
-"4.4.4.4.4.9 1 o 4.4.4.4.4.4.4.4.= f p @ 4.4.4.4.",
-"4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.. 4.4.4.4.4.",
-"4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.",
-"4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.",
-"4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4.4."
+":.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.",
+":.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.",
+":.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.",
+":.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.",
+":.:.:.:.:.9 7 7 :.:.:.:.:.:.:.:.6 0 8 :.:.:.:.:.",
+":.:.:.:.9 D ;.L 4 :.:.:.:.:.:.3 J ;.L 8 :.:.:.:.",
+":.:.:.:.5 -.F #.S 4 :.:.:.:.3 N +.G *.< :.:.:.:.",
+":.:.:.:.1 x  .K @.A 5 :.:.3 V +.K  .x 1 :.:.:.:.",
+":.:.:.:.:.1 M ..R %.Z 2 , C $.R ..M 1 :.:.:.:.:.",
+":.:.:.:.:.:.1 n o.~ =.A C &.~ o.n 1 :.:.:.:.:.:.",
+":.:.:.:.:.:.:.1 b O./ X.X./ O.b 1 :.:.:.:.:.:.:.",
+":.:.:.:.:.:.:.:.> l | ^ ^ | c > :.:.:.:.:.:.:.:.",
+":.:.:.:.:.:.:.:.: z { E E { j : :.:.:.:.:.:.:.:.",
+":.:.:.:.:.:.:.4 k } T ] ] T } k 4 :.:.:.:.:.:.:.",
+":.:.:.:.:.:.4 f ` G [ h g ' G ` f 4 :.:.:.:.:.:.",
+":.:.:.:.:.4 a ( B _ d : ; s ) B ( a 4 :.:.:.:.:.",
+":.:.:.:.< y W v ~ p : :.:., p ! v Q i $ :.:.:.:.",
+":.:.:.:.- I v Y u $ :.:.:.:.% r U m P = :.:.:.:.",
+":.:.:.:.+ e H w @ :.:.:.:.:.:.# q D t O :.:.:.:.",
+":.:.:.:.:.o * . :.:.:.:.:.:.:.:.  & X :.:.:.:.:.",
+":.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.",
+":.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.",
+":.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.",
+":.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:."

 };
 };

diff --git a/lisp/riece-command-previous-channel.xpm b/lisp/riece-command-previous-channel.xpm
index 7ea17a6..ec307d4 100644 (file)
--- a/lisp/riece-command-previous-channel.xpm
+++ b/lisp/riece-command-previous-channel.xpm
@@ -1,163 +1,105 @@
 /* XPM */
 static char *riece_command_previous_channel[] = {
 /* columns rows colors chars-per-pixel */
 /* XPM */
 static char *riece_command_previous_channel[] = {
 /* columns rows colors chars-per-pixel */

-"24 24 133 2",
-"   c black",
-".  c gray2",
-"X  c #0E0E0E",
-"o  c gray12",
-"O  c #282828",
-"+  c gray22",
-"@  c #676359",
-"#  c gray38",
-"$  c #6A6763",
-"%  c #72706C",
-"&  c #817D74",
-"*  c #8B867D",
-"=  c #838381",
-"-  c #848381",
-";  c #9B958A",
-":  c #9B968A",
-">  c #9D978B",
-",  c #9D978C",
-"<  c #9E988D",
-"1  c #9F998D",
-"2  c #999891",
-"3  c gray62",
-"4  c #A19B8F",
-"5  c #A19B90",
-"6  c #A19C90",
-"7  c #A29C90",
-"8  c #A39D91",
-"9  c #A39D92",
-"0  c #A39E92",
-"q  c #A49E93",
-"w  c #A4A4A3",
-"e  c gray67",
-"r  c #AFAFAE",
-"t  c #B1B0AE",
-"y  c gray70",
-"u  c #B4B3B2",
-"i  c #B6B5B3",
-"p  c #B6B6B4",
-"a  c #B7B7B6",
-"s  c #B9B7B6",
-"d  c #B9B8B6",
-"f  c #BABAB8",
-"g  c #BABAB9",
-"h  c #BDBDBB",
-"j  c #BDBDBC",
-"k  c #C4C3C0",
-"l  c #CACAC8",
-"z  c #CDCDCD",
-"x  c #D5D3CE",
-"c  c gray82",
-"v  c LightGray",
-"b  c #D7D5D1",
-"n  c #D7D6D1",
-"m  c #D4D4D3",
-"M  c #D8D6D1",
-"N  c #D8D6D2",
-"B  c #D9D7D3",
-"V  c #DBD9D5",
-"C  c #DCDAD6",
-"Z  c #DCDBD7",
-"A  c #DDDBD7",
-"S  c #DCDAD8",
-"D  c #DDDCD8",
-"F  c #DEDCD8",
-"G  c #DEDDD9",
-"H  c #DFDEDA",
-"J  c #E0DEDA",
-"K  c #E0DFDB",
-"L  c #E1DFDB",
-"P  c #E1DFDC",
-"I  c #E1E0DC",
-"U  c #E1E0DD",
-"Y  c #E2E0DD",
-"T  c #E2E1DD",
-"R  c #E0E0DF",
-"E  c #E2E1DE",
-"W  c #E2E1DF",
-"Q  c #E3E2DE",
-"!  c #E3E2DF",
-"~  c #E4E2DF",
-"^  c #E4E3DF",
-"/  c #E4E3E0",
-"(  c #E5E4E0",
-")  c #E5E4E1",
-"_  c #E6E4E1",
-"`  c #E5E4E2",
-"'  c #E5E5E2",
-"]  c #E6E5E2",
-"[  c #E7E6E3",
-"{  c #E4E4E4",
-"}  c #E7E7E7",
-"|  c #E8E7E4",
-" . c #E8E7E5",
-".. c #E9E8E5",
-"X. c #E9E8E6",
-"o. c #E9E9E9",
-"O. c #EBEAE8",
-"+. c #ECEBE9",
-"@. c #EDECEA",
-"#. c #EDEDEB",
-"$. c #EEEDEB",
-"%. c gray93",
-"&. c #EFEEEC",
-"*. c #EFEFED",
-"=. c #EEEEEE",
-"-. c #EFEFEE",
-";. c #F0EFED",
-":. c #F0F0EE",
-">. c #F1F0EF",
-",. c gray94",
-"<. c #F2F2F0",
-"1. c #F3F2F1",
-"2. c #F3F3F1",
-"3. c gray95",
-"4. c #F4F3F2",
-"5. c #F5F4F3",
-"6. c #F5F5F3",
-"7. c #F4F4F4",
-"8. c #F6F5F4",
-"9. c #F6F6F4",
-"0. c #F7F6F5",
-"q. c #F6F6F6",
-"w. c #F8F7F6",
-"e. c #F8F8F7",
-"r. c #F9F9F8",
-"t. c #F9F9F9",
-"y. c #FAFAF9",
-"u. c #FBFBFB",
-"i. c #FCFCFB",
-"p. c #FDFDFD",
-"a. c #FEFEFE",
-"s. c gray100",
-"d. c None",
+"24 24 75 1",
+"  c #1F4985",
+". c #204A86",
+"X c #204A87",
+"o c #214A87",
+"O c #204B87",
+"+ c #214C87",
+"@ c #204A88",
+"# c #214A88",
+"$ c #204B88",
+"% c #214B88",
+"& c #214C88",
+"* c #204C89",
+"= c #214C89",
+"- c #224D89",
+"; c #244D89",
+": c #244F8B",
+"> c #28528C",
+", c #2E5D9B",
+"< c #355D96",
+"1 c #305E9D",
+"2 c #3C639B",
+"3 c #3564A0",
+"4 c #3465A4",
+"5 c #3767A5",
+"6 c #3A68A3",
+"7 c #3868A6",
+"8 c #3B6AA7",
+"9 c #3B6BA7",
+"0 c #3C6BA7",
+"q c #3F6CA6",
+"w c #3E6CA8",
+"e c #3F70AB",
+"r c #3F70AC",
+"t c #41679D",
+"y c #456DA2",
+"u c #406EA9",
+"i c #446FA8",
+"p c #406FAC",
+"a c #4971A6",
+"s c #4471AB",
+"d c #4571AB",
+"f c #4572AB",
+"g c #4070AC",
+"h c #4071AC",
+"j c #4171AC",
+"k c #4070AD",
+"l c #4071AD",
+"z c #4171AD",
+"x c #4672AC",
+"c c #4972A9",
+"v c #4B73A9",
+"b c #4C74AB",
+"n c #4A74AC",
+"m c #4A75AD",
+"M c #4E78AF",
+"N c #4979B3",
+"B c #4A7AB3",
+"V c #4B7BB3",
+"C c #4D79B1",
+"Z c #4D7BB4",
+"A c #547FB5",
+"S c #5781B5",
+"D c #5883B8",
+"F c #5884B9",
+"G c #5D87BA",
+"H c #6089BA",
+"J c #618ABB",
+"K c #628BBC",
+"L c #638BBC",
+"P c #638CBC",
+"I c #6990BE",
+"U c #6E92BF",
+"Y c #6991C0",
+"T c #6D94C2",
+"R c None",

 /* pixels */
 /* pixels */

-"d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.",
-"d.d.d.                          X O # d.d.d.d.d.",
-"d.d.  v q.s.s.s.s.s.s.s.s.t.r.r.} { z o d.d.d.d.",
-"d.d.  q.s.s.s.s.s.s.s.s.s.s.r.-.r o.s.y + d.d.d.",
-"d.d.  s.s.s.s.s.s.s.a.s.a.p.r.=.w ,.s.7.e . d.d.",
-"d.d.  s.s.s.s.s.a.p.i.p.i.u.r.3.3           d.d.",
-"d.d.  s.s.s.a.p.i.u.y.u.y.r.r.7.m s = - $   d.d.",
-"d.d.  s.a.p.i.u.y.r.e.r.e.w.r.1.R S l p %   d.d.",
-"d.d.  s.i.u.y.r.e.w.0.w.j   4.>.;.;.` k &   d.d.",
-"d.d.  s.y.r.e.w.0.9.5.h     4.4.4.O.P P *   d.d.",
-"d.d.  s.e.w.0.9.5.4.g       *.$.#.' P P q   d.d.",
-"d.d.  s.8.6.4.4.2.f         $.+.[ W / P q   d.d.",
-"d.d.  s.4.1.<.:.a           +. .) / E P q   d.d.",
-"d.d.  s.4.1.<.:.*.d         +. .) / E P q   d.d.",
-"d.d.  s.:.*.*.&.$.@.i       | [ ! Y I K 6   d.d.",
-"d.d.  s.#.@.+.+.+.O...u     ) _ Q H G D 5   d.d.",
-"d.d.  s.O.X.X. .| | [ | t   ^ Q K G D Z 5   d.d.",
-"d.d.  s.[ ] ] ] ) _ ( _ ( ^ T K G Z V B 1   d.d.",
-"d.d.  t./ ! Q ~ ^ T Q T Q I I G A C B N <   d.d.",
-"d.d.  %.U P I K T K I K I H J A C B M b >   d.d.",
-"d.d.  c L J H G K G J G J F F C C N n x ;   d.d.",
-"d.d.  2 0 q 9 8 9 6 7 6 7 4 5 1 1 , , : @   d.d.",
-"d.d.d.                                    d.d.d.",
-"d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d.d."
+"RRRRRRRRRRRRRRRRRRRRRRRR",
+"RRRRRRRRRRRRRRRRRRRRRRRR",
+"RRRRRRRRRRRRRRRRRRRRRRRR",
+"RRRRRRRRRRRR*XRRRRRRRRRR",
+"RRRRRRRRRRR$<XRRRRRRRRRR",
+"RRRRRRRRRR$2UXRRRRRRRRRR",
+"RRRRRRRRR%tITXRRRRRRRRRR",
+"RRRRRRRR%yKZY;OOOOOOO@RR",
+"RRRRRRR#aGVNFPLLLLLPHoRR",
+"RRRRRR=vDBNNNBBBBBBVJoRR",
+"RRRRR;bANNNNNNNNNNNNGoRR",
+"RRRR.cCzllkjhgggregpSoRR",
+"RRRR&>nw444444444444MoRR",
+"RRRRRR:iw44444444444moRR",
+"RRRRRRR-q0449sfffffxdoRR",
+"RRRRRRRR=684u+XXXXXXXXRR",
+"RRRRRRRRR&379XRRRRRRRRRR",
+"RRRRRRRRRR@15XRRRRRRRRRR",
+"RRRRRRRRRRRO,XRRRRRRRRRR",
+"RRRRRRRRRRRRXXRRRRRRRRRR",
+"RRRRRRRRRRRRR RRRRRRRRRR",
+"RRRRRRRRRRRRRRRRRRRRRRRR",
+"RRRRRRRRRRRRRRRRRRRRRRRR",
+"RRRRRRRRRRRRRRRRRRRRRRRR"

 };
 };

diff --git a/lisp/riece-toolbar.el b/lisp/riece-toolbar.el
index 9d77ac8..0f28319 100644 (file)
--- a/lisp/riece-toolbar.el
+++ b/lisp/riece-toolbar.el
@@ -24,14 +24,14 @@
 
 ;;; Commentary:
 
 
 ;;; Commentary:
 

-;; Image files are taken from GNOME stock icons:
-;; riece-command-next-channel.xpm      stock_next.png
-;; riece-command-previous-channel.xpm  stock_previous.png
-;; riece-command-configure-windows.xpm stock_refresh.png
-;; riece-command-list-addons           stock_styles.png
-;; riece-command-join                  stock_people.png
-;; riece-command-part                  stock_calc-cancel.png
-;; riece-command-quit                  stock_exit.png
+;; Image files are taken from stock icons:
+
+;; riece-command-next-channel.xpm      gtk-go-forward
+;; riece-command-previous-channel.xpm  gtk-go-back
+;; riece-command-configure-windows.xpm gtk-refresh
+;; riece-command-list-addons           gtk-preferences
+;; riece-command-join                  gtk-new
+;; riece-command-part                  gtk-close

 
 ;; NOTE: This is an add-on module for Riece.
 
 
 ;; NOTE: This is an add-on module for Riece.
 


@@ -43,13 +43,12 @@
   "Display toolbar icons.")
 
 (defvar riece-toolbar-items
   "Display toolbar icons.")
 
 (defvar riece-toolbar-items

-  '(riece-command-previous-channel
-    riece-command-next-channel
-    riece-command-configure-windows
-    riece-command-list-addons
-    riece-command-join
-    riece-command-part
-    riece-command-quit))
+  '((riece-command-previous-channel . "left-arrow")
+    (riece-command-next-channel . "right-arrow")
+    (riece-command-configure-windows . "refresh")
+    (riece-command-join . "new")
+    (riece-command-part . "close")
+    (riece-command-list-addons . "preferences")))

 
 (defun riece-toolbar-find-menu-item (command)
   (let ((pointer riece-menu-items)
 
 (defun riece-toolbar-find-menu-item (command)
   (let ((pointer riece-menu-items)


@@ -73,20 +72,21 @@
                    file
                    menu-item)
                (while pointer
                    file
                    menu-item)
                (while pointer

-                 (setq file (locate-file (symbol-name (car pointer))
+                 (setq file (locate-file (symbol-name (car (car pointer)))

                                          (cons riece-data-directory load-path)
                                          '(".xpm" ".pbm" ".xbm"))
                                          (cons riece-data-directory load-path)
                                          '(".xpm" ".pbm" ".xbm"))

-                       menu-item (riece-toolbar-find-menu-item (car pointer)))
+                       menu-item (riece-toolbar-find-menu-item
+                                  (car (car pointer))))

                  (if (and file (file-exists-p file))
                      (setq toolbar
                            (toolbar-add-item
                             toolbar
                             (toolbar-new-button
                              file
                  (if (and file (file-exists-p file))
                      (setq toolbar
                            (toolbar-add-item
                             toolbar
                             (toolbar-new-button
                              file

-                             (car pointer)
+                             (car (car pointer))

                              (if menu-item
                                  (aref menu-item 0)
                              (if menu-item
                                  (aref menu-item 0)

-                               (symbol-name (car pointer)))))))
+                               (symbol-name (car (car pointer))))))))

                  (setq pointer (cdr pointer)))
                toolbar))
            (defvar riece-toolbar-original-toolbar nil)
                  (setq pointer (cdr pointer)))
                toolbar))
            (defvar riece-toolbar-original-toolbar nil)


@@ -108,8 +108,8 @@
       (let ((pointer items)
            (tool-bar-map (make-sparse-keymap)))
        (while pointer
       (let ((pointer items)
            (tool-bar-map (make-sparse-keymap)))
        (while pointer

-         (tool-bar-add-item-from-menu (car pointer)
-                                      (symbol-name (car pointer))
+         (tool-bar-add-item-from-menu (car (car pointer))
+                                      (cdr (car pointer))

                                       map)
          (setq pointer (cdr pointer)))
        tool-bar-map))
                                       map)
          (setq pointer (cdr pointer)))
        tool-bar-map))