blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Window management

Browse Source
This commit is contained in:
Sebastien Helleu 2004-07-01 20:43:57 +00:00
parent 66ff97166f
commit 062e5ea1ae
44 changed files with 4396 additions and 4184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BUGS
View File

@ -1,12 +1,13 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
WeeChat known bugs, 2004-06-05
WeeChat known bugs, 2004-07-01
- ./configure does not check that Curses headers are installed
- ./configure does not check that Gtk 2.0 libraries are installed
- ./configure does not check that Perl headers & libraries are installed
- too much nicks in the channel (> height of window) => display bug
- problem when resizing terminal and that some windows are outside new term size
- some IRC commands are marked as 'unknown' when received
(IRC protocol is under dev!)
- too much opened channels => display bug

2
ChangeLog
View File

@ -1,7 +1,7 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2004-06-23
ChangeLog - 2004-07-01
Version 0.0.7 (under dev!):

2
TODO
View File

@ -1,7 +1,7 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
TODO - 2004-06-23
TODO - 2004-07-01
Legend:
# done

5
configure.in
View File

@ -110,10 +110,11 @@ AC_SUBST(PLUGINS_LIBS)
if test "x$enable_debug" = "xyes" ; then
AC_DEFINE(DEBUG)
CFLAGS="-Wall -W -pipe -O2 -g"
else
CFLAGS="-Wall -W -pipe -O2"
fi
CFLAGS="-Wall -W -pipe -O2"
AC_OUTPUT([Makefile
src/Makefile
src/common/Makefile

200
po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.0.7-pre2\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2004-06-05 10:52+0200\n"
"POT-Creation-Date: 2004-06-27 15:36+0200\n"
"PO-Revision-Date: 2004-06-05 10:52+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -1172,7 +1172,7 @@ msgstr "%s utilisateur non trouv
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
#: src/irc/irc-send.c:547 src/common/command.c:1118
#: src/irc/irc-send.c:547 src/common/command.c:1126
#, c-format
msgid "%s wrong argument count for \"%s\" command\n"
msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n"
@ -1618,11 +1618,11 @@ msgstr ""
"%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire "
"insuffisante)\n"
#: src/gui/curses/gui-display.c:952
#: src/gui/curses/gui-display.c:919
msgid "[not connected] "
msgstr "[non connecté] "
#: src/gui/curses/gui-display.c:959 src/gui/curses/gui-display.c:962
#: src/gui/curses/gui-display.c:927 src/gui/curses/gui-display.c:930
msgid "-MORE-"
msgstr "-PLUS-"
@ -1630,17 +1630,17 @@ msgstr "-PLUS-"
msgid "server"
msgstr "serveur"
#: src/gui/gui-common.c:217
#: src/gui/gui-common.c:303
#, c-format
msgid "%s not enough memory for infobar message\n"
msgstr "%s pas assez de mémoire pour un message de la barre d'infos\n"
#: src/gui/gui-common.c:323
#: src/gui/gui-common.c:421
#, c-format
msgid "%s not enough memory for new line!\n"
msgstr "%s pas assez de mémoire pour une nouvelle ligne !\n"
#: src/gui/gui-common.c:350
#: src/gui/gui-common.c:464
msgid "not enough memory!\n"
msgstr "pas assez de mémoire !\n"
@ -1798,29 +1798,52 @@ msgstr "nom_alias"
msgid "alias_name: name of alias to remove"
msgstr "nom_alias: nom de l'alias à supprimer"
#: src/common/command.c:340
#: src/common/command.c:91
msgid "manage windows"
msgstr "gestion des fenêtres"
#: src/common/command.c:92
msgid "[action]"
msgstr "[action]"
#: src/common/command.c:93
msgid ""
"action: action to do:\n"
" close close current window (under development!)\n"
" list list opened windows (no parameter implies this list)\n"
" splith split current window horizontally\n"
" splitv split current window vertically"
msgstr ""
"action: action à effectuer:\n"
" close ferme la fenêtre courante (en développement !)\n"
" list liste toutes les fenêtres ouvertes (pas de paramètre affiche cette "
"liste)\n"
" splith éclate la fenêtre en deux horizontalement\n"
" splitv éclate la fenêtre en deux verticalement"
#: src/common/command.c:348
#, c-format
msgid "%s alias or command \"%s\" already exists!\n"
msgstr "%s l'alias ou la commande \"%s\" existe déjà !\n"
#: src/common/command.c:349
#: src/common/command.c:357
#, c-format
msgid "%s alias cannot run another alias!\n"
msgstr "%s l'alias ne peux pas lancer un autre alias !\n"
#: src/common/command.c:355
#: src/common/command.c:363
#, c-format
msgid "%s target command \"%s\" does not exist!\n"
msgstr "%s la commande cible \"%s\" n'existe pas !\n"
#: src/common/command.c:541
#: src/common/command.c:549
#, c-format
msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
msgstr ""
"%s nombre de paramètres incorrect pour la commande %s \"%s\" (attendu: %d "
"paramètre%s)\n"
#: src/common/command.c:550
#: src/common/command.c:558
#, c-format
msgid ""
"%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
@ -1829,19 +1852,19 @@ msgstr ""
"%s nombre de paramètres incorrect pour la commande %s \"%s\" (attendu: entre "
"%d et %d paramètre%s)\n"
#: src/common/command.c:569
#: src/common/command.c:577
#, c-format
msgid "%s %s command \"%s\" failed\n"
msgstr "%s %s la commande \"%s\" a échoué\n"
#: src/common/command.c:594
#: src/common/command.c:602
#, c-format
msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
msgstr ""
"%s nombre de paramètres incorrect pour la commande IRC \"%s\" (attendu: %d "
"paramètre%s)\n"
#: src/common/command.c:603
#: src/common/command.c:611
#, c-format
msgid ""
"%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
@ -1850,134 +1873,134 @@ msgstr ""
"%s nombre de paramètres incorrect pour la commande IRC \"%s\" (attendu: "
"entre %d et %d paramètre%s)\n"
#: src/common/command.c:616
#: src/common/command.c:624
#, c-format
msgid "%s command \"%s\" needs a server connection!\n"
msgstr "%s la commande \"%s\" nécessite une connexion au serveur !\n"
#: src/common/command.c:628
#: src/common/command.c:636
#, c-format
msgid "%s IRC command \"%s\" failed\n"
msgstr "%s la commande IRC \"%s\" a échoué\n"
#: src/common/command.c:675
#: src/common/command.c:683
#, c-format
msgid "%s unknown command \"%s\" (type /help for help)\n"
msgstr "%s commande \"%s\" inconnue (tapez /help pour l'aide)\n"
#: src/common/command.c:744
#: src/common/command.c:752
#, c-format
msgid "%s cannot find nick for sending message\n"
msgstr "%s impossible de trouver le pseudo pour envoyer le message\n"
#: src/common/command.c:750
#: src/common/command.c:758
msgid "This window is not a channel!\n"
msgstr "Cette fenêtre n'est pas un canal !\n"
#: src/common/command.c:776 src/common/command.c:788
#: src/common/command.c:784 src/common/command.c:796
#, c-format
msgid "%s missing arguments for \"%s\" command\n"
msgstr "%s paramètres manquants pour la commande \"%s\"\n"
#: src/common/command.c:783
#: src/common/command.c:791
#, c-format
msgid "Alias \"%s\" => \"%s\" created\n"
msgstr "Alias \"%s\" => \"%s\" créé\n"
#: src/common/command.c:798
#: src/common/command.c:806
msgid "List of aliases:\n"
msgstr "Liste des alias:\n"
#: src/common/command.c:808
#: src/common/command.c:816
msgid "No alias defined.\n"
msgstr "Aucun alias défini.\n"
#: src/common/command.c:827
#: src/common/command.c:835
#, c-format
msgid "unknown parameter \"%s\" for \"%s\" command\n"
msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n"
#: src/common/command.c:856
#: src/common/command.c:864
#, c-format
msgid "%s already connected to server \"%s\"!\n"
msgstr "%s déjà connecté au serveur \"%s\" !\n"
#: src/common/command.c:879 src/common/command.c:914
#: src/common/command.c:887 src/common/command.c:922
#, c-format
msgid "%s server \"%s\" not found\n"
msgstr "%s serveur \"%s\" non trouvé\n"
#: src/common/command.c:904
#: src/common/command.c:912
#, c-format
msgid "%s not connected to server \"%s\"!\n"
msgstr "%s non connecté au serveur \"%s\" !\n"
#: src/common/command.c:933
#: src/common/command.c:941
#, c-format
msgid "> List of %s internal commands:\n"
msgstr "> Liste des commandes internes %s:\n"
#: src/common/command.c:938
#: src/common/command.c:946
msgid "> List of IRC commands:\n"
msgstr "> Liste des commandes IRC:\n"
#: src/common/command.c:953
#: src/common/command.c:961
#, c-format
msgid "> Help on %s internal command \"%s\":\n"
msgstr "> Aide sur la commande interne %s \"%s\":\n"
#: src/common/command.c:956 src/common/command.c:977
#: src/common/command.c:964 src/common/command.c:985
#, c-format
msgid "Syntax: /%s %s\n"
msgstr "Syntaxe: /%s %s\n"
#: src/common/command.c:975
#: src/common/command.c:983
#, c-format
msgid "> Help on IRC command \"%s\":\n"
msgstr "> Aide sur la commande IRC \"%s\":\n"
#: src/common/command.c:991
#: src/common/command.c:999
#, c-format
msgid "No help available, \"%s\" is an unknown command\n"
msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n"
#: src/common/command.c:1016
#: src/common/command.c:1024
msgid "Registered Perl scripts:\n"
msgstr "Scripts Perl enregistrés :\n"
#: src/common/command.c:1033 src/common/command.c:1055
#: src/common/command.c:1077
#: src/common/command.c:1041 src/common/command.c:1063
#: src/common/command.c:1085
msgid " (none)\n"
msgstr " (aucun)\n"
#: src/common/command.c:1038
#: src/common/command.c:1046
msgid "Perl message handlers:\n"
msgstr "Fonctions Perl pour messages :\n"
#: src/common/command.c:1047
#: src/common/command.c:1055
#, c-format
msgid " IRC(%s) => Perl(%s)\n"
msgstr " IRC(%s) => Perl(%s)\n"
#: src/common/command.c:1060
#: src/common/command.c:1068
msgid "Perl command handlers:\n"
msgstr "Commandes Perl :\n"
#: src/common/command.c:1069
#: src/common/command.c:1077
#, c-format
msgid " Command /%s => Perl(%s)\n"
msgstr " Commande /%s => Perl(%s)\n"
#: src/common/command.c:1087
#: src/common/command.c:1095
msgid "Perl scripts unloaded\n"
msgstr "Scripts Perl déchargés\n"
#: src/common/command.c:1112
#: src/common/command.c:1120
#, c-format
msgid "%s unknown option for \"%s\" command\n"
msgstr "%s option inconnue pour la commande \"%s\"\n"
#: src/common/command.c:1123
#: src/common/command.c:1131
msgid ""
"WeeChat was build without Perl support.\n"
"Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
@ -1986,193 +2009,194 @@ msgstr ""
"Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le "
"script ./configure\n"
#: src/common/command.c:1167
#: src/common/command.c:1175
msgid "Server: "
msgstr "Serveur: "
#: src/common/command.c:1178
#: src/common/command.c:1186
msgid "connected"
msgstr "connecté"
#: src/common/command.c:1178
#: src/common/command.c:1186
msgid "not connected"
msgstr "non connecté"
#: src/common/command.c:1185
#: src/common/command.c:1193
#, c-format
msgid " Autoconnect: %s%s\n"
msgstr " Autoconnect: %s%s\n"
#: src/common/command.c:1186
#: src/common/command.c:1194
msgid "yes"
msgstr "oui"
#: src/common/command.c:1186
#: src/common/command.c:1194
msgid "no"
msgstr "non"
#: src/common/command.c:1188
#: src/common/command.c:1196
msgid " (temporary server, will not be saved)"
msgstr " (serveur temporaire, ne sera pas sauvé)"
#: src/common/command.c:1193
#: src/common/command.c:1201
#, c-format
msgid " Hostname : %s\n"
msgstr " Nom/IP : %s\n"
#: src/common/command.c:1198
#: src/common/command.c:1206
#, c-format
msgid " Port : %d\n"
msgstr " Port : %d\n"
#: src/common/command.c:1204
#: src/common/command.c:1212
msgid " Password : (hidden)\n"
msgstr " Mot passe : (caché)\n"
#: src/common/command.c:1208
#: src/common/command.c:1216
msgid " Password : (none)\n"
msgstr " Mot passe : (aucun)\n"
#: src/common/command.c:1212
#: src/common/command.c:1220
#, c-format
msgid " Nicks : %s"
msgstr " Pseudos : %s"
#: src/common/command.c:1229
#: src/common/command.c:1237
#, c-format
msgid " Username : %s\n"
msgstr " Nom utilis.: %s\n"
#: src/common/command.c:1234
#: src/common/command.c:1242
#, c-format
msgid " Realname : %s\n"
msgstr " Nom réel : %s\n"
#: src/common/command.c:1240
#: src/common/command.c:1248
#, c-format
msgid " Command : %s\n"
msgstr " Commande : %s\n"
#: src/common/command.c:1245
#: src/common/command.c:1253
msgid " Command : (none)\n"
msgstr " Commande : (aucune)\n"
#: src/common/command.c:1250
#: src/common/command.c:1258
#, c-format
msgid " Auto-join : %s\n"
msgstr " Auto-join : %s\n"
#: src/common/command.c:1255
#: src/common/command.c:1263
msgid " Auto-join : (none)\n"
msgstr " Auto-join : (aucun)\n"
#: src/common/command.c:1259
#: src/common/command.c:1267
msgid "No server.\n"
msgstr "Pas de serveur.\n"
#: src/common/command.c:1268
#: src/common/command.c:1276
#, c-format
msgid "%s missing servername for \"%s\" command\n"
msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n"
#: src/common/command.c:1274
#: src/common/command.c:1282
#, c-format
msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
msgstr "%s trop de paramètres pour la commande \"%s\", paramètres ignorés\n"
#: src/common/command.c:1291
#: src/common/command.c:1299
#, c-format
msgid "%s server \"%s\" not found for \"%s\" command\n"
msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n"
#: src/common/command.c:1297 src/common/command.c:1428
#: src/common/command.c:1305 src/common/command.c:1436
msgid "Server"
msgstr "Serveur"
#: src/common/command.c:1300
#: src/common/command.c:1308
msgid "has been deleted\n"
msgstr "a été supprimé\n"
#: src/common/command.c:1314
#: src/common/command.c:1322
#, c-format
msgid "%s missing parameters for \"%s\" command\n"
msgstr "%s paramètres manquants pour la commande \"%s\"\n"
#: src/common/command.c:1323
#: src/common/command.c:1331
#, c-format
msgid "%s server \"%s\" already exists, can't create it!\n"
msgstr "%s le serveur \"%s\" existe déjà, impossible de le créer !\n"
#: src/common/command.c:1347 src/common/command.c:1373
#: src/common/command.c:1385 src/common/command.c:1409
#: src/common/command.c:1355 src/common/command.c:1381
#: src/common/command.c:1393 src/common/command.c:1417
#, c-format
msgid "%s missing password for \"%s\" parameter\n"
msgstr "%s mot de passe manquant pour le paramètre \"%s\"\n"
#: src/common/command.c:1359
#: src/common/command.c:1367
#, c-format
msgid "%s missing nick(s) for \"%s\" parameter\n"
msgstr "%s pseudo(s) manquant(s) pour le paramètre \"%s\"\n"
#: src/common/command.c:1397
#: src/common/command.c:1405
#, c-format
msgid "%s missing command for \"%s\" parameter\n"
msgstr "%s commande manquante pour le paramètre \"%s\"\n"
#: src/common/command.c:1431
#: src/common/command.c:1439
msgid "created\n"
msgstr "créé\n"
#: src/common/command.c:1436
#: src/common/command.c:1444
#, c-format
msgid "%s unable to create server\n"
msgstr "%s impossible de créer le serveur\n"
#: src/common/command.c:1490
#: src/common/command.c:1498
#, c-format
msgid "%s option '%s' can not be changed while WeeChat is running\n"
msgstr "%s l'option '%s' ne peut pas être changée lorsque WeeChat tourne\n"
#: src/common/command.c:1502
#: src/common/command.c:1510
#, c-format
msgid "%s incorrect value for option '%s'\n"
msgstr "%s valeur incorrecte pour l'option '%s'\n"
#: src/common/command.c:1508
#: src/common/command.c:1516
#, c-format
msgid "%s config option '%s' not found\n"
msgstr "%s option de configuration '%s' non trouvée\n"
#: src/common/command.c:1558
#: src/common/command.c:1566
msgid "(unknown)"
msgstr "(inconnu)"
#: src/common/command.c:1578 src/common/command.c:1581
#: src/common/command.c:1586 src/common/command.c:1589
#, c-format
msgid "No config option found with '%s'\n"
msgstr "Aucune option de configuration trouvée avec '%s'\n"
#: src/common/command.c:1586
#: src/common/command.c:1594
#, c-format
msgid "%d config option(s) found with '%s'\n"
msgstr "%d option(s) de configuration trouvées avec '%s'\n"
#: src/common/command.c:1589
#: src/common/command.c:1597
#, c-format
msgid "%d config option(s) found\n"
msgstr "%d option(s) de configuration trouvées\n"
#: src/common/command.c:1609
#: src/common/command.c:1617
#, c-format
msgid "%s alias or command \"%s\" not found\n"
msgstr "%s alias ou commande \"%s\" non trouvé\n"
#: src/common/command.c:1618
#: src/common/command.c:1626
#, c-format
msgid "Alias \"%s\" removed\n"
msgstr "Alias \"%s\" supprimé\n"
#: src/common/weechat.c:118
#, c-format
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
"\n"
@ -2181,6 +2205,7 @@ msgstr ""
"\n"
#: src/common/weechat.c:131
#, c-format
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr " . type booléen (valeurs: 'on' ou 'off')\n"
@ -2201,6 +2226,7 @@ msgid " . default value: %d\n"
msgstr " . valeur par défaut: %d\n"
#: src/common/weechat.c:144
#, c-format
msgid " . type string (values: "
msgstr " . type chaîne (valeurs: "
@ -2209,10 +2235,12 @@ msgid "empty"
msgstr "vide"
#: src/common/weechat.c:160
#, c-format
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr " . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n"
#: src/common/weechat.c:166
#, c-format
msgid " . type string (any string)\n"
msgstr " . type chaîne (toute chaîne)\n"
@ -2226,6 +2254,7 @@ msgstr ""
"\n"
#: src/common/weechat.c:178
#, c-format
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
msgstr ""
@ -2233,6 +2262,7 @@ msgstr ""
"des lignes comme :\n"
#: src/common/weechat.c:180
#, c-format
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
"\n"

218
po/weechat.pot
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2004-06-05 10:52+0200\n"
"POT-Creation-Date: 2004-06-27 15:36+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -1078,7 +1078,7 @@ msgstr ""
msgid "%s cannot create new private window \"%s\"\n"
msgstr ""
#: src/irc/irc-send.c:547 src/common/command.c:1118
#: src/irc/irc-send.c:547 src/common/command.c:1126
#, c-format
msgid "%s wrong argument count for \"%s\" command\n"
msgstr ""
@ -1511,11 +1511,11 @@ msgstr ""
msgid "%s unable to add handler for \"%s\" message (not enough memory)\n"
msgstr ""
#: src/gui/curses/gui-display.c:952
#: src/gui/curses/gui-display.c:919
msgid "[not connected] "
msgstr ""
#: src/gui/curses/gui-display.c:959 src/gui/curses/gui-display.c:962
#: src/gui/curses/gui-display.c:927 src/gui/curses/gui-display.c:930
msgid "-MORE-"
msgstr ""
@ -1523,17 +1523,17 @@ msgstr ""
msgid "server"
msgstr ""
#: src/gui/gui-common.c:217
#: src/gui/gui-common.c:303
#, c-format
msgid "%s not enough memory for infobar message\n"
msgstr ""
#: src/gui/gui-common.c:323
#: src/gui/gui-common.c:421
#, c-format
msgid "%s not enough memory for new line!\n"
msgstr ""
#: src/gui/gui-common.c:350
#: src/gui/gui-common.c:464
msgid "not enough memory!\n"
msgstr ""
@ -1672,376 +1672,395 @@ msgstr ""
msgid "alias_name: name of alias to remove"
msgstr ""
#: src/common/command.c:340
#: src/common/command.c:91
msgid "manage windows"
msgstr ""
#: src/common/command.c:92
msgid "[action]"
msgstr ""
#: src/common/command.c:93
msgid ""
"action: action to do:\n"
" close close current window (under development!)\n"
" list list opened windows (no parameter implies this list)\n"
" splith split current window horizontally\n"
" splitv split current window vertically"
msgstr ""
#: src/common/command.c:348
#, c-format
msgid "%s alias or command \"%s\" already exists!\n"
msgstr ""
#: src/common/command.c:349
#: src/common/command.c:357
#, c-format
msgid "%s alias cannot run another alias!\n"
msgstr ""
#: src/common/command.c:355
#: src/common/command.c:363
#, c-format
msgid "%s target command \"%s\" does not exist!\n"
msgstr ""
#: src/common/command.c:541
#: src/common/command.c:549
#, c-format
msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
msgstr ""
#: src/common/command.c:550
#: src/common/command.c:558
#, c-format
msgid ""
"%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
"arg%s)\n"
msgstr ""
#: src/common/command.c:569
#: src/common/command.c:577
#, c-format
msgid "%s %s command \"%s\" failed\n"
msgstr ""
#: src/common/command.c:594
#: src/common/command.c:602
#, c-format
msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
msgstr ""
#: src/common/command.c:603
#: src/common/command.c:611
#, c-format
msgid ""
"%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
"arg%s)\n"
msgstr ""
#: src/common/command.c:616
#: src/common/command.c:624
#, c-format
msgid "%s command \"%s\" needs a server connection!\n"
msgstr ""
#: src/common/command.c:628
#: src/common/command.c:636
#, c-format
msgid "%s IRC command \"%s\" failed\n"
msgstr ""
#: src/common/command.c:675
#: src/common/command.c:683
#, c-format
msgid "%s unknown command \"%s\" (type /help for help)\n"
msgstr ""
#: src/common/command.c:744
#: src/common/command.c:752
#, c-format
msgid "%s cannot find nick for sending message\n"
msgstr ""
#: src/common/command.c:750
#: src/common/command.c:758
msgid "This window is not a channel!\n"
msgstr ""
#: src/common/command.c:776 src/common/command.c:788
#: src/common/command.c:784 src/common/command.c:796
#, c-format
msgid "%s missing arguments for \"%s\" command\n"
msgstr ""
#: src/common/command.c:783
#: src/common/command.c:791
#, c-format
msgid "Alias \"%s\" => \"%s\" created\n"
msgstr ""
#: src/common/command.c:798
#: src/common/command.c:806
msgid "List of aliases:\n"
msgstr ""
#: src/common/command.c:808
#: src/common/command.c:816
msgid "No alias defined.\n"
msgstr ""
#: src/common/command.c:827
#: src/common/command.c:835
#, c-format
msgid "unknown parameter \"%s\" for \"%s\" command\n"
msgstr ""
#: src/common/command.c:856
#: src/common/command.c:864
#, c-format
msgid "%s already connected to server \"%s\"!\n"
msgstr ""
#: src/common/command.c:879 src/common/command.c:914
#: src/common/command.c:887 src/common/command.c:922
#, c-format
msgid "%s server \"%s\" not found\n"
msgstr ""
#: src/common/command.c:904
#: src/common/command.c:912
#, c-format
msgid "%s not connected to server \"%s\"!\n"
msgstr ""
#: src/common/command.c:933
#: src/common/command.c:941
#, c-format
msgid "> List of %s internal commands:\n"
msgstr ""
#: src/common/command.c:938
#: src/common/command.c:946
msgid "> List of IRC commands:\n"
msgstr ""
#: src/common/command.c:953
#: src/common/command.c:961
#, c-format
msgid "> Help on %s internal command \"%s\":\n"
msgstr ""
#: src/common/command.c:956 src/common/command.c:977
#: src/common/command.c:964 src/common/command.c:985
#, c-format
msgid "Syntax: /%s %s\n"
msgstr ""
#: src/common/command.c:975
#: src/common/command.c:983
#, c-format
msgid "> Help on IRC command \"%s\":\n"
msgstr ""
#: src/common/command.c:991
#: src/common/command.c:999
#, c-format
msgid "No help available, \"%s\" is an unknown command\n"
msgstr ""
#: src/common/command.c:1016
#: src/common/command.c:1024
msgid "Registered Perl scripts:\n"
msgstr ""
#: src/common/command.c:1033 src/common/command.c:1055
#: src/common/command.c:1077
#: src/common/command.c:1041 src/common/command.c:1063
#: src/common/command.c:1085
msgid " (none)\n"
msgstr ""
#: src/common/command.c:1038
#: src/common/command.c:1046
msgid "Perl message handlers:\n"
msgstr ""
#: src/common/command.c:1047
#: src/common/command.c:1055
#, c-format
msgid " IRC(%s) => Perl(%s)\n"
msgstr ""
#: src/common/command.c:1060
#: src/common/command.c:1068
msgid "Perl command handlers:\n"
msgstr ""
#: src/common/command.c:1069
#: src/common/command.c:1077
#, c-format
msgid " Command /%s => Perl(%s)\n"
msgstr ""
#: src/common/command.c:1087
#: src/common/command.c:1095
msgid "Perl scripts unloaded\n"
msgstr ""
#: src/common/command.c:1112
#: src/common/command.c:1120
#, c-format
msgid "%s unknown option for \"%s\" command\n"
msgstr ""
#: src/common/command.c:1123
#: src/common/command.c:1131
msgid ""
"WeeChat was build without Perl support.\n"
"Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
msgstr ""
#: src/common/command.c:1167
#: src/common/command.c:1175
msgid "Server: "
msgstr ""
#: src/common/command.c:1178
#: src/common/command.c:1186
msgid "connected"
msgstr ""
#: src/common/command.c:1178
#: src/common/command.c:1186
msgid "not connected"
msgstr ""
#: src/common/command.c:1185
#, c-format
msgid " Autoconnect: %s%s\n"
msgstr ""
#: src/common/command.c:1186
msgid "yes"
msgstr ""
#: src/common/command.c:1186
msgid "no"
msgstr ""
#: src/common/command.c:1188
msgid " (temporary server, will not be saved)"
msgstr ""
#: src/common/command.c:1193
#, c-format
msgid " Autoconnect: %s%s\n"
msgstr ""
#: src/common/command.c:1194
msgid "yes"
msgstr ""
#: src/common/command.c:1194
msgid "no"
msgstr ""
#: src/common/command.c:1196
msgid " (temporary server, will not be saved)"
msgstr ""
#: src/common/command.c:1201
#, c-format
msgid " Hostname : %s\n"
msgstr ""
#: src/common/command.c:1198
#: src/common/command.c:1206
#, c-format
msgid " Port : %d\n"
msgstr ""
#: src/common/command.c:1204
#: src/common/command.c:1212
msgid " Password : (hidden)\n"
msgstr ""
#: src/common/command.c:1208
#: src/common/command.c:1216
msgid " Password : (none)\n"
msgstr ""
#: src/common/command.c:1212
#: src/common/command.c:1220
#, c-format
msgid " Nicks : %s"
msgstr ""
#: src/common/command.c:1229
#: src/common/command.c:1237
#, c-format
msgid " Username : %s\n"
msgstr ""
#: src/common/command.c:1234
#: src/common/command.c:1242
#, c-format
msgid " Realname : %s\n"
msgstr ""
#: src/common/command.c:1240
#: src/common/command.c:1248
#, c-format
msgid " Command : %s\n"
msgstr ""
#: src/common/command.c:1245
#: src/common/command.c:1253
msgid " Command : (none)\n"
msgstr ""
#: src/common/command.c:1250
#: src/common/command.c:1258
#, c-format
msgid " Auto-join : %s\n"
msgstr ""
#: src/common/command.c:1255
#: src/common/command.c:1263
msgid " Auto-join : (none)\n"
msgstr ""
#: src/common/command.c:1259
#: src/common/command.c:1267
msgid "No server.\n"
msgstr ""
#: src/common/command.c:1268
#: src/common/command.c:1276
#, c-format
msgid "%s missing servername for \"%s\" command\n"
msgstr ""
#: src/common/command.c:1274
#: src/common/command.c:1282
#, c-format
msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
msgstr ""
#: src/common/command.c:1291
#: src/common/command.c:1299
#, c-format
msgid "%s server \"%s\" not found for \"%s\" command\n"
msgstr ""
#: src/common/command.c:1297 src/common/command.c:1428
#: src/common/command.c:1305 src/common/command.c:1436
msgid "Server"
msgstr ""
#: src/common/command.c:1300
#: src/common/command.c:1308
msgid "has been deleted\n"
msgstr ""
#: src/common/command.c:1314
#: src/common/command.c:1322
#, c-format
msgid "%s missing parameters for \"%s\" command\n"
msgstr ""
#: src/common/command.c:1323
#: src/common/command.c:1331
#, c-format
msgid "%s server \"%s\" already exists, can't create it!\n"
msgstr ""
#: src/common/command.c:1347 src/common/command.c:1373
#: src/common/command.c:1385 src/common/command.c:1409
#: src/common/command.c:1355 src/common/command.c:1381
#: src/common/command.c:1393 src/common/command.c:1417
#, c-format
msgid "%s missing password for \"%s\" parameter\n"
msgstr ""
#: src/common/command.c:1359
#: src/common/command.c:1367
#, c-format
msgid "%s missing nick(s) for \"%s\" parameter\n"
msgstr ""
#: src/common/command.c:1397
#: src/common/command.c:1405
#, c-format
msgid "%s missing command for \"%s\" parameter\n"
msgstr ""
#: src/common/command.c:1431
#: src/common/command.c:1439
msgid "created\n"
msgstr ""
#: src/common/command.c:1436
#: src/common/command.c:1444
#, c-format
msgid "%s unable to create server\n"
msgstr ""
#: src/common/command.c:1490
#: src/common/command.c:1498
#, c-format
msgid "%s option '%s' can not be changed while WeeChat is running\n"
msgstr ""
#: src/common/command.c:1502
#: src/common/command.c:1510
#, c-format
msgid "%s incorrect value for option '%s'\n"
msgstr ""
#: src/common/command.c:1508
#: src/common/command.c:1516
#, c-format
msgid "%s config option '%s' not found\n"
msgstr ""
#: src/common/command.c:1558
#: src/common/command.c:1566
msgid "(unknown)"
msgstr ""
#: src/common/command.c:1578 src/common/command.c:1581
#: src/common/command.c:1586 src/common/command.c:1589
#, c-format
msgid "No config option found with '%s'\n"
msgstr ""
#: src/common/command.c:1586
#: src/common/command.c:1594
#, c-format
msgid "%d config option(s) found with '%s'\n"
msgstr ""
#: src/common/command.c:1589
#: src/common/command.c:1597
#, c-format
msgid "%d config option(s) found\n"
msgstr ""
#: src/common/command.c:1609
#: src/common/command.c:1617
#, c-format
msgid "%s alias or command \"%s\" not found\n"
msgstr ""
#: src/common/command.c:1618
#: src/common/command.c:1626
#, c-format
msgid "Alias \"%s\" removed\n"
msgstr ""
#: src/common/weechat.c:118
#, c-format
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
"\n"
msgstr ""
#: src/common/weechat.c:131
#, c-format
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr ""
@ -2062,6 +2081,7 @@ msgid " . default value: %d\n"
msgstr ""
#: src/common/weechat.c:144
#, c-format
msgid " . type string (values: "
msgstr ""
@ -2070,10 +2090,12 @@ msgid "empty"
msgstr ""
#: src/common/weechat.c:160
#, c-format
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr ""
#: src/common/weechat.c:166
#, c-format
msgid " . type string (any string)\n"
msgstr ""
@ -2085,11 +2107,13 @@ msgid ""
msgstr ""
#: src/common/weechat.c:178
#, c-format
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
msgstr ""
#: src/common/weechat.c:180
#, c-format
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
"\n"

44
src/common/command.c
View File

@ -91,7 +91,7 @@ t_weechat_command weechat_commands[] =
{ "window", N_("manage windows"),
N_("[action]"),
N_("action: action to do:\n"
" close close current window\n"
" close close current window (under development!)\n"
" list list opened windows (no parameter implies this list)\n"
" splith split current window horizontally\n"
" splitv split current window vertically"),
@ -715,46 +715,46 @@ user_command (t_irc_server *server, char *command)
{
if ((command[0] == '/') && (command[1] == '/'))
command++;
if (server && (!VIEW_IS_SERVER(gui_current_view)))
if (server && (!BUFFER_IS_SERVER(gui_current_window->buffer)))
{
server_sendf (server, "PRIVMSG %s :%s\r\n",
CHANNEL(gui_current_view)->name,
CHANNEL(gui_current_window->buffer)->name,
command);
if (VIEW_IS_PRIVATE(gui_current_view))
if (BUFFER_IS_PRIVATE(gui_current_window->buffer))
{
gui_printf_color_type (CHANNEL(gui_current_view)->view,
gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
MSG_TYPE_NICK,
COLOR_WIN_CHAT_DARK, "<");
gui_printf_color_type (CHANNEL(gui_current_view)->view,
gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
MSG_TYPE_NICK,
COLOR_WIN_NICK_SELF,
"%s", server->nick);
gui_printf_color_type (CHANNEL(gui_current_view)->view,
gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
MSG_TYPE_NICK,
COLOR_WIN_CHAT_DARK, "> ");
gui_printf_color_type (CHANNEL(gui_current_view)->view,
gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
MSG_TYPE_MSG,
COLOR_WIN_CHAT, "%s\n", command);
}
else
{
ptr_nick = nick_search (CHANNEL(gui_current_view), server->nick);
ptr_nick = nick_search (CHANNEL(gui_current_window->buffer), server->nick);
if (ptr_nick)
{
irc_display_nick (CHANNEL(gui_current_view)->view, ptr_nick,
irc_display_nick (CHANNEL(gui_current_window->buffer)->buffer, ptr_nick,
MSG_TYPE_NICK, 1, 1, 0);
gui_printf_color (CHANNEL(gui_current_view)->view,
gui_printf_color (CHANNEL(gui_current_window->buffer)->buffer,
COLOR_WIN_CHAT, "%s\n", command);
}
else
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot find nick for sending message\n"),
WEECHAT_ERROR);
}
}
else
gui_printf ((server) ? server->view : NULL,
gui_printf ((server) ? server->buffer : NULL,
_("This window is not a channel!\n"));
}
}
@ -828,7 +828,7 @@ weechat_cmd_clear (int argc, char **argv)
if (argc == 1)
{
if (strcmp (argv[0], "-all") == 0)
gui_view_clear_all ();
gui_buffer_clear_all ();
else
{
gui_printf (NULL,
@ -838,7 +838,7 @@ weechat_cmd_clear (int argc, char **argv)
}
}
else
gui_view_clear (gui_current_view);
gui_buffer_clear (gui_current_window->buffer);
return 0;
}
@ -865,9 +865,9 @@ weechat_cmd_connect (int argc, char **argv)
WEECHAT_ERROR, argv[0]);
return -1;
}
if (!ptr_server->view)
if (!ptr_server->buffer)
{
if (!gui_view_new (gui_current_view->window, ptr_server, NULL, 1))
if (!gui_buffer_new (gui_current_window, ptr_server, NULL, 1))
return -1;
}
if (server_connect (ptr_server))
@ -914,7 +914,7 @@ weechat_cmd_disconnect (int argc, char **argv)
return -1;
}
server_disconnect (ptr_server);
gui_redraw_view_status (gui_current_view);
gui_draw_buffer_status (gui_current_window->buffer, 1);
}
else
{
@ -1308,7 +1308,7 @@ weechat_cmd_server (int argc, char **argv)
gui_printf_color (NULL, COLOR_WIN_CHAT, _("has been deleted\n"));
server_free (server_found);
gui_redraw_view (gui_current_view);
gui_redraw_buffer (gui_current_window->buffer);
return 0;
}
@ -1449,7 +1449,7 @@ weechat_cmd_server (int argc, char **argv)
if (new_server->autoconnect)
{
(void) gui_view_new (gui_current_view->window, new_server, NULL, 1);
(void) gui_buffer_new (gui_current_window, new_server, NULL, 1);
if (server_connect (new_server))
irc_login (new_server);
}
@ -1648,12 +1648,12 @@ weechat_cmd_window (int argc, char **argv)
if (strcasecmp (argv[0], "splith") == 0)
{
/* split window horizontally */
gui_printf (NULL, "window splith -- NOT DEVELOPED!\n");
gui_window_split_horiz (gui_current_window);
}
else if (strcasecmp (argv[0], "splitv") == 0)
{
/* split window vertically */
gui_printf (NULL, "window splitv -- NOT DEVELOPED!\n");
gui_window_split_vertic (gui_current_window);
}
else
return -1;

