annotate mcabber/src/screen.c @ 1394:bba74a50dedf

Improve Cygwin support On Cygwin, isprint() isn't enough so we consider that key codes between 161 and 255 are printable.
author Mikael Berthe <mikael@lilotux.net>
date Sun, 09 Dec 2007 19:26:37 +0100
parents 753a348c65c1
children f89844a0448a
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 *
1205
2de8f8ba1f34 Update copyrights
Mikael Berthe <mikael@lilotux.net>
parents: 1204
diff changeset
4 * Copyright (C) 2005-2007 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>
929
f4bf564893b5 Fix ncurses #include
Mikael Berthe <mikael@lilotux.net>
parents: 898
diff changeset
32
1382
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
33 #ifdef HAVE_LOCALCHARSET_H
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
34 # include <localcharset.h>
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
35 #else
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
36 # include <langinfo.h>
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
37 #endif
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
38
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
39 #ifdef HAVE_ASPELL_H
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
40 # include <aspell.h>
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
41 #endif
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
42
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
43 #include "screen.h"
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
44 #include "utf8.h"
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
45 #include "hbuf.h"
47
7259a61e1a4b [/trunk] Changeset 63 by mikael
mikael
parents: 44
diff changeset
46 #include "commands.h"
95
9e6b7897ec37 [/trunk] Changeset 109 by mikael
mikael
parents: 84
diff changeset
47 #include "compl.h"
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
48 #include "roster.h"
180
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
49 #include "histolog.h"
279
f5dd437c057b Rewrite the settings system
Mikael Berthe <mikael@lilotux.net>
parents: 276
diff changeset
50 #include "settings.h"
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
51 #include "utils.h"
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
52
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
53 #define get_color(col) (COLOR_PAIR(col)|COLOR_ATTRIB[col])
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
54
515
180f0a6e4ac9 Log window's height can be set by the user
Mikael Berthe <mikael@lilotux.net>
parents: 514
diff changeset
55 #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
56 #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
57 #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
58
1390
753a348c65c1 LocaleCharSet is const
Mikael Berthe <mikael@lilotux.net>
parents: 1386
diff changeset
59 const char *LocaleCharSet = "C";
592
67a332121aea Try UTF8 -> locale conversion with fallback
Mikael Berthe <mikael@lilotux.net>
parents: 580
diff changeset
60
515
180f0a6e4ac9 Log window's height can be set by the user
Mikael Berthe <mikael@lilotux.net>
parents: 514
diff changeset
61 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
62 static unsigned short int Roster_Width;
515
180f0a6e4ac9 Log window's height can be set by the user
Mikael Berthe <mikael@lilotux.net>
parents: 514
diff changeset
63
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
64 static inline void check_offset(int);
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
65 static void scr_cancel_current_completion(void);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
66 static void scr_end_current_completion(void);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
67 static void scr_insert_text(const char*);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
68 static void scr_handle_tab(void);
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
69
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
70 #ifdef HAVE_ASPELL_H
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
71 static void spellcheck(char *, char *);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
72 #endif
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
73
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
74 static GHashTable *winbufhash;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
75
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
76 typedef struct {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
77 GList *hbuf;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
78 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
79 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
80 char lock;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
81 } buffdata;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
82
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
83 typedef struct {
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
84 WINDOW *win;
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
85 PANEL *panel;
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
86 buffdata *bd;
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
87 } winbuf;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
88
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
89 struct dimensions {
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
90 int l;
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
91 int c;
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
92 };
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
93
1133
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
94 static WINDOW *rosterWnd, *chatWnd, *activechatWnd, *inputWnd, *logWnd;
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
95 static WINDOW *mainstatusWnd, *chatstatusWnd;
1133
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
96 static PANEL *rosterPanel, *chatPanel, *activechatPanel, *inputPanel;
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
97 static PANEL *mainstatusPanel, *chatstatusPanel;
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
98 static PANEL *logPanel;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
99 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
100 static int prev_chatwidth;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
101 static winbuf *statusWindow;
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
102 static winbuf *currentWindow;
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
103 static GList *statushbuf;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
104
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
105 static int roster_hidden;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
106 static int chatmode;
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
107 static int multimode;
807
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
108 static char *multiline, *multimode_subj;
30
4ea2df449381 [/trunk] Changeset 46 by mikael
mikael
parents: 29
diff changeset
109 int update_roster;
232
9a6ba4b38e63 [/trunk] Changeset 245 by mikael
mikael
parents: 220
diff changeset
110 int utf8_mode = 0;
332
a1901741890e scr_LogPrint() can be called before ncurses initialization
Mikael Berthe <mikael@lilotux.net>
parents: 330
diff changeset
111 static bool Curses;
972
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
112 static bool log_win_on_top;
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
113 static bool roster_win_on_right;
939
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
114 static time_t LastActivity;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
115
174
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
116 static char inputLine[INPUTLINE_LENGTH+1];
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
117 #ifdef HAVE_ASPELL_H
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
118 static char maskLine[INPUTLINE_LENGTH+1];
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
119 #endif
174
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
120 static char *ptr_inputline;
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
121 static short int inputline_offset;
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
122 static int completion_started;
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
123 static GList *cmdhisto;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
124 static GList *cmdhisto_cur;
1127
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
125 static guint cmdhisto_nblines;
174
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
126 static char cmdhisto_backup[INPUTLINE_LENGTH+1];
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
127
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
128 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
129 static bool lock_chatstate;
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
130 static time_t chatstate_timestamp;
993
0759f4c7da68 Add option 'disable_chatstates'
Mikael Berthe <mikael@lilotux.net>
parents: 992
diff changeset
131 int chatstates_disabled;
990
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
132
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
133 #define MAX_KEYSEQ_LENGTH 8
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
134
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
135 typedef struct {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
136 char *seqstr;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
137 guint mkeycode;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
138 gint value;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
139 } keyseq;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
140
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
141 GSList *keyseqlist;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
142 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
143
850
d0781ca2dd08 Use new status buffer window
Mikael Berthe <mikael@lilotux.net>
parents: 849
diff changeset
144 void scr_WriteInWindow(const char *winId, const char *text, time_t timestamp,
1290
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
145 unsigned int prefix_flags, int force_show,
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
146 unsigned mucnicklen);
850
d0781ca2dd08 Use new status buffer window
Mikael Berthe <mikael@lilotux.net>
parents: 849
diff changeset
147
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
148 #ifdef HAVE_ASPELL_H
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
149 #define ASPELLBADCHAR 5
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
150 AspellConfig *spell_config;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
151 AspellSpeller *spell_checker;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
152 #endif
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
153
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
154 typedef struct {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
155 char *status, *wildcard;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
156 int color;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
157 GPatternSpec *compiled;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
158 } rostercolor;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
159
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
160 static GSList *rostercolrules = NULL;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
161
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
162 static GHashTable *muccolors = NULL, *nickcolors = NULL;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
163
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
164 typedef struct {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
165 bool manual;//Manually set?
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
166 int color;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
167 } nickcolor;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
168
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
169 static int nickcolcount = 0, *nickcols = NULL;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
170 static muccoltype glob_muccol = MC_OFF;
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
171
99
7fffb8a6b229 [/trunk] Changeset 113 by mikael
mikael
parents: 98
diff changeset
172 /* Functions */
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
173
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
174 static int color_conv_table[] = {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
175 COLOR_BLACK,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
176 COLOR_RED,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
177 COLOR_GREEN,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
178 COLOR_YELLOW,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
179 COLOR_BLUE,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
180 COLOR_MAGENTA,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
181 COLOR_CYAN,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
182 COLOR_WHITE
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
183 };
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
184
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
185 static int color_conv_table_fg[] = {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
186 COLOR_BLACK_FG,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
187 COLOR_RED_FG,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
188 COLOR_GREEN_FG,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
189 COLOR_YELLOW_FG,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
190 COLOR_BLUE_FG,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
191 COLOR_MAGENTA_FG,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
192 COLOR_CYAN_FG,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
193 COLOR_WHITE_FG
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
194 };
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
195
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
196 static int color_to_color_fg(int color)
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
197 {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
198 unsigned i = 0;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
199 for ( ; i < sizeof color_conv_table / sizeof *color_conv_table; i++)
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
200 if (color == color_conv_table[i])
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
201 return color_conv_table_fg[i];
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
202 return -1;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
203 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
204
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
205 static int color_fg_to_color(int color)
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
206 {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
207 unsigned i = 0;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
208 if (color >= COLOR_BLACK_BOLD_FG)
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
209 color -= COLOR_BLACK_BOLD_FG - COLOR_BLACK_FG;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
210 for ( ; i < sizeof color_conv_table_fg / sizeof *color_conv_table_fg; i++)
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
211 if (color == color_conv_table_fg[i])
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
212 return color_conv_table[i];
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
213 return -1;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
214 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
215
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
216 static int FindColorInternal(const char *name)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
217 {
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
218 if (!strcmp(name, "default"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
219 return -1;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
220 if (!strcmp(name, "black"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
221 return COLOR_BLACK;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
222 if (!strcmp(name, "red"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
223 return COLOR_RED;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
224 if (!strcmp(name, "green"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
225 return COLOR_GREEN;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
226 if (!strcmp(name, "yellow"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
227 return COLOR_YELLOW;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
228 if (!strcmp(name, "blue"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
229 return COLOR_BLUE;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
230 if (!strcmp(name, "magenta"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
231 return COLOR_MAGENTA;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
232 if (!strcmp(name, "cyan"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
233 return COLOR_CYAN;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
234 if (!strcmp(name, "white"))
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
235 return COLOR_WHITE;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
236
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
237 return -2;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
238 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
239
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
240 static int FindColor(const char *name)
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
241 {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
242 int result = FindColorInternal(name);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
243 if (result != -2)
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
244 return result;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
245
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
246 scr_LogPrint(LPRINT_LOGNORM, "ERROR: Wrong color: %s", name);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
247 return -1;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
248 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
249
1295
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
250 static int get_user_color(const char *color)
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
251 {
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
252 bool isbright = FALSE;
1295
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
253 int cl;
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
254 if (!strncmp(color, "bright", 6)) {
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
255 isbright = TRUE;
1295
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
256 color += 6;
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
257 }
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
258 cl = color_to_color_fg(FindColorInternal(color));
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
259 if (cl < 0)
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
260 return cl;
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
261 if (isbright)
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
262 cl += COLOR_BLACK_BOLD_FG - COLOR_BLACK_FG;
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
263 return cl;
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
264 }
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
265
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
266 static void ensure_string_htable(GHashTable **table,
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
267 GDestroyNotify value_destroy_func)
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
268 {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
269 if (*table)//Have it already
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
270 return;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
271 *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
272 g_free, value_destroy_func);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
273 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
274
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
275 // Sets the coloring mode for given MUC
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
276 // 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
277 // muc - the JID of room
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
278 // type - the new type
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
279 void scr_MucColor(const char *muc, muccoltype type)
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 gchar *muclow = g_utf8_strdown(muc, -1);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
282 if (type == MC_REMOVE) {//Remove it
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
283 if (strcmp(muc, "*")) {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
284 if (muccolors && g_hash_table_lookup(muccolors, muclow))
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
285 g_hash_table_remove(muccolors, muclow);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
286 } else {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
287 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
288 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
289 g_free(muclow);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
290 } else {//Add or overwrite
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
291 if (strcmp(muc, "*")) {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
292 ensure_string_htable(&muccolors, g_free);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
293 muccoltype *value = g_new(muccoltype, 1);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
294 *value = type;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
295 g_hash_table_replace(muccolors, muclow, value);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
296 } else {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
297 glob_muccol = type;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
298 g_free(muclow);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
299 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
300 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
301 //Need to redraw?
1333
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
302 if (chatmode &&
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
303 ((buddy_search_jid(muc) == current_buddy) || !strcmp(muc, "*")))
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
304 scr_UpdateBuddyWindow();
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
305 }
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 // Sets the color for nick in MUC
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
308 // 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
309 // not used if the room is in the "preset" mode
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
310 void scr_MucNickColor(const char *nick, const char *color)
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
311 {
1333
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
312 char *snick, *mnick;
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
313 bool need_update = FALSE;
1333
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
314 snick = g_strdup_printf("<%s>", nick);
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
315 mnick = g_strdup_printf("*%s ", nick);
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
316 if (!strcmp(color, "-")) {//Remove the color
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
317 if (nickcolors) {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
318 nickcolor *nc = g_hash_table_lookup(nickcolors, snick);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
319 if (nc) {//Have this nick already
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
320 nc->manual = FALSE;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
321 nc = g_hash_table_lookup(nickcolors, mnick);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
322 assert(nc);//Must have both at the same time
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
323 nc->manual = FALSE;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
324 }// Else -> no color saved, nothing to delete
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
325 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
326 g_free(snick);//They are not saved in the hash
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
327 g_free(mnick);
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
328 need_update = TRUE;
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
329 } else if (!strcmp(color, "!")) {
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
330 if (nickcolors) {
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
331 g_free(g_hash_table_lookup(nickcolors, snick));
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
332 g_hash_table_remove(nickcolors, snick);
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
333 g_hash_table_remove(nickcolors, mnick);
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
334 }
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
335 g_free(snick);//They are not saved in the hash
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
336 g_free(mnick);
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
337 need_update = TRUE;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
338 } else {
1295
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
339 int cl = get_user_color(color);
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
340 if (cl < 0) {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
341 scr_LogPrint(LPRINT_NORMAL, "No such color name");
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
342 g_free(snick);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
343 g_free(mnick);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
344 } else {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
345 nickcolor *nc = g_new(nickcolor, 1);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
346 ensure_string_htable(&nickcolors, NULL);
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
347 nc->manual = TRUE;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
348 nc->color = cl;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
349 //Free the struct, if any there already
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
350 g_free(g_hash_table_lookup(nickcolors, mnick));
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
351 //Save the new ones
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
352 g_hash_table_replace(nickcolors, mnick, nc);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
353 g_hash_table_replace(nickcolors, snick, nc);
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
354 need_update = TRUE;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
355 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
356 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
357 if (need_update && chatmode &&
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
358 (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_ROOM))
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
359 scr_UpdateBuddyWindow();
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
360 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
361
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
362 static void free_rostercolrule(rostercolor *col)
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
363 {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
364 g_free(col->status);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
365 g_free(col->wildcard);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
366 g_pattern_spec_free(col->compiled);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
367 g_free(col);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
368 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
369
1284
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
370 // Removes all roster coloring rules
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
371 void scr_RosterClearColor(void)
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
372 {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
373 GSList *head;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
374 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
375 free_rostercolrule(head->data);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
376 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
377 g_slist_free(rostercolrules);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
378 rostercolrules = NULL;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
379 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
380
1284
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
381 // Adds, modifies or removes roster coloring rule
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
382 // color set to "-" removes the rule,
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
383 // otherwise it is modified (if exists) or added
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
384 //
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
385 // Returns weather it was successfull (therefore the roster should be
2c96720c4f5b Add comments (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1280
diff changeset
386 // 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
387 // name, it also prints the error.
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
388 bool scr_RosterColor(const char *status, const char *wildcard,
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
389 const char *color)
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
390 {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
391 GSList *head;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
392 GSList *found = NULL;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
393 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
394 rostercolor *rc = head->data;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
395 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
396 found = head;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
397 break;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
398 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
399 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
400 if (!strcmp(color,"-")) {//Delete the rule
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
401 if (found) {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
402 free_rostercolrule(found->data);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
403 rostercolrules = g_slist_delete_link(rostercolrules, found);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
404 return TRUE;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
405 } else {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
406 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
407 return FALSE;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
408 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
409 } else {
1295
33cb828282d5 Fix recognizing of bright colors
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1294
diff changeset
410 int cl = get_user_color(color);
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
411 if (cl < 0 ) {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
412 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
413 return FALSE;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
414 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
415 if (found) {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
416 rostercolor *rc = found->data;
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
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
430 static void ParseColors(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:
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
482 init_pair(i+1, ((color) ? FindColor(color) : COLOR_WHITE),
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
483 FindColor(background));
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:
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
486 init_pair(i+1, ((color) ? FindColor(color) : COLOR_CYAN),
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
487 FindColor(background));
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:
e802ec0c02d2 Basic support for nick highlighting in MUC rooms (the whole line is colored)
Mikael Berthe <mikael@lilotux.net>
parents: 1190
diff changeset
490 init_pair(i+1, ((color) ? FindColor(color) : COLOR_YELLOW),
e802ec0c02d2 Basic support for nick highlighting in MUC rooms (the whole line is colored)
Mikael Berthe <mikael@lilotux.net>
parents: 1190
diff changeset
491 FindColor(background));
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:
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
494 init_pair(i+1, ((color) ? FindColor(color) : COLOR_WHITE),
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
495 FindColor(backstatus));
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:
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
498 init_pair(i+1, ((color) ? FindColor(color) : COLOR_GREEN),
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
499 FindColor(background));
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:
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
502 init_pair(i+1, ((color) ? FindColor(color) : COLOR_BLUE),
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
503 FindColor(backselected));
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:
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
506 init_pair(i+1, ((color) ? FindColor(color) : COLOR_RED),
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
507 FindColor(backselected));
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:
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
510 init_pair(i+1, ((color) ? FindColor(color) : COLOR_RED),
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
511 FindColor(background));
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:
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
514 init_pair(i+1, ((color) ? FindColor(color) : COLOR_WHITE),
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
515 FindColor(background));
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:
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
518 init_pair(i+1, ((color) ? FindColor(color) : COLOR_WHITE),
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
519 FindColor(background));
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 }
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
523 for (i = COLOR_BLACK_FG; i < COLOR_max; i++) {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
524 init_pair(i, color_fg_to_color(i), FindColor(background));
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
525 if (i >= COLOR_BLACK_BOLD_FG)
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
526 COLOR_ATTRIB[i] = A_BOLD;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
527 }
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
528 if (!nickcols) {
1314
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
529 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
530 if (ncolors) {
1314
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
531 char *ncolor_start, *ncolor_end;
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
532 ncolor_start = ncolor_end = ncolors;
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
533
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
534 while (*ncolor_end)
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
535 ncolor_end++;
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
536
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
537 while (ncolors < ncolor_end && *ncolors) {
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
538 if ((*ncolors == ' ') || (*ncolors == '\t')) {
1314
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
539 ncolors++;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
540 } else {
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
541 char *end = ncolors;
1314
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
542 int cl;
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
543 while (*end && (*end != ' ') && (*end != '\t'))
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
544 end++;
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
545 *end = '\0';
1314
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
546 cl = get_user_color(ncolors);
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
547 if (cl < 0) {
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
548 scr_LogPrint(LPRINT_NORMAL, "Unknown color %s", ncolors);
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
549 } else {
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
550 nickcols = g_realloc(nickcols, (++nickcolcount) * sizeof *nickcols);
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
551 nickcols[nickcolcount-1] = cl;
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
552 }
1314
248e3f69dd9e Fix a bug in the nick_colors variable parsing
Mikael Berthe <mikael@lilotux.net>
parents: 1311
diff changeset
553 ncolors = end+1;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
554 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
555 }
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
556 g_free(ncolor_start);
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
557 }
1298
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
558 if (!nickcols) {//Fallback to have something
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
559 nickcolcount = 1;
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
560 nickcols = g_new(int, 1);
af035a304bec colorable muc nick fix
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1296
diff changeset
561 *nickcols = COLOR_GENERAL;
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 }
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
564 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
565
765
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 764
diff changeset
566 static void init_keycodes(void)
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
567 {
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
568 add_keyseq("O5A", MKEY_EQUIV, 521); // Ctrl-Up
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
569 add_keyseq("O5B", MKEY_EQUIV, 514); // Ctrl-Down
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
570 add_keyseq("O5C", MKEY_EQUIV, 518); // Ctrl-Right
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
571 add_keyseq("O5D", MKEY_EQUIV, 516); // Ctrl-Left
763
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
572 add_keyseq("O6A", MKEY_EQUIV, 520); // Shift-Up
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
573 add_keyseq("O6B", MKEY_EQUIV, 513); // Shift-Down
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
574 add_keyseq("O6C", MKEY_EQUIV, 402); // Shift-Right
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
575 add_keyseq("O6D", MKEY_EQUIV, 393); // Shift-Left
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
576 add_keyseq("O2A", MKEY_EQUIV, 520); // Shift-Up
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
577 add_keyseq("O2B", MKEY_EQUIV, 513); // Shift-Down
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
578 add_keyseq("O2C", MKEY_EQUIV, 402); // Shift-Right
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
579 add_keyseq("O2D", MKEY_EQUIV, 393); // Shift-Left
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
580 add_keyseq("[5^", MKEY_CTRL_PGUP, 0); // Ctrl-PageUp
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
581 add_keyseq("[6^", MKEY_CTRL_PGDOWN, 0); // Ctrl-PageDown
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
582 add_keyseq("[5@", MKEY_CTRL_SHIFT_PGUP, 0); // Ctrl-Shift-PageUp
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
583 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
584 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
585 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
586 add_keyseq("[8^", MKEY_CTRL_END, 0); // Ctrl-End
32d5298f9f8d Add a few keycode sequences
Mikael Berthe <mikael@lilotux.net>
parents: 790
diff changeset
587 add_keyseq("[7^", MKEY_CTRL_HOME, 0); // Ctrl-Home
32d5298f9f8d Add a few keycode sequences
Mikael Berthe <mikael@lilotux.net>
parents: 790
diff changeset
588 add_keyseq("[2^", MKEY_CTRL_INS, 0); // Ctrl-Insert
32d5298f9f8d Add a few keycode sequences
Mikael Berthe <mikael@lilotux.net>
parents: 790
diff changeset
589 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
590
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
591 // Xterm
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
592 add_keyseq("[1;5A", MKEY_EQUIV, 521); // Ctrl-Up
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
593 add_keyseq("[1;5B", MKEY_EQUIV, 514); // Ctrl-Down
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
594 add_keyseq("[1;5C", MKEY_EQUIV, 518); // Ctrl-Right
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
595 add_keyseq("[1;5D", MKEY_EQUIV, 516); // Ctrl-Left
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
596 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
597 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
598 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
599 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
600 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
601 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
602 add_keyseq("[1;2A", MKEY_EQUIV, 521); // Shift-Up
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
603 add_keyseq("[1;2B", MKEY_EQUIV, 514); // Shift-Down
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
604 add_keyseq("[5;5~", MKEY_CTRL_PGUP, 0); // Ctrl-PageUp
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
605 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
606 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
607 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
608 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
609 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
610
768
0f6d25a02450 Add PuTTY escape keys for Ctrl-arrows
Mikael Berthe <mikael@lilotux.net>
parents: 766
diff changeset
611 // PuTTY
0f6d25a02450 Add PuTTY escape keys for Ctrl-arrows
Mikael Berthe <mikael@lilotux.net>
parents: 766
diff changeset
612 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
613 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
614 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
615 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
616
762
96d46e00524a Add some key escape sequences for screen
Mikael Berthe <mikael@lilotux.net>
parents: 761
diff changeset
617 // screen
96d46e00524a Add some key escape sequences for screen
Mikael Berthe <mikael@lilotux.net>
parents: 761
diff changeset
618 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
619 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
620 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
621 add_keyseq("Od", MKEY_EQUIV, 516); // Ctrl-Left
763
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
622 add_keyseq("[a", MKEY_EQUIV, 520); // Shift-Up
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
623 add_keyseq("[b", MKEY_EQUIV, 513); // Shift-Down
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
624 add_keyseq("[c", MKEY_EQUIV, 402); // Shift-Right
6866ee749225 More keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 762
diff changeset
625 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
626 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
627 add_keyseq("[6$", MKEY_SHIFT_PGDOWN, 0); // Shift-PageDown
1170
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
628
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
629 // VT100
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
630 add_keyseq("[H", MKEY_EQUIV, KEY_HOME); // Home
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
631 add_keyseq("[F", MKEY_EQUIV, KEY_END); // End
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
632
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
633 // Konsole Linux
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
634 add_keyseq("[1~", MKEY_EQUIV, KEY_HOME); // Home
29f805d8412f Add some keycodes
Mikael Berthe <mikael@lilotux.net>
parents: 1168
diff changeset
635 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
636 }
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 764
diff changeset
637
1176
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
638 // scr_init_bindings()
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
639 // Create default key bindings
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
640 // 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
641 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
642 {
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
643 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
644
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
645 // 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
646 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
647 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
648 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
649 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
650 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
651 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
652 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
653 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
654 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
655 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
656 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
657 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
658 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
659 "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
660 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
661 settings_set(SETTINGS_TYPE_BINDING, sbuf->str,
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
662 "iline hist_beginning_search_fwd");
1176
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
663 g_string_printf(sbuf, "%d", KEY_PPAGE);
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
664 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
665 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
666 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
667 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
668 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
669 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
670 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
671 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
672 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
673 // 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
674 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
675 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
676 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
677 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
678 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
679 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
680 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
681 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
682 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
683 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
684 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
685 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
686 // Ctrl-Left (2 codes):
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
687 settings_set(SETTINGS_TYPE_BINDING, "515", "iline bword");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
688 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
689 // Ctrl-Right (2 codes):
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
690 settings_set(SETTINGS_TYPE_BINDING, "517", "iline fword");
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
691 settings_set(SETTINGS_TYPE_BINDING, "518", "iline fword");
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, "12", "screen_refresh"); // Ctrl-l
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, "27", "chat_disable"); // Esc
1185
5c34af370b67 Bind Meta-Esc (Esc-Esc) to chat_disable by default
Mikael Berthe <mikael@lilotux.net>
parents: 1179
diff changeset
694 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
695 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
696 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
697 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
698 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
699
1208
0dbe51d1e62e Add default binding for F1 (265) to /help
Mikael Berthe <mikael@lilotux.net>
parents: 1205
diff changeset
700 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
701
1176
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
702 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
703 }
547a8ca7c1a8 Move init_bindings() to screen.c, with a few updates
Mikael Berthe <mikael@lilotux.net>
parents: 1173
diff changeset
704
1229
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
705 // is_speckey(key)
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
706 // 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
707 // 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
708 // isprint(KEY_PPAGE) returns TRUE...
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
709 static int is_speckey(int key)
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
710 {
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
711 switch (key) {
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
712 case 127:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
713 case 393:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
714 case 402:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
715 case KEY_BACKSPACE:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
716 case KEY_DC:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
717 case KEY_LEFT:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
718 case KEY_RIGHT:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
719 case KEY_UP:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
720 case KEY_DOWN:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
721 case KEY_PPAGE:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
722 case KEY_NPAGE:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
723 case KEY_HOME:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
724 case KEY_END:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
725 case KEY_EOL:
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
726 return TRUE;
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
727 }
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
728
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
729 // Fn keys
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
730 if (key >= 265 && key < 265+12)
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
731 return TRUE;
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
732
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
733 // Special key combinations
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
734 if (key >= 513 && key <= 521)
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
735 return TRUE;
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
736
e9ea1497ac9d Fix a key binding issue on FreeBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1228
diff changeset
737 return FALSE;
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
779
057ffe7c43dc Initialize locale charset earlier
Mikael Berthe <mikael@lilotux.net>
parents: 773
diff changeset
740 void scr_InitLocaleCharSet(void)
057ffe7c43dc Initialize locale charset earlier
Mikael Berthe <mikael@lilotux.net>
parents: 773
diff changeset
741 {
057ffe7c43dc Initialize locale charset earlier
Mikael Berthe <mikael@lilotux.net>
parents: 773
diff changeset
742 setlocale(LC_CTYPE, "");
1382
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
743 #ifdef HAVE_LOCALCHARSET_H
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
744 LocaleCharSet = locale_charset();
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
745 #else
779
057ffe7c43dc Initialize locale charset earlier
Mikael Berthe <mikael@lilotux.net>
parents: 773
diff changeset
746 LocaleCharSet = nl_langinfo(CODESET);
1382
1447c5296977 Fix locale charset detection on some BSD systems
Mikael Berthe <mikael@lilotux.net>
parents: 1381
diff changeset
747 #endif
779
057ffe7c43dc Initialize locale charset earlier
Mikael Berthe <mikael@lilotux.net>
parents: 773
diff changeset
748 utf8_mode = (strcmp(LocaleCharSet, "UTF-8") == 0);
057ffe7c43dc Initialize locale charset earlier
Mikael Berthe <mikael@lilotux.net>
parents: 773
diff changeset
749 }
057ffe7c43dc Initialize locale charset earlier
Mikael Berthe <mikael@lilotux.net>
parents: 773
diff changeset
750
765
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 764
diff changeset
751 void scr_InitCurses(void)
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 764
diff changeset
752 {
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 764
diff changeset
753 /* Key sequences initialization */
72626e9d60bd Create init_keycodes(), add 2 screen escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 764
diff changeset
754 init_keycodes();
762
96d46e00524a Add some key escape sequences for screen
Mikael Berthe <mikael@lilotux.net>
parents: 761
diff changeset
755
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
756 initscr();
382
4c6e8392e465 Use nodelay() instead of halfdelay()
Mikael Berthe <mikael@lilotux.net>
parents: 374
diff changeset
757 raw();
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
758 noecho();
389
6e895f397474 Ncurses changes + Ctrl-C does not send a signal anylore
Mikael Berthe <mikael@lilotux.net>
parents: 388
diff changeset
759 nonl();
6e895f397474 Ncurses changes + Ctrl-C does not send a signal anylore
Mikael Berthe <mikael@lilotux.net>
parents: 388
diff changeset
760 intrflush(stdscr, FALSE);
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
761 start_color();
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
762 use_default_colors();
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
763
1386
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
764 if (settings_opt_get("escdelay")) {
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
765 #ifdef HAVE_ESCDELAY
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
766 ESCDELAY = (unsigned) settings_opt_get_int("escdelay");
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
767 #else
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
768 scr_LogPrint(LPRINT_LOGNORM, "ERROR: no ESCDELAY support.");
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
769 #endif
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
770 }
8e763c2c331f Add option 'escdelay'
Mikael Berthe <mikael@lilotux.net>
parents: 1382
diff changeset
771
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
772 ParseColors();
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
773
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
774 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
775 Log_Win_Height = DEFAULT_LOG_WIN_HEIGHT;
518
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
776 // Note scr_DrawMainWindow() should be called early after scr_InitCurses()
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
777 // 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
778
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
779 inputLine[0] = 0;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
780 ptr_inputline = inputLine;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
781
966
d9acb7f2a3d1 Do not set Curses variable too early
Mikael Berthe <mikael@lilotux.net>
parents: 961
diff changeset
782 Curses = TRUE;
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
783 return;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
784 }
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
785
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
786 void scr_TerminateCurses(void)
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
787 {
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
788 if (!Curses) return;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
789 clear();
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
790 refresh();
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
791 endwin();
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
792 Curses = FALSE;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
793 return;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
794 }
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
795
675
ae7016aae014 New "beep_on_message" option
Mikael Berthe <mikael@lilotux.net>
parents: 667
diff changeset
796 inline void scr_Beep(void)
ae7016aae014 New "beep_on_message" option
Mikael Berthe <mikael@lilotux.net>
parents: 667
diff changeset
797 {
ae7016aae014 New "beep_on_message" option
Mikael Berthe <mikael@lilotux.net>
parents: 667
diff changeset
798 beep();
ae7016aae014 New "beep_on_message" option
Mikael Berthe <mikael@lilotux.net>
parents: 667
diff changeset
799 }
ae7016aae014 New "beep_on_message" option
Mikael Berthe <mikael@lilotux.net>
parents: 667
diff changeset
800
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
801 // 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
802 static const char *timeprefixes[] = {
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
803 "%m-%d %H:%M ",
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
804 "%H:%M ",
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
805 " "
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
806 };
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
807
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
808 static const char *spectimeprefixes[] = {
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
809 "%m-%d %H:%M:%S ",
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
810 "%H:%M:%S ",
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
811 " "
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
812 };
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
813
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
814 static int timepreflengths[] = {
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
815 // (length of the corresponding timeprefix + 5)
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
816 17,
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
817 11,
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
818 6
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
819 };
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
820
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
821 static const char *gettprefix()
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
822 {
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
823 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
824 return timeprefixes[(n < 3 ? n : 0)];
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
825 }
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
826
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
827 static const char *getspectprefix()
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
828 {
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
829 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
830 return spectimeprefixes[(n < 3 ? n : 0)];
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
831 }
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
832
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
833 static unsigned getprefixwidth()
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
834 {
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
835 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
836 return timepreflengths[(n < 3 ? n : 0)];
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
837 }
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
838
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
839 // scr_LogPrint(...)
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
840 // Display a message in the log window.
771
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings
Mikael Berthe <mikael@lilotux.net>
parents: 770
diff changeset
841 // This function will convert from UTF-8 unless the LPRINT_NOTUTF8 flag is set.
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
842 void scr_LogPrint(unsigned int flag, const char *fmt, ...)
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
843 {
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
844 time_t timestamp;
857
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size
Mikael Berthe <mikael@lilotux.net>
parents: 851
diff changeset
845 char strtimestamp[64];
858
2683ad5d1003 Improve scr_LogPrint() for log/debug messages
Mikael Berthe <mikael@lilotux.net>
parents: 857
diff changeset
846 char *buffer, *btext;
1075
03bc225ad763 Improve scr_LogPrint() readability
Mikael Berthe <mikael@lilotux.net>
parents: 1072
diff changeset
847 char *convbuf1 = NULL, *convbuf2 = NULL;
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
848 va_list ap;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
849
771
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings
Mikael Berthe <mikael@lilotux.net>
parents: 770
diff changeset
850 if (!(flag & ~LPRINT_NOTUTF8)) return; // Shouldn't happen
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
851
857
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size
Mikael Berthe <mikael@lilotux.net>
parents: 851
diff changeset
852 timestamp = time(NULL);
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size
Mikael Berthe <mikael@lilotux.net>
parents: 851
diff changeset
853 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
854 va_start(ap, fmt);
858
2683ad5d1003 Improve scr_LogPrint() for log/debug messages
Mikael Berthe <mikael@lilotux.net>
parents: 857
diff changeset
855 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
856 va_end(ap);
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
857
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
858 if (flag & LPRINT_NORMAL) {
771
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings
Mikael Berthe <mikael@lilotux.net>
parents: 770
diff changeset
859 char *buffer_locale;
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
860 char *buf_specialwindow;
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
861
858
2683ad5d1003 Improve scr_LogPrint() for log/debug messages
Mikael Berthe <mikael@lilotux.net>
parents: 857
diff changeset
862 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
863
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
864 // 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
865 if (!(flag & LPRINT_NOTUTF8))
1075
03bc225ad763 Improve scr_LogPrint() readability
Mikael Berthe <mikael@lilotux.net>
parents: 1072
diff changeset
866 buffer_locale = convbuf1 = from_utf8(buffer);
771
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings
Mikael Berthe <mikael@lilotux.net>
parents: 770
diff changeset
867 else
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings
Mikael Berthe <mikael@lilotux.net>
parents: 770
diff changeset
868 buffer_locale = buffer;
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
869
884
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures
Mikael Berthe <mikael@lilotux.net>
parents: 880
diff changeset
870 if (!buffer_locale) {
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures
Mikael Berthe <mikael@lilotux.net>
parents: 880
diff changeset
871 wprintw(logWnd,
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures
Mikael Berthe <mikael@lilotux.net>
parents: 880
diff changeset
872 "\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
873 update_panels();
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures
Mikael Berthe <mikael@lilotux.net>
parents: 880
diff changeset
874 g_free(buffer);
897
a05b5a16a06a Fix memory leak in scr_LogPrint()
Mikael Berthe <mikael@lilotux.net>
parents: 891
diff changeset
875 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
876 return;
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures
Mikael Berthe <mikael@lilotux.net>
parents: 880
diff changeset
877 }
9e6d9f0cf9eb scr_LogPrint(): Add a warning for UTF-8 -> locale conversion failures
Mikael Berthe <mikael@lilotux.net>
parents: 880
diff changeset
878
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
879 // 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
880 if (flag & LPRINT_NOTUTF8)
1075
03bc225ad763 Improve scr_LogPrint() readability
Mikael Berthe <mikael@lilotux.net>
parents: 1072
diff changeset
881 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
882 else
858
2683ad5d1003 Improve scr_LogPrint() for log/debug messages
Mikael Berthe <mikael@lilotux.net>
parents: 857
diff changeset
883 buf_specialwindow = btext;
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
884
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
885 if (Curses) {
771
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings
Mikael Berthe <mikael@lilotux.net>
parents: 770
diff changeset
886 wprintw(logWnd, "\n%s", buffer_locale);
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
887 update_panels();
850
d0781ca2dd08 Use new status buffer window
Mikael Berthe <mikael@lilotux.net>
parents: 849
diff changeset
888 scr_WriteInWindow(NULL, buf_specialwindow, timestamp,
1290
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
889 HBB_PREFIX_SPECIAL, FALSE, 0);
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
890 } else {
771
ce4f8a2129a4 scr_LogPrint() can display UTF-8 strings
Mikael Berthe <mikael@lilotux.net>
parents: 770
diff changeset
891 printf("%s\n", buffer_locale);
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
892 // 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
893 hbuf_add_line(&statushbuf, buf_specialwindow, timestamp,
1290
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
894 HBB_PREFIX_SPECIAL, 0, 0, 0);
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
895 }
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
896
1075
03bc225ad763 Improve scr_LogPrint() readability
Mikael Berthe <mikael@lilotux.net>
parents: 1072
diff changeset
897 g_free(convbuf1);
03bc225ad763 Improve scr_LogPrint() readability
Mikael Berthe <mikael@lilotux.net>
parents: 1072
diff changeset
898 g_free(convbuf2);
858
2683ad5d1003 Improve scr_LogPrint() for log/debug messages
Mikael Berthe <mikael@lilotux.net>
parents: 857
diff changeset
899 g_free(buffer);
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
900 }
412
9c640ee3bae3 Display full date in the log file
Mikael Berthe <mikael@lilotux.net>
parents: 393
diff changeset
901
857
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size
Mikael Berthe <mikael@lilotux.net>
parents: 851
diff changeset
902 if (flag & (LPRINT_LOG|LPRINT_DEBUG)) {
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size
Mikael Berthe <mikael@lilotux.net>
parents: 851
diff changeset
903 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
904 buffer = g_strdup_printf("%s %s\n", strtimestamp, btext);
857
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size
Mikael Berthe <mikael@lilotux.net>
parents: 851
diff changeset
905 ut_WriteLog(flag, buffer);
ef35a2bb40d7 scr_LogPrint(): do not use static buffer size
Mikael Berthe <mikael@lilotux.net>
parents: 851
diff changeset
906 g_free(buffer);
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
907 }
897
a05b5a16a06a Fix memory leak in scr_LogPrint()
Mikael Berthe <mikael@lilotux.net>
parents: 891
diff changeset
908 g_free(btext);
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
909 }
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
910
1156
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
911 static winbuf *scr_SearchWindow(const char *winId, int special)
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
912 {
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
913 char *id;
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
914 winbuf *wbp;
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
915
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
916 if (special)
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
917 return statusWindow; // Only one special window atm.
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
918
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
919 if (!winId)
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
920 return NULL;
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
921
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
922 id = g_strdup(winId);
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
923 mc_strtolower(id);
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
924 wbp = g_hash_table_lookup(winbufhash, id);
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
925 g_free(id);
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
926 return wbp;
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
927 }
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
928
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
929 int scr_BuddyBufferExists(const char *bjid)
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
930 {
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
931 return (scr_SearchWindow(bjid, FALSE) != NULL);
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
932 }
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
933
1133
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
934 // scr_new_buddy(title, dontshow)
1139
104676e3389b Update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1138
diff changeset
935 // 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
936 static winbuf *scr_new_buddy(const char *title, int dont_show)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
937 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
938 winbuf *tmp;
393
f8f3c7493457 Whitespace cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 389
diff changeset
939
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
940 tmp = g_new0(winbuf, 1);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
941
1133
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
942 tmp->win = activechatWnd;
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
943 tmp->panel = activechatPanel;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
944
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
945 if (!dont_show) {
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
946 currentWindow = tmp;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
947 } else {
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
948 if (currentWindow)
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
949 top_panel(currentWindow->panel);
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
950 else
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
951 top_panel(chatPanel);
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
952 }
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
953 update_panels();
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
954
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
955 // If title is NULL, this is a special buffer
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
956 if (title) {
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
957 char *id;
1156
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
958 id = hlog_get_log_jid(title);
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
959 if (id) {
1160
14f5876b5555 Slight optimization + line wrapping
Mikael Berthe <mikael@lilotux.net>
parents: 1159
diff changeset
960 winbuf *wb = scr_SearchWindow(id, FALSE);
14f5876b5555 Slight optimization + line wrapping
Mikael Berthe <mikael@lilotux.net>
parents: 1159
diff changeset
961 if (!wb)
14f5876b5555 Slight optimization + line wrapping
Mikael Berthe <mikael@lilotux.net>
parents: 1159
diff changeset
962 wb = scr_new_buddy(id, TRUE);
14f5876b5555 Slight optimization + line wrapping
Mikael Berthe <mikael@lilotux.net>
parents: 1159
diff changeset
963 tmp->bd=wb->bd;
1156
cae430fcd385 Mcabber will load symlinked histories only once, now.
Frank Zschockelt
parents: 1154
diff changeset
964 g_free(id);
1159
53c0c5be43fa Small fixes, typos and cleanups
Mikael Berthe <mikael@lilotux.net>
parents: 1157
diff changeset
965 } 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
966 tmp->bd = g_new0(buffdata, 1);
1159
53c0c5be43fa Small fixes, typos and cleanups
Mikael Berthe <mikael@lilotux.net>
parents: 1157
diff changeset
967 hlog_read_history(title, &tmp->bd->hbuf,
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
968 maxX - Roster_Width - getprefixwidth());
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
969 }
181
4a0bde661562 [/trunk] Changeset 193 by mikael
mikael
parents: 180
diff changeset
970
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
971 id = g_strdup(title);
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
972 mc_strtolower(id);
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
973 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
974 } else {
1159
53c0c5be43fa Small fixes, typos and cleanups
Mikael Berthe <mikael@lilotux.net>
parents: 1157
diff changeset
975 tmp->bd = g_new0(buffdata, 1);
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
976 }
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
977 return tmp;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
978 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
979
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
980 // scr_UpdateWindow()
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
981 // (Re-)Display the given chat window.
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
982 static void scr_UpdateWindow(winbuf *win_entry)
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
983 {
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
984 int n;
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
985 int width, prefixwidth;
184
b5aa2b9c425a [/trunk] Changeset 196 by mikael
mikael
parents: 181
diff changeset
986 hbb_line **lines, *line;
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
987 GList *hbuf_head;
850
d0781ca2dd08 Use new status buffer window
Mikael Berthe <mikael@lilotux.net>
parents: 849
diff changeset
988 char date[64];
1291
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
989 int color;
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
990
1077
c51ca5225516 Remove useless WindowWidth function
Mikael Berthe <mikael@lilotux.net>
parents: 1076
diff changeset
991 width = getmaxx(win_entry->win);
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
992 prefixwidth = getprefixwidth();
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
993
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
994 // Should the window be empty?
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
995 if (win_entry->bd->cleared) {
168
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
996 werase(win_entry->win);
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
997 return;
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
998 }
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
999
1160
14f5876b5555 Slight optimization + line wrapping
Mikael Berthe <mikael@lilotux.net>
parents: 1159
diff changeset
1000 // 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
1001 // we are displaying the last messages.
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1002
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1003 // We will show the last CHAT_WIN_HEIGHT lines.
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1004 // Let's find out where it begins.
1160
14f5876b5555 Slight optimization + line wrapping
Mikael Berthe <mikael@lilotux.net>
parents: 1159
diff changeset
1005 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
1006 win_entry->bd->top) == -1)) {
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1007 // 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
1008 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
1009 hbuf_head = win_entry->bd->hbuf;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1010 win_entry->bd->top = NULL; // (Just to make sure)
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1011 n = 0;
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1012 while (hbuf_head && (n < CHAT_WIN_HEIGHT-1) && g_list_previous(hbuf_head)) {
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1013 hbuf_head = g_list_previous(hbuf_head);
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1014 n++;
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1015 }
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
1016 // 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
1017 if (win_entry->bd->lock)
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1018 win_entry->bd->top = hbuf_head;
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1019 } else
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1020 hbuf_head = win_entry->bd->top;
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1021
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1022 // Get the last CHAT_WIN_HEIGHT lines.
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1023 lines = hbuf_get_lines(hbuf_head, CHAT_WIN_HEIGHT);
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1024
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1025 // Display these lines
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1026 for (n = 0; n < CHAT_WIN_HEIGHT; n++) {
168
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1027 wmove(win_entry->win, n, 0);
184
b5aa2b9c425a [/trunk] Changeset 196 by mikael
mikael
parents: 181
diff changeset
1028 line = *(lines+n);
b5aa2b9c425a [/trunk] Changeset 196 by mikael
mikael
parents: 181
diff changeset
1029 if (line) {
1204
e802ec0c02d2 Basic support for nick highlighting in MUC rooms (the whole line is colored)
Mikael Berthe <mikael@lilotux.net>
parents: 1190
diff changeset
1030 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
1031 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
1032 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
1033 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
1034 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
1035 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
1036 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
1037 color = COLOR_MSGIN;
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1038 else
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1039 color = COLOR_GENERAL;
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1040
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1041 if (color != COLOR_GENERAL)
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1042 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
1043
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1044 if (line->timestamp &&
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1045 !(line->flags & (HBB_PREFIX_SPECIAL|HBB_PREFIX_CONT))) {
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
1046 strftime(date, 30, gettprefix(), localtime(&line->timestamp));
184
b5aa2b9c425a [/trunk] Changeset 196 by mikael
mikael
parents: 181
diff changeset
1047 } else
185
e8e447a07641 [/trunk] Changeset 197 by mikael
mikael
parents: 184
diff changeset
1048 strcpy(date, " ");
1268
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1049 if (!(line->flags & HBB_PREFIX_CONT)) {
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1050 if (line->flags & HBB_PREFIX_INFO) {
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1051 char dir = '*';
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1052 if (line->flags & HBB_PREFIX_IN)
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1053 dir = '<';
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1054 else if (line->flags & HBB_PREFIX_OUT)
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1055 dir = '>';
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
1056 wprintw(win_entry->win, "%s*%c* ", date, dir);
1268
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1057 } else if (line->flags & HBB_PREFIX_ERR) {
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1058 char dir = '#';
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1059 if (line->flags & HBB_PREFIX_IN)
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1060 dir = '<';
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1061 else if (line->flags & HBB_PREFIX_OUT)
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1062 dir = '>';
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
1063 wprintw(win_entry->win, "%s#%c# ", date, dir);
1268
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1064 } else if (line->flags & HBB_PREFIX_IN) {
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1065 char cryptflag = line->flags & HBB_PREFIX_PGPCRYPT ? '~' : '=';
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
1066 wprintw(win_entry->win, "%s<%c= ", date, cryptflag);
1268
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1067 } else if (line->flags & HBB_PREFIX_OUT) {
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1068 char cryptflag = line->flags & HBB_PREFIX_PGPCRYPT ? '~' : '-';
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
1069 wprintw(win_entry->win, "%s-%c> ", date, cryptflag);
1268
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1070 } else if (line->flags & HBB_PREFIX_SPECIAL) {
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
1071 strftime(date, 30, getspectprefix(), localtime(&line->timestamp));
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
1072 wprintw(win_entry->win, "%s ", date);
1268
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1073 } else {
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
1074 wprintw(win_entry->win, "%s ", date);
1268
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1075 }
728
421b337dc6d2 Chat window: Highlight the flag in our messages
Mikael Berthe <mikael@lilotux.net>
parents: 727
diff changeset
1076 } else {
1268
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1077 wprintw(win_entry->win, " " );
75
ff119bb11563 [/trunk] Changeset 89 by mikael
mikael
parents: 74
diff changeset
1078 }
729
39f67cade02c Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents: 728
diff changeset
1079
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
1080 // Make sure we are at the right position
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
1081 wmove(win_entry->win, n, prefixwidth-1);
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
1082
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
1083 // The MUC nick - overwrite with proper color
1294
86caabe72f3a Color only incoming messages
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1292
diff changeset
1084 if (line->mucnicklen) {
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
1085 // Store the char after the nick
1290
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
1086 char tmp = line->text[line->mucnicklen];
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1087 muccoltype type = glob_muccol, *typetmp;
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
1088 // 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
1089 line->text[line->mucnicklen] = '\0';
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1090 char *mucjid = g_utf8_strdown(CURRENT_JID, -1);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1091 if (muccolors) {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1092 typetmp = g_hash_table_lookup(muccolors, mucjid);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1093 if (typetmp)
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1094 type = *typetmp;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1095 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1096 g_free(mucjid);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1097 nickcolor *actual = NULL;
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1098 // Need to generate some random color?
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1099 if ((type == MC_ALL) && (!nickcolors ||
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1100 !g_hash_table_lookup(nickcolors, line->text))) {
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1101 ensure_string_htable(&nickcolors, NULL);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1102 char *snick = g_strdup(line->text), *mnick = g_strdup(line->text);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1103 nickcolor *nc = g_new(nickcolor, 1);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1104 nc->color = nickcols[random() % nickcolcount];
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
1105 nc->manual = FALSE;
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1106 *snick = '<';
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1107 snick[strlen(snick)-1] = '>';
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1108 *mnick = '*';
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1109 mnick[strlen(mnick)-1] = ' ';
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
1110 // Insert them
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1111 g_hash_table_insert(nickcolors, snick, nc);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1112 g_hash_table_insert(nickcolors, mnick, nc);
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1113 }
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1114 if (nickcolors)
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1115 actual = g_hash_table_lookup(nickcolors, line->text);
1294
86caabe72f3a Color only incoming messages
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1292
diff changeset
1116 if (actual && ((type == MC_ALL) || (actual->manual))
86caabe72f3a Color only incoming messages
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1292
diff changeset
1117 && (line->flags & HBB_PREFIX_IN) &&
86caabe72f3a Color only incoming messages
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1292
diff changeset
1118 (!(line->flags & HBB_PREFIX_HLIGHT_OUT)))
1292
382ec54b584e Muc nick coloring functionality
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1291
diff changeset
1119 wattrset(win_entry->win, get_color(actual->color));
1290
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
1120 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
1121 // Return the char
1290
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
1122 line->text[line->mucnicklen] = tmp;
1376
a0deb5124ebf Check time_prefix value before using it
Mikael Berthe <mikael@lilotux.net>
parents: 1359
diff changeset
1123 // Return the color back
1291
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1124 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
1125 }
729
39f67cade02c Use bold font for outgoing messages
Mikael Berthe <mikael@lilotux.net>
parents: 728
diff changeset
1126
1333
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
1127 // Display text line
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
1128 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
1129 wclrtoeol(win_entry->win);
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1130
1268
dbc907b2d92f Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1254
diff changeset
1131 // Return the color back
1291
9f64f548ac16 Better way of writing the nick
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1290
diff changeset
1132 if (color != COLOR_GENERAL)
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1133 wattrset(win_entry->win, get_color(COLOR_GENERAL));
184
b5aa2b9c425a [/trunk] Changeset 196 by mikael
mikael
parents: 181
diff changeset
1134 g_free(line->text);
898
c65b71dcda94 Fix memory leak in scr_UpdateWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 897
diff changeset
1135 g_free(line);
168
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1136 } else {
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1137 wclrtobot(win_entry->win);
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1138 break;
75
ff119bb11563 [/trunk] Changeset 89 by mikael
mikael
parents: 74
diff changeset
1139 }
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1140 }
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1141 g_free(lines);
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1142 }
1159
53c0c5be43fa Small fixes, typos and cleanups
Mikael Berthe <mikael@lilotux.net>
parents: 1157
diff changeset
1143
53c0c5be43fa Small fixes, typos and cleanups
Mikael Berthe <mikael@lilotux.net>
parents: 1157
diff changeset
1144 static winbuf *scr_CreateWindow(const char *winId, int special, int dont_show)
1154
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1145 {
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1146 if (special) {
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1147 if (!statusWindow) {
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1148 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
1149 statusWindow->bd->hbuf = statushbuf;
1154
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1150 }
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1151 return statusWindow;
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1152 } else {
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1153 return scr_new_buddy(winId, dont_show);
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1154 }
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1155 }
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1156
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1157 // scr_ShowWindow()
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1158 // Display the chat window with the given identifier.
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1159 // "special" must be true if this is a special buffer window.
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1160 static void scr_ShowWindow(const char *winId, int special)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1161 {
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1162 winbuf *win_entry;
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1163
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1164 win_entry = scr_SearchWindow(winId, special);
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1165
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1166 if (!win_entry) {
1154
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1167 win_entry = scr_CreateWindow(winId, special, FALSE);
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1168 }
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1169
180
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1170 top_panel(win_entry->panel);
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1171 currentWindow = win_entry;
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1172 chatmode = TRUE;
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1173 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
1174 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
1175 if (!special)
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1176 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
1177 update_roster = TRUE;
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1178
180
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1179 // Refresh the window
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1180 scr_UpdateWindow(win_entry);
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1181
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1182 // Finished :)
42a33611233b [/trunk] Changeset 192 by mikael
mikael
parents: 178
diff changeset
1183 update_panels();
142
bb6fe91589b9 [/trunk] Changeset 154 by mikael
mikael
parents: 140
diff changeset
1184
bb6fe91589b9 [/trunk] Changeset 154 by mikael
mikael
parents: 140
diff changeset
1185 top_panel(inputPanel);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1186 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1187
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1188 // scr_ShowBuddyWindow()
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1189 // Display the chat window buffer for the current buddy.
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1190 void scr_ShowBuddyWindow(void)
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1191 {
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
1192 const gchar *bjid;
140
3b480b73df19 [/trunk] Changeset 152 by mikael
mikael
parents: 139
diff changeset
1193
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1194 if (!current_buddy) {
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
1195 bjid = NULL;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1196 } else {
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
1197 bjid = CURRENT_JID;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1198 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL) {
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1199 scr_ShowWindow(buddy_getname(BUDDATA(current_buddy)), TRUE);
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1200 return;
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1201 }
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1202 }
140
3b480b73df19 [/trunk] Changeset 152 by mikael
mikael
parents: 139
diff changeset
1203
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
1204 if (!bjid) {
140
3b480b73df19 [/trunk] Changeset 152 by mikael
mikael
parents: 139
diff changeset
1205 top_panel(chatPanel);
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1206 top_panel(inputPanel);
140
3b480b73df19 [/trunk] Changeset 152 by mikael
mikael
parents: 139
diff changeset
1207 currentWindow = NULL;
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
1208 return;
140
3b480b73df19 [/trunk] Changeset 152 by mikael
mikael
parents: 139
diff changeset
1209 }
3b480b73df19 [/trunk] Changeset 152 by mikael
mikael
parents: 139
diff changeset
1210
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
1211 scr_ShowWindow(bjid, FALSE);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1212 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1213
865
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1214 // scr_UpdateBuddyWindow()
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1215 // (Re)Display the current window.
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1216 // If chatmode is enabled, call scr_ShowBuddyWindow(),
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1217 // else display the chat window.
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1218 inline void scr_UpdateBuddyWindow(void)
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1219 {
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1220 if (chatmode) {
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1221 scr_ShowBuddyWindow();
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1222 return;
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1223 }
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1224
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1225 top_panel(chatPanel);
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1226 top_panel(inputPanel);
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1227 }
cee8d6be04e1 Improve changeset a3db3ee8b99e, do not enable chatmode when refreshing
Mikael Berthe <mikael@lilotux.net>
parents: 858
diff changeset
1228
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1229 // scr_WriteInWindow()
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1230 // 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
1231 // Use winId == NULL for the special status buffer.
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1232 // 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
1233 // If this window doesn't exist, it is created.
184
b5aa2b9c425a [/trunk] Changeset 196 by mikael
mikael
parents: 181
diff changeset
1234 void scr_WriteInWindow(const char *winId, const char *text, time_t timestamp,
1290
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
1235 unsigned int prefix_flags, int force_show,
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
1236 unsigned mucnicklen)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1237 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
1238 winbuf *win_entry;
772
464be13343a9 Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents: 771
diff changeset
1239 char *text_locale;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1240 int dont_show = FALSE;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1241 int special;
1142
0e27177882c7 Small fix for the max_history_blocks option
Mikael Berthe <mikael@lilotux.net>
parents: 1141
diff changeset
1242 guint num_history_blocks;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
1243 bool setmsgflg = FALSE;
1296
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1244 char *nicktmp, *nicklocaltmp;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1245
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1246 // Look for the window entry.
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1247 special = (winId == NULL);
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1248 win_entry = scr_SearchWindow(winId, special);
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1249
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1250 // Do we have to really show the window?
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1251 if (!chatmode)
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1252 dont_show = TRUE;
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1253 else if ((!force_show) && ((!currentWindow || (currentWindow != win_entry))))
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1254 dont_show = TRUE;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1255
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1256 // 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
1257 if (!win_entry) {
1154
f746d91c5d3b Rearranged duplicated code in screen.c
franky@teufel.fs
parents: 1142
diff changeset
1258 win_entry = scr_CreateWindow(winId, special, dont_show);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1259 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1260
220
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1261 // 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
1262 if (win_entry->bd->cleared)
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1263 win_entry->bd->top = g_list_last(win_entry->bd->hbuf);
220
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1264
1142
0e27177882c7 Small fix for the max_history_blocks option
Mikael Berthe <mikael@lilotux.net>
parents: 1141
diff changeset
1265 // 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
1266 // top is set.
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1267 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
1268 num_history_blocks = 0U;
0e27177882c7 Small fix for the max_history_blocks option
Mikael Berthe <mikael@lilotux.net>
parents: 1141
diff changeset
1269 else
0e27177882c7 Small fix for the max_history_blocks option
Mikael Berthe <mikael@lilotux.net>
parents: 1141
diff changeset
1270 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
1271
772
464be13343a9 Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents: 771
diff changeset
1272 text_locale = from_utf8(text);
1296
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1273 //Convert the nick alone and compute its length
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1274 if (mucnicklen) {
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1275 nicktmp = g_strndup(text, mucnicklen);
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1276 nicklocaltmp = from_utf8(nicktmp);
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1277 mucnicklen = strlen(nicklocaltmp);
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1278 g_free(nicklocaltmp);
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1279 g_free(nicktmp);
7a0eaa53bd53 Further nick colors fixes
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1295
diff changeset
1280 }
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1281 hbuf_add_line(&win_entry->bd->hbuf, text_locale, timestamp, prefix_flags,
1333
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
1282 maxX - Roster_Width - getprefixwidth(), num_history_blocks,
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
1283 mucnicklen);
772
464be13343a9 Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents: 771
diff changeset
1284 g_free(text_locale);
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1285
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1286 if (win_entry->bd->cleared) {
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1287 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1288 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
1289 win_entry->bd->top = g_list_next(win_entry->bd->top);
220
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1290 }
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1291
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1292 // 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
1293 if (!win_entry->bd->lock && win_entry->bd->top) {
220
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1294 int dist;
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1295 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
1296 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
1297 g_list_position(first, win_entry->bd->top);
220
8dfdc6f1778e [/trunk] Changeset 232 by mikael
mikael
parents: 197
diff changeset
1298 if (dist >= CHAT_WIN_HEIGHT)
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1299 win_entry->bd->top = NULL;
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
1300 }
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
1301
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1302 if (!dont_show) {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1303 if (win_entry->bd->lock)
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
1304 setmsgflg = TRUE;
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1305 // Show and refresh the window
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1306 top_panel(win_entry->panel);
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1307 scr_UpdateWindow(win_entry);
142
bb6fe91589b9 [/trunk] Changeset 154 by mikael
mikael
parents: 140
diff changeset
1308 top_panel(inputPanel);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1309 update_panels();
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
1310 } 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
1311 setmsgflg = TRUE;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
1312 }
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
1313 if (setmsgflg && !special) {
889
ae93e69aaaaf Fix up pending message flag for the status special buffer
Mikael Berthe <mikael@lilotux.net>
parents: 888
diff changeset
1314 if (special && !winId)
ae93e69aaaaf Fix up pending message flag for the status special buffer
Mikael Berthe <mikael@lilotux.net>
parents: 888
diff changeset
1315 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
1316 roster_msg_setflag(winId, special, TRUE);
30
4ea2df449381 [/trunk] Changeset 46 by mikael
mikael
parents: 29
diff changeset
1317 update_roster = TRUE;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1318 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1319 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1320
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1321 // scr_UpdateMainStatus()
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1322 // Redraw the main (bottom) status line.
724
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1323 void scr_UpdateMainStatus(int forceupdate)
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1324 {
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1325 char *sm = from_utf8(jb_getstatusmsg());
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1326
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1327 werase(mainstatusWnd);
724
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1328 mvwprintw(mainstatusWnd, 0, 0, "%c[%c] %s",
718
b41799901abd Add a new_message flag (#) in the main status line
Mikael Berthe <mikael@lilotux.net>
parents: 717
diff changeset
1329 (unread_msg(NULL) ? '#' : ' '),
b41799901abd Add a new_message flag (#) in the main status line
Mikael Berthe <mikael@lilotux.net>
parents: 717
diff changeset
1330 imstatus2char[jb_getstatus()], (sm ? sm : ""));
724
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1331 if (forceupdate) {
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1332 top_panel(inputPanel);
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1333 update_panels();
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1334 }
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1335 g_free(sm);
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1336 }
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1337
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1338 // scr_DrawMainWindow()
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1339 // 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
1340 //
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1341 // 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
1342 // expert... :-\ Mikael.
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1343 //
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1344 void scr_DrawMainWindow(unsigned int fullinit)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1345 {
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1346 int requested_size;
961
95659cf9ea1a Display mcabber version in the status window
Mikael Berthe <mikael@lilotux.net>
parents: 952
diff changeset
1347 gchar *ver, *message;
972
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1348 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
1349 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
1350
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1351 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
1352 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
1353 if (requested_size > 0) {
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1354 if (maxY > requested_size + 3)
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1355 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
1356 else
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1357 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
1358 } else if (requested_size < 0) {
518
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1359 Log_Win_Height = 3;
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1360 }
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1361
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1362 if (maxY < Log_Win_Height+2) {
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1363 if (maxY < 5) {
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1364 Log_Win_Height = 3;
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1365 maxY = Log_Win_Height+2;
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1366 } else {
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1367 Log_Win_Height = maxY - 2;
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1368 }
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1369 }
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1370
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1371 if (roster_hidden) {
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1372 Roster_Width = 0;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1373 } else {
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1374 requested_size = settings_opt_get_int("roster_width");
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1375 if (requested_size > 1)
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1376 Roster_Width = requested_size;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1377 else if (requested_size == 1)
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1378 Roster_Width = 2;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1379 else
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1380 Roster_Width = DEFAULT_ROSTER_WIDTH;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1381 }
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1382
972
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1383 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
1384 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
1385
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1386 if (log_win_on_top) {
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1387 chat_y_pos = Log_Win_Height-1;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1388 log_y_pos = 0;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1389 chatstatus_y_pos = Log_Win_Height-2;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1390 } else {
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1391 chat_y_pos = 0;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1392 log_y_pos = CHAT_WIN_HEIGHT+1;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1393 chatstatus_y_pos = CHAT_WIN_HEIGHT;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1394 }
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1395
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1396 if (roster_win_on_right) {
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1397 roster_x_pos = maxX - Roster_Width;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1398 chat_x_pos = 0;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1399 } else {
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1400 roster_x_pos = 0;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1401 chat_x_pos = Roster_Width;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1402 }
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1403
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1404 if (fullinit) {
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1405 if (!winbufhash)
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1406 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
1407 /* Create windows */
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1408 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
1409 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
1410 chat_x_pos);
1133
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
1411 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
1412 chat_x_pos);
972
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1413 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
1414 chatstatusWnd = newwin(1, maxX, chatstatus_y_pos, 0);
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1415 mainstatusWnd = newwin(1, maxX, maxY-2, 0);
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1416 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
1417 if (!rosterWnd || !chatWnd || !logWnd || !inputWnd) {
6e4e667c5571 Fix a segfault when starting mcabber in a really small terminal
Mikael Berthe <mikael@lilotux.net>
parents: 339
diff changeset
1418 scr_TerminateCurses();
6e4e667c5571 Fix a segfault when starting mcabber in a really small terminal
Mikael Berthe <mikael@lilotux.net>
parents: 339
diff changeset
1419 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
1420 exit(EXIT_FAILURE);
6e4e667c5571 Fix a segfault when starting mcabber in a really small terminal
Mikael Berthe <mikael@lilotux.net>
parents: 339
diff changeset
1421 }
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1422 wbkgd(rosterWnd, get_color(COLOR_GENERAL));
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1423 wbkgd(chatWnd, get_color(COLOR_GENERAL));
1133
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
1424 wbkgd(activechatWnd, get_color(COLOR_GENERAL));
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1425 wbkgd(logWnd, get_color(COLOR_GENERAL));
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1426 wbkgd(chatstatusWnd, get_color(COLOR_STATUS));
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1427 wbkgd(mainstatusWnd, get_color(COLOR_STATUS));
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1428 } else {
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1429 /* Resize/move windows */
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1430 wresize(rosterWnd, CHAT_WIN_HEIGHT, Roster_Width);
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1431 wresize(chatWnd, CHAT_WIN_HEIGHT, maxX - Roster_Width);
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1432 wresize(logWnd, Log_Win_Height-2, maxX);
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1433
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1434 mvwin(chatWnd, chat_y_pos, chat_x_pos);
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1435 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
1436 mvwin(logWnd, log_y_pos, 0);
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1437
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1438 // Resize & move chat status window
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1439 wresize(chatstatusWnd, 1, maxX);
972
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1440 mvwin(chatstatusWnd, chatstatus_y_pos, 0);
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1441 // Resize & move main status window
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1442 wresize(mainstatusWnd, 1, maxX);
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1443 mvwin(mainstatusWnd, maxY-2, 0);
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1444 // Resize & move input line window
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1445 wresize(inputWnd, 1, maxX);
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1446 mvwin(inputWnd, maxY-1, 0);
168
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1447
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1448 werase(chatWnd);
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1449 }
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1450
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1451 /* Draw/init windows */
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1452
961
95659cf9ea1a Display mcabber version in the status window
Mikael Berthe <mikael@lilotux.net>
parents: 952
diff changeset
1453 ver = mcabber_version();
95659cf9ea1a Display mcabber version in the status window
Mikael Berthe <mikael@lilotux.net>
parents: 952
diff changeset
1454 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
1455 mvwprintw(chatWnd, 0, 0, message);
679
5933a8036672 Remove "This is the status window" message
Mikael Berthe <mikael@lilotux.net>
parents: 675
diff changeset
1456 mvwprintw(chatWnd, 1, 0, "http://www.lilotux.net/~mikael/mcabber/");
961
95659cf9ea1a Display mcabber version in the status window
Mikael Berthe <mikael@lilotux.net>
parents: 952
diff changeset
1457 g_free(ver);
95659cf9ea1a Display mcabber version in the status window
Mikael Berthe <mikael@lilotux.net>
parents: 952
diff changeset
1458 g_free(message);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1459
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1460 // Auto-scrolling in log window
74
b392112ab995 [/trunk] Changeset 88 by mikael
mikael
parents: 65
diff changeset
1461 scrollok(logWnd, TRUE);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1462
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1463
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1464 if (fullinit) {
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1465 // Enable keypad (+ special keys)
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1466 keypad(inputWnd, TRUE);
382
4c6e8392e465 Use nodelay() instead of halfdelay()
Mikael Berthe <mikael@lilotux.net>
parents: 374
diff changeset
1467 nodelay(inputWnd, TRUE);
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1468
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1469 // Create panels
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1470 rosterPanel = new_panel(rosterWnd);
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1471 chatPanel = new_panel(chatWnd);
1133
9dd28a56128f Do not create one panel per contact
Mikael Berthe <mikael@lilotux.net>
parents: 1131
diff changeset
1472 activechatPanel = new_panel(activechatWnd);
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1473 logPanel = new_panel(logWnd);
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1474 chatstatusPanel = new_panel(chatstatusWnd);
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1475 mainstatusPanel = new_panel(mainstatusWnd);
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1476 inputPanel = new_panel(inputWnd);
232
9a6ba4b38e63 [/trunk] Changeset 245 by mikael
mikael
parents: 220
diff changeset
1477
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1478 // 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
1479 // is added
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1480 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
1481
6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change
Mikael Berthe <mikael@lilotux.net>
parents: 1089
diff changeset
1482 // 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
1483 // from rewrapping buffers when the width doesn't change.
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
1484 prev_chatwidth = maxX - Roster_Width - getprefixwidth();
851
da03534e46c7 Add startup log messages to the status buffer
Mikael Berthe <mikael@lilotux.net>
parents: 850
diff changeset
1485 // 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
1486 hbuf_rebuild(&statushbuf, prev_chatwidth);
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1487
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
1488 #ifndef UNICODE
232
9a6ba4b38e63 [/trunk] Changeset 245 by mikael
mikael
parents: 220
diff changeset
1489 if (utf8_mode)
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
1490 scr_LogPrint(LPRINT_NORMAL,
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
1491 "WARNING: Compiled without full UTF-8 support!");
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
1492 #endif
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1493 } else {
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1494 // Update panels
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1495 replace_panel(rosterPanel, rosterWnd);
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1496 replace_panel(chatPanel, chatWnd);
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1497 replace_panel(logPanel, logWnd);
711
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1498 replace_panel(chatstatusPanel, chatstatusWnd);
75dde88f1884 Introduce status lines
Mikael Berthe <mikael@lilotux.net>
parents: 709
diff changeset
1499 replace_panel(mainstatusPanel, mainstatusWnd);
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1500 replace_panel(inputPanel, inputWnd);
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1501 }
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1502
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1503 // We'll need to redraw the roster
149
9f74832eb4f8 [/trunk] Changeset 161 by mikael
mikael
parents: 148
diff changeset
1504 update_roster = TRUE;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1505 return;
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1506 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1507
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1508 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
1509 {
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1510 winbuf *wbp = value;
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1511 struct dimensions *dim = data;
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1512 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
1513 int new_chatwidth;
972
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1514
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1515 if (!(wbp && wbp->win))
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1516 return;
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1517
972
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1518 if (log_win_on_top)
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1519 chat_y_pos = Log_Win_Height-1;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1520 else
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1521 chat_y_pos = 0;
11b632d824f6 Add option 'log_win_on_top'
Mikael Berthe <mikael@lilotux.net>
parents: 967
diff changeset
1522
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1523 if (roster_win_on_right)
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1524 chat_x_pos = 0;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1525 else
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1526 chat_x_pos = Roster_Width;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1527
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1528 // Resize/move buddy window
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1529 wresize(wbp->win, dim->l, dim->c);
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1530 mvwin(wbp->win, chat_y_pos, chat_x_pos);
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1531 werase(wbp->win);
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1532 // If a panel exists, replace the old window with the new
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1533 if (wbp->panel)
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1534 replace_panel(wbp->panel, wbp->win);
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1535 // Redo line wrapping
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1536 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
1537
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
1538 new_chatwidth = maxX - Roster_Width - 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
1539 if (new_chatwidth != prev_chatwidth)
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
1540 hbuf_rebuild(&wbp->bd->hbuf, new_chatwidth);
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1541 }
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1542
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1543 // scr_Resize()
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1544 // Function called when the window is resized.
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1545 // - Resize windows
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1546 // - Rewrap lines in each buddy buffer
1059
875d2c9d399c Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1058
diff changeset
1547 void scr_Resize(void)
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1548 {
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1549 struct dimensions dim;
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1550
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1551 // First, update the global variables
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1552 getmaxyx(stdscr, maxY, maxX);
518
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1553 // scr_DrawMainWindow() will take care of maxY and Log_Win_Height
9480a76471b6 Update Log_Win_Height when refreshing the screen
Mikael Berthe <mikael@lilotux.net>
parents: 515
diff changeset
1554
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1555 // Make sure the cursor stays inside the window
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1556 check_offset(0);
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1557
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1558 // Resize windows and update panels
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1559 scr_DrawMainWindow(FALSE);
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1560
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1561 // Resize all buddy windows
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1562 dim.l = CHAT_WIN_HEIGHT;
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1563 dim.c = maxX - Roster_Width;
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1564 if (dim.c < 1)
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1565 dim.c = 1;
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1566
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1567 // Resize all buffers
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1568 g_hash_table_foreach(winbufhash, resize_win_buffer, &dim);
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1569
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1570 // Resize/move special status buffer
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1571 if (statusWindow)
1078
7866dbaf67a6 Use a hash for the list of win buffers
Mikael Berthe <mikael@lilotux.net>
parents: 1077
diff changeset
1572 resize_win_buffer(NULL, statusWindow, &dim);
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
1573
1093
6ca9a65df21f Do not rewrap buffer lines when the chat window width doesn't change
Mikael Berthe <mikael@lilotux.net>
parents: 1089
diff changeset
1574 // Update prev_chatwidth, now that all buffers have been resized
1286
02ad6200df26 Add selectable time prefixes (vorner)
Mikael Berthe <mikael@lilotux.net>
parents: 1284
diff changeset
1575 prev_chatwidth = maxX - Roster_Width - 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
1576
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1577 // Refresh current buddy window
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
1578 if (chatmode)
151
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1579 scr_ShowBuddyWindow();
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1580 }
b69c0b7a23e3 [/trunk] Changeset 163 by mikael
mikael
parents: 149
diff changeset
1581
721
9cf31c9b1dc4 Use room topic as a description in the chat status line
Mikael Berthe <mikael@lilotux.net>
parents: 720
diff changeset
1582 // scr_UpdateChatStatus(forceupdate)
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1583 // Redraw the buddy status bar.
939
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
1584 // Set forceupdate to TRUE if update_panels() must be called.
721
9cf31c9b1dc4 Use room topic as a description in the chat status line
Mikael Berthe <mikael@lilotux.net>
parents: 720
diff changeset
1585 void scr_UpdateChatStatus(int forceupdate)
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1586 {
848
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
1587 unsigned short btype, isgrp, ismuc, isspe;
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1588 const char *fullname;
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1589 const char *msg = NULL;
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1590 char status;
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1591 char *buf, *buf_locale;
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1592
718
b41799901abd Add a new_message flag (#) in the main status line
Mikael Berthe <mikael@lilotux.net>
parents: 717
diff changeset
1593 // 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
1594 // at least to refresh the pending message flag.
724
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1595 scr_UpdateMainStatus(FALSE);
718
b41799901abd Add a new_message flag (#) in the main status line
Mikael Berthe <mikael@lilotux.net>
parents: 717
diff changeset
1596
806
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1597 // Clear the line
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1598 werase(chatstatusWnd);
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1599
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1600 if (chatmode)
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1601 wprintw(chatstatusWnd, "~");
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1602
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1603 if (!current_buddy) {
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1604 if (forceupdate) {
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1605 update_panels();
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1606 }
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1607 return;
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1608 }
3521e34f722a Fix a segfault when not connected to a server
Mikael Berthe <mikael@lilotux.net>
parents: 797
diff changeset
1609
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1610 fullname = buddy_getname(BUDDATA(current_buddy));
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1611 btype = buddy_gettype(BUDDATA(current_buddy));
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1612
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1613 isgrp = btype & ROSTER_TYPE_GROUP;
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1614 ismuc = btype & ROSTER_TYPE_ROOM;
848
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
1615 isspe = btype & ROSTER_TYPE_SPECIAL;
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1616
874
293e8955075c Display a flag in the chat status line when the buffer is locked
Mikael Berthe <mikael@lilotux.net>
parents: 873
diff changeset
1617 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
1618 winbuf *win_entry;
293e8955075c Display a flag in the chat status line when the buffer is locked
Mikael Berthe <mikael@lilotux.net>
parents: 873
diff changeset
1619 win_entry = scr_SearchWindow(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
1620 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
1621 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
1622 }
293e8955075c Display a flag in the chat status line when the buffer is locked
Mikael Berthe <mikael@lilotux.net>
parents: 873
diff changeset
1623
848
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
1624 if (isgrp || isspe) {
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1625 buf_locale = from_utf8(fullname);
848
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
1626 if (isgrp)
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
1627 mvwprintw(chatstatusWnd, 0, 5, "Group: %s", buf_locale);
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
1628 else
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
1629 mvwprintw(chatstatusWnd, 0, 5, "Special buffer: %s", buf_locale);
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1630 g_free(buf_locale);
716
ba1137a01078 Add a chatmode flag (©) in the chat status line
Mikael Berthe <mikael@lilotux.net>
parents: 715
diff changeset
1631 if (forceupdate) {
ba1137a01078 Add a chatmode flag (©) in the chat status line
Mikael Berthe <mikael@lilotux.net>
parents: 715
diff changeset
1632 update_panels();
ba1137a01078 Add a chatmode flag (©) in the chat status line
Mikael Berthe <mikael@lilotux.net>
parents: 715
diff changeset
1633 }
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1634 return;
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1635 }
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1636
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1637 status = '?';
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1638
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1639 if (ismuc) {
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1640 if (buddy_getinsideroom(BUDDATA(current_buddy)))
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1641 status = 'C';
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1642 else
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1643 status = 'x';
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1644 } else if (jb_getstatus() != offline) {
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1645 enum imstatus budstate;
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1646 budstate = buddy_getstatus(BUDDATA(current_buddy), NULL);
790
5d4ad1d77da4 Kill a few gcc4 warnings
Mikael Berthe <mikael@lilotux.net>
parents: 785
diff changeset
1647 if (budstate < imstatus_size)
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1648 status = imstatus2char[budstate];
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1649 }
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1650
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1651 // No status message for groups & MUC rooms
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1652 if (!isgrp && !ismuc) {
1072
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
1653 GSList *resources, *p_res;
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
1654 resources = buddy_getresources(BUDDATA(current_buddy));
843
915a7f17474a Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents: 833
diff changeset
1655 msg = buddy_getstatusmsg(BUDDATA(current_buddy),
915a7f17474a Remember the status message when a buddy goes offline
Mikael Berthe <mikael@lilotux.net>
parents: 833
diff changeset
1656 resources ? resources->data : "");
1072
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
1657 // Free the resources list data
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
1658 for (p_res = resources ; p_res ; p_res = g_slist_next(p_res))
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
1659 g_free(p_res->data);
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
1660 g_slist_free(resources);
721
9cf31c9b1dc4 Use room topic as a description in the chat status line
Mikael Berthe <mikael@lilotux.net>
parents: 720
diff changeset
1661 } else if (ismuc) {
9cf31c9b1dc4 Use room topic as a description in the chat status line
Mikael Berthe <mikael@lilotux.net>
parents: 720
diff changeset
1662 msg = buddy_gettopic(BUDDATA(current_buddy));
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1663 }
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1664 if (!msg)
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1665 msg = "";
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1666
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1667 buf = g_strdup_printf("[%c] Buddy: %s -- %s", status, fullname, msg);
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1668 replace_nl_with_dots(buf);
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1669 buf_locale = from_utf8(buf);
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1670 mvwprintw(chatstatusWnd, 0, 1, "%s", buf_locale);
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1671 g_free(buf_locale);
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1672 g_free(buf);
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1673
996
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1674 // 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
1675 if (btype & ROSTER_TYPE_USER) {
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1676 char eventchar = 0;
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1677 guint event;
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1678
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1679 // 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
1680 // highest priority will be used.
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1681 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
1682
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1683 if (event == ROSTER_EVENT_ACTIVE)
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1684 eventchar = 'A';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1685 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
1686 eventchar = 'C';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1687 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
1688 eventchar = 'P';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1689 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
1690 eventchar = 'I';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1691 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
1692 eventchar = 'G';
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1693
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1694 if (eventchar)
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1695 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
1696 }
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1697
f4d6570e2628 Chatstates: display contact chatstate in the chat status bar
Mikael Berthe <mikael@lilotux.net>
parents: 993
diff changeset
1698
717
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1699 if (forceupdate) {
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1700 update_panels();
8ce2bfdc4143 Reindent update_chat_status_window()
Mikael Berthe <mikael@lilotux.net>
parents: 716
diff changeset
1701 }
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1702 }
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1703
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
1704 // scr_DrawRoster()
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
1705 // Display the buddylist (not really the roster) on the screen
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1706 void scr_DrawRoster(void)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1707 {
735
2f027806cd48 Some code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 731
diff changeset
1708 static int offset = 0;
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1709 char *name, *rline;
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1710 int maxx, maxy;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1711 GList *buddy;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1712 int i, n;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1713 int rOffset;
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1714 int cursor_backup;
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1715 char status, pending;
164
faf534be8ff0 [/trunk] Changeset 176 by mikael
mikael
parents: 159
diff changeset
1716 enum imstatus currentstatus = jb_getstatus();
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1717 int x_pos;
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1718
123
1bdf882bed98 [/trunk] Changeset 136 by mikael
mikael
parents: 121
diff changeset
1719 // We can reset update_roster
1bdf882bed98 [/trunk] Changeset 136 by mikael
mikael
parents: 121
diff changeset
1720 update_roster = FALSE;
1bdf882bed98 [/trunk] Changeset 136 by mikael
mikael
parents: 121
diff changeset
1721
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1722 getmaxyx(rosterWnd, maxy, maxx);
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1723 maxx--; // Last char is for vertical border
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1724
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1725 cursor_backup = curs_set(0);
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1726
724
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1727 if (!buddylist)
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1728 offset = 0;
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1729 else
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1730 scr_UpdateChatStatus(FALSE);
264375fe7159 Fix a roster refresh issue
Mikael Berthe <mikael@lilotux.net>
parents: 723
diff changeset
1731
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1732 // Cleanup of roster window
168
6ad156673b19 [/trunk] Changeset 180 by mikael
mikael
parents: 167
diff changeset
1733 werase(rosterWnd);
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1734
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1735 if (Roster_Width) {
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1736 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
1737 // Redraw the vertical line (not very good...)
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1738 wattrset(rosterWnd, get_color(COLOR_GENERAL));
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1739 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
1740 mvwaddch(rosterWnd, i, line_x_pos, ACS_VLINE);
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1741 }
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1742
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1743 // 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
1744 if (!buddylist || !Roster_Width) {
123
1bdf882bed98 [/trunk] Changeset 136 by mikael
mikael
parents: 121
diff changeset
1745 update_panels();
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1746 curs_set(cursor_backup);
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1747 return;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1748 }
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1749
84
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1750 // Update offset if necessary
680
1f8987e0e56c Try to display as many buddylist items as possible
Mikael Berthe <mikael@lilotux.net>
parents: 679
diff changeset
1751 // 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
1752 i = g_list_length(buddylist) - maxy;
682
f3945593432e Small fix in scr_DrawRoster()
Mikael Berthe <mikael@lilotux.net>
parents: 680
diff changeset
1753 if (i < 0)
f3945593432e Small fix in scr_DrawRoster()
Mikael Berthe <mikael@lilotux.net>
parents: 680
diff changeset
1754 i = 0;
f3945593432e Small fix in scr_DrawRoster()
Mikael Berthe <mikael@lilotux.net>
parents: 680
diff changeset
1755 if (i < offset)
680
1f8987e0e56c Try to display as many buddylist items as possible
Mikael Berthe <mikael@lilotux.net>
parents: 679
diff changeset
1756 offset = i;
1f8987e0e56c Try to display as many buddylist items as possible
Mikael Berthe <mikael@lilotux.net>
parents: 679
diff changeset
1757 // b) Make sure the current_buddy is visible
84
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1758 i = g_list_position(buddylist, current_buddy);
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1759 if (i == -1) { // This is bad
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
1760 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
1761 curs_set(cursor_backup);
84
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1762 return;
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1763 } else if (i < offset) {
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1764 offset = i;
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1765 } else if (i+1 > offset + maxy) {
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1766 offset = i + 1 - maxy;
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1767 }
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1768
973
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1769 if (roster_win_on_right)
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1770 x_pos = 1; // 1 char offset (vertical line)
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1771 else
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1772 x_pos = 0;
e693cbe33802 Add option 'roster_win_on_right'
Mikael Berthe <mikael@lilotux.net>
parents: 972
diff changeset
1773
1026
fc6060707022 [BP] Fixes truncating utf-8 buddy names (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 966
diff changeset
1774 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
1775 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
1776
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1777 buddy = buddylist;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1778 rOffset = offset;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1779
84
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1780 for (i=0; i<maxy && buddy; buddy = g_list_next(buddy)) {
848
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
1781 unsigned short bflags, btype, ismsg, isgrp, ismuc, ishid, isspe;
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1782 gchar *rline_locale;
1072
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
1783 GSList *resources, *p_res;
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1784
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1785 bflags = buddy_getflags(BUDDATA(buddy));
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1786 btype = buddy_gettype(BUDDATA(buddy));
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1787
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1788 ismsg = bflags & ROSTER_FLAG_MSG;
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1789 ishid = bflags & ROSTER_FLAG_HIDE;
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1790 isgrp = btype & ROSTER_TYPE_GROUP;
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1791 ismuc = btype & ROSTER_TYPE_ROOM;
848
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
1792 isspe = btype & ROSTER_TYPE_SPECIAL;
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1793
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1794 if (rOffset > 0) {
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1795 rOffset--;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1796 continue;
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1797 }
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1798
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1799 status = '?';
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1800 pending = ' ';
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1801
986
ed697234bd39 Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents: 981
diff changeset
1802 resources = buddy_getresources(BUDDATA(buddy));
1072
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
1803 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
1804 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
1805 p_res ? p_res->data : "");
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
1806 if ((events & ROSTER_EVENT_PAUSED) && pending != '+')
992
b37348c2aa79 Chatstates: display "paused" states in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 991
diff changeset
1807 pending = '.';
1072
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
1808 if (events & ROSTER_EVENT_COMPOSING)
987
f47e312560af Improve JEP22 + JEP85 support
Mikael Berthe <mikael@lilotux.net>
parents: 986
diff changeset
1809 pending = '+';
1072
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
1810 g_free(p_res->data);
986
ed697234bd39 Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents: 981
diff changeset
1811 }
1072
2a3cfb98bd5e Fix memory leaks after calls to buddy_getresources()
Mikael Berthe <mikael@lilotux.net>
parents: 1059
diff changeset
1812 g_slist_free(resources);
986
ed697234bd39 Chat states receival (Alexis Hildebrandt)
Mikael Berthe <mikael@lilotux.net>
parents: 981
diff changeset
1813
149
9f74832eb4f8 [/trunk] Changeset 161 by mikael
mikael
parents: 148
diff changeset
1814 // Display message notice if there is a message flag, but not
9f74832eb4f8 [/trunk] Changeset 161 by mikael
mikael
parents: 148
diff changeset
1815 // for unfolded groups.
9f74832eb4f8 [/trunk] Changeset 161 by mikael
mikael
parents: 148
diff changeset
1816 if (ismsg && (!isgrp || ishid)) {
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1817 pending = '#';
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1818 }
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1819
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1820 if (ismuc) {
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1821 if (buddy_getinsideroom(BUDDATA(buddy)))
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1822 status = 'C';
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1823 else
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1824 status = 'x';
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1825 } else if (currentstatus != offline) {
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1826 enum imstatus budstate;
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1827 budstate = buddy_getstatus(BUDDATA(buddy), NULL);
790
5d4ad1d77da4 Kill a few gcc4 warnings
Mikael Berthe <mikael@lilotux.net>
parents: 785
diff changeset
1828 if (budstate < imstatus_size)
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1829 status = imstatus2char[budstate];
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1830 }
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1831 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
1832 if (pending == '#')
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1833 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
1834 else
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1835 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
1836 // 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
1837 wmove(rosterWnd, i, x_pos);
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1838 for (n = 0; n < maxx; n++)
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1839 waddch(rosterWnd, ' ');
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1840 } else {
149
9f74832eb4f8 [/trunk] Changeset 161 by mikael
mikael
parents: 148
diff changeset
1841 if (pending == '#')
739
0d5fb1d9077c Allow "bright" text colors
Mikael Berthe <mikael@lilotux.net>
parents: 735
diff changeset
1842 wattrset(rosterWnd, get_color(COLOR_ROSTERNMSG));
1272
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1843 else {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1844 int color = get_color(COLOR_ROSTER);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1845 if ((!isspe) && (!isgrp)) {//Look for color rules
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1846 GSList *head;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1847 const char *jid = buddy_getjid(BUDDATA(buddy));
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1848 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
1849 rostercolor *rc = head->data;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1850 if (g_pattern_match_string(rc->compiled, jid) &&
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1851 (!strcmp("*", rc->status) || strchr(rc->status, status))) {
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1852 color = get_color(rc->color);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1853 break;
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1854 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1855 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1856 }
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1857 wattrset(rosterWnd, color);
033576acac4c Add configurable roster colors (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents: 1268
diff changeset
1858 }
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1859 }
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1860
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1861 if (Roster_Width > 7)
1026
fc6060707022 [BP] Fixes truncating utf-8 buddy names (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 966
diff changeset
1862 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
1863 else
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1864 name[0] = 0;
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1865
149
9f74832eb4f8 [/trunk] Changeset 161 by mikael
mikael
parents: 148
diff changeset
1866 if (isgrp) {
133
a27b22e3b3a1 [/trunk] Changeset 146 by mikael
mikael
parents: 129
diff changeset
1867 char *sep;
149
9f74832eb4f8 [/trunk] Changeset 161 by mikael
mikael
parents: 148
diff changeset
1868 if (ishid)
133
a27b22e3b3a1 [/trunk] Changeset 146 by mikael
mikael
parents: 129
diff changeset
1869 sep = "+++";
a27b22e3b3a1 [/trunk] Changeset 146 by mikael
mikael
parents: 129
diff changeset
1870 else
a27b22e3b3a1 [/trunk] Changeset 146 by mikael
mikael
parents: 129
diff changeset
1871 sep = "---";
1168
eb05f960613f Fix UTF-8 group names in the roster (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1160
diff changeset
1872 snprintf(rline, 4*Roster_Width, " %c%s %s", pending, sep, name);
848
a9161d2dc414 Introduce special buffer stuff
Mikael Berthe <mikael@lilotux.net>
parents: 843
diff changeset
1873 } else if (isspe) {
1168
eb05f960613f Fix UTF-8 group names in the roster (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 1160
diff changeset
1874 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
1875 } else {
824
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
1876 char sepleft = '[';
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
1877 char sepright = ']';
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
1878 if (btype & ROSTER_TYPE_USER) {
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
1879 guint subtype = buddy_getsubscription(BUDDATA(buddy));
832
7c210263c661 Small scr_DrawRoster() fix
Mikael Berthe <mikael@lilotux.net>
parents: 828
diff changeset
1880 if (status == '_' && !(subtype & sub_to))
824
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
1881 status = '?';
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
1882 if (!(subtype & sub_from)) {
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
1883 sepleft = '{';
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
1884 sepright = '}';
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
1885 }
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
1886 }
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
1887
1026
fc6060707022 [BP] Fixes truncating utf-8 buddy names (Myhailo Danylenko)
Mikael Berthe <mikael@lilotux.net>
parents: 966
diff changeset
1888 snprintf(rline, 4*Roster_Width,
824
37ef269330f0 Show incomplete subscriptions in the roster
Mikael Berthe <mikael@lilotux.net>
parents: 822
diff changeset
1889 " %c%c%c%c %s", pending, sepleft, status, sepright, name);
133
a27b22e3b3a1 [/trunk] Changeset 146 by mikael
mikael
parents: 129
diff changeset
1890 }
84
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1891
773
e25b8a348ebd Screen updating functions use UTF-8
Mikael Berthe <mikael@lilotux.net>
parents: 772
diff changeset
1892 rline_locale = from_utf8(rline);
981
553b8ecf901f Fixes truncating of utf-8 buddy names (again)
Myhailo Danylenko <isbear@ukrpost.net>
parents: 980
diff changeset
1893 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
1894 g_free(rline_locale);
84
134fe2567f07 [/trunk] Changeset 98 by mikael
mikael
parents: 81
diff changeset
1895 i++;
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1896 }
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1897
701
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1898 g_free(rline);
6c100adfbfb6 Add setting "roster_width" (variable buddylist width)
Mikael Berthe <mikael@lilotux.net>
parents: 699
diff changeset
1899 g_free(name);
142
bb6fe91589b9 [/trunk] Changeset 154 by mikael
mikael
parents: 140
diff changeset
1900 top_panel(inputPanel);
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
1901 update_panels();
713
b5aa7b7afee8 Update status lines
Mikael Berthe <mikael@lilotux.net>
parents: 712
diff changeset
1902 curs_set(cursor_backup);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1903 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1904
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1905 // scr_RosterVisibility(status)
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1906 // Set the roster visibility:
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1907 // status=1 Show roster
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1908 // status=0 Hide roster
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1909 // status=-1 Toggle roster status
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1910 void scr_RosterVisibility(int status)
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1911 {
708
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed
Mikael Berthe <mikael@lilotux.net>
parents: 707
diff changeset
1912 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
1913
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1914 if (status > 0)
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1915 roster_hidden = FALSE;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1916 else if (status == 0)
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1917 roster_hidden = TRUE;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1918 else
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1919 roster_hidden = !roster_hidden;
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1920
708
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed
Mikael Berthe <mikael@lilotux.net>
parents: 707
diff changeset
1921 if (roster_hidden != old_roster_status) {
709
5aa66101807b Leave full-width mode automatically under some conditions
Mikael Berthe <mikael@lilotux.net>
parents: 708
diff changeset
1922 if (roster_hidden) {
5aa66101807b Leave full-width mode automatically under some conditions
Mikael Berthe <mikael@lilotux.net>
parents: 708
diff changeset
1923 // Enter chat mode
5aa66101807b Leave full-width mode automatically under some conditions
Mikael Berthe <mikael@lilotux.net>
parents: 708
diff changeset
1924 scr_set_chatmode(TRUE);
5aa66101807b Leave full-width mode automatically under some conditions
Mikael Berthe <mikael@lilotux.net>
parents: 708
diff changeset
1925 scr_ShowBuddyWindow();
5aa66101807b Leave full-width mode automatically under some conditions
Mikael Berthe <mikael@lilotux.net>
parents: 708
diff changeset
1926 }
708
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed
Mikael Berthe <mikael@lilotux.net>
parents: 707
diff changeset
1927 // 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
1928 scr_Resize();
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed
Mikael Berthe <mikael@lilotux.net>
parents: 707
diff changeset
1929 redrawwin(stdscr);
ed326697e4ed scr_RosterVisibility(): do not refresh when it is not needed
Mikael Berthe <mikael@lilotux.net>
parents: 707
diff changeset
1930 }
707
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1931 }
b26a0bde4cdb Add /roster hide|show|toggle
Mikael Berthe <mikael@lilotux.net>
parents: 701
diff changeset
1932
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
1933 inline void scr_WriteMessage(const char *bjid, const char *text,
1290
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
1934 time_t timestamp, guint prefix_flags,
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
1935 unsigned mucnicklen)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1936 {
727
1c3620668857 Expand tabs when reading history files
Mikael Berthe <mikael@lilotux.net>
parents: 726
diff changeset
1937 char *xtext;
725
1aff92625bdb Expand tabs when receiving a message
Mikael Berthe <mikael@lilotux.net>
parents: 724
diff changeset
1938
726
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
1939 if (!timestamp) timestamp = time(NULL);
725
1aff92625bdb Expand tabs when receiving a message
Mikael Berthe <mikael@lilotux.net>
parents: 724
diff changeset
1940
1122
648fe6f715a6 Filter out ^M (0x0d) characters in incoming messages
Mikael Berthe <mikael@lilotux.net>
parents: 1115
diff changeset
1941 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
1942
1290
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
1943 scr_WriteInWindow(bjid, xtext, timestamp, prefix_flags, FALSE, mucnicklen);
725
1aff92625bdb Expand tabs when receiving a message
Mikael Berthe <mikael@lilotux.net>
parents: 724
diff changeset
1944
1aff92625bdb Expand tabs when receiving a message
Mikael Berthe <mikael@lilotux.net>
parents: 724
diff changeset
1945 if (xtext != (char*)text)
1aff92625bdb Expand tabs when receiving a message
Mikael Berthe <mikael@lilotux.net>
parents: 724
diff changeset
1946 g_free(xtext);
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1947 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
1948
726
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
1949 // If prefix is NULL, HBB_PREFIX_IN is supposed.
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
1950 void scr_WriteIncomingMessage(const char *jidfrom, const char *text,
1290
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
1951 time_t timestamp, guint prefix, unsigned mucnicklen)
726
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
1952 {
1055
6eb1efea75d0 PGP: Visual encryption flag
Mikael Berthe <mikael@lilotux.net>
parents: 1050
diff changeset
1953 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
1954 ~HBB_PREFIX_NOFLAG & ~HBB_PREFIX_HLIGHT & ~HBB_PREFIX_HLIGHT_OUT &
e802ec0c02d2 Basic support for nick highlighting in MUC rooms (the whole line is colored)
Mikael Berthe <mikael@lilotux.net>
parents: 1190
diff changeset
1955 ~HBB_PREFIX_PGPCRYPT))
726
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
1956 prefix |= HBB_PREFIX_IN;
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
1957
1290
e42f48103609 Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents: 1286
diff changeset
1958 scr_WriteMessage(jidfrom, text, timestamp, prefix, mucnicklen);
726
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
1959 }
51be2bc1a820 Better tab expansion
Mikael Berthe <mikael@lilotux.net>
parents: 725
diff changeset
1960
1055
6eb1efea75d0 PGP: Visual encryption flag
Mikael Berthe <mikael@lilotux.net>
parents: 1050
diff changeset
1961 void scr_WriteOutgoingMessage(const char *jidto, const char *text, guint prefix)
47
7259a61e1a4b [/trunk] Changeset 63 by mikael
mikael
parents: 44
diff changeset
1962 {
1115
922a9ae1a17e Fix /say_to to a member of a folded group
Mikael Berthe <mikael@lilotux.net>
parents: 1093
diff changeset
1963 GSList *roster_elt;
922a9ae1a17e Fix /say_to to a member of a folded group
Mikael Berthe <mikael@lilotux.net>
parents: 1093
diff changeset
1964 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
1965 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
1966
1333
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
1967 scr_WriteMessage(jidto, text,
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
1968 0, prefix|HBB_PREFIX_OUT|HBB_PREFIX_HLIGHT_OUT, 0);
1115
922a9ae1a17e Fix /say_to to a member of a folded group
Mikael Berthe <mikael@lilotux.net>
parents: 1093
diff changeset
1969
922a9ae1a17e Fix /say_to to a member of a folded group
Mikael Berthe <mikael@lilotux.net>
parents: 1093
diff changeset
1970 // 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
1971 if (roster_elt && g_list_position(buddylist, roster_elt->data) != -1)
922a9ae1a17e Fix /say_to to a member of a folded group
Mikael Berthe <mikael@lilotux.net>
parents: 1093
diff changeset
1972 scr_ShowWindow(jidto, FALSE);
47
7259a61e1a4b [/trunk] Changeset 63 by mikael
mikael
parents: 44
diff changeset
1973 }
7259a61e1a4b [/trunk] Changeset 63 by mikael
mikael
parents: 44
diff changeset
1974
935
97e6a6da2b2c Fix ncurses #include (again)
Mikael Berthe <mikael@lilotux.net>
parents: 933
diff changeset
1975 static inline void set_autoaway(bool setaway)
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
1976 {
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
1977 static enum imstatus oldstatus;
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
1978 static char *oldmsg;
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
1979 Autoaway = setaway;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
1980
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
1981 if (setaway) {
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
1982 const char *msg, *prevmsg;
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
1983 oldstatus = jb_getstatus();
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
1984 if (oldmsg) {
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
1985 g_free(oldmsg);
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
1986 oldmsg = NULL;
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
1987 }
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
1988 prevmsg = jb_getstatusmsg();
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
1989 msg = settings_opt_get("message_autoaway");
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
1990 if (!msg)
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
1991 msg = prevmsg;
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
1992 if (prevmsg)
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
1993 oldmsg = g_strdup(prevmsg);
1056
5b3ecae91c95 PGP: sign auto-away presence too
Mikael Berthe <mikael@lilotux.net>
parents: 1055
diff changeset
1994 jb_setstatus(away, NULL, msg, FALSE);
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
1995 } else {
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
1996 // Back
1050
ea71d31a2607 PGP: Do not sign presence messages to chatrooms
Mikael Berthe <mikael@lilotux.net>
parents: 1037
diff changeset
1997 jb_setstatus(oldstatus, NULL, (oldmsg ? oldmsg : ""), FALSE);
521
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
1998 if (oldmsg) {
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
1999 g_free(oldmsg);
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2000 oldmsg = NULL;
cc8c969ab6e5 "/status" changes
Mikael Berthe <mikael@lilotux.net>
parents: 518
diff changeset
2001 }
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2002 }
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2003 }
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2004
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2005 long int scr_GetAutoAwayTimeout(time_t now)
939
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
2006 {
940
fc30221b952d Fix an autoaway problem
Mikael Berthe <mikael@lilotux.net>
parents: 939
diff changeset
2007 enum imstatus cur_st;
939
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
2008 unsigned int autoaway_timeout = settings_opt_get_int("autoaway");
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
2009
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
2010 if (Autoaway || !autoaway_timeout)
940
fc30221b952d Fix an autoaway problem
Mikael Berthe <mikael@lilotux.net>
parents: 939
diff changeset
2011 return 86400;
939
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
2012
940
fc30221b952d Fix an autoaway problem
Mikael Berthe <mikael@lilotux.net>
parents: 939
diff changeset
2013 cur_st = jb_getstatus();
fc30221b952d Fix an autoaway problem
Mikael Berthe <mikael@lilotux.net>
parents: 939
diff changeset
2014 // Auto-away is disabled for the following states
fc30221b952d Fix an autoaway problem
Mikael Berthe <mikael@lilotux.net>
parents: 939
diff changeset
2015 if ((cur_st != available) && (cur_st != freeforchat))
fc30221b952d Fix an autoaway problem
Mikael Berthe <mikael@lilotux.net>
parents: 939
diff changeset
2016 return 86400;
fc30221b952d Fix an autoaway problem
Mikael Berthe <mikael@lilotux.net>
parents: 939
diff changeset
2017
fc30221b952d Fix an autoaway problem
Mikael Berthe <mikael@lilotux.net>
parents: 939
diff changeset
2018 if (now >= LastActivity + (time_t)autoaway_timeout)
939
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
2019 return 0;
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
2020 else
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
2021 return LastActivity + (time_t)autoaway_timeout - now;
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
2022 }
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
2023
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2024 // set_chatstate(state)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2025 // Set the current chat state (0=active, 1=composing, 2=paused)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2026 // If the chat state has changed, call jb_send_chatstate()
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2027 static inline void set_chatstate(int state)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2028 {
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2029 #if defined JEP0022 || defined JEP0085
993
0759f4c7da68 Add option 'disable_chatstates'
Mikael Berthe <mikael@lilotux.net>
parents: 992
diff changeset
2030 if (chatstates_disabled)
0759f4c7da68 Add option 'disable_chatstates'
Mikael Berthe <mikael@lilotux.net>
parents: 992
diff changeset
2031 return;
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2032 if (!chatmode)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2033 state = 0;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2034 if (state != chatstate) {
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2035 chatstate = state;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2036 if (current_buddy &&
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2037 buddy_gettype(BUDDATA(current_buddy)) == ROSTER_TYPE_USER) {
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2038 guint jep_state;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2039 if (chatstate == 1)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2040 jep_state = ROSTER_EVENT_COMPOSING;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2041 else if (chatstate == 2)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2042 jep_state = ROSTER_EVENT_PAUSED;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2043 else
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2044 jep_state = ROSTER_EVENT_ACTIVE;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2045 jb_send_chatstate(BUDDATA(current_buddy), jep_state);
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2046 }
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2047 if (!chatstate)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2048 chatstate_timestamp = 0;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2049 }
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2050 #endif
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2051 }
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2052
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2053 #if defined JEP0022 || defined JEP0085
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2054 inline long int scr_GetChatStatesTimeout(time_t now)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2055 {
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2056 // Check if we're currently composing...
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2057 if (chatstate != 1 || !chatstate_timestamp)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2058 return 86400;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2059
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2060 // 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
2061 if (now >= chatstate_timestamp + COMPOSING_TIMEOUT) {
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2062 chatstate_timestamp = now;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2063 set_chatstate(2);
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2064 return 86400;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2065 }
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2066
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2067 return chatstate_timestamp + COMPOSING_TIMEOUT - now;
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2068 }
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2069 #endif
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
2070
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2071 // Check if we should enter/leave automatic away status
935
97e6a6da2b2c Fix ncurses #include (again)
Mikael Berthe <mikael@lilotux.net>
parents: 933
diff changeset
2072 void scr_CheckAutoAway(int activity)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2073 {
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2074 enum imstatus cur_st;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2075 unsigned int autoaway_timeout = settings_opt_get_int("autoaway");
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2076
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2077 if (Autoaway && activity) set_autoaway(FALSE);
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2078 if (!autoaway_timeout) return;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2079 if (!LastActivity || activity) time(&LastActivity);
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2080
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2081 cur_st = jb_getstatus();
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2082 // Auto-away is disabled for the following states
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2083 if ((cur_st != available) && (cur_st != freeforchat))
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2084 return;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2085
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2086 if (!activity) {
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2087 time_t now;
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2088 time(&now);
735
2f027806cd48 Some code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 731
diff changeset
2089 if (!Autoaway && (now > LastActivity + (time_t)autoaway_timeout))
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2090 set_autoaway(TRUE);
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
2091 }
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2092 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2093
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2094 // set_current_buddy(newbuddy)
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2095 // 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
2096 // 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
2097 static void set_current_buddy(GList *newbuddy)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2098 {
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2099 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
2100 /* 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
2101 * 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
2102 * buddy_getstatus() call.
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2103 */
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2104
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2105 if (!current_buddy || !newbuddy) return;
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2106 if (newbuddy == current_buddy) return;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2107
990
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
2108 // 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
2109 set_chatstate(0);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
2110 // 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
2111 lock_chatstate = TRUE;
990
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
2112
438
b44be19d6229 Handle multiple resources for the same buddy
Mikael Berthe <mikael@lilotux.net>
parents: 419
diff changeset
2113 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
2114 buddy_setflags(BUDDATA(current_buddy), ROSTER_FLAG_LOCK, FALSE);
330
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2115 if (chatmode)
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2116 alternate_buddy = current_buddy;
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2117 current_buddy = newbuddy;
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2118 // 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
2119 if (chatmode)
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2120 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
2121 // We should rebuild the buddylist but not everytime
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2122 // Here we check if we were locking a buddy who is actually offline,
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2123 // and hide_offline_buddies is TRUE. In which case we need to rebuild.
1311
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2124 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
2125 buddylist_build();
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2126 update_roster = TRUE;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2127 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
2128
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2129 // scr_RosterTop()
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2130 // Go to the first buddy in the buddylist
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2131 void scr_RosterTop(void)
104
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2132 {
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2133 set_current_buddy(buddylist);
104
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2134 if (chatmode)
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2135 scr_ShowBuddyWindow();
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2136 }
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2137
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2138 // scr_RosterBottom()
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2139 // Go to the last buddy in the buddylist
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2140 void scr_RosterBottom(void)
104
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2141 {
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2142 set_current_buddy(g_list_last(buddylist));
104
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2143 if (chatmode)
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2144 scr_ShowBuddyWindow();
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2145 }
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2146
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2147 // scr_RosterUp()
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2148 // Go to the previous buddy in the buddylist
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2149 void scr_RosterUp(void)
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2150 {
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2151 set_current_buddy(g_list_previous(current_buddy));
104
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2152 if (chatmode)
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2153 scr_ShowBuddyWindow();
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2154 }
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2155
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2156 // scr_RosterDown()
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2157 // Go to the next buddy in the buddylist
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2158 void scr_RosterDown(void)
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2159 {
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2160 set_current_buddy(g_list_next(current_buddy));
104
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2161 if (chatmode)
fe7257d251ac [/trunk] Changeset 118 by mikael
mikael
parents: 103
diff changeset
2162 scr_ShowBuddyWindow();
81
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2163 }
0bd578421ce9 [/trunk] Changeset 95 by mikael
mikael
parents: 76
diff changeset
2164
1086
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2165 // scr_RosterPrevGroup()
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2166 // Go to the previous group in the buddylist
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2167 void scr_RosterPrevGroup(void)
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2168 {
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2169 GList *bud;
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2170
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2171 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
2172 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
2173 if (!bud)
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2174 break;
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2175 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
2176 set_current_buddy(bud);
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2177 if (chatmode)
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2178 scr_ShowBuddyWindow();
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2179 break;
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2180 }
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2181 }
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2182 }
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2183
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2184 // scr_RosterNextGroup()
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2185 // Go to the next group in the buddylist
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2186 void scr_RosterNextGroup(void)
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2187 {
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2188 GList *bud;
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2189
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2190 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
2191 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
2192 if (!bud)
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2193 break;
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2194 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
2195 set_current_buddy(bud);
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2196 if (chatmode)
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2197 scr_ShowBuddyWindow();
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2198 break;
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2199 }
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2200 }
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2201 }
5e2e647e781b Add command /roster group_prev|group_next and update documentation
Mikael Berthe <mikael@lilotux.net>
parents: 1083
diff changeset
2202
265
49e9e02dd6d0 Add "/roster search" command
mikael@frmp8452
parents: 263
diff changeset
2203 // scr_RosterSearch(str)
49e9e02dd6d0 Add "/roster search" command
mikael@frmp8452
parents: 263
diff changeset
2204 // Look forward for a buddy with jid/name containing str.
49e9e02dd6d0 Add "/roster search" command
mikael@frmp8452
parents: 263
diff changeset
2205 void scr_RosterSearch(char *str)
49e9e02dd6d0 Add "/roster search" command
mikael@frmp8452
parents: 263
diff changeset
2206 {
328
83d129adde03 Add set_current_buddy() function, to reduce code duplication
Mikael Berthe <mikael@lilotux.net>
parents: 325
diff changeset
2207 set_current_buddy(buddy_search(str));
265
49e9e02dd6d0 Add "/roster search" command
mikael@frmp8452
parents: 263
diff changeset
2208 if (chatmode)
49e9e02dd6d0 Add "/roster search" command
mikael@frmp8452
parents: 263
diff changeset
2209 scr_ShowBuddyWindow();
49e9e02dd6d0 Add "/roster search" command
mikael@frmp8452
parents: 263
diff changeset
2210 }
49e9e02dd6d0 Add "/roster search" command
mikael@frmp8452
parents: 263
diff changeset
2211
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
2212 // scr_RosterJumpJid(bjid)
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
2213 // Jump to buddy bjid.
480
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2214 // NOTE: With this function, the buddy is added to the roster if doesn't exist.
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2215 void scr_RosterJumpJid(char *barejid)
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2216 {
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2217 GSList *roster_elt;
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2218 // Look for an existing buddy
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2219 roster_elt = roster_find(barejid, jidsearch,
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2220 ROSTER_TYPE_USER|ROSTER_TYPE_AGENT|ROSTER_TYPE_ROOM);
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2221 // Create it if necessary
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2222 if (!roster_elt)
603
9516db839e08 Store subscription data
Mikael Berthe <mikael@lilotux.net>
parents: 602
diff changeset
2223 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
2224 sub_none, -1);
480
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2225 // Set a lock to see it in the buddylist
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2226 buddy_setflags(BUDDATA(roster_elt), ROSTER_FLAG_LOCK, TRUE);
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2227 buddylist_build();
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2228 // Jump to the buddy
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2229 set_current_buddy(buddy_search_jid(barejid));
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2230 if (chatmode)
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2231 scr_ShowBuddyWindow();
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2232 }
882e1acae422 Add /say_to command
Mikael Berthe <mikael@lilotux.net>
parents: 464
diff changeset
2233
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2234 // scr_RosterUnreadMessage(next)
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2235 // 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
2236 // 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
2237 // message from unread_list.
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2238 void scr_RosterUnreadMessage(int next)
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2239 {
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2240 gpointer unread_ptr;
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2241 gpointer refbuddata;
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2242 GList *nbuddy;
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2243
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2244 if (!current_buddy) return;
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2245
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2246 if (next) refbuddata = BUDDATA(current_buddy);
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2247 else refbuddata = NULL;
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2248
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2249 unread_ptr = unread_msg(refbuddata);
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2250 if (!unread_ptr) return;
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2251
889
ae93e69aaaaf Fix up pending message flag for the status special buffer
Mikael Berthe <mikael@lilotux.net>
parents: 888
diff changeset
2252 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
2253 gpointer ngroup;
ae93e69aaaaf Fix up pending message flag for the status special buffer
Mikael Berthe <mikael@lilotux.net>
parents: 888
diff changeset
2254 // 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
2255 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
2256 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
2257 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
2258 buddylist_build();
ae93e69aaaaf Fix up pending message flag for the status special buffer
Mikael Berthe <mikael@lilotux.net>
parents: 888
diff changeset
2259 }
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2260 }
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2261
329
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2262 nbuddy = g_list_find(buddylist, unread_ptr);
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2263 if (nbuddy) {
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2264 set_current_buddy(nbuddy);
7c53bf62a2a2 scr_RosterUnreadMessage() uses set_current_buddy()
Mikael Berthe <mikael@lilotux.net>
parents: 328
diff changeset
2265 if (chatmode) scr_ShowBuddyWindow();
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
2266 } else
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
2267 scr_LogPrint(LPRINT_LOGNORM, "Error: nbuddy == NULL"); // should not happen
236
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2268 }
72fd1273f2b7 [/trunk] Changeset 249 by mikael
mikael
parents: 232
diff changeset
2269
330
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2270 // scr_RosterJumpAlternate()
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2271 // Try to jump to alternate (== previous) buddy
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2272 void scr_RosterJumpAlternate(void)
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2273 {
330
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2274 if (!alternate_buddy || g_list_position(buddylist, alternate_buddy) == -1)
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2275 return;
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2276 set_current_buddy(alternate_buddy);
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2277 if (chatmode)
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2278 scr_ShowBuddyWindow();
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2279 }
a9013124ede6 Add "/roster alternate"
Mikael Berthe <mikael@lilotux.net>
parents: 329
diff changeset
2280
1311
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2281 // scr_RosterDisplay(filter)
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2282 // 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
2283 // mask is displayed.
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2284 void scr_RosterDisplay(const char *filter)
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2285 {
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2286 guchar status;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2287 enum imstatus budstate;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2288 char strfilter[imstatus_size+1];
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2289 char *psfilter;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2290
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2291 if (filter && *filter) {
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2292 int show_all = (*filter == '*');
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2293 status = 0;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2294 for (budstate = 0; budstate < imstatus_size-1; budstate++)
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2295 if (strchr(filter, imstatus2char[budstate]) || show_all)
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2296 status |= 1<<budstate;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2297 buddylist_set_filter(status);
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2298 buddylist_build();
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2299 update_roster = TRUE;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2300 return;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2301 }
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2302
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2303 // Display current filter
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2304 psfilter = strfilter;
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2305 status = buddylist_get_filter();
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2306 for (budstate = 0; budstate < imstatus_size-1; budstate++)
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2307 if (status & 1<<budstate)
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2308 *psfilter++ = imstatus2char[budstate];
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2309 *psfilter = '\0';
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2310 scr_LogPrint(LPRINT_NORMAL, "Roster status filter: %s", strfilter);
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2311 }
0dda8238af21 Implement "/roster display"
Mikael Berthe <mikael@lilotux.net>
parents: 1298
diff changeset
2312
369
499170ed71c9 Rename some buffer commands, for homogeneity
Mikael Berthe <mikael@lilotux.net>
parents: 365
diff changeset
2313 // scr_BufferScrollUpDown()
508
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2314 // Scroll up/down the current buddy window,
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2315 // - half a screen if nblines is 0,
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2316 // - up if updown == -1, down if updown == 1
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2317 void scr_BufferScrollUpDown(int updown, unsigned int nblines)
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2318 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
2319 winbuf *win_entry;
508
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2320 int n, nbl;
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2321 GList *hbuf_top;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2322 guint isspe;
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2323
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2324 // Get win_entry
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2325 if (!current_buddy) return;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2326
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2327 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2328 win_entry = scr_SearchWindow(CURRENT_JID, isspe);
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2329 if (!win_entry) return;
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2330
508
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2331 if (!nblines) {
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2332 // Scroll half a screen (or less)
512
1744664332cd Fix "/buffer up"
Mikael Berthe <mikael@lilotux.net>
parents: 508
diff changeset
2333 nbl = CHAT_WIN_HEIGHT/2;
508
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2334 } else {
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2335 nbl = nblines;
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2336 }
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2337 hbuf_top = win_entry->bd->top;
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2338
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2339 if (updown == -1) { // UP
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2340 if (!hbuf_top) {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2341 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
2342 if (!win_entry->bd->cleared) {
512
1744664332cd Fix "/buffer up"
Mikael Berthe <mikael@lilotux.net>
parents: 508
diff changeset
2343 if (!nblines) nbl = nbl*3 - 1;
1744664332cd Fix "/buffer up"
Mikael Berthe <mikael@lilotux.net>
parents: 508
diff changeset
2344 else nbl += CHAT_WIN_HEIGHT - 1;
1744664332cd Fix "/buffer up"
Mikael Berthe <mikael@lilotux.net>
parents: 508
diff changeset
2345 } else {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2346 win_entry->bd->cleared = FALSE;
512
1744664332cd Fix "/buffer up"
Mikael Berthe <mikael@lilotux.net>
parents: 508
diff changeset
2347 }
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2348 }
508
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2349 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
2350 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
2351 win_entry->bd->top = hbuf_top;
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2352 } else { // DOWN
508
5a2132ba2220 Add "/buffer up" and "/buffer down"
Mikael Berthe <mikael@lilotux.net>
parents: 503
diff changeset
2353 for (n=0 ; hbuf_top && n < nbl ; n++)
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2354 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
2355 win_entry->bd->top = hbuf_top;
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2356 // Check if we are at the bottom
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2357 for (n=0 ; hbuf_top && n < CHAT_WIN_HEIGHT-1 ; n++)
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2358 hbuf_top = g_list_next(hbuf_top);
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2359 if (!hbuf_top)
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2360 win_entry->bd->top = NULL; // End reached
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2361 }
105
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2362
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2363 // Refresh the window
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2364 scr_UpdateWindow(win_entry);
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2365
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2366 // Finished :)
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2367 update_panels();
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2368 }
91d3ec21c24e [/trunk] Changeset 119 by mikael
mikael
parents: 104
diff changeset
2369
369
499170ed71c9 Rename some buffer commands, for homogeneity
Mikael Berthe <mikael@lilotux.net>
parents: 365
diff changeset
2370 // scr_BufferClear()
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2371 // Clear the current buddy window (used for the /clear command)
369
499170ed71c9 Rename some buffer commands, for homogeneity
Mikael Berthe <mikael@lilotux.net>
parents: 365
diff changeset
2372 void scr_BufferClear(void)
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2373 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
2374 winbuf *win_entry;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2375 guint isspe;
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2376
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2377 // Get win_entry
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2378 if (!current_buddy) return;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2379 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2380 win_entry = scr_SearchWindow(CURRENT_JID, isspe);
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2381 if (!win_entry) return;
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2382
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2383 win_entry->bd->cleared = TRUE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2384 win_entry->bd->top = NULL;
108
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2385
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2386 // Refresh the window
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2387 scr_UpdateWindow(win_entry);
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2388
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2389 // Finished :)
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2390 update_panels();
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2391 }
7fb72bc13732 [/trunk] Changeset 122 by mikael
mikael
parents: 105
diff changeset
2392
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2393 // buffer_purge()
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2394 // key: winId/jid
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2395 // value: winbuf structure
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2396 // 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
2397 // NOTE: does not work for special buffers.
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2398 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
2399 {
1225
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2400 int *p_closebuf = data;
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2401 winbuf *win_entry = value;
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2402
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2403 // Delete the current hbuf
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2404 hbuf_free(&win_entry->bd->hbuf);
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2405
1225
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2406 if (*p_closebuf) {
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2407 g_hash_table_remove(winbufhash, key);
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2408 } else {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2409 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2410 win_entry->bd->top = NULL;
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2411 }
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2412 }
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2413
1279
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2414 // scr_BufferPurge(closebuf, jid)
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2415 // 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
2416 // If closebuf is 1, close the buffer.
1279
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2417 void scr_BufferPurge(int closebuf, const char *jid)
866
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2418 {
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2419 winbuf *win_entry;
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2420 guint isspe;
1225
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2421 guint *p_closebuf;
1279
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2422 const char *cjid;
1345
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2423 guint hold_chatmode = FALSE;
1279
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2424
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2425 if (jid) {
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2426 cjid = jid;
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2427 isspe = FALSE;
1345
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2428 // 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
2429 // 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
2430 if (closebuf && current_buddy) {
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2431 if (buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL ||
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2432 strcasecmp(jid, CURRENT_JID))
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2433 hold_chatmode = TRUE;
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2434 }
1279
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2435 } else {
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2436 // Get win_entry
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2437 if (!current_buddy) return;
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2438 cjid = CURRENT_JID;
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2439 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2440 }
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2441 win_entry = scr_SearchWindow(cjid, isspe);
866
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2442 if (!win_entry) return;
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2443
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2444 if (!isspe) {
1225
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2445 p_closebuf = g_new(guint, 1);
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2446 *p_closebuf = closebuf;
1279
8bbc764139ef Implement /buffer close|purge [jid]
Mikael Berthe <mikael@lilotux.net>
parents: 1272
diff changeset
2447 buffer_purge((gpointer)cjid, win_entry, p_closebuf);
1225
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2448 g_free(p_closebuf);
1345
8e4e741787be Small change to buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1333
diff changeset
2449 if (closebuf && !hold_chatmode) {
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2450 scr_set_chatmode(FALSE);
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2451 currentWindow = NULL;
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2452 }
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2453 } else {
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2454 // (Special buffer)
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2455 // Reset the current hbuf
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2456 hbuf_free(&win_entry->bd->hbuf);
866
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2457 // Currently it can only be the status buffer
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2458 statushbuf = NULL;
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2459
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2460 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2461 win_entry->bd->top = NULL;
866
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2462 }
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2463
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2464 // Refresh the window
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2465 scr_UpdateBuddyWindow();
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2466
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2467 // Finished :)
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2468 update_panels();
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2469 }
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2470
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2471 void scr_BufferPurgeAll(int closebuf)
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2472 {
1225
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2473 guint *p_closebuf;
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2474 p_closebuf = g_new(guint, 1);
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2475
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2476 *p_closebuf = closebuf;
0e9e9724d643 Fix a bad type cast in buffer_purge()
Mikael Berthe <mikael@lilotux.net>
parents: 1209
diff changeset
2477 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
2478 g_free(p_closebuf);
1138
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2479
8ba4b1e8b42d Add command /buffer close_all
Mikael Berthe <mikael@lilotux.net>
parents: 1137
diff changeset
2480 if (closebuf) {
1135
5d7c05932b13 Add command /buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1133
diff changeset
2481 scr_set_chatmode(FALSE);
1137
5752017f6e2b Fix a bug in /buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1135
diff changeset
2482 currentWindow = NULL;
1135
5d7c05932b13 Add command /buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1133
diff changeset
2483 }
5d7c05932b13 Add command /buffer close
Mikael Berthe <mikael@lilotux.net>
parents: 1133
diff changeset
2484
866
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2485 // Refresh the window
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2486 scr_UpdateBuddyWindow();
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2487
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2488 // Finished :)
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2489 update_panels();
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2490 }
b30df2ab457f Add "/buffer purge"
Mikael Berthe <mikael@lilotux.net>
parents: 865
diff changeset
2491
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2492 // scr_BufferScrollLock(lock)
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2493 // Lock/unlock the current buddy buffer
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2494 // lock = 1 : lock
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2495 // lock = 0 : unlock
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2496 // lock = -1: toggle lock status
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2497 void scr_BufferScrollLock(int lock)
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2498 {
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2499 winbuf *win_entry;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2500 guint isspe;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2501
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2502 // Get win_entry
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2503 if (!current_buddy) return;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2504 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2505 win_entry = scr_SearchWindow(CURRENT_JID, isspe);
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2506 if (!win_entry) return;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2507
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2508 if (lock == -1)
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2509 lock = !win_entry->bd->lock;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2510
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2511 if (lock) {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2512 win_entry->bd->lock = TRUE;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2513 } else {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2514 win_entry->bd->lock = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2515 //win_entry->bd->cleared = 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
2516 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
2517 win_entry->bd->top = NULL;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2518 }
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2519
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2520 // If chatmode is disabled and we're at the bottom of the buffer,
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2521 // we need to set the "top" line, so we need to call scr_ShowBuddyWindow()
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2522 // 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
2523 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
2524 chatmode = TRUE;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2525 scr_ShowBuddyWindow();
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2526 chatmode = FALSE;
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2527 }
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2528
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2529 // Refresh the window
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2530 scr_UpdateBuddyWindow();
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2531
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2532 // Finished :)
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2533 update_panels();
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2534 }
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2535
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2536 // scr_BufferTopBottom()
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2537 // Jump to the head/tail of the current buddy window
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2538 // (top if topbottom == -1, bottom topbottom == 1)
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2539 void scr_BufferTopBottom(int topbottom)
187
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2540 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
2541 winbuf *win_entry;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2542 guint isspe;
187
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2543
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2544 // Get win_entry
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2545 if (!current_buddy) return;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2546 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2547 win_entry = scr_SearchWindow(CURRENT_JID, isspe);
187
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2548 if (!win_entry) return;
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2549
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2550 win_entry->bd->cleared = FALSE;
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2551 if (topbottom == 1)
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2552 win_entry->bd->top = NULL;
361
51ff319947c3 Code cleanup/optimization
Mikael Berthe <mikael@lilotux.net>
parents: 358
diff changeset
2553 else
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2554 win_entry->bd->top = g_list_first(win_entry->bd->hbuf);
187
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2555
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2556 // Refresh the window
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2557 scr_UpdateWindow(win_entry);
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2558
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2559 // Finished :)
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2560 update_panels();
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2561 }
4ce9ff808baa [/trunk] Changeset 199 by mikael
mikael
parents: 185
diff changeset
2562
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2563 // scr_BufferSearch(direction, text)
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2564 // Jump to the next line containing text
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2565 // (backward search if direction == -1, forward if topbottom == 1)
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2566 void scr_BufferSearch(int direction, const char *text)
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2567 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
2568 winbuf *win_entry;
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2569 GList *current_line, *search_res;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2570 guint isspe;
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2571
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2572 // Get win_entry
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2573 if (!current_buddy) return;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2574 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2575 win_entry = scr_SearchWindow(CURRENT_JID, isspe);
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2576 if (!win_entry) return;
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2577
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2578 if (win_entry->bd->top)
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2579 current_line = win_entry->bd->top;
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2580 else
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2581 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
2582
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2583 search_res = hbuf_search(current_line, direction, text);
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2584
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2585 if (search_res) {
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2586 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2587 win_entry->bd->top = search_res;
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2588
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2589 // Refresh the window
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2590 scr_UpdateWindow(win_entry);
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2591
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2592 // Finished :)
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2593 update_panels();
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2594 } else
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
2595 scr_LogPrint(LPRINT_NORMAL, "Search string not found");
370
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2596 }
dd9e2eb52916 Add /buffer search_{backward,forward}
Mikael Berthe <mikael@lilotux.net>
parents: 369
diff changeset
2597
462
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2598 // scr_BufferPercent(n)
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2599 // Jump to the specified position in the buffer, in %
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2600 void scr_BufferPercent(int pc)
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2601 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
2602 winbuf *win_entry;
462
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2603 GList *search_res;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2604 guint isspe;
462
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2605
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2606 // Get win_entry
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2607 if (!current_buddy) return;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2608 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2609 win_entry = scr_SearchWindow(CURRENT_JID, isspe);
462
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2610 if (!win_entry) return;
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2611
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2612 if (pc < 0 || pc > 100) {
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2613 scr_LogPrint(LPRINT_NORMAL, "Bad % value");
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2614 return;
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2615 }
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2616
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2617 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
2618
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2619 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2620 win_entry->bd->top = search_res;
462
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2621
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2622 // Refresh the window
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2623 scr_UpdateWindow(win_entry);
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2624
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2625 // Finished :)
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2626 update_panels();
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2627 }
d580e87c11ed Add "/buffer %n"
Mikael Berthe <mikael@lilotux.net>
parents: 459
diff changeset
2628
464
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2629 // scr_BufferDate(t)
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2630 // Jump to the first line after date t in the buffer
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2631 // t is a date in seconds since `00:00:00 1970-01-01 UTC'
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2632 void scr_BufferDate(time_t t)
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2633 {
822
0dbb2be10975 Get rid of list.h
Mikael Berthe <mikael@lilotux.net>
parents: 807
diff changeset
2634 winbuf *win_entry;
464
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2635 GList *search_res;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2636 guint isspe;
464
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2637
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2638 // Get win_entry
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2639 if (!current_buddy) return;
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2640 isspe = buddy_gettype(BUDDATA(current_buddy)) & ROSTER_TYPE_SPECIAL;
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2641 win_entry = scr_SearchWindow(CURRENT_JID, isspe);
464
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2642 if (!win_entry) return;
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2643
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2644 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
2645
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2646 win_entry->bd->cleared = FALSE;
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2647 win_entry->bd->top = search_res;
464
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2648
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2649 // Refresh the window
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2650 scr_UpdateWindow(win_entry);
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2651
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2652 // Finished :)
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2653 update_panels();
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2654 }
e4840b288be0 Add "/buffer date"
Mikael Berthe <mikael@lilotux.net>
parents: 462
diff changeset
2655
1226
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2656 #ifdef DEBUG_ENABLE
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2657 // buffer_list()
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2658 // key: winId/jid
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2659 // value: winbuf structure
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2660 // data: none.
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2661 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
2662 {
1227
79c396678f1b Make buffer list display the number of allocated HBB blocks
Mikael Berthe <mikael@lilotux.net>
parents: 1226
diff changeset
2663 GList *head;
1226
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2664 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
2665
79c396678f1b Make buffer list display the number of allocated HBB blocks
Mikael Berthe <mikael@lilotux.net>
parents: 1226
diff changeset
2666 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
2667
79c396678f1b Make buffer list display the number of allocated HBB blocks
Mikael Berthe <mikael@lilotux.net>
parents: 1226
diff changeset
2668 scr_LogPrint(LPRINT_NORMAL, " %s (%u/%u)", key,
79c396678f1b Make buffer list display the number of allocated HBB blocks
Mikael Berthe <mikael@lilotux.net>
parents: 1226
diff changeset
2669 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
2670 }
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2671
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2672 void scr_BufferList(void)
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2673 {
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2674 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
2675 buffer_list("[status]", statusWindow, NULL);
1226
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2676 g_hash_table_foreach(winbufhash, buffer_list, NULL);
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2677 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
2678 scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE);
9f7e6c22cd14 "buffer list" sets the new_msg flag
Mikael Berthe <mikael@lilotux.net>
parents: 1245
diff changeset
2679 update_roster = TRUE;
1226
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2680 }
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2681 #endif
2521efbf3b72 New (debug) subcommand, buffer list
Mikael Berthe <mikael@lilotux.net>
parents: 1225
diff changeset
2682
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
2683 // scr_set_chatmode()
261
259ed1de5bdc Fix spelling mistakes in comments
mikael@frmp8452
parents: 260
diff changeset
2684 // Public function to (un)set chatmode...
129
03be1cc94560 [/trunk] Changeset 142 by mikael
mikael
parents: 126
diff changeset
2685 inline void scr_set_chatmode(int enable)
03be1cc94560 [/trunk] Changeset 142 by mikael
mikael
parents: 126
diff changeset
2686 {
03be1cc94560 [/trunk] Changeset 142 by mikael
mikael
parents: 126
diff changeset
2687 chatmode = enable;
721
9cf31c9b1dc4 Use room topic as a description in the chat status line
Mikael Berthe <mikael@lilotux.net>
parents: 720
diff changeset
2688 scr_UpdateChatStatus(TRUE);
129
03be1cc94560 [/trunk] Changeset 142 by mikael
mikael
parents: 126
diff changeset
2689 }
03be1cc94560 [/trunk] Changeset 142 by mikael
mikael
parents: 126
diff changeset
2690
1129
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
2691 // scr_get_chatmode()
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
2692 // Public function to get chatmode state.
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
2693 inline int scr_get_chatmode(void)
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
2694 {
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
2695 return chatmode;
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
2696 }
1a109ebf3f24 Add option "events_ignore_active_window"
Mikael Berthe <mikael@lilotux.net>
parents: 1127
diff changeset
2697
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2698 // scr_get_multimode()
261
259ed1de5bdc Fix spelling mistakes in comments
mikael@frmp8452
parents: 260
diff changeset
2699 // Public function to get multimode status...
1059
875d2c9d399c Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1058
diff changeset
2700 inline int scr_get_multimode(void)
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2701 {
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2702 return multimode;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2703 }
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2704
654
d7fe7b88e4fc MUC: Set the new_message flag when joining a room
Mikael Berthe <mikael@lilotux.net>
parents: 652
diff changeset
2705 // 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
2706 // 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
2707 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
2708 {
891
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed()
Mikael Berthe <mikael@lilotux.net>
parents: 889
diff changeset
2709 const char *current_id;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2710 bool iscurrentlocked = FALSE;
667
86bc3295a4db Fix segfault in scr_setmsgflag_if_needed()
Mikael Berthe <mikael@lilotux.net>
parents: 658
diff changeset
2711
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
2712 if (!bjid)
849
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2713 return;
42c43a88d823 Status buffer management
Mikael Berthe <mikael@lilotux.net>
parents: 848
diff changeset
2714
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2715 if (current_buddy) {
891
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed()
Mikael Berthe <mikael@lilotux.net>
parents: 889
diff changeset
2716 if (special)
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed()
Mikael Berthe <mikael@lilotux.net>
parents: 889
diff changeset
2717 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
2718 else
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed()
Mikael Berthe <mikael@lilotux.net>
parents: 889
diff changeset
2719 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
2720 if (current_id) {
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed()
Mikael Berthe <mikael@lilotux.net>
parents: 889
diff changeset
2721 winbuf *win_entry = scr_SearchWindow(current_id, special);
888
578d2034e971 scr_setmsgflag_if_needed(): Add a check after scr_SearchWindow()
Mikael Berthe <mikael@lilotux.net>
parents: 884
diff changeset
2722 if (!win_entry) return;
1157
5c857f0f0ab8 Moved all variables related to hbuf to an extra struct, bufdata
Frank Zschockelt
parents: 1156
diff changeset
2723 iscurrentlocked = win_entry->bd->lock;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2724 }
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2725 } else {
891
78f4971578dd Add a "special" parameter to scr_setmsgflag_if_needed()
Mikael Berthe <mikael@lilotux.net>
parents: 889
diff changeset
2726 current_id = NULL;
873
ee39f6d94d43 Add /buffer {scroll_lock|scroll_unlock|toggle_scroll}
Mikael Berthe <mikael@lilotux.net>
parents: 866
diff changeset
2727 }
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
2728 if (!chatmode || !current_id || strcmp(bjid, current_id) || iscurrentlocked)
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
2729 roster_msg_setflag(bjid, special, TRUE);
654
d7fe7b88e4fc MUC: Set the new_message flag when joining a room
Mikael Berthe <mikael@lilotux.net>
parents: 652
diff changeset
2730 }
d7fe7b88e4fc MUC: Set the new_message flag when joining a room
Mikael Berthe <mikael@lilotux.net>
parents: 652
diff changeset
2731
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2732 // scr_set_multimode()
261
259ed1de5bdc Fix spelling mistakes in comments
mikael@frmp8452
parents: 260
diff changeset
2733 // Public function to (un)set multimode...
260
33e1a05864a6 Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents: 252
diff changeset
2734 // Convention:
33e1a05864a6 Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents: 252
diff changeset
2735 // 0 = disabled / 1 = multimode / 2 = multimode verbatim (commands disabled)
807
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2736 inline void scr_set_multimode(int enable, char *subject)
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2737 {
807
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2738 g_free(multiline);
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2739 multiline = NULL;
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2740
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2741 g_free(multimode_subj);
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2742 if (enable && subject)
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2743 multimode_subj = g_strdup(subject);
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2744 else
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2745 multimode_subj = NULL;
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2746
260
33e1a05864a6 Add "verbatim multi-line" mode, with commands disabled
mikael@frmp8452
parents: 252
diff changeset
2747 multimode = enable;
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2748 }
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2749
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2750 // scr_get_multiline()
261
259ed1de5bdc Fix spelling mistakes in comments
mikael@frmp8452
parents: 260
diff changeset
2751 // Public function to get the current multi-line.
807
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2752 inline const char *scr_get_multiline(void)
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2753 {
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2754 if (multimode && multiline)
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2755 return multiline;
807
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2756 return NULL;
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2757 }
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2758
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2759 // scr_get_multimode_subj()
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2760 // Public function to get the multi-line subject, if any.
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2761 inline const char *scr_get_multimode_subj(void)
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2762 {
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2763 if (multimode)
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2764 return multimode_subj;
f6cda389db48 Allow messages with a subject (/msay)
Mikael Berthe <mikael@lilotux.net>
parents: 806
diff changeset
2765 return NULL;
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2766 }
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2767
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2768 // scr_append_multiline(line)
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2769 // Public function to append a line to the current multi-line message.
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2770 // Skip empty leading lines.
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2771 void scr_append_multiline(const char *line)
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2772 {
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2773 static int num;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2774
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2775 if (!multimode) {
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
2776 scr_LogPrint(LPRINT_NORMAL, "Error: Not in multi-line message mode!");
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2777 return;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2778 }
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2779 if (multiline) {
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2780 int len = strlen(multiline)+strlen(line)+2;
252
cb7f944741e4 [/trunk] Changeset 265 by mikael
mikael
parents: 238
diff changeset
2781 if (len >= HBB_BLOCKSIZE - 1) {
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2782 // We don't handle single messages with size > HBB_BLOCKSIZE
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2783 // (see hbuf)
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
2784 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
2785 "this line has not been added.");
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
2786 scr_LogPrint(LPRINT_NORMAL, "Please send this part now...");
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2787 return;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2788 }
276
627925d885de Limit the number of lines in multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents: 271
diff changeset
2789 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
2790 // 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
2791 // (It should be < 1000 yet)
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
2792 scr_LogPrint(LPRINT_NORMAL, "Your message has too many lines, "
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
2793 "this one has not been added.");
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
2794 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
2795 return;
627925d885de Limit the number of lines in multi-line messages
Mikael Berthe <mikael@lilotux.net>
parents: 271
diff changeset
2796 }
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2797 multiline = g_renew(char, multiline, len);
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2798 strcat(multiline, "\n");
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2799 strcat(multiline, line);
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2800 num++;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2801 } else {
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2802 // First message line (we skip leading empty lines)
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2803 num = 0;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2804 if (line[0]) {
419
2f9852610cf4 Small code review
Mikael Berthe <mikael@lilotux.net>
parents: 412
diff changeset
2805 multiline = g_strdup(line);
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2806 num++;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2807 } else
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2808 return;
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2809 }
772
464be13343a9 Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents: 771
diff changeset
2810 scr_LogPrint(LPRINT_NORMAL|LPRINT_NOTUTF8,
464be13343a9 Store most data in UTF-8 internally
Mikael Berthe <mikael@lilotux.net>
parents: 771
diff changeset
2811 "Multi-line mode: line #%d added [%.25s...", num, line);
238
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2812 }
8e30b2bb380e [/trunk] Changeset 251 by mikael
mikael
parents: 236
diff changeset
2813
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2814 // scr_cmdhisto_addline()
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2815 // Add a line to the inputLine history
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2816 inline void scr_cmdhisto_addline(char *line)
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2817 {
1127
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2818 int max_histo_lines;
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2819
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2820 if (!line || !*line)
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2821 return;
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2822
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2823 max_histo_lines = settings_opt_get_int("cmdhistory_lines");
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2824
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2825 if (max_histo_lines < 0)
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2826 max_histo_lines = 1;
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2827
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2828 if (max_histo_lines)
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2829 while (cmdhisto_nblines >= (guint)max_histo_lines) {
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2830 if (cmdhisto_cur && cmdhisto_cur == cmdhisto)
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2831 break;
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2832 g_free(cmdhisto->data);
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2833 cmdhisto = g_list_delete_link(cmdhisto, cmdhisto);
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2834 cmdhisto_nblines--;
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2835 }
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2836
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2837 cmdhisto = g_list_append(cmdhisto, g_strdup(line));
1127
fddf2fef7b83 Add option "cmdhistory_lines"
Mikael Berthe <mikael@lilotux.net>
parents: 1122
diff changeset
2838 cmdhisto_nblines++;
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2839 }
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2840
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2841 // scr_cmdhisto_prev()
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2842 // 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
2843 // Returns NULL if none found
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
2844 static const char *scr_cmdhisto_prev(char *mask, guint len)
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2845 {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2846 GList *hl;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2847 if (!cmdhisto_cur) {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2848 hl = g_list_last(cmdhisto);
174
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
2849 if (hl) { // backup current line
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
2850 strncpy(cmdhisto_backup, mask, INPUTLINE_LENGTH);
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
2851 }
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2852 } else {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2853 hl = g_list_previous(cmdhisto_cur);
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2854 }
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2855 while (hl) {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2856 if (!strncmp((char*)hl->data, mask, len)) {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2857 // Found a match
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2858 cmdhisto_cur = hl;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2859 return (const char*)hl->data;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2860 }
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2861 hl = g_list_previous(hl);
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2862 }
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2863 return NULL;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2864 }
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2865
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2866 // scr_cmdhisto_next()
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2867 // 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
2868 // Returns NULL if none found
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
2869 static const char *scr_cmdhisto_next(char *mask, guint len)
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2870 {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2871 GList *hl;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2872 if (!cmdhisto_cur) return NULL;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2873 hl = cmdhisto_cur;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2874 while ((hl = g_list_next(hl)) != NULL)
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2875 if (!strncmp((char*)hl->data, mask, len)) {
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2876 // Found a match
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2877 cmdhisto_cur = hl;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2878 return (const char*)hl->data;
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2879 }
175
7b7dd6d69f58 [/trunk] Changeset 187 by mikael
mikael
parents: 174
diff changeset
2880 // If the "backuped" line matches, we'll use it
7b7dd6d69f58 [/trunk] Changeset 187 by mikael
mikael
parents: 174
diff changeset
2881 if (strncmp(cmdhisto_backup, mask, len)) return NULL; // No match
174
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
2882 cmdhisto_cur = NULL;
6354625e8fb2 [/trunk] Changeset 186 by mikael
mikael
parents: 173
diff changeset
2883 return cmdhisto_backup;
173
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2884 }
09e24917059d [/trunk] Changeset 185 by mikael
mikael
parents: 168
diff changeset
2885
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2886 // readline_transpose_chars()
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2887 // Drag the character before point forward over the character at
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2888 // point, moving point forward as well. If point is at the end of
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2889 // the line, then this transposes the two characters before point.
1059
875d2c9d399c Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1058
diff changeset
2890 void readline_transpose_chars(void)
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2891 {
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
2892 char *c1, *c2;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
2893 unsigned a, b;
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2894
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2895 if (ptr_inputline == inputLine) return;
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2896
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2897 if (!*ptr_inputline) { // We're at EOL
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2898 // 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
2899 if (ptr_inputline == prev_char(ptr_inputline, inputLine)) return;
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2900 // Transpose the two previous characters
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
2901 c2 = prev_char(ptr_inputline, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
2902 c1 = prev_char(c2, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
2903 a = get_char(c1);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
2904 b = get_char(c2);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
2905 put_char(put_char(c1, b), a);
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2906 } else {
196
58eb8ad9ef74 [/trunk] Changeset 208 by mikael
mikael
parents: 195
diff changeset
2907 // 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
2908 c2 = ptr_inputline;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
2909 c1 = prev_char(c2, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
2910 a = get_char(c1);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
2911 b = get_char(c2);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
2912 put_char(put_char(c1, b), a);
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2913 check_offset(1);
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2914 }
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2915 }
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2916
1171
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2917 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
2918 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2919 char *c, *old = ptr_inputline;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2920 int spaceallowed = 1;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2921
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2922 if (! *ptr_inputline) return;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2923
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2924 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
2925 if (!iswalnum(get_char(c))) {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2926 if (iswblank(get_char(c))) {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2927 if (!spaceallowed) break;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2928 } else spaceallowed = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2929 } else spaceallowed = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2930 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2931
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2932 // Modify the line
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2933 for (;;) {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2934 *old = *c++;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2935 if (!*old++) break;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2936 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2937 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
2938
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2939 // readline_backward_kill_word()
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2940 // Kill the word before the cursor, in input line
1059
875d2c9d399c Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1058
diff changeset
2941 void readline_backward_kill_word(void)
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2942 {
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2943 char *c, *old = ptr_inputline;
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2944 int spaceallowed = 1;
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2945
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2946 if (ptr_inputline == inputLine) return;
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2947
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
2948 c = prev_char(ptr_inputline, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
2949 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
2950 if (!iswalnum(get_char(c))) {
933
ede9260be93d Input line: Improve word-related functions
Mikael Berthe <mikael@lilotux.net>
parents: 932
diff changeset
2951 if (iswblank(get_char(c))) {
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2952 if (!spaceallowed) break;
933
ede9260be93d Input line: Improve word-related functions
Mikael Berthe <mikael@lilotux.net>
parents: 932
diff changeset
2953 } else spaceallowed = 0;
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2954 } 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
2955 }
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2956
1280
8b621f980321 readline_backward_kill_word() makes a stop at the "command" character
Mikael Berthe <mikael@lilotux.net>
parents: 1279
diff changeset
2957 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
2958 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
2959 } 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
2960 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
2961 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
2962 }
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2963
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2964 // Modify the line
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2965 ptr_inputline = c;
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2966 for (;;) {
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2967 *c = *old++;
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2968 if (!*c++) break;
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2969 }
195
cdaa53d5ef70 [/trunk] Changeset 207 by mikael
mikael
parents: 194
diff changeset
2970 check_offset(-1);
194
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2971 }
a05d5c3876ec [/trunk] Changeset 206 by mikael
mikael
parents: 190
diff changeset
2972
759
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
2973 // 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
2974 // Move back to the start of the current or previous word
1059
875d2c9d399c Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1058
diff changeset
2975 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
2976 {
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
2977 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
2978
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
2979 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
2980
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
2981 if (iswalnum(get_char(ptr_inputline)) &&
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
2982 !iswalnum(get_char(prev_char(ptr_inputline, inputLine))))
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
2983 i--;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
2984
1333
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
2985 for ( ;
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
2986 ptr_inputline > inputLine;
e30a9d907105 Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents: 1314
diff changeset
2987 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
2988 if (!iswalnum(get_char(ptr_inputline))) {
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
2989 if (i) {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
2990 ptr_inputline = next_char(ptr_inputline);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
2991 break;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
2992 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
2993 } 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
2994 }
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
2995
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
2996 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
2997 }
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
2998
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
2999 // 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
3000 // Move forward to the end of the next word
1059
875d2c9d399c Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1058
diff changeset
3001 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
3002 {
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3003 int stopsymbol_allowed = 1;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3004
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3005 while (*ptr_inputline) {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3006 if (!iswalnum(get_char(ptr_inputline))) {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3007 if (!stopsymbol_allowed) break;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3008 } else stopsymbol_allowed = 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3009 ptr_inputline = next_char(ptr_inputline);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3010 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3011
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3012 check_offset(1);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3013 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3014
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3015 void readline_updowncase_word(int upcase)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3016 {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3017 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
3018
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3019 while (*ptr_inputline) {
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3020 if (!iswalnum(get_char(ptr_inputline))) {
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3021 if (!stopsymbol_allowed) break;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3022 } else {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3023 stopsymbol_allowed = 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3024 if (upcase)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3025 *ptr_inputline = towupper(get_char(ptr_inputline));
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3026 else
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3027 *ptr_inputline = towlower(get_char(ptr_inputline));
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3028 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3029 ptr_inputline = next_char(ptr_inputline);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3030 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3031
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3032 check_offset(1);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3033 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3034
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3035 void readline_capitalize_word(void)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3036 {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3037 int stopsymbol_allowed = 1;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3038 int upcased = 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3039
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3040 while (*ptr_inputline) {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3041 if (!iswalnum(get_char(ptr_inputline))) {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3042 if (!stopsymbol_allowed) break;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3043 } else {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3044 stopsymbol_allowed = 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3045 if (!upcased) {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3046 *ptr_inputline = towupper(get_char(ptr_inputline));
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3047 upcased = 1;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3048 } else *ptr_inputline = towlower(get_char(ptr_inputline));
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3049 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3050 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
3051 }
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3052
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3053 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
3054 }
a681dc477c7f Add readline_backward_word and readline_forward_word (Ctrl-Left/Ctrl-Right)
Mikael Berthe <mikael@lilotux.net>
parents: 758
diff changeset
3055
1171
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3056 void readline_backward_char(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3057 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3058 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
3059
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3060 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
3061 check_offset(-1);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3062 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3063
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3064 void readline_forward_char(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3065 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3066 if (!*ptr_inputline) return;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3067
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3068 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
3069 check_offset(1);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3070 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3071
1177
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3072 // 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
3073 // Validate current command line.
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3074 // 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
3075 int readline_accept_line(int down_history)
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3076 {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3077 scr_CheckAutoAway(TRUE);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3078 if (process_line(inputLine))
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3079 return 255;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3080 // Add line to history
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3081 scr_cmdhisto_addline(inputLine);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3082 // Reset the line
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3083 ptr_inputline = inputLine;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3084 *ptr_inputline = 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3085 inputline_offset = 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3086
1177
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3087 if (down_history) {
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3088 // 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
3089 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
3090 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
3091 // Reset backup history line
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3092 cmdhisto_backup[0] = 0;
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3093 } else {
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3094 // Reset history line pointer
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3095 cmdhisto_cur = NULL;
10733d7de004 Refactor readline_accept_line() and readline_accept_line_down_hist()
Mikael Berthe <mikael@lilotux.net>
parents: 1176
diff changeset
3096 }
1172
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3097 return 0;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3098 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3099
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3100 void readline_cancel_completion(void)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3101 {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3102 scr_cancel_current_completion();
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3103 scr_end_current_completion();
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3104 check_offset(-1);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3105 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3106
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3107 void readline_do_completion(void)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3108 {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3109 int i, n;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3110
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3111 if (scr_get_multimode() != 2) {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3112 // Not in verbatim multi-line mode
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3113 scr_handle_tab();
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3114 } else {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3115 // Verbatim multi-line mode: expand tab
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3116 char tabstr[9];
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3117 n = 8 - (ptr_inputline - inputLine) % 8;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3118 for (i = 0; i < n; i++)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3119 tabstr[i] = ' ';
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3120 tabstr[i] = '\0';
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3121 scr_insert_text(tabstr);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3122 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3123 check_offset(0);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3124 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3125
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3126 void readline_refresh_screen(void)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3127 {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3128 scr_CheckAutoAway(TRUE);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3129 ParseColors();
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3130 scr_Resize();
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3131 redrawwin(stdscr);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3132 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3133
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3134 void readline_disable_chat_mode(void)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3135 {
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3136 scr_CheckAutoAway(TRUE);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3137 currentWindow = NULL;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3138 chatmode = FALSE;
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3139 if (current_buddy)
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3140 buddy_setflags(BUDDATA(current_buddy), ROSTER_FLAG_LOCK, FALSE);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3141 scr_RosterVisibility(1);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3142 scr_UpdateChatStatus(FALSE);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3143 top_panel(chatPanel);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3144 top_panel(inputPanel);
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3145 update_panels();
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3146 }
334ae9f498f1 Add some more iline functions (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1171
diff changeset
3147
1190
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3148 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
3149 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3150 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
3151 if (l) strcpy(inputLine, l);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3152 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3153
1190
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3154 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
3155 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3156 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
3157 if (l) strcpy(inputLine, l);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3158 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3159
1190
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3160 void readline_hist_prev(void)
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3161 {
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3162 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
3163 if (l) {
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3164 strcpy(inputLine, l);
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3165 // Set the pointer at the EOL.
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3166 // 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
3167 readline_iline_start();
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3168 readline_iline_end();
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3169 }
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3170 }
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3171
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3172 void readline_hist_next(void)
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3173 {
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3174 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
3175 if (l) {
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3176 strcpy(inputLine, l);
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3177 // Set the pointer at the EOL.
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3178 // 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
3179 readline_iline_start();
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3180 readline_iline_end();
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3181 }
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3182 }
be06bbe7e449 Add readline_hist_beginning_search_bwd/fwd functions
Mikael Berthe <mikael@lilotux.net>
parents: 1187
diff changeset
3183
1171
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3184 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
3185 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3186 char *src, *c;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3187
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3188 if (ptr_inputline == (char*)&inputLine)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3189 return;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3190
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3191 src = ptr_inputline;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3192 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
3193 ptr_inputline = c;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3194 for ( ; *src ; )
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3195 *c++ = *src++;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3196 *c = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3197 check_offset(-1);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3198 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3199
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3200 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
3201 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3202 if (!*ptr_inputline)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3203 return;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3204
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3205 strcpy(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
3206 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3207
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3208 void readline_iline_start(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3209 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3210 ptr_inputline = inputLine;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3211 inputline_offset = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3212 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3213
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3214 void readline_iline_end(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3215 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3216 for (; *ptr_inputline; ptr_inputline++) ;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3217 check_offset(1);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3218 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3219
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3220 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
3221 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3222 strcpy(inputLine, ptr_inputline);
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3223 ptr_inputline = inputLine;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3224 inputline_offset = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3225 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3226
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3227 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
3228 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3229 *ptr_inputline = 0;
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3230 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3231
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3232 void readline_send_multiline(void)
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3233 {
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3234 // Validate current multi-line
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3235 if (scr_get_multimode())
1187
16abe7ec3056 Fix a conflict between verbatim multiline mode and the key binding system
Mikael Berthe <mikael@lilotux.net>
parents: 1186
diff changeset
3236 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
3237 }
03a38b7ad2e0 Add a collection of commands for key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1170
diff changeset
3238
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3239 // which_row()
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3240 // 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
3241 // -2 -> normal text
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3242 // -1 -> room: nickname completion
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3243 // 0 -> command
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3244 // 1 -> parameter 1 (etc.)
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3245 // 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
3246 static int which_row(const char **p_row)
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3247 {
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3248 int row = -1;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3249 char *p;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3250 int quote = FALSE;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3251
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3252 // Not a command?
967
303408ef5e5d Configurable command character
Alexis Hildebrandt
parents: 966
diff changeset
3253 if ((ptr_inputline == inputLine) || (inputLine[0] != COMMAND_CHAR)) {
503
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3254 if (!current_buddy) return -2;
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3255 if (buddy_gettype(BUDDATA(current_buddy)) == ROSTER_TYPE_ROOM) {
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3256 *p_row = inputLine;
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3257 return -1;
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3258 }
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3259 return -2;
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3260 }
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3261
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3262 // This is a command
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3263 row = 0;
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3264 for (p = inputLine ; p < ptr_inputline ; p = next_char(p)) {
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3265 if (quote) {
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3266 if (*p == '"' && *(p-1) != '\\')
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3267 quote = FALSE;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3268 continue;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3269 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3270 if (*p == '"' && *(p-1) != '\\') {
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3271 quote = TRUE;
121
94b251102069 [/trunk] Changeset 134 by mikael
mikael
parents: 120
diff changeset
3272 } else if (*p == ' ') {
94b251102069 [/trunk] Changeset 134 by mikael
mikael
parents: 120
diff changeset
3273 if (*(p-1) != ' ')
94b251102069 [/trunk] Changeset 134 by mikael
mikael
parents: 120
diff changeset
3274 row++;
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3275 *p_row = p+1;
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3276 }
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3277 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3278 return row;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3279 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3280
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
3281 // scr_insert_text()
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
3282 // Insert the given text at the current cursor position.
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
3283 // 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
3284 // after, the caller should do that.
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3285 static void scr_insert_text(const char *text)
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3286 {
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3287 char tmpLine[INPUTLINE_LENGTH+1];
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3288 int len = strlen(text);
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3289 // Check the line isn't too long
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3290 if (strlen(inputLine) + len >= INPUTLINE_LENGTH) {
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
3291 scr_LogPrint(LPRINT_LOGNORM, "Cannot insert text, line too long.");
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3292 return;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3293 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3294
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3295 strcpy(tmpLine, ptr_inputline);
419
2f9852610cf4 Small code review
Mikael Berthe <mikael@lilotux.net>
parents: 412
diff changeset
3296 strcpy(ptr_inputline, text);
2f9852610cf4 Small code review
Mikael Berthe <mikael@lilotux.net>
parents: 412
diff changeset
3297 ptr_inputline += len;
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3298 strcpy(ptr_inputline, tmpLine);
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3299 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3300
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3301 static void scr_cancel_current_completion(void);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3302
143
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
3303 // scr_handle_tab()
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
3304 // Function called when tab is pressed.
300bb88f631f [/trunk] Changeset 155 by mikael
mikael
parents: 142
diff changeset
3305 // Initiate or continue a completion...
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3306 static void scr_handle_tab(void)
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3307 {
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3308 int nrow;
503
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3309 const char *row;
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3310 const char *cchar;
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3311 guint compl_categ;
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3312
740
1877838d3c27 Kill two gcc warnings
Mikael Berthe <mikael@lilotux.net>
parents: 739
diff changeset
3313 row = inputLine; // (Kills a GCC warning)
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3314 nrow = which_row(&row);
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3315
503
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3316 // a) No completion if no leading slash ('cause not a command),
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3317 // unless this is a room (then, it is a nickname completion)
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3318 // 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
3319 if ((nrow == -2) || (nrow == 3 && !completion_started) || nrow > 3)
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3320 return;
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3321
503
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3322 if (nrow == 0) { // Command completion
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3323 row = next_char(inputLine);
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3324 compl_categ = COMPL_CMD;
503
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3325 } else if (nrow == -1) { // Nickname completion
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3326 compl_categ = COMPL_RESOURCE;
ddec224c2318 MUC: nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 499
diff changeset
3327 } else { // Other completion, depending on the command
285
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3328 int alias = FALSE;
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3329 cmd *com;
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3330 char *xpline = expandalias(inputLine);
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3331 com = cmd_get(xpline);
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3332 if (xpline != inputLine) {
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3333 // This is an alias, so we can't complete rows > 0
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3334 alias = TRUE;
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3335 g_free(xpline);
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3336 }
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3337 if ((!com && (!alias || !completion_started)) || !row) {
374
bd5638c21834 Improve logging system (traces)
Mikael Berthe <mikael@lilotux.net>
parents: 373
diff changeset
3338 scr_LogPrint(LPRINT_NORMAL, "I cannot complete that...");
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3339 return;
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3340 }
285
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3341 if (!alias)
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3342 compl_categ = com->completion_flags[nrow-1];
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3343 else
edc263a5d350 Add /alias command
Mikael Berthe <mikael@lilotux.net>
parents: 281
diff changeset
3344 compl_categ = 0;
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3345 }
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3346
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3347 if (!completion_started) {
1076
b9698c89f46d Fix memory leak in scr_handle_tab()
Mikael Berthe <mikael@lilotux.net>
parents: 1075
diff changeset
3348 guint dynlist;
b9698c89f46d Fix memory leak in scr_handle_tab()
Mikael Berthe <mikael@lilotux.net>
parents: 1075
diff changeset
3349 GSList *list = compl_get_category_list(compl_categ, &dynlist);
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3350 if (list) {
1228
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3351 guint n;
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3352 char *prefix = g_strndup(row, ptr_inputline-row);
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3353 // Init completion
1228
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3354 n = new_completion(prefix, list);
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3355 g_free(prefix);
1228
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3356 if (n == 0 && nrow == -1) {
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3357 // 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
3358 // 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
3359 row = prev_char(ptr_inputline, inputLine);
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3360 while (row >= inputLine) {
1239
eb9fc5d6d085 MUC: Nickname completion starts from any non-space character
Mikael Berthe <mikael@lilotux.net>
parents: 1229
diff changeset
3361 if (iswspace(get_char(row)) || get_char(row) == '(') {
1228
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3362 row = next_char((char*)row);
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3363 break;
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3364 }
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3365 if (row == inputLine)
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3366 break;
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3367 row = prev_char((char*)row, inputLine);
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3368 }
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3369 // There's no need to try again if row == inputLine
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3370 if (row > inputLine) {
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3371 prefix = g_strndup(row, ptr_inputline-row);
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3372 new_completion(prefix, list);
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3373 g_free(prefix);
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3374 }
9a68fe4515dc Improve MUC nickname completion
Mikael Berthe <mikael@lilotux.net>
parents: 1227
diff changeset
3375 }
1076
b9698c89f46d Fix memory leak in scr_handle_tab()
Mikael Berthe <mikael@lilotux.net>
parents: 1075
diff changeset
3376 // 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
3377 if (dynlist) {
b9698c89f46d Fix memory leak in scr_handle_tab()
Mikael Berthe <mikael@lilotux.net>
parents: 1075
diff changeset
3378 GSList *slp;
b9698c89f46d Fix memory leak in scr_handle_tab()
Mikael Berthe <mikael@lilotux.net>
parents: 1075
diff changeset
3379 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
3380 g_free(slp->data);
b9698c89f46d Fix memory leak in scr_handle_tab()
Mikael Berthe <mikael@lilotux.net>
parents: 1075
diff changeset
3381 g_slist_free(list);
b9698c89f46d Fix memory leak in scr_handle_tab()
Mikael Berthe <mikael@lilotux.net>
parents: 1075
diff changeset
3382 }
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3383 // Now complete
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3384 cchar = complete();
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3385 if (cchar)
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3386 scr_insert_text(cchar);
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3387 completion_started = TRUE;
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3388 }
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3389 } else { // Completion already initialized
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3390 scr_cancel_current_completion();
103
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3391 // Now complete again
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3392 cchar = complete();
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3393 if (cchar)
93dcc4e15d4a [/trunk] Changeset 117 by mikael
mikael
parents: 102
diff changeset
3394 scr_insert_text(cchar);
102
2b4cc6bc5bf2 [/trunk] Changeset 116 by mikael
mikael
parents: 101
diff changeset
3395 }
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3396 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3397
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3398 static void scr_cancel_current_completion(void)
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3399 {
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3400 char *c;
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3401 char *src = ptr_inputline;
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3402 guint back = cancel_completion();
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3403 guint i;
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3404 // Remove $back chars
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3405 for (i = 0; i < back; i++)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3406 ptr_inputline = prev_char(ptr_inputline, inputLine);
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3407 c = ptr_inputline;
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3408 for ( ; *src ; )
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3409 *c++ = *src++;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3410 *c = 0;
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3411 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3412
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3413 static void scr_end_current_completion(void)
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3414 {
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3415 done_completion();
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3416 completion_started = FALSE;
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3417 }
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3418
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3419 // check_offset(int direction)
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3420 // Check inputline_offset value, and make sure the cursor is inside the
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3421 // screen.
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3422 static inline void check_offset(int direction)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3423 {
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3424 int i;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3425 char *c = &inputLine[inputline_offset];
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3426 // Left side
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3427 if (inputline_offset && direction <= 0) {
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3428 while (ptr_inputline <= c) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3429 for (i = 0; i < 5; i++)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3430 c = prev_char(c, inputLine);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3431 if (c == inputLine)
828
319fc55b9a2b Fix a bug in check_offset()
Mikael Berthe <mikael@lilotux.net>
parents: 827
diff changeset
3432 break;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3433 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3434 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3435 // Right side
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3436 if (direction >= 0) {
932
fc6aaa223650 Fix a few problems with non-UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents: 931
diff changeset
3437 int delta = get_char_width(c);
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3438 while (ptr_inputline > c) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3439 c = next_char(c);
932
fc6aaa223650 Fix a few problems with non-UTF-8 locales
Mikael Berthe <mikael@lilotux.net>
parents: 931
diff changeset
3440 delta += get_char_width(c);
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3441 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3442 c = &inputLine[inputline_offset];
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3443 while (delta >= maxX) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3444 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
3445 delta -= get_char_width(c);
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3446 c = next_char(c);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3447 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3448 }
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3449 }
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3450 inputline_offset = c - inputLine;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3451 }
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3452
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3453 #ifdef HAVE_ASPELL_H
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3454 // prints inputLine with underlined words when misspelled
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3455 static inline void print_checked_line(void)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3456 {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3457 char *wprint_char_fmt = "%c";
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3458 int point;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3459 char *ptrCur = inputLine + inputline_offset;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3460
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3461 #ifdef UNICODE
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3462 // 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
3463 if (utf8_mode)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3464 wprint_char_fmt = "%lc";
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3465 #endif
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3466
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3467 wmove(inputWnd, 0, 0); // problem with backspace
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3468
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3469 while (*ptrCur) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3470 point = ptrCur - inputLine;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3471 if (maskLine[point])
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3472 wattrset(inputWnd, A_UNDERLINE);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3473 wprintw(inputWnd, wprint_char_fmt, get_char(ptrCur));
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3474 wattrset(inputWnd, A_NORMAL);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3475 ptrCur = next_char(ptrCur);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3476 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3477 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3478 #endif
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3479
336
eb994ee40029 Make some functions static
Mikael Berthe <mikael@lilotux.net>
parents: 332
diff changeset
3480 static inline void refresh_inputline(void)
312
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3481 {
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3482 #ifdef HAVE_ASPELL_H
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3483 if (settings_opt_get_int("aspell_enable")) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3484 memset(maskLine, 0, INPUTLINE_LENGTH+1);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3485 spellcheck(inputLine, maskLine);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3486 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3487 print_checked_line();
312
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3488 wclrtoeol(inputWnd);
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3489 if (*ptr_inputline) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3490 // 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
3491 // so I know of no better way.
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3492 char c = *ptr_inputline;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3493 *ptr_inputline = 0;
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3494 print_checked_line();
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3495 *ptr_inputline = c;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3496 }
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3497 #else
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3498 mvwprintw(inputWnd, 0, 0, "%s", inputLine + inputline_offset);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3499 wclrtoeol(inputWnd);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3500 if (*ptr_inputline) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3501 // hack to set cursor pos. Characters can have different width,
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3502 // so I know of no better way.
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3503 char c = *ptr_inputline;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3504 *ptr_inputline = 0;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3505 mvwprintw(inputWnd, 0, 0, "%s", inputLine + inputline_offset);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3506 *ptr_inputline = c;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3507 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3508 #endif
312
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3509 }
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3510
389
6e895f397474 Ncurses changes + Ctrl-C does not send a signal anylore
Mikael Berthe <mikael@lilotux.net>
parents: 388
diff changeset
3511 void scr_handle_CtrlC(void)
312
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3512 {
365
ddb6593bedc9 Fix segfault when mcabber receives an INT signal (Ctrl-C) early
Mikael Berthe <mikael@lilotux.net>
parents: 364
diff changeset
3513 if (!Curses) return;
315
65aa05520556 First Ctrl-C now also leaves multi-line message mode
Mikael Berthe <mikael@lilotux.net>
parents: 314
diff changeset
3514 // 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
3515 process_command(mkcmdstr("msay abort"), TRUE);
312
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3516 // Same as Ctrl-g, now
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3517 scr_cancel_current_completion();
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3518 scr_end_current_completion();
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3519 check_offset(-1);
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3520 refresh_inputline();
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3521 }
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3522
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3523 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
3524 {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3525 keyseq *ks;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3526
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3527 // Let's make sure the length is correct
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3528 if (strlen(seqstr) > MAX_KEYSEQ_LENGTH) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3529 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
3530 return;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3531 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3532
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3533 ks = g_new0(keyseq, 1);
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3534 ks->seqstr = g_strdup(seqstr);
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3535 ks->mkeycode = mkeycode;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3536 ks->value = value;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3537 keyseqlist = g_slist_append(keyseqlist, ks);
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3538 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3539
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3540 // match_keyseq(iseq, &ret)
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3541 // Check if "iseq" is a known key escape sequence.
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3542 // Return value:
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3543 // -1 if "seq" matches no known sequence
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3544 // 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
3545 // >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
3546 // and *ret is set to the matching keyseq structure.
952
527d6f234924 Small code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 949
diff changeset
3547 static inline gint match_keyseq(int *iseq, keyseq **ret)
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
3548 {
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3549 GSList *ksl;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3550 keyseq *ksp;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3551 char *p, c;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3552 int *i;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3553 int needmore = FALSE;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3554
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3555 for (ksl = keyseqlist; ksl; ksl = g_slist_next(ksl)) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3556 ksp = ksl->data;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3557 p = ksp->seqstr;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3558 i = iseq;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3559 while (1) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3560 c = (unsigned char)*i;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3561 if (!*p && !c) { // Match
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3562 (*ret) = ksp;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3563 return ksp->mkeycode;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3564 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3565 if (!c) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3566 // iseq is too short
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3567 needmore = TRUE;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3568 break;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3569 } else if (!*p || c != *p) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3570 // This isn't a match
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3571 break;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3572 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3573 p++; i++;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3574 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3575 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3576
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3577 if (needmore)
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3578 return 0;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3579 return -1;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3580 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3581
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3582 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
3583 {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3584 int *strp = iseq;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3585 unsigned c = *strp++;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3586 unsigned mask = 0x80;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3587 int len = -1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3588 while (c & mask) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3589 mask >>= 1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3590 len++;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3591 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3592 if (len <= 0 || len > 4)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3593 return -1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3594 c &= mask - 1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3595 while ((*strp & 0xc0) == 0x80) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3596 if (len-- <= 0) // can't happen
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3597 return -1;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3598 c = (c << 6) | (*strp++ & 0x3f);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3599 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3600 if (len)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3601 return 0;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3602 return c;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3603 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3604
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3605 void scr_Getch(keycode *kcode)
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3606 {
769
15eefed5f1de Kill a gcc warning
Mikael Berthe <mikael@lilotux.net>
parents: 766
diff changeset
3607 keyseq *mks = NULL;
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3608 int ks[MAX_KEYSEQ_LENGTH+1];
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3609 int i;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3610
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3611 memset(kcode, 0, sizeof(keycode));
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3612 memset(ks, 0, sizeof(ks));
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3613
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3614 kcode->value = wgetch(inputWnd);
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3615 if (utf8_mode) {
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
3616 bool ismeta = (kcode->value == 27);
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
3617
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
3618 if (ismeta)
944
aec71ebf98fa Fix Meta + UTF-8 character
Mikael Berthe <mikael@lilotux.net>
parents: 940
diff changeset
3619 ks[0] = wgetch(inputWnd);
aec71ebf98fa Fix Meta + UTF-8 character
Mikael Berthe <mikael@lilotux.net>
parents: 940
diff changeset
3620 else
aec71ebf98fa Fix Meta + UTF-8 character
Mikael Berthe <mikael@lilotux.net>
parents: 940
diff changeset
3621 ks[0] = kcode->value;
aec71ebf98fa Fix Meta + UTF-8 character
Mikael Berthe <mikael@lilotux.net>
parents: 940
diff changeset
3622
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3623 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
3624 int match = match_utf8_keyseq(ks);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3625 if (match == -1)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3626 break;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3627 if (match > 0) {
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3628 kcode->value = match;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3629 kcode->utf8 = 1;
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
3630 if (ismeta)
944
aec71ebf98fa Fix Meta + UTF-8 character
Mikael Berthe <mikael@lilotux.net>
parents: 940
diff changeset
3631 kcode->mcode = MKEY_META;
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3632 return;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3633 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3634 ks[i + 1] = wgetch(inputWnd);
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3635 if (ks[i + 1] == ERR)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3636 break;
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3637 }
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3638 while (i > 0)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3639 ungetch(ks[i--]);
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
3640 if (ismeta)
944
aec71ebf98fa Fix Meta + UTF-8 character
Mikael Berthe <mikael@lilotux.net>
parents: 940
diff changeset
3641 ungetch(ks[0]);
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3642 memset(ks, 0, sizeof(ks));
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3643 }
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3644 if (kcode->value != 27)
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3645 return;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3646
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3647 // Check for escape key sequence
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3648 for (i=0; i < MAX_KEYSEQ_LENGTH; i++) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3649 int match;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3650 ks[i] = wgetch(inputWnd);
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3651 if (ks[i] == ERR) break;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3652 match = match_keyseq(ks, &mks);
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3653 if (match == -1) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3654 // 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
3655 i++;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3656 break;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3657 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3658 if (match > 0) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3659 // We have a matching sequence
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3660 kcode->mcode = mks->mkeycode;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3661 kcode->value = mks->value;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3662 return;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3663 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3664 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3665
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3666 // No match. Let's return a meta-key.
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3667 if (i > 0) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3668 kcode->mcode = MKEY_META;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3669 kcode->value = ks[0];
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3670 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3671 if (i > 1) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3672 // 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
3673 while (i-- > 1)
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3674 ungetch(ks[i]);
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3675 }
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3676 return;
373
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
3677 }
af2f8ddf6a1b Move (reorganize) functions
Mikael Berthe <mikael@lilotux.net>
parents: 370
diff changeset
3678
939
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
3679 inline void scr_DoUpdate(void)
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
3680 {
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
3681 doupdate();
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
3682 }
12fa2ae6445d Get rid of "busy-waiting" (Christof Meerwald)
Mikael Berthe <mikael@lilotux.net>
parents: 936
diff changeset
3683
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3684 static int bindcommand(keycode kcode)
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3685 {
945
17ef145f3326 Display and use UTF-8 key codes
Mikael Berthe <mikael@lilotux.net>
parents: 944
diff changeset
3686 gchar asciikey[16], asciicode[16];
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3687 const gchar *boundcmd;
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3688
945
17ef145f3326 Display and use UTF-8 key codes
Mikael Berthe <mikael@lilotux.net>
parents: 944
diff changeset
3689 if (kcode.utf8)
17ef145f3326 Display and use UTF-8 key codes
Mikael Berthe <mikael@lilotux.net>
parents: 944
diff changeset
3690 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
3691 else
17ef145f3326 Display and use UTF-8 key codes
Mikael Berthe <mikael@lilotux.net>
parents: 944
diff changeset
3692 g_snprintf(asciicode, 15, "%d", kcode.value);
17ef145f3326 Display and use UTF-8 key codes
Mikael Berthe <mikael@lilotux.net>
parents: 944
diff changeset
3693
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3694 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
3695 g_snprintf(asciikey, 15, "%s", asciicode);
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3696 else if (kcode.mcode == MKEY_META)
945
17ef145f3326 Display and use UTF-8 key codes
Mikael Berthe <mikael@lilotux.net>
parents: 944
diff changeset
3697 g_snprintf(asciikey, 15, "M%s", asciicode);
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3698 else
949
e3c49b2f8143 Fix bindings of special keys (MK*)
Mikael Berthe <mikael@lilotux.net>
parents: 945
diff changeset
3699 g_snprintf(asciikey, 15, "MK%d", kcode.mcode);
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3700
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3701 boundcmd = settings_get(SETTINGS_TYPE_BINDING, asciikey);
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3702
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3703 if (boundcmd) {
1357
7bbfb0073f88 Fix an UTF-8 problem in new hook_execute_internal() function
Mikael Berthe <mikael@lilotux.net>
parents: 1355
diff changeset
3704 gchar *cmdline = from_utf8(boundcmd);
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3705 scr_CheckAutoAway(TRUE);
1187
16abe7ec3056 Fix a conflict between verbatim multiline mode and the key binding system
Mikael Berthe <mikael@lilotux.net>
parents: 1186
diff changeset
3706 if (process_command(cmdline, TRUE))
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3707 return 255; // Quit
1058
c0d44a9a99bc Code cleanup
Mikael Berthe <mikael@lilotux.net>
parents: 1056
diff changeset
3708 g_free(cmdline);
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3709 return 0;
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3710 }
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3711
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3712 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
3713 #ifndef UNICODE
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3714 if (utf8_mode)
930
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3715 scr_LogPrint(LPRINT_NORMAL,
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3716 "WARNING: Compiled without full UTF-8 support!");
a75f7a13df7b UTF-8 terminal support (Reimar Döffinger)
Mikael Berthe <mikael@lilotux.net>
parents: 929
diff changeset
3717 #endif
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3718 return -1;
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3719 }
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3720
44
c10f95f959d0 [/trunk] Changeset 60 by mikael
mikael
parents: 42
diff changeset
3721 // process_key(key)
c10f95f959d0 [/trunk] Changeset 60 by mikael
mikael
parents: 42
diff changeset
3722 // Handle the pressed key, in the command line (bottom).
1359
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents: 1357
diff changeset
3723 void process_key(keycode kcode)
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3724 {
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3725 int key = kcode.value;
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3726 int display_char = FALSE;
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3727
1381
40095d413da9 Fix compilation on OpenBSD
Mikael Berthe <mikael@lilotux.net>
parents: 1376
diff changeset
3728 lock_chatstate = FALSE;
990
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
3729
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3730 switch (kcode.mcode) {
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3731 case 0:
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3732 break;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3733 case MKEY_EQUIV:
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3734 key = kcode.value;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3735 break;
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3736 case MKEY_META:
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3737 default:
1359
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents: 1357
diff changeset
3738 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
3739 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
3740 return;
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents: 1357
diff changeset
3741 }
764
4e15322d315e Allow binding of meta keys
Mikael Berthe <mikael@lilotux.net>
parents: 763
diff changeset
3742 key = ERR; // Do not process any further
758
402b0e288433 Enable "meta" key
Mikael Berthe <mikael@lilotux.net>
parents: 740
diff changeset
3743 }
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3744
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3745 if (kcode.utf8) {
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3746 if (key != ERR && !kcode.mcode)
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3747 display_char = TRUE;
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3748 goto display;
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3749 }
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3750
758
402b0e288433 Enable "meta" key
Mikael Berthe <mikael@lilotux.net>
parents: 740
diff changeset
3751 switch (key) {
761
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3752 case 0:
4532a9fe0e8c Handle some keyboard escape sequences
Mikael Berthe <mikael@lilotux.net>
parents: 760
diff changeset
3753 case ERR:
758
402b0e288433 Enable "meta" key
Mikael Berthe <mikael@lilotux.net>
parents: 740
diff changeset
3754 break;
1173
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
3755 case 9: // Tab
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
3756 readline_do_completion();
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
3757 break;
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
3758 case 13: // Enter
1359
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents: 1357
diff changeset
3759 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
3760 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
3761 return;
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents: 1357
diff changeset
3762 }
1173
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
3763 break;
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
3764 case 3: // Ctrl-C
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
3765 scr_handle_CtrlC();
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
3766 break;
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
3767 case KEY_RESIZE:
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
3768 scr_Resize();
960f34ec22a2 Add init_bindings() for default key bindings (Lego12239)
Mikael Berthe <mikael@lilotux.net>
parents: 1172
diff changeset
3769 break;
499
baa812f04f24 Reorganise process_key()
Mikael Berthe <mikael@lilotux.net>
parents: 480
diff changeset
3770 default:
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3771 display_char = TRUE;
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3772 } // switch
263
1bcc3eec08f0 Add Ctrl-o: accept-line-and-down-history
mikael@frmp8452
parents: 261
diff changeset
3773
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3774 display:
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3775 if (display_char) {
1394
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
3776 guint printable;
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
3777
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
3778 if (kcode.utf8) {
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
3779 printable = iswprint(key);
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
3780 } else {
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
3781 #ifdef __CYGWIN__
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
3782 printable = (isprint(key) || (key >= 161 && key <= 255))
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
3783 && !is_speckey(key);
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
3784 #else
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
3785 printable = isprint(key) && !is_speckey(key);
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
3786 #endif
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
3787 }
bba74a50dedf Improve Cygwin support
Mikael Berthe <mikael@lilotux.net>
parents: 1390
diff changeset
3788 if (printable) {
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3789 char tmpLine[INPUTLINE_LENGTH+1];
499
baa812f04f24 Reorganise process_key()
Mikael Berthe <mikael@lilotux.net>
parents: 480
diff changeset
3790
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3791 // Check the line isn't too long
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3792 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
3793 return;
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3794
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3795 // Insert char
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3796 strcpy(tmpLine, ptr_inputline);
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3797 ptr_inputline = put_char(ptr_inputline, key);
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3798 strcpy(ptr_inputline, tmpLine);
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3799 check_offset(1);
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3800 } else {
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3801 // 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
3802 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
3803 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
3804 return;
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents: 1357
diff changeset
3805 }
931
1cd6d694ac3c Fix display of some UTF-8 chars
Mikael Berthe <mikael@lilotux.net>
parents: 930
diff changeset
3806 }
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3807 }
499
baa812f04f24 Reorganise process_key()
Mikael Berthe <mikael@lilotux.net>
parents: 480
diff changeset
3808
157
409ff07d9fe2 [/trunk] Changeset 169 by mikael
mikael
parents: 154
diff changeset
3809 if (completion_started && key != 9 && key != KEY_RESIZE)
98
f20831f7d349 [/trunk] Changeset 112 by mikael
mikael
parents: 95
diff changeset
3810 scr_end_current_completion();
312
f0b7ff2df7e8 Ctrl-C does not terminate mcabber
Mikael Berthe <mikael@lilotux.net>
parents: 307
diff changeset
3811 refresh_inputline();
990
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
3812
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
3813 if (!lock_chatstate) {
997
d0d0cd9e39c4 Cosmetics & comments
Mikael Berthe <mikael@lilotux.net>
parents: 996
diff changeset
3814 // Set chat state to composing (1) if the user is currently composing,
d0d0cd9e39c4 Cosmetics & comments
Mikael Berthe <mikael@lilotux.net>
parents: 996
diff changeset
3815 // 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
3816 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
3817 set_chatstate(0);
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
3818 else
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
3819 set_chatstate(1);
991
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
3820 if (chatstate)
ef10906691bb Chatstates: add composing timeout
Mikael Berthe <mikael@lilotux.net>
parents: 990
diff changeset
3821 time(&chatstate_timestamp);
990
35e7913affb7 Send events/chatstates notifications (JEP-22/JEP-85)
Mikael Berthe <mikael@lilotux.net>
parents: 987
diff changeset
3822 }
1359
7daf906fbcdc The command /quit can be used in bindings, hooks and sourced files
Mikael Berthe <mikael@lilotux.net>
parents: 1357
diff changeset
3823 return;
24
e88b15cbf2de [/trunk] Changeset 40 by mikael
mikael
parents:
diff changeset
3824 }
576
8b3db0b555a1 Add Vim modelines
Mikael Berthe <mikael@lilotux.net>
parents: 539
diff changeset
3825
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3826 #ifdef HAVE_ASPELL_H
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3827 // Aspell initialization
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3828 void spellcheck_init(void)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3829 {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3830 int aspell_enable = settings_opt_get_int("aspell_enable");
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3831 const char *aspell_lang = settings_opt_get("aspell_lang");
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3832 const char *aspell_encoding = settings_opt_get("aspell_encoding");
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3833 AspellCanHaveError *possible_err;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3834
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3835 if (!aspell_enable)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3836 return;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3837
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3838 if (spell_checker) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3839 delete_aspell_speller(spell_checker);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3840 delete_aspell_config(spell_config);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3841 spell_checker = NULL;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3842 spell_config = NULL;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3843 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3844
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3845 spell_config = new_aspell_config();
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3846 aspell_config_replace(spell_config, "encoding", aspell_encoding);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3847 aspell_config_replace(spell_config, "lang", aspell_lang);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3848 possible_err = new_aspell_speller(spell_config);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3849
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3850 if (aspell_error_number(possible_err) != 0) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3851 spell_checker = NULL;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3852 delete_aspell_config(spell_config);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3853 spell_config = NULL;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3854 } else {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3855 spell_checker = to_aspell_speller(possible_err);
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
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3859 // Deinitialization of Aspell spellchecker
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3860 void spellcheck_deinit(void)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3861 {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3862 if (spell_checker) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3863 delete_aspell_speller(spell_checker);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3864 spell_checker = NULL;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3865 }
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 if (spell_config) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3868 delete_aspell_config(spell_config);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3869 spell_config = NULL;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3870 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3871 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3872
1245
e6ddd19956eb Fix Aspell support on some systems
Mikael Berthe <mikael@lilotux.net>
parents: 1239
diff changeset
3873 #define aspell_isalpha(c) (utf8_mode ? iswalpha(get_char(c)) : isalpha(*c))
e6ddd19956eb Fix Aspell support on some systems
Mikael Berthe <mikael@lilotux.net>
parents: 1239
diff changeset
3874
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3875 // Spell checking function
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3876 static void spellcheck(char *line, char *checked)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3877 {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3878 const char *start, *line_start;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3879
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3880 if (inputLine[0] == 0 || inputLine[0] == COMMAND_CHAR)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3881 return;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3882
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3883 line_start = line;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3884
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3885 while (*line) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3886
1245
e6ddd19956eb Fix Aspell support on some systems
Mikael Berthe <mikael@lilotux.net>
parents: 1239
diff changeset
3887 if (!aspell_isalpha(line)) {
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3888 line = next_char(line);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3889 continue;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3890 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3891
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3892 if (!strncmp(line, "http://", 7)) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3893 line += 7; // : and / characters are 1 byte long in utf8, right?
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3894
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3895 while (!strchr(" \t\r\n", *line))
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3896 line = next_char(line); // i think line++ would be fine here?
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3897
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3898 continue;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3899 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3900
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3901 if (!strncmp(line, "ftp://", 6)) {
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3902 line += 6;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3903
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3904 while (!strchr(" \t\r\n", *line))
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3905 line = next_char(line);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3906
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3907 continue;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3908 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3909
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3910 start = line;
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3911
1245
e6ddd19956eb Fix Aspell support on some systems
Mikael Berthe <mikael@lilotux.net>
parents: 1239
diff changeset
3912 while (aspell_isalpha(line))
1179
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3913 line = next_char(line);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3914
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3915 if (spell_checker &&
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3916 aspell_speller_check(spell_checker, start, line - start) == 0)
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3917 memset(&checked[start - line_start], ASPELLBADCHAR, line - start);
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3918 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3919 }
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3920 #endif
0f7e0346d9cb Add aspell support
entragian <entragian@o2.pl>
parents: 1178
diff changeset
3921
580
fed6d1e4d7a9 Fix modelines
Mikael Berthe <mikael@lilotux.net>
parents: 576
diff changeset
3922 /* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */