mcabber-isbear-patches: comparison cmdopts.diff

equal deleted inserted replaced

-:ee30584c654b
+:07e696e91b6f
 # HG changeset patch
 # Parent 1b0b563a81e6425da07c1da7ea4f947c4f3326cb
 [work-in-progress] Unified command option parsing
-* wrecking chaos all over the place
+* complete change of commands.h interface
-* started integration with cmd subsystem
+- uses different symbols to make compatibility layer possible
-* broke everything
+* completion system is broken now
+* usable commands:
+- roster
+- color
+- status/status_to
+- add/del
+- group
+- say
+* it does compile, but have not tested at all
+* privatized say_cmd()
+* dropped cmd_setstatus()
+* process_line() still expects line to be in local encoding,
+while cmd_execute() expects utf8 and rw
+* process_line() can return error values, different from 255
 ** PREVIOUS ACHIEVEMENTS **
-* cmdopts_parse() & cmdopts_free() in utils.c/h
+* function interface changes:
-* /roster uses parser
 * buddy_search() now expects argument in utf8
-* /say_to uses parser
-* /color uses parser
-* /status and /status_to use parser
 * cmd_setstatus() now expects separate status and message arguments
-* /add uses parser
+* say_cmd()'s second argument is now of new type msgtype_t
-* /del uses parser
+* scr_multi* now store multiline in utf8
+* /del:
 * allows specifying jid, as /add does
 * -n(--dryrun) switch for debugging purposes
-* /group uses parser
+* /rename:
-* /say uses parser
-* say_cmd()'s second argument is now of new type msgtype_t
-* /msay uses parser
-* scr_multi* now store multiline in utf8
-* /buffer uses parser
-* fix help for /buffer date
-* /rename uses parser
 * -r(--reset) instead of '-'
 * -j(--jid), -g(--group), -n(--name)
-* /move uses parser
+* /move:
 * -j(--jid), -n(--name)
-* /rawxml uses parser
+* misc:
+* fix help for /buffer date
 diff -r 1b0b563a81e6 mcabber/doc/help/cs/hlp_buffer.txt
 --- a/mcabber/doc/help/cs/hlp_buffer.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/cs/hlp_buffer.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/cs/hlp_buffer.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/cs/hlp_del.txt
 --- a/mcabber/doc/help/cs/hlp_del.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/cs/hlp_del.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/cs/hlp_del.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/cs/hlp_move.txt
 --- a/mcabber/doc/help/cs/hlp_move.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/cs/hlp_move.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/cs/hlp_move.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/cs/hlp_rename.txt
 --- a/mcabber/doc/help/cs/hlp_rename.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/cs/hlp_rename.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/cs/hlp_rename.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/de/hlp_buffer.txt
 --- a/mcabber/doc/help/de/hlp_buffer.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/de/hlp_buffer.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/de/hlp_buffer.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/de/hlp_del.txt
 --- a/mcabber/doc/help/de/hlp_del.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/de/hlp_del.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/de/hlp_del.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/de/hlp_move.txt
 --- a/mcabber/doc/help/de/hlp_move.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/de/hlp_move.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/de/hlp_move.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/de/hlp_rename.txt
 --- a/mcabber/doc/help/de/hlp_rename.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/de/hlp_rename.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/de/hlp_rename.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/en/hlp_buffer.txt
 --- a/mcabber/doc/help/en/hlp_buffer.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/en/hlp_buffer.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/en/hlp_buffer.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/en/hlp_del.txt
 --- a/mcabber/doc/help/en/hlp_del.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/en/hlp_del.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/en/hlp_del.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/en/hlp_move.txt
 --- a/mcabber/doc/help/en/hlp_move.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/en/hlp_move.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/en/hlp_move.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/en/hlp_rename.txt
 --- a/mcabber/doc/help/en/hlp_rename.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/en/hlp_rename.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/en/hlp_rename.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/fr/hlp_buffer.txt
 --- a/mcabber/doc/help/fr/hlp_buffer.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/fr/hlp_buffer.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/fr/hlp_buffer.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/fr/hlp_del.txt
 --- a/mcabber/doc/help/fr/hlp_del.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/fr/hlp_del.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/fr/hlp_del.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/fr/hlp_move.txt
 --- a/mcabber/doc/help/fr/hlp_move.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/fr/hlp_move.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/fr/hlp_move.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/fr/hlp_rename.txt
 --- a/mcabber/doc/help/fr/hlp_rename.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/fr/hlp_rename.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/fr/hlp_rename.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/it/hlp_buffer.txt
 --- a/mcabber/doc/help/it/hlp_buffer.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/it/hlp_buffer.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/it/hlp_buffer.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/it/hlp_del.txt
 --- a/mcabber/doc/help/it/hlp_del.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/it/hlp_del.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/it/hlp_del.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/it/hlp_move.txt
 --- a/mcabber/doc/help/it/hlp_move.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/it/hlp_move.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/it/hlp_move.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/it/hlp_rename.txt
 --- a/mcabber/doc/help/it/hlp_rename.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/it/hlp_rename.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/it/hlp_rename.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/nl/hlp_buffer.txt
 --- a/mcabber/doc/help/nl/hlp_buffer.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/nl/hlp_buffer.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/nl/hlp_buffer.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/nl/hlp_del.txt
 --- a/mcabber/doc/help/nl/hlp_del.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/nl/hlp_del.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/nl/hlp_del.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/nl/hlp_move.txt
 --- a/mcabber/doc/help/nl/hlp_move.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/nl/hlp_move.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/nl/hlp_move.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/nl/hlp_rename.txt
 --- a/mcabber/doc/help/nl/hlp_rename.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/nl/hlp_rename.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/nl/hlp_rename.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/pl/hlp_del.txt
 --- a/mcabber/doc/help/pl/hlp_del.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/pl/hlp_del.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/pl/hlp_del.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/pl/hlp_move.txt
 --- a/mcabber/doc/help/pl/hlp_move.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/pl/hlp_move.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/pl/hlp_move.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/pl/hlp_rename.txt
 --- a/mcabber/doc/help/pl/hlp_rename.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/pl/hlp_rename.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/pl/hlp_rename.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/ru/hlp_buffer.txt
 --- a/mcabber/doc/help/ru/hlp_buffer.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/ru/hlp_buffer.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/ru/hlp_buffer.txt	Mon Mar 18 02:16:22 2013 +0200
 @@ -25,7 +25,7 @@
 Перемещает на [n] строк вверх в буфере (истории переписки) (по умолчанию: половина экрана)
 /buffer down [n]
 Перемещает на [n] строк вниз в буфере (истории переписки) (по умолчанию: половина экрана)
 -/buffer date [date]
 Перемещает в первой строке после определенной даты [date] в буфере (истории переписки) (формат даты: "год-месяц-день", для примера "2006-01-01")
 /buffer % n
 Перемещает на позицию %n в текущем буфере (истории переписки)
 diff -r 1b0b563a81e6 mcabber/doc/help/ru/hlp_del.txt
 --- a/mcabber/doc/help/ru/hlp_del.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/ru/hlp_del.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/ru/hlp_del.txt	Mon Mar 18 02:16:22 2013 +0200
 @@ -1,4 +1,4 @@
 - /DEL
 + /DEL [-n|--dryrun] [jid]
 -Удаляет текущего пользователя из списка контактов, отключает уведомления о его статусе и отключает уведомления пользователя о вашем статусе.
 +Удаляет текущего пользователя (или указанного с помощью jid) из списка контактов, отключает уведомления о его статусе и отключает уведомление пользователя о вашем статусе.
 diff -r 1b0b563a81e6 mcabber/doc/help/ru/hlp_move.txt
 --- a/mcabber/doc/help/ru/hlp_move.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/ru/hlp_move.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/ru/hlp_move.txt	Mon Mar 18 02:16:22 2013 +0200
 @@ -1,6 +1,7 @@
 - /MOVE [groupname]
 + /MOVE [-j|--jid jid] [-n|--name name] [groupname]
 +С помощью параметров --jid и --name можно перемещать контакты, отличные от текущего.
 Полезно: Если включен режим чата (chatmode), Вы можете использовать "/roster alternate" для перехода к перемещенному пользователю.
 diff -r 1b0b563a81e6 mcabber/doc/help/ru/hlp_rename.txt
 --- a/mcabber/doc/help/ru/hlp_rename.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/ru/hlp_rename.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/ru/hlp_rename.txt	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/doc/help/uk/hlp_buffer.txt
 --- a/mcabber/doc/help/uk/hlp_buffer.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/uk/hlp_buffer.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/uk/hlp_buffer.txt	Mon Mar 18 02:16:22 2013 +0200
 @@ -25,7 +25,7 @@
 Посунути буфер вверх на n рядків (якщо не вказано - пів екрану).
 /buffer down [n]
 Посунути буфер вниз на n рядків (якщо не вказано - пів екрану).
 -/buffer date [дата]
 Перейти до першого повідомлення після дати (дата вигляду РРРР-ММ-ДД).
 /buffer % процент
 Перейти до вказаної у процентах позиції.
 diff -r 1b0b563a81e6 mcabber/doc/help/uk/hlp_del.txt
 --- a/mcabber/doc/help/uk/hlp_del.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/uk/hlp_del.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/uk/hlp_del.txt	Mon Mar 18 02:16:22 2013 +0200
 @@ -1,4 +1,4 @@
 - /DEL
 + /DEL [-n|--dryrun] [jid]
 -Потерти поточний контакт зі списку. На додачу відписатися від його повідомлень про статус і відписати його від ваших.
 +Потерти поточний контакт (або контакт, що має вказаний jid) зі списку. Також відписатися від його сповіщень про статус і відписати його від ваших.
 diff -r 1b0b563a81e6 mcabber/doc/help/uk/hlp_move.txt
 --- a/mcabber/doc/help/uk/hlp_move.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/uk/hlp_move.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/uk/hlp_move.txt	Mon Mar 18 02:16:22 2013 +0200
 @@ -1,5 +1,6 @@
 - /MOVE [група]
 + /MOVE [-j|--jid jid] [-n|--name ім’я] [група]
 +Переносить поточний контакт до вказаної групи. Якщо групу не вказати контакт опиниться у головній групі. Якщо групи не існує, її буде створено.
 +За допомогою опцій --jid та --name можна перемістити контакт, відмінний від поточного.
 Примітка: в режимі розмови можна використати "/roster alternate", щоб перейти до нового місця контакту контакту.
 diff -r 1b0b563a81e6 mcabber/doc/help/uk/hlp_rename.txt
 --- a/mcabber/doc/help/uk/hlp_rename.txt	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/uk/hlp_rename.txt	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/doc/help/uk/hlp_rename.txt	Mon Mar 18 02:16:22 2013 +0200
 @@ -1,4 +1,6 @@
 - /RENAME ім'я
 + /RENAME [-r|--reset] [-j|--jid jid] [-g|--group ім’я] [-n|--name ім’я] нове ім’я
 Змінює прізвисько поточного контакту або назву групи.
 +За допомогою параметра --reset можна повернути контакту типову назву. При цьому нове ім’я (якщо вказане) ігнорується.
 +Опції --jid, --group та --name дозволяють перейменовувати об’єкти, відмінні від поточного.
 diff -r 1b0b563a81e6 mcabber/mcabber/commands.c
 --- a/mcabber/mcabber/commands.c	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/commands.c	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/mcabber/commands.c	Mon Mar 18 02:16:22 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,631 @@
+@@ -43,512 +43,671 @@
 #include "xmpp.h"
 #include "main.h"
 -#define IMSTATUS_AWAY           "away"
 -#define IMSTATUS_ONLINE         "online"
 +typedef enum {
 +  scmd_group_unfold = 0,
 +  scmd_group_fold   = 1,
 +  scmd_group_toggle = -1,
 +} scmd_group_t;
++typedef enum {
++  msgtype_not_set,
++  msgtype_normal,
++  msgtype_headline,
++} msgtype_t;
 +
 +static void group_cmd (gpointer group, scmd_group_t action);
++static void say_cmd (char *arg, msgtype_t msgtype);
 +
 +//static void room_bookmark(gpointer bud, char *arg);
 +
-+#define BUILTIN_COUNT 4
++#define BUILTIN_COUNT 8
 +static cmdopts_t def_roster,
 +                 def_color,
 +                 def_status,
 +                 def_status_to,
 +                 def_add,
 +                 def_del,
-+                 def_group;
++                 def_group,
++                 def_say;
 +#if 0
-+                 def_say,
 +                 def_msay,
 +                 def_say_to,
 +                 def_buffer,
 +                 def_clear,
 +                 def_info,
 +  cmd_list[2]  = &def_status;
 +  cmd_list[3]  = &def_status_to;
 +  cmd_list[4]  = &def_add;
 +  cmd_list[5]  = &def_del;
 +  cmd_list[6]  = &def_group;
++  cmd_list[7]  = &def_say;
 +#if 0
-+  cmd_list[7]  = &def_say;
 +  cmd_list[8]  = &def_msay;
 +  cmd_list[9]  = &def_say_to;
 +  cmd_list[10] = &def_buffer;
 +  cmd_list[11] = &def_clear;
 +  cmd_list[12] = &def_info;
 +  g_free (cmd_list);
 +  cmd_list  = NULL;
 +  cmd_count = 0;
 +}
 +
