mcabber: mcabber/mcabber/screen.c annotate

annotate mcabber/mcabber/screen.c @ 1984:b0470ef8669b

XEP 184: don't send receipts to buddies that have no presence subscription In order to not leak our presence, do not send message delivery receipts to senders who are not authorized to view our presence. (XEP-0184, section 8)

author	Mikael Berthe <mikael@lilotux.net>
date	Sun, 27 Mar 2011 12:45:41 +0200
parents	1d8f9135e000
children	0870005f7efc

rev	line source
307 566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	1 /*
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	2 * screen.c -- UI stuff
393 f8f3c7493457 Whitespace cleanup Mikael Berthe <mikael@lilotux.net> parents: 389 diff changeset	3 *
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	4 * Copyright (C) 2005-2010 Mikael Berthe <mikael@lilotux.net>
307 566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	5 * Parts of this file come from the Cabber project <cabber@ajmacias.com>
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	6 *
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	7 * This program is free software; you can redistribute it and/or modify
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	8 * it under the terms of the GNU General Public License as published by
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	9 * the Free Software Foundation; either version 2 of the License, or (at
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	10 * your option) any later version.
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	11 *
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	12 * This program is distributed in the hope that it will be useful, but
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	15 * General Public License for more details.
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	16 *
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	17 * You should have received a copy of the GNU General Public License
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	18 * along with this program; if not, write to the Free Software
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	20 * USA
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	21 */
566818afee1c Add headers to C files Mikael Berthe <mikael@lilotux.net> parents: 288 diff changeset	22
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	23 #include <stdio.h>
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	24 #include <stdlib.h>
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	25 #include <string.h>
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	26 #include <time.h>
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	27 #include <ctype.h>
1382 1447c5296977 Fix locale charset detection on some BSD systems Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	28
1447c5296977 Fix locale charset detection on some BSD systems Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	29 #include <config.h>
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	30 #include <locale.h>
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	31 #include <assert.h>
1454 6b98dc22946d Add optional SIGWINCH handler (Markus Hennecke) Mikael Berthe <mikael@lilotux.net> parents: 1424 diff changeset	32 #ifdef USE_SIGWINCH
6b98dc22946d Add optional SIGWINCH handler (Markus Hennecke) Mikael Berthe <mikael@lilotux.net> parents: 1424 diff changeset	33 # include <sys/ioctl.h>
6b98dc22946d Add optional SIGWINCH handler (Markus Hennecke) Mikael Berthe <mikael@lilotux.net> parents: 1424 diff changeset	34 # include <termios.h>
6b98dc22946d Add optional SIGWINCH handler (Markus Hennecke) Mikael Berthe <mikael@lilotux.net> parents: 1424 diff changeset	35 # include <unistd.h>
6b98dc22946d Add optional SIGWINCH handler (Markus Hennecke) Mikael Berthe <mikael@lilotux.net> parents: 1424 diff changeset	36 #endif
929 f4bf564893b5 Fix ncurses #include Mikael Berthe <mikael@lilotux.net> parents: 898 diff changeset	37
1382 1447c5296977 Fix locale charset detection on some BSD systems Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	38 #ifdef HAVE_LOCALCHARSET_H
1447c5296977 Fix locale charset detection on some BSD systems Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	39 # include <localcharset.h>
1447c5296977 Fix locale charset detection on some BSD systems Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	40 #else
1447c5296977 Fix locale charset detection on some BSD systems Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	41 # include <langinfo.h>
1447c5296977 Fix locale charset detection on some BSD systems Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	42 #endif
1447c5296977 Fix locale charset detection on some BSD systems Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	43
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	44 #ifdef WITH_ENCHANT
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	45 # include <enchant.h>
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	46 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	47
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	48 #ifdef WITH_ASPELL
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	49 # include <aspell.h>
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	50 #endif
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	51
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	52 #include "screen.h"
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	53 #include "utf8.h"
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	54 #include "hbuf.h"
47 7259a61e1a4b [/trunk] Changeset 63 by mikael mikael parents: 44 diff changeset	55 #include "commands.h"
95 9e6b7897ec37 [/trunk] Changeset 109 by mikael mikael parents: 84 diff changeset	56 #include "compl.h"
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	57 #include "roster.h"
180 42a33611233b [/trunk] Changeset 192 by mikael mikael parents: 178 diff changeset	58 #include "histolog.h"
279 f5dd437c057b Rewrite the settings system Mikael Berthe <mikael@lilotux.net> parents: 276 diff changeset	59 #include "settings.h"
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	60 #include "utils.h"
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	61 #include "xmpp.h"
1653 fca9a4c17432 Improve UI latency and CPU usage Myhailo Danylenko <isbear@ukrpost.net> parents: 1651 diff changeset	62 #include "main.h"
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	63
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	64 #define get_color(col) (COLOR_PAIR(col)\|COLOR_ATTRIB[col])
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	65 #define compose_color(col) (COLOR_PAIR(col->color_pair)\|col->color_attrib)
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	66
515 180f0a6e4ac9 Log window's height can be set by the user Mikael Berthe <mikael@lilotux.net> parents: 514 diff changeset	67 #define DEFAULT_LOG_WIN_HEIGHT (5+2)
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	68 #define DEFAULT_ROSTER_WIDTH 24
515 180f0a6e4ac9 Log window's height can be set by the user Mikael Berthe <mikael@lilotux.net> parents: 514 diff changeset	69 #define CHAT_WIN_HEIGHT (maxY-1-Log_Win_Height)
180f0a6e4ac9 Log window's height can be set by the user Mikael Berthe <mikael@lilotux.net> parents: 514 diff changeset	70
1390 753a348c65c1 LocaleCharSet is const Mikael Berthe <mikael@lilotux.net> parents: 1386 diff changeset	71 const char *LocaleCharSet = "C";
592 67a332121aea Try UTF8 -> locale conversion with fallback Mikael Berthe <mikael@lilotux.net> parents: 580 diff changeset	72
515 180f0a6e4ac9 Log window's height can be set by the user Mikael Berthe <mikael@lilotux.net> parents: 514 diff changeset	73 static unsigned short int Log_Win_Height;
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	74 static unsigned short int Roster_Width;
1942 3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	75 static gboolean colors_stalled = FALSE;
515 180f0a6e4ac9 Log window's height can be set by the user Mikael Berthe <mikael@lilotux.net> parents: 514 diff changeset	76
1804 35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	77 // Default attention sign trigger levels
35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	78 static guint ui_attn_sign_prio_level_muc = ROSTER_UI_PRIO_MUC_HL_MESSAGE;
35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	79 static guint ui_attn_sign_prio_level = ROSTER_UI_PRIO_ATTENTION_MESSAGE;
35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	80
336 eb994ee40029 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 332 diff changeset	81 static inline void check_offset(int);
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	82 static void scr_cancel_current_completion(void);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	83 static void scr_end_current_completion(void);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	84 static void scr_insert_text(const char*);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	85 static void scr_handle_tab(void);
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	86
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	87 #if defined XEP0022 \|\| defined XEP0085
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	88 static gboolean scr_chatstates_timeout();
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	89 #endif
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	90
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	91 #if defined(WITH_ENCHANT) \|\| defined(WITH_ASPELL)
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	92 static void spellcheck(char , char );
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	93 #endif
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	94
1078 7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	95 static GHashTable *winbufhash;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	96
822 0dbb2be10975 Get rid of list.h Mikael Berthe <mikael@lilotux.net> parents: 807 diff changeset	97 typedef struct {
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	98 GList *hbuf;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	99 GList *top; // If top is NULL, we'll display the last lines
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	100 char cleared; // For ex, user has issued a /clear command...
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	101 char lock;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	102 } buffdata;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	103
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	104 typedef struct {
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	105 WINDOW *win;
108 7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	106 PANEL *panel;
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	107 buffdata *bd;
822 0dbb2be10975 Get rid of list.h Mikael Berthe <mikael@lilotux.net> parents: 807 diff changeset	108 } winbuf;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	109
1078 7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	110 struct dimensions {
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	111 int l;
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	112 int c;
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	113 };
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	114
1133 9dd28a56128f Do not create one panel per contact Mikael Berthe <mikael@lilotux.net> parents: 1131 diff changeset	115 static WINDOW rosterWnd, chatWnd, activechatWnd, inputWnd, *logWnd;
711 75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	116 static WINDOW mainstatusWnd, chatstatusWnd;
1133 9dd28a56128f Do not create one panel per contact Mikael Berthe <mikael@lilotux.net> parents: 1131 diff changeset	117 static PANEL rosterPanel, chatPanel, activechatPanel, inputPanel;
711 75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	118 static PANEL mainstatusPanel, chatstatusPanel;
75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	119 static PANEL *logPanel;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	120 static int maxY, maxX;
1093 6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change Mikael Berthe <mikael@lilotux.net> parents: 1089 diff changeset	121 static int prev_chatwidth;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	122 static winbuf *statusWindow;
822 0dbb2be10975 Get rid of list.h Mikael Berthe <mikael@lilotux.net> parents: 807 diff changeset	123 static winbuf *currentWindow;
851 da03534e46c7 Add startup log messages to the status buffer Mikael Berthe <mikael@lilotux.net> parents: 850 diff changeset	124 static GList *statushbuf;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	125
707 b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	126 static int roster_hidden;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	127 static int chatmode;
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	128 static int multimode;
807 f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	129 static char multiline, multimode_subj;
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	130
332 a1901741890e scr_LogPrint() can be called before ncurses initialization Mikael Berthe <mikael@lilotux.net> parents: 330 diff changeset	131 static bool Curses;
972 11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	132 static bool log_win_on_top;
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	133 static bool roster_win_on_right;
1677 9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	134 static guint autoaway_source = 0;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	135
174 6354625e8fb2 [/trunk] Changeset 186 by mikael mikael parents: 173 diff changeset	136 static char inputLine[INPUTLINE_LENGTH+1];
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	137 #if defined(WITH_ENCHANT) \|\| defined(WITH_ASPELL)
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	138 static char maskLine[INPUTLINE_LENGTH+1];
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	139 #endif
174 6354625e8fb2 [/trunk] Changeset 186 by mikael mikael parents: 173 diff changeset	140 static char *ptr_inputline;
6354625e8fb2 [/trunk] Changeset 186 by mikael mikael parents: 173 diff changeset	141 static short int inputline_offset;
6354625e8fb2 [/trunk] Changeset 186 by mikael mikael parents: 173 diff changeset	142 static int completion_started;
173 09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	143 static GList *cmdhisto;
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	144 static GList *cmdhisto_cur;
1127 fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	145 static guint cmdhisto_nblines;
174 6354625e8fb2 [/trunk] Changeset 186 by mikael mikael parents: 173 diff changeset	146 static char cmdhisto_backup[INPUTLINE_LENGTH+1];
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	147
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	148 static int chatstate; /* (0=active, 1=composing, 2=paused) */
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	149 static bool lock_chatstate;
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	150 static time_t chatstate_timestamp;
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	151 static guint chatstate_timeout_id = 0;
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	152
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	153 int update_roster;
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	154 int utf8_mode;
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	155 gboolean chatstates_disabled;
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	156 gboolean Autoaway;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	157
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	158 #define MAX_KEYSEQ_LENGTH 8
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	159
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	160 typedef struct {
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	161 char *seqstr;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	162 guint mkeycode;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	163 gint value;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	164 } keyseq;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	165
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	166 GSList *keyseqlist;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	167 static void add_keyseq(char *seqstr, guint mkeycode, gint value);
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	168
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	169 static void scr_write_in_window(const char winId, const char text,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	170 time_t timestamp, unsigned int prefix_flags,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	171 int force_show, unsigned mucnicklen,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	172 gpointer xep184);
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	173
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	174 static void scr_write_message(const char bjid, const char text,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	175 time_t timestamp, guint prefix_flags,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	176 unsigned mucnicklen, gpointer xep184);
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	177
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	178 inline void scr_update_buddy_window(void);
1413 f89844a0448a Remove useless inlines Mikael Berthe <mikael@lilotux.net> parents: 1394 diff changeset	179 inline void scr_set_chatmode(int enable);
f89844a0448a Remove useless inlines Mikael Berthe <mikael@lilotux.net> parents: 1394 diff changeset	180
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	181 #define SPELLBADCHAR 5
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	182
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	183 #ifdef WITH_ENCHANT
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	184 EnchantBroker *spell_broker;
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	185 EnchantDict *spell_checker;
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	186 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	187
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	188 #ifdef WITH_ASPELL
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	189 AspellConfig *spell_config;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	190 AspellSpeller *spell_checker;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	191 #endif
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	192
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	193 typedef struct {
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	194 int color_pair;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	195 int color_attrib;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	196 } ccolor;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	197
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	198 typedef struct {
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	199 char status, wildcard;
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	200 ccolor *color;
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	201 GPatternSpec *compiled;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	202 } rostercolor;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	203
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	204 static GSList *rostercolrules = NULL;
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	205
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	206 static GHashTable muccolors = NULL, nickcolors = NULL;
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	207
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	208 typedef struct {
1413 f89844a0448a Remove useless inlines Mikael Berthe <mikael@lilotux.net> parents: 1394 diff changeset	209 bool manual; // Manually set?
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	210 ccolor *color;
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	211 } nickcolor;
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	212
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	213 static int nickcolcount = 0;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	214 static ccolor ** nickcols = NULL;
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	215 static muccoltype glob_muccol = MC_OFF;
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	216
99 7fffb8a6b229 [/trunk] Changeset 113 by mikael mikael parents: 98 diff changeset	217 /* Functions */
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	218
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	219 static int find_color(const char *name)
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	220 {
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	221 int result;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	222
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	223 if (!strcmp(name, "default"))
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	224 return -1;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	225 if (!strcmp(name, "black"))
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	226 return COLOR_BLACK;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	227 if (!strcmp(name, "red"))
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	228 return COLOR_RED;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	229 if (!strcmp(name, "green"))
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	230 return COLOR_GREEN;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	231 if (!strcmp(name, "yellow"))
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	232 return COLOR_YELLOW;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	233 if (!strcmp(name, "blue"))
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	234 return COLOR_BLUE;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	235 if (!strcmp(name, "magenta"))
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	236 return COLOR_MAGENTA;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	237 if (!strcmp(name, "cyan"))
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	238 return COLOR_CYAN;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	239 if (!strcmp(name, "white"))
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	240 return COLOR_WHITE;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	241
1417 783b47c9d963 Allow more than the 16 default colors (patch from mjs) Mikael Berthe <mikael@lilotux.net> parents: 1414 diff changeset	242 // Directly support 256-color values
783b47c9d963 Allow more than the 16 default colors (patch from mjs) Mikael Berthe <mikael@lilotux.net> parents: 1414 diff changeset	243 result = atoi(name);
783b47c9d963 Allow more than the 16 default colors (patch from mjs) Mikael Berthe <mikael@lilotux.net> parents: 1414 diff changeset	244 if (result > 0 && result < COLORS)
783b47c9d963 Allow more than the 16 default colors (patch from mjs) Mikael Berthe <mikael@lilotux.net> parents: 1414 diff changeset	245 return result;
783b47c9d963 Allow more than the 16 default colors (patch from mjs) Mikael Berthe <mikael@lilotux.net> parents: 1414 diff changeset	246
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	247 scr_LogPrint(LPRINT_LOGNORM, "ERROR: Wrong color: %s", name);
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	248 return -1;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	249 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	250
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	251 static ccolor get_user_color(const char color)
1295 33cb828282d5 Fix recognizing of bright colors Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1294 diff changeset	252 {
1381 40095d413da9 Fix compilation on OpenBSD Mikael Berthe <mikael@lilotux.net> parents: 1376 diff changeset	253 bool isbright = FALSE;
1295 33cb828282d5 Fix recognizing of bright colors Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1294 diff changeset	254 int cl;
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	255 ccolor *ccol;
1295 33cb828282d5 Fix recognizing of bright colors Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1294 diff changeset	256 if (!strncmp(color, "bright", 6)) {
1381 40095d413da9 Fix compilation on OpenBSD Mikael Berthe <mikael@lilotux.net> parents: 1376 diff changeset	257 isbright = TRUE;
1295 33cb828282d5 Fix recognizing of bright colors Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1294 diff changeset	258 color += 6;
33cb828282d5 Fix recognizing of bright colors Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1294 diff changeset	259 }
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	260 cl = find_color(color);
1295 33cb828282d5 Fix recognizing of bright colors Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1294 diff changeset	261 if (cl < 0)
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	262 return NULL;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	263 ccol = g_new0(ccolor, 1);
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	264 ccol->color_attrib = isbright ? A_BOLD : A_NORMAL;
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	265 ccol->color_pair = cl + COLOR_max; // User colors come after the internal ones
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	266 return ccol;
1295 33cb828282d5 Fix recognizing of bright colors Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1294 diff changeset	267 }
33cb828282d5 Fix recognizing of bright colors Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1294 diff changeset	268
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	269 static void ensure_string_htable(GHashTable **table,
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	270 GDestroyNotify value_destroy_func)
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	271 {
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	272 if (*table) // Have it already
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	273 return;
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	274 *table = g_hash_table_new_full(g_str_hash, g_str_equal,
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	275 g_free, value_destroy_func);
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	276 }
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	277
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	278 // Sets the coloring mode for given MUC
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	279 // The MUC room does not need to be in the roster at that time
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	280 // muc - the JID of room
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	281 // type - the new type
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	282 void scr_muc_color(const char *muc, muccoltype type)
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	283 {
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	284 gchar *muclow = g_utf8_strdown(muc, -1);
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	285 if (type == MC_REMOVE) { // Remove it
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	286 if (strcmp(muc, "*")) {
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	287 if (muccolors && g_hash_table_lookup(muccolors, muclow))
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	288 g_hash_table_remove(muccolors, muclow);
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	289 } else {
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	290 scr_LogPrint(LPRINT_NORMAL, "Can not remove global coloring mode");
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	291 }
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	292 g_free(muclow);
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	293 } else { // Add or overwrite
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	294 if (strcmp(muc, "*")) {
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	295 muccoltype *value = g_new(muccoltype, 1);
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	296 *value = type;
1476 77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	297 ensure_string_htable(&muccolors, g_free);
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	298 g_hash_table_replace(muccolors, muclow, value);
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	299 } else {
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	300 glob_muccol = type;
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	301 g_free(muclow);
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	302 }
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	303 }
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	304 // Need to redraw?
1333 e30a9d907105 Minor coding style adjustments Mikael Berthe <mikael@lilotux.net> parents: 1314 diff changeset	305 if (chatmode &&
e30a9d907105 Minor coding style adjustments Mikael Berthe <mikael@lilotux.net> parents: 1314 diff changeset	306 ((buddy_search_jid(muc) == current_buddy) \|\| !strcmp(muc, "*")))
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	307 scr_update_buddy_window();
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	308 }
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	309
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	310 // Sets the color for nick in MUC
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	311 // If color is "-", the color is marked as automaticly assigned and is
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	312 // not used if the room is in the "preset" mode
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	313 void scr_muc_nick_color(const char nick, const char color)
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	314 {
1333 e30a9d907105 Minor coding style adjustments Mikael Berthe <mikael@lilotux.net> parents: 1314 diff changeset	315 char snick, mnick;
1381 40095d413da9 Fix compilation on OpenBSD Mikael Berthe <mikael@lilotux.net> parents: 1376 diff changeset	316 bool need_update = FALSE;
1333 e30a9d907105 Minor coding style adjustments Mikael Berthe <mikael@lilotux.net> parents: 1314 diff changeset	317 snick = g_strdup_printf("<%s>", nick);
e30a9d907105 Minor coding style adjustments Mikael Berthe <mikael@lilotux.net> parents: 1314 diff changeset	318 mnick = g_strdup_printf("*%s ", nick);
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	319 if (!strcmp(color, "-")) { // Remove the color
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	320 if (nickcolors) {
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	321 nickcolor *nc = g_hash_table_lookup(nickcolors, snick);
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	322 if (nc) { // Have this nick already
1381 40095d413da9 Fix compilation on OpenBSD Mikael Berthe <mikael@lilotux.net> parents: 1376 diff changeset	323 nc->manual = FALSE;
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	324 nc = g_hash_table_lookup(nickcolors, mnick);
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	325 assert(nc); // Must have both at the same time
1381 40095d413da9 Fix compilation on OpenBSD Mikael Berthe <mikael@lilotux.net> parents: 1376 diff changeset	326 nc->manual = FALSE;
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	327 }// Else -> no color saved, nothing to delete
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	328 }
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	329 g_free(snick); // They are not saved in the hash
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	330 g_free(mnick);
1381 40095d413da9 Fix compilation on OpenBSD Mikael Berthe <mikael@lilotux.net> parents: 1376 diff changeset	331 need_update = TRUE;
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	332 } else {
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	333 ccolor *cl = get_user_color(color);
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	334 if (!cl) {
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	335 scr_LogPrint(LPRINT_NORMAL, "No such color name");
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	336 g_free(snick);
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	337 g_free(mnick);
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	338 } else {
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	339 nickcolor *nc = g_new(nickcolor, 1);
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	340 ensure_string_htable(&nickcolors, NULL);
1381 40095d413da9 Fix compilation on OpenBSD Mikael Berthe <mikael@lilotux.net> parents: 1376 diff changeset	341 nc->manual = TRUE;
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	342 nc->color = cl;
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	343 // Free the struct, if any there already
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	344 g_free(g_hash_table_lookup(nickcolors, mnick));
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	345 // Save the new ones
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	346 g_hash_table_replace(nickcolors, mnick, nc);
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	347 g_hash_table_replace(nickcolors, snick, nc);
1381 40095d413da9 Fix compilation on OpenBSD Mikael Berthe <mikael@lilotux.net> parents: 1376 diff changeset	348 need_update = TRUE;
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	349 }
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	350 }
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	351 if (need_update && chatmode &&
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	352 (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_ROOM))
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	353 scr_update_buddy_window();
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	354 }
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	355
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	356 static void free_rostercolrule(rostercolor *col)
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	357 {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	358 g_free(col->status);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	359 g_free(col->wildcard);
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	360 g_free(col->color);
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	361 g_pattern_spec_free(col->compiled);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	362 g_free(col);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	363 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	364
1284 2c96720c4f5b Add comments (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1280 diff changeset	365 // Removes all roster coloring rules
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	366 void scr_roster_clear_color(void)
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	367 {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	368 GSList *head;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	369 for (head = rostercolrules; head; head = g_slist_next(head)) {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	370 free_rostercolrule(head->data);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	371 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	372 g_slist_free(rostercolrules);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	373 rostercolrules = NULL;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	374 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	375
1284 2c96720c4f5b Add comments (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1280 diff changeset	376 // Adds, modifies or removes roster coloring rule
2c96720c4f5b Add comments (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1280 diff changeset	377 // color set to "-" removes the rule,
2c96720c4f5b Add comments (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1280 diff changeset	378 // otherwise it is modified (if exists) or added
2c96720c4f5b Add comments (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1280 diff changeset	379 //
2c96720c4f5b Add comments (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1280 diff changeset	380 // Returns weather it was successfull (therefore the roster should be
2c96720c4f5b Add comments (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1280 diff changeset	381 // redrawed) or not. If it failed, for example because of invalid color
2c96720c4f5b Add comments (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1280 diff changeset	382 // name, it also prints the error.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	383 bool scr_roster_color(const char status, const char wildcard,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	384 const char *color)
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	385 {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	386 GSList *head;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	387 GSList *found = NULL;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	388 for (head = rostercolrules; head; head = g_slist_next(head)) {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	389 rostercolor *rc = head->data;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	390 if ((!strcmp(status, rc->status)) && (!strcmp(wildcard, rc->wildcard))) {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	391 found = head;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	392 break;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	393 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	394 }
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	395 if (!strcmp(color,"-")) { // Delete the rule
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	396 if (found) {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	397 free_rostercolrule(found->data);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	398 rostercolrules = g_slist_delete_link(rostercolrules, found);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	399 return TRUE;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	400 } else {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	401 scr_LogPrint(LPRINT_NORMAL, "No such color rule, nothing removed");
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	402 return FALSE;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	403 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	404 } else {
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	405 ccolor *cl = get_user_color(color);
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	406 if (!cl) {
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	407 scr_LogPrint(LPRINT_NORMAL, "No such color name");
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	408 return FALSE;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	409 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	410 if (found) {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	411 rostercolor *rc = found->data;
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	412 g_free(rc->color);
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	413 rc->color = cl;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	414 } else {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	415 rostercolor *rc = g_new(rostercolor, 1);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	416 rc->status = g_strdup(status);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	417 rc->wildcard = g_strdup(wildcard);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	418 rc->compiled = g_pattern_spec_new(wildcard);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	419 rc->color = cl;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	420 rostercolrules = g_slist_prepend(rostercolrules, rc);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	421 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	422 return TRUE;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	423 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	424 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	425
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	426 static void parse_colors(void)
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	427 {
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	428 const char *colors[] = {
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	429 "", "",
267 8d3d5bd52da3 Improve color configuration mikael@frmp8452 parents: 265 diff changeset	430 "general",
785 7e0562e3bc83 Replace color_highlight with color_msgout Mikael Berthe <mikael@lilotux.net> parents: 779 diff changeset	431 "msgout",
1204 e802ec0c02d2 Basic support for nick highlighting in MUC rooms (the whole line is colored) Mikael Berthe <mikael@lilotux.net> parents: 1190 diff changeset	432 "msghl",
711 75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	433 "status",
712 e1639629c87b Rename color options Mikael Berthe <mikael@lilotux.net> parents: 711 diff changeset	434 "roster",
e1639629c87b Rename color options Mikael Berthe <mikael@lilotux.net> parents: 711 diff changeset	435 "rostersel",
723 23068490d063 Add text color when the selected buddy has an unread message Mikael Berthe <mikael@lilotux.net> parents: 721 diff changeset	436 "rosterselmsg",
712 e1639629c87b Rename color options Mikael Berthe <mikael@lilotux.net> parents: 711 diff changeset	437 "rosternewmsg",
1268 dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	438 "info",
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	439 "msgin",
1960 b596bcff758e Add 'color_readmark' Mikael Berthe <mikael@lilotux.net> parents: 1957 diff changeset	440 "readmark",
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	441 NULL
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	442 };
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	443
281 f562b9af2de7 Add "const" specifier in prototypes Mikael Berthe <mikael@lilotux.net> parents: 279 diff changeset	444 const char *color;
f562b9af2de7 Add "const" specifier in prototypes Mikael Berthe <mikael@lilotux.net> parents: 279 diff changeset	445 const char *background = settings_opt_get("color_background");
712 e1639629c87b Rename color options Mikael Berthe <mikael@lilotux.net> parents: 711 diff changeset	446 const char *backselected = settings_opt_get("color_bgrostersel");
e1639629c87b Rename color options Mikael Berthe <mikael@lilotux.net> parents: 711 diff changeset	447 const char *backstatus = settings_opt_get("color_bgstatus");
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	448 char *tmp;
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	449 int i;
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	450
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	451 // Initialize color attributes
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	452 memset(COLOR_ATTRIB, 0, sizeof(COLOR_ATTRIB));
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	453
267 8d3d5bd52da3 Improve color configuration mikael@frmp8452 parents: 265 diff changeset	454 // Default values
711 75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	455 if (!background) background = "black";
267 8d3d5bd52da3 Improve color configuration mikael@frmp8452 parents: 265 diff changeset	456 if (!backselected) backselected = "cyan";
711 75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	457 if (!backstatus) backstatus = "blue";
267 8d3d5bd52da3 Improve color configuration mikael@frmp8452 parents: 265 diff changeset	458
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	459 for (i=0; colors[i]; i++) {
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	460 tmp = g_strdup_printf("color_%s", colors[i]);
279 f5dd437c057b Rewrite the settings system Mikael Berthe <mikael@lilotux.net> parents: 276 diff changeset	461 color = settings_opt_get(tmp);
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	462 g_free(tmp);
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	463
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	464 if (color) {
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	465 if (!strncmp(color, "bright", 6)) {
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	466 COLOR_ATTRIB[i+1] = A_BOLD;
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	467 color += 6;
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	468 }
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	469 }
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	470
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	471 switch (i + 1) {
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	472 case 1:
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	473 init_pair(1, COLOR_BLACK, COLOR_WHITE);
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	474 break;
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	475 case 2:
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	476 init_pair(2, COLOR_WHITE, COLOR_BLACK);
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	477 break;
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	478 case COLOR_GENERAL:
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	479 init_pair(i+1, ((color) ? find_color(color) : COLOR_WHITE),
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	480 find_color(background));
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	481 break;
785 7e0562e3bc83 Replace color_highlight with color_msgout Mikael Berthe <mikael@lilotux.net> parents: 779 diff changeset	482 case COLOR_MSGOUT:
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	483 init_pair(i+1, ((color) ? find_color(color) : COLOR_CYAN),
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	484 find_color(background));
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	485 break;
1204 e802ec0c02d2 Basic support for nick highlighting in MUC rooms (the whole line is colored) Mikael Berthe <mikael@lilotux.net> parents: 1190 diff changeset	486 case COLOR_MSGHL:
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	487 init_pair(i+1, ((color) ? find_color(color) : COLOR_YELLOW),
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	488 find_color(background));
1204 e802ec0c02d2 Basic support for nick highlighting in MUC rooms (the whole line is colored) Mikael Berthe <mikael@lilotux.net> parents: 1190 diff changeset	489 break;
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	490 case COLOR_STATUS:
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	491 init_pair(i+1, ((color) ? find_color(color) : COLOR_WHITE),
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	492 find_color(backstatus));
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	493 break;
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	494 case COLOR_ROSTER:
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	495 init_pair(i+1, ((color) ? find_color(color) : COLOR_GREEN),
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	496 find_color(background));
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	497 break;
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	498 case COLOR_ROSTERSEL:
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	499 init_pair(i+1, ((color) ? find_color(color) : COLOR_BLUE),
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	500 find_color(backselected));
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	501 break;
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	502 case COLOR_ROSTERSELNMSG:
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	503 init_pair(i+1, ((color) ? find_color(color) : COLOR_RED),
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	504 find_color(backselected));
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	505 break;
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	506 case COLOR_ROSTERNMSG:
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	507 init_pair(i+1, ((color) ? find_color(color) : COLOR_RED),
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	508 find_color(background));
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	509 break;
1268 dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	510 case COLOR_INFO:
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	511 init_pair(i+1, ((color) ? find_color(color) : COLOR_WHITE),
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	512 find_color(background));
1268 dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	513 break;
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	514 case COLOR_MSGIN:
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	515 init_pair(i+1, ((color) ? find_color(color) : COLOR_WHITE),
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	516 find_color(background));
1268 dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	517 break;
1960 b596bcff758e Add 'color_readmark' Mikael Berthe <mikael@lilotux.net> parents: 1957 diff changeset	518 case COLOR_READMARK:
b596bcff758e Add 'color_readmark' Mikael Berthe <mikael@lilotux.net> parents: 1957 diff changeset	519 init_pair(i+1, ((color) ? find_color(color) : COLOR_RED),
b596bcff758e Add 'color_readmark' Mikael Berthe <mikael@lilotux.net> parents: 1957 diff changeset	520 find_color(background));
b596bcff758e Add 'color_readmark' Mikael Berthe <mikael@lilotux.net> parents: 1957 diff changeset	521 break;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	522 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	523 }
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	524 for (i = COLOR_max; i < (COLOR_max + COLORS); i++)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	525 init_pair(i, i-COLOR_max, find_color(background));
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	526
1298 af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	527 if (!nickcols) {
1314 248e3f69dd9e Fix a bug in the nick_colors variable parsing Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	528 char *ncolors = g_strdup(settings_opt_get("nick_colors"));
1298 af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	529 if (ncolors) {
1314 248e3f69dd9e Fix a bug in the nick_colors variable parsing Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	530 char ncolor_start, ncolor_end;
248e3f69dd9e Fix a bug in the nick_colors variable parsing Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	531 ncolor_start = ncolor_end = ncolors;
248e3f69dd9e Fix a bug in the nick_colors variable parsing Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	532
248e3f69dd9e Fix a bug in the nick_colors variable parsing Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	533 while (*ncolor_end)
248e3f69dd9e Fix a bug in the nick_colors variable parsing Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	534 ncolor_end++;
248e3f69dd9e Fix a bug in the nick_colors variable parsing Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	535
248e3f69dd9e Fix a bug in the nick_colors variable parsing Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	536 while (ncolors < ncolor_end && *ncolors) {
1298 af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	537 if ((ncolors == ' ') \|\| (ncolors == '\t')) {
1314 248e3f69dd9e Fix a bug in the nick_colors variable parsing Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	538 ncolors++;
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	539 } else {
1298 af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	540 char *end = ncolors;
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	541 ccolor *cl;
1298 af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	542 while (end && (end != ' ') && (*end != '\t'))
af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	543 end++;
af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	544 *end = '\0';
1314 248e3f69dd9e Fix a bug in the nick_colors variable parsing Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	545 cl = get_user_color(ncolors);
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	546 if (!cl) {
1298 af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	547 scr_LogPrint(LPRINT_NORMAL, "Unknown color %s", ncolors);
af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	548 } else {
af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	549 nickcols = g_realloc(nickcols, (++nickcolcount) * sizeof *nickcols);
af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	550 nickcols[nickcolcount-1] = cl;
af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	551 }
1314 248e3f69dd9e Fix a bug in the nick_colors variable parsing Mikael Berthe <mikael@lilotux.net> parents: 1311 diff changeset	552 ncolors = end+1;
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	553 }
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	554 }
1298 af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	555 g_free(ncolor_start);
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	556 }
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	557 if (!nickcols) { // Fallback to have something
1298 af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	558 nickcolcount = 1;
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	559 nickcols = g_new(ccolor*, 1);
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	560 *nickcols = g_new(ccolor, 1);
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	561 (*nickcols)->color_pair = COLOR_GENERAL;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	562 (*nickcols)->color_attrib = A_NORMAL;
1298 af035a304bec colorable muc nick fix Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1296 diff changeset	563 }
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	564 }
1942 3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	565
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	566 colors_stalled = FALSE;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	567 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	568
765 72626e9d60bd Create init_keycodes(), add 2 screen escape sequences Mikael Berthe <mikael@lilotux.net> parents: 764 diff changeset	569 static void init_keycodes(void)
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	570 {
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	571 add_keyseq("O5A", MKEY_EQUIV, 521); // Ctrl-Up
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	572 add_keyseq("O5B", MKEY_EQUIV, 514); // Ctrl-Down
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	573 add_keyseq("O5C", MKEY_EQUIV, 518); // Ctrl-Right
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	574 add_keyseq("O5D", MKEY_EQUIV, 516); // Ctrl-Left
763 6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	575 add_keyseq("O6A", MKEY_EQUIV, 520); // Shift-Up
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	576 add_keyseq("O6B", MKEY_EQUIV, 513); // Shift-Down
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	577 add_keyseq("O6C", MKEY_EQUIV, 402); // Shift-Right
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	578 add_keyseq("O6D", MKEY_EQUIV, 393); // Shift-Left
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	579 add_keyseq("O2A", MKEY_EQUIV, 520); // Shift-Up
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	580 add_keyseq("O2B", MKEY_EQUIV, 513); // Shift-Down
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	581 add_keyseq("O2C", MKEY_EQUIV, 402); // Shift-Right
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	582 add_keyseq("O2D", MKEY_EQUIV, 393); // Shift-Left
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	583 add_keyseq("[5^", MKEY_CTRL_PGUP, 0); // Ctrl-PageUp
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	584 add_keyseq("[6^", MKEY_CTRL_PGDOWN, 0); // Ctrl-PageDown
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	585 add_keyseq("[5@", MKEY_CTRL_SHIFT_PGUP, 0); // Ctrl-Shift-PageUp
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	586 add_keyseq("[6@", MKEY_CTRL_SHIFT_PGDOWN, 0); // Ctrl-Shift-PageDown
826 3a3c7a017904 Add Ctrl-Shift-{Home,End} key code sequences Mikael Berthe <mikael@lilotux.net> parents: 825 diff changeset	587 add_keyseq("[7@", MKEY_CTRL_SHIFT_HOME, 0); // Ctrl-Shift-Home
3a3c7a017904 Add Ctrl-Shift-{Home,End} key code sequences Mikael Berthe <mikael@lilotux.net> parents: 825 diff changeset	588 add_keyseq("[8@", MKEY_CTRL_SHIFT_END, 0); // Ctrl-Shift-End
794 32d5298f9f8d Add a few keycode sequences Mikael Berthe <mikael@lilotux.net> parents: 790 diff changeset	589 add_keyseq("[8^", MKEY_CTRL_END, 0); // Ctrl-End
32d5298f9f8d Add a few keycode sequences Mikael Berthe <mikael@lilotux.net> parents: 790 diff changeset	590 add_keyseq("[7^", MKEY_CTRL_HOME, 0); // Ctrl-Home
32d5298f9f8d Add a few keycode sequences Mikael Berthe <mikael@lilotux.net> parents: 790 diff changeset	591 add_keyseq("[2^", MKEY_CTRL_INS, 0); // Ctrl-Insert
32d5298f9f8d Add a few keycode sequences Mikael Berthe <mikael@lilotux.net> parents: 790 diff changeset	592 add_keyseq("[3^", MKEY_CTRL_DEL, 0); // Ctrl-Delete
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	593
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	594 // Xterm
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	595 add_keyseq("[1;5A", MKEY_EQUIV, 521); // Ctrl-Up
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	596 add_keyseq("[1;5B", MKEY_EQUIV, 514); // Ctrl-Down
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	597 add_keyseq("[1;5C", MKEY_EQUIV, 518); // Ctrl-Right
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	598 add_keyseq("[1;5D", MKEY_EQUIV, 516); // Ctrl-Left
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	599 add_keyseq("[1;6A", MKEY_EQUIV, 520); // Ctrl-Shift-Up
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	600 add_keyseq("[1;6B", MKEY_EQUIV, 513); // Ctrl-Shift-Down
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	601 add_keyseq("[1;6C", MKEY_EQUIV, 402); // Ctrl-Shift-Right
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	602 add_keyseq("[1;6D", MKEY_EQUIV, 393); // Ctrl-Shift-Left
826 3a3c7a017904 Add Ctrl-Shift-{Home,End} key code sequences Mikael Berthe <mikael@lilotux.net> parents: 825 diff changeset	603 add_keyseq("[1;6H", MKEY_CTRL_SHIFT_HOME, 0); // Ctrl-Shift-Home
3a3c7a017904 Add Ctrl-Shift-{Home,End} key code sequences Mikael Berthe <mikael@lilotux.net> parents: 825 diff changeset	604 add_keyseq("[1;6F", MKEY_CTRL_SHIFT_END, 0); // Ctrl-Shift-End
763 6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	605 add_keyseq("[1;2A", MKEY_EQUIV, 521); // Shift-Up
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	606 add_keyseq("[1;2B", MKEY_EQUIV, 514); // Shift-Down
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	607 add_keyseq("[5;5~", MKEY_CTRL_PGUP, 0); // Ctrl-PageUp
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	608 add_keyseq("[6;5~", MKEY_CTRL_PGDOWN, 0); // Ctrl-PageDown
794 32d5298f9f8d Add a few keycode sequences Mikael Berthe <mikael@lilotux.net> parents: 790 diff changeset	609 add_keyseq("[1;5F", MKEY_CTRL_END, 0); // Ctrl-End
32d5298f9f8d Add a few keycode sequences Mikael Berthe <mikael@lilotux.net> parents: 790 diff changeset	610 add_keyseq("[1;5H", MKEY_CTRL_HOME, 0); // Ctrl-Home
32d5298f9f8d Add a few keycode sequences Mikael Berthe <mikael@lilotux.net> parents: 790 diff changeset	611 add_keyseq("[2;5~", MKEY_CTRL_INS, 0); // Ctrl-Insert
32d5298f9f8d Add a few keycode sequences Mikael Berthe <mikael@lilotux.net> parents: 790 diff changeset	612 add_keyseq("[3;5~", MKEY_CTRL_DEL, 0); // Ctrl-Delete
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	613
768 0f6d25a02450 Add PuTTY escape keys for Ctrl-arrows Mikael Berthe <mikael@lilotux.net> parents: 766 diff changeset	614 // PuTTY
0f6d25a02450 Add PuTTY escape keys for Ctrl-arrows Mikael Berthe <mikael@lilotux.net> parents: 766 diff changeset	615 add_keyseq("[A", MKEY_EQUIV, 521); // Ctrl-Up
0f6d25a02450 Add PuTTY escape keys for Ctrl-arrows Mikael Berthe <mikael@lilotux.net> parents: 766 diff changeset	616 add_keyseq("[B", MKEY_EQUIV, 514); // Ctrl-Down
0f6d25a02450 Add PuTTY escape keys for Ctrl-arrows Mikael Berthe <mikael@lilotux.net> parents: 766 diff changeset	617 add_keyseq("[C", MKEY_EQUIV, 518); // Ctrl-Right
0f6d25a02450 Add PuTTY escape keys for Ctrl-arrows Mikael Berthe <mikael@lilotux.net> parents: 766 diff changeset	618 add_keyseq("[D", MKEY_EQUIV, 516); // Ctrl-Left
0f6d25a02450 Add PuTTY escape keys for Ctrl-arrows Mikael Berthe <mikael@lilotux.net> parents: 766 diff changeset	619
762 96d46e00524a Add some key escape sequences for screen Mikael Berthe <mikael@lilotux.net> parents: 761 diff changeset	620 // screen
96d46e00524a Add some key escape sequences for screen Mikael Berthe <mikael@lilotux.net> parents: 761 diff changeset	621 add_keyseq("Oa", MKEY_EQUIV, 521); // Ctrl-Up
96d46e00524a Add some key escape sequences for screen Mikael Berthe <mikael@lilotux.net> parents: 761 diff changeset	622 add_keyseq("Ob", MKEY_EQUIV, 514); // Ctrl-Down
96d46e00524a Add some key escape sequences for screen Mikael Berthe <mikael@lilotux.net> parents: 761 diff changeset	623 add_keyseq("Oc", MKEY_EQUIV, 518); // Ctrl-Right
96d46e00524a Add some key escape sequences for screen Mikael Berthe <mikael@lilotux.net> parents: 761 diff changeset	624 add_keyseq("Od", MKEY_EQUIV, 516); // Ctrl-Left
763 6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	625 add_keyseq("[a", MKEY_EQUIV, 520); // Shift-Up
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	626 add_keyseq("[b", MKEY_EQUIV, 513); // Shift-Down
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	627 add_keyseq("[c", MKEY_EQUIV, 402); // Shift-Right
6866ee749225 More keycodes Mikael Berthe <mikael@lilotux.net> parents: 762 diff changeset	628 add_keyseq("[d", MKEY_EQUIV, 393); // Shift-Left
765 72626e9d60bd Create init_keycodes(), add 2 screen escape sequences Mikael Berthe <mikael@lilotux.net> parents: 764 diff changeset	629 add_keyseq("[5$", MKEY_SHIFT_PGUP, 0); // Shift-PageUp
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences Mikael Berthe <mikael@lilotux.net> parents: 764 diff changeset	630 add_keyseq("[6$", MKEY_SHIFT_PGDOWN, 0); // Shift-PageDown
1170 29f805d8412f Add some keycodes Mikael Berthe <mikael@lilotux.net> parents: 1168 diff changeset	631
29f805d8412f Add some keycodes Mikael Berthe <mikael@lilotux.net> parents: 1168 diff changeset	632 // VT100
29f805d8412f Add some keycodes Mikael Berthe <mikael@lilotux.net> parents: 1168 diff changeset	633 add_keyseq("[H", MKEY_EQUIV, KEY_HOME); // Home
29f805d8412f Add some keycodes Mikael Berthe <mikael@lilotux.net> parents: 1168 diff changeset	634 add_keyseq("[F", MKEY_EQUIV, KEY_END); // End
29f805d8412f Add some keycodes Mikael Berthe <mikael@lilotux.net> parents: 1168 diff changeset	635
29f805d8412f Add some keycodes Mikael Berthe <mikael@lilotux.net> parents: 1168 diff changeset	636 // Konsole Linux
29f805d8412f Add some keycodes Mikael Berthe <mikael@lilotux.net> parents: 1168 diff changeset	637 add_keyseq("[1~", MKEY_EQUIV, KEY_HOME); // Home
29f805d8412f Add some keycodes Mikael Berthe <mikael@lilotux.net> parents: 1168 diff changeset	638 add_keyseq("[4~", MKEY_EQUIV, KEY_END); // End
765 72626e9d60bd Create init_keycodes(), add 2 screen escape sequences Mikael Berthe <mikael@lilotux.net> parents: 764 diff changeset	639 }
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences Mikael Berthe <mikael@lilotux.net> parents: 764 diff changeset	640
1176 547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	641 // scr_init_bindings()
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	642 // Create default key bindings
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	643 // Return 0 if error and 1 if none
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	644 void scr_init_bindings(void)
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	645 {
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	646 GString *sbuf = g_string_new("");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	647
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	648 // Common backspace key codes: 8, 127
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	649 settings_set(SETTINGS_TYPE_BINDING, "8", "iline char_bdel"); // Ctrl-h
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	650 settings_set(SETTINGS_TYPE_BINDING, "127", "iline char_bdel");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	651 g_string_printf(sbuf, "%d", KEY_BACKSPACE);
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	652 settings_set(SETTINGS_TYPE_BINDING, sbuf->str, "iline char_bdel");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	653 g_string_printf(sbuf, "%d", KEY_DC);
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	654 settings_set(SETTINGS_TYPE_BINDING, sbuf->str, "iline char_fdel");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	655 g_string_printf(sbuf, "%d", KEY_LEFT);
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	656 settings_set(SETTINGS_TYPE_BINDING, sbuf->str, "iline bchar");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	657 g_string_printf(sbuf, "%d", KEY_RIGHT);
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	658 settings_set(SETTINGS_TYPE_BINDING, sbuf->str, "iline fchar");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	659 settings_set(SETTINGS_TYPE_BINDING, "7", "iline compl_cancel"); // Ctrl-g
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	660 g_string_printf(sbuf, "%d", KEY_UP);
1190 be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	661 settings_set(SETTINGS_TYPE_BINDING, sbuf->str,
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	662 "iline hist_beginning_search_bwd");
1176 547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	663 g_string_printf(sbuf, "%d", KEY_DOWN);
1190 be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	664 settings_set(SETTINGS_TYPE_BINDING, sbuf->str,
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	665 "iline hist_beginning_search_fwd");
1176 547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	666 g_string_printf(sbuf, "%d", KEY_PPAGE);
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	667 settings_set(SETTINGS_TYPE_BINDING, sbuf->str, "roster up");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	668 g_string_printf(sbuf, "%d", KEY_NPAGE);
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	669 settings_set(SETTINGS_TYPE_BINDING, sbuf->str, "roster down");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	670 g_string_printf(sbuf, "%d", KEY_HOME);
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	671 settings_set(SETTINGS_TYPE_BINDING, sbuf->str, "iline iline_start");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	672 settings_set(SETTINGS_TYPE_BINDING, "1", "iline iline_start"); // Ctrl-a
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	673 g_string_printf(sbuf, "%d", KEY_END);
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	674 settings_set(SETTINGS_TYPE_BINDING, sbuf->str, "iline iline_end");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	675 settings_set(SETTINGS_TYPE_BINDING, "5", "iline iline_end"); // Ctrl-e
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	676 // Ctrl-o (accept-line-and-down-history):
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	677 settings_set(SETTINGS_TYPE_BINDING, "15", "iline iline_accept_down_hist");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	678 settings_set(SETTINGS_TYPE_BINDING, "21", "iline iline_bdel"); // Ctrl-u
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	679 g_string_printf(sbuf, "%d", KEY_EOL);
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	680 settings_set(SETTINGS_TYPE_BINDING, sbuf->str, "iline iline_fdel");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	681 settings_set(SETTINGS_TYPE_BINDING, "11", "iline iline_fdel"); // Ctrl-k
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	682 settings_set(SETTINGS_TYPE_BINDING, "16", "buffer up"); // Ctrl-p
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	683 settings_set(SETTINGS_TYPE_BINDING, "14", "buffer down"); // Ctrl-n
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	684 settings_set(SETTINGS_TYPE_BINDING, "20", "iline char_swap"); // Ctrl-t
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	685 settings_set(SETTINGS_TYPE_BINDING, "23", "iline word_bdel"); // Ctrl-w
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	686 settings_set(SETTINGS_TYPE_BINDING, "M98", "iline bword"); // Meta-b
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	687 settings_set(SETTINGS_TYPE_BINDING, "M102", "iline fword"); // Meta-f
1186 0158bd8ca9d6 Add a default binding to Meta-d (iline word_fdel) Mikael Berthe <mikael@lilotux.net> parents: 1185 diff changeset	688 settings_set(SETTINGS_TYPE_BINDING, "M100", "iline word_fdel"); // Meta-d
1176 547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	689 // Ctrl-Left (2 codes):
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	690 settings_set(SETTINGS_TYPE_BINDING, "515", "iline bword");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	691 settings_set(SETTINGS_TYPE_BINDING, "516", "iline bword");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	692 // Ctrl-Right (2 codes):
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	693 settings_set(SETTINGS_TYPE_BINDING, "517", "iline fword");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	694 settings_set(SETTINGS_TYPE_BINDING, "518", "iline fword");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	695 settings_set(SETTINGS_TYPE_BINDING, "12", "screen_refresh"); // Ctrl-l
1503 c74cfe7fd848 Add option --show-roster to command chat_disable. Mikael Berthe <mikael@lilotux.net> parents: 1502 diff changeset	696 settings_set(SETTINGS_TYPE_BINDING, "27", "chat_disable --show-roster");// Esc
1185 5c34af370b67 Bind Meta-Esc (Esc-Esc) to chat_disable by default Mikael Berthe <mikael@lilotux.net> parents: 1179 diff changeset	697 settings_set(SETTINGS_TYPE_BINDING, "M27", "chat_disable"); // Esc-Esc
1176 547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	698 settings_set(SETTINGS_TYPE_BINDING, "4", "iline send_multiline"); // Ctrl-d
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	699 settings_set(SETTINGS_TYPE_BINDING, "M117", "iline word_upcase"); // Meta-u
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	700 settings_set(SETTINGS_TYPE_BINDING, "M108", "iline word_downcase"); // Meta-l
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	701 settings_set(SETTINGS_TYPE_BINDING, "M99", "iline word_capit"); // Meta-c
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	702
1208 0dbe51d1e62e Add default binding for F1 (265) to /help Mikael Berthe <mikael@lilotux.net> parents: 1205 diff changeset	703 settings_set(SETTINGS_TYPE_BINDING, "265", "help"); // Bind F1 to help...
0dbe51d1e62e Add default binding for F1 (265) to /help Mikael Berthe <mikael@lilotux.net> parents: 1205 diff changeset	704
1176 547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	705 g_string_free(sbuf, TRUE);
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	706 }
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates Mikael Berthe <mikael@lilotux.net> parents: 1173 diff changeset	707
1229 e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	708 // is_speckey(key)
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	709 // Return TRUE if key is a special code, i.e. no char should be displayed on
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	710 // the screen. It's not very nice, it's a workaround for the systems where
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	711 // isprint(KEY_PPAGE) returns TRUE...
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	712 static int is_speckey(int key)
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	713 {
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	714 switch (key) {
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	715 case 127:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	716 case 393:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	717 case 402:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	718 case KEY_BACKSPACE:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	719 case KEY_DC:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	720 case KEY_LEFT:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	721 case KEY_RIGHT:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	722 case KEY_UP:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	723 case KEY_DOWN:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	724 case KEY_PPAGE:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	725 case KEY_NPAGE:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	726 case KEY_HOME:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	727 case KEY_END:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	728 case KEY_EOL:
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	729 return TRUE;
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	730 }
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	731
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	732 // Fn keys
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	733 if (key >= 265 && key < 265+12)
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	734 return TRUE;
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	735
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	736 // Special key combinations
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	737 if (key >= 513 && key <= 521)
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	738 return TRUE;
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	739
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	740 return FALSE;
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	741 }
e9ea1497ac9d Fix a key binding issue on FreeBSD Mikael Berthe <mikael@lilotux.net> parents: 1228 diff changeset	742
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	743 void scr_init_locale_charset(void)
779 057ffe7c43dc Initialize locale charset earlier Mikael Berthe <mikael@lilotux.net> parents: 773 diff changeset	744 {
1651 d0a0d96ed5d5 Set all locale variables Myhailo Danylenko <isbear@ukrpost.net> parents: 1602 diff changeset	745 setlocale(LC_ALL, "");
1382 1447c5296977 Fix locale charset detection on some BSD systems Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	746 #ifdef HAVE_LOCALCHARSET_H
1447c5296977 Fix locale charset detection on some BSD systems Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	747 LocaleCharSet = locale_charset();
1447c5296977 Fix locale charset detection on some BSD systems Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	748 #else
779 057ffe7c43dc Initialize locale charset earlier Mikael Berthe <mikael@lilotux.net> parents: 773 diff changeset	749 LocaleCharSet = nl_langinfo(CODESET);
1382 1447c5296977 Fix locale charset detection on some BSD systems Mikael Berthe <mikael@lilotux.net> parents: 1381 diff changeset	750 #endif
779 057ffe7c43dc Initialize locale charset earlier Mikael Berthe <mikael@lilotux.net> parents: 773 diff changeset	751 utf8_mode = (strcmp(LocaleCharSet, "UTF-8") == 0);
057ffe7c43dc Initialize locale charset earlier Mikael Berthe <mikael@lilotux.net> parents: 773 diff changeset	752 }
057ffe7c43dc Initialize locale charset earlier Mikael Berthe <mikael@lilotux.net> parents: 773 diff changeset	753
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	754 gboolean scr_curses_status(void)
1733 a9b0364c0cb2 Fix segfault introduced in previous commit Mikael Berthe <mikael@lilotux.net> parents: 1729 diff changeset	755 {
a9b0364c0cb2 Fix segfault introduced in previous commit Mikael Berthe <mikael@lilotux.net> parents: 1729 diff changeset	756 return Curses;
a9b0364c0cb2 Fix segfault introduced in previous commit Mikael Berthe <mikael@lilotux.net> parents: 1729 diff changeset	757 }
a9b0364c0cb2 Fix segfault introduced in previous commit Mikael Berthe <mikael@lilotux.net> parents: 1729 diff changeset	758
1942 3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	759 static gchar scr_color_guard(const gchar key, const gchar *new_value)
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	760 {
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	761 if (g_strcmp0(settings_opt_get(key), new_value))
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	762 colors_stalled = TRUE;
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	763 return g_strdup(new_value);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	764 }
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	765
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	766 void scr_init_curses(void)
765 72626e9d60bd Create init_keycodes(), add 2 screen escape sequences Mikael Berthe <mikael@lilotux.net> parents: 764 diff changeset	767 {
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences Mikael Berthe <mikael@lilotux.net> parents: 764 diff changeset	768 /* Key sequences initialization */
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences Mikael Berthe <mikael@lilotux.net> parents: 764 diff changeset	769 init_keycodes();
762 96d46e00524a Add some key escape sequences for screen Mikael Berthe <mikael@lilotux.net> parents: 761 diff changeset	770
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	771 initscr();
382 4c6e8392e465 Use nodelay() instead of halfdelay() Mikael Berthe <mikael@lilotux.net> parents: 374 diff changeset	772 raw();
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	773 noecho();
389 6e895f397474 Ncurses changes + Ctrl-C does not send a signal anylore Mikael Berthe <mikael@lilotux.net> parents: 388 diff changeset	774 nonl();
6e895f397474 Ncurses changes + Ctrl-C does not send a signal anylore Mikael Berthe <mikael@lilotux.net> parents: 388 diff changeset	775 intrflush(stdscr, FALSE);
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	776 start_color();
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	777 use_default_colors();
1561 2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	778 #ifdef NCURSES_MOUSE_VERSION
1563 c1d0f906d379 Add option "use_mouse" franky parents: 1561 diff changeset	779 if (settings_opt_get_int("use_mouse"))
c1d0f906d379 Add option "use_mouse" franky parents: 1561 diff changeset	780 mousemask(ALL_MOUSE_EVENTS, NULL);
1561 2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	781 #endif
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	782
1386 8e763c2c331f Add option 'escdelay' Mikael Berthe <mikael@lilotux.net> parents: 1382 diff changeset	783 if (settings_opt_get("escdelay")) {
8e763c2c331f Add option 'escdelay' Mikael Berthe <mikael@lilotux.net> parents: 1382 diff changeset	784 #ifdef HAVE_ESCDELAY
8e763c2c331f Add option 'escdelay' Mikael Berthe <mikael@lilotux.net> parents: 1382 diff changeset	785 ESCDELAY = (unsigned) settings_opt_get_int("escdelay");
8e763c2c331f Add option 'escdelay' Mikael Berthe <mikael@lilotux.net> parents: 1382 diff changeset	786 #else
8e763c2c331f Add option 'escdelay' Mikael Berthe <mikael@lilotux.net> parents: 1382 diff changeset	787 scr_LogPrint(LPRINT_LOGNORM, "ERROR: no ESCDELAY support.");
8e763c2c331f Add option 'escdelay' Mikael Berthe <mikael@lilotux.net> parents: 1382 diff changeset	788 #endif
8e763c2c331f Add option 'escdelay' Mikael Berthe <mikael@lilotux.net> parents: 1382 diff changeset	789 }
8e763c2c331f Add option 'escdelay' Mikael Berthe <mikael@lilotux.net> parents: 1382 diff changeset	790
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	791 parse_colors();
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	792
1942 3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	793 settings_set_guard("color_background", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	794 settings_set_guard("color_general", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	795 settings_set_guard("color_info", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	796 settings_set_guard("color_msgin", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	797 settings_set_guard("color_msgout", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	798 settings_set_guard("color_msghl", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	799 settings_set_guard("color_bgstatus", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	800 settings_set_guard("color_status", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	801 settings_set_guard("color_roster", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	802 settings_set_guard("color_bgrostersel", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	803 settings_set_guard("color_rostersel", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	804 settings_set_guard("color_rosterselmsg", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	805 settings_set_guard("color_rosternewmsg", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	806
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	807 getmaxyx(stdscr, maxY, maxX);
515 180f0a6e4ac9 Log window's height can be set by the user Mikael Berthe <mikael@lilotux.net> parents: 514 diff changeset	808 Log_Win_Height = DEFAULT_LOG_WIN_HEIGHT;
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	809 // Note scr_draw_main_window() should be called early after scr_init_curses()
518 9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	810 // to update Log_Win_Height and set max{X,Y}
515 180f0a6e4ac9 Log window's height can be set by the user Mikael Berthe <mikael@lilotux.net> parents: 514 diff changeset	811
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	812 inputLine[0] = 0;
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	813 ptr_inputline = inputLine;
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	814
966 d9acb7f2a3d1 Do not set Curses variable too early Mikael Berthe <mikael@lilotux.net> parents: 961 diff changeset	815 Curses = TRUE;
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	816 return;
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	817 }
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	818
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	819 void scr_terminate_curses(void)
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	820 {
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	821 if (!Curses) return;
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	822 clear();
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	823 refresh();
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	824 endwin();
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	825 Curses = FALSE;
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	826 return;
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	827 }
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	828
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	829 void scr_beep(void)
675 ae7016aae014 New "beep_on_message" option Mikael Berthe <mikael@lilotux.net> parents: 667 diff changeset	830 {
ae7016aae014 New "beep_on_message" option Mikael Berthe <mikael@lilotux.net> parents: 667 diff changeset	831 beep();
ae7016aae014 New "beep_on_message" option Mikael Berthe <mikael@lilotux.net> parents: 667 diff changeset	832 }
ae7016aae014 New "beep_on_message" option Mikael Berthe <mikael@lilotux.net> parents: 667 diff changeset	833
1286 02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	834 // This and following belongs to dynamic setting of time prefix
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	835 static const char *timeprefixes[] = {
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	836 "%m-%d %H:%M ",
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	837 "%H:%M ",
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	838 " "
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	839 };
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	840
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	841 static const char *spectimeprefixes[] = {
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	842 "%m-%d %H:%M:%S ",
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	843 "%H:%M:%S ",
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	844 " "
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	845 };
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	846
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	847 static int timepreflengths[] = {
1376 a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	848 // (length of the corresponding timeprefix + 5)
1286 02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	849 17,
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	850 11,
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	851 6
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	852 };
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	853
1486 f83a51eaa5ed Fix multiline output in /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1485 diff changeset	854 static const char *gettprefix(void)
1286 02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	855 {
1376 a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	856 guint n = settings_opt_get_int("time_prefix");
a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	857 return timeprefixes[(n < 3 ? n : 0)];
1286 02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	858 }
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	859
1486 f83a51eaa5ed Fix multiline output in /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1485 diff changeset	860 static const char *getspectprefix(void)
1286 02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	861 {
1376 a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	862 guint n = settings_opt_get_int("time_prefix");
a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	863 return spectimeprefixes[(n < 3 ? n : 0)];
1286 02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	864 }
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	865
1487 f61ed2466f7c Minor style upgrade Mikael Berthe <mikael@lilotux.net> parents: 1486 diff changeset	866 guint scr_getprefixwidth(void)
1286 02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	867 {
1376 a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	868 guint n = settings_opt_get_int("time_prefix");
a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	869 return timepreflengths[(n < 3 ? n : 0)];
1286 02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	870 }
02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	871
1761 61f0482d3993 Limit = alignment to 1/3 of screen in option list Myhailo Danylenko <isbear@ukrpost.net> parents: 1756 diff changeset	872 guint scr_gettextwidth(void)
61f0482d3993 Limit = alignment to 1/3 of screen in option list Myhailo Danylenko <isbear@ukrpost.net> parents: 1756 diff changeset	873 {
61f0482d3993 Limit = alignment to 1/3 of screen in option list Myhailo Danylenko <isbear@ukrpost.net> parents: 1756 diff changeset	874 return maxX - Roster_Width - scr_getprefixwidth();
61f0482d3993 Limit = alignment to 1/3 of screen in option list Myhailo Danylenko <isbear@ukrpost.net> parents: 1756 diff changeset	875 }
61f0482d3993 Limit = alignment to 1/3 of screen in option list Myhailo Danylenko <isbear@ukrpost.net> parents: 1756 diff changeset	876
1791 6e0a8bfb3a01 Add scr_gettextheight() Myhailo Danylenko <isbear@ukrpost.net> parents: 1783 diff changeset	877 guint scr_gettextheight(void)
6e0a8bfb3a01 Add scr_gettextheight() Myhailo Danylenko <isbear@ukrpost.net> parents: 1783 diff changeset	878 {
6e0a8bfb3a01 Add scr_gettextheight() Myhailo Danylenko <isbear@ukrpost.net> parents: 1783 diff changeset	879 // log window, two status bars and one input line
6e0a8bfb3a01 Add scr_gettextheight() Myhailo Danylenko <isbear@ukrpost.net> parents: 1783 diff changeset	880 return maxY - Log_Win_Height - 3;
6e0a8bfb3a01 Add scr_gettextheight() Myhailo Danylenko <isbear@ukrpost.net> parents: 1783 diff changeset	881 }
6e0a8bfb3a01 Add scr_gettextheight() Myhailo Danylenko <isbear@ukrpost.net> parents: 1783 diff changeset	882
1819 d13315366ba5 Add scr_getlogwinheight() Mikael Berthe <mikael@lilotux.net> parents: 1815 diff changeset	883 guint scr_getlogwinheight(void)
d13315366ba5 Add scr_getlogwinheight() Mikael Berthe <mikael@lilotux.net> parents: 1815 diff changeset	884 {
d13315366ba5 Add scr_getlogwinheight() Mikael Berthe <mikael@lilotux.net> parents: 1815 diff changeset	885 if (Log_Win_Height >= 2)
d13315366ba5 Add scr_getlogwinheight() Mikael Berthe <mikael@lilotux.net> parents: 1815 diff changeset	886 return Log_Win_Height - 2;
d13315366ba5 Add scr_getlogwinheight() Mikael Berthe <mikael@lilotux.net> parents: 1815 diff changeset	887 return 0;
d13315366ba5 Add scr_getlogwinheight() Mikael Berthe <mikael@lilotux.net> parents: 1815 diff changeset	888 }
d13315366ba5 Add scr_getlogwinheight() Mikael Berthe <mikael@lilotux.net> parents: 1815 diff changeset	889
1518 63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	890 // scr_print_logwindow(string)
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	891 // Display the string in the log window.
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	892 // Note: The string must be in the user's locale!
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	893 void scr_print_logwindow(const char *string)
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	894 {
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	895 time_t timestamp;
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	896 char strtimestamp[64];
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	897
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	898 timestamp = time(NULL);
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	899 strftime(strtimestamp, 48, "[%H:%M:%S]", localtime(&timestamp));
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	900 if (Curses) {
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	901 wprintw(logWnd, "\n%s %s", strtimestamp, string);
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	902 update_panels();
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	903 } else {
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	904 printf("%s %s\n", strtimestamp, string);
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	905 }
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	906 }
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	907
1783 af3de54ef986 Convert scr_LogPrint() to scr_log_print() Mikael Berthe <mikael@lilotux.net> parents: 1780 diff changeset	908 // scr_log_print(...)
1518 63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	909 // Display a message in the log window and in the status buffer.
63dc211a4c1a New command: /echo (display a message in the log window) Mikael Berthe <mikael@lilotux.net> parents: 1515 diff changeset	910 // Add the message to the tracelog file if the log flag is set.
771 ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings Mikael Berthe <mikael@lilotux.net> parents: 770 diff changeset	911 // This function will convert from UTF-8 unless the LPRINT_NOTUTF8 flag is set.
1783 af3de54ef986 Convert scr_LogPrint() to scr_log_print() Mikael Berthe <mikael@lilotux.net> parents: 1780 diff changeset	912 void scr_log_print(unsigned int flag, const char *fmt, ...)
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	913 {
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	914 time_t timestamp;
857 ef35a2bb40d7 scr_LogPrint(): do not use static buffer size Mikael Berthe <mikael@lilotux.net> parents: 851 diff changeset	915 char strtimestamp[64];
858 2683ad5d1003 Improve scr_LogPrint() for log/debug messages Mikael Berthe <mikael@lilotux.net> parents: 857 diff changeset	916 char buffer, btext;
1075 03bc225ad763 Improve scr_LogPrint() readability Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	917 char convbuf1 = NULL, convbuf2 = NULL;
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	918 va_list ap;
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	919
771 ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings Mikael Berthe <mikael@lilotux.net> parents: 770 diff changeset	920 if (!(flag & ~LPRINT_NOTUTF8)) return; // Shouldn't happen
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	921
857 ef35a2bb40d7 scr_LogPrint(): do not use static buffer size Mikael Berthe <mikael@lilotux.net> parents: 851 diff changeset	922 timestamp = time(NULL);
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size Mikael Berthe <mikael@lilotux.net> parents: 851 diff changeset	923 strftime(strtimestamp, 48, "[%H:%M:%S]", localtime(&timestamp));
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size Mikael Berthe <mikael@lilotux.net> parents: 851 diff changeset	924 va_start(ap, fmt);
858 2683ad5d1003 Improve scr_LogPrint() for log/debug messages Mikael Berthe <mikael@lilotux.net> parents: 857 diff changeset	925 btext = g_strdup_vprintf(fmt, ap);
857 ef35a2bb40d7 scr_LogPrint(): do not use static buffer size Mikael Berthe <mikael@lilotux.net> parents: 851 diff changeset	926 va_end(ap);
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	927
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	928 if (flag & LPRINT_NORMAL) {
771 ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings Mikael Berthe <mikael@lilotux.net> parents: 770 diff changeset	929 char *buffer_locale;
851 da03534e46c7 Add startup log messages to the status buffer Mikael Berthe <mikael@lilotux.net> parents: 850 diff changeset	930 char *buf_specialwindow;
da03534e46c7 Add startup log messages to the status buffer Mikael Berthe <mikael@lilotux.net> parents: 850 diff changeset	931
858 2683ad5d1003 Improve scr_LogPrint() for log/debug messages Mikael Berthe <mikael@lilotux.net> parents: 857 diff changeset	932 buffer = g_strdup_printf("%s %s", strtimestamp, btext);
2683ad5d1003 Improve scr_LogPrint() for log/debug messages Mikael Berthe <mikael@lilotux.net> parents: 857 diff changeset	933
851 da03534e46c7 Add startup log messages to the status buffer Mikael Berthe <mikael@lilotux.net> parents: 850 diff changeset	934 // Convert buffer to current locale for wprintw()
771 ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings Mikael Berthe <mikael@lilotux.net> parents: 770 diff changeset	935 if (!(flag & LPRINT_NOTUTF8))
1075 03bc225ad763 Improve scr_LogPrint() readability Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	936 buffer_locale = convbuf1 = from_utf8(buffer);
771 ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings Mikael Berthe <mikael@lilotux.net> parents: 770 diff changeset	937 else
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings Mikael Berthe <mikael@lilotux.net> parents: 770 diff changeset	938 buffer_locale = buffer;
851 da03534e46c7 Add startup log messages to the status buffer Mikael Berthe <mikael@lilotux.net> parents: 850 diff changeset	939
884 9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures Mikael Berthe <mikael@lilotux.net> parents: 880 diff changeset	940 if (!buffer_locale) {
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures Mikael Berthe <mikael@lilotux.net> parents: 880 diff changeset	941 wprintw(logWnd,
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures Mikael Berthe <mikael@lilotux.net> parents: 880 diff changeset	942 "\n%s*Error: cannot convert string to locale.", strtimestamp);
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures Mikael Berthe <mikael@lilotux.net> parents: 880 diff changeset	943 update_panels();
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures Mikael Berthe <mikael@lilotux.net> parents: 880 diff changeset	944 g_free(buffer);
897 a05b5a16a06a Fix memory leak in scr_LogPrint() Mikael Berthe <mikael@lilotux.net> parents: 891 diff changeset	945 g_free(btext);
884 9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures Mikael Berthe <mikael@lilotux.net> parents: 880 diff changeset	946 return;
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures Mikael Berthe <mikael@lilotux.net> parents: 880 diff changeset	947 }
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures Mikael Berthe <mikael@lilotux.net> parents: 880 diff changeset	948
851 da03534e46c7 Add startup log messages to the status buffer Mikael Berthe <mikael@lilotux.net> parents: 850 diff changeset	949 // For the special status buffer, we need utf-8, but without the timestamp
da03534e46c7 Add startup log messages to the status buffer Mikael Berthe <mikael@lilotux.net> parents: 850 diff changeset	950 if (flag & LPRINT_NOTUTF8)
1075 03bc225ad763 Improve scr_LogPrint() readability Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	951 buf_specialwindow = convbuf2 = to_utf8(btext);
851 da03534e46c7 Add startup log messages to the status buffer Mikael Berthe <mikael@lilotux.net> parents: 850 diff changeset	952 else
858 2683ad5d1003 Improve scr_LogPrint() for log/debug messages Mikael Berthe <mikael@lilotux.net> parents: 857 diff changeset	953 buf_specialwindow = btext;
851 da03534e46c7 Add startup log messages to the status buffer Mikael Berthe <mikael@lilotux.net> parents: 850 diff changeset	954
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	955 if (Curses) {
771 ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings Mikael Berthe <mikael@lilotux.net> parents: 770 diff changeset	956 wprintw(logWnd, "\n%s", buffer_locale);
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	957 update_panels();
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	958 scr_write_in_window(NULL, buf_specialwindow, timestamp,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	959 HBB_PREFIX_SPECIAL, FALSE, 0, NULL);
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	960 } else {
771 ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings Mikael Berthe <mikael@lilotux.net> parents: 770 diff changeset	961 printf("%s\n", buffer_locale);
851 da03534e46c7 Add startup log messages to the status buffer Mikael Berthe <mikael@lilotux.net> parents: 850 diff changeset	962 // ncurses are not initialized yet, so we call directly hbuf routine
da03534e46c7 Add startup log messages to the status buffer Mikael Berthe <mikael@lilotux.net> parents: 850 diff changeset	963 hbuf_add_line(&statushbuf, buf_specialwindow, timestamp,
1602 f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	964 HBB_PREFIX_SPECIAL, 0, 0, 0, NULL);
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	965 }
851 da03534e46c7 Add startup log messages to the status buffer Mikael Berthe <mikael@lilotux.net> parents: 850 diff changeset	966
1075 03bc225ad763 Improve scr_LogPrint() readability Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	967 g_free(convbuf1);
03bc225ad763 Improve scr_LogPrint() readability Mikael Berthe <mikael@lilotux.net> parents: 1072 diff changeset	968 g_free(convbuf2);
858 2683ad5d1003 Improve scr_LogPrint() for log/debug messages Mikael Berthe <mikael@lilotux.net> parents: 857 diff changeset	969 g_free(buffer);
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	970 }
412 9c640ee3bae3 Display full date in the log file Mikael Berthe <mikael@lilotux.net> parents: 393 diff changeset	971
857 ef35a2bb40d7 scr_LogPrint(): do not use static buffer size Mikael Berthe <mikael@lilotux.net> parents: 851 diff changeset	972 if (flag & (LPRINT_LOG\|LPRINT_DEBUG)) {
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size Mikael Berthe <mikael@lilotux.net> parents: 851 diff changeset	973 strftime(strtimestamp, 23, "[%Y-%m-%d %H:%M:%S]", localtime(&timestamp));
858 2683ad5d1003 Improve scr_LogPrint() for log/debug messages Mikael Berthe <mikael@lilotux.net> parents: 857 diff changeset	974 buffer = g_strdup_printf("%s %s\n", strtimestamp, btext);
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	975 ut_write_log(flag, buffer);
857 ef35a2bb40d7 scr_LogPrint(): do not use static buffer size Mikael Berthe <mikael@lilotux.net> parents: 851 diff changeset	976 g_free(buffer);
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	977 }
897 a05b5a16a06a Fix memory leak in scr_LogPrint() Mikael Berthe <mikael@lilotux.net> parents: 891 diff changeset	978 g_free(btext);
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	979 }
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	980
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	981 static winbuf scr_search_window(const char winId, int special)
1156 cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	982 {
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	983 char *id;
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	984 winbuf *wbp;
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	985
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	986 if (special)
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	987 return statusWindow; // Only one special window atm.
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	988
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	989 if (!winId)
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	990 return NULL;
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	991
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	992 id = g_strdup(winId);
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	993 mc_strtolower(id);
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	994 wbp = g_hash_table_lookup(winbufhash, id);
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	995 g_free(id);
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	996 return wbp;
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	997 }
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	998
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	999 int scr_buddy_buffer_exists(const char *bjid)
1156 cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	1000 {
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1001 return (scr_search_window(bjid, FALSE) != NULL);
1156 cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	1002 }
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	1003
1133 9dd28a56128f Do not create one panel per contact Mikael Berthe <mikael@lilotux.net> parents: 1131 diff changeset	1004 // scr_new_buddy(title, dontshow)
1139 104676e3389b Update documentation Mikael Berthe <mikael@lilotux.net> parents: 1138 diff changeset	1005 // Note: title (aka winId/jid) can be NULL for special buffers
1133 9dd28a56128f Do not create one panel per contact Mikael Berthe <mikael@lilotux.net> parents: 1131 diff changeset	1006 static winbuf scr_new_buddy(const char title, int dont_show)
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1007 {
822 0dbb2be10975 Get rid of list.h Mikael Berthe <mikael@lilotux.net> parents: 807 diff changeset	1008 winbuf *tmp;
393 f8f3c7493457 Whitespace cleanup Mikael Berthe <mikael@lilotux.net> parents: 389 diff changeset	1009
822 0dbb2be10975 Get rid of list.h Mikael Berthe <mikael@lilotux.net> parents: 807 diff changeset	1010 tmp = g_new0(winbuf, 1);
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1011
1133 9dd28a56128f Do not create one panel per contact Mikael Berthe <mikael@lilotux.net> parents: 1131 diff changeset	1012 tmp->win = activechatWnd;
9dd28a56128f Do not create one panel per contact Mikael Berthe <mikael@lilotux.net> parents: 1131 diff changeset	1013 tmp->panel = activechatPanel;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1014
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	1015 if (!dont_show) {
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1016 currentWindow = tmp;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1017 } else {
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1018 if (currentWindow)
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1019 top_panel(currentWindow->panel);
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1020 else
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1021 top_panel(chatPanel);
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1022 }
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	1023 update_panels();
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1024
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1025 // If title is NULL, this is a special buffer
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1026 if (title) {
1078 7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1027 char *id;
1156 cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	1028 id = hlog_get_log_jid(title);
cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	1029 if (id) {
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1030 winbuf *wb = scr_search_window(id, FALSE);
1160 14f5876b5555 Slight optimization + line wrapping Mikael Berthe <mikael@lilotux.net> parents: 1159 diff changeset	1031 if (!wb)
14f5876b5555 Slight optimization + line wrapping Mikael Berthe <mikael@lilotux.net> parents: 1159 diff changeset	1032 wb = scr_new_buddy(id, TRUE);
14f5876b5555 Slight optimization + line wrapping Mikael Berthe <mikael@lilotux.net> parents: 1159 diff changeset	1033 tmp->bd=wb->bd;
1156 cae430fcd385 Mcabber will load symlinked histories only once, now. Frank Zschockelt parents: 1154 diff changeset	1034 g_free(id);
1159 53c0c5be43fa Small fixes, typos and cleanups Mikael Berthe <mikael@lilotux.net> parents: 1157 diff changeset	1035 } else { // Load buddy history from file (if enabled)
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1036 tmp->bd = g_new0(buffdata, 1);
1159 53c0c5be43fa Small fixes, typos and cleanups Mikael Berthe <mikael@lilotux.net> parents: 1157 diff changeset	1037 hlog_read_history(title, &tmp->bd->hbuf,
1487 f61ed2466f7c Minor style upgrade Mikael Berthe <mikael@lilotux.net> parents: 1486 diff changeset	1038 maxX - Roster_Width - scr_getprefixwidth());
1965 ec737f5f1d6f Couple of readmark-related bugfixes Mikael Berthe <mikael@lilotux.net> parents: 1961 diff changeset	1039
ec737f5f1d6f Couple of readmark-related bugfixes Mikael Berthe <mikael@lilotux.net> parents: 1961 diff changeset	1040 // Set a readmark to separate new content
ec737f5f1d6f Couple of readmark-related bugfixes Mikael Berthe <mikael@lilotux.net> parents: 1961 diff changeset	1041 hbuf_set_readmark(tmp->bd->hbuf, TRUE);
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1042 }
181 4a0bde661562 [/trunk] Changeset 193 by mikael mikael parents: 180 diff changeset	1043
1078 7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1044 id = g_strdup(title);
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1045 mc_strtolower(id);
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1046 g_hash_table_insert(winbufhash, id, tmp);
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1047 } else {
1159 53c0c5be43fa Small fixes, typos and cleanups Mikael Berthe <mikael@lilotux.net> parents: 1157 diff changeset	1048 tmp->bd = g_new0(buffdata, 1);
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1049 }
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1050 return tmp;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1051 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1052
1483 e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1053 // scr_line_prefix(line, pref, preflen)
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1054 // Use data from the hbb_line structure and write the prefix
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1055 // to pref (not exceeding preflen, trailing null byte included).
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1056 void scr_line_prefix(hbb_line line, char pref, guint preflen)
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1057 {
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1058 char date[64];
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1059
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1060 if (line->timestamp &&
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1061 !(line->flags & (HBB_PREFIX_SPECIAL\|HBB_PREFIX_CONT))) {
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1062 strftime(date, 30, gettprefix(), localtime(&line->timestamp));
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1063 } else
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1064 strcpy(date, " ");
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1065
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1066 if (!(line->flags & HBB_PREFIX_CONT)) {
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1067 if (line->flags & HBB_PREFIX_INFO) {
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1068 char dir = '*';
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1069 if (line->flags & HBB_PREFIX_IN)
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1070 dir = '<';
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1071 else if (line->flags & HBB_PREFIX_OUT)
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1072 dir = '>';
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1073 g_snprintf(pref, preflen, "%s%c ", date, dir);
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1074 } else if (line->flags & HBB_PREFIX_ERR) {
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1075 char dir = '#';
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1076 if (line->flags & HBB_PREFIX_IN)
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1077 dir = '<';
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1078 else if (line->flags & HBB_PREFIX_OUT)
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1079 dir = '>';
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1080 g_snprintf(pref, preflen, "%s#%c# ", date, dir);
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1081 } else if (line->flags & HBB_PREFIX_IN) {
1484 7b36b91a4388 New UI message flag (O) when OTR is used Mikael Berthe <mikael@lilotux.net> parents: 1483 diff changeset	1082 char cryptflag;
7b36b91a4388 New UI message flag (O) when OTR is used Mikael Berthe <mikael@lilotux.net> parents: 1483 diff changeset	1083 if (line->flags & HBB_PREFIX_PGPCRYPT)
7b36b91a4388 New UI message flag (O) when OTR is used Mikael Berthe <mikael@lilotux.net> parents: 1483 diff changeset	1084 cryptflag = '~';
7b36b91a4388 New UI message flag (O) when OTR is used Mikael Berthe <mikael@lilotux.net> parents: 1483 diff changeset	1085 else if (line->flags & HBB_PREFIX_OTRCRYPT)
7b36b91a4388 New UI message flag (O) when OTR is used Mikael Berthe <mikael@lilotux.net> parents: 1483 diff changeset	1086 cryptflag = 'O';
7b36b91a4388 New UI message flag (O) when OTR is used Mikael Berthe <mikael@lilotux.net> parents: 1483 diff changeset	1087 else
7b36b91a4388 New UI message flag (O) when OTR is used Mikael Berthe <mikael@lilotux.net> parents: 1483 diff changeset	1088 cryptflag = '=';
1483 e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1089 g_snprintf(pref, preflen, "%s<%c= ", date, cryptflag);
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1090 } else if (line->flags & HBB_PREFIX_OUT) {
1602 f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	1091 char cryptflag, receiptflag;
1484 7b36b91a4388 New UI message flag (O) when OTR is used Mikael Berthe <mikael@lilotux.net> parents: 1483 diff changeset	1092 if (line->flags & HBB_PREFIX_PGPCRYPT)
7b36b91a4388 New UI message flag (O) when OTR is used Mikael Berthe <mikael@lilotux.net> parents: 1483 diff changeset	1093 cryptflag = '~';
7b36b91a4388 New UI message flag (O) when OTR is used Mikael Berthe <mikael@lilotux.net> parents: 1483 diff changeset	1094 else if (line->flags & HBB_PREFIX_OTRCRYPT)
7b36b91a4388 New UI message flag (O) when OTR is used Mikael Berthe <mikael@lilotux.net> parents: 1483 diff changeset	1095 cryptflag = 'O';
7b36b91a4388 New UI message flag (O) when OTR is used Mikael Berthe <mikael@lilotux.net> parents: 1483 diff changeset	1096 else
1488 b393b8cee171 Fix small mistake in changeset 7b36b91a4388 Mikael Berthe <mikael@lilotux.net> parents: 1487 diff changeset	1097 cryptflag = '-';
1602 f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	1098 if (line->flags & HBB_PREFIX_RECEIPT)
f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	1099 receiptflag = 'r';
f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	1100 else
f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	1101 receiptflag = '-';
f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	1102 g_snprintf(pref, preflen, "%s%c%c> ", date, receiptflag, cryptflag);
1483 e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1103 } else if (line->flags & HBB_PREFIX_SPECIAL) {
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1104 strftime(date, 30, getspectprefix(), localtime(&line->timestamp));
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1105 g_snprintf(pref, preflen, "%s ", date);
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1106 } else {
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1107 g_snprintf(pref, preflen, "%s ", date);
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1108 }
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1109 } else {
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1110 g_snprintf(pref, preflen, " ");
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1111 }
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1112 }
e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1113
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1114 // scr_update_window()
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	1115 // (Re-)Display the given chat window.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1116 static void scr_update_window(winbuf *win_entry)
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1117 {
1948 e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1118 int n, mark_offset = 0;
1486 f83a51eaa5ed Fix multiline output in /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1485 diff changeset	1119 guint prefixwidth;
1483 e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1120 char pref[96];
184 b5aa2b9c425a [/trunk] Changeset 196 by mikael mikael parents: 181 diff changeset	1121 hbb_line *lines, line;
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1122 GList *hbuf_head;
1965 ec737f5f1d6f Couple of readmark-related bugfixes Mikael Berthe <mikael@lilotux.net> parents: 1961 diff changeset	1123 int color = COLOR_GENERAL;
1948 e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1124 bool readmark = FALSE;
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1125 bool skipline = FALSE;
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1126
1487 f61ed2466f7c Minor style upgrade Mikael Berthe <mikael@lilotux.net> parents: 1486 diff changeset	1127 prefixwidth = scr_getprefixwidth();
1486 f83a51eaa5ed Fix multiline output in /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1485 diff changeset	1128 prefixwidth = MIN(prefixwidth, sizeof pref);
108 7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	1129
7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	1130 // Should the window be empty?
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1131 if (win_entry->bd->cleared) {
168 6ad156673b19 [/trunk] Changeset 180 by mikael mikael parents: 167 diff changeset	1132 werase(win_entry->win);
108 7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	1133 return;
7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	1134 }
7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	1135
1160 14f5876b5555 Slight optimization + line wrapping Mikael Berthe <mikael@lilotux.net> parents: 1159 diff changeset	1136 // win_entry->bd->top is the top message of the screen. If it set to NULL,
14f5876b5555 Slight optimization + line wrapping Mikael Berthe <mikael@lilotux.net> parents: 1159 diff changeset	1137 // we are displaying the last messages.
105 91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	1138
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1139 // We will show the last CHAT_WIN_HEIGHT lines.
b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1140 // Let's find out where it begins.
1160 14f5876b5555 Slight optimization + line wrapping Mikael Berthe <mikael@lilotux.net> parents: 1159 diff changeset	1141 if (!win_entry->bd->top \|\| (g_list_position(g_list_first(win_entry->bd->hbuf),
14f5876b5555 Slight optimization + line wrapping Mikael Berthe <mikael@lilotux.net> parents: 1159 diff changeset	1142 win_entry->bd->top) == -1)) {
105 91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	1143 // Move up CHAT_WIN_HEIGHT lines
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1144 win_entry->bd->hbuf = g_list_last(win_entry->bd->hbuf);
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1145 hbuf_head = win_entry->bd->hbuf;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1146 win_entry->bd->top = NULL; // (Just to make sure)
105 91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	1147 n = 0;
91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	1148 while (hbuf_head && (n < CHAT_WIN_HEIGHT-1) && g_list_previous(hbuf_head)) {
91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	1149 hbuf_head = g_list_previous(hbuf_head);
91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	1150 n++;
91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	1151 }
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	1152 // If the buffer is locked, remember current "top" line for the next time.
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1153 if (win_entry->bd->lock)
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1154 win_entry->bd->top = hbuf_head;
105 91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	1155 } else
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1156 hbuf_head = win_entry->bd->top;
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1157
b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1158 // Get the last CHAT_WIN_HEIGHT lines.
b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1159 lines = hbuf_get_lines(hbuf_head, CHAT_WIN_HEIGHT);
b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1160
1948 e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1161 if (CHAT_WIN_HEIGHT > 1) {
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1162 // Do we have a read mark?
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1163 for (n = 0; n < CHAT_WIN_HEIGHT; n++) {
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1164 line = *(lines+n);
1954 256cfc706ae5 Update readmark support Mikael Berthe <mikael@lilotux.net> parents: 1950 diff changeset	1165 if (line) {
256cfc706ae5 Update readmark support Mikael Berthe <mikael@lilotux.net> parents: 1950 diff changeset	1166 if (line->flags & HBB_PREFIX_READMARK) {
256cfc706ae5 Update readmark support Mikael Berthe <mikael@lilotux.net> parents: 1950 diff changeset	1167 // If this is not the last line, we'll display a mark
256cfc706ae5 Update readmark support Mikael Berthe <mikael@lilotux.net> parents: 1950 diff changeset	1168 if (n+1 < CHAT_WIN_HEIGHT && *(lines+n+1)) {
256cfc706ae5 Update readmark support Mikael Berthe <mikael@lilotux.net> parents: 1950 diff changeset	1169 readmark = TRUE;
256cfc706ae5 Update readmark support Mikael Berthe <mikael@lilotux.net> parents: 1950 diff changeset	1170 skipline = TRUE;
256cfc706ae5 Update readmark support Mikael Berthe <mikael@lilotux.net> parents: 1950 diff changeset	1171 mark_offset = -1;
256cfc706ae5 Update readmark support Mikael Berthe <mikael@lilotux.net> parents: 1950 diff changeset	1172 }
256cfc706ae5 Update readmark support Mikael Berthe <mikael@lilotux.net> parents: 1950 diff changeset	1173 }
256cfc706ae5 Update readmark support Mikael Berthe <mikael@lilotux.net> parents: 1950 diff changeset	1174 } else if (readmark) {
256cfc706ae5 Update readmark support Mikael Berthe <mikael@lilotux.net> parents: 1950 diff changeset	1175 // There will be empty lines, so we don't need to skip the first line
256cfc706ae5 Update readmark support Mikael Berthe <mikael@lilotux.net> parents: 1950 diff changeset	1176 skipline = FALSE;
256cfc706ae5 Update readmark support Mikael Berthe <mikael@lilotux.net> parents: 1950 diff changeset	1177 mark_offset = 0;
1948 e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1178 }
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1179 }
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1180 }
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1181
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1182 // Display the lines
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1183 for (n = 0 ; n < CHAT_WIN_HEIGHT; n++) {
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1184 int winy = n + mark_offset;
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1185 wmove(win_entry->win, winy, 0);
184 b5aa2b9c425a [/trunk] Changeset 196 by mikael mikael parents: 181 diff changeset	1186 line = *(lines+n);
b5aa2b9c425a [/trunk] Changeset 196 by mikael mikael parents: 181 diff changeset	1187 if (line) {
1948 e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1188 if (skipline)
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1189 goto scr_update_window_skipline;
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1190
1204 e802ec0c02d2 Basic support for nick highlighting in MUC rooms (the whole line is colored) Mikael Berthe <mikael@lilotux.net> parents: 1190 diff changeset	1191 if (line->flags & HBB_PREFIX_HLIGHT_OUT)
1291 9f64f548ac16 Better way of writing the nick Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1290 diff changeset	1192 color = COLOR_MSGOUT;
1204 e802ec0c02d2 Basic support for nick highlighting in MUC rooms (the whole line is colored) Mikael Berthe <mikael@lilotux.net> parents: 1190 diff changeset	1193 else if (line->flags & HBB_PREFIX_HLIGHT)
1291 9f64f548ac16 Better way of writing the nick Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1290 diff changeset	1194 color = COLOR_MSGHL;
1268 dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	1195 else if (line->flags & HBB_PREFIX_INFO)
1291 9f64f548ac16 Better way of writing the nick Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1290 diff changeset	1196 color = COLOR_INFO;
1268 dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	1197 else if (line->flags & HBB_PREFIX_IN)
1291 9f64f548ac16 Better way of writing the nick Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1290 diff changeset	1198 color = COLOR_MSGIN;
9f64f548ac16 Better way of writing the nick Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1290 diff changeset	1199 else
9f64f548ac16 Better way of writing the nick Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1290 diff changeset	1200 color = COLOR_GENERAL;
9f64f548ac16 Better way of writing the nick Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1290 diff changeset	1201
9f64f548ac16 Better way of writing the nick Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1290 diff changeset	1202 if (color != COLOR_GENERAL)
9f64f548ac16 Better way of writing the nick Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1290 diff changeset	1203 wattrset(win_entry->win, get_color(color));
1268 dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1254 diff changeset	1204
1483 e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1205 // Generate the prefix area and display it
1486 f83a51eaa5ed Fix multiline output in /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1485 diff changeset	1206 scr_line_prefix(line, pref, prefixwidth);
1483 e74cc83e7158 Refactor scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 1476 diff changeset	1207 wprintw(win_entry->win, pref);
729 39f67cade02c Use bold font for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 728 diff changeset	1208
1286 02ad6200df26 Add selectable time prefixes (vorner) Mikael Berthe <mikael@lilotux.net> parents: 1284 diff changeset	1209 // Make sure we are at the right position
1948 e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1210 wmove(win_entry->win, winy, prefixwidth-1);
1376 a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	1211
a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	1212 // The MUC nick - overwrite with proper color
1294 86caabe72f3a Color only incoming messages Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1292 diff changeset	1213 if (line->mucnicklen) {
1476 77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	1214 char *mucjid;
77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	1215 char tmp;
77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	1216 nickcolor *actual = NULL;
77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	1217 muccoltype type, *typetmp;
77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	1218
1376 a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	1219 // Store the char after the nick
1476 77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	1220 tmp = line->text[line->mucnicklen];
77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	1221 type = glob_muccol;
1376 a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	1222 // Terminate the string after the nick
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1286 diff changeset	1223 line->text[line->mucnicklen] = '\0';
1476 77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	1224 mucjid = g_utf8_strdown(CURRENT_JID, -1);
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1225 if (muccolors) {
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1226 typetmp = g_hash_table_lookup(muccolors, mucjid);
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1227 if (typetmp)
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1228 type = *typetmp;
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1229 }
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1230 g_free(mucjid);
1510 f6d4e20b9caa MUC nickname colors depend on nicknames now Maxim Vuets <maxim.vuets@gmail.com> parents: 1505 diff changeset	1231 // Need to generate a color for the specified nick?
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1232 if ((type == MC_ALL) && (!nickcolors \|\|
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1233 !g_hash_table_lookup(nickcolors, line->text))) {
1476 77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	1234 char snick, mnick;
77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	1235 nickcolor *nc;
1510 f6d4e20b9caa MUC nickname colors depend on nicknames now Maxim Vuets <maxim.vuets@gmail.com> parents: 1505 diff changeset	1236 const char *p = line->text;
f6d4e20b9caa MUC nickname colors depend on nicknames now Maxim Vuets <maxim.vuets@gmail.com> parents: 1505 diff changeset	1237 unsigned int nicksum = 0;
1476 77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	1238 snick = g_strdup(line->text);
77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	1239 mnick = g_strdup(line->text);
77afd831f8f7 Avoid mixed declarations and code Mikael Berthe <mikael@lilotux.net> parents: 1457 diff changeset	1240 nc = g_new(nickcolor, 1);
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1241 ensure_string_htable(&nickcolors, NULL);
1510 f6d4e20b9caa MUC nickname colors depend on nicknames now Maxim Vuets <maxim.vuets@gmail.com> parents: 1505 diff changeset	1242 while (*p)
f6d4e20b9caa MUC nickname colors depend on nicknames now Maxim Vuets <maxim.vuets@gmail.com> parents: 1505 diff changeset	1243 nicksum += *p++;
f6d4e20b9caa MUC nickname colors depend on nicknames now Maxim Vuets <maxim.vuets@gmail.com> parents: 1505 diff changeset	1244 nc->color = nickcols[nicksum % nickcolcount];
1381 40095d413da9 Fix compilation on OpenBSD Mikael Berthe <mikael@lilotux.net> parents: 1376 diff changeset	1245 nc->manual = FALSE;
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1246 *snick = '<';
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1247 snick[strlen(snick)-1] = '>';
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1248 mnick = '';
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1249 mnick[strlen(mnick)-1] = ' ';
1376 a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	1250 // Insert them
1292 382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1251 g_hash_table_insert(nickcolors, snick, nc);
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1252 g_hash_table_insert(nickcolors, mnick, nc);
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1253 }
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1254 if (nickcolors)
382ec54b584e Muc nick coloring functionality Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1291 diff changeset	1255 actual = g_hash_table_lookup(nickcolors, line->text);
1294 86caabe72f3a Color only incoming messages Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1292 diff changeset	1256 if (actual && ((type == MC_ALL) \|\| (actual->manual))
86caabe72f3a Color only incoming messages Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1292 diff changeset	1257 && (line->flags & HBB_PREFIX_IN) &&
86caabe72f3a Color only incoming messages Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1292 diff changeset	1258 (!(line->flags & HBB_PREFIX_HLIGHT_OUT)))
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	1259 wattrset(win_entry->win, compose_color(actual->color));
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1286 diff changeset	1260 wprintw(win_entry->win, "%s", line->text);
1376 a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	1261 // Return the char
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1286 diff changeset	1262 line->text[line->mucnicklen] = tmp;
1376 a0deb5124ebf Check time_prefix value before using it Mikael Berthe <mikael@lilotux.net> parents: 1359 diff changeset	1263 // Return the color back
1291 9f64f548ac16 Better way of writing the nick Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1290 diff changeset	1264 wattrset(win_entry->win, get_color(color));
1290 e42f48103609 Drawing the MUC nicks by a different color Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1286 diff changeset	1265 }
729 39f67cade02c Use bold font for outgoing messages Mikael Berthe <mikael@lilotux.net> parents: 728 diff changeset	1266
1333 e30a9d907105 Minor coding style adjustments Mikael Berthe <mikael@lilotux.net> parents: 1314 diff changeset	1267 // Display text line
e30a9d907105 Minor coding style adjustments Mikael Berthe <mikael@lilotux.net> parents: 1314 diff changeset	1268 wprintw(win_entry->win, "%s", line->text+line->mucnicklen);
1291 9f64f548ac16 Better way of writing the nick Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1290 diff changeset	1269 wclrtoeol(win_entry->win);
9f64f548ac16 Better way of writing the nick Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1290 diff changeset	1270
1948 e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1271 scr_update_window_skipline:
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1272 skipline = FALSE;
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1273 if (readmark && line->flags & HBB_PREFIX_READMARK) {
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1274 int i, w;
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1275 mark_offset++;
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1276
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1277 // Display the mark
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1278 winy = n + mark_offset;
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1279 wmove(win_entry->win, winy, 0);
1965 ec737f5f1d6f Couple of readmark-related bugfixes Mikael Berthe <mikael@lilotux.net> parents: 1961 diff changeset	1280 color = COLOR_READMARK;
ec737f5f1d6f Couple of readmark-related bugfixes Mikael Berthe <mikael@lilotux.net> parents: 1961 diff changeset	1281 wattrset(win_entry->win, get_color(color));
1948 e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1282 g_snprintf(pref, prefixwidth, " == ");
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1283 wprintw(win_entry->win, pref);
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1284 w = scr_gettextwidth() / 3;
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1285 for (i=0; i<w; i++)
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1286 wprintw(win_entry->win, "== ");
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1287 wclrtoeol(win_entry->win);
1960 b596bcff758e Add 'color_readmark' Mikael Berthe <mikael@lilotux.net> parents: 1957 diff changeset	1288 wattrset(win_entry->win, get_color(COLOR_GENERAL));
1948 e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1289 }
e8cebf5fd36c Add readmark support Mikael Berthe <mikael@lilotux.net> parents: 1945 diff changeset	1290
1965 ec737f5f1d6f Couple of readmark-related bugfixes Mikael Berthe <mikael@lilotux.net> parents: 1961 diff changeset	1291 // Restore default ("general") color
ec737f5f1d6f Couple of readmark-related bugfixes Mikael Berthe <mikael@lilotux.net> parents: 1961 diff changeset	1292 if (color != COLOR_GENERAL)
ec737f5f1d6f Couple of readmark-related bugfixes Mikael Berthe <mikael@lilotux.net> parents: 1961 diff changeset	1293 wattrset(win_entry->win, get_color(COLOR_GENERAL));
ec737f5f1d6f Couple of readmark-related bugfixes Mikael Berthe <mikael@lilotux.net> parents: 1961 diff changeset	1294
184 b5aa2b9c425a [/trunk] Changeset 196 by mikael mikael parents: 181 diff changeset	1295 g_free(line->text);
898 c65b71dcda94 Fix memory leak in scr_UpdateWindow() Mikael Berthe <mikael@lilotux.net> parents: 897 diff changeset	1296 g_free(line);
168 6ad156673b19 [/trunk] Changeset 180 by mikael mikael parents: 167 diff changeset	1297 } else {
6ad156673b19 [/trunk] Changeset 180 by mikael mikael parents: 167 diff changeset	1298 wclrtobot(win_entry->win);
6ad156673b19 [/trunk] Changeset 180 by mikael mikael parents: 167 diff changeset	1299 break;
75 ff119bb11563 [/trunk] Changeset 89 by mikael mikael parents: 74 diff changeset	1300 }
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1301 }
b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1302 g_free(lines);
b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1303 }
1159 53c0c5be43fa Small fixes, typos and cleanups Mikael Berthe <mikael@lilotux.net> parents: 1157 diff changeset	1304
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1305 static winbuf scr_create_window(const char winId, int special, int dont_show)
1154 f746d91c5d3b Rearranged duplicated code in screen.c franky@teufel.fs parents: 1142 diff changeset	1306 {
f746d91c5d3b Rearranged duplicated code in screen.c franky@teufel.fs parents: 1142 diff changeset	1307 if (special) {
f746d91c5d3b Rearranged duplicated code in screen.c franky@teufel.fs parents: 1142 diff changeset	1308 if (!statusWindow) {
f746d91c5d3b Rearranged duplicated code in screen.c franky@teufel.fs parents: 1142 diff changeset	1309 statusWindow = scr_new_buddy(NULL, dont_show);
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1310 statusWindow->bd->hbuf = statushbuf;
1154 f746d91c5d3b Rearranged duplicated code in screen.c franky@teufel.fs parents: 1142 diff changeset	1311 }
f746d91c5d3b Rearranged duplicated code in screen.c franky@teufel.fs parents: 1142 diff changeset	1312 return statusWindow;
f746d91c5d3b Rearranged duplicated code in screen.c franky@teufel.fs parents: 1142 diff changeset	1313 } else {
f746d91c5d3b Rearranged duplicated code in screen.c franky@teufel.fs parents: 1142 diff changeset	1314 return scr_new_buddy(winId, dont_show);
f746d91c5d3b Rearranged duplicated code in screen.c franky@teufel.fs parents: 1142 diff changeset	1315 }
f746d91c5d3b Rearranged duplicated code in screen.c franky@teufel.fs parents: 1142 diff changeset	1316 }
f746d91c5d3b Rearranged duplicated code in screen.c franky@teufel.fs parents: 1142 diff changeset	1317
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1318 // scr_show_window()
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	1319 // Display the chat window with the given identifier.
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1320 // "special" must be true if this is a special buffer window.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1321 static void scr_show_window(const char *winId, int special)
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1322 {
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1323 winbuf *win_entry;
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1324
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1325 win_entry = scr_search_window(winId, special);
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1326
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1327 if (!win_entry) {
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1328 win_entry = scr_create_window(winId, special, FALSE);
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1329 }
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1330
180 42a33611233b [/trunk] Changeset 192 by mikael mikael parents: 178 diff changeset	1331 top_panel(win_entry->panel);
42a33611233b [/trunk] Changeset 192 by mikael mikael parents: 178 diff changeset	1332 currentWindow = win_entry;
42a33611233b [/trunk] Changeset 192 by mikael mikael parents: 178 diff changeset	1333 chatmode = TRUE;
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1334 if (!win_entry->bd->lock)
889 ae93e69aaaaf Fix up pending message flag for the status special buffer Mikael Berthe <mikael@lilotux.net> parents: 888 diff changeset	1335 roster_msg_setflag(winId, special, FALSE);
ae93e69aaaaf Fix up pending message flag for the status special buffer Mikael Berthe <mikael@lilotux.net> parents: 888 diff changeset	1336 if (!special)
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1337 roster_setflags(winId, ROSTER_FLAG_LOCK, TRUE);
874 293e8955075c Display a flag in the chat status line when the buffer is locked Mikael Berthe <mikael@lilotux.net> parents: 873 diff changeset	1338 update_roster = TRUE;
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1339
180 42a33611233b [/trunk] Changeset 192 by mikael mikael parents: 178 diff changeset	1340 // Refresh the window
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1341 scr_update_window(win_entry);
180 42a33611233b [/trunk] Changeset 192 by mikael mikael parents: 178 diff changeset	1342
42a33611233b [/trunk] Changeset 192 by mikael mikael parents: 178 diff changeset	1343 // Finished :)
42a33611233b [/trunk] Changeset 192 by mikael mikael parents: 178 diff changeset	1344 update_panels();
142 bb6fe91589b9 [/trunk] Changeset 154 by mikael mikael parents: 140 diff changeset	1345
bb6fe91589b9 [/trunk] Changeset 154 by mikael mikael parents: 140 diff changeset	1346 top_panel(inputPanel);
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1347 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1348
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1349 // scr_show_buddy_window()
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	1350 // Display the chat window buffer for the current buddy.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1351 void scr_show_buddy_window(void)
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1352 {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1056 diff changeset	1353 const gchar *bjid;
140 3b480b73df19 [/trunk] Changeset 152 by mikael mikael parents: 139 diff changeset	1354
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1355 if (!current_buddy) {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1056 diff changeset	1356 bjid = NULL;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1357 } else {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1056 diff changeset	1358 bjid = CURRENT_JID;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1359 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL) {
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1360 scr_show_window(buddy_getname(BUDDATA(current_buddy)), TRUE);
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1361 return;
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1362 }
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1363 }
140 3b480b73df19 [/trunk] Changeset 152 by mikael mikael parents: 139 diff changeset	1364
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1056 diff changeset	1365 if (!bjid) {
140 3b480b73df19 [/trunk] Changeset 152 by mikael mikael parents: 139 diff changeset	1366 top_panel(chatPanel);
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	1367 top_panel(inputPanel);
140 3b480b73df19 [/trunk] Changeset 152 by mikael mikael parents: 139 diff changeset	1368 currentWindow = NULL;
105 91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	1369 return;
140 3b480b73df19 [/trunk] Changeset 152 by mikael mikael parents: 139 diff changeset	1370 }
3b480b73df19 [/trunk] Changeset 152 by mikael mikael parents: 139 diff changeset	1371
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1372 scr_show_window(bjid, FALSE);
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1373 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1374
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1375 // scr_update_buddy_window()
865 cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing Mikael Berthe <mikael@lilotux.net> parents: 858 diff changeset	1376 // (Re)Display the current window.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1377 // If chatmode is enabled, call scr_show_buddy_window(),
865 cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing Mikael Berthe <mikael@lilotux.net> parents: 858 diff changeset	1378 // else display the chat window.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1379 inline void scr_update_buddy_window(void)
865 cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing Mikael Berthe <mikael@lilotux.net> parents: 858 diff changeset	1380 {
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing Mikael Berthe <mikael@lilotux.net> parents: 858 diff changeset	1381 if (chatmode) {
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1382 scr_show_buddy_window();
865 cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing Mikael Berthe <mikael@lilotux.net> parents: 858 diff changeset	1383 return;
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing Mikael Berthe <mikael@lilotux.net> parents: 858 diff changeset	1384 }
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing Mikael Berthe <mikael@lilotux.net> parents: 858 diff changeset	1385
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing Mikael Berthe <mikael@lilotux.net> parents: 858 diff changeset	1386 top_panel(chatPanel);
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing Mikael Berthe <mikael@lilotux.net> parents: 858 diff changeset	1387 top_panel(inputPanel);
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing Mikael Berthe <mikael@lilotux.net> parents: 858 diff changeset	1388 }
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing Mikael Berthe <mikael@lilotux.net> parents: 858 diff changeset	1389
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1390 // scr_write_in_window()
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	1391 // Write some text in the winId window (this usually is a jid).
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1392 // Use winId == NULL for the special status buffer.
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	1393 // Lines are splitted when they are too long to fit in the chat window.
300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	1394 // If this window doesn't exist, it is created.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1395 static void scr_write_in_window(const char winId, const char text,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1396 time_t timestamp, unsigned int prefix_flags,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1397 int force_show, unsigned mucnicklen,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1398 gpointer xep184)
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1399 {
822 0dbb2be10975 Get rid of list.h Mikael Berthe <mikael@lilotux.net> parents: 807 diff changeset	1400 winbuf *win_entry;
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 771 diff changeset	1401 char *text_locale;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1402 int dont_show = FALSE;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1403 int special;
1142 0e27177882c7 Small fix for the max_history_blocks option Mikael Berthe <mikael@lilotux.net> parents: 1141 diff changeset	1404 guint num_history_blocks;
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	1405 bool setmsgflg = FALSE;
1296 7a0eaa53bd53 Further nick colors fixes Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1295 diff changeset	1406 char nicktmp, nicklocaltmp;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1407
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1408 // Look for the window entry.
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1409 special = (winId == NULL);
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1410 win_entry = scr_search_window(winId, special);
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1411
b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1412 // Do we have to really show the window?
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1413 if (!chatmode)
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1414 dont_show = TRUE;
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1415 else if ((!force_show) && ((!currentWindow \|\| (currentWindow != win_entry))))
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1416 dont_show = TRUE;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1417
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1418 // If the window entry doesn't exist yet, let's create it.
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1419 if (!win_entry) {
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1420 win_entry = scr_create_window(winId, special, dont_show);
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1421 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1422
220 8dfdc6f1778e [/trunk] Changeset 232 by mikael mikael parents: 197 diff changeset	1423 // The message must be displayed -> update top pointer
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1424 if (win_entry->bd->cleared)
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1425 win_entry->bd->top = g_list_last(win_entry->bd->hbuf);
220 8dfdc6f1778e [/trunk] Changeset 232 by mikael mikael parents: 197 diff changeset	1426
1142 0e27177882c7 Small fix for the max_history_blocks option Mikael Berthe <mikael@lilotux.net> parents: 1141 diff changeset	1427 // Make sure we do not free the buffer while it's locked or when
0e27177882c7 Small fix for the max_history_blocks option Mikael Berthe <mikael@lilotux.net> parents: 1141 diff changeset	1428 // top is set.
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1429 if (win_entry->bd->lock \|\| win_entry->bd->top)
1142 0e27177882c7 Small fix for the max_history_blocks option Mikael Berthe <mikael@lilotux.net> parents: 1141 diff changeset	1430 num_history_blocks = 0U;
0e27177882c7 Small fix for the max_history_blocks option Mikael Berthe <mikael@lilotux.net> parents: 1141 diff changeset	1431 else
0e27177882c7 Small fix for the max_history_blocks option Mikael Berthe <mikael@lilotux.net> parents: 1141 diff changeset	1432 num_history_blocks = get_max_history_blocks();
0e27177882c7 Small fix for the max_history_blocks option Mikael Berthe <mikael@lilotux.net> parents: 1141 diff changeset	1433
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 771 diff changeset	1434 text_locale = from_utf8(text);
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	1435 // Convert the nick alone and compute its length
1296 7a0eaa53bd53 Further nick colors fixes Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1295 diff changeset	1436 if (mucnicklen) {
7a0eaa53bd53 Further nick colors fixes Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1295 diff changeset	1437 nicktmp = g_strndup(text, mucnicklen);
7a0eaa53bd53 Further nick colors fixes Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1295 diff changeset	1438 nicklocaltmp = from_utf8(nicktmp);
1918 0fa6df17bc5c Fix potential issue pointed out by franky's clang report Mikael Berthe <mikael@lilotux.net> parents: 1915 diff changeset	1439 if (nicklocaltmp)
0fa6df17bc5c Fix potential issue pointed out by franky's clang report Mikael Berthe <mikael@lilotux.net> parents: 1915 diff changeset	1440 mucnicklen = strlen(nicklocaltmp);
1296 7a0eaa53bd53 Further nick colors fixes Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1295 diff changeset	1441 g_free(nicklocaltmp);
7a0eaa53bd53 Further nick colors fixes Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1295 diff changeset	1442 g_free(nicktmp);
7a0eaa53bd53 Further nick colors fixes Michal 'vorner' Vaner <vorner@ucw.cz> parents: 1295 diff changeset	1443 }
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1444 hbuf_add_line(&win_entry->bd->hbuf, text_locale, timestamp, prefix_flags,
1487 f61ed2466f7c Minor style upgrade Mikael Berthe <mikael@lilotux.net> parents: 1486 diff changeset	1445 maxX - Roster_Width - scr_getprefixwidth(), num_history_blocks,
1602 f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	1446 mucnicklen, xep184);
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 771 diff changeset	1447 g_free(text_locale);
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1448
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1449 if (win_entry->bd->cleared) {
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1450 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1451 if (g_list_next(win_entry->bd->top))
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1452 win_entry->bd->top = g_list_next(win_entry->bd->top);
220 8dfdc6f1778e [/trunk] Changeset 232 by mikael mikael parents: 197 diff changeset	1453 }
8dfdc6f1778e [/trunk] Changeset 232 by mikael mikael parents: 197 diff changeset	1454
8dfdc6f1778e [/trunk] Changeset 232 by mikael mikael parents: 197 diff changeset	1455 // Make sure the last line appears in the window; update top if necessary
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1456 if (!win_entry->bd->lock && win_entry->bd->top) {
220 8dfdc6f1778e [/trunk] Changeset 232 by mikael mikael parents: 197 diff changeset	1457 int dist;
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1458 GList *first = g_list_first(win_entry->bd->hbuf);
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1459 dist = g_list_position(first, g_list_last(win_entry->bd->hbuf)) -
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1460 g_list_position(first, win_entry->bd->top);
220 8dfdc6f1778e [/trunk] Changeset 232 by mikael mikael parents: 197 diff changeset	1461 if (dist >= CHAT_WIN_HEIGHT)
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1462 win_entry->bd->top = NULL;
108 7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	1463 }
7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	1464
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1465 if (!dont_show) {
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1466 if (win_entry->bd->lock)
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	1467 setmsgflg = TRUE;
1955 fad27c72a229 Don't update readmark when buffer scroll_lock is set Mikael Berthe <mikael@lilotux.net> parents: 1954 diff changeset	1468 else
1961 39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	1469 // If this is an outgoing message, remove the readmark
1955 fad27c72a229 Don't update readmark when buffer scroll_lock is set Mikael Berthe <mikael@lilotux.net> parents: 1954 diff changeset	1470 if (!special && (prefix_flags & (HBB_PREFIX_OUT\|HBB_PREFIX_HLIGHT_OUT)))
fad27c72a229 Don't update readmark when buffer scroll_lock is set Mikael Berthe <mikael@lilotux.net> parents: 1954 diff changeset	1471 hbuf_set_readmark(win_entry->bd->hbuf, FALSE);
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1472 // Show and refresh the window
b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1473 top_panel(win_entry->panel);
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1474 scr_update_window(win_entry);
142 bb6fe91589b9 [/trunk] Changeset 154 by mikael mikael parents: 140 diff changeset	1475 top_panel(inputPanel);
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1476 update_panels();
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	1477 } else if (!(prefix_flags & HBB_PREFIX_NOFLAG)) {
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	1478 setmsgflg = TRUE;
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	1479 }
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	1480 if (setmsgflg && !special) {
889 ae93e69aaaaf Fix up pending message flag for the status special buffer Mikael Berthe <mikael@lilotux.net> parents: 888 diff changeset	1481 if (special && !winId)
ae93e69aaaaf Fix up pending message flag for the status special buffer Mikael Berthe <mikael@lilotux.net> parents: 888 diff changeset	1482 winId = SPECIAL_BUFFER_STATUS_ID;
ae93e69aaaaf Fix up pending message flag for the status special buffer Mikael Berthe <mikael@lilotux.net> parents: 888 diff changeset	1483 roster_msg_setflag(winId, special, TRUE);
30 4ea2df449381 [/trunk] Changeset 46 by mikael mikael parents: 29 diff changeset	1484 update_roster = TRUE;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1485 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1486 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1487
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1488 // scr_update_main_status(forceupdate)
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1489 // Redraw the main (bottom) status line.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1490 // You can set forceupdate to FALSE in order to optimize screen refresh
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1491 // if you call top_panel()/update_panels() later.
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1492 void scr_update_main_status(int forceupdate)
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1493 {
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	1494 char *sm = from_utf8(xmpp_getstatusmsg());
1514 939e2957f8a8 Add option "info" (suggested by lego) franky@diable parents: 1513 diff changeset	1495 const char *info = settings_opt_get("info");
1977 1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1496 guint prio = 0;
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1497 gpointer unread_ptr;
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1498 char unreadchar;
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1499
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1500 unread_ptr = unread_msg(NULL);
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1501 if (unread_ptr) {
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1502 prio = buddy_getuiprio(unread_ptr);
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1503 // If there's an unerad buffer but no priority set, let's consider the
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1504 // priority is 1.
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1505 if (!prio && buddy_getflags(unread_ptr) & ROSTER_FLAG_MSG)
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1506 prio = 1;
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1507 }
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1508
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1509 // Status bar unread message flag
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1510 if (prio >= ROSTER_UI_PRIO_MUC_HL_MESSAGE)
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1511 unreadchar = '!';
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1512 else if (prio > 0)
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1513 unreadchar = '#';
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1514 else
1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1515 unreadchar = ' ';
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1516
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1517 werase(mainstatusWnd);
1515 9013d23f0a86 Forgot those poor non-utf8 locale-souls franky@diable parents: 1514 diff changeset	1518 if (info) {
1519 ac5a2c262098 Cosmetics Mikael Berthe <mikael@lilotux.net> parents: 1518 diff changeset	1519 char *info_locale = from_utf8(info);
1977 1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1520 mvwprintw(mainstatusWnd, 0, 0, "%c[%c] %s %s", unreadchar,
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	1521 imstatus2char[xmpp_getstatus()],
1519 ac5a2c262098 Cosmetics Mikael Berthe <mikael@lilotux.net> parents: 1518 diff changeset	1522 info_locale, (sm ? sm : ""));
ac5a2c262098 Cosmetics Mikael Berthe <mikael@lilotux.net> parents: 1518 diff changeset	1523 g_free(info_locale);
1515 9013d23f0a86 Forgot those poor non-utf8 locale-souls franky@diable parents: 1514 diff changeset	1524 } else
1977 1d8f9135e000 Use smarter message flag in the main status line Mikael Berthe <mikael@lilotux.net> parents: 1974 diff changeset	1525 mvwprintw(mainstatusWnd, 0, 0, "%c[%c] %s", unreadchar,
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	1526 imstatus2char[xmpp_getstatus()], (sm ? sm : ""));
724 264375fe7159 Fix a roster refresh issue Mikael Berthe <mikael@lilotux.net> parents: 723 diff changeset	1527 if (forceupdate) {
264375fe7159 Fix a roster refresh issue Mikael Berthe <mikael@lilotux.net> parents: 723 diff changeset	1528 top_panel(inputPanel);
264375fe7159 Fix a roster refresh issue Mikael Berthe <mikael@lilotux.net> parents: 723 diff changeset	1529 update_panels();
264375fe7159 Fix a roster refresh issue Mikael Berthe <mikael@lilotux.net> parents: 723 diff changeset	1530 }
773 e25b8a348ebd Screen updating functions use UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	1531 g_free(sm);
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1532 }
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1533
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1534 // scr_draw_main_window()
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1535 // Set fullinit to TRUE to also create panels. Set it to FALSE for a resize.
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1536 //
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1537 // I think it could be improved a _lot_ but I'm really not an ncurses
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1538 // expert... :-\ Mikael.
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1539 //
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1540 void scr_draw_main_window(unsigned int fullinit)
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1541 {
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	1542 int requested_size;
961 95659cf9ea1a Display mcabber version in the status window Mikael Berthe <mikael@lilotux.net> parents: 952 diff changeset	1543 gchar ver, message;
972 11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1544 int chat_y_pos, chatstatus_y_pos, log_y_pos;
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1545 int roster_x_pos, chat_x_pos;
518 9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1546
9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1547 Log_Win_Height = DEFAULT_LOG_WIN_HEIGHT;
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	1548 requested_size = settings_opt_get_int("log_win_height");
6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	1549 if (requested_size > 0) {
6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	1550 if (maxY > requested_size + 3)
6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	1551 Log_Win_Height = requested_size + 2;
518 9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1552 else
9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1553 Log_Win_Height = ((maxY > 5) ? (maxY - 2) : 3);
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	1554 } else if (requested_size < 0) {
518 9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1555 Log_Win_Height = 3;
9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1556 }
9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1557
9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1558 if (maxY < Log_Win_Height+2) {
9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1559 if (maxY < 5) {
9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1560 Log_Win_Height = 3;
9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1561 maxY = Log_Win_Height+2;
9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1562 } else {
9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1563 Log_Win_Height = maxY - 2;
9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1564 }
9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1565 }
9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1566
707 b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1567 if (roster_hidden) {
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1568 Roster_Width = 0;
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1569 } else {
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1570 requested_size = settings_opt_get_int("roster_width");
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1571 if (requested_size > 1)
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1572 Roster_Width = requested_size;
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1573 else if (requested_size == 1)
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1574 Roster_Width = 2;
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1575 else
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1576 Roster_Width = DEFAULT_ROSTER_WIDTH;
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1577 }
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	1578
972 11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1579 log_win_on_top = (settings_opt_get_int("log_win_on_top") == 1);
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1580 roster_win_on_right = (settings_opt_get_int("roster_win_on_right") == 1);
972 11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1581
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1582 if (log_win_on_top) {
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1583 chat_y_pos = Log_Win_Height-1;
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1584 log_y_pos = 0;
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1585 chatstatus_y_pos = Log_Win_Height-2;
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1586 } else {
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1587 chat_y_pos = 0;
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1588 log_y_pos = CHAT_WIN_HEIGHT+1;
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1589 chatstatus_y_pos = CHAT_WIN_HEIGHT;
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1590 }
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1591
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1592 if (roster_win_on_right) {
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1593 roster_x_pos = maxX - Roster_Width;
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1594 chat_x_pos = 0;
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1595 } else {
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1596 roster_x_pos = 0;
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1597 chat_x_pos = Roster_Width;
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1598 }
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1599
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1600 if (fullinit) {
1078 7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1601 if (!winbufhash)
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1602 winbufhash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1603 /* Create windows */
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1604 rosterWnd = newwin(CHAT_WIN_HEIGHT, Roster_Width, chat_y_pos, roster_x_pos);
972 11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1605 chatWnd = newwin(CHAT_WIN_HEIGHT, maxX - Roster_Width, chat_y_pos,
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1606 chat_x_pos);
1133 9dd28a56128f Do not create one panel per contact Mikael Berthe <mikael@lilotux.net> parents: 1131 diff changeset	1607 activechatWnd = newwin(CHAT_WIN_HEIGHT, maxX - Roster_Width, chat_y_pos,
9dd28a56128f Do not create one panel per contact Mikael Berthe <mikael@lilotux.net> parents: 1131 diff changeset	1608 chat_x_pos);
972 11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1609 logWnd = newwin(Log_Win_Height-2, maxX, log_y_pos, 0);
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1610 chatstatusWnd = newwin(1, maxX, chatstatus_y_pos, 0);
711 75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	1611 mainstatusWnd = newwin(1, maxX, maxY-2, 0);
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1612 inputWnd = newwin(1, maxX, maxY-1, 0);
358 6e4e667c5571 Fix a segfault when starting mcabber in a really small terminal Mikael Berthe <mikael@lilotux.net> parents: 339 diff changeset	1613 if (!rosterWnd \|\| !chatWnd \|\| !logWnd \|\| !inputWnd) {
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1614 scr_terminate_curses();
358 6e4e667c5571 Fix a segfault when starting mcabber in a really small terminal Mikael Berthe <mikael@lilotux.net> parents: 339 diff changeset	1615 fprintf(stderr, "Cannot create windows!\n");
6e4e667c5571 Fix a segfault when starting mcabber in a really small terminal Mikael Berthe <mikael@lilotux.net> parents: 339 diff changeset	1616 exit(EXIT_FAILURE);
6e4e667c5571 Fix a segfault when starting mcabber in a really small terminal Mikael Berthe <mikael@lilotux.net> parents: 339 diff changeset	1617 }
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1618 wbkgd(rosterWnd, get_color(COLOR_GENERAL));
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1619 wbkgd(chatWnd, get_color(COLOR_GENERAL));
1133 9dd28a56128f Do not create one panel per contact Mikael Berthe <mikael@lilotux.net> parents: 1131 diff changeset	1620 wbkgd(activechatWnd, get_color(COLOR_GENERAL));
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1621 wbkgd(logWnd, get_color(COLOR_GENERAL));
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1622 wbkgd(chatstatusWnd, get_color(COLOR_STATUS));
0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1623 wbkgd(mainstatusWnd, get_color(COLOR_STATUS));
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1624 } else {
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	1625 /* Resize/move windows */
6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	1626 wresize(rosterWnd, CHAT_WIN_HEIGHT, Roster_Width);
6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	1627 wresize(chatWnd, CHAT_WIN_HEIGHT, maxX - Roster_Width);
711 75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	1628 wresize(logWnd, Log_Win_Height-2, maxX);
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1629
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1630 mvwin(chatWnd, chat_y_pos, chat_x_pos);
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1631 mvwin(rosterWnd, chat_y_pos, roster_x_pos);
972 11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1632 mvwin(logWnd, log_y_pos, 0);
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1633
711 75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	1634 // Resize & move chat status window
75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	1635 wresize(chatstatusWnd, 1, maxX);
972 11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1636 mvwin(chatstatusWnd, chatstatus_y_pos, 0);
711 75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	1637 // Resize & move main status window
75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	1638 wresize(mainstatusWnd, 1, maxX);
75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	1639 mvwin(mainstatusWnd, maxY-2, 0);
75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	1640 // Resize & move input line window
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1641 wresize(inputWnd, 1, maxX);
409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1642 mvwin(inputWnd, maxY-1, 0);
168 6ad156673b19 [/trunk] Changeset 180 by mikael mikael parents: 167 diff changeset	1643
6ad156673b19 [/trunk] Changeset 180 by mikael mikael parents: 167 diff changeset	1644 werase(chatWnd);
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1645 }
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1646
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1647 /* Draw/init windows */
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1648
961 95659cf9ea1a Display mcabber version in the status window Mikael Berthe <mikael@lilotux.net> parents: 952 diff changeset	1649 ver = mcabber_version();
95659cf9ea1a Display mcabber version in the status window Mikael Berthe <mikael@lilotux.net> parents: 952 diff changeset	1650 message = g_strdup_printf("MCabber version %s.\n", ver);
95659cf9ea1a Display mcabber version in the status window Mikael Berthe <mikael@lilotux.net> parents: 952 diff changeset	1651 mvwprintw(chatWnd, 0, 0, message);
1455 bec235cd28a8 Misc. documentation updates Mikael Berthe <mikael@lilotux.net> parents: 1454 diff changeset	1652 mvwprintw(chatWnd, 1, 0, "http://mcabber.com/");
961 95659cf9ea1a Display mcabber version in the status window Mikael Berthe <mikael@lilotux.net> parents: 952 diff changeset	1653 g_free(ver);
95659cf9ea1a Display mcabber version in the status window Mikael Berthe <mikael@lilotux.net> parents: 952 diff changeset	1654 g_free(message);
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1655
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1656 // Auto-scrolling in log window
74 b392112ab995 [/trunk] Changeset 88 by mikael mikael parents: 65 diff changeset	1657 scrollok(logWnd, TRUE);
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1658
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1659
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1660 if (fullinit) {
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1661 // Enable keypad (+ special keys)
409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1662 keypad(inputWnd, TRUE);
1457 3a537b4d7f8d Fix UTF-8 on MirBSD (Thorsten Glaser) Mikael Berthe <mikael@lilotux.net> parents: 1455 diff changeset	1663 #ifdef __MirBSD__
3a537b4d7f8d Fix UTF-8 on MirBSD (Thorsten Glaser) Mikael Berthe <mikael@lilotux.net> parents: 1455 diff changeset	1664 wtimeout(inputWnd, 50 /* ms */);
3a537b4d7f8d Fix UTF-8 on MirBSD (Thorsten Glaser) Mikael Berthe <mikael@lilotux.net> parents: 1455 diff changeset	1665 #else
382 4c6e8392e465 Use nodelay() instead of halfdelay() Mikael Berthe <mikael@lilotux.net> parents: 374 diff changeset	1666 nodelay(inputWnd, TRUE);
1457 3a537b4d7f8d Fix UTF-8 on MirBSD (Thorsten Glaser) Mikael Berthe <mikael@lilotux.net> parents: 1455 diff changeset	1667 #endif
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1668
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1669 // Create panels
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1670 rosterPanel = new_panel(rosterWnd);
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1671 chatPanel = new_panel(chatWnd);
1133 9dd28a56128f Do not create one panel per contact Mikael Berthe <mikael@lilotux.net> parents: 1131 diff changeset	1672 activechatPanel = new_panel(activechatWnd);
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1673 logPanel = new_panel(logWnd);
711 75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	1674 chatstatusPanel = new_panel(chatstatusWnd);
75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	1675 mainstatusPanel = new_panel(mainstatusWnd);
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1676 inputPanel = new_panel(inputWnd);
232 9a6ba4b38e63 [/trunk] Changeset 245 by mikael mikael parents: 220 diff changeset	1677
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1678 // Build the buddylist at least once, to make sure the special buffer
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1679 // is added
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1680 buddylist_build();
1093 6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change Mikael Berthe <mikael@lilotux.net> parents: 1089 diff changeset	1681
6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change Mikael Berthe <mikael@lilotux.net> parents: 1089 diff changeset	1682 // Init prev_chatwidth; this variable will be used to prevent us
6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change Mikael Berthe <mikael@lilotux.net> parents: 1089 diff changeset	1683 // from rewrapping buffers when the width doesn't change.
1487 f61ed2466f7c Minor style upgrade Mikael Berthe <mikael@lilotux.net> parents: 1486 diff changeset	1684 prev_chatwidth = maxX - Roster_Width - scr_getprefixwidth();
851 da03534e46c7 Add startup log messages to the status buffer Mikael Berthe <mikael@lilotux.net> parents: 850 diff changeset	1685 // Wrap existing status buffer lines
1093 6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change Mikael Berthe <mikael@lilotux.net> parents: 1089 diff changeset	1686 hbuf_rebuild(&statushbuf, prev_chatwidth);
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1687
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	1688 #ifndef UNICODE
232 9a6ba4b38e63 [/trunk] Changeset 245 by mikael mikael parents: 220 diff changeset	1689 if (utf8_mode)
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	1690 scr_LogPrint(LPRINT_NORMAL,
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	1691 "WARNING: Compiled without full UTF-8 support!");
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	1692 #endif
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1693 } else {
409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1694 // Update panels
409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1695 replace_panel(rosterPanel, rosterWnd);
409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1696 replace_panel(chatPanel, chatWnd);
409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1697 replace_panel(logPanel, logWnd);
711 75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	1698 replace_panel(chatstatusPanel, chatstatusWnd);
75dde88f1884 Introduce status lines Mikael Berthe <mikael@lilotux.net> parents: 709 diff changeset	1699 replace_panel(mainstatusPanel, mainstatusWnd);
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1700 replace_panel(inputPanel, inputWnd);
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1701 }
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1702
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1703 // We'll need to redraw the roster
149 9f74832eb4f8 [/trunk] Changeset 161 by mikael mikael parents: 148 diff changeset	1704 update_roster = TRUE;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1705 return;
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1706 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1707
1078 7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1708 static void resize_win_buffer(gpointer key, gpointer value, gpointer data)
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1709 {
1078 7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1710 winbuf *wbp = value;
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1711 struct dimensions *dim = data;
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1712 int chat_x_pos, chat_y_pos;
1093 6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change Mikael Berthe <mikael@lilotux.net> parents: 1089 diff changeset	1713 int new_chatwidth;
972 11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1714
1078 7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1715 if (!(wbp && wbp->win))
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1716 return;
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1717
972 11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1718 if (log_win_on_top)
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1719 chat_y_pos = Log_Win_Height-1;
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1720 else
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1721 chat_y_pos = 0;
11b632d824f6 Add option 'log_win_on_top' Mikael Berthe <mikael@lilotux.net> parents: 967 diff changeset	1722
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1723 if (roster_win_on_right)
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1724 chat_x_pos = 0;
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1725 else
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1726 chat_x_pos = Roster_Width;
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1727
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1728 // Resize/move buddy window
1078 7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1729 wresize(wbp->win, dim->l, dim->c);
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1730 mvwin(wbp->win, chat_y_pos, chat_x_pos);
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1731 werase(wbp->win);
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1732 // If a panel exists, replace the old window with the new
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1733 if (wbp->panel)
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1734 replace_panel(wbp->panel, wbp->win);
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1735 // Redo line wrapping
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1736 wbp->bd->top = hbuf_previous_persistent(wbp->bd->top);
1093 6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change Mikael Berthe <mikael@lilotux.net> parents: 1089 diff changeset	1737
1487 f61ed2466f7c Minor style upgrade Mikael Berthe <mikael@lilotux.net> parents: 1486 diff changeset	1738 new_chatwidth = maxX - Roster_Width - scr_getprefixwidth();
1093 6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change Mikael Berthe <mikael@lilotux.net> parents: 1089 diff changeset	1739 if (new_chatwidth != prev_chatwidth)
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1740 hbuf_rebuild(&wbp->bd->hbuf, new_chatwidth);
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1741 }
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1742
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1743 // scr_Resize()
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1744 // Function called when the window is resized.
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1745 // - Resize windows
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1746 // - Rewrap lines in each buddy buffer
1059 875d2c9d399c Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	1747 void scr_Resize(void)
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1748 {
1078 7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1749 struct dimensions dim;
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1750
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1751 // First, update the global variables
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1752 getmaxyx(stdscr, maxY, maxX);
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1753 // scr_draw_main_window() will take care of maxY and Log_Win_Height
518 9480a76471b6 Update Log_Win_Height when refreshing the screen Mikael Berthe <mikael@lilotux.net> parents: 515 diff changeset	1754
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1755 // Make sure the cursor stays inside the window
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1756 check_offset(0);
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1757
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1758 // Resize windows and update panels
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1759 scr_draw_main_window(FALSE);
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1760
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1761 // Resize all buddy windows
1078 7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1762 dim.l = CHAT_WIN_HEIGHT;
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1763 dim.c = maxX - Roster_Width;
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1764 if (dim.c < 1)
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1765 dim.c = 1;
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1766
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1767 // Resize all buffers
7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1768 g_hash_table_foreach(winbufhash, resize_win_buffer, &dim);
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1769
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1770 // Resize/move special status buffer
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1771 if (statusWindow)
1078 7866dbaf67a6 Use a hash for the list of win buffers Mikael Berthe <mikael@lilotux.net> parents: 1077 diff changeset	1772 resize_win_buffer(NULL, statusWindow, &dim);
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	1773
1093 6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change Mikael Berthe <mikael@lilotux.net> parents: 1089 diff changeset	1774 // Update prev_chatwidth, now that all buffers have been resized
1487 f61ed2466f7c Minor style upgrade Mikael Berthe <mikael@lilotux.net> parents: 1486 diff changeset	1775 prev_chatwidth = maxX - Roster_Width - scr_getprefixwidth();
1093 6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change Mikael Berthe <mikael@lilotux.net> parents: 1089 diff changeset	1776
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1777 // Refresh current buddy window
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	1778 if (chatmode)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1779 scr_show_buddy_window();
151 b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1780 }
b69c0b7a23e3 [/trunk] Changeset 163 by mikael mikael parents: 149 diff changeset	1781
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1782 // scr_update_chat_status(forceupdate)
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1783 // Redraw the buddy status bar.
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 936 diff changeset	1784 // Set forceupdate to TRUE if update_panels() must be called.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1785 void scr_update_chat_status(int forceupdate)
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1786 {
848 a9161d2dc414 Introduce special buffer stuff Mikael Berthe <mikael@lilotux.net> parents: 843 diff changeset	1787 unsigned short btype, isgrp, ismuc, isspe;
1502 50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1788 const char *btypetext = "Unknown";
717 8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1789 const char *fullname;
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1790 const char *msg = NULL;
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1791 char status;
773 e25b8a348ebd Screen updating functions use UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	1792 char buf, buf_locale;
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1793
718 b41799901abd Add a new_message flag (#) in the main status line Mikael Berthe <mikael@lilotux.net> parents: 717 diff changeset	1794 // Usually we need to update the bottom status line too,
b41799901abd Add a new_message flag (#) in the main status line Mikael Berthe <mikael@lilotux.net> parents: 717 diff changeset	1795 // at least to refresh the pending message flag.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1796 scr_update_main_status(FALSE);
718 b41799901abd Add a new_message flag (#) in the main status line Mikael Berthe <mikael@lilotux.net> parents: 717 diff changeset	1797
806 3521e34f722a Fix a segfault when not connected to a server Mikael Berthe <mikael@lilotux.net> parents: 797 diff changeset	1798 // Clear the line
3521e34f722a Fix a segfault when not connected to a server Mikael Berthe <mikael@lilotux.net> parents: 797 diff changeset	1799 werase(chatstatusWnd);
3521e34f722a Fix a segfault when not connected to a server Mikael Berthe <mikael@lilotux.net> parents: 797 diff changeset	1800
3521e34f722a Fix a segfault when not connected to a server Mikael Berthe <mikael@lilotux.net> parents: 797 diff changeset	1801 if (!current_buddy) {
3521e34f722a Fix a segfault when not connected to a server Mikael Berthe <mikael@lilotux.net> parents: 797 diff changeset	1802 if (forceupdate) {
3521e34f722a Fix a segfault when not connected to a server Mikael Berthe <mikael@lilotux.net> parents: 797 diff changeset	1803 update_panels();
3521e34f722a Fix a segfault when not connected to a server Mikael Berthe <mikael@lilotux.net> parents: 797 diff changeset	1804 }
3521e34f722a Fix a segfault when not connected to a server Mikael Berthe <mikael@lilotux.net> parents: 797 diff changeset	1805 return;
3521e34f722a Fix a segfault when not connected to a server Mikael Berthe <mikael@lilotux.net> parents: 797 diff changeset	1806 }
3521e34f722a Fix a segfault when not connected to a server Mikael Berthe <mikael@lilotux.net> parents: 797 diff changeset	1807
717 8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1808 fullname = buddy_getname(BUDDATA(current_buddy));
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1809 btype = buddy_gettype(BUDDATA(current_buddy));
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1810
1502 50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1811 isgrp = ismuc = isspe = 0;
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1812 if (btype & ROSTER_TYPE_USER) {
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1813 btypetext = "Buddy";
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1814 } else if (btype & ROSTER_TYPE_GROUP) {
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1815 btypetext = "Group";
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1816 isgrp = 1;
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1817 } else if (btype & ROSTER_TYPE_AGENT) {
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1818 btypetext = "Agent";
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1819 } else if (btype & ROSTER_TYPE_ROOM) {
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1820 btypetext = "Room";
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1821 ismuc = 1;
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1822 } else if (btype & ROSTER_TYPE_SPECIAL) {
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1823 btypetext = "Special buffer";
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1824 isspe = 1;
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1825 }
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1826
1513 9d78b571e693 Show '#' for unread message per buddy on the buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1511 diff changeset	1827 if (chatmode) {
9d78b571e693 Show '#' for unread message per buddy on the buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1511 diff changeset	1828 wprintw(chatstatusWnd, "~");
9d78b571e693 Show '#' for unread message per buddy on the buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1511 diff changeset	1829 } else {
9d78b571e693 Show '#' for unread message per buddy on the buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1511 diff changeset	1830 unsigned short bflags = buddy_getflags(BUDDATA(current_buddy));
9d78b571e693 Show '#' for unread message per buddy on the buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1511 diff changeset	1831 if (bflags & ROSTER_FLAG_MSG) {
9d78b571e693 Show '#' for unread message per buddy on the buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1511 diff changeset	1832 // There is an unread message from the current buddy
9d78b571e693 Show '#' for unread message per buddy on the buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1511 diff changeset	1833 wprintw(chatstatusWnd, "#");
9d78b571e693 Show '#' for unread message per buddy on the buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1511 diff changeset	1834 }
9d78b571e693 Show '#' for unread message per buddy on the buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1511 diff changeset	1835 }
9d78b571e693 Show '#' for unread message per buddy on the buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1511 diff changeset	1836
874 293e8955075c Display a flag in the chat status line when the buffer is locked Mikael Berthe <mikael@lilotux.net> parents: 873 diff changeset	1837 if (chatmode && !isgrp) {
293e8955075c Display a flag in the chat status line when the buffer is locked Mikael Berthe <mikael@lilotux.net> parents: 873 diff changeset	1838 winbuf *win_entry;
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1839 win_entry = scr_search_window(buddy_getjid(BUDDATA(current_buddy)), isspe);
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	1840 if (win_entry && win_entry->bd->lock)
874 293e8955075c Display a flag in the chat status line when the buffer is locked Mikael Berthe <mikael@lilotux.net> parents: 873 diff changeset	1841 mvwprintw(chatstatusWnd, 0, 0, "*");
293e8955075c Display a flag in the chat status line when the buffer is locked Mikael Berthe <mikael@lilotux.net> parents: 873 diff changeset	1842 }
293e8955075c Display a flag in the chat status line when the buffer is locked Mikael Berthe <mikael@lilotux.net> parents: 873 diff changeset	1843
848 a9161d2dc414 Introduce special buffer stuff Mikael Berthe <mikael@lilotux.net> parents: 843 diff changeset	1844 if (isgrp \|\| isspe) {
773 e25b8a348ebd Screen updating functions use UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	1845 buf_locale = from_utf8(fullname);
1502 50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1846 mvwprintw(chatstatusWnd, 0, 5, "%s: %s", btypetext, buf_locale);
773 e25b8a348ebd Screen updating functions use UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	1847 g_free(buf_locale);
716 ba1137a01078 Add a chatmode flag (©) in the chat status line Mikael Berthe <mikael@lilotux.net> parents: 715 diff changeset	1848 if (forceupdate) {
ba1137a01078 Add a chatmode flag (©) in the chat status line Mikael Berthe <mikael@lilotux.net> parents: 715 diff changeset	1849 update_panels();
ba1137a01078 Add a chatmode flag (©) in the chat status line Mikael Berthe <mikael@lilotux.net> parents: 715 diff changeset	1850 }
717 8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1851 return;
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1852 }
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1853
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1854 status = '?';
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1855
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1856 if (ismuc) {
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1857 if (buddy_getinsideroom(BUDDATA(current_buddy)))
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1858 status = 'C';
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1859 else
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1860 status = 'x';
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	1861 } else if (xmpp_getstatus() != offline) {
717 8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1862 enum imstatus budstate;
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1863 budstate = buddy_getstatus(BUDDATA(current_buddy), NULL);
790 5d4ad1d77da4 Kill a few gcc4 warnings Mikael Berthe <mikael@lilotux.net> parents: 785 diff changeset	1864 if (budstate < imstatus_size)
717 8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1865 status = imstatus2char[budstate];
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1866 }
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1867
1502 50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1868 // No status message for MUC rooms
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1869 if (!ismuc) {
1522 5ef122b2bb75 Use the status string of the most likely resource in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 1521 diff changeset	1870 GSList resources, p_res, *p_next_res;
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1059 diff changeset	1871 resources = buddy_getresources(BUDDATA(current_buddy));
1522 5ef122b2bb75 Use the status string of the most likely resource in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 1521 diff changeset	1872
5ef122b2bb75 Use the status string of the most likely resource in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 1521 diff changeset	1873 for (p_res = resources ; p_res ; p_res = p_next_res) {
5ef122b2bb75 Use the status string of the most likely resource in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 1521 diff changeset	1874 p_next_res = g_slist_next(p_res);
5ef122b2bb75 Use the status string of the most likely resource in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 1521 diff changeset	1875 // Store the status message of the latest resource (highest priority)
5ef122b2bb75 Use the status string of the most likely resource in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 1521 diff changeset	1876 if (!p_next_res)
5ef122b2bb75 Use the status string of the most likely resource in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 1521 diff changeset	1877 msg = buddy_getstatusmsg(BUDDATA(current_buddy), p_res->data);
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1059 diff changeset	1878 g_free(p_res->data);
1522 5ef122b2bb75 Use the status string of the most likely resource in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 1521 diff changeset	1879 }
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1059 diff changeset	1880 g_slist_free(resources);
1502 50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1881 } else {
721 9cf31c9b1dc4 Use room topic as a description in the chat status line Mikael Berthe <mikael@lilotux.net> parents: 720 diff changeset	1882 msg = buddy_gettopic(BUDDATA(current_buddy));
717 8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1883 }
1502 50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1884
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1885 if (msg)
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1886 buf = g_strdup_printf("[%c] %s: %s -- %s", status, btypetext, fullname, msg);
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1887 else
50dbbca69b55 Small style improvement of buddy status line Maxim Vuets <maxim.vuets@gmail.com> parents: 1489 diff changeset	1888 buf = g_strdup_printf("[%c] %s: %s", status, btypetext, fullname);
717 8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1889 replace_nl_with_dots(buf);
773 e25b8a348ebd Screen updating functions use UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	1890 buf_locale = from_utf8(buf);
e25b8a348ebd Screen updating functions use UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	1891 mvwprintw(chatstatusWnd, 0, 1, "%s", buf_locale);
e25b8a348ebd Screen updating functions use UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	1892 g_free(buf_locale);
717 8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1893 g_free(buf);
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1894
996 f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1895 // Display chatstates of the contact, if available.
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1896 if (btype & ROSTER_TYPE_USER) {
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1897 char eventchar = 0;
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1898 guint event;
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1899
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1900 // We do not specify the resource here, so one of the resources with the
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1901 // highest priority will be used.
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1902 event = buddy_resource_getevents(BUDDATA(current_buddy), NULL);
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1903
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1904 if (event == ROSTER_EVENT_ACTIVE)
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1905 eventchar = 'A';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1906 else if (event == ROSTER_EVENT_COMPOSING)
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1907 eventchar = 'C';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1908 else if (event == ROSTER_EVENT_PAUSED)
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1909 eventchar = 'P';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1910 else if (event == ROSTER_EVENT_INACTIVE)
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1911 eventchar = 'I';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1912 else if (event == ROSTER_EVENT_GONE)
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1913 eventchar = 'G';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1914
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1915 if (eventchar)
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1916 mvwprintw(chatstatusWnd, 0, maxX-3, "[%c]", eventchar);
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1917 }
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1918
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar Mikael Berthe <mikael@lilotux.net> parents: 993 diff changeset	1919
717 8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1920 if (forceupdate) {
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1921 update_panels();
8ce2bfdc4143 Reindent update_chat_status_window() Mikael Berthe <mikael@lilotux.net> parents: 716 diff changeset	1922 }
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1923 }
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1924
1504 9fafea381eb8 Show the number of unfiltered contacts in folded groups franky parents: 1503 diff changeset	1925 void increment_if_buddy_not_filtered(gpointer rosterdata, void *param)
9fafea381eb8 Show the number of unfiltered contacts in folded groups franky parents: 1503 diff changeset	1926 {
9fafea381eb8 Show the number of unfiltered contacts in folded groups franky parents: 1503 diff changeset	1927 int *p = param;
9fafea381eb8 Show the number of unfiltered contacts in folded groups franky parents: 1503 diff changeset	1928 if (buddylist_is_status_filtered(buddy_getstatus(rosterdata, NULL)))
9fafea381eb8 Show the number of unfiltered contacts in folded groups franky parents: 1503 diff changeset	1929 p=p+1;
9fafea381eb8 Show the number of unfiltered contacts in folded groups franky parents: 1503 diff changeset	1930 }
9fafea381eb8 Show the number of unfiltered contacts in folded groups franky parents: 1503 diff changeset	1931
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1932 // scr_draw_roster()
328 83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	1933 // Display the buddylist (not really the roster) on the screen
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1934 void scr_draw_roster(void)
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	1935 {
735 2f027806cd48 Some code cleanup Mikael Berthe <mikael@lilotux.net> parents: 731 diff changeset	1936 static int offset = 0;
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	1937 char name, rline;
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	1938 int maxx, maxy;
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	1939 GList *buddy;
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	1940 int i, n;
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	1941 int rOffset;
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1942 int cursor_backup;
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1943 char status, pending;
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	1944 enum imstatus currentstatus = xmpp_getstatus();
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1945 int x_pos;
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	1946
123 1bdf882bed98 [/trunk] Changeset 136 by mikael mikael parents: 121 diff changeset	1947 // We can reset update_roster
1bdf882bed98 [/trunk] Changeset 136 by mikael mikael parents: 121 diff changeset	1948 update_roster = FALSE;
1bdf882bed98 [/trunk] Changeset 136 by mikael mikael parents: 121 diff changeset	1949
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	1950 getmaxyx(rosterWnd, maxy, maxx);
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	1951 maxx--; // Last char is for vertical border
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	1952
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1953 cursor_backup = curs_set(0);
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1954
724 264375fe7159 Fix a roster refresh issue Mikael Berthe <mikael@lilotux.net> parents: 723 diff changeset	1955 if (!buddylist)
264375fe7159 Fix a roster refresh issue Mikael Berthe <mikael@lilotux.net> parents: 723 diff changeset	1956 offset = 0;
264375fe7159 Fix a roster refresh issue Mikael Berthe <mikael@lilotux.net> parents: 723 diff changeset	1957 else
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	1958 scr_update_chat_status(FALSE);
724 264375fe7159 Fix a roster refresh issue Mikael Berthe <mikael@lilotux.net> parents: 723 diff changeset	1959
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	1960 // Cleanup of roster window
168 6ad156673b19 [/trunk] Changeset 180 by mikael mikael parents: 167 diff changeset	1961 werase(rosterWnd);
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	1962
707 b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1963 if (Roster_Width) {
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1964 int line_x_pos = roster_win_on_right ? 0 : Roster_Width-1;
707 b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1965 // Redraw the vertical line (not very good...)
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	1966 wattrset(rosterWnd, get_color(COLOR_GENERAL));
707 b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1967 for (i=0 ; i < CHAT_WIN_HEIGHT ; i++)
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1968 mvwaddch(rosterWnd, i, line_x_pos, ACS_VLINE);
707 b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1969 }
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1970
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1971 // Leave now if buddylist is empty or the roster is hidden
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	1972 if (!buddylist \|\| !Roster_Width) {
123 1bdf882bed98 [/trunk] Changeset 136 by mikael mikael parents: 121 diff changeset	1973 update_panels();
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1974 curs_set(cursor_backup);
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	1975 return;
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	1976 }
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	1977
84 134fe2567f07 [/trunk] Changeset 98 by mikael mikael parents: 81 diff changeset	1978 // Update offset if necessary
680 1f8987e0e56c Try to display as many buddylist items as possible Mikael Berthe <mikael@lilotux.net> parents: 679 diff changeset	1979 // a) Try to show as many buddylist items as possible
1f8987e0e56c Try to display as many buddylist items as possible Mikael Berthe <mikael@lilotux.net> parents: 679 diff changeset	1980 i = g_list_length(buddylist) - maxy;
682 f3945593432e Small fix in scr_DrawRoster() Mikael Berthe <mikael@lilotux.net> parents: 680 diff changeset	1981 if (i < 0)
f3945593432e Small fix in scr_DrawRoster() Mikael Berthe <mikael@lilotux.net> parents: 680 diff changeset	1982 i = 0;
f3945593432e Small fix in scr_DrawRoster() Mikael Berthe <mikael@lilotux.net> parents: 680 diff changeset	1983 if (i < offset)
680 1f8987e0e56c Try to display as many buddylist items as possible Mikael Berthe <mikael@lilotux.net> parents: 679 diff changeset	1984 offset = i;
1f8987e0e56c Try to display as many buddylist items as possible Mikael Berthe <mikael@lilotux.net> parents: 679 diff changeset	1985 // b) Make sure the current_buddy is visible
84 134fe2567f07 [/trunk] Changeset 98 by mikael mikael parents: 81 diff changeset	1986 i = g_list_position(buddylist, current_buddy);
134fe2567f07 [/trunk] Changeset 98 by mikael mikael parents: 81 diff changeset	1987 if (i == -1) { // This is bad
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	1988 scr_LogPrint(LPRINT_NORMAL, "Doh! Can't find current selected buddy!!");
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	1989 curs_set(cursor_backup);
84 134fe2567f07 [/trunk] Changeset 98 by mikael mikael parents: 81 diff changeset	1990 return;
134fe2567f07 [/trunk] Changeset 98 by mikael mikael parents: 81 diff changeset	1991 } else if (i < offset) {
134fe2567f07 [/trunk] Changeset 98 by mikael mikael parents: 81 diff changeset	1992 offset = i;
134fe2567f07 [/trunk] Changeset 98 by mikael mikael parents: 81 diff changeset	1993 } else if (i+1 > offset + maxy) {
134fe2567f07 [/trunk] Changeset 98 by mikael mikael parents: 81 diff changeset	1994 offset = i + 1 - maxy;
134fe2567f07 [/trunk] Changeset 98 by mikael mikael parents: 81 diff changeset	1995 }
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	1996
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1997 if (roster_win_on_right)
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1998 x_pos = 1; // 1 char offset (vertical line)
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	1999 else
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	2000 x_pos = 0;
e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	2001
1026 fc6060707022 [BP] Fixes truncating utf-8 buddy names (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 966 diff changeset	2002 name = g_new0(char, 4*Roster_Width);
fc6060707022 [BP] Fixes truncating utf-8 buddy names (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 966 diff changeset	2003 rline = g_new0(char, 4*Roster_Width+1);
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	2004
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2005 buddy = buddylist;
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2006 rOffset = offset;
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2007
84 134fe2567f07 [/trunk] Changeset 98 by mikael mikael parents: 81 diff changeset	2008 for (i=0; i<maxy && buddy; buddy = g_list_next(buddy)) {
1804 35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	2009 unsigned short bflags, btype;
35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	2010 unsigned short ismsg, isgrp, ismuc, ishid, isspe;
35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	2011 guint isurg;
773 e25b8a348ebd Screen updating functions use UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	2012 gchar *rline_locale;
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1059 diff changeset	2013 GSList resources, p_res;
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2014
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2015 bflags = buddy_getflags(BUDDATA(buddy));
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2016 btype = buddy_gettype(BUDDATA(buddy));
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2017
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2018 ismsg = bflags & ROSTER_FLAG_MSG;
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2019 ishid = bflags & ROSTER_FLAG_HIDE;
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2020 isgrp = btype & ROSTER_TYPE_GROUP;
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2021 ismuc = btype & ROSTER_TYPE_ROOM;
848 a9161d2dc414 Introduce special buffer stuff Mikael Berthe <mikael@lilotux.net> parents: 843 diff changeset	2022 isspe = btype & ROSTER_TYPE_SPECIAL;
1804 35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	2023 isurg = buddy_getuiprio(BUDDATA(buddy));
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2024
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2025 if (rOffset > 0) {
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2026 rOffset--;
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2027 continue;
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2028 }
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2029
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2030 status = '?';
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2031 pending = ' ';
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2032
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 981 diff changeset	2033 resources = buddy_getresources(BUDDATA(buddy));
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1059 diff changeset	2034 for (p_res = resources ; p_res ; p_res = g_slist_next(p_res)) {
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 981 diff changeset	2035 guint events = buddy_resource_getevents(BUDDATA(buddy),
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1059 diff changeset	2036 p_res ? p_res->data : "");
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1059 diff changeset	2037 if ((events & ROSTER_EVENT_PAUSED) && pending != '+')
992 b37348c2aa79 Chatstates: display "paused" states in the roster Mikael Berthe <mikael@lilotux.net> parents: 991 diff changeset	2038 pending = '.';
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1059 diff changeset	2039 if (events & ROSTER_EVENT_COMPOSING)
987 f47e312560af Improve JEP22 + JEP85 support Mikael Berthe <mikael@lilotux.net> parents: 986 diff changeset	2040 pending = '+';
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1059 diff changeset	2041 g_free(p_res->data);
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 981 diff changeset	2042 }
1072 2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources() Mikael Berthe <mikael@lilotux.net> parents: 1059 diff changeset	2043 g_slist_free(resources);
986 ed697234bd39 Chat states receival (Alexis Hildebrandt) Mikael Berthe <mikael@lilotux.net> parents: 981 diff changeset	2044
149 9f74832eb4f8 [/trunk] Changeset 161 by mikael mikael parents: 148 diff changeset	2045 // Display message notice if there is a message flag, but not
9f74832eb4f8 [/trunk] Changeset 161 by mikael mikael parents: 148 diff changeset	2046 // for unfolded groups.
9f74832eb4f8 [/trunk] Changeset 161 by mikael mikael parents: 148 diff changeset	2047 if (ismsg && (!isgrp \|\| ishid)) {
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2048 pending = '#';
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2049 }
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2050
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2051 if (ismuc) {
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2052 if (buddy_getinsideroom(BUDDATA(buddy)))
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2053 status = 'C';
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2054 else
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2055 status = 'x';
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2056 } else if (currentstatus != offline) {
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2057 enum imstatus budstate;
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2058 budstate = buddy_getstatus(BUDDATA(buddy), NULL);
790 5d4ad1d77da4 Kill a few gcc4 warnings Mikael Berthe <mikael@lilotux.net> parents: 785 diff changeset	2059 if (budstate < imstatus_size)
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2060 status = imstatus2char[budstate];
b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2061 }
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2062 if (buddy == current_buddy) {
723 23068490d063 Add text color when the selected buddy has an unread message Mikael Berthe <mikael@lilotux.net> parents: 721 diff changeset	2063 if (pending == '#')
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	2064 wattrset(rosterWnd, get_color(COLOR_ROSTERSELNMSG));
723 23068490d063 Add text color when the selected buddy has an unread message Mikael Berthe <mikael@lilotux.net> parents: 721 diff changeset	2065 else
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	2066 wattrset(rosterWnd, get_color(COLOR_ROSTERSEL));
723 23068490d063 Add text color when the selected buddy has an unread message Mikael Berthe <mikael@lilotux.net> parents: 721 diff changeset	2067 // The 3 following lines aim at coloring the whole line
973 e693cbe33802 Add option 'roster_win_on_right' Mikael Berthe <mikael@lilotux.net> parents: 972 diff changeset	2068 wmove(rosterWnd, i, x_pos);
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2069 for (n = 0; n < maxx; n++)
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2070 waddch(rosterWnd, ' ');
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2071 } else {
149 9f74832eb4f8 [/trunk] Changeset 161 by mikael mikael parents: 148 diff changeset	2072 if (pending == '#')
739 0d5fb1d9077c Allow "bright" text colors Mikael Berthe <mikael@lilotux.net> parents: 735 diff changeset	2073 wattrset(rosterWnd, get_color(COLOR_ROSTERNMSG));
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	2074 else {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	2075 int color = get_color(COLOR_ROSTER);
1729 e6e89b1d7831 Minor style and header updates Mikael Berthe <mikael@lilotux.net> parents: 1710 diff changeset	2076 if ((!isspe) && (!isgrp)) { // Look for color rules
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	2077 GSList *head;
1804 35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	2078 const char *bjid = buddy_getjid(BUDDATA(buddy));
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	2079 for (head = rostercolrules; head; head = g_slist_next(head)) {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	2080 rostercolor *rc = head->data;
1804 35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	2081 if (g_pattern_match_string(rc->compiled, bjid) &&
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	2082 (!strcmp("*", rc->status) \|\| strchr(rc->status, status))) {
1489 e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster franky@veqlargh.fs parents: 1488 diff changeset	2083 color = compose_color(rc->color);
1272 033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	2084 break;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	2085 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	2086 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	2087 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	2088 wattrset(rosterWnd, color);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner) Mikael Berthe <mikael@lilotux.net> parents: 1268 diff changeset	2089 }
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2090 }
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2091
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	2092 if (Roster_Width > 7)
1026 fc6060707022 [BP] Fixes truncating utf-8 buddy names (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 966 diff changeset	2093 g_utf8_strncpy(name, buddy_getname(BUDDATA(buddy)), Roster_Width-7);
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	2094 else
6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	2095 name[0] = 0;
6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	2096
1804 35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	2097 if (pending == '#') {
35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	2098 // Attention sign?
35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	2099 if ((ismuc && isurg >= ui_attn_sign_prio_level_muc) \|\|
35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	2100 (!ismuc && isurg >= ui_attn_sign_prio_level))
35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	2101 pending = '!';
35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	2102 }
35a1250c111a Display urgent/attention sign in the roster UI Mikael Berthe <mikael@lilotux.net> parents: 1802 diff changeset	2103
149 9f74832eb4f8 [/trunk] Changeset 161 by mikael mikael parents: 148 diff changeset	2104 if (isgrp) {
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2105 if (ishid) {
1504 9fafea381eb8 Show the number of unfiltered contacts in folded groups franky parents: 1503 diff changeset	2106 int group_count = 0;
9fafea381eb8 Show the number of unfiltered contacts in folded groups franky parents: 1503 diff changeset	2107 foreach_group_member(BUDDATA(buddy), increment_if_buddy_not_filtered,
9fafea381eb8 Show the number of unfiltered contacts in folded groups franky parents: 1503 diff changeset	2108 &group_count);
9fafea381eb8 Show the number of unfiltered contacts in folded groups franky parents: 1503 diff changeset	2109 snprintf(rline, 4*Roster_Width, " %c+++ %s (%i)", pending, name,
1579 a2dd83167bc9 Fix display error in the roster Mikael Berthe <mikael@lilotux.net> parents: 1573 diff changeset	2110 group_count);
a2dd83167bc9 Fix display error in the roster Mikael Berthe <mikael@lilotux.net> parents: 1573 diff changeset	2111 /* Do not display the item count if there isn't enough space */
a2dd83167bc9 Fix display error in the roster Mikael Berthe <mikael@lilotux.net> parents: 1573 diff changeset	2112 if (g_utf8_strlen(rline, 4*Roster_Width) >= Roster_Width)
1710 68981c37ed3f Fix roster issue reported by DavidP Mikael Berthe <mikael@lilotux.net> parents: 1700 diff changeset	2113 snprintf(rline, 4*Roster_Width, " %c+++ %s", pending, name);
1504 9fafea381eb8 Show the number of unfiltered contacts in folded groups franky parents: 1503 diff changeset	2114 }
133 a27b22e3b3a1 [/trunk] Changeset 146 by mikael mikael parents: 129 diff changeset	2115 else
1504 9fafea381eb8 Show the number of unfiltered contacts in folded groups franky parents: 1503 diff changeset	2116 snprintf(rline, 4*Roster_Width, " %c--- %s", pending, name);
848 a9161d2dc414 Introduce special buffer stuff Mikael Berthe <mikael@lilotux.net> parents: 843 diff changeset	2117 } else if (isspe) {
1168 eb05f960613f Fix UTF-8 group names in the roster (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1160 diff changeset	2118 snprintf(rline, 4*Roster_Width, " %c%s", pending, name);
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	2119 } else {
824 37ef269330f0 Show incomplete subscriptions in the roster Mikael Berthe <mikael@lilotux.net> parents: 822 diff changeset	2120 char sepleft = '[';
37ef269330f0 Show incomplete subscriptions in the roster Mikael Berthe <mikael@lilotux.net> parents: 822 diff changeset	2121 char sepright = ']';
37ef269330f0 Show incomplete subscriptions in the roster Mikael Berthe <mikael@lilotux.net> parents: 822 diff changeset	2122 if (btype & ROSTER_TYPE_USER) {
37ef269330f0 Show incomplete subscriptions in the roster Mikael Berthe <mikael@lilotux.net> parents: 822 diff changeset	2123 guint subtype = buddy_getsubscription(BUDDATA(buddy));
832 7c210263c661 Small scr_DrawRoster() fix Mikael Berthe <mikael@lilotux.net> parents: 828 diff changeset	2124 if (status == '_' && !(subtype & sub_to))
824 37ef269330f0 Show incomplete subscriptions in the roster Mikael Berthe <mikael@lilotux.net> parents: 822 diff changeset	2125 status = '?';
37ef269330f0 Show incomplete subscriptions in the roster Mikael Berthe <mikael@lilotux.net> parents: 822 diff changeset	2126 if (!(subtype & sub_from)) {
37ef269330f0 Show incomplete subscriptions in the roster Mikael Berthe <mikael@lilotux.net> parents: 822 diff changeset	2127 sepleft = '{';
37ef269330f0 Show incomplete subscriptions in the roster Mikael Berthe <mikael@lilotux.net> parents: 822 diff changeset	2128 sepright = '}';
37ef269330f0 Show incomplete subscriptions in the roster Mikael Berthe <mikael@lilotux.net> parents: 822 diff changeset	2129 }
37ef269330f0 Show incomplete subscriptions in the roster Mikael Berthe <mikael@lilotux.net> parents: 822 diff changeset	2130 }
37ef269330f0 Show incomplete subscriptions in the roster Mikael Berthe <mikael@lilotux.net> parents: 822 diff changeset	2131
1026 fc6060707022 [BP] Fixes truncating utf-8 buddy names (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 966 diff changeset	2132 snprintf(rline, 4*Roster_Width,
824 37ef269330f0 Show incomplete subscriptions in the roster Mikael Berthe <mikael@lilotux.net> parents: 822 diff changeset	2133 " %c%c%c%c %s", pending, sepleft, status, sepright, name);
133 a27b22e3b3a1 [/trunk] Changeset 146 by mikael mikael parents: 129 diff changeset	2134 }
84 134fe2567f07 [/trunk] Changeset 98 by mikael mikael parents: 81 diff changeset	2135
773 e25b8a348ebd Screen updating functions use UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	2136 rline_locale = from_utf8(rline);
981 553b8ecf901f Fixes truncating of utf-8 buddy names (again) Myhailo Danylenko <isbear@ukrpost.net> parents: 980 diff changeset	2137 mvwprintw(rosterWnd, i, x_pos, "%s", rline_locale);
773 e25b8a348ebd Screen updating functions use UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 772 diff changeset	2138 g_free(rline_locale);
84 134fe2567f07 [/trunk] Changeset 98 by mikael mikael parents: 81 diff changeset	2139 i++;
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2140 }
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2141
701 6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	2142 g_free(rline);
6c100adfbfb6 Add setting "roster_width" (variable buddylist width) Mikael Berthe <mikael@lilotux.net> parents: 699 diff changeset	2143 g_free(name);
142 bb6fe91589b9 [/trunk] Changeset 154 by mikael mikael parents: 140 diff changeset	2144 top_panel(inputPanel);
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2145 update_panels();
713 b5aa7b7afee8 Update status lines Mikael Berthe <mikael@lilotux.net> parents: 712 diff changeset	2146 curs_set(cursor_backup);
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	2147 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	2148
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2149 // scr_roster_visibility(status)
707 b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2150 // Set the roster visibility:
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2151 // status=1 Show roster
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2152 // status=0 Hide roster
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2153 // status=-1 Toggle roster status
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2154 void scr_roster_visibility(int status)
707 b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2155 {
708 ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed Mikael Berthe <mikael@lilotux.net> parents: 707 diff changeset	2156 int old_roster_status = roster_hidden;
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed Mikael Berthe <mikael@lilotux.net> parents: 707 diff changeset	2157
707 b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2158 if (status > 0)
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2159 roster_hidden = FALSE;
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2160 else if (status == 0)
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2161 roster_hidden = TRUE;
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2162 else
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2163 roster_hidden = !roster_hidden;
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2164
708 ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed Mikael Berthe <mikael@lilotux.net> parents: 707 diff changeset	2165 if (roster_hidden != old_roster_status) {
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed Mikael Berthe <mikael@lilotux.net> parents: 707 diff changeset	2166 // Recalculate windows size and redraw
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed Mikael Berthe <mikael@lilotux.net> parents: 707 diff changeset	2167 scr_Resize();
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed Mikael Berthe <mikael@lilotux.net> parents: 707 diff changeset	2168 redrawwin(stdscr);
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed Mikael Berthe <mikael@lilotux.net> parents: 707 diff changeset	2169 }
707 b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2170 }
b26a0bde4cdb Add /roster hide\|show\|toggle Mikael Berthe <mikael@lilotux.net> parents: 701 diff changeset	2171
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2172 static void scr_write_message(const char bjid, const char text,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2173 time_t timestamp, guint prefix_flags,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2174 unsigned mucnicklen, gpointer xep184)
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	2175 {
727 1c3620668857 Expand tabs when reading history files Mikael Berthe <mikael@lilotux.net> parents: 726 diff changeset	2176 char *xtext;
725 1aff92625bdb Expand tabs when receiving a message Mikael Berthe <mikael@lilotux.net> parents: 724 diff changeset	2177
726 51be2bc1a820 Better tab expansion Mikael Berthe <mikael@lilotux.net> parents: 725 diff changeset	2178 if (!timestamp) timestamp = time(NULL);
725 1aff92625bdb Expand tabs when receiving a message Mikael Berthe <mikael@lilotux.net> parents: 724 diff changeset	2179
1122 648fe6f715a6 Filter out ^M (0x0d) characters in incoming messages Mikael Berthe <mikael@lilotux.net> parents: 1115 diff changeset	2180 xtext = ut_expand_tabs(text); // Expand tabs and filter out some chars
726 51be2bc1a820 Better tab expansion Mikael Berthe <mikael@lilotux.net> parents: 725 diff changeset	2181
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2182 scr_write_in_window(bjid, xtext, timestamp, prefix_flags, FALSE, mucnicklen,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2183 xep184);
725 1aff92625bdb Expand tabs when receiving a message Mikael Berthe <mikael@lilotux.net> parents: 724 diff changeset	2184
1aff92625bdb Expand tabs when receiving a message Mikael Berthe <mikael@lilotux.net> parents: 724 diff changeset	2185 if (xtext != (char*)text)
1aff92625bdb Expand tabs when receiving a message Mikael Berthe <mikael@lilotux.net> parents: 724 diff changeset	2186 g_free(xtext);
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	2187 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	2188
726 51be2bc1a820 Better tab expansion Mikael Berthe <mikael@lilotux.net> parents: 725 diff changeset	2189 // If prefix is NULL, HBB_PREFIX_IN is supposed.
1783 af3de54ef986 Convert scr_LogPrint() to scr_log_print() Mikael Berthe <mikael@lilotux.net> parents: 1780 diff changeset	2190 void scr_write_incoming_message(const char jidfrom, const char text,
af3de54ef986 Convert scr_LogPrint() to scr_log_print() Mikael Berthe <mikael@lilotux.net> parents: 1780 diff changeset	2191 time_t timestamp,
af3de54ef986 Convert scr_LogPrint() to scr_log_print() Mikael Berthe <mikael@lilotux.net> parents: 1780 diff changeset	2192 guint prefix, unsigned mucnicklen)
726 51be2bc1a820 Better tab expansion Mikael Berthe <mikael@lilotux.net> parents: 725 diff changeset	2193 {
1055 6eb1efea75d0 PGP: Visual encryption flag Mikael Berthe <mikael@lilotux.net> parents: 1050 diff changeset	2194 if (!(prefix &
1204 e802ec0c02d2 Basic support for nick highlighting in MUC rooms (the whole line is colored) Mikael Berthe <mikael@lilotux.net> parents: 1190 diff changeset	2195 ~HBB_PREFIX_NOFLAG & ~HBB_PREFIX_HLIGHT & ~HBB_PREFIX_HLIGHT_OUT &
1484 7b36b91a4388 New UI message flag (O) when OTR is used Mikael Berthe <mikael@lilotux.net> parents: 1483 diff changeset	2196 ~HBB_PREFIX_PGPCRYPT & ~HBB_PREFIX_OTRCRYPT))
726 51be2bc1a820 Better tab expansion Mikael Berthe <mikael@lilotux.net> parents: 725 diff changeset	2197 prefix \|= HBB_PREFIX_IN;
51be2bc1a820 Better tab expansion Mikael Berthe <mikael@lilotux.net> parents: 725 diff changeset	2198
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2199 scr_write_message(jidfrom, text, timestamp, prefix, mucnicklen, NULL);
726 51be2bc1a820 Better tab expansion Mikael Berthe <mikael@lilotux.net> parents: 725 diff changeset	2200 }
51be2bc1a820 Better tab expansion Mikael Berthe <mikael@lilotux.net> parents: 725 diff changeset	2201
1783 af3de54ef986 Convert scr_LogPrint() to scr_log_print() Mikael Berthe <mikael@lilotux.net> parents: 1780 diff changeset	2202 void scr_write_outgoing_message(const char jidto, const char text,
af3de54ef986 Convert scr_LogPrint() to scr_log_print() Mikael Berthe <mikael@lilotux.net> parents: 1780 diff changeset	2203 guint prefix, gpointer xep184)
47 7259a61e1a4b [/trunk] Changeset 63 by mikael mikael parents: 44 diff changeset	2204 {
1115 922a9ae1a17e Fix /say_to to a member of a folded group Mikael Berthe <mikael@lilotux.net> parents: 1093 diff changeset	2205 GSList *roster_elt;
922a9ae1a17e Fix /say_to to a member of a folded group Mikael Berthe <mikael@lilotux.net> parents: 1093 diff changeset	2206 roster_elt = roster_find(jidto, jidsearch,
922a9ae1a17e Fix /say_to to a member of a folded group Mikael Berthe <mikael@lilotux.net> parents: 1093 diff changeset	2207 ROSTER_TYPE_USER\|ROSTER_TYPE_AGENT\|ROSTER_TYPE_ROOM);
922a9ae1a17e Fix /say_to to a member of a folded group Mikael Berthe <mikael@lilotux.net> parents: 1093 diff changeset	2208
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2209 scr_write_message(jidto, text,
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2210 0, prefix\|HBB_PREFIX_OUT\|HBB_PREFIX_HLIGHT_OUT, 0, xep184);
1115 922a9ae1a17e Fix /say_to to a member of a folded group Mikael Berthe <mikael@lilotux.net> parents: 1093 diff changeset	2211
922a9ae1a17e Fix /say_to to a member of a folded group Mikael Berthe <mikael@lilotux.net> parents: 1093 diff changeset	2212 // Show jidto's buffer unless the buddy is not in the buddylist
922a9ae1a17e Fix /say_to to a member of a folded group Mikael Berthe <mikael@lilotux.net> parents: 1093 diff changeset	2213 if (roster_elt && g_list_position(buddylist, roster_elt->data) != -1)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2214 scr_show_window(jidto, FALSE);
47 7259a61e1a4b [/trunk] Changeset 63 by mikael mikael parents: 44 diff changeset	2215 }
7259a61e1a4b [/trunk] Changeset 63 by mikael mikael parents: 44 diff changeset	2216
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2217 void scr_remove_receipt_flag(const char *bjid, gpointer xep184)
1602 f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	2218 {
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2219 winbuf *win_entry = scr_search_window(bjid, FALSE);
1602 f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	2220 if (win_entry) {
f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	2221 hbuf_remove_receipt(win_entry->bd->hbuf, xep184);
f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	2222 if (chatmode && (buddy_search_jid(bjid) == current_buddy))
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2223 scr_update_buddy_window();
1602 f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	2224 }
f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	2225 }
f4a2c6f767d1 Message Receipts support (XEP-0184) franky parents: 1599 diff changeset	2226
935 97e6a6da2b2c Fix ncurses #include (again) Mikael Berthe <mikael@lilotux.net> parents: 933 diff changeset	2227 static inline void set_autoaway(bool setaway)
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	2228 {
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	2229 static enum imstatus oldstatus;
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2230 static char *oldmsg;
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	2231 Autoaway = setaway;
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	2232
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	2233 if (setaway) {
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2234 const char msg, prevmsg;
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2235 oldstatus = xmpp_getstatus();
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2236 if (oldmsg) {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2237 g_free(oldmsg);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2238 oldmsg = NULL;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2239 }
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2240 prevmsg = xmpp_getstatusmsg();
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	2241 msg = settings_opt_get("message_autoaway");
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2242 if (!msg)
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2243 msg = prevmsg;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2244 if (prevmsg)
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2245 oldmsg = g_strdup(prevmsg);
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2246 xmpp_setstatus(away, NULL, msg, FALSE);
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	2247 } else {
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	2248 // Back
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2249 xmpp_setstatus(oldstatus, NULL, (oldmsg ? oldmsg : ""), FALSE);
521 cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2250 if (oldmsg) {
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2251 g_free(oldmsg);
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2252 oldmsg = NULL;
cc8c969ab6e5 "/status" changes Mikael Berthe <mikael@lilotux.net> parents: 518 diff changeset	2253 }
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	2254 }
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	2255 }
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	2256
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2257 // set_chatstate(state)
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2258 // Set the current chat state (0=active, 1=composing, 2=paused)
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2259 // If the chat state has changed, call xmpp_send_chatstate()
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2260 static void set_chatstate(int state)
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2261 {
1691 b2e0083891cc Replace JEP with XEP Mikael Berthe <mikael@lilotux.net> parents: 1686 diff changeset	2262 #if defined XEP0022 \|\| defined XEP0085
993 0759f4c7da68 Add option 'disable_chatstates' Mikael Berthe <mikael@lilotux.net> parents: 992 diff changeset	2263 if (chatstates_disabled)
0759f4c7da68 Add option 'disable_chatstates' Mikael Berthe <mikael@lilotux.net> parents: 992 diff changeset	2264 return;
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2265 if (!chatmode)
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2266 state = 0;
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2267 if (state != chatstate) {
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2268 chatstate = state;
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2269 if (current_buddy &&
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2270 buddy_gettype(BUDDATA(current_buddy)) == ROSTER_TYPE_USER) {
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2271 guint jep_state;
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2272 if (chatstate == 1) {
a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2273 if (chatstate_timeout_id == 0)
a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2274 chatstate_timeout_id = g_timeout_add_seconds(1,
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2275 scr_chatstates_timeout,
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2276 NULL);
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2277 jep_state = ROSTER_EVENT_COMPOSING;
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2278 }
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2279 else if (chatstate == 2)
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2280 jep_state = ROSTER_EVENT_PAUSED;
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2281 else
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2282 jep_state = ROSTER_EVENT_ACTIVE;
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2283 xmpp_send_chatstate(BUDDATA(current_buddy), jep_state);
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2284 }
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2285 if (!chatstate)
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2286 chatstate_timestamp = 0;
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2287 }
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2288 #endif
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2289 }
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2290
1691 b2e0083891cc Replace JEP with XEP Mikael Berthe <mikael@lilotux.net> parents: 1686 diff changeset	2291 #if defined XEP0022 \|\| defined XEP0085
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2292 static gboolean scr_chatstates_timeout(void)
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2293 {
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2294 time_t now;
a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2295 time(&now);
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2296 // Check if we're currently composing...
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2297 if (chatstate != 1 \|\| !chatstate_timestamp) {
a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2298 chatstate_timeout_id = 0;
a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2299 return FALSE;
a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2300 }
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2301
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2302 // If the timeout is reached, let's change the state right now.
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2303 if (now >= chatstate_timestamp + COMPOSING_TIMEOUT) {
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2304 chatstate_timestamp = now;
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2305 set_chatstate(2);
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2306 chatstate_timeout_id = 0;
a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2307 return FALSE;
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2308 }
1598 a087125d8fc8 Replace libjabber with loudmouth franky parents: 1590 diff changeset	2309 return TRUE;
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2310 }
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2311 #endif
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	2312
1677 9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2313 static gboolean scr_autoaway_timeout_callback(gpointer data)
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2314 {
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2315 enum imstatus cur_st = xmpp_getstatus();
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2316 if (cur_st != available && cur_st != freeforchat)
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2317 // Some non-user-originated status changes, let's wait more.
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2318 // Maybe the proper fix for that will be set global variable
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2319 // "autoaway_delayed" and check that variable in postconnect
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2320 // hook (afaik, only source for such status changes are
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2321 // error disconnects).
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2322 return TRUE;
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2323 set_autoaway(TRUE);
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2324 // source will be destroyed after return
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2325 autoaway_source = 0;
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2326 return FALSE;
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2327 }
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2328
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2329 static void scr_reinstall_autoaway_timeout(void)
1677 9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2330 {
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2331 unsigned int autoaway_timeout = settings_opt_get_int("autoaway");
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2332 enum imstatus cur_st = xmpp_getstatus();
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2333 if (autoaway_source) {
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2334 g_source_remove(autoaway_source);
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2335 autoaway_source = 0;
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2336 }
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2337 if (autoaway_timeout && (cur_st == available \|\| cur_st == freeforchat))
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2338 autoaway_source = g_timeout_add_seconds(autoaway_timeout,
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2339 scr_autoaway_timeout_callback,
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2340 NULL);
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2341 }
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2342
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2343 // Check if we should reset autoaway timeout source
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2344 void scr_check_auto_away(int activity)
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	2345 {
1677 9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2346 if (Autoaway && activity) {
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2347 scr_reinstall_autoaway_timeout();
1677 9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2348 set_autoaway(FALSE);
9a0ed33fb91b Fix autoaway Myhailo Danylenko <isbear@ukrpost.net> parents: 1668 diff changeset	2349 } else if (activity \|\| !autoaway_source)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2350 scr_reinstall_autoaway_timeout();
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	2351 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	2352
328 83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2353 // set_current_buddy(newbuddy)
83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2354 // Set the current_buddy to newbuddy (if not NULL)
83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2355 // Lock the newbuddy, and unlock the previous current_buddy
83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2356 static void set_current_buddy(GList *newbuddy)
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	2357 {
328 83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2358 enum imstatus prev_st = imstatus_size;
83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2359 /* prev_st initialized to imstatus_size, which is used as "undef" value.
83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2360 * We are sure prev_st will get a different status value after the
83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2361 * buddy_getstatus() call.
83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2362 */
83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2363
329 7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2364 if (!current_buddy \|\| !newbuddy) return;
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2365 if (newbuddy == current_buddy) return;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	2366
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	2367 // We're moving to another buddy. We're thus inactive wrt current_buddy.
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	2368 set_chatstate(0);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	2369 // We don't want the chatstate to be changed again right now.
1381 40095d413da9 Fix compilation on OpenBSD Mikael Berthe <mikael@lilotux.net> parents: 1376 diff changeset	2370 lock_chatstate = TRUE;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	2371
438 b44be19d6229 Handle multiple resources for the same buddy Mikael Berthe <mikael@lilotux.net> parents: 419 diff changeset	2372 prev_st = buddy_getstatus(BUDDATA(current_buddy), NULL);
328 83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2373 buddy_setflags(BUDDATA(current_buddy), ROSTER_FLAG_LOCK, FALSE);
1950 aec86670047b Automatically set readmark flag Mikael Berthe <mikael@lilotux.net> parents: 1949 diff changeset	2374 if (chatmode) {
aec86670047b Automatically set readmark flag Mikael Berthe <mikael@lilotux.net> parents: 1949 diff changeset	2375 scr_buffer_readmark(TRUE);
330 a9013124ede6 Add "/roster alternate" Mikael Berthe <mikael@lilotux.net> parents: 329 diff changeset	2376 alternate_buddy = current_buddy;
1950 aec86670047b Automatically set readmark flag Mikael Berthe <mikael@lilotux.net> parents: 1949 diff changeset	2377 }
328 83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2378 current_buddy = newbuddy;
83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2379 // Lock the buddy in the buddylist if we're in chat mode
1961 39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2380 if (chatmode) {
328 83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2381 buddy_setflags(BUDDATA(current_buddy), ROSTER_FLAG_LOCK, TRUE);
1961 39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2382 // Remove the readmark if it is at the end of the buffer
39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2383 scr_buffer_readmark(-1);
39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2384 }
328 83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2385 // We should rebuild the buddylist but not everytime
1311 0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2386 if (!(buddylist_get_filter() & 1<<prev_st))
328 83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2387 buddylist_build();
83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2388 update_roster = TRUE;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	2389 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	2390
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2391 // scr_roster_top()
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	2392 // Go to the first buddy in the buddylist
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2393 void scr_roster_top(void)
104 fe7257d251ac [/trunk] Changeset 118 by mikael mikael parents: 103 diff changeset	2394 {
328 83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2395 set_current_buddy(buddylist);
104 fe7257d251ac [/trunk] Changeset 118 by mikael mikael parents: 103 diff changeset	2396 if (chatmode)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2397 scr_show_buddy_window();
104 fe7257d251ac [/trunk] Changeset 118 by mikael mikael parents: 103 diff changeset	2398 }
fe7257d251ac [/trunk] Changeset 118 by mikael mikael parents: 103 diff changeset	2399
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2400 // scr_roster_bottom()
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	2401 // Go to the last buddy in the buddylist
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2402 void scr_roster_bottom(void)
104 fe7257d251ac [/trunk] Changeset 118 by mikael mikael parents: 103 diff changeset	2403 {
328 83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2404 set_current_buddy(g_list_last(buddylist));
104 fe7257d251ac [/trunk] Changeset 118 by mikael mikael parents: 103 diff changeset	2405 if (chatmode)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2406 scr_show_buddy_window();
104 fe7257d251ac [/trunk] Changeset 118 by mikael mikael parents: 103 diff changeset	2407 }
fe7257d251ac [/trunk] Changeset 118 by mikael mikael parents: 103 diff changeset	2408
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2409 // scr_roster_up_down(updown, n)
1573 ece4f26bf9ff Add count parameter to roster up/down command Mikael Berthe <mikael@lilotux.net> parents: 1566 diff changeset	2410 // Go to the nth next buddy in the buddylist
ece4f26bf9ff Add count parameter to roster up/down command Mikael Berthe <mikael@lilotux.net> parents: 1566 diff changeset	2411 // (up if updown == -1, down if updown == 1)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2412 void scr_roster_up_down(int updown, unsigned int n)
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2413 {
1573 ece4f26bf9ff Add count parameter to roster up/down command Mikael Berthe <mikael@lilotux.net> parents: 1566 diff changeset	2414 unsigned int i;
ece4f26bf9ff Add count parameter to roster up/down command Mikael Berthe <mikael@lilotux.net> parents: 1566 diff changeset	2415
ece4f26bf9ff Add count parameter to roster up/down command Mikael Berthe <mikael@lilotux.net> parents: 1566 diff changeset	2416 if (updown < 0) {
ece4f26bf9ff Add count parameter to roster up/down command Mikael Berthe <mikael@lilotux.net> parents: 1566 diff changeset	2417 for (i = 0; i < n; i++)
ece4f26bf9ff Add count parameter to roster up/down command Mikael Berthe <mikael@lilotux.net> parents: 1566 diff changeset	2418 set_current_buddy(g_list_previous(current_buddy));
ece4f26bf9ff Add count parameter to roster up/down command Mikael Berthe <mikael@lilotux.net> parents: 1566 diff changeset	2419 } else {
ece4f26bf9ff Add count parameter to roster up/down command Mikael Berthe <mikael@lilotux.net> parents: 1566 diff changeset	2420 for (i = 0; i < n; i++)
ece4f26bf9ff Add count parameter to roster up/down command Mikael Berthe <mikael@lilotux.net> parents: 1566 diff changeset	2421 set_current_buddy(g_list_next(current_buddy));
ece4f26bf9ff Add count parameter to roster up/down command Mikael Berthe <mikael@lilotux.net> parents: 1566 diff changeset	2422 }
104 fe7257d251ac [/trunk] Changeset 118 by mikael mikael parents: 103 diff changeset	2423 if (chatmode)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2424 scr_show_buddy_window();
81 0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2425 }
0bd578421ce9 [/trunk] Changeset 95 by mikael mikael parents: 76 diff changeset	2426
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2427 // scr_roster_prev_group()
1086 5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2428 // Go to the previous group in the buddylist
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2429 void scr_roster_prev_group(void)
1086 5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2430 {
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2431 GList *bud;
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2432
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2433 for (bud = current_buddy ; bud ; ) {
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2434 bud = g_list_previous(bud);
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2435 if (!bud)
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2436 break;
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2437 if (buddy_gettype(BUDDATA(bud)) & ROSTER_TYPE_GROUP) {
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2438 set_current_buddy(bud);
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2439 if (chatmode)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2440 scr_show_buddy_window();
1086 5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2441 break;
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2442 }
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2443 }
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2444 }
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2445
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2446 // scr_roster_next_group()
1086 5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2447 // Go to the next group in the buddylist
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2448 void scr_roster_next_group(void)
1086 5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2449 {
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2450 GList *bud;
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2451
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2452 for (bud = current_buddy ; bud ; ) {
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2453 bud = g_list_next(bud);
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2454 if (!bud)
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2455 break;
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2456 if (buddy_gettype(BUDDATA(bud)) & ROSTER_TYPE_GROUP) {
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2457 set_current_buddy(bud);
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2458 if (chatmode)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2459 scr_show_buddy_window();
1086 5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2460 break;
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2461 }
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2462 }
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2463 }
5e2e647e781b Add command /roster group_prev\|group_next and update documentation Mikael Berthe <mikael@lilotux.net> parents: 1083 diff changeset	2464
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2465 // scr_roster_search(str)
265 49e9e02dd6d0 Add "/roster search" command mikael@frmp8452 parents: 263 diff changeset	2466 // Look forward for a buddy with jid/name containing str.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2467 void scr_roster_search(char *str)
265 49e9e02dd6d0 Add "/roster search" command mikael@frmp8452 parents: 263 diff changeset	2468 {
328 83d129adde03 Add set_current_buddy() function, to reduce code duplication Mikael Berthe <mikael@lilotux.net> parents: 325 diff changeset	2469 set_current_buddy(buddy_search(str));
265 49e9e02dd6d0 Add "/roster search" command mikael@frmp8452 parents: 263 diff changeset	2470 if (chatmode)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2471 scr_show_buddy_window();
265 49e9e02dd6d0 Add "/roster search" command mikael@frmp8452 parents: 263 diff changeset	2472 }
49e9e02dd6d0 Add "/roster search" command mikael@frmp8452 parents: 263 diff changeset	2473
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2474 // scr_roster_jump_jid(bjid)
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1056 diff changeset	2475 // Jump to buddy bjid.
480 882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2476 // NOTE: With this function, the buddy is added to the roster if doesn't exist.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2477 void scr_roster_jump_jid(char *barejid)
480 882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2478 {
882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2479 GSList *roster_elt;
882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2480 // Look for an existing buddy
882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2481 roster_elt = roster_find(barejid, jidsearch,
882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2482 ROSTER_TYPE_USER\|ROSTER_TYPE_AGENT\|ROSTER_TYPE_ROOM);
882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2483 // Create it if necessary
882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2484 if (!roster_elt)
603 9516db839e08 Store subscription data Mikael Berthe <mikael@lilotux.net> parents: 602 diff changeset	2485 roster_elt = roster_add_user(barejid, NULL, NULL, ROSTER_TYPE_USER,
1355 9716cf8a0726 Add on_server flag Mikael Berthe <mikael@lilotux.net> parents: 1345 diff changeset	2486 sub_none, -1);
480 882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2487 // Set a lock to see it in the buddylist
882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2488 buddy_setflags(BUDDATA(roster_elt), ROSTER_FLAG_LOCK, TRUE);
882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2489 buddylist_build();
882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2490 // Jump to the buddy
882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2491 set_current_buddy(buddy_search_jid(barejid));
882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2492 if (chatmode)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2493 scr_show_buddy_window();
480 882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2494 }
882e1acae422 Add /say_to command Mikael Berthe <mikael@lilotux.net> parents: 464 diff changeset	2495
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2496 // scr_roster_unread_message(next)
236 72fd1273f2b7 [/trunk] Changeset 249 by mikael mikael parents: 232 diff changeset	2497 // Go to a new message. If next is not null, try to go to the next new
72fd1273f2b7 [/trunk] Changeset 249 by mikael mikael parents: 232 diff changeset	2498 // message. If it is not possible or if next is NULL, go to the first new
72fd1273f2b7 [/trunk] Changeset 249 by mikael mikael parents: 232 diff changeset	2499 // message from unread_list.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2500 void scr_roster_unread_message(int next)
236 72fd1273f2b7 [/trunk] Changeset 249 by mikael mikael parents: 232 diff changeset	2501 {
329 7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2502 gpointer unread_ptr;
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2503 gpointer refbuddata;
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2504 GList *nbuddy;
236 72fd1273f2b7 [/trunk] Changeset 249 by mikael mikael parents: 232 diff changeset	2505
329 7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2506 if (!current_buddy) return;
236 72fd1273f2b7 [/trunk] Changeset 249 by mikael mikael parents: 232 diff changeset	2507
329 7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2508 if (next) refbuddata = BUDDATA(current_buddy);
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2509 else refbuddata = NULL;
236 72fd1273f2b7 [/trunk] Changeset 249 by mikael mikael parents: 232 diff changeset	2510
329 7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2511 unread_ptr = unread_msg(refbuddata);
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2512 if (!unread_ptr) return;
236 72fd1273f2b7 [/trunk] Changeset 249 by mikael mikael parents: 232 diff changeset	2513
889 ae93e69aaaaf Fix up pending message flag for the status special buffer Mikael Berthe <mikael@lilotux.net> parents: 888 diff changeset	2514 if (!(buddy_gettype(unread_ptr) & ROSTER_TYPE_SPECIAL)) {
ae93e69aaaaf Fix up pending message flag for the status special buffer Mikael Berthe <mikael@lilotux.net> parents: 888 diff changeset	2515 gpointer ngroup;
ae93e69aaaaf Fix up pending message flag for the status special buffer Mikael Berthe <mikael@lilotux.net> parents: 888 diff changeset	2516 // If buddy is in a folded group, we need to expand it
ae93e69aaaaf Fix up pending message flag for the status special buffer Mikael Berthe <mikael@lilotux.net> parents: 888 diff changeset	2517 ngroup = buddy_getgroup(unread_ptr);
ae93e69aaaaf Fix up pending message flag for the status special buffer Mikael Berthe <mikael@lilotux.net> parents: 888 diff changeset	2518 if (buddy_getflags(ngroup) & ROSTER_FLAG_HIDE) {
ae93e69aaaaf Fix up pending message flag for the status special buffer Mikael Berthe <mikael@lilotux.net> parents: 888 diff changeset	2519 buddy_setflags(ngroup, ROSTER_FLAG_HIDE, FALSE);
ae93e69aaaaf Fix up pending message flag for the status special buffer Mikael Berthe <mikael@lilotux.net> parents: 888 diff changeset	2520 buddylist_build();
ae93e69aaaaf Fix up pending message flag for the status special buffer Mikael Berthe <mikael@lilotux.net> parents: 888 diff changeset	2521 }
329 7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2522 }
236 72fd1273f2b7 [/trunk] Changeset 249 by mikael mikael parents: 232 diff changeset	2523
329 7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2524 nbuddy = g_list_find(buddylist, unread_ptr);
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2525 if (nbuddy) {
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy() Mikael Berthe <mikael@lilotux.net> parents: 328 diff changeset	2526 set_current_buddy(nbuddy);
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2527 if (chatmode) scr_show_buddy_window();
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	2528 } else
bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	2529 scr_LogPrint(LPRINT_LOGNORM, "Error: nbuddy == NULL"); // should not happen
236 72fd1273f2b7 [/trunk] Changeset 249 by mikael mikael parents: 232 diff changeset	2530 }
72fd1273f2b7 [/trunk] Changeset 249 by mikael mikael parents: 232 diff changeset	2531
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2532 // scr_roster_jump_alternate()
330 a9013124ede6 Add "/roster alternate" Mikael Berthe <mikael@lilotux.net> parents: 329 diff changeset	2533 // Try to jump to alternate (== previous) buddy
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2534 void scr_roster_jump_alternate(void)
105 91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2535 {
330 a9013124ede6 Add "/roster alternate" Mikael Berthe <mikael@lilotux.net> parents: 329 diff changeset	2536 if (!alternate_buddy \|\| g_list_position(buddylist, alternate_buddy) == -1)
a9013124ede6 Add "/roster alternate" Mikael Berthe <mikael@lilotux.net> parents: 329 diff changeset	2537 return;
a9013124ede6 Add "/roster alternate" Mikael Berthe <mikael@lilotux.net> parents: 329 diff changeset	2538 set_current_buddy(alternate_buddy);
a9013124ede6 Add "/roster alternate" Mikael Berthe <mikael@lilotux.net> parents: 329 diff changeset	2539 if (chatmode)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2540 scr_show_buddy_window();
330 a9013124ede6 Add "/roster alternate" Mikael Berthe <mikael@lilotux.net> parents: 329 diff changeset	2541 }
a9013124ede6 Add "/roster alternate" Mikael Berthe <mikael@lilotux.net> parents: 329 diff changeset	2542
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2543 // scr_roster_display(filter)
1311 0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2544 // Set the roster filter mask. If filter is null/empty, the current
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2545 // mask is displayed.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2546 void scr_roster_display(const char *filter)
1311 0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2547 {
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2548 guchar status;
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2549 enum imstatus budstate;
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2550 char strfilter[imstatus_size+1];
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2551 char *psfilter;
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2552
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2553 if (filter && *filter) {
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2554 int show_all = (filter == '');
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2555 status = 0;
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2556 for (budstate = 0; budstate < imstatus_size-1; budstate++)
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2557 if (strchr(filter, imstatus2char[budstate]) \|\| show_all)
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2558 status \|= 1<<budstate;
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2559 buddylist_set_filter(status);
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2560 buddylist_build();
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2561 update_roster = TRUE;
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2562 return;
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2563 }
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2564
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2565 // Display current filter
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2566 psfilter = strfilter;
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2567 status = buddylist_get_filter();
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2568 for (budstate = 0; budstate < imstatus_size-1; budstate++)
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2569 if (status & 1<<budstate)
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2570 *psfilter++ = imstatus2char[budstate];
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2571 *psfilter = '\0';
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2572 scr_LogPrint(LPRINT_NORMAL, "Roster status filter: %s", strfilter);
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2573 }
0dda8238af21 Implement "/roster display" Mikael Berthe <mikael@lilotux.net> parents: 1298 diff changeset	2574
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2575 // scr_buffer_scroll_up_down()
508 5a2132ba2220 Add "/buffer up" and "/buffer down" Mikael Berthe <mikael@lilotux.net> parents: 503 diff changeset	2576 // Scroll up/down the current buddy window,
5a2132ba2220 Add "/buffer up" and "/buffer down" Mikael Berthe <mikael@lilotux.net> parents: 503 diff changeset	2577 // - half a screen if nblines is 0,
5a2132ba2220 Add "/buffer up" and "/buffer down" Mikael Berthe <mikael@lilotux.net> parents: 503 diff changeset	2578 // - up if updown == -1, down if updown == 1
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2579 void scr_buffer_scroll_up_down(int updown, unsigned int nblines)
105 91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2580 {
822 0dbb2be10975 Get rid of list.h Mikael Berthe <mikael@lilotux.net> parents: 807 diff changeset	2581 winbuf *win_entry;
508 5a2132ba2220 Add "/buffer up" and "/buffer down" Mikael Berthe <mikael@lilotux.net> parents: 503 diff changeset	2582 int n, nbl;
105 91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2583 GList *hbuf_top;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	2584 guint isspe;
105 91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2585
91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2586 // Get win_entry
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2587 if (!current_buddy) return;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	2588
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	2589 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2590 win_entry = scr_search_window(CURRENT_JID, isspe);
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2591 if (!win_entry) return;
105 91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2592
508 5a2132ba2220 Add "/buffer up" and "/buffer down" Mikael Berthe <mikael@lilotux.net> parents: 503 diff changeset	2593 if (!nblines) {
5a2132ba2220 Add "/buffer up" and "/buffer down" Mikael Berthe <mikael@lilotux.net> parents: 503 diff changeset	2594 // Scroll half a screen (or less)
512 1744664332cd Fix "/buffer up" Mikael Berthe <mikael@lilotux.net> parents: 508 diff changeset	2595 nbl = CHAT_WIN_HEIGHT/2;
508 5a2132ba2220 Add "/buffer up" and "/buffer down" Mikael Berthe <mikael@lilotux.net> parents: 503 diff changeset	2596 } else {
5a2132ba2220 Add "/buffer up" and "/buffer down" Mikael Berthe <mikael@lilotux.net> parents: 503 diff changeset	2597 nbl = nblines;
5a2132ba2220 Add "/buffer up" and "/buffer down" Mikael Berthe <mikael@lilotux.net> parents: 503 diff changeset	2598 }
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2599 hbuf_top = win_entry->bd->top;
105 91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2600
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2601 if (updown == -1) { // UP
1969 d9255c408027 Improve (fix) buffer up 1 when the screen is cleared Mikael Berthe <mikael@lilotux.net> parents: 1968 diff changeset	2602 n = 0;
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2603 if (!hbuf_top) {
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2604 hbuf_top = g_list_last(win_entry->bd->hbuf);
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2605 if (!win_entry->bd->cleared) {
512 1744664332cd Fix "/buffer up" Mikael Berthe <mikael@lilotux.net> parents: 508 diff changeset	2606 if (!nblines) nbl = nbl*3 - 1;
1744664332cd Fix "/buffer up" Mikael Berthe <mikael@lilotux.net> parents: 508 diff changeset	2607 else nbl += CHAT_WIN_HEIGHT - 1;
1744664332cd Fix "/buffer up" Mikael Berthe <mikael@lilotux.net> parents: 508 diff changeset	2608 } else {
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2609 win_entry->bd->cleared = FALSE;
1969 d9255c408027 Improve (fix) buffer up 1 when the screen is cleared Mikael Berthe <mikael@lilotux.net> parents: 1968 diff changeset	2610 n++; // We'll scroll one line less
512 1744664332cd Fix "/buffer up" Mikael Berthe <mikael@lilotux.net> parents: 508 diff changeset	2611 }
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2612 }
1969 d9255c408027 Improve (fix) buffer up 1 when the screen is cleared Mikael Berthe <mikael@lilotux.net> parents: 1968 diff changeset	2613 for ( ; hbuf_top && n < nbl && g_list_previous(hbuf_top) ; n++)
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2614 hbuf_top = g_list_previous(hbuf_top);
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2615 win_entry->bd->top = hbuf_top;
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2616 } else { // DOWN
508 5a2132ba2220 Add "/buffer up" and "/buffer down" Mikael Berthe <mikael@lilotux.net> parents: 503 diff changeset	2617 for (n=0 ; hbuf_top && n < nbl ; n++)
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2618 hbuf_top = g_list_next(hbuf_top);
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2619 win_entry->bd->top = hbuf_top;
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2620 // Check if we are at the bottom
51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2621 for (n=0 ; hbuf_top && n < CHAT_WIN_HEIGHT-1 ; n++)
51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2622 hbuf_top = g_list_next(hbuf_top);
51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2623 if (!hbuf_top)
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2624 win_entry->bd->top = NULL; // End reached
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2625 }
105 91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2626
91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2627 // Refresh the window
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2628 scr_update_window(win_entry);
105 91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2629
91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2630 // Finished :)
91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2631 update_panels();
91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2632 }
91d3ec21c24e [/trunk] Changeset 119 by mikael mikael parents: 104 diff changeset	2633
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2634 // scr_buffer_clear()
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	2635 // Clear the current buddy window (used for the /clear command)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2636 void scr_buffer_clear(void)
108 7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	2637 {
822 0dbb2be10975 Get rid of list.h Mikael Berthe <mikael@lilotux.net> parents: 807 diff changeset	2638 winbuf *win_entry;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	2639 guint isspe;
108 7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	2640
7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	2641 // Get win_entry
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2642 if (!current_buddy) return;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	2643 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2644 win_entry = scr_search_window(CURRENT_JID, isspe);
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2645 if (!win_entry) return;
108 7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	2646
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2647 win_entry->bd->cleared = TRUE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2648 win_entry->bd->top = NULL;
108 7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	2649
7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	2650 // Refresh the window
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2651 scr_update_window(win_entry);
108 7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	2652
7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	2653 // Finished :)
7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	2654 update_panels();
7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	2655 }
7fb72bc13732 [/trunk] Changeset 122 by mikael mikael parents: 105 diff changeset	2656
1138 8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2657 // buffer_purge()
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2658 // key: winId/jid
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2659 // value: winbuf structure
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2660 // data: int, set to 1 if the buffer should be closed.
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2661 // NOTE: does not work for special buffers.
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2662 static void buffer_purge(gpointer key, gpointer value, gpointer data)
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2663 {
1225 0e9e9724d643 Fix a bad type cast in buffer_purge() Mikael Berthe <mikael@lilotux.net> parents: 1209 diff changeset	2664 int *p_closebuf = data;
1138 8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2665 winbuf *win_entry = value;
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2666
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2667 // Delete the current hbuf
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2668 hbuf_free(&win_entry->bd->hbuf);
1138 8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2669
1225 0e9e9724d643 Fix a bad type cast in buffer_purge() Mikael Berthe <mikael@lilotux.net> parents: 1209 diff changeset	2670 if (*p_closebuf) {
1138 8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2671 g_hash_table_remove(winbufhash, key);
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2672 } else {
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2673 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2674 win_entry->bd->top = NULL;
1138 8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2675 }
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2676 }
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2677
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2678 // scr_buffer_purge(closebuf, jid)
1279 8bbc764139ef Implement /buffer close\|purge [jid] Mikael Berthe <mikael@lilotux.net> parents: 1272 diff changeset	2679 // Purge/Drop the current buddy buffer or jid's buffer if jid != NULL.
1135 5d7c05932b13 Add command /buffer close Mikael Berthe <mikael@lilotux.net> parents: 1133 diff changeset	2680 // If closebuf is 1, close the buffer.
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2681 void scr_buffer_purge(int closebuf, const char *jid)
866 b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2682 {
b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2683 winbuf *win_entry;
b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2684 guint isspe;
1225 0e9e9724d643 Fix a bad type cast in buffer_purge() Mikael Berthe <mikael@lilotux.net> parents: 1209 diff changeset	2685 guint *p_closebuf;
1279 8bbc764139ef Implement /buffer close\|purge [jid] Mikael Berthe <mikael@lilotux.net> parents: 1272 diff changeset	2686 const char *cjid;
1345 8e4e741787be Small change to buffer close Mikael Berthe <mikael@lilotux.net> parents: 1333 diff changeset	2687 guint hold_chatmode = FALSE;
1279 8bbc764139ef Implement /buffer close\|purge [jid] Mikael Berthe <mikael@lilotux.net> parents: 1272 diff changeset	2688
8bbc764139ef Implement /buffer close\|purge [jid] Mikael Berthe <mikael@lilotux.net> parents: 1272 diff changeset	2689 if (jid) {
8bbc764139ef Implement /buffer close\|purge [jid] Mikael Berthe <mikael@lilotux.net> parents: 1272 diff changeset	2690 cjid = jid;
8bbc764139ef Implement /buffer close\|purge [jid] Mikael Berthe <mikael@lilotux.net> parents: 1272 diff changeset	2691 isspe = FALSE;
1345 8e4e741787be Small change to buffer close Mikael Berthe <mikael@lilotux.net> parents: 1333 diff changeset	2692 // If closebuf is TRUE, it's probably better not to leave chat mode
8e4e741787be Small change to buffer close Mikael Berthe <mikael@lilotux.net> parents: 1333 diff changeset	2693 // if the change isn't related to the current buffer.
8e4e741787be Small change to buffer close Mikael Berthe <mikael@lilotux.net> parents: 1333 diff changeset	2694 if (closebuf && current_buddy) {
8e4e741787be Small change to buffer close Mikael Berthe <mikael@lilotux.net> parents: 1333 diff changeset	2695 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL \|\|
8e4e741787be Small change to buffer close Mikael Berthe <mikael@lilotux.net> parents: 1333 diff changeset	2696 strcasecmp(jid, CURRENT_JID))
8e4e741787be Small change to buffer close Mikael Berthe <mikael@lilotux.net> parents: 1333 diff changeset	2697 hold_chatmode = TRUE;
8e4e741787be Small change to buffer close Mikael Berthe <mikael@lilotux.net> parents: 1333 diff changeset	2698 }
1279 8bbc764139ef Implement /buffer close\|purge [jid] Mikael Berthe <mikael@lilotux.net> parents: 1272 diff changeset	2699 } else {
8bbc764139ef Implement /buffer close\|purge [jid] Mikael Berthe <mikael@lilotux.net> parents: 1272 diff changeset	2700 // Get win_entry
8bbc764139ef Implement /buffer close\|purge [jid] Mikael Berthe <mikael@lilotux.net> parents: 1272 diff changeset	2701 if (!current_buddy) return;
8bbc764139ef Implement /buffer close\|purge [jid] Mikael Berthe <mikael@lilotux.net> parents: 1272 diff changeset	2702 cjid = CURRENT_JID;
8bbc764139ef Implement /buffer close\|purge [jid] Mikael Berthe <mikael@lilotux.net> parents: 1272 diff changeset	2703 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
8bbc764139ef Implement /buffer close\|purge [jid] Mikael Berthe <mikael@lilotux.net> parents: 1272 diff changeset	2704 }
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2705 win_entry = scr_search_window(cjid, isspe);
866 b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2706 if (!win_entry) return;
b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2707
1138 8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2708 if (!isspe) {
1225 0e9e9724d643 Fix a bad type cast in buffer_purge() Mikael Berthe <mikael@lilotux.net> parents: 1209 diff changeset	2709 p_closebuf = g_new(guint, 1);
0e9e9724d643 Fix a bad type cast in buffer_purge() Mikael Berthe <mikael@lilotux.net> parents: 1209 diff changeset	2710 *p_closebuf = closebuf;
1279 8bbc764139ef Implement /buffer close\|purge [jid] Mikael Berthe <mikael@lilotux.net> parents: 1272 diff changeset	2711 buffer_purge((gpointer)cjid, win_entry, p_closebuf);
1700 87dd0a8f1a9c Remove the "new message" flag when a buffer is purged with /buffer purge Mikael Berthe <mikael@lilotux.net> parents: 1694 diff changeset	2712 roster_msg_setflag(cjid, FALSE, FALSE);
1225 0e9e9724d643 Fix a bad type cast in buffer_purge() Mikael Berthe <mikael@lilotux.net> parents: 1209 diff changeset	2713 g_free(p_closebuf);
1345 8e4e741787be Small change to buffer close Mikael Berthe <mikael@lilotux.net> parents: 1333 diff changeset	2714 if (closebuf && !hold_chatmode) {
1138 8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2715 scr_set_chatmode(FALSE);
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2716 currentWindow = NULL;
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2717 }
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2718 } else {
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2719 // (Special buffer)
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2720 // Reset the current hbuf
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2721 hbuf_free(&win_entry->bd->hbuf);
866 b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2722 // Currently it can only be the status buffer
b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2723 statushbuf = NULL;
1700 87dd0a8f1a9c Remove the "new message" flag when a buffer is purged with /buffer purge Mikael Berthe <mikael@lilotux.net> parents: 1694 diff changeset	2724 roster_msg_setflag(SPECIAL_BUFFER_STATUS_ID, TRUE, FALSE);
1138 8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2725
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2726 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2727 win_entry->bd->top = NULL;
866 b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2728 }
b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2729
1700 87dd0a8f1a9c Remove the "new message" flag when a buffer is purged with /buffer purge Mikael Berthe <mikael@lilotux.net> parents: 1694 diff changeset	2730 update_roster = TRUE;
87dd0a8f1a9c Remove the "new message" flag when a buffer is purged with /buffer purge Mikael Berthe <mikael@lilotux.net> parents: 1694 diff changeset	2731
1138 8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2732 // Refresh the window
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2733 scr_update_buddy_window();
1138 8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2734
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2735 // Finished :)
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2736 update_panels();
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2737 }
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2738
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2739 // scr_buffer_purge_all(closebuf)
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2740 // Purge all existing buffers.
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2741 // If closebuf is 1, the buffers are closed.
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2742 void scr_buffer_purge_all(int closebuf)
1138 8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2743 {
1225 0e9e9724d643 Fix a bad type cast in buffer_purge() Mikael Berthe <mikael@lilotux.net> parents: 1209 diff changeset	2744 guint *p_closebuf;
0e9e9724d643 Fix a bad type cast in buffer_purge() Mikael Berthe <mikael@lilotux.net> parents: 1209 diff changeset	2745 p_closebuf = g_new(guint, 1);
0e9e9724d643 Fix a bad type cast in buffer_purge() Mikael Berthe <mikael@lilotux.net> parents: 1209 diff changeset	2746
0e9e9724d643 Fix a bad type cast in buffer_purge() Mikael Berthe <mikael@lilotux.net> parents: 1209 diff changeset	2747 *p_closebuf = closebuf;
0e9e9724d643 Fix a bad type cast in buffer_purge() Mikael Berthe <mikael@lilotux.net> parents: 1209 diff changeset	2748 g_hash_table_foreach(winbufhash, buffer_purge, p_closebuf);
0e9e9724d643 Fix a bad type cast in buffer_purge() Mikael Berthe <mikael@lilotux.net> parents: 1209 diff changeset	2749 g_free(p_closebuf);
1138 8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2750
8ba4b1e8b42d Add command /buffer close_all Mikael Berthe <mikael@lilotux.net> parents: 1137 diff changeset	2751 if (closebuf) {
1135 5d7c05932b13 Add command /buffer close Mikael Berthe <mikael@lilotux.net> parents: 1133 diff changeset	2752 scr_set_chatmode(FALSE);
1137 5752017f6e2b Fix a bug in /buffer close Mikael Berthe <mikael@lilotux.net> parents: 1135 diff changeset	2753 currentWindow = NULL;
1135 5d7c05932b13 Add command /buffer close Mikael Berthe <mikael@lilotux.net> parents: 1133 diff changeset	2754 }
5d7c05932b13 Add command /buffer close Mikael Berthe <mikael@lilotux.net> parents: 1133 diff changeset	2755
866 b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2756 // Refresh the window
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2757 scr_update_buddy_window();
866 b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2758
b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2759 // Finished :)
b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2760 update_panels();
b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2761 }
b30df2ab457f Add "/buffer purge" Mikael Berthe <mikael@lilotux.net> parents: 865 diff changeset	2762
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2763 // scr_buffer_scroll_lock(lock)
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2764 // Lock/unlock the current buddy buffer
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2765 // lock = 1 : lock
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2766 // lock = 0 : unlock
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2767 // lock = -1: toggle lock status
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2768 void scr_buffer_scroll_lock(int lock)
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2769 {
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2770 winbuf *win_entry;
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2771 guint isspe;
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2772
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2773 // Get win_entry
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2774 if (!current_buddy) return;
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2775 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2776 win_entry = scr_search_window(CURRENT_JID, isspe);
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2777 if (!win_entry) return;
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2778
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2779 if (lock == -1)
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2780 lock = !win_entry->bd->lock;
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2781
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2782 if (lock) {
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2783 win_entry->bd->lock = TRUE;
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2784 } else {
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2785 win_entry->bd->lock = FALSE;
880 ea983a945eba /buffer scroll_unlock: Don't always jump to the end of the buffer Mikael Berthe <mikael@lilotux.net> parents: 878 diff changeset	2786 if (isspe \|\| (buddy_getflags(BUDDATA(current_buddy)) & ROSTER_FLAG_MSG))
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2787 win_entry->bd->top = NULL;
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2788 }
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2789
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2790 // If chatmode is disabled and we're at the bottom of the buffer,
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2791 // we need to set the "top" line, so we need to call scr_show_buddy_window()
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2792 // at least once. (Maybe it will cause a double refresh...)
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2793 if (!chatmode && !win_entry->bd->top) {
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2794 chatmode = TRUE;
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2795 scr_show_buddy_window();
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2796 chatmode = FALSE;
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2797 }
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2798
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2799 // Refresh the window
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2800 scr_update_buddy_window();
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2801
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2802 // Finished :)
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2803 update_panels();
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2804 }
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	2805
1961 39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2806 // scr_buffer_readmark(action)
39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2807 // Update the readmark flag for the current buffer
39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2808 // If action = 1, set the readmark flag on the last message
39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2809 // If action = 0, reset the readmark flag
39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2810 // If action = -1, remove the readmark flag iff it is on the last line
39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2811 void scr_buffer_readmark(gchar action)
1949 13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2812 {
13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2813 winbuf *win_entry;
13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2814 guint isspe;
13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2815
13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2816 // Get win_entry
13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2817 if (!current_buddy) return;
13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2818 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2819 if (isspe) return; // Maybe not necessary
13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2820 win_entry = scr_search_window(CURRENT_JID, isspe);
13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2821 if (!win_entry) return;
13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2822
1961 39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2823 if (!win_entry->bd->lock) {
39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2824 if (action >= 0)
39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2825 hbuf_set_readmark(win_entry->bd->hbuf, action);
39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2826 else
39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2827 hbuf_remove_trailing_readmark(win_entry->bd->hbuf);
39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	2828 }
1949 13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2829 }
13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2830
13d18777a629 Add scr_buffer_readmark() Mikael Berthe <mikael@lilotux.net> parents: 1948 diff changeset	2831
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2832 // scr_buffer_top_bottom()
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2833 // Jump to the head/tail of the current buddy window
51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2834 // (top if topbottom == -1, bottom topbottom == 1)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2835 void scr_buffer_top_bottom(int topbottom)
187 4ce9ff808baa [/trunk] Changeset 199 by mikael mikael parents: 185 diff changeset	2836 {
822 0dbb2be10975 Get rid of list.h Mikael Berthe <mikael@lilotux.net> parents: 807 diff changeset	2837 winbuf *win_entry;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	2838 guint isspe;
187 4ce9ff808baa [/trunk] Changeset 199 by mikael mikael parents: 185 diff changeset	2839
4ce9ff808baa [/trunk] Changeset 199 by mikael mikael parents: 185 diff changeset	2840 // Get win_entry
4ce9ff808baa [/trunk] Changeset 199 by mikael mikael parents: 185 diff changeset	2841 if (!current_buddy) return;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	2842 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2843 win_entry = scr_search_window(CURRENT_JID, isspe);
187 4ce9ff808baa [/trunk] Changeset 199 by mikael mikael parents: 185 diff changeset	2844 if (!win_entry) return;
4ce9ff808baa [/trunk] Changeset 199 by mikael mikael parents: 185 diff changeset	2845
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2846 win_entry->bd->cleared = FALSE;
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2847 if (topbottom == 1)
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2848 win_entry->bd->top = NULL;
361 51ff319947c3 Code cleanup/optimization Mikael Berthe <mikael@lilotux.net> parents: 358 diff changeset	2849 else
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2850 win_entry->bd->top = g_list_first(win_entry->bd->hbuf);
187 4ce9ff808baa [/trunk] Changeset 199 by mikael mikael parents: 185 diff changeset	2851
4ce9ff808baa [/trunk] Changeset 199 by mikael mikael parents: 185 diff changeset	2852 // Refresh the window
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2853 scr_update_window(win_entry);
187 4ce9ff808baa [/trunk] Changeset 199 by mikael mikael parents: 185 diff changeset	2854
4ce9ff808baa [/trunk] Changeset 199 by mikael mikael parents: 185 diff changeset	2855 // Finished :)
4ce9ff808baa [/trunk] Changeset 199 by mikael mikael parents: 185 diff changeset	2856 update_panels();
4ce9ff808baa [/trunk] Changeset 199 by mikael mikael parents: 185 diff changeset	2857 }
4ce9ff808baa [/trunk] Changeset 199 by mikael mikael parents: 185 diff changeset	2858
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2859 // scr_buffer_search(direction, text)
370 dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2860 // Jump to the next line containing text
dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2861 // (backward search if direction == -1, forward if topbottom == 1)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2862 void scr_buffer_search(int direction, const char *text)
370 dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2863 {
822 0dbb2be10975 Get rid of list.h Mikael Berthe <mikael@lilotux.net> parents: 807 diff changeset	2864 winbuf *win_entry;
370 dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2865 GList current_line, search_res;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	2866 guint isspe;
370 dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2867
dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2868 // Get win_entry
dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2869 if (!current_buddy) return;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	2870 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2871 win_entry = scr_search_window(CURRENT_JID, isspe);
370 dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2872 if (!win_entry) return;
dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2873
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2874 if (win_entry->bd->top)
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2875 current_line = win_entry->bd->top;
370 dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2876 else
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2877 current_line = g_list_last(win_entry->bd->hbuf);
370 dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2878
dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2879 search_res = hbuf_search(current_line, direction, text);
dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2880
dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2881 if (search_res) {
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2882 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2883 win_entry->bd->top = search_res;
370 dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2884
dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2885 // Refresh the window
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2886 scr_update_window(win_entry);
370 dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2887
dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2888 // Finished :)
dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2889 update_panels();
dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2890 } else
1957 e3e8fb918d56 Be more verbose when the buffer search commands are not successful Mikael Berthe <mikael@lilotux.net> parents: 1956 diff changeset	2891 scr_LogPrint(LPRINT_NORMAL, "Search string not found.");
370 dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2892 }
dd9e2eb52916 Add /buffer search_{backward,forward} Mikael Berthe <mikael@lilotux.net> parents: 369 diff changeset	2893
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2894 // scr_buffer_percent(n)
462 d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2895 // Jump to the specified position in the buffer, in %
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2896 void scr_buffer_percent(int pc)
462 d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2897 {
822 0dbb2be10975 Get rid of list.h Mikael Berthe <mikael@lilotux.net> parents: 807 diff changeset	2898 winbuf *win_entry;
462 d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2899 GList *search_res;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	2900 guint isspe;
462 d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2901
d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2902 // Get win_entry
d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2903 if (!current_buddy) return;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	2904 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2905 win_entry = scr_search_window(CURRENT_JID, isspe);
462 d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2906 if (!win_entry) return;
d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2907
d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2908 if (pc < 0 \|\| pc > 100) {
1686 393c05fba337 Use G_GNUC_PRINTF to check scr_LogPrint arguments Myhailo Danylenko <isbear@ukrpost.net> parents: 1677 diff changeset	2909 scr_LogPrint(LPRINT_NORMAL, "Bad %% value");
462 d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2910 return;
d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2911 }
d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2912
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2913 search_res = hbuf_jump_percent(win_entry->bd->hbuf, pc);
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2914
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2915 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2916 win_entry->bd->top = search_res;
462 d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2917
d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2918 // Refresh the window
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2919 scr_update_window(win_entry);
462 d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2920
d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2921 // Finished :)
d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2922 update_panels();
d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2923 }
d580e87c11ed Add "/buffer %n" Mikael Berthe <mikael@lilotux.net> parents: 459 diff changeset	2924
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2925 // scr_buffer_date(t)
464 e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2926 // Jump to the first line after date t in the buffer
e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2927 // t is a date in seconds since `00:00:00 1970-01-01 UTC'
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2928 void scr_buffer_date(time_t t)
464 e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2929 {
822 0dbb2be10975 Get rid of list.h Mikael Berthe <mikael@lilotux.net> parents: 807 diff changeset	2930 winbuf *win_entry;
464 e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2931 GList *search_res;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	2932 guint isspe;
464 e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2933
e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2934 // Get win_entry
e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2935 if (!current_buddy) return;
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	2936 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2937 win_entry = scr_search_window(CURRENT_JID, isspe);
464 e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2938 if (!win_entry) return;
e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2939
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2940 search_res = hbuf_jump_date(win_entry->bd->hbuf, t);
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2941
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2942 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	2943 win_entry->bd->top = search_res;
464 e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2944
1957 e3e8fb918d56 Be more verbose when the buffer search commands are not successful Mikael Berthe <mikael@lilotux.net> parents: 1956 diff changeset	2945 if (!search_res)
e3e8fb918d56 Be more verbose when the buffer search commands are not successful Mikael Berthe <mikael@lilotux.net> parents: 1956 diff changeset	2946 scr_log_print(LPRINT_NORMAL, "Date not found.");
e3e8fb918d56 Be more verbose when the buffer search commands are not successful Mikael Berthe <mikael@lilotux.net> parents: 1956 diff changeset	2947
464 e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2948 // Refresh the window
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2949 scr_update_window(win_entry);
464 e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2950
e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2951 // Finished :)
e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2952 update_panels();
e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2953 }
e4840b288be0 Add "/buffer date" Mikael Berthe <mikael@lilotux.net> parents: 462 diff changeset	2954
1956 f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2955 // scr_buffer_jump_readmark()
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2956 // Jump to the buffer readmark, if there's one
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2957 void scr_buffer_jump_readmark(void)
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2958 {
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2959 winbuf *win_entry;
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2960 GList *search_res;
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2961 guint isspe;
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2962
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2963 // Get win_entry
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2964 if (!current_buddy) return;
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2965 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2966 if (isspe) return;
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2967 win_entry = scr_search_window(CURRENT_JID, isspe);
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2968 if (!win_entry) return;
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2969
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2970 search_res = hbuf_jump_readmark(win_entry->bd->hbuf);
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2971
1968 83d7c7daea6a buffer readmark: don't update the screen when there is no mark Mikael Berthe <mikael@lilotux.net> parents: 1965 diff changeset	2972 if (!search_res) {
83d7c7daea6a buffer readmark: don't update the screen when there is no mark Mikael Berthe <mikael@lilotux.net> parents: 1965 diff changeset	2973 scr_log_print(LPRINT_NORMAL, "Readmark not found.");
83d7c7daea6a buffer readmark: don't update the screen when there is no mark Mikael Berthe <mikael@lilotux.net> parents: 1965 diff changeset	2974 return;
83d7c7daea6a buffer readmark: don't update the screen when there is no mark Mikael Berthe <mikael@lilotux.net> parents: 1965 diff changeset	2975 }
83d7c7daea6a buffer readmark: don't update the screen when there is no mark Mikael Berthe <mikael@lilotux.net> parents: 1965 diff changeset	2976
1956 f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2977 win_entry->bd->cleared = FALSE;
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2978 win_entry->bd->top = search_res;
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2979
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2980 // Refresh the window
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2981 scr_update_window(win_entry);
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2982
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2983 // Finished :)
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2984 update_panels();
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2985 }
f309f343070c Add command /buffer readmark Mikael Berthe <mikael@lilotux.net> parents: 1955 diff changeset	2986
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2987 // scr_buffer_dump(filename)
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2988 // Dump the current buffer content to the specified file.
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	2989 void scr_buffer_dump(const char *file)
1485 0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	2990 {
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	2991 char *extfname;
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	2992
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	2993 if (!currentWindow) {
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	2994 scr_LogPrint(LPRINT_NORMAL, "No current buffer!");
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	2995 return;
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	2996 }
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	2997
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	2998 if (!file \|\| !*file) {
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	2999 scr_LogPrint(LPRINT_NORMAL, "Missing parameter (file name)!");
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	3000 return;
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	3001 }
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	3002
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	3003 extfname = expand_filename(file);
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	3004 hbuf_dump_to_file(currentWindow->bd->hbuf, extfname);
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	3005 g_free(extfname);
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	3006 }
0121b6f3047c New command: /buffer save Mikael Berthe <mikael@lilotux.net> parents: 1484 diff changeset	3007
1226 2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3008 // buffer_list()
2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3009 // key: winId/jid
2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3010 // value: winbuf structure
2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3011 // data: none.
2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3012 static void buffer_list(gpointer key, gpointer value, gpointer data)
2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3013 {
1227 79c396678f1b Make buffer list display the number of allocated HBB blocks Mikael Berthe <mikael@lilotux.net> parents: 1226 diff changeset	3014 GList *head;
1226 2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3015 winbuf *win_entry = value;
1227 79c396678f1b Make buffer list display the number of allocated HBB blocks Mikael Berthe <mikael@lilotux.net> parents: 1226 diff changeset	3016
79c396678f1b Make buffer list display the number of allocated HBB blocks Mikael Berthe <mikael@lilotux.net> parents: 1226 diff changeset	3017 head = g_list_first(win_entry->bd->hbuf);
79c396678f1b Make buffer list display the number of allocated HBB blocks Mikael Berthe <mikael@lilotux.net> parents: 1226 diff changeset	3018
1686 393c05fba337 Use G_GNUC_PRINTF to check scr_LogPrint arguments Myhailo Danylenko <isbear@ukrpost.net> parents: 1677 diff changeset	3019 scr_LogPrint(LPRINT_NORMAL, " %s (%u/%u)", (const char *) key,
1227 79c396678f1b Make buffer list display the number of allocated HBB blocks Mikael Berthe <mikael@lilotux.net> parents: 1226 diff changeset	3020 g_list_length(head), hbuf_get_blocks_number(head));
1226 2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3021 }
2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3022
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	3023 void scr_buffer_list(void)
1226 2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3024 {
2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3025 scr_LogPrint(LPRINT_NORMAL, "Buffer list:");
1227 79c396678f1b Make buffer list display the number of allocated HBB blocks Mikael Berthe <mikael@lilotux.net> parents: 1226 diff changeset	3026 buffer_list("[status]", statusWindow, NULL);
1226 2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3027 g_hash_table_foreach(winbufhash, buffer_list, NULL);
2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3028 scr_LogPrint(LPRINT_NORMAL, "End of buffer list.");
1252 9f7e6c22cd14 "buffer list" sets the new_msg flag Mikael Berthe <mikael@lilotux.net> parents: 1245 diff changeset	3029 scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE);
1815 6abca6000762 Make use of ROSTER_UI_PRIO_STATUS_WIN_MESSAGE Mikael Berthe <mikael@lilotux.net> parents: 1811 diff changeset	3030 scr_setattentionflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE,
6abca6000762 Make use of ROSTER_UI_PRIO_STATUS_WIN_MESSAGE Mikael Berthe <mikael@lilotux.net> parents: 1811 diff changeset	3031 ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max);
1226 2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3032 }
2521efbf3b72 New (debug) subcommand, buffer list Mikael Berthe <mikael@lilotux.net> parents: 1225 diff changeset	3033
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	3034 // scr_set_chatmode()
261 259ed1de5bdc Fix spelling mistakes in comments mikael@frmp8452 parents: 260 diff changeset	3035 // Public function to (un)set chatmode...
129 03be1cc94560 [/trunk] Changeset 142 by mikael mikael parents: 126 diff changeset	3036 inline void scr_set_chatmode(int enable)
03be1cc94560 [/trunk] Changeset 142 by mikael mikael parents: 126 diff changeset	3037 {
1961 39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	3038 gboolean enter_chatmode = enable && chatmode == FALSE;
129 03be1cc94560 [/trunk] Changeset 142 by mikael mikael parents: 126 diff changeset	3039 chatmode = enable;
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	3040 scr_update_chat_status(TRUE);
1961 39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	3041 if (enter_chatmode)
39021fd6b0e1 Try to improve readmarks in some cases Mikael Berthe <mikael@lilotux.net> parents: 1960 diff changeset	3042 scr_buffer_readmark(-1);
129 03be1cc94560 [/trunk] Changeset 142 by mikael mikael parents: 126 diff changeset	3043 }
03be1cc94560 [/trunk] Changeset 142 by mikael mikael parents: 126 diff changeset	3044
1129 1a109ebf3f24 Add option "events_ignore_active_window" Mikael Berthe <mikael@lilotux.net> parents: 1127 diff changeset	3045 // scr_get_chatmode()
1a109ebf3f24 Add option "events_ignore_active_window" Mikael Berthe <mikael@lilotux.net> parents: 1127 diff changeset	3046 // Public function to get chatmode state.
1a109ebf3f24 Add option "events_ignore_active_window" Mikael Berthe <mikael@lilotux.net> parents: 1127 diff changeset	3047 inline int scr_get_chatmode(void)
1a109ebf3f24 Add option "events_ignore_active_window" Mikael Berthe <mikael@lilotux.net> parents: 1127 diff changeset	3048 {
1a109ebf3f24 Add option "events_ignore_active_window" Mikael Berthe <mikael@lilotux.net> parents: 1127 diff changeset	3049 return chatmode;
1a109ebf3f24 Add option "events_ignore_active_window" Mikael Berthe <mikael@lilotux.net> parents: 1127 diff changeset	3050 }
1a109ebf3f24 Add option "events_ignore_active_window" Mikael Berthe <mikael@lilotux.net> parents: 1127 diff changeset	3051
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3052 // scr_get_multimode()
261 259ed1de5bdc Fix spelling mistakes in comments mikael@frmp8452 parents: 260 diff changeset	3053 // Public function to get multimode status...
1059 875d2c9d399c Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	3054 inline int scr_get_multimode(void)
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3055 {
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3056 return multimode;
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3057 }
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3058
654 d7fe7b88e4fc MUC: Set the new_message flag when joining a room Mikael Berthe <mikael@lilotux.net> parents: 652 diff changeset	3059 // scr_setmsgflag_if_needed(jid)
d7fe7b88e4fc MUC: Set the new_message flag when joining a room Mikael Berthe <mikael@lilotux.net> parents: 652 diff changeset	3060 // Set the message flag unless we're already in the jid buffer window
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1056 diff changeset	3061 void scr_setmsgflag_if_needed(const char *bjid, int special)
654 d7fe7b88e4fc MUC: Set the new_message flag when joining a room Mikael Berthe <mikael@lilotux.net> parents: 652 diff changeset	3062 {
891 78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed() Mikael Berthe <mikael@lilotux.net> parents: 889 diff changeset	3063 const char *current_id;
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	3064 bool iscurrentlocked = FALSE;
667 86bc3295a4db Fix segfault in scr_setmsgflag_if_needed() Mikael Berthe <mikael@lilotux.net> parents: 658 diff changeset	3065
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1056 diff changeset	3066 if (!bjid)
849 42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	3067 return;
42c43a88d823 Status buffer management Mikael Berthe <mikael@lilotux.net> parents: 848 diff changeset	3068
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	3069 if (current_buddy) {
891 78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed() Mikael Berthe <mikael@lilotux.net> parents: 889 diff changeset	3070 if (special)
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed() Mikael Berthe <mikael@lilotux.net> parents: 889 diff changeset	3071 current_id = buddy_getname(BUDDATA(current_buddy));
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed() Mikael Berthe <mikael@lilotux.net> parents: 889 diff changeset	3072 else
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed() Mikael Berthe <mikael@lilotux.net> parents: 889 diff changeset	3073 current_id = buddy_getjid(BUDDATA(current_buddy));
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed() Mikael Berthe <mikael@lilotux.net> parents: 889 diff changeset	3074 if (current_id) {
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	3075 winbuf *win_entry = scr_search_window(current_id, special);
888 578d2034e971 scr_setmsgflag_if_needed(): Add a check after scr_SearchWindow() Mikael Berthe <mikael@lilotux.net> parents: 884 diff changeset	3076 if (!win_entry) return;
1157 5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata Frank Zschockelt parents: 1156 diff changeset	3077 iscurrentlocked = win_entry->bd->lock;
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	3078 }
ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	3079 } else {
891 78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed() Mikael Berthe <mikael@lilotux.net> parents: 889 diff changeset	3080 current_id = NULL;
873 ee39f6d94d43 Add /buffer {scroll_lock\|scroll_unlock\|toggle_scroll} Mikael Berthe <mikael@lilotux.net> parents: 866 diff changeset	3081 }
1821 60db836ad98a Move some "update_roster" updates to a better place Mikael Berthe <mikael@lilotux.net> parents: 1819 diff changeset	3082 if (!chatmode \|\| !current_id \|\| strcmp(bjid, current_id) \|\| iscurrentlocked) {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1056 diff changeset	3083 roster_msg_setflag(bjid, special, TRUE);
1821 60db836ad98a Move some "update_roster" updates to a better place Mikael Berthe <mikael@lilotux.net> parents: 1819 diff changeset	3084 update_roster = TRUE;
60db836ad98a Move some "update_roster" updates to a better place Mikael Berthe <mikael@lilotux.net> parents: 1819 diff changeset	3085 }
654 d7fe7b88e4fc MUC: Set the new_message flag when joining a room Mikael Berthe <mikael@lilotux.net> parents: 652 diff changeset	3086 }
d7fe7b88e4fc MUC: Set the new_message flag when joining a room Mikael Berthe <mikael@lilotux.net> parents: 652 diff changeset	3087
1802 b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3088 // scr_setattentionflag_if_needed(bare_jid, special, value, action)
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3089 // Set the attention flag unless we're already in the jid buffer window
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3090 // TODO: avoid code duplication with scr_setmsgflag_if_needed()
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3091 void scr_setattentionflag_if_needed(const char *bjid, int special,
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3092 guint value, enum setuiprio_ops action)
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3093 {
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3094 const char *current_id;
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3095 winbuf *wb;
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3096 bool iscurrentlocked = FALSE;
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3097
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3098 if (!bjid)
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3099 return;
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3100
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3101 wb = scr_search_window(bjid, special);
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3102 if (!wb)
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3103 return;
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3104
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3105 if (current_buddy) {
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3106 if (special)
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3107 current_id = buddy_getname(BUDDATA(current_buddy));
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3108 else
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3109 current_id = buddy_getjid(BUDDATA(current_buddy));
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3110 if (current_id) {
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3111 winbuf *win_entry = scr_search_window(current_id, special);
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3112 if (!win_entry) return;
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3113 iscurrentlocked = win_entry->bd->lock;
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3114 }
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3115 } else {
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3116 current_id = NULL;
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3117 }
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3118
1821 60db836ad98a Move some "update_roster" updates to a better place Mikael Berthe <mikael@lilotux.net> parents: 1819 diff changeset	3119 if (!chatmode \|\| !current_id \|\| strcmp(bjid, current_id) \|\| iscurrentlocked) {
1802 b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3120 roster_setuiprio(bjid, special, value, action);
1821 60db836ad98a Move some "update_roster" updates to a better place Mikael Berthe <mikael@lilotux.net> parents: 1819 diff changeset	3121 update_roster = TRUE;
60db836ad98a Move some "update_roster" updates to a better place Mikael Berthe <mikael@lilotux.net> parents: 1819 diff changeset	3122 }
1802 b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3123 }
b135572fcd26 Add urgent flag per screen buffer Mikael Berthe <mikael@lilotux.net> parents: 1793 diff changeset	3124
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3125 // scr_set_multimode()
261 259ed1de5bdc Fix spelling mistakes in comments mikael@frmp8452 parents: 260 diff changeset	3126 // Public function to (un)set multimode...
260 33e1a05864a6 Add "verbatim multi-line" mode, with commands disabled mikael@frmp8452 parents: 252 diff changeset	3127 // Convention:
33e1a05864a6 Add "verbatim multi-line" mode, with commands disabled mikael@frmp8452 parents: 252 diff changeset	3128 // 0 = disabled / 1 = multimode / 2 = multimode verbatim (commands disabled)
1413 f89844a0448a Remove useless inlines Mikael Berthe <mikael@lilotux.net> parents: 1394 diff changeset	3129 void scr_set_multimode(int enable, char *subject)
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3130 {
807 f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3131 g_free(multiline);
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3132 multiline = NULL;
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3133
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3134 g_free(multimode_subj);
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3135 if (enable && subject)
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3136 multimode_subj = g_strdup(subject);
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3137 else
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3138 multimode_subj = NULL;
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3139
260 33e1a05864a6 Add "verbatim multi-line" mode, with commands disabled mikael@frmp8452 parents: 252 diff changeset	3140 multimode = enable;
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3141 }
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3142
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3143 // scr_get_multiline()
261 259ed1de5bdc Fix spelling mistakes in comments mikael@frmp8452 parents: 260 diff changeset	3144 // Public function to get the current multi-line.
1413 f89844a0448a Remove useless inlines Mikael Berthe <mikael@lilotux.net> parents: 1394 diff changeset	3145 const char *scr_get_multiline(void)
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3146 {
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3147 if (multimode && multiline)
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3148 return multiline;
807 f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3149 return NULL;
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3150 }
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3151
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3152 // scr_get_multimode_subj()
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3153 // Public function to get the multi-line subject, if any.
1413 f89844a0448a Remove useless inlines Mikael Berthe <mikael@lilotux.net> parents: 1394 diff changeset	3154 const char *scr_get_multimode_subj(void)
807 f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3155 {
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3156 if (multimode)
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3157 return multimode_subj;
f6cda389db48 Allow messages with a subject (/msay) Mikael Berthe <mikael@lilotux.net> parents: 806 diff changeset	3158 return NULL;
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3159 }
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3160
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3161 // scr_append_multiline(line)
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3162 // Public function to append a line to the current multi-line message.
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3163 // Skip empty leading lines.
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3164 void scr_append_multiline(const char *line)
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3165 {
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3166 static int num;
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3167
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3168 if (!multimode) {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	3169 scr_LogPrint(LPRINT_NORMAL, "Error: Not in multi-line message mode!");
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3170 return;
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3171 }
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3172 if (multiline) {
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3173 int len = strlen(multiline)+strlen(line)+2;
252 cb7f944741e4 [/trunk] Changeset 265 by mikael mikael parents: 238 diff changeset	3174 if (len >= HBB_BLOCKSIZE - 1) {
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3175 // We don't handle single messages with size > HBB_BLOCKSIZE
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3176 // (see hbuf)
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	3177 scr_LogPrint(LPRINT_NORMAL, "Your multi-line message is too big, "
bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	3178 "this line has not been added.");
bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	3179 scr_LogPrint(LPRINT_NORMAL, "Please send this part now...");
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3180 return;
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3181 }
276 627925d885de Limit the number of lines in multi-line messages Mikael Berthe <mikael@lilotux.net> parents: 271 diff changeset	3182 if (num >= MULTILINE_MAX_LINE_NUMBER) {
627925d885de Limit the number of lines in multi-line messages Mikael Berthe <mikael@lilotux.net> parents: 271 diff changeset	3183 // We don't allow too many lines; however the maximum is arbitrary
627925d885de Limit the number of lines in multi-line messages Mikael Berthe <mikael@lilotux.net> parents: 271 diff changeset	3184 // (It should be < 1000 yet)
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	3185 scr_LogPrint(LPRINT_NORMAL, "Your message has too many lines, "
bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	3186 "this one has not been added.");
bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	3187 scr_LogPrint(LPRINT_NORMAL, "Please send this part now...");
276 627925d885de Limit the number of lines in multi-line messages Mikael Berthe <mikael@lilotux.net> parents: 271 diff changeset	3188 return;
627925d885de Limit the number of lines in multi-line messages Mikael Berthe <mikael@lilotux.net> parents: 271 diff changeset	3189 }
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3190 multiline = g_renew(char, multiline, len);
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3191 strcat(multiline, "\n");
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3192 strcat(multiline, line);
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3193 num++;
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3194 } else {
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3195 // First message line (we skip leading empty lines)
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3196 num = 0;
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3197 if (line[0]) {
419 2f9852610cf4 Small code review Mikael Berthe <mikael@lilotux.net> parents: 412 diff changeset	3198 multiline = g_strdup(line);
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3199 num++;
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3200 } else
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3201 return;
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3202 }
772 464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 771 diff changeset	3203 scr_LogPrint(LPRINT_NORMAL\|LPRINT_NOTUTF8,
464be13343a9 Store most data in UTF-8 internally Mikael Berthe <mikael@lilotux.net> parents: 771 diff changeset	3204 "Multi-line mode: line #%d added [%.25s...", num, line);
238 8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3205 }
8e30b2bb380e [/trunk] Changeset 251 by mikael mikael parents: 236 diff changeset	3206
173 09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3207 // scr_cmdhisto_addline()
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3208 // Add a line to the inputLine history
1558 3df441efb7c2 Fix gcc warnings related to inline/static uses Mikael Berthe <mikael@lilotux.net> parents: 1522 diff changeset	3209 static inline void scr_cmdhisto_addline(char *line)
173 09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3210 {
1127 fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3211 int max_histo_lines;
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3212
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3213 if (!line \|\| !*line)
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3214 return;
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3215
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3216 max_histo_lines = settings_opt_get_int("cmdhistory_lines");
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3217
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3218 if (max_histo_lines < 0)
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3219 max_histo_lines = 1;
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3220
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3221 if (max_histo_lines)
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3222 while (cmdhisto_nblines >= (guint)max_histo_lines) {
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3223 if (cmdhisto_cur && cmdhisto_cur == cmdhisto)
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3224 break;
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3225 g_free(cmdhisto->data);
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3226 cmdhisto = g_list_delete_link(cmdhisto, cmdhisto);
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3227 cmdhisto_nblines--;
fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3228 }
173 09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3229
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3230 cmdhisto = g_list_append(cmdhisto, g_strdup(line));
1127 fddf2fef7b83 Add option "cmdhistory_lines" Mikael Berthe <mikael@lilotux.net> parents: 1122 diff changeset	3231 cmdhisto_nblines++;
173 09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3232 }
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3233
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3234 // scr_cmdhisto_prev()
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3235 // Look for previous line beginning w/ the given mask in the inputLine history
175 7b7dd6d69f58 [/trunk] Changeset 187 by mikael mikael parents: 174 diff changeset	3236 // Returns NULL if none found
336 eb994ee40029 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 332 diff changeset	3237 static const char scr_cmdhisto_prev(char mask, guint len)
173 09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3238 {
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3239 GList *hl;
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3240 if (!cmdhisto_cur) {
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3241 hl = g_list_last(cmdhisto);
174 6354625e8fb2 [/trunk] Changeset 186 by mikael mikael parents: 173 diff changeset	3242 if (hl) { // backup current line
6354625e8fb2 [/trunk] Changeset 186 by mikael mikael parents: 173 diff changeset	3243 strncpy(cmdhisto_backup, mask, INPUTLINE_LENGTH);
6354625e8fb2 [/trunk] Changeset 186 by mikael mikael parents: 173 diff changeset	3244 }
173 09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3245 } else {
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3246 hl = g_list_previous(cmdhisto_cur);
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3247 }
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3248 while (hl) {
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3249 if (!strncmp((char*)hl->data, mask, len)) {
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3250 // Found a match
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3251 cmdhisto_cur = hl;
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3252 return (const char*)hl->data;
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3253 }
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3254 hl = g_list_previous(hl);
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3255 }
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3256 return NULL;
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3257 }
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3258
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3259 // scr_cmdhisto_next()
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3260 // Look for next line beginning w/ the given mask in the inputLine history
175 7b7dd6d69f58 [/trunk] Changeset 187 by mikael mikael parents: 174 diff changeset	3261 // Returns NULL if none found
336 eb994ee40029 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 332 diff changeset	3262 static const char scr_cmdhisto_next(char mask, guint len)
173 09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3263 {
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3264 GList *hl;
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3265 if (!cmdhisto_cur) return NULL;
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3266 hl = cmdhisto_cur;
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3267 while ((hl = g_list_next(hl)) != NULL)
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3268 if (!strncmp((char*)hl->data, mask, len)) {
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3269 // Found a match
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3270 cmdhisto_cur = hl;
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3271 return (const char*)hl->data;
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3272 }
175 7b7dd6d69f58 [/trunk] Changeset 187 by mikael mikael parents: 174 diff changeset	3273 // If the "backuped" line matches, we'll use it
7b7dd6d69f58 [/trunk] Changeset 187 by mikael mikael parents: 174 diff changeset	3274 if (strncmp(cmdhisto_backup, mask, len)) return NULL; // No match
174 6354625e8fb2 [/trunk] Changeset 186 by mikael mikael parents: 173 diff changeset	3275 cmdhisto_cur = NULL;
6354625e8fb2 [/trunk] Changeset 186 by mikael mikael parents: 173 diff changeset	3276 return cmdhisto_backup;
173 09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3277 }
09e24917059d [/trunk] Changeset 185 by mikael mikael parents: 168 diff changeset	3278
1903 75a0a22bbf78 Fix issue #54 -- command line corruption Mikael Berthe <mikael@lilotux.net> parents: 1863 diff changeset	3279 static char _strmove(char dst, const char *src)
75a0a22bbf78 Fix issue #54 -- command line corruption Mikael Berthe <mikael@lilotux.net> parents: 1863 diff changeset	3280 {
75a0a22bbf78 Fix issue #54 -- command line corruption Mikael Berthe <mikael@lilotux.net> parents: 1863 diff changeset	3281 char *dest = dst;
75a0a22bbf78 Fix issue #54 -- command line corruption Mikael Berthe <mikael@lilotux.net> parents: 1863 diff changeset	3282 while ((dest++ = src++) != '\0')
75a0a22bbf78 Fix issue #54 -- command line corruption Mikael Berthe <mikael@lilotux.net> parents: 1863 diff changeset	3283 ;
75a0a22bbf78 Fix issue #54 -- command line corruption Mikael Berthe <mikael@lilotux.net> parents: 1863 diff changeset	3284 return dest;
75a0a22bbf78 Fix issue #54 -- command line corruption Mikael Berthe <mikael@lilotux.net> parents: 1863 diff changeset	3285 }
75a0a22bbf78 Fix issue #54 -- command line corruption Mikael Berthe <mikael@lilotux.net> parents: 1863 diff changeset	3286
195 cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3287 // readline_transpose_chars()
cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3288 // Drag the character before point forward over the character at
cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3289 // point, moving point forward as well. If point is at the end of
cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3290 // the line, then this transposes the two characters before point.
1059 875d2c9d399c Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	3291 void readline_transpose_chars(void)
195 cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3292 {
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3293 char c1, c2;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3294 unsigned a, b;
195 cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3295
cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3296 if (ptr_inputline == inputLine) return;
cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3297
cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3298 if (!*ptr_inputline) { // We're at EOL
cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3299 // If line is only 1 char long, nothing to do...
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3300 if (ptr_inputline == prev_char(ptr_inputline, inputLine)) return;
195 cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3301 // Transpose the two previous characters
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3302 c2 = prev_char(ptr_inputline, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3303 c1 = prev_char(c2, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3304 a = get_char(c1);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3305 b = get_char(c2);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3306 put_char(put_char(c1, b), a);
195 cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3307 } else {
196 58eb8ad9ef74 [/trunk] Changeset 208 by mikael mikael parents: 195 diff changeset	3308 // Swap the two characters before the cursor and move right.
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3309 c2 = ptr_inputline;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3310 c1 = prev_char(c2, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3311 a = get_char(c1);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3312 b = get_char(c2);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3313 put_char(put_char(c1, b), a);
195 cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3314 check_offset(1);
cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3315 }
cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3316 }
cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3317
1171 03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3318 void readline_forward_kill_word(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3319 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3320 char c, old = ptr_inputline;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3321 int spaceallowed = 1;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3322
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3323 if (! *ptr_inputline) return;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3324
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3325 for (c = ptr_inputline ; *c ; c = next_char(c)) {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3326 if (!iswalnum(get_char(c))) {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3327 if (iswblank(get_char(c))) {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3328 if (!spaceallowed) break;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3329 } else spaceallowed = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3330 } else spaceallowed = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3331 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3332
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3333 // Modify the line
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3334 for (;;) {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3335 old = c++;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3336 if (!*old++) break;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3337 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3338 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3339
195 cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3340 // readline_backward_kill_word()
194 a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3341 // Kill the word before the cursor, in input line
1059 875d2c9d399c Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	3342 void readline_backward_kill_word(void)
194 a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3343 {
a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3344 char c, old = ptr_inputline;
a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3345 int spaceallowed = 1;
a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3346
a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3347 if (ptr_inputline == inputLine) return;
a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3348
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3349 c = prev_char(ptr_inputline, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3350 for ( ; c > inputLine ; c = prev_char(c, inputLine)) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3351 if (!iswalnum(get_char(c))) {
933 ede9260be93d Input line: Improve word-related functions Mikael Berthe <mikael@lilotux.net> parents: 932 diff changeset	3352 if (iswblank(get_char(c))) {
194 a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3353 if (!spaceallowed) break;
933 ede9260be93d Input line: Improve word-related functions Mikael Berthe <mikael@lilotux.net> parents: 932 diff changeset	3354 } else spaceallowed = 0;
194 a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3355 } else spaceallowed = 0;
759 a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3356 }
194 a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3357
1280 8b621f980321 readline_backward_kill_word() makes a stop at the "command" character Mikael Berthe <mikael@lilotux.net> parents: 1279 diff changeset	3358 if (c == inputLine && *c == COMMAND_CHAR && old != c+1) {
8b621f980321 readline_backward_kill_word() makes a stop at the "command" character Mikael Berthe <mikael@lilotux.net> parents: 1279 diff changeset	3359 c = next_char(c);
8b621f980321 readline_backward_kill_word() makes a stop at the "command" character Mikael Berthe <mikael@lilotux.net> parents: 1279 diff changeset	3360 } else if (c != inputLine \|\| iswblank(get_char(c))) {
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3361 if ((c < prev_char(ptr_inputline, inputLine)) && (!iswalnum(get_char(c))))
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3362 c = next_char(c);
1280 8b621f980321 readline_backward_kill_word() makes a stop at the "command" character Mikael Berthe <mikael@lilotux.net> parents: 1279 diff changeset	3363 }
194 a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3364
a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3365 // Modify the line
a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3366 ptr_inputline = c;
1903 75a0a22bbf78 Fix issue #54 -- command line corruption Mikael Berthe <mikael@lilotux.net> parents: 1863 diff changeset	3367 _strmove(ptr_inputline, old);
195 cdaa53d5ef70 [/trunk] Changeset 207 by mikael mikael parents: 194 diff changeset	3368 check_offset(-1);
194 a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3369 }
a05d5c3876ec [/trunk] Changeset 206 by mikael mikael parents: 190 diff changeset	3370
759 a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3371 // readline_backward_word()
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3372 // Move back to the start of the current or previous word
1059 875d2c9d399c Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	3373 void readline_backward_word(void)
759 a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3374 {
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3375 int i = 0;
759 a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3376
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3377 if (ptr_inputline == inputLine) return;
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3378
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3379 if (iswalnum(get_char(ptr_inputline)) &&
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3380 !iswalnum(get_char(prev_char(ptr_inputline, inputLine))))
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3381 i--;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3382
1333 e30a9d907105 Minor coding style adjustments Mikael Berthe <mikael@lilotux.net> parents: 1314 diff changeset	3383 for ( ;
e30a9d907105 Minor coding style adjustments Mikael Berthe <mikael@lilotux.net> parents: 1314 diff changeset	3384 ptr_inputline > inputLine;
e30a9d907105 Minor coding style adjustments Mikael Berthe <mikael@lilotux.net> parents: 1314 diff changeset	3385 ptr_inputline = prev_char(ptr_inputline, inputLine)) {
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3386 if (!iswalnum(get_char(ptr_inputline))) {
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3387 if (i) {
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3388 ptr_inputline = next_char(ptr_inputline);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3389 break;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3390 }
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3391 } else i++;
759 a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3392 }
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3393
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3394 check_offset(-1);
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3395 }
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3396
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3397 // readline_forward_word()
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3398 // Move forward to the end of the next word
1059 875d2c9d399c Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1058 diff changeset	3399 void readline_forward_word(void)
759 a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3400 {
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3401 int stopsymbol_allowed = 1;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3402
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3403 while (*ptr_inputline) {
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3404 if (!iswalnum(get_char(ptr_inputline))) {
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3405 if (!stopsymbol_allowed) break;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3406 } else stopsymbol_allowed = 0;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3407 ptr_inputline = next_char(ptr_inputline);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3408 }
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3409
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3410 check_offset(1);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3411 }
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3412
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3413 void readline_updowncase_word(int upcase)
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3414 {
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3415 int stopsymbol_allowed = 1;
759 a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3416
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3417 while (*ptr_inputline) {
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3418 if (!iswalnum(get_char(ptr_inputline))) {
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3419 if (!stopsymbol_allowed) break;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3420 } else {
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3421 stopsymbol_allowed = 0;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3422 if (upcase)
1748 51a23403cc80 Fix readline_updowncase_word() and readline_capitalize_word() wrt UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 1743 diff changeset	3423 put_char(ptr_inputline, towupper(get_char(ptr_inputline)));
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3424 else
1748 51a23403cc80 Fix readline_updowncase_word() and readline_capitalize_word() wrt UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 1743 diff changeset	3425 put_char(ptr_inputline, towlower(get_char(ptr_inputline)));
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3426 }
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3427 ptr_inputline = next_char(ptr_inputline);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3428 }
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3429
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3430 check_offset(1);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3431 }
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3432
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3433 void readline_capitalize_word(void)
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3434 {
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3435 int stopsymbol_allowed = 1;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3436 int upcased = 0;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3437
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3438 while (*ptr_inputline) {
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3439 if (!iswalnum(get_char(ptr_inputline))) {
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3440 if (!stopsymbol_allowed) break;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3441 } else {
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3442 stopsymbol_allowed = 0;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3443 if (!upcased) {
1748 51a23403cc80 Fix readline_updowncase_word() and readline_capitalize_word() wrt UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 1743 diff changeset	3444 put_char(ptr_inputline, towupper(get_char(ptr_inputline)));
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3445 upcased = 1;
1748 51a23403cc80 Fix readline_updowncase_word() and readline_capitalize_word() wrt UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 1743 diff changeset	3446 } else
51a23403cc80 Fix readline_updowncase_word() and readline_capitalize_word() wrt UTF-8 Mikael Berthe <mikael@lilotux.net> parents: 1743 diff changeset	3447 put_char(ptr_inputline, towlower(get_char(ptr_inputline)));
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3448 }
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3449 ptr_inputline = next_char(ptr_inputline);
759 a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3450 }
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3451
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3452 check_offset(1);
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3453 }
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right) Mikael Berthe <mikael@lilotux.net> parents: 758 diff changeset	3454
1171 03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3455 void readline_backward_char(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3456 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3457 if (ptr_inputline == (char*)&inputLine) return;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3458
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3459 ptr_inputline = prev_char(ptr_inputline, inputLine);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3460 check_offset(-1);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3461 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3462
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3463 void readline_forward_char(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3464 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3465 if (!*ptr_inputline) return;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3466
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3467 ptr_inputline = next_char(ptr_inputline);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3468 check_offset(1);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3469 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3470
1177 10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3471 // readline_accept_line(down_history)
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3472 // Validate current command line.
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3473 // If down_history is true, load the next history line.
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3474 int readline_accept_line(int down_history)
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3475 {
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	3476 scr_check_auto_away(TRUE);
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3477 if (process_line(inputLine))
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3478 return 255;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3479 // Add line to history
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3480 scr_cmdhisto_addline(inputLine);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3481 // Reset the line
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3482 ptr_inputline = inputLine;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3483 *ptr_inputline = 0;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3484 inputline_offset = 0;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3485
1177 10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3486 if (down_history) {
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3487 // Use next history line instead of a blank line
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3488 const char *l = scr_cmdhisto_next("", 0);
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3489 if (l) strcpy(inputLine, l);
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3490 // Reset backup history line
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3491 cmdhisto_backup[0] = 0;
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3492 } else {
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3493 // Reset history line pointer
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3494 cmdhisto_cur = NULL;
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist() Mikael Berthe <mikael@lilotux.net> parents: 1176 diff changeset	3495 }
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3496 return 0;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3497 }
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3498
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3499 void readline_cancel_completion(void)
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3500 {
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3501 scr_cancel_current_completion();
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3502 scr_end_current_completion();
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3503 check_offset(-1);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3504 }
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3505
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3506 void readline_do_completion(void)
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3507 {
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3508 int i, n;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3509
1413 f89844a0448a Remove useless inlines Mikael Berthe <mikael@lilotux.net> parents: 1394 diff changeset	3510 if (multimode != 2) {
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3511 // Not in verbatim multi-line mode
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3512 scr_handle_tab();
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3513 } else {
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3514 // Verbatim multi-line mode: expand tab
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3515 char tabstr[9];
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3516 n = 8 - (ptr_inputline - inputLine) % 8;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3517 for (i = 0; i < n; i++)
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3518 tabstr[i] = ' ';
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3519 tabstr[i] = '\0';
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3520 scr_insert_text(tabstr);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3521 }
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3522 check_offset(0);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3523 }
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3524
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3525 void readline_refresh_screen(void)
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3526 {
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	3527 scr_check_auto_away(TRUE);
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	3528 parse_colors();
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3529 scr_Resize();
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3530 redrawwin(stdscr);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3531 }
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3532
1503 c74cfe7fd848 Add option --show-roster to command chat_disable. Mikael Berthe <mikael@lilotux.net> parents: 1502 diff changeset	3533 void readline_disable_chat_mode(guint show_roster)
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3534 {
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	3535 scr_check_auto_away(TRUE);
1950 aec86670047b Automatically set readmark flag Mikael Berthe <mikael@lilotux.net> parents: 1949 diff changeset	3536 if (chatmode)
aec86670047b Automatically set readmark flag Mikael Berthe <mikael@lilotux.net> parents: 1949 diff changeset	3537 scr_buffer_readmark(TRUE);
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3538 currentWindow = NULL;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3539 chatmode = FALSE;
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3540 if (current_buddy)
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3541 buddy_setflags(BUDDATA(current_buddy), ROSTER_FLAG_LOCK, FALSE);
1503 c74cfe7fd848 Add option --show-roster to command chat_disable. Mikael Berthe <mikael@lilotux.net> parents: 1502 diff changeset	3542 if (show_roster)
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	3543 scr_roster_visibility(1);
e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	3544 scr_update_chat_status(FALSE);
1172 334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3545 top_panel(chatPanel);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3546 top_panel(inputPanel);
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3547 update_panels();
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3548 }
334ae9f498f1 Add some more iline functions (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1171 diff changeset	3549
1190 be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3550 void readline_hist_beginning_search_bwd(void)
1171 03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3551 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3552 const char *l = scr_cmdhisto_prev(inputLine, ptr_inputline-inputLine);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3553 if (l) strcpy(inputLine, l);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3554 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3555
1190 be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3556 void readline_hist_beginning_search_fwd(void)
1171 03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3557 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3558 const char *l = scr_cmdhisto_next(inputLine, ptr_inputline-inputLine);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3559 if (l) strcpy(inputLine, l);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3560 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3561
1190 be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3562 void readline_hist_prev(void)
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3563 {
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3564 const char *l = scr_cmdhisto_prev(inputLine, 0);
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3565 if (l) {
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3566 strcpy(inputLine, l);
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3567 // Set the pointer at the EOL.
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3568 // We have to move it to BOL first, because we could be too far already.
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3569 readline_iline_start();
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3570 readline_iline_end();
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3571 }
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3572 }
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3573
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3574 void readline_hist_next(void)
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3575 {
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3576 const char *l = scr_cmdhisto_next(inputLine, 0);
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3577 if (l) {
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3578 strcpy(inputLine, l);
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3579 // Set the pointer at the EOL.
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3580 // We have to move it to BOL first, because we could be too far already.
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3581 readline_iline_start();
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3582 readline_iline_end();
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3583 }
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3584 }
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions Mikael Berthe <mikael@lilotux.net> parents: 1187 diff changeset	3585
1171 03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3586 void readline_backward_kill_char(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3587 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3588 char src, c;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3589
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3590 if (ptr_inputline == (char*)&inputLine)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3591 return;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3592
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3593 src = ptr_inputline;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3594 c = prev_char(ptr_inputline, inputLine);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3595 ptr_inputline = c;
1903 75a0a22bbf78 Fix issue #54 -- command line corruption Mikael Berthe <mikael@lilotux.net> parents: 1863 diff changeset	3596 _strmove(ptr_inputline, src);
1171 03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3597 check_offset(-1);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3598 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3599
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3600 void readline_forward_kill_char(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3601 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3602 if (!*ptr_inputline)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3603 return;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3604
1903 75a0a22bbf78 Fix issue #54 -- command line corruption Mikael Berthe <mikael@lilotux.net> parents: 1863 diff changeset	3605 _strmove(ptr_inputline, next_char(ptr_inputline));
1171 03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3606 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3607
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3608 void readline_iline_start(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3609 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3610 ptr_inputline = inputLine;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3611 inputline_offset = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3612 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3613
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3614 void readline_iline_end(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3615 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3616 for (; *ptr_inputline; ptr_inputline++) ;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3617 check_offset(1);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3618 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3619
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3620 void readline_backward_kill_iline(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3621 {
1863 2b013c0f949a readline: Make backward_kill_iline() consistent with backward_kill_word() Mikael Berthe <mikael@lilotux.net> parents: 1821 diff changeset	3622 char *dest = inputLine;
2b013c0f949a readline: Make backward_kill_iline() consistent with backward_kill_word() Mikael Berthe <mikael@lilotux.net> parents: 1821 diff changeset	3623
2b013c0f949a readline: Make backward_kill_iline() consistent with backward_kill_word() Mikael Berthe <mikael@lilotux.net> parents: 1821 diff changeset	3624 if (ptr_inputline == inputLine) return;
2b013c0f949a readline: Make backward_kill_iline() consistent with backward_kill_word() Mikael Berthe <mikael@lilotux.net> parents: 1821 diff changeset	3625
2b013c0f949a readline: Make backward_kill_iline() consistent with backward_kill_word() Mikael Berthe <mikael@lilotux.net> parents: 1821 diff changeset	3626 if (*dest == COMMAND_CHAR && ptr_inputline != dest+1)
2b013c0f949a readline: Make backward_kill_iline() consistent with backward_kill_word() Mikael Berthe <mikael@lilotux.net> parents: 1821 diff changeset	3627 dest = next_char(dest);
2b013c0f949a readline: Make backward_kill_iline() consistent with backward_kill_word() Mikael Berthe <mikael@lilotux.net> parents: 1821 diff changeset	3628
1903 75a0a22bbf78 Fix issue #54 -- command line corruption Mikael Berthe <mikael@lilotux.net> parents: 1863 diff changeset	3629 _strmove(dest, ptr_inputline);
1863 2b013c0f949a readline: Make backward_kill_iline() consistent with backward_kill_word() Mikael Berthe <mikael@lilotux.net> parents: 1821 diff changeset	3630 ptr_inputline = dest;
1171 03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3631 inputline_offset = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3632 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3633
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3634 void readline_forward_kill_iline(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3635 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3636 *ptr_inputline = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3637 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3638
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3639 void readline_send_multiline(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3640 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3641 // Validate current multi-line
1413 f89844a0448a Remove useless inlines Mikael Berthe <mikael@lilotux.net> parents: 1394 diff changeset	3642 if (multimode)
1187 16abe7ec3056 Fix a conflict between verbatim multiline mode and the key binding system Mikael Berthe <mikael@lilotux.net> parents: 1186 diff changeset	3643 process_command(mkcmdstr("msay send"), TRUE);
1171 03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3644 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1170 diff changeset	3645
1945 518740bcd78b Add /iline iline_insert (Hermitifier) Mikael Berthe <mikael@lilotux.net> parents: 1942 diff changeset	3646 void readline_insert(const char *toinsert)
518740bcd78b Add /iline iline_insert (Hermitifier) Mikael Berthe <mikael@lilotux.net> parents: 1942 diff changeset	3647 {
518740bcd78b Add /iline iline_insert (Hermitifier) Mikael Berthe <mikael@lilotux.net> parents: 1942 diff changeset	3648 if (!toinsert \|\| !*toinsert) return;
518740bcd78b Add /iline iline_insert (Hermitifier) Mikael Berthe <mikael@lilotux.net> parents: 1942 diff changeset	3649
518740bcd78b Add /iline iline_insert (Hermitifier) Mikael Berthe <mikael@lilotux.net> parents: 1942 diff changeset	3650 scr_insert_text(toinsert);
518740bcd78b Add /iline iline_insert (Hermitifier) Mikael Berthe <mikael@lilotux.net> parents: 1942 diff changeset	3651 check_offset(0);
518740bcd78b Add /iline iline_insert (Hermitifier) Mikael Berthe <mikael@lilotux.net> parents: 1942 diff changeset	3652 }
518740bcd78b Add /iline iline_insert (Hermitifier) Mikael Berthe <mikael@lilotux.net> parents: 1942 diff changeset	3653
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3654 // which_row()
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3655 // Tells which row our cursor is in, in the command line.
503 ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3656 // -2 -> normal text
ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3657 // -1 -> room: nickname completion
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3658 // 0 -> command
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3659 // 1 -> parameter 1 (etc.)
102 2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael mikael parents: 101 diff changeset	3660 // If > 0, then *p_row is set to the beginning of the row
503 ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3661 static int which_row(const char **p_row)
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3662 {
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3663 int row = -1;
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3664 char *p;
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3665 int quote = FALSE;
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3666
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3667 // Not a command?
967 303408ef5e5d Configurable command character Alexis Hildebrandt parents: 966 diff changeset	3668 if ((ptr_inputline == inputLine) \|\| (inputLine[0] != COMMAND_CHAR)) {
503 ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3669 if (!current_buddy) return -2;
ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3670 if (buddy_gettype(BUDDATA(current_buddy)) == ROSTER_TYPE_ROOM) {
ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3671 *p_row = inputLine;
ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3672 return -1;
ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3673 }
ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3674 return -2;
ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3675 }
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3676
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3677 // This is a command
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3678 row = 0;
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3679 for (p = inputLine ; p < ptr_inputline ; p = next_char(p)) {
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3680 if (quote) {
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3681 if (p == '"' && (p-1) != '\\')
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3682 quote = FALSE;
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3683 continue;
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3684 }
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3685 if (p == '"' && (p-1) != '\\') {
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3686 quote = TRUE;
121 94b251102069 [/trunk] Changeset 134 by mikael mikael parents: 120 diff changeset	3687 } else if (*p == ' ') {
94b251102069 [/trunk] Changeset 134 by mikael mikael parents: 120 diff changeset	3688 if (*(p-1) != ' ')
94b251102069 [/trunk] Changeset 134 by mikael mikael parents: 120 diff changeset	3689 row++;
102 2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael mikael parents: 101 diff changeset	3690 *p_row = p+1;
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael mikael parents: 101 diff changeset	3691 }
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3692 }
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3693 return row;
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3694 }
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3695
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	3696 // scr_insert_text()
300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	3697 // Insert the given text at the current cursor position.
300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	3698 // The cursor is moved. We don't check if the cursor still is in the screen
300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	3699 // after, the caller should do that.
336 eb994ee40029 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 332 diff changeset	3700 static void scr_insert_text(const char *text)
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3701 {
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3702 char tmpLine[INPUTLINE_LENGTH+1];
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3703 int len = strlen(text);
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3704 // Check the line isn't too long
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3705 if (strlen(inputLine) + len >= INPUTLINE_LENGTH) {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	3706 scr_LogPrint(LPRINT_LOGNORM, "Cannot insert text, line too long.");
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3707 return;
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3708 }
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3709
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3710 strcpy(tmpLine, ptr_inputline);
419 2f9852610cf4 Small code review Mikael Berthe <mikael@lilotux.net> parents: 412 diff changeset	3711 strcpy(ptr_inputline, text);
2f9852610cf4 Small code review Mikael Berthe <mikael@lilotux.net> parents: 412 diff changeset	3712 ptr_inputline += len;
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3713 strcpy(ptr_inputline, tmpLine);
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3714 }
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3715
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3716 static void scr_cancel_current_completion(void);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3717
143 300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	3718 // scr_handle_tab()
300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	3719 // Function called when tab is pressed.
300bb88f631f [/trunk] Changeset 155 by mikael mikael parents: 142 diff changeset	3720 // Initiate or continue a completion...
336 eb994ee40029 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 332 diff changeset	3721 static void scr_handle_tab(void)
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3722 {
102 2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael mikael parents: 101 diff changeset	3723 int nrow;
503 ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3724 const char *row;
102 2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael mikael parents: 101 diff changeset	3725 const char *cchar;
103 93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3726 guint compl_categ;
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3727
740 1877838d3c27 Kill two gcc warnings Mikael Berthe <mikael@lilotux.net> parents: 739 diff changeset	3728 row = inputLine; // (Kills a GCC warning)
102 2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael mikael parents: 101 diff changeset	3729 nrow = which_row(&row);
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3730
503 ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3731 // a) No completion if no leading slash ('cause not a command),
ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3732 // unless this is a room (then, it is a nickname completion)
103 93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3733 // b) We can't have more than 2 parameters (we use 2 flags)
503 ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3734 if ((nrow == -2) \|\| (nrow == 3 && !completion_started) \|\| nrow > 3)
ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3735 return;
102 2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael mikael parents: 101 diff changeset	3736
503 ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3737 if (nrow == 0) { // Command completion
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3738 row = next_char(inputLine);
103 93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3739 compl_categ = COMPL_CMD;
503 ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3740 } else if (nrow == -1) { // Nickname completion
ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3741 compl_categ = COMPL_RESOURCE;
ddec224c2318 MUC: nickname completion Mikael Berthe <mikael@lilotux.net> parents: 499 diff changeset	3742 } else { // Other completion, depending on the command
285 edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3743 int alias = FALSE;
edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3744 cmd *com;
edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3745 char *xpline = expandalias(inputLine);
edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3746 com = cmd_get(xpline);
edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3747 if (xpline != inputLine) {
edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3748 // This is an alias, so we can't complete rows > 0
edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3749 alias = TRUE;
edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3750 g_free(xpline);
edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3751 }
edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3752 if ((!com && (!alias \|\| !completion_started)) \|\| !row) {
374 bd5638c21834 Improve logging system (traces) Mikael Berthe <mikael@lilotux.net> parents: 373 diff changeset	3753 scr_LogPrint(LPRINT_NORMAL, "I cannot complete that...");
103 93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3754 return;
93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3755 }
285 edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3756 if (!alias)
edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3757 compl_categ = com->completion_flags[nrow-1];
edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3758 else
edc263a5d350 Add /alias command Mikael Berthe <mikael@lilotux.net> parents: 281 diff changeset	3759 compl_categ = 0;
103 93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3760 }
93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3761
93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3762 if (!completion_started) {
1076 b9698c89f46d Fix memory leak in scr_handle_tab() Mikael Berthe <mikael@lilotux.net> parents: 1075 diff changeset	3763 guint dynlist;
1927 3e3e73bb43f5 Do not call compl_get_category_list() needlessly Mikael Berthe <mikael@lilotux.net> parents: 1918 diff changeset	3764 GSList *list;
3e3e73bb43f5 Do not call compl_get_category_list() needlessly Mikael Berthe <mikael@lilotux.net> parents: 1918 diff changeset	3765
3e3e73bb43f5 Do not call compl_get_category_list() needlessly Mikael Berthe <mikael@lilotux.net> parents: 1918 diff changeset	3766 if (!compl_categ)
3e3e73bb43f5 Do not call compl_get_category_list() needlessly Mikael Berthe <mikael@lilotux.net> parents: 1918 diff changeset	3767 return; // Nothing to complete
3e3e73bb43f5 Do not call compl_get_category_list() needlessly Mikael Berthe <mikael@lilotux.net> parents: 1918 diff changeset	3768
3e3e73bb43f5 Do not call compl_get_category_list() needlessly Mikael Berthe <mikael@lilotux.net> parents: 1918 diff changeset	3769 list = compl_get_category_list(compl_categ, &dynlist);
103 93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3770 if (list) {
1228 9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3771 guint n;
103 93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3772 char *prefix = g_strndup(row, ptr_inputline-row);
93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3773 // Init completion
1756 e2c084204583 Add (optional) suffix after nick completion in Multi-User Chats Mikael Berthe <mikael@lilotux.net> parents: 1748 diff changeset	3774 n = new_completion(prefix, list,
e2c084204583 Add (optional) suffix after nick completion in Multi-User Chats Mikael Berthe <mikael@lilotux.net> parents: 1748 diff changeset	3775 (compl_categ == COMPL_RESOURCE ?
1793 c3ddb52f1055 Rename completion_muc_suffix to muc_completion_suffix Myhailo Danylenko <isbear@ukrpost.net> parents: 1791 diff changeset	3776 settings_opt_get("muc_completion_suffix") : NULL));
103 93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3777 g_free(prefix);
1228 9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3778 if (n == 0 && nrow == -1) {
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3779 // This is a MUC room and we can't complete from the beginning of the
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3780 // line. Let's try a bit harder and complete the current word.
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3781 row = prev_char(ptr_inputline, inputLine);
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3782 while (row >= inputLine) {
1239 eb9fc5d6d085 MUC: Nickname completion starts from any non-space character Mikael Berthe <mikael@lilotux.net> parents: 1229 diff changeset	3783 if (iswspace(get_char(row)) \|\| get_char(row) == '(') {
1228 9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3784 row = next_char((char*)row);
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3785 break;
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3786 }
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3787 if (row == inputLine)
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3788 break;
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3789 row = prev_char((char*)row, inputLine);
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3790 }
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3791 // There's no need to try again if row == inputLine
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3792 if (row > inputLine) {
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3793 prefix = g_strndup(row, ptr_inputline-row);
1756 e2c084204583 Add (optional) suffix after nick completion in Multi-User Chats Mikael Berthe <mikael@lilotux.net> parents: 1748 diff changeset	3794 new_completion(prefix, list, NULL);
1228 9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3795 g_free(prefix);
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3796 }
9a68fe4515dc Improve MUC nickname completion Mikael Berthe <mikael@lilotux.net> parents: 1227 diff changeset	3797 }
1076 b9698c89f46d Fix memory leak in scr_handle_tab() Mikael Berthe <mikael@lilotux.net> parents: 1075 diff changeset	3798 // Free the list if it's a dynamic one
b9698c89f46d Fix memory leak in scr_handle_tab() Mikael Berthe <mikael@lilotux.net> parents: 1075 diff changeset	3799 if (dynlist) {
b9698c89f46d Fix memory leak in scr_handle_tab() Mikael Berthe <mikael@lilotux.net> parents: 1075 diff changeset	3800 GSList *slp;
b9698c89f46d Fix memory leak in scr_handle_tab() Mikael Berthe <mikael@lilotux.net> parents: 1075 diff changeset	3801 for (slp = list; slp; slp = g_slist_next(slp))
b9698c89f46d Fix memory leak in scr_handle_tab() Mikael Berthe <mikael@lilotux.net> parents: 1075 diff changeset	3802 g_free(slp->data);
b9698c89f46d Fix memory leak in scr_handle_tab() Mikael Berthe <mikael@lilotux.net> parents: 1075 diff changeset	3803 g_slist_free(list);
b9698c89f46d Fix memory leak in scr_handle_tab() Mikael Berthe <mikael@lilotux.net> parents: 1075 diff changeset	3804 }
103 93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3805 // Now complete
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3806 cchar = complete();
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3807 if (cchar)
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3808 scr_insert_text(cchar);
103 93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3809 completion_started = TRUE;
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3810 }
103 93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3811 } else { // Completion already initialized
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3812 scr_cancel_current_completion();
103 93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3813 // Now complete again
93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3814 cchar = complete();
93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3815 if (cchar)
93dcc4e15d4a [/trunk] Changeset 117 by mikael mikael parents: 102 diff changeset	3816 scr_insert_text(cchar);
102 2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael mikael parents: 101 diff changeset	3817 }
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3818 }
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3819
336 eb994ee40029 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 332 diff changeset	3820 static void scr_cancel_current_completion(void)
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3821 {
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3822 char *c;
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3823 char *src = ptr_inputline;
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3824 guint back = cancel_completion();
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3825 guint i;
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3826 // Remove $back chars
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3827 for (i = 0; i < back; i++)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3828 ptr_inputline = prev_char(ptr_inputline, inputLine);
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3829 c = ptr_inputline;
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3830 for ( ; *src ; )
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3831 c++ = src++;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3832 *c = 0;
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3833 }
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3834
336 eb994ee40029 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 332 diff changeset	3835 static void scr_end_current_completion(void)
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3836 {
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3837 done_completion();
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3838 completion_started = FALSE;
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3839 }
f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	3840
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	3841 // check_offset(int direction)
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	3842 // Check inputline_offset value, and make sure the cursor is inside the
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	3843 // screen.
336 eb994ee40029 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 332 diff changeset	3844 static inline void check_offset(int direction)
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	3845 {
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3846 int i;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3847 char *c = &inputLine[inputline_offset];
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	3848 // Left side
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	3849 if (inputline_offset && direction <= 0) {
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3850 while (ptr_inputline <= c) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3851 for (i = 0; i < 5; i++)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3852 c = prev_char(c, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3853 if (c == inputLine)
828 319fc55b9a2b Fix a bug in check_offset() Mikael Berthe <mikael@lilotux.net> parents: 827 diff changeset	3854 break;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	3855 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	3856 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	3857 // Right side
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	3858 if (direction >= 0) {
932 fc6aaa223650 Fix a few problems with non-UTF-8 locales Mikael Berthe <mikael@lilotux.net> parents: 931 diff changeset	3859 int delta = get_char_width(c);
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3860 while (ptr_inputline > c) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3861 c = next_char(c);
932 fc6aaa223650 Fix a few problems with non-UTF-8 locales Mikael Berthe <mikael@lilotux.net> parents: 931 diff changeset	3862 delta += get_char_width(c);
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3863 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3864 c = &inputLine[inputline_offset];
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3865 while (delta >= maxX) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3866 for (i = 0; i < 5; i++) {
932 fc6aaa223650 Fix a few problems with non-UTF-8 locales Mikael Berthe <mikael@lilotux.net> parents: 931 diff changeset	3867 delta -= get_char_width(c);
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3868 c = next_char(c);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3869 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3870 }
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	3871 }
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3872 inputline_offset = c - inputLine;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	3873 }
e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	3874
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	3875 #if defined(WITH_ENCHANT) \|\| defined(WITH_ASPELL)
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3876 // prints inputLine with underlined words when misspelled
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3877 static inline void print_checked_line(void)
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3878 {
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3879 char *wprint_char_fmt = "%c";
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3880 int point;
1566 d64e0b2855fc Fix display of last character in the input line when Aspell support is enabled Mikael Berthe <mikael@lilotux.net> parents: 1563 diff changeset	3881 int nrchar = maxX;
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3882 char *ptrCur = inputLine + inputline_offset;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3883
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3884 #ifdef UNICODE
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3885 // We need this to display a single UTF-8 char... Any better solution?
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3886 if (utf8_mode)
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3887 wprint_char_fmt = "%lc";
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3888 #endif
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3889
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3890 wmove(inputWnd, 0, 0); // problem with backspace
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3891
1566 d64e0b2855fc Fix display of last character in the input line when Aspell support is enabled Mikael Berthe <mikael@lilotux.net> parents: 1563 diff changeset	3892 while (*ptrCur && nrchar-- > 0) {
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3893 point = ptrCur - inputLine;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3894 if (maskLine[point])
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3895 wattrset(inputWnd, A_UNDERLINE);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3896 wprintw(inputWnd, wprint_char_fmt, get_char(ptrCur));
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3897 wattrset(inputWnd, A_NORMAL);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3898 ptrCur = next_char(ptrCur);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3899 }
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3900 }
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3901 #endif
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3902
336 eb994ee40029 Make some functions static Mikael Berthe <mikael@lilotux.net> parents: 332 diff changeset	3903 static inline void refresh_inputline(void)
312 f0b7ff2df7e8 Ctrl-C does not terminate mcabber Mikael Berthe <mikael@lilotux.net> parents: 307 diff changeset	3904 {
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	3905 #if defined(WITH_ENCHANT) \|\| defined(WITH_ASPELL)
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	3906 if (settings_opt_get_int("spell_enable")) {
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3907 memset(maskLine, 0, INPUTLINE_LENGTH+1);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3908 spellcheck(inputLine, maskLine);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3909 }
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3910 print_checked_line();
312 f0b7ff2df7e8 Ctrl-C does not terminate mcabber Mikael Berthe <mikael@lilotux.net> parents: 307 diff changeset	3911 wclrtoeol(inputWnd);
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3912 if (*ptr_inputline) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3913 // hack to set cursor pos. Characters can have different width,
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3914 // so I know of no better way.
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3915 char c = *ptr_inputline;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3916 *ptr_inputline = 0;
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3917 print_checked_line();
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3918 *ptr_inputline = c;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	3919 }
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3920 #else
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3921 mvwprintw(inputWnd, 0, 0, "%s", inputLine + inputline_offset);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3922 wclrtoeol(inputWnd);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3923 if (*ptr_inputline) {
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3924 // hack to set cursor pos. Characters can have different width,
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3925 // so I know of no better way.
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3926 char c = *ptr_inputline;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3927 *ptr_inputline = 0;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3928 mvwprintw(inputWnd, 0, 0, "%s", inputLine + inputline_offset);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3929 *ptr_inputline = c;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3930 }
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	3931 #endif
312 f0b7ff2df7e8 Ctrl-C does not terminate mcabber Mikael Berthe <mikael@lilotux.net> parents: 307 diff changeset	3932 }
f0b7ff2df7e8 Ctrl-C does not terminate mcabber Mikael Berthe <mikael@lilotux.net> parents: 307 diff changeset	3933
389 6e895f397474 Ncurses changes + Ctrl-C does not send a signal anylore Mikael Berthe <mikael@lilotux.net> parents: 388 diff changeset	3934 void scr_handle_CtrlC(void)
312 f0b7ff2df7e8 Ctrl-C does not terminate mcabber Mikael Berthe <mikael@lilotux.net> parents: 307 diff changeset	3935 {
365 ddb6593bedc9 Fix segfault when mcabber receives an INT signal (Ctrl-C) early Mikael Berthe <mikael@lilotux.net> parents: 364 diff changeset	3936 if (!Curses) return;
315 65aa05520556 First Ctrl-C now also leaves multi-line message mode Mikael Berthe <mikael@lilotux.net> parents: 314 diff changeset	3937 // Leave multi-line mode
1187 16abe7ec3056 Fix a conflict between verbatim multiline mode and the key binding system Mikael Berthe <mikael@lilotux.net> parents: 1186 diff changeset	3938 process_command(mkcmdstr("msay abort"), TRUE);
312 f0b7ff2df7e8 Ctrl-C does not terminate mcabber Mikael Berthe <mikael@lilotux.net> parents: 307 diff changeset	3939 // Same as Ctrl-g, now
f0b7ff2df7e8 Ctrl-C does not terminate mcabber Mikael Berthe <mikael@lilotux.net> parents: 307 diff changeset	3940 scr_cancel_current_completion();
f0b7ff2df7e8 Ctrl-C does not terminate mcabber Mikael Berthe <mikael@lilotux.net> parents: 307 diff changeset	3941 scr_end_current_completion();
f0b7ff2df7e8 Ctrl-C does not terminate mcabber Mikael Berthe <mikael@lilotux.net> parents: 307 diff changeset	3942 check_offset(-1);
f0b7ff2df7e8 Ctrl-C does not terminate mcabber Mikael Berthe <mikael@lilotux.net> parents: 307 diff changeset	3943 refresh_inputline();
f0b7ff2df7e8 Ctrl-C does not terminate mcabber Mikael Berthe <mikael@lilotux.net> parents: 307 diff changeset	3944 }
f0b7ff2df7e8 Ctrl-C does not terminate mcabber Mikael Berthe <mikael@lilotux.net> parents: 307 diff changeset	3945
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3946 static void add_keyseq(char *seqstr, guint mkeycode, gint value)
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3947 {
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3948 keyseq *ks;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3949
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3950 // Let's make sure the length is correct
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3951 if (strlen(seqstr) > MAX_KEYSEQ_LENGTH) {
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3952 scr_LogPrint(LPRINT_LOGNORM, "add_keyseq(): key sequence is too long!");
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3953 return;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3954 }
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3955
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3956 ks = g_new0(keyseq, 1);
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3957 ks->seqstr = g_strdup(seqstr);
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3958 ks->mkeycode = mkeycode;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3959 ks->value = value;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3960 keyseqlist = g_slist_append(keyseqlist, ks);
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3961 }
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3962
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3963 // match_keyseq(iseq, &ret)
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3964 // Check if "iseq" is a known key escape sequence.
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3965 // Return value:
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3966 // -1 if "seq" matches no known sequence
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3967 // 0 if "seq" could match 1 or more known sequences
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3968 // >0 if "seq" matches a key sequence; the mkey code is returned
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3969 // and *ret is set to the matching keyseq structure.
952 527d6f234924 Small code cleanup Mikael Berthe <mikael@lilotux.net> parents: 949 diff changeset	3970 static inline gint match_keyseq(int iseq, keyseq *ret)
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	3971 {
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3972 GSList *ksl;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3973 keyseq *ksp;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3974 char *p, c;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3975 int *i;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3976 int needmore = FALSE;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3977
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3978 for (ksl = keyseqlist; ksl; ksl = g_slist_next(ksl)) {
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3979 ksp = ksl->data;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3980 p = ksp->seqstr;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3981 i = iseq;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3982 while (1) {
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3983 c = (unsigned char)*i;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3984 if (!*p && !c) { // Match
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3985 (*ret) = ksp;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3986 return ksp->mkeycode;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3987 }
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3988 if (!c) {
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3989 // iseq is too short
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3990 needmore = TRUE;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3991 break;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3992 } else if (!p \|\| c != p) {
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3993 // This isn't a match
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3994 break;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3995 }
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3996 p++; i++;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3997 }
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3998 }
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	3999
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4000 if (needmore)
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4001 return 0;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4002 return -1;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4003 }
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4004
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4005 static inline int match_utf8_keyseq(int *iseq)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4006 {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4007 int *strp = iseq;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4008 unsigned c = *strp++;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4009 unsigned mask = 0x80;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4010 int len = -1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4011 while (c & mask) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4012 mask >>= 1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4013 len++;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4014 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4015 if (len <= 0 \|\| len > 4)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4016 return -1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4017 c &= mask - 1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4018 while ((*strp & 0xc0) == 0x80) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4019 if (len-- <= 0) // can't happen
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4020 return -1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4021 c = (c << 6) \| (*strp++ & 0x3f);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4022 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4023 if (len)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4024 return 0;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4025 return c;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4026 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4027
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	4028 void scr_getch(keycode *kcode)
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4029 {
769 15eefed5f1de Kill a gcc warning Mikael Berthe <mikael@lilotux.net> parents: 766 diff changeset	4030 keyseq *mks = NULL;
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4031 int ks[MAX_KEYSEQ_LENGTH+1];
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4032 int i;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4033
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4034 memset(kcode, 0, sizeof(keycode));
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4035 memset(ks, 0, sizeof(ks));
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4036
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4037 kcode->value = wgetch(inputWnd);
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4038 if (utf8_mode) {
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1056 diff changeset	4039 bool ismeta = (kcode->value == 27);
1561 2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4040 #ifdef NCURSES_MOUSE_VERSION
2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4041 bool ismouse = (kcode->value == KEY_MOUSE);
2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4042
2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4043 if (ismouse) {
2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4044 MEVENT mouse;
2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4045 getmouse(&mouse);
2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4046 kcode->value = mouse.bstate;
2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4047 kcode->mcode = MKEY_MOUSE;
2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4048 return;
2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4049 } else if (ismeta)
2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4050 #else
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1056 diff changeset	4051 if (ismeta)
1561 2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4052 #endif
944 aec71ebf98fa Fix Meta + UTF-8 character Mikael Berthe <mikael@lilotux.net> parents: 940 diff changeset	4053 ks[0] = wgetch(inputWnd);
aec71ebf98fa Fix Meta + UTF-8 character Mikael Berthe <mikael@lilotux.net> parents: 940 diff changeset	4054 else
aec71ebf98fa Fix Meta + UTF-8 character Mikael Berthe <mikael@lilotux.net> parents: 940 diff changeset	4055 ks[0] = kcode->value;
aec71ebf98fa Fix Meta + UTF-8 character Mikael Berthe <mikael@lilotux.net> parents: 940 diff changeset	4056
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4057 for (i = 0; i < MAX_KEYSEQ_LENGTH - 1; i++) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4058 int match = match_utf8_keyseq(ks);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4059 if (match == -1)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4060 break;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4061 if (match > 0) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4062 kcode->value = match;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4063 kcode->utf8 = 1;
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1056 diff changeset	4064 if (ismeta)
944 aec71ebf98fa Fix Meta + UTF-8 character Mikael Berthe <mikael@lilotux.net> parents: 940 diff changeset	4065 kcode->mcode = MKEY_META;
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4066 return;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4067 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4068 ks[i + 1] = wgetch(inputWnd);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4069 if (ks[i + 1] == ERR)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4070 break;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4071 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4072 while (i > 0)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4073 ungetch(ks[i--]);
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1056 diff changeset	4074 if (ismeta)
944 aec71ebf98fa Fix Meta + UTF-8 character Mikael Berthe <mikael@lilotux.net> parents: 940 diff changeset	4075 ungetch(ks[0]);
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4076 memset(ks, 0, sizeof(ks));
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4077 }
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4078 if (kcode->value != 27)
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4079 return;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4080
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4081 // Check for escape key sequence
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4082 for (i=0; i < MAX_KEYSEQ_LENGTH; i++) {
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4083 int match;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4084 ks[i] = wgetch(inputWnd);
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4085 if (ks[i] == ERR) break;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4086 match = match_keyseq(ks, &mks);
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4087 if (match == -1) {
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4088 // No such key sequence. Let's increment i as it is a valid key.
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4089 i++;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4090 break;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4091 }
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4092 if (match > 0) {
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4093 // We have a matching sequence
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4094 kcode->mcode = mks->mkeycode;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4095 kcode->value = mks->value;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4096 return;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4097 }
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4098 }
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4099
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4100 // No match. Let's return a meta-key.
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4101 if (i > 0) {
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4102 kcode->mcode = MKEY_META;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4103 kcode->value = ks[0];
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4104 }
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4105 if (i > 1) {
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4106 // We need to push some keys back to the keyboard buffer
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4107 while (i-- > 1)
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4108 ungetch(ks[i]);
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4109 }
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4110 return;
373 af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	4111 }
af2f8ddf6a1b Move (reorganize) functions Mikael Berthe <mikael@lilotux.net> parents: 370 diff changeset	4112
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	4113 void scr_do_update(void)
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 936 diff changeset	4114 {
1942 3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	4115 if (colors_stalled)
3e39a336a992 Use guards for colors (Myhailo Danylenko) Mikael Berthe <mikael@lilotux.net> parents: 1935 diff changeset	4116 parse_colors();
939 12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 936 diff changeset	4117 doupdate();
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 936 diff changeset	4118 }
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald) Mikael Berthe <mikael@lilotux.net> parents: 936 diff changeset	4119
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4120 static int bindcommand(keycode kcode)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4121 {
945 17ef145f3326 Display and use UTF-8 key codes Mikael Berthe <mikael@lilotux.net> parents: 944 diff changeset	4122 gchar asciikey[16], asciicode[16];
764 4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4123 const gchar *boundcmd;
4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4124
945 17ef145f3326 Display and use UTF-8 key codes Mikael Berthe <mikael@lilotux.net> parents: 944 diff changeset	4125 if (kcode.utf8)
17ef145f3326 Display and use UTF-8 key codes Mikael Berthe <mikael@lilotux.net> parents: 944 diff changeset	4126 g_snprintf(asciicode, 15, "U%d", kcode.value);
17ef145f3326 Display and use UTF-8 key codes Mikael Berthe <mikael@lilotux.net> parents: 944 diff changeset	4127 else
17ef145f3326 Display and use UTF-8 key codes Mikael Berthe <mikael@lilotux.net> parents: 944 diff changeset	4128 g_snprintf(asciicode, 15, "%d", kcode.value);
17ef145f3326 Display and use UTF-8 key codes Mikael Berthe <mikael@lilotux.net> parents: 944 diff changeset	4129
764 4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4130 if (!kcode.mcode \|\| kcode.mcode == MKEY_EQUIV)
945 17ef145f3326 Display and use UTF-8 key codes Mikael Berthe <mikael@lilotux.net> parents: 944 diff changeset	4131 g_snprintf(asciikey, 15, "%s", asciicode);
764 4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4132 else if (kcode.mcode == MKEY_META)
945 17ef145f3326 Display and use UTF-8 key codes Mikael Berthe <mikael@lilotux.net> parents: 944 diff changeset	4133 g_snprintf(asciikey, 15, "M%s", asciicode);
1561 2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4134 else if (kcode.mcode == MKEY_MOUSE)
2e86c1cc4eb1 Map mouse events to p* keycodes franky parents: 1558 diff changeset	4135 g_snprintf(asciikey, 15, "p%s", asciicode);
764 4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4136 else
949 e3c49b2f8143 Fix bindings of special keys (MK) Mikael Berthe <mikael@lilotux.net>* parents: 945 diff changeset	4137 g_snprintf(asciikey, 15, "MK%d", kcode.mcode);
764 4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4138
4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4139 boundcmd = settings_get(SETTINGS_TYPE_BINDING, asciikey);
4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4140
4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4141 if (boundcmd) {
1357 7bbfb0073f88 Fix an UTF-8 problem in new hook_execute_internal() function Mikael Berthe <mikael@lilotux.net> parents: 1355 diff changeset	4142 gchar *cmdline = from_utf8(boundcmd);
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	4143 scr_check_auto_away(TRUE);
1187 16abe7ec3056 Fix a conflict between verbatim multiline mode and the key binding system Mikael Berthe <mikael@lilotux.net> parents: 1186 diff changeset	4144 if (process_command(cmdline, TRUE))
764 4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4145 return 255; // Quit
1058 c0d44a9a99bc Code cleanup Mikael Berthe <mikael@lilotux.net> parents: 1056 diff changeset	4146 g_free(cmdline);
764 4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4147 return 0;
4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4148 }
4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4149
4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4150 scr_LogPrint(LPRINT_NORMAL, "Unknown key=%s", asciikey);
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4151 #ifndef UNICODE
764 4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4152 if (utf8_mode)
930 a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4153 scr_LogPrint(LPRINT_NORMAL,
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4154 "WARNING: Compiled without full UTF-8 support!");
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger) Mikael Berthe <mikael@lilotux.net> parents: 929 diff changeset	4155 #endif
764 4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4156 return -1;
4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4157 }
4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4158
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	4159 // scr_process_key(key)
44 c10f95f959d0 [/trunk] Changeset 60 by mikael mikael parents: 42 diff changeset	4160 // Handle the pressed key, in the command line (bottom).
1780 e4378fbab5d7 Major API cleanup - bump API to 4 Mikael Berthe <mikael@lilotux.net> parents: 1761 diff changeset	4161 void scr_process_key(keycode kcode)
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	4162 {
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4163 int key = kcode.value;
931 1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4164 int display_char = FALSE;
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4165
1381 40095d413da9 Fix compilation on OpenBSD Mikael Berthe <mikael@lilotux.net> parents: 1376 diff changeset	4166 lock_chatstate = FALSE;
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	4167
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4168 switch (kcode.mcode) {
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4169 case 0:
1918 0fa6df17bc5c Fix potential issue pointed out by franky's clang report Mikael Berthe <mikael@lilotux.net> parents: 1915 diff changeset	4170 // key = kcode.value;
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4171 break;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4172 case MKEY_EQUIV:
1918 0fa6df17bc5c Fix potential issue pointed out by franky's clang report Mikael Berthe <mikael@lilotux.net> parents: 1915 diff changeset	4173 // key = kcode.value;
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4174 break;
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4175 case MKEY_META:
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4176 default:
1359 7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4177 if (bindcommand(kcode) == 255) {
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4178 mcabber_set_terminate_ui();
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4179 return;
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4180 }
764 4e15322d315e Allow binding of meta keys Mikael Berthe <mikael@lilotux.net> parents: 763 diff changeset	4181 key = ERR; // Do not process any further
758 402b0e288433 Enable "meta" key Mikael Berthe <mikael@lilotux.net> parents: 740 diff changeset	4182 }
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4183
931 1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4184 if (kcode.utf8) {
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4185 if (key != ERR && !kcode.mcode)
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4186 display_char = TRUE;
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4187 goto display;
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4188 }
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4189
758 402b0e288433 Enable "meta" key Mikael Berthe <mikael@lilotux.net> parents: 740 diff changeset	4190 switch (key) {
761 4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4191 case 0:
4532a9fe0e8c Handle some keyboard escape sequences Mikael Berthe <mikael@lilotux.net> parents: 760 diff changeset	4192 case ERR:
758 402b0e288433 Enable "meta" key Mikael Berthe <mikael@lilotux.net> parents: 740 diff changeset	4193 break;
1173 960f34ec22a2 Add init_bindings() for default key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1172 diff changeset	4194 case 9: // Tab
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1172 diff changeset	4195 readline_do_completion();
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1172 diff changeset	4196 break;
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1172 diff changeset	4197 case 13: // Enter
1935 a06d9eab14c5 Handle the Enter key on Maemo systems (diSabler) Mikael Berthe <mikael@lilotux.net> parents: 1927 diff changeset	4198 case 343: // Enter on Maemo
1359 7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4199 if (readline_accept_line(FALSE) == 255) {
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4200 mcabber_set_terminate_ui();
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4201 return;
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4202 }
1173 960f34ec22a2 Add init_bindings() for default key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1172 diff changeset	4203 break;
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1172 diff changeset	4204 case 3: // Ctrl-C
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1172 diff changeset	4205 scr_handle_CtrlC();
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1172 diff changeset	4206 break;
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1172 diff changeset	4207 case KEY_RESIZE:
1454 6b98dc22946d Add optional SIGWINCH handler (Markus Hennecke) Mikael Berthe <mikael@lilotux.net> parents: 1424 diff changeset	4208 #ifdef USE_SIGWINCH
6b98dc22946d Add optional SIGWINCH handler (Markus Hennecke) Mikael Berthe <mikael@lilotux.net> parents: 1424 diff changeset	4209 {
1660 dc03a24198a9 Do not call do_screen_refresh() on SIGWINCH Mikael Berthe <mikael@lilotux.net> parents: 1653 diff changeset	4210 struct winsize size;
dc03a24198a9 Do not call do_screen_refresh() on SIGWINCH Mikael Berthe <mikael@lilotux.net> parents: 1653 diff changeset	4211 if (ioctl(STDIN_FILENO, TIOCGWINSZ, &size) != -1)
dc03a24198a9 Do not call do_screen_refresh() on SIGWINCH Mikael Berthe <mikael@lilotux.net> parents: 1653 diff changeset	4212 resizeterm(size.ws_row, size.ws_col);
1454 6b98dc22946d Add optional SIGWINCH handler (Markus Hennecke) Mikael Berthe <mikael@lilotux.net> parents: 1424 diff changeset	4213 }
1660 dc03a24198a9 Do not call do_screen_refresh() on SIGWINCH Mikael Berthe <mikael@lilotux.net> parents: 1653 diff changeset	4214 #endif
1173 960f34ec22a2 Add init_bindings() for default key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1172 diff changeset	4215 scr_Resize();
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239) Mikael Berthe <mikael@lilotux.net> parents: 1172 diff changeset	4216 break;
499 baa812f04f24 Reorganise process_key() Mikael Berthe <mikael@lilotux.net> parents: 480 diff changeset	4217 default:
931 1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4218 display_char = TRUE;
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4219 } // switch
263 1bcc3eec08f0 Add Ctrl-o: accept-line-and-down-history mikael@frmp8452 parents: 261 diff changeset	4220
931 1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4221 display:
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4222 if (display_char) {
1394 bba74a50dedf Improve Cygwin support Mikael Berthe <mikael@lilotux.net> parents: 1390 diff changeset	4223 guint printable;
bba74a50dedf Improve Cygwin support Mikael Berthe <mikael@lilotux.net> parents: 1390 diff changeset	4224
bba74a50dedf Improve Cygwin support Mikael Berthe <mikael@lilotux.net> parents: 1390 diff changeset	4225 if (kcode.utf8) {
bba74a50dedf Improve Cygwin support Mikael Berthe <mikael@lilotux.net> parents: 1390 diff changeset	4226 printable = iswprint(key);
bba74a50dedf Improve Cygwin support Mikael Berthe <mikael@lilotux.net> parents: 1390 diff changeset	4227 } else {
bba74a50dedf Improve Cygwin support Mikael Berthe <mikael@lilotux.net> parents: 1390 diff changeset	4228 #ifdef __CYGWIN__
bba74a50dedf Improve Cygwin support Mikael Berthe <mikael@lilotux.net> parents: 1390 diff changeset	4229 printable = (isprint(key) \|\| (key >= 161 && key <= 255))
bba74a50dedf Improve Cygwin support Mikael Berthe <mikael@lilotux.net> parents: 1390 diff changeset	4230 && !is_speckey(key);
bba74a50dedf Improve Cygwin support Mikael Berthe <mikael@lilotux.net> parents: 1390 diff changeset	4231 #else
bba74a50dedf Improve Cygwin support Mikael Berthe <mikael@lilotux.net> parents: 1390 diff changeset	4232 printable = isprint(key) && !is_speckey(key);
bba74a50dedf Improve Cygwin support Mikael Berthe <mikael@lilotux.net> parents: 1390 diff changeset	4233 #endif
bba74a50dedf Improve Cygwin support Mikael Berthe <mikael@lilotux.net> parents: 1390 diff changeset	4234 }
bba74a50dedf Improve Cygwin support Mikael Berthe <mikael@lilotux.net> parents: 1390 diff changeset	4235 if (printable) {
931 1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4236 char tmpLine[INPUTLINE_LENGTH+1];
499 baa812f04f24 Reorganise process_key() Mikael Berthe <mikael@lilotux.net> parents: 480 diff changeset	4237
931 1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4238 // Check the line isn't too long
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4239 if (strlen(inputLine) + 4 > INPUTLINE_LENGTH)
1359 7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4240 return;
931 1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4241
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4242 // Insert char
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4243 strcpy(tmpLine, ptr_inputline);
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4244 ptr_inputline = put_char(ptr_inputline, key);
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4245 strcpy(ptr_inputline, tmpLine);
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4246 check_offset(1);
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4247 } else {
1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4248 // Look for a key binding.
1359 7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4249 if (!kcode.utf8 && (bindcommand(kcode) == 255)) {
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4250 mcabber_set_terminate_ui();
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4251 return;
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4252 }
931 1cd6d694ac3c Fix display of some UTF-8 chars Mikael Berthe <mikael@lilotux.net> parents: 930 diff changeset	4253 }
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	4254 }
499 baa812f04f24 Reorganise process_key() Mikael Berthe <mikael@lilotux.net> parents: 480 diff changeset	4255
157 409ff07d9fe2 [/trunk] Changeset 169 by mikael mikael parents: 154 diff changeset	4256 if (completion_started && key != 9 && key != KEY_RESIZE)
98 f20831f7d349 [/trunk] Changeset 112 by mikael mikael parents: 95 diff changeset	4257 scr_end_current_completion();
312 f0b7ff2df7e8 Ctrl-C does not terminate mcabber Mikael Berthe <mikael@lilotux.net> parents: 307 diff changeset	4258 refresh_inputline();
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	4259
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	4260 if (!lock_chatstate) {
997 d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 996 diff changeset	4261 // Set chat state to composing (1) if the user is currently composing,
d0d0cd9e39c4 Cosmetics & comments Mikael Berthe <mikael@lilotux.net> parents: 996 diff changeset	4262 // i.e. not an empty line and not a command line.
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	4263 if (inputLine[0] == 0 \|\| inputLine[0] == COMMAND_CHAR)
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	4264 set_chatstate(0);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	4265 else
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	4266 set_chatstate(1);
991 ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	4267 if (chatstate)
ef10906691bb Chatstates: add composing timeout Mikael Berthe <mikael@lilotux.net> parents: 990 diff changeset	4268 time(&chatstate_timestamp);
990 35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85) Mikael Berthe <mikael@lilotux.net> parents: 987 diff changeset	4269 }
1359 7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files Mikael Berthe <mikael@lilotux.net> parents: 1357 diff changeset	4270 return;
24 e88b15cbf2de [/trunk] Changeset 40 by mikael mikael parents: diff changeset	4271 }
576 8b3db0b555a1 Add Vim modelines Mikael Berthe <mikael@lilotux.net> parents: 539 diff changeset	4272
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4273 #if defined(WITH_ENCHANT) \|\| defined(WITH_ASPELL)
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4274 // initialization
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4275 void spellcheck_init(void)
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4276 {
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4277 int spell_enable = settings_opt_get_int("spell_enable");
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4278 const char *spell_lang = settings_opt_get("spell_lang");
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4279 #ifdef WITH_ASPELL
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4280 const char *spell_encoding = settings_opt_get("spell_encoding");
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4281 AspellCanHaveError *possible_err;
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4282 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4283
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4284 if (!spell_enable)
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4285 return;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4286
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4287 #ifdef WITH_ENCHANT
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4288 if (spell_checker) {
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4289 enchant_broker_free_dict(spell_broker, spell_checker);
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4290 enchant_broker_free(spell_broker);
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4291 spell_checker = NULL;
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4292 spell_broker = NULL;
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4293 }
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4294
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4295 spell_broker = enchant_broker_init();
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4296 spell_checker = enchant_broker_request_dict(spell_broker, spell_lang);
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4297 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4298 #ifdef WITH_ASPELL
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4299 if (spell_checker) {
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4300 delete_aspell_speller(spell_checker);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4301 delete_aspell_config(spell_config);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4302 spell_checker = NULL;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4303 spell_config = NULL;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4304 }
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4305
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4306 spell_config = new_aspell_config();
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4307 aspell_config_replace(spell_config, "encoding", spell_encoding);
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4308 aspell_config_replace(spell_config, "lang", spell_lang);
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4309 possible_err = new_aspell_speller(spell_config);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4310
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4311 if (aspell_error_number(possible_err) != 0) {
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4312 spell_checker = NULL;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4313 delete_aspell_config(spell_config);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4314 spell_config = NULL;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4315 } else {
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4316 spell_checker = to_aspell_speller(possible_err);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4317 }
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4318 #endif
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4319 }
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4320
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4321 // Deinitialization of spellchecker
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4322 void spellcheck_deinit(void)
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4323 {
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4324 if (spell_checker) {
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4325 #ifdef WITH_ENCHANT
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4326 enchant_broker_free_dict(spell_broker, spell_checker);
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4327 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4328 #ifdef WITH_ASPELL
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4329 delete_aspell_speller(spell_checker);
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4330 #endif
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4331 spell_checker = NULL;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4332 }
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4333
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4334 #ifdef WITH_ENCHANT
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4335 if (spell_broker) {
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4336 enchant_broker_free(spell_broker);
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4337 spell_broker = NULL;
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4338 }
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4339 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4340 #ifdef WITH_ASPELL
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4341 if (spell_config) {
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4342 delete_aspell_config(spell_config);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4343 spell_config = NULL;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4344 }
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4345 #endif
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4346 }
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4347
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4348 #define spell_isalpha(c) (utf8_mode ? iswalpha(get_char(c)) : isalpha(*c))
1245 e6ddd19956eb Fix Aspell support on some systems Mikael Berthe <mikael@lilotux.net> parents: 1239 diff changeset	4349
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4350 // Spell checking function
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4351 static void spellcheck(char line, char checked)
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4352 {
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4353 const char start, line_start;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4354
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4355 if (inputLine[0] == 0 \|\| inputLine[0] == COMMAND_CHAR)
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4356 return;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4357
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4358 line_start = line;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4359
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4360 while (*line) {
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4361
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4362 if (!spell_isalpha(line)) {
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4363 line = next_char(line);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4364 continue;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4365 }
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4366
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4367 if (!strncmp(line, "http://", 7)) {
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4368 line += 7; // : and / characters are 1 byte long in utf8, right?
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4369
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4370 while (!strchr(" \t\r\n", *line))
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4371 line = next_char(line); // i think line++ would be fine here?
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4372
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4373 continue;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4374 }
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4375
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4376 if (!strncmp(line, "ftp://", 6)) {
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4377 line += 6;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4378
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4379 while (!strchr(" \t\r\n", *line))
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4380 line = next_char(line);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4381
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4382 continue;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4383 }
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4384
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4385 start = line;
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4386
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4387 while (spell_isalpha(line))
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4388 line = next_char(line);
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4389
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4390 if (spell_checker &&
1590 8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4391 #ifdef WITH_ENCHANT
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4392 enchant_dict_check(spell_checker, start, line - start) != 0
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4393 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4394 #ifdef WITH_ASPELL
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4395 aspell_speller_check(spell_checker, start, line - start) == 0
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4396 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4397 )
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan) Mikael Berthe <mikael@lilotux.net> parents: 1579 diff changeset	4398 memset(&checked[start - line_start], SPELLBADCHAR, line - start);
1179 0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4399 }
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4400 }
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4401 #endif
0f7e0346d9cb Add aspell support entragian <entragian@o2.pl> parents: 1178 diff changeset	4402
1811 e6d355e50d7a Update Vim modelines Mikael Berthe <mikael@lilotux.net> parents: 1804 diff changeset	4403 /* vim: set et cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */

Mercurial > ~mikael > mcabber > hg

annotate mcabber/mcabber/screen.c @ 1984:b0470ef8669b