30
src/common/history.c
View File

@ -44,7 +44,7 @@ int num_history_general = 0;
*/
void
history_add (void *view, char *string)
history_add (void *buffer, char *string)
{
t_history *new_history, *ptr_history;
@ -83,26 +83,26 @@ history_add (void *view, char *string)
{
new_history->text = strdup (string);
if (((t_gui_view *)(view))->history)
((t_gui_view *)(view))->history->prev_history = new_history;
if (((t_gui_buffer *)(buffer))->history)
((t_gui_buffer *)(buffer))->history->prev_history = new_history;
else
((t_gui_view *)(view))->last_history = new_history;
new_history->next_history = ((t_gui_view *)(view))->history;
((t_gui_buffer *)(buffer))->last_history = new_history;
new_history->next_history = ((t_gui_buffer *)(buffer))->history;
new_history->prev_history = NULL;
((t_gui_view *)view)->history = new_history;
((t_gui_view *)(view))->num_history++;
((t_gui_buffer *)buffer)->history = new_history;
((t_gui_buffer *)(buffer))->num_history++;
/* remove one command if necessary */
if ((cfg_history_max_commands > 0)
&& (((t_gui_view *)(view))->num_history > cfg_history_max_commands))
&& (((t_gui_buffer *)(buffer))->num_history > cfg_history_max_commands))
{
ptr_history = ((t_gui_view *)view)->last_history->prev_history;
((t_gui_view *)view)->last_history->prev_history->next_history = NULL;
if (((t_gui_view *)view)->last_history->text)
free (((t_gui_view *)view)->last_history->text);
free (((t_gui_view *)view)->last_history);
((t_gui_view *)view)->last_history = ptr_history;
((t_gui_view *)(view))->num_history++;
ptr_history = ((t_gui_buffer *)buffer)->last_history->prev_history;
((t_gui_buffer *)buffer)->last_history->prev_history->next_history = NULL;
if (((t_gui_buffer *)buffer)->last_history->text)
free (((t_gui_buffer *)buffer)->last_history->text);
free (((t_gui_buffer *)buffer)->last_history);
((t_gui_buffer *)buffer)->last_history = ptr_history;
((t_gui_buffer *)(buffer))->num_history++;
}
}
}

32
src/common/weeconfig.c
View File