-+// XXX:
++static size_t cmdopts_count_values (cmdopts_t *command)
-+//  * if command is found, maybe still put it at the start of queue?
++{
++  size_t max = -1;
++  if (command -> opts) {
++    cmdopt_t *opt;
++    for (opt = command -> opts; opt -> shortopt != 0; opt ++)
++      if (opt -> arg.pos > max)
++        max = opt -> arg.pos;
++  }
++  if (command -> args) {
++    cmdarg_t *arg;
++    for (arg = command -> args; arg -> name != NULL; arg ++)
++      if (arg -> pos > max)
++        max = arg -> pos;
++  }
++  if (command -> cmds) {
++    cmdopts_t *scmd;
++    for (scmd = command -> cmds; scmd -> name != NULL; scmd ++) {
++      size_t cnt = cmdopts_count_values (scmd);
++      if (cnt > max)
++        max = cnt;
+}
++  }
++  return max;
++}
++
 +void cmd_define (cmdopts_t *command)
 +{
-+  cmdopts_t **cmd;
++  size_t n;
-+  for (cmd = cmd_list; *cmd != NULL; cmd ++)
++  // we update value count even for existing commands - user may
-+    if (*cmd == command)
++  // have screwed something up in struct.
++  command -> valno = cmdopts_count_values (command) + 1;
++  // check if command already exists
++  for (n = cmd_count; n > 0; n --)
++    if (cmd_list[n-1] == command) {
++      // raise it's priority
++      g_memmove(cmd_list+n-1, cmd_list+n, sizeof(cmdopts_t *) * (cmd_count-n-1));
++      cmd_list[cmd_count-1] = command;
 +      return;
++    }
++  // register new command
 +  cmd_list = g_renew (cmdopts_t *, cmd_list, cmd_count+2);
-+  cmd_list[cmd_count] = command;
++  cmd_list[cmd_count]   = command;
++  cmd_list[cmd_count+1] = NULL;
 +  cmd_count ++;
-+  cmd_list[cmd_count] = NULL;
 +}
 +
 +void cmd_undef (cmdopts_t *command)
 +{
 +  size_t num = 0;
 +    if (cmd_list[num] == command) {
 +      g_memmove (cmd_list+num, cmd_list+num+1, sizeof(cmdopts_t *) * (cmd_count-num));
 +      cmd_list = g_renew (cmdopts_t *, cmd_list, cmd_count);
 +      cmd_count --;
 +      return;
-}
++    }
--  return NULL;
 +    num ++;
 +  }
-}
++}
--#endif
--
--//  cmd_add()
--// Adds a command to the commands list and to the CMD completion list
--gpointer cmd_add(const char *name, const char *help, guint flags_row1,
--                 guint flags_row2, void (*f)(char*), gpointer userdata)
 +
 +//  error cmdopts_parse_argument ( startptr, endptr, flags )
 +// Parses next argument according to flags and finishes it with zero.
 +// Updates current/end pointers. Parsed string MUST be writable.
 +// String may shrink in size (quotation/escapes), thus endpointer is also
 +// updated.
 +const char *cmdopts_parse_argument(gchar **pr, gchar **er, cmdarg_flags_t flags)
-{
++{
--  cmd *n_cmd = g_slice_new0(cmd);
--  strncpy(n_cmd->name, name, 32-1);
--  n_cmd->help = help;
--  n_cmd->completion_flags[0] = flags_row1;
--  n_cmd->completion_flags[1] = flags_row2;
--  n_cmd->func = f;
--  n_cmd->userdata = userdata;
--  Commands = g_slist_prepend(Commands, n_cmd);
--  // Add to completion CMD category
--  compl_add_category_word(COMPL_CMD, name);
--  return n_cmd;
 +  gchar *p = *pr;
 +  gchar *e = *er;
 +  const char *error = NULL;
 +  gboolean   quotes = FALSE;
 +
 +  }
 +
 +  *pr = p;
 +  *er = e;
 +  return error;
-}
++}
++
--//  cmd_set_safe(name, safe)
++static cmdarg_value_t *cmdopts_allocate_values (cmdopts_t *command)
--// Sets if command can be used in startup configuration file.
++{
--gboolean cmd_set_safe(const gchar *name, gboolean safe)
++  cmdarg_value_t *values;
++  size_t         n = command -> valno;
++
++  if (n == 0)
++    return NULL;
++
++  values = g_slice_alloc (sizeof(cmdarg_value_t) * n);
++
++  while (n > 0) {
++    n --;
++    values[n].src       = NULL;
++    values[n].flags     = cmdval_default;
++    values[n].value.arg = NULL;
++  }
++
++  return values;
++}
++
 +//  error cmdopts_parse_internal ( startptr, endptr, commanddef )
 +// Parses command arguments according to command definition.
 +// Parsed string MUST be writable. Regardless of success or error, input
 +// string should be considered corrupted by parsing process.
 +// Even in case of error, commanddef should be passed to cmdopts_free().
