mcabber-isbear-patches: comparison cmdopts.diff

equal deleted inserted replaced

-:a879ea179877
+:17cd00b2e722
 * -j(--jid), -n(--name)
 * /rawxml uses parser
 diff -r 92fa48ef53c9 mcabber/doc/help/cs/hlp_buffer.txt
 --- a/mcabber/doc/help/cs/hlp_buffer.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/cs/hlp_buffer.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/cs/hlp_buffer.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -25,7 +25,7 @@
 Přesune se o [n] řádků nahoru (výchozí: polovina obrazovky).
 /buffer down [n]
 Přesune se o [n] řádků dolů (výchozí: polovina obrazovky).
 -/buffer date [datum]
 Přesune se na první řádek po datu [datum] (formát: "RRRR-mm-dd").
 /buffer % n
 Přesune se na procentuální pozici n%.
 diff -r 92fa48ef53c9 mcabber/doc/help/cs/hlp_del.txt
 --- a/mcabber/doc/help/cs/hlp_del.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/cs/hlp_del.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/cs/hlp_del.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,4 @@
 - /DEL
 + /DEL [-n|--dryrun] [jid]
 Smaže aktuální kontakt ze seznamu kontaktů (rosteru) a zruší povolení oznamování o stavu daného kontaktu (autorizaci) na obou stranách.
 diff -r 92fa48ef53c9 mcabber/doc/help/cs/hlp_move.txt
 --- a/mcabber/doc/help/cs/hlp_move.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/cs/hlp_move.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/cs/hlp_move.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,5 +1,6 @@
 - /MOVE [skupina]
 + /MOVE [-j|--jid jid] [-n|--name name] [skupina]
 Přesune aktuální kontakt do požadované skupiny. Není-li skupina zadána, přesune se kontakt do výchozí skupiny. Pokud skupina neexistuje, automaticky se založí.
 +You can select other buddy that current using options --jid and --name.
 Tip: V módu rozhovoru lze použít "/roster alternate" pro skok na přesunutý kontakt.
 diff -r 92fa48ef53c9 mcabber/doc/help/cs/hlp_rename.txt
 --- a/mcabber/doc/help/cs/hlp_rename.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/cs/hlp_rename.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/cs/hlp_rename.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,6 @@
 - /RENAME jméno
 + /RENAME [-r|--reset] [-j|--jid jid] [-g|--group name] [-n|--name name] jméno
 +Přejmenuje aktuálního uživatele nebo skupinu na 'jméno'.
 +If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
 +Optionally you can use one of --jid, --group or --name to select object, different from current.
 diff -r 92fa48ef53c9 mcabber/doc/help/de/hlp_buffer.txt
 --- a/mcabber/doc/help/de/hlp_buffer.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/de/hlp_buffer.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/de/hlp_buffer.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -25,7 +25,7 @@
 Scrollt den Puffer um n Zeilen hoch. Gibt man keine Zahl an, scrollt er um einen halben Bildschirm
 /buffer down [n]
 Scrollt den Puffer um n Zeilen runter. Gibt man keine Zahl an, scrollt er um einen halben Bildschirm
 -/buffer date [date]
 Springe zu der ersten Zeile nach dem Datum, welches im Format "JJJJ-mm-tt" anstatt [date] angegeben werden muss
 /buffer % n
 Springe zur Position "n" im Chatpuffer
 diff -r 92fa48ef53c9 mcabber/doc/help/de/hlp_del.txt
 --- a/mcabber/doc/help/de/hlp_del.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/de/hlp_del.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/de/hlp_del.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,4 @@
 - /DEL
 + /DEL [-n|--dryrun] [jid]
 Löscht den gerade ausgewählten Buddy vom Roster. Außerdem werden die automatischen Presence Benachrichtigungen vom/zum Buddy gestoppt.
 diff -r 92fa48ef53c9 mcabber/doc/help/de/hlp_move.txt
 --- a/mcabber/doc/help/de/hlp_move.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/de/hlp_move.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/de/hlp_move.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,6 +1,7 @@
 - /MOVE [groupname]
 + /MOVE [-j|--jid jid] [-n|--name name] [groupname]
 +You can select other buddy that current using options --jid and --name.
 Tipp: Wenn der Chatmodus aktiviert ist, kannst du "/roster alternate" benutzen um zu dem gerade bewegten Buddy zu springen.
 diff -r 92fa48ef53c9 mcabber/doc/help/de/hlp_rename.txt
 --- a/mcabber/doc/help/de/hlp_rename.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/de/hlp_rename.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/de/hlp_rename.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,6 @@
 - /RENAME name
 + /RENAME [-r|--reset] [-j|--jid jid] [-g|--group name] [-n|--name name] newname
 +Setzt den Namen des gerade ausgewählten Buddys bzw. der ausgewählten Gruppe auf "name".
 +If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
 +Optionally you can use one of --jid, --group or --name to select object, different from current.
 diff -r 92fa48ef53c9 mcabber/doc/help/en/hlp_buffer.txt
 --- a/mcabber/doc/help/en/hlp_buffer.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/en/hlp_buffer.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/en/hlp_buffer.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -25,7 +25,7 @@
 Scroll the buffer up [n] lines (default: half a screen)
 /buffer down [n]
 Scroll the buffer down [n] lines (default: half a screen)
 -/buffer date [date]
 Jump to the first line after the specified [date] in the chat buffer (date format: "YYYY-mm-dd")
 /buffer % n
 Jump to position %n of the buddy chat buffer
 diff -r 92fa48ef53c9 mcabber/doc/help/en/hlp_del.txt
 --- a/mcabber/doc/help/en/hlp_del.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/en/hlp_del.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/en/hlp_del.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,4 @@
 - /DEL
 + /DEL [-n|--dryrun] [jid]
 -Delete the current buddy from our roster, unsubscribe from its presence notification and unsubscribe it from ours.
 +Delete the current buddy or one, specified with [jid] from our roster, unsubscribe from its presence notification and unsubscribe it from ours.
 diff -r 92fa48ef53c9 mcabber/doc/help/en/hlp_move.txt
 --- a/mcabber/doc/help/en/hlp_move.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/en/hlp_move.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/en/hlp_move.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,5 +1,6 @@
 - /MOVE [groupname]
 + /MOVE [-j|--jid jid] [-n|--name name] [groupname]
 Move the current buddy to the requested group.  If no group is specified, then the buddy is moved to the default group.  If the group "groupname" doesn't exist, it is created.
 +You can select other buddy that current using options --jid and --name.
 Tip: if the chatmode is enabled, you can use "/roster alternate" to jump to the moved buddy.
 diff -r 92fa48ef53c9 mcabber/doc/help/en/hlp_rename.txt
 --- a/mcabber/doc/help/en/hlp_rename.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/en/hlp_rename.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/en/hlp_rename.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,6 @@
 - /RENAME name
 + /RENAME [-r|--reset] [-j|--jid jid] [-g|--group name] [-n|--name name] newname
 +Rename the current buddy or group to the given "newname".
 +If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
 +Optionally you can use one of --jid, --group or --name to select object, different from current.
 diff -r 92fa48ef53c9 mcabber/doc/help/fr/hlp_buffer.txt
 --- a/mcabber/doc/help/fr/hlp_buffer.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/fr/hlp_buffer.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/fr/hlp_buffer.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -25,7 +25,7 @@
 Défile vers le haut de [n] lignes (par défaut un demi écran)
 /buffer down [n]
 Défile vers le bas de [n] lignes (par défaut un demi écran)
 -/buffer date [date]
 Va à la première ligne après la [date] dans le tampon actuel (format: "aaaa-mm-jj")
 /buffer % n
 Va à la position n% du tampon
 diff -r 92fa48ef53c9 mcabber/doc/help/fr/hlp_del.txt
 --- a/mcabber/doc/help/fr/hlp_del.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/fr/hlp_del.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/fr/hlp_del.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,4 @@
 - /DEL
 + /DEL [-n|--dryrun] [jid]
 Supprime le contact sélectionné du roster, supprime notre abonnement à ses notifications de présence et supprime son abonnement aux nôtres.
 diff -r 92fa48ef53c9 mcabber/doc/help/fr/hlp_move.txt
 --- a/mcabber/doc/help/fr/hlp_move.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/fr/hlp_move.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/fr/hlp_move.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,5 +1,6 @@
 - /MOVE [groupname]
 + /MOVE [-j|--jid jid] [-n|--name name] [groupname]
 Déplace le contact sélectionné vers le groupe spécifié. Si aucun groupe n'est donné, le contact est déplacé vers le groupe par défaut. Si le groupe "groupname" n'existe pas, il est créé.
 +You can select other buddy that current using options --jid and --name.
 Astuce : si le mode discussion (chatmode) est activé, vous pouvez utiliser "/roster alternate" pour vous positionner sur le contact que vous venez de déplacer.
 diff -r 92fa48ef53c9 mcabber/doc/help/fr/hlp_rename.txt
 --- a/mcabber/doc/help/fr/hlp_rename.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/fr/hlp_rename.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/fr/hlp_rename.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,6 @@
 - /RENAME nom
 + /RENAME [-r|--reset] [-j|--jid jid] [-g|--group name] [-n|--name name] nom
 +Renomme le contact/groupe sélectionné avec le "nom" spécifié.
 +If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
 +Optionally you can use one of --jid, --group or --name to select object, different from current.
 diff -r 92fa48ef53c9 mcabber/doc/help/it/hlp_buffer.txt
 --- a/mcabber/doc/help/it/hlp_buffer.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/it/hlp_buffer.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/it/hlp_buffer.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -25,7 +25,7 @@
 Fa scorrere indietro il buffer di [n] linee (default: metà schermo)
 /buffer down [n]
 Fa scorrere avanti il buffer di [n] linee (default: metà schermo)
 -/buffer date [data]
 Salta alla prima linea successiva alla [data] specificata nel buffer di chat (formato della data: "YYYY-mm-dd")
 /buffer % n
 Salta alla posizione %n del buffer di chat corrente
 diff -r 92fa48ef53c9 mcabber/doc/help/it/hlp_del.txt
 --- a/mcabber/doc/help/it/hlp_del.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/it/hlp_del.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/it/hlp_del.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,4 @@
 - /DEL
 + /DEL [-n|--dryrun] [jid]
 Elimina il contatto corrente dal roster, cancellando la sottoscrizione alle reciproche notifiche della propria presenza.
 diff -r 92fa48ef53c9 mcabber/doc/help/it/hlp_move.txt
 --- a/mcabber/doc/help/it/hlp_move.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/it/hlp_move.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/it/hlp_move.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,5 +1,6 @@
 - /MOVE [gruppo]
 + /MOVE [-j|--jid jid] [-n|--name name] [grouppo]
 Muove il contatto corrente nel gruppo richiesto. Se non viene specificato alcun gruppo, il contatto viene spostato nel gruppo si default. Se il gruppo "gruppo" non esiste, viene creato.
 +You can select other buddy that current using options --jid and --name.
 Trucco: se la modalità chat è abilitata, puoi usare "/roster alternate" per spostarti sul contatto appena mosso.
 diff -r 92fa48ef53c9 mcabber/doc/help/it/hlp_rename.txt
 --- a/mcabber/doc/help/it/hlp_rename.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/it/hlp_rename.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/it/hlp_rename.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,6 @@
 - /RENAME nome
 + /RENAME [-r|--reset] [-j|--jid jid] [-g|--group name] [-n|--name name] nome
 +Rinomina il contatto od il gruppo correnti usando "nome".
 +If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
 +Optionally you can use one of --jid, --group or --name to select object, different from current.
 diff -r 92fa48ef53c9 mcabber/doc/help/nl/hlp_buffer.txt
 --- a/mcabber/doc/help/nl/hlp_buffer.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/nl/hlp_buffer.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/nl/hlp_buffer.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -25,7 +25,7 @@
 Scroll de buffer [n] regels omhoog (standaard: een half scherm)
 /buffer down [n]
 Scroll de buffer [n] regels omlaag (standaard: een half scherm)
 -/buffer date [datum]
 Spring naar de eerste regel na de aangeduide [datum] in de chat buffer (datum formaat: "YYYY-mm-dd")
 /buffer % n
 Spring naar positie %n in de buddy chat buffer
 diff -r 92fa48ef53c9 mcabber/doc/help/nl/hlp_del.txt
 --- a/mcabber/doc/help/nl/hlp_del.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/nl/hlp_del.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/nl/hlp_del.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,4 @@
 - /DEL
 + /DEL [-n|--dryrun] [jid]
 Verwijder de actieve buddy uit ons roster, en zet het wederzijds toezenden van status veranderingen stop.
 diff -r 92fa48ef53c9 mcabber/doc/help/nl/hlp_move.txt
 --- a/mcabber/doc/help/nl/hlp_move.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/nl/hlp_move.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/nl/hlp_move.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,5 +1,6 @@
 - /MOVE [groepsnaam]
 + /MOVE [-j|--jid jid] [-n|--name name] [groepsnaam]
 Verplaats de actieve buddy naar de aangegeven groep.  Indien geen groep werd gespecificeerd wordt buddy verplaatst naar de standaard groep.  Indien de groep "groepsnaam" niet bestaat, wordt die eerst aangemaakt.
 +You can select other buddy that current using options --jid and --name.
 Tip: indien chatmode actief is, kun je "/roster alternate" gebruiken om direct naar de verplaatste buddy te springen.
 diff -r 92fa48ef53c9 mcabber/doc/help/nl/hlp_rename.txt
 --- a/mcabber/doc/help/nl/hlp_rename.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/nl/hlp_rename.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/nl/hlp_rename.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,6 @@
 - /RENAME naam
 + /RENAME [-r|--reset] [-j|--jid jid] [-g|--group name] [-n|--name name] naam
 +Hernoem de actieve buddy of groep in de aangegeven "naam".
 +If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
 +Optionally you can use one of --jid, --group or --name to select object, different from current.
 diff -r 92fa48ef53c9 mcabber/doc/help/pl/hlp_del.txt
 --- a/mcabber/doc/help/pl/hlp_del.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/pl/hlp_del.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/pl/hlp_del.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,4 @@
 - /DEL
 + /DEL [-n|--dryrun] [jid]
 Usuwa aktualnie zaznaczoną osobę z rostera, usuwa subskrypcję powiadomienia dostępności u danej osoby oraz u nas.
 diff -r 92fa48ef53c9 mcabber/doc/help/pl/hlp_move.txt
 --- a/mcabber/doc/help/pl/hlp_move.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/pl/hlp_move.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/pl/hlp_move.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,5 +1,6 @@
 - /MOVE [nazwa grupy]
 + /MOVE [-j|--jid jid] [-n|--name name] [nazwa grupy]
 Przenosi aktualną osobę do grupy "nazwa grupy".  Jeśli nie podano nazwy grupy, wtedy osoba jest przenoszona do grupy domyślnej.  Jeśli grupa "nazwa grupy" nie istnieje, zostaje utworzona.
 +You can select other buddy that current using options --jid and --name.
 Podpowiedź: jeśli jest włączony tryb czatu, możesz użyć "/roster alternate" aby skoczyć do przeniesionej osoby.
 diff -r 92fa48ef53c9 mcabber/doc/help/pl/hlp_rename.txt
 --- a/mcabber/doc/help/pl/hlp_rename.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/pl/hlp_rename.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/pl/hlp_rename.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,6 @@
 - /RENAME nazwa
 + /RENAME [-r|--reset] [-j|--jid jid] [-g|--group name] [-n|--name name] nazwa
 +Zmienia nazwę aktualnej osoby lub grupy na "nazwa".
 +If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
 +Optionally you can use one of --jid, --group or --name to select object, different from current.
 diff -r 92fa48ef53c9 mcabber/doc/help/ru/hlp_buffer.txt
 --- a/mcabber/doc/help/ru/hlp_buffer.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/ru/hlp_buffer.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/ru/hlp_buffer.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -25,7 +25,7 @@
 Перемещает на [n] строк вверх в буфере (истории переписки) (по умолчанию: половина экрана)
 /buffer down [n]
 Перемещает на [n] строк вниз в буфере (истории переписки) (по умолчанию: половина экрана)
 -/buffer date [date]
 Перемещает в первой строке после определенной даты [date] в буфере (истории переписки) (формат даты: "год-месяц-день", для примера "2006-01-01")
 /buffer % n
 Перемещает на позицию %n в текущем буфере (истории переписки)
 diff -r 92fa48ef53c9 mcabber/doc/help/ru/hlp_del.txt
 --- a/mcabber/doc/help/ru/hlp_del.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/ru/hlp_del.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/ru/hlp_del.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,4 @@
 - /DEL
 + /DEL [-n|--dryrun] [jid]
 -Удаляет текущего пользователя из списка контактов, отключает уведомления о его статусе и отключает уведомления пользователя о вашем статусе.
 +Удаляет текущего пользователя (или указанного с помощью jid) из списка контактов, отключает уведомления о его статусе и отключает уведомление пользователя о вашем статусе.
 diff -r 92fa48ef53c9 mcabber/doc/help/ru/hlp_move.txt
 --- a/mcabber/doc/help/ru/hlp_move.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/ru/hlp_move.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/ru/hlp_move.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,6 +1,7 @@
 - /MOVE [groupname]
 + /MOVE [-j|--jid jid] [-n|--name name] [groupname]
 +С помощью параметров --jid и --name можно перемещать контакты, отличные от текущего.
 Полезно: Если включен режим чата (chatmode), Вы можете использовать "/roster alternate" для перехода к перемещенному пользователю.
 diff -r 92fa48ef53c9 mcabber/doc/help/ru/hlp_rename.txt
 --- a/mcabber/doc/help/ru/hlp_rename.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/ru/hlp_rename.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/ru/hlp_rename.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,6 @@
 - /RENAME name
 + /RENAME [-r|--reset] [-j|--jid jid] [-g|--group name] [-n|--name name] newname
 +Переименовывает текущего пользователя или группу в заданное имя "newname".
 +Если указан параметр --reset, "newname" игнорируется, а имя сбрасывается (mcabber будет отображать JID или имя пользователя по умолчанию).
 +Для указания обьекта, отличного от текущего, можно использовать опции --jid, --group и --name.
 diff -r 92fa48ef53c9 mcabber/doc/help/uk/hlp_buffer.txt
 --- a/mcabber/doc/help/uk/hlp_buffer.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/uk/hlp_buffer.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/uk/hlp_buffer.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -25,7 +25,7 @@
 Посунути буфер вверх на n рядків (якщо не вказано - пів екрану).
 /buffer down [n]
 Посунути буфер вниз на n рядків (якщо не вказано - пів екрану).
 -/buffer date [дата]
 Перейти до першого повідомлення після дати (дата вигляду РРРР-ММ-ДД).
 /buffer % процент
 Перейти до вказаної у процентах позиції.
 diff -r 92fa48ef53c9 mcabber/doc/help/uk/hlp_del.txt
 --- a/mcabber/doc/help/uk/hlp_del.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/uk/hlp_del.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/uk/hlp_del.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,4 @@
 - /DEL
 + /DEL [-n|--dryrun] [jid]
 -Потерти поточний контакт зі списку. На додачу відписатися від його повідомлень про статус і відписати його від ваших.
 +Потерти поточний контакт (або контакт, що має вказаний jid) зі списку. Також відписатися від його сповіщень про статус і відписати його від ваших.
 diff -r 92fa48ef53c9 mcabber/doc/help/uk/hlp_move.txt
 --- a/mcabber/doc/help/uk/hlp_move.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/uk/hlp_move.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/uk/hlp_move.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,5 +1,6 @@
 - /MOVE [група]
 + /MOVE [-j|--jid jid] [-n|--name ім’я] [група]
 +Переносить поточний контакт до вказаної групи. Якщо групу не вказати контакт опиниться у головній групі. Якщо групи не існує, її буде створено.
 +За допомогою опцій --jid та --name можна перемістити контакт, відмінний від поточного.
 Примітка: в режимі розмови можна використати "/roster alternate", щоб перейти до нового місця контакту контакту.
 diff -r 92fa48ef53c9 mcabber/doc/help/uk/hlp_rename.txt
 --- a/mcabber/doc/help/uk/hlp_rename.txt	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/doc/help/uk/hlp_rename.txt	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/doc/help/uk/hlp_rename.txt	Mon Mar 11 01:32:27 2013 +0200
 @@ -1,4 +1,6 @@
 - /RENAME ім'я
 + /RENAME [-r|--reset] [-j|--jid jid] [-g|--group ім’я] [-n|--name ім’я] нове ім’я
 Змінює прізвисько поточного контакту або назву групи.
 +За допомогою параметра --reset можна повернути контакту типову назву. При цьому нове ім’я (якщо вказане) ігнорується.
 +Опції --jid, --group та --name дозволяють перейменовувати об’єкти, відмінні від поточного.
 diff -r 92fa48ef53c9 mcabber/mcabber/commands.c
 --- a/mcabber/mcabber/commands.c	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/mcabber/commands.c	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/mcabber/commands.c	Mon Mar 11 01:32:27 2013 +0200
 @@ -19,7 +19,7 @@
 * USA
 */
 -#include <string.h>
 +#include <string.h> // g_memmove
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-@@ -43,512 +43,645 @@
+@@ -43,512 +43,663 @@
 #include "xmpp.h"
 #include "main.h"
 -#define IMSTATUS_AWAY           "away"
 -#define IMSTATUS_ONLINE         "online"
 +
 +//static void room_bookmark(gpointer bud, char *arg);
 +
 +#define BUILTIN_COUNT 3
 +static cmdopts_t def_roster,