@ -109,33 +109,33 @@ t_config_option weechat_options_look[] =
{ "look_nicklist", N_("display nicklist window"),
N_("display nicklist window (for channel windows)"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
NULL, NULL, &cfg_look_nicklist, NULL, config_change_views },
NULL, NULL, &cfg_look_nicklist, NULL, config_change_buffers },
{ "look_nicklist_position", N_("nicklist position"),
N_("nicklist position (top, left, right (default), bottom)"),
OPTION_TYPE_INT_WITH_STRING, 0, 0, 0,
"right", cfg_look_nicklist_position_values, &cfg_look_nicklist_position, NULL, config_change_views },
"right", cfg_look_nicklist_position_values, &cfg_look_nicklist_position, NULL, config_change_buffers },
{ "look_nicklist_min_size", N_("min size for nicklist"),
N_("min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"),
OPTION_TYPE_INT, 0, 100, 0,
NULL, NULL, &cfg_look_nicklist_min_size, NULL, config_change_views },
NULL, NULL, &cfg_look_nicklist_min_size, NULL, config_change_buffers },
{ "look_nicklist_max_size", N_("max size for nicklist"),
N_("max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"),
OPTION_TYPE_INT, 0, 100, 0,
NULL, NULL, &cfg_look_nicklist_max_size, NULL, config_change_views },
NULL, NULL, &cfg_look_nicklist_max_size, NULL, config_change_buffers },
{ "look_no_nickname", N_("text to display instead of nick when not connected"),
N_("text to display instead of nick when not connected"),
OPTION_TYPE_STRING, 0, 0, 0,
"-cmd-", NULL, NULL, &cfg_look_no_nickname, config_change_view_content },
"-cmd-", NULL, NULL, &cfg_look_no_nickname, config_change_buffer_content },
{ "look_nickmode", N_("display nick mode ((half)op/voice) before each nick"),
N_("display nick mode ((half)op/voice) before each nick"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
NULL, NULL, &cfg_look_nickmode, NULL, config_change_views },
NULL, NULL, &cfg_look_nickmode, NULL, config_change_buffers },
{ "look_nickmode_empty", N_("display space if nick mode is not (half)op/voice"),
N_("display space if nick mode is not (half)op/voice"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
NULL, NULL, &cfg_look_nickmode_empty, NULL, config_change_views },
NULL, NULL, &cfg_look_nickmode_empty, NULL, config_change_buffers },
{ "look_nick_completor", N_("the string inserted after nick completion"),
N_("the string inserted after nick completion"),
OPTION_TYPE_STRING, 0, 0, 0,
@ -143,11 +143,11 @@ t_config_option weechat_options_look[] =
{ "look_infobar", N_("enable info bar"),
N_("enable info bar"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
NULL, NULL, &cfg_look_infobar, NULL, config_change_views },
NULL, NULL, &cfg_look_infobar, NULL, config_change_buffers },
{ "look_infobar_timestamp", N_("timestamp for time in infobar"),
N_("timestamp for time in infobar"),
OPTION_TYPE_STRING, 0, 0, 0,
"%B, %A %d %G - %H:%M", NULL, NULL, &cfg_look_infobar_timestamp, config_change_view_content },
"%B, %A %d %G - %H:%M", NULL, NULL, &cfg_look_infobar_timestamp, config_change_buffer_content },
{ "look_infobar_delay_highlight", N_("delay (in seconds) for highlight messages in infobar"),
N_("delay (in seconds) for highlight messages in infobar "
"(0 = disable highlight notifications in infobar)"),
@ -615,24 +615,24 @@ config_change_title ()
}
/*
* config_change_views: called when views change (for example nicklist)
* config_change_buffers: called when buffers change (for example nicklist)
*/
void
config_change_views ()
config_change_buffers ()
{
gui_switch_to_view (gui_current_view);
gui_redraw_view (gui_current_view);
gui_switch_to_buffer (gui_current_window, gui_current_window->buffer);
gui_redraw_buffer (gui_current_window->buffer);
}
/*
* config_change_view_content: called when content of a view changes
* config_change_buffer_content: called when content of a buffer changes
*/
void
config_change_view_content ()
config_change_buffer_content ()
{
gui_redraw_view (gui_current_view);
gui_redraw_buffer (gui_current_window->buffer);
}
/*

4
src/common/weeconfig.h
View File

@ -158,8 +158,8 @@ extern t_config_option * weechat_options [CONFIG_NUMBER_SECTIONS];
extern char *config_get_section ();
extern void config_change_noop ();
extern void config_change_title ();
extern void config_change_views ();
extern void config_change_view_content ();
extern void config_change_buffers ();
extern void config_change_buffer_content ();
extern void config_change_color ();
extern int config_option_set_value (t_config_option *, char *);
extern t_config_option *config_option_search (char *);

1896
src/gui/curses/gui-display.c
View File

File diff suppressed because it is too large Load Diff

315
src/gui/curses/gui-input.c
View File

@ -49,7 +49,7 @@ void
gui_read_keyb ()
{
int key, i;
t_gui_view *ptr_view;
t_gui_buffer *ptr_buffer;
char new_char[2];
key = getch ();
@ -59,16 +59,20 @@ gui_read_keyb ()
{
/* resize event */
case KEY_RESIZE:
gui_calculate_pos_size (gui_current_view);
gui_redraw_view (gui_current_view);
gui_calculate_pos_size (gui_current_window);
gui_redraw_buffer (gui_current_window->buffer);
break;
/* previous view */
/* previous buffer in window */
case KEY_F(6):
gui_switch_to_previous_view ();
gui_switch_to_previous_buffer (gui_current_window);
break;
/* next view */
/* next buffer in window */
case KEY_F(7):
gui_switch_to_next_view ();
gui_switch_to_next_buffer (gui_current_window);
break;
/* next window */
case KEY_F(8):
gui_switch_to_next_window (gui_current_window);
break;
/* remove last infobar message */
case KEY_F(10):
@ -76,205 +80,208 @@ gui_read_keyb ()
break;
/* cursor up */
case KEY_UP:
if (gui_current_view->ptr_history)
if (gui_current_window->buffer->ptr_history)
{
gui_current_view->ptr_history =
gui_current_view->ptr_history->next_history;
if (!gui_current_view->ptr_history)
gui_current_view->ptr_history =
gui_current_view->history;
gui_current_window->buffer->ptr_history =
gui_current_window->buffer->ptr_history->next_history;
if (!gui_current_window->buffer->ptr_history)
gui_current_window->buffer->ptr_history =
gui_current_window->buffer->history;
}
else
gui_current_view->ptr_history =
gui_current_view->history;
if (gui_current_view->ptr_history)
gui_current_window->buffer->ptr_history =
gui_current_window->buffer->history;
if (gui_current_window->buffer->ptr_history)
{
gui_current_view->input_buffer_size =
strlen (gui_current_view->ptr_history->text);
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->input_buffer_pos =
gui_current_view->input_buffer_size;
strcpy (gui_current_view->input_buffer,
gui_current_view->ptr_history->text);
gui_draw_view_input (gui_current_view);
gui_current_window->buffer->input_buffer_size =
strlen (gui_current_window->buffer->ptr_history->text);
gui_optimize_input_buffer_size (gui_current_window->buffer);
gui_current_window->buffer->input_buffer_pos =
gui_current_window->buffer->input_buffer_size;
strcpy (gui_current_window->buffer->input_buffer,
gui_current_window->buffer->ptr_history->text);
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* cursor down */
case KEY_DOWN:
if (gui_current_view->ptr_history)
if (gui_current_window->buffer->ptr_history)
{
gui_current_view->ptr_history =
gui_current_view->ptr_history->prev_history;
if (gui_current_view->ptr_history)
gui_current_view->input_buffer_size =
strlen (gui_current_view->ptr_history->text);
gui_current_window->buffer->ptr_history =
gui_current_window->buffer->ptr_history->prev_history;
if (gui_current_window->buffer->ptr_history)
gui_current_window->buffer->input_buffer_size =
strlen (gui_current_window->buffer->ptr_history->text);
else
gui_current_view->input_buffer_size = 0;
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->input_buffer_pos =
gui_current_view->input_buffer_size;
if (gui_current_view->ptr_history)
strcpy (gui_current_view->input_buffer,
gui_current_view->ptr_history->text);
gui_draw_view_input (gui_current_view);
gui_current_window->buffer->input_buffer_size = 0;
gui_optimize_input_buffer_size (gui_current_window->buffer);
gui_current_window->buffer->input_buffer_pos =
gui_current_window->buffer->input_buffer_size;
if (gui_current_window->buffer->ptr_history)
strcpy (gui_current_window->buffer->input_buffer,
gui_current_window->buffer->ptr_history->text);
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* cursor left */
case KEY_LEFT:
if (gui_current_view->input_buffer_pos > 0)
if (gui_current_window->buffer->input_buffer_pos > 0)
{
gui_current_view->input_buffer_pos--;
gui_draw_view_input (gui_current_view);
gui_current_window->buffer->input_buffer_pos--;
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* cursor right */
case KEY_RIGHT:
if (gui_current_view->input_buffer_pos <
gui_current_view->input_buffer_size)
if (gui_current_window->buffer->input_buffer_pos <
gui_current_window->buffer->input_buffer_size)
{
gui_current_view->input_buffer_pos++;
gui_draw_view_input (gui_current_view);
gui_current_window->buffer->input_buffer_pos++;
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* home key */
case KEY_HOME:
if (gui_current_view->input_buffer_pos > 0)
if (gui_current_window->buffer->input_buffer_pos > 0)
{
gui_current_view->input_buffer_pos = 0;
gui_draw_view_input (gui_current_view);
gui_current_window->buffer->input_buffer_pos = 0;
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* end key */
case KEY_END:
if (gui_current_view->input_buffer_pos <
gui_current_view->input_buffer_size)
if (gui_current_window->buffer->input_buffer_pos <
gui_current_window->buffer->input_buffer_size)
{
gui_current_view->input_buffer_pos =
gui_current_view->input_buffer_size;
gui_draw_view_input (gui_current_view);
gui_current_window->buffer->input_buffer_pos =
gui_current_window->buffer->input_buffer_size;
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* page up */
case KEY_PPAGE:
gui_move_page_up ();
gui_move_page_up (gui_current_window);
break;
/* page down */
case KEY_NPAGE:
gui_move_page_down ();
gui_move_page_down (gui_current_window);
break;
/* erase before cursor and move cursor to the left */
case 127:
case KEY_BACKSPACE:
if (gui_current_view->input_buffer_pos > 0)
if (gui_current_window->buffer->input_buffer_pos > 0)
{
i = gui_current_view->input_buffer_pos-1;
while (gui_current_view->input_buffer[i])
i = gui_current_window->buffer->input_buffer_pos-1;
while (gui_current_window->buffer->input_buffer[i])
{
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i+1];
gui_current_window->buffer->input_buffer[i] =
gui_current_window->buffer->input_buffer[i+1];
i++;
}
gui_current_view->input_buffer_size--;
gui_current_view->input_buffer_pos--;
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
gui_draw_view_input (gui_current_view);
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->completion.position = -1;
gui_current_window->buffer->input_buffer_size--;
gui_current_window->buffer->input_buffer_pos--;
gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
gui_draw_buffer_input (gui_current_window->buffer, 0);
gui_optimize_input_buffer_size (gui_current_window->buffer);
gui_current_window->buffer->completion.position = -1;
}
break;
/* Control + Backspace */
case 0x08:
gui_delete_previous_word ();
gui_delete_previous_word (gui_current_window->buffer);
break;
/* erase char under cursor */
case KEY_DC:
if (gui_current_view->input_buffer_pos <
gui_current_view->input_buffer_size)
if (gui_current_window->buffer->input_buffer_pos <
gui_current_window->buffer->input_buffer_size)
{
i = gui_current_view->input_buffer_pos;
while (gui_current_view->input_buffer[i])
i = gui_current_window->buffer->input_buffer_pos;
while (gui_current_window->buffer->input_buffer[i])
{
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i+1];
gui_current_window->buffer->input_buffer[i] =
gui_current_window->buffer->input_buffer[i+1];
i++;
}
gui_current_view->input_buffer_size--;
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
gui_draw_view_input (gui_current_view);
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->completion.position = -1;
gui_current_window->buffer->input_buffer_size--;
gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
gui_draw_buffer_input (gui_current_window->buffer, 0);
gui_optimize_input_buffer_size (gui_current_window->buffer);
gui_current_window->buffer->completion.position = -1;
}
break;
/* Tab : completion */
case '\t':
completion_search (&(gui_current_view->completion),
CHANNEL(gui_current_view),
gui_current_view->input_buffer,
gui_current_view->input_buffer_size,
gui_current_view->input_buffer_pos);
if (gui_current_view->completion.word_found)
completion_search (&(gui_current_window->buffer->completion),
CHANNEL(gui_current_window->buffer),
gui_current_window->buffer->input_buffer,
gui_current_window->buffer->input_buffer_size,
gui_current_window->buffer->input_buffer_pos);
if (gui_current_window->buffer->completion.word_found)
{
// replace word with new completed word into input buffer
gui_current_view->input_buffer_size +=
gui_current_view->completion.diff_size;
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
gui_current_window->buffer->input_buffer_size +=
gui_current_window->buffer->completion.diff_size;
gui_optimize_input_buffer_size (gui_current_window->buffer);
gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
if (gui_current_view->completion.diff_size > 0)
if (gui_current_window->buffer->completion.diff_size > 0)
{
for (i = gui_current_view->input_buffer_size - 1;
i >= gui_current_view->completion.position_replace +
(int)strlen (gui_current_view->completion.word_found); i--)
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i -
gui_current_view->completion.diff_size];
for (i = gui_current_window->buffer->input_buffer_size - 1;
i >= gui_current_window->buffer->completion.position_replace +
(int)strlen (gui_current_window->buffer->completion.word_found); i--)
gui_current_window->buffer->input_buffer[i] =
gui_current_window->buffer->input_buffer[i -
gui_current_window->buffer->completion.diff_size];
}
else
{
for (i = gui_current_view->completion.position_replace +
strlen (gui_current_view->completion.word_found);
i < gui_current_view->input_buffer_size; i++)
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i -
gui_current_view->completion.diff_size];
for (i = gui_current_window->buffer->completion.position_replace +
strlen (gui_current_window->buffer->completion.word_found);
i < gui_current_window->buffer->input_buffer_size; i++)
gui_current_window->buffer->input_buffer[i] =
gui_current_window->buffer->input_buffer[i -
gui_current_window->buffer->completion.diff_size];
}
strncpy (gui_current_view->input_buffer + gui_current_view->completion.position_replace,
gui_current_view->completion.word_found,
strlen (gui_current_view->completion.word_found));
gui_current_view->input_buffer_pos =
gui_current_view->completion.position_replace +
strlen (gui_current_view->completion.word_found);
gui_current_view->completion.position =
gui_current_view->input_buffer_pos;
strncpy (gui_current_window->buffer->input_buffer + gui_current_window->buffer->completion.position_replace,
gui_current_window->buffer->completion.word_found,
strlen (gui_current_window->buffer->completion.word_found));
gui_current_window->buffer->input_buffer_pos =
gui_current_window->buffer->completion.position_replace +
strlen (gui_current_window->buffer->completion.word_found);
gui_current_window->buffer->completion.position =
gui_current_window->buffer->input_buffer_pos;
/* add space or completor to the end of completion, if needed */
if (gui_current_view->completion.base_word[0] == '/')
if (gui_current_window->buffer->completion.base_word[0] == '/')
{
if (gui_current_view->input_buffer[gui_current_view->input_buffer_pos] != ' ')
gui_buffer_insert_string (" ",
gui_current_view->input_buffer_pos);
gui_current_view->completion.position++;
gui_current_view->input_buffer_pos++;
if (gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_pos] != ' ')
gui_buffer_insert_string (gui_current_window->buffer,
" ",
gui_current_window->buffer->input_buffer_pos);
gui_current_window->buffer->completion.position++;
gui_current_window->buffer->input_buffer_pos++;
}
else
{
if (gui_current_view->completion.base_word_pos == 0)
if (gui_current_window->buffer->completion.base_word_pos == 0)
{
if (strncmp (gui_current_view->input_buffer + gui_current_view->input_buffer_pos,
if (strncmp (gui_current_window->buffer->input_buffer + gui_current_window->buffer->input_buffer_pos,
cfg_look_completor, strlen (cfg_look_completor)) != 0)
gui_buffer_insert_string (cfg_look_completor,
gui_current_view->input_buffer_pos);
gui_current_view->completion.position += strlen (cfg_look_completor);
gui_current_view->input_buffer_pos += strlen (cfg_look_completor);
if (gui_current_view->input_buffer[gui_current_view->input_buffer_pos] != ' ')
gui_buffer_insert_string (" ",
gui_current_view->input_buffer_pos);
gui_current_view->completion.position++;
gui_current_view->input_buffer_pos++;
gui_buffer_insert_string (gui_current_window->buffer,
cfg_look_completor,
gui_current_window->buffer->input_buffer_pos);
gui_current_window->buffer->completion.position += strlen (cfg_look_completor);
gui_current_window->buffer->input_buffer_pos += strlen (cfg_look_completor);
if (gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_pos] != ' ')
gui_buffer_insert_string (gui_current_window->buffer,
" ",
gui_current_window->buffer->input_buffer_pos);
gui_current_window->buffer->completion.position++;
gui_current_window->buffer->input_buffer_pos++;
}
}
gui_draw_view_input (gui_current_view);
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* escape code (for control-key) */
@ -284,10 +291,10 @@ gui_read_keyb ()
switch (key)
{
case KEY_LEFT:
gui_switch_to_previous_view ();
gui_switch_to_previous_buffer (gui_current_window);
break;
case KEY_RIGHT:
gui_switch_to_next_view ();
gui_switch_to_next_buffer (gui_current_window);
break;
case 79:
/* TODO: replace 79 by constant name! */
@ -299,11 +306,11 @@ gui_read_keyb ()
{
/* Control + Right */
case 99:
gui_move_next_word ();
gui_move_next_word (gui_current_window->buffer);
break;
/* Control + Left */
case 100:
gui_move_previous_word ();
gui_move_previous_word (gui_current_window->buffer);
break;
}
}
@ -314,35 +321,36 @@ gui_read_keyb ()
break;
/* send command/message */
case '\n':
if (gui_current_view->input_buffer_size > 0)
if (gui_current_window->buffer->input_buffer_size > 0)
{
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
history_add (gui_current_view, gui_current_view->input_buffer);
gui_current_view->input_buffer_size = 0;
gui_current_view->input_buffer_pos = 0;
gui_current_view->input_buffer_1st_display = 0;
gui_current_view->completion.position = -1;
gui_current_view->ptr_history = NULL;
ptr_view = gui_current_view;
user_command (SERVER(gui_current_view),
gui_current_view->input_buffer);
if (ptr_view == gui_current_view)
gui_draw_view_input (ptr_view);
if (ptr_view)
ptr_view->input_buffer[0] = '\0';
gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
history_add (gui_current_window->buffer, gui_current_window->buffer->input_buffer);
gui_current_window->buffer->input_buffer_size = 0;
gui_current_window->buffer->input_buffer_pos = 0;
gui_current_window->buffer->input_buffer_1st_display = 0;
gui_current_window->buffer->completion.position = -1;
gui_current_window->buffer->ptr_history = NULL;
ptr_buffer = gui_current_window->buffer;
user_command (SERVER(gui_current_window->buffer),
gui_current_window->buffer->input_buffer);
if (ptr_buffer == gui_current_window->buffer)
gui_draw_buffer_input (ptr_buffer, 0);
if (ptr_buffer)
ptr_buffer->input_buffer[0] = '\0';
}
break;
/* other key => add to input buffer */
default:
/*gui_printf (gui_current_view,
/*gui_printf (gui_current_buffer,
"[Debug] key pressed = %d, as octal: %o\n", key, key);*/
new_char[0] = key;
new_char[1] = '\0';
gui_buffer_insert_string (new_char,
gui_current_view->input_buffer_pos);
gui_current_view->input_buffer_pos++;
gui_draw_view_input (gui_current_view);
gui_current_view->completion.position = -1;
gui_buffer_insert_string (gui_current_window->buffer,
new_char,
gui_current_window->buffer->input_buffer_pos);
gui_current_window->buffer->input_buffer_pos++;
gui_draw_buffer_input (gui_current_window->buffer, 0);
gui_current_window->buffer->completion.position = -1;
break;
}
}
@ -374,14 +382,13 @@ gui_main_loop ()
if (local_time->tm_min != old_min)
{
old_min = local_time->tm_min;
gui_redraw_view_infobar (gui_current_view);
gui_draw_buffer_infobar (gui_current_window->buffer, 1);
}
/* second has changed ? => count down time for infobar, if needed */
if (local_time->tm_sec != old_sec)
{
old_sec = local_time->tm_sec;
/* TODO: manage splited windows! */
if (gui_infobar && gui_infobar->remaining_time > 0)
{
gui_infobar->remaining_time--;

479
src/gui/gui-common.c
View File

@ -41,10 +41,11 @@
int gui_ready; /* = 1 if GUI is initialized */
t_gui_window *gui_windows = NULL; /* pointer to first window */
t_gui_window *last_gui_window = NULL; /* pointer to last window */
t_gui_window *gui_current_window = NULL; /* pointer to current window */
t_gui_view *gui_views = NULL; /* pointer to first view */
t_gui_view *last_gui_view = NULL; /* pointer to last view */
t_gui_view *gui_current_view = NULL; /* pointer to current view */
t_gui_buffer *gui_buffers = NULL; /* pointer to first buffer */
t_gui_buffer *last_gui_buffer = NULL; /* pointer to last buffer */
t_gui_infobar *gui_infobar; /* pointer to infobar content */
@ -55,186 +56,217 @@ t_gui_infobar *gui_infobar; /* pointer to infobar content */
t_gui_window *
gui_window_new (int x, int y, int width, int height)
{
t_gui_window *window;
t_gui_window *new_window;
if ((window = (t_gui_window *)(malloc (sizeof (t_gui_window)))))
#ifdef DEBUG
wee_log_printf ("creating new window (x:%d, y:%d, width:%d, height:%d)\n",
x, y, width, height);
#endif
if ((new_window = (t_gui_window *)(malloc (sizeof (t_gui_window)))))
{
window->win_x = x;
window->win_y = y;
window->win_width = width;
window->win_height = height;
new_window->win_x = x;
new_window->win_y = y;
new_window->win_width = width;
new_window->win_height = height;
window->win_chat_x = 0;
window->win_chat_y = 0;
window->win_chat_width = 0;
window->win_chat_height = 0;
window->win_chat_cursor_x = 0;
window->win_chat_cursor_y = 0;
new_window->win_chat_x = 0;
new_window->win_chat_y = 0;
new_window->win_chat_width = 0;
new_window->win_chat_height = 0;
new_window->win_chat_cursor_x = 0;
new_window->win_chat_cursor_y = 0;
window->win_nick_x = 0;
window->win_nick_y = 0;
window->win_nick_width = 0;
window->win_nick_height = 0;
new_window->win_nick_x = 0;
new_window->win_nick_y = 0;
new_window->win_nick_width = 0;
new_window->win_nick_height = 0;
window->win_title = NULL;
window->win_chat = NULL;
window->win_nick = NULL;
window->win_status = NULL;
window->win_infobar = NULL;
window->win_input = NULL;
window->textview_chat = NULL;
window->textbuffer_chat = NULL;
window->texttag_chat = NULL;
window->textview_nicklist = NULL;
window->textbuffer_nicklist = NULL;
new_window->win_title = NULL;
new_window->win_chat = NULL;
new_window->win_nick = NULL;
new_window->win_status = NULL;
new_window->win_infobar = NULL;
new_window->win_input = NULL;
new_window->win_separator = NULL;
new_window->textview_chat = NULL;
new_window->textbuffer_chat = NULL;
new_window->texttag_chat = NULL;
new_window->textview_nicklist = NULL;
new_window->textbuffer_nicklist = NULL;
new_window->buffer = NULL;
new_window->first_line_displayed = 0;
new_window->sub_lines = 0;
/* add window to windows queue */
new_window->prev_window = last_gui_window;
if (gui_windows)
last_gui_window->next_window = new_window;
else
gui_windows = new_window;
last_gui_window = new_window;
new_window->next_window = NULL;
}
else
return NULL;
return window;
return new_window;
}
/*
* gui_view_new: create a new view in current window
* gui_buffer_new: create a new buffer in current window
*/
t_gui_view *
gui_view_new (t_gui_window *window, void *server, void *channel, int switch_to_view)
t_gui_buffer *
gui_buffer_new (t_gui_window *window, void *server, void *channel, int switch_to_buffer)
{
t_gui_view *new_view;
t_gui_buffer *new_buffer;
if (gui_views)
#ifdef DEBUG
wee_log_printf ("creating new buffer\n");
#endif
if (gui_buffers)
{
/* use first view if no server was assigned to this view */
if (!SERVER(gui_views))
/* use first buffer if no server was assigned to this buffer */
if (!SERVER(gui_buffers))
{
if (server)
((t_irc_server *)(server))->view = gui_views;
((t_irc_server *)(server))->buffer = gui_buffers;
if (channel)
((t_irc_channel *)(channel))->view = gui_views;
SERVER(gui_views) = server;
CHANNEL(gui_views) = channel;
return gui_views;
((t_irc_channel *)(channel))->buffer = gui_buffers;
SERVER(gui_buffers) = server;
CHANNEL(gui_buffers) = channel;
return gui_buffers;
}
}
if ((new_view = (t_gui_view *)(malloc (sizeof (t_gui_view)))))
if ((new_buffer = (t_gui_buffer *)(malloc (sizeof (t_gui_buffer)))))
{
new_view->is_displayed = 0;
new_buffer->num_displayed = 0;
/* assign server and channel to view */
SERVER(new_view) = server;
CHANNEL(new_view) = channel;
/* assign view to server and channel */
/* assign server and channel to buffer */
SERVER(new_buffer) = server;
CHANNEL(new_buffer) = channel;
/* assign buffer to server and channel */
if (server && !channel)
SERVER(new_view)->view = new_view;
SERVER(new_buffer)->buffer = new_buffer;
if (channel)
CHANNEL(new_view)->view = new_view;
CHANNEL(new_buffer)->buffer = new_buffer;
new_view->window = window;
if (!window->buffer)
window->buffer = new_buffer;
window->first_line_displayed = 1;
window->sub_lines = 0;
gui_calculate_pos_size (new_view);
gui_calculate_pos_size (window);
/* init views */
gui_view_init_subviews(new_view);
/* init buffers */
gui_window_init_subwindows (window);
/* init lines */
new_view->lines = NULL;
new_view->last_line = NULL;
new_view->num_lines = 0;
new_view->first_line_displayed = 1;
new_view->sub_lines = 0;
new_view->line_complete = 1;
new_view->unread_data = 0;
new_buffer->lines = NULL;
new_buffer->last_line = NULL;
new_buffer->num_lines = 0;
new_buffer->line_complete = 1;
new_buffer->unread_data = 0;
/* init input buffer */
new_view->input_buffer_alloc = INPUT_BUFFER_BLOCK_SIZE;
new_view->input_buffer = (char *) malloc (INPUT_BUFFER_BLOCK_SIZE);
new_view->input_buffer[0] = '\0';
new_view->input_buffer_size = 0;
new_view->input_buffer_pos = 0;
new_view->input_buffer_1st_display = 0;
new_buffer->input_buffer_alloc = INPUT_BUFFER_BLOCK_SIZE;
new_buffer->input_buffer = (char *) malloc (INPUT_BUFFER_BLOCK_SIZE);
new_buffer->input_buffer[0] = '\0';
new_buffer->input_buffer_size = 0;
new_buffer->input_buffer_pos = 0;
new_buffer->input_buffer_1st_display = 0;
/* init completion */
completion_init (&(new_view->completion));
completion_init (&(new_buffer->completion));
/* init history */
new_view->history = NULL;
new_view->last_history = NULL;
new_view->ptr_history = NULL;
new_view->num_history = 0;
new_buffer->history = NULL;
new_buffer->last_history = NULL;
new_buffer->ptr_history = NULL;
new_buffer->num_history = 0;
/* switch to new view */
if (switch_to_view)
gui_switch_to_view (new_view);
/* add view to views queue */
new_view->prev_view = last_gui_view;
if (gui_views)
last_gui_view->next_view = new_view;
/* add buffer to buffers queue */
new_buffer->prev_buffer = last_gui_buffer;
if (gui_buffers)
last_gui_buffer->next_buffer = new_buffer;
else
gui_views = new_view;
last_gui_view = new_view;
new_view->next_view = NULL;
gui_buffers = new_buffer;
last_gui_buffer = new_buffer;
new_buffer->next_buffer = NULL;
/* redraw whole screen */
/* TODO: manage splited windows */
gui_redraw_view (gui_current_view);
/* switch to new buffer */
if (switch_to_buffer)
gui_switch_to_buffer (window, new_buffer);
/* redraw buffer */
gui_redraw_buffer (new_buffer);
}
else
return NULL;
return new_view;
return new_buffer;
}
/*
* gui_view_clear: clear view content
* gui_buffer_clear: clear buffer content
*/
void
gui_view_clear (t_gui_view *view)
gui_buffer_clear (t_gui_buffer *buffer)
{
t_gui_window *ptr_win;
t_gui_line *ptr_line;
t_gui_message *ptr_message;
while (view->lines)
while (buffer->lines)
{
ptr_line = view->lines->next_line;
while (view->lines->messages)
ptr_line = buffer->lines->next_line;
while (buffer->lines->messages)
{
ptr_message = view->lines->messages->next_message;
if (view->lines->messages->message)
free (view->lines->messages->message);
free (view->lines->messages);
view->lines->messages = ptr_message;
ptr_message = buffer->lines->messages->next_message;
if (buffer->lines->messages->message)
free (buffer->lines->messages->message);
free (buffer->lines->messages);
buffer->lines->messages = ptr_message;
}
free (view->lines);
view->lines = ptr_line;
free (buffer->lines);
buffer->lines = ptr_line;
}
view->lines = NULL;
view->last_line = NULL;
view->num_lines = 0;
view->first_line_displayed = 1;
view->sub_lines = 0;
view->line_complete = 1;
view->unread_data = 0;
buffer->lines = NULL;
buffer->last_line = NULL;
buffer->num_lines = 0;
buffer->line_complete = 1;
buffer->unread_data = 0;
if (view == gui_current_view)
gui_redraw_view_chat (view);
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
{
if (ptr_win->buffer == buffer)
{
ptr_win->first_line_displayed = 1;
ptr_win->sub_lines = 0;
}
}
if (buffer == gui_current_window->buffer)
gui_draw_buffer_chat (buffer, 1);
}
/*
* gui_view_clear_all: clear all views content
* gui_buffer_clear_all: clear all buffers content
*/
void
gui_view_clear_all ()
gui_buffer_clear_all ()
{
t_gui_view *ptr_view;
t_gui_buffer *ptr_buffer;
for (ptr_view = gui_views; ptr_view; ptr_view = ptr_view->next_view)
gui_view_clear (ptr_view);
for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
gui_buffer_clear (ptr_buffer);
}
/*
@ -264,8 +296,7 @@ gui_infobar_printf (int time_displayed, int color, char *message, ...)
ptr_infobar->remaining_time = (time_displayed <= 0) ? -1 : time_displayed;
ptr_infobar->next_infobar = gui_infobar;
gui_infobar = ptr_infobar;
/* TODO: manage splited windows! */
gui_redraw_view_infobar (gui_current_view);
gui_draw_buffer_infobar (gui_current_window->buffer, 1);
}
else
wee_log_printf (_("%s not enough memory for infobar message\n"),
@ -288,13 +319,12 @@ gui_infobar_remove ()
free (gui_infobar->text);
free (gui_infobar);
gui_infobar = new_infobar;
/* TODO: manage splited windows! */
gui_redraw_view_infobar (gui_current_view);
gui_draw_buffer_infobar (gui_current_window->buffer, 1);
}
}
/*
* gui_line_free: delete a line from a view
* gui_line_free: delete a line from a buffer
*/
void
@ -314,57 +344,60 @@ gui_line_free (t_gui_line *line)
}
/*
* gui_view_free: delete a view
* gui_buffer_free: delete a buffer
*/
void
gui_view_free (t_gui_view *view)
gui_buffer_free (t_gui_buffer *buffer)
{
t_gui_window *ptr_win;
t_gui_line *ptr_line;
int create_new;
create_new = (view->server || view->channel);
create_new = (buffer->server || buffer->channel);
/* TODO: manage splited windows! */
if ((view == gui_current_view) &&
((view->next_view) || (view->prev_view)))
gui_switch_to_previous_view ();
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
{
if ((buffer == ptr_win->buffer) &&
((buffer->next_buffer) || (buffer->prev_buffer)))
gui_switch_to_previous_buffer (ptr_win);
}
/* free lines and messages */
while (view->lines)
while (buffer->lines)
{
ptr_line = view->lines->next_line;
gui_line_free (view->lines);
view->lines = ptr_line;
ptr_line = buffer->lines->next_line;
gui_line_free (buffer->lines);
buffer->lines = ptr_line;
}
if (view->input_buffer)
free (view->input_buffer);
if (buffer->input_buffer)
free (buffer->input_buffer);
completion_free (&(view->completion));
completion_free (&(buffer->completion));
/* remove view from views list */
if (view->prev_view)
view->prev_view->next_view = view->next_view;
if (view->next_view)
view->next_view->prev_view = view->prev_view;
if (gui_views == view)
gui_views = view->next_view;
if (last_gui_view == view)
last_gui_view = view->prev_view;
/* remove buffer from buffers list */
if (buffer->prev_buffer)
buffer->prev_buffer->next_buffer = buffer->next_buffer;
if (buffer->next_buffer)
buffer->next_buffer->prev_buffer = buffer->prev_buffer;
if (gui_buffers == buffer)
gui_buffers = buffer->next_buffer;
if (last_gui_buffer == buffer)
last_gui_buffer = buffer->prev_buffer;
free (view);
free (buffer);
/* always at least one view */
if (!gui_views && create_new)
(void) gui_view_new (gui_windows, NULL, NULL, 1);
/* always at least one buffer */
if (!gui_buffers && create_new)
(void) gui_buffer_new (gui_windows, NULL, NULL, 1);
}
/*
* gui_new_line: create new line for a view
* gui_new_line: create new line for a buffer
*/
t_gui_line *
gui_new_line (t_gui_view *view)
gui_new_line (t_gui_buffer *buffer)
{
t_gui_line *new_line, *ptr_line;
@ -375,14 +408,14 @@ gui_new_line (t_gui_view *view)
new_line->line_with_message = 0;
new_line->messages = NULL;
new_line->last_message = NULL;
if (!view->lines)
view->lines = new_line;
if (!buffer->lines)
buffer->lines = new_line;
else
view->last_line->next_line = new_line;
new_line->prev_line = view->last_line;
buffer->last_line->next_line = new_line;
new_line->prev_line = buffer->last_line;
new_line->next_line = NULL;
view->last_line = new_line;
view->num_lines++;
buffer->last_line = new_line;
buffer->num_lines++;
}
else
{
@ -392,40 +425,40 @@ gui_new_line (t_gui_view *view)
/* remove one line if necessary */
if ((cfg_history_max_lines > 0)
&& (view->num_lines > cfg_history_max_lines))
&& (buffer->num_lines > cfg_history_max_lines))
{
if (view->last_line == view->lines)
view->last_line = NULL;
ptr_line = view->lines->next_line;
gui_line_free (view->lines);
view->lines = ptr_line;
if (buffer->last_line == buffer->lines)
buffer->last_line = NULL;
ptr_line = buffer->lines->next_line;
gui_line_free (buffer->lines);
buffer->lines = ptr_line;
ptr_line->prev_line = NULL;
view->num_lines--;
if (view->first_line_displayed)
gui_redraw_view_chat (view);
buffer->num_lines--;
//if (buffer->first_line_displayed)
gui_draw_buffer_chat (buffer, 1);
}
return new_line;
}
/*
* gui_new_message: create a new message for last line of a view
* gui_new_message: create a new message for last line of a buffer
*/
t_gui_message *
gui_new_message (t_gui_view *view)
gui_new_message (t_gui_buffer *buffer)
{
t_gui_message *new_message;
if ((new_message = (t_gui_message *) malloc (sizeof (struct t_gui_message))))
{
if (!view->last_line->messages)
view->last_line->messages = new_message;
if (!buffer->last_line->messages)
buffer->last_line->messages = new_message;
else
view->last_line->last_message->next_message = new_message;
new_message->prev_message = view->last_line->last_message;
buffer->last_line->last_message->next_message = new_message;
new_message->prev_message = buffer->last_line->last_message;
new_message->next_message = NULL;
view->last_line->last_message = new_message;
buffer->last_line->last_message = new_message;
}
else
{
@ -441,16 +474,16 @@ gui_new_message (t_gui_view *view)
*/
void
gui_optimize_input_buffer_size (t_gui_view *view)
gui_optimize_input_buffer_size (t_gui_buffer *buffer)
{
int optimal_size;
optimal_size = ((view->input_buffer_size / INPUT_BUFFER_BLOCK_SIZE) *
optimal_size = ((buffer->input_buffer_size / INPUT_BUFFER_BLOCK_SIZE) *
INPUT_BUFFER_BLOCK_SIZE) + INPUT_BUFFER_BLOCK_SIZE;
if (view->input_buffer_alloc != optimal_size)
if (buffer->input_buffer_alloc != optimal_size)
{
view->input_buffer_alloc = optimal_size;
view->input_buffer = realloc (view->input_buffer, optimal_size);
buffer->input_buffer_alloc = optimal_size;
buffer->input_buffer = realloc (buffer->input_buffer, optimal_size);
}
}
@ -459,25 +492,25 @@ gui_optimize_input_buffer_size (t_gui_view *view)
*/
void
gui_delete_previous_word ()
gui_delete_previous_word (t_gui_buffer *buffer)
{
int i, j, num_char_deleted, num_char_end;
if (gui_current_view->input_buffer_pos > 0)
if (buffer->input_buffer_pos > 0)
{
i = gui_current_view->input_buffer_pos - 1;
i = buffer->input_buffer_pos - 1;
while ((i >= 0) &&
(gui_current_view->input_buffer[i] == ' '))
(buffer->input_buffer[i] == ' '))
i--;
if (i >= 0)
{
while ((i >= 0) &&
(gui_current_view->input_buffer[i] != ' '))
(buffer->input_buffer[i] != ' '))
i--;
if (i >= 0)
{
while ((i >= 0) &&
(gui_current_view->input_buffer[i] == ' '))
(buffer->input_buffer[i] == ' '))
i--;
}
}
@ -485,20 +518,20 @@ gui_delete_previous_word ()
if (i >= 0)
i++;
i++;
num_char_deleted = gui_current_view->input_buffer_pos - i;
num_char_end = gui_current_view->input_buffer_size -
gui_current_view->input_buffer_pos;
num_char_deleted = buffer->input_buffer_pos - i;
num_char_end = buffer->input_buffer_size -
buffer->input_buffer_pos;
for (j = 0; j < num_char_end; j++)
gui_current_view->input_buffer[i + j] =
gui_current_view->input_buffer[gui_current_view->input_buffer_pos + j];
buffer->input_buffer[i + j] =
buffer->input_buffer[buffer->input_buffer_pos + j];
gui_current_view->input_buffer_size -= num_char_deleted;
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
gui_current_view->input_buffer_pos = i;
gui_draw_view_input (gui_current_view);
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->completion.position = -1;
buffer->input_buffer_size -= num_char_deleted;
buffer->input_buffer[buffer->input_buffer_size] = '\0';
buffer->input_buffer_pos = i;
gui_draw_buffer_input (buffer, 0);
gui_optimize_input_buffer_size (buffer);
buffer->completion.position = -1;
}
}
@ -507,26 +540,26 @@ gui_delete_previous_word ()
*/
void
gui_move_previous_word ()
gui_move_previous_word (t_gui_buffer *buffer)
{
int i;
if (gui_current_view->input_buffer_pos > 0)
if (buffer->input_buffer_pos > 0)
{
i = gui_current_view->input_buffer_pos - 1;
i = buffer->input_buffer_pos - 1;
while ((i >= 0) &&
(gui_current_view->input_buffer[i] == ' '))
(buffer->input_buffer[i] == ' '))
i--;
if (i < 0)
gui_current_view->input_buffer_pos = 0;
buffer->input_buffer_pos = 0;
else
{
while ((i >= 0) &&
(gui_current_view->input_buffer[i] != ' '))
(buffer->input_buffer[i] != ' '))
i--;
gui_current_view->input_buffer_pos = i + 1;
buffer->input_buffer_pos = i + 1;
}
gui_draw_view_input (gui_current_view);
gui_draw_buffer_input (buffer, 0);
}
}
@ -535,32 +568,32 @@ gui_move_previous_word ()
*/
void
gui_move_next_word ()
gui_move_next_word (t_gui_buffer *buffer)
{
int i;
if (gui_current_view->input_buffer_pos <
gui_current_view->input_buffer_size + 1)
if (buffer->input_buffer_pos <
buffer->input_buffer_size + 1)
{
i = gui_current_view->input_buffer_pos;
while ((i <= gui_current_view->input_buffer_size) &&
(gui_current_view->input_buffer[i] == ' '))
i = buffer->input_buffer_pos;
while ((i <= buffer->input_buffer_size) &&
(buffer->input_buffer[i] == ' '))
i++;
if (i > gui_current_view->input_buffer_size)
gui_current_view->input_buffer_pos = i - 1;
if (i > buffer->input_buffer_size)
buffer->input_buffer_pos = i - 1;
else
{
while ((i <= gui_current_view->input_buffer_size) &&
(gui_current_view->input_buffer[i] != ' '))
while ((i <= buffer->input_buffer_size) &&
(buffer->input_buffer[i] != ' '))
i++;
if (i > gui_current_view->input_buffer_size)
gui_current_view->input_buffer_pos =
gui_current_view->input_buffer_size;
if (i > buffer->input_buffer_size)
buffer->input_buffer_pos =
buffer->input_buffer_size;
else
gui_current_view->input_buffer_pos = i;
buffer->input_buffer_pos = i;
}
gui_draw_view_input (gui_current_view);
gui_draw_buffer_input (buffer, 0);
}
}
@ -569,24 +602,24 @@ gui_move_next_word ()
*/
void
gui_buffer_insert_string (char *string, int pos)
gui_buffer_insert_string (t_gui_buffer *buffer, char *string, int pos)
{
int i, start, end, length;
length = strlen (string);
/* increase buffer size */
gui_current_view->input_buffer_size += length;
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
buffer->input_buffer_size += length;
gui_optimize_input_buffer_size (buffer);
buffer->input_buffer[buffer->input_buffer_size] = '\0';
/* move end of string to the right */
start = pos + length;
end = gui_current_view->input_buffer_size - 1;
end = buffer->input_buffer_size - 1;
for (i = end; i >= start; i--)
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i - length];
buffer->input_buffer[i] =
buffer->input_buffer[i - length];
/* insert new string */
strncpy (gui_current_view->input_buffer + pos, string, length);
strncpy (buffer->input_buffer + pos, string, length);
}

166
src/gui/gui.h
View File

@ -59,23 +59,23 @@
#define COLOR_WIN_NICK_LAST 38
#define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
#define SERVER(view) ((t_irc_server *)(view->server))
#define CHANNEL(view) ((t_irc_channel *)(view->channel))
#define SERVER(buffer) ((t_irc_server *)(buffer->server))
#define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel))
#define VIEW_IS_SERVER(view) (SERVER(view) && !CHANNEL(view))
#define VIEW_IS_CHANNEL(view) (CHANNEL(view) && (CHANNEL(view)->type == CHAT_CHANNEL))
#define VIEW_IS_PRIVATE(view) (CHANNEL(view) && (CHANNEL(view)->type == CHAT_PRIVATE))
#define BUFFER_IS_SERVER(buffer) (SERVER(buffer) && !CHANNEL(buffer))
#define BUFFER_IS_CHANNEL(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_CHANNEL))
#define BUFFER_IS_PRIVATE(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_PRIVATE))
#define MSG_TYPE_TIME 0
#define MSG_TYPE_NICK 1
#define MSG_TYPE_INFO 2
#define MSG_TYPE_MSG 3
#define gui_printf_color(view, color, fmt, argz...) \
gui_printf_color_type(view, MSG_TYPE_INFO, color, fmt, ##argz)
#define gui_printf_color(buffer, color, fmt, argz...) \
gui_printf_color_type(buffer, MSG_TYPE_INFO, color, fmt, ##argz)
#define gui_printf(view, fmt, argz...) \
gui_printf_color_type(view, MSG_TYPE_INFO, -1, fmt, ##argz)
#define gui_printf(buffer, fmt, argz...) \
gui_printf_color_type(buffer, MSG_TYPE_INFO, -1, fmt, ##argz)
typedef struct t_gui_message t_gui_message;
@ -121,6 +121,44 @@ struct t_gui_infobar
t_gui_infobar *next_infobar; /* next message for infobar */
};
typedef struct t_gui_buffer t_gui_buffer;
struct t_gui_buffer
{
int num_displayed; /* number of windows displaying buffer */
/* server/channel */
void *server; /* buffer's server */
void *channel; /* buffer's channel */
/* chat content (lines, line is composed by many messages) */
t_gui_line *lines; /* lines of chat window */
t_gui_line *last_line; /* last line of chat window */
int num_lines; /* number of lines in the window */
int line_complete; /* current line complete ? (\n ending) */
int unread_data; /* highlight windows with unread data */
/* inupt buffer */
char *input_buffer; /* input buffer */
int input_buffer_alloc; /* input buffer: allocated size in mem */
int input_buffer_size; /* buffer size (user input length) */
int input_buffer_pos; /* position into buffer */
int input_buffer_1st_display; /* first char displayed on screen */
/* completion */
t_completion completion; /* for cmds/nicks completion */
/* history */
t_history *history; /* commands history */
t_history *last_history; /* last command in history */
t_history *ptr_history; /* current command in history */
int num_history; /* number of commands in history */
/* link to previous/next buffer */
t_gui_buffer *prev_buffer; /* link to previous buffer */
t_gui_buffer *next_buffer; /* link to next buffer */
};
typedef struct t_gui_window t_gui_window;
struct t_gui_window
@ -148,6 +186,7 @@ struct t_gui_window
void *win_status; /* status window */
void *win_infobar; /* info bar window */
void *win_input; /* input window */
void *win_separator; /* separation between 2 splited (V) win */
/* windows for Gtk GUI */
void *textview_chat; /* textview widget for chat */
@ -159,109 +198,70 @@ struct t_gui_window
/* windows for Qt GUI */
/* TODO: declare Qt window */
t_gui_window *prev_window; /* link to previous window */
t_gui_window *next_window; /* link to next window */
};
typedef struct t_gui_view t_gui_view;
struct t_gui_view
{
int is_displayed; /* = 1 if view is displayed */
t_gui_buffer *buffer; /* buffer currently displayed in window */
/* server/channel */
void *server; /* view's server */
void *channel; /* view's channel */
t_gui_window *window; /* Curses or Gtk window */
/* chat content (lines, line is composed by many messages) */
t_gui_line *lines; /* lines of chat window */
t_gui_line *last_line; /* last line of chat window */
int num_lines; /* number of lines in the window */
int first_line_displayed; /* = 1 if first line is displayed */
int sub_lines; /* if > 0 then do not display until end */
int line_complete; /* current line complete ? (\n ending) */
int unread_data; /* highlight windows with unread data */
/* inupt buffer */
char *input_buffer; /* input buffer */
int input_buffer_alloc; /* input buffer: allocated size in mem */
int input_buffer_size; /* buffer size (user input length) */
int input_buffer_pos; /* position into buffer */
int input_buffer_1st_display; /* first char displayed on screen */
/* completion */
t_completion completion; /* for cmds/nicks completion */
/* history */
t_history *history; /* commands history */
t_history *last_history; /* last command in history */
t_history *ptr_history; /* current command in history */
int num_history; /* number of commands in history */
/* link to next window */
t_gui_view *prev_view; /* link to previous view */
t_gui_view *next_view; /* link to next view */
t_gui_window *prev_window; /* link to previous window */
t_gui_window *next_window; /* link to next window */
};
/* variables */
extern int gui_ready;
extern t_gui_window *gui_windows;
extern t_gui_view *gui_views;
extern t_gui_view *last_gui_view;
extern t_gui_view *gui_current_view;
extern t_gui_window *last_gui_window;
extern t_gui_window *gui_current_window;
extern t_gui_buffer *gui_buffers;
extern t_gui_buffer *last_gui_buffer;
extern t_gui_infobar *gui_infobar;
/* prototypes */
/* GUI independent functions */
extern t_gui_window *gui_window_new (int, int, int, int);
extern t_gui_view *gui_view_new (t_gui_window *, void *, void *, int);
extern void gui_view_clear (t_gui_view *);
extern void gui_view_clear_all ();
extern t_gui_buffer *gui_buffer_new (t_gui_window *, void *, void *, int);
extern void gui_buffer_clear (t_gui_buffer *);
extern void gui_buffer_clear_all ();
extern void gui_infobar_printf (int, int, char *, ...);
extern void gui_infobar_remove ();
extern t_gui_line *gui_new_line (t_gui_view *);
extern t_gui_message *gui_new_message (t_gui_view *);
extern void gui_optimize_input_buffer_size (t_gui_view *);
extern void gui_delete_previous_word ();
extern void gui_move_previous_word ();
extern void gui_move_next_word ();
extern void gui_buffer_insert_string (char *, int);
extern t_gui_line *gui_new_line (t_gui_buffer *);
extern t_gui_message *gui_new_message (t_gui_buffer *);
extern void gui_optimize_input_buffer_size (t_gui_buffer *);
extern void gui_delete_previous_word (t_gui_buffer *);
extern void gui_move_previous_word (t_gui_buffer *);
extern void gui_move_next_word (t_gui_buffer *);
extern void gui_buffer_insert_string (t_gui_buffer *, char *, int);
/* GUI dependant functions */
extern int gui_assign_color (int *, char *);
extern int gui_get_color_by_name (char *);
extern char *gui_get_color_by_value (int);
extern int gui_view_has_nicklist (t_gui_view *);
extern void gui_calculate_pos_size (t_gui_view *);
extern void gui_draw_view_title (t_gui_view *);
extern void gui_redraw_view_title (t_gui_view *);
extern void gui_draw_view_chat (t_gui_view *);
extern void gui_redraw_view_chat (t_gui_view *);
extern void gui_draw_view_nick (t_gui_view *);
extern void gui_redraw_view_nick (t_gui_view *);
extern void gui_draw_view_status (t_gui_view *);
extern void gui_redraw_view_status (t_gui_view *);
extern void gui_draw_view_infobar (t_gui_view *);
extern void gui_redraw_view_infobar (t_gui_view *);
extern void gui_draw_view_input (t_gui_view *);
extern void gui_redraw_view_input (t_gui_view *);
extern void gui_redraw_view (t_gui_view *);
extern void gui_switch_to_view (t_gui_view *);
extern void gui_switch_to_previous_view ();
extern void gui_switch_to_next_view ();
extern int gui_buffer_has_nicklist (t_gui_buffer *);
extern void gui_calculate_pos_size (t_gui_window *);
extern void gui_draw_buffer_title (t_gui_buffer *, int);
extern void gui_draw_buffer_chat (t_gui_buffer *, int);
extern void gui_draw_buffer_nick (t_gui_buffer *, int);
extern void gui_draw_buffer_status (t_gui_buffer *, int);
extern void gui_draw_buffer_infobar (t_gui_buffer *, int);
extern void gui_draw_buffer_input (t_gui_buffer *, int);
extern void gui_redraw_buffer (t_gui_buffer *);
extern void gui_switch_to_buffer (t_gui_window *, t_gui_buffer *);
extern void gui_switch_to_previous_buffer (t_gui_window *);
extern void gui_switch_to_next_buffer (t_gui_window *);
extern void gui_switch_to_next_window (t_gui_window *);
extern void gui_move_page_up ();
extern void gui_move_page_down ();
extern void gui_view_init_subviews (t_gui_view *);
extern void gui_window_init_subwindows (t_gui_window *);
extern void gui_window_split_horiz (t_gui_window *);
extern void gui_window_split_vertic (t_gui_window *);
extern void gui_pre_init (int *, char **[]);
extern void gui_init_colors ();
extern void gui_set_window_title ();
extern void gui_init ();
extern void gui_view_free (t_gui_view *);
extern void gui_buffer_free (t_gui_buffer *);
extern void gui_end ();
extern void gui_printf_color_type (/*@null@*/ t_gui_view *, int, int, char *, ...);
extern void gui_printf_color_type (/*@null@*/ t_gui_buffer *, int, int, char *, ...);
extern void gui_main_loop ();
#endif /* gui.h */

4
src/irc/irc-channel.c
View File

@ -41,7 +41,7 @@ char *channel_modes = "iklmnst";
t_irc_channel *
channel_new (t_irc_server *server, int channel_type, char *channel_name,
int switch_to_view)
int switch_to_buffer)
{
t_irc_channel *new_channel;
@ -72,7 +72,7 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name,
server->channels = new_channel;
server->last_channel = new_channel;
gui_view_new (gui_current_view->window, server, new_channel, switch_to_view);
gui_buffer_new (gui_current_window, server, new_channel, switch_to_buffer);
/* all is ok, return address of new channel */
return new_channel;

50
src/irc/irc-display.c
View File

@ -41,16 +41,16 @@
*/
void
irc_display_prefix (t_gui_view *view, char *prefix)
irc_display_prefix (t_gui_buffer *buffer, char *prefix)
{
if (prefix[0] == prefix[2])
{
gui_printf_color (view, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]);
gui_printf_color (view, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]);
gui_printf_color (view, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]);
gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]);
gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]);
gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]);
}
else
gui_printf_color (view, COLOR_WIN_CHAT_PREFIX1, "%s ", prefix);
gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%s ", prefix);
}
/*
@ -59,45 +59,45 @@ irc_display_prefix (t_gui_view *view, char *prefix)
*/
void
irc_display_nick (t_gui_view *view, t_irc_nick *nick, int message_type,
irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, int message_type,
int display_around, int color_nick, int no_nickmode)
{
if (display_around)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type, COLOR_WIN_CHAT_DARK, "<");
if (cfg_look_nickmode)
{
if (nick->is_op)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type,
COLOR_WIN_NICK_OP, "@");
else
{
if (nick->is_halfop)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type,
COLOR_WIN_NICK_HALFOP, "%%");
else
{
if (nick->has_voice)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type,
COLOR_WIN_NICK_VOICE, "+");
else
if (cfg_look_nickmode_empty && !no_nickmode)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type,
COLOR_WIN_CHAT, " ");
}
}
}
if (color_nick < 0)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type,
COLOR_WIN_CHAT_HIGHLIGHT,
"%s", nick->nick);
else
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type,
(color_nick) ?
((cfg_look_color_nicks) ?
@ -106,7 +106,7 @@ irc_display_nick (t_gui_view *view, t_irc_nick *nick, int message_type,
"%s", nick->nick);
if (display_around)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type, COLOR_WIN_CHAT_DARK, "> ");
}
@ -115,21 +115,21 @@ irc_display_nick (t_gui_view *view, t_irc_nick *nick, int message_type,
*/
void
irc_display_mode (t_gui_view *view, char *channel_name, char set_flag,
irc_display_mode (t_gui_buffer *buffer, char *channel_name, char set_flag,
char *symbol, char *nick_host, char *message, char *param)
{
irc_display_prefix (view, PREFIX_INFO);
gui_printf_color (view, COLOR_WIN_CHAT_DARK, "[");
gui_printf_color (view, COLOR_WIN_CHAT_CHANNEL, "%s", channel_name);
gui_printf_color (view, COLOR_WIN_CHAT, "/");
gui_printf_color (view, COLOR_WIN_CHAT_CHANNEL, "%c%s", set_flag, symbol);
gui_printf_color (view, COLOR_WIN_CHAT_DARK, "] ");
gui_printf_color (view, COLOR_WIN_CHAT_NICK, "%s", nick_host);
irc_display_prefix (buffer, PREFIX_INFO);
gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", channel_name);
gui_printf_color (buffer, COLOR_WIN_CHAT, "/");
gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%c%s", set_flag, symbol);
gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, "%s", nick_host);
if (param)
{
gui_printf_color (view, COLOR_WIN_CHAT, " %s ", message);
gui_printf_color (view, COLOR_WIN_CHAT_NICK, "%s\n", param);
gui_printf_color (buffer, COLOR_WIN_CHAT, " %s ", message);
gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, "%s\n", param);
}
else
gui_printf_color (view, COLOR_WIN_CHAT, " %s\n", message);
gui_printf_color (buffer, COLOR_WIN_CHAT, " %s\n", message);
}