-+static gchar *cmdopts_parse_internal(gchar **pr, gchar **er, cmdopts_t *command)
++static gchar *cmdopts_parse_internal(gchar **pr, gchar **er, cmdopts_t *command, cmdarg_value_t *values)
-{
++{
--  GSList *sel;
--  if (!name)
--    return FALSE;
--  for (sel = safe_commands; sel; sel = sel->next)
--    if (!strcmp((const char *)sel->data, name)) {
--      if (safe)
--        return FALSE;
--      else {
--        g_free(sel->data);
--        safe_commands = g_slist_delete_link(safe_commands, sel);
 +  enum {             // Parser state transitions:
 +    in_space,        // -> in_space, in_optstart, in_argstart
 +    in_optstart,     // -> in_shortoptend, in_longoptstart, in_argstart ("-")
 +    in_shortoptend,  // -> in_space, in_argstart, error
 +    in_longoptstart, // -> in_longopt, in_space, in_argstart ("---")
 +  gboolean opts_ended = FALSE; // don't allow options any more
 +  cmdopt_t *option   = NULL; // option, for which argument is currently parsed
 +  size_t   argno     = 0;    // number of current positional argument
 +  gchar    *error    = NULL; // error message to return
 +
-+  // general environment checking
-+  if (command -> check) {
-+    if ((error = command -> check (command))) {
-+      gchar *err = error;
-+      error = g_strdup_printf("%s: %s", command -> name, err);
-+      g_free (err);
-+    }
-+  }
-+
 +  // prepare: set default values for arguments and unset some fields
 +  if (error == NULL) {
 +    gsize n;
 +    if (command -> opts) {
 +      for (n = 0; command -> opts[n].shortopt != 0; n ++) {
-+        cmdopt_t *opt = command -> opts + n;
++        cmdopt_t       *opt = command -> opts + n;
-+        if (opt -> flags & cmdopt_switch) {
++        cmdarg_value_t *val = values + opt -> arg.pos;
-+          opt -> arg.value.swc = 0;
++        // do not overwrite already specified values
-+        } else {
++        if (val -> src == NULL || !(val -> flags & cmdval_visited)) {
-+          opt -> arg.value.roarg = opt -> arg.defval;
++          if (opt -> arg.flags & cmdarg_switch) {
++            val -> value.swc = 0;
++          } else {
++            val -> value.roarg = opt -> arg.defval; // XXX ro
++          }
++          val -> src = &(opt -> arg);
 +        }
-+        opt -> arg.flags &= ~(cmdarg_ppclear);
++      }
-}
++    }
-}
--  if (safe)
--    safe_commands = g_slist_append(safe_commands, g_strdup(name));
--  else
--    return FALSE;
--  return TRUE;
 +    if (command -> args) {
 +      for (n = 0; command -> args[n].name != NULL; n ++) {
-+        cmdarg_t *arg = command -> args + n;
++        cmdarg_t       *arg = command -> args + n;
-+        arg -> value.roarg = arg -> defval;
++        cmdarg_value_t *val = values + arg -> pos;
-+        arg -> flags  &= ~(cmdarg_ppclear);
++        // do not overwrite already specified values
++        if (val -> src == NULL || !(val -> flags & cmdval_visited)) {
++          val -> value.roarg = arg -> defval; // XXX ro
++          val -> src         = arg;
++        }
 +      }
++    }
++  }
++
++  // general environment checking
++  if (command -> check) {
++    if ((error = command -> check (command, values))) {
++      gchar *err = error;
++      error = g_strdup_printf("%s: %s", command -> name, err);
++      g_free (err);
 +    }
 +  }
 +
 +  // we allow parser to do one extra run on final '\0'
 +  while (p <= e && error == NULL) {
 +            option = command -> opts + n;
 +            break;
 +          }
 +        }
 +        if (option != NULL) { // option is known
-+          if (option -> flags & cmdopt_switch) { // it is switch
++          if (option -> arg.flags & cmdarg_switch) { // it is switch
-+            option -> arg.value.swc ++;
++            cmdarg_value_t *val = values + option -> arg.pos;
++            val -> value.swc ++;
++            val -> src    = &(option -> arg);
++            val -> flags |= cmdval_visited;
 +            option = NULL;
 +          } else if (p == e) {
 +            error = g_strdup_printf ("%s: Option -%c needs an argument.", command -> name, option -> shortopt);
 +          }
 +          state = in_space;
 +            option = command -> opts + n;
 +            break;
 +          }
 +        }
 +        if (option != NULL) { // option is known
-+          if (option -> flags & cmdopt_switch) { // it is switch
++          if (option -> arg.flags & cmdarg_switch) { // it is switch
-+            option -> arg.value.swc ++;
++            cmdarg_value_t *val = values + option -> arg.pos;
++            val -> value.swc ++;
++            val -> src    = &(option -> arg);
++            val -> flags |= cmdval_visited;
 +            option = NULL;
 +          } else if (p == e) {
 +            error = g_strdup_printf ("%s: Option --%s needs an argument.", command -> name, option -> longopt);
 +          }
 +          state = in_space;
 +        break;
 +      } else { // normal aurgument
 +        arg = command -> args + argno;
 +      }
 +
-+      if ((err = cmdopts_parse_argument(&p, &e, arg -> flags))) { // get argument value
++      if ((err = cmdopts_parse_argument (&p, &e, arg -> flags))) { // get argument value
 +        if (!option) {
 +          error = g_strdup_printf ("%s: Can't parse argument %s (%lu): %s", command -> name, arg -> name, argno + 1, err);
-+        } else if (option -> shortopt) {
++        } else if (option -> longopt) {
++          error = g_strdup_printf ("%s: Can't parse argument for option --%s: %s", command -> name, option -> longopt, err);
++        } else {
 +          error = g_strdup_printf ("%s: Can't parse argument for option -%c: %s", command -> name, option -> shortopt, err);
-+        } else {
-+          error = g_strdup_printf ("%s: Can't parse argument for option --%s: %s", command -> name, option -> longopt, err);
 +        }
 +      } else {
-+        arg -> value.arg = s;
++        cmdarg_value_t *val = values + arg -> pos;
-+        arg -> flags |= cmdarg_visited;
++        val -> value.arg = s;
++        val -> src       = arg;
++        val -> flags    |= cmdval_visited;
 +        if (option) { // option argument
 +          option = NULL;
 +        } else { // normal argument
 +          if (arg -> flags & cmdarg_subcmd) { // subcommand
 +            cmdopts_t *subcmd;
-+            gsize     n; // XXX put command list into chkdata
++            for (subcmd = command -> cmds; subcmd -> name != NULL; subcmd ++)
-+            for (n = 0; command -> cmds[n].name != NULL; n ++) {
++              if (!strcmp (s, subcmd -> name))
-+              if (!strcmp (s, command -> cmds[n].name)) {
-+                subcmd = command -> cmds + n;
 +                break;
-+              }
++            if (subcmd -> name != NULL) { // found subcommand
-+            }
++              val -> value.cmd = subcmd;
-+            if (subcmd != NULL) { // found subcommand
++              if ((error = cmdopts_parse_internal (&p, &e, subcmd, values))) {
-+              arg -> value.cmd = subcmd;
-+              if ((error = cmdopts_parse_internal (&p, &e, subcmd))) {
 +                gchar *err = error;
 +                error = g_strdup_printf("%s %s", command -> name, err);
 +                g_free (err);
 +              }
 +            } else { // wrong subcommand
 +  }
 +
 +  *pr = p;
 +  *er = e;
 +
-+  // perform option argument checking
++  return error;
-+  if (error == NULL && command -> opts) {
++}
-+    gsize n;
++
-+    for (n = 0; command -> opts[n].shortopt != 0; n ++) {
++// value types:      type               check                 required
-+      cmdopt_t *opt = command -> opts + n;
++// - switch          no effect          toboolean()           no effect?
-+      if (!(opt -> flags & cmdopt_switch)) { // not a switch
++// - option          check              call checker          fatal check error
-+        // needs checking and not checked already
++// - argument        check              call checker          fatal check error
-+        if ((opt -> arg.flags & (cmdarg_check | cmdarg_visited)) && !(opt -> arg.flags & cmdarg_checked)) {
++// - subcommand      no effect          check for required    fail if missing
-+          if (opt -> arg.type && opt -> arg.type -> check) { // checker is present
++static gchar *cmdopts_check_values (cmdopts_t *command, cmdarg_value_t *values)
-+            gchar *err;
++{
-+            opt -> arg.flags |= cmdarg_checked;
++  size_t n = command -> valno;
-+            if ((err = opt -> arg.type -> check (&(opt -> arg)))) {
++
-+              if (opt -> arg.flags & cmdarg_required) {
++  if (n == 0)
-+                if (opt -> longopt) {
++    return NULL;
-+                  error = g_strdup_printf ("%s: Error in argument for option --%s: %s", command -> name, opt -> longopt, err);
++
-+                } else {
++  // XXX reverse order?
-+                  error = g_strdup_printf ("%s: Error in argument for option -%c: %s", command -> name, opt -> shortopt, err);
++  while (n > 0) {
-+                }
++    cmdarg_value_t *val = values + n - 1;
-+                g_free (err);
++    n --;
-+                break;
++    if ((val -> flags & cmdval_visited) || ((val -> src != NULL) && (val -> src -> flags & cmdarg_check))) {
-+              } else {
++      if (val -> src -> flags & cmdarg_subcmd) { // subcommand - fail if required and missing
-+                if (opt -> longopt) {
++        if ((val -> src -> flags & cmdarg_required) && (val -> value.cmd == NULL))
-+                  scr_log_print (LPRINT_NORMAL, "Warning: %s: Error in argument for option --%s: %s", command -> name, opt -> longopt, err);
++          return g_strdup_printf ("%s: Not specified %s.", command -> name, val -> src -> name);
-+                } else {
++      } else if (val -> src -> flags & cmdarg_switch) { // switch - toboolean if check
-+                  scr_log_print (LPRINT_NORMAL, "Warning: %s: Error in argument for option -%c: %s", command -> name, opt -> shortopt, err);
++        if (val -> src -> flags & cmdarg_check)
-+                }
++          val -> value.swc %= 2;
-+                g_free (err);
++      } else if (val -> src -> type && val -> src -> type -> check) { // typed argument
-+              }
++        gchar *err;
-+            }
++        if ((err = val -> src -> type -> check (val))) {
++          // FIXME option name
++          if (val -> src -> flags & cmdarg_required) {
++            gchar *error = g_strdup_printf ("Error in argument value \"%s\": %s", val -> src -> name, err);
++            g_free (err);
++            return error;
++          } else {
++            scr_log_print (LPRINT_NORMAL, "Warning: %s: Error in argument value \"%s\": %s", command -> name, val -> src -> name, err);
++            g_free (err);
 +          }
 +        }
 +      }
 +    }
 +  }
 +
-+  // perform positional argument checking
+return NULL;
-+  if (error == NULL && command -> args) {
+}
-+    size_t n;
+-#endif
-+    for (n = 0; command -> args[n].name != NULL; n ++) {
+-
-+      cmdarg_t *arg = command -> args + n;
+-//  cmd_add()
-+      // needs checking and not checked already
+-// Adds a command to the commands list and to the CMD completion list
-+      if ((arg -> flags & (cmdarg_check | cmdarg_visited)) && !(arg -> flags & cmdarg_checked)) {
+-gpointer cmd_add(const char *name, const char *help, guint flags_row1,
-+        if (arg -> flags & cmdarg_subcmd) { // subcommand
+-                 guint flags_row2, void (*f)(char*), gpointer userdata)
-+          if (!arg -> value.cmd) {
++
-+            if (arg -> flags & cmdarg_required) {
++//  cmdopts_free ( commanddef )
-+              error = g_strdup_printf ("%s: No %s specified.", command -> name, arg -> name);
++// Free various parser data, used in parsing process
-+              break;
++static void cmdopts_free_values (cmdopts_t *command, cmdarg_value_t *values)
-+            } else { // XXX more prefixes
+{
-+              scr_log_print (LPRINT_NORMAL, "Warning: %s: No %s specified.", command -> name, arg -> name);
+-  cmd *n_cmd = g_slice_new0(cmd);
-+            }
+-  strncpy(n_cmd->name, name, 32-1);
-+          }
+-  n_cmd->help = help;
-+        } else { // normal argument
+-  n_cmd->completion_flags[0] = flags_row1;
-+          if (arg -> type && arg -> type -> check) {
+-  n_cmd->completion_flags[1] = flags_row2;
-+            gchar *err;
+-  n_cmd->func = f;
-+            arg -> flags |= cmdarg_checked;
+-  n_cmd->userdata = userdata;
-+            if ((err = arg -> type -> check (arg))) {
+-  Commands = g_slist_prepend(Commands, n_cmd);
-+              if (arg -> flags & cmdarg_required) {
+-  // Add to completion CMD category
-+                error = g_strdup_printf ("%s: Error in argument %s (%lu): %s", command -> name, arg -> name, n, err);
+-  compl_add_category_word(COMPL_CMD, name);
-+                g_free (err);
+-  return n_cmd;
-+                break;
++  size_t n = command -> valno;
-+              } else { // XXX more prefixes
++
-+                scr_log_print (LPRINT_NORMAL, "Warning: %s: Error in argument %s (%lu): %s", command -> name, arg -> name, n, err);
++  if (n == 0)
-+                g_free (err);
++    return;
-+              }
++
-+            }
++  while (n > 0) {
-+          }
++    cmdarg_value_t *val = values + n - 1;
-+        }
++    n --;
-+      }
++    if ((val -> flags & cmdval_freeme) &&
++        val -> src && val -> src -> type &&
++        val -> src -> type -> free) {
++      val -> src -> type -> free (val);
 +    }
 +  }
 +
-+  return error;
++  g_slice_free1 (sizeof(cmdarg_value_t) * n, values);
+}
+-//  cmd_set_safe(name, safe)
+-// Sets if command can be used in startup configuration file.
+-gboolean cmd_set_safe(const gchar *name, gboolean safe)
++cmd_result_t cmd_execute (gchar *commandline, cmdexe_flags_t flags)
+{
+-  GSList *sel;
+-  if (!name)
+-    return FALSE;
+-  for (sel = safe_commands; sel; sel = sel->next)
+-    if (!strcmp((const char *)sel->data, name)) {
+-      if (safe)
+-        return FALSE;
+-      else {
+-        g_free(sel->data);
+-        safe_commands = g_slist_delete_link(safe_commands, sel);
+-      }
++  gchar *s = commandline;
++  gchar *p, *e;
++  gchar *freeme = NULL;
++  const char *err;
++  gchar      *error;
++  cmdopts_t  *command = NULL;
++  const char *alias   = NULL;
++  cmdarg_value_t *values;
++  size_t n;
++
++  // skip command indicator and spaces at the beginning
++  while (*s == COMMAND_CHAR || *s == ' ')
++    s ++;
++  p = s;
++  e = s + strlen (s);
++
++  // separate first word - command name
++  if ((err = cmdopts_parse_argument (&p, &e, cmdarg_default))) {
++    scr_log_print (LPRINT_NORMAL, "error: Can't comprehend command name: %s.", err);
++    return cmd_result_syntax_error;
++  }
++
++  // check for quit command
++  if (!strcmp (s, "quit")) {
++    return cmd_result_quit;
++  }
++
++  // check if we're in verbatim mode
++  if ((flags & cmdexe_check_verbatim) && scr_get_multimode () == 2) {
++    if (strcmp (s, "msay")) { // it is not msay
++      return cmd_result_verbatim;
+}
+-  if (safe)
+-    safe_commands = g_slist_append(safe_commands, g_strdup(name));
+-  else
+-    return FALSE;
+-  return TRUE;
++  }
++
++  // check and expand alias
++  if ((alias = settings_get (SETTINGS_TYPE_ALIAS, s))) {
++    freeme = s = g_strdup_printf ("%s %s", alias, p);
++    p = s;
++    e = s + strlen (s);
++
++    if ((err = cmdopts_parse_argument (&p, &e, cmdarg_default))) {
++      scr_log_print (LPRINT_NORMAL, "error: Can't comprehend command name: %s.", err);
++      g_free (freeme);
++      return cmd_result_syntax_error;
++    }
++
++    // check for quit command again
++    if (!strcmp (s, "quit")) {
++      g_free (freeme);
++      return cmd_result_quit;
++    }
++  }
++
++  // find command with this name (reverse - see cmd_define())
++  for (n = cmd_count; n > 0; n --) {
++    if (!strcmp (s, cmd_list[n-1] -> name)) {
++      command = cmd_list[n-1];
++      break;
++    }
++  }
++  if (command == NULL) {
++    scr_log_print (LPRINT_NORMAL, "error: Unable to find command \"%s\".", s);
++    g_free (freeme);
++    return cmd_result_not_found;
++  }
++
++  // check safety
++  if ((flags & cmdexe_check_safe) && !(command -> flags & cmd_safe)) {
++    scr_log_print (LPRINT_NORMAL, "error: Command \"%s\" is not safe to execute here.", command -> name);
++    g_free (freeme);
++    return cmd_result_not_found;
++  }
++
++  // allocate dynamic storage for arguments
++  values = cmdopts_allocate_values (command);
++
++  // parse command line
++  if ((error = cmdopts_parse_internal (&p, &e, command, values))) {
++    scr_log_print (LPRINT_NORMAL, "%s", error);
++    g_free (error);
++    cmdopts_free_values (command, values);
++    g_free (freeme);
++    return cmd_result_syntax_error;
++  }
++
++  // do type checking on arguments
++  if ((error = cmdopts_check_values (command, values))) {
++    scr_log_print (LPRINT_NORMAL, "%s: %s", command -> name, error);
++    g_free (error);
++    cmdopts_free_values (command, values);
++    g_free (freeme);
++    return cmd_result_value_error;
++  }
++
++  // execute command handler
++  if (command -> handle) {
++    if ((error = command -> handle (command, values))) {
++      scr_log_print (LPRINT_NORMAL, "%s: %s", command -> name, error);
++      g_free (error);
++      cmdopts_free_values (command, values);
++      g_free (freeme);
++      return cmd_result_runtime_error;
++    }
++  }
++
++  // free resources
++  cmdopts_free_values (command, values);
++  g_free (freeme);
++  return cmd_result_ok;
 }
 -//  cmd_is_safe(name)
 -// Returns if command is safe or not
 -gboolean cmd_is_safe(const gchar *name)
-+//  cmdopts_free ( commanddef )
++//  process_line(line)
-+// Free various parser data, used in parsing process
++// Process a command/message line. If this isn't a command, this is a message
-+static void cmdopts_free(cmdopts_t *command)
++// and it is sent to the currently selected buddy.
++// Returns 255 if the line is the /quit command, 0 on success and some other
++// error codes.
++cmd_result_t process_line(const char *line)
 {
 -  GSList *sel;
 -  if (!name)
 -    return FALSE;
 -  for (sel = safe_commands; sel; sel = sel->next)
 -    if (!strcmp((const char *)sel->data, name))
 -      return TRUE;
 -  return FALSE;
-+  gsize n;
+-}
-+  if (command -> opts) {
+-
-+    for (n = 0; command -> opts[n].shortopt != 0; n ++) {
-+      cmdopt_t *opt = command -> opts + n;
-+      if (!(opt -> flags & cmdopt_switch)) { // not switch
-+        if (opt -> arg.flags & cmdarg_freeme) { // can free something
-+          opt -> arg.flags &= ~cmdarg_freeme;
-+          if (opt -> arg.type && opt -> arg.type -> free) { // need to free something
-+            opt -> arg.type -> free (&(opt -> arg));
-+          }
-+        }
-+      }
-+    }
-+  }
-+  if (command -> args) {
-+    for (n = 0; command -> args[n].name != NULL; n ++) {
-+      cmdarg_t *arg = command -> args + n;
-+      if (arg -> flags & cmdarg_subcmd) { // subcommand
-+        if (arg -> value.cmd) {
-+          cmdopts_free (arg -> value.cmd);
-+          arg -> value.cmd = NULL;
-+        }
-+      } else { // normal argument
-+        if (arg -> flags & cmdarg_freeme) { // can free something
-+          arg -> flags &= ~cmdarg_freeme;
-+          if (arg -> type && arg -> type -> free) { // need to free something
-+            arg -> type -> free (arg);
-+          }
-+        }
-+      }
-+    }
-+  }
-}
 -//  cmd_init()
 -// Commands table initialization
 -// !!!
 -// After changing commands names and it arguments names here, you must change
 -// ones in init_bindings()!
 -//
 -void cmd_init(void)
-+cmd_result_t cmd_execute (gchar *commandline, cmdexe_flags_t flags)
+-{
-{
 -  cmd_add("add", "Add a jabber user", COMPL_JID, 0, &do_add, NULL);
 -  cmd_add("alias", "Add an alias", 0, 0, &do_alias, NULL);
 -  cmd_add("authorization", "Manage subscription authorizations",
 -          COMPL_AUTH, COMPL_JID, &do_authorization, NULL);
 -  cmd_add("bind", "Add an key binding", 0, 0, &do_bind, NULL);
 -  compl_add_category_word(COMPL_MODULE, "info");
 -  compl_add_category_word(COMPL_MODULE, "list");
 -  compl_add_category_word(COMPL_MODULE, "load");
 -  compl_add_category_word(COMPL_MODULE, "unload");
 -#endif
-+  gchar *s = commandline;
+-}
-+  gchar *p, *e;
+-
-+  gchar *freeme = NULL;
-+  const char *err;
-+  gchar      *error;
-+  cmdopts_t  *command = NULL;
-+  const char *alias   = NULL;
-+  size_t n;
-+
-+  // skip command indicator and spaces at the beginning
-+  while (*s == COMMAND_CHAR || *s == ' ')
-+    s ++;
-+  p = s;
-+  e = s + strlen (s);
-+
-+  // separate first word - command name
-+  if ((err = cmdopts_parse_argument (&p, &e, cmdarg_default))) {
-+    scr_log_print (LPRINT_NORMAL, "error: Can't comprehend command name: %s.", err);
-+    return cmd_result_syntax_error;
-+  }
-+
-+  // check for quit command
-+  if (!strcmp (s, "quit")) {
-+    return cmd_result_quit;
-+  }
-+
-+  // check if we're in verbatim mode
-+  if ((flags & cmdexe_check_verbatim) && scr_get_multimode () == 2) {
-+    if (strcmp (s, "msay")) { // it is not msay
-+      return cmd_result_verbatim;
-+    }
-+  }
-+
-+  // check and expand alias
-+  if ((alias = settings_get (SETTINGS_TYPE_ALIAS, s))) {
-+    freeme = s = g_strdup_printf ("%s %s", alias, p);
-+    p = s;
-+    e = s + strlen (s);
-+
-+    if ((err = cmdopts_parse_argument (&p, &e, cmdarg_default))) {
-+      scr_log_print (LPRINT_NORMAL, "error: Can't comprehend command name: %s.", err);
-+      g_free (freeme);
-+      return cmd_result_syntax_error;
-+    }
-+
-+    // check for quit command again
-+    if (!strcmp (s, "quit")) {
-+      g_free (freeme);
-+      return cmd_result_quit;
-+    }
-+  }
-+
-+  // find command with this name (reverse - see cmd_define())
-+  for (n = cmd_count - 1; n >= 0; n --) {
-+    if (!strcmp (s, cmd_list[n] -> name)) {
-+      command = cmd_list[n];
-+      break;
-+    }
-+  }
-+  if (command == NULL) {
-+    scr_log_print (LPRINT_NORMAL, "error: Unable to find command \"%s\".", s);
-+    g_free (freeme);
-+    return cmd_result_not_found;
-+  }
-+
-+  // check safety
-+  if ((flags & cmdexe_check_safe) && !(command -> flags & cmd_safe)) {
-+    scr_log_print (LPRINT_NORMAL, "error: Command \"%s\" is not safe to execute here.", command -> name);
-+    g_free (freeme);
-+    return cmd_result_not_found;
-+  }
-+
-+  // parse command line
-+  if ((error = cmdopts_parse_internal (&p, &e, command))) {
-+    scr_log_print (LPRINT_NORMAL, "%s", error);
-+    g_free (error);
-+    cmdopts_free (command);
-+    g_free (freeme);
-+    return cmd_result_syntax_error;
-+  }
-+
-+  // execute command handler
-+  if (command -> handle) {
-+    if ((error = command -> handle (command))) {
-+      scr_log_print (LPRINT_NORMAL, "%s: %s", command -> name, error);
-+      g_free (error);
-+      cmdopts_free (command);
-+      g_free (freeme);
-+      return cmd_result_runtime_error;
-+    }
-+  }
-+
-+  // free resources
-+  cmdopts_free (command);
-+  g_free (freeme);
-+  return cmd_result_ok;
-}
 -//  expandalias(line)
 -// If there is one, expand the alias in line and returns a new allocated line
 -// If no alias is found, returns line
 -// Note: if the returned pointer is different from line, the caller should
 -//       g_free() the pointer after use
 -char *expandalias(const char *line)
-+//  process_line(line)
+-{
-+// Process a command/message line. If this isn't a command, this is a message
-+// and it is sent to the currently selected buddy.
-+// Returns 255 if the line is the /quit command, 0 on success and some other
-+// error codes.
-+cmd_result_t process_line(const char *line)
-{
 -  const char *p1, *p2;
 -  char *word;
 -  const gchar *value;
 -  char *newline = (char*)line;
 -
 +  int retval;
 +
 if (!*line) { // User only pressed enter
 if (scr_get_multimode()) {
 scr_append_multiline("");
-@@ -556,141 +675,584 @@
+@@ -556,141 +715,585 @@
 }
 if (current_buddy) {
 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_GROUP)
 -        do_group("toggle");
 +        group_cmd (BUDDATA(current_buddy), scmd_group_toggle);
 +// * 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_roster_group    - in roster, on '.' select group of current buddy -> bud
 +// + cmdarg_type_bjid         - any bjid -> bjid
 +// + cmdarg_type_fjid         - any fjid -> fjid
-+// + cmdarg_type_statusmask   - string -> string
++// + cmdarg_type_charset      - string -> string
 +// + cmdarg_type_uint         - string -> uint
 +// + cmdarg_type_nonspace     - strip, space only -> null
 +// * cmdarg_type_bjidmask
 +// + cmdarg_type_color
 +// + cmdarg_type_string2enum
 +
 +//
 +//  generic destructors
 +//
 +
-+void cmdarg_free_gfree (cmdarg_t *arg)
++void cmdarg_free_gfree (cmdarg_value_t *arg)
 +{
 +  g_free (arg -> value.arg);
 +}
 +
 +//
 +//  command environment checkers
 +//
 +
-+gchar *cmd_check_online (cmdopts_t *command)
++gchar *cmd_check_online (cmdopts_t *command, cmdarg_value_t *values)
 +{
 +  if (!xmpp_is_online())
 +    return g_strdup ("You are not connected!");
 +  return NULL;
 +}
 +
 +// 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.
-+gchar *cmdarg_check_nonspace (cmdarg_t *arg)
++gchar *cmdarg_check_nonspace (cmdarg_value_t *arg)
 +{
 +  gchar *val = arg -> value.arg;
 +
 +  if (val) {
 +    while (isspace (*val))
 +//
 +//  bjid -> bud
 +//
 +
 +// Uses chkdata as guint with allowed ROSTER_TYPE_*.
-+// Returns buddy roster entry in value.bud.
++// Returns buddy roster entry in value.rjid.bud.
 +// Recognizes as current ".", but not "" or NULL - use defvalue.
 +// Does not require freeing.
-+gchar *cmdarg_check_roster_bjid (cmdarg_t *arg)
++gchar *cmdarg_check_roster_bjid (cmdarg_value_t *arg)
 +{
 +  gchar *error = NULL;
 +
 +  if (!(error = cmdarg_check_nonspace(arg))) {
 +    const char *bjid = arg -> value.arg;
-+    guint      types = (guint) arg -> chkdata;
++    guint      types = (guint) arg -> src -> 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);
++        arg -> value.rjid.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;
++        arg -> value.rjid.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);
 +    }
 +  }
 +
++  arg -> value.rjid.resource = NULL;
 +  if (error)
-+    arg -> value.bud = NULL;
++    arg -> value.rjid.bud = NULL;
 +  return error;
 +}
 +
 +const cmdarg_type_t cmdarg_type_roster_bjid = {
 +  cmdarg_check_roster_bjid,
 +// 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
 +//  * merge with roster_bjid and use own flags in chkdata to signify types and resource allowed/required conditions
-+gchar *cmdarg_check_roster_resource (cmdarg_t *arg)
++gchar *cmdarg_check_roster_resource (cmdarg_value_t *arg)
 +{
 +  gchar    *error    = NULL;
 +  gpointer bud       = NULL;
 +  char     *resource = NULL;
 +
 +  if (!(error = cmdarg_check_nonspace(arg))) {
 +    char  *fjid = arg -> value.arg;
-+    guint types = (guint) arg -> chkdata;
++    guint types = (guint) arg -> src -> 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))) {
 +        if (!current_buddy)
 +          error = g_strdup ("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.");
++          error = g_strdup("Currently selected buddy is of wrong type.");
 +      }
 +      if (bud) {
 +        GSList *resources, *p_res;
 +        gboolean found = FALSE;
 +        resources = buddy_getresources (bud);
 +      }
 }
 +  }
 +
 +  if (error) {
-+    arg -> userdata  = NULL;
++    arg -> value.rjid.bud      = NULL;
-+    arg -> value.arg = NULL;
++    arg -> value.rjid.resource = NULL;
 } 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);
-+    arg -> userdata  = bud;
++    arg -> value.rjid.bud      = bud;
-+    arg -> value.arg = resource;
++    arg -> value.rjid.resource = resource;
 +  }
 +  return error;
 +}
 +
 +const cmdarg_type_t cmdarg_type_roster_resource = {
 +// Returns buddy roster entry in value.bud.
 +// Recognizes as current ".".
 +// Does not require freeing.
 +// XXX:
 +//  * group, named "."?
-+gchar *cmdarg_check_roster_group (cmdarg_t *arg)
++//  * group, named " "? is it even possible?
++//  * check only that it is not NULL, and use "" as current?
++gchar *cmdarg_check_roster_group (cmdarg_value_t *arg)
 +{
 +  gchar    *error;
 +  gpointer group  = NULL;
 +
 +  if (!(error = cmdarg_check_nonspace(arg))) {
 -      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);
-+  arg -> value.bud = group;
++  arg -> value.rjid.bud = group;
 +  return error;
 +}
 +
 +const cmdarg_type_t cmdarg_type_roster_group = {
 +  cmdarg_check_roster_group,
 +// Returns corrected fjid in value.arg.
 +// Recognizes as current "." and "./res".
 +// Requires freeing.
 +// XXX:
 +//  * g_strdup jid?
-+gchar *cmdarg_check_fjid (cmdarg_t *arg)
++gchar *cmdarg_check_fjid (cmdarg_value_t *arg)
 +{
 +  gchar *error = NULL;
 +
 +  if (!(error = cmdarg_check_nonspace(arg))) {
 +    const char *fjid = arg -> value.arg;
 +
 +    if (fjid[0] == '.' && (fjid[1] == JID_RESOURCE_SEPARATOR || fjid[1] == '\0')) {
 +      const char *jid;
-+      if (!current_buddy)
++      if (!current_buddy) {
 +        error = g_strdup_printf ("No buddy selected.");
-+      else if (!(jid = buddy_getjid(BUDDATA(current_buddy)))) {
++      } else if (!(jid = buddy_getjid(BUDDATA(current_buddy)))) {
 +        error = g_strdup_printf ("Current buddy have no jid.");
 +      } else if (fjid[1] == '\0') {
 +        arg -> value.roarg = jid;
 +      } else {
 +        arg -> value.arg = g_strdup_printf ("%s%c%s", jid, JID_RESOURCE_SEPARATOR, fjid + 2);
-+        arg -> flags    |= cmdarg_freeme;
++        arg -> flags    |= cmdval_freeme;
 }
 -      g_slist_free(resources);
 -      if (!found) {
 -        scr_LogPrint(LPRINT_NORMAL, "No such resource <%s>...", jidres);
 -        return;
 +
 +// Returns corrected bjid in value.arg.
 +// Recognizes as current "." and "./res" (but still removes resource).
 +// Needs RW access to trim the resource - no resources in default values!
 +// Requires freeing (as fjid).
-+gchar *cmdarg_check_bjid (cmdarg_t *arg)
++gchar *cmdarg_check_bjid (cmdarg_value_t *arg)
 +{
 +  gchar *error = NULL;
 +
 +  if (!(error = cmdarg_check_fjid(arg))) {
 +    gchar *res = strchr (arg -> value.arg, JID_RESOURCE_SEPARATOR);
 +// 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
-+gchar *cmdarg_check_uint (cmdarg_t *arg)
++gchar *cmdarg_check_uint (cmdarg_value_t *arg)
 +{
 +  gchar *error;
 +
 +  if (!(error = cmdarg_check_nonspace(arg))) {
 +    char *s = arg -> value.arg;
 +  NULL,
 +  NULL,
 +};
 +
 +//
-+//  string -> statusmask
++//  string -> set of valid chars
 +//
 +
-+// Strips/checks for any non-valid status chars in mask.
++// Strips/checks for any non-valid chars in argument.
-+// Returns mask in value.arg.
++// Gets set of valid chars from chkdata.
++// Returns filtered string 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?
++//  * g_strdup (valid)?
-+//    * Then argument name should go into cmdarg struct - message would be too generic
++gchar *cmdarg_check_charset (cmdarg_value_t *arg)
-+gchar *cmdarg_check_statusmask (cmdarg_t *arg)
 +{
 +  gchar *error;
 +
 +  if (!(error = cmdarg_check_nonspace(arg)) && arg -> value.arg) {
-+    const char *valid = "foand_?";
++    const char *valid = arg -> src -> chkdata;
 +    if (!strcmp(arg -> value.arg, "*")) {
-+      arg -> value.arg = g_strdup (valid);
++      arg -> value.roarg = valid;
-+      arg -> flags    |= cmdarg_freeme;
 +    } else {
 +      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);
++          return g_strdup_printf ("Character '%c' not in set [%s].", *p, valid);
 +        } else {
-+          scr_log_print (LPRINT_NORMAL, "Warning: Wrong %s character [%c]", arg -> name, *p);
++          scr_log_print (LPRINT_NORMAL, "Warning: Wrong %s character [%c]", arg -> src -> name, *p);
 +          g_memmove (p, p+1, e-p-1);
 +          e --;
 +        }
 }
 -    } else {
 +  }
 +
 +  return error;
 +}
 +
-+const cmdarg_type_t cmdarg_type_statusmask = {
++const cmdarg_type_t cmdarg_type_charset = {
-+  cmdarg_check_statusmask,
++  cmdarg_check_charset,
-+  cmdarg_free_gfree,
++  NULL,
 +  NULL,
 +};
 +
 +//
 +//  string -> enum
 +// 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:
++//  * default value on error?
 +//  * also, print list of possible values on error?
-+//  * default value on error?
++gchar *cmdarg_check_string2enum (cmdarg_value_t *arg)
-+gchar *cmdarg_check_string2enum (cmdarg_t *arg)
 +{
 +  gchar *error;
 +
 +  if (!(error = cmdarg_check_nonspace(arg))) {
 +    const string2enum_t *list;
-+    for (list = arg -> chkdata; list -> name != NULL; list ++)
++    for (list = arg -> src -> chkdata; list -> name != NULL; list ++)
 +      if (!strcmp(list -> name, arg -> value.arg)) { // found
 +        arg -> value.uint = list -> value;
 +        return NULL;
 +      }
 +    // not found, error
-+    error = g_strdup_printf ("Value \"%s\" is invalid for %s.", arg -> value.arg, arg -> name);
++    error = g_strdup_printf ("Value \"%s\" is invalid.", arg -> value.arg);
 +  }
 +
 +  if (error)
 +    arg -> value.uint = 0;
 +  return error;
 +//  * 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 *cmdarg_check_color (cmdarg_value_t *arg)
 +{
 +  gchar *error;
 +
 +  if (!(error = cmdarg_check_nonspace(arg))) {
 +    char *color = arg -> value.arg;
 -// 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 +1317,15 @@
+@@ -755,41 +1358,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,484 +1336,568 @@
+@@ -800,484 +1377,618 @@
 }
 }
 -//  roster_updown(updown, nitems)
 -// updown: -1=up, +1=down
 -inline static void roster_updown(int updown, char *nitems)
-+static gchar *do_roster (cmdopts_t *command);
++static gchar *do_roster (cmdopts_t *command, cmdarg_value_t *values);
 +
 +typedef enum {
 +  scmd_roster_bottom, scmd_roster_top, scmd_roster_up, scmd_roster_down,
 +  scmd_roster_group_prev, scmd_roster_group_next,
 +  scmd_roster_alternate,
 +  scmd_roster_note, scmd_roster_notes,
 +  scmd_roster_resource_lock, scmd_roster_resource_unlock,
 +  scmd_roster_hide, scmd_roster_show, scmd_roster_toggle,
 +} scmd_roster_t;
 +
++typedef enum {
++  pos_roster_scmd         = 0,
++  pos_roster_up_n         = 1,
++  pos_roster_down_n       = 1,
++  pos_roster_search_name  = 1,
++  pos_roster_display_mask = 1,
++  pos_roster_itemlock_jid = 1,
++  pos_roster_note_jid     = 1,
++  pos_roster_note_rst     = 2,
++  pos_roster_note_text    = 3,
++  pos_roster_reslock_jid  = 1,
++} pos_roster_t;
++
 +#define SCMD_ROSTER(NAME, ARGS...) \
 +    { #NAME, cmd_default, NULL, NULL, NULL, ARGS, NULL, (gpointer)scmd_roster_##NAME }
 +static cmdopts_t def_roster = {
 +  "roster",
 +  cmd_default,
 +  NULL,
 +  do_roster,
 +  NULL,
-+  (cmdarg_t[2]){{"subcommand", cmdarg_subcmd | cmdarg_check, NULL, NULL},{NULL}},
++  (cmdarg_t[2]){{"subcommand", pos_roster_scmd, cmdarg_subcmd | cmdarg_check, NULL, NULL},{NULL}},
 +  (cmdopts_t[25]){
 +    SCMD_ROSTER(bottom, NULL),
 +    SCMD_ROSTER(top,    NULL),
-+    SCMD_ROSTER(up,   (cmdarg_t[2]){{"n", cmdarg_chreq, "1", &cmdarg_type_uint},{NULL}}),
++    SCMD_ROSTER(up,   (cmdarg_t[2]){{"n", pos_roster_up_n, cmdarg_chreq, "1", &cmdarg_type_uint},{NULL}}),
-+    SCMD_ROSTER(down, (cmdarg_t[2]){{"n", cmdarg_chreq, "1", &cmdarg_type_uint},{NULL}}),
++    SCMD_ROSTER(down, (cmdarg_t[2]){{"n", pos_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_t[2]){{"name", cmdarg_eol|cmdarg_required, NULL, &cmdarg_type_nonspace},{NULL}}),
++    SCMD_ROSTER(search, (cmdarg_t[2]){{"name", pos_roster_search_name, cmdarg_eol|cmdarg_required, NULL, &cmdarg_type_nonspace},{NULL}}),
-+    SCMD_ROSTER(display, (cmdarg_t[2]){{"statusmask", cmdarg_check, NULL, &cmdarg_type_statusmask},{NULL}}),
++    SCMD_ROSTER(display, (cmdarg_t[2]){{"statusmask", pos_roster_display_mask, cmdarg_check, NULL, &cmdarg_type_charset, (gpointer)"ofdna_?"},{NULL}}),
 +    SCMD_ROSTER(hide_offline,   NULL),
 +    SCMD_ROSTER(show_offline,   NULL),
 +    SCMD_ROSTER(toggle_offline, NULL),
-+    SCMD_ROSTER(item_lock,        (cmdarg_t[2]){{"jid", cmdarg_chreq, ".", &cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM)},{NULL}}),
++    SCMD_ROSTER(item_lock,        (cmdarg_t[2]){{"jid", pos_roster_itemlock_jid, cmdarg_chreq, ".", &cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM)},{NULL}}),
-+    SCMD_ROSTER(item_unlock,      (cmdarg_t[2]){{"jid", cmdarg_chreq, ".", &cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM)},{NULL}}),
++    SCMD_ROSTER(item_unlock,      (cmdarg_t[2]){{"jid", pos_roster_itemlock_jid, cmdarg_chreq, ".", &cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM)},{NULL}}),
-+    SCMD_ROSTER(item_toggle_lock, (cmdarg_t[2]){{"jid", cmdarg_chreq, ".", &cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM)},{NULL}}),
++    SCMD_ROSTER(item_toggle_lock, (cmdarg_t[2]){{"jid", pos_roster_itemlock_jid, cmdarg_chreq, ".", &cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM)},{NULL}}),
 +    { "note", cmd_default, NULL, NULL,
 +      (cmdopt_t[3]){
-+        {'r', "reset", cmdopt_switch, {"reset", cmdarg_default, NULL, NULL, NULL}},
++        {'r', "reset", {"reset", pos_roster_note_rst, cmdarg_switch, NULL, NULL, NULL}},
-+        {'j', "jid",  cmdopt_default, {"jid", cmdarg_chreq, ".", &cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM|ROSTER_TYPE_AGENT)}},
++        {'j', "jid",   {"jid",   pos_roster_note_jid, cmdarg_chreq, ".", &cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_ROOM|ROSTER_TYPE_AGENT)}},
 +        {0}
 +      },
 +      (cmdarg_t[2]){
-+        {"text", cmdarg_eol, NULL, &cmdarg_type_nonspace},
++        {"text", pos_roster_note_text, cmdarg_eol, NULL, &cmdarg_type_nonspace},
 +        {NULL}
 +      },
 +      NULL, (gpointer)scmd_roster_note
 +    },
 +    SCMD_ROSTER(notes, NULL),
-+    SCMD_ROSTER(resource_lock,   (cmdarg_t[2]){{"resource|fjid", cmdarg_chreq, NULL, &cmdarg_type_roster_resource, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_AGENT)},{NULL}}),
++    SCMD_ROSTER(resource_lock,   (cmdarg_t[2]){{"resource|fjid", pos_roster_reslock_jid, cmdarg_chreq, NULL, &cmdarg_type_roster_resource, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_AGENT)},{NULL}}),
-+    SCMD_ROSTER(resource_unlock, (cmdarg_t[2]){{"jid", cmdarg_chreq, ".", &cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_AGENT)},{NULL}}),
++    SCMD_ROSTER(resource_unlock, (cmdarg_t[2]){{"jid", pos_roster_reslock_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}
 +  },
 +};
 +
-+static gchar *do_roster(cmdopts_t *options)
++static gchar *do_roster(cmdopts_t *options, cmdarg_value_t *values)
 {
 -  int nbitems;
 -
 -  if (!nitems || !*nitems)
 -    nbitems = 1;
 -    free_arg_lst(paramlst);
 -    return;
 -  }
 -
 -  if (!strcasecmp(subcmd, "top")) {
-+  scmd_roster_t subcmd = (scmd_roster_t) (options -> args[0].value.cmd -> userdata);
++  scmd_roster_t subcmd = (scmd_roster_t) (values[pos_roster_scmd].value.cmd -> userdata);
-+  cmdarg_t      *arg   = NULL;
-+
-+  if (options -> args[0].value.cmd -> args[0].name)
-+    arg = options -> args[0].value.cmd -> args;
 +
 +  if (subcmd == scmd_roster_bottom) {
 +    scr_roster_bottom();
 +    update_roster = TRUE;
 +  } else if (subcmd == scmd_roster_top) {
 scr_roster_top();
 update_roster = TRUE;
 -  } else if (!strcasecmp(subcmd, "bottom")) {
 -    scr_roster_bottom();
 +  } else if (subcmd == scmd_roster_up) {
-+    scr_roster_up_down(-1, arg -> value.uint);
++    scr_roster_up_down(-1, values[pos_roster_up_n].value.uint);
 +  } else if (subcmd == scmd_roster_down) {
-+    scr_roster_up_down(1, arg -> value.uint);
++    scr_roster_up_down(1, values[pos_roster_down_n].value.uint);
 +  } else if (subcmd == scmd_roster_group_prev) {
 +    scr_roster_prev_group();
 +  } else if (subcmd == scmd_roster_group_next) {
 +    scr_roster_next_group();
 +  } else if (subcmd == scmd_roster_alternate) {
 +  } else if (subcmd == scmd_roster_unread_first) {
 +    scr_roster_unread_message(0);
 +  } else if (subcmd == scmd_roster_unread_next) {
 +    scr_roster_unread_message(1);
 +  } else if (subcmd == scmd_roster_search) {
-+    scr_roster_search(arg -> value.arg);
++    scr_roster_search(values[pos_roster_search_name].value.arg);
 update_roster = TRUE;
 -  } else if (!strcasecmp(subcmd, "hide")) {
 -    scr_roster_visibility(0);
 -  } else if (!strcasecmp(subcmd, "show")) {
 -    scr_roster_visibility(1);
 -  } else if (!strcasecmp(subcmd, "toggle")) {
 -    scr_roster_visibility(-1);
 -  } else if (!strcasecmp(subcmd, "hide_offline")) {
 +  } else if (subcmd == scmd_roster_display) {
-+    scr_roster_display(arg -> value.arg);
++    scr_roster_display(values[pos_roster_display_mask].value.arg);
 +  } else if (subcmd == scmd_roster_hide_offline) {
 buddylist_set_hide_offline_buddies(TRUE);
 -    if (current_buddy)
 +    if (current_buddy) // XXX
 buddylist_build();
 -    roster_resourcelock(arg, FALSE);
 -  } else
 -    scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
 -  free_arg_lst(paramlst);
 +  } else if (subcmd == scmd_roster_item_lock) {
-+    roster_buddylock(arg -> value.bud, 1);
++    roster_buddylock(values[pos_roster_itemlock_jid].value.rjid.bud, 1);
 +  } else if (subcmd == scmd_roster_item_unlock) {
-+    roster_buddylock(arg -> value.bud, 0);
++    roster_buddylock(values[pos_roster_itemlock_jid].value.rjid.bud, 0);
 +  } else if (subcmd == scmd_roster_item_toggle_lock) {
-+    roster_buddylock(arg -> value.bud, -1);
++    roster_buddylock(values[pos_roster_itemlock_jid].value.rjid.bud, -1);
 +  } else if (subcmd == scmd_roster_note) {
-+    roster_note(options -> cmds[18].opts[1].arg.value.bud,
++    roster_note(values[pos_roster_note_jid].value.rjid.bud,
-+                options -> cmds[18].opts[0].arg.value.swc,
++                values[pos_roster_note_rst].value.swc,
-+                arg -> value.arg);
++                values[pos_roster_note_text].value.arg);
 +  } else if (subcmd == scmd_roster_notes) {
 +    display_all_annotations();
 +  } else if (subcmd == scmd_roster_resource_lock) {
-+    buddy_setactiveresource(arg -> userdata, arg -> value.arg);
++    buddy_setactiveresource(values[pos_roster_reslock_jid].value.rjid.bud,
++                            values[pos_roster_reslock_jid].value.rjid.resource);
 +    scr_update_chat_status(TRUE);
 +  } else if (subcmd == scmd_roster_resource_unlock) {
-+    buddy_setactiveresource(arg -> value.bud, NULL);
++    buddy_setactiveresource(values[pos_roster_reslock_jid].value.rjid.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);
 +//
 +
 +// custom argument types
 +
 +// statusmask + "clear"
-+static gchar *cmdarg_check_color_statusmask (cmdarg_t *arg)
++// Needs status char set in chkdata.
++static gchar *cmdarg_check_color_statusmask (cmdarg_value_t *arg)
 {
 -  char **paramlst;
 -  char *subcmd;
 -
 -  paramlst = split_arg(arg, 2, 1); // subcmd, arg
 -    free_arg_lst(paramlst);
 -    return;
 +  if (!g_strcmp0 (arg -> value.arg, "clear"))
 +    return NULL;
 +  else
-+    return cmdarg_check_statusmask (arg);
++    return cmdarg_check_charset (arg);
 +}
 +
 +static const 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)
++// XXX:
++//  * strdup jid?
++//  * requires type in chkdata
++static gchar *cmdarg_check_color_roomjid (cmdarg_value_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?
++    arg -> value.roarg = buddy_getjid (arg -> value.rjid.bud);
 }
 -  if (!strcasecmp(subcmd, "roster")) {
 -    char *status, *wildcard, *color;
 -    char **arglist = split_arg(arg, 3, 0);
 +  NULL,
 +};
 +
 +// command
 +
-+static gchar *do_color (cmdopts_t *command);
++static gchar *do_color (cmdopts_t *command, cmdarg_value_t *values);
 +
 +typedef enum {
 +  scmd_color_roster,
 +  scmd_color_mucnick,
 +  scmd_color_muc,
 +} scmd_color_t;
++
++typedef enum {
++  pos_color_scmd          = 0,
++  pos_color_roster_status = 1,
++  pos_color_roster_jid    = 2,
++  pos_color_roster_color  = 3,
++  pos_color_muc_room      = 1,
++  pos_color_muc_mode      = 2,
++  pos_color_nick_nick     = 1,
++  pos_color_nick_color    = 2,
++} pos_color_t;
 +
 +static const string2enum_t s2e_color_muc[] = {
 +  { "on",     MC_ALL    },
 +  { "off",    MC_OFF    },
 +  { "preset", MC_PRESET },
 +  "color",
 +  cmd_safe,
 +  NULL,
 +  do_color,
 +  NULL,
-+  (cmdarg_t[2]){{ "subcommand", cmdarg_subcmd | cmdarg_check, NULL, NULL },{NULL}},
++  (cmdarg_t[2]){{ "subcommand", pos_color_scmd, cmdarg_subcmd | cmdarg_check, NULL, NULL },{NULL}},
 +  (cmdopts_t[4]){
 +    {"roster", cmd_default, NULL, NULL, NULL, (cmdarg_t[4]){
-+        { "statusmask|clear", cmdarg_chreq,   NULL, &cmdarg_type_color_statusmask },
++        { "statusmask|clear", pos_color_roster_status, cmdarg_chreq,   NULL, &cmdarg_type_color_statusmask, (gpointer)"ofdna_?" },
-+        { "jidmask",          cmdarg_default, NULL, &cmdarg_type_bjidmask         },
++        { "jidmask",          pos_color_roster_jid,    cmdarg_default, NULL, &cmdarg_type_bjidmask },
-+        { "color|-",          cmdarg_default, NULL, &cmdarg_type_color            },
++        { "color|-",          pos_color_roster_color,  cmdarg_default, NULL, &cmdarg_type_color    },
 +        {NULL}
 +      }, NULL, (gpointer)scmd_color_roster},
 +    {"muc", cmd_default, NULL, NULL, NULL, (cmdarg_t[3]){
-+        { "roomjid",         cmdarg_chreq, NULL, &cmdarg_type_color_roomjid },
++        { "roomjid",         pos_color_muc_room, cmdarg_chreq, NULL, &cmdarg_type_color_roomjid, (gpointer)ROSTER_TYPE_ROOM },
-+        { "on|off|preset|-", cmdarg_chreq, "on", &cmdarg_type_string2enum, (gpointer)s2e_color_muc},
++        { "on|off|preset|-", pos_color_muc_mode, cmdarg_chreq, "on", &cmdarg_type_string2enum,   (gpointer)s2e_color_muc },
 +        {NULL}
 +      }, NULL, (gpointer)scmd_color_muc},
 +    {"mucnick", cmd_default, NULL, NULL, NULL, (cmdarg_t[3]){
-+        { "nick",    cmdarg_chreq, NULL, &cmdarg_type_nick  },
++        { "nick",    pos_color_nick_nick,  cmdarg_chreq, NULL, &cmdarg_type_nick  },
-+        { "color|-", cmdarg_chreq, NULL, &cmdarg_type_color },
++        { "color|-", pos_color_nick_color, cmdarg_chreq, NULL, &cmdarg_type_color },
 +        {NULL}
 +      }, NULL, (gpointer)scmd_color_mucnick},
 +    {NULL}
 +  },
 +};
 +
-+static gchar *do_color (cmdopts_t *options)
++static gchar *do_color (cmdopts_t *options, cmdarg_value_t *values)
 +{
-+  scmd_color_t subcmd = (scmd_color_t) options -> args[0].value.cmd -> userdata;
++  scmd_color_t subcmd = (scmd_color_t) (values[pos_color_scmd].value.cmd -> userdata);
 +
 +  if (subcmd == scmd_color_roster) {
-+    const gchar *status   = options -> cmds[0].args[0].value.arg;
++    const gchar *status   = values[pos_color_roster_status].value.arg;
-+    const gchar *wildcard = options -> cmds[0].args[1].value.arg;
++    const gchar *wildcard = values[pos_color_roster_jid].value.arg;
-+    const gchar *color    = options -> cmds[0].args[2].value.arg;
++    const gchar *color    = values[pos_color_roster_color].value.arg;
 +    if (!strcmp(status, "clear")) { // Not a color command, clear all
 scr_roster_clear_color();
 update_roster = TRUE;
 } else {
 -      if (!status || !*status || !wildcard || !*wildcard || !color || !*color) {
 -    free_arg_lst(arglist);
 -  } else
 -    scr_LogPrint(LPRINT_NORMAL, "Unrecognized parameter!");
 -  free_arg_lst(paramlst);
 +  } else if (subcmd == scmd_color_muc) {
-+    scr_muc_color ( options -> cmds[1].args[0].value.arg,
++    scr_muc_color ( values[pos_color_muc_room].value.arg,
-+                    options -> cmds[1].args[1].value.uint );
++                    values[pos_color_muc_mode].value.uint );
 +  } else { // scmd_color_mucnick
-+    scr_muc_nick_color( options -> cmds[2].args[0].value.arg,
++    scr_muc_nick_color( values[pos_color_nick_nick].value.arg,
-+                        options -> cmds[2].args[1].value.arg );
++                        values[pos_color_nick_color].value.arg );
 +  }
 +
 +  return NULL;
 }
 +//
 +
 +// custom type
 +
 +// needs corresponding s2e in chkdata
-+static gchar *cmdarg_check_status_status (cmdarg_t *arg)
++static gchar *cmdarg_check_status_status (cmdarg_value_t *arg)
 {
 -  char **paramlst;
 -  char *status;
 -  char *msg;
 -  enum imstatus st;
 +  NULL,
 +};
 +
 +// command
 +
-+static gchar *do_status (cmdopts_t *command);
++static gchar *do_status (cmdopts_t *command, cmdarg_value_t *values);
++
++typedef enum {
++  pos_status_status  = 0,
++  pos_status_message = 1,
++} pos_status_t;
 +
 +static const string2enum_t s2e_status2[] = {
 +  { "away",      away        },
 +  { "offline",   offline     },
 +  { "online",    available   },
 +  cmd_safe,
 +  NULL,
 +  do_status,
 +  NULL,
 +  (cmdarg_t[3]){
-+    {"status",  cmdarg_chreq, "show", &cmdarg_type_status_status, (gpointer)s2e_status2},
++    {"status",  pos_status_status,  cmdarg_chreq, "show", &cmdarg_type_status_status, (gpointer)s2e_status2},
-+    {"message", cmdarg_eol,   NULL,   &cmdarg_type_nonspace},
++    {"message", pos_status_message, cmdarg_eol,   NULL,   &cmdarg_type_nonspace},
 +    {NULL}
 +  },
 +  NULL,
 +};
 +
-+static gchar *do_status (cmdopts_t *options)
++static gchar *do_status (cmdopts_t *options, cmdarg_value_t *values)
 {
 -  if (!*arg) {
-+  if (options -> args[0].value.uint == imstatus_size) {
++  if (values[pos_status_status].value.uint == imstatus_size) {
 const char *sm = xmpp_getstatusmsg();
 scr_LogPrint(LPRINT_NORMAL, "Your status is: [%c] %s",
 imstatus2char[xmpp_getstatus()],
 (sm ? sm : ""));
 -    return;
 +  } else {
 +    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,
++    xmpp_setstatus(values[pos_status_status].value.uint, NULL,
-+                   options -> args[1].value.arg, FALSE);
++                   values[pos_status_message].value.arg, FALSE);
 }
 -  arg = to_utf8(arg);
 -  cmd_setstatus(NULL, arg);
 -  g_free(arg);
 +  return NULL;
 -static void do_status_to(char *arg)
 +//
 +//  /status_to
 +//
 +
-+static gchar *do_status_to (cmdopts_t *command);
++static gchar *do_status_to (cmdopts_t *command, cmdarg_value_t *values);
++
++typedef enum {
++  pos_statusto_jid     = 0,
++  pos_statusto_status  = 1,
++  pos_statusto_message = 2,
++} pos_statusto_t;
 +
 +// no "show" here
 +static const string2enum_t s2e_status[] = {
 +  { "away",      away        },
 +  { "offline",   offline     },
 +  cmd_default,
 +  NULL,
 +  do_status_to,
 +  NULL,
 +  (cmdarg_t[4]){
-+    {"jid",     cmdarg_chreq, NULL, &cmdarg_type_fjid},
++    {"jid",     pos_statusto_jid,     cmdarg_chreq, NULL, &cmdarg_type_fjid},
-+    {"status",  cmdarg_chreq, NULL, &cmdarg_type_status_status, (gpointer)s2e_status},
++    {"status",  pos_statusto_status,  cmdarg_chreq, NULL, &cmdarg_type_status_status, (gpointer)s2e_status},
-+    {"message", cmdarg_eol,   NULL, &cmdarg_type_nonspace},
++    {"message", pos_statusto_message, cmdarg_eol,   NULL, &cmdarg_type_nonspace},
 +    {NULL}
 +  },
 +  NULL,
 +};
 +
-+static gchar *do_status_to (cmdopts_t *options)
++static gchar *do_status_to (cmdopts_t *options, cmdarg_value_t *values)
 {
 -  char **paramlst;
 -  char *fjid, *st, *msg;
 -  char *jid_utf8 = NULL;
 -
 -    free_arg_lst(paramlst);
 -    return;
 +  const char *fjid, *stname, *msg;
 +  enum imstatus st;
 +
-+  fjid = options -> args[0].value.arg;
++  fjid = values[pos_statusto_jid].value.arg;
-+  st   = options -> args[1].value.uint;
++  st   = values[pos_statusto_status].value.uint;
-+  msg  = options -> args[2].value.arg;
++  msg  = values[pos_statusto_message].value.arg;
 +
 +  { // get status name
 +    const string2enum_t *list;
 +    for (list = s2e_status; list -> name != NULL; list ++)
 +      if (list -> value == st) {
 +
 +//
 +//  /add
 +//
 +
-+static gchar *do_add (cmdopts_t *command);
++static gchar *do_add (cmdopts_t *command, cmdarg_value_t *values);
++
++typedef enum {
++  pos_add_jid  = 0,
++  pos_add_name = 1,
++} pos_add_t;
 +
 +static cmdopts_t def_add = {
 +  "add",
 +  cmd_default,
 +  cmd_check_online,
 +  do_add,
 +  NULL,
 +  (cmdarg_t[3]){
-+    {"jid",  cmdarg_chreq,   ".",  &cmdarg_type_bjid},
++    {"jid",  pos_add_jid,  cmdarg_chreq,   ".",  &cmdarg_type_bjid},
-+    {"name", cmdarg_default, NULL, &cmdarg_type_nonspace},
++    {"name", pos_add_name, cmdarg_default, NULL, &cmdarg_type_nonspace},
 +    {NULL}
 +  },
 +  NULL,
 +};
 +
-+static gchar *do_add (cmdopts_t *options)
++static gchar *do_add (cmdopts_t *options, cmdarg_value_t *values)
 +{
-+  gchar *jid = options -> args[0].value.arg;
++  gchar *jid = values[pos_add_jid].value.arg;
 +
 +  // XXX
 +  //mc_strtolower(jid);
 +
-+  xmpp_addbuddy(jid, options -> args[1].value.arg, NULL);
++  xmpp_addbuddy(jid, values[pos_add_name].value.arg, NULL);
 +  scr_LogPrint(LPRINT_LOGNORM, "Sent presence notification request to <%s>.",
 +               jid);
 +
 +  return NULL;
 +}
 +
 +//
 +//  /del
 +//
 +
-+static gchar *do_del (cmdopts_t *command);
++static gchar *do_del (cmdopts_t *command, cmdarg_value_t *values);
++
++typedef enum {
++  pos_del_jid    = 0,
++  pos_del_dryrun = 1,
++} pos_del_t;
 +
 +static cmdopts_t def_del = {
 +  "del",
 +  cmd_default,
 +  cmd_check_online,
 +  do_del,
 +  (cmdopt_t[2]){
-+    {'n', "dryrun", cmdopt_switch, {"dryrun", cmdarg_default, NULL, NULL}},
++    {'n', "dryrun", {"dryrun", pos_del_dryrun, cmdarg_switch|cmdarg_check, NULL, NULL}},
 +    {0}
 +  },
 +  (cmdarg_t[2]){
-+    {"jid", cmdarg_chreq, ".", &cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_AGENT|ROSTER_TYPE_GROUP)},
++    {"jid", pos_del_jid, cmdarg_chreq, ".", &cmdarg_type_roster_bjid, (gpointer)(ROSTER_TYPE_USER|ROSTER_TYPE_AGENT|ROSTER_TYPE_GROUP)},
 +    {NULL}
 +  },
 +  NULL,
 +};
 +
-+static gchar *do_del (cmdopts_t *options)
++static gchar *do_del (cmdopts_t *options, cmdarg_value_t *values)
 +{
-+  gpointer   buddy = options -> args[0].value.bud;
++  gpointer   buddy = values[pos_del_jid].value.rjid.bud;
 +  const char *jid  = buddy_getjid (buddy);
 +
 +  if (buddy_gettype(buddy) & ROSTER_TYPE_ROOM)
 +    // This is a chatroom
 +    if (buddy_getinsideroom(buddy))
 +      return g_strdup ("You haven't left this room!");
 +
 +  scr_LogPrint(LPRINT_LOGNORM, "Removing <%s>...", jid);
 +
-+  if (!(options -> opts[0].arg.value.swc)) {
++  if (!(values[pos_del_dryrun].value.swc)) {
 +    // Close the buffer
 +    scr_buffer_purge(1, jid);
 +
 +    xmpp_delbuddy(jid);
 +    scr_update_buddy_window();
 -
 -do_group_return:
 -  free_arg_lst(paramlst);
 }
-+static gchar *do_group (cmdopts_t *command);
++static gchar *do_group (cmdopts_t *command, cmdarg_value_t *values);
++
++typedef enum {
++  pos_group_group  = 0,
++  pos_group_action = 1,
++} pos_group_t;
 +
 +static const string2enum_t s2e_group_scmd[] = {
 +  {"expand", scmd_group_unfold},
 +  {"unfold", scmd_group_unfold},
 +  {"shrink", scmd_group_fold  },
 +  cmd_default,
 +  NULL,
 +  do_group,
 +  NULL,
 +  (cmdarg_t[3]){
-+    {"subcommand", cmdarg_chreq,            NULL, &cmdarg_type_string2enum,
++    {"subcommand", pos_group_action, cmdarg_chreq, NULL, &cmdarg_type_string2enum,
 +                                                  (gpointer)s2e_group_scmd},
-+    {"group",      cmdarg_chreq|cmdarg_eol, ".",  &cmdarg_type_roster_group},
++    {"group", pos_group_group, cmdarg_chreq|cmdarg_eol, ".",  &cmdarg_type_roster_group},
 +    {NULL}
 +  },
 +  NULL,
 +};
 +
-+static gchar *do_group(cmdopts_t *options)
++static gchar *do_group(cmdopts_t *options, cmdarg_value_t *values)
 +{
 +  //if (!current_buddy) // XXX do we need this still?
 +  //  return g_strdup("Command needs selected buddy.");
 +
-+  group_cmd (options -> args[0].value.bud,
++  group_cmd (values[pos_group_group].value.rjid.bud,
-+             options -> args[1].value.uint);
++             values[pos_group_action].value.uint);
 +
 +  return NULL;
 +}
 +
 +//
 -                           LmMessageSubType type_overwrite, bool quiet)
 +                           msgtype_t msg_type, bool quiet)
 {
 char *bare_jid, *rp;
 char *hmsg;
-@@ -1285,6 +1905,7 @@
+@@ -1285,6 +1996,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 +1920,15 @@
+@@ -1299,11 +2011,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 +1979,7 @@
+@@ -1354,8 +2070,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 +2002,13 @@
+@@ -1378,34 +2093,13 @@
 else
 jid = g_strdup(bjid);
 -  send_message_to(jid, msg, subj, type_overwrite, FALSE);
 +  send_message_to(jid, msg, subj, msgtype, FALSE);
 -  free_arg_lst(parlist);
 -  return result;
 -}
 -
 -void say_cmd(char *arg, int parse_flags)
-+void say_cmd(char *arg, msgtype_t msgtype)
++static void say_cmd(char *arg, msgtype_t msgtype)
 {
 gpointer bud;
 -  LmMessageSubType msgtype = LM_MESSAGE_SUB_TYPE_NOT_SET;
 scr_set_chatmode(TRUE);
 scr_show_buddy_window();
-@@ -1424,80 +2027,133 @@
+@@ -1424,80 +2118,137 @@
 }
 buddy_setflags(bud, ROSTER_FLAG_LOCK, TRUE);
 -  if (parse_flags)
 -    msgtype = scan_mtype(&arg);
 -  arg = to_utf8(arg);
 send_message(arg, NULL, msgtype);
 -  g_free(arg);
 }
+-static void do_say(char *arg) {
+-  say_cmd(arg, 1);
++static gchar *do_say (cmdopts_t *command, cmdarg_value_t *values);
++
++typedef enum {
++  pos_say_msg     = 0,
++  pos_say_msgtype = 1,
++} pos_say_t;
++
++static cmdopts_t def_say = {
++  "say",
++  cmd_default,
++  NULL,
++  do_say,
++  (cmdopt_t[4]){
++    {'n', "normal",   {"normal",   pos_say_msgtype, cmdarg_switch, NULL, NULL, NULL, (gpointer)msgtype_normal}},
++    {'h', "headline", {"headline", pos_say_msgtype, cmdarg_switch, NULL, NULL, NULL, (gpointer)msgtype_headline}},
++    {'d', "default",  {"default",  pos_say_msgtype, cmdarg_switch, NULL, NULL, NULL, (gpointer)msgtype_not_set}},
++    {0}
++  },
++  (cmdarg_t[2]){
++    {"message", pos_say_msg, cmdarg_eol | cmdarg_chreq, NULL, &cmdarg_type_nonspace},
++    {NULL}
++  },
++  NULL,
++};
++
++static gchar *do_say (cmdopts_t *options, cmdarg_value_t *values)
++{
++  say_cmd(values[pos_say_msg].value.arg,
++          (msgtype_t) (values[pos_say_msgtype].src -> userdata));
++  return NULL;
+}
 +#if 0
 +
-static void do_say(char *arg) {
--  say_cmd(arg, 1);
-+  cmdopts_t options = {
-+    "say",
-+    (cmdopt_t[2]){
-+      { CMDOPT_SWITCH,               'n', "normal",   { .swc = 0 } },
-+      { CMDOPT_SWITCH | CMDOPT_LAST, 'h', "headline", { .swc = 0 } },
-+    },
-+    (cmdarg_t[1]){
-+      { CMDOPT_CATCHALL | CMDOPT_PLAIN | CMDOPT_REQUIRED | CMDOPT_LAST,
-+        { .arg = NULL } },
-+    },
-+    NULL,
-+  };
-+  msgtype_t msgtype = msgtype_not_set;
-+
-+  if (cmdopts_parse(arg, &options))
-+    return;
-+
-+  if (options.opts[0].value.swc)
-+    msgtype = msgtype_normal;
-+  else if (options.opts[1].value.swc)
-+    msgtype = msgtype_headline;
-+
-+  say_cmd(options.args[0].value.arg, msgtype);
-+
-+  cmdopts_free(&options);
-}
 static void do_msay(char *arg)
 {
 -  /* Parameters: begin verbatim abort send send_to */
 -  char **paramlst;
 -  char *subcmd;
 -  /* 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 +2164,47 @@
+@@ -1508,49 +2259,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 +2220,7 @@
+@@ -1566,7 +2315,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 +2288,103 @@
+@@ -1634,130 +2383,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 +2402,10 @@
+@@ -1775,27 +2497,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 +2414,156 @@
+@@ -1804,98 +2509,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 +2701,20 @@
+@@ -2033,29 +2796,20 @@
 }
 }
 +enum room_names_style_t {
 +  room_names_style_normal = 0,
 -    }
 -  }
 // Enter chat mode
 scr_set_chatmode(TRUE);
-@@ -2075,12 +2734,12 @@
+@@ -2075,12 +2829,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 +2755,12 @@
+@@ -2096,12 +2850,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 +2804,69 @@
+@@ -2145,16 +2899,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 +2874,13 @@
+@@ -2162,11 +2969,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 +2895,117 @@
+@@ -2181,90 +2990,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 +3017,7 @@
+@@ -2276,7 +3112,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 +3026,7 @@
+@@ -2285,8 +3121,7 @@
 }
 }
 -  g_free(group_utf8);
 -  g_free(newgroupname);
 +  cmdopts_free(&options);
 update_roster = TRUE;
 }
-@@ -2468,50 +3208,33 @@
+@@ -2468,50 +3303,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)
-@@ -2815,6 +3538,8 @@
+@@ -2815,6 +3633,8 @@
 free_arg_lst(paramlst);
 }
 +#endif
 +
 void cmd_room_leave(gpointer bud, char *arg)
 {
 gchar *roomid, *desc;
-@@ -2833,6 +3558,8 @@
+@@ -2833,6 +3653,8 @@
 g_free(roomid);
 }
 +#if 0
 +
 static void room_nick(gpointer bud, char *arg)
 {
 if (!buddy_getinsideroom(bud)) {
-@@ -2874,7 +3601,7 @@
+@@ -2874,7 +3696,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);
-@@ -3052,6 +3779,8 @@
+@@ -3052,6 +3874,8 @@
 free_arg_lst(paramlst);
 }
 +#endif
 +
 //  cmd_room_whois(..)
 // If interactive is TRUE, chatmode can be enabled.
 // Please note that usernick is expected in UTF-8 locale iff interactive is
-@@ -3146,6 +3875,8 @@
+@@ -3146,6 +3970,8 @@
 free_arg_lst(paramlst);
 }
 +#if 0
 +
 static void room_bookmark(gpointer bud, char *arg)
 {
 const char *roomid;
-@@ -3290,6 +4021,207 @@
+@@ -3290,6 +4116,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 +4279,7 @@
+@@ -3347,7 +4374,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 +5094,6 @@
+@@ -4162,5 +5189,6 @@
 }
 mcabber_set_terminate_ui();
 }
 +#endif
 /* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim users... */
 diff -r 1b0b563a81e6 mcabber/mcabber/commands.h
 --- a/mcabber/mcabber/commands.h	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/commands.h	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/mcabber/commands.h	Mon Mar 18 02:16:22 2013 +0200
-@@ -5,32 +5,246 @@
+@@ -5,32 +5,338 @@
 #include <mcabber/config.h>
 -// Command structure
 +//
++//  DONE(?):
++//
++// * Clustering of options/switches
++//   - with separate values - just specify the same index
++//   - use the same flags on all of the clustered options, or result may be a bit unpredictable
++// * for now we'll do without multi-options.
++// * checks
++//   - argument type == public struct with name and callbacks, simple!
++//   - command checks should be just single callbacks
++//   - argument checker needs:
++//     - [in] value string (current or default)
++//     - [in] additional input data for some generic checkers (like string2enum wordlist)
++//     - [out] replacement value (not necessary string)
++//       - replacement value may need freeing
++//     - [out] error string
++//       - that may need freeing
++//
 +//  TODO:
 +//
-+// * Clustering of options/switches
++// * checkers can use visited flag to check if value is rw
-+// * Multivalue options
++//   - but what if in-checker assigns ro value, like buddy_getjid()?
-+//   - list
++//   - maybe need separate flag for that
-+//     - special checker
++// * now, that we have rjid, merge bjid/fjid checkers into one
-+//     - or run checker multiple times
++// * Usable documentation in sources/howto
-+//   - or run command several times
++// * Changelog entry
-+//     - what if there are several of such arguments?
 +// * --help
 +//   - use argument type names and clarify, if needed in descriptions
 +//   - command/subcommand descriptions
 +//   - or maybe just do "/help foo"
 +// * Add argument type field and subsystem to check values. Uses so far:
 +//     - color (restrictive, semi-defined list)
 +//     - nick (non-restrictive)
 +//     - defined lists (restrictive)
 +//     - date (restrictive)
 +//     - percent (numerical, restrictive)
-+//   - number (result - int)
++//   - number (result - uint)
 +//   - filename (expand_filename(), g_utf8_to_filename()?)
 +//   - custom (maybe some helpers for constant stringlists)
 +//   - text message (compl: nicks in rooms, dictionary?)
 +// * Non-argument checks for commands/subcommands:
 +//   - xmpp_is_online()
 +//   - current_buddy
++// * Usable subsystem for completion, based on user-supplied completors
++//
++//  XXX:
++//
++// * while escaped aliases should not be expanded, we should still unquote them for command search
++// * allow escaping in options?
++// * merge cmdopt_t and cmdarg_t?
++//   - improve the checker error messages
++//   - extra NULLs to specify in arg definition
++//   - inconvenient positioning of shortopt/longopt or argname in sequence
++//   - merge options/arguments?
++//   - describe values, not opt/args?
++// * command ref and name in special value 0 and indexing starts from 1?
++//   - requires allocation of values always
++//   - though there's not that many commands without arguments
++// * command checker is not quite effective
++//   - I'd like to run it before allocating anything
++//   - so far only one of them
++// * unable to put checker before allocation because in many cases it will be in subcommand.
++//   - separate command/subcommand values and use subcommand callbacks?
++//   - ignore command options and always go directly to subcommand parsing if present?
++//     (i.e. subcommand is always first argument and consumes the end of the line
++// * type name generator callback
++//   for generic types to construct something like "foo|bar|baz"
++// * [+foo|-foo] support?
 +// * Subcommands with fallback to argument?
-+// * [+foo|-foo] support?
++// * Multivalue options
-+// * Usable subsystem for completion, based on user-supplied completors
++//   - list
-+
++//     - special checker
-+// * for now we'll do without multi-options.
++//     - or run checker multiple times
-+// * and without clustering.
++//   - or run command several times
-+// * checks
++//     - what if there are several of such arguments?
-+//   - argument type == public struct with name and callbacks, simple!
++//
-+//   - command checks should be just single callbacks
++
-+// * now, what checker needs?
++//
-+//   - [in] value string (current or default)
++//  Type predeclarations
-+//   - [in] additional input data for some generic checkers (like string2enum wordlist)
++//
-+//   - [out] replacement value (not necessary string)
-+//     - replacement value may need freeing
-+//   - [out] error string
-+//     - that may need freeing
 +
 +typedef struct cmdopts_struct      cmdopts_t;
 +typedef struct cmdopt_struct       cmdopt_t;
 +typedef struct cmdarg_struct       cmdarg_t;
 +typedef struct cmdarg_type_struct  cmdarg_type_t;
-+
++typedef struct cmdarg_value_struct cmdarg_value_t;
-+// note, this is called before options are parsed!
++
-+typedef gchar *(*cmd_checker_t)(cmdopts_t *opts);
++//
-+// command function itself
++//  Callback type definitions
-+typedef gchar *(*cmd_handler_t)(cmdopts_t *opts);
++//
-+// should check arg -> val -> val.arg and replace, if needed
++
-+typedef gchar *(*cmdarg_checker_t)(cmdarg_t *arg);
++// Command execution environment check function.
-+// free resources, used in arg -> val -> val.arg, if needed
++// Note: This is called before options are parsed, but values are already allocated.
-+typedef void (*cmdarg_destructor_t)(cmdarg_t *arg);
++typedef gchar *(*cmd_checker_t)(cmdopts_t *command, cmdarg_value_t *args);
-+// todo
++// Command function itself.
-+typedef void (*cmdarg_completor_t)(void); // FIXME
++// Command definition is provided for userdata access, should not be modified.
-+
++typedef gchar *(*cmd_handler_t)(cmdopts_t *command, cmdarg_value_t *args);
-+typedef union {
++// Should check value -> value.arg and replace, if needed.
-+  guint       uint;        // unsigned integer
++// Can set cmdarg_freeme flag to request type destructor call.
-+  gint        sint;        // signed integer
++// Can access argument definition via value -> src (but not modify it).
-+  guint       swc;         // switch count
++typedef gchar *(*cmdarg_checker_t)(cmdarg_value_t *value);
-+  const gchar *roarg;      // default value
++// Free resources, used in value, if needed.
-+  gchar       *arg;        // string argument
++typedef void (*cmdarg_destructor_t)(cmdarg_value_t *value);
-+  cmdopts_t   *cmd;        // subcommand
++// TODO Return possible completions for given argument.
-+  gpointer    bud;         // buddy data (roster entry)
++typedef void (*cmdarg_completor_t)(void);
-+  gpointer    ptr;         // anything else
++
-+} cmdarg_value_t;
++//
-+
++//  Data type definitions
++//
++
++// command description flags
 +typedef enum {
-+  cmd_default     = 0,     // no flags
++  cmd_default     = 0x0000, // no flags
-+  cmd_safe        = 1<<0,  // command is safe to use in mcabberrc
++  cmd_safe        = 0x0001, // command is safe to use in mcabberrc
 +} cmd_flags_t;
++// argument description flags
 +typedef enum {
-+  cmdopt_default  = 0,     // no flags
++  cmdarg_default  = 0x0000, // no flags
-+  cmdopt_switch   = 1<<0,  // option have no argument
++  cmdarg_catchall = 0x0001, // argument consumes the end of command line
-+} cmdopt_flags_t;
++  cmdarg_plain    = 0x0002, // quotes and escapes are not processed
++  cmdarg_check    = 0x0004, // forse checker call on argument
++  cmdarg_required = 0x0008, // checker errors are fatal (checker may use as well)
++  cmdarg_subcmd   = 0x0010, // argument is subcommand
++  cmdarg_switch   = 0x0020, // option without argument, value is count
++  // shortcuts:
++  cmdarg_eol      = 0x0003, // catchall + plain
++  cmdarg_chreq    = 0x000C, // check + required
++  cmdarg_special  = 0x0030, // subcmd + switch
++} cmdarg_flags_t;
++// argument value flags (internal)
 +typedef enum {
-+  cmdarg_default  = 0x0000, // no flags ['u' - user, 'p' - parser, 'c' - checker]
++  cmdval_default  = 0x0000, // no flags
-+  cmdarg_catchall = 0x0001, // u2p, argument consumes the end of command line
++  cmdval_visited  = 0x0100, // marks initialized arguments
-+  cmdarg_plain    = 0x0002, // u2p, quotes and escapes are not processed
++  cmdval_freeme   = 0x0200, // marks argument, that needs freeing
-+  cmdarg_subcmd   = 0x0004, // u2p, argument is subcommand
++} cmdval_flags_t;
-+  cmdarg_check    = 0x0008, // u2p, force checker call on argument
++
-+  cmdarg_required = 0x0010, // u2p[c], treat checker errors as errors or warnings (may be used by checker too)
++// command description
-+  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_ppclear  = 0x00E0, // pre-parse clear = visited + checked + freeme
-+} cmdarg_flags_t;
-+
 +struct cmdopts_struct {
 +  const char    *name;     // [user,req] command name (error messages, help, subcommands)
 +  cmd_flags_t   flags;     // [user,req] safe
 +  cmd_checker_t check;     // [user,req] checker routine
 +  cmd_handler_t handle;    // [user,req] main command processing function
 +  cmdopt_t      *opts;     // [user,req] options
 +  cmdarg_t      *args;     // [user,req] arguments
 +  cmdopts_t     *cmds;     // [user,req] subcommands
 +  gpointer      userdata;  // [user]
++  size_t        valno;     // internal, number of values to allocate
 +};
++// positional/option argument description
 +struct cmdarg_struct {
-+  const char     *name;    // [user,req] argument name - errors, help
++  const char           *name;    // [user,req] argument name - errors, help (unused for switches, but must be initialized)
-+  cmdarg_flags_t flags;    // [user,req] catchall, plain, required, subcommand
++  const guint          pos;      // [user,req] value positional number
-+  const char     *defval;  // [user,req] default value
++  const cmdarg_flags_t flags;    // [user,req] catchall, plain, check, required, subcommand, switch
-+  const cmdarg_type_t *type; // [user,req] type cbs - checker and completor
++  const char           *defval;  // [user,req] default value (unused for switches)
-+  gpointer       chkdata;  // [user] instance data for type checker - eg string2enum list
++  const cmdarg_type_t  *type;    // [user,req] type cbs - checker and completor (unused for switches and subcommands)
-+  gpointer       userdata; // [user]
++  gconstpointer        chkdata;  // [user] instance data for type checker - eg string2enum list (unused for switches and subcommands)
-+  cmdarg_value_t value;    // [parser,chk] current value
++  gconstpointer        userdata; // [user]
 +};
++// option description
 +struct cmdopt_struct {
-+  char           shortopt; // [user,req]
++  const char           shortopt; // [user,req]
-+  const char     *longopt; // [user,req]
++  const char           *longopt; // [user,req]
-+  cmdopt_flags_t flags;    // [user,req] switch
++  cmdarg_t             arg;      // [user,req]
-+  cmdarg_t       arg;      // [user,req]
 +};
-+
++// argument type description
 +struct cmdarg_type_struct {
-+  cmdarg_checker_t    check;    // [user,req] check string and set argument value
++  cmdarg_checker_t    check;     // [user,req] check string and set argument value
-+  cmdarg_destructor_t free;     // [user,req] free argument value
++  cmdarg_destructor_t free;      // [user,req] free argument value
-+  cmdarg_completor_t  complete; // [user,req]
++  cmdarg_completor_t  complete;  // [user,req]
 +};
-+
++// argument value
++struct cmdarg_value_struct {
++  cmdarg_t       *src;           // source of value
++  cmdval_flags_t flags;          // visited, freeme
++  union {                        // value:
++    guint        uint;           // - unsigned integer
++    gint         sint;           // - signed integer
++    guint        swc;            // - switch count
++    const gchar  *roarg;         // - XXX default value
++    gchar        *arg;           // - string argument
++    cmdopts_t    *cmd;           // - subcommand
++    struct {                     // - roster jid:
++      gpointer   bud;            //   - buddy struct
++      gchar      *resource;      //   - resource (optional)
++    } rjid;                      //
++    gpointer     ptr;            // - anything else
++  } value;                       //
++};
++
++//
++//  Public functions
++//
++
++// add command definition
 +void cmd_define (cmdopts_t *command);
++// remove command definition
 +void cmd_undef (cmdopts_t *command);
 +
 +//  error cmdopts_parse_argument ( startptr, endptr, flags )
 +// Parses next argument according to flags and finishes it with zero.
 +// Updates current/end pointers. Parsed string MUST be writable.
 +// String may shrink in size (quotation/escapes), thus endpointer is also
 +// updated.
 +const char *cmdopts_parse_argument(gchar **pr, gchar **er, cmdarg_flags_t flags);
 +
++// flags for cmd_execute()
 +typedef enum {
 +  cmdexe_default        = 0,    // no flags
 +  cmdexe_check_safe     = 1<<0, // we're parsing main config file
 +  cmdexe_check_verbatim = 1<<1, // check for verbatim input mode
 +} cmdexe_flags_t;
++// return codes for cmd_execute() and process_line()
 +typedef enum {
 +  cmd_result_ok   = 0,       // all is ok
-+  cmd_result_syntax_error,   // syntax, environment or argument check error
++  cmd_result_syntax_error,   // syntax or environment check error
++  cmd_result_value_error,    // argument value missing or type check error
 +  cmd_result_not_found,      // no such command
 +  cmd_result_runtime_error,  // error while executing command
 +  cmd_result_verbatim,       // we're in verbatim mode and this is not "msay"
 +  cmd_result_input,          // [process_line only] line was a message
 +  cmd_result_quit = 255,     // this is hard-coded "quit" command
 +// One special value is cmd_result_quit (255) - if it is "quit" command.
 +cmd_result_t cmd_execute (gchar *commandline, cmdexe_flags_t flags);
 +
 +//  process_line(line)
 +// Process a command/message line. If this isn't a command, this is a message
-+// and it is sent to the currently selected buddy.
++// and it is sent to the currently selected buddy. The line is converted from
++// local encoding to utf8.
 +// Returns 255 if the line is the /quit command, 0 on success and some other
 +// error codes.
 +cmd_result_t process_line(const char *line);
 +
 +//
-+//  Standard types
++//  Standard argument types
 +//
 +
 typedef struct {
 -  char name[32];
 -  const char *help;
 -#ifdef MODULES_ENABLE
 -gpointer cmd_del(gpointer id);
 -gpointer cmd_add(const char *name, const char *help, guint flags1, guint flags2,
 -                 void (*f)(char*), gpointer userdata);
 -gboolean cmd_set_safe(const gchar *name, gboolean safe);
-+void cmdarg_free_gfree (cmdarg_t *arg);
++// destructor, that g_free()s value.arg
-+
++void cmdarg_free_gfree (cmdarg_value_t *arg);
-+gchar *cmdarg_check_nonspace        (cmdarg_t *arg);
++
-+gchar *cmdarg_check_roster_bjid     (cmdarg_t *arg);
++// strips space at the start/end and ensures, that string have non-zero length
-+gchar *cmdarg_check_roster_resource (cmdarg_t *arg);
++gchar *cmdarg_check_nonspace        (cmdarg_value_t *arg);
-+gchar *cmdarg_check_roster_group    (cmdarg_t *arg);
++// checks, that jid is in roster and returns buddy
-+gchar *cmdarg_check_fjid            (cmdarg_t *arg);
++gchar *cmdarg_check_roster_bjid     (cmdarg_value_t *arg);
-+gchar *cmdarg_check_bjid            (cmdarg_t *arg);
++// checks, that jid is in roster and have specified resource, returns buddy and resource
-+gchar *cmdarg_check_uint            (cmdarg_t *arg);
++gchar *cmdarg_check_roster_resource (cmdarg_value_t *arg);
-+gchar *cmdarg_check_statusmask      (cmdarg_t *arg);
++// checks for group with given name and returns buddy
-+gchar *cmdarg_check_string2enum     (cmdarg_t *arg);
++gchar *cmdarg_check_roster_group    (cmdarg_value_t *arg);
-+
++// checks correctness of jid syntax
++gchar *cmdarg_check_fjid            (cmdarg_value_t *arg);
++// checks correctness of jid syntax, strips resource
++gchar *cmdarg_check_bjid            (cmdarg_value_t *arg);
++// transforms to guint
++gchar *cmdarg_check_uint            (cmdarg_value_t *arg);
++// checks, that string consists of characters from a given set
++gchar *cmdarg_check_charset         (cmdarg_value_t *arg);
++// checks, that string is from the given list, and returns corresponding guint value
++gchar *cmdarg_check_string2enum     (cmdarg_value_t *arg);
++// checks mcabber color name syntax
++gchar *cmdarg_check_color           (cmdarg_value_t *arg);
++
++// ready for use standard type descriptions
 +const cmdarg_type_t cmdarg_type_nonspace;
 +const cmdarg_type_t cmdarg_type_roster_bjid;
 +const cmdarg_type_t cmdarg_type_roster_resource;
 +const cmdarg_type_t cmdarg_type_roster_group;
 +const cmdarg_type_t cmdarg_type_fjid;
 +const cmdarg_type_t cmdarg_type_bjid;
 +const cmdarg_type_t cmdarg_type_uint;
-+const cmdarg_type_t cmdarg_type_statusmask;
++const cmdarg_type_t cmdarg_type_charset;
 +const cmdarg_type_t cmdarg_type_string2enum;
 +const cmdarg_type_t cmdarg_type_color;
 +
 +//
 +//  Private
 +
 +void cmd_init (void);
 +void cmd_uninit (void);
 +
 +#if 0
-+//  error cmdopts_parse_internal ( startptr, endptr, commanddef )
++// return highest index for value, used in command
++size_t cmdopts_count_values (cmdopts_t *command);
++
++// allocate values array to store arguments
++cmdarg_value_t *cmdopts_allocate_values (cmdopts_t *command);
++
++//  error cmdopts_parse_internal ( startptr, endptr, commanddef, values )
 +// Parses command arguments according to command definition.
 +// Parsed string MUST be writable. Regardless of success or error, input
 +// string should be considered corrupted by parsing process.
-+// Even in case of error, commanddef should be passed to cmdopts_free().
++gchar *cmdopts_parse_internal(gchar **pr, gchar **er, cmdopts_t *command, cmdarg_value_t *values);
-+gchar *cmdopts_parse_internal(gchar **pr, gchar **er, cmdopts_t *command);
++
-+
++// perform type checking/conversion on parsed values
-+//  cmdopts_free ( commanddef )
++gchar *cmdopts_check_values (cmdopts_t *command, cmdarg_value_t *values);
-+// Free various parser data, used in parsing process
++
-+void cmdopts_free(cmdopts_t *command);
++//  cmdopts_free_values ( commanddef, values )
-#endif
++// Free allocated by checkers resources and values array.
--gboolean cmd_is_safe(const gchar *name);
++void cmdopts_free_values(cmdopts_t *command, cmdarg_value_t *values);
 +
 +typedef enum {
 +  msgtype_not_set,
 +  msgtype_normal,
 +  msgtype_headline,
 +} msgtype_t;
++
++void say_cmd(char *arg, msgtype_t msgtype);
+#endif
+-gboolean cmd_is_safe(const gchar *name);
 void cmd_room_whois(gpointer bud, const char *nick, guint interactive);
 void cmd_room_leave(gpointer bud, char *arg);
 -void cmd_setstatus(const char *recipient, const char *arg);
 -void say_cmd(char *arg, int parse_flags);
-+void cmd_setstatus(const char *recipient,
-+                   const char *status, const char *message);
-+void say_cmd(char *arg, msgtype_t msgtype);
 #endif /* __MCABBER_COMMANDS_H__ */
 diff -r 1b0b563a81e6 mcabber/mcabber/hooks.c
 --- a/mcabber/mcabber/hooks.c	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/hooks.c	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/mcabber/hooks.c	Mon Mar 18 02:16:22 2013 +0200
 @@ -638,10 +638,9 @@
 scr_LogPrint(LPRINT_LOGNORM, "Running hook-post-connect...");
 -  cmdline = from_utf8(hook_command);
 g_free(cmdline);
 }
 diff -r 1b0b563a81e6 mcabber/mcabber/roster.c
 --- a/mcabber/mcabber/roster.c	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/roster.c	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/mcabber/roster.c	Mon Mar 18 02:16:22 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 1b0b563a81e6 mcabber/mcabber/screen.c
 --- a/mcabber/mcabber/screen.c	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/screen.c	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/mcabber/screen.c	Mon Mar 18 02:16:22 2013 +0200
 @@ -3630,7 +3630,7 @@
 {
 scr_check_auto_away(TRUE);
 last_activity_buddy = current_buddy;
 -  if (process_line(inputLine))
 g_free(cmdline);
 return 0;
 }
 diff -r 1b0b563a81e6 mcabber/mcabber/settings.c
 --- a/mcabber/mcabber/settings.c	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/settings.c	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/mcabber/settings.c	Mon Mar 18 02:16:22 2013 +0200
 @@ -183,28 +183,12 @@
 if ((*line == '\n') || (*line == '\0') || (*line == '#'))
 continue;
 -    // If we aren't in runtime (i.e. startup) we'll only accept "safe" commands
 }
 g_free(buf);
 fclose(fp);
 diff -r 1b0b563a81e6 mcabber/mcabber/xmpp_iq.c
 --- a/mcabber/mcabber/xmpp_iq.c	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/xmpp_iq.c	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/mcabber/xmpp_iq.c	Mon Mar 18 02:16:22 2013 +0200
 @@ -71,20 +71,20 @@
 struct adhoc_status {
 char *name;   // the name used by adhoc
 char *description;
 -  char *status; // the string, used by setstus
 lm_message_node_set_attribute(command, "status", "completed");
 lm_message_node_add_dataform_result(command,
 "Status has been changed");
 diff -r 1b0b563a81e6 mcabber/modules/beep/beep.c
 --- a/mcabber/modules/beep/beep.c	Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/modules/beep/beep.c	Wed Mar 13 17:51:29 2013 +0200
++++ b/mcabber/modules/beep/beep.c	Mon Mar 18 02:16:22 2013 +0200
 @@ -31,6 +31,7 @@
 static void beep_init   (void);
 static void beep_uninit (void);
-+static gchar *do_beep (cmdopts_t *command);
++static gchar *do_beep (cmdopts_t *command, cmdarg_value_t *values);
 /* Module description */
 module_info_t info_beep = {
 @@ -46,9 +47,7 @@
 .next            = NULL,
 -static guint    beep_hid  = 0;  /* Hook handler id */
 +static guint beep_hid  = 0;  /* Hook handler id */
 /* Event handler */
 static guint beep_hh(const gchar *hookname, hk_arg_t *args, gpointer userdata)
-@@ -61,20 +60,38 @@
+@@ -61,20 +60,42 @@
 return HOOK_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
 }
 +static const string2enum_t s2e_onoff[] = {
 +  { "on",      1  },
 +  { "0",       0  },
 +  { "show",    2  },
 +  { NULL,      0  },
 +};
 +
++typedef enum {
++  pos_beep_enable = 0,
++} pos_beep_t;
++
 +static cmdopts_t def_beep = {
 +  "beep",
 +  cmd_default,
 +  NULL,
 +  do_beep,
 +  NULL,
 +  (cmdarg_t[2]){
-+    {"on|off", cmdarg_chreq, "show", &cmdarg_type_string2enum, (gpointer)s2e_onoff},
++    {"on|off", pos_beep_enable, cmdarg_chreq, "show", &cmdarg_type_string2enum, (gpointer)s2e_onoff},
 +    {NULL}
 +  },
 +  NULL
 +};
 +
 /* beep command handler */
 -static void do_beep(char *args)
-+static gchar *do_beep(cmdopts_t *command)
++static gchar *do_beep(cmdopts_t *command, cmdarg_value_t *values)
 {
 /* Check arguments, and if recognized,
 * set mcabber option accordingly */
 -  if (!strcmp(args, "enable") ||
 -      !strcmp(args, "on") ||
 -      !strcmp(args, "yes") ||
 -      !strcmp(args, "1"))
-+  if (command -> args[0].value.uint == 1)
++  if (values[pos_beep_enable].value.uint == 1)
 settings_set(SETTINGS_TYPE_OPTION, "beep_enable", "1");
 -  else if (!strcmp(args, "disable") ||
 -           !strcmp(args, "off") ||
 -           !strcmp(args, "no") ||
 -           !strcmp(args, "0"))
-+  else if (command -> args[0].value.uint == 0)
++  else if (values[pos_beep_enable].value.uint == 0)
 settings_set(SETTINGS_TYPE_OPTION, "beep_enable", "0");
 /* Output current state, either if state is
-@@ -83,19 +100,14 @@
+@@ -83,19 +104,14 @@
 scr_log_print(LPRINT_NORMAL, "Beep on messages is enabled");
 else
 scr_log_print(LPRINT_NORMAL, "Beep on messages is disabled");
 +  return NULL;
 }
 -  beep_cmid = cmd_add("beep", "", beep_cid, 0, do_beep, NULL);
 +  cmd_define(&def_beep);
 /* Add handler
 * We are only interested in incoming message events
 */
-@@ -109,11 +121,7 @@
+@@ -109,11 +125,7 @@
 /* Unregister event handler */
 hk_del_handler(HOOK_POST_MESSAGE_IN, beep_hid);
 /* Unregister command */
 -  cmd_del(beep_cmid);
 -  /* Give back completion handle */

changeset 79	07e696e91b6f
parent 78	ee30584c654b
child 80	93088d0c8140