++                 def_color,
 +                 def_status,
 +                 def_status_to,
 +#if 0
 +                 def_add,
 +                 def_del,
 +                 def_pgp,
 +                 def_iline,
 +                 def_screen_refresh,
 +                 def_chat_disable,
 +                 def_source,
-+                 def_color,
 +                 def_otr,
 +                 def_otrpolicy,
 +                 def_echo,
 +                 def_module,
 +                 def_exit
 -
 -gpointer cmd_del(gpointer id)
 +                 ;
 +
 +static cmd_handler_t do_roster,
++                     do_color,
 +                     do_status,
 +                     do_status_to,
 +#if 0
 +                     do_add,
 +                     do_del,
 +                     do_pgp,
 +                     do_iline,
 +                     do_screen_refresh,
 +                     do_chat_disable,
 +                     do_source,
-+                     do_color,
 +                     do_otr,
 +                     do_otrpolicy,
 +                     do_echo,
 +                     do_module,
 +                     do_exit
 -      compl_del_category_word(COMPL_CMD, command->name);
 -      g_slice_free(cmd, command);
 -      return userdata;
 +  cmd_list = g_new ((cmdopts_t *), BUILTIN_COUNT+1);
 +  cmd_list[0]  = def_roster;
-+  cmd_list[1]  = def_status;
++  cmd_list[1]  = def_color;
-+  cmd_list[2]  = def_status_to;
++  cmd_list[2]  = def_status;
++  cmd_list[3]  = def_status_to;
 +#if 0