4
src/irc/irc-nick.c
View File

@ -182,7 +182,7 @@ nick_new (t_irc_channel *channel, char *nick_name,
/* alloc memory for new nick */
if ((new_nick = (t_irc_nick *) malloc (sizeof (t_irc_nick))) == NULL)
{
gui_printf (channel->view,
gui_printf (channel->buffer,
_("%s cannot allocate new nick\n"), WEECHAT_ERROR);
return NULL;
}
@ -192,7 +192,7 @@ nick_new (t_irc_channel *channel, char *nick_name,
new_nick->is_op = is_op;
new_nick->is_halfop = is_halfop;
new_nick->has_voice = has_voice;
if (strcasecmp (new_nick->nick, SERVER(channel->view)->nick) == 0)
if (strcasecmp (new_nick->nick, SERVER(channel->buffer)->nick) == 0)
new_nick->color = COLOR_WIN_NICK_SELF;
else
new_nick->color = nick_find_color (channel);

614
src/irc/irc-recv.c
View File

File diff suppressed because it is too large Load Diff

130
src/irc/irc-send.c
View File

@ -56,7 +56,7 @@ irc_login (t_irc_server *server)
hostname[sizeof (hostname) - 1] = '\0';
if (!hostname[0])
strcpy (hostname, _("unknown"));
gui_printf (server->view,
gui_printf (server->buffer,
_("%s: using local hostname \"%s\"\n"),
PACKAGE_NAME, hostname);
server_sendf (server,
@ -198,15 +198,15 @@ irc_cmd_send_deop (t_irc_server *server, int argc, char **argv)
{
int i;
if (VIEW_IS_CHANNEL(gui_current_view))
if (BUFFER_IS_CHANNEL(gui_current_window->buffer))
{
for (i = 0; i < argc; i++)
server_sendf (server, "MODE %s -o %s\r\n",
CHANNEL(gui_current_view)->name,
CHANNEL(gui_current_window->buffer)->name,
argv[i]);
}
else
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can only be executed in a channel window\n"),
WEECHAT_ERROR, "deop");
return 0;
@ -221,16 +221,16 @@ irc_cmd_send_devoice (t_irc_server *server, int argc, char **argv)
{
int i;
if (VIEW_IS_CHANNEL(gui_current_view))
if (BUFFER_IS_CHANNEL(gui_current_window->buffer))
{
for (i = 0; i < argc; i++)
server_sendf (server, "MODE %s -v %s\r\n",
CHANNEL(gui_current_view)->name,
CHANNEL(gui_current_window->buffer)->name,
argv[i]);
}
else
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can only be executed in a channel window\n"),
WEECHAT_ERROR, "devoice");
return -1;
@ -310,15 +310,15 @@ irc_cmd_send_kick (t_irc_server *server, char *arguments)
server_sendf (server, "KICK %s\r\n", arguments);
else
{
if (VIEW_IS_CHANNEL (gui_current_view))
if (BUFFER_IS_CHANNEL (gui_current_window->buffer))
{
server_sendf (server,
"KICK %s %s\r\n",
CHANNEL(gui_current_view)->name, arguments);
CHANNEL(gui_current_window->buffer)->name, arguments);
}
else
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can only be executed in a channel window\n"),
WEECHAT_ERROR, "kick");
return -1;
@ -388,19 +388,19 @@ irc_cmd_send_lusers (t_irc_server *server, char *arguments)
int
irc_cmd_send_me (t_irc_server *server, char *arguments)
{
if (VIEW_IS_SERVER(gui_current_view))
if (BUFFER_IS_SERVER(gui_current_window->buffer))
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can not be executed on a server window\n"),
WEECHAT_ERROR, "me");
return -1;
}
server_sendf (server, "PRIVMSG %s :\01ACTION %s\01\r\n",
CHANNEL(gui_current_view)->name, arguments);
irc_display_prefix (gui_current_view, PREFIX_ACTION_ME);
gui_printf_color (gui_current_view,
CHANNEL(gui_current_window->buffer)->name, arguments);
irc_display_prefix (gui_current_window->buffer, PREFIX_ACTION_ME);
gui_printf_color (gui_current_window->buffer,
COLOR_WIN_CHAT_NICK, "%s", server->nick);
gui_printf_color (gui_current_view,
gui_printf_color (gui_current_window->buffer,
COLOR_WIN_CHAT, " %s\n", arguments);
return 0;
}
@ -459,25 +459,25 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
}
if (strcmp (arguments, "*") == 0)
{
if (VIEW_IS_SERVER(gui_current_view))
if (BUFFER_IS_SERVER(gui_current_window->buffer))
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can not be executed on a server window\n"),
WEECHAT_ERROR, "msg *");
return -1;
}
ptr_channel = CHANNEL(gui_current_view);
ptr_channel = CHANNEL(gui_current_window->buffer);
ptr_nick = nick_search (ptr_channel, server->nick);
if (ptr_nick)
{
irc_display_nick (ptr_channel->view, ptr_nick,
irc_display_nick (ptr_channel->buffer, ptr_nick,
MSG_TYPE_NICK, 1, 1, 0);
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_MSG,
COLOR_WIN_CHAT, "%s\n", pos);
}
else
gui_printf (server->view,
gui_printf (server->buffer,
_("%s nick not found for \"%s\" command\n"),
WEECHAT_ERROR, "msg");
server_sendf (server, "PRIVMSG %s :%s\r\n", ptr_channel->name, pos);
@ -492,14 +492,14 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
ptr_nick = nick_search (ptr_channel, server->nick);
if (ptr_nick)
{
irc_display_nick (ptr_channel->view, ptr_nick,
irc_display_nick (ptr_channel->buffer, ptr_nick,
MSG_TYPE_NICK, 1, 1, 0);
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_MSG,
COLOR_WIN_CHAT, "%s\n", pos);
}
else
gui_printf (server->view,
gui_printf (server->buffer,
_("%s nick not found for \"%s\" command\n"),
WEECHAT_ERROR, "msg");
}
@ -513,26 +513,26 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
ptr_channel = channel_new (server, CHAT_PRIVATE, arguments, 1);
if (!ptr_channel)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot create new private window \"%s\"\n"),
WEECHAT_ERROR,
arguments);
return -1;
}
gui_redraw_view_title (ptr_channel->view);
gui_draw_buffer_title (ptr_channel->buffer, 1);
}
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_NICK,
COLOR_WIN_CHAT_DARK, "<");
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_NICK,
COLOR_WIN_NICK_SELF,
"%s", server->nick);
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_NICK,
COLOR_WIN_CHAT_DARK, "> ");
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_MSG,
COLOR_WIN_CHAT, "%s\n", pos);
server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
@ -543,7 +543,7 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
}
else
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s wrong argument count for \"%s\" command\n"),
WEECHAT_ERROR, "msg");
return -1;
@ -562,16 +562,16 @@ irc_cmd_send_names (t_irc_server *server, char *arguments)
server_sendf (server, "NAMES %s\r\n", arguments);
else
{
if (!VIEW_IS_CHANNEL(gui_current_view))
if (!BUFFER_IS_CHANNEL(gui_current_window->buffer))
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can only be executed in a channel window\n"),
WEECHAT_ERROR, "names");
return -1;
}
else
server_sendf (server, "NAMES %s\r\n",
CHANNEL(gui_current_view)->name);
CHANNEL(gui_current_window->buffer)->name);
}
return 0;
}
@ -609,16 +609,16 @@ irc_cmd_send_op (t_irc_server *server, int argc, char **argv)
{
int i;
if (VIEW_IS_CHANNEL(gui_current_view))
if (BUFFER_IS_CHANNEL(gui_current_window->buffer))
{
for (i = 0; i < argc; i++)
server_sendf (server, "MODE %s +o %s\r\n",
CHANNEL(gui_current_view)->name,
CHANNEL(gui_current_window->buffer)->name,
argv[i]);
}
else
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can only be executed in a channel window\n"),
WEECHAT_ERROR, "op");
return -1;
@ -663,36 +663,36 @@ irc_cmd_send_part (t_irc_server *server, char *arguments)
}
else
{
if (VIEW_IS_SERVER(gui_current_view))
if (BUFFER_IS_SERVER(gui_current_window->buffer))
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can not be executed on a server window\n"),
WEECHAT_ERROR, "part");
return -1;
}
channel_name = CHANNEL(gui_current_view)->name;
channel_name = CHANNEL(gui_current_window->buffer)->name;
pos_args = arguments;
}
}
else
{
if (VIEW_IS_SERVER(gui_current_view))
if (BUFFER_IS_SERVER(gui_current_window->buffer))
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can not be executed on a server window\n"),
WEECHAT_ERROR, "part");
return -1;
}
if (VIEW_IS_PRIVATE(gui_current_view))
if (BUFFER_IS_PRIVATE(gui_current_window->buffer))
{
ptr_channel = CHANNEL(gui_current_view);
gui_view_free (ptr_channel->view);
ptr_channel = CHANNEL(gui_current_window->buffer);
gui_buffer_free (ptr_channel->buffer);
channel_free (server, ptr_channel);
gui_redraw_view_status (gui_current_view);
gui_redraw_view_input (gui_current_view);
gui_draw_buffer_status (gui_current_window->buffer, 1);
gui_draw_buffer_input (gui_current_window->buffer, 1);
return 0;
}
channel_name = CHANNEL(gui_current_view)->name;
channel_name = CHANNEL(gui_current_window->buffer)->name;
pos_args = NULL;
}
@ -753,29 +753,29 @@ irc_cmd_send_query (t_irc_server *server, char *arguments)
ptr_channel = channel_new (server, CHAT_PRIVATE, arguments, 1);
if (!ptr_channel)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot create new private window \"%s\"\n"),
WEECHAT_ERROR,
arguments);
return -1;
}
gui_redraw_view_title (ptr_channel->view);
gui_draw_buffer_title (ptr_channel->buffer, 1);
}
/* display text if given */
if (pos)
{
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_NICK,
COLOR_WIN_CHAT_DARK, "<");
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_NICK,
COLOR_WIN_NICK_SELF,
"%s", server->nick);
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_NICK,
COLOR_WIN_CHAT_DARK, "> ");
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_MSG,
COLOR_WIN_CHAT, "%s\n", pos);
server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
@ -970,14 +970,14 @@ irc_cmd_send_topic (t_irc_server *server, char *arguments)
/* look for current channel if not specified */
if (!channel_name)
{
if (VIEW_IS_SERVER(gui_current_view))
if (BUFFER_IS_SERVER(gui_current_window->buffer))
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can not be executed on a server window\n"),
WEECHAT_ERROR, "topic");
return -1;
}
channel_name = CHANNEL(gui_current_view)->name;
channel_name = CHANNEL(gui_current_window->buffer)->name;
}
if (new_topic)
@ -1040,8 +1040,8 @@ irc_cmd_send_version (t_irc_server *server, char *arguments)
{
if (arguments)
{
if (VIEW_IS_CHANNEL(gui_current_view) &&
nick_search (CHANNEL(gui_current_view), arguments))
if (BUFFER_IS_CHANNEL(gui_current_window->buffer) &&
nick_search (CHANNEL(gui_current_window->buffer), arguments))
server_sendf (server, "PRIVMSG %s :\01VERSION\01\r\n",
arguments);
else
@ -1050,8 +1050,8 @@ irc_cmd_send_version (t_irc_server *server, char *arguments)
}
else
{
irc_display_prefix (server->view, PREFIX_INFO);
gui_printf (server->view, _("%s, compiled on %s %s\n"),
irc_display_prefix (server->buffer, PREFIX_INFO);
gui_printf (server->buffer, _("%s, compiled on %s %s\n"),
PACKAGE_STRING,
__DATE__, __TIME__);
server_sendf (server, "VERSION\r\n");
@ -1068,16 +1068,16 @@ irc_cmd_send_voice (t_irc_server *server, int argc, char **argv)
{
int i;
if (VIEW_IS_CHANNEL(gui_current_view))
if (BUFFER_IS_CHANNEL(gui_current_window->buffer))
{
for (i = 0; i < argc; i++)
server_sendf (server, "MODE %s +v %s\r\n",
CHANNEL(gui_current_view)->name,
CHANNEL(gui_current_window->buffer)->name,
argv[i]);
}
else
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can only be executed in a channel window\n"),
WEECHAT_ERROR, "voice");
return -1;

52
src/irc/irc-server.c
View File

@ -78,7 +78,7 @@ server_init (t_irc_server *server)
server->is_away = 0;
server->server_read = -1;
server->server_write = -1;
server->view = NULL;
server->buffer = NULL;
server->channels = NULL;
server->last_channel = NULL;
}
@ -270,8 +270,8 @@ server_free (t_irc_server *server)
(server->next_server)->prev_server = server->prev_server;
server_destroy (server);
if (server->view)
gui_view_free (server->view);
if (server->buffer)
gui_buffer_free (server->buffer);
free (server);
irc_servers = new_irc_servers;
}
@ -377,11 +377,11 @@ server_sendf (t_irc_server * server, char *fmt, ...)
size_buf = strlen (buffer);
buffer[size_buf - 2] = '\0';
#ifdef DEBUG
gui_printf (server->view, "[DEBUG] Sending to server >>> %s\n", buffer);
gui_printf (server->buffer, "[DEBUG] Sending to server >>> %s\n", buffer);
#endif
buffer[size_buf - 2] = '\r';
if (server_send (server, buffer, size_buf) <= 0)
gui_printf (server->view, _("%s error sending data to IRC server\n"),
gui_printf (server->buffer, _("%s error sending data to IRC server\n"),
WEECHAT_ERROR);
}
@ -397,7 +397,7 @@ server_msgq_add_msg (t_irc_server *server, char *msg)
message = (t_irc_message *) malloc (sizeof (t_irc_message));
if (!message)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s not enough memory for received IRC message\n"),
WEECHAT_ERROR);
return;
@ -408,7 +408,7 @@ server_msgq_add_msg (t_irc_server *server, char *msg)
message->data = (char *) malloc (strlen (unterminated_message) +
strlen (msg) + 1);
if (!message->data)
gui_printf (server->view,
gui_printf (server->buffer,
_("%s not enough memory for received IRC message\n"),
WEECHAT_ERROR);
else
@ -462,14 +462,14 @@ server_msgq_add_buffer (t_irc_server * server, char *buffer)
(char *) realloc (unterminated_message,
strlen (buffer) + 1);
if (!unterminated_message)
gui_printf (server->view,
gui_printf (server->buffer,
_("%s not enough memory for received IRC message\n"),
WEECHAT_ERROR);
else
strcpy (unterminated_message, buffer);
return;
}
gui_printf (server->view,
gui_printf (server->buffer,
_("%s unable to explode received buffer\n"),
WEECHAT_ERROR);
}
@ -493,7 +493,7 @@ server_msgq_flush ()
if (recv_msgq->data)
{
#ifdef DEBUG
gui_printf (gui_current_view, "[DEBUG] %s\n", recv_msgq->data);
gui_printf (gui_current_window->buffer, "[DEBUG] %s\n", recv_msgq->data);
#endif
ptr_data = recv_msgq->data;
@ -542,15 +542,15 @@ server_msgq_flush ()
command, args))
{
case -1:
gui_printf (recv_msgq->server->view,
gui_printf (recv_msgq->server->buffer,
_("Command '%s' failed!\n"), command);
break;
case -2:
gui_printf (recv_msgq->server->view,
gui_printf (recv_msgq->server->buffer,
_("No command to execute!\n"));
break;
case -3:
gui_printf (recv_msgq->server->view,
gui_printf (recv_msgq->server->buffer,
_("Unknown command: cmd=%s, args=%s\n"),
command, args);
break;
@ -602,7 +602,7 @@ server_connect (t_irc_server *server)
int error;
int server_pipe[2];
gui_printf (server->view,
gui_printf (server->buffer,
_("%s: connecting to %s:%d...\n"),
PACKAGE_NAME, server->address, server->port);
wee_log_printf (_("connecting to server %s:%d...\n"),
@ -612,7 +612,7 @@ server_connect (t_irc_server *server)
/* create pipe */
if (pipe (server_pipe) < 0)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot create pipe\n"), WEECHAT_ERROR);
server_free (server);
return 0;
@ -626,14 +626,14 @@ server_connect (t_irc_server *server)
if (setsockopt
(server->sock4, SOL_SOCKET, SO_REUSEADDR, (char *) &set,
sizeof (set)) == -1)
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot set socket option \"SO_REUSEADDR\"\n"),
WEECHAT_ERROR);
set = 1;
if (setsockopt
(server->sock4, SOL_SOCKET, SO_KEEPALIVE, (char *) &set,
sizeof (set)) == -1)
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot set socket option \"SO_KEEPALIVE\"\n"),
WEECHAT_ERROR);
@ -641,7 +641,7 @@ server_connect (t_irc_server *server)
ip4_hostent = gethostbyname (server->address);
if (!ip4_hostent)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s address \"%s\" not found\n"),
WEECHAT_ERROR, server->address);
close (server->server_read);
@ -657,14 +657,14 @@ server_connect (t_irc_server *server)
/*error = bind(server->sock4, (struct sockaddr *)(&addr), sizeof(addr));
if (error != 0)
{
gui_printf (server->view,
gui_printf (server->buffer,
WEECHAT_ERORR "server_connect: can't bind to hostname\n");
return 0;
} */
ip_address = inet_ntoa (addr.sin_addr);
if (!ip_address)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s IP address not found\n"), WEECHAT_ERROR);
close (server->server_read);
close (server->server_write);
@ -674,13 +674,13 @@ server_connect (t_irc_server *server)
}
/* connection to server */
gui_printf (server->view,
gui_printf (server->buffer,
_("%s: server IP is: %s\n"), PACKAGE_NAME, ip_address);
error = connect (server->sock4, (struct sockaddr *) &addr, sizeof (addr));
if (error != 0)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot connect to irc server\n"), WEECHAT_ERROR);
close (server->server_read);
close (server->server_write);
@ -708,7 +708,7 @@ server_auto_connect (int command_line)
if ( ((command_line) && (ptr_server->command_line))
|| ((!command_line) && (ptr_server->autoconnect)) )
{
(void) gui_view_new (gui_current_view->window, ptr_server, NULL, 1);
(void) gui_buffer_new (gui_current_window, ptr_server, NULL, 1);
if (server_connect (ptr_server))
irc_login (ptr_server);
}
@ -726,12 +726,12 @@ server_disconnect (t_irc_server *server)
if (server->is_connected)
{
/* write disconnection message on each channel/private view */
/* write disconnection message on each channel/private buffer */
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
irc_display_prefix (ptr_channel->view, PREFIX_INFO);
gui_printf (ptr_channel->view, _("Disconnected from server!\n"));
irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
gui_printf (ptr_channel->buffer, _("Disconnected from server!\n"));
}
/* close communication with server */

10
src/irc/irc.h
View File

@ -83,7 +83,7 @@ struct t_irc_channel
char *key; /* channel key (NULL if no key is set) */
t_irc_nick *nicks; /* nicks on the channel */
t_irc_nick *last_nick; /* last nick on the channel */
t_gui_view *view; /* GUI view allocated for channel */
t_gui_buffer *buffer; /* GUI buffer allocated for channel */
t_irc_channel *prev_channel; /* link to previous channel */
t_irc_channel *next_channel; /* link to next channel */
};
@ -116,7 +116,7 @@ struct t_irc_server
int is_away; /* 1 is user is marker as away */
int server_read; /* pipe for reading server data */
int server_write; /* pipe for sending data to server */
t_gui_view *view; /* GUI view allocated for server */
t_gui_buffer *buffer; /* GUI buffer allocated for server */
t_irc_channel *channels; /* opened channels on server */
t_irc_channel *last_channel; /* last opened channal on server */
t_irc_server *prev_server; /* link to previous server */
@ -204,9 +204,9 @@ extern void dcc_send ();
/* IRC display (irc-diplay.c) */
extern void irc_display_prefix (/*@null@*/ t_gui_view *, char *);
extern void irc_display_nick (t_gui_view *, t_irc_nick *, int, int, int, int);
extern void irc_display_mode (t_gui_view *, char *, char, char *, char *,
extern void irc_display_prefix (/*@null@*/ t_gui_buffer *, char *);
extern void irc_display_nick (t_gui_buffer *, t_irc_nick *, int, int, int, int);
extern void irc_display_mode (t_gui_buffer *, char *, char, char *, char *,
char *, char *);
/* IRC protocol (irc-commands.c) */

30
src/plugins/perl/wee-perl.c
View File

@ -120,7 +120,7 @@ static XS (XS_IRC_register)
}
/*
* IRC::print: print message to current view
* IRC::print: print message to current buffer
*/
static XS (XS_IRC_print)
@ -135,8 +135,8 @@ static XS (XS_IRC_print)
for (i = 0; i < items; i++)
{
message = SvPV (ST (i), integer);
irc_display_prefix (gui_current_view, PREFIX_PLUGIN);
gui_printf (gui_current_view, "%s", message);
irc_display_prefix (gui_current_window->buffer, PREFIX_PLUGIN);
gui_printf (gui_current_window->buffer, "%s", message);
}
XSRETURN_EMPTY;
@ -151,7 +151,7 @@ static XS (XS_IRC_print_with_channel)
{
int integer;
char *message, *channel, *server = NULL;
t_gui_view *ptr_view;
t_gui_buffer *ptr_buffer;
t_irc_server *ptr_server;
t_irc_channel *ptr_channel;
dXSARGS;
@ -167,9 +167,9 @@ static XS (XS_IRC_print_with_channel)
server = NULL;
}
/* look for view for printing message */
/* look for buffer for printing message */
channel = SvPV (ST (1), integer);
ptr_view = NULL;
ptr_buffer = NULL;
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
@ -180,25 +180,25 @@ static XS (XS_IRC_print_with_channel)
{
if (strcasecmp (ptr_channel->name, channel) == 0)
{
ptr_view = ptr_channel->view;
ptr_buffer = ptr_channel->buffer;
break;
}
}
}
if (ptr_view)
if (ptr_buffer)
break;
}
/* view found => display message & return 1 */
if (ptr_view)
/* buffer found => display message & return 1 */
if (ptr_buffer)
{
message = SvPV (ST (0), integer);
irc_display_prefix (ptr_view, PREFIX_PLUGIN);
gui_printf (ptr_view, "%s", message);
irc_display_prefix (ptr_buffer, PREFIX_PLUGIN);
gui_printf (ptr_buffer, "%s", message);
XSRETURN_YES;
}
/* no view found => return 0 */
/* no buffer found => return 0 */
XSRETURN_NO;
}
@ -307,8 +307,8 @@ static XS (XS_IRC_get_info)
}
else if ( (strcasecmp (arg, "2") == 0) || (strcasecmp (arg, "channel") == 0) )
{
if (VIEW_IS_CHANNEL (gui_current_view))
info = CHANNEL (gui_current_view)->name;
if (BUFFER_IS_CHANNEL (gui_current_window->buffer))
info = CHANNEL (gui_current_window->buffer)->name;
}
else if ( (strcasecmp (arg, "3") == 0) || (strcasecmp (arg, "server") == 0) )
{

3
weechat/BUGS
View File

@ -1,12 +1,13 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
WeeChat known bugs, 2004-06-05
WeeChat known bugs, 2004-07-01
- ./configure does not check that Curses headers are installed
- ./configure does not check that Gtk 2.0 libraries are installed
- ./configure does not check that Perl headers & libraries are installed
- too much nicks in the channel (> height of window) => display bug
- problem when resizing terminal and that some windows are outside new term size
- some IRC commands are marked as 'unknown' when received
(IRC protocol is under dev!)
- too much opened channels => display bug

2
weechat/ChangeLog
View File

@ -1,7 +1,7 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
ChangeLog - 2004-06-23
ChangeLog - 2004-07-01
Version 0.0.7 (under dev!):

2
weechat/TODO
View File

@ -1,7 +1,7 @@
WeeChat - Wee Enhanced Environment for Chat
===========================================
TODO - 2004-06-23
TODO - 2004-07-01
Legend:
# done

5
weechat/configure.in
View File

@ -110,10 +110,11 @@ AC_SUBST(PLUGINS_LIBS)
if test "x$enable_debug" = "xyes" ; then
AC_DEFINE(DEBUG)
CFLAGS="-Wall -W -pipe -O2 -g"
else
CFLAGS="-Wall -W -pipe -O2"
fi
CFLAGS="-Wall -W -pipe -O2"
AC_OUTPUT([Makefile
src/Makefile
src/common/Makefile

200
weechat/po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.0.7-pre2\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2004-06-05 10:52+0200\n"
"POT-Creation-Date: 2004-06-27 15:36+0200\n"
"PO-Revision-Date: 2004-06-05 10:52+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -1172,7 +1172,7 @@ msgstr "%s utilisateur non trouv
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s impossible de créer la fenêtre privée \"%s\"\n"
#: src/irc/irc-send.c:547 src/common/command.c:1118
#: src/irc/irc-send.c:547 src/common/command.c:1126
#, c-format
msgid "%s wrong argument count for \"%s\" command\n"
msgstr "%s nombre de paramètres erroné pour la commande \"%s\"\n"
@ -1618,11 +1618,11 @@ msgstr ""
"%s impossible d'ajouter la fonction pour le message \"%s\" (mémoire "
"insuffisante)\n"
#: src/gui/curses/gui-display.c:952
#: src/gui/curses/gui-display.c:919
msgid "[not connected] "
msgstr "[non connecté] "
#: src/gui/curses/gui-display.c:959 src/gui/curses/gui-display.c:962
#: src/gui/curses/gui-display.c:927 src/gui/curses/gui-display.c:930
msgid "-MORE-"
msgstr "-PLUS-"
@ -1630,17 +1630,17 @@ msgstr "-PLUS-"
msgid "server"
msgstr "serveur"
#: src/gui/gui-common.c:217
#: src/gui/gui-common.c:303
#, c-format
msgid "%s not enough memory for infobar message\n"
msgstr "%s pas assez de mémoire pour un message de la barre d'infos\n"
#: src/gui/gui-common.c:323
#: src/gui/gui-common.c:421
#, c-format
msgid "%s not enough memory for new line!\n"
msgstr "%s pas assez de mémoire pour une nouvelle ligne !\n"
#: src/gui/gui-common.c:350
#: src/gui/gui-common.c:464
msgid "not enough memory!\n"
msgstr "pas assez de mémoire !\n"
@ -1798,29 +1798,52 @@ msgstr "nom_alias"
msgid "alias_name: name of alias to remove"
msgstr "nom_alias: nom de l'alias à supprimer"
#: src/common/command.c:340
#: src/common/command.c:91
msgid "manage windows"
msgstr "gestion des fenêtres"
#: src/common/command.c:92
msgid "[action]"
msgstr "[action]"
#: src/common/command.c:93
msgid ""
"action: action to do:\n"
" close close current window (under development!)\n"
" list list opened windows (no parameter implies this list)\n"
" splith split current window horizontally\n"
" splitv split current window vertically"
msgstr ""
"action: action à effectuer:\n"
" close ferme la fenêtre courante (en développement !)\n"
" list liste toutes les fenêtres ouvertes (pas de paramètre affiche cette "
"liste)\n"
" splith éclate la fenêtre en deux horizontalement\n"
" splitv éclate la fenêtre en deux verticalement"
#: src/common/command.c:348
#, c-format
msgid "%s alias or command \"%s\" already exists!\n"
msgstr "%s l'alias ou la commande \"%s\" existe déjà !\n"
#: src/common/command.c:349
#: src/common/command.c:357
#, c-format
msgid "%s alias cannot run another alias!\n"
msgstr "%s l'alias ne peux pas lancer un autre alias !\n"
#: src/common/command.c:355
#: src/common/command.c:363
#, c-format
msgid "%s target command \"%s\" does not exist!\n"
msgstr "%s la commande cible \"%s\" n'existe pas !\n"
#: src/common/command.c:541
#: src/common/command.c:549
#, c-format
msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
msgstr ""
"%s nombre de paramètres incorrect pour la commande %s \"%s\" (attendu: %d "
"paramètre%s)\n"
#: src/common/command.c:550
#: src/common/command.c:558
#, c-format
msgid ""
"%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
@ -1829,19 +1852,19 @@ msgstr ""
"%s nombre de paramètres incorrect pour la commande %s \"%s\" (attendu: entre "
"%d et %d paramètre%s)\n"
#: src/common/command.c:569
#: src/common/command.c:577
#, c-format
msgid "%s %s command \"%s\" failed\n"
msgstr "%s %s la commande \"%s\" a échoué\n"
#: src/common/command.c:594
#: src/common/command.c:602
#, c-format
msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
msgstr ""
"%s nombre de paramètres incorrect pour la commande IRC \"%s\" (attendu: %d "
"paramètre%s)\n"
#: src/common/command.c:603
#: src/common/command.c:611
#, c-format
msgid ""
"%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
@ -1850,134 +1873,134 @@ msgstr ""
"%s nombre de paramètres incorrect pour la commande IRC \"%s\" (attendu: "
"entre %d et %d paramètre%s)\n"
#: src/common/command.c:616
#: src/common/command.c:624
#, c-format
msgid "%s command \"%s\" needs a server connection!\n"
msgstr "%s la commande \"%s\" nécessite une connexion au serveur !\n"
#: src/common/command.c:628
#: src/common/command.c:636
#, c-format
msgid "%s IRC command \"%s\" failed\n"
msgstr "%s la commande IRC \"%s\" a échoué\n"
#: src/common/command.c:675
#: src/common/command.c:683
#, c-format
msgid "%s unknown command \"%s\" (type /help for help)\n"
msgstr "%s commande \"%s\" inconnue (tapez /help pour l'aide)\n"
#: src/common/command.c:744
#: src/common/command.c:752
#, c-format
msgid "%s cannot find nick for sending message\n"
msgstr "%s impossible de trouver le pseudo pour envoyer le message\n"
#: src/common/command.c:750
#: src/common/command.c:758
msgid "This window is not a channel!\n"
msgstr "Cette fenêtre n'est pas un canal !\n"
#: src/common/command.c:776 src/common/command.c:788
#: src/common/command.c:784 src/common/command.c:796
#, c-format
msgid "%s missing arguments for \"%s\" command\n"
msgstr "%s paramètres manquants pour la commande \"%s\"\n"
#: src/common/command.c:783
#: src/common/command.c:791
#, c-format
msgid "Alias \"%s\" => \"%s\" created\n"
msgstr "Alias \"%s\" => \"%s\" créé\n"
#: src/common/command.c:798
#: src/common/command.c:806
msgid "List of aliases:\n"
msgstr "Liste des alias:\n"
#: src/common/command.c:808
#: src/common/command.c:816
msgid "No alias defined.\n"
msgstr "Aucun alias défini.\n"
#: src/common/command.c:827
#: src/common/command.c:835
#, c-format
msgid "unknown parameter \"%s\" for \"%s\" command\n"
msgstr "paramètre inconnu \"%s\" pour la commande \"%s\"\n"
#: src/common/command.c:856
#: src/common/command.c:864
#, c-format
msgid "%s already connected to server \"%s\"!\n"
msgstr "%s déjà connecté au serveur \"%s\" !\n"
#: src/common/command.c:879 src/common/command.c:914
#: src/common/command.c:887 src/common/command.c:922
#, c-format
msgid "%s server \"%s\" not found\n"
msgstr "%s serveur \"%s\" non trouvé\n"
#: src/common/command.c:904
#: src/common/command.c:912
#, c-format
msgid "%s not connected to server \"%s\"!\n"
msgstr "%s non connecté au serveur \"%s\" !\n"
#: src/common/command.c:933
#: src/common/command.c:941
#, c-format
msgid "> List of %s internal commands:\n"
msgstr "> Liste des commandes internes %s:\n"
#: src/common/command.c:938
#: src/common/command.c:946
msgid "> List of IRC commands:\n"
msgstr "> Liste des commandes IRC:\n"
#: src/common/command.c:953
#: src/common/command.c:961
#, c-format
msgid "> Help on %s internal command \"%s\":\n"
msgstr "> Aide sur la commande interne %s \"%s\":\n"
#: src/common/command.c:956 src/common/command.c:977
#: src/common/command.c:964 src/common/command.c:985
#, c-format
msgid "Syntax: /%s %s\n"
msgstr "Syntaxe: /%s %s\n"
#: src/common/command.c:975
#: src/common/command.c:983
#, c-format
msgid "> Help on IRC command \"%s\":\n"
msgstr "> Aide sur la commande IRC \"%s\":\n"
#: src/common/command.c:991
#: src/common/command.c:999
#, c-format
msgid "No help available, \"%s\" is an unknown command\n"
msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n"
#: src/common/command.c:1016
#: src/common/command.c:1024
msgid "Registered Perl scripts:\n"
msgstr "Scripts Perl enregistrés :\n"
#: src/common/command.c:1033 src/common/command.c:1055
#: src/common/command.c:1077
#: src/common/command.c:1041 src/common/command.c:1063
#: src/common/command.c:1085
msgid " (none)\n"
msgstr " (aucun)\n"
#: src/common/command.c:1038
#: src/common/command.c:1046
msgid "Perl message handlers:\n"
msgstr "Fonctions Perl pour messages :\n"
#: src/common/command.c:1047
#: src/common/command.c:1055
#, c-format
msgid " IRC(%s) => Perl(%s)\n"
msgstr " IRC(%s) => Perl(%s)\n"
#: src/common/command.c:1060
#: src/common/command.c:1068
msgid "Perl command handlers:\n"
msgstr "Commandes Perl :\n"
#: src/common/command.c:1069
#: src/common/command.c:1077
#, c-format
msgid " Command /%s => Perl(%s)\n"
msgstr " Commande /%s => Perl(%s)\n"
#: src/common/command.c:1087
#: src/common/command.c:1095
msgid "Perl scripts unloaded\n"
msgstr "Scripts Perl déchargés\n"
#: src/common/command.c:1112
#: src/common/command.c:1120
#, c-format
msgid "%s unknown option for \"%s\" command\n"
msgstr "%s option inconnue pour la commande \"%s\"\n"
#: src/common/command.c:1123
#: src/common/command.c:1131
msgid ""
"WeeChat was build without Perl support.\n"
"Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
@ -1986,193 +2009,194 @@ msgstr ""
"Merci de reconstruire WeeChat avec l'option \"--enable-perl\" pour le "
"script ./configure\n"
#: src/common/command.c:1167
#: src/common/command.c:1175
msgid "Server: "
msgstr "Serveur: "
#: src/common/command.c:1178
#: src/common/command.c:1186
msgid "connected"
msgstr "connecté"
#: src/common/command.c:1178
#: src/common/command.c:1186
msgid "not connected"
msgstr "non connecté"
#: src/common/command.c:1185
#: src/common/command.c:1193
#, c-format
msgid " Autoconnect: %s%s\n"
msgstr " Autoconnect: %s%s\n"
#: src/common/command.c:1186
#: src/common/command.c:1194
msgid "yes"
msgstr "oui"
#: src/common/command.c:1186
#: src/common/command.c:1194
msgid "no"
msgstr "non"
#: src/common/command.c:1188
#: src/common/command.c:1196
msgid " (temporary server, will not be saved)"
msgstr " (serveur temporaire, ne sera pas sauvé)"
#: src/common/command.c:1193
#: src/common/command.c:1201
#, c-format
msgid " Hostname : %s\n"
msgstr " Nom/IP : %s\n"
#: src/common/command.c:1198
#: src/common/command.c:1206
#, c-format
msgid " Port : %d\n"
msgstr " Port : %d\n"
#: src/common/command.c:1204
#: src/common/command.c:1212
msgid " Password : (hidden)\n"
msgstr " Mot passe : (caché)\n"
#: src/common/command.c:1208
#: src/common/command.c:1216
msgid " Password : (none)\n"
msgstr " Mot passe : (aucun)\n"
#: src/common/command.c:1212
#: src/common/command.c:1220
#, c-format
msgid " Nicks : %s"
msgstr " Pseudos : %s"
#: src/common/command.c:1229
#: src/common/command.c:1237
#, c-format
msgid " Username : %s\n"
msgstr " Nom utilis.: %s\n"
#: src/common/command.c:1234
#: src/common/command.c:1242
#, c-format
msgid " Realname : %s\n"
msgstr " Nom réel : %s\n"
#: src/common/command.c:1240
#: src/common/command.c:1248
#, c-format
msgid " Command : %s\n"
msgstr " Commande : %s\n"
#: src/common/command.c:1245
#: src/common/command.c:1253
msgid " Command : (none)\n"
msgstr " Commande : (aucune)\n"
#: src/common/command.c:1250
#: src/common/command.c:1258
#, c-format
msgid " Auto-join : %s\n"
msgstr " Auto-join : %s\n"
#: src/common/command.c:1255
#: src/common/command.c:1263
msgid " Auto-join : (none)\n"
msgstr " Auto-join : (aucun)\n"
#: src/common/command.c:1259
#: src/common/command.c:1267
msgid "No server.\n"
msgstr "Pas de serveur.\n"
#: src/common/command.c:1268
#: src/common/command.c:1276
#, c-format
msgid "%s missing servername for \"%s\" command\n"
msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n"
#: src/common/command.c:1274
#: src/common/command.c:1282
#, c-format
msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
msgstr "%s trop de paramètres pour la commande \"%s\", paramètres ignorés\n"
#: src/common/command.c:1291
#: src/common/command.c:1299
#, c-format
msgid "%s server \"%s\" not found for \"%s\" command\n"
msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n"
#: src/common/command.c:1297 src/common/command.c:1428
#: src/common/command.c:1305 src/common/command.c:1436
msgid "Server"
msgstr "Serveur"
#: src/common/command.c:1300
#: src/common/command.c:1308
msgid "has been deleted\n"
msgstr "a été supprimé\n"
#: src/common/command.c:1314
#: src/common/command.c:1322
#, c-format
msgid "%s missing parameters for \"%s\" command\n"
msgstr "%s paramètres manquants pour la commande \"%s\"\n"
#: src/common/command.c:1323
#: src/common/command.c:1331
#, c-format
msgid "%s server \"%s\" already exists, can't create it!\n"
msgstr "%s le serveur \"%s\" existe déjà, impossible de le créer !\n"
#: src/common/command.c:1347 src/common/command.c:1373
#: src/common/command.c:1385 src/common/command.c:1409
#: src/common/command.c:1355 src/common/command.c:1381
#: src/common/command.c:1393 src/common/command.c:1417
#, c-format
msgid "%s missing password for \"%s\" parameter\n"
msgstr "%s mot de passe manquant pour le paramètre \"%s\"\n"
#: src/common/command.c:1359
#: src/common/command.c:1367
#, c-format
msgid "%s missing nick(s) for \"%s\" parameter\n"
msgstr "%s pseudo(s) manquant(s) pour le paramètre \"%s\"\n"
#: src/common/command.c:1397
#: src/common/command.c:1405
#, c-format
msgid "%s missing command for \"%s\" parameter\n"
msgstr "%s commande manquante pour le paramètre \"%s\"\n"
#: src/common/command.c:1431
#: src/common/command.c:1439
msgid "created\n"
msgstr "créé\n"
#: src/common/command.c:1436
#: src/common/command.c:1444
#, c-format
msgid "%s unable to create server\n"
msgstr "%s impossible de créer le serveur\n"
#: src/common/command.c:1490
#: src/common/command.c:1498
#, c-format
msgid "%s option '%s' can not be changed while WeeChat is running\n"
msgstr "%s l'option '%s' ne peut pas être changée lorsque WeeChat tourne\n"
#: src/common/command.c:1502
#: src/common/command.c:1510
#, c-format
msgid "%s incorrect value for option '%s'\n"
msgstr "%s valeur incorrecte pour l'option '%s'\n"
#: src/common/command.c:1508
#: src/common/command.c:1516
#, c-format
msgid "%s config option '%s' not found\n"
msgstr "%s option de configuration '%s' non trouvée\n"
#: src/common/command.c:1558
#: src/common/command.c:1566
msgid "(unknown)"
msgstr "(inconnu)"
#: src/common/command.c:1578 src/common/command.c:1581
#: src/common/command.c:1586 src/common/command.c:1589
#, c-format
msgid "No config option found with '%s'\n"
msgstr "Aucune option de configuration trouvée avec '%s'\n"
#: src/common/command.c:1586
#: src/common/command.c:1594
#, c-format
msgid "%d config option(s) found with '%s'\n"
msgstr "%d option(s) de configuration trouvées avec '%s'\n"
#: src/common/command.c:1589
#: src/common/command.c:1597
#, c-format
msgid "%d config option(s) found\n"
msgstr "%d option(s) de configuration trouvées\n"
#: src/common/command.c:1609
#: src/common/command.c:1617
#, c-format
msgid "%s alias or command \"%s\" not found\n"
msgstr "%s alias ou commande \"%s\" non trouvé\n"
#: src/common/command.c:1618
#: src/common/command.c:1626
#, c-format
msgid "Alias \"%s\" removed\n"
msgstr "Alias \"%s\" supprimé\n"
#: src/common/weechat.c:118
#, c-format
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
"\n"
@ -2181,6 +2205,7 @@ msgstr ""
"\n"
#: src/common/weechat.c:131
#, c-format
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr " . type booléen (valeurs: 'on' ou 'off')\n"
@ -2201,6 +2226,7 @@ msgid " . default value: %d\n"
msgstr " . valeur par défaut: %d\n"
#: src/common/weechat.c:144
#, c-format
msgid " . type string (values: "
msgstr " . type chaîne (valeurs: "
@ -2209,10 +2235,12 @@ msgid "empty"
msgstr "vide"
#: src/common/weechat.c:160
#, c-format
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr " . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n"
#: src/common/weechat.c:166
#, c-format
msgid " . type string (any string)\n"
msgstr " . type chaîne (toute chaîne)\n"
@ -2226,6 +2254,7 @@ msgstr ""
"\n"
#: src/common/weechat.c:178
#, c-format
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
msgstr ""
@ -2233,6 +2262,7 @@ msgstr ""
"des lignes comme :\n"
#: src/common/weechat.c:180
#, c-format
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
"\n"

218
weechat/po/weechat.pot
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2004-06-05 10:52+0200\n"
"POT-Creation-Date: 2004-06-27 15:36+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -1078,7 +1078,7 @@ msgstr ""
msgid "%s cannot create new private window \"%s\"\n"
msgstr ""
#: src/irc/irc-send.c:547 src/common/command.c:1118
#: src/irc/irc-send.c:547 src/common/command.c:1126
#, c-format
msgid "%s wrong argument count for \"%s\" command\n"
msgstr ""
@ -1511,11 +1511,11 @@ msgstr ""
msgid "%s unable to add handler for \"%s\" message (not enough memory)\n"
msgstr ""
#: src/gui/curses/gui-display.c:952
#: src/gui/curses/gui-display.c:919
msgid "[not connected] "
msgstr ""
#: src/gui/curses/gui-display.c:959 src/gui/curses/gui-display.c:962
#: src/gui/curses/gui-display.c:927 src/gui/curses/gui-display.c:930
msgid "-MORE-"
msgstr ""
@ -1523,17 +1523,17 @@ msgstr ""
msgid "server"
msgstr ""
#: src/gui/gui-common.c:217
#: src/gui/gui-common.c:303
#, c-format
msgid "%s not enough memory for infobar message\n"
msgstr ""
#: src/gui/gui-common.c:323
#: src/gui/gui-common.c:421
#, c-format
msgid "%s not enough memory for new line!\n"
msgstr ""
#: src/gui/gui-common.c:350
#: src/gui/gui-common.c:464
msgid "not enough memory!\n"
msgstr ""
@ -1672,376 +1672,395 @@ msgstr ""
msgid "alias_name: name of alias to remove"
msgstr ""
#: src/common/command.c:340
#: src/common/command.c:91
msgid "manage windows"
msgstr ""
#: src/common/command.c:92
msgid "[action]"
msgstr ""
#: src/common/command.c:93
msgid ""
"action: action to do:\n"
" close close current window (under development!)\n"
" list list opened windows (no parameter implies this list)\n"
" splith split current window horizontally\n"
" splitv split current window vertically"
msgstr ""
#: src/common/command.c:348
#, c-format
msgid "%s alias or command \"%s\" already exists!\n"
msgstr ""
#: src/common/command.c:349
#: src/common/command.c:357
#, c-format
msgid "%s alias cannot run another alias!\n"
msgstr ""
#: src/common/command.c:355
#: src/common/command.c:363
#, c-format
msgid "%s target command \"%s\" does not exist!\n"
msgstr ""
#: src/common/command.c:541
#: src/common/command.c:549
#, c-format
msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n"
msgstr ""
#: src/common/command.c:550
#: src/common/command.c:558
#, c-format
msgid ""
"%s wrong argument count for %s command \"%s\" (expected: between %d and %d "
"arg%s)\n"
msgstr ""
#: src/common/command.c:569
#: src/common/command.c:577
#, c-format
msgid "%s %s command \"%s\" failed\n"
msgstr ""
#: src/common/command.c:594
#: src/common/command.c:602
#, c-format
msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n"
msgstr ""
#: src/common/command.c:603
#: src/common/command.c:611
#, c-format
msgid ""
"%s wrong argument count for IRC command \"%s\" (expected: between %d and %d "
"arg%s)\n"
msgstr ""
#: src/common/command.c:616
#: src/common/command.c:624
#, c-format
msgid "%s command \"%s\" needs a server connection!\n"
msgstr ""
#: src/common/command.c:628
#: src/common/command.c:636
#, c-format
msgid "%s IRC command \"%s\" failed\n"
msgstr ""
#: src/common/command.c:675
#: src/common/command.c:683
#, c-format
msgid "%s unknown command \"%s\" (type /help for help)\n"
msgstr ""
#: src/common/command.c:744
#: src/common/command.c:752
#, c-format
msgid "%s cannot find nick for sending message\n"
msgstr ""
#: src/common/command.c:750
#: src/common/command.c:758
msgid "This window is not a channel!\n"
msgstr ""
#: src/common/command.c:776 src/common/command.c:788
#: src/common/command.c:784 src/common/command.c:796
#, c-format
msgid "%s missing arguments for \"%s\" command\n"
msgstr ""
#: src/common/command.c:783
#: src/common/command.c:791
#, c-format
msgid "Alias \"%s\" => \"%s\" created\n"
msgstr ""
#: src/common/command.c:798
#: src/common/command.c:806
msgid "List of aliases:\n"
msgstr ""
#: src/common/command.c:808
#: src/common/command.c:816
msgid "No alias defined.\n"
msgstr ""
#: src/common/command.c:827
#: src/common/command.c:835
#, c-format
msgid "unknown parameter \"%s\" for \"%s\" command\n"
msgstr ""
#: src/common/command.c:856
#: src/common/command.c:864
#, c-format
msgid "%s already connected to server \"%s\"!\n"
msgstr ""
#: src/common/command.c:879 src/common/command.c:914
#: src/common/command.c:887 src/common/command.c:922
#, c-format
msgid "%s server \"%s\" not found\n"
msgstr ""
#: src/common/command.c:904
#: src/common/command.c:912
#, c-format
msgid "%s not connected to server \"%s\"!\n"
msgstr ""
#: src/common/command.c:933
#: src/common/command.c:941
#, c-format
msgid "> List of %s internal commands:\n"
msgstr ""
#: src/common/command.c:938
#: src/common/command.c:946
msgid "> List of IRC commands:\n"
msgstr ""
#: src/common/command.c:953
#: src/common/command.c:961
#, c-format
msgid "> Help on %s internal command \"%s\":\n"
msgstr ""
#: src/common/command.c:956 src/common/command.c:977
#: src/common/command.c:964 src/common/command.c:985
#, c-format
msgid "Syntax: /%s %s\n"
msgstr ""
#: src/common/command.c:975
#: src/common/command.c:983
#, c-format
msgid "> Help on IRC command \"%s\":\n"
msgstr ""
#: src/common/command.c:991
#: src/common/command.c:999
#, c-format
msgid "No help available, \"%s\" is an unknown command\n"
msgstr ""
#: src/common/command.c:1016
#: src/common/command.c:1024
msgid "Registered Perl scripts:\n"
msgstr ""
#: src/common/command.c:1033 src/common/command.c:1055
#: src/common/command.c:1077
#: src/common/command.c:1041 src/common/command.c:1063
#: src/common/command.c:1085
msgid " (none)\n"
msgstr ""
#: src/common/command.c:1038
#: src/common/command.c:1046
msgid "Perl message handlers:\n"
msgstr ""
#: src/common/command.c:1047
#: src/common/command.c:1055
#, c-format
msgid " IRC(%s) => Perl(%s)\n"
msgstr ""
#: src/common/command.c:1060
#: src/common/command.c:1068
msgid "Perl command handlers:\n"
msgstr ""
#: src/common/command.c:1069
#: src/common/command.c:1077
#, c-format
msgid " Command /%s => Perl(%s)\n"
msgstr ""
#: src/common/command.c:1087
#: src/common/command.c:1095
msgid "Perl scripts unloaded\n"
msgstr ""
#: src/common/command.c:1112
#: src/common/command.c:1120
#, c-format
msgid "%s unknown option for \"%s\" command\n"
msgstr ""
#: src/common/command.c:1123
#: src/common/command.c:1131
msgid ""
"WeeChat was build without Perl support.\n"
"Please rebuild WeeChat with \"--enable-perl\" option for ./configure script\n"
msgstr ""
#: src/common/command.c:1167
#: src/common/command.c:1175
msgid "Server: "
msgstr ""
#: src/common/command.c:1178
#: src/common/command.c:1186
msgid "connected"
msgstr ""
#: src/common/command.c:1178
#: src/common/command.c:1186
msgid "not connected"
msgstr ""
#: src/common/command.c:1185
#, c-format
msgid " Autoconnect: %s%s\n"
msgstr ""
#: src/common/command.c:1186
msgid "yes"
msgstr ""
#: src/common/command.c:1186
msgid "no"
msgstr ""
#: src/common/command.c:1188
msgid " (temporary server, will not be saved)"
msgstr ""
#: src/common/command.c:1193
#, c-format
msgid " Autoconnect: %s%s\n"
msgstr ""
#: src/common/command.c:1194
msgid "yes"
msgstr ""
#: src/common/command.c:1194
msgid "no"
msgstr ""
#: src/common/command.c:1196
msgid " (temporary server, will not be saved)"
msgstr ""
#: src/common/command.c:1201
#, c-format
msgid " Hostname : %s\n"
msgstr ""
#: src/common/command.c:1198
#: src/common/command.c:1206
#, c-format
msgid " Port : %d\n"
msgstr ""
#: src/common/command.c:1204
#: src/common/command.c:1212
msgid " Password : (hidden)\n"
msgstr ""
#: src/common/command.c:1208
#: src/common/command.c:1216
msgid " Password : (none)\n"
msgstr ""
#: src/common/command.c:1212
#: src/common/command.c:1220
#, c-format
msgid " Nicks : %s"
msgstr ""
#: src/common/command.c:1229
#: src/common/command.c:1237
#, c-format
msgid " Username : %s\n"
msgstr ""
#: src/common/command.c:1234
#: src/common/command.c:1242
#, c-format
msgid " Realname : %s\n"
msgstr ""
#: src/common/command.c:1240
#: src/common/command.c:1248
#, c-format
msgid " Command : %s\n"
msgstr ""
#: src/common/command.c:1245
#: src/common/command.c:1253
msgid " Command : (none)\n"
msgstr ""
#: src/common/command.c:1250
#: src/common/command.c:1258
#, c-format
msgid " Auto-join : %s\n"
msgstr ""
#: src/common/command.c:1255
#: src/common/command.c:1263
msgid " Auto-join : (none)\n"
msgstr ""
#: src/common/command.c:1259
#: src/common/command.c:1267
msgid "No server.\n"
msgstr ""
#: src/common/command.c:1268
#: src/common/command.c:1276
#, c-format
msgid "%s missing servername for \"%s\" command\n"
msgstr ""
#: src/common/command.c:1274
#: src/common/command.c:1282
#, c-format
msgid "%s too much arguments for \"%s\" command, ignoring arguments\n"
msgstr ""
#: src/common/command.c:1291
#: src/common/command.c:1299
#, c-format
msgid "%s server \"%s\" not found for \"%s\" command\n"
msgstr ""
#: src/common/command.c:1297 src/common/command.c:1428
#: src/common/command.c:1305 src/common/command.c:1436
msgid "Server"
msgstr ""
#: src/common/command.c:1300
#: src/common/command.c:1308
msgid "has been deleted\n"
msgstr ""
#: src/common/command.c:1314
#: src/common/command.c:1322
#, c-format
msgid "%s missing parameters for \"%s\" command\n"
msgstr ""
#: src/common/command.c:1323
#: src/common/command.c:1331
#, c-format
msgid "%s server \"%s\" already exists, can't create it!\n"
msgstr ""
#: src/common/command.c:1347 src/common/command.c:1373
#: src/common/command.c:1385 src/common/command.c:1409
#: src/common/command.c:1355 src/common/command.c:1381
#: src/common/command.c:1393 src/common/command.c:1417
#, c-format
msgid "%s missing password for \"%s\" parameter\n"
msgstr ""
#: src/common/command.c:1359
#: src/common/command.c:1367
#, c-format
msgid "%s missing nick(s) for \"%s\" parameter\n"
msgstr ""
#: src/common/command.c:1397
#: src/common/command.c:1405
#, c-format
msgid "%s missing command for \"%s\" parameter\n"
msgstr ""
#: src/common/command.c:1431
#: src/common/command.c:1439
msgid "created\n"
msgstr ""
#: src/common/command.c:1436
#: src/common/command.c:1444
#, c-format
msgid "%s unable to create server\n"
msgstr ""
#: src/common/command.c:1490
#: src/common/command.c:1498
#, c-format
msgid "%s option '%s' can not be changed while WeeChat is running\n"
msgstr ""
#: src/common/command.c:1502
#: src/common/command.c:1510
#, c-format
msgid "%s incorrect value for option '%s'\n"
msgstr ""
#: src/common/command.c:1508
#: src/common/command.c:1516
#, c-format
msgid "%s config option '%s' not found\n"
msgstr ""
#: src/common/command.c:1558
#: src/common/command.c:1566
msgid "(unknown)"
msgstr ""
#: src/common/command.c:1578 src/common/command.c:1581
#: src/common/command.c:1586 src/common/command.c:1589
#, c-format
msgid "No config option found with '%s'\n"
msgstr ""
#: src/common/command.c:1586
#: src/common/command.c:1594
#, c-format
msgid "%d config option(s) found with '%s'\n"
msgstr ""
#: src/common/command.c:1589
#: src/common/command.c:1597
#, c-format
msgid "%d config option(s) found\n"
msgstr ""
#: src/common/command.c:1609
#: src/common/command.c:1617
#, c-format
msgid "%s alias or command \"%s\" not found\n"
msgstr ""
#: src/common/command.c:1618
#: src/common/command.c:1626
#, c-format
msgid "Alias \"%s\" removed\n"
msgstr ""
#: src/common/weechat.c:118
#, c-format
msgid ""
"WeeChat configuration options (~/.weechat/weechat.rc):\n"
"\n"
msgstr ""
#: src/common/weechat.c:131
#, c-format
msgid " . type boolean (values: 'on' or 'off')\n"
msgstr ""
@ -2062,6 +2081,7 @@ msgid " . default value: %d\n"
msgstr ""
#: src/common/weechat.c:144
#, c-format
msgid " . type string (values: "
msgstr ""
@ -2070,10 +2090,12 @@ msgid "empty"
msgstr ""
#: src/common/weechat.c:160
#, c-format
msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n"
msgstr ""
#: src/common/weechat.c:166
#, c-format
msgid " . type string (any string)\n"
msgstr ""
@ -2085,11 +2107,13 @@ msgid ""
msgstr ""
#: src/common/weechat.c:178
#, c-format
msgid ""
"Moreover, you can define aliases in [alias] section, by adding lines like:\n"
msgstr ""
#: src/common/weechat.c:180
#, c-format
msgid ""
"where 'j' is alias name, and 'join' associated command.\n"
"\n"

44
weechat/src/common/command.c
View File

@ -91,7 +91,7 @@ t_weechat_command weechat_commands[] =
{ "window", N_("manage windows"),
N_("[action]"),
N_("action: action to do:\n"
" close close current window\n"
" close close current window (under development!)\n"
" list list opened windows (no parameter implies this list)\n"
" splith split current window horizontally\n"
" splitv split current window vertically"),
@ -715,46 +715,46 @@ user_command (t_irc_server *server, char *command)
{
if ((command[0] == '/') && (command[1] == '/'))
command++;
if (server && (!VIEW_IS_SERVER(gui_current_view)))
if (server && (!BUFFER_IS_SERVER(gui_current_window->buffer)))
{
server_sendf (server, "PRIVMSG %s :%s\r\n",
CHANNEL(gui_current_view)->name,
CHANNEL(gui_current_window->buffer)->name,
command);
if (VIEW_IS_PRIVATE(gui_current_view))
if (BUFFER_IS_PRIVATE(gui_current_window->buffer))
{
gui_printf_color_type (CHANNEL(gui_current_view)->view,
gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
MSG_TYPE_NICK,
COLOR_WIN_CHAT_DARK, "<");
gui_printf_color_type (CHANNEL(gui_current_view)->view,
gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
MSG_TYPE_NICK,
COLOR_WIN_NICK_SELF,
"%s", server->nick);
gui_printf_color_type (CHANNEL(gui_current_view)->view,
gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
MSG_TYPE_NICK,
COLOR_WIN_CHAT_DARK, "> ");
gui_printf_color_type (CHANNEL(gui_current_view)->view,
gui_printf_color_type (CHANNEL(gui_current_window->buffer)->buffer,
MSG_TYPE_MSG,
COLOR_WIN_CHAT, "%s\n", command);
}
else
{
ptr_nick = nick_search (CHANNEL(gui_current_view), server->nick);
ptr_nick = nick_search (CHANNEL(gui_current_window->buffer), server->nick);
if (ptr_nick)
{
irc_display_nick (CHANNEL(gui_current_view)->view, ptr_nick,
irc_display_nick (CHANNEL(gui_current_window->buffer)->buffer, ptr_nick,
MSG_TYPE_NICK, 1, 1, 0);
gui_printf_color (CHANNEL(gui_current_view)->view,
gui_printf_color (CHANNEL(gui_current_window->buffer)->buffer,
COLOR_WIN_CHAT, "%s\n", command);
}
else
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot find nick for sending message\n"),
WEECHAT_ERROR);
}
}
else
gui_printf ((server) ? server->view : NULL,
gui_printf ((server) ? server->buffer : NULL,
_("This window is not a channel!\n"));
}
}
@ -828,7 +828,7 @@ weechat_cmd_clear (int argc, char **argv)
if (argc == 1)
{
if (strcmp (argv[0], "-all") == 0)
gui_view_clear_all ();
gui_buffer_clear_all ();
else
{
gui_printf (NULL,
@ -838,7 +838,7 @@ weechat_cmd_clear (int argc, char **argv)
}
}
else
gui_view_clear (gui_current_view);
gui_buffer_clear (gui_current_window->buffer);
return 0;
}
@ -865,9 +865,9 @@ weechat_cmd_connect (int argc, char **argv)
WEECHAT_ERROR, argv[0]);
return -1;
}
if (!ptr_server->view)
if (!ptr_server->buffer)
{
if (!gui_view_new (gui_current_view->window, ptr_server, NULL, 1))
if (!gui_buffer_new (gui_current_window, ptr_server, NULL, 1))
return -1;
}
if (server_connect (ptr_server))
@ -914,7 +914,7 @@ weechat_cmd_disconnect (int argc, char **argv)
return -1;
}
server_disconnect (ptr_server);
gui_redraw_view_status (gui_current_view);
gui_draw_buffer_status (gui_current_window->buffer, 1);
}
else
{
@ -1308,7 +1308,7 @@ weechat_cmd_server (int argc, char **argv)
gui_printf_color (NULL, COLOR_WIN_CHAT, _("has been deleted\n"));
server_free (server_found);
gui_redraw_view (gui_current_view);
gui_redraw_buffer (gui_current_window->buffer);
return 0;
}
@ -1449,7 +1449,7 @@ weechat_cmd_server (int argc, char **argv)
if (new_server->autoconnect)
{
(void) gui_view_new (gui_current_view->window, new_server, NULL, 1);
(void) gui_buffer_new (gui_current_window, new_server, NULL, 1);
if (server_connect (new_server))
irc_login (new_server);
}
@ -1648,12 +1648,12 @@ weechat_cmd_window (int argc, char **argv)
if (strcasecmp (argv[0], "splith") == 0)
{
/* split window horizontally */
gui_printf (NULL, "window splith -- NOT DEVELOPED!\n");
gui_window_split_horiz (gui_current_window);
}
else if (strcasecmp (argv[0], "splitv") == 0)
{
/* split window vertically */
gui_printf (NULL, "window splitv -- NOT DEVELOPED!\n");
gui_window_split_vertic (gui_current_window);
}
else
return -1;

30
weechat/src/common/history.c
View File

@ -44,7 +44,7 @@ int num_history_general = 0;
*/
void
history_add (void *view, char *string)
history_add (void *buffer, char *string)
{
t_history *new_history, *ptr_history;
@ -83,26 +83,26 @@ history_add (void *view, char *string)
{
new_history->text = strdup (string);
if (((t_gui_view *)(view))->history)
((t_gui_view *)(view))->history->prev_history = new_history;
if (((t_gui_buffer *)(buffer))->history)
((t_gui_buffer *)(buffer))->history->prev_history = new_history;
else
((t_gui_view *)(view))->last_history = new_history;
new_history->next_history = ((t_gui_view *)(view))->history;
((t_gui_buffer *)(buffer))->last_history = new_history;
new_history->next_history = ((t_gui_buffer *)(buffer))->history;
new_history->prev_history = NULL;
((t_gui_view *)view)->history = new_history;
((t_gui_view *)(view))->num_history++;
((t_gui_buffer *)buffer)->history = new_history;
((t_gui_buffer *)(buffer))->num_history++;
/* remove one command if necessary */
if ((cfg_history_max_commands > 0)
&& (((t_gui_view *)(view))->num_history > cfg_history_max_commands))
&& (((t_gui_buffer *)(buffer))->num_history > cfg_history_max_commands))
{
ptr_history = ((t_gui_view *)view)->last_history->prev_history;
((t_gui_view *)view)->last_history->prev_history->next_history = NULL;
if (((t_gui_view *)view)->last_history->text)
free (((t_gui_view *)view)->last_history->text);
free (((t_gui_view *)view)->last_history);
((t_gui_view *)view)->last_history = ptr_history;
((t_gui_view *)(view))->num_history++;
ptr_history = ((t_gui_buffer *)buffer)->last_history->prev_history;
((t_gui_buffer *)buffer)->last_history->prev_history->next_history = NULL;
if (((t_gui_buffer *)buffer)->last_history->text)
free (((t_gui_buffer *)buffer)->last_history->text);
free (((t_gui_buffer *)buffer)->last_history);
((t_gui_buffer *)buffer)->last_history = ptr_history;
((t_gui_buffer *)(buffer))->num_history++;
}
}
}

32
weechat/src/common/weeconfig.c
View File

@ -109,33 +109,33 @@ t_config_option weechat_options_look[] =
{ "look_nicklist", N_("display nicklist window"),
N_("display nicklist window (for channel windows)"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
NULL, NULL, &cfg_look_nicklist, NULL, config_change_views },
NULL, NULL, &cfg_look_nicklist, NULL, config_change_buffers },
{ "look_nicklist_position", N_("nicklist position"),
N_("nicklist position (top, left, right (default), bottom)"),
OPTION_TYPE_INT_WITH_STRING, 0, 0, 0,
"right", cfg_look_nicklist_position_values, &cfg_look_nicklist_position, NULL, config_change_views },
"right", cfg_look_nicklist_position_values, &cfg_look_nicklist_position, NULL, config_change_buffers },
{ "look_nicklist_min_size", N_("min size for nicklist"),
N_("min size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no min size))"),
OPTION_TYPE_INT, 0, 100, 0,
NULL, NULL, &cfg_look_nicklist_min_size, NULL, config_change_views },
NULL, NULL, &cfg_look_nicklist_min_size, NULL, config_change_buffers },
{ "look_nicklist_max_size", N_("max size for nicklist"),
N_("max size for nicklist (width or height, depending on look_nicklist_position "
"(0 = no max size; if min == max and > 0, then size is fixed))"),
OPTION_TYPE_INT, 0, 100, 0,
NULL, NULL, &cfg_look_nicklist_max_size, NULL, config_change_views },
NULL, NULL, &cfg_look_nicklist_max_size, NULL, config_change_buffers },
{ "look_no_nickname", N_("text to display instead of nick when not connected"),
N_("text to display instead of nick when not connected"),
OPTION_TYPE_STRING, 0, 0, 0,
"-cmd-", NULL, NULL, &cfg_look_no_nickname, config_change_view_content },
"-cmd-", NULL, NULL, &cfg_look_no_nickname, config_change_buffer_content },
{ "look_nickmode", N_("display nick mode ((half)op/voice) before each nick"),
N_("display nick mode ((half)op/voice) before each nick"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
NULL, NULL, &cfg_look_nickmode, NULL, config_change_views },
NULL, NULL, &cfg_look_nickmode, NULL, config_change_buffers },
{ "look_nickmode_empty", N_("display space if nick mode is not (half)op/voice"),
N_("display space if nick mode is not (half)op/voice"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
NULL, NULL, &cfg_look_nickmode_empty, NULL, config_change_views },
NULL, NULL, &cfg_look_nickmode_empty, NULL, config_change_buffers },
{ "look_nick_completor", N_("the string inserted after nick completion"),
N_("the string inserted after nick completion"),
OPTION_TYPE_STRING, 0, 0, 0,
@ -143,11 +143,11 @@ t_config_option weechat_options_look[] =
{ "look_infobar", N_("enable info bar"),
N_("enable info bar"),
OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
NULL, NULL, &cfg_look_infobar, NULL, config_change_views },
NULL, NULL, &cfg_look_infobar, NULL, config_change_buffers },
{ "look_infobar_timestamp", N_("timestamp for time in infobar"),
N_("timestamp for time in infobar"),
OPTION_TYPE_STRING, 0, 0, 0,
"%B, %A %d %G - %H:%M", NULL, NULL, &cfg_look_infobar_timestamp, config_change_view_content },
"%B, %A %d %G - %H:%M", NULL, NULL, &cfg_look_infobar_timestamp, config_change_buffer_content },
{ "look_infobar_delay_highlight", N_("delay (in seconds) for highlight messages in infobar"),
N_("delay (in seconds) for highlight messages in infobar "
"(0 = disable highlight notifications in infobar)"),
@ -615,24 +615,24 @@ config_change_title ()
}
/*
* config_change_views: called when views change (for example nicklist)
* config_change_buffers: called when buffers change (for example nicklist)
*/
void
config_change_views ()
config_change_buffers ()
{
gui_switch_to_view (gui_current_view);
gui_redraw_view (gui_current_view);
gui_switch_to_buffer (gui_current_window, gui_current_window->buffer);
gui_redraw_buffer (gui_current_window->buffer);
}
/*
* config_change_view_content: called when content of a view changes
* config_change_buffer_content: called when content of a buffer changes
*/
void
config_change_view_content ()
config_change_buffer_content ()
{
gui_redraw_view (gui_current_view);
gui_redraw_buffer (gui_current_window->buffer);
}
/*

4
weechat/src/common/weeconfig.h
View File

@ -158,8 +158,8 @@ extern t_config_option * weechat_options [CONFIG_NUMBER_SECTIONS];
extern char *config_get_section ();
extern void config_change_noop ();
extern void config_change_title ();
extern void config_change_views ();
extern void config_change_view_content ();
extern void config_change_buffers ();
extern void config_change_buffer_content ();
extern void config_change_color ();
extern int config_option_set_value (t_config_option *, char *);
extern t_config_option *config_option_search (char *);

1896
weechat/src/gui/curses/gui-display.c
View File

File diff suppressed because it is too large Load Diff

315
weechat/src/gui/curses/gui-input.c
View File

@ -49,7 +49,7 @@ void
gui_read_keyb ()
{
int key, i;
t_gui_view *ptr_view;
t_gui_buffer *ptr_buffer;
char new_char[2];
key = getch ();
@ -59,16 +59,20 @@ gui_read_keyb ()
{
/* resize event */
case KEY_RESIZE:
gui_calculate_pos_size (gui_current_view);
gui_redraw_view (gui_current_view);
gui_calculate_pos_size (gui_current_window);
gui_redraw_buffer (gui_current_window->buffer);
break;
/* previous view */
/* previous buffer in window */
case KEY_F(6):
gui_switch_to_previous_view ();
gui_switch_to_previous_buffer (gui_current_window);
break;
/* next view */
/* next buffer in window */
case KEY_F(7):
gui_switch_to_next_view ();
gui_switch_to_next_buffer (gui_current_window);
break;
/* next window */
case KEY_F(8):
gui_switch_to_next_window (gui_current_window);
break;
/* remove last infobar message */
case KEY_F(10):
@ -76,205 +80,208 @@ gui_read_keyb ()
break;
/* cursor up */
case KEY_UP:
if (gui_current_view->ptr_history)
if (gui_current_window->buffer->ptr_history)
{
gui_current_view->ptr_history =
gui_current_view->ptr_history->next_history;
if (!gui_current_view->ptr_history)
gui_current_view->ptr_history =
gui_current_view->history;
gui_current_window->buffer->ptr_history =
gui_current_window->buffer->ptr_history->next_history;
if (!gui_current_window->buffer->ptr_history)
gui_current_window->buffer->ptr_history =
gui_current_window->buffer->history;
}
else
gui_current_view->ptr_history =
gui_current_view->history;
if (gui_current_view->ptr_history)
gui_current_window->buffer->ptr_history =
gui_current_window->buffer->history;
if (gui_current_window->buffer->ptr_history)
{
gui_current_view->input_buffer_size =
strlen (gui_current_view->ptr_history->text);
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->input_buffer_pos =
gui_current_view->input_buffer_size;
strcpy (gui_current_view->input_buffer,
gui_current_view->ptr_history->text);
gui_draw_view_input (gui_current_view);
gui_current_window->buffer->input_buffer_size =
strlen (gui_current_window->buffer->ptr_history->text);
gui_optimize_input_buffer_size (gui_current_window->buffer);
gui_current_window->buffer->input_buffer_pos =
gui_current_window->buffer->input_buffer_size;
strcpy (gui_current_window->buffer->input_buffer,
gui_current_window->buffer->ptr_history->text);
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* cursor down */
case KEY_DOWN:
if (gui_current_view->ptr_history)
if (gui_current_window->buffer->ptr_history)
{
gui_current_view->ptr_history =
gui_current_view->ptr_history->prev_history;
if (gui_current_view->ptr_history)
gui_current_view->input_buffer_size =
strlen (gui_current_view->ptr_history->text);
gui_current_window->buffer->ptr_history =
gui_current_window->buffer->ptr_history->prev_history;
if (gui_current_window->buffer->ptr_history)
gui_current_window->buffer->input_buffer_size =
strlen (gui_current_window->buffer->ptr_history->text);
else
gui_current_view->input_buffer_size = 0;
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->input_buffer_pos =
gui_current_view->input_buffer_size;
if (gui_current_view->ptr_history)
strcpy (gui_current_view->input_buffer,
gui_current_view->ptr_history->text);
gui_draw_view_input (gui_current_view);
gui_current_window->buffer->input_buffer_size = 0;
gui_optimize_input_buffer_size (gui_current_window->buffer);
gui_current_window->buffer->input_buffer_pos =
gui_current_window->buffer->input_buffer_size;
if (gui_current_window->buffer->ptr_history)
strcpy (gui_current_window->buffer->input_buffer,
gui_current_window->buffer->ptr_history->text);
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* cursor left */
case KEY_LEFT:
if (gui_current_view->input_buffer_pos > 0)
if (gui_current_window->buffer->input_buffer_pos > 0)
{
gui_current_view->input_buffer_pos--;
gui_draw_view_input (gui_current_view);
gui_current_window->buffer->input_buffer_pos--;
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* cursor right */
case KEY_RIGHT:
if (gui_current_view->input_buffer_pos <
gui_current_view->input_buffer_size)
if (gui_current_window->buffer->input_buffer_pos <
gui_current_window->buffer->input_buffer_size)
{
gui_current_view->input_buffer_pos++;
gui_draw_view_input (gui_current_view);
gui_current_window->buffer->input_buffer_pos++;
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* home key */
case KEY_HOME:
if (gui_current_view->input_buffer_pos > 0)
if (gui_current_window->buffer->input_buffer_pos > 0)
{
gui_current_view->input_buffer_pos = 0;
gui_draw_view_input (gui_current_view);
gui_current_window->buffer->input_buffer_pos = 0;
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* end key */
case KEY_END:
if (gui_current_view->input_buffer_pos <
gui_current_view->input_buffer_size)
if (gui_current_window->buffer->input_buffer_pos <
gui_current_window->buffer->input_buffer_size)
{
gui_current_view->input_buffer_pos =
gui_current_view->input_buffer_size;
gui_draw_view_input (gui_current_view);
gui_current_window->buffer->input_buffer_pos =
gui_current_window->buffer->input_buffer_size;
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* page up */
case KEY_PPAGE:
gui_move_page_up ();
gui_move_page_up (gui_current_window);
break;
/* page down */
case KEY_NPAGE:
gui_move_page_down ();
gui_move_page_down (gui_current_window);
break;
/* erase before cursor and move cursor to the left */
case 127:
case KEY_BACKSPACE:
if (gui_current_view->input_buffer_pos > 0)
if (gui_current_window->buffer->input_buffer_pos > 0)
{
i = gui_current_view->input_buffer_pos-1;
while (gui_current_view->input_buffer[i])
i = gui_current_window->buffer->input_buffer_pos-1;
while (gui_current_window->buffer->input_buffer[i])
{
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i+1];
gui_current_window->buffer->input_buffer[i] =
gui_current_window->buffer->input_buffer[i+1];
i++;
}
gui_current_view->input_buffer_size--;
gui_current_view->input_buffer_pos--;
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
gui_draw_view_input (gui_current_view);
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->completion.position = -1;
gui_current_window->buffer->input_buffer_size--;
gui_current_window->buffer->input_buffer_pos--;
gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
gui_draw_buffer_input (gui_current_window->buffer, 0);
gui_optimize_input_buffer_size (gui_current_window->buffer);
gui_current_window->buffer->completion.position = -1;
}
break;
/* Control + Backspace */
case 0x08:
gui_delete_previous_word ();
gui_delete_previous_word (gui_current_window->buffer);
break;
/* erase char under cursor */
case KEY_DC:
if (gui_current_view->input_buffer_pos <
gui_current_view->input_buffer_size)
if (gui_current_window->buffer->input_buffer_pos <
gui_current_window->buffer->input_buffer_size)
{
i = gui_current_view->input_buffer_pos;
while (gui_current_view->input_buffer[i])
i = gui_current_window->buffer->input_buffer_pos;
while (gui_current_window->buffer->input_buffer[i])
{
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i+1];
gui_current_window->buffer->input_buffer[i] =
gui_current_window->buffer->input_buffer[i+1];
i++;
}
gui_current_view->input_buffer_size--;
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
gui_draw_view_input (gui_current_view);
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->completion.position = -1;
gui_current_window->buffer->input_buffer_size--;
gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
gui_draw_buffer_input (gui_current_window->buffer, 0);
gui_optimize_input_buffer_size (gui_current_window->buffer);
gui_current_window->buffer->completion.position = -1;
}
break;
/* Tab : completion */
case '\t':
completion_search (&(gui_current_view->completion),
CHANNEL(gui_current_view),
gui_current_view->input_buffer,
gui_current_view->input_buffer_size,
gui_current_view->input_buffer_pos);
if (gui_current_view->completion.word_found)
completion_search (&(gui_current_window->buffer->completion),
CHANNEL(gui_current_window->buffer),
gui_current_window->buffer->input_buffer,
gui_current_window->buffer->input_buffer_size,
gui_current_window->buffer->input_buffer_pos);
if (gui_current_window->buffer->completion.word_found)
{
// replace word with new completed word into input buffer
gui_current_view->input_buffer_size +=
gui_current_view->completion.diff_size;
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
gui_current_window->buffer->input_buffer_size +=
gui_current_window->buffer->completion.diff_size;
gui_optimize_input_buffer_size (gui_current_window->buffer);
gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
if (gui_current_view->completion.diff_size > 0)
if (gui_current_window->buffer->completion.diff_size > 0)
{
for (i = gui_current_view->input_buffer_size - 1;
i >= gui_current_view->completion.position_replace +
(int)strlen (gui_current_view->completion.word_found); i--)
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i -
gui_current_view->completion.diff_size];
for (i = gui_current_window->buffer->input_buffer_size - 1;
i >= gui_current_window->buffer->completion.position_replace +
(int)strlen (gui_current_window->buffer->completion.word_found); i--)
gui_current_window->buffer->input_buffer[i] =
gui_current_window->buffer->input_buffer[i -
gui_current_window->buffer->completion.diff_size];
}
else
{
for (i = gui_current_view->completion.position_replace +
strlen (gui_current_view->completion.word_found);
i < gui_current_view->input_buffer_size; i++)
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i -
gui_current_view->completion.diff_size];
for (i = gui_current_window->buffer->completion.position_replace +
strlen (gui_current_window->buffer->completion.word_found);
i < gui_current_window->buffer->input_buffer_size; i++)
gui_current_window->buffer->input_buffer[i] =
gui_current_window->buffer->input_buffer[i -
gui_current_window->buffer->completion.diff_size];
}
strncpy (gui_current_view->input_buffer + gui_current_view->completion.position_replace,
gui_current_view->completion.word_found,
strlen (gui_current_view->completion.word_found));
gui_current_view->input_buffer_pos =
gui_current_view->completion.position_replace +
strlen (gui_current_view->completion.word_found);
gui_current_view->completion.position =
gui_current_view->input_buffer_pos;
strncpy (gui_current_window->buffer->input_buffer + gui_current_window->buffer->completion.position_replace,
gui_current_window->buffer->completion.word_found,
strlen (gui_current_window->buffer->completion.word_found));
gui_current_window->buffer->input_buffer_pos =
gui_current_window->buffer->completion.position_replace +
strlen (gui_current_window->buffer->completion.word_found);
gui_current_window->buffer->completion.position =
gui_current_window->buffer->input_buffer_pos;
/* add space or completor to the end of completion, if needed */
if (gui_current_view->completion.base_word[0] == '/')
if (gui_current_window->buffer->completion.base_word[0] == '/')
{
if (gui_current_view->input_buffer[gui_current_view->input_buffer_pos] != ' ')
gui_buffer_insert_string (" ",
gui_current_view->input_buffer_pos);
gui_current_view->completion.position++;
gui_current_view->input_buffer_pos++;
if (gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_pos] != ' ')
gui_buffer_insert_string (gui_current_window->buffer,
" ",
gui_current_window->buffer->input_buffer_pos);
gui_current_window->buffer->completion.position++;
gui_current_window->buffer->input_buffer_pos++;
}
else
{
if (gui_current_view->completion.base_word_pos == 0)
if (gui_current_window->buffer->completion.base_word_pos == 0)
{
if (strncmp (gui_current_view->input_buffer + gui_current_view->input_buffer_pos,
if (strncmp (gui_current_window->buffer->input_buffer + gui_current_window->buffer->input_buffer_pos,
cfg_look_completor, strlen (cfg_look_completor)) != 0)
gui_buffer_insert_string (cfg_look_completor,
gui_current_view->input_buffer_pos);
gui_current_view->completion.position += strlen (cfg_look_completor);
gui_current_view->input_buffer_pos += strlen (cfg_look_completor);
if (gui_current_view->input_buffer[gui_current_view->input_buffer_pos] != ' ')
gui_buffer_insert_string (" ",
gui_current_view->input_buffer_pos);
gui_current_view->completion.position++;
gui_current_view->input_buffer_pos++;
gui_buffer_insert_string (gui_current_window->buffer,
cfg_look_completor,
gui_current_window->buffer->input_buffer_pos);
gui_current_window->buffer->completion.position += strlen (cfg_look_completor);
gui_current_window->buffer->input_buffer_pos += strlen (cfg_look_completor);
if (gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_pos] != ' ')
gui_buffer_insert_string (gui_current_window->buffer,
" ",
gui_current_window->buffer->input_buffer_pos);
gui_current_window->buffer->completion.position++;
gui_current_window->buffer->input_buffer_pos++;
}
}
gui_draw_view_input (gui_current_view);
gui_draw_buffer_input (gui_current_window->buffer, 0);
}
break;
/* escape code (for control-key) */
@ -284,10 +291,10 @@ gui_read_keyb ()
switch (key)
{
case KEY_LEFT:
gui_switch_to_previous_view ();
gui_switch_to_previous_buffer (gui_current_window);
break;
case KEY_RIGHT:
gui_switch_to_next_view ();
gui_switch_to_next_buffer (gui_current_window);
break;
case 79:
/* TODO: replace 79 by constant name! */
@ -299,11 +306,11 @@ gui_read_keyb ()
{
/* Control + Right */
case 99:
gui_move_next_word ();
gui_move_next_word (gui_current_window->buffer);
break;
/* Control + Left */
case 100:
gui_move_previous_word ();
gui_move_previous_word (gui_current_window->buffer);
break;
}
}
@ -314,35 +321,36 @@ gui_read_keyb ()
break;
/* send command/message */
case '\n':
if (gui_current_view->input_buffer_size > 0)
if (gui_current_window->buffer->input_buffer_size > 0)
{
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
history_add (gui_current_view, gui_current_view->input_buffer);
gui_current_view->input_buffer_size = 0;
gui_current_view->input_buffer_pos = 0;
gui_current_view->input_buffer_1st_display = 0;
gui_current_view->completion.position = -1;
gui_current_view->ptr_history = NULL;
ptr_view = gui_current_view;
user_command (SERVER(gui_current_view),
gui_current_view->input_buffer);
if (ptr_view == gui_current_view)
gui_draw_view_input (ptr_view);
if (ptr_view)
ptr_view->input_buffer[0] = '\0';
gui_current_window->buffer->input_buffer[gui_current_window->buffer->input_buffer_size] = '\0';
history_add (gui_current_window->buffer, gui_current_window->buffer->input_buffer);
gui_current_window->buffer->input_buffer_size = 0;
gui_current_window->buffer->input_buffer_pos = 0;
gui_current_window->buffer->input_buffer_1st_display = 0;
gui_current_window->buffer->completion.position = -1;
gui_current_window->buffer->ptr_history = NULL;
ptr_buffer = gui_current_window->buffer;
user_command (SERVER(gui_current_window->buffer),
gui_current_window->buffer->input_buffer);
if (ptr_buffer == gui_current_window->buffer)
gui_draw_buffer_input (ptr_buffer, 0);
if (ptr_buffer)
ptr_buffer->input_buffer[0] = '\0';
}
break;
/* other key => add to input buffer */
default:
/*gui_printf (gui_current_view,
/*gui_printf (gui_current_buffer,
"[Debug] key pressed = %d, as octal: %o\n", key, key);*/
new_char[0] = key;
new_char[1] = '\0';
gui_buffer_insert_string (new_char,
gui_current_view->input_buffer_pos);
gui_current_view->input_buffer_pos++;
gui_draw_view_input (gui_current_view);
gui_current_view->completion.position = -1;
gui_buffer_insert_string (gui_current_window->buffer,
new_char,
gui_current_window->buffer->input_buffer_pos);
gui_current_window->buffer->input_buffer_pos++;
gui_draw_buffer_input (gui_current_window->buffer, 0);
gui_current_window->buffer->completion.position = -1;
break;
}
}
@ -374,14 +382,13 @@ gui_main_loop ()
if (local_time->tm_min != old_min)
{
old_min = local_time->tm_min;
gui_redraw_view_infobar (gui_current_view);
gui_draw_buffer_infobar (gui_current_window->buffer, 1);
}
/* second has changed ? => count down time for infobar, if needed */
if (local_time->tm_sec != old_sec)
{
old_sec = local_time->tm_sec;
/* TODO: manage splited windows! */
if (gui_infobar && gui_infobar->remaining_time > 0)
{
gui_infobar->remaining_time--;

479
weechat/src/gui/gui-common.c
View File

@ -41,10 +41,11 @@
int gui_ready; /* = 1 if GUI is initialized */
t_gui_window *gui_windows = NULL; /* pointer to first window */
t_gui_window *last_gui_window = NULL; /* pointer to last window */
t_gui_window *gui_current_window = NULL; /* pointer to current window */
t_gui_view *gui_views = NULL; /* pointer to first view */
t_gui_view *last_gui_view = NULL; /* pointer to last view */
t_gui_view *gui_current_view = NULL; /* pointer to current view */
t_gui_buffer *gui_buffers = NULL; /* pointer to first buffer */
t_gui_buffer *last_gui_buffer = NULL; /* pointer to last buffer */
t_gui_infobar *gui_infobar; /* pointer to infobar content */
@ -55,186 +56,217 @@ t_gui_infobar *gui_infobar; /* pointer to infobar content */
t_gui_window *
gui_window_new (int x, int y, int width, int height)
{
t_gui_window *window;
t_gui_window *new_window;
if ((window = (t_gui_window *)(malloc (sizeof (t_gui_window)))))
#ifdef DEBUG
wee_log_printf ("creating new window (x:%d, y:%d, width:%d, height:%d)\n",
x, y, width, height);
#endif
if ((new_window = (t_gui_window *)(malloc (sizeof (t_gui_window)))))
{
window->win_x = x;
window->win_y = y;
window->win_width = width;
window->win_height = height;
new_window->win_x = x;
new_window->win_y = y;
new_window->win_width = width;
new_window->win_height = height;
window->win_chat_x = 0;
window->win_chat_y = 0;
window->win_chat_width = 0;
window->win_chat_height = 0;
window->win_chat_cursor_x = 0;
window->win_chat_cursor_y = 0;
new_window->win_chat_x = 0;
new_window->win_chat_y = 0;
new_window->win_chat_width = 0;
new_window->win_chat_height = 0;
new_window->win_chat_cursor_x = 0;
new_window->win_chat_cursor_y = 0;
window->win_nick_x = 0;
window->win_nick_y = 0;
window->win_nick_width = 0;
window->win_nick_height = 0;
new_window->win_nick_x = 0;
new_window->win_nick_y = 0;
new_window->win_nick_width = 0;
new_window->win_nick_height = 0;
window->win_title = NULL;
window->win_chat = NULL;
window->win_nick = NULL;
window->win_status = NULL;
window->win_infobar = NULL;
window->win_input = NULL;
window->textview_chat = NULL;
window->textbuffer_chat = NULL;
window->texttag_chat = NULL;
window->textview_nicklist = NULL;
window->textbuffer_nicklist = NULL;
new_window->win_title = NULL;
new_window->win_chat = NULL;
new_window->win_nick = NULL;
new_window->win_status = NULL;
new_window->win_infobar = NULL;
new_window->win_input = NULL;
new_window->win_separator = NULL;
new_window->textview_chat = NULL;
new_window->textbuffer_chat = NULL;
new_window->texttag_chat = NULL;
new_window->textview_nicklist = NULL;
new_window->textbuffer_nicklist = NULL;
new_window->buffer = NULL;
new_window->first_line_displayed = 0;
new_window->sub_lines = 0;
/* add window to windows queue */
new_window->prev_window = last_gui_window;
if (gui_windows)
last_gui_window->next_window = new_window;
else
gui_windows = new_window;
last_gui_window = new_window;
new_window->next_window = NULL;
}
else
return NULL;
return window;
return new_window;
}
/*
* gui_view_new: create a new view in current window
* gui_buffer_new: create a new buffer in current window
*/
t_gui_view *
gui_view_new (t_gui_window *window, void *server, void *channel, int switch_to_view)
t_gui_buffer *
gui_buffer_new (t_gui_window *window, void *server, void *channel, int switch_to_buffer)
{
t_gui_view *new_view;
t_gui_buffer *new_buffer;
if (gui_views)
#ifdef DEBUG
wee_log_printf ("creating new buffer\n");
#endif
if (gui_buffers)
{
/* use first view if no server was assigned to this view */
if (!SERVER(gui_views))
/* use first buffer if no server was assigned to this buffer */
if (!SERVER(gui_buffers))
{
if (server)
((t_irc_server *)(server))->view = gui_views;
((t_irc_server *)(server))->buffer = gui_buffers;
if (channel)
((t_irc_channel *)(channel))->view = gui_views;
SERVER(gui_views) = server;
CHANNEL(gui_views) = channel;
return gui_views;
((t_irc_channel *)(channel))->buffer = gui_buffers;
SERVER(gui_buffers) = server;
CHANNEL(gui_buffers) = channel;
return gui_buffers;
}
}
if ((new_view = (t_gui_view *)(malloc (sizeof (t_gui_view)))))
if ((new_buffer = (t_gui_buffer *)(malloc (sizeof (t_gui_buffer)))))
{
new_view->is_displayed = 0;
new_buffer->num_displayed = 0;
/* assign server and channel to view */
SERVER(new_view) = server;
CHANNEL(new_view) = channel;
/* assign view to server and channel */
/* assign server and channel to buffer */
SERVER(new_buffer) = server;
CHANNEL(new_buffer) = channel;
/* assign buffer to server and channel */
if (server && !channel)
SERVER(new_view)->view = new_view;
SERVER(new_buffer)->buffer = new_buffer;
if (channel)
CHANNEL(new_view)->view = new_view;
CHANNEL(new_buffer)->buffer = new_buffer;
new_view->window = window;
if (!window->buffer)
window->buffer = new_buffer;
window->first_line_displayed = 1;
window->sub_lines = 0;
gui_calculate_pos_size (new_view);
gui_calculate_pos_size (window);
/* init views */
gui_view_init_subviews(new_view);
/* init buffers */
gui_window_init_subwindows (window);
/* init lines */
new_view->lines = NULL;
new_view->last_line = NULL;
new_view->num_lines = 0;
new_view->first_line_displayed = 1;
new_view->sub_lines = 0;
new_view->line_complete = 1;
new_view->unread_data = 0;
new_buffer->lines = NULL;
new_buffer->last_line = NULL;
new_buffer->num_lines = 0;
new_buffer->line_complete = 1;
new_buffer->unread_data = 0;
/* init input buffer */
new_view->input_buffer_alloc = INPUT_BUFFER_BLOCK_SIZE;
new_view->input_buffer = (char *) malloc (INPUT_BUFFER_BLOCK_SIZE);
new_view->input_buffer[0] = '\0';
new_view->input_buffer_size = 0;
new_view->input_buffer_pos = 0;
new_view->input_buffer_1st_display = 0;
new_buffer->input_buffer_alloc = INPUT_BUFFER_BLOCK_SIZE;
new_buffer->input_buffer = (char *) malloc (INPUT_BUFFER_BLOCK_SIZE);
new_buffer->input_buffer[0] = '\0';
new_buffer->input_buffer_size = 0;
new_buffer->input_buffer_pos = 0;
new_buffer->input_buffer_1st_display = 0;
/* init completion */
completion_init (&(new_view->completion));
completion_init (&(new_buffer->completion));
/* init history */
new_view->history = NULL;
new_view->last_history = NULL;
new_view->ptr_history = NULL;
new_view->num_history = 0;
new_buffer->history = NULL;
new_buffer->last_history = NULL;
new_buffer->ptr_history = NULL;
new_buffer->num_history = 0;
/* switch to new view */
if (switch_to_view)
gui_switch_to_view (new_view);
/* add view to views queue */
new_view->prev_view = last_gui_view;
if (gui_views)
last_gui_view->next_view = new_view;
/* add buffer to buffers queue */
new_buffer->prev_buffer = last_gui_buffer;
if (gui_buffers)
last_gui_buffer->next_buffer = new_buffer;
else
gui_views = new_view;
last_gui_view = new_view;
new_view->next_view = NULL;
gui_buffers = new_buffer;
last_gui_buffer = new_buffer;
new_buffer->next_buffer = NULL;
/* redraw whole screen */
/* TODO: manage splited windows */
gui_redraw_view (gui_current_view);
/* switch to new buffer */
if (switch_to_buffer)
gui_switch_to_buffer (window, new_buffer);
/* redraw buffer */
gui_redraw_buffer (new_buffer);
}
else
return NULL;
return new_view;
return new_buffer;
}
/*
* gui_view_clear: clear view content
* gui_buffer_clear: clear buffer content
*/
void
gui_view_clear (t_gui_view *view)
gui_buffer_clear (t_gui_buffer *buffer)
{
t_gui_window *ptr_win;
t_gui_line *ptr_line;
t_gui_message *ptr_message;
while (view->lines)
while (buffer->lines)
{
ptr_line = view->lines->next_line;
while (view->lines->messages)
ptr_line = buffer->lines->next_line;
while (buffer->lines->messages)
{
ptr_message = view->lines->messages->next_message;
if (view->lines->messages->message)
free (view->lines->messages->message);
free (view->lines->messages);
view->lines->messages = ptr_message;
ptr_message = buffer->lines->messages->next_message;
if (buffer->lines->messages->message)
free (buffer->lines->messages->message);
free (buffer->lines->messages);
buffer->lines->messages = ptr_message;
}
free (view->lines);
view->lines = ptr_line;
free (buffer->lines);
buffer->lines = ptr_line;
}
view->lines = NULL;
view->last_line = NULL;
view->num_lines = 0;
view->first_line_displayed = 1;
view->sub_lines = 0;
view->line_complete = 1;
view->unread_data = 0;
buffer->lines = NULL;
buffer->last_line = NULL;
buffer->num_lines = 0;
buffer->line_complete = 1;
buffer->unread_data = 0;
if (view == gui_current_view)
gui_redraw_view_chat (view);
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
{
if (ptr_win->buffer == buffer)
{
ptr_win->first_line_displayed = 1;
ptr_win->sub_lines = 0;
}
}
if (buffer == gui_current_window->buffer)
gui_draw_buffer_chat (buffer, 1);
}
/*
* gui_view_clear_all: clear all views content
* gui_buffer_clear_all: clear all buffers content
*/
void
gui_view_clear_all ()
gui_buffer_clear_all ()
{
t_gui_view *ptr_view;
t_gui_buffer *ptr_buffer;
for (ptr_view = gui_views; ptr_view; ptr_view = ptr_view->next_view)
gui_view_clear (ptr_view);
for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
gui_buffer_clear (ptr_buffer);
}
/*
@ -264,8 +296,7 @@ gui_infobar_printf (int time_displayed, int color, char *message, ...)
ptr_infobar->remaining_time = (time_displayed <= 0) ? -1 : time_displayed;
ptr_infobar->next_infobar = gui_infobar;
gui_infobar = ptr_infobar;
/* TODO: manage splited windows! */
gui_redraw_view_infobar (gui_current_view);
gui_draw_buffer_infobar (gui_current_window->buffer, 1);
}
else
wee_log_printf (_("%s not enough memory for infobar message\n"),
@ -288,13 +319,12 @@ gui_infobar_remove ()
free (gui_infobar->text);
free (gui_infobar);
gui_infobar = new_infobar;
/* TODO: manage splited windows! */
gui_redraw_view_infobar (gui_current_view);
gui_draw_buffer_infobar (gui_current_window->buffer, 1);
}
}
/*
* gui_line_free: delete a line from a view
* gui_line_free: delete a line from a buffer
*/
void
@ -314,57 +344,60 @@ gui_line_free (t_gui_line *line)
}
/*
* gui_view_free: delete a view
* gui_buffer_free: delete a buffer
*/
void
gui_view_free (t_gui_view *view)
gui_buffer_free (t_gui_buffer *buffer)
{
t_gui_window *ptr_win;
t_gui_line *ptr_line;
int create_new;
create_new = (view->server || view->channel);
create_new = (buffer->server || buffer->channel);
/* TODO: manage splited windows! */
if ((view == gui_current_view) &&
((view->next_view) || (view->prev_view)))
gui_switch_to_previous_view ();
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
{
if ((buffer == ptr_win->buffer) &&
((buffer->next_buffer) || (buffer->prev_buffer)))
gui_switch_to_previous_buffer (ptr_win);
}
/* free lines and messages */
while (view->lines)
while (buffer->lines)
{
ptr_line = view->lines->next_line;
gui_line_free (view->lines);
view->lines = ptr_line;
ptr_line = buffer->lines->next_line;
gui_line_free (buffer->lines);
buffer->lines = ptr_line;
}
if (view->input_buffer)
free (view->input_buffer);
if (buffer->input_buffer)
free (buffer->input_buffer);
completion_free (&(view->completion));
completion_free (&(buffer->completion));
/* remove view from views list */
if (view->prev_view)
view->prev_view->next_view = view->next_view;
if (view->next_view)
view->next_view->prev_view = view->prev_view;
if (gui_views == view)
gui_views = view->next_view;
if (last_gui_view == view)
last_gui_view = view->prev_view;
/* remove buffer from buffers list */
if (buffer->prev_buffer)
buffer->prev_buffer->next_buffer = buffer->next_buffer;
if (buffer->next_buffer)
buffer->next_buffer->prev_buffer = buffer->prev_buffer;
if (gui_buffers == buffer)
gui_buffers = buffer->next_buffer;
if (last_gui_buffer == buffer)
last_gui_buffer = buffer->prev_buffer;
free (view);
free (buffer);
/* always at least one view */
if (!gui_views && create_new)
(void) gui_view_new (gui_windows, NULL, NULL, 1);
/* always at least one buffer */
if (!gui_buffers && create_new)
(void) gui_buffer_new (gui_windows, NULL, NULL, 1);
}
/*
* gui_new_line: create new line for a view
* gui_new_line: create new line for a buffer
*/
t_gui_line *
gui_new_line (t_gui_view *view)
gui_new_line (t_gui_buffer *buffer)
{
t_gui_line *new_line, *ptr_line;
@ -375,14 +408,14 @@ gui_new_line (t_gui_view *view)
new_line->line_with_message = 0;
new_line->messages = NULL;
new_line->last_message = NULL;
if (!view->lines)
view->lines = new_line;
if (!buffer->lines)
buffer->lines = new_line;
else
view->last_line->next_line = new_line;
new_line->prev_line = view->last_line;
buffer->last_line->next_line = new_line;
new_line->prev_line = buffer->last_line;
new_line->next_line = NULL;
view->last_line = new_line;
view->num_lines++;
buffer->last_line = new_line;
buffer->num_lines++;
}
else
{
@ -392,40 +425,40 @@ gui_new_line (t_gui_view *view)
/* remove one line if necessary */
if ((cfg_history_max_lines > 0)
&& (view->num_lines > cfg_history_max_lines))
&& (buffer->num_lines > cfg_history_max_lines))
{
if (view->last_line == view->lines)
view->last_line = NULL;
ptr_line = view->lines->next_line;
gui_line_free (view->lines);
view->lines = ptr_line;
if (buffer->last_line == buffer->lines)
buffer->last_line = NULL;
ptr_line = buffer->lines->next_line;
gui_line_free (buffer->lines);
buffer->lines = ptr_line;
ptr_line->prev_line = NULL;
view->num_lines--;
if (view->first_line_displayed)
gui_redraw_view_chat (view);
buffer->num_lines--;
//if (buffer->first_line_displayed)
gui_draw_buffer_chat (buffer, 1);
}
return new_line;
}
/*
* gui_new_message: create a new message for last line of a view
* gui_new_message: create a new message for last line of a buffer
*/
t_gui_message *
gui_new_message (t_gui_view *view)
gui_new_message (t_gui_buffer *buffer)
{
t_gui_message *new_message;
if ((new_message = (t_gui_message *) malloc (sizeof (struct t_gui_message))))
{
if (!view->last_line->messages)
view->last_line->messages = new_message;
if (!buffer->last_line->messages)
buffer->last_line->messages = new_message;
else
view->last_line->last_message->next_message = new_message;
new_message->prev_message = view->last_line->last_message;
buffer->last_line->last_message->next_message = new_message;
new_message->prev_message = buffer->last_line->last_message;
new_message->next_message = NULL;
view->last_line->last_message = new_message;
buffer->last_line->last_message = new_message;
}
else
{
@ -441,16 +474,16 @@ gui_new_message (t_gui_view *view)
*/
void
gui_optimize_input_buffer_size (t_gui_view *view)
gui_optimize_input_buffer_size (t_gui_buffer *buffer)
{
int optimal_size;
optimal_size = ((view->input_buffer_size / INPUT_BUFFER_BLOCK_SIZE) *
optimal_size = ((buffer->input_buffer_size / INPUT_BUFFER_BLOCK_SIZE) *
INPUT_BUFFER_BLOCK_SIZE) + INPUT_BUFFER_BLOCK_SIZE;
if (view->input_buffer_alloc != optimal_size)
if (buffer->input_buffer_alloc != optimal_size)
{
view->input_buffer_alloc = optimal_size;
view->input_buffer = realloc (view->input_buffer, optimal_size);
buffer->input_buffer_alloc = optimal_size;
buffer->input_buffer = realloc (buffer->input_buffer, optimal_size);
}
}
@ -459,25 +492,25 @@ gui_optimize_input_buffer_size (t_gui_view *view)
*/
void
gui_delete_previous_word ()
gui_delete_previous_word (t_gui_buffer *buffer)
{
int i, j, num_char_deleted, num_char_end;
if (gui_current_view->input_buffer_pos > 0)
if (buffer->input_buffer_pos > 0)
{
i = gui_current_view->input_buffer_pos - 1;
i = buffer->input_buffer_pos - 1;
while ((i >= 0) &&
(gui_current_view->input_buffer[i] == ' '))
(buffer->input_buffer[i] == ' '))
i--;
if (i >= 0)
{
while ((i >= 0) &&
(gui_current_view->input_buffer[i] != ' '))
(buffer->input_buffer[i] != ' '))
i--;
if (i >= 0)
{
while ((i >= 0) &&
(gui_current_view->input_buffer[i] == ' '))
(buffer->input_buffer[i] == ' '))
i--;
}
}
@ -485,20 +518,20 @@ gui_delete_previous_word ()
if (i >= 0)
i++;
i++;
num_char_deleted = gui_current_view->input_buffer_pos - i;
num_char_end = gui_current_view->input_buffer_size -
gui_current_view->input_buffer_pos;
num_char_deleted = buffer->input_buffer_pos - i;
num_char_end = buffer->input_buffer_size -
buffer->input_buffer_pos;
for (j = 0; j < num_char_end; j++)
gui_current_view->input_buffer[i + j] =
gui_current_view->input_buffer[gui_current_view->input_buffer_pos + j];
buffer->input_buffer[i + j] =
buffer->input_buffer[buffer->input_buffer_pos + j];
gui_current_view->input_buffer_size -= num_char_deleted;
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
gui_current_view->input_buffer_pos = i;
gui_draw_view_input (gui_current_view);
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->completion.position = -1;
buffer->input_buffer_size -= num_char_deleted;
buffer->input_buffer[buffer->input_buffer_size] = '\0';
buffer->input_buffer_pos = i;
gui_draw_buffer_input (buffer, 0);
gui_optimize_input_buffer_size (buffer);
buffer->completion.position = -1;
}
}
@ -507,26 +540,26 @@ gui_delete_previous_word ()
*/
void
gui_move_previous_word ()
gui_move_previous_word (t_gui_buffer *buffer)
{
int i;
if (gui_current_view->input_buffer_pos > 0)
if (buffer->input_buffer_pos > 0)
{
i = gui_current_view->input_buffer_pos - 1;
i = buffer->input_buffer_pos - 1;
while ((i >= 0) &&
(gui_current_view->input_buffer[i] == ' '))
(buffer->input_buffer[i] == ' '))
i--;
if (i < 0)
gui_current_view->input_buffer_pos = 0;
buffer->input_buffer_pos = 0;
else
{
while ((i >= 0) &&
(gui_current_view->input_buffer[i] != ' '))
(buffer->input_buffer[i] != ' '))
i--;
gui_current_view->input_buffer_pos = i + 1;
buffer->input_buffer_pos = i + 1;
}
gui_draw_view_input (gui_current_view);
gui_draw_buffer_input (buffer, 0);
}
}
@ -535,32 +568,32 @@ gui_move_previous_word ()
*/
void
gui_move_next_word ()
gui_move_next_word (t_gui_buffer *buffer)
{
int i;
if (gui_current_view->input_buffer_pos <
gui_current_view->input_buffer_size + 1)
if (buffer->input_buffer_pos <
buffer->input_buffer_size + 1)
{
i = gui_current_view->input_buffer_pos;
while ((i <= gui_current_view->input_buffer_size) &&
(gui_current_view->input_buffer[i] == ' '))
i = buffer->input_buffer_pos;
while ((i <= buffer->input_buffer_size) &&
(buffer->input_buffer[i] == ' '))
i++;
if (i > gui_current_view->input_buffer_size)
gui_current_view->input_buffer_pos = i - 1;
if (i > buffer->input_buffer_size)
buffer->input_buffer_pos = i - 1;
else
{
while ((i <= gui_current_view->input_buffer_size) &&
(gui_current_view->input_buffer[i] != ' '))
while ((i <= buffer->input_buffer_size) &&
(buffer->input_buffer[i] != ' '))
i++;
if (i > gui_current_view->input_buffer_size)
gui_current_view->input_buffer_pos =
gui_current_view->input_buffer_size;
if (i > buffer->input_buffer_size)
buffer->input_buffer_pos =
buffer->input_buffer_size;
else
gui_current_view->input_buffer_pos = i;
buffer->input_buffer_pos = i;
}
gui_draw_view_input (gui_current_view);
gui_draw_buffer_input (buffer, 0);
}
}
@ -569,24 +602,24 @@ gui_move_next_word ()
*/
void
gui_buffer_insert_string (char *string, int pos)
gui_buffer_insert_string (t_gui_buffer *buffer, char *string, int pos)
{
int i, start, end, length;
length = strlen (string);
/* increase buffer size */
gui_current_view->input_buffer_size += length;
gui_optimize_input_buffer_size (gui_current_view);
gui_current_view->input_buffer[gui_current_view->input_buffer_size] = '\0';
buffer->input_buffer_size += length;
gui_optimize_input_buffer_size (buffer);
buffer->input_buffer[buffer->input_buffer_size] = '\0';
/* move end of string to the right */
start = pos + length;
end = gui_current_view->input_buffer_size - 1;
end = buffer->input_buffer_size - 1;
for (i = end; i >= start; i--)
gui_current_view->input_buffer[i] =
gui_current_view->input_buffer[i - length];
buffer->input_buffer[i] =
buffer->input_buffer[i - length];
/* insert new string */
strncpy (gui_current_view->input_buffer + pos, string, length);
strncpy (buffer->input_buffer + pos, string, length);
}

