Mercurial > ~mikael > mcabber > hg

annotate mcabber/mcabber/screen.c @ 1954:256cfc706ae5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update readmark support Fix two small issues with readmarks.
author Mikael Berthe <mikael@lilotux.net>
date Mon, 14 Mar 2011 14:25:21 +0100
parents aec86670047b
children fad27c72a229
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
1521
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
166 #ifdef HAVE_GLIB_REGEX
1915
e09763e16e49 Fix segfault related to url_regex
franky
parents: 1903
diff changeset
167 static GRegex *url_regex = NULL;
1521
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
168 #endif
1520
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
169
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
170 GSList *keyseqlist;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
171 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
172
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
173 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
174 time_t timestamp, unsigned int prefix_flags,
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
175 int force_show, unsigned mucnicklen,
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
176 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 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
179 time_t timestamp, guint prefix_flags,
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
180 unsigned mucnicklen, gpointer xep184);
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
181
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
182 inline void scr_update_buddy_window(void);
1413
f89844a0448a Remove useless inlines
Mikael Berthe <mikael@lilotux.net>
parents: 1394
diff changeset
183 inline void scr_set_chatmode(int enable);
f89844a0448a Remove useless inlines
Mikael Berthe <mikael@lilotux.net>
parents: 1394
diff changeset
184
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
185 #define SPELLBADCHAR 5
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
186
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
187 #ifdef WITH_ENCHANT
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
188 EnchantBroker *spell_broker;
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
189 EnchantDict *spell_checker;
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
190 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
191
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
192 #ifdef WITH_ASPELL
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
193 AspellConfig *spell_config;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
194 AspellSpeller *spell_checker;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
195 #endif
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
196
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
197 typedef struct {
1489
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
198 int color_pair;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
199 int color_attrib;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
200 } ccolor;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
201
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
202 typedef struct {
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
203 char *status, *wildcard;
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
204 ccolor *color;
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
205 GPatternSpec *compiled;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
206 } rostercolor;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
207
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
208 static GSList *rostercolrules = NULL;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
209
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
210 static GHashTable *muccolors = NULL, *nickcolors = NULL;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
211
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
212 typedef struct {
1413
f89844a0448a Remove useless inlines
Mikael Berthe <mikael@lilotux.net>
parents: 1394
diff changeset
213 bool manual; // Manually set?
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
214 ccolor *color;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
215 } nickcolor;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
216
1489
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
217 static int nickcolcount = 0;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
218 static ccolor ** nickcols = NULL;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
219 static muccoltype glob_muccol = MC_OFF;
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
220
99
7fffb8a6b229 [/trunk] Changeset 113 by mikael
mikael
parents: 98
diff changeset
221 /* Functions */
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
222
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
223 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
224 {
1489
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
225 int result;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
226
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
227 if (!strcmp(name, "default"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
228 return -1;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
229 if (!strcmp(name, "black"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
230 return COLOR_BLACK;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
231 if (!strcmp(name, "red"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
232 return COLOR_RED;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
233 if (!strcmp(name, "green"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
234 return COLOR_GREEN;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
235 if (!strcmp(name, "yellow"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
236 return COLOR_YELLOW;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
237 if (!strcmp(name, "blue"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
238 return COLOR_BLUE;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
239 if (!strcmp(name, "magenta"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
240 return COLOR_MAGENTA;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
241 if (!strcmp(name, "cyan"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
242 return COLOR_CYAN;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
243 if (!strcmp(name, "white"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
244 return COLOR_WHITE;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
245
1417
783b47c9d963 Allow more than the 16 default colors (patch from mjs)
Mikael Berthe <mikael@lilotux.net>
parents: 1414
diff changeset
246 // 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
247 result = atoi(name);
783b47c9d963 Allow more than the 16 default colors (patch from mjs)
Mikael Berthe <mikael@lilotux.net>
parents: 1414
diff changeset
248 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
249 return result;
783b47c9d963 Allow more than the 16 default colors (patch from mjs)
Mikael Berthe <mikael@lilotux.net>
parents: 1414
diff changeset
250
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
251 scr_LogPrint(LPRINT_LOGNORM, "ERROR: Wrong color: %s", name);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
252 return -1;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
253 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
254
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
255 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
256 {
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
257 bool isbright = FALSE;
1295
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
258 int cl;
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
259 ccolor *ccol;
1295
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
260 if (!strncmp(color, "bright", 6)) {
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
261 isbright = TRUE;
1295
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
262 color += 6;
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
263 }
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
264 cl = find_color(color);
1295
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
265 if (cl < 0)
1489
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
266 return NULL;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
267 ccol = g_new0(ccolor, 1);
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
268 ccol->color_attrib = isbright ? A_BOLD : A_NORMAL;
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
269 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
270 return ccol;
1295
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
271 }
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
272
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
273 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
274 GDestroyNotify value_destroy_func)
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
275 {
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
276 if (*table) // Have it already
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
277 return;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
278 *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
279 g_free, value_destroy_func);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
280 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
281
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
282 // Sets the coloring mode for given MUC
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
283 // 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
284 // muc - the JID of room
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
285 // type - the new type
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
286 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
287 {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
288 gchar *muclow = g_utf8_strdown(muc, -1);
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
289 if (type == MC_REMOVE) { // Remove it
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
290 if (strcmp(muc, "*")) {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
291 if (muccolors && g_hash_table_lookup(muccolors, muclow))
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
292 g_hash_table_remove(muccolors, muclow);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
293 } else {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
294 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
295 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
296 g_free(muclow);
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
297 } else { // Add or overwrite
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
298 if (strcmp(muc, "*")) {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
299 muccoltype *value = g_new(muccoltype, 1);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
300 *value = type;
1476
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
301 ensure_string_htable(&muccolors, g_free);
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
302 g_hash_table_replace(muccolors, muclow, value);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
303 } else {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
304 glob_muccol = type;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
305 g_free(muclow);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
306 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
307 }
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
308 // Need to redraw?
1333
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
309 if (chatmode &&
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
310 ((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
311 scr_update_buddy_window();
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
312 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
313
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
314 // Sets the color for nick in MUC
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
315 // 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
316 // 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
317 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
318 {
1333
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
319 char *snick, *mnick;
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
320 bool need_update = FALSE;
1333
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
321 snick = g_strdup_printf("<%s>", nick);
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
322 mnick = g_strdup_printf("*%s ", nick);
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
323 if (!strcmp(color, "-")) { // Remove the color
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
324 if (nickcolors) {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
325 nickcolor *nc = g_hash_table_lookup(nickcolors, snick);
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
326 if (nc) { // Have this nick already
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
327 nc->manual = FALSE;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
328 nc = g_hash_table_lookup(nickcolors, mnick);
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
329 assert(nc); // Must have both at the same time
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
330 nc->manual = FALSE;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
331 }// Else -> no color saved, nothing to delete
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
332 }
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
333 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
334 g_free(mnick);
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
335 need_update = TRUE;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
336 } else {
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
337 ccolor *cl = get_user_color(color);
1489
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
338 if (!cl) {
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
339 scr_LogPrint(LPRINT_NORMAL, "No such color name");
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
340 g_free(snick);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
341 g_free(mnick);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
342 } else {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
343 nickcolor *nc = g_new(nickcolor, 1);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
344 ensure_string_htable(&nickcolors, NULL);
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
345 nc->manual = TRUE;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
346 nc->color = cl;
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
347 // Free the struct, if any there already
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
348 g_free(g_hash_table_lookup(nickcolors, mnick));
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
349 // Save the new ones
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
350 g_hash_table_replace(nickcolors, mnick, nc);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
351 g_hash_table_replace(nickcolors, snick, nc);
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
352 need_update = TRUE;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
353 }
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 if (need_update && chatmode &&
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
356 (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
357 scr_update_buddy_window();
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
358 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
359
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
360 static void free_rostercolrule(rostercolor *col)
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
361 {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
362 g_free(col->status);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
363 g_free(col->wildcard);
1489
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
364 g_free(col->color);
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
365 g_pattern_spec_free(col->compiled);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
366 g_free(col);
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
1284
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
369 // Removes all roster coloring rules
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
370 void scr_roster_clear_color(void)
1272
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 GSList *head;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
373 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
374 free_rostercolrule(head->data);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
375 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
376 g_slist_free(rostercolrules);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
377 rostercolrules = NULL;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
378 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
379
1284
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
380 // Adds, modifies or removes roster coloring rule
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
381 // color set to "-" removes the rule,
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
382 // otherwise it is modified (if exists) or added
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
383 //
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
384 // Returns weather it was successfull (therefore the roster should be
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
385 // 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
386 // name, it also prints the error.
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
387 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
388 const char *color)
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
389 {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
390 GSList *head;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
391 GSList *found = NULL;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
392 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
393 rostercolor *rc = head->data;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
394 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
395 found = head;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
396 break;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
397 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
398 }
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
399 if (!strcmp(color,"-")) { // Delete the rule
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
400 if (found) {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
401 free_rostercolrule(found->data);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
402 rostercolrules = g_slist_delete_link(rostercolrules, found);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
403 return TRUE;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
404 } else {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
405 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
406 return FALSE;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
407 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
408 } else {
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
409 ccolor *cl = get_user_color(color);
1489
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
410 if (!cl) {
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
411 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
412 return FALSE;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
413 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
414 if (found) {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
415 rostercolor *rc = found->data;
1489
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
416 g_free(rc->color);
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
417 rc->color = cl;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
418 } else {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
419 rostercolor *rc = g_new(rostercolor, 1);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
420 rc->status = g_strdup(status);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
421 rc->wildcard = g_strdup(wildcard);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
422 rc->compiled = g_pattern_spec_new(wildcard);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
423 rc->color = cl;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
424 rostercolrules = g_slist_prepend(rostercolrules, rc);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
425 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
426 return TRUE;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
427 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
428 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
429
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
430 static void parse_colors(void)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
431 {
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
432 const char *colors[] = {
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
433 "", "",
267
8d3d5bd52da3 Improve color configuration
mikael@frmp8452
parents: 265
diff changeset
434 "general",
785
7e0562e3bc83 Replace color_highlight with color_msgout
Mikael Berthe <mikael@lilotux.net>
parents: 779
diff changeset
435 "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
436 "msghl",
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
437 "status",
712
e1639629c87b Rename color options
Mikael Berthe <mikael@lilotux.net>
parents: 711
diff changeset
438 "roster",
e1639629c87b Rename color options
Mikael Berthe <mikael@lilotux.net>
parents: 711
diff changeset
439 "rostersel",
723
23068490d063 Add text color when the selected buddy has an unread message
Mikael Berthe <mikael@lilotux.net>
parents: 721
diff changeset
440 "rosterselmsg",
712
e1639629c87b Rename color options
Mikael Berthe <mikael@lilotux.net>
parents: 711
diff changeset
441 "rosternewmsg",
1268
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
442 "info",
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
443 "msgin",
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
444 NULL
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
445 };
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
446
281
f562b9af2de7 Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
447 const char *color;
f562b9af2de7 Add "const" specifier in prototypes
Mikael Berthe <mikael@lilotux.net>
parents: 279
diff changeset
448 const char *background = settings_opt_get("color_background");
712
e1639629c87b Rename color options
Mikael Berthe <mikael@lilotux.net>
parents: 711
diff changeset
449 const char *backselected = settings_opt_get("color_bgrostersel");
e1639629c87b Rename color options
Mikael Berthe <mikael@lilotux.net>
parents: 711
diff changeset
450 const char *backstatus = settings_opt_get("color_bgstatus");
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
451 char *tmp;
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
452 int i;
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
453
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
454 // Initialize color attributes
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
455 memset(COLOR_ATTRIB, 0, sizeof(COLOR_ATTRIB));
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
456
267
8d3d5bd52da3 Improve color configuration
mikael@frmp8452
parents: 265
diff changeset
457 // Default values
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
458 if (!background) background = "black";
267
8d3d5bd52da3 Improve color configuration
mikael@frmp8452
parents: 265
diff changeset
459 if (!backselected) backselected = "cyan";
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
460 if (!backstatus) backstatus = "blue";
267
8d3d5bd52da3 Improve color configuration
mikael@frmp8452
parents: 265
diff changeset
461
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
462 for (i=0; colors[i]; i++) {
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
463 tmp = g_strdup_printf("color_%s", colors[i]);
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents: 276
diff changeset
464 color = settings_opt_get(tmp);
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
465 g_free(tmp);
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
466
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
467 if (color) {
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
468 if (!strncmp(color, "bright", 6)) {
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
469 COLOR_ATTRIB[i+1] = A_BOLD;
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
470 color += 6;
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
471 }
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
472 }
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
473
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
474 switch (i + 1) {
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
475 case 1:
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
476 init_pair(1, COLOR_BLACK, COLOR_WHITE);
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 2:
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
479 init_pair(2, COLOR_WHITE, COLOR_BLACK);
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
480 break;
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
481 case COLOR_GENERAL:
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
482 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
483 find_color(background));
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
484 break;
785
7e0562e3bc83 Replace color_highlight with color_msgout
Mikael Berthe <mikael@lilotux.net>
parents: 779
diff changeset
485 case COLOR_MSGOUT:
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
486 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
487 find_color(background));
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
488 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
489 case COLOR_MSGHL:
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
490 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
491 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
492 break;
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
493 case COLOR_STATUS:
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
494 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
495 find_color(backstatus));
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
496 break;
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
497 case COLOR_ROSTER:
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
498 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
499 find_color(background));
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
500 break;
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
501 case COLOR_ROSTERSEL:
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
502 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
503 find_color(backselected));
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
504 break;
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
505 case COLOR_ROSTERSELNMSG:
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
506 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
507 find_color(backselected));
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
508 break;
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
509 case COLOR_ROSTERNMSG:
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
510 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
511 find_color(background));
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
512 break;
1268
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
513 case COLOR_INFO:
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
514 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
515 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
516 break;
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
517 case COLOR_MSGIN:
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
518 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
519 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
520 break;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
521 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
522 }
1489
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
523 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
524 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
525
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
526 if (!nickcols) {
1314
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
527 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
528 if (ncolors) {
1314
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
529 char *ncolor_start, *ncolor_end;
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
530 ncolor_start = ncolor_end = ncolors;
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
531
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
532 while (*ncolor_end)
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
533 ncolor_end++;
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
534
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
535 while (ncolors < ncolor_end && *ncolors) {
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
536 if ((*ncolors == ' ') || (*ncolors == '\t')) {
1314
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
537 ncolors++;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
538 } else {
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
539 char *end = ncolors;
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
540 ccolor *cl;
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
541 while (*end && (*end != ' ') && (*end != '\t'))
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
542 end++;
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
543 *end = '\0';
1314
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
544 cl = get_user_color(ncolors);
1489
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
545 if (!cl) {
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
546 scr_LogPrint(LPRINT_NORMAL, "Unknown color %s", ncolors);
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
547 } else {
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
548 nickcols = g_realloc(nickcols, (++nickcolcount) * sizeof *nickcols);
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
549 nickcols[nickcolcount-1] = cl;
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
550 }
1314
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
551 ncolors = end+1;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
552 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
553 }
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
554 g_free(ncolor_start);
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
555 }
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
556 if (!nickcols) { // Fallback to have something
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
557 nickcolcount = 1;
1489
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
558 nickcols = g_new(ccolor*, 1);
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)->color_pair = COLOR_GENERAL;
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
561 (*nickcols)->color_attrib = A_NORMAL;
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
562 }
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
563 }
1942
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
564
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
565 colors_stalled = FALSE;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
566 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
567
765
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 764
diff changeset
568 static void init_keycodes(void)
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
569 {
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
570 add_keyseq("O5A", MKEY_EQUIV, 521); // Ctrl-Up
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
571 add_keyseq("O5B", MKEY_EQUIV, 514); // Ctrl-Down
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
572 add_keyseq("O5C", MKEY_EQUIV, 518); // Ctrl-Right
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
573 add_keyseq("O5D", MKEY_EQUIV, 516); // Ctrl-Left
763
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
574 add_keyseq("O6A", MKEY_EQUIV, 520); // Shift-Up
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
575 add_keyseq("O6B", MKEY_EQUIV, 513); // Shift-Down
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
576 add_keyseq("O6C", MKEY_EQUIV, 402); // Shift-Right
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
577 add_keyseq("O6D", MKEY_EQUIV, 393); // Shift-Left
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
578 add_keyseq("O2A", MKEY_EQUIV, 520); // Shift-Up
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
579 add_keyseq("O2B", MKEY_EQUIV, 513); // Shift-Down
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
580 add_keyseq("O2C", MKEY_EQUIV, 402); // Shift-Right
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
581 add_keyseq("O2D", MKEY_EQUIV, 393); // Shift-Left
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
582 add_keyseq("[5^", MKEY_CTRL_PGUP, 0); // Ctrl-PageUp
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
583 add_keyseq("[6^", MKEY_CTRL_PGDOWN, 0); // Ctrl-PageDown
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
584 add_keyseq("[5@", MKEY_CTRL_SHIFT_PGUP, 0); // Ctrl-Shift-PageUp
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
585 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
586 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
587 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
588 add_keyseq("[8^", MKEY_CTRL_END, 0); // Ctrl-End
32d5298f9f8d Add a few keycode sequences
Mikael Berthe <mikael@lilotux.net>
parents: 790
diff changeset
589 add_keyseq("[7^", MKEY_CTRL_HOME, 0); // Ctrl-Home
32d5298f9f8d Add a few keycode sequences
Mikael Berthe <mikael@lilotux.net>
parents: 790
diff changeset
590 add_keyseq("[2^", MKEY_CTRL_INS, 0); // Ctrl-Insert
32d5298f9f8d Add a few keycode sequences
Mikael Berthe <mikael@lilotux.net>
parents: 790
diff changeset
591 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
592
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
593 // Xterm
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
594 add_keyseq("[1;5A", MKEY_EQUIV, 521); // Ctrl-Up
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
595 add_keyseq("[1;5B", MKEY_EQUIV, 514); // Ctrl-Down
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
596 add_keyseq("[1;5C", MKEY_EQUIV, 518); // Ctrl-Right
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
597 add_keyseq("[1;5D", MKEY_EQUIV, 516); // Ctrl-Left
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
598 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
599 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
600 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
601 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
602 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
603 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
604 add_keyseq("[1;2A", MKEY_EQUIV, 521); // Shift-Up
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
605 add_keyseq("[1;2B", MKEY_EQUIV, 514); // Shift-Down
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
606 add_keyseq("[5;5~", MKEY_CTRL_PGUP, 0); // Ctrl-PageUp
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
607 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
608 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
609 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
610 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
611 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
612
768
0f6d25a02450 Add PuTTY escape keys for Ctrl-arrows
Mikael Berthe <mikael@lilotux.net>
parents: 766
diff changeset
613 // PuTTY
0f6d25a02450 Add PuTTY escape keys for Ctrl-arrows
Mikael Berthe <mikael@lilotux.net>
parents: 766
diff changeset
614 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
615 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
616 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
617 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
618
762
96d46e00524a Add some key escape sequences for screen
Mikael Berthe <mikael@lilotux.net>
parents: 761
diff changeset
619 // screen
96d46e00524a Add some key escape sequences for screen
Mikael Berthe <mikael@lilotux.net>
parents: 761
diff changeset
620 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
621 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
622 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
623 add_keyseq("Od", MKEY_EQUIV, 516); // Ctrl-Left
763
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
624 add_keyseq("[a", MKEY_EQUIV, 520); // Shift-Up
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
625 add_keyseq("[b", MKEY_EQUIV, 513); // Shift-Down
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
626 add_keyseq("[c", MKEY_EQUIV, 402); // Shift-Right
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
627 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
628 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
629 add_keyseq("[6$", MKEY_SHIFT_PGDOWN, 0); // Shift-PageDown
1170
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
630
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
631 // VT100
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
632 add_keyseq("[H", MKEY_EQUIV, KEY_HOME); // Home
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
633 add_keyseq("[F", MKEY_EQUIV, KEY_END); // End
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
634
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
635 // Konsole Linux
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
636 add_keyseq("[1~", MKEY_EQUIV, KEY_HOME); // Home
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
637 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
638 }
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 764
diff changeset
639
1176
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
640 // scr_init_bindings()
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
641 // Create default key bindings
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
642 // 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
643 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
644 {
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
645 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
646
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
647 // 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
648 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
649 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
650 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
651 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
652 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
653 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
654 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
655 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
656 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
657 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
658 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
659 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
660 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
661 "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
662 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
663 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
664 "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
665 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
666 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
667 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
668 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
669 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
670 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
671 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
672 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
673 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
674 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
675 // 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
676 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
677 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
678 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
679 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
680 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
681 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
682 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
683 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
684 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
685 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
686 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
687 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
688 // Ctrl-Left (2 codes):
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
689 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
690 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
691 // Ctrl-Right (2 codes):
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
692 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
693 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
694 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
695 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
696 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
697 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
698 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
699 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
700 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
701
1208
0dbe51d1e62e Add default binding for F1 (265) to /help
Mikael Berthe <mikael@lilotux.net>
parents: 1205
diff changeset
702 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
703
1176
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
704 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
705 }
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
706
1229
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
707 // is_speckey(key)
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
708 // 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
709 // 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
710 // isprint(KEY_PPAGE) returns TRUE...
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
711 static int is_speckey(int key)
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
712 {
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
713 switch (key) {
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
714 case 127:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
715 case 393:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
716 case 402:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
717 case KEY_BACKSPACE:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
718 case KEY_DC:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
719 case KEY_LEFT:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
720 case KEY_RIGHT:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
721 case KEY_UP:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
722 case KEY_DOWN:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
723 case KEY_PPAGE:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
724 case KEY_NPAGE:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
725 case KEY_HOME:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
726 case KEY_END:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
727 case KEY_EOL:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
728 return TRUE;
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
729 }
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 // Fn keys
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
732 if (key >= 265 && key < 265+12)
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
733 return TRUE;
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
734
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
735 // Special key combinations
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
736 if (key >= 513 && key <= 521)
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
737 return TRUE;
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
738
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
739 return FALSE;
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
740 }
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
741
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
742 void scr_init_locale_charset(void)
779
057ffe7c43dc Initialize locale charset earlier
Mikael Berthe <mikael@lilotux.net>
parents: 773
diff changeset
743 {
1651
d0a0d96ed5d5 Set all locale variables
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1602
diff changeset
744 setlocale(LC_ALL, "");
1382
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
745 #ifdef HAVE_LOCALCHARSET_H
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
746 LocaleCharSet = locale_charset();
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
747 #else
779
057ffe7c43dc Initialize locale charset earlier
Mikael Berthe <mikael@lilotux.net>
parents: 773
diff changeset
748 LocaleCharSet = nl_langinfo(CODESET);
1382
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
749 #endif
779
057ffe7c43dc Initialize locale charset earlier
Mikael Berthe <mikael@lilotux.net>
parents: 773
diff changeset
750 utf8_mode = (strcmp(LocaleCharSet, "UTF-8") == 0);
057ffe7c43dc Initialize locale charset earlier
Mikael Berthe <mikael@lilotux.net>
parents: 773
diff changeset
751 }
057ffe7c43dc Initialize locale charset earlier
Mikael Berthe <mikael@lilotux.net>
parents: 773
diff changeset
752
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
753 gboolean scr_curses_status(void)
1733
a9b0364c0cb2 Fix segfault introduced in previous commit
Mikael Berthe <mikael@lilotux.net>
parents: 1729
diff changeset
754 {
a9b0364c0cb2 Fix segfault introduced in previous commit
Mikael Berthe <mikael@lilotux.net>
parents: 1729
diff changeset
755 return Curses;
a9b0364c0cb2 Fix segfault introduced in previous commit
Mikael Berthe <mikael@lilotux.net>
parents: 1729
diff changeset
756 }
a9b0364c0cb2 Fix segfault introduced in previous commit
Mikael Berthe <mikael@lilotux.net>
parents: 1729
diff changeset
757
1942
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
758 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
759 {
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
760 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
761 colors_stalled = TRUE;
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
762 return g_strdup(new_value);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
763 }
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
764
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
765 void scr_init_curses(void)
765
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 764
diff changeset
766 {
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 764
diff changeset
767 /* Key sequences initialization */
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 764
diff changeset
768 init_keycodes();
762
96d46e00524a Add some key escape sequences for screen
Mikael Berthe <mikael@lilotux.net>
parents: 761
diff changeset
769
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
770 initscr();
382
4c6e8392e465 Use nodelay() instead of halfdelay()
Mikael Berthe <mikael@lilotux.net>
parents: 374
diff changeset
771 raw();
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
772 noecho();
389
6e895f397474 Ncurses changes + Ctrl-C does not send a signal anylore
Mikael Berthe <mikael@lilotux.net>
parents: 388
diff changeset
773 nonl();
6e895f397474 Ncurses changes + Ctrl-C does not send a signal anylore
Mikael Berthe <mikael@lilotux.net>
parents: 388
diff changeset
774 intrflush(stdscr, FALSE);
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
775 start_color();
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
776 use_default_colors();
1561
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
777 #ifdef NCURSES_MOUSE_VERSION
1563
c1d0f906d379 Add option "use_mouse"
franky
parents: 1561
diff changeset
778 if (settings_opt_get_int("use_mouse"))
c1d0f906d379 Add option "use_mouse"
franky
parents: 1561
diff changeset
779 mousemask(ALL_MOUSE_EVENTS, NULL);
1561
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
780 #endif
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
781
1386
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
782 if (settings_opt_get("escdelay")) {
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
783 #ifdef HAVE_ESCDELAY
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
784 ESCDELAY = (unsigned) settings_opt_get_int("escdelay");
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
785 #else
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
786 scr_LogPrint(LPRINT_LOGNORM, "ERROR: no ESCDELAY support.");
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
787 #endif
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
788 }
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
789
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
790 parse_colors();
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
791
1942
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
792 settings_set_guard("color_background", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
793 settings_set_guard("color_general", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
794 settings_set_guard("color_info", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
795 settings_set_guard("color_msgin", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
796 settings_set_guard("color_msgout", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
797 settings_set_guard("color_msghl", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
798 settings_set_guard("color_bgstatus", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
799 settings_set_guard("color_status", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
800 settings_set_guard("color_roster", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
801 settings_set_guard("color_bgrostersel", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
802 settings_set_guard("color_rostersel", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
803 settings_set_guard("color_rosterselmsg", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
804 settings_set_guard("color_rosternewmsg", scr_color_guard);
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
805
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
806 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
807 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
808 // 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
809 // 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
810
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
811 inputLine[0] = 0;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
812 ptr_inputline = inputLine;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
813
1521
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
814 if (settings_opt_get("url_regex")) {
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
815 #ifdef HAVE_GLIB_REGEX
1520
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
816 url_regex = g_regex_new(settings_opt_get("url_regex"),
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
817 G_REGEX_OPTIMIZE, 0, NULL);
1521
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
818 #else
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
819 scr_LogPrint(LPRINT_LOGNORM, "ERROR: Your glib version is too old, "
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
820 "cannot use url_regex.");
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
821 #endif // HAVE_GLIB_REGEX
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
822 }
1520
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
823
966
d9acb7f2a3d1 Do not set Curses variable too early
Mikael Berthe <mikael@lilotux.net>
parents: 961
diff changeset
824 Curses = TRUE;
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
825 return;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
826 }
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
827
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
828 void scr_terminate_curses(void)
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
829 {
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
830 if (!Curses) return;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
831 clear();
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
832 refresh();
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
833 endwin();
1521
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
834 #ifdef HAVE_GLIB_REGEX
1915
e09763e16e49 Fix segfault related to url_regex
franky
parents: 1903
diff changeset
835 if (url_regex) {
1520
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
836 g_regex_unref(url_regex);
1915
e09763e16e49 Fix segfault related to url_regex
franky
parents: 1903
diff changeset
837 url_regex = NULL;
e09763e16e49 Fix segfault related to url_regex
franky
parents: 1903
diff changeset
838 }
1521
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
839 #endif
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
840 Curses = FALSE;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
841 return;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
842 }
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
843
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
844 void scr_beep(void)
675
ae7016aae014 New "beep_on_message" option
Mikael Berthe <mikael@lilotux.net>
parents: 667
diff changeset
845 {
ae7016aae014 New "beep_on_message" option
Mikael Berthe <mikael@lilotux.net>
parents: 667
diff changeset
846 beep();
ae7016aae014 New "beep_on_message" option
Mikael Berthe <mikael@lilotux.net>
parents: 667
diff changeset
847 }
ae7016aae014 New "beep_on_message" option
Mikael Berthe <mikael@lilotux.net>
parents: 667
diff changeset
848
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
849 // 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
850 static const char *timeprefixes[] = {
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
851 "%m-%d %H:%M ",
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
852 "%H:%M ",
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
853 " "
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
854 };
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
855
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
856 static const char *spectimeprefixes[] = {
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
857 "%m-%d %H:%M:%S ",
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
858 "%H:%M:%S ",
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
859 " "
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
860 };
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
861
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
862 static int timepreflengths[] = {
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
863 // (length of the corresponding timeprefix + 5)
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
864 17,
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
865 11,
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
866 6
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
867 };
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
868
1486
f83a51eaa5ed Fix multiline output in /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1485
diff changeset
869 static const char *gettprefix(void)
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
870 {
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
871 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
872 return timeprefixes[(n < 3 ? n : 0)];
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
873 }
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
874
1486
f83a51eaa5ed Fix multiline output in /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1485
diff changeset
875 static const char *getspectprefix(void)
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
876 {
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
877 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
878 return spectimeprefixes[(n < 3 ? n : 0)];
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
879 }
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
880
1487
f61ed2466f7c Minor style upgrade
Mikael Berthe <mikael@lilotux.net>
parents: 1486
diff changeset
881 guint scr_getprefixwidth(void)
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
882 {
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
883 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
884 return timepreflengths[(n < 3 ? n : 0)];
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
885 }
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
886
1761
61f0482d3993 Limit = alignment to 1/3 of screen in option list
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1756
diff changeset
887 guint scr_gettextwidth(void)
61f0482d3993 Limit = alignment to 1/3 of screen in option list
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1756
diff changeset
888 {
61f0482d3993 Limit = alignment to 1/3 of screen in option list
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1756
diff changeset
889 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
890 }
61f0482d3993 Limit = alignment to 1/3 of screen in option list
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1756
diff changeset
891
1791
6e0a8bfb3a01 Add scr_gettextheight()
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1783
diff changeset
892 guint scr_gettextheight(void)
6e0a8bfb3a01 Add scr_gettextheight()
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1783
diff changeset
893 {
6e0a8bfb3a01 Add scr_gettextheight()
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1783
diff changeset
894 // log window, two status bars and one input line
6e0a8bfb3a01 Add scr_gettextheight()
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1783
diff changeset
895 return maxY - Log_Win_Height - 3;
6e0a8bfb3a01 Add scr_gettextheight()
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1783
diff changeset
896 }
6e0a8bfb3a01 Add scr_gettextheight()
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1783
diff changeset
897
1819
d13315366ba5 Add scr_getlogwinheight()
Mikael Berthe <mikael@lilotux.net>
parents: 1815
diff changeset
898 guint scr_getlogwinheight(void)
d13315366ba5 Add scr_getlogwinheight()
Mikael Berthe <mikael@lilotux.net>
parents: 1815
diff changeset
899 {
d13315366ba5 Add scr_getlogwinheight()
Mikael Berthe <mikael@lilotux.net>
parents: 1815
diff changeset
900 if (Log_Win_Height >= 2)
d13315366ba5 Add scr_getlogwinheight()
Mikael Berthe <mikael@lilotux.net>
parents: 1815
diff changeset
901 return Log_Win_Height - 2;
d13315366ba5 Add scr_getlogwinheight()
Mikael Berthe <mikael@lilotux.net>
parents: 1815
diff changeset
902 return 0;
d13315366ba5 Add scr_getlogwinheight()
Mikael Berthe <mikael@lilotux.net>
parents: 1815
diff changeset
903 }
d13315366ba5 Add scr_getlogwinheight()
Mikael Berthe <mikael@lilotux.net>
parents: 1815
diff changeset
904
1518
63dc211a4c1a New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents: 1515
diff changeset
905 // scr_print_logwindow(string)
63dc211a4c1a New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents: 1515
diff changeset
906 // 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
907 // 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
908 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
909 {
63dc211a4c1a New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents: 1515
diff changeset
910 time_t timestamp;
63dc211a4c1a New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents: 1515
diff changeset
911 char strtimestamp[64];
63dc211a4c1a New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents: 1515
diff changeset
912
63dc211a4c1a New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents: 1515
diff changeset
913 timestamp = time(NULL);
63dc211a4c1a New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents: 1515
diff changeset
914 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
915 if (Curses) {
63dc211a4c1a New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents: 1515
diff changeset
916 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
917 update_panels();
63dc211a4c1a New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents: 1515
diff changeset
918 } else {
63dc211a4c1a New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents: 1515
diff changeset
919 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
920 }
63dc211a4c1a New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents: 1515
diff changeset
921 }
63dc211a4c1a New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents: 1515
diff changeset
922
1783
af3de54ef986 Convert scr_LogPrint() to scr_log_print()
Mikael Berthe <mikael@lilotux.net>
parents: 1780
diff changeset
923 // scr_log_print(...)
1518
63dc211a4c1a New command: /echo (display a message in the log window)
Mikael Berthe <mikael@lilotux.net>
parents: 1515
diff changeset
924 // 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
925 // 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
926 // 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
927 void scr_log_print(unsigned int flag, const char *fmt, ...)
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
928 {
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
929 time_t timestamp;
857
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size
Mikael Berthe <mikael@lilotux.net>
parents: 851
diff changeset
930 char strtimestamp[64];
858
2683ad5d1003 Improve scr_LogPrint() for log/debug messages
Mikael Berthe <mikael@lilotux.net>
parents: 857
diff changeset
931 char *buffer, *btext;
1075
03bc225ad763 Improve scr_LogPrint() readability
Mikael Berthe <mikael@lilotux.net>
parents: 1072
diff changeset
932 char *convbuf1 = NULL, *convbuf2 = NULL;
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
933 va_list ap;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
934
771
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings
Mikael Berthe <mikael@lilotux.net>
parents: 770
diff changeset
935 if (!(flag & ~LPRINT_NOTUTF8)) return; // Shouldn't happen
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
936
857
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size
Mikael Berthe <mikael@lilotux.net>
parents: 851
diff changeset
937 timestamp = time(NULL);
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size
Mikael Berthe <mikael@lilotux.net>
parents: 851
diff changeset
938 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
939 va_start(ap, fmt);
858
2683ad5d1003 Improve scr_LogPrint() for log/debug messages
Mikael Berthe <mikael@lilotux.net>
parents: 857
diff changeset
940 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
941 va_end(ap);
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
942
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
943 if (flag & LPRINT_NORMAL) {
771
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings
Mikael Berthe <mikael@lilotux.net>
parents: 770
diff changeset
944 char *buffer_locale;
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
945 char *buf_specialwindow;
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
946
858
2683ad5d1003 Improve scr_LogPrint() for log/debug messages
Mikael Berthe <mikael@lilotux.net>
parents: 857
diff changeset
947 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
948
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
949 // 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
950 if (!(flag & LPRINT_NOTUTF8))
1075
03bc225ad763 Improve scr_LogPrint() readability
Mikael Berthe <mikael@lilotux.net>
parents: 1072
diff changeset
951 buffer_locale = convbuf1 = from_utf8(buffer);
771
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings
Mikael Berthe <mikael@lilotux.net>
parents: 770
diff changeset
952 else
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings
Mikael Berthe <mikael@lilotux.net>
parents: 770
diff changeset
953 buffer_locale = buffer;
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
954
884
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures
Mikael Berthe <mikael@lilotux.net>
parents: 880
diff changeset
955 if (!buffer_locale) {
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures
Mikael Berthe <mikael@lilotux.net>
parents: 880
diff changeset
956 wprintw(logWnd,
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures
Mikael Berthe <mikael@lilotux.net>
parents: 880
diff changeset
957 "\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
958 update_panels();
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures
Mikael Berthe <mikael@lilotux.net>
parents: 880
diff changeset
959 g_free(buffer);
897
a05b5a16a06a Fix memory leak in scr_LogPrint()
Mikael Berthe <mikael@lilotux.net>
parents: 891
diff changeset
960 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
961 return;
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures
Mikael Berthe <mikael@lilotux.net>
parents: 880
diff changeset
962 }
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures
Mikael Berthe <mikael@lilotux.net>
parents: 880
diff changeset
963
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
964 // 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
965 if (flag & LPRINT_NOTUTF8)
1075
03bc225ad763 Improve scr_LogPrint() readability
Mikael Berthe <mikael@lilotux.net>
parents: 1072
diff changeset
966 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
967 else
858
2683ad5d1003 Improve scr_LogPrint() for log/debug messages
Mikael Berthe <mikael@lilotux.net>
parents: 857
diff changeset
968 buf_specialwindow = btext;
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
969
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
970 if (Curses) {
771
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings
Mikael Berthe <mikael@lilotux.net>
parents: 770
diff changeset
971 wprintw(logWnd, "\n%s", buffer_locale);
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
972 update_panels();
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
973 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
974 HBB_PREFIX_SPECIAL, FALSE, 0, NULL);
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
975 } else {
771
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings
Mikael Berthe <mikael@lilotux.net>
parents: 770
diff changeset
976 printf("%s\n", buffer_locale);
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
977 // 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
978 hbuf_add_line(&statushbuf, buf_specialwindow, timestamp,
1602
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
979 HBB_PREFIX_SPECIAL, 0, 0, 0, NULL);
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
980 }
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
981
1075
03bc225ad763 Improve scr_LogPrint() readability
Mikael Berthe <mikael@lilotux.net>
parents: 1072
diff changeset
982 g_free(convbuf1);
03bc225ad763 Improve scr_LogPrint() readability
Mikael Berthe <mikael@lilotux.net>
parents: 1072
diff changeset
983 g_free(convbuf2);
858
2683ad5d1003 Improve scr_LogPrint() for log/debug messages
Mikael Berthe <mikael@lilotux.net>
parents: 857
diff changeset
984 g_free(buffer);
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
985 }
412
9c640ee3bae3 Display full date in the log file
Mikael Berthe <mikael@lilotux.net>
parents: 393
diff changeset
986
857
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size
Mikael Berthe <mikael@lilotux.net>
parents: 851
diff changeset
987 if (flag & (LPRINT_LOG|LPRINT_DEBUG)) {
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size
Mikael Berthe <mikael@lilotux.net>
parents: 851
diff changeset
988 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
989 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
990 ut_write_log(flag, buffer);
857
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size
Mikael Berthe <mikael@lilotux.net>
parents: 851
diff changeset
991 g_free(buffer);
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
992 }
897
a05b5a16a06a Fix memory leak in scr_LogPrint()
Mikael Berthe <mikael@lilotux.net>
parents: 891
diff changeset
993 g_free(btext);
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
994 }
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
995
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
996 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
997 {
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
998 char *id;
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
999 winbuf *wbp;
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1000
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1001 if (special)
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1002 return statusWindow; // Only one special window atm.
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1003
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1004 if (!winId)
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1005 return NULL;
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1006
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1007 id = g_strdup(winId);
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1008 mc_strtolower(id);
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1009 wbp = g_hash_table_lookup(winbufhash, id);
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1010 g_free(id);
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1011 return wbp;
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1012 }
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1013
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1014 int scr_buddy_buffer_exists(const char *bjid)
1156
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1015 {
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1016 return (scr_search_window(bjid, FALSE) != NULL);
1156
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1017 }
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1018
1133
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
1019 // scr_new_buddy(title, dontshow)
1139
104676e3389b Update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1138
diff changeset
1020 // 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
1021 static winbuf *scr_new_buddy(const char *title, int dont_show)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1022 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
1023 winbuf *tmp;
393
f8f3c7493457 Whitespace cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 389
diff changeset
1024
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
1025 tmp = g_new0(winbuf, 1);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1026
1133
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
1027 tmp->win = activechatWnd;
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
1028 tmp->panel = activechatPanel;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1029
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1030 if (!dont_show) {
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1031 currentWindow = tmp;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1032 } else {
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1033 if (currentWindow)
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1034 top_panel(currentWindow->panel);
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1035 else
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1036 top_panel(chatPanel);
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1037 }
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1038 update_panels();
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1039
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1040 // If title is NULL, this is a special buffer
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1041 if (title) {
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1042 char *id;
1156
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1043 id = hlog_get_log_jid(title);
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1044 if (id) {
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1045 winbuf *wb = scr_search_window(id, FALSE);
1160
14f5876b5555 Slight optimization + line wrapping
Mikael Berthe <mikael@lilotux.net>
parents: 1159
diff changeset
1046 if (!wb)
14f5876b5555 Slight optimization + line wrapping
Mikael Berthe <mikael@lilotux.net>
parents: 1159
diff changeset
1047 wb = scr_new_buddy(id, TRUE);
14f5876b5555 Slight optimization + line wrapping
Mikael Berthe <mikael@lilotux.net>
parents: 1159
diff changeset
1048 tmp->bd=wb->bd;
1156
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
1049 g_free(id);
1159
53c0c5be43fa Small fixes, typos and cleanups
Mikael Berthe <mikael@lilotux.net>
parents: 1157
diff changeset
1050 } 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
1051 tmp->bd = g_new0(buffdata, 1);
1159
53c0c5be43fa Small fixes, typos and cleanups
Mikael Berthe <mikael@lilotux.net>
parents: 1157
diff changeset
1052 hlog_read_history(title, &tmp->bd->hbuf,
1487
f61ed2466f7c Minor style upgrade
Mikael Berthe <mikael@lilotux.net>
parents: 1486
diff changeset
1053 maxX - Roster_Width - scr_getprefixwidth());
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1054 }
181
4a0bde661562 [/trunk] Changeset 193 by mikael
mikael
parents: 180
diff changeset
1055
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1056 id = g_strdup(title);
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1057 mc_strtolower(id);
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1058 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
1059 } else {
1159
53c0c5be43fa Small fixes, typos and cleanups
Mikael Berthe <mikael@lilotux.net>
parents: 1157
diff changeset
1060 tmp->bd = g_new0(buffdata, 1);
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1061 }
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1062 return tmp;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1063 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1064
1483
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1065 // scr_line_prefix(line, pref, preflen)
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1066 // Use data from the hbb_line structure and write the prefix
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1067 // to pref (not exceeding preflen, trailing null byte included).
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1068 void scr_line_prefix(hbb_line *line, char *pref, guint preflen)
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1069 {
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1070 char date[64];
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1071
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1072 if (line->timestamp &&
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1073 !(line->flags & (HBB_PREFIX_SPECIAL|HBB_PREFIX_CONT))) {
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1074 strftime(date, 30, gettprefix(), localtime(&line->timestamp));
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1075 } else
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1076 strcpy(date, " ");
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1077
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1078 if (!(line->flags & HBB_PREFIX_CONT)) {
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1079 if (line->flags & HBB_PREFIX_INFO) {
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1080 char dir = '*';
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1081 if (line->flags & HBB_PREFIX_IN)
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1082 dir = '<';
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1083 else if (line->flags & HBB_PREFIX_OUT)
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1084 dir = '>';
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1085 g_snprintf(pref, preflen, "%s*%c* ", date, dir);
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1086 } else if (line->flags & HBB_PREFIX_ERR) {
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1087 char dir = '#';
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1088 if (line->flags & HBB_PREFIX_IN)
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1089 dir = '<';
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1090 else if (line->flags & HBB_PREFIX_OUT)
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1091 dir = '>';
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1092 g_snprintf(pref, preflen, "%s#%c# ", date, dir);
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1093 } 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
1094 char cryptflag;
7b36b91a4388 New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents: 1483
diff changeset
1095 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
1096 cryptflag = '~';
7b36b91a4388 New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents: 1483
diff changeset
1097 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
1098 cryptflag = 'O';
7b36b91a4388 New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents: 1483
diff changeset
1099 else
7b36b91a4388 New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents: 1483
diff changeset
1100 cryptflag = '=';
1483
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1101 g_snprintf(pref, preflen, "%s<%c= ", date, cryptflag);
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1102 } else if (line->flags & HBB_PREFIX_OUT) {
1602
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
1103 char cryptflag, receiptflag;
1484
7b36b91a4388 New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents: 1483
diff changeset
1104 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
1105 cryptflag = '~';
7b36b91a4388 New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents: 1483
diff changeset
1106 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
1107 cryptflag = 'O';
7b36b91a4388 New UI message flag (O) when OTR is used
Mikael Berthe <mikael@lilotux.net>
parents: 1483
diff changeset
1108 else
1488
b393b8cee171 Fix small mistake in changeset 7b36b91a4388
Mikael Berthe <mikael@lilotux.net>
parents: 1487
diff changeset
1109 cryptflag = '-';
1602
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
1110 if (line->flags & HBB_PREFIX_RECEIPT)
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
1111 receiptflag = 'r';
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
1112 else
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
1113 receiptflag = '-';
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
1114 g_snprintf(pref, preflen, "%s%c%c> ", date, receiptflag, cryptflag);
1483
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1115 } else if (line->flags & HBB_PREFIX_SPECIAL) {
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1116 strftime(date, 30, getspectprefix(), localtime(&line->timestamp));
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1117 g_snprintf(pref, preflen, "%s ", date);
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1118 } else {
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1119 g_snprintf(pref, preflen, "%s ", date);
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1120 }
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1121 } else {
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1122 g_snprintf(pref, preflen, " ");
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1123 }
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1124 }
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1125
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1126 // scr_update_window()
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1127 // (Re-)Display the given chat window.
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1128 static void scr_update_window(winbuf *win_entry)
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1129 {
1948
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1130 int n, mark_offset = 0;
1486
f83a51eaa5ed Fix multiline output in /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1485
diff changeset
1131 guint prefixwidth;
1483
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1132 char pref[96];
184
b5aa2b9c425a [/trunk] Changeset 196 by mikael
mikael
parents: 181
diff changeset
1133 hbb_line **lines, *line;
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1134 GList *hbuf_head;
1291
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1135 int color;
1948
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1136 bool readmark = FALSE;
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1137 bool skipline = FALSE;
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1138
1487
f61ed2466f7c Minor style upgrade
Mikael Berthe <mikael@lilotux.net>
parents: 1486
diff changeset
1139 prefixwidth = scr_getprefixwidth();
1486
f83a51eaa5ed Fix multiline output in /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1485
diff changeset
1140 prefixwidth = MIN(prefixwidth, sizeof pref);
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
1141
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
1142 // Should the window be empty?
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1143 if (win_entry->bd->cleared) {
168
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1144 werase(win_entry->win);
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
1145 return;
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
1146 }
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
1147
1160
14f5876b5555 Slight optimization + line wrapping
Mikael Berthe <mikael@lilotux.net>
parents: 1159
diff changeset
1148 // 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
1149 // we are displaying the last messages.
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1150
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1151 // We will show the last CHAT_WIN_HEIGHT lines.
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1152 // Let's find out where it begins.
1160
14f5876b5555 Slight optimization + line wrapping
Mikael Berthe <mikael@lilotux.net>
parents: 1159
diff changeset
1153 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
1154 win_entry->bd->top) == -1)) {
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1155 // 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
1156 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
1157 hbuf_head = win_entry->bd->hbuf;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1158 win_entry->bd->top = NULL; // (Just to make sure)
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1159 n = 0;
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1160 while (hbuf_head && (n < CHAT_WIN_HEIGHT-1) && g_list_previous(hbuf_head)) {
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1161 hbuf_head = g_list_previous(hbuf_head);
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1162 n++;
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1163 }
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
1164 // 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
1165 if (win_entry->bd->lock)
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1166 win_entry->bd->top = hbuf_head;
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1167 } else
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1168 hbuf_head = win_entry->bd->top;
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1169
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1170 // Get the last CHAT_WIN_HEIGHT lines.
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1171 lines = hbuf_get_lines(hbuf_head, CHAT_WIN_HEIGHT);
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1172
1948
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1173 if (CHAT_WIN_HEIGHT > 1) {
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1174 // Do we have a read mark?
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1175 for (n = 0; n < CHAT_WIN_HEIGHT; n++) {
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1176 line = *(lines+n);
1954
256cfc706ae5 Update readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1950
diff changeset
1177 if (line) {
256cfc706ae5 Update readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1950
diff changeset
1178 if (line->flags & HBB_PREFIX_READMARK) {
256cfc706ae5 Update readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1950
diff changeset
1179 // 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
1180 if (n+1 < CHAT_WIN_HEIGHT && *(lines+n+1)) {
256cfc706ae5 Update readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1950
diff changeset
1181 readmark = TRUE;
256cfc706ae5 Update readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1950
diff changeset
1182 skipline = TRUE;
256cfc706ae5 Update readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1950
diff changeset
1183 mark_offset = -1;
256cfc706ae5 Update readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1950
diff changeset
1184 }
256cfc706ae5 Update readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1950
diff changeset
1185 }
256cfc706ae5 Update readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1950
diff changeset
1186 } else if (readmark) {
256cfc706ae5 Update readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1950
diff changeset
1187 // 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
1188 skipline = FALSE;
256cfc706ae5 Update readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1950
diff changeset
1189 mark_offset = 0;
1948
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1190 }
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1191 }
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1192 }
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1193
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1194 // Display the lines
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1195 for (n = 0 ; n < CHAT_WIN_HEIGHT; n++) {
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1196 int winy = n + mark_offset;
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1197 wmove(win_entry->win, winy, 0);
184
b5aa2b9c425a [/trunk] Changeset 196 by mikael
mikael
parents: 181
diff changeset
1198 line = *(lines+n);
b5aa2b9c425a [/trunk] Changeset 196 by mikael
mikael
parents: 181
diff changeset
1199 if (line) {
1948
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1200 if (skipline)
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1201 goto scr_update_window_skipline;
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1202
1204
e802ec0c02d2 Basic support for nick highlighting in MUC rooms (the whole line is colored)
Mikael Berthe <mikael@lilotux.net>
parents: 1190
diff changeset
1203 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
1204 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
1205 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
1206 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
1207 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
1208 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
1209 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
1210 color = COLOR_MSGIN;
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1211 else
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1212 color = COLOR_GENERAL;
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1213
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1214 if (color != COLOR_GENERAL)
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1215 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
1216
1483
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1217 // Generate the prefix area and display it
1486
f83a51eaa5ed Fix multiline output in /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1485
diff changeset
1218 scr_line_prefix(line, pref, prefixwidth);
1483
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1219 wprintw(win_entry->win, pref);
729
39f67cade02c Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents: 728
diff changeset
1220
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
1221 // Make sure we are at the right position
1948
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1222 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
1223
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
1224 // The MUC nick - overwrite with proper color
1294
86caabe72f3a Color only incoming messages
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1292
diff changeset
1225 if (line->mucnicklen) {
1476
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
1226 char *mucjid;
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
1227 char tmp;
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
1228 nickcolor *actual = NULL;
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
1229 muccoltype type, *typetmp;
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
1230
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
1231 // Store the char after the nick
1476
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
1232 tmp = line->text[line->mucnicklen];
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
1233 type = glob_muccol;
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
1234 // 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
1235 line->text[line->mucnicklen] = '\0';
1476
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
1236 mucjid = g_utf8_strdown(CURRENT_JID, -1);
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1237 if (muccolors) {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1238 typetmp = g_hash_table_lookup(muccolors, mucjid);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1239 if (typetmp)
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1240 type = *typetmp;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1241 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1242 g_free(mucjid);
1510
f6d4e20b9caa MUC nickname colors depend on nicknames now
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1505
diff changeset
1243 // 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
1244 if ((type == MC_ALL) && (!nickcolors ||
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1245 !g_hash_table_lookup(nickcolors, line->text))) {
1476
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
1246 char *snick, *mnick;
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
1247 nickcolor *nc;
1510
f6d4e20b9caa MUC nickname colors depend on nicknames now
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1505
diff changeset
1248 const char *p = line->text;
f6d4e20b9caa MUC nickname colors depend on nicknames now
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1505
diff changeset
1249 unsigned int nicksum = 0;
1476
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
1250 snick = g_strdup(line->text);
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
1251 mnick = g_strdup(line->text);
77afd831f8f7 Avoid mixed declarations and code
Mikael Berthe <mikael@lilotux.net>
parents: 1457
diff changeset
1252 nc = g_new(nickcolor, 1);
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1253 ensure_string_htable(&nickcolors, NULL);
1510
f6d4e20b9caa MUC nickname colors depend on nicknames now
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1505
diff changeset
1254 while (*p)
f6d4e20b9caa MUC nickname colors depend on nicknames now
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1505
diff changeset
1255 nicksum += *p++;
f6d4e20b9caa MUC nickname colors depend on nicknames now
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1505
diff changeset
1256 nc->color = nickcols[nicksum % nickcolcount];
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
1257 nc->manual = FALSE;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1258 *snick = '<';
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1259 snick[strlen(snick)-1] = '>';
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1260 *mnick = '*';
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1261 mnick[strlen(mnick)-1] = ' ';
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
1262 // Insert them
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1263 g_hash_table_insert(nickcolors, snick, nc);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1264 g_hash_table_insert(nickcolors, mnick, nc);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1265 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1266 if (nickcolors)
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1267 actual = g_hash_table_lookup(nickcolors, line->text);
1294
86caabe72f3a Color only incoming messages
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1292
diff changeset
1268 if (actual && ((type == MC_ALL) || (actual->manual))
86caabe72f3a Color only incoming messages
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1292
diff changeset
1269 && (line->flags & HBB_PREFIX_IN) &&
86caabe72f3a Color only incoming messages
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1292
diff changeset
1270 (!(line->flags & HBB_PREFIX_HLIGHT_OUT)))
1489
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
1271 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
1272 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
1273 // Return the char
1290
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
1274 line->text[line->mucnicklen] = tmp;
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
1275 // Return the color back
1291
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1276 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
1277 }
729
39f67cade02c Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents: 728
diff changeset
1278
1333
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
1279 // Display text line
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
1280 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
1281 wclrtoeol(win_entry->win);
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1282
1268
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1283 // Return the color back
1291
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1284 if (color != COLOR_GENERAL)
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1285 wattrset(win_entry->win, get_color(COLOR_GENERAL));
1483
e74cc83e7158 Refactor scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 1476
diff changeset
1286
1948
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1287 scr_update_window_skipline:
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1288 skipline = FALSE;
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1289 if (readmark && line->flags & HBB_PREFIX_READMARK) {
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1290 int i, w;
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1291 mark_offset++;
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1292
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1293 // Display the mark
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1294 winy = n + mark_offset;
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1295 wmove(win_entry->win, winy, 0);
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1296 g_snprintf(pref, prefixwidth, " == ");
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1297 wprintw(win_entry->win, pref);
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1298 w = scr_gettextwidth() / 3;
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1299 for (i=0; i<w; i++)
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1300 wprintw(win_entry->win, "== ");
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1301 wclrtoeol(win_entry->win);
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1302 }
e8cebf5fd36c Add readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1945
diff changeset
1303
184
b5aa2b9c425a [/trunk] Changeset 196 by mikael
mikael
parents: 181
diff changeset
1304 g_free(line->text);
898
c65b71dcda94 Fix memory leak in scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 897
diff changeset
1305 g_free(line);
168
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1306 } else {
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1307 wclrtobot(win_entry->win);
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1308 break;
75
ff119bb11563 [/trunk] Changeset 89 by mikael
mikael
parents: 74
diff changeset
1309 }
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1310 }
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1311 g_free(lines);
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1312 }
1159
53c0c5be43fa Small fixes, typos and cleanups
Mikael Berthe <mikael@lilotux.net>
parents: 1157
diff changeset
1313
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1314 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
1315 {
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1316 if (special) {
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1317 if (!statusWindow) {
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1318 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
1319 statusWindow->bd->hbuf = statushbuf;
1154
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1320 }
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1321 return statusWindow;
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1322 } else {
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1323 return scr_new_buddy(winId, dont_show);
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1324 }
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1325 }
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1326
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1327 // scr_show_window()
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1328 // Display the chat window with the given identifier.
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1329 // "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
1330 static void scr_show_window(const char *winId, int special)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1331 {
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1332 winbuf *win_entry;
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1333
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1334 win_entry = scr_search_window(winId, special);
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1335
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1336 if (!win_entry) {
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1337 win_entry = scr_create_window(winId, special, FALSE);
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1338 }
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 top_panel(win_entry->panel);
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1341 currentWindow = win_entry;
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1342 chatmode = TRUE;
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1343 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
1344 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
1345 if (!special)
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1346 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
1347 update_roster = TRUE;
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1348
180
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1349 // Refresh the window
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1350 scr_update_window(win_entry);
180
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1351
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1352 // Finished :)
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1353 update_panels();
142
bb6fe91589b9 [/trunk] Changeset 154 by mikael
mikael
parents: 140
diff changeset
1354
bb6fe91589b9 [/trunk] Changeset 154 by mikael
mikael
parents: 140
diff changeset
1355 top_panel(inputPanel);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1356 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1357
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1358 // scr_show_buddy_window()
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1359 // 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
1360 void scr_show_buddy_window(void)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1361 {
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
1362 const gchar *bjid;
140
3b480b73df19 [/trunk] Changeset 152 by mikael
mikael
parents: 139
diff changeset
1363
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1364 if (!current_buddy) {
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
1365 bjid = NULL;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1366 } else {
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
1367 bjid = CURRENT_JID;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1368 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
1369 scr_show_window(buddy_getname(BUDDATA(current_buddy)), TRUE);
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1370 return;
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1371 }
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1372 }
140
3b480b73df19 [/trunk] Changeset 152 by mikael
mikael
parents: 139
diff changeset
1373
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
1374 if (!bjid) {
140
3b480b73df19 [/trunk] Changeset 152 by mikael
mikael
parents: 139
diff changeset
1375 top_panel(chatPanel);
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1376 top_panel(inputPanel);
140
3b480b73df19 [/trunk] Changeset 152 by mikael
mikael
parents: 139
diff changeset
1377 currentWindow = NULL;
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1378 return;
140
3b480b73df19 [/trunk] Changeset 152 by mikael
mikael
parents: 139
diff changeset
1379 }
3b480b73df19 [/trunk] Changeset 152 by mikael
mikael
parents: 139
diff changeset
1380
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1381 scr_show_window(bjid, FALSE);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1382 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1383
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1384 // scr_update_buddy_window()
865
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1385 // (Re)Display the current window.
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1386 // 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
1387 // else display the chat window.
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1388 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
1389 {
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1390 if (chatmode) {
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1391 scr_show_buddy_window();
865
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1392 return;
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1393 }
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1394
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1395 top_panel(chatPanel);
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1396 top_panel(inputPanel);
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1397 }
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1398
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1399 // scr_write_in_window()
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1400 // 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
1401 // Use winId == NULL for the special status buffer.
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1402 // 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
1403 // 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
1404 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
1405 time_t timestamp, unsigned int prefix_flags,
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1406 int force_show, unsigned mucnicklen,
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1407 gpointer xep184)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1408 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
1409 winbuf *win_entry;
772
464be13343a9 Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents: 771
diff changeset
1410 char *text_locale;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1411 int dont_show = FALSE;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1412 int special;
1142
0e27177882c7 Small fix for the max_history_blocks option
Mikael Berthe <mikael@lilotux.net>
parents: 1141
diff changeset
1413 guint num_history_blocks;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
1414 bool setmsgflg = FALSE;
1296
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1415 char *nicktmp, *nicklocaltmp;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1416
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1417 // Look for the window entry.
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1418 special = (winId == NULL);
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1419 win_entry = scr_search_window(winId, special);
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1420
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1421 // Do we have to really show the window?
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1422 if (!chatmode)
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1423 dont_show = TRUE;
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1424 else if ((!force_show) && ((!currentWindow || (currentWindow != win_entry))))
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1425 dont_show = TRUE;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1426
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1427 // 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
1428 if (!win_entry) {
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1429 win_entry = scr_create_window(winId, special, dont_show);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1430 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1431
220
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1432 // 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
1433 if (win_entry->bd->cleared)
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1434 win_entry->bd->top = g_list_last(win_entry->bd->hbuf);
220
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1435
1142
0e27177882c7 Small fix for the max_history_blocks option
Mikael Berthe <mikael@lilotux.net>
parents: 1141
diff changeset
1436 // 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
1437 // top is set.
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1438 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
1439 num_history_blocks = 0U;
0e27177882c7 Small fix for the max_history_blocks option
Mikael Berthe <mikael@lilotux.net>
parents: 1141
diff changeset
1440 else
0e27177882c7 Small fix for the max_history_blocks option
Mikael Berthe <mikael@lilotux.net>
parents: 1141
diff changeset
1441 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
1442
772
464be13343a9 Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents: 771
diff changeset
1443 text_locale = from_utf8(text);
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
1444 // Convert the nick alone and compute its length
1296
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1445 if (mucnicklen) {
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1446 nicktmp = g_strndup(text, mucnicklen);
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1447 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
1448 if (nicklocaltmp)
0fa6df17bc5c Fix potential issue pointed out by franky's clang report
Mikael Berthe <mikael@lilotux.net>
parents: 1915
diff changeset
1449 mucnicklen = strlen(nicklocaltmp);
1296
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1450 g_free(nicklocaltmp);
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1451 g_free(nicktmp);
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1452 }
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1453 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
1454 maxX - Roster_Width - scr_getprefixwidth(), num_history_blocks,
1602
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
1455 mucnicklen, xep184);
772
464be13343a9 Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents: 771
diff changeset
1456 g_free(text_locale);
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1457
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1458 if (win_entry->bd->cleared) {
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1459 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1460 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
1461 win_entry->bd->top = g_list_next(win_entry->bd->top);
220
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1462 }
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1463
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1464 // 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
1465 if (!win_entry->bd->lock && win_entry->bd->top) {
220
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1466 int dist;
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1467 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
1468 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
1469 g_list_position(first, win_entry->bd->top);
220
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1470 if (dist >= CHAT_WIN_HEIGHT)
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1471 win_entry->bd->top = NULL;
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
1472 }
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
1473
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1474 if (!dont_show) {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1475 if (win_entry->bd->lock)
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
1476 setmsgflg = TRUE;
1950
aec86670047b Automatically set readmark flag
Mikael Berthe <mikael@lilotux.net>
parents: 1949
diff changeset
1477 // If this is an outgoing message, update readmark
1954
256cfc706ae5 Update readmark support
Mikael Berthe <mikael@lilotux.net>
parents: 1950
diff changeset
1478 if (!special && (prefix_flags & (HBB_PREFIX_OUT|HBB_PREFIX_HLIGHT_OUT)))
1950
aec86670047b Automatically set readmark flag
Mikael Berthe <mikael@lilotux.net>
parents: 1949
diff changeset
1479 hbuf_set_readmark(win_entry->bd->hbuf, FALSE);
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1480 // Show and refresh the window
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1481 top_panel(win_entry->panel);
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1482 scr_update_window(win_entry);
142
bb6fe91589b9 [/trunk] Changeset 154 by mikael
mikael
parents: 140
diff changeset
1483 top_panel(inputPanel);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1484 update_panels();
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
1485 } 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
1486 setmsgflg = TRUE;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
1487 }
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
1488 if (setmsgflg && !special) {
889
ae93e69aaaaf Fix up pending message flag for the status special buffer
Mikael Berthe <mikael@lilotux.net>
parents: 888
diff changeset
1489 if (special && !winId)
ae93e69aaaaf Fix up pending message flag for the status special buffer
Mikael Berthe <mikael@lilotux.net>
parents: 888
diff changeset
1490 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
1491 roster_msg_setflag(winId, special, TRUE);
30
4ea2df449381 [/trunk] Changeset 46 by mikael
mikael
parents: 29
diff changeset
1492 update_roster = TRUE;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1493 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1494 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1495
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1496 // scr_update_main_status(forceupdate)
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1497 // Redraw the main (bottom) status line.
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1498 // 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
1499 // 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
1500 void scr_update_main_status(int forceupdate)
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1501 {
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
1502 char *sm = from_utf8(xmpp_getstatusmsg());
1514
939e2957f8a8 Add option "info" (suggested by lego)
franky@diable
parents: 1513
diff changeset
1503 const char *info = settings_opt_get("info");
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1504
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1505 werase(mainstatusWnd);
1515
9013d23f0a86 Forgot those poor non-utf8 locale-souls
franky@diable
parents: 1514
diff changeset
1506 if (info) {
1519
ac5a2c262098 Cosmetics
Mikael Berthe <mikael@lilotux.net>
parents: 1518
diff changeset
1507 char *info_locale = from_utf8(info);
1743
dcbf31f99fa3 Do not automatically append ":" to the "info" string
Mikael Berthe <mikael@lilotux.net>
parents: 1733
diff changeset
1508 mvwprintw(mainstatusWnd, 0, 0, "%c[%c] %s %s",
1514
939e2957f8a8 Add option "info" (suggested by lego)
franky@diable
parents: 1513
diff changeset
1509 (unread_msg(NULL) ? '#' : ' '),
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
1510 imstatus2char[xmpp_getstatus()],
1519
ac5a2c262098 Cosmetics
Mikael Berthe <mikael@lilotux.net>
parents: 1518
diff changeset
1511 info_locale, (sm ? sm : ""));
ac5a2c262098 Cosmetics
Mikael Berthe <mikael@lilotux.net>
parents: 1518
diff changeset
1512 g_free(info_locale);
1515
9013d23f0a86 Forgot those poor non-utf8 locale-souls
franky@diable
parents: 1514
diff changeset
1513 } else
1514
939e2957f8a8 Add option "info" (suggested by lego)
franky@diable
parents: 1513
diff changeset
1514 mvwprintw(mainstatusWnd, 0, 0, "%c[%c] %s",
939e2957f8a8 Add option "info" (suggested by lego)
franky@diable
parents: 1513
diff changeset
1515 (unread_msg(NULL) ? '#' : ' '),
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
1516 imstatus2char[xmpp_getstatus()], (sm ? sm : ""));
724
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1517 if (forceupdate) {
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1518 top_panel(inputPanel);
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1519 update_panels();
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1520 }
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1521 g_free(sm);
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1522 }
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1523
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1524 // scr_draw_main_window()
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1525 // 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
1526 //
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1527 // 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
1528 // expert... :-\ Mikael.
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1529 //
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1530 void scr_draw_main_window(unsigned int fullinit)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1531 {
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1532 int requested_size;
961
95659cf9ea1a Display mcabber version in the status window
Mikael Berthe <mikael@lilotux.net>
parents: 952
diff changeset
1533 gchar *ver, *message;
972
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1534 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
1535 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
1536
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1537 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
1538 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
1539 if (requested_size > 0) {
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1540 if (maxY > requested_size + 3)
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1541 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
1542 else
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1543 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
1544 } else if (requested_size < 0) {
518
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1545 Log_Win_Height = 3;
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
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1548 if (maxY < Log_Win_Height+2) {
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1549 if (maxY < 5) {
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1550 Log_Win_Height = 3;
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1551 maxY = Log_Win_Height+2;
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 - 2;
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1554 }
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1555 }
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1556
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1557 if (roster_hidden) {
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1558 Roster_Width = 0;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1559 } else {
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1560 requested_size = settings_opt_get_int("roster_width");
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1561 if (requested_size > 1)
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1562 Roster_Width = requested_size;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1563 else if (requested_size == 1)
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1564 Roster_Width = 2;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1565 else
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1566 Roster_Width = DEFAULT_ROSTER_WIDTH;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1567 }
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1568
972
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1569 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
1570 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
1571
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1572 if (log_win_on_top) {
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1573 chat_y_pos = Log_Win_Height-1;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1574 log_y_pos = 0;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1575 chatstatus_y_pos = Log_Win_Height-2;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1576 } else {
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1577 chat_y_pos = 0;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1578 log_y_pos = CHAT_WIN_HEIGHT+1;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1579 chatstatus_y_pos = CHAT_WIN_HEIGHT;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1580 }
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1581
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1582 if (roster_win_on_right) {
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1583 roster_x_pos = maxX - Roster_Width;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1584 chat_x_pos = 0;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1585 } else {
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1586 roster_x_pos = 0;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1587 chat_x_pos = Roster_Width;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1588 }
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1589
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1590 if (fullinit) {
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1591 if (!winbufhash)
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1592 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
1593 /* Create windows */
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1594 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
1595 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
1596 chat_x_pos);
1133
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
1597 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
1598 chat_x_pos);
972
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1599 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
1600 chatstatusWnd = newwin(1, maxX, chatstatus_y_pos, 0);
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1601 mainstatusWnd = newwin(1, maxX, maxY-2, 0);
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1602 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
1603 if (!rosterWnd || !chatWnd || !logWnd || !inputWnd) {
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1604 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
1605 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
1606 exit(EXIT_FAILURE);
6e4e667c5571 Fix a segfault when starting mcabber in a really small terminal
Mikael Berthe <mikael@lilotux.net>
parents: 339
diff changeset
1607 }
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1608 wbkgd(rosterWnd, get_color(COLOR_GENERAL));
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1609 wbkgd(chatWnd, get_color(COLOR_GENERAL));
1133
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
1610 wbkgd(activechatWnd, get_color(COLOR_GENERAL));
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1611 wbkgd(logWnd, get_color(COLOR_GENERAL));
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1612 wbkgd(chatstatusWnd, get_color(COLOR_STATUS));
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1613 wbkgd(mainstatusWnd, get_color(COLOR_STATUS));
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1614 } else {
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1615 /* Resize/move windows */
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1616 wresize(rosterWnd, CHAT_WIN_HEIGHT, Roster_Width);
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1617 wresize(chatWnd, CHAT_WIN_HEIGHT, maxX - Roster_Width);
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1618 wresize(logWnd, Log_Win_Height-2, maxX);
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1619
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1620 mvwin(chatWnd, chat_y_pos, chat_x_pos);
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1621 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
1622 mvwin(logWnd, log_y_pos, 0);
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1623
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1624 // Resize & move chat status window
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1625 wresize(chatstatusWnd, 1, maxX);
972
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1626 mvwin(chatstatusWnd, chatstatus_y_pos, 0);
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1627 // Resize & move main status window
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1628 wresize(mainstatusWnd, 1, maxX);
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1629 mvwin(mainstatusWnd, maxY-2, 0);
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1630 // Resize & move input line window
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1631 wresize(inputWnd, 1, maxX);
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1632 mvwin(inputWnd, maxY-1, 0);
168
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1633
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1634 werase(chatWnd);
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1635 }
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1636
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1637 /* Draw/init windows */
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1638
961
95659cf9ea1a Display mcabber version in the status window
Mikael Berthe <mikael@lilotux.net>
parents: 952
diff changeset
1639 ver = mcabber_version();
95659cf9ea1a Display mcabber version in the status window
Mikael Berthe <mikael@lilotux.net>
parents: 952
diff changeset
1640 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
1641 mvwprintw(chatWnd, 0, 0, message);
1455
bec235cd28a8 Misc. documentation updates
Mikael Berthe <mikael@lilotux.net>
parents: 1454
diff changeset
1642 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
1643 g_free(ver);
95659cf9ea1a Display mcabber version in the status window
Mikael Berthe <mikael@lilotux.net>
parents: 952
diff changeset
1644 g_free(message);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1645
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1646 // Auto-scrolling in log window
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1647 scrollok(logWnd, TRUE);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1648
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1649
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1650 if (fullinit) {
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1651 // Enable keypad (+ special keys)
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1652 keypad(inputWnd, TRUE);
1457
3a537b4d7f8d Fix UTF-8 on MirBSD (Thorsten Glaser)
Mikael Berthe <mikael@lilotux.net>
parents: 1455
diff changeset
1653 #ifdef __MirBSD__
3a537b4d7f8d Fix UTF-8 on MirBSD (Thorsten Glaser)
Mikael Berthe <mikael@lilotux.net>
parents: 1455
diff changeset
1654 wtimeout(inputWnd, 50 /* ms */);
3a537b4d7f8d Fix UTF-8 on MirBSD (Thorsten Glaser)
Mikael Berthe <mikael@lilotux.net>
parents: 1455
diff changeset
1655 #else
382
4c6e8392e465 Use nodelay() instead of halfdelay()
Mikael Berthe <mikael@lilotux.net>
parents: 374
diff changeset
1656 nodelay(inputWnd, TRUE);
1457
3a537b4d7f8d Fix UTF-8 on MirBSD (Thorsten Glaser)
Mikael Berthe <mikael@lilotux.net>
parents: 1455
diff changeset
1657 #endif
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1658
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1659 // Create panels
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1660 rosterPanel = new_panel(rosterWnd);
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1661 chatPanel = new_panel(chatWnd);
1133
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
1662 activechatPanel = new_panel(activechatWnd);
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1663 logPanel = new_panel(logWnd);
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1664 chatstatusPanel = new_panel(chatstatusWnd);
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1665 mainstatusPanel = new_panel(mainstatusWnd);
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1666 inputPanel = new_panel(inputWnd);
232
9a6ba4b38e63 [/trunk] Changeset 245 by mikael
mikael
parents: 220
diff changeset
1667
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1668 // 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
1669 // is added
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1670 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
1671
6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change
Mikael Berthe <mikael@lilotux.net>
parents: 1089
diff changeset
1672 // 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
1673 // from rewrapping buffers when the width doesn't change.
1487
f61ed2466f7c Minor style upgrade
Mikael Berthe <mikael@lilotux.net>
parents: 1486
diff changeset
1674 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
1675 // 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
1676 hbuf_rebuild(&statushbuf, prev_chatwidth);
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1677
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
1678 #ifndef UNICODE
232
9a6ba4b38e63 [/trunk] Changeset 245 by mikael
mikael
parents: 220
diff changeset
1679 if (utf8_mode)
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
1680 scr_LogPrint(LPRINT_NORMAL,
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
1681 "WARNING: Compiled without full UTF-8 support!");
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
1682 #endif
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1683 } else {
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1684 // Update panels
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1685 replace_panel(rosterPanel, rosterWnd);
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1686 replace_panel(chatPanel, chatWnd);
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1687 replace_panel(logPanel, logWnd);
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1688 replace_panel(chatstatusPanel, chatstatusWnd);
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1689 replace_panel(mainstatusPanel, mainstatusWnd);
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1690 replace_panel(inputPanel, inputWnd);
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1691 }
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1692
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1693 // We'll need to redraw the roster
149
9f74832eb4f8 [/trunk] Changeset 161 by mikael
mikael
parents: 148
diff changeset
1694 update_roster = TRUE;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1695 return;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1696 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1697
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1698 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
1699 {
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1700 winbuf *wbp = value;
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1701 struct dimensions *dim = data;
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1702 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
1703 int new_chatwidth;
972
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1704
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1705 if (!(wbp && wbp->win))
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1706 return;
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1707
972
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1708 if (log_win_on_top)
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1709 chat_y_pos = Log_Win_Height-1;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1710 else
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1711 chat_y_pos = 0;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1712
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1713 if (roster_win_on_right)
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1714 chat_x_pos = 0;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1715 else
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1716 chat_x_pos = Roster_Width;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1717
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1718 // Resize/move buddy window
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1719 wresize(wbp->win, dim->l, dim->c);
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1720 mvwin(wbp->win, chat_y_pos, chat_x_pos);
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1721 werase(wbp->win);
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1722 // If a panel exists, replace the old window with the new
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1723 if (wbp->panel)
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1724 replace_panel(wbp->panel, wbp->win);
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1725 // Redo line wrapping
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1726 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
1727
1487
f61ed2466f7c Minor style upgrade
Mikael Berthe <mikael@lilotux.net>
parents: 1486
diff changeset
1728 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
1729 if (new_chatwidth != prev_chatwidth)
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1730 hbuf_rebuild(&wbp->bd->hbuf, new_chatwidth);
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1731 }
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1732
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1733 // scr_Resize()
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1734 // Function called when the window is resized.
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1735 // - Resize windows
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1736 // - Rewrap lines in each buddy buffer
1059
875d2c9d399c Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1058
diff changeset
1737 void scr_Resize(void)
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1738 {
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1739 struct dimensions dim;
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1740
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1741 // First, update the global variables
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1742 getmaxyx(stdscr, maxY, maxX);
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1743 // 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
1744
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1745 // Make sure the cursor stays inside the window
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1746 check_offset(0);
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1747
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1748 // Resize windows and update panels
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1749 scr_draw_main_window(FALSE);
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 // Resize all buddy windows
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1752 dim.l = CHAT_WIN_HEIGHT;
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1753 dim.c = maxX - Roster_Width;
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1754 if (dim.c < 1)
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1755 dim.c = 1;
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1756
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1757 // Resize all buffers
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1758 g_hash_table_foreach(winbufhash, resize_win_buffer, &dim);
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1759
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1760 // Resize/move special status buffer
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1761 if (statusWindow)
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1762 resize_win_buffer(NULL, statusWindow, &dim);
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1763
1093
6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change
Mikael Berthe <mikael@lilotux.net>
parents: 1089
diff changeset
1764 // Update prev_chatwidth, now that all buffers have been resized
1487
f61ed2466f7c Minor style upgrade
Mikael Berthe <mikael@lilotux.net>
parents: 1486
diff changeset
1765 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
1766
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1767 // Refresh current buddy window
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1768 if (chatmode)
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1769 scr_show_buddy_window();
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1770 }
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1771
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1772 // scr_update_chat_status(forceupdate)
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1773 // Redraw the buddy status bar.
939
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
1774 // 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
1775 void scr_update_chat_status(int forceupdate)
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1776 {
848
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
1777 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
1778 const char *btypetext = "Unknown";
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1779 const char *fullname;
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1780 const char *msg = NULL;
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1781 char status;
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1782 char *buf, *buf_locale;
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1783
718
b41799901abd Add a new_message flag (#) in the main status line
Mikael Berthe <mikael@lilotux.net>
parents: 717
diff changeset
1784 // 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
1785 // 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
1786 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
1787
806
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1788 // Clear the line
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1789 werase(chatstatusWnd);
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1790
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1791 if (!current_buddy) {
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1792 if (forceupdate) {
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1793 update_panels();
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1794 }
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1795 return;
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1796 }
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1797
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1798 fullname = buddy_getname(BUDDATA(current_buddy));
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1799 btype = buddy_gettype(BUDDATA(current_buddy));
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1800
1502
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1801 isgrp = ismuc = isspe = 0;
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1802 if (btype & ROSTER_TYPE_USER) {
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1803 btypetext = "Buddy";
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1804 } else if (btype & ROSTER_TYPE_GROUP) {
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1805 btypetext = "Group";
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1806 isgrp = 1;
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1807 } else if (btype & ROSTER_TYPE_AGENT) {
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1808 btypetext = "Agent";
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1809 } else if (btype & ROSTER_TYPE_ROOM) {
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1810 btypetext = "Room";
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1811 ismuc = 1;
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1812 } else if (btype & ROSTER_TYPE_SPECIAL) {
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1813 btypetext = "Special buffer";
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1814 isspe = 1;
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1815 }
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1816
1513
9d78b571e693 Show '#' for unread message per buddy on the buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1511
diff changeset
1817 if (chatmode) {
9d78b571e693 Show '#' for unread message per buddy on the buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1511
diff changeset
1818 wprintw(chatstatusWnd, "~");
9d78b571e693 Show '#' for unread message per buddy on the buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1511
diff changeset
1819 } else {
9d78b571e693 Show '#' for unread message per buddy on the buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1511
diff changeset
1820 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
1821 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
1822 // 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
1823 wprintw(chatstatusWnd, "#");
9d78b571e693 Show '#' for unread message per buddy on the buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1511
diff changeset
1824 }
9d78b571e693 Show '#' for unread message per buddy on the buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1511
diff changeset
1825 }
9d78b571e693 Show '#' for unread message per buddy on the buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1511
diff changeset
1826
874
293e8955075c Display a flag in the chat status line when the buffer is locked
Mikael Berthe <mikael@lilotux.net>
parents: 873
diff changeset
1827 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
1828 winbuf *win_entry;
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1829 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
1830 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
1831 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
1832 }
293e8955075c Display a flag in the chat status line when the buffer is locked
Mikael Berthe <mikael@lilotux.net>
parents: 873
diff changeset
1833
848
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
1834 if (isgrp || isspe) {
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1835 buf_locale = from_utf8(fullname);
1502
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1836 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
1837 g_free(buf_locale);
716
ba1137a01078 Add a chatmode flag (©) in the chat status line
Mikael Berthe <mikael@lilotux.net>
parents: 715
diff changeset
1838 if (forceupdate) {
ba1137a01078 Add a chatmode flag (©) in the chat status line
Mikael Berthe <mikael@lilotux.net>
parents: 715
diff changeset
1839 update_panels();
ba1137a01078 Add a chatmode flag (©) in the chat status line
Mikael Berthe <mikael@lilotux.net>
parents: 715
diff changeset
1840 }
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1841 return;
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1842 }
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1843
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1844 status = '?';
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1845
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1846 if (ismuc) {
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1847 if (buddy_getinsideroom(BUDDATA(current_buddy)))
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1848 status = 'C';
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1849 else
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1850 status = 'x';
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
1851 } else if (xmpp_getstatus() != offline) {
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1852 enum imstatus budstate;
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1853 budstate = buddy_getstatus(BUDDATA(current_buddy), NULL);
790
5d4ad1d77da4 Kill a few gcc4 warnings
Mikael Berthe <mikael@lilotux.net>
parents: 785
diff changeset
1854 if (budstate < imstatus_size)
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1855 status = imstatus2char[budstate];
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1856 }
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1857
1502
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1858 // No status message for MUC rooms
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1859 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
1860 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
1861 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
1862
5ef122b2bb75 Use the status string of the most likely resource in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 1521
diff changeset
1863 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
1864 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
1865 // 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
1866 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
1867 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
1868 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
1869 }
1072
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
1870 g_slist_free(resources);
1502
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1871 } else {
721
9cf31c9b1dc4 Use room topic as a description in the chat status line
Mikael Berthe <mikael@lilotux.net>
parents: 720
diff changeset
1872 msg = buddy_gettopic(BUDDATA(current_buddy));
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1873 }
1502
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1874
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1875 if (msg)
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1876 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
1877 else
50dbbca69b55 Small style improvement of buddy status line
Maxim Vuets <maxim.vuets@gmail.com>
parents: 1489
diff changeset
1878 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
1879 replace_nl_with_dots(buf);
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1880 buf_locale = from_utf8(buf);
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1881 mvwprintw(chatstatusWnd, 0, 1, "%s", buf_locale);
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1882 g_free(buf_locale);
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1883 g_free(buf);
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1884
996
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1885 // 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
1886 if (btype & ROSTER_TYPE_USER) {
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1887 char eventchar = 0;
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1888 guint event;
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1889
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1890 // 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
1891 // highest priority will be used.
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1892 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
1893
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1894 if (event == ROSTER_EVENT_ACTIVE)
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1895 eventchar = 'A';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1896 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
1897 eventchar = 'C';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1898 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
1899 eventchar = 'P';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1900 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
1901 eventchar = 'I';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1902 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
1903 eventchar = 'G';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1904
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1905 if (eventchar)
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1906 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
1907 }
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1908
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1909
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1910 if (forceupdate) {
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1911 update_panels();
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1912 }
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1913 }
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1914
1504
9fafea381eb8 Show the number of unfiltered contacts in folded groups
franky
parents: 1503
diff changeset
1915 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
1916 {
9fafea381eb8 Show the number of unfiltered contacts in folded groups
franky
parents: 1503
diff changeset
1917 int *p = param;
9fafea381eb8 Show the number of unfiltered contacts in folded groups
franky
parents: 1503
diff changeset
1918 if (buddylist_is_status_filtered(buddy_getstatus(rosterdata, NULL)))
9fafea381eb8 Show the number of unfiltered contacts in folded groups
franky
parents: 1503
diff changeset
1919 *p=*p+1;
9fafea381eb8 Show the number of unfiltered contacts in folded groups
franky
parents: 1503
diff changeset
1920 }
9fafea381eb8 Show the number of unfiltered contacts in folded groups
franky
parents: 1503
diff changeset
1921
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1922 // scr_draw_roster()
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
1923 // 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
1924 void scr_draw_roster(void)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1925 {
735
2f027806cd48 Some code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 731
diff changeset
1926 static int offset = 0;
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1927 char *name, *rline;
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1928 int maxx, maxy;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1929 GList *buddy;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1930 int i, n;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1931 int rOffset;
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1932 int cursor_backup;
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1933 char status, pending;
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
1934 enum imstatus currentstatus = xmpp_getstatus();
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1935 int x_pos;
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1936
123
1bdf882bed98 [/trunk] Changeset 136 by mikael
mikael
parents: 121
diff changeset
1937 // We can reset update_roster
1bdf882bed98 [/trunk] Changeset 136 by mikael
mikael
parents: 121
diff changeset
1938 update_roster = FALSE;
1bdf882bed98 [/trunk] Changeset 136 by mikael
mikael
parents: 121
diff changeset
1939
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1940 getmaxyx(rosterWnd, maxy, maxx);
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1941 maxx--; // Last char is for vertical border
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1942
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1943 cursor_backup = curs_set(0);
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1944
724
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1945 if (!buddylist)
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1946 offset = 0;
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1947 else
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
1948 scr_update_chat_status(FALSE);
724
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1949
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1950 // Cleanup of roster window
168
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1951 werase(rosterWnd);
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1952
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1953 if (Roster_Width) {
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1954 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
1955 // Redraw the vertical line (not very good...)
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1956 wattrset(rosterWnd, get_color(COLOR_GENERAL));
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1957 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
1958 mvwaddch(rosterWnd, i, line_x_pos, ACS_VLINE);
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1959 }
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1960
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1961 // 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
1962 if (!buddylist || !Roster_Width) {
123
1bdf882bed98 [/trunk] Changeset 136 by mikael
mikael
parents: 121
diff changeset
1963 update_panels();
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1964 curs_set(cursor_backup);
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1965 return;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1966 }
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1967
84
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1968 // Update offset if necessary
680
1f8987e0e56c Try to display as many buddylist items as possible
Mikael Berthe <mikael@lilotux.net>
parents: 679
diff changeset
1969 // 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
1970 i = g_list_length(buddylist) - maxy;
682
f3945593432e Small fix in scr_DrawRoster()
Mikael Berthe <mikael@lilotux.net>
parents: 680
diff changeset
1971 if (i < 0)
f3945593432e Small fix in scr_DrawRoster()
Mikael Berthe <mikael@lilotux.net>
parents: 680
diff changeset
1972 i = 0;
f3945593432e Small fix in scr_DrawRoster()
Mikael Berthe <mikael@lilotux.net>
parents: 680
diff changeset
1973 if (i < offset)
680
1f8987e0e56c Try to display as many buddylist items as possible
Mikael Berthe <mikael@lilotux.net>
parents: 679
diff changeset
1974 offset = i;
1f8987e0e56c Try to display as many buddylist items as possible
Mikael Berthe <mikael@lilotux.net>
parents: 679
diff changeset
1975 // b) Make sure the current_buddy is visible
84
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1976 i = g_list_position(buddylist, current_buddy);
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1977 if (i == -1) { // This is bad
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
1978 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
1979 curs_set(cursor_backup);
84
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1980 return;
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1981 } else if (i < offset) {
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1982 offset = i;
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1983 } else if (i+1 > offset + maxy) {
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1984 offset = i + 1 - maxy;
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1985 }
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1986
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1987 if (roster_win_on_right)
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1988 x_pos = 1; // 1 char offset (vertical line)
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1989 else
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1990 x_pos = 0;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1991
1026
fc6060707022 [BP] Fixes truncating utf-8 buddy names (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 966
diff changeset
1992 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
1993 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
1994
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1995 buddy = buddylist;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1996 rOffset = offset;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1997
84
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1998 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
1999 unsigned short bflags, btype;
35a1250c111a Display urgent/attention sign in the roster UI
Mikael Berthe <mikael@lilotux.net>
parents: 1802
diff changeset
2000 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
2001 guint isurg;
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
2002 gchar *rline_locale;
1072
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
2003 GSList *resources, *p_res;
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2004
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2005 bflags = buddy_getflags(BUDDATA(buddy));
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2006 btype = buddy_gettype(BUDDATA(buddy));
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2007
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2008 ismsg = bflags & ROSTER_FLAG_MSG;
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2009 ishid = bflags & ROSTER_FLAG_HIDE;
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2010 isgrp = btype & ROSTER_TYPE_GROUP;
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2011 ismuc = btype & ROSTER_TYPE_ROOM;
848
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
2012 isspe = btype & ROSTER_TYPE_SPECIAL;
1804
35a1250c111a Display urgent/attention sign in the roster UI
Mikael Berthe <mikael@lilotux.net>
parents: 1802
diff changeset
2013 isurg = buddy_getuiprio(BUDDATA(buddy));
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2014
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2015 if (rOffset > 0) {
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2016 rOffset--;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2017 continue;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2018 }
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2019
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2020 status = '?';
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2021 pending = ' ';
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2022
986
ed697234bd39 Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents: 981
diff changeset
2023 resources = buddy_getresources(BUDDATA(buddy));
1072
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
2024 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
2025 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
2026 p_res ? p_res->data : "");
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
2027 if ((events & ROSTER_EVENT_PAUSED) && pending != '+')
992
b37348c2aa79 Chatstates: display "paused" states in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 991
diff changeset
2028 pending = '.';
1072
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
2029 if (events & ROSTER_EVENT_COMPOSING)
987
f47e312560af Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents: 986
diff changeset
2030 pending = '+';
1072
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
2031 g_free(p_res->data);
986
ed697234bd39 Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents: 981
diff changeset
2032 }
1072
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
2033 g_slist_free(resources);
986
ed697234bd39 Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents: 981
diff changeset
2034
149
9f74832eb4f8 [/trunk] Changeset 161 by mikael
mikael
parents: 148
diff changeset
2035 // Display message notice if there is a message flag, but not
9f74832eb4f8 [/trunk] Changeset 161 by mikael
mikael
parents: 148
diff changeset
2036 // for unfolded groups.
9f74832eb4f8 [/trunk] Changeset 161 by mikael
mikael
parents: 148
diff changeset
2037 if (ismsg && (!isgrp || ishid)) {
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2038 pending = '#';
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2039 }
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2040
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2041 if (ismuc) {
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2042 if (buddy_getinsideroom(BUDDATA(buddy)))
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2043 status = 'C';
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2044 else
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2045 status = 'x';
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2046 } else if (currentstatus != offline) {
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2047 enum imstatus budstate;
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2048 budstate = buddy_getstatus(BUDDATA(buddy), NULL);
790
5d4ad1d77da4 Kill a few gcc4 warnings
Mikael Berthe <mikael@lilotux.net>
parents: 785
diff changeset
2049 if (budstate < imstatus_size)
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2050 status = imstatus2char[budstate];
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2051 }
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2052 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
2053 if (pending == '#')
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
2054 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
2055 else
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
2056 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
2057 // 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
2058 wmove(rosterWnd, i, x_pos);
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2059 for (n = 0; n < maxx; n++)
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2060 waddch(rosterWnd, ' ');
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2061 } else {
149
9f74832eb4f8 [/trunk] Changeset 161 by mikael
mikael
parents: 148
diff changeset
2062 if (pending == '#')
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
2063 wattrset(rosterWnd, get_color(COLOR_ROSTERNMSG));
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
2064 else {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
2065 int color = get_color(COLOR_ROSTER);
1729
e6e89b1d7831 Minor style and header updates
Mikael Berthe <mikael@lilotux.net>
parents: 1710
diff changeset
2066 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
2067 GSList *head;
1804
35a1250c111a Display urgent/attention sign in the roster UI
Mikael Berthe <mikael@lilotux.net>
parents: 1802
diff changeset
2068 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
2069 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
2070 rostercolor *rc = head->data;
1804
35a1250c111a Display urgent/attention sign in the roster UI
Mikael Berthe <mikael@lilotux.net>
parents: 1802
diff changeset
2071 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
2072 (!strcmp("*", rc->status) || strchr(rc->status, status))) {
1489
e9c71ce96dca Fixed the colorhandling for mucnicks and /color roster
franky@veqlargh.fs
parents: 1488
diff changeset
2073 color = compose_color(rc->color);
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
2074 break;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
2075 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
2076 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
2077 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
2078 wattrset(rosterWnd, color);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
2079 }
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2080 }
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2081
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
2082 if (Roster_Width > 7)
1026
fc6060707022 [BP] Fixes truncating utf-8 buddy names (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 966
diff changeset
2083 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
2084 else
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
2085 name[0] = 0;
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
2086
1804
35a1250c111a Display urgent/attention sign in the roster UI
Mikael Berthe <mikael@lilotux.net>
parents: 1802
diff changeset
2087 if (pending == '#') {
35a1250c111a Display urgent/attention sign in the roster UI
Mikael Berthe <mikael@lilotux.net>
parents: 1802
diff changeset
2088 // Attention sign?
35a1250c111a Display urgent/attention sign in the roster UI
Mikael Berthe <mikael@lilotux.net>
parents: 1802
diff changeset
2089 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
2090 (!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
2091 pending = '!';
35a1250c111a Display urgent/attention sign in the roster UI
Mikael Berthe <mikael@lilotux.net>
parents: 1802
diff changeset
2092 }
35a1250c111a Display urgent/attention sign in the roster UI
Mikael Berthe <mikael@lilotux.net>
parents: 1802
diff changeset
2093
149
9f74832eb4f8 [/trunk] Changeset 161 by mikael
mikael
parents: 148
diff changeset
2094 if (isgrp) {
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2095 if (ishid) {
1504
9fafea381eb8 Show the number of unfiltered contacts in folded groups
franky
parents: 1503
diff changeset
2096 int group_count = 0;
9fafea381eb8 Show the number of unfiltered contacts in folded groups
franky
parents: 1503
diff changeset
2097 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
2098 &group_count);
9fafea381eb8 Show the number of unfiltered contacts in folded groups
franky
parents: 1503
diff changeset
2099 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
2100 group_count);
a2dd83167bc9 Fix display error in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 1573
diff changeset
2101 /* 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
2102 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
2103 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
2104 }
133
a27b22e3b3a1 [/trunk] Changeset 146 by mikael
mikael
parents: 129
diff changeset
2105 else
1504
9fafea381eb8 Show the number of unfiltered contacts in folded groups
franky
parents: 1503
diff changeset
2106 snprintf(rline, 4*Roster_Width, " %c--- %s", pending, name);
848
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
2107 } else if (isspe) {
1168
eb05f960613f Fix UTF-8 group names in the roster (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1160
diff changeset
2108 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
2109 } else {
824
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
2110 char sepleft = '[';
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
2111 char sepright = ']';
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
2112 if (btype & ROSTER_TYPE_USER) {
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
2113 guint subtype = buddy_getsubscription(BUDDATA(buddy));
832
7c210263c661 Small scr_DrawRoster() fix
Mikael Berthe <mikael@lilotux.net>
parents: 828
diff changeset
2114 if (status == '_' && !(subtype & sub_to))
824
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
2115 status = '?';
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
2116 if (!(subtype & sub_from)) {
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
2117 sepleft = '{';
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
2118 sepright = '}';
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
2119 }
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
2120 }
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
2121
1026
fc6060707022 [BP] Fixes truncating utf-8 buddy names (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 966
diff changeset
2122 snprintf(rline, 4*Roster_Width,
824
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
2123 " %c%c%c%c %s", pending, sepleft, status, sepright, name);
133
a27b22e3b3a1 [/trunk] Changeset 146 by mikael
mikael
parents: 129
diff changeset
2124 }
84
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
2125
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
2126 rline_locale = from_utf8(rline);
981
553b8ecf901f Fixes truncating of utf-8 buddy names (again)
Myhailo Danylenko <isbear@ukrpost.net>
parents: 980
diff changeset
2127 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
2128 g_free(rline_locale);
84
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
2129 i++;
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2130 }
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2131
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
2132 g_free(rline);
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
2133 g_free(name);
142
bb6fe91589b9 [/trunk] Changeset 154 by mikael
mikael
parents: 140
diff changeset
2134 top_panel(inputPanel);
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2135 update_panels();
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
2136 curs_set(cursor_backup);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2137 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2138
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2139 // scr_roster_visibility(status)
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2140 // Set the roster visibility:
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2141 // status=1 Show roster
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2142 // status=0 Hide roster
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2143 // status=-1 Toggle roster status
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2144 void scr_roster_visibility(int status)
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2145 {
708
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed
Mikael Berthe <mikael@lilotux.net>
parents: 707
diff changeset
2146 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
2147
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2148 if (status > 0)
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2149 roster_hidden = FALSE;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2150 else if (status == 0)
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2151 roster_hidden = TRUE;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2152 else
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2153 roster_hidden = !roster_hidden;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2154
708
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed
Mikael Berthe <mikael@lilotux.net>
parents: 707
diff changeset
2155 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
2156 // 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
2157 scr_Resize();
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed
Mikael Berthe <mikael@lilotux.net>
parents: 707
diff changeset
2158 redrawwin(stdscr);
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed
Mikael Berthe <mikael@lilotux.net>
parents: 707
diff changeset
2159 }
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2160 }
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
2161
1521
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
2162 #ifdef HAVE_GLIB_REGEX
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2163 static inline void scr_log_urls(const gchar *string)
1520
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
2164 {
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
2165 GMatchInfo *match_info;
1663
dcb0b4522ded Fix GError handling
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1660
diff changeset
2166
dcb0b4522ded Fix GError handling
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1660
diff changeset
2167 g_regex_match_full(url_regex, string, -1, 0, 0, &match_info, NULL);
1520
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
2168 while (g_match_info_matches(match_info)) {
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
2169 gchar *url = g_match_info_fetch(match_info, 0);
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
2170 scr_print_logwindow(url);
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
2171 g_free(url);
1663
dcb0b4522ded Fix GError handling
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1660
diff changeset
2172 g_match_info_next(match_info, NULL);
1520
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
2173 }
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
2174 g_match_info_free(match_info);
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
2175 }
1521
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
2176 #endif
1520
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
2177
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2178 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
2179 time_t timestamp, guint prefix_flags,
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2180 unsigned mucnicklen, gpointer xep184)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2181 {
727
1c3620668857 Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents: 726
diff changeset
2182 char *xtext;
725
1aff92625bdb Expand tabs when receiving a message
Mikael Berthe <mikael@lilotux.net>
parents: 724
diff changeset
2183
726
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
2184 if (!timestamp) timestamp = time(NULL);
725
1aff92625bdb Expand tabs when receiving a message
Mikael Berthe <mikael@lilotux.net>
parents: 724
diff changeset
2185
1122
648fe6f715a6 Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents: 1115
diff changeset
2186 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
2187
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2188 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
2189 xep184);
725
1aff92625bdb Expand tabs when receiving a message
Mikael Berthe <mikael@lilotux.net>
parents: 724
diff changeset
2190
1aff92625bdb Expand tabs when receiving a message
Mikael Berthe <mikael@lilotux.net>
parents: 724
diff changeset
2191 if (xtext != (char*)text)
1aff92625bdb Expand tabs when receiving a message
Mikael Berthe <mikael@lilotux.net>
parents: 724
diff changeset
2192 g_free(xtext);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2193 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2194
726
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
2195 // 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
2196 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
2197 time_t timestamp,
af3de54ef986 Convert scr_LogPrint() to scr_log_print()
Mikael Berthe <mikael@lilotux.net>
parents: 1780
diff changeset
2198 guint prefix, unsigned mucnicklen)
726
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
2199 {
1055
6eb1efea75d0 PGP: Visual encryption flag
Mikael Berthe <mikael@lilotux.net>
parents: 1050
diff changeset
2200 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
2201 ~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
2202 ~HBB_PREFIX_PGPCRYPT & ~HBB_PREFIX_OTRCRYPT))
726
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
2203 prefix |= HBB_PREFIX_IN;
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
2204
1521
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
2205 #ifdef HAVE_GLIB_REGEX
1520
41d3457af815 Add option "url_regex"
franky@diable.fs
parents: 1519
diff changeset
2206 if (url_regex)
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2207 scr_log_urls(text);
1521
33f8f795abd2 Check for regex support in glib
Mikael Berthe <mikael@lilotux.net>
parents: 1520
diff changeset
2208 #endif
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2209 scr_write_message(jidfrom, text, timestamp, prefix, mucnicklen, NULL);
726
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
2210 }
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
2211
1783
af3de54ef986 Convert scr_LogPrint() to scr_log_print()
Mikael Berthe <mikael@lilotux.net>
parents: 1780
diff changeset
2212 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
2213 guint prefix, gpointer xep184)
47
7259a61e1a4b [/trunk] Changeset 63 by mikael
mikael
parents: 44
diff changeset
2214 {
1115
922a9ae1a17e Fix /say_to to a member of a folded group
Mikael Berthe <mikael@lilotux.net>
parents: 1093
diff changeset
2215 GSList *roster_elt;
922a9ae1a17e Fix /say_to to a member of a folded group
Mikael Berthe <mikael@lilotux.net>
parents: 1093
diff changeset
2216 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
2217 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
2218
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2219 scr_write_message(jidto, text,
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2220 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
2221
922a9ae1a17e Fix /say_to to a member of a folded group
Mikael Berthe <mikael@lilotux.net>
parents: 1093
diff changeset
2222 // 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
2223 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
2224 scr_show_window(jidto, FALSE);
47
7259a61e1a4b [/trunk] Changeset 63 by mikael
mikael
parents: 44
diff changeset
2225 }
7259a61e1a4b [/trunk] Changeset 63 by mikael
mikael
parents: 44
diff changeset
2226
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2227 void scr_remove_receipt_flag(const char *bjid, gpointer xep184)
1602
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
2228 {
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2229 winbuf *win_entry = scr_search_window(bjid, FALSE);
1602
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
2230 if (win_entry) {
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
2231 hbuf_remove_receipt(win_entry->bd->hbuf, xep184);
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
2232 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
2233 scr_update_buddy_window();
1602
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
2234 }
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
2235 }
f4a2c6f767d1 Message Receipts support (XEP-0184)
franky
parents: 1599
diff changeset
2236
935
97e6a6da2b2c Fix ncurses #include (again)
Mikael Berthe <mikael@lilotux.net>
parents: 933
diff changeset
2237 static inline void set_autoaway(bool setaway)
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2238 {
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2239 static enum imstatus oldstatus;
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2240 static char *oldmsg;
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2241 Autoaway = setaway;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2242
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2243 if (setaway) {
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2244 const char *msg, *prevmsg;
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2245 oldstatus = xmpp_getstatus();
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2246 if (oldmsg) {
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2247 g_free(oldmsg);
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2248 oldmsg = NULL;
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2249 }
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2250 prevmsg = xmpp_getstatusmsg();
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2251 msg = settings_opt_get("message_autoaway");
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2252 if (!msg)
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2253 msg = prevmsg;
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2254 if (prevmsg)
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2255 oldmsg = g_strdup(prevmsg);
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2256 xmpp_setstatus(away, NULL, msg, FALSE);
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2257 } else {
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2258 // Back
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2259 xmpp_setstatus(oldstatus, NULL, (oldmsg ? oldmsg : ""), FALSE);
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2260 if (oldmsg) {
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2261 g_free(oldmsg);
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2262 oldmsg = NULL;
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2263 }
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2264 }
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2265 }
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2266
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2267 // set_chatstate(state)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2268 // Set the current chat state (0=active, 1=composing, 2=paused)
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2269 // 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
2270 static void set_chatstate(int state)
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2271 {
1691
b2e0083891cc Replace JEP with XEP
Mikael Berthe <mikael@lilotux.net>
parents: 1686
diff changeset
2272 #if defined XEP0022 || defined XEP0085
993
0759f4c7da68 Add option 'disable_chatstates'
Mikael Berthe <mikael@lilotux.net>
parents: 992
diff changeset
2273 if (chatstates_disabled)
0759f4c7da68 Add option 'disable_chatstates'
Mikael Berthe <mikael@lilotux.net>
parents: 992
diff changeset
2274 return;
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2275 if (!chatmode)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2276 state = 0;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2277 if (state != chatstate) {
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2278 chatstate = state;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2279 if (current_buddy &&
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2280 buddy_gettype(BUDDATA(current_buddy)) == ROSTER_TYPE_USER) {
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2281 guint jep_state;
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2282 if (chatstate == 1) {
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2283 if (chatstate_timeout_id == 0)
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2284 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
2285 scr_chatstates_timeout,
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2286 NULL);
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2287 jep_state = ROSTER_EVENT_COMPOSING;
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2288 }
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2289 else if (chatstate == 2)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2290 jep_state = ROSTER_EVENT_PAUSED;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2291 else
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2292 jep_state = ROSTER_EVENT_ACTIVE;
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2293 xmpp_send_chatstate(BUDDATA(current_buddy), jep_state);
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2294 }
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2295 if (!chatstate)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2296 chatstate_timestamp = 0;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2297 }
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2298 #endif
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2299 }
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2300
1691
b2e0083891cc Replace JEP with XEP
Mikael Berthe <mikael@lilotux.net>
parents: 1686
diff changeset
2301 #if defined XEP0022 || defined XEP0085
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2302 static gboolean scr_chatstates_timeout(void)
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2303 {
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2304 time_t now;
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2305 time(&now);
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2306 // Check if we're currently composing...
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2307 if (chatstate != 1 || !chatstate_timestamp) {
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2308 chatstate_timeout_id = 0;
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2309 return FALSE;
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2310 }
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2311
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2312 // 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
2313 if (now >= chatstate_timestamp + COMPOSING_TIMEOUT) {
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2314 chatstate_timestamp = now;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2315 set_chatstate(2);
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2316 chatstate_timeout_id = 0;
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2317 return FALSE;
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2318 }
1598
a087125d8fc8 Replace libjabber with loudmouth
franky
parents: 1590
diff changeset
2319 return TRUE;
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2320 }
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2321 #endif
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2322
1677
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2323 static gboolean scr_autoaway_timeout_callback(gpointer data)
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2324 {
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2325 enum imstatus cur_st = xmpp_getstatus();
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2326 if (cur_st != available && cur_st != freeforchat)
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2327 // Some non-user-originated status changes, let's wait more.
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2328 // Maybe the proper fix for that will be set global variable
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2329 // "autoaway_delayed" and check that variable in postconnect
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2330 // hook (afaik, only source for such status changes are
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2331 // error disconnects).
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2332 return TRUE;
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2333 set_autoaway(TRUE);
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2334 // source will be destroyed after return
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 return FALSE;
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2337 }
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2338
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2339 static void scr_reinstall_autoaway_timeout(void)
1677
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2340 {
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2341 unsigned int autoaway_timeout = settings_opt_get_int("autoaway");
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2342 enum imstatus cur_st = xmpp_getstatus();
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2343 if (autoaway_source) {
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2344 g_source_remove(autoaway_source);
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2345 autoaway_source = 0;
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2346 }
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2347 if (autoaway_timeout && (cur_st == available || cur_st == freeforchat))
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2348 autoaway_source = g_timeout_add_seconds(autoaway_timeout,
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2349 scr_autoaway_timeout_callback,
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2350 NULL);
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2351 }
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2352
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2353 // 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
2354 void scr_check_auto_away(int activity)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2355 {
1677
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2356 if (Autoaway && activity) {
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2357 scr_reinstall_autoaway_timeout();
1677
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2358 set_autoaway(FALSE);
9a0ed33fb91b Fix autoaway
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1668
diff changeset
2359 } else if (activity || !autoaway_source)
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2360 scr_reinstall_autoaway_timeout();
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2361 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2362
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2363 // set_current_buddy(newbuddy)
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2364 // 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
2365 // 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
2366 static void set_current_buddy(GList *newbuddy)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2367 {
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2368 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
2369 /* 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
2370 * 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
2371 * buddy_getstatus() call.
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2372 */
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2373
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2374 if (!current_buddy || !newbuddy) return;
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2375 if (newbuddy == current_buddy) return;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2376
990
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
2377 // 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
2378 set_chatstate(0);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
2379 // 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
2380 lock_chatstate = TRUE;
990
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
2381
438
b44be19d6229 Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents: 419
diff changeset
2382 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
2383 buddy_setflags(BUDDATA(current_buddy), ROSTER_FLAG_LOCK, FALSE);
1950
aec86670047b Automatically set readmark flag
Mikael Berthe <mikael@lilotux.net>
parents: 1949
diff changeset
2384 if (chatmode) {
aec86670047b Automatically set readmark flag
Mikael Berthe <mikael@lilotux.net>
parents: 1949
diff changeset
2385 scr_buffer_readmark(TRUE);
330
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2386 alternate_buddy = current_buddy;
1950
aec86670047b Automatically set readmark flag
Mikael Berthe <mikael@lilotux.net>
parents: 1949
diff changeset
2387 }
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2388 current_buddy = newbuddy;
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2389 // Lock the buddy in the buddylist if we're in chat mode
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2390 if (chatmode)
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2391 buddy_setflags(BUDDATA(current_buddy), ROSTER_FLAG_LOCK, TRUE);
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2392 // We should rebuild the buddylist but not everytime
1311
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2393 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
2394 buddylist_build();
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2395 update_roster = TRUE;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2396 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2397
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2398 // scr_roster_top()
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2399 // 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
2400 void scr_roster_top(void)
104
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2401 {
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2402 set_current_buddy(buddylist);
104
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2403 if (chatmode)
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2404 scr_show_buddy_window();
104
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2405 }
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2406
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2407 // scr_roster_bottom()
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2408 // 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
2409 void scr_roster_bottom(void)
104
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2410 {
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2411 set_current_buddy(g_list_last(buddylist));
104
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2412 if (chatmode)
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2413 scr_show_buddy_window();
104
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2414 }
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2415
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2416 // 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
2417 // 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
2418 // (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
2419 void scr_roster_up_down(int updown, unsigned int n)
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2420 {
1573
ece4f26bf9ff Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents: 1566
diff changeset
2421 unsigned int i;
ece4f26bf9ff Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents: 1566
diff changeset
2422
ece4f26bf9ff Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents: 1566
diff changeset
2423 if (updown < 0) {
ece4f26bf9ff Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents: 1566
diff changeset
2424 for (i = 0; i < n; i++)
ece4f26bf9ff Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents: 1566
diff changeset
2425 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
2426 } else {
ece4f26bf9ff Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents: 1566
diff changeset
2427 for (i = 0; i < n; i++)
ece4f26bf9ff Add count parameter to roster up/down command
Mikael Berthe <mikael@lilotux.net>
parents: 1566
diff changeset
2428 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
2429 }
104
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2430 if (chatmode)
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2431 scr_show_buddy_window();
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2432 }
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2433
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2434 // 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
2435 // 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
2436 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
2437 {
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2438 GList *bud;
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2439
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2440 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
2441 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
2442 if (!bud)
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2443 break;
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2444 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
2445 set_current_buddy(bud);
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2446 if (chatmode)
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2447 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
2448 break;
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 }
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
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2453 // 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
2454 // 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
2455 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
2456 {
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2457 GList *bud;
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2458
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2459 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
2460 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
2461 if (!bud)
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2462 break;
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2463 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
2464 set_current_buddy(bud);
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2465 if (chatmode)
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2466 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
2467 break;
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2468 }
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2469 }
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2470 }
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2471
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2472 // scr_roster_search(str)
265
49e9e02dd6d0 Add "/roster search" command
mikael@frmp8452
parents: 263
diff changeset
2473 // 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
2474 void scr_roster_search(char *str)
265
49e9e02dd6d0 Add "/roster search" command
mikael@frmp8452
parents: 263
diff changeset
2475 {
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2476 set_current_buddy(buddy_search(str));
265
49e9e02dd6d0 Add "/roster search" command
mikael@frmp8452
parents: 263
diff changeset
2477 if (chatmode)
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2478 scr_show_buddy_window();
265
49e9e02dd6d0 Add "/roster search" command
mikael@frmp8452
parents: 263
diff changeset
2479 }
49e9e02dd6d0 Add "/roster search" command
mikael@frmp8452
parents: 263
diff changeset
2480
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2481 // scr_roster_jump_jid(bjid)
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
2482 // Jump to buddy bjid.
480
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2483 // 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
2484 void scr_roster_jump_jid(char *barejid)
480
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2485 {
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2486 GSList *roster_elt;
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2487 // Look for an existing buddy
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2488 roster_elt = roster_find(barejid, jidsearch,
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2489 ROSTER_TYPE_USER|ROSTER_TYPE_AGENT|ROSTER_TYPE_ROOM);
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2490 // Create it if necessary
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2491 if (!roster_elt)
603
9516db839e08 Store subscription data
Mikael Berthe <mikael@lilotux.net>
parents: 602
diff changeset
2492 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
2493 sub_none, -1);
480
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2494 // Set a lock to see it in the buddylist
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2495 buddy_setflags(BUDDATA(roster_elt), ROSTER_FLAG_LOCK, TRUE);
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2496 buddylist_build();
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2497 // Jump to the buddy
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2498 set_current_buddy(buddy_search_jid(barejid));
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2499 if (chatmode)
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2500 scr_show_buddy_window();
480
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2501 }
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2502
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2503 // scr_roster_unread_message(next)
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2504 // 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
2505 // 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
2506 // message from unread_list.
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2507 void scr_roster_unread_message(int next)
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2508 {
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2509 gpointer unread_ptr;
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2510 gpointer refbuddata;
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2511 GList *nbuddy;
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2512
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2513 if (!current_buddy) return;
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2514
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2515 if (next) refbuddata = BUDDATA(current_buddy);
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2516 else refbuddata = NULL;
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2517
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2518 unread_ptr = unread_msg(refbuddata);
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2519 if (!unread_ptr) return;
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2520
889
ae93e69aaaaf Fix up pending message flag for the status special buffer
Mikael Berthe <mikael@lilotux.net>
parents: 888
diff changeset
2521 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
2522 gpointer ngroup;
ae93e69aaaaf Fix up pending message flag for the status special buffer
Mikael Berthe <mikael@lilotux.net>
parents: 888
diff changeset
2523 // 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
2524 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
2525 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
2526 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
2527 buddylist_build();
ae93e69aaaaf Fix up pending message flag for the status special buffer
Mikael Berthe <mikael@lilotux.net>
parents: 888
diff changeset
2528 }
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2529 }
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2530
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2531 nbuddy = g_list_find(buddylist, unread_ptr);
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2532 if (nbuddy) {
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2533 set_current_buddy(nbuddy);
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2534 if (chatmode) scr_show_buddy_window();
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
2535 } else
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
2536 scr_LogPrint(LPRINT_LOGNORM, "Error: nbuddy == NULL"); // should not happen
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2537 }
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2538
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2539 // scr_roster_jump_alternate()
330
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2540 // 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
2541 void scr_roster_jump_alternate(void)
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2542 {
330
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2543 if (!alternate_buddy || g_list_position(buddylist, alternate_buddy) == -1)
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2544 return;
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2545 set_current_buddy(alternate_buddy);
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2546 if (chatmode)
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2547 scr_show_buddy_window();
330
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2548 }
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2549
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2550 // scr_roster_display(filter)
1311
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2551 // 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
2552 // mask is displayed.
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2553 void scr_roster_display(const char *filter)
1311
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2554 {
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2555 guchar status;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2556 enum imstatus budstate;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2557 char strfilter[imstatus_size+1];
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2558 char *psfilter;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2559
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2560 if (filter && *filter) {
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2561 int show_all = (*filter == '*');
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2562 status = 0;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2563 for (budstate = 0; budstate < imstatus_size-1; budstate++)
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2564 if (strchr(filter, imstatus2char[budstate]) || show_all)
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2565 status |= 1<<budstate;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2566 buddylist_set_filter(status);
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2567 buddylist_build();
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2568 update_roster = TRUE;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2569 return;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2570 }
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2571
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2572 // Display current filter
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2573 psfilter = strfilter;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2574 status = buddylist_get_filter();
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2575 for (budstate = 0; budstate < imstatus_size-1; budstate++)
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2576 if (status & 1<<budstate)
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2577 *psfilter++ = imstatus2char[budstate];
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2578 *psfilter = '\0';
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2579 scr_LogPrint(LPRINT_NORMAL, "Roster status filter: %s", strfilter);
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2580 }
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2581
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2582 // scr_buffer_scroll_up_down()
508
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2583 // Scroll up/down the current buddy window,
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2584 // - half a screen if nblines is 0,
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2585 // - 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
2586 void scr_buffer_scroll_up_down(int updown, unsigned int nblines)
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2587 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
2588 winbuf *win_entry;
508
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2589 int n, nbl;
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2590 GList *hbuf_top;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2591 guint isspe;
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2592
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2593 // Get win_entry
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2594 if (!current_buddy) return;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2595
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2596 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
2597 win_entry = scr_search_window(CURRENT_JID, isspe);
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2598 if (!win_entry) return;
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2599
508
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2600 if (!nblines) {
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2601 // Scroll half a screen (or less)
512
1744664332cd Fix "/buffer up"
Mikael Berthe <mikael@lilotux.net>
parents: 508
diff changeset
2602 nbl = CHAT_WIN_HEIGHT/2;
508
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2603 } else {
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2604 nbl = nblines;
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2605 }
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2606 hbuf_top = win_entry->bd->top;
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2607
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2608 if (updown == -1) { // UP
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2609 if (!hbuf_top) {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2610 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
2611 if (!win_entry->bd->cleared) {
512
1744664332cd Fix "/buffer up"
Mikael Berthe <mikael@lilotux.net>
parents: 508
diff changeset
2612 if (!nblines) nbl = nbl*3 - 1;
1744664332cd Fix "/buffer up"
Mikael Berthe <mikael@lilotux.net>
parents: 508
diff changeset
2613 else nbl += CHAT_WIN_HEIGHT - 1;
1744664332cd Fix "/buffer up"
Mikael Berthe <mikael@lilotux.net>
parents: 508
diff changeset
2614 } else {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2615 win_entry->bd->cleared = FALSE;
512
1744664332cd Fix "/buffer up"
Mikael Berthe <mikael@lilotux.net>
parents: 508
diff changeset
2616 }
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2617 }
508
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2618 for (n=0 ; hbuf_top && n < nbl && g_list_previous(hbuf_top) ; n++)
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2619 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
2620 win_entry->bd->top = hbuf_top;
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2621 } else { // DOWN
508
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2622 for (n=0 ; hbuf_top && n < nbl ; n++)
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2623 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
2624 win_entry->bd->top = hbuf_top;
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2625 // Check if we are at the bottom
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2626 for (n=0 ; hbuf_top && n < CHAT_WIN_HEIGHT-1 ; n++)
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2627 hbuf_top = g_list_next(hbuf_top);
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2628 if (!hbuf_top)
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2629 win_entry->bd->top = NULL; // End reached
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2630 }
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2631
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2632 // Refresh the window
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2633 scr_update_window(win_entry);
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2634
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2635 // Finished :)
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2636 update_panels();
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2637 }
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2638
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2639 // scr_buffer_clear()
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2640 // 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
2641 void scr_buffer_clear(void)
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2642 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
2643 winbuf *win_entry;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2644 guint isspe;
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2645
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2646 // Get win_entry
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2647 if (!current_buddy) return;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2648 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
2649 win_entry = scr_search_window(CURRENT_JID, isspe);
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2650 if (!win_entry) return;
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2651
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2652 win_entry->bd->cleared = TRUE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2653 win_entry->bd->top = NULL;
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2654
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2655 // Refresh the window
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2656 scr_update_window(win_entry);
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2657
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2658 // Finished :)
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2659 update_panels();
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2660 }
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2661
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2662 // buffer_purge()
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2663 // key: winId/jid
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2664 // value: winbuf structure
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2665 // 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
2666 // NOTE: does not work for special buffers.
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2667 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
2668 {
1225
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2669 int *p_closebuf = data;
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2670 winbuf *win_entry = value;
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2671
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2672 // Delete the current hbuf
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2673 hbuf_free(&win_entry->bd->hbuf);
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2674
1225
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2675 if (*p_closebuf) {
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2676 g_hash_table_remove(winbufhash, key);
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2677 } else {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2678 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2679 win_entry->bd->top = NULL;
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2680 }
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2681 }
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2682
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2683 // scr_buffer_purge(closebuf, jid)
1279
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2684 // 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
2685 // 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
2686 void scr_buffer_purge(int closebuf, const char *jid)
866
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2687 {
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2688 winbuf *win_entry;
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2689 guint isspe;
1225
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2690 guint *p_closebuf;
1279
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2691 const char *cjid;
1345
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2692 guint hold_chatmode = FALSE;
1279
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2693
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2694 if (jid) {
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2695 cjid = jid;
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2696 isspe = FALSE;
1345
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2697 // 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
2698 // 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
2699 if (closebuf && current_buddy) {
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2700 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL ||
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2701 strcasecmp(jid, CURRENT_JID))
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2702 hold_chatmode = TRUE;
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2703 }
1279
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2704 } else {
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2705 // Get win_entry
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2706 if (!current_buddy) return;
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2707 cjid = CURRENT_JID;
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2708 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2709 }
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2710 win_entry = scr_search_window(cjid, isspe);
866
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2711 if (!win_entry) return;
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2712
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2713 if (!isspe) {
1225
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2714 p_closebuf = g_new(guint, 1);
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2715 *p_closebuf = closebuf;
1279
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2716 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
2717 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
2718 g_free(p_closebuf);
1345
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2719 if (closebuf && !hold_chatmode) {
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2720 scr_set_chatmode(FALSE);
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2721 currentWindow = NULL;
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2722 }
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2723 } else {
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2724 // (Special buffer)
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2725 // Reset the current hbuf
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2726 hbuf_free(&win_entry->bd->hbuf);
866
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2727 // Currently it can only be the status buffer
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2728 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
2729 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
2730
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2731 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2732 win_entry->bd->top = NULL;
866
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2733 }
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2734
1700
87dd0a8f1a9c Remove the "new message" flag when a buffer is purged with /buffer purge
Mikael Berthe <mikael@lilotux.net>
parents: 1694
diff changeset
2735 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
2736
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2737 // Refresh the window
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2738 scr_update_buddy_window();
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2739
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2740 // Finished :)
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2741 update_panels();
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2742 }
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2743
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2744 // scr_buffer_purge_all(closebuf)
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2745 // Purge all existing buffers.
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2746 // 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
2747 void scr_buffer_purge_all(int closebuf)
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2748 {
1225
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2749 guint *p_closebuf;
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2750 p_closebuf = g_new(guint, 1);
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2751
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2752 *p_closebuf = closebuf;
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2753 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
2754 g_free(p_closebuf);
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2755
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2756 if (closebuf) {
1135
5d7c05932b13 Add command /buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1133
diff changeset
2757 scr_set_chatmode(FALSE);
1137
5752017f6e2b Fix a bug in /buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1135
diff changeset
2758 currentWindow = NULL;
1135
5d7c05932b13 Add command /buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1133
diff changeset
2759 }
5d7c05932b13 Add command /buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1133
diff changeset
2760
866
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2761 // Refresh the window
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2762 scr_update_buddy_window();
866
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2763
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2764 // Finished :)
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2765 update_panels();
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2766 }
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2767
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2768 // scr_buffer_scroll_lock(lock)
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2769 // Lock/unlock the current buddy buffer
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2770 // lock = 1 : lock
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2771 // lock = 0 : unlock
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2772 // lock = -1: toggle lock status
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2773 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
2774 {
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2775 winbuf *win_entry;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2776 guint isspe;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2777
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2778 // Get win_entry
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2779 if (!current_buddy) return;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2780 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
2781 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
2782 if (!win_entry) return;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2783
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2784 if (lock == -1)
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2785 lock = !win_entry->bd->lock;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2786
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2787 if (lock) {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2788 win_entry->bd->lock = TRUE;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2789 } else {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2790 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
2791 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
2792 win_entry->bd->top = NULL;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2793 }
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2794
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2795 // 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
2796 // 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
2797 // 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
2798 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
2799 chatmode = TRUE;
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2800 scr_show_buddy_window();
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2801 chatmode = FALSE;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2802 }
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2803
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2804 // Refresh the window
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2805 scr_update_buddy_window();
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2806
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2807 // Finished :)
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2808 update_panels();
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2809 }
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2810
1949
13d18777a629 Add scr_buffer_readmark()
Mikael Berthe <mikael@lilotux.net>
parents: 1948
diff changeset
2811 void scr_buffer_readmark(gboolean action)
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
13d18777a629 Add scr_buffer_readmark()
Mikael Berthe <mikael@lilotux.net>
parents: 1948
diff changeset
2823 hbuf_set_readmark(win_entry->bd->hbuf, action);
13d18777a629 Add scr_buffer_readmark()
Mikael Berthe <mikael@lilotux.net>
parents: 1948
diff changeset
2824 }
13d18777a629 Add scr_buffer_readmark()
Mikael Berthe <mikael@lilotux.net>
parents: 1948
diff changeset
2825
13d18777a629 Add scr_buffer_readmark()
Mikael Berthe <mikael@lilotux.net>
parents: 1948
diff changeset
2826
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2827 // scr_buffer_top_bottom()
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2828 // Jump to the head/tail of the current buddy window
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2829 // (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
2830 void scr_buffer_top_bottom(int topbottom)
187
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2831 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
2832 winbuf *win_entry;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2833 guint isspe;
187
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2834
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2835 // Get win_entry
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2836 if (!current_buddy) return;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2837 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
2838 win_entry = scr_search_window(CURRENT_JID, isspe);
187
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2839 if (!win_entry) return;
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2840
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2841 win_entry->bd->cleared = FALSE;
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2842 if (topbottom == 1)
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2843 win_entry->bd->top = NULL;
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2844 else
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2845 win_entry->bd->top = g_list_first(win_entry->bd->hbuf);
187
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2846
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2847 // Refresh the window
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2848 scr_update_window(win_entry);
187
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2849
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2850 // Finished :)
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2851 update_panels();
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2852 }
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2853
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2854 // scr_buffer_search(direction, text)
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2855 // Jump to the next line containing text
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2856 // (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
2857 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
2858 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
2859 winbuf *win_entry;
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2860 GList *current_line, *search_res;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2861 guint isspe;
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2862
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2863 // Get win_entry
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2864 if (!current_buddy) return;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2865 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
2866 win_entry = scr_search_window(CURRENT_JID, isspe);
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2867 if (!win_entry) return;
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2868
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2869 if (win_entry->bd->top)
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2870 current_line = win_entry->bd->top;
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2871 else
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2872 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
2873
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2874 search_res = hbuf_search(current_line, direction, text);
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2875
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2876 if (search_res) {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2877 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2878 win_entry->bd->top = search_res;
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2879
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2880 // Refresh the window
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2881 scr_update_window(win_entry);
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2882
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2883 // Finished :)
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2884 update_panels();
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2885 } else
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
2886 scr_LogPrint(LPRINT_NORMAL, "Search string not found");
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
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2889 // scr_buffer_percent(n)
462
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2890 // 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
2891 void scr_buffer_percent(int pc)
462
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2892 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
2893 winbuf *win_entry;
462
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2894 GList *search_res;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2895 guint isspe;
462
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2896
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2897 // Get win_entry
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2898 if (!current_buddy) return;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2899 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
2900 win_entry = scr_search_window(CURRENT_JID, isspe);
462
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2901 if (!win_entry) return;
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2902
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2903 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
2904 scr_LogPrint(LPRINT_NORMAL, "Bad %% value");
462
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2905 return;
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2906 }
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2907
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2908 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
2909
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2910 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2911 win_entry->bd->top = search_res;
462
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2912
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2913 // Refresh the window
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2914 scr_update_window(win_entry);
462
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2915
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2916 // Finished :)
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2917 update_panels();
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2918 }
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2919
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2920 // scr_buffer_date(t)
464
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2921 // Jump to the first line after date t in the buffer
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2922 // 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
2923 void scr_buffer_date(time_t t)
464
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2924 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
2925 winbuf *win_entry;
464
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2926 GList *search_res;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2927 guint isspe;
464
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2928
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2929 // Get win_entry
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2930 if (!current_buddy) return;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2931 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
2932 win_entry = scr_search_window(CURRENT_JID, isspe);
464
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2933 if (!win_entry) return;
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2934
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2935 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
2936
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2937 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2938 win_entry->bd->top = search_res;
464
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2939
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2940 // Refresh the window
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2941 scr_update_window(win_entry);
464
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2942
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2943 // Finished :)
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2944 update_panels();
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2945 }
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2946
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2947 // scr_buffer_dump(filename)
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2948 // 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
2949 void scr_buffer_dump(const char *file)
1485
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2950 {
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2951 char *extfname;
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2952
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2953 if (!currentWindow) {
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2954 scr_LogPrint(LPRINT_NORMAL, "No current buffer!");
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2955 return;
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2956 }
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2957
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2958 if (!file || !*file) {
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2959 scr_LogPrint(LPRINT_NORMAL, "Missing parameter (file name)!");
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2960 return;
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2961 }
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2962
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2963 extfname = expand_filename(file);
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2964 hbuf_dump_to_file(currentWindow->bd->hbuf, extfname);
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2965 g_free(extfname);
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2966 }
0121b6f3047c New command: /buffer save
Mikael Berthe <mikael@lilotux.net>
parents: 1484
diff changeset
2967
1226
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2968 // buffer_list()
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2969 // key: winId/jid
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2970 // value: winbuf structure
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2971 // data: none.
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2972 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
2973 {
1227
79c396678f1b Make buffer list display the number of allocated HBB blocks
Mikael Berthe <mikael@lilotux.net>
parents: 1226
diff changeset
2974 GList *head;
1226
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2975 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
2976
79c396678f1b Make buffer list display the number of allocated HBB blocks
Mikael Berthe <mikael@lilotux.net>
parents: 1226
diff changeset
2977 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
2978
1686
393c05fba337 Use G_GNUC_PRINTF to check scr_LogPrint arguments
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1677
diff changeset
2979 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
2980 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
2981 }
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2982
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2983 void scr_buffer_list(void)
1226
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2984 {
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2985 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
2986 buffer_list("[status]", statusWindow, NULL);
1226
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2987 g_hash_table_foreach(winbufhash, buffer_list, NULL);
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2988 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
2989 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
2990 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
2991 ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max);
1226
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2992 }
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2993
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2994 // scr_set_chatmode()
261
259ed1de5bdc Fix spelling mistakes in comments
mikael@frmp8452
parents: 260
diff changeset
2995 // Public function to (un)set chatmode...
129
03be1cc94560 [/trunk] Changeset 142 by mikael
mikael
parents: 126
diff changeset
2996 inline void scr_set_chatmode(int enable)
03be1cc94560 [/trunk] Changeset 142 by mikael
mikael
parents: 126
diff changeset
2997 {
03be1cc94560 [/trunk] Changeset 142 by mikael
mikael
parents: 126
diff changeset
2998 chatmode = enable;
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
2999 scr_update_chat_status(TRUE);
129
03be1cc94560 [/trunk] Changeset 142 by mikael
mikael
parents: 126
diff changeset
3000 }
03be1cc94560 [/trunk] Changeset 142 by mikael
mikael
parents: 126
diff changeset
3001
1129
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
3002 // scr_get_chatmode()
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
3003 // Public function to get chatmode state.
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
3004 inline int scr_get_chatmode(void)
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
3005 {
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
3006 return chatmode;
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
3007 }
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
3008
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3009 // scr_get_multimode()
261
259ed1de5bdc Fix spelling mistakes in comments
mikael@frmp8452
parents: 260
diff changeset
3010 // Public function to get multimode status...
1059
875d2c9d399c Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1058
diff changeset
3011 inline int scr_get_multimode(void)
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3012 {
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3013 return multimode;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3014 }
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3015
654
d7fe7b88e4fc MUC: Set the new_message flag when joining a room
Mikael Berthe <mikael@lilotux.net>
parents: 652
diff changeset
3016 // 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
3017 // 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
3018 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
3019 {
891
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed()
Mikael Berthe <mikael@lilotux.net>
parents: 889
diff changeset
3020 const char *current_id;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
3021 bool iscurrentlocked = FALSE;
667
86bc3295a4db Fix segfault in scr_setmsgflag_if_needed()
Mikael Berthe <mikael@lilotux.net>
parents: 658
diff changeset
3022
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
3023 if (!bjid)
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
3024 return;
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
3025
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
3026 if (current_buddy) {
891
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed()
Mikael Berthe <mikael@lilotux.net>
parents: 889
diff changeset
3027 if (special)
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed()
Mikael Berthe <mikael@lilotux.net>
parents: 889
diff changeset
3028 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
3029 else
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed()
Mikael Berthe <mikael@lilotux.net>
parents: 889
diff changeset
3030 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
3031 if (current_id) {
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
3032 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
3033 if (!win_entry) return;
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
3034 iscurrentlocked = win_entry->bd->lock;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
3035 }
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
3036 } else {
891
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed()
Mikael Berthe <mikael@lilotux.net>
parents: 889
diff changeset
3037 current_id = NULL;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
3038 }
1821
60db836ad98a Move some "update_roster" updates to a better place
Mikael Berthe <mikael@lilotux.net>
parents: 1819
diff changeset
3039 if (!chatmode || !current_id || strcmp(bjid, current_id) || iscurrentlocked) {
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
3040 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
3041 update_roster = TRUE;
60db836ad98a Move some "update_roster" updates to a better place
Mikael Berthe <mikael@lilotux.net>
parents: 1819
diff changeset
3042 }
654
d7fe7b88e4fc MUC: Set the new_message flag when joining a room
Mikael Berthe <mikael@lilotux.net>
parents: 652
diff changeset
3043 }
d7fe7b88e4fc MUC: Set the new_message flag when joining a room
Mikael Berthe <mikael@lilotux.net>
parents: 652
diff changeset
3044
1802
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3045 // 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
3046 // 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
3047 // 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
3048 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
3049 guint value, enum setuiprio_ops action)
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3050 {
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3051 const char *current_id;
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3052 winbuf *wb;
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3053 bool iscurrentlocked = FALSE;
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3054
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3055 if (!bjid)
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3056 return;
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3057
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3058 wb = scr_search_window(bjid, special);
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3059 if (!wb)
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3060 return;
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3061
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3062 if (current_buddy) {
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3063 if (special)
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3064 current_id = buddy_getname(BUDDATA(current_buddy));
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3065 else
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3066 current_id = buddy_getjid(BUDDATA(current_buddy));
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3067 if (current_id) {
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3068 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
3069 if (!win_entry) return;
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3070 iscurrentlocked = win_entry->bd->lock;
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3071 }
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3072 } else {
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3073 current_id = NULL;
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3074 }
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3075
1821
60db836ad98a Move some "update_roster" updates to a better place
Mikael Berthe <mikael@lilotux.net>
parents: 1819
diff changeset
3076 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
3077 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
3078 update_roster = TRUE;
60db836ad98a Move some "update_roster" updates to a better place
Mikael Berthe <mikael@lilotux.net>
parents: 1819
diff changeset
3079 }
1802
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3080 }
b135572fcd26 Add urgent flag per screen buffer
Mikael Berthe <mikael@lilotux.net>
parents: 1793
diff changeset
3081
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3082 // scr_set_multimode()
261
259ed1de5bdc Fix spelling mistakes in comments
mikael@frmp8452
parents: 260
diff changeset
3083 // Public function to (un)set multimode...
260
33e1a05864a6 Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents: 252
diff changeset
3084 // Convention:
33e1a05864a6 Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents: 252
diff changeset
3085 // 0 = disabled / 1 = multimode / 2 = multimode verbatim (commands disabled)
1413
f89844a0448a Remove useless inlines
Mikael Berthe <mikael@lilotux.net>
parents: 1394
diff changeset
3086 void scr_set_multimode(int enable, char *subject)
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3087 {
807
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3088 g_free(multiline);
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3089 multiline = NULL;
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3090
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3091 g_free(multimode_subj);
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3092 if (enable && subject)
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3093 multimode_subj = g_strdup(subject);
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3094 else
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3095 multimode_subj = NULL;
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3096
260
33e1a05864a6 Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents: 252
diff changeset
3097 multimode = enable;
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3098 }
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3099
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3100 // scr_get_multiline()
261
259ed1de5bdc Fix spelling mistakes in comments
mikael@frmp8452
parents: 260
diff changeset
3101 // Public function to get the current multi-line.
1413
f89844a0448a Remove useless inlines
Mikael Berthe <mikael@lilotux.net>
parents: 1394
diff changeset
3102 const char *scr_get_multiline(void)
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3103 {
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3104 if (multimode && multiline)
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3105 return multiline;
807
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3106 return NULL;
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3107 }
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3108
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3109 // scr_get_multimode_subj()
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3110 // Public function to get the multi-line subject, if any.
1413
f89844a0448a Remove useless inlines
Mikael Berthe <mikael@lilotux.net>
parents: 1394
diff changeset
3111 const char *scr_get_multimode_subj(void)
807
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3112 {
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3113 if (multimode)
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3114 return multimode_subj;
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
3115 return NULL;
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3116 }
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3117
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3118 // scr_append_multiline(line)
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3119 // Public function to append a line to the current multi-line message.
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3120 // Skip empty leading lines.
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3121 void scr_append_multiline(const char *line)
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3122 {
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3123 static int num;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3124
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3125 if (!multimode) {
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
3126 scr_LogPrint(LPRINT_NORMAL, "Error: Not in multi-line message mode!");
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3127 return;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3128 }
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3129 if (multiline) {
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3130 int len = strlen(multiline)+strlen(line)+2;
252
cb7f944741e4 [/trunk] Changeset 265 by mikael
mikael
parents: 238
diff changeset
3131 if (len >= HBB_BLOCKSIZE - 1) {
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3132 // We don't handle single messages with size > HBB_BLOCKSIZE
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3133 // (see hbuf)
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
3134 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
3135 "this line has not been added.");
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
3136 scr_LogPrint(LPRINT_NORMAL, "Please send this part now...");
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3137 return;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3138 }
276
627925d885de Limit the number of lines in multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents: 271
diff changeset
3139 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
3140 // 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
3141 // (It should be < 1000 yet)
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
3142 scr_LogPrint(LPRINT_NORMAL, "Your message has too many lines, "
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
3143 "this one has not been added.");
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
3144 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
3145 return;
627925d885de Limit the number of lines in multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents: 271
diff changeset
3146 }
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3147 multiline = g_renew(char, multiline, len);
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3148 strcat(multiline, "\n");
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3149 strcat(multiline, line);
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3150 num++;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3151 } else {
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3152 // First message line (we skip leading empty lines)
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3153 num = 0;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3154 if (line[0]) {
419
2f9852610cf4 Small code review
Mikael Berthe <mikael@lilotux.net>
parents: 412
diff changeset
3155 multiline = g_strdup(line);
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3156 num++;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3157 } else
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3158 return;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3159 }
772
464be13343a9 Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents: 771
diff changeset
3160 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8,
464be13343a9 Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents: 771
diff changeset
3161 "Multi-line mode: line #%d added [%.25s...", num, line);
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3162 }
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
3163
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3164 // scr_cmdhisto_addline()
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3165 // 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
3166 static inline void scr_cmdhisto_addline(char *line)
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3167 {
1127
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3168 int max_histo_lines;
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3169
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3170 if (!line || !*line)
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3171 return;
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3172
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3173 max_histo_lines = settings_opt_get_int("cmdhistory_lines");
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3174
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3175 if (max_histo_lines < 0)
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3176 max_histo_lines = 1;
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3177
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3178 if (max_histo_lines)
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3179 while (cmdhisto_nblines >= (guint)max_histo_lines) {
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3180 if (cmdhisto_cur && cmdhisto_cur == cmdhisto)
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3181 break;
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3182 g_free(cmdhisto->data);
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3183 cmdhisto = g_list_delete_link(cmdhisto, cmdhisto);
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3184 cmdhisto_nblines--;
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3185 }
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3186
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3187 cmdhisto = g_list_append(cmdhisto, g_strdup(line));
1127
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
3188 cmdhisto_nblines++;
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3189 }
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3190
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3191 // scr_cmdhisto_prev()
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3192 // 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
3193 // Returns NULL if none found
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3194 static const char *scr_cmdhisto_prev(char *mask, guint len)
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3195 {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3196 GList *hl;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3197 if (!cmdhisto_cur) {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3198 hl = g_list_last(cmdhisto);
174
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
3199 if (hl) { // backup current line
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
3200 strncpy(cmdhisto_backup, mask, INPUTLINE_LENGTH);
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
3201 }
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3202 } else {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3203 hl = g_list_previous(cmdhisto_cur);
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3204 }
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3205 while (hl) {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3206 if (!strncmp((char*)hl->data, mask, len)) {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3207 // Found a match
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3208 cmdhisto_cur = hl;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3209 return (const char*)hl->data;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3210 }
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3211 hl = g_list_previous(hl);
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3212 }
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3213 return NULL;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3214 }
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3215
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3216 // scr_cmdhisto_next()
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3217 // 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
3218 // Returns NULL if none found
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3219 static const char *scr_cmdhisto_next(char *mask, guint len)
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3220 {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3221 GList *hl;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3222 if (!cmdhisto_cur) return NULL;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3223 hl = cmdhisto_cur;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3224 while ((hl = g_list_next(hl)) != NULL)
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3225 if (!strncmp((char*)hl->data, mask, len)) {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3226 // Found a match
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3227 cmdhisto_cur = hl;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3228 return (const char*)hl->data;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3229 }
175
7b7dd6d69f58 [/trunk] Changeset 187 by mikael
mikael
parents: 174
diff changeset
3230 // If the "backuped" line matches, we'll use it
7b7dd6d69f58 [/trunk] Changeset 187 by mikael
mikael
parents: 174
diff changeset
3231 if (strncmp(cmdhisto_backup, mask, len)) return NULL; // No match
174
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
3232 cmdhisto_cur = NULL;
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
3233 return cmdhisto_backup;
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3234 }
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
3235
1903
75a0a22bbf78 Fix issue #54 -- command line corruption
Mikael Berthe <mikael@lilotux.net>
parents: 1863
diff changeset
3236 static char *_strmove(char *dst, const char *src)
75a0a22bbf78 Fix issue #54 -- command line corruption
Mikael Berthe <mikael@lilotux.net>
parents: 1863
diff changeset
3237 {
75a0a22bbf78 Fix issue #54 -- command line corruption
Mikael Berthe <mikael@lilotux.net>
parents: 1863
diff changeset
3238 char *dest = dst;
75a0a22bbf78 Fix issue #54 -- command line corruption
Mikael Berthe <mikael@lilotux.net>
parents: 1863
diff changeset
3239 while ((*dest++ = *src++) != '\0')
75a0a22bbf78 Fix issue #54 -- command line corruption
Mikael Berthe <mikael@lilotux.net>
parents: 1863
diff changeset
3240 ;
75a0a22bbf78 Fix issue #54 -- command line corruption
Mikael Berthe <mikael@lilotux.net>
parents: 1863
diff changeset
3241 return dest;
75a0a22bbf78 Fix issue #54 -- command line corruption
Mikael Berthe <mikael@lilotux.net>
parents: 1863
diff changeset
3242 }
75a0a22bbf78 Fix issue #54 -- command line corruption
Mikael Berthe <mikael@lilotux.net>
parents: 1863
diff changeset
3243
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3244 // readline_transpose_chars()
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3245 // Drag the character before point forward over the character at
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3246 // point, moving point forward as well. If point is at the end of
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3247 // the line, then this transposes the two characters before point.
1059
875d2c9d399c Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1058
diff changeset
3248 void readline_transpose_chars(void)
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3249 {
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3250 char *c1, *c2;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3251 unsigned a, b;
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3252
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3253 if (ptr_inputline == inputLine) return;
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3254
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3255 if (!*ptr_inputline) { // We're at EOL
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3256 // 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
3257 if (ptr_inputline == prev_char(ptr_inputline, inputLine)) return;
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3258 // Transpose the two previous characters
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3259 c2 = prev_char(ptr_inputline, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3260 c1 = prev_char(c2, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3261 a = get_char(c1);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3262 b = get_char(c2);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3263 put_char(put_char(c1, b), a);
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3264 } else {
196
58eb8ad9ef74 [/trunk] Changeset 208 by mikael
mikael
parents: 195
diff changeset
3265 // 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
3266 c2 = ptr_inputline;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3267 c1 = prev_char(c2, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3268 a = get_char(c1);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3269 b = get_char(c2);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3270 put_char(put_char(c1, b), a);
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3271 check_offset(1);
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3272 }
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3273 }
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3274
1171
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3275 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
3276 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3277 char *c, *old = ptr_inputline;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3278 int spaceallowed = 1;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3279
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3280 if (! *ptr_inputline) return;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3281
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3282 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
3283 if (!iswalnum(get_char(c))) {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3284 if (iswblank(get_char(c))) {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3285 if (!spaceallowed) break;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3286 } else spaceallowed = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3287 } else spaceallowed = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3288 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3289
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3290 // Modify the line
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3291 for (;;) {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3292 *old = *c++;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3293 if (!*old++) break;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3294 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3295 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3296
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3297 // readline_backward_kill_word()
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3298 // Kill the word before the cursor, in input line
1059
875d2c9d399c Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1058
diff changeset
3299 void readline_backward_kill_word(void)
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3300 {
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3301 char *c, *old = ptr_inputline;
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3302 int spaceallowed = 1;
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3303
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3304 if (ptr_inputline == inputLine) return;
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3305
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3306 c = prev_char(ptr_inputline, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3307 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
3308 if (!iswalnum(get_char(c))) {
933
ede9260be93d Input line: Improve word-related functions
Mikael Berthe <mikael@lilotux.net>
parents: 932
diff changeset
3309 if (iswblank(get_char(c))) {
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3310 if (!spaceallowed) break;
933
ede9260be93d Input line: Improve word-related functions
Mikael Berthe <mikael@lilotux.net>
parents: 932
diff changeset
3311 } else spaceallowed = 0;
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3312 } 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
3313 }
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3314
1280
8b621f980321 readline_backward_kill_word() makes a stop at the "command" character
Mikael Berthe <mikael@lilotux.net>
parents: 1279
diff changeset
3315 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
3316 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
3317 } 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
3318 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
3319 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
3320 }
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3321
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3322 // Modify the line
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3323 ptr_inputline = c;
1903
75a0a22bbf78 Fix issue #54 -- command line corruption
Mikael Berthe <mikael@lilotux.net>
parents: 1863
diff changeset
3324 _strmove(ptr_inputline, old);
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
3325 check_offset(-1);
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3326 }
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
3327
759
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3328 // 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
3329 // Move back to the start of the current or previous word
1059
875d2c9d399c Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1058
diff changeset
3330 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
3331 {
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3332 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
3333
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3334 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
3335
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3336 if (iswalnum(get_char(ptr_inputline)) &&
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3337 !iswalnum(get_char(prev_char(ptr_inputline, inputLine))))
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3338 i--;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3339
1333
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
3340 for ( ;
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
3341 ptr_inputline > inputLine;
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
3342 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
3343 if (!iswalnum(get_char(ptr_inputline))) {
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3344 if (i) {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3345 ptr_inputline = next_char(ptr_inputline);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3346 break;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3347 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3348 } 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
3349 }
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3350
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3351 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
3352 }
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3353
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3354 // 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
3355 // Move forward to the end of the next word
1059
875d2c9d399c Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1058
diff changeset
3356 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
3357 {
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3358 int stopsymbol_allowed = 1;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3359
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3360 while (*ptr_inputline) {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3361 if (!iswalnum(get_char(ptr_inputline))) {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3362 if (!stopsymbol_allowed) break;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3363 } else stopsymbol_allowed = 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3364 ptr_inputline = next_char(ptr_inputline);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3365 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3366
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3367 check_offset(1);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3368 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3369
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3370 void readline_updowncase_word(int upcase)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3371 {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3372 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
3373
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3374 while (*ptr_inputline) {
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3375 if (!iswalnum(get_char(ptr_inputline))) {
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3376 if (!stopsymbol_allowed) break;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3377 } else {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3378 stopsymbol_allowed = 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3379 if (upcase)
1748
51a23403cc80 Fix readline_updowncase_word() and readline_capitalize_word() wrt UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 1743
diff changeset
3380 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
3381 else
1748
51a23403cc80 Fix readline_updowncase_word() and readline_capitalize_word() wrt UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 1743
diff changeset
3382 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
3383 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3384 ptr_inputline = next_char(ptr_inputline);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3385 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3386
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3387 check_offset(1);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3388 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3389
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3390 void readline_capitalize_word(void)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3391 {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3392 int stopsymbol_allowed = 1;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3393 int upcased = 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3394
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3395 while (*ptr_inputline) {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3396 if (!iswalnum(get_char(ptr_inputline))) {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3397 if (!stopsymbol_allowed) break;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3398 } else {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3399 stopsymbol_allowed = 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3400 if (!upcased) {
1748
51a23403cc80 Fix readline_updowncase_word() and readline_capitalize_word() wrt UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 1743
diff changeset
3401 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
3402 upcased = 1;
1748
51a23403cc80 Fix readline_updowncase_word() and readline_capitalize_word() wrt UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 1743
diff changeset
3403 } else
51a23403cc80 Fix readline_updowncase_word() and readline_capitalize_word() wrt UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 1743
diff changeset
3404 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
3405 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3406 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
3407 }
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3408
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3409 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
3410 }
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3411
1171
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3412 void readline_backward_char(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3413 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3414 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
3415
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3416 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
3417 check_offset(-1);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3418 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3419
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3420 void readline_forward_char(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3421 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3422 if (!*ptr_inputline) return;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3423
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3424 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
3425 check_offset(1);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3426 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3427
1177
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3428 // 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
3429 // Validate current command line.
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3430 // 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
3431 int readline_accept_line(int down_history)
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3432 {
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
3433 scr_check_auto_away(TRUE);
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3434 if (process_line(inputLine))
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3435 return 255;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3436 // Add line to history
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3437 scr_cmdhisto_addline(inputLine);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3438 // Reset the line
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3439 ptr_inputline = inputLine;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3440 *ptr_inputline = 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3441 inputline_offset = 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3442
1177
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3443 if (down_history) {
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3444 // 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
3445 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
3446 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
3447 // Reset backup history line
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3448 cmdhisto_backup[0] = 0;
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3449 } else {
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3450 // Reset history line pointer
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3451 cmdhisto_cur = NULL;
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3452 }
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3453 return 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3454 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3455
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3456 void readline_cancel_completion(void)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3457 {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3458 scr_cancel_current_completion();
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3459 scr_end_current_completion();
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3460 check_offset(-1);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3461 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3462
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3463 void readline_do_completion(void)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3464 {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3465 int i, n;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3466
1413
f89844a0448a Remove useless inlines
Mikael Berthe <mikael@lilotux.net>
parents: 1394
diff changeset
3467 if (multimode != 2) {
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3468 // Not in verbatim multi-line mode
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3469 scr_handle_tab();
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3470 } else {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3471 // Verbatim multi-line mode: expand tab
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3472 char tabstr[9];
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3473 n = 8 - (ptr_inputline - inputLine) % 8;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3474 for (i = 0; i < n; i++)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3475 tabstr[i] = ' ';
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3476 tabstr[i] = '\0';
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3477 scr_insert_text(tabstr);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3478 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3479 check_offset(0);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3480 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3481
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3482 void readline_refresh_screen(void)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3483 {
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
3484 scr_check_auto_away(TRUE);
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
3485 parse_colors();
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3486 scr_Resize();
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3487 redrawwin(stdscr);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3488 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3489
1503
c74cfe7fd848 Add option --show-roster to command chat_disable.
Mikael Berthe <mikael@lilotux.net>
parents: 1502
diff changeset
3490 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
3491 {
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
3492 scr_check_auto_away(TRUE);
1950
aec86670047b Automatically set readmark flag
Mikael Berthe <mikael@lilotux.net>
parents: 1949
diff changeset
3493 if (chatmode)
aec86670047b Automatically set readmark flag
Mikael Berthe <mikael@lilotux.net>
parents: 1949
diff changeset
3494 scr_buffer_readmark(TRUE);
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3495 currentWindow = NULL;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3496 chatmode = FALSE;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3497 if (current_buddy)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3498 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
3499 if (show_roster)
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
3500 scr_roster_visibility(1);
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
3501 scr_update_chat_status(FALSE);
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3502 top_panel(chatPanel);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3503 top_panel(inputPanel);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3504 update_panels();
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
1190
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3507 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
3508 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3509 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
3510 if (l) strcpy(inputLine, l);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3511 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3512
1190
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3513 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
3514 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3515 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
3516 if (l) strcpy(inputLine, l);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3517 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3518
1190
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3519 void readline_hist_prev(void)
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3520 {
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3521 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
3522 if (l) {
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3523 strcpy(inputLine, l);
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3524 // Set the pointer at the EOL.
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3525 // 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
3526 readline_iline_start();
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3527 readline_iline_end();
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3528 }
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3529 }
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3530
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3531 void readline_hist_next(void)
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3532 {
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3533 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
3534 if (l) {
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3535 strcpy(inputLine, l);
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3536 // Set the pointer at the EOL.
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3537 // 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
3538 readline_iline_start();
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3539 readline_iline_end();
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3540 }
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3541 }
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3542
1171
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3543 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
3544 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3545 char *src, *c;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3546
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3547 if (ptr_inputline == (char*)&inputLine)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3548 return;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3549
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3550 src = ptr_inputline;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3551 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
3552 ptr_inputline = c;
1903
75a0a22bbf78 Fix issue #54 -- command line corruption
Mikael Berthe <mikael@lilotux.net>
parents: 1863
diff changeset
3553 _strmove(ptr_inputline, src);
1171
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3554 check_offset(-1);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3555 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3556
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3557 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
3558 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3559 if (!*ptr_inputline)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3560 return;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3561
1903
75a0a22bbf78 Fix issue #54 -- command line corruption
Mikael Berthe <mikael@lilotux.net>
parents: 1863
diff changeset
3562 _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
3563 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3564
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3565 void readline_iline_start(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3566 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3567 ptr_inputline = inputLine;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3568 inputline_offset = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3569 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3570
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3571 void readline_iline_end(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3572 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3573 for (; *ptr_inputline; ptr_inputline++) ;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3574 check_offset(1);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3575 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3576
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3577 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
3578 {
1863
2b013c0f949a readline: Make backward_kill_iline() consistent with backward_kill_word()
Mikael Berthe <mikael@lilotux.net>
parents: 1821
diff changeset
3579 char *dest = inputLine;
2b013c0f949a readline: Make backward_kill_iline() consistent with backward_kill_word()
Mikael Berthe <mikael@lilotux.net>
parents: 1821
diff changeset
3580
2b013c0f949a readline: Make backward_kill_iline() consistent with backward_kill_word()
Mikael Berthe <mikael@lilotux.net>
parents: 1821
diff changeset
3581 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
3582
2b013c0f949a readline: Make backward_kill_iline() consistent with backward_kill_word()
Mikael Berthe <mikael@lilotux.net>
parents: 1821
diff changeset
3583 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
3584 dest = next_char(dest);
2b013c0f949a readline: Make backward_kill_iline() consistent with backward_kill_word()
Mikael Berthe <mikael@lilotux.net>
parents: 1821
diff changeset
3585
1903
75a0a22bbf78 Fix issue #54 -- command line corruption
Mikael Berthe <mikael@lilotux.net>
parents: 1863
diff changeset
3586 _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
3587 ptr_inputline = dest;
1171
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3588 inputline_offset = 0;
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
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3591 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
3592 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3593 *ptr_inputline = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3594 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3595
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3596 void readline_send_multiline(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3597 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3598 // Validate current multi-line
1413
f89844a0448a Remove useless inlines
Mikael Berthe <mikael@lilotux.net>
parents: 1394
diff changeset
3599 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
3600 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
3601 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3602
1945
518740bcd78b Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents: 1942
diff changeset
3603 void readline_insert(const char *toinsert)
518740bcd78b Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents: 1942
diff changeset
3604 {
518740bcd78b Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents: 1942
diff changeset
3605 if (!toinsert || !*toinsert) return;
518740bcd78b Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents: 1942
diff changeset
3606
518740bcd78b Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents: 1942
diff changeset
3607 scr_insert_text(toinsert);
518740bcd78b Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents: 1942
diff changeset
3608 check_offset(0);
518740bcd78b Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents: 1942
diff changeset
3609 }
518740bcd78b Add /iline iline_insert (Hermitifier)
Mikael Berthe <mikael@lilotux.net>
parents: 1942
diff changeset
3610
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3611 // which_row()
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3612 // 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
3613 // -2 -> normal text
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3614 // -1 -> room: nickname completion
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3615 // 0 -> command
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3616 // 1 -> parameter 1 (etc.)
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3617 // 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
3618 static int which_row(const char **p_row)
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3619 {
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3620 int row = -1;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3621 char *p;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3622 int quote = FALSE;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3623
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3624 // Not a command?
967
303408ef5e5d Configurable command character
Alexis Hildebrandt
parents: 966
diff changeset
3625 if ((ptr_inputline == inputLine) || (inputLine[0] != COMMAND_CHAR)) {
503
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3626 if (!current_buddy) return -2;
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3627 if (buddy_gettype(BUDDATA(current_buddy)) == ROSTER_TYPE_ROOM) {
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3628 *p_row = inputLine;
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3629 return -1;
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3630 }
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3631 return -2;
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3632 }
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3633
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3634 // This is a command
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3635 row = 0;
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3636 for (p = inputLine ; p < ptr_inputline ; p = next_char(p)) {
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3637 if (quote) {
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3638 if (*p == '"' && *(p-1) != '\\')
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3639 quote = FALSE;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3640 continue;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3641 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3642 if (*p == '"' && *(p-1) != '\\') {
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3643 quote = TRUE;
121
94b251102069 [/trunk] Changeset 134 by mikael
mikael
parents: 120
diff changeset
3644 } else if (*p == ' ') {
94b251102069 [/trunk] Changeset 134 by mikael
mikael
parents: 120
diff changeset
3645 if (*(p-1) != ' ')
94b251102069 [/trunk] Changeset 134 by mikael
mikael
parents: 120
diff changeset
3646 row++;
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3647 *p_row = p+1;
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3648 }
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3649 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3650 return row;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3651 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3652
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
3653 // scr_insert_text()
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
3654 // Insert the given text at the current cursor position.
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
3655 // 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
3656 // after, the caller should do that.
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3657 static void scr_insert_text(const char *text)
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3658 {
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3659 char tmpLine[INPUTLINE_LENGTH+1];
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3660 int len = strlen(text);
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3661 // Check the line isn't too long
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3662 if (strlen(inputLine) + len >= INPUTLINE_LENGTH) {
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
3663 scr_LogPrint(LPRINT_LOGNORM, "Cannot insert text, line too long.");
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3664 return;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3665 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3666
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3667 strcpy(tmpLine, ptr_inputline);
419
2f9852610cf4 Small code review
Mikael Berthe <mikael@lilotux.net>
parents: 412
diff changeset
3668 strcpy(ptr_inputline, text);
2f9852610cf4 Small code review
Mikael Berthe <mikael@lilotux.net>
parents: 412
diff changeset
3669 ptr_inputline += len;
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3670 strcpy(ptr_inputline, tmpLine);
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3671 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3672
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3673 static void scr_cancel_current_completion(void);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3674
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
3675 // scr_handle_tab()
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
3676 // Function called when tab is pressed.
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
3677 // Initiate or continue a completion...
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3678 static void scr_handle_tab(void)
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3679 {
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3680 int nrow;
503
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3681 const char *row;
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3682 const char *cchar;
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3683 guint compl_categ;
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3684
740
1877838d3c27 Kill two gcc warnings
Mikael Berthe <mikael@lilotux.net>
parents: 739
diff changeset
3685 row = inputLine; // (Kills a GCC warning)
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3686 nrow = which_row(&row);
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3687
503
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3688 // a) No completion if no leading slash ('cause not a command),
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3689 // unless this is a room (then, it is a nickname completion)
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3690 // 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
3691 if ((nrow == -2) || (nrow == 3 && !completion_started) || nrow > 3)
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3692 return;
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3693
503
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3694 if (nrow == 0) { // Command completion
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3695 row = next_char(inputLine);
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3696 compl_categ = COMPL_CMD;
503
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3697 } else if (nrow == -1) { // Nickname completion
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3698 compl_categ = COMPL_RESOURCE;
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3699 } else { // Other completion, depending on the command
285
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3700 int alias = FALSE;
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3701 cmd *com;
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3702 char *xpline = expandalias(inputLine);
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3703 com = cmd_get(xpline);
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3704 if (xpline != inputLine) {
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3705 // This is an alias, so we can't complete rows > 0
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3706 alias = TRUE;
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3707 g_free(xpline);
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3708 }
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3709 if ((!com && (!alias || !completion_started)) || !row) {
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
3710 scr_LogPrint(LPRINT_NORMAL, "I cannot complete that...");
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3711 return;
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3712 }
285
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3713 if (!alias)
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3714 compl_categ = com->completion_flags[nrow-1];
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3715 else
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3716 compl_categ = 0;
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3717 }
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3718
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3719 if (!completion_started) {
1076
b9698c89f46d Fix memory leak in scr_handle_tab()
Mikael Berthe <mikael@lilotux.net>
parents: 1075
diff changeset
3720 guint dynlist;
1927
3e3e73bb43f5 Do not call compl_get_category_list() needlessly
Mikael Berthe <mikael@lilotux.net>
parents: 1918
diff changeset
3721 GSList *list;
3e3e73bb43f5 Do not call compl_get_category_list() needlessly
Mikael Berthe <mikael@lilotux.net>
parents: 1918
diff changeset
3722
3e3e73bb43f5 Do not call compl_get_category_list() needlessly
Mikael Berthe <mikael@lilotux.net>
parents: 1918
diff changeset
3723 if (!compl_categ)
3e3e73bb43f5 Do not call compl_get_category_list() needlessly
Mikael Berthe <mikael@lilotux.net>
parents: 1918
diff changeset
3724 return; // Nothing to complete
3e3e73bb43f5 Do not call compl_get_category_list() needlessly
Mikael Berthe <mikael@lilotux.net>
parents: 1918
diff changeset
3725
3e3e73bb43f5 Do not call compl_get_category_list() needlessly
Mikael Berthe <mikael@lilotux.net>
parents: 1918
diff changeset
3726 list = compl_get_category_list(compl_categ, &dynlist);
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3727 if (list) {
1228
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3728 guint n;
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3729 char *prefix = g_strndup(row, ptr_inputline-row);
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3730 // Init completion
1756
e2c084204583 Add (optional) suffix after nick completion in Multi-User Chats
Mikael Berthe <mikael@lilotux.net>
parents: 1748
diff changeset
3731 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
3732 (compl_categ == COMPL_RESOURCE ?
1793
c3ddb52f1055 Rename completion_muc_suffix to muc_completion_suffix
Myhailo Danylenko <isbear@ukrpost.net>
parents: 1791
diff changeset
3733 settings_opt_get("muc_completion_suffix") : NULL));
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3734 g_free(prefix);
1228
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3735 if (n == 0 && nrow == -1) {
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3736 // 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
3737 // 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
3738 row = prev_char(ptr_inputline, inputLine);
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3739 while (row >= inputLine) {
1239
eb9fc5d6d085 MUC: Nickname completion starts from any non-space character
Mikael Berthe <mikael@lilotux.net>
parents: 1229
diff changeset
3740 if (iswspace(get_char(row)) || get_char(row) == '(') {
1228
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3741 row = next_char((char*)row);
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3742 break;
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3743 }
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3744 if (row == inputLine)
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3745 break;
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3746 row = prev_char((char*)row, inputLine);
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3747 }
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3748 // There's no need to try again if row == inputLine
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3749 if (row > inputLine) {
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3750 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
3751 new_completion(prefix, list, NULL);
1228
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3752 g_free(prefix);
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3753 }
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3754 }
1076
b9698c89f46d Fix memory leak in scr_handle_tab()
Mikael Berthe <mikael@lilotux.net>
parents: 1075
diff changeset
3755 // 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
3756 if (dynlist) {
b9698c89f46d Fix memory leak in scr_handle_tab()
Mikael Berthe <mikael@lilotux.net>
parents: 1075
diff changeset
3757 GSList *slp;
b9698c89f46d Fix memory leak in scr_handle_tab()
Mikael Berthe <mikael@lilotux.net>
parents: 1075
diff changeset
3758 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
3759 g_free(slp->data);
b9698c89f46d Fix memory leak in scr_handle_tab()
Mikael Berthe <mikael@lilotux.net>
parents: 1075
diff changeset
3760 g_slist_free(list);
b9698c89f46d Fix memory leak in scr_handle_tab()
Mikael Berthe <mikael@lilotux.net>
parents: 1075
diff changeset
3761 }
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3762 // Now complete
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3763 cchar = complete();
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3764 if (cchar)
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3765 scr_insert_text(cchar);
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3766 completion_started = TRUE;
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3767 }
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3768 } else { // Completion already initialized
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3769 scr_cancel_current_completion();
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3770 // Now complete again
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3771 cchar = complete();
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3772 if (cchar)
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3773 scr_insert_text(cchar);
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3774 }
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3775 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3776
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3777 static void scr_cancel_current_completion(void)
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3778 {
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3779 char *c;
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3780 char *src = ptr_inputline;
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3781 guint back = cancel_completion();
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3782 guint i;
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3783 // Remove $back chars
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3784 for (i = 0; i < back; i++)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3785 ptr_inputline = prev_char(ptr_inputline, inputLine);
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3786 c = ptr_inputline;
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3787 for ( ; *src ; )
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3788 *c++ = *src++;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3789 *c = 0;
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3790 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3791
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3792 static void scr_end_current_completion(void)
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3793 {
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3794 done_completion();
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3795 completion_started = FALSE;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3796 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3797
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3798 // check_offset(int direction)
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3799 // Check inputline_offset value, and make sure the cursor is inside the
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3800 // screen.
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3801 static inline void check_offset(int direction)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3802 {
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3803 int i;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3804 char *c = &inputLine[inputline_offset];
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3805 // Left side
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3806 if (inputline_offset && direction <= 0) {
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3807 while (ptr_inputline <= c) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3808 for (i = 0; i < 5; i++)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3809 c = prev_char(c, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3810 if (c == inputLine)
828
319fc55b9a2b Fix a bug in check_offset()
Mikael Berthe <mikael@lilotux.net>
parents: 827
diff changeset
3811 break;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3812 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3813 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3814 // Right side
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3815 if (direction >= 0) {
932
fc6aaa223650 Fix a few problems with non-UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents: 931
diff changeset
3816 int delta = get_char_width(c);
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3817 while (ptr_inputline > c) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3818 c = next_char(c);
932
fc6aaa223650 Fix a few problems with non-UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents: 931
diff changeset
3819 delta += get_char_width(c);
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3820 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3821 c = &inputLine[inputline_offset];
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3822 while (delta >= maxX) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3823 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
3824 delta -= get_char_width(c);
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3825 c = next_char(c);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3826 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3827 }
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3828 }
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3829 inputline_offset = c - inputLine;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3830 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3831
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
3832 #if defined(WITH_ENCHANT) || defined(WITH_ASPELL)
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3833 // prints inputLine with underlined words when misspelled
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3834 static inline void print_checked_line(void)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3835 {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3836 char *wprint_char_fmt = "%c";
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3837 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
3838 int nrchar = maxX;
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3839 char *ptrCur = inputLine + inputline_offset;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3840
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3841 #ifdef UNICODE
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3842 // 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
3843 if (utf8_mode)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3844 wprint_char_fmt = "%lc";
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3845 #endif
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3846
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3847 wmove(inputWnd, 0, 0); // problem with backspace
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3848
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
3849 while (*ptrCur && nrchar-- > 0) {
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3850 point = ptrCur - inputLine;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3851 if (maskLine[point])
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3852 wattrset(inputWnd, A_UNDERLINE);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3853 wprintw(inputWnd, wprint_char_fmt, get_char(ptrCur));
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3854 wattrset(inputWnd, A_NORMAL);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3855 ptrCur = next_char(ptrCur);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3856 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3857 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3858 #endif
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3859
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3860 static inline void refresh_inputline(void)
312
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3861 {
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
3862 #if defined(WITH_ENCHANT) || defined(WITH_ASPELL)
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
3863 if (settings_opt_get_int("spell_enable")) {
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3864 memset(maskLine, 0, INPUTLINE_LENGTH+1);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3865 spellcheck(inputLine, maskLine);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3866 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3867 print_checked_line();
312
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3868 wclrtoeol(inputWnd);
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3869 if (*ptr_inputline) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3870 // 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
3871 // so I know of no better way.
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3872 char c = *ptr_inputline;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3873 *ptr_inputline = 0;
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3874 print_checked_line();
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3875 *ptr_inputline = c;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3876 }
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3877 #else
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3878 mvwprintw(inputWnd, 0, 0, "%s", inputLine + inputline_offset);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3879 wclrtoeol(inputWnd);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3880 if (*ptr_inputline) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3881 // hack to set cursor pos. Characters can have different width,
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3882 // so I know of no better way.
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3883 char c = *ptr_inputline;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3884 *ptr_inputline = 0;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3885 mvwprintw(inputWnd, 0, 0, "%s", inputLine + inputline_offset);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3886 *ptr_inputline = c;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3887 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3888 #endif
312
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3889 }
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3890
389
6e895f397474 Ncurses changes + Ctrl-C does not send a signal anylore
Mikael Berthe <mikael@lilotux.net>
parents: 388
diff changeset
3891 void scr_handle_CtrlC(void)
312
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3892 {
365
ddb6593bedc9 Fix segfault when mcabber receives an INT signal (Ctrl-C) early
Mikael Berthe <mikael@lilotux.net>
parents: 364
diff changeset
3893 if (!Curses) return;
315
65aa05520556 First Ctrl-C now also leaves multi-line message mode
Mikael Berthe <mikael@lilotux.net>
parents: 314
diff changeset
3894 // 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
3895 process_command(mkcmdstr("msay abort"), TRUE);
312
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3896 // Same as Ctrl-g, now
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3897 scr_cancel_current_completion();
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3898 scr_end_current_completion();
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3899 check_offset(-1);
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3900 refresh_inputline();
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3901 }
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3902
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3903 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
3904 {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3905 keyseq *ks;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3906
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3907 // Let's make sure the length is correct
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3908 if (strlen(seqstr) > MAX_KEYSEQ_LENGTH) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3909 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
3910 return;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3911 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3912
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3913 ks = g_new0(keyseq, 1);
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3914 ks->seqstr = g_strdup(seqstr);
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3915 ks->mkeycode = mkeycode;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3916 ks->value = value;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3917 keyseqlist = g_slist_append(keyseqlist, ks);
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3918 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3919
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3920 // match_keyseq(iseq, &ret)
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3921 // Check if "iseq" is a known key escape sequence.
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3922 // Return value:
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3923 // -1 if "seq" matches no known sequence
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3924 // 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
3925 // >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
3926 // and *ret is set to the matching keyseq structure.
952
527d6f234924 Small code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 949
diff changeset
3927 static inline gint match_keyseq(int *iseq, keyseq **ret)
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
3928 {
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3929 GSList *ksl;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3930 keyseq *ksp;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3931 char *p, c;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3932 int *i;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3933 int needmore = FALSE;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3934
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3935 for (ksl = keyseqlist; ksl; ksl = g_slist_next(ksl)) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3936 ksp = ksl->data;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3937 p = ksp->seqstr;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3938 i = iseq;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3939 while (1) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3940 c = (unsigned char)*i;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3941 if (!*p && !c) { // Match
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3942 (*ret) = ksp;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3943 return ksp->mkeycode;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3944 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3945 if (!c) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3946 // iseq is too short
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3947 needmore = TRUE;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3948 break;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3949 } else if (!*p || c != *p) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3950 // This isn't a match
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3951 break;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3952 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3953 p++; i++;
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
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3957 if (needmore)
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3958 return 0;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3959 return -1;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3960 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3961
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3962 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
3963 {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3964 int *strp = iseq;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3965 unsigned c = *strp++;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3966 unsigned mask = 0x80;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3967 int len = -1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3968 while (c & mask) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3969 mask >>= 1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3970 len++;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3971 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3972 if (len <= 0 || len > 4)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3973 return -1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3974 c &= mask - 1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3975 while ((*strp & 0xc0) == 0x80) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3976 if (len-- <= 0) // can't happen
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3977 return -1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3978 c = (c << 6) | (*strp++ & 0x3f);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3979 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3980 if (len)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3981 return 0;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3982 return c;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3983 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3984
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
3985 void scr_getch(keycode *kcode)
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3986 {
769
15eefed5f1de Kill a gcc warning
Mikael Berthe <mikael@lilotux.net>
parents: 766
diff changeset
3987 keyseq *mks = NULL;
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3988 int ks[MAX_KEYSEQ_LENGTH+1];
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3989 int i;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3990
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3991 memset(kcode, 0, sizeof(keycode));
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3992 memset(ks, 0, sizeof(ks));
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3993
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3994 kcode->value = wgetch(inputWnd);
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3995 if (utf8_mode) {
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
3996 bool ismeta = (kcode->value == 27);
1561
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
3997 #ifdef NCURSES_MOUSE_VERSION
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
3998 bool ismouse = (kcode->value == KEY_MOUSE);
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
3999
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
4000 if (ismouse) {
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
4001 MEVENT mouse;
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
4002 getmouse(&mouse);
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
4003 kcode->value = mouse.bstate;
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
4004 kcode->mcode = MKEY_MOUSE;
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
4005 return;
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
4006 } else if (ismeta)
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
4007 #else
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
4008 if (ismeta)
1561
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
4009 #endif
944
aec71ebf98fa Fix Meta + UTF-8 character
Mikael Berthe <mikael@lilotux.net>
parents: 940
diff changeset
4010 ks[0] = wgetch(inputWnd);
aec71ebf98fa Fix Meta + UTF-8 character
Mikael Berthe <mikael@lilotux.net>
parents: 940
diff changeset
4011 else
aec71ebf98fa Fix Meta + UTF-8 character
Mikael Berthe <mikael@lilotux.net>
parents: 940
diff changeset
4012 ks[0] = kcode->value;
aec71ebf98fa Fix Meta + UTF-8 character
Mikael Berthe <mikael@lilotux.net>
parents: 940
diff changeset
4013
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4014 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
4015 int match = match_utf8_keyseq(ks);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4016 if (match == -1)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4017 break;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4018 if (match > 0) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4019 kcode->value = match;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4020 kcode->utf8 = 1;
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
4021 if (ismeta)
944
aec71ebf98fa Fix Meta + UTF-8 character
Mikael Berthe <mikael@lilotux.net>
parents: 940
diff changeset
4022 kcode->mcode = MKEY_META;
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4023 return;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4024 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4025 ks[i + 1] = wgetch(inputWnd);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4026 if (ks[i + 1] == ERR)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4027 break;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4028 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4029 while (i > 0)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4030 ungetch(ks[i--]);
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
4031 if (ismeta)
944
aec71ebf98fa Fix Meta + UTF-8 character
Mikael Berthe <mikael@lilotux.net>
parents: 940
diff changeset
4032 ungetch(ks[0]);
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4033 memset(ks, 0, sizeof(ks));
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4034 }
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4035 if (kcode->value != 27)
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4036 return;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4037
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4038 // Check for escape key sequence
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4039 for (i=0; i < MAX_KEYSEQ_LENGTH; i++) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4040 int match;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4041 ks[i] = wgetch(inputWnd);
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4042 if (ks[i] == ERR) break;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4043 match = match_keyseq(ks, &mks);
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4044 if (match == -1) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4045 // 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
4046 i++;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4047 break;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4048 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4049 if (match > 0) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4050 // We have a matching sequence
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4051 kcode->mcode = mks->mkeycode;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4052 kcode->value = mks->value;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4053 return;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4054 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4055 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4056
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4057 // No match. Let's return a meta-key.
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4058 if (i > 0) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4059 kcode->mcode = MKEY_META;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4060 kcode->value = ks[0];
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4061 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4062 if (i > 1) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4063 // 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
4064 while (i-- > 1)
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4065 ungetch(ks[i]);
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4066 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4067 return;
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
4068 }
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
4069
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
4070 void scr_do_update(void)
939
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
4071 {
1942
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
4072 if (colors_stalled)
3e39a336a992 Use guards for colors (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1935
diff changeset
4073 parse_colors();
939
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
4074 doupdate();
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
4075 }
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
4076
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4077 static int bindcommand(keycode kcode)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4078 {
945
17ef145f3326 Display and use UTF-8 key codes
Mikael Berthe <mikael@lilotux.net>
parents: 944
diff changeset
4079 gchar asciikey[16], asciicode[16];
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4080 const gchar *boundcmd;
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4081
945
17ef145f3326 Display and use UTF-8 key codes
Mikael Berthe <mikael@lilotux.net>
parents: 944
diff changeset
4082 if (kcode.utf8)
17ef145f3326 Display and use UTF-8 key codes
Mikael Berthe <mikael@lilotux.net>
parents: 944
diff changeset
4083 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
4084 else
17ef145f3326 Display and use UTF-8 key codes
Mikael Berthe <mikael@lilotux.net>
parents: 944
diff changeset
4085 g_snprintf(asciicode, 15, "%d", kcode.value);
17ef145f3326 Display and use UTF-8 key codes
Mikael Berthe <mikael@lilotux.net>
parents: 944
diff changeset
4086
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4087 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
4088 g_snprintf(asciikey, 15, "%s", asciicode);
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4089 else if (kcode.mcode == MKEY_META)
945
17ef145f3326 Display and use UTF-8 key codes
Mikael Berthe <mikael@lilotux.net>
parents: 944
diff changeset
4090 g_snprintf(asciikey, 15, "M%s", asciicode);
1561
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
4091 else if (kcode.mcode == MKEY_MOUSE)
2e86c1cc4eb1 Map mouse events to p* keycodes
franky
parents: 1558
diff changeset
4092 g_snprintf(asciikey, 15, "p%s", asciicode);
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4093 else
949
e3c49b2f8143 Fix bindings of special keys (MK*)
Mikael Berthe <mikael@lilotux.net>
parents: 945
diff changeset
4094 g_snprintf(asciikey, 15, "MK%d", kcode.mcode);
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4095
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4096 boundcmd = settings_get(SETTINGS_TYPE_BINDING, asciikey);
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4097
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4098 if (boundcmd) {
1357
7bbfb0073f88 Fix an UTF-8 problem in new hook_execute_internal() function
Mikael Berthe <mikael@lilotux.net>
parents: 1355
diff changeset
4099 gchar *cmdline = from_utf8(boundcmd);
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
4100 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
4101 if (process_command(cmdline, TRUE))
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4102 return 255; // Quit
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
4103 g_free(cmdline);
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4104 return 0;
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4105 }
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4106
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4107 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
4108 #ifndef UNICODE
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4109 if (utf8_mode)
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4110 scr_LogPrint(LPRINT_NORMAL,
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4111 "WARNING: Compiled without full UTF-8 support!");
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
4112 #endif
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4113 return -1;
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4114 }
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4115
1780
e4378fbab5d7 Major API cleanup - bump API to 4
Mikael Berthe <mikael@lilotux.net>
parents: 1761
diff changeset
4116 // scr_process_key(key)
44
c10f95f959d0 [/trunk] Changeset 60 by mikael
mikael
parents: 42
diff changeset
4117 // 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
4118 void scr_process_key(keycode kcode)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
4119 {
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4120 int key = kcode.value;
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4121 int display_char = FALSE;
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4122
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
4123 lock_chatstate = FALSE;
990
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
4124
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4125 switch (kcode.mcode) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4126 case 0:
1918
0fa6df17bc5c Fix potential issue pointed out by franky's clang report
Mikael Berthe <mikael@lilotux.net>
parents: 1915
diff changeset
4127 // key = kcode.value;
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4128 break;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4129 case MKEY_EQUIV:
1918
0fa6df17bc5c Fix potential issue pointed out by franky's clang report
Mikael Berthe <mikael@lilotux.net>
parents: 1915
diff changeset
4130 // key = kcode.value;
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4131 break;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4132 case MKEY_META:
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4133 default:
1359
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents: 1357
diff changeset
4134 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
4135 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
4136 return;
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents: 1357
diff changeset
4137 }
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
4138 key = ERR; // Do not process any further
758
402b0e288433 Enable "meta" key
Mikael Berthe <mikael@lilotux.net>
parents: 740
diff changeset
4139 }
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4140
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4141 if (kcode.utf8) {
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4142 if (key != ERR && !kcode.mcode)
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4143 display_char = TRUE;
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4144 goto display;
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4145 }
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4146
758
402b0e288433 Enable "meta" key
Mikael Berthe <mikael@lilotux.net>
parents: 740
diff changeset
4147 switch (key) {
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4148 case 0:
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
4149 case ERR:
758
402b0e288433 Enable "meta" key
Mikael Berthe <mikael@lilotux.net>
parents: 740
diff changeset
4150 break;
1173
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
4151 case 9: // Tab
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
4152 readline_do_completion();
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
4153 break;
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
4154 case 13: // Enter
1935
a06d9eab14c5 Handle the Enter key on Maemo systems (diSabler)
Mikael Berthe <mikael@lilotux.net>
parents: 1927
diff changeset
4155 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
4156 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
4157 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
4158 return;
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents: 1357
diff changeset
4159 }
1173
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
4160 break;
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
4161 case 3: // Ctrl-C
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
4162 scr_handle_CtrlC();
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
4163 break;
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
4164 case KEY_RESIZE:
1454
6b98dc22946d Add optional SIGWINCH handler (Markus Hennecke)
Mikael Berthe <mikael@lilotux.net>
parents: 1424
diff changeset
4165 #ifdef USE_SIGWINCH
6b98dc22946d Add optional SIGWINCH handler (Markus Hennecke)
Mikael Berthe <mikael@lilotux.net>
parents: 1424
diff changeset
4166 {
1660
dc03a24198a9 Do not call do_screen_refresh() on SIGWINCH
Mikael Berthe <mikael@lilotux.net>
parents: 1653
diff changeset
4167 struct winsize size;
dc03a24198a9 Do not call do_screen_refresh() on SIGWINCH
Mikael Berthe <mikael@lilotux.net>
parents: 1653
diff changeset
4168 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
4169 resizeterm(size.ws_row, size.ws_col);
1454
6b98dc22946d Add optional SIGWINCH handler (Markus Hennecke)
Mikael Berthe <mikael@lilotux.net>
parents: 1424
diff changeset
4170 }
1660
dc03a24198a9 Do not call do_screen_refresh() on SIGWINCH
Mikael Berthe <mikael@lilotux.net>
parents: 1653
diff changeset
4171 #endif
1173
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
4172 scr_Resize();
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
4173 break;
499
baa812f04f24 Reorganise process_key()
Mikael Berthe <mikael@lilotux.net>
parents: 480
diff changeset
4174 default:
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4175 display_char = TRUE;
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4176 } // switch
263
1bcc3eec08f0 Add Ctrl-o: accept-line-and-down-history
mikael@frmp8452
parents: 261
diff changeset
4177
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4178 display:
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4179 if (display_char) {
1394
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
4180 guint printable;
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
4181
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
4182 if (kcode.utf8) {
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
4183 printable = iswprint(key);
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
4184 } else {
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
4185 #ifdef __CYGWIN__
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
4186 printable = (isprint(key) || (key >= 161 && key <= 255))
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
4187 && !is_speckey(key);
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
4188 #else
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
4189 printable = isprint(key) && !is_speckey(key);
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
4190 #endif
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
4191 }
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
4192 if (printable) {
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4193 char tmpLine[INPUTLINE_LENGTH+1];
499
baa812f04f24 Reorganise process_key()
Mikael Berthe <mikael@lilotux.net>
parents: 480
diff changeset
4194
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4195 // Check the line isn't too long
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4196 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
4197 return;
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4198
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4199 // Insert char
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4200 strcpy(tmpLine, ptr_inputline);
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4201 ptr_inputline = put_char(ptr_inputline, key);
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4202 strcpy(ptr_inputline, tmpLine);
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4203 check_offset(1);
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4204 } else {
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4205 // 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
4206 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
4207 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
4208 return;
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents: 1357
diff changeset
4209 }
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
4210 }
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
4211 }
499
baa812f04f24 Reorganise process_key()
Mikael Berthe <mikael@lilotux.net>
parents: 480
diff changeset
4212
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
4213 if (completion_started && key != 9 && key != KEY_RESIZE)
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
4214 scr_end_current_completion();
312
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
4215 refresh_inputline();
990
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
4216
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
4217 if (!lock_chatstate) {
997
d0d0cd9e39c4 Cosmetics & comments
Mikael Berthe <mikael@lilotux.net>
parents: 996
diff changeset
4218 // Set chat state to composing (1) if the user is currently composing,
d0d0cd9e39c4 Cosmetics & comments
Mikael Berthe <mikael@lilotux.net>
parents: 996
diff changeset
4219 // 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
4220 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
4221 set_chatstate(0);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
4222 else
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
4223 set_chatstate(1);
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
4224 if (chatstate)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
4225 time(&chatstate_timestamp);
990
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
4226 }
1359
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents: 1357
diff changeset
4227 return;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
4228 }
576
8b3db0b555a1 Add Vim modelines
Mikael Berthe <mikael@lilotux.net>
parents: 539
diff changeset
4229
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4230 #if defined(WITH_ENCHANT) || defined(WITH_ASPELL)
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4231 // initialization
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4232 void spellcheck_init(void)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4233 {
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4234 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
4235 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
4236 #ifdef WITH_ASPELL
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4237 const char *spell_encoding = settings_opt_get("spell_encoding");
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4238 AspellCanHaveError *possible_err;
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4239 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4240
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4241 if (!spell_enable)
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4242 return;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4243
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4244 #ifdef WITH_ENCHANT
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4245 if (spell_checker) {
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4246 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
4247 enchant_broker_free(spell_broker);
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4248 spell_checker = NULL;
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4249 spell_broker = NULL;
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4250 }
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4251
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4252 spell_broker = enchant_broker_init();
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4253 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
4254 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4255 #ifdef WITH_ASPELL
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4256 if (spell_checker) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4257 delete_aspell_speller(spell_checker);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4258 delete_aspell_config(spell_config);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4259 spell_checker = NULL;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4260 spell_config = NULL;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4261 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4262
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4263 spell_config = new_aspell_config();
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4264 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
4265 aspell_config_replace(spell_config, "lang", spell_lang);
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4266 possible_err = new_aspell_speller(spell_config);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4267
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4268 if (aspell_error_number(possible_err) != 0) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4269 spell_checker = NULL;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4270 delete_aspell_config(spell_config);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4271 spell_config = NULL;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4272 } else {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4273 spell_checker = to_aspell_speller(possible_err);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4274 }
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4275 #endif
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4276 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4277
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4278 // Deinitialization of spellchecker
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4279 void spellcheck_deinit(void)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4280 {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4281 if (spell_checker) {
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4282 #ifdef WITH_ENCHANT
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4283 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
4284 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4285 #ifdef WITH_ASPELL
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4286 delete_aspell_speller(spell_checker);
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4287 #endif
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4288 spell_checker = NULL;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4289 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4290
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4291 #ifdef WITH_ENCHANT
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4292 if (spell_broker) {
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4293 enchant_broker_free(spell_broker);
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4294 spell_broker = NULL;
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4295 }
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4296 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4297 #ifdef WITH_ASPELL
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4298 if (spell_config) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4299 delete_aspell_config(spell_config);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4300 spell_config = NULL;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4301 }
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4302 #endif
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4303 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4304
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4305 #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
4306
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4307 // Spell checking function
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4308 static void spellcheck(char *line, char *checked)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4309 {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4310 const char *start, *line_start;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4311
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4312 if (inputLine[0] == 0 || inputLine[0] == COMMAND_CHAR)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4313 return;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4314
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4315 line_start = line;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4316
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4317 while (*line) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4318
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4319 if (!spell_isalpha(line)) {
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4320 line = next_char(line);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4321 continue;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4322 }
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 (!strncmp(line, "http://", 7)) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4325 line += 7; // : and / characters are 1 byte long in utf8, right?
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4326
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4327 while (!strchr(" \t\r\n", *line))
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4328 line = next_char(line); // i think line++ would be fine here?
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4329
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4330 continue;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4331 }
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 if (!strncmp(line, "ftp://", 6)) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4334 line += 6;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4335
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4336 while (!strchr(" \t\r\n", *line))
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4337 line = next_char(line);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4338
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4339 continue;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4340 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4341
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4342 start = line;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4343
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4344 while (spell_isalpha(line))
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4345 line = next_char(line);
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 if (spell_checker &&
1590
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4348 #ifdef WITH_ENCHANT
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4349 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
4350 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4351 #ifdef WITH_ASPELL
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4352 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
4353 #endif
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4354 )
8d1bcc83ae32 Add support for spellchecking with Enchant (caolan)
Mikael Berthe <mikael@lilotux.net>
parents: 1579
diff changeset
4355 memset(&checked[start - line_start], SPELLBADCHAR, line - start);
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4356 }
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 #endif
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
4359
1811
e6d355e50d7a Update Vim modelines
Mikael Berthe <mikael@lilotux.net>
parents: 1804
diff changeset
4360 /* vim: set et cindent cinoptions=>2\:2(0 ts=2 sw=2: For Vim users... */