From svn w toxygen.net Sat Oct 3 13:20:45 2009 From: svn w toxygen.net (SVN commit) Date: Sat, 3 Oct 2009 13:20:45 +0200 (CEST) Subject: [ekg2-commit] r4868 - trunk/docs: trunk/docs/vars-pl.txt Message-ID: <20091003112045.6E7D017B51@toxygen.net> Author: darkjames Date: 2009-10-03 13:20:44 +0200 (Sat, 03 Oct 2009) New Revision: 4868 Modified: trunk/docs/vars-pl.txt Log: (trivial, doc) Default value for keep_reason is 1. Modified: trunk/docs/vars-pl.txt =================================================================== --- trunk/docs/vars-pl.txt 2009-09-30 08:09:14 UTC (rev 4867) +++ trunk/docs/vars-pl.txt 2009-10-03 11:20:44 UTC (rev 4868) @@ -204,7 +204,7 @@ keep_reason typ: liczba - domyślna wartość: 0 + domyślna wartość: 1 jeśli włączona, komendy ,,away'', ,,back'', ,,invisible'', ,,quit'' i ,,disconnect'' bez podanego powodu przejmą aktualny opis. zostanie From svn w toxygen.net Sat Oct 3 17:32:44 2009 From: svn w toxygen.net (SVN commit) Date: Sat, 3 Oct 2009 17:32:44 +0200 (CEST) Subject: [ekg2-commit] r4869 - trunk/ekg: trunk/ekg/dynstuff.c trunk/ekg/dynstuff.h trunk/ekg/net.c Message-ID: <20091003153244.A3D5D17B58@toxygen.net> Author: darkjames Date: 2009-10-03 17:32:44 +0200 (Sat, 03 Oct 2009) New Revision: 4869 Modified: trunk/ekg/dynstuff.c trunk/ekg/dynstuff.h trunk/ekg/net.c Log: cleanup array_shift() & move to dynstuff.c Modified: trunk/ekg/dynstuff.c =================================================================== --- trunk/ekg/dynstuff.c 2009-10-03 11:20:44 UTC (rev 4868) +++ trunk/ekg/dynstuff.c 2009-10-03 15:32:44 UTC (rev 4869) @@ -1182,6 +1182,25 @@ return 0; } +char *array_shift(char ***array) +{ + int count; + char *out; + + if (!(count = array_count(*array))) + return NULL; + + out = (*array)[0]; + memmove((*array), &(*array)[1], count * sizeof(char **)); + count--; + + if (count == 0) { + xfree(*array); + *array = NULL; + } + return out; +} + /* * array_free() * Modified: trunk/ekg/dynstuff.h =================================================================== --- trunk/ekg/dynstuff.h 2009-10-03 11:20:44 UTC (rev 4868) +++ trunk/ekg/dynstuff.h 2009-10-03 15:32:44 UTC (rev 4869) @@ -173,6 +173,7 @@ int array_count(char **array); int array_contains(char **array, const char *string, int casesensitive); int array_item_contains(char **array, const char *string, int casesensitive); +char *array_shift(char ***array); void array_free(char **array); void array_free_count(char **array, int count); Modified: trunk/ekg/net.c =================================================================== --- trunk/ekg/net.c 2009-10-03 11:20:44 UTC (rev 4868) +++ trunk/ekg/net.c 2009-10-03 15:32:44 UTC (rev 4869) @@ -205,30 +205,6 @@ xfree(c); } - /* XXX: would we use it anywhere else? if yes, then move to dynstuff */ -static char *array_shift(char ***array) { - char *out = NULL; - int i = 1; - - if (array && *array) { - if (**array) { - const int count = array_count(*array); - - out = (*array)[0]; - for (; i < count; i++) - (*array)[i-1] = (*array)[i]; - (*array)[i-1] = NULL; - } - - if (i == 1) { /* last element, free array */ - array_free(*array); - *array = NULL; - } - } - - return out; -} - static int ekg_connect_loop(struct ekg_connect_data *c); /* predeclared */ static WATCHER_LINE(ekg_connect_resolver_handler) { From svn w toxygen.net Thu Oct 8 19:41:15 2009 From: svn w toxygen.net (SVN commit) Date: Thu, 8 Oct 2009 19:41:15 +0200 (CEST) Subject: [ekg2-commit] r4870 - trunk: trunk/autoclean.sh Message-ID: <20091008174115.6E9D317B61@toxygen.net> Author: porridge Date: 2009-10-08 19:41:14 +0200 (Thu, 08 Oct 2009) New Revision: 4870 Modified: trunk/autoclean.sh Log: Change autoclean to not mutilate ekg2book Makefiles. Modified: trunk/autoclean.sh =================================================================== --- trunk/autoclean.sh 2009-10-03 15:32:44 UTC (rev 4869) +++ trunk/autoclean.sh 2009-10-08 17:41:14 UTC (rev 4870) @@ -14,5 +14,7 @@ rm -f po/insert-header.sin po/remove-potcdate.sin rm -f po/en w boldquot.header po/en w quot.header -find . \( -name Makefile -o -name Makefile.in -o -name \*.la -o -name \*.a -o -name \*.so -o -name \*.o -type f \) -exec rm -f {} \; +find . \ + \( -path ./docs/ekg2book/Makefile -o -path ./docs/ekg2book-en/Makefile \) -prune -o \ + \( -name Makefile -o -name Makefile.in -o -name \*.la -o -name \*.a -o -name \*.so -o -name \*.o -type f \) -exec rm -f {} \; find . \( -name \.deps -o -name \.libs -type d \) -exec rm -rf {} \; From svn w toxygen.net Thu Oct 8 19:41:19 2009 From: svn w toxygen.net (SVN commit) Date: Thu, 8 Oct 2009 19:41:19 +0200 (CEST) Subject: [ekg2-commit] r4871 - in trunk/docs: . ekg2book ekg2book-en: +trunk/docs/generate-ekg2book.sh trunk/docs/ekg2book-en/generate.sh trunk/docs/ekg2book/generate.sh Message-ID: <20091008174119.ADC3C17B61@toxygen.net> Author: porridge Date: 2009-10-08 19:41:19 +0200 (Thu, 08 Oct 2009) New Revision: 4871 Added: trunk/docs/generate-ekg2book.sh Modified: trunk/docs/ekg2book-en/generate.sh trunk/docs/ekg2book/generate.sh Log: Fold Makefile and generate.sh into a new script for generating and cleaning ekg2book. The Makefile files in ekg2book directories are the only non-generated Makefiles in the source tree, so it is difficult to omit them when running ./autoclean.sh. Also, having a single script reduces code duplication. This script should be used from now on, instead of the Makefiles and/or generate.sh scripts within ekg2book directories, as they will be going away soon. Modified: trunk/docs/ekg2book/generate.sh =================================================================== --- trunk/docs/ekg2book/generate.sh 2009-10-08 17:41:14 UTC (rev 4870) +++ trunk/docs/ekg2book/generate.sh 2009-10-08 17:41:19 UTC (rev 4871) @@ -1,5 +1,10 @@ #!/bin/sh +echo +echo "WARNING: this script (and neighbouring Makefile) is deprecated. Please use ../generate-ekg2book.sh" >&2 +echo +sleep 5 + PREINPUTS="design/header.xml bookinfo.xml userbook.xml" POSTINPUTS="develbook.xml faq.xml design/footer.xml" OUTPUT="book.xml" Modified: trunk/docs/ekg2book-en/generate.sh =================================================================== --- trunk/docs/ekg2book-en/generate.sh 2009-10-08 17:41:14 UTC (rev 4870) +++ trunk/docs/ekg2book-en/generate.sh 2009-10-08 17:41:19 UTC (rev 4871) @@ -1,5 +1,10 @@ #!/bin/sh +echo +echo "WARNING: this script (and neighbouring Makefile) is deprecated. Please use ../generate-ekg2book.sh" >&2 +echo +sleep 5 + PREINPUTS="design/header.xml bookinfo.xml userbook.xml" POSTINPUTS="develbook.xml faq.xml design/footer.xml" OUTPUT="book.xml" Added: trunk/docs/generate-ekg2book.sh =================================================================== --- trunk/docs/generate-ekg2book.sh (rev 0) +++ trunk/docs/generate-ekg2book.sh 2009-10-08 17:41:19 UTC (rev 4871) @@ -0,0 +1,68 @@ +#!/bin/sh +# Generate the ekg2 book or cleanup in a given directory. + +set -e + +lang=${1} +case $lang in +pl) + dir="ekg2book" + ;; +en) + dir="ekg2book-en" + ;; +*) + echo "Provide a valid language code first argument, not \"$1\"." >&2 + exit 1 +esac + +action=${2:-'generate'} + +cd "${dir}" + +PREINPUTS="design/header.xml bookinfo.xml userbook.xml" +POSTINPUTS="develbook.xml faq.xml design/footer.xml" +OUTPUT="book.xml" +GENPROG="./txt2docbook.py" + +case $action in +generate) + rm -rf book + cat ${PREINPUTS} "design/plugins_header.xml" > $OUTPUT + for i in ../../plugins/* + do + if [ -f $i ]; then continue; fi + if [ -f $i/doc.xml -o -f $i/commands-${lang}.txt -o -f $i/vars-${lang}.txt ]; then + sed -e s/PLUGIN/`basename $i`/ "design/plugin_header.xml" >> $OUTPUT + if [ -f $i/doc.xml ]; then + cat $i/doc.xml >> $OUTPUT + fi + if [ -f $i/commands-${lang}.txt ]; then + $GENPROG -c $i/commands-${lang}.txt >> $OUTPUT + fi + if [ -f $i/vars-${lang}.txt ]; then + $GENPROG -v $i/vars-${lang}.txt >> $OUTPUT + fi + if [ -f $i/session-${lang}.txt ]; then + $GENPROG -s ../session-${lang}.txt >> $OUTPUT + $GENPROG -s $i/session-${lang}.txt >> $OUTPUT + fi + cat "design/plugin_footer.xml" >> $OUTPUT + fi + done + cat "design/plugins_footer.xml" $POSTINPUTS >> $OUTPUT + ${XSLTRANSFORMER:-'xslproc'} -stringparam chunker.output.encoding ISO-8859-2 sheet.xsl ${OUTPUT} + mkdir book + mv *.html book/ + ;; + +clean|distclean) + rm -rf book book.xml + ;; + +*) + echo "Unknown action \"$action\"." >&2 + exit 1 + ;; +esac + Property changes on: trunk/docs/generate-ekg2book.sh ___________________________________________________________________ Name: svn:executable + * From svn w toxygen.net Thu Oct 8 19:41:23 2009 From: svn w toxygen.net (SVN commit) Date: Thu, 8 Oct 2009 19:41:23 +0200 (CEST) Subject: [ekg2-commit] r4872 - trunk/plugins/autoresponder: trunk/plugins/autoresponder/autoresponder.c trunk/plugins/autoresponder/vars-en.txt trunk/plugins/autoresponder/vars-pl.txt Message-ID: <20091008174123.9E0FF17B61@toxygen.net> Author: porridge Date: 2009-10-08 19:41:23 +0200 (Thu, 08 Oct 2009) New Revision: 4872 Modified: trunk/plugins/autoresponder/autoresponder.c trunk/plugins/autoresponder/vars-en.txt trunk/plugins/autoresponder/vars-pl.txt Log: Add a note about treating gg:0 specially when using autoresponder. Modified: trunk/plugins/autoresponder/autoresponder.c =================================================================== --- trunk/plugins/autoresponder/autoresponder.c 2009-10-08 17:41:19 UTC (rev 4871) +++ trunk/plugins/autoresponder/autoresponder.c 2009-10-08 17:41:23 UTC (rev 4872) @@ -70,6 +70,7 @@ || (userlist_find(s, uid)) /* check if it isn't currently on our roster */ || (window_find_s(s, uid)) /* or maybe we've already opened query? */ || (list_find_str(autoresponder_allowed_uids, uid))) /* search the allowed uids list */ + /* TODO(porridge): || (gg session && uid == "gg:0") - he won't respond, and it may cause connection drops */ return 0; switch (config_autoresponder_match_mode) { Modified: trunk/plugins/autoresponder/vars-en.txt =================================================================== --- trunk/plugins/autoresponder/vars-en.txt 2009-10-08 17:41:19 UTC (rev 4871) +++ trunk/plugins/autoresponder/vars-en.txt 2009-10-08 17:41:23 UTC (rev 4872) @@ -2,8 +2,13 @@ type: string default value: (none) - Comma-separated list of sessions, for which autoresponder plugin - will be used. Both UIDs, and aliases can be used. + A comma-separated list of sessions, for which autoresponder plugin + will be used. Both UIDs and aliases can be used. + + Note that when using this plugin with a "gg" session, you need to + ignore or add to your roster the special user "gg:0", who sends "system + messages". Otherwise, the server may drop your connection right after + establishing it. answer type: string Modified: trunk/plugins/autoresponder/vars-pl.txt =================================================================== --- trunk/plugins/autoresponder/vars-pl.txt 2009-10-08 17:41:19 UTC (rev 4871) +++ trunk/plugins/autoresponder/vars-pl.txt 2009-10-08 17:41:23 UTC (rev 4872) @@ -4,6 +4,11 @@ Oddzielona przecinkami lista sesji, dla których wtyczka autorespondera będzie używana. Może zawierać zarówno UID-y, jak i aliasy. + + Uwaga: korzystając z autorespondera w sesjach "gg", należy pamiętać aby + dodać do listy kontaktów lub ignorowanych użytkownika "gg:0", który + wysyła "wiadomości systemowe". W przeciwnym wypadku serwer może zrywać + połączenie zaraz po jego nawiązaniu. answer typ: tekst From svn w toxygen.net Thu Oct 8 19:41:27 2009 From: svn w toxygen.net (SVN commit) Date: Thu, 8 Oct 2009 19:41:27 +0200 (CEST) Subject: [ekg2-commit] r4873 - trunk/plugins/perl: trunk/plugins/perl/Makefile.am Message-ID: <20091008174127.3F3CF17B61@toxygen.net> Author: porridge Date: 2009-10-08 19:41:26 +0200 (Thu, 08 Oct 2009) New Revision: 4873 Modified: trunk/plugins/perl/Makefile.am Log: Abort perl plugin subdir processing if one directory fails. Modified: trunk/plugins/perl/Makefile.am =================================================================== --- trunk/plugins/perl/Makefile.am 2009-10-08 17:41:23 UTC (rev 4872) +++ trunk/plugins/perl/Makefile.am 2009-10-08 17:41:26 UTC (rev 4873) @@ -13,7 +13,7 @@ perl_dirs = common irc all-local: - for dir in $(perl_dirs); do \ + set -e; for dir in $(perl_dirs); do \ cd $$dir && \ if [ ! -f Makefile ]; then \ $(PERL) Makefile.PL; \ @@ -23,7 +23,7 @@ done clean-generic: - for dir in $(perl_dirs); do \ + set -e; for dir in $(perl_dirs); do \ cd $$dir; \ $(MAKE) clean; \ cd ..; \ @@ -31,6 +31,6 @@ install-exec-local: - for dir in $(perl_dirs); do \ + set -e; for dir in $(perl_dirs); do \ cd $$dir && $(MAKE) install DESTDIR=$(DESTDIR) $(perl_install_args) && cd ..; \ done From svn w toxygen.net Fri Oct 9 22:04:41 2009 From: svn w toxygen.net (SVN commit) Date: Fri, 9 Oct 2009 22:04:41 +0200 (CEST) Subject: [ekg2-commit] r4874 - trunk/plugins/jabber: trunk/plugins/jabber/commands-en.txt Message-ID: <20091009200442.04E0017B63@toxygen.net> Author: porridge Date: 2009-10-09 22:04:41 +0200 (Fri, 09 Oct 2009) New Revision: 4874 Modified: trunk/plugins/jabber/commands-en.txt Log: Fix error in a command file. Modified: trunk/plugins/jabber/commands-en.txt =================================================================== --- trunk/plugins/jabber/commands-en.txt 2009-10-08 17:41:26 UTC (rev 4873) +++ trunk/plugins/jabber/commands-en.txt 2009-10-09 20:04:41 UTC (rev 4874) @@ -171,7 +171,7 @@ part parameters: - short descrition: leaves conference + short description: leaves conference reconnect parameters: From svn w toxygen.net Sun Oct 18 11:52:31 2009 From: svn w toxygen.net (SVN commit) Date: Sun, 18 Oct 2009 11:52:31 +0200 (CEST) Subject: [ekg2-commit] r4875 - in trunk: contrib ekg plugins/gg po: trunk/contrib/ekg_hash_benchmark.c trunk/ekg/sessions.c trunk/ekg/themes.c trunk/ekg/userlist.c trunk/plugins/gg/commands-en.txt trunk/po/de.po trunk/po/pl.po Message-ID: <20091018095231.1786017B58@toxygen.net> Author: porridge Date: 2009-10-18 11:52:30 +0200 (Sun, 18 Oct 2009) New Revision: 4875 Modified: trunk/contrib/ekg_hash_benchmark.c trunk/ekg/sessions.c trunk/ekg/themes.c trunk/ekg/userlist.c trunk/plugins/gg/commands-en.txt trunk/po/de.po trunk/po/pl.po Log: Information does not have a plural form. Modified: trunk/contrib/ekg_hash_benchmark.c =================================================================== --- trunk/contrib/ekg_hash_benchmark.c 2009-10-09 20:04:41 UTC (rev 4874) +++ trunk/contrib/ekg_hash_benchmark.c 2009-10-18 09:52:30 UTC (rev 4875) @@ -533,7 +533,7 @@ "change your session password using /session password", 1); format_add("passwd_abuse", "%! (%1) Somebody want to clear our password (%2)", 1); format_add("change", _("%> Informations in public directory chenged\n"), 1); - format_add("change_failed", _("%! Error while changing informations in public directory\n"), 1); + format_add("change_failed", _("%! Error while changing information in public directory\n"), 1); format_add("search_failed", _("%! Error while search: %1\n"), 1); format_add("search_not_found", _("%! Not found\n"), 1); format_add("search_no_last", _("%! Last search returned no result\n"), 1); Modified: trunk/ekg/sessions.c =================================================================== --- trunk/ekg/sessions.c 2009-10-09 20:04:41 UTC (rev 4874) +++ trunk/ekg/sessions.c 2009-10-18 09:52:30 UTC (rev 4875) @@ -898,7 +898,7 @@ /* * session_write() * - * writes informations about sessions in files + * writes information about sessions in files */ int session_write() { Modified: trunk/ekg/themes.c =================================================================== --- trunk/ekg/themes.c 2009-10-09 20:04:41 UTC (rev 4874) +++ trunk/ekg/themes.c 2009-10-18 09:52:30 UTC (rev 4875) @@ -1665,7 +1665,7 @@ /* changing information in public catalog */ format_add("change", _("%> Informations in public directory chenged\n"), 1); - format_add("change_failed", _("%! Error while changing informations in public directory\n"), 1); + format_add("change_failed", _("%! Error while changing information in public directory\n"), 1); /* users finding */ format_add("search_failed", _("%! Error while search: %1\n"), 1); Modified: trunk/ekg/userlist.c =================================================================== --- trunk/ekg/userlist.c 2009-10-09 20:04:41 UTC (rev 4874) +++ trunk/ekg/userlist.c 2009-10-18 09:52:30 UTC (rev 4875) @@ -340,12 +340,12 @@ /** * userlist_clear_status() * - * If @a uin == NULL then it clears all users presence informations in the @a session userlist + * If @a uin == NULL then it clears all users presence information in the @a session userlist * otherwise it clears only specified user * It's useful if user goes notavail, or we goes disconnected..
* However if that happen you shouldn't use this function but emit query PROTOCOL_STATUS or PROTOCOL_DISCONNECTED * - * @note By presence informations I mean:
+ * @note By presence information I mean:
* -> status - user's status [avail, away, ffc, dnd], it'll be: @a EKG_STATUS_NA ("notavail")
* -> descr - user's description, it'll be: NULL
* -> ip - user's ip, il'll be: 0.0.0.0
Modified: trunk/plugins/gg/commands-en.txt =================================================================== --- trunk/plugins/gg/commands-en.txt 2009-10-09 20:04:41 UTC (rev 4874) +++ trunk/plugins/gg/commands-en.txt 2009-10-18 09:52:30 UTC (rev 4875) @@ -37,7 +37,7 @@ change parameters: - short description: change informations in public catalogue + short description: change information in public catalogue -f, --first @@ -156,7 +156,7 @@ modify parameters: - short description: change informations in contact list + short description: change information in contact list You can use options like: Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2009-10-09 20:04:41 UTC (rev 4874) +++ trunk/po/de.po 2009-10-18 09:52:30 UTC (rev 4875) @@ -1015,7 +1015,7 @@ msgstr "" #: ekg/themes.c:1593 -msgid "%! Error while changing informations in public directory\n" +msgid "%! Error while changing information in public directory\n" msgstr "" #: ekg/themes.c:1596 Modified: trunk/po/pl.po =================================================================== --- trunk/po/pl.po 2009-10-09 20:04:41 UTC (rev 4874) +++ trunk/po/pl.po 2009-10-18 09:52:30 UTC (rev 4875) @@ -1170,7 +1170,7 @@ msgstr "%> Informacje w katalogu publicznym zostały zmienione\n" #: ekg/themes.c:1593 -msgid "%! Error while changing informations in public directory\n" +msgid "%! Error while changing information in public directory\n" msgstr "%! Błąd podczas zmiany informacji w katalogu publicznym\n" #: ekg/themes.c:1596 From svn w toxygen.net Thu Oct 22 16:42:48 2009 From: svn w toxygen.net (SVN commit) Date: Thu, 22 Oct 2009 16:42:48 +0200 (CEST) Subject: [ekg2-commit] r4876 - trunk/docs: +trunk/docs/themes-en.txt trunk/docs/README Message-ID: <20091022144248.896FA17B56@toxygen.net> Author: adamm Date: 2009-10-22 16:42:47 +0200 (Thu, 22 Oct 2009) New Revision: 4876 Added: trunk/docs/themes-en.txt Modified: trunk/docs/README Log: translation for themes.txt and README fixes (thx to: pinochet) Modified: trunk/docs/README =================================================================== --- trunk/docs/README 2009-10-18 09:52:30 UTC (rev 4875) +++ trunk/docs/README 2009-10-22 14:42:47 UTC (rev 4876) @@ -66,19 +66,10 @@ Brana pod uwagę jest zwykle pierwsza litera, więc jeśli wpiszesz ,,list --gone'', ekg potraktuje to jako ,,list --get''. - Komendy można wysyłać także przez potok. By go uaktywnić, należy - uruchomić ekg z parametrem ,,-c'' i ścieżką potoku. Ze względu na - specyfikę potoków, wyniki poleceń wysyłane będą na terminal na którym - jest uruchomione ekg (tak jak normalnie). Pisać do potoku można tak - jak do normalnego pliku (choćby poleceniem echo). + Komendy można wysyłać także przez potok lub internet. Wymagana jest do tego + wtyczka remote control. Ładowanie /plugin +rc ustawienie potoku: + /set rc:remote_control pipe:/home/user/named_pipe - Jeśli w linii poleceń shella podasz po nazwie programu i parametrach - zaczynających się od myślnika coś jeszcze, to zostanie to zinterpretowane - jako komenda wsadowa. ekg połączy się z serwerem, wykona tylko tę komendę - i od razu wyjdzie. Jeśli na serwerze czekają na Ciebie jakieś wiadomości, - to serwer je przyśle zaraz po połączeniu i w trybie wsadowym ekg wypisze - je na terminal. Jeśli zamierzasz przekierować wyjście do /dev/null i nie - masz włączonego logowania, wiadomości zginą bezpowrotnie. KLAWIATURA @@ -167,7 +158,7 @@ Kolejność ładowania plików konfiguracyjnych jest następująca: 1) /etc/ekg.conf (lub z innego katalogu wskazanego przez opcję --sysconfdir przekazaną skryptowi ./configure), - 2) ~/.gg/config lub ~/.gg//config, + 2) ~/.ekg/config lub ~/.ekg//config, 3) /etc/ekg-override.conf Dzięki temu administrator może wymusić pewne opcje na klientach Added: trunk/docs/themes-en.txt =================================================================== --- trunk/docs/themes-en.txt (rev 0) +++ trunk/docs/themes-en.txt 2009-10-22 14:42:47 UTC (rev 4876) @@ -0,0 +1,118 @@ +// translation from themes.txt 2009 by Jan J. Roman + +.---------------,--------,-------,-----. +| color |ordinary| light | bg | +,---------------+--------+-------+-----' +| black/grey | %k | %K | %l | +| blue | %b | %B | %e | +| red | %r | %R | %s | +| violet | %m/%p | %M/%P | %q | +| turquoise | %c | %C | %d | +| brown/yellow | %y | %Y | %z | +| green | %g | %G | %h | +| white | %w | %W | %x | +| blinking | %i | - | - | +| bold | %T | - | - | +,---------------'--------'-------'-----| +| 'white char' | %n | +`---------------'----------------------' + +* * * + + %A choose the graphic maping: vt100 + %a choose default maping. + +* * * + +You can use %1-%9 to hard define a width, it can be usefull for tables or lists. + + %[10]1 add spaces before text for attaining specific width (in this case 10 - it is the first parameter) + %[-10]1 similar but add spaces after text + %[.5]1 uses zeroes to achive specific length + %[,9]2 the same but uses points + %[_4]1 uses '_' character + %(10)1 if parameter is longer than 10 it will be NOT cut down. + %[^12]1 put first parameter in the middle of space length of 12 (empty fields are filled by spaces). + %[^,8]1 as above but space size is 8 and filling character is point + +WARNING! coloring expresions are treated as regular text, Don't use it for auto completion. + +* * * + +// It is polish declension cause I have no idea how to translate this ;-) +jeśli chce się rozróżniać przymiotniki dla różnych płci, można użyć +%@n, gdzie ,,n'' to numer formatu, który bierzemy pod uwagę. jeśli +ostatnią literą będzie ,,a'', %@n zostanie zastąpione przez ,,a'', +w innym przypadku przez ,,y''. przykład: + + %> %1 jest dostępn%@1. + +należy wziąć uwagę, że w wielu wypadkach pseudonimy są najpierw +formatowane przez known_user i unknown_user, więc trzeba podać osobny +parametr z samym pseudonimem. + +* * * + +%> prompt (green by default) +%! error (red by default) +%) prompt2 (turquoise by default) +%# timestamp (GG:MM by default) + +%| the end of prompt. Occur of this format means that prompt should + be repeated in the beginning of each new line + + example: + + %> Very long line, will be divided for several shorter. + + On the small term: + + .-------------------------. + | ::: Very long line, | + | will be divided for | + | several shorter. | + `-------------------------' + + If in format string is %| it means: + + %> %|Very long line, will be divided for several shorter. + + output will be: + + .-------------------------. + | ::: Very long line, | + | ::: will be divided for | + | ::: several shorter. | + `-------------------------' + +* * * + +There is two special formats:''known_user'' i ''unknown_user''. They define +how to show users from contact list and out of list. +First get two parameters: +%1 - description from contact list +%2 - user identificator +second only one: +%1 - user identificator + +* * * + +entries readline_*, shouldn't consist of formating codes (with '%'), +The exception of this rule is readline_prompt_query. +This rule is also for config_changed. + +* * * + +(ncurses) There is posibility of setiing margins and definind its size by ncurses:margin_size variable. +For use margins there is "/|" formating string. + +example: + text left/|text right +causes: + text left text right +size of gap is defining in ncurses:margin_size value. + +* * * + +$Id: themes.txt 4009 2008-06-02 09:56:12Z wiechu $ +$Id: themes.txt 4009 2009-03-14 13:35:43Z Pinochet $ From svn w toxygen.net Fri Oct 23 10:21:33 2009 From: svn w toxygen.net (SVN commit) Date: Fri, 23 Oct 2009 10:21:33 +0200 (CEST) Subject: [ekg2-commit] r4877 - trunk/remote: trunk/remote/ekg-remote.c Message-ID: <20091023082133.5565A17B60@toxygen.net> Author: porridge Date: 2009-10-23 10:21:32 +0200 (Fri, 23 Oct 2009) New Revision: 4877 Modified: trunk/remote/ekg-remote.c Log: Corrections for ekg2-remote command line parsing. Order options in the same way in all places in the code to make it easier to keep them consistent. Added missing long option and help texts. Modified: trunk/remote/ekg-remote.c =================================================================== --- trunk/remote/ekg-remote.c 2009-10-22 14:42:47 UTC (rev 4876) +++ trunk/remote/ekg-remote.c 2009-10-23 08:21:32 UTC (rev 4877) @@ -394,24 +394,26 @@ } struct option ekg_options[] = { + { "charset", required_argument, 0, 'c' }, + { "password", required_argument, 0, 'p' }, + { "test", required_argument, 0, 'T' }, + { "frontend", required_argument, 0, 'F' }, { "no-mouse", no_argument, 0, 'm' }, - { "frontend", required_argument, 0, 'F' }, - { "test", required_argument, 0, 'T' }, + { "unicode", no_argument, 0, 'U' }, + { "help", no_argument, 0, 'h' }, + { "version", no_argument, 0, 'v' }, - { "charset", required_argument, 0, 'c' }, - - { "unicode", no_argument, 0, 'U' }, - - { "help", no_argument, 0, 'h' }, - { "version", no_argument, 0, 'v' }, { 0, 0, 0, 0 } }; #define EKG_USAGE N_( \ -"Usage: %s [OPTIONS] [COMMANDS]\n" \ -" -m, --no-mouse does not load mouse support\n" \ +"Usage: %s [OPTIONS] REMOTE-ENDPOINT\n" \ +" -c, --charset=CHARSET forces charset to use\n" \ +" -p, --password=PASSWD sets password\n" \ +" -T, --test=NAME same as -F, but runs in test mode - for debugging\n" \ " -F, --frontend=NAME uses NAME frontend (default is ncurses)\n" \ -" -p, --password=haslo password\n" \ +" -m, --no-mouse does not load mouse support\n" \ +" -U, --unicode forces unicode support\n" \ \ " -h, --help displays this help message\n" \ " -v, --version displays program version and exits\n" \ @@ -475,9 +477,18 @@ signal(SIGPIPE, SIG_IGN); signal(SIGCHLD, SIG_IGN); /* nie interesuja nas dzieci... nie powinnismy miec zadnego :) */ - while ((c = getopt_long(argc, argv, "c:p:T:F:mhvU", ekg_options, NULL)) != -1) + while ((c = getopt_long(argc, argv, "c:p:T:F:mUhv", ekg_options, NULL)) != -1) { switch (c) { + case 'c': + xfree(config_console_charset); /* XXX, sensowniej!, /me chce zeby sie wyswietlalo co nl_langinfo() zwrocilo, a co my podalismy. */ + config_console_charset = xstrdup(optarg); + break; + + case 'p': + config_password = optarg; + break; + case 'T': testonly = 1; frontend = optarg; @@ -491,19 +502,6 @@ no_mouse = 1; break; - case 'h': - printf(_(EKG_USAGE), argv[0]); - return 0; - - case 'c': - xfree(config_console_charset); /* XXX, sensowniej!, /me chce zeby sie wyswietlalo co nl_langinfo() zwrocilo, a co my podalismy. */ - config_console_charset = xstrdup(optarg); - break; - - case 'p': - config_password = optarg; - break; - case 'U': #ifdef USE_UNICODE config_use_unicode = 1; @@ -513,6 +511,10 @@ #endif break; + case 'h': + printf(_(EKG_USAGE), argv[0]); + return 0; + case 'v': printf("ekg2-%s (compiled on %s)\n", VERSION, compile_time()); return 0; From svn w toxygen.net Fri Oct 23 10:21:39 2009 From: svn w toxygen.net (SVN commit) Date: Fri, 23 Oct 2009 10:21:39 +0200 (CEST) Subject: [ekg2-commit] r4878 - trunk/plugins/gtk: trunk/plugins/gtk/gtkutil.c Message-ID: <20091023082139.7BE2917B60@toxygen.net> Author: porridge Date: 2009-10-23 10:21:39 +0200 (Fri, 23 Oct 2009) New Revision: 4878 Modified: trunk/plugins/gtk/gtkutil.c Log: GTK+ include fix. Enable pieces of deprecated GTK+ API to make ekg2 buildable with libgtk2.0-dev 2.14.7-4 Modified: trunk/plugins/gtk/gtkutil.c =================================================================== --- trunk/plugins/gtk/gtkutil.c 2009-10-23 08:21:32 UTC (rev 4877) +++ trunk/plugins/gtk/gtkutil.c 2009-10-23 08:21:39 UTC (rev 4878) @@ -25,6 +25,7 @@ #include #include +#include #include #include #include