-+  cmd_list[3]  = def_add;
++  cmd_list[4]  = def_add;
-+  cmd_list[4]  = def_del;
++  cmd_list[5]  = def_del;
-+  cmd_list[5]  = def_group;
++  cmd_list[6]  = def_group;
-+  cmd_list[6]  = def_say;
++  cmd_list[7]  = def_say;
-+  cmd_list[7]  = def_msay;
++  cmd_list[8]  = def_msay;
-+  cmd_list[8]  = def_say_to;
++  cmd_list[9]  = def_say_to;
-+  cmd_list[9]  = def_buffer;
++  cmd_list[10] = def_buffer;
-+  cmd_list[10] = def_clear;
++  cmd_list[11] = def_clear;
-+  cmd_list[11] = def_info;
++  cmd_list[12] = def_info;
-+  cmd_list[12] = def_rename;
++  cmd_list[13] = def_rename;
-+  cmd_list[13] = def_move;
++  cmd_list[14] = def_move;
-+  cmd_list[14] = def_set;
++  cmd_list[15] = def_set;
-+  cmd_list[15] = def_alias;
++  cmd_list[16] = def_alias;
-+  cmd_list[16] = def_bind;
++  cmd_list[17] = def_bind;
-+  cmd_list[17] = def_connect;
++  cmd_list[18] = def_connect;
-+  cmd_list[18] = def_disconnect;
++  cmd_list[19] = def_disconnect;
-+  cmd_list[19] = def_rawxml;
++  cmd_list[20] = def_rawxml;
-+  cmd_list[20] = def_room;
++  cmd_list[21] = def_room;
-+  cmd_list[21] = def_authorization;
++  cmd_list[22] = def_authorization;
-+  cmd_list[22] = def_version;
++  cmd_list[23] = def_version;
-+  cmd_list[23] = def_request;
++  cmd_list[24] = def_request;
-+  cmd_list[24] = def_event;
++  cmd_list[25] = def_event;
-+  cmd_list[25] = def_help;
++  cmd_list[26] = def_help;
-+  cmd_list[26] = def_pgp;
++  cmd_list[27] = def_pgp;
-+  cmd_list[27] = def_iline;
++  cmd_list[28] = def_iline;
-+  cmd_list[28] = def_screen_refresh;
++  cmd_list[29] = def_screen_refresh;
-+  cmd_list[29] = def_chat_disable;
++  cmd_list[30] = def_chat_disable;
-+  cmd_list[30] = def_source;
++  cmd_list[31] = def_source;
-+  cmd_list[31] = def_color;
 +  cmd_list[32] = def_otr;
 +  cmd_list[33] = def_otrpolicy;
 +  cmd_list[34] = def_echo;
 +  cmd_list[35] = def_module;
 +  cmd_list[36] = def_exit;
 -  return TRUE;
 +    if (command -> args) {
 +      for (n = 0; command -> args[n] != NULL; n ++) {
 +        cmdarg_t *arg = command -> args[n];
 +        arg -> value.roarg = arg -> defval;
-+        arg -> flags &= ~(cmdarg_visited|cmdarg_checked|cmdarg_freed);
++        arg -> flags &= ~(cmdarg_visited|cmdarg_checked);
 +      }
 +    }
 +  }
 +
 +  // we allow parser to do one extra run on final '\0'
 +        arg = command -> args[argno];
 +      }
 +
 +      if ((err = cmdopt_parse_argument(&p, &e, arg -> flags))) { // get argument value
 +        if (!option) {
-+          error = g_strdup_printf ("%s: Can't parse argument #%u: %s", command -> name, argno + 1, err);
++          error = g_strdup_printf ("%s: Can't parse argument %s (%u): %s", command -> name, arg -> name, argno + 1, err);
 +        else if (option -> shortopt) {
 +          error = g_strdup_printf ("%s: Can't parse argument for option -%c: %s", command -> name, option -> shortopt, err);
 +        } else {
 +          error = g_strdup_printt ("%s: Can't parse argument for option --%s: %s", command -> name, option -> longopt, err);
 +        }
 +      cmdopt_t *opt = command -> opts[n];
 +      if (!(opt -> flags & cmdopt_switch)) { // not a switch
 +        // needs checking and not checked already
 +        if ((opt -> arg.flags & (cmdarg_check | cmdarg_visited)) && !(opt -> arg.flags & cmdarg_checked)) {
 +          if (opt -> arg.type && opt -> arg.type -> check) { // checker is present
++            gchar *err;
 +            opt -> arg.flags |= cmdarg_checked;
-+            if ((error = opt -> arg.type -> check (&(opt -> arg)))) {
++            if ((err = opt -> arg.type -> check (&(opt -> arg)))) {
-+              gchar *err = error;
++              if (opt -> arg.flags & cmdarg_required) {
-+              if (option -> shortopt) {
++                if (opt -> shortopt) {
-+                error = g_strdup_printf ("%s: Error in argument for option -%c: %s", command -> name, option -> shortopt, err);
++                  error = g_strdup_printf ("%s: Error in argument for option -%c: %s", command -> name, opt -> shortopt, err);
++                } else {
++                  error = g_strdup_printt ("%s: Error in argument for option --%s: %s", command -> name, opt -> longopt, err);
++                }
++                g_free (err);
++                break;
 +              } else {
-+                error = g_strdup_printt ("%s: Error in argument for option --%s: %s", command -> name, option -> longopt, err);
++                if (opt -> shortopt) {
++                  scr_log_print (LPRINT_NORMAL, "Warning: %s: Error in argument for option -%c: %s", command -> name, opt -> shortopt, err);
++                } else {
++                  scr_log_print (LPRINT_NORMAL, "Warning: %s: Error in argument for option --%s: %s", command -> name, opt -> longopt, err);
++                }
++                g_free (err);
 +              }
-+              g_free (err);
-+              break;
 +            }
 +          }
 +        }
 +      }
 +    }
 +      cmdarg_t *arg = command -> args[n];
 +      // needs checking and not checked already
 +      if ((arg -> flags & (cmdarg_check | cmdarg_visited)) && !(arg -> flags & cmdarg_checked)) {
 +        if (arg -> flags & cmdarg_subcmd) { // subcommand
 +          if (!arg -> value.cmd) {
-+            error = g_strdup_printf ("%s: No subcommand specified.", command -> name);
++            if (arg -> flags & cmdarg_required) {
-+            break;
++              error = g_strdup_printf ("%s: No %s specified.", command -> name, arg -> name);
++              break;
++            } else { // XXX more prefixes
++              scr_log_print (LPRINT_NORMAL, "Warning: %s: No %s specified.", command -> name, arg -> name);
++            }
 +          }
 +        } else { // normal argument
 +          if (arg -> type && arg -> type -> check) {
++            gchar *err;
 +            arg -> flags |= cmdarg_checked;
-+            if ((error = arg -> type -> check (arg))) {
++            if ((err = arg -> type -> check (arg))) {
-+              gchar *err = error;
++              if (arg -> flags & cmdarg_required) {
-+              error = g_strdup_printf ("%s: Error in argument #%u: %s", command -> name, n, err);
++                error = g_strdup_printf ("%s: Error in argument %s (%u): %s", command -> name, arg -> name, n, err);
-+              g_free (err);
++                g_free (err);
-+              break;
++                break;
++              } else { // XXX more prefixes
++                scr_log_print (LPRINT_NORMAL, "Warning: %s: Error in argument %s (%u): %s", command -> name, arg -> name, n, err);
++                g_free (err);
++              }
 +            }
 +          }
 +        }
 +      }
 +    }
 +  gsize n;
 +  if (command -> opts) {
 +    for (n = 0; command -> opts[n]; n ++) {
 +      cmdopt_t *opt = command -> opts[n];
 +      if (!(opt -> flags & cmdopt_switch)) { // not switch
-+        if (opt -> arg.flags & cmdarg_checked) { // can free something
++        if (opt -> arg.flags & cmdarg_freeme) { // can free something
-+          opt -> arg.flags &= ~cmdarg_checked;
++          opt -> arg.flags &= ~cmdarg_freeme;
 +          if (opt -> arg.type && opt -> arg.type -> free) { // need to free something
 +            opt -> arg.type -> free (&(opt -> arg));
 +          }
 +        }
 +      }
 +        if (arg -> value.cmd) {
 +          cmdopts_free (arg -> value.cmd);
 +          arg -> value.cmd = NULL;
 +        }
 +      } else { // normal argument
-+        if (arg -> flags & cmdarg_checked) { // can free something
++        if (arg -> flags & cmdarg_freeme) { // can free something
-+          arg -> flags &= ~cmdarg_checked;
++          arg -> flags &= ~cmdarg_freeme;
 +          if (arg -> type && arg -> type -> free) { // need to free something
 +            arg -> type.free (arg);
 +          }
 +        }
 +      }
 +  int retval;
 +
 if (!*line) { // User only pressed enter
 if (scr_get_multimode()) {
 scr_append_multiline("");
-@@ -556,75 +689,114 @@
+@@ -556,141 +707,509 @@
 }
 if (current_buddy) {
 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_GROUP)
 -        do_group("toggle");
 +        group_cmd (BUDDATA(current_buddy), scmd_group_toggle);
 +
 +  return retval;
 }
 -static void roster_resourcelock(char *jidres, gboolean lock) {
+-  gpointer bud = NULL;
+-  char *resource = NULL;
+-
+-  if (!jidres) {
+-    if (lock) return;
+-    jidres = ".";
+-  }
+-
+-  if (jidres[0] == '.' &&
+-      (jidres[1] == '\0' || jidres[1] == JID_RESOURCE_SEPARATOR)) {
+-    //Special jid: . or ./resource
+-    switch (jidres[1]) {
+-      case JID_RESOURCE_SEPARATOR:
+-        resource = jidres+2;
+-      case '\0':
+-        if (current_buddy)
+-          bud = BUDDATA(current_buddy);
+-    }
+-  } else {
+-    char *tmp;
+-    if (!check_jid_syntax(jidres) &&
+-        (tmp = strchr(jidres, JID_RESOURCE_SEPARATOR))) {
+-      //Any other valid full jid
+-      *tmp = '\0'; // for roster search by bare jid;
+-      resource = tmp+1;
+-      GSList *roster_elt;
+-      roster_elt = roster_find(jidres, jidsearch,
+-          ROSTER_TYPE_USER|ROSTER_TYPE_AGENT);
+-      if (roster_elt)
+-        bud = roster_elt->data;
+-      *tmp = JID_RESOURCE_SEPARATOR;
+-    }
+-    if (!bud) {
+-      //Resource for current buddy
+-      if (current_buddy)
+-        bud = BUDDATA(current_buddy);
+-      resource = jidres;
 +//
 +//  Standard types
 +//
 +// This section contains standard argument type definitions, used in built-in
 +// mcabber commands.
 +//
 +
 +// TODO: (and variations with 'required')
-+// * cmdarg_type_roster_bjid  - in roster, with specified types -> bud
++// + cmdarg_type_roster_bjid     - in roster, with specified types -> bud
-+// * cmdarg_type_roster_fjid  - in roster, with specified types -> bud + resource
++// + cmdarg_type_roster_resource - in roster, with specified types, have resource -> bud + resource
++// * cmdarg_type_roster_fjid     - in roster, with specified types, might have non-existing resource -> bud + resource
++// * cmdarg_type_roster_jid      - in roster, with specified types, might have or not have resource -> bud + (resource)
 +// * cmdarg_type_bjid         - any bjid -> bjid
-+// * cmdarg_type_fjid         - any fjid -> fjid
++// + cmdarg_type_fjid         - any fjid -> fjid
-+// * cmdarg_type_statusmask
++// + cmdarg_type_statusmask   - string -> string
-+// * cmdarg_type_uint
++// + cmdarg_type_uint         - string -> uint
-+// * cmdarg_type_nonspace     - space only -> null
++// + cmdarg_type_nonspace     - strip, space only -> null
 +// * cmdarg_type_bjidmask
-+// * cmdarg_type_color
++// + cmdarg_type_color
-+// * cmdarg_type_string2enum
++// + cmdarg_type_string2enum
 +// * cmdarg_type_nick        - provide completions first from current room, then from all other, nonspace, do not restrict
 +
-+// Uses chkdata as guint with allowed ROSTER_TYPE_*.
++//
-+// Returns buddy roster entry in value.bud.
++//  common methods
-+// Recognizes as current ".", but not "" or NULL - use defvalue.
++//
-+// Does not require freeing.
++
-+gchar *cmdarg_check_roster_bjid_required(optarg_t *arg)
++static void cmdarg_free_gfree (optarg_t *arg)
 +{
-+  const char *bjid;
++  g_free (arg -> value.arg);
-+  guint      types;
-+  gchar      *error;
-+
-+  if ((error = cmdarg_check_nospace_required(arg)))
-+    return error;
-+
-+  bjid  = arg -> value.arg;
-+  types = (guint) arg -> chkdata;
-+
-+  if (strcmp(bjid, ".")) { // jid specified
-+    GSList *found;
-+    if (check_jid_syntax(bjid))
-+      return g_strdup_printf("<%s> is not a valid Jabber ID.", bjid);
-+    // find the buddy
-+    found = roster_find(bjid, jidsearch, types);
-+    if (found)
-+      arg -> value.bud = found->data;
-+    else
-+      return g_strdup_printf("Jid <%s> is not in the roster.", bjid);
-+  } else { // current buddy
-+    if (!current_buddy)
-+      return g_strdup_printf("No jid specified, and no buddy selected.");
-+    else if (buddy_gettype(BUDDATA(current_buddy)) & types)
-+      arg -> value.bud = BUDDATA(current_buddy);
-+    else // TODO: improve message
-+      return g_strdup_printf("Currently selected buddy is of wrong type.");
-+  }
-+
-+  return NULL;
 +}
 +
-+// The same as bjid_required, but in the case of error just sets value.bud
++//
-+// to NULL.
++//  string -> stripspace string
-+gchar *cmdarg_check_roster_bjid(optarg_t *arg)
++//
++
++// Strips leading and trailing spaces, checks if anything left.
++// Replaces value.arg.
++// Does not need freeing.
++// No trailing spaces in defvalue - needs RW access for that.
++static gchar *cmdarg_check_nospace (optarg_t *arg)
 +{
-+  gchar *error = cmdarg_check_roster_bjid_required(arg);
++  gchar *val = arg -> value.arg;
-+
++  if (val) {
-+  if (error) {
++    while (isspace(*val))
-+    g_free (error);
++      val ++;
-+    arg -> value.bud = NULL;
++    if (*val) { // valid arg
-+  }
++      arg -> value.arg = val;
-+
++      // XXX requires RW access. default values must not contain trailing space
-+  return NULL;
++      while (*val)
-+}
++        val ++;
-+
++      while (isspace(*val))
-+// FIXME check fjid
++        val --;
-+// XXX can't specify resource in bud - fjid or bud+resource?
++      val ++;
-+// resource must be present in roster - cmdarg_check_fjid_in_roster?
++      if (*val)
-+gchac *cmdarg_check_fjid(optarg_t *arg)
++        *val = '\0';
-+{
++      return NULL;
-gpointer bud = NULL;
-char *resource = NULL;
-@@ -664,33 +836,61 @@
-resource = jidres;
 }
 }
 -
 -  if (bud && buddy_gettype(bud) & (ROSTER_TYPE_USER|ROSTER_TYPE_AGENT)) {
 -    if (lock) {
 -      resources = buddy_getresources(bud);
 -      for (p_res = resources ; p_res ; p_res = g_slist_next(p_res)) {
 -        if (!g_strcmp0((char*)p_res->data, resource))
 -          found = TRUE;
 -        g_free(p_res->data);
--      }
++  // error
++  arg -> value.arg = NULL;
++  return g_strdup("Non-space value required.");
++}
++
++cmdarg_type_t cmdarg_type_nospace = {
++  cmdarg_check_nospace,
++  NULL,
++  NULL,
++};
++
++//
++//  bjid -> bud
++//
++
++// Uses chkdata as guint with allowed ROSTER_TYPE_*.
++// Returns buddy roster entry in value.bud.
++// Recognizes as current ".", but not "" or NULL - use defvalue.
++// Does not require freeing.
++static gchar *cmdarg_check_roster_bjid (optarg_t *arg)
++{
++  gchar *error = NULL;
++
++  if (!(error = cmdarg_check_nospace_required(arg))) {
++    const char *bjid = arg -> value.arg;
++    guint      types = (guint) arg -> chkdata;
++
++    if (!strcmp(bjid, ".")) { // current buddy
++      if (!current_buddy)
++        error = g_strdup_printf("No buddy selected.");
++      else if (buddy_gettype(BUDDATA(current_buddy)) & types)
++        arg -> value.bud = BUDDATA(current_buddy);
++      else // TODO: improve message
++        error = g_strdup_printf("Currently selected buddy is of wrong type.");
++    } else if (!check_jid_syntax(bjid)) { // valid jid specified
++      GSList *found = roster_find(bjid, jidsearch, types);
++      if (found)
++        arg -> value.bud = found->data;
++      else
++        error = g_strdup_printf("Jid <%s> is not in the roster.", bjid);
++    } else { // jid is invalid
++      error =  g_strdup_printf("<%s> is not a valid Jabber ID.", bjid);
++    }
++  }
++
++  if (error)
++    arg -> value.bud = NULL;
++  return error;
++}
++
++cmdarg_type_t cmdarg_type_bjid = {
++  cmdarg_check_roster_bjid,
++  NULL,
++  NULL,
++};
++
++//
++//  fjid -> bud + resource
++//
++
++// Uses chkdata as guint with allowed ROSTER_TYPE_*.
++// Returns buddy roster entry in userdata.
++// Returns resource string in value.arg.
++// Recognizes as current "./res" and "res".
++// Does not require freeing.
++// No full "jid/resource" syntax in defvalue - needs rw for that.
++// XXX:
++//  * make return value a custom struct { .bud, .res } instead of using userdata
++//  * allow bjids and '.'
++//  * merge with roster_bjid and use own flags in chkdata to signify types and resource allowed/required conditions
++//  * it is rather check_roster_resource
++static gchar *cmdarg_check_roster_resource(optarg_t *arg)
++{
++  gchar    *error    = NULL;
++  gpointer bud       = NULL;
++  char     *resource = NULL;
++
++  if (!(error = cmdarg_check_nospace(arg))) {
++    const char *fjid     = arg -> value.arg;
++    guint      types     = (guint) arg -> chkdata;
++
++    if (fjid[0] == '.' && fjid[1] == JID_RESOURCE_SEPARATOR) {
++      // current buddy
++      resource = fjid+2;
++    } else if (!check_jid_syntax(fjid) && (resource = strchr(fjid, JID_RESOURCE_SEPARATOR))) {
++      // valid jid
++      GSList *found;
++      *resource = '\0'; // XXX needs rw
++      found = roster_find(fjid, jidsearch, types);
++      if (found) {
++        bud = found->data;
++        resource ++;
++      } else
++        error = g_strdup_printf("Jid <%s> is not in the roster.", bjid);
++    } else {
++      // jid is invalid - let's consider it resource (XXX)
++      resource = fjid;
++    }
++    // resource for current buddy
++    if (error == NULL && resource) {
++      if (bud == NULL) {
++        if (!current_buddy)
++          error = g_strdup_printf("No buddy selected.");
++        else if (buddy_gettype(BUDDATA(current_buddy)) & types)
++          bud = BUDDATA(current_buddy);
++        else // TODO: improve message
++          error = g_strdup_printf("Currently selected buddy is of wrong type.");
+}
 -      g_slist_free(resources);
 -      if (!found) {
 -        scr_LogPrint(LPRINT_NORMAL, "No such resource <%s>...", jidres);
 -        return;
--      }
++      if (bud) {
--    } else {
++        GSList *resources, *p_res;
++        gboolean found = FALSE;
++        resources = buddy_getresources(bud);
++        for (p_res = resources; p_res; p_res = g_slist_next(p_res)) {
++          if (!g_strcmp0((char*)p_res->data, resource))
++            found = TRUE;
++          g_free(p_res->data);
++        }
++        g_slist_free(resources);
++        if (!found)
++          error = g_strdup_printf("No such resource <%s%c%s>...", buddy_getjid(bud), JID_RESOURCE_SEPARATOR, resource);
+}
++    }
++  }
++
++  if (error) {
++    arg -> userdata  = NULL;
++    arg -> value.arg = NULL;
++  } else {
++    arg -> userdata  = bud;
++    arg -> value.arg = resource;
++  }
++  return error;
++}
++
++cmdarg_type_t cmdarg_type_roster_resource = {
++  cmdarg_check_roster_resource,
++  NULL,
++  NULL,
++};
++
++//
++//  fjid -> fjid
++//
++
++// Returns corrected fjid in value.arg.
++// Recognizes as current "." and "./res".
++// Requires freeing.
++// XXX:
++//  * destructor is rather generic g_freer, publish?
++static gchar *cmdarg_check_fjid(optarg_t *arg)
++{
++  gchar *error = NULL;
++
++  if (!(error = cmdarg_check_nospace(arg))) {
++    const char *fjid = arg -> value.arg;
++
++    if (fjid[0] == '.' && (fjid[1] == JID_RESOURCE_SEPARATOR || fjid[1] == '\0')) {
++      const char *jid;
++      if (!current_buddy)
++        error = g_strdup_printf ("No buddy selected.");
++      else if (!(jid = buddy_getjid(BUDDATA(current_buddy)))) {
++        error = g_strdup_printf ("Current buddy have no jid.");
++      } else if (fjid[1] == '\0') {
++        arg -> value.arg = jid;
++      } else {
++        arg -> value.arg = g_strdup_printf ("%s%c%s", jid, JID_RESOURCE_SEPARATOR, fjid + 2);
++        arg -> flags |= cmdarg_freeme;
++      }
++    } else if (check_jid_syntax(fjid)) {
++      error = g_strdup_printf ("Jid <%s> is invalid.", fjid);
++    }
++  }
++
++  if (error)
++    arg -> value.arg = NULL;
++  return error;
++}
++
++cmdarg_type_t cmdarg_type_fjid = {
++  cmdarg_check_fjid,
++  cmdarg_free_gfree,
++  NULL,
++};
++
++//
++//  string -> uint
++//
++
++// Returns unsigned integer in value.uint.
++// Does not require freeing.
++// XXX:
++//  * use gulong? (strtoul allows to check conversion errors, while atoi - not)
++//  * use flags in chkdata to specify signedness - it only affects two checks
++static gchar *cmdarg_check_uint (cmdarg_t *arg)
++{
++  gchar *error;
++
++  if (!(error = cmdarg_check_nospace(arg))) {
++    const char *e = NULL;
++    const char *s = arg -> value.arg;
++    long n = strtol(s, &e, 0);
++    if (*e != '\0')
++      error = g_strdup_printf ("Invalid number \"%s\".", s);
++    else if (n < 0)
++      error = g_strdup ("Value must be greater than zero.");
++    else if (n > G_MAXUINT)
++      error = g_strdup ("Value %d is too big.", n);
++    else
++      arg -> value.uint = (guint) n;
++  }
++
++  if (error)
++    arg -> value.uint = 0;
++  return error;
++}
++
++cmdarg_type_t cmdarg_type_uint = {
++  cmdarg_check_uint,
++  NULL,
++  NULL,
++};
++
++//
++//  string -> statusmask
++//
++
++// Strips/checks for any non-valid status chars in mask.
++// Returns mask in value.arg.
++// Recognizes "*" as glob.
++// Does not require freeing.
++// No errors in default vaules - needs RW for that.
++// XXX:
++//  * check duplicates?
++//    * string2flags?
++//  * canonicize?
++//    * string2enum?
++//  * common strchr callback with valid chars in chkdata?
++//    * Then argument name should go into cmdarg struct - message would be too generic
++static gchar *cmdarg_check_statusmask (cmdarg_t *arg)
++{
++  gchar *error;
++
++  if (!(error = cmdarg_check_nospace(arg)) && arg -> value.arg) {
++    const char *valid = "foand_?";
++    if (!strcmp(arg -> value.arg, "*")) {
++      arg -> value.arg = g_strdup (valid);
++      arg -> flags    |= cmdarg_freeme;
+} else {
 -      resource = NULL;
--    }
++      gchar *p = arg -> value.arg;
++      gchar *e = p + strlen (p);
++      while (p < e) {
++        if (strchr(valid, *p)) {
++          p ++;
++        } else if (arg -> flags & cmdarg_required) {
++          // this is valid use of flag in checker
++          return g_strdup_printf ("%s can only contain characters [%s].", arg -> name, valid);
++        } else {
++          scr_log_print (LPRINT_NORMAL, "Warning: Wrong %s character [%c]", arg -> name, *p);
++          memmove (p, p+1, e-p-1);
++          e --;
++        }
++      }
++      if (arg -> value.arg == e) // arg is not required and we deleted all string
++        arg -> value.arg = NULL;
+}
 -    buddy_setactiveresource(bud, resource);
 -    scr_update_chat_status(TRUE);
-+
-+  GSList *resources, *p_res;
-+  gboolean found = FALSE;
-+  resources = buddy_getresources(bud);
-+  for (p_res = resources ; p_res ; p_res = g_slist_next(p_res)) {
-+    if (!g_strcmp0((char*)p_res->data, resource))
-+      found = TRUE;
-+    g_free(p_res->data);
 +  }
-+  g_slist_free(resources);
++
-+  if (!found) {
++  return error;
-+    scr_LogPrint(LPRINT_NORMAL, "No such resource <%s>...", jidres);
++}
-+    return;
++
-}
++cmdarg_type_t cmdarg_type_statusmask = {
-}
++  cmdarg_check_statusmask,
++  cmdarg_free_gfree,
++  NULL,
++};
++
++//
++//  string -> enum
++//
++
++typedef struct {
++  const char *name;
++  guint      value;
++} string2enum_t;
++
++// Uses chkdata as a pointer to continuous array of string2enum_t structs.
++// Returns corresponding value in value.uint.
++// Returns 0 if not recognized and not required.
++// Does not require freeing.
++// XXX:
++//  * also, print list of possible values on error?
++static gchar *cmdarg_check_string2enum (cmdarg_t *arg)
++{
++  gchar *error;
++
++  if (!(error = cmdarg_check_nospace(arg))) {
++    string2enum_t *list = arg -> chkdata;
++    gsize i;
++    for (i = 0; list[i] -> name != NULL; i ++) {
++      if (!strcmp(list[i] -> name, arg -> value.arg)) { // found
++        arg -> value.uint = list[i] -> value;
++        return NULL;
++      }
++      list ++;
++    }
++    // not found, error
++    error = g_strdup_printf("Value \"%s\" is invalid for %s.", arg -> value.arg, arg -> name);
++  }
++
++  if (error)
++    arg -> value.uint = 0; // XXX default value?
++  return error;
++}
++
++cmdarg_type_t cmdarg_type_string2enum = {
++  cmdarg_check_string2enum,
++  NULL,
++  NULL,
++};
++
++//
++//  string -> color name
++//
++
++static string2enum_t s2e_color[] = {
++  { "default", -1 },
++  { "black",   1  },
++  { "red",     1  },
++  { "green",   1  },
++  { "yellow",  1  },
++  { "blue",    1  },
++  { "magenta", 1  },
++  { "white",   1  },
++  { NULL,      0  },
++};
++
++// Recognizes "-" for reset, prefix "bright", standard names and numerical values.
++// Returns color name in value.arg.
++// Does not require freeing.
++// XXX
++//  * in fact, we can straight away do color parsing & allocate ccolor,
++//    but to not break too much things, for now we'll wait with that.
++//    * that needs access to ncurses internals, so, probably, this will
++//      be better done, when moving related command definitions to
++//      corresponding subsystems.
++static gchar *cmdarg_check_color (cmdarg_t *arg)
++{
++  gchar *error;
++
++  if (!(error = cmdarg_check_nospace(arg))) {
++    const char *color = arg -> value.arg;
++    gsize i;
++    // reset color
++    if (!strcmp(color, "-")) {
++      return NULL;
++    }
++    // allow "bright" prefix
++    if (!strncmp(color, "bright", 6))
++      color += 6;
++    // check names
++    for (i = 0; s2e_color[i] -> name != NULL; i ++) {
++      if (!strcmp (s2e_color[i] -> name, color)) {
++        return NULL;
++      }
++    }
++    { // not found, check for numerical value
++      const char *e = NULL;
++      long n = strtol(color, &e, 0);
++      if (*e != '\0' || n < 0 || n > 256)
++        error = g_strdup_printf ("Invalid color \"%s\".", arg -> value.arg);
++    }
++  }
++
++  if (error)
++    arg -> value.arg = NULL;
++  return error;
++}
++
++cmdarg_type_t cmdarg_type_color = {
++  cmdarg_check_color,
++  NULL,
++  NULL,
++};
 +
 +//
 +//  Command definitions
 +//
 +// This section contains definitions for built-in mcabber commands.
 +    lock = !(buddy_getflags(bud) & ROSTER_FLAG_USRLOCK);
 +  buddy_setflags(bud, ROSTER_FLAG_USRLOCK, lock);
 +  if ((!current_buddy) || bud == BUDDATA(current_buddy)) {
 +    buddylist_build();
 +    update_roster = TRUE;
-+  }
+}
-+}
+}
-+
-+static void roster_resourcelock(gpointer bud, const char *resource, gboolean lock)
-+{
-+  if (lock)
-+    buddy_setactiveresource(bud, resource);
-+  else
-+    buddy_setactiveresource(buf, NULL);
-+  scr_update_chat_status(TRUE);
-+}
 +
 //  display_and_free_note(note, winId)
 // Display the note information in the winId buffer, and free note
 // (winId is a bare jid or NULL for the status window, in which case we
 -// display the note jid too)
 +// display the note jid too).
 static void display_and_free_note(struct annotation *note, const char *winId)
 {
 gchar tbuf[128];
-@@ -755,41 +955,15 @@
+@@ -755,41 +1274,15 @@
 g_slist_free(notes);
 }
 -static void roster_note(char *arg)
 +static void roster_note(gpointer bud, gboolean reset, gchar *note)
 +    xmpp_set_storage_rosternotes(bjid, NULL);
 +  else { // display a note
 struct annotation *note = xmpp_get_storage_rosternotes(bjid, FALSE);
 if (note) {
 display_and_free_note(note, bjid);
-@@ -800,194 +974,244 @@
+@@ -800,194 +1293,273 @@
 }
 }
 -//  roster_updown(updown, nitems)
 -// updown: -1=up, +1=down
 +static cmdopts_t def_roster = {
 +  "roster",
 +  NULL,
 +  do_roster,
 +  NULL,
-+  {{cmdarg_subcmd | cmdarg_check, NULL, NULL}, NULL},
++  {{"subcommand", cmdarg_subcmd | cmdarg_check, NULL, NULL}, NULL},
 +  {
 +    SCMD_ROSTER(bottom, NULL),
 +    SCMD_ROSTER(top,    NULL),
-+    SCMD_ROSTER(up,   {{cmdarg_check, "1", cmdarg_type_uint}, NULL}),
++    SCMD_ROSTER(up,   {{"n", cmdarg_chreq, "1", cmdarg_type_uint}, NULL}),
-+    SCMD_ROSTER(down, {{cmdarg_check, "1", cmdarg_type_uint}, NULL}),
++    SCMD_ROSTER(down, {{"n", cmdarg_chreq, "1", cmdarg_type_uint}, NULL}),
 +    SCMD_ROSTER(group_prev, NULL),
 +    SCMD_ROSTER(group_next, NULL),
 +    SCMD_ROSTER(alternate, NULL),
 +    SCMD_ROSTER(unread_first, NULL),
 +    SCMD_ROSTER(unread_next,  NULL),
-+    SCMD_ROSTER(search, {{cmdarg_catchall|cmdarg_plain|cmdarg_check, NULL, cmdarg_type_nonspace}, NULL}),
++    SCMD_ROSTER(search, {{"name", cmdarg_eol|cmdarg_required, NULL, cmdarg_type_nonspace}, NULL}),
-+    SCMD_ROSTER(display, {{cmdarg_check, NULL, cmdarg_type_statusmask}, NULL}),
++    SCMD_ROSTER(display, {{"statusmask", cmdarg_check, NULL, cmdarg_type_statusmask}, NULL}),
 +    SCMD_ROSTER(hide_offline,   NULL),
 +    SCMD_ROSTER(show_offline,   NULL),
 +    SCMD_ROSTER(toggle_offline, NULL),
-+    SCMD_ROSTER(item_lock,        {{cmdarg_check, ".", cmdarg_type_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM)}, NULL}),
++    SCMD_ROSTER(item_lock,        {{"jid", cmdarg_chreq, ".", cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM)}, NULL}),
-+    SCMD_ROSTER(item_unlock,      {{cmdarg_check, ".", cmdarg_type_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM)}, NULL}),
++    SCMD_ROSTER(item_unlock,      {{"jid", cmdarg_chreq, ".", cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM)}, NULL}),
-+    SCMD_ROSTER(item_toggle_lock, {{cmdarg_check, ".", cmdarg_type_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM)}, NULL}),
++    SCMD_ROSTER(item_toggle_lock, {{"jid", cmdarg_chreq, ".", cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM)}, NULL}),
 +    { "note", NULL, NULL,
 +      {
-+        {cmdopt_switch,  'r', "reset", {cmdarg_default, NULL, NULL, NULL}},
++        {cmdopt_switch,  'r', "reset", {"reset", cmdarg_default, NULL, NULL, NULL}},
-+        {cmdopt_default, 'j', "jid",   {cmdarg_check, ".", cmdarg_type_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM|ROSTER_TYPE_AGENT)}},
++        {cmdopt_default, 'j', "jid",   {"jid", cmdarg_chreq, ".", cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM|ROSTER_TYPE_AGENT)}},
 +        NULL,
 +      },
 +      {
-+        {cmdarg_catchall|cmdarg_plain, NULL, cmdarg_type_nonspace},
++        {cmdarg_eol, NULL, cmdarg_type_nonspace},
 +        NULL,
 +      },
 +      NULL, (gpointer)scmd_roster_note
 +    },
 +    SCMD_ROSTER(notes, NULL),
-+    SCMD_ROSTER(resource_lock,   {{cmdarg_check, NULL, cmdarg_type_fjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_AGENT}, NULL}),
++    SCMD_ROSTER(resource_lock,   {{"resource|fjid", cmdarg_chreq, NULL, cmdarg_type_roster_resource, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_AGENT)}, NULL}),
-+    SCMD_ROSTER(resource_unlock, {{cmdarg_check, NULL, cmdarg_type_fjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_AGENT}, NULL}),
++    SCMD_ROSTER(resource_unlock, {{"jid", cmdarg_chreq, ".", cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_AGENT)}, NULL}),
 +    SCMD_ROSTER(hide,   NULL),
 +    SCMD_ROSTER(show,   NULL),
 +    SCMD_ROSTER(toggle, NULL),
 +    NULL,
 +  },
 +    roster_note(options -> cmds[18] -> opts[1] -> value.bud,
 +                options -> cmds[18] -> opts[0] -> value.swc,
 +                arg -> value.arg);
 +  } else if (subcmd == scmd_roster_notes) {
 +    display_all_annotations();
-+  } else if (subcmd == scmd_roster_resource_lock) { // FIXME implement fjid checker and decide where to get resource
++  } else if (subcmd == scmd_roster_resource_lock) {
-+    roster_resourcelock(arg -> value.bud, resource, TRUE);
++    buddy_setactiveresource(arg -> userdata, arg -> value.arg);
++    scr_update_chat_status(TRUE);
 +  } else if (subcmd == scmd_roster_resource_unlock) {
-+    roster_resourcelock(arg -> value.bud, NULL, FALSE);
++    buddy_setactiveresource(arg -> value.bud, NULL);
++    scr_update_chat_status(TRUE);
 +  } else if (subcmd == scmd_roster_hide) {
 +    scr_roster_visibility(0);
 +  } else if (subcmd == scmd_roster_show) {
 +    scr_roster_visibility(1);
 +  } else { // scmd_roster_toggle
 -void do_color(char *arg)
 +//
 +//  /color
 +//
 +
-+// TODO:
++// custom argument types
-+// * cmdarg_type_color_statusmask - also accept "clear"
++
-+// * cmdarg_type_color_roomjid    - also accept "*"
++// statusmask + "clear"
++static gchar *cmdarg_check_color_statusmask (cmdarg_t *arg)
+{
+-  char **paramlst;
+-  char *subcmd;
+-
+-  paramlst = split_arg(arg, 2, 1); // subcmd, arg
+-  subcmd = *paramlst;
+-  arg = *(paramlst+1);
+-
+-  if (!subcmd || !*subcmd) {
+-    scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
+-    free_arg_lst(paramlst);
+-    return;
++  if (!g_strcmp0(arg -> value.arg, "clear"))
++    return NULL;
++  else
++    return cmdarg_check_statusmask (arg);
++}
++
++static cmdarg_type_t cmdarg_type_color_statusmask = {
++  cmdarg_check_color_statusmask,
++  NULL,
++  NULL,
++};
++
++// bjid + "*"
++// Returns string, not buddy.
++static gchar *cmdarg_check_color_roomjid (cmdarg_t *arg)
++{
++  gchar *error;
++
++  if (!g_strcmp0(arg -> value.arg, "*"))
++    return NULL;
++
++  arg -> chkdata = (gpointer) ROSTER_TYPE_ROOM;
++  if (!(error = cmdarg_check_roster_bjid (arg))) {
++    arg -> value.roarg = buddy_getjid (arg -> value.bud); // XXX strdup?
+}
+-  if (!strcasecmp(subcmd, "roster")) {
+-    char *status, *wildcard, *color;
+-    char **arglist = split_arg(arg, 3, 0);
+-
+-    status = *arglist;
+-    wildcard = to_utf8(arglist[1]);
+-    color = arglist[2];
+-
+-    if (status && !strcmp(status, "clear")) { // Not a color command, clear all
++  if (error)
++    arg -> value.arg = NULL;
++  return error;
++}
++
++static cmdarg_type_t cmdarg_type_color_roomjid = {
++  cmdarg_check_color_roomjid,
++  NULL,
++  NULL,
++};
++
++// command
 +
 +typedef enum {
 +  scmd_color_roster,
 +  scmd_color_mucnick,
 +  scmd_color_muc,
 +  { "preset", MC_PRESET },
 +  { "-",      MC_REMOVE },
 +  { NULL,     0         },
 +};
 +
-+cmdopts_t def_color = {
++static cmdopts_t def_color = {
 +  "color",
 +  NULL,
 +  do_color,
 +  NULL,
-+  {{ cmdarg_subcmd | cmdarg_check, NULL, NULL }, NULL},
++  {{ "subcommand", cmdarg_subcmd | cmdarg_check, NULL, NULL }, NULL},
 +  {
 +    {"roster", NULL, NULL, NULL, {
-+        { cmdarg_check,   NULL, cmdarg_type_color_statusmask },
++        { "statusmask|clear", cmdarg_chreq, NULL, cmdarg_type_color_statusmask },
-+        { cmdarg_default, NULL, cmdarg_type_bjidmask         },
++        { "jidmask", cmdarg_default, NULL, cmdarg_type_bjidmask         },
-+        { cmdarg_default, NULL, cmdarg_type_color            },
++        { "color|-", cmdarg_default, NULL, cmdarg_type_color            },
 +        NULL,
 +      }, NULL, (gpointer)scmd_color_roster},
 +    {"muc", NULL, NULL, NULL, {
-+        { cmdarg_check, NULL, cmdarg_type_color_roomjid },
++        { "roomjid", cmdarg_chreq, NULL, cmdarg_type_color_roomjid },
-+        { cmdarg_check, "on", cmdarg_type_string2enum, (gpointer)s2e_color_muc},
++        { "on|off|preset|-", cmdarg_chreq, "on", cmdarg_type_string2enum, (gpointer)s2e_color_muc},
 +        NULL,
 +      }, NULL, (gpointer)scmd_color_muc},
 +    {"mucnick", NULL, NULL, NULL {
-+        { cmdarg_check, NULL, cmdarg_type_nick  },
++        { "nick", cmdarg_chreq, NULL, cmdarg_type_nick  },
-+        { cmdarg_check, NULL, cmdarg_type_color },
++        { "color|-", cmdarg_chreq, NULL, cmdarg_type_color },
 +        NULL,
 +      }, NULL, (gpointer)scmd_color_mucnick},
 +    NULL,
 +  },
 +};
 +
 +static gchar *do_color(cmdopts_t *options)
-{
++{
--  char **paramlst;
--  char *subcmd;
--
--  paramlst = split_arg(arg, 2, 1); // subcmd, arg
--  subcmd = *paramlst;
--  arg = *(paramlst+1);
--
--  if (!subcmd || !*subcmd) {
--    scr_LogPrint(LPRINT_NORMAL, "Missing parameter.");
--    free_arg_lst(paramlst);
--    return;
--  }
--
--  if (!strcasecmp(subcmd, "roster")) {
--    char *status, *wildcard, *color;
--    char **arglist = split_arg(arg, 3, 0);
--
--    status = *arglist;
--    wildcard = to_utf8(arglist[1]);
--    color = arglist[2];
--
--    if (status && !strcmp(status, "clear")) { // Not a color command, clear all
 +  scmd_color_t subcmd = (scmd_color_t) options -> args[0] -> value.cmd -> userdata;
 +
 +  if (subcmd == scmd_color_roster) {
 +    const gchar *status   = options -> cmds[0] -> args[0] -> value.arg;
 +    const gchar *wildcard = options -> cmds[0] -> args[1] -> value.arg;
 -//  cmd_setstatus(recipient, arg)
 +//
 +//  /status
 +//
 +
-+static string2enum_t s2e_status[] = {
++// FIXME: this should go to xmpp_iq, that uses it
-+  { "away",      away        },
-+  { "offline",   offline     },
-+  { "online",    available   },
-+  { "avail",     available   },
-+  { "notavail",  notavail    },
-+  { "dnd",       dontdisturb },
-+  { "free",      freeforchat },
-+#ifdef WITH_DEPRECATED_STATUS_INVISIBLE
-+  { "invisible", invisible   },
-+#endif
-+  { NULL,        0           },
-+};
-+
 +//  cmd_setstatus(recipient, status, message)
 // Set your Jabber status.
 -// - if recipient is not NULL, the status is sent to this contact only
 -// - arg must be "status message" (message is optional)
 -void cmd_setstatus(const char *recipient, const char *arg)
 -  char *status;
 -  char *msg;
 enum imstatus st;
 if (!xmpp_is_online())
-@@ -1000,15 +1224,15 @@
+@@ -1000,15 +1572,15 @@
 if (!recipient)
 scr_check_auto_away(TRUE);
 -  paramlst = split_arg(arg, 2, 1); // status, message
 -  status = *paramlst;
 +  }
 +
 if      (!strcasecmp(status, IMSTATUS_OFFLINE))       st = offline;
 else if (!strcasecmp(status, IMSTATUS_ONLINE))        st = available;
 else if (!strcasecmp(status, IMSTATUS_AVAILABLE))     st = available;
-@@ -1020,64 +1244,88 @@
+@@ -1020,229 +1592,347 @@
 else if (!strcasecmp(status, IMSTATUS_NOTAVAILABLE))  st = notavail;
 else if (!strcasecmp(status, IMSTATUS_FREE4CHAT))     st = freeforchat;
 else if (!strcasecmp(status, "message")) {
 -    if (!msg || !*msg) {
 +    if (!msg) {
 -
 -  free_arg_lst(paramlst);
 }
 -static void do_status(char *arg)
++// custom type
++
++// XXX status|message|show -> status
++static string2enum_t s2e_status2[] = {
++  { "away",      away        },
++  { "offline",   offline     },
++  { "online",    available   },
++  { "avail",     available   },
++  { "notavail",  notavail    },
++  { "dnd",       dontdisturb },
++  { "free",      freeforchat },
++#ifdef WITH_DEPRECATED_STATUS_INVISIBLE
++  { "invisible", invisible   },
++#endif
++  { "show",      imstatus_size},
++  { NULL,        0           },
++};
++
++// needs corresponding s2e in chkdata
++static gchar *cmdarg_check_status_status (cmdarg_t *arg)
+{
+-  if (!*arg) {
++  gchar *error;
++
++  if (!g_strcmp0(arg, "message")) {
++    arg -> value.uint = xmpp_getstatus(); // Preserve current status
++    return NULL;
++  }
++
++  return cmdarg_check_string2enum (arg);
++}
++
++static cmdarg_type_t cmdarg_type_status_status = {
++  cmdarg_check_status_status,
++  NULL,
++  NULL,
++};
++
++// command
 +
 +cmdopts_t def_status = {
 +  "status",
 +  NULL,
 +  do_status,
 +  NULL,
 +  {
-+    {cmdarg_default, NULL, cmdarg_type_status_status, (string2enum_t)s2e_status2},
++    {"status", cmdarg_default, NULL, cmdarg_type_status_status, (gpointer)s2e_status2},
-+    {cmdarg_catchall|cmdarg_plain, NULL, cmdarg_type_nonspace},
++    {"message", cmdarg_eol, NULL, cmdarg_type_nonspace},
 +    NULL,
 +  },
 +  NULL,
 +};
 +
 +static gchar *do_status(cmdopts_t *options)
-{
++{
--  if (!*arg) {
++  if (options -> args[0] -> value.uint == imstatus_size) {
-+  if (options.args[0].value.arg == NULL) {
 const char *sm = xmpp_getstatusmsg();
 scr_LogPrint(LPRINT_NORMAL, "Your status is: [%c] %s",
 imstatus2char[xmpp_getstatus()],
 (sm ? sm : ""));
 +  } else {
-+    cmd_setstatus(NULL, options.args[0].value.arg, options.args[1].value.arg);
++    if (!xmpp_is_online())
++      scr_LogPrint(LPRINT_NORMAL, "You are currently not connected...");
++    scr_check_auto_away(TRUE);
++    xmpp_setstatus(options -> args[0] -> value.uint, NULL,
++                   options -> args[1] -> value.arg, FALSE);
 +  }
 +  return NULL;
 +}
++
++//
++//  /status_to
++//
++
++// no "show" here
++static string2enum_t s2e_status[] = {
++  { "away",      away        },
++  { "offline",   offline     },
++  { "online",    available   },
++  { "avail",     available   },
++  { "notavail",  notavail    },
++  { "dnd",       dontdisturb },
++  { "free",      freeforchat },
++#ifdef WITH_DEPRECATED_STATUS_INVISIBLE
++  { "invisible", invisible   },
++#endif
++  { NULL,        0           },
++};
 +
 +cmdopts_t def_status_to = {
 +  "status_to",
 +  NULL,
 +  do_status_to,
 +  NULL,
-+  { // FIXME NOT in roster, just any fjid, and as a string
++  {
-+    {cmdarg_check, NULL, cmdarg_type_fjid},
++    {"jid", cmdarg_chreq, NULL, cmdarg_type_fjid},
-+    {cmdarg_check, NULL, cmdarg_type_status_status, (string2enum_t)s2e_status2},
++    {"status", cmdarg_chreq, NULL, cmdarg_type_status_status, (string2enum_t)s2e_status},
-+    {cmdarg_catchall|cmdarg_plain, NULL, cmdarg_type_nonspace},
++    {"message", cmdarg_eol,   NULL, cmdarg_type_nonspace},
 +    NULL,
 +  },
 +  NULL,
 +};
 +
 +static gchar *do_status_to(cmdopts_t *options)
 +{
-+  cmdopts_t options = {
++  const char *fjid, *stname, *msg;
-+    "status_to",
++  enum imstatus st;
-+    NULL,
++  gsize i;
-+    (cmdarg_t[3]){
++
-+      // jid
++  fjid = options -> args[0] -> value.arg;
-+      { CMDOPT_REQUIRED,                              { .arg = NULL } },
++  st   = options -> args[1] -> value.uint;
-+      // status
++  msg  = options -> args[2] -> value.arg;
-+      { CMDOPT_REQUIRED,                              { .arg = NULL } },
++
-+      // message
++  for (i = 0; s2e_status[i] -> name != NULL; i++) {
-+      { CMDOPT_CATCHALL | CMDOPT_PLAIN | CMDOPT_LAST, { .arg = ""   } },
++    if (s2e_status[i] -> value == st) {
-+    },
++      stname = s2e_status[i] -> name;
-+    NULL,
++      break;
-+  };
++    }
-+  char *fjid, *st, *msg;
++  }
-+
++  msg = msg ? msg : "";
-+  if (cmdopts_parse(arg, &options))
++
-return;
++  scr_LogPrint(LPRINT_LOGNORM,
--  }
++               "Sending to <%s> /status %s %s", fjid, stname, msg);
--  arg = to_utf8(arg);
++  if (!xmpp_is_online())
--  cmd_setstatus(NULL, arg);
++    scr_LogPrint(LPRINT_NORMAL, "You are currently not connected...");
--  g_free(arg);
++  xmpp_setstatus(st, fjid, msg, FALSE);
--}
++
--
++  return NULL
--static void do_status_to(char *arg)
++}
--{
++
--  char **paramlst;
--  char *fjid, *st, *msg;
--  char *jid_utf8 = NULL;
--
--  paramlst = split_arg(arg, 3, 1); // jid, status, [message]
--  fjid = *paramlst;
--  st = *(paramlst+1);
--  msg = *(paramlst+2);
--
--  if (!fjid || !st) {
--    scr_LogPrint(LPRINT_NORMAL,
--                 "Please specify both a Jabber ID and a status.");
--    free_arg_lst(paramlst);
--    return;
--  }
-+
-+  fjid = options.args[0].value.arg;
-+  st   = options.args[1].value.arg;
-+  msg  = options.args[2].value.arg;
-// Allow things like /status_to "" away
-if (!*fjid || !strcmp(fjid, "."))
-@@ -1086,15 +1334,13 @@
-if (fjid) {
-// The JID has been specified.  Quick check...
-if (check_jid_syntax(fjid)) {
--      scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8,
--                   "<%s> is not a valid Jabber ID.", fjid);
-+      scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", fjid);
-fjid = NULL;
-} else {
-// Convert jid to lowercase
-char *p = fjid;
-for ( ; *p && *p != JID_RESOURCE_SEPARATOR; p++)
-*p = tolower(*p);
--      fjid = jid_utf8 = to_utf8(fjid);
-}
-} else {
-// Add the current buddy
-@@ -1105,144 +1351,208 @@
-}
-if (fjid) {
--    char *cmdline;
--    if (!msg)
--      msg = "";
--    msg = to_utf8(msg);
--    cmdline = g_strdup_printf("%s %s", st, msg);
--    scr_LogPrint(LPRINT_LOGNORM, "Sending to <%s> /status %s", fjid, cmdline);
--    cmd_setstatus(fjid, cmdline);
--    g_free(msg);
--    g_free(cmdline);
--    g_free(jid_utf8);
-+    scr_LogPrint(LPRINT_LOGNORM,
-+                 "Sending to <%s> /status %s %s", fjid, st, msg);
-+    cmd_setstatus(fjid, st, msg);
-}
--  free_arg_lst(paramlst);
-+
-+  cmdopts_free(&options);
-}
 +#if 0
-static void do_add(char *arg)
++static void do_add(char *arg)
-{
++{
--  char **paramlst;
--  char *id, *nick;
--  char *jid_utf8 = NULL;
 +  cmdopts_t options = {
 +    "add",
 +    NULL,
 +    (cmdarg_t[2]){
 +      // jid
 +      { CMDOPT_CATCHALL | CMDOPT_PLAIN | CMDOPT_LAST, { .arg = NULL } },
 +    },
 +    NULL,
 +  };
 +  gchar *jid, *nick;
++
++  if (!xmpp_is_online()) {
++    scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
+return;
+}
+-  arg = to_utf8(arg);
+-  cmd_setstatus(NULL, arg);
+-  g_free(arg);
+-}
+-
+-static void do_status_to(char *arg)
+-{
+-  char **paramlst;
+-  char *fjid, *st, *msg;
+-  char *jid_utf8 = NULL;
+-
+-  paramlst = split_arg(arg, 3, 1); // jid, status, [message]
+-  fjid = *paramlst;
+-  st = *(paramlst+1);
+-  msg = *(paramlst+2);
+-
+-  if (!fjid || !st) {
+-    scr_LogPrint(LPRINT_NORMAL,
+-                 "Please specify both a Jabber ID and a status.");
+-    free_arg_lst(paramlst);
++
++  if (cmdopts_parse(arg, &options))
+return;
+-  }
+-
+-  // Allow things like /status_to "" away
+-  if (!*fjid || !strcmp(fjid, "."))
+-    fjid = NULL;
+-
+-  if (fjid) {
++
++  jid  = options.args[0].value.arg;
++  nick = options.args[1].value.arg;
++
++  if (jid && (!*jid || !strcmp(jid, ".")))
++    jid = NULL;
++
++  if (jid) {
+// The JID has been specified.  Quick check...
+-    if (check_jid_syntax(fjid)) {
+-      scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8,
+-                   "<%s> is not a valid Jabber ID.", fjid);
+-      fjid = NULL;
++    if (check_jid_syntax(jid)) {
++      scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", jid);
++      jid = NULL;
+} else {
+-      // Convert jid to lowercase
+-      char *p = fjid;
+-      for ( ; *p && *p != JID_RESOURCE_SEPARATOR; p++)
+-        *p = tolower(*p);
+-      fjid = jid_utf8 = to_utf8(fjid);
++      mc_strtolower(jid);
+}
+} else {
+// Add the current buddy
+if (current_buddy)
+-      fjid = (char*)buddy_getjid(BUDDATA(current_buddy));
+-    if (!fjid)
++      jid = (char*)buddy_getjid(BUDDATA(current_buddy));
++    if (!jid)
+scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID.");
+}
+-  if (fjid) {
+-    char *cmdline;
+-    if (!msg)
+-      msg = "";
+-    msg = to_utf8(msg);
+-    cmdline = g_strdup_printf("%s %s", st, msg);
+-    scr_LogPrint(LPRINT_LOGNORM, "Sending to <%s> /status %s", fjid, cmdline);
+-    cmd_setstatus(fjid, cmdline);
+-    g_free(msg);
+-    g_free(cmdline);
+-    g_free(jid_utf8);
++  if (jid) {
++    // 2nd parameter = optional nickname
++    xmpp_addbuddy(jid, nick, NULL);
++    scr_LogPrint(LPRINT_LOGNORM, "Sent presence notification request to <%s>.",
++                 jid);
+}
+-  free_arg_lst(paramlst);
++
++  cmdopts_free(&options);
+}
+-static void do_add(char *arg)
++static void do_del(char *arg)
+{
+-  char **paramlst;
+-  char *id, *nick;
+-  char *jid_utf8 = NULL;
++  cmdopts_t options = {
++    "del",
++    (cmdopt_t[1]){
++      { CMDOPT_SWITCH | CMDOPT_LAST, 'n', "dryrun", { .swc = 0 } },
++    },
++    (cmdarg_t[1]){
++      { CMDOPT_LAST, { .arg = "."  } }, // jid
++    },
++    NULL,
++  };
++  gchar *jid;
++  gpointer buddy;
 if (!xmpp_is_online()) {
 scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
 return;
 }
 -
 -  if (id) {
 +  if (cmdopts_parse(arg, &options))
 +    return;
 +
-+  jid  = options.args[0].value.arg;
++  jid = options.args[0].value.arg;
-+  nick = options.args[1].value.arg;
 +
 +  if (jid && (!*jid || !strcmp(jid, ".")))
 +    jid = NULL;
 +
 +  if (jid) {
 +      scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", jid);
 +      jid = NULL;
 } else {
 -      mc_strtolower(id);
 -      id = jid_utf8 = to_utf8(id);
-+      mc_strtolower(jid);
-}
-} else {
-// Add the current buddy
-if (current_buddy)
--      id = (char*)buddy_getjid(BUDDATA(current_buddy));
--    if (!id)
-+      jid = (char*)buddy_getjid(BUDDATA(current_buddy));
-+    if (!jid)
-scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID.");
-}
--  if (nick)
--    nick = to_utf8(nick);
--
--  if (id) {
-+  if (jid) {
-// 2nd parameter = optional nickname
--    xmpp_addbuddy(id, nick, NULL);
-+    xmpp_addbuddy(jid, nick, NULL);
-scr_LogPrint(LPRINT_LOGNORM, "Sent presence notification request to <%s>.",
--                 id);
-+                 jid);
-}
--  g_free(jid_utf8);
--  g_free(nick);
--  free_arg_lst(paramlst);
-+  cmdopts_free(&options);
-}
-static void do_del(char *arg)
-{
--  const char *bjid;
--
--  if (*arg) {
--    scr_LogPrint(LPRINT_NORMAL, "This action does not require a parameter; "
--                 "the currently-selected buddy will be deleted.");
-+  cmdopts_t options = {
-+    "del",
-+    (cmdopt_t[1]){
-+      { CMDOPT_SWITCH | CMDOPT_LAST, 'n', "dryrun", { .swc = 0 } },
-+    },
-+    (cmdarg_t[1]){
-+      { CMDOPT_LAST, { .arg = "."  } }, // jid
-+    },
-+    NULL,
-+  };
-+  gchar *jid;
-+  gpointer buddy;
-+
-+  if (!xmpp_is_online()) {
-+    scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
-return;
-}
-+  if (cmdopts_parse(arg, &options))
-+    return;
-+
-+  jid = options.args[0].value.arg;
-+
-+  if (jid && (!*jid || !strcmp(jid, ".")))
-+    jid = NULL;
-+
-+  if (jid) {
-+    // The JID has been specified.  Quick check...
-+    if (check_jid_syntax(jid)) {
-+      scr_LogPrint(LPRINT_NORMAL, "<%s> is not a valid Jabber ID.", jid);
-+      jid = NULL;
-+    } else {
 +      GSList *found;
 +      mc_strtolower(jid);
 +      found = roster_find(jid, jidsearch, ROSTER_TYPE_USER |
 +                          ROSTER_TYPE_AGENT | ROSTER_TYPE_GROUP);
 +      if (!found) {
 +        scr_log_print(LPRINT_NORMAL, "Jabber ID <%s> is not in roster.", jid);
 +        jid = NULL;
 +      } else {
 +        buddy = found -> data;
 +      }
-+    }
+}
-+  } else {
+} else {
+-    // Add the current buddy
 +    // Use current buddy
-+    if (current_buddy)
+if (current_buddy)
+-      id = (char*)buddy_getjid(BUDDATA(current_buddy));
+-    if (!id)
 +      jid = (char*)buddy_getjid(BUDDATA(current_buddy));
 +    if (!jid)
-+      scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID.");
+scr_LogPrint(LPRINT_NORMAL, "Please specify a Jabber ID.");
 +    else
 +      buddy = BUDDATA(current_buddy);
-+  }
+}
-+
+-  if (nick)
+-    nick = to_utf8(nick);
+-
+-  if (id) {
+-    // 2nd parameter = optional nickname
+-    xmpp_addbuddy(id, nick, NULL);
+-    scr_LogPrint(LPRINT_LOGNORM, "Sent presence notification request to <%s>.",
+-                 id);
 +  if (jid) {
 +    if (buddy_gettype(buddy) & ROSTER_TYPE_ROOM) {
 +      // This is a chatroom
 +      if (buddy_getinsideroom(buddy)) {
 +        scr_LogPrint(LPRINT_NORMAL, "You haven't left this room!");
 +      scr_buffer_purge(1, jid);
 +
 +      xmpp_delbuddy(jid);
 +      scr_update_buddy_window();
 +    }
-+  }
+}
-+
+-  g_free(jid_utf8);
+-  g_free(nick);
+-  free_arg_lst(paramlst);
 +  cmdopts_free(&options);
-+}
+}
-+
+-static void do_del(char *arg)
 +#endif
 +
 +static void group_cmd (gpointer group, group_scmd_t action)
-+{
+{
+-  const char *bjid;
+-
+-  if (*arg) {
+-    scr_LogPrint(LPRINT_NORMAL, "This action does not require a parameter; "
+-                 "the currently-selected buddy will be deleted.");
+-    return;
+-  }
 +  // We'll have to redraw the chat window if we're not currently on the group
 +  // entry itself, because it means we'll have to leave the current buddy
 +  // chat window.
 +  if (action != scmd_group_unfold &&
 +      ((!current_buddy) ||
 +    },
 +  };
 +  gchar *name;
 +  gpointer group = NULL;
 +  guint leave_buddywindow;
-+
 if (!current_buddy)
 return;
 -  bjid = buddy_getjid(BUDDATA(current_buddy));
 -  if (!bjid)
 +
 -    g_free(group_utf8);
 +    roster_elt = roster_find(name, namesearch, ROSTER_TYPE_GROUP);
 if (roster_elt)
 group = buddy_getgroup(roster_elt->data);
 } else {
-@@ -1253,31 +1563,19 @@
+@@ -1253,31 +1943,19 @@
 goto do_group_return;
 }
 -  // We'll have to redraw the chat window if we're not currently on the group
 -  // entry itself, because it means we'll have to leave the current buddy
 -                           LmMessageSubType type_overwrite, bool quiet)
 +                           msgtype_t msg_type, bool quiet)
 {
 char *bare_jid, *rp;
 char *hmsg;
-@@ -1285,6 +1583,7 @@
+@@ -1285,6 +1963,7 @@
 gint retval = 0;
 int isroom;
 gpointer xep184 = NULL;
 +  LmMessageSubType type_overwrite = LM_MESSAGE_SUB_TYPE_NOT_SET;
 if (!xmpp_is_online()) {
 scr_LogPrint(LPRINT_NORMAL, "You are not connected.");
-@@ -1299,11 +1598,15 @@
+@@ -1299,11 +1978,15 @@
 return 1;
 }
 if (check_jid_syntax((char*)fjid)) {
 -    scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8,
 -                 "<%s> is not a valid Jabber ID.", fjid);
 +    type_overwrite = LM_MESSAGE_SUB_TYPE_HEADLINE;
 +
 // We must use the bare jid in hk_message_out()
 rp = strchr(fjid, JID_RESOURCE_SEPARATOR);
 if (rp)
-@@ -1354,8 +1657,7 @@
+@@ -1354,8 +2037,7 @@
 //  send_message(msg, subj, type_overwrite)
 // Write the message in the buddy's window and send the message on
 // the network.
 -static void send_message(const char *msg, const char *subj,
 -                         LmMessageSubType type_overwrite)
 +static void send_message(const char *msg, const char *subj, msgtype_t msgtype)
 {
 const char *bjid;
 char *jid;
-@@ -1378,34 +1680,13 @@
+@@ -1378,34 +2060,13 @@
 else
 jid = g_strdup(bjid);
 -  send_message_to(jid, msg, subj, type_overwrite, FALSE);
 +  send_message_to(jid, msg, subj, msgtype, FALSE);
 gpointer bud;
 -  LmMessageSubType msgtype = LM_MESSAGE_SUB_TYPE_NOT_SET;
 scr_set_chatmode(TRUE);
 scr_show_buddy_window();
-@@ -1424,80 +1705,131 @@
+@@ -1424,80 +2085,131 @@
 }
 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE);
 -  if (parse_flags)
 -    msgtype = scan_mtype(&arg);
 -  /* send/send_to command */
 +  /* msay_scmd_send or msay_scmd_send_to */
 if (!scr_get_multimode()) {
 scr_LogPrint(LPRINT_NORMAL, "No message to send.  "
-@@ -1508,49 +1840,47 @@
+@@ -1508,49 +2220,47 @@
 scr_set_chatmode(TRUE);
 scr_show_buddy_window();
 -  if (!strcasecmp(subcmd, "send_to")) {
 -    int err = FALSE;
 -  free_arg_lst(paramlst);
 +  cmdopts_free(&options);
 }
 //  load_message_from_file(filename)
-@@ -1566,7 +1896,7 @@
+@@ -1566,7 +2276,7 @@
 char *next_utf8_char;
 size_t len;
 -  fd = fopen(filename, "r");
 +  fd = fopen(filename, "r"); // FIXME g_from_utf8
 if (!fd || fstat(fileno(fd), &buf)) {
 scr_LogPrint(LPRINT_LOGNORM, "Cannot open message file (%s)", filename);
-@@ -1634,130 +1964,103 @@
+@@ -1634,130 +2344,103 @@
 static void do_say_to(char *arg)
 {
 -  char **paramlst;
 -  char *fjid, *msg_utf8;
 +  g_free(freeme);
 +  g_free(freeme2);
 }
 //  buffer_updown(updown, nblines)
-@@ -1775,27 +2078,10 @@
+@@ -1775,27 +2458,10 @@
 scr_buffer_scroll_up_down(updown, nblines);
 }
 -static void buffer_search(int direction, char *arg)
 -{
 -  strip_arg_special_chars(date);
 -
 t = from_iso8601(date, 0);
 if (t)
 scr_buffer_date(t);
-@@ -1804,98 +2090,156 @@
+@@ -1804,98 +2470,156 @@
 "not correctly formatted or invalid.");
 }
 -static void buffer_percent(char *arg1, char *arg2)
 +// XXX % command before was able to handle %50
 -  do_buffer("clear");
 +  scr_buffer_clear();
 }
 static void do_info(char *arg)
-@@ -2033,29 +2377,20 @@
+@@ -2033,29 +2757,20 @@
 }
 }
 +enum room_names_style_t {
 +  room_names_style_normal = 0,
 -    }
 -  }
 // Enter chat mode
 scr_set_chatmode(TRUE);
-@@ -2075,12 +2410,12 @@
+@@ -2075,12 +2790,12 @@
 rstatus = buddy_getstatus(bud, p_res->data);
 rst_msg = buddy_getstatusmsg(bud, p_res->data);
 -    if (style == style_short) {
 +    if (style == room_names_style_short) {
 -    } else if (style == style_compact) {
 +    } else if (style == room_names_style_compact) {
 enum imrole role = buddy_getrole(bud, p_res->data);
 enum imaffiliation affil = buddy_getaffil(bud, p_res->data);
 bool showaffil = (affil != affil_none);
-@@ -2096,12 +2431,12 @@
+@@ -2096,12 +2811,12 @@
 snprintf(buffer, 4095, "[%c] %s", imstatus2char[rstatus],
 (char*)p_res->data);
 scr_WriteIncomingMessage(bjid, buffer, 0, HBB_PREFIX_INFO, 0);
 -      if (rst_msg && style != style_quiet) {
 +      if (rst_msg && style != room_names_style_quiet) {
 -      if (style == style_detail) {
 +      if (style == room_names_style_detail) {
 enum imrole role = buddy_getrole(bud, p_res->data);
 enum imaffiliation affil = buddy_getaffil(bud, p_res->data);
-@@ -2145,16 +2480,69 @@
+@@ -2145,16 +2860,69 @@
 static void do_rename(char *arg)
 {
 +  cmdopts_t options = {
 +    "rename",
 +  }
 +
 bjid   = buddy_getjid(bud);
 group  = buddy_getgroupname(bud);
 type   = buddy_gettype(bud);
-@@ -2162,11 +2550,13 @@
+@@ -2162,11 +2930,13 @@
 if (type & ROSTER_TYPE_SPECIAL) {
 scr_LogPrint(LPRINT_NORMAL, "You can't rename this item.");
 +    cmdopts_free(&options);
 return;
 scr_LogPrint(LPRINT_NORMAL, "Please specify a new name.");
 +    cmdopts_free(&options);
 return;
 }
-@@ -2181,90 +2571,117 @@
+@@ -2181,90 +2951,117 @@
 //  }
 //}
 -  newname = g_strdup(arg);
 // Remove trailing space
 +      // We do not move the buddy right now because the server could reject
 +      // the request.  Let's wait for the server answer.
 } else {
 // This is a local item, we move it without adding to roster.
 guint msgflag;
-@@ -2276,7 +2693,7 @@
+@@ -2276,7 +3073,7 @@
 msgflag = buddy_getflags(bud) & ROSTER_FLAG_MSG;
 if (msgflag)
 roster_msg_setflag(bjid, FALSE, FALSE);
 -      buddy_setgroup(bud, group_utf8);
 +      buddy_setgroup(bud, newgroupname);
 if (msgflag)
 roster_msg_setflag(bjid, FALSE, TRUE);
 if ((type & ROSTER_TYPE_ROOM) && xmpp_is_bookmarked(bjid) &&
-@@ -2285,8 +2702,7 @@
+@@ -2285,8 +3082,7 @@
 }
 }
 -  g_free(group_utf8);
 -  g_free(newgroupname);
 +  cmdopts_free(&options);
 update_roster = TRUE;
 }
-@@ -2468,50 +2884,33 @@
+@@ -2468,50 +3264,33 @@
 static void do_rawxml(char *arg)
 {
 -  char **paramlst;
 -  char *subcmd;
 +  lm_connection_send_raw(lconnection, options.cmds[0].args[0].value.arg, NULL);
 +  cmdopts_free(&options);
 }
 //  check_room_subcommand(arg, param_needed, buddy_must_be_a_room)
-@@ -2874,7 +3273,7 @@
+@@ -2874,7 +3653,7 @@
 fjid_utf8 = g_strdup_printf("%s/%s", buddy_getjid(bud), nick_utf8);
 g_free (nick_utf8);
 msg = to_utf8(arg);
 -  send_message_to(fjid_utf8, msg, NULL, LM_MESSAGE_SUB_TYPE_NOT_SET, FALSE);
 +  send_message_to(fjid_utf8, msg, NULL, msgtype_not_set, FALSE);
 g_free(fjid_utf8);
 g_free(msg);
 free_arg_lst(paramlst);
-@@ -3290,6 +3689,207 @@
+@@ -3290,6 +4069,207 @@
 static void do_room(char *arg)
 {
 +  enum room_scmd_t {
 +    room_scmd_join, room_scmd_leave,
 +    },
 +  };
 char **paramlst;
 char *subcmd;
 gpointer bud;
-@@ -3347,7 +3947,7 @@
+@@ -3347,7 +4327,7 @@
 cmd_room_leave(bud, arg);
 } else if (!strcasecmp(subcmd, "names"))  {
 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL)
 -      room_names(bud, arg);
 +      room_names(bud, room_names_style_normal); // FIXME
 } else if (!strcasecmp(subcmd, "nick"))  {
 if ((arg = check_room_subcommand(arg, FALSE, bud)) != NULL)
 room_nick(bud, arg);
-@@ -4162,5 +4762,6 @@
+@@ -4162,5 +5142,6 @@
 }
 mcabber_set_terminate_ui();
 }
 +#endif
 /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
 diff -r 92fa48ef53c9 mcabber/mcabber/commands.h
 --- a/mcabber/mcabber/commands.h	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/mcabber/commands.h	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/mcabber/commands.h	Mon Mar 11 01:32:27 2013 +0200
-@@ -5,32 +5,209 @@
+@@ -5,32 +5,214 @@
 #include <mcabber/config.h>
 -// Command structure
 -typedef struct {
 +typedef enum {
 +  cmdopt_default  = 0,     // no flags
 +  cmdopt_switch   = 1<<0,  // option have no argument
 +} cmdopt_flags_t;
 +typedef enum {
-+  cmdarg_default  = 0,     // no flags
++  cmdarg_default  = 0x0000, // no flags ['u' - user, 'p' - parser, 'c' - checker]
-+  cmdarg_catchall = 1<<0,  // argument consumes the end of command line
++  cmdarg_catchall = 0x0001, // u2p, argument consumes the end of command line
-+  cmdarg_plain    = 1<<1,  // quotes and escapes are not processed
++  cmdarg_plain    = 0x0002, // u2p, quotes and escapes are not processed
-+  cmdarg_subcmd   = 1<<2,  // argument is subcommand
++  cmdarg_subcmd   = 0x0004, // u2p, argument is subcommand
-+  cmdarg_check    = 1<<3,  // force checker call on argument
++  cmdarg_check    = 0x0008, // u2p, force checker call on argument
-+  cmdarg_visited  = 1<<4,  // private, marks initialized arguments
++  cmdarg_required = 0x0010, // u2p[c], treat checker errors as errors or warnings (may be used by checker too)
-+  cmdarg_checked  = 1<<5,  // private, marks checked argument
++  cmdarg_visited  = 0x0020, // p2p, marks initialized arguments
++  cmdarg_checked  = 0x0040, // p2p, marks checked argument
++  cmdarg_freeme   = 0x0080, // c2p, marks argument, that needs freeing
++  // convenience shortcuts
++  cmdarg_eol      = 0x0003, // catchall + plain
++  cmdarg_chreq    = 0x0018, // check + required
 +} cmdarg_flags_t;
 +
 +struct cmdopts_struct {
 +  const char    *name;     // [user,req] command name (error messages, help, subcommands)
 +  cmd_flags_t   flags;     // [user,req] safe
 +  char           shortopt; // [user,req]
 +  const char     *longopt; // [user,req]
 +  cmdarg_t       arg;      // [user,req]
 +};
 +struct cmdarg_struct {
++  const char     *name;    // [user,req] argument name - errors, help
 +  cmdarg_flags_t flags;    // [user,req] catchall, plain, required, subcommand
 +  const char     *defval;  // [user,req] default value
 +  cmdarg_type_t  *type;    // [user,req] type cbs - checker and completor
 +  gpointer       chkdata;  // [user] instance data for type checker - eg string2enum list
 +  gpointer       userdata; // [user]
 +  cmdarg_value_t value;    // [parser,chk] current value
 +};
 +
 +struct cmdarg_type_struct {
-+  const char          *name;    // [user,req] type name (help)
 +  cmdarg_checker_t    check;    // [user,req] check string and set argument value
 +  cmdarg_destructor_t free;     // [user,req] free argument value
 +  cmdarg_completor_t  complete; // [user,req]
 +};
 +
 #endif /* __MCABBER_COMMANDS_H__ */
 diff -r 92fa48ef53c9 mcabber/mcabber/roster.c
 --- a/mcabber/mcabber/roster.c	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/mcabber/roster.c	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/mcabber/roster.c	Mon Mar 11 01:32:27 2013 +0200
 @@ -1586,13 +1586,14 @@
 // Look for a buddy whose name or jid contains string.
 // Search begins at current_buddy; if no match is found in the the buddylist,
 // return NULL;
 +// Note: before this function considered its argument to be in local encoding,
 if (found)
 return buddy;
 }
 diff -r 92fa48ef53c9 mcabber/mcabber/screen.c
 --- a/mcabber/mcabber/screen.c	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/mcabber/screen.c	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/mcabber/screen.c	Mon Mar 11 01:32:27 2013 +0200
 @@ -3626,7 +3626,7 @@
 {
 scr_check_auto_away(TRUE);
 last_activity_buddy = current_buddy;
 -  if (process_line(inputLine))
 return 255;
 // Add line to history
 scr_cmdhisto_addline(inputLine);
 diff -r 92fa48ef53c9 mcabber/mcabber/xmpp_iq.c
 --- a/mcabber/mcabber/xmpp_iq.c	Sun Jan 27 00:40:37 2013 +0200
-+++ b/mcabber/mcabber/xmpp_iq.c	Tue Mar 05 01:08:31 2013 +0200
++++ b/mcabber/mcabber/xmpp_iq.c	Mon Mar 11 01:32:27 2013 +0200
 @@ -289,10 +289,7 @@
 if (value) {
 for (s = adhoc_status_list; !s->name || strcmp(s->name, value); s++);
 if (s->name) {
 -          char *status = g_strdup_printf("%s %s", s->status,

changeset 75	17cd00b2e722
parent 74	a879ea179877
child 76	3c8b784f92c7