166
weechat/src/gui/gui.h
View File

@ -59,23 +59,23 @@
#define COLOR_WIN_NICK_LAST 38
#define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
#define SERVER(view) ((t_irc_server *)(view->server))
#define CHANNEL(view) ((t_irc_channel *)(view->channel))
#define SERVER(buffer) ((t_irc_server *)(buffer->server))
#define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel))
#define VIEW_IS_SERVER(view) (SERVER(view) && !CHANNEL(view))
#define VIEW_IS_CHANNEL(view) (CHANNEL(view) && (CHANNEL(view)->type == CHAT_CHANNEL))
#define VIEW_IS_PRIVATE(view) (CHANNEL(view) && (CHANNEL(view)->type == CHAT_PRIVATE))
#define BUFFER_IS_SERVER(buffer) (SERVER(buffer) && !CHANNEL(buffer))
#define BUFFER_IS_CHANNEL(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_CHANNEL))
#define BUFFER_IS_PRIVATE(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHAT_PRIVATE))
#define MSG_TYPE_TIME 0
#define MSG_TYPE_NICK 1
#define MSG_TYPE_INFO 2
#define MSG_TYPE_MSG 3
#define gui_printf_color(view, color, fmt, argz...) \
gui_printf_color_type(view, MSG_TYPE_INFO, color, fmt, ##argz)
#define gui_printf_color(buffer, color, fmt, argz...) \
gui_printf_color_type(buffer, MSG_TYPE_INFO, color, fmt, ##argz)
#define gui_printf(view, fmt, argz...) \
gui_printf_color_type(view, MSG_TYPE_INFO, -1, fmt, ##argz)
#define gui_printf(buffer, fmt, argz...) \
gui_printf_color_type(buffer, MSG_TYPE_INFO, -1, fmt, ##argz)
typedef struct t_gui_message t_gui_message;
@ -121,6 +121,44 @@ struct t_gui_infobar
t_gui_infobar *next_infobar; /* next message for infobar */
};
typedef struct t_gui_buffer t_gui_buffer;
struct t_gui_buffer
{
int num_displayed; /* number of windows displaying buffer */
/* server/channel */
void *server; /* buffer's server */
void *channel; /* buffer's channel */
/* chat content (lines, line is composed by many messages) */
t_gui_line *lines; /* lines of chat window */
t_gui_line *last_line; /* last line of chat window */
int num_lines; /* number of lines in the window */
int line_complete; /* current line complete ? (\n ending) */
int unread_data; /* highlight windows with unread data */
/* inupt buffer */
char *input_buffer; /* input buffer */
int input_buffer_alloc; /* input buffer: allocated size in mem */
int input_buffer_size; /* buffer size (user input length) */
int input_buffer_pos; /* position into buffer */
int input_buffer_1st_display; /* first char displayed on screen */
/* completion */
t_completion completion; /* for cmds/nicks completion */
/* history */
t_history *history; /* commands history */
t_history *last_history; /* last command in history */
t_history *ptr_history; /* current command in history */
int num_history; /* number of commands in history */
/* link to previous/next buffer */
t_gui_buffer *prev_buffer; /* link to previous buffer */
t_gui_buffer *next_buffer; /* link to next buffer */
};
typedef struct t_gui_window t_gui_window;
struct t_gui_window
@ -148,6 +186,7 @@ struct t_gui_window
void *win_status; /* status window */
void *win_infobar; /* info bar window */
void *win_input; /* input window */
void *win_separator; /* separation between 2 splited (V) win */
/* windows for Gtk GUI */
void *textview_chat; /* textview widget for chat */
@ -159,109 +198,70 @@ struct t_gui_window
/* windows for Qt GUI */
/* TODO: declare Qt window */
t_gui_window *prev_window; /* link to previous window */
t_gui_window *next_window; /* link to next window */
};
typedef struct t_gui_view t_gui_view;
struct t_gui_view
{
int is_displayed; /* = 1 if view is displayed */
t_gui_buffer *buffer; /* buffer currently displayed in window */
/* server/channel */
void *server; /* view's server */
void *channel; /* view's channel */
t_gui_window *window; /* Curses or Gtk window */
/* chat content (lines, line is composed by many messages) */
t_gui_line *lines; /* lines of chat window */
t_gui_line *last_line; /* last line of chat window */
int num_lines; /* number of lines in the window */
int first_line_displayed; /* = 1 if first line is displayed */
int sub_lines; /* if > 0 then do not display until end */
int line_complete; /* current line complete ? (\n ending) */
int unread_data; /* highlight windows with unread data */
/* inupt buffer */
char *input_buffer; /* input buffer */
int input_buffer_alloc; /* input buffer: allocated size in mem */
int input_buffer_size; /* buffer size (user input length) */
int input_buffer_pos; /* position into buffer */
int input_buffer_1st_display; /* first char displayed on screen */
/* completion */
t_completion completion; /* for cmds/nicks completion */
/* history */
t_history *history; /* commands history */
t_history *last_history; /* last command in history */
t_history *ptr_history; /* current command in history */
int num_history; /* number of commands in history */
/* link to next window */
t_gui_view *prev_view; /* link to previous view */
t_gui_view *next_view; /* link to next view */
t_gui_window *prev_window; /* link to previous window */
t_gui_window *next_window; /* link to next window */
};
/* variables */
extern int gui_ready;
extern t_gui_window *gui_windows;
extern t_gui_view *gui_views;
extern t_gui_view *last_gui_view;
extern t_gui_view *gui_current_view;
extern t_gui_window *last_gui_window;
extern t_gui_window *gui_current_window;
extern t_gui_buffer *gui_buffers;
extern t_gui_buffer *last_gui_buffer;
extern t_gui_infobar *gui_infobar;
/* prototypes */
/* GUI independent functions */
extern t_gui_window *gui_window_new (int, int, int, int);
extern t_gui_view *gui_view_new (t_gui_window *, void *, void *, int);
extern void gui_view_clear (t_gui_view *);
extern void gui_view_clear_all ();
extern t_gui_buffer *gui_buffer_new (t_gui_window *, void *, void *, int);
extern void gui_buffer_clear (t_gui_buffer *);
extern void gui_buffer_clear_all ();
extern void gui_infobar_printf (int, int, char *, ...);
extern void gui_infobar_remove ();
extern t_gui_line *gui_new_line (t_gui_view *);
extern t_gui_message *gui_new_message (t_gui_view *);
extern void gui_optimize_input_buffer_size (t_gui_view *);
extern void gui_delete_previous_word ();
extern void gui_move_previous_word ();
extern void gui_move_next_word ();
extern void gui_buffer_insert_string (char *, int);
extern t_gui_line *gui_new_line (t_gui_buffer *);
extern t_gui_message *gui_new_message (t_gui_buffer *);
extern void gui_optimize_input_buffer_size (t_gui_buffer *);
extern void gui_delete_previous_word (t_gui_buffer *);
extern void gui_move_previous_word (t_gui_buffer *);
extern void gui_move_next_word (t_gui_buffer *);
extern void gui_buffer_insert_string (t_gui_buffer *, char *, int);
/* GUI dependant functions */
extern int gui_assign_color (int *, char *);
extern int gui_get_color_by_name (char *);
extern char *gui_get_color_by_value (int);
extern int gui_view_has_nicklist (t_gui_view *);
extern void gui_calculate_pos_size (t_gui_view *);
extern void gui_draw_view_title (t_gui_view *);
extern void gui_redraw_view_title (t_gui_view *);
extern void gui_draw_view_chat (t_gui_view *);
extern void gui_redraw_view_chat (t_gui_view *);
extern void gui_draw_view_nick (t_gui_view *);
extern void gui_redraw_view_nick (t_gui_view *);
extern void gui_draw_view_status (t_gui_view *);
extern void gui_redraw_view_status (t_gui_view *);
extern void gui_draw_view_infobar (t_gui_view *);
extern void gui_redraw_view_infobar (t_gui_view *);
extern void gui_draw_view_input (t_gui_view *);
extern void gui_redraw_view_input (t_gui_view *);
extern void gui_redraw_view (t_gui_view *);
extern void gui_switch_to_view (t_gui_view *);
extern void gui_switch_to_previous_view ();
extern void gui_switch_to_next_view ();
extern int gui_buffer_has_nicklist (t_gui_buffer *);
extern void gui_calculate_pos_size (t_gui_window *);
extern void gui_draw_buffer_title (t_gui_buffer *, int);
extern void gui_draw_buffer_chat (t_gui_buffer *, int);
extern void gui_draw_buffer_nick (t_gui_buffer *, int);
extern void gui_draw_buffer_status (t_gui_buffer *, int);
extern void gui_draw_buffer_infobar (t_gui_buffer *, int);
extern void gui_draw_buffer_input (t_gui_buffer *, int);
extern void gui_redraw_buffer (t_gui_buffer *);
extern void gui_switch_to_buffer (t_gui_window *, t_gui_buffer *);
extern void gui_switch_to_previous_buffer (t_gui_window *);
extern void gui_switch_to_next_buffer (t_gui_window *);
extern void gui_switch_to_next_window (t_gui_window *);
extern void gui_move_page_up ();
extern void gui_move_page_down ();
extern void gui_view_init_subviews (t_gui_view *);
extern void gui_window_init_subwindows (t_gui_window *);
extern void gui_window_split_horiz (t_gui_window *);
extern void gui_window_split_vertic (t_gui_window *);
extern void gui_pre_init (int *, char **[]);
extern void gui_init_colors ();
extern void gui_set_window_title ();
extern void gui_init ();
extern void gui_view_free (t_gui_view *);
extern void gui_buffer_free (t_gui_buffer *);
extern void gui_end ();
extern void gui_printf_color_type (/*@null@*/ t_gui_view *, int, int, char *, ...);
extern void gui_printf_color_type (/*@null@*/ t_gui_buffer *, int, int, char *, ...);
extern void gui_main_loop ();
#endif /* gui.h */

4
weechat/src/irc/irc-channel.c
View File

@ -41,7 +41,7 @@ char *channel_modes = "iklmnst";
t_irc_channel *
channel_new (t_irc_server *server, int channel_type, char *channel_name,
int switch_to_view)
int switch_to_buffer)
{
t_irc_channel *new_channel;
@ -72,7 +72,7 @@ channel_new (t_irc_server *server, int channel_type, char *channel_name,
server->channels = new_channel;
server->last_channel = new_channel;
gui_view_new (gui_current_view->window, server, new_channel, switch_to_view);
gui_buffer_new (gui_current_window, server, new_channel, switch_to_buffer);
/* all is ok, return address of new channel */
return new_channel;

50
weechat/src/irc/irc-display.c
View File

@ -41,16 +41,16 @@
*/
void
irc_display_prefix (t_gui_view *view, char *prefix)
irc_display_prefix (t_gui_buffer *buffer, char *prefix)
{
if (prefix[0] == prefix[2])
{
gui_printf_color (view, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]);
gui_printf_color (view, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]);
gui_printf_color (view, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]);
gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%c", prefix[0]);
gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX2, "%c", prefix[1]);
gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%c ", prefix[2]);
}
else
gui_printf_color (view, COLOR_WIN_CHAT_PREFIX1, "%s ", prefix);
gui_printf_color (buffer, COLOR_WIN_CHAT_PREFIX1, "%s ", prefix);
}
/*
@ -59,45 +59,45 @@ irc_display_prefix (t_gui_view *view, char *prefix)
*/
void
irc_display_nick (t_gui_view *view, t_irc_nick *nick, int message_type,
irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, int message_type,
int display_around, int color_nick, int no_nickmode)
{
if (display_around)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type, COLOR_WIN_CHAT_DARK, "<");
if (cfg_look_nickmode)
{
if (nick->is_op)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type,
COLOR_WIN_NICK_OP, "@");
else
{
if (nick->is_halfop)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type,
COLOR_WIN_NICK_HALFOP, "%%");
else
{
if (nick->has_voice)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type,
COLOR_WIN_NICK_VOICE, "+");
else
if (cfg_look_nickmode_empty && !no_nickmode)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type,
COLOR_WIN_CHAT, " ");
}
}
}
if (color_nick < 0)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type,
COLOR_WIN_CHAT_HIGHLIGHT,
"%s", nick->nick);
else
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type,
(color_nick) ?
((cfg_look_color_nicks) ?
@ -106,7 +106,7 @@ irc_display_nick (t_gui_view *view, t_irc_nick *nick, int message_type,
"%s", nick->nick);
if (display_around)
gui_printf_color_type (view,
gui_printf_color_type (buffer,
message_type, COLOR_WIN_CHAT_DARK, "> ");
}
@ -115,21 +115,21 @@ irc_display_nick (t_gui_view *view, t_irc_nick *nick, int message_type,
*/
void
irc_display_mode (t_gui_view *view, char *channel_name, char set_flag,
irc_display_mode (t_gui_buffer *buffer, char *channel_name, char set_flag,
char *symbol, char *nick_host, char *message, char *param)
{
irc_display_prefix (view, PREFIX_INFO);
gui_printf_color (view, COLOR_WIN_CHAT_DARK, "[");
gui_printf_color (view, COLOR_WIN_CHAT_CHANNEL, "%s", channel_name);
gui_printf_color (view, COLOR_WIN_CHAT, "/");
gui_printf_color (view, COLOR_WIN_CHAT_CHANNEL, "%c%s", set_flag, symbol);
gui_printf_color (view, COLOR_WIN_CHAT_DARK, "] ");
gui_printf_color (view, COLOR_WIN_CHAT_NICK, "%s", nick_host);
irc_display_prefix (buffer, PREFIX_INFO);
gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "[");
gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%s", channel_name);
gui_printf_color (buffer, COLOR_WIN_CHAT, "/");
gui_printf_color (buffer, COLOR_WIN_CHAT_CHANNEL, "%c%s", set_flag, symbol);
gui_printf_color (buffer, COLOR_WIN_CHAT_DARK, "] ");
gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, "%s", nick_host);
if (param)
{
gui_printf_color (view, COLOR_WIN_CHAT, " %s ", message);
gui_printf_color (view, COLOR_WIN_CHAT_NICK, "%s\n", param);
gui_printf_color (buffer, COLOR_WIN_CHAT, " %s ", message);
gui_printf_color (buffer, COLOR_WIN_CHAT_NICK, "%s\n", param);
}
else
gui_printf_color (view, COLOR_WIN_CHAT, " %s\n", message);
gui_printf_color (buffer, COLOR_WIN_CHAT, " %s\n", message);
}

4
weechat/src/irc/irc-nick.c
View File

@ -182,7 +182,7 @@ nick_new (t_irc_channel *channel, char *nick_name,
/* alloc memory for new nick */
if ((new_nick = (t_irc_nick *) malloc (sizeof (t_irc_nick))) == NULL)
{
gui_printf (channel->view,
gui_printf (channel->buffer,
_("%s cannot allocate new nick\n"), WEECHAT_ERROR);
return NULL;
}
@ -192,7 +192,7 @@ nick_new (t_irc_channel *channel, char *nick_name,
new_nick->is_op = is_op;
new_nick->is_halfop = is_halfop;
new_nick->has_voice = has_voice;
if (strcasecmp (new_nick->nick, SERVER(channel->view)->nick) == 0)
if (strcasecmp (new_nick->nick, SERVER(channel->buffer)->nick) == 0)
new_nick->color = COLOR_WIN_NICK_SELF;
else
new_nick->color = nick_find_color (channel);

614
weechat/src/irc/irc-recv.c
View File

File diff suppressed because it is too large Load Diff

130
weechat/src/irc/irc-send.c
View File

@ -56,7 +56,7 @@ irc_login (t_irc_server *server)
hostname[sizeof (hostname) - 1] = '\0';
if (!hostname[0])
strcpy (hostname, _("unknown"));
gui_printf (server->view,
gui_printf (server->buffer,
_("%s: using local hostname \"%s\"\n"),
PACKAGE_NAME, hostname);
server_sendf (server,
@ -198,15 +198,15 @@ irc_cmd_send_deop (t_irc_server *server, int argc, char **argv)
{
int i;
if (VIEW_IS_CHANNEL(gui_current_view))
if (BUFFER_IS_CHANNEL(gui_current_window->buffer))
{
for (i = 0; i < argc; i++)
server_sendf (server, "MODE %s -o %s\r\n",
CHANNEL(gui_current_view)->name,
CHANNEL(gui_current_window->buffer)->name,
argv[i]);
}
else
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can only be executed in a channel window\n"),
WEECHAT_ERROR, "deop");
return 0;
@ -221,16 +221,16 @@ irc_cmd_send_devoice (t_irc_server *server, int argc, char **argv)
{
int i;
if (VIEW_IS_CHANNEL(gui_current_view))
if (BUFFER_IS_CHANNEL(gui_current_window->buffer))
{
for (i = 0; i < argc; i++)
server_sendf (server, "MODE %s -v %s\r\n",
CHANNEL(gui_current_view)->name,
CHANNEL(gui_current_window->buffer)->name,
argv[i]);
}
else
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can only be executed in a channel window\n"),
WEECHAT_ERROR, "devoice");
return -1;
@ -310,15 +310,15 @@ irc_cmd_send_kick (t_irc_server *server, char *arguments)
server_sendf (server, "KICK %s\r\n", arguments);
else
{
if (VIEW_IS_CHANNEL (gui_current_view))
if (BUFFER_IS_CHANNEL (gui_current_window->buffer))
{
server_sendf (server,
"KICK %s %s\r\n",
CHANNEL(gui_current_view)->name, arguments);
CHANNEL(gui_current_window->buffer)->name, arguments);
}
else
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can only be executed in a channel window\n"),
WEECHAT_ERROR, "kick");
return -1;
@ -388,19 +388,19 @@ irc_cmd_send_lusers (t_irc_server *server, char *arguments)
int
irc_cmd_send_me (t_irc_server *server, char *arguments)
{
if (VIEW_IS_SERVER(gui_current_view))
if (BUFFER_IS_SERVER(gui_current_window->buffer))
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can not be executed on a server window\n"),
WEECHAT_ERROR, "me");
return -1;
}
server_sendf (server, "PRIVMSG %s :\01ACTION %s\01\r\n",
CHANNEL(gui_current_view)->name, arguments);
irc_display_prefix (gui_current_view, PREFIX_ACTION_ME);
gui_printf_color (gui_current_view,
CHANNEL(gui_current_window->buffer)->name, arguments);
irc_display_prefix (gui_current_window->buffer, PREFIX_ACTION_ME);
gui_printf_color (gui_current_window->buffer,
COLOR_WIN_CHAT_NICK, "%s", server->nick);
gui_printf_color (gui_current_view,
gui_printf_color (gui_current_window->buffer,
COLOR_WIN_CHAT, " %s\n", arguments);
return 0;
}
@ -459,25 +459,25 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
}
if (strcmp (arguments, "*") == 0)
{
if (VIEW_IS_SERVER(gui_current_view))
if (BUFFER_IS_SERVER(gui_current_window->buffer))
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can not be executed on a server window\n"),
WEECHAT_ERROR, "msg *");
return -1;
}
ptr_channel = CHANNEL(gui_current_view);
ptr_channel = CHANNEL(gui_current_window->buffer);
ptr_nick = nick_search (ptr_channel, server->nick);
if (ptr_nick)
{
irc_display_nick (ptr_channel->view, ptr_nick,
irc_display_nick (ptr_channel->buffer, ptr_nick,
MSG_TYPE_NICK, 1, 1, 0);
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_MSG,
COLOR_WIN_CHAT, "%s\n", pos);
}
else
gui_printf (server->view,
gui_printf (server->buffer,
_("%s nick not found for \"%s\" command\n"),
WEECHAT_ERROR, "msg");
server_sendf (server, "PRIVMSG %s :%s\r\n", ptr_channel->name, pos);
@ -492,14 +492,14 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
ptr_nick = nick_search (ptr_channel, server->nick);
if (ptr_nick)
{
irc_display_nick (ptr_channel->view, ptr_nick,
irc_display_nick (ptr_channel->buffer, ptr_nick,
MSG_TYPE_NICK, 1, 1, 0);
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_MSG,
COLOR_WIN_CHAT, "%s\n", pos);
}
else
gui_printf (server->view,
gui_printf (server->buffer,
_("%s nick not found for \"%s\" command\n"),
WEECHAT_ERROR, "msg");
}
@ -513,26 +513,26 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
ptr_channel = channel_new (server, CHAT_PRIVATE, arguments, 1);
if (!ptr_channel)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot create new private window \"%s\"\n"),
WEECHAT_ERROR,
arguments);
return -1;
}
gui_redraw_view_title (ptr_channel->view);
gui_draw_buffer_title (ptr_channel->buffer, 1);
}
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_NICK,
COLOR_WIN_CHAT_DARK, "<");
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_NICK,
COLOR_WIN_NICK_SELF,
"%s", server->nick);
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_NICK,
COLOR_WIN_CHAT_DARK, "> ");
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_MSG,
COLOR_WIN_CHAT, "%s\n", pos);
server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
@ -543,7 +543,7 @@ irc_cmd_send_msg (t_irc_server *server, char *arguments)
}
else
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s wrong argument count for \"%s\" command\n"),
WEECHAT_ERROR, "msg");
return -1;
@ -562,16 +562,16 @@ irc_cmd_send_names (t_irc_server *server, char *arguments)
server_sendf (server, "NAMES %s\r\n", arguments);
else
{
if (!VIEW_IS_CHANNEL(gui_current_view))
if (!BUFFER_IS_CHANNEL(gui_current_window->buffer))
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can only be executed in a channel window\n"),
WEECHAT_ERROR, "names");
return -1;
}
else
server_sendf (server, "NAMES %s\r\n",
CHANNEL(gui_current_view)->name);
CHANNEL(gui_current_window->buffer)->name);
}
return 0;
}
@ -609,16 +609,16 @@ irc_cmd_send_op (t_irc_server *server, int argc, char **argv)
{
int i;
if (VIEW_IS_CHANNEL(gui_current_view))
if (BUFFER_IS_CHANNEL(gui_current_window->buffer))
{
for (i = 0; i < argc; i++)
server_sendf (server, "MODE %s +o %s\r\n",
CHANNEL(gui_current_view)->name,
CHANNEL(gui_current_window->buffer)->name,
argv[i]);
}
else
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can only be executed in a channel window\n"),
WEECHAT_ERROR, "op");
return -1;
@ -663,36 +663,36 @@ irc_cmd_send_part (t_irc_server *server, char *arguments)
}
else
{
if (VIEW_IS_SERVER(gui_current_view))
if (BUFFER_IS_SERVER(gui_current_window->buffer))
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can not be executed on a server window\n"),
WEECHAT_ERROR, "part");
return -1;
}
channel_name = CHANNEL(gui_current_view)->name;
channel_name = CHANNEL(gui_current_window->buffer)->name;
pos_args = arguments;
}
}
else
{
if (VIEW_IS_SERVER(gui_current_view))
if (BUFFER_IS_SERVER(gui_current_window->buffer))
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can not be executed on a server window\n"),
WEECHAT_ERROR, "part");
return -1;
}
if (VIEW_IS_PRIVATE(gui_current_view))
if (BUFFER_IS_PRIVATE(gui_current_window->buffer))
{
ptr_channel = CHANNEL(gui_current_view);
gui_view_free (ptr_channel->view);
ptr_channel = CHANNEL(gui_current_window->buffer);
gui_buffer_free (ptr_channel->buffer);
channel_free (server, ptr_channel);
gui_redraw_view_status (gui_current_view);
gui_redraw_view_input (gui_current_view);
gui_draw_buffer_status (gui_current_window->buffer, 1);
gui_draw_buffer_input (gui_current_window->buffer, 1);
return 0;
}
channel_name = CHANNEL(gui_current_view)->name;
channel_name = CHANNEL(gui_current_window->buffer)->name;
pos_args = NULL;
}
@ -753,29 +753,29 @@ irc_cmd_send_query (t_irc_server *server, char *arguments)
ptr_channel = channel_new (server, CHAT_PRIVATE, arguments, 1);
if (!ptr_channel)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot create new private window \"%s\"\n"),
WEECHAT_ERROR,
arguments);
return -1;
}
gui_redraw_view_title (ptr_channel->view);
gui_draw_buffer_title (ptr_channel->buffer, 1);
}
/* display text if given */
if (pos)
{
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_NICK,
COLOR_WIN_CHAT_DARK, "<");
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_NICK,
COLOR_WIN_NICK_SELF,
"%s", server->nick);
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_NICK,
COLOR_WIN_CHAT_DARK, "> ");
gui_printf_color_type (ptr_channel->view,
gui_printf_color_type (ptr_channel->buffer,
MSG_TYPE_MSG,
COLOR_WIN_CHAT, "%s\n", pos);
server_sendf (server, "PRIVMSG %s :%s\r\n", arguments, pos);
@ -970,14 +970,14 @@ irc_cmd_send_topic (t_irc_server *server, char *arguments)
/* look for current channel if not specified */
if (!channel_name)
{
if (VIEW_IS_SERVER(gui_current_view))
if (BUFFER_IS_SERVER(gui_current_window->buffer))
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can not be executed on a server window\n"),
WEECHAT_ERROR, "topic");
return -1;
}
channel_name = CHANNEL(gui_current_view)->name;
channel_name = CHANNEL(gui_current_window->buffer)->name;
}
if (new_topic)
@ -1040,8 +1040,8 @@ irc_cmd_send_version (t_irc_server *server, char *arguments)
{
if (arguments)
{
if (VIEW_IS_CHANNEL(gui_current_view) &&
nick_search (CHANNEL(gui_current_view), arguments))
if (BUFFER_IS_CHANNEL(gui_current_window->buffer) &&
nick_search (CHANNEL(gui_current_window->buffer), arguments))
server_sendf (server, "PRIVMSG %s :\01VERSION\01\r\n",
arguments);
else
@ -1050,8 +1050,8 @@ irc_cmd_send_version (t_irc_server *server, char *arguments)
}
else
{
irc_display_prefix (server->view, PREFIX_INFO);
gui_printf (server->view, _("%s, compiled on %s %s\n"),
irc_display_prefix (server->buffer, PREFIX_INFO);
gui_printf (server->buffer, _("%s, compiled on %s %s\n"),
PACKAGE_STRING,
__DATE__, __TIME__);
server_sendf (server, "VERSION\r\n");
@ -1068,16 +1068,16 @@ irc_cmd_send_voice (t_irc_server *server, int argc, char **argv)
{
int i;
if (VIEW_IS_CHANNEL(gui_current_view))
if (BUFFER_IS_CHANNEL(gui_current_window->buffer))
{
for (i = 0; i < argc; i++)
server_sendf (server, "MODE %s +v %s\r\n",
CHANNEL(gui_current_view)->name,
CHANNEL(gui_current_window->buffer)->name,
argv[i]);
}
else
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s \"%s\" command can only be executed in a channel window\n"),
WEECHAT_ERROR, "voice");
return -1;

52
weechat/src/irc/irc-server.c
View File

@ -78,7 +78,7 @@ server_init (t_irc_server *server)
server->is_away = 0;
server->server_read = -1;
server->server_write = -1;
server->view = NULL;
server->buffer = NULL;
server->channels = NULL;
server->last_channel = NULL;
}
@ -270,8 +270,8 @@ server_free (t_irc_server *server)
(server->next_server)->prev_server = server->prev_server;
server_destroy (server);
if (server->view)
gui_view_free (server->view);
if (server->buffer)
gui_buffer_free (server->buffer);
free (server);
irc_servers = new_irc_servers;
}
@ -377,11 +377,11 @@ server_sendf (t_irc_server * server, char *fmt, ...)
size_buf = strlen (buffer);
buffer[size_buf - 2] = '\0';
#ifdef DEBUG
gui_printf (server->view, "[DEBUG] Sending to server >>> %s\n", buffer);
gui_printf (server->buffer, "[DEBUG] Sending to server >>> %s\n", buffer);
#endif
buffer[size_buf - 2] = '\r';
if (server_send (server, buffer, size_buf) <= 0)
gui_printf (server->view, _("%s error sending data to IRC server\n"),
gui_printf (server->buffer, _("%s error sending data to IRC server\n"),
WEECHAT_ERROR);
}
@ -397,7 +397,7 @@ server_msgq_add_msg (t_irc_server *server, char *msg)
message = (t_irc_message *) malloc (sizeof (t_irc_message));
if (!message)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s not enough memory for received IRC message\n"),
WEECHAT_ERROR);
return;
@ -408,7 +408,7 @@ server_msgq_add_msg (t_irc_server *server, char *msg)
message->data = (char *) malloc (strlen (unterminated_message) +
strlen (msg) + 1);
if (!message->data)
gui_printf (server->view,
gui_printf (server->buffer,
_("%s not enough memory for received IRC message\n"),
WEECHAT_ERROR);
else
@ -462,14 +462,14 @@ server_msgq_add_buffer (t_irc_server * server, char *buffer)
(char *) realloc (unterminated_message,
strlen (buffer) + 1);
if (!unterminated_message)
gui_printf (server->view,
gui_printf (server->buffer,
_("%s not enough memory for received IRC message\n"),
WEECHAT_ERROR);
else
strcpy (unterminated_message, buffer);
return;
}
gui_printf (server->view,
gui_printf (server->buffer,
_("%s unable to explode received buffer\n"),
WEECHAT_ERROR);
}
@ -493,7 +493,7 @@ server_msgq_flush ()
if (recv_msgq->data)
{
#ifdef DEBUG
gui_printf (gui_current_view, "[DEBUG] %s\n", recv_msgq->data);
gui_printf (gui_current_window->buffer, "[DEBUG] %s\n", recv_msgq->data);
#endif
ptr_data = recv_msgq->data;
@ -542,15 +542,15 @@ server_msgq_flush ()
command, args))
{
case -1:
gui_printf (recv_msgq->server->view,
gui_printf (recv_msgq->server->buffer,
_("Command '%s' failed!\n"), command);
break;
case -2:
gui_printf (recv_msgq->server->view,
gui_printf (recv_msgq->server->buffer,
_("No command to execute!\n"));
break;
case -3:
gui_printf (recv_msgq->server->view,
gui_printf (recv_msgq->server->buffer,
_("Unknown command: cmd=%s, args=%s\n"),
command, args);
break;
@ -602,7 +602,7 @@ server_connect (t_irc_server *server)
int error;
int server_pipe[2];
gui_printf (server->view,
gui_printf (server->buffer,
_("%s: connecting to %s:%d...\n"),
PACKAGE_NAME, server->address, server->port);
wee_log_printf (_("connecting to server %s:%d...\n"),
@ -612,7 +612,7 @@ server_connect (t_irc_server *server)
/* create pipe */
if (pipe (server_pipe) < 0)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot create pipe\n"), WEECHAT_ERROR);
server_free (server);
return 0;
@ -626,14 +626,14 @@ server_connect (t_irc_server *server)
if (setsockopt
(server->sock4, SOL_SOCKET, SO_REUSEADDR, (char *) &set,
sizeof (set)) == -1)
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot set socket option \"SO_REUSEADDR\"\n"),
WEECHAT_ERROR);
set = 1;
if (setsockopt
(server->sock4, SOL_SOCKET, SO_KEEPALIVE, (char *) &set,
sizeof (set)) == -1)
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot set socket option \"SO_KEEPALIVE\"\n"),
WEECHAT_ERROR);
@ -641,7 +641,7 @@ server_connect (t_irc_server *server)
ip4_hostent = gethostbyname (server->address);
if (!ip4_hostent)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s address \"%s\" not found\n"),
WEECHAT_ERROR, server->address);
close (server->server_read);
@ -657,14 +657,14 @@ server_connect (t_irc_server *server)
/*error = bind(server->sock4, (struct sockaddr *)(&addr), sizeof(addr));
if (error != 0)
{
gui_printf (server->view,
gui_printf (server->buffer,
WEECHAT_ERORR "server_connect: can't bind to hostname\n");
return 0;
} */
ip_address = inet_ntoa (addr.sin_addr);
if (!ip_address)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s IP address not found\n"), WEECHAT_ERROR);
close (server->server_read);
close (server->server_write);
@ -674,13 +674,13 @@ server_connect (t_irc_server *server)
}
/* connection to server */
gui_printf (server->view,
gui_printf (server->buffer,
_("%s: server IP is: %s\n"), PACKAGE_NAME, ip_address);
error = connect (server->sock4, (struct sockaddr *) &addr, sizeof (addr));
if (error != 0)
{
gui_printf (server->view,
gui_printf (server->buffer,
_("%s cannot connect to irc server\n"), WEECHAT_ERROR);
close (server->server_read);
close (server->server_write);
@ -708,7 +708,7 @@ server_auto_connect (int command_line)
if ( ((command_line) && (ptr_server->command_line))
|| ((!command_line) && (ptr_server->autoconnect)) )
{
(void) gui_view_new (gui_current_view->window, ptr_server, NULL, 1);
(void) gui_buffer_new (gui_current_window, ptr_server, NULL, 1);
if (server_connect (ptr_server))
irc_login (ptr_server);
}
@ -726,12 +726,12 @@ server_disconnect (t_irc_server *server)
if (server->is_connected)
{
/* write disconnection message on each channel/private view */
/* write disconnection message on each channel/private buffer */
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
irc_display_prefix (ptr_channel->view, PREFIX_INFO);
gui_printf (ptr_channel->view, _("Disconnected from server!\n"));
irc_display_prefix (ptr_channel->buffer, PREFIX_INFO);
gui_printf (ptr_channel->buffer, _("Disconnected from server!\n"));
}
/* close communication with server */

10
weechat/src/irc/irc.h
View File

@ -83,7 +83,7 @@ struct t_irc_channel
char *key; /* channel key (NULL if no key is set) */
t_irc_nick *nicks; /* nicks on the channel */
t_irc_nick *last_nick; /* last nick on the channel */
t_gui_view *view; /* GUI view allocated for channel */
t_gui_buffer *buffer; /* GUI buffer allocated for channel */
t_irc_channel *prev_channel; /* link to previous channel */
t_irc_channel *next_channel; /* link to next channel */
};
@ -116,7 +116,7 @@ struct t_irc_server
int is_away; /* 1 is user is marker as away */
int server_read; /* pipe for reading server data */
int server_write; /* pipe for sending data to server */
t_gui_view *view; /* GUI view allocated for server */
t_gui_buffer *buffer; /* GUI buffer allocated for server */
t_irc_channel *channels; /* opened channels on server */
t_irc_channel *last_channel; /* last opened channal on server */
t_irc_server *prev_server; /* link to previous server */
@ -204,9 +204,9 @@ extern void dcc_send ();
/* IRC display (irc-diplay.c) */
extern void irc_display_prefix (/*@null@*/ t_gui_view *, char *);
extern void irc_display_nick (t_gui_view *, t_irc_nick *, int, int, int, int);
extern void irc_display_mode (t_gui_view *, char *, char, char *, char *,
extern void irc_display_prefix (/*@null@*/ t_gui_buffer *, char *);
extern void irc_display_nick (t_gui_buffer *, t_irc_nick *, int, int, int, int);
extern void irc_display_mode (t_gui_buffer *, char *, char, char *, char *,
char *, char *);
/* IRC protocol (irc-commands.c) */

30
weechat/src/plugins/perl/wee-perl.c
View File

@ -120,7 +120,7 @@ static XS (XS_IRC_register)
}
/*
* IRC::print: print message to current view
* IRC::print: print message to current buffer
*/
static XS (XS_IRC_print)
@ -135,8 +135,8 @@ static XS (XS_IRC_print)
for (i = 0; i < items; i++)
{
message = SvPV (ST (i), integer);
irc_display_prefix (gui_current_view, PREFIX_PLUGIN);
gui_printf (gui_current_view, "%s", message);
irc_display_prefix (gui_current_window->buffer, PREFIX_PLUGIN);
gui_printf (gui_current_window->buffer, "%s", message);
}
XSRETURN_EMPTY;
@ -151,7 +151,7 @@ static XS (XS_IRC_print_with_channel)
{
int integer;
char *message, *channel, *server = NULL;
t_gui_view *ptr_view;
t_gui_buffer *ptr_buffer;
t_irc_server *ptr_server;
t_irc_channel *ptr_channel;
dXSARGS;
@ -167,9 +167,9 @@ static XS (XS_IRC_print_with_channel)
server = NULL;
}
/* look for view for printing message */
/* look for buffer for printing message */
channel = SvPV (ST (1), integer);
ptr_view = NULL;
ptr_buffer = NULL;
for (ptr_server = irc_servers; ptr_server;
ptr_server = ptr_server->next_server)
{
@ -180,25 +180,25 @@ static XS (XS_IRC_print_with_channel)
{
if (strcasecmp (ptr_channel->name, channel) == 0)
{
ptr_view = ptr_channel->view;
ptr_buffer = ptr_channel->buffer;
break;
}
}
}
if (ptr_view)
if (ptr_buffer)
break;
}
/* view found => display message & return 1 */
if (ptr_view)
/* buffer found => display message & return 1 */
if (ptr_buffer)
{
message = SvPV (ST (0), integer);
irc_display_prefix (ptr_view, PREFIX_PLUGIN);
gui_printf (ptr_view, "%s", message);
irc_display_prefix (ptr_buffer, PREFIX_PLUGIN);
gui_printf (ptr_buffer, "%s", message);
XSRETURN_YES;
}
/* no view found => return 0 */
/* no buffer found => return 0 */
XSRETURN_NO;
}
@ -307,8 +307,8 @@ static XS (XS_IRC_get_info)
}
else if ( (strcasecmp (arg, "2") == 0) || (strcasecmp (arg, "channel") == 0) )
{
if (VIEW_IS_CHANNEL (gui_current_view))
info = CHANNEL (gui_current_view)->name;
if (BUFFER_IS_CHANNEL (gui_current_window->buffer))
info = CHANNEL (gui_current_window->buffer)->name;
}
else if ( (strcasecmp (arg, "3") == 0) || (strcasecmp (arg, "server") == 0) )
{