ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.194 by root, Mon Feb 14 10:44:50 2005 UTC vs.
Revision 1.603 by root, Mon Jun 5 13:39:34 2023 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
53#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 56# include "keyboard.h"
55#endif 57#endif
56 58
57#include <csignal> 59#include <signal.h>
60
61#if LINUX_YIELD_HACK
62# include <time.h>
63#endif
58 64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
81 XK_Right, 0x2192, 84 XK_Right, 0x2192,
82 XK_KP_Right, 0x2192, 85 XK_KP_Right, 0x2192,
83 XK_Down, 0x2193, 86 XK_Down, 0x2193,
84 XK_KP_Down, 0x2193, 87 XK_KP_Down, 0x2193,
85 XK_Linefeed, 0x21b4, 88 XK_Linefeed, 0x21b4,
86 XK_Return, 0x21b5,
87 XK_KP_Enter, 0x21b5,
88 89
89 XK_Prior, 0x21de, 90 XK_Prior, 0x21de,
90 XK_Next, 0x21df, 91 XK_Next, 0x21df,
91 XK_Tab, 0x21e5, 92 XK_Tab, 0x21e5,
92 XK_ISO_Left_Tab, 0x21e6, 93 XK_ISO_Left_Tab, 0x21e6,
93 XK_Shift_L, 0x21e7, 94 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7, 95 XK_Shift_R, 0x21e7,
95 96
96 XK_Shift_Lock, 0x21eb, 97 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb, 98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec, 99 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed, 100 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee, 101 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef, 102 XK_ISO_Level3_Lock, 0x21ef,
… …
108 XK_Begin, 0x2320, 108 XK_Begin, 0x2320,
109 XK_Delete, 0x2326, 109 XK_Delete, 0x2326,
110 XK_Clear, 0x2327, 110 XK_Clear, 0x2327,
111 XK_BackSpace, 0x232b, 111 XK_BackSpace, 0x232b,
112 XK_Insert, 0x2380, 112 XK_Insert, 0x2380,
113 XK_KP_Enter, 0x2386,
114 XK_Alt_L, 0x2387,
115 XK_Alt_R, 0x2387,
113 XK_Control_L, 0x2388, 116 XK_Control_L, 0x2388,
114 XK_Control_R, 0x2388, 117 XK_Control_R, 0x2388,
115 XK_Pause, 0x2389, 118 XK_Pause, 0x2389,
116 XK_Break, 0x238a, 119 XK_Break, 0x238a,
117 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
118 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
119 XK_Print, 0x2399, 122 XK_Print, 0x2399,
123 XK_Return, 0x23ce,
120 124
121 XK_space, 0x2423, 125 XK_space, 0x2423,
126
127#ifdef XK_KP_Begin
128 XK_KP_Prior, 0x21de,
129 XK_KP_Next, 0x21df,
130 XK_KP_Begin, 0x2320,
131 XK_KP_Insert, 0x2380,
132 XK_KP_Delete, 0x2326,
122 XK_KP_Space, 0x2422, 133 XK_KP_Space, 0x2422,
134#endif
123 0, 135 0,
124}; 136};
125 137
126void 138void ecb_cold
127rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
128{ 140{
129 x = Pixel2Col (x); 141 x = Pixel2Col (x);
130 y = Pixel2Row (y); 142 y = Pixel2Row (y);
131 143
132 if (x < 0 || x >= TermWin.ncol 144 if (!IN_RANGE_EXC (x, 0, ncol)
133 || y < 0 || y >= TermWin.nrow) 145 || !IN_RANGE_EXC (y, 0, nrow))
134 return; 146 return;
135 147
136 for (;;) 148 for (;;)
137 { 149 {
138 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 150 const line_t &l = ROW(y + view_start);
151
152 text_t t = l.t[x];
139 153
140 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
141 { 155 {
142 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 156 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
143 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
144 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
145 break; 158 break;
146 } 159 }
147 160
148 x--; 161 x--;
149 } 162 }
150
151} 163}
152#endif
153 164
154#if ENABLE_OVERLAY 165void ecb_cold
155void
156rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
157{ 167{
158 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
159 rxvt_font *f = (*fs)[fs->find_font (ch)];
160 wchar_t *chr, *alloc, ch2; 169 wchar_t *chr, *alloc, ch2, **fname;
161 int len; 170 int len;
162 171
163#if ENABLE_COMBINING 172# if ENABLE_COMBINING
164 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
165 { 174 {
166 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
167 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
168 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
169 } 178 }
170 else 179 else
171#endif 180# endif
172 { 181 {
173 ch2 = ch; 182 ch2 = ch;
174 183
175 alloc = 0; 184 alloc = 0;
176 chr = &ch2; 185 chr = &ch2;
177 len = 1; 186 len = 1;
178 } 187 }
179 188
180 int width = strlen (f->name); 189 char rowcol[40];
190 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
181 191
182 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 char attr[80]; // plenty
193
194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
195 (int)r,
196 fgcolor_of (r), bgcolor_of (r),
197 r & RS_Bold ? " bold" : "",
198 r & RS_Italic ? " italic" : "",
199 r & RS_Blink ? " blink" : "",
200 r & RS_RVid ? " rvid" : "",
201 r & RS_Uline ? " uline" : "",
202 r & RS_Careful ? " careful" : "");
203
204 int width = 0;
205 fname = rxvt_temp_buf<wchar_t *> (len);
206 for (int i = 0; i < len; i++)
207 {
208 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
209 fname[i] = rxvt_utf8towcs (f->name);
210 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
211 }
212
213 max_it (width, strlen (attr));
214
215 if (y >= 0)
216 {
217 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
218 x = 0;
219 }
220
221 scr_overlay_new (x, y, width, len * 2 + 2);
222
223 scr_overlay_set (0, 0, rowcol);
183 224
184 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 225 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
185 226
186 for (int y = 0; y < len; y++) 227 for (int y = 0; y < len; y++)
187 { 228 {
188 char buf[9]; 229 char buf[9];
189 230
190 ch = *chr++; 231 ch = *chr++;
191 232
192 sprintf (buf, "%8x", ch); 233 sprintf (buf, "%8x", ch);
193 scr_overlay_set (0, y, buf); 234 scr_overlay_set (0, y + 1, buf);
194 scr_overlay_set (9, y, '='); 235 scr_overlay_set (9, y + 1, '=');
195#if !UNICODE3 236# if !UNICODE_3
196 if (ch >= 0x10000) 237 if (ch >= 0x10000)
197 ch = 0xfffd; 238 ch = 0xfffd;
198#endif 239# endif
199 scr_overlay_set (11, y, ch, r); 240 scr_overlay_set (11, y + 1, ch, r);
241
242 if (WCWIDTH (ch) >= 2)
200 scr_overlay_set (12, y, NOCHAR, r); 243 scr_overlay_set (12, y + 1, NOCHAR, r);
201 } 244 }
202 245
246// {
247// char buf[4+4+3+1];
248// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
249// scr_overlay_set (0, 0, buf);
250// }
203 scr_overlay_set (0, len, f->name); 251 scr_overlay_set (0, len + 1, attr);
252 for (int i = 0; i < len; i++)
253 {
254 scr_overlay_set (0, len + 2 + i, fname[i]);
255 free (fname[i]);
256 }
204 257
205#if ENABLE_COMBINING 258# if ENABLE_COMBINING
206 if (alloc) 259 if (alloc)
207 delete [] alloc; 260 delete [] alloc;
208#endif 261# endif
209} 262}
210#endif 263#endif
211 264
212void 265void ecb_cold
213rxvt_term::commit_iso14755 () 266rxvt_term::commit_iso14755 ()
214{ 267{
215 wchar_t ch[2];
216
217 ch[0] = iso14755buf & ISO_14755_MASK; 268 wchar_t ch = iso14755buf & ISO_14755_MASK;
218 ch[1] = 0;
219 269
220 if (iso14755buf & ISO_14755_51) 270 if (iso14755buf & ISO_14755_51)
221 { 271 {
222 char mb[16]; 272 char mb[MB_LEN_MAX];
223 int len; 273 int len;
224 274
225 // allow verbatim 0-bytes and control-bytes to be entered 275 // allow verbatim 0-bytes and control-bytes to be entered
226 if (ch[0] >= 0x20) 276 if (ch >= 0x20)
227 len = wcstombs (mb, ch, 16); 277 len = wctomb (mb, ch);
228 else 278 else
229 { 279 {
230 mb[0] = ch[0]; 280 mb[0] = ch;
231 len = 1; 281 len = 1;
232 } 282 }
233 283
234 if (len > 0) 284 if (len > 0)
235 tt_write ((unsigned char *)mb, len); 285 tt_write (mb, len);
236 else 286 else
237 scr_bell (); 287 scr_bell ();
238 } 288 }
239 289
240 iso14755buf = 0; 290 iso14755buf = 0;
241} 291}
242 292
243int 293static int ecb_cold
244rxvt_term::hex_keyval (XKeyEvent &ev) 294hex_keyval (XKeyEvent &ev)
245{ 295{
246 // check wether this event corresponds to a hex digit 296 // check whether this event corresponds to a hex digit
247 // if the modifiers had not been pressed. 297 // if the modifiers had not been pressed.
248 for (int index = 0; index < 8; index++) 298 for (int index = 0; index < 8; index++)
249 { 299 {
250 KeySym k = XLookupKeysym (&ev, index); 300 KeySym k = XLookupKeysym (&ev, index);
251 301
… …
257 307
258 return -1; 308 return -1;
259} 309}
260#endif 310#endif
261 311
262/*{{{ Convert the keypress event into a string */ 312static inline KeySym ecb_cold
263void 313translate_keypad (KeySym keysym, bool kp)
314{
315#ifdef XK_KP_Home
316 static const KeySym keypadtrans[] = {
317 XK_KP_7, // XK_KP_Home
318 XK_KP_4, // XK_KP_Left
319 XK_KP_8, // XK_KP_Up
320 XK_KP_6, // XK_KP_Right
321 XK_KP_2, // XK_KP_Down
322 XK_KP_9, // XK_KP_Prior
323 XK_KP_3, // XK_KP_Next
324 XK_KP_1, // XK_KP_End
325 XK_KP_5, // XK_KP_Begin
326 };
327
328 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
329 {
330 unsigned int index = keysym - XK_KP_Home;
331 keysym = kp ? keypadtrans[index] : XK_Home + index;
332 }
333 else if (keysym == XK_KP_Insert)
334 keysym = kp ? XK_KP_0 : XK_Insert;
335# ifndef NO_DELETE_KEY
336 else if (keysym == XK_KP_Delete)
337 keysym = kp ? XK_KP_Decimal : XK_Delete;
338# endif
339#endif
340 return keysym;
341}
342
343static inline int ecb_cold
344map_function_key (KeySym keysym)
345{
346 int param = 0;
347
348 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
349 {
350 param = 11 + keysym - XK_F1;
351 if (keysym >= XK_F17)
352 param += 4;
353 else if (keysym >= XK_F15)
354 param += 3;
355 else if (keysym >= XK_F11)
356 param += 2;
357 else if (keysym >= XK_F6)
358 param += 1;
359 }
360 else
361 switch (keysym)
362 {
363 case XK_Find:
364 param = 1;
365 break;
366 case XK_Insert:
367 param = 2;
368 break;
369#ifdef DXK_Remove
370 case DXK_Remove:
371#endif
372 case XK_Execute:
373 param = 3;
374 break;
375 case XK_Select:
376 param = 4;
377 break;
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390 case XK_Help:
391 param = 28;
392 break;
393 case XK_Menu:
394 param = 29;
395 break;
396 }
397 return param;
398}
399
400static inline wchar_t *
401rxvt_wcsdup (const wchar_t *str, int len)
402{
403 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
404 memcpy (r, str, len * sizeof (wchar_t));
405 r[len] = 0;
406 return r;
407}
408
409void ecb_cold
264rxvt_term::lookup_key (XKeyEvent &ev) 410rxvt_term::key_press (XKeyEvent &ev)
265{ 411{
266 int ctrl, meta, shft, len; 412 int ctrl, meta, shft, len;
267 unsigned int newlen; 413 KeySym keysym = NoSymbol;
268 KeySym keysym; 414 char rkbuf[KBUFSZ + 1];
269#ifdef DEBUG_CMD 415 char *kbuf = rkbuf + 1;
270 static int debug_key = 1; /* accessible by a debugger only */ 416
417#if ISO_14755
418 if (iso14755buf & ISO_14755_52)
419 return;
271#endif 420#endif
272 int valid_keysym;
273 unsigned char kbuf[KBUFSZ];
274 421
275 /* 422 /*
276 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 423 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
277 * escape sequence to toggle the Keypad. 424 * escape sequence to toggle the Keypad.
278 * 425 *
279 * Always permit `shift' to override the current setting 426 * Always permit `shift' to override the current setting
280 */ 427 */
281 shft = (ev.state & ShiftMask); 428 shft = ev.state & ShiftMask;
282 ctrl = (ev.state & ControlMask); 429 ctrl = ev.state & ControlMask;
283 meta = (ev.state & ModMetaMask); 430 meta = ev.state & ModMetaMask;
284
285 if (numlock_state || (ev.state & ModNumLockMask))
286 {
287 numlock_state = (ev.state & ModNumLockMask);
288 PrivMode ((!numlock_state), PrivMode_aplKP);
289 }
290 431
291 kbuf[0] = 0; 432 kbuf[0] = 0;
292 433
293#ifdef USE_XIM 434#if USE_XIM
294 if (Input_Context) 435 if (Input_Context)
295 { 436 {
296 Status status_return; 437 Status status_return;
297 438
298#if 0 439#if 0
299#ifdef X_HAVE_UTF8_STRING 440#ifdef X_HAVE_UTF8_STRING
300 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 441 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
301 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 442 len = Xutf8LookupString (Input_Context, &ev, kbuf,
302 KBUFSZ, &keysym, &status_return); 443 KBUFSZ, &keysym, &status_return);
303 else 444 else
304#endif 445#endif
305#endif 446#endif
306 { 447 {
… …
308 449
309 // the XOpenIM manpage lies about hardcoding the locale 450 // the XOpenIM manpage lies about hardcoding the locale
310 // at the point of XOpenIM, so temporarily switch locales 451 // at the point of XOpenIM, so temporarily switch locales
311 if (rs[Rs_imLocale]) 452 if (rs[Rs_imLocale])
312 SET_LOCALE (rs[Rs_imLocale]); 453 SET_LOCALE (rs[Rs_imLocale]);
454
313 // assume wchar_t == unicode or better 455 // assume wchar_t == unicode or better
314 len = XwcLookupString (Input_Context, &ev, wkbuf, 456 len = XwcLookupString (Input_Context, &ev, wkbuf,
315 KBUFSZ, &keysym, &status_return); 457 KBUFSZ, &keysym, &status_return);
458
316 if (rs[Rs_imLocale]) 459 if (rs[Rs_imLocale])
317 SET_LOCALE (locale); 460 SET_LOCALE (locale);
318 461
319 if (status_return == XLookupChars 462 if (status_return == XLookupChars
320 || status_return == XLookupBoth) 463 || status_return == XLookupBoth)
… …
334 } 477 }
335 } 478 }
336 else 479 else
337 len = 0; 480 len = 0;
338 } 481 }
339
340 valid_keysym = status_return == XLookupKeySym
341 || status_return == XLookupBoth;
342 } 482 }
343 else 483 else
344#endif 484#endif
345 { 485 {
346 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 486 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
347 valid_keysym = keysym != NoSymbol; 487 }
488
489 if (keysym != NoSymbol)
348 } 490 {
491 KeySym orig_keysym = keysym;
349 492
350 if (valid_keysym) 493 /* Shift + F1 - F10 generates F11 - F20 */
494 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
495 {
496 keysym += (XK_F11 - XK_F1);
497 shft = 0; /* turn off Shift */
498 }
499
500 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
501 {
502 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
503 unsigned int newlen = 1;
504
505 if (ev.state & ModNumLockMask)
506 kp = false;
507
508 keysym = translate_keypad (keysym, kp);
509
510 switch (keysym)
511 {
512#ifndef NO_BACKSPACE_KEY
513 case XK_BackSpace:
514 if (priv_modes & PrivMode_HaveBackSpace)
515 {
516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
517 ^ !!ctrl) ? '\b' : '\177';
518 kbuf[1] = '\0';
519 }
520 else
521 strcpy (kbuf, rs[Rs_backspace_key]);
522 break;
523#endif
524#ifndef NO_DELETE_KEY
525 case XK_Delete:
526 strcpy (kbuf, rs[Rs_delete_key]);
527 break;
528#endif
529 case XK_Tab:
530 if (shft)
531 strcpy (kbuf, "\033[Z");
532 else
533 {
534#ifdef CTRL_TAB_MAKES_META
535 if (ctrl)
536 meta = 1;
537#endif
538#ifdef MOD4_TAB_MAKES_META
539 if (ev.state & Mod4Mask)
540 meta = 1;
541#endif
542 newlen = 0;
543 }
544 break;
545
546 case XK_Up: /* "\033[A" */
547 case XK_Down: /* "\033[B" */
548 case XK_Right: /* "\033[C" */
549 case XK_Left: /* "\033[D" */
550 strcpy (kbuf, "\033[Z");
551 kbuf[2] = "DACB"[keysym - XK_Left];
552 /* do Shift first */
553 if (shft)
554 kbuf[2] = "dacb"[keysym - XK_Left];
555 else if (ctrl)
556 {
557 kbuf[1] = 'O';
558 kbuf[2] = "dacb"[keysym - XK_Left];
559 }
560 else if (priv_modes & PrivMode_aplCUR)
561 kbuf[1] = 'O';
562 break;
563
564 case XK_KP_Enter:
565 /* allow shift to override */
566 if (kp)
567 {
568 strcpy (kbuf, "\033OM");
569 break;
570 }
571
572 /* FALLTHROUGH */
573
574 case XK_Return:
575 if (priv_modes & PrivMode_LFNL)
576 {
577 kbuf[0] = '\015';
578 kbuf[1] = '\012';
579 kbuf[2] = '\0';
580 }
581 else
582 {
583 kbuf[0] = '\015';
584 kbuf[1] = '\0';
585 }
586 break;
587
588 case XK_KP_F1: /* "\033OP" */
589 case XK_KP_F2: /* "\033OQ" */
590 case XK_KP_F3: /* "\033OR" */
591 case XK_KP_F4: /* "\033OS" */
592 strcpy (kbuf, "\033OP");
593 kbuf[2] += (keysym - XK_KP_F1);
594 break;
595
596 case XK_KP_Multiply: /* "\033Oj" : "*" */
597 case XK_KP_Add: /* "\033Ok" : "+" */
598 case XK_KP_Separator: /* "\033Ol" : "," */
599 case XK_KP_Subtract: /* "\033Om" : "-" */
600 case XK_KP_Decimal: /* "\033On" : "." */
601 case XK_KP_Divide: /* "\033Oo" : "/" */
602 case XK_KP_0: /* "\033Op" : "0" */
603 case XK_KP_1: /* "\033Oq" : "1" */
604 case XK_KP_2: /* "\033Or" : "2" */
605 case XK_KP_3: /* "\033Os" : "3" */
606 case XK_KP_4: /* "\033Ot" : "4" */
607 case XK_KP_5: /* "\033Ou" : "5" */
608 case XK_KP_6: /* "\033Ov" : "6" */
609 case XK_KP_7: /* "\033Ow" : "7" */
610 case XK_KP_8: /* "\033Ox" : "8" */
611 case XK_KP_9: /* "\033Oy" : "9" */
612 /* allow shift to override */
613 if (kp)
614 {
615 strcpy (kbuf, "\033Oj");
616 kbuf[2] += (keysym - XK_KP_Multiply);
617 }
618 else
619 {
620 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
621 kbuf[1] = '\0';
622 }
623 break;
624
625 default:
626 {
627 int param = map_function_key (keysym);
628 if (param > 0)
629 sprintf (kbuf,"\033[%d~", param);
630 else
631 newlen = 0;
632 }
633 break;
634 }
635
636 if (newlen)
637 len = strlen (kbuf);
638
639 if (len > 0)
640 {
641 /*
642 * pass Shift/Control indicators for function keys ending with `~'
643 *
644 * eg,
645 * Prior = "ESC[5~"
646 * Shift+Prior = "ESC[5$"
647 * Ctrl+Prior = "ESC[5^"
648 * Ctrl+Shift+Prior = "ESC[5@"
649 */
650 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
651 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
652
653 /*
654 * Pass meta for all function keys, if 'meta' option set
655 */
656#ifdef META8_OPTION
657 if (meta && (meta_char == 0x80))
658 kbuf[len - 1] |= 0x80;
659#endif
660 }
661
662 }
663 else if (ctrl && keysym == XK_minus)
664 {
665 len = 1;
666 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
667 }
668 else if (keysym == XK_ISO_Left_Tab)
669 {
670 strcpy (kbuf, "\033[Z");
671 len = 3;
672 }
673 else
674 {
675#ifdef META8_OPTION
676 /* set 8-bit on */
677 if (meta && (meta_char == 0x80))
678 {
679 char *ch;
680
681 for (ch = kbuf; ch < kbuf + len; ch++)
682 *ch |= 0x80;
683 }
684#endif
685 /* nil */ ;
686 }
687
688 keysym = orig_keysym;
689 }
690
691 /* escape prefix */
692 if (len && meta
693#ifdef META8_OPTION
694 && meta_char == C0_ESC
695#endif
696 )
697 {
698 *--kbuf = C0_ESC;
699 len++;
700 }
701
702 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
703 return;
704
705 if (keysym != NoSymbol)
351 { 706 {
352#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
353 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
354 return; 709 return;
355#endif 710#endif
356 711
357 if (TermWin.saveLines) 712 if (saveLines)
358 { 713 {
359#ifdef UNSHIFTED_SCROLLKEYS 714#ifdef UNSHIFTED_SCROLLKEYS
360 if (!ctrl && !meta) 715 if (!ctrl && !meta)
361#else 716#else
362 if (IS_SCROLL_MOD) 717 if (IS_SCROLL_MOD)
363#endif 718#endif
364 { 719 {
365 int lnsppg; 720 int lnsppg;
366 721
367#ifdef PAGING_CONTEXT_LINES 722#ifdef PAGING_CONTEXT_LINES
368 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 723 lnsppg = nrow - PAGING_CONTEXT_LINES;
369#else 724#else
370 lnsppg = TermWin.nrow * 4 / 5; 725 lnsppg = nrow * 4 / 5;
371#endif 726#endif
727 max_it (lnsppg, 1);
728
372 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
373 { 730 {
374 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
375 return; 732 return;
376 } 733 }
377 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
378 { 735 {
379 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
380 return; 737 return;
381 } 738 }
382 } 739 }
383#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
384 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
385 { 742 {
386 if (keysym == XK_Up) 743 if (keysym == XK_Up)
387 { 744 {
388 scr_page (UP, 1); 745 scr_page (1);
389 return; 746 return;
390 } 747 }
391 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
392 { 749 {
393 scr_page (DN, 1); 750 scr_page (-1);
394 return; 751 return;
395 } 752 }
396 } 753 }
397#endif 754#endif
398#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
399 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
400 { 757 {
401 if (keysym == XK_Home) 758 if (keysym == XK_Home)
402 { 759 {
403 scr_move_to (0, 1); 760 scr_changeview (top_row);
404 return; 761 return;
405 } 762 }
406 else if (keysym == XK_End) 763 else if (keysym == XK_End)
407 { 764 {
408 scr_move_to (1, 0); 765 scr_changeview (0);
409 return; 766 return;
410 } 767 }
411 } 768 }
412#endif 769#endif
413 } 770 }
414 771
415 if (shft) 772 if (shft)
416 { 773 {
417 /* Shift + F1 - F10 generates F11 - F20 */
418 if (keysym >= XK_F1 && keysym <= XK_F10)
419 {
420 keysym += (XK_F11 - XK_F1);
421 shft = 0; /* turn off Shift */
422 }
423 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
424 { 775 {
425 switch (keysym) 776 switch (keysym)
426 { 777 {
427 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
428 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
429 selection_request (ev.time, 0, 0); 780 selection_request (ev.time);
430 return; 781 return;
431#if TODO 782#if TODO
432 /* rxvt extras */ 783 /* rxvt extras */
433 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 784 case XK_KP_Add: /* Shift+KP_Add = bigger font */
434 change_font (FONT_UP);
435 return; 785 return;
436 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
437 change_font (FONT_DN);
438 return; 787 return;
439#endif 788#endif
440 } 789 }
441 } 790 }
442 } 791 }
443 792
793 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
794 {
795 if (keysym == XK_v)
796 selection_request (ev.time, Sel_Clipboard);
797 else if (selection.len > 0)
798 {
799 free (selection.clip_text);
800 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
801 selection.clip_len = selection.len;
802 selection_grab (CurrentTime, true);
803 }
804
805 return;
806 }
807
444#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
445 // ISO 14755 support 809 // ISO 14755 support
446 if (shft && ctrl) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
447 { 811 {
448 int hv; 812 int hv;
449 813
450 if (iso14755buf & ISO_14755_51 814 if (iso14755buf & ISO_14755_51
451 && (keysym == XK_space || keysym == XK_KP_Space 815 && (keysym == XK_space || keysym == XK_KP_Space
… …
453 { 817 {
454 commit_iso14755 (); 818 commit_iso14755 ();
455 iso14755buf = ISO_14755_51; 819 iso14755buf = ISO_14755_51;
456# if ISO_14755 820# if ISO_14755
457 iso14755_51 (0); 821 iso14755_51 (0);
822# endif
823 return;
824 }
825 else if (keysym == XK_BackSpace)
826 {
827 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
828# if ISO_14755
829 iso14755_51 (iso14755buf & ISO_14755_MASK);
458# endif 830# endif
459 return; 831 return;
460 } 832 }
461 else if ((hv = hex_keyval (ev)) >= 0) 833 else if ((hv = hex_keyval (ev)) >= 0)
462 { 834 {
… …
467# endif 839# endif
468 return; 840 return;
469 } 841 }
470 else 842 else
471 { 843 {
472# if ENABLE_OVERLAY 844# if ISO_14755
473 scr_overlay_off (); 845 scr_overlay_off ();
474# endif 846# endif
475 iso14755buf = 0; 847 iso14755buf = 0;
476 } 848 }
477 } 849 }
850 else if (option (Opt_iso14755) &&
478 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 851 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
479 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 852 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
480 if (!(iso14755buf & ISO_14755_STARTED)) 853 if (!(iso14755buf & ISO_14755_STARTED))
481 { 854 {
482 iso14755buf |= ISO_14755_STARTED; 855 iso14755buf |= ISO_14755_STARTED;
483# if ENABLE_OVERLAY 856# if ISO_14755
484 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 857 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
485 scr_overlay_set (0, 0, "ISO 14755 mode"); 858 scr_overlay_set (0, 0, "ISO 14755 mode");
486# endif 859# endif
487 } 860 }
488#endif 861#endif
489 862
490#ifdef PRINTPIPE 863#ifdef PRINTPIPE
491 if (keysym == XK_Print) 864 if (keysym == XK_Print)
492 { 865 {
493 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
494 return; 867 return;
495 } 868 }
496#endif 869#endif
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 {
501 newlen = 1;
502 switch (keysym)
503 {
504#ifndef NO_BACKSPACE_KEY
505 case XK_BackSpace:
506 if (priv_modes & PrivMode_HaveBackSpace)
507 {
508 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
509 ^ !!ctrl) ? '\b' : '\177';
510 kbuf[1] = '\0';
511 }
512 else
513 strcpy (kbuf, key_backspace);
514 break;
515#endif
516#ifndef NO_DELETE_KEY
517 case XK_Delete:
518 strcpy (kbuf, key_delete);
519 break;
520#endif
521 case XK_Tab:
522 if (shft)
523 strcpy (kbuf, "\033[Z");
524 else
525 {
526#ifdef CTRL_TAB_MAKES_META
527 if (ctrl)
528 meta = 1;
529#endif
530#ifdef MOD4_TAB_MAKES_META
531 if (ev.state & Mod4Mask)
532 meta = 1;
533#endif
534 newlen = 0;
535 }
536 break;
537
538#ifdef XK_KP_Left
539 case XK_KP_Up: /* \033Ox or standard */
540 case XK_KP_Down: /* \033Or or standard */
541 case XK_KP_Right: /* \033Ov or standard */
542 case XK_KP_Left: /* \033Ot or standard */
543 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
544 {
545 strcpy (kbuf, "\033OZ");
546 kbuf[2] = "txvr"[keysym - XK_KP_Left];
547 break;
548 }
549 else
550 /* translate to std. cursor key */
551 keysym = XK_Left + (keysym - XK_KP_Left);
552 /* FALLTHROUGH */
553#endif
554 case XK_Up: /* "\033[A" */
555 case XK_Down: /* "\033[B" */
556 case XK_Right: /* "\033[C" */
557 case XK_Left: /* "\033[D" */
558 strcpy (kbuf, "\033[Z");
559 kbuf[2] = "DACB"[keysym - XK_Left];
560 /* do Shift first */
561 if (shft)
562 kbuf[2] = "dacb"[keysym - XK_Left];
563 else if (ctrl)
564 {
565 kbuf[1] = 'O';
566 kbuf[2] = "dacb"[keysym - XK_Left];
567 }
568 else if (priv_modes & PrivMode_aplCUR)
569 kbuf[1] = 'O';
570 break;
571
572#ifndef UNSHIFTED_SCROLLKEYS
573# ifdef XK_KP_Prior
574 case XK_KP_Prior:
575 /* allow shift to override */
576 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
577 {
578 strcpy (kbuf, "\033Oy");
579 break;
580 }
581 /* FALLTHROUGH */
582# endif
583 case XK_Prior:
584 strcpy (kbuf, "\033[5~");
585 break;
586# ifdef XK_KP_Next
587 case XK_KP_Next:
588 /* allow shift to override */
589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
590 {
591 strcpy (kbuf, "\033Os");
592 break;
593 }
594 /* FALLTHROUGH */
595# endif
596 case XK_Next:
597 strcpy (kbuf, "\033[6~");
598 break;
599#endif
600 case XK_KP_Enter:
601 /* allow shift to override */
602 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
603 {
604 strcpy (kbuf, "\033OM");
605 break;
606 }
607
608 /* FALLTHROUGH */
609
610 case XK_Return:
611 if (priv_modes & PrivMode_LFNL)
612 {
613 kbuf[0] = '\015';
614 kbuf[1] = '\012';
615 kbuf[2] = '\0';
616 }
617 else
618 {
619 kbuf[0] = '\015';
620 kbuf[1] = '\0';
621 }
622 break;
623
624#ifdef XK_KP_Begin
625 case XK_KP_Begin:
626 strcpy (kbuf, "\033Ou");
627 break;
628
629 case XK_KP_Insert:
630 strcpy (kbuf, "\033Op");
631 break;
632
633 case XK_KP_Delete:
634 strcpy (kbuf, "\033On");
635 break;
636#endif
637 case XK_KP_F1: /* "\033OP" */
638 case XK_KP_F2: /* "\033OQ" */
639 case XK_KP_F3: /* "\033OR" */
640 case XK_KP_F4: /* "\033OS" */
641 strcpy (kbuf, "\033OP");
642 kbuf[2] += (keysym - XK_KP_F1);
643 break;
644
645 case XK_KP_Multiply: /* "\033Oj" : "*" */
646 case XK_KP_Add: /* "\033Ok" : "+" */
647 case XK_KP_Separator: /* "\033Ol" : "," */
648 case XK_KP_Subtract: /* "\033Om" : "-" */
649 case XK_KP_Decimal: /* "\033On" : "." */
650 case XK_KP_Divide: /* "\033Oo" : "/" */
651 case XK_KP_0: /* "\033Op" : "0" */
652 case XK_KP_1: /* "\033Oq" : "1" */
653 case XK_KP_2: /* "\033Or" : "2" */
654 case XK_KP_3: /* "\033Os" : "3" */
655 case XK_KP_4: /* "\033Ot" : "4" */
656 case XK_KP_5: /* "\033Ou" : "5" */
657 case XK_KP_6: /* "\033Ov" : "6" */
658 case XK_KP_7: /* "\033Ow" : "7" */
659 case XK_KP_8: /* "\033Ox" : "8" */
660 case XK_KP_9: /* "\033Oy" : "9" */
661 /* allow shift to override */
662 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
663 {
664 strcpy (kbuf, "\033Oj");
665 kbuf[2] += (keysym - XK_KP_Multiply);
666 }
667 else
668 {
669 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
670 kbuf[1] = '\0';
671 }
672 break;
673
674 case XK_Find:
675 strcpy (kbuf, "\033[1~");
676 break;
677 case XK_Insert:
678 strcpy (kbuf, "\033[2~");
679 break;
680#ifdef DXK_Remove /* support for DEC remove like key */
681 case DXK_Remove:
682 /* FALLTHROUGH */
683#endif
684 case XK_Execute:
685 strcpy (kbuf, "\033[3~");
686 break;
687 case XK_Select:
688 strcpy (kbuf, "\033[4~");
689 break;
690#ifdef XK_KP_End
691 case XK_KP_End:
692 /* allow shift to override */
693 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
694 {
695 strcpy (kbuf, "\033Oq");
696 break;
697 }
698 /* FALLTHROUGH */
699#endif
700 case XK_End:
701 strcpy (kbuf, KS_END);
702 break;
703#ifdef XK_KP_Home
704 case XK_KP_Home:
705 /* allow shift to override */
706 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
707 {
708 strcpy (kbuf, "\033Ow");
709 break;
710 }
711 /* FALLTHROUGH */
712#endif
713 case XK_Home:
714 strcpy (kbuf, KS_HOME);
715 break;
716
717#define FKEY(n, fkey) \
718 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
719
720 case XK_F1: /* "\033[11~" */
721 case XK_F2: /* "\033[12~" */
722 case XK_F3: /* "\033[13~" */
723 case XK_F4: /* "\033[14~" */
724 case XK_F5: /* "\033[15~" */
725 FKEY (11, XK_F1);
726 break;
727 case XK_F6: /* "\033[17~" */
728 case XK_F7: /* "\033[18~" */
729 case XK_F8: /* "\033[19~" */
730 case XK_F9: /* "\033[20~" */
731 case XK_F10: /* "\033[21~" */
732 FKEY (17, XK_F6);
733 break;
734 case XK_F11: /* "\033[23~" */
735 case XK_F12: /* "\033[24~" */
736 case XK_F13: /* "\033[25~" */
737 case XK_F14: /* "\033[26~" */
738 FKEY (23, XK_F11);
739 break;
740 case XK_F15: /* "\033[28~" */
741 case XK_F16: /* "\033[29~" */
742 FKEY (28, XK_F15);
743 break;
744 case XK_Help: /* "\033[28~" */
745 FKEY (28, XK_Help);
746 break;
747 case XK_Menu: /* "\033[29~" */
748 FKEY (29, XK_Menu);
749 break;
750 case XK_F17: /* "\033[31~" */
751 case XK_F18: /* "\033[32~" */
752 case XK_F19: /* "\033[33~" */
753 case XK_F20: /* "\033[34~" */
754 case XK_F21: /* "\033[35~" */
755 case XK_F22: /* "\033[36~" */
756 case XK_F23: /* "\033[37~" */
757 case XK_F24: /* "\033[38~" */
758 case XK_F25: /* "\033[39~" */
759 case XK_F26: /* "\033[40~" */
760 case XK_F27: /* "\033[41~" */
761 case XK_F28: /* "\033[42~" */
762 case XK_F29: /* "\033[43~" */
763 case XK_F30: /* "\033[44~" */
764 case XK_F31: /* "\033[45~" */
765 case XK_F32: /* "\033[46~" */
766 case XK_F33: /* "\033[47~" */
767 case XK_F34: /* "\033[48~" */
768 case XK_F35: /* "\033[49~" */
769 FKEY (31, XK_F17);
770 break;
771#undef FKEY
772 default:
773 newlen = 0;
774 break;
775 }
776
777 if (newlen)
778 len = strlen (kbuf);
779 }
780
781 /*
782 * Pass meta for all function keys, if 'meta' option set
783 */
784#ifdef META8_OPTION
785 if (meta && (meta_char == 0x80) && len > 0)
786 kbuf[len - 1] |= 0x80;
787#endif
788
789 }
790 else if (ctrl && keysym == XK_minus)
791 {
792 len = 1;
793 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
794 }
795 else if (keysym == XK_ISO_Left_Tab)
796 {
797 strcpy (kbuf, "\033[Z");
798 len = 3;
799 }
800 else
801 {
802#ifdef META8_OPTION
803 /* set 8-bit on */
804 if (meta && (meta_char == 0x80))
805 {
806 unsigned char *ch;
807
808 for (ch = kbuf; ch < kbuf + len; ch++)
809 *ch |= 0x80;
810
811 meta = 0;
812 }
813#endif
814 /* nil */ ;
815 }
816 } 870 }
817 871
818 if (len <= 0) 872 if (len <= 0)
819 return; /* not mapped */ 873 return; /* not mapped */
820 874
821 if (options & Opt_scrollTtyKeypress) 875 tt_write_user_input (kbuf, (unsigned int)len);
822 if (TermWin.view_start) 876}
877
878void ecb_cold
879rxvt_term::key_release (XKeyEvent &ev)
880{
881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
882 KeySym keysym;
883
884 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
885#endif
886
887#if ENABLE_FRILLS || ISO_14755
888 // ISO 14755 support
889 if (iso14755buf)
890 if (iso14755buf & ISO_14755_52)
823 { 891 {
824 TermWin.view_start = 0; 892# if ISO_14755
825 want_refresh = 1; 893 scr_overlay_off ();
894# endif
895# if ISO_14755
896 // iso14755 part 5.2 handling: release time
897 // first: controls
898 if ((ev.state & ControlMask)
899 && ((keysym >= 0x40 && keysym <= 0x5f)
900 || (keysym >= 0x61 && keysym <= 0x7f)))
901 {
902 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
903 commit_iso14755 ();
904
905 return;
906 }
907
908 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
909 if (i[0] == keysym)
910 {
911 iso14755buf = ISO_14755_51 | i[1];
912 commit_iso14755 ();
913
914 return;
915 }
916
917 scr_bell ();
918# endif
919 iso14755buf = 0;
920
921 return;
826 } 922 }
827 923 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
828 /* 924 {
829 * these modifications only affect the static keybuffer 925# if ISO_14755
830 * pass Shift/Control indicators for function keys ending with `~' 926 scr_overlay_off ();
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841
842 /* escape prefix */
843 if (meta
844#ifdef META8_OPTION
845 && meta_char == C0_ESC
846#endif 927# endif
847 ) 928 if (iso14755buf & ISO_14755_51)
848 { 929 commit_iso14755 ();
849 const unsigned char ch = C0_ESC; 930#if ISO_14755
850 tt_write (&ch, 1); 931 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
851 } 932 {
933 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
852 934
853#if defined(DEBUG_CMD) 935 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
854 /* Display keyboard buffer contents */ 936 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
855 unsigned char *p; 937 }
856 int i;
857
858 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
859 for (i = 0, p = kbuf; i < len; i++, p++)
860 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
861 fprintf (stderr, "'\n");
862#endif /* DEBUG_CMD */
863 tt_write (kbuf, (unsigned int)len);
864}
865/*}}} */
866
867#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
868/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
869/* attempt to `write' count to the input buffer */
870unsigned int
871rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
872{
873 unsigned int n, s;
874
875 n = cmdbuf_ptr - cmdbuf_base;
876 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
877
878 if (n > 0 && s < count)
879 {
880 memmove (cmdbuf_base, cmdbuf_ptr,
881 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
882 cmdbuf_ptr = cmdbuf_base;
883 cmdbuf_endp -= n;
884 s += n;
885 }
886
887 if (count > s)
888 {
889 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
890 count = s;
891 }
892
893 for (; count--;)
894 *cmdbuf_endp++ = *str++;
895
896 cmd_parse ();
897
898 return 0;
899}
900#endif 938# endif
939 else
940 iso14755buf = 0;
941 }
942#endif
943
944 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
945 return;
946
947#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
948 if (!(ev.state & ControlMask))
949 slip_wheel_ev.stop ();
950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
951 mouse_slip_wheel_speed = 0;
952#endif
953}
901 954
902void 955void
903rxvt_term::flush () 956rxvt_term::flush ()
904{ 957{
905 flush_ev.stop (); 958 flush_ev.stop ();
906 959
907#ifdef TRANSPARENT 960#ifdef HAVE_IMG
908 if (want_full_refresh) 961 if (bg_flags & BG_NEEDS_REFRESH)
909 { 962 {
910 want_full_refresh = 0; 963 bg_flags &= ~BG_NEEDS_REFRESH;
911 scr_clear ();
912 scr_touch (false); 964 scr_touch (false);
913 } 965 }
914#endif 966#endif
915 967
916 if (want_refresh) 968 if (want_refresh)
917 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
918 scr_refresh (refresh_type); 1008 scr_refresh ();
919 scrollbar_show (1); 1009 scrollBar.show (1);
920#ifdef USE_XIM 1010#if USE_XIM
921 IMSendSpot (); 1011 im_send_spot ();
922#endif 1012#endif
923 } 1013 }
924 1014
925 display->flush (); 1015 display->flush ();
926} 1016}
927 1017
1018/* checks whether a refresh is requested and starts the refresh timer */
928void 1019void
929rxvt_term::check_cb (check_watcher &w) 1020rxvt_term::refresh_check ()
930{ 1021{
931 SET_R (this); 1022 if (want_refresh && !flush_ev.is_active ())
932 SET_LOCALE (locale); 1023 flush_ev.start ();
933 1024
934 display->flush (); 1025 display->flush ();
935
936 if (want_refresh && !flush_ev.active)
937 flush_ev.start (NOW + 0.01);
938} 1026}
939 1027
940void 1028void
941rxvt_term::flush_cb (time_watcher &w) 1029rxvt_term::flush_cb (ev::timer &w, int revents)
942{ 1030{
943 SET_R (this); 1031 make_current ();
944 SET_LOCALE (locale);
945 1032
946 refresh_limit = 1;
947 refresh_count = 0; 1033 refresh_count = 0;
948 flush (); 1034 flush ();
949} 1035}
950 1036
951#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
952void 1038void
1039rxvt_term::cursor_blink_reset ()
1040{
1041 if (!focus)
1042 return;
1043
1044 if (hidden_cursor)
1045 {
1046 hidden_cursor = 0;
1047 want_refresh = 1;
1048 }
1049
1050 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1051 cursor_blink_ev.again ();
1052 else
1053 cursor_blink_ev.stop ();
1054}
1055
1056void
953rxvt_term::cursor_blink_cb (time_watcher &w) 1057rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
954{ 1058{
955 hidden_cursor = !hidden_cursor; 1059 hidden_cursor = !hidden_cursor;
956 want_refresh = 1; 1060 want_refresh = 1;
957 1061 refresh_check ();
958 w.start (w.at + BLINK_INTERVAL);
959} 1062}
960#endif 1063#endif
961 1064
962#ifdef TEXT_BLINK 1065#ifdef TEXT_BLINK
963void 1066void
964rxvt_term::text_blink_cb (time_watcher &w) 1067rxvt_term::text_blink_cb (ev::timer &w, int revents)
965{ 1068{
966 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1069 if (scr_refresh_rend (RS_Blink, RS_Blink))
967 { 1070 {
968 hidden_text = !hidden_text; 1071 hidden_text = !hidden_text;
969 want_refresh = 1; 1072 want_refresh = 1;
970 w.start (w.at + TEXT_BLINK_INTERVAL); 1073 refresh_check ();
971 } 1074 }
1075 else
1076 w.stop ();
972} 1077}
973#endif 1078#endif
974 1079
975#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1080#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
976void 1081void
977rxvt_term::cont_scroll_cb (time_watcher &w) 1082rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
978{ 1083{
979 if ((scrollbar_isUp() || scrollbar_isDn()) && 1084 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
980 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1085 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
981 { 1086 {
982 refresh_type |= SMOOTH_REFRESH;
983 want_refresh = 1; 1087 want_refresh = 1;
984 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1088 refresh_check ();
985 } 1089 }
1090 else
1091 w.stop ();
986} 1092}
987#endif 1093#endif
988 1094
989#ifdef SELECTION_SCROLLING 1095#ifdef SELECTION_SCROLLING
990void 1096void
991rxvt_term::sel_scroll_cb (time_watcher &w) 1097rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
992{ 1098{
993 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1099 if (scr_page (scroll_selection_lines))
994 { 1100 {
995 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1101 selection_extend (selection_save_x, selection_save_y, selection_save_state);
996 refresh_type |= SMOOTH_REFRESH;
997 want_refresh = 1; 1102 want_refresh = 1;
998 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1103 refresh_check ();
999 } 1104 }
1105 else
1106 w.stop ();
1000} 1107}
1001#endif 1108#endif
1002 1109
1003#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1110#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1004void 1111void
1005rxvt_term::slip_wheel_cb (time_watcher &w) 1112rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1006{ 1113{
1007 if (mouse_slip_wheel_speed == 0 1114 if (scr_page (mouse_slip_wheel_speed))
1008 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1009 : scr_page (UP, mouse_slip_wheel_speed))
1010 { 1115 {
1011 if (TermWin.view_start == TermWin.nscrolled ||
1012 TermWin.view_start == 0)
1013 mouse_slip_wheel_speed = 0;
1014
1015 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1; 1116 want_refresh = 1;
1017 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1117 refresh_check ();
1118 }
1119
1120 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1018 } 1121 {
1122 mouse_slip_wheel_speed = 0;
1123 w.stop ();
1124 }
1125}
1126#endif
1127
1128#if LINUX_YIELD_HACK
1129static struct event_handler
1130{
1131 ev::prepare yield_ev;
1132
1133 void yield_cb (ev::prepare &w, int revents)
1134 {
1135 // this should really be sched_yield(), but the linux guys thought
1136 // that giving a process calling sched_yield () less cpu time than
1137 // ones with high nice levels is a useful thing to do. It surely is is
1138 // allowed by the sus... as is returning ENOSYS.
1139 // since the linux guys additionally thought that breaking the only
1140 // known workaround against their unusable sched_yield hack is cool,
1141 // we just nanosleep a bit and hope for the best.
1142
1143 struct timespec ts = { 0, 1000 };
1144 nanosleep (&ts, 0);
1145
1146 w.stop ();
1147 }
1148
1149 event_handler ()
1150 : yield_ev (this, &event_handler::yield_cb)
1151 {
1152 }
1153} event_handler;
1154#endif
1155
1156/* make sure all the cmd data is at beginning of cmdbuf */
1157void
1158rxvt_term::cmdbuf_reify ()
1159{
1160 if (cmdbuf_ptr == cmdbuf_base)
1161 return;
1162
1163 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1164
1165 memmove (cmdbuf_base, cmdbuf_ptr, used);
1166 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + used;
1168
1169}
1170
1171#if defined (KEYSYM_RESOURCE)
1172void
1173rxvt_term::cmdbuf_append (const char *str, size_t count)
1174{
1175 cmdbuf_reify ();
1176
1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1178
1179 if (count > avail)
1180 return;
1181
1182 memcpy (cmdbuf_endp, str, count);
1183 cmdbuf_endp += count;
1184
1185 cmd_parse ();
1019} 1186}
1020#endif 1187#endif
1021 1188
1022bool 1189bool
1023rxvt_term::pty_fill () 1190rxvt_term::pty_fill ()
1024{ 1191{
1025 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1192 cmdbuf_reify ();
1026 1193
1027 if (CBUFSIZ == n) 1194 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1028 { 1195
1029 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1196 if (!avail)
1030 n = 0;
1031 } 1197 {
1032 1198 // normally this indicates a "too long" command sequence - just drop the data we have
1033 memmove (cmdbuf_base, cmdbuf_ptr, n);
1034 cmdbuf_ptr = cmdbuf_base; 1199 cmdbuf_ptr = cmdbuf_base;
1035 cmdbuf_endp = cmdbuf_ptr + n; 1200 cmdbuf_endp = cmdbuf_ptr;
1201 avail = CBUFSIZ;
1202 }
1036 1203
1037 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1204 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1038 1205
1039 if (n > 0) 1206 if (r > 0)
1040 { 1207 {
1041 cmdbuf_endp += n; 1208 cmdbuf_endp += r;
1042 return true; 1209 return true;
1043 } 1210 }
1044 else if (n < 0 && errno != EAGAIN) 1211 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1212 {
1213#if LINUX_YIELD_HACK
1214 if (display->is_local)
1215 event_handler.yield_ev.start ();
1216#endif
1217 }
1218 else
1219 {
1220 pty_ev.stop ();
1221
1222 if (!option (Opt_hold))
1045 destroy (); 1223 destroy ();
1046 1224 }
1225
1047 return false; 1226 return false;
1048} 1227}
1049 1228
1050void 1229void
1051rxvt_term::pty_cb (io_watcher &w, short revents) 1230rxvt_term::pty_cb (ev::io &w, int revents)
1052{ 1231{
1053 SET_R (this); 1232 make_current ();
1054 SET_LOCALE (locale);
1055 1233
1056 if (revents & EVENT_READ) 1234 if (revents & ev::READ)
1057 // loop, but don't allow a single term to monopolize us 1235 // loop, but don't allow a single term to monopolize us
1058 while (pty_fill ()) 1236 for (int i = CBUFCNT; i-- && pty_fill (); )
1059 if (cmd_parse ()) 1237 cmd_parse ();
1060 break;
1061 1238
1062 if (revents & EVENT_WRITE) 1239 if (revents & ev::WRITE)
1063 pty_write (); 1240 pty_write ();
1064}
1065 1241
1066void 1242 refresh_check ();
1243}
1244
1245void ecb_cold
1067rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1068{ 1247{
1069 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1070 recolour_cursor (); 1249 recolor_cursor ();
1071 1250
1072#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1073 hidden_pointer = 0; 1252 hidden_pointer = 0;
1074 1253
1075 if (options & Opt_pointerBlank) 1254 if (option (Opt_pointerBlank))
1076 pointer_ev.start (NOW + pointerBlankDelay); 1255 pointer_ev.start (pointerBlankDelay);
1077#endif 1256#endif
1078} 1257}
1079 1258
1080#ifdef POINTER_BLANK 1259#ifdef POINTER_BLANK
1081void 1260void ecb_cold
1082rxvt_term::pointer_blank () 1261rxvt_term::pointer_blank ()
1083{ 1262{
1084 if (! (options & Opt_pointerBlank)) 1263 if (!option (Opt_pointerBlank))
1085 return; 1264 return;
1086 1265
1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1266 XDefineCursor (dpy, vt, display->blank_cursor);
1088 XFlush (display->display); 1267 XFlush (dpy);
1089 1268
1090 hidden_pointer = 1; 1269 hidden_pointer = 1;
1091} 1270}
1092 1271
1093void 1272void ecb_cold
1094rxvt_term::pointer_cb (time_watcher &w) 1273rxvt_term::pointer_cb (ev::timer &w, int revents)
1095{ 1274{
1096 SET_R (this); 1275 make_current ();
1097 SET_LOCALE (locale);
1098 1276
1099 pointer_blank (); 1277 pointer_blank ();
1100} 1278}
1101#endif 1279#endif
1102 1280
1103void 1281void
1104rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1105{ 1283{
1106 int button_number, key_state = 0; 1284 int button_number, state = 0;
1107 int x, y; 1285 int x, y;
1286 bool release = ev.type == ButtonRelease;
1108 1287
1109 x = ev.x; 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1110 y = ev.y; 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1111 pixel_position (&x, &y);
1112 1290
1113 if (MEvent.button == AnyButton) 1291 if (ev.type == MotionNotify)
1114 button_number = 3; 1292 {
1115 else 1293 if (x == mouse_row && y == mouse_col)
1294 return;
1295
1296 mouse_row = x;
1297 mouse_col = y;
1298 state += 32;
1116 { 1299 }
1300
1117 button_number = MEvent.button - Button1; 1301 button_number = MEvent.button - Button1;
1118 /* add 0x3D for wheel events, like xterm does */ 1302 if (button_number > 10)
1303 return;
1304 else if (button_number >= 7)
1305 button_number += 128 - 7;
1119 if (button_number >= 3) 1306 else if (button_number >= 3)
1120 button_number += (64 - 3); 1307 button_number += 64 - 3;
1121 }
1122 1308
1123 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1124 { 1310 {
1125 /* 1311 /*
1126 * do not report ButtonRelease 1312 * do not report ButtonRelease
1127 * no state info allowed 1313 * no state info allowed
1128 */ 1314 */
1129 key_state = 0; 1315 if (release)
1130 if (button_number == 3)
1131 return; 1316 return;
1132 } 1317 }
1133 else 1318 else
1134 { 1319 {
1135 /* XTerm mouse reporting needs these values: 1320 /* XTerm mouse reporting needs these values:
… …
1137 * 8 = Meta 1322 * 8 = Meta
1138 * 16 = Control 1323 * 16 = Control
1139 * plus will add in our own Double-Click reporting 1324 * plus will add in our own Double-Click reporting
1140 * 32 = Double Click 1325 * 32 = Double Click
1141 */ 1326 */
1142 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1327 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1143 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1328 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1144 + ((MEvent.state & ControlMask) ? 16 : 0); 1329 + ((MEvent.state & ControlMask) ? 16 : 0);
1145#ifdef MOUSE_REPORT_DOUBLECLICK 1330#ifdef MOUSE_REPORT_DOUBLECLICK
1146 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1331 state += ((MEvent.clicks > 1) ? 32 : 0);
1147#endif 1332#endif
1148 } 1333 }
1334
1335 int code = 32 + (release ? 3 : button_number) + state;
1149 1336
1150#if DEBUG_MOUSEREPORT 1337#if DEBUG_MOUSEREPORT
1151 fprintf (stderr, "Mouse ["); 1338 fprintf (stderr, "Mouse [");
1152 if (key_state & 16) 1339 if (state & 16)
1153 fputc ('C', stderr); 1340 fputc ('C', stderr);
1154 if (key_state & 4) 1341 if (state & 4)
1155 fputc ('S', stderr); 1342 fputc ('S', stderr);
1156 if (key_state & 8) 1343 if (state & 8)
1157 fputc ('A', stderr); 1344 fputc ('A', stderr);
1158 if (key_state & 32) 1345 if (state & 32)
1159 fputc ('2', stderr); 1346 fputc ('2', stderr);
1160 fprintf (stderr, "]: <%d>, %d/%d\n", 1347 fprintf (stderr, "]: <%d>, %d/%d\n",
1161 button_number, 1348 button_number,
1162 x + 1, 1349 x,
1163 y + 1); 1350 y);
1164#endif 1351#endif
1165 1352
1353#if ENABLE_FRILLS
1354 if (priv_modes & PrivMode_ExtMouseSGR)
1355 tt_printf ("\033[<%d;%d;%d%c",
1356 button_number + state,
1357 x,
1358 y,
1359 release ? 'm' : 'M');
1360 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1361 tt_printf ("\033[%d;%d;%dM",
1362 code,
1363 x,
1364 y);
1365 else if (priv_modes & PrivMode_ExtMouseUTF8)
1366 if (code < 128)
1367 tt_printf ("\033[M%c%lc%lc",
1368 code,
1369 wint_t (32 + x),
1370 wint_t (32 + y));
1371 else
1372 tt_printf ("\033[M%c%c%lc%lc",
1373 0xc0 + (code >> 6),
1374 0x80 + (code & 0x3f),
1375 wint_t (32 + x),
1376 wint_t (32 + y));
1377 else
1378#endif
1166 tt_printf ("\033[M%c%c%c", 1379 tt_printf ("\033[M%c%c%c",
1167 (32 + button_number + key_state), 1380 code,
1168 (32 + x + 1), 1381 32 + x,
1169 (32 + y + 1)); 1382 32 + y);
1170} 1383}
1171
1172#ifdef USING_W11LIB
1173void
1174rxvt_W11_process_x_event (XEvent *ev)
1175{
1176 rxvt_t *r = rxvt_get_r ();
1177
1178 x_cb (*ev);
1179}
1180#endif
1181 1384
1182/*{{{ process an X event */ 1385/*{{{ process an X event */
1183void 1386void ecb_hot
1184rxvt_term::x_cb (XEvent &ev) 1387rxvt_term::x_cb (XEvent &ev)
1185{ 1388{
1186 dDisp; 1389 make_current ();
1187 1390
1188 SET_R (this); 1391 dLocal (Display *, dpy);
1189 SET_LOCALE (locale);
1190 1392
1191#if defined(CURSOR_BLINK) 1393 if (ev.xany.window == vt
1192 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1394 && SHOULD_INVOKE (HOOK_X_EVENT)
1193 { 1395 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1194 if (hidden_cursor) 1396 return;
1195 {
1196 hidden_cursor = 0;
1197 want_refresh = 1;
1198 }
1199 1397
1200 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1398 // for XQueryPointer
1201 }
1202#endif
1203
1204#if defined(POINTER_BLANK)
1205 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1206 {
1207 if (ev.type == MotionNotify
1208 || ev.type == ButtonPress
1209 || ev.type == ButtonRelease)
1210 if (hidden_pointer)
1211 pointer_unblank ();
1212
1213 if (ev.type == KeyPress && hidden_pointer == 0)
1214 pointer_blank ();
1215 }
1216#endif
1217
1218 Window unused_root, unused_child; 1399 Window unused_root, unused_child;
1219 int unused_root_x, unused_root_y; 1400 int unused_root_x, unused_root_y;
1220 unsigned int unused_mask; 1401 unsigned int unused_mask;
1221 1402
1222 switch (ev.type) 1403 switch (ev.type)
1223 { 1404 {
1224 case KeyPress: 1405 case KeyPress:
1225#if ISO_14755 1406 key_press (ev.xkey);
1226 if (!(iso14755buf & ISO_14755_52))
1227#endif
1228 lookup_key (ev.xkey);
1229
1230 break; 1407 break;
1231 1408
1232 case KeyRelease: 1409 case KeyRelease:
1233 { 1410 key_release (ev.xkey);
1234#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1235 KeySym ks;
1236
1237 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1238#endif
1239
1240#if ENABLE_FRILLS || ISO_14755
1241 // ISO 14755 support
1242 if (iso14755buf)
1243 if (iso14755buf & ISO_14755_52)
1244 {
1245# if ENABLE_OVERLAY
1246 scr_overlay_off ();
1247# endif
1248# if ISO_14755
1249 // iso14755 part 5.2 handling: release time
1250 // first: controls
1251 if ((ev.xkey.state & ControlMask)
1252 && ((ks >= 0x40 && ks <= 0x5f)
1253 || (ks >= 0x61 && ks <= 0x7f)))
1254 {
1255 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1256 commit_iso14755 ();
1257 return; // case-break;
1258 }
1259
1260 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1261 if (i[0] == ks)
1262 {
1263 iso14755buf = ISO_14755_51 | i[1];
1264 commit_iso14755 ();
1265 return; // case-break;
1266 }
1267
1268 scr_bell ();
1269# endif
1270 iso14755buf = 0;
1271 break;
1272 }
1273 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1274 {
1275# if ENABLE_OVERLAY
1276 scr_overlay_off ();
1277# endif
1278 if (iso14755buf & ISO_14755_51)
1279 commit_iso14755 ();
1280#if ISO_14755
1281 else if (iso14755buf & ISO_14755_STARTED)
1282 {
1283 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1284
1285 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1286 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1287 }
1288# endif
1289 else
1290 iso14755buf = 0;
1291 }
1292#endif
1293
1294#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1295 if (!(ev.xkey.state & ControlMask))
1296 slip_wheel_ev.stop ();
1297 else if (ks == XK_Control_L || ks == XK_Control_R)
1298 mouse_slip_wheel_speed = 0;
1299#endif
1300 break; 1411 break;
1301 }
1302 1412
1303 case ButtonPress: 1413 case ButtonPress:
1304 button_press (ev.xbutton); 1414 button_press (ev.xbutton);
1305 break; 1415 break;
1306 1416
… …
1308 button_release (ev.xbutton); 1418 button_release (ev.xbutton);
1309 break; 1419 break;
1310 1420
1311 case ClientMessage: 1421 case ClientMessage:
1312 if (ev.xclient.format == 32 1422 if (ev.xclient.format == 32
1313 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1423 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1314 destroy ();
1315#ifdef OFFIX_DND
1316 /* OffiX Dnd (drag 'n' drop) protocol */
1317 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1318 && (ev.xclient.data.l[0] == DndFile
1319 || ev.xclient.data.l[0] == DndDir
1320 || ev.xclient.data.l[0] == DndLink))
1321 { 1424 {
1322 /* Get Dnd data */ 1425 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1323 Atom ActualType; 1426 {
1324 int ActualFormat; 1427 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1325 unsigned char *data; 1428 {
1326 unsigned long Size, RemainingBytes; 1429 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1327 1430 {
1328 XGetWindowProperty (disp, display->root, 1431 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1329 xa[XA_DNDSELECTION], 1432 destroy ();
1330 0L, 1000000L, 1433 }
1331 False, AnyPropertyType, 1434#if ENABLE_EWMH
1332 &ActualType, &ActualFormat, 1435 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1333 &Size, &RemainingBytes, 1436 XSendEvent (dpy, ev.xclient.window = display->root,
1437 False, SubstructureRedirectMask | SubstructureNotifyMask,
1334 &data); 1438 &ev);
1335 set_string_property (XA_CUT_BUFFER0, data); 1439#endif
1336 XFree (data); 1440 }
1337 selection_paste (display->root, XA_CUT_BUFFER0, true); 1441 }
1338 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); 1442#if ENABLE_XEMBED
1443 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1444 {
1445 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1446 focus_in ();
1447 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1448 focus_out ();
1449 }
1450#endif
1339 } 1451 }
1340#endif /* OFFIX_DND */
1341 break;
1342
1343 case MappingNotify:
1344 XRefreshKeyboardMapping (&ev.xmapping);
1345 break; 1452 break;
1346 1453
1347 /* 1454 /*
1348 * XXX: this is not the _current_ arrangement 1455 * XXX: this is not the _current_ arrangement
1349 * Here's my conclusion: 1456 * Here's my conclusion:
… …
1368 break; 1475 break;
1369 } 1476 }
1370 break; 1477 break;
1371 1478
1372 case FocusIn: 1479 case FocusIn:
1373 if (!TermWin.focus) 1480 if (ev.xfocus.detail != NotifyInferior
1481 && ev.xfocus.detail != NotifyPointer
1482 && ev.xfocus.mode != NotifyGrab)
1483 focus_in ();
1484 break;
1485
1486 case FocusOut:
1487 if (ev.xfocus.detail != NotifyInferior
1488 && ev.xfocus.detail != NotifyPointer
1489 && ev.xfocus.mode != NotifyGrab)
1490 focus_out ();
1491 break;
1492
1493 case ConfigureNotify:
1494 if (ev.xconfigure.window == parent)
1374 { 1495 {
1375 TermWin.focus = 1; 1496 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1376 want_refresh = 1; 1497 ;
1377#ifdef USE_XIM 1498
1378 if (Input_Context != NULL) 1499 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1500
1501 if (want_position_change)
1379 { 1502 {
1380 IMSetStatusPosition (); 1503 int x, y;
1381 XSetICFocus (Input_Context); 1504
1505 if (ev.xconfigure.send_event)
1506 {
1507 x = ev.xconfigure.x;
1508 y = ev.xconfigure.y;
1509 }
1510 else
1511 get_window_origin (x, y);
1512
1513 if (x != parent_x || y != parent_y)
1514 {
1515 parent_x = x;
1516 parent_y = y;
1517 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1518 }
1382 } 1519 }
1383#endif
1384#ifdef CURSOR_BLINK
1385 if (options & Opt_cursorBlink)
1386 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1387#endif
1388#ifdef OFF_FOCUS_FADING
1389 if (rs[Rs_fade])
1390 {
1391 pix_colors = pix_colors_focused;
1392 scr_recolour ();
1393 }
1394#endif
1395 1520
1396 }
1397 break;
1398
1399 case FocusOut:
1400 if (TermWin.focus)
1401 {
1402 TermWin.focus = 0;
1403 want_refresh = 1;
1404
1405#if ENABLE_FRILLS || ISO_14755
1406 iso14755buf = 0;
1407#endif
1408#if ENABLE_OVERLAY
1409 scr_overlay_off ();
1410#endif
1411#ifdef USE_XIM
1412 if (Input_Context != NULL)
1413 XUnsetICFocus (Input_Context);
1414#endif
1415#ifdef CURSOR_BLINK
1416 if (options & Opt_cursorBlink)
1417 cursor_blink_ev.stop ();
1418 hidden_cursor = 0;
1419#endif
1420#ifdef OFF_FOCUS_FADING
1421 if (rs[Rs_fade])
1422 {
1423 pix_colors = pix_colors_unfocused;
1424 scr_recolour ();
1425 }
1426#endif
1427 }
1428 break;
1429
1430 case ConfigureNotify:
1431 if (ev.xconfigure.window == TermWin.parent[0])
1432 {
1433 int height, width;
1434
1435 do
1436 { /* Wrap lots of configures into one */
1437 width = ev.xconfigure.width;
1438 height = ev.xconfigure.height;
1439 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1440 }
1441 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1442
1443 if (szHint.width != width || szHint.height != height) 1521 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1522 {
1445 seen_resize = 1; 1523 seen_resize = 1;
1446 resize_all_windows (width, height, 1); 1524 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1525 }
1448 1526
1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1527 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1450 if (options & Opt_transparent)
1451 check_our_parents ();
1452#endif
1453 } 1528 }
1454 break; 1529 break;
1455 1530
1456 case PropertyNotify: 1531 case PropertyNotify:
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1532 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1461 break; 1533 break;
1462 1534
1463 case SelectionClear: 1535 case SelectionClear:
1464 selection_clear (); 1536 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1465 break;
1466
1467 case SelectionNotify:
1468 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 break; 1537 break;
1471 1538
1472 case SelectionRequest: 1539 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1474 break; 1541 break;
1475 1542
1543 case MapNotify:
1544 mapped = 1;
1545#ifdef TEXT_BLINK
1546 text_blink_ev.start ();
1547#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 break;
1550
1476 case UnmapNotify: 1551 case UnmapNotify:
1477 TermWin.mapped = 0; 1552 mapped = 0;
1478#ifdef TEXT_BLINK 1553#ifdef TEXT_BLINK
1479 text_blink_ev.stop (); 1554 text_blink_ev.stop ();
1480#endif 1555#endif
1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1481 break; 1557 break;
1482
1483 case MapNotify:
1484 TermWin.mapped = 1;
1485#ifdef TEXT_BLINK
1486 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1487#endif
1488 break;
1489
1490#ifdef TRANSPARENT
1491 case ReparentNotify:
1492 rootwin_cb (ev);
1493 break;
1494#endif /* TRANSPARENT */
1495 1558
1496 case GraphicsExpose: 1559 case GraphicsExpose:
1497 case Expose: 1560 case Expose:
1498 if (ev.xany.window == TermWin.vt) 1561 if (ev.xany.window == vt)
1499 { 1562 {
1500 do 1563 do
1564 {
1501 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1502 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1567 }
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1504 1569
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506 1571
1507 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573 {
1508 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1509 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1576 }
1510 1577
1511 scr_refresh (refresh_type); 1578 want_refresh = 1;
1512 } 1579 }
1513 else 1580 else
1514 { 1581 {
1515 XEvent unused_event; 1582 XEvent unused_event;
1516 1583
1517 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1518 ; 1585 ;
1519 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1520 ; 1587 ;
1521 1588
1522 if (isScrollbarWindow (ev.xany.window)) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1523 { 1590 {
1524 scrollBar.setIdle (); 1591 scrollBar.state = SB_STATE_IDLE;
1525 scrollbar_show (0); 1592 scrollBar.show (0);
1526 } 1593 }
1527#ifdef MENUBAR
1528 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1529 menubar_expose ();
1530#endif
1531
1532#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == TermWin.parent[0])
1534 XClearWindow (disp, ev.xany.window);
1535#endif
1536 } 1594 }
1537 break; 1595 break;
1538 1596
1539 case MotionNotify: 1597 case MotionNotify:
1540#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1541 if (hidden_pointer) 1599 if (hidden_pointer)
1542 pointer_unblank (); 1600 pointer_unblank ();
1543#endif 1601#endif
1544#if MENUBAR 1602 if (!bypass_keystate
1545 if (isMenuBarWindow (ev.xany.window)) 1603 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1546 { 1604 || priv_modes & PrivMode_MouseAnyEvent))
1547 menubar_control (ev.xbutton); 1605 mouse_report (ev.xbutton);
1548 break;
1549 }
1550#endif
1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1552 break; 1607 break;
1553 1608
1554 if (ev.xany.window == TermWin.vt) 1609 if (ev.xany.window == vt)
1555 { 1610 {
1611 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1612 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1613 ; // nop
1556 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1614 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1557 { 1615 {
1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1616 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1559 ; 1617 ;
1560 1618
1561 XQueryPointer (disp, TermWin.vt, 1619 XQueryPointer (dpy, vt,
1562 &unused_root, &unused_child, 1620 &unused_root, &unused_child,
1563 &unused_root_x, &unused_root_y, 1621 &unused_root_x, &unused_root_y,
1564 &ev.xbutton.x, &ev.xbutton.y, 1622 &ev.xbutton.x, &ev.xbutton.y,
1565 &ev.xbutton.state); 1623 &ev.xbutton.state);
1566#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1567 /* deal with a `jumpy' mouse */ 1625 /* deal with a `jumpy' mouse */
1568 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1626 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1627#endif
1569 { 1628 {
1570#endif
1571#if ISO_14755 1629#if ISO_14755
1572 // 5.4 1630 // 5.4
1573 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1631 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1574 { 1632 {
1575 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1633 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1578#endif 1636#endif
1579 selection_extend (ev.xbutton.x, ev.xbutton.y, 1637 selection_extend (ev.xbutton.x, ev.xbutton.y,
1580 ev.xbutton.state & Button3Mask ? 2 : 0); 1638 ev.xbutton.state & Button3Mask ? 2 : 0);
1581 1639
1582#ifdef SELECTION_SCROLLING 1640#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1641 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1642 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1643 {
1644 page_dirn scroll_selection_dir;
1586 int dist; 1645 int dist;
1587 1646
1588 /* don't clobber the current delay if we are 1647 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1648 * already in the middle of scrolling.
1590 */ 1649 */
1591 if (!sel_scroll_ev.active) 1650 if (!sel_scroll_ev.is_active ())
1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1651 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1593 1652
1594 /* save the event params so we can highlight 1653 /* save the event params so we can highlight
1595 * the selection in the pending-scroll loop 1654 * the selection in the pending-scroll loop
1596 */ 1655 */
1597 selection_save_x = ev.xbutton.x; 1656 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1657 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1658 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1659
1601 /* calc number of lines to scroll */ 1660 /* calc number of lines to scroll */
1602 if (ev.xbutton.y < TermWin.int_bwidth) 1661 if (ev.xbutton.y < int_bwidth)
1603 { 1662 {
1604 scroll_selection_dir = UP; 1663 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1664 dist = int_bwidth - ev.xbutton.y;
1606 } 1665 }
1607 else 1666 else
1608 { 1667 {
1609 scroll_selection_dir = DN; 1668 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1669 dist = ev.xbutton.y - (int_bwidth + vt_height);
1611 } 1670 }
1612 1671
1613 scroll_selection_lines = Pixel2Height (dist) 1672 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1673 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1674 + 1;
1616 MIN_IT (scroll_selection_lines, 1675 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1676 SELECTION_SCROLL_MAX_LINES);
1677 scroll_selection_lines *= scroll_selection_dir;
1618 } 1678 }
1619 else 1679 else
1620 { 1680 {
1621 /* we are within the text window, so we 1681 /* we are within the text window, so we
1622 * shouldn't be scrolling 1682 * shouldn't be scrolling
1623 */ 1683 */
1624 if (sel_scroll_ev.active)
1625 sel_scroll_ev.stop(); 1684 sel_scroll_ev.stop();
1626 } 1685 }
1627#endif 1686#endif
1628#ifdef MOUSE_THRESHOLD
1629 } 1687 }
1630#endif
1631 } 1688 }
1632 } 1689 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1634 { 1691 {
1635 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1636 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1637 ; 1694 ;
1638 1695
1639 XQueryPointer (disp, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1640 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1641 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1642 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1643 &unused_mask); 1700 &unused_mask);
1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1645 scrollbar_size ()); 1702 scrollBar.size ());
1646 scr_refresh (refresh_type);
1647 refresh_limit = 0; 1703 want_refresh = 1;
1648 scrollbar_show (1); 1704 scrollBar.show (1);
1649 } 1705 }
1650 break; 1706 break;
1651 } 1707 }
1652}
1653 1708
1654#if TRANSPARENT 1709#if defined(CURSOR_BLINK)
1655void 1710 if (ev.type == KeyPress)
1711 cursor_blink_reset ();
1712#endif
1713
1714#if defined(POINTER_BLANK)
1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1716 {
1717 if (ev.type == MotionNotify
1718 || ev.type == ButtonPress
1719 || ev.type == ButtonRelease)
1720 if (hidden_pointer)
1721 pointer_unblank ();
1722
1723 if (ev.type == KeyPress && hidden_pointer == 0)
1724 pointer_blank ();
1725 }
1726#endif
1727
1728 refresh_check ();
1729}
1730
1731#if ENABLE_FRILLS
1732void ecb_cold
1733rxvt_term::set_urgency (bool enable)
1734{
1735 if (enable == urgency_hint)
1736 return;
1737
1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1739 {
1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1741 XSetWMHints (dpy, parent, h);
1742 urgency_hint = enable;
1743 XFree (h);
1744 }
1745}
1746#endif
1747
1748void ecb_cold
1749rxvt_term::focus_in ()
1750{
1751 if (!focus)
1752 {
1753 focus = 1;
1754 want_refresh = 1;
1755
1756#if USE_XIM
1757 if (Input_Context != NULL)
1758 {
1759 im_set_position ();
1760 XSetICFocus (Input_Context);
1761 }
1762#endif
1763#if CURSOR_BLINK
1764 if (option (Opt_cursorBlink))
1765 cursor_blink_ev.again ();
1766#endif
1767#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade])
1769 {
1770 pix_colors = pix_colors_focused;
1771 scr_recolor ();
1772 }
1773#endif
1774#if ENABLE_FRILLS
1775 if (option (Opt_urgentOnBell))
1776 set_urgency (0);
1777
1778 if (priv_modes & PrivMode_FocusEvent)
1779 tt_printf ("\x1b[I");
1780#endif
1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1783 }
1784}
1785
1786void ecb_cold
1787rxvt_term::focus_out ()
1788{
1789 if (focus)
1790 {
1791 focus = 0;
1792 want_refresh = 1;
1793
1794#if ENABLE_FRILLS
1795 if (option (Opt_urgentOnBell))
1796 set_urgency (0);
1797
1798 if (priv_modes & PrivMode_FocusEvent)
1799 tt_printf ("\x1b[O");
1800#endif
1801#if ENABLE_FRILLS || ISO_14755
1802 if (iso14755buf)
1803 {
1804 iso14755buf = 0;
1805# if ISO_14755
1806 scr_overlay_off ();
1807# endif
1808 }
1809#endif
1810#if USE_XIM
1811 if (Input_Context != NULL)
1812 XUnsetICFocus (Input_Context);
1813#endif
1814#if CURSOR_BLINK
1815 if (option (Opt_cursorBlink))
1816 cursor_blink_ev.stop ();
1817
1818 hidden_cursor = 0;
1819#endif
1820#if OFF_FOCUS_FADING
1821 if (rs[Rs_fade])
1822 {
1823 pix_colors = pix_colors_unfocused;
1824 scr_recolor ();
1825 }
1826#endif
1827
1828 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1829 }
1830}
1831
1832void ecb_cold
1833rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1834{
1835#if OFF_FOCUS_FADING
1836 if (rs[Rs_fade])
1837 {
1838 if (!first_time)
1839 pix_colors_focused [idx].free (this);
1840
1841 rgba c;
1842 pix_colors [Color_fade].get (c);
1843 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1844 }
1845#endif
1846}
1847
1848#if ENABLE_PERL
1849void ecb_hot
1656rxvt_term::rootwin_cb (XEvent &ev) 1850rxvt_term::rootwin_cb (XEvent &ev)
1657{ 1851{
1658 SET_R (this); 1852 make_current ();
1659 SET_LOCALE (locale); 1853
1854 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1855 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1856 return;
1660 1857
1661 switch (ev.type) 1858 switch (ev.type)
1662 { 1859 {
1663 case PropertyNotify: 1860 case PropertyNotify:
1664 /* 1861 /*
1665 * if user used some Esetroot compatible prog to set the root bg, 1862 * if user used some Esetroot compatible prog to set the root bg,
1666 * use the property to determine the pixmap. We use it later on. 1863 * use the property to determine the pixmap. We use it later on.
1667 */ 1864 */
1668 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1865 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1669 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1866 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1670 return; 1867 {
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869 }
1671 1870
1672 /* FALLTHROUGH */
1673 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1675 want_refresh = want_full_refresh = 1;
1676 break; 1871 break;
1677 } 1872 }
1873
1874 refresh_check ();
1678} 1875}
1679#endif 1876#endif
1680 1877
1681void 1878void
1682rxvt_term::button_press (XButtonEvent &ev) 1879rxvt_term::button_press (XButtonEvent &ev)
1683{ 1880{
1684 int reportmode = 0, clickintime; 1881 int reportmode = 0, clickintime;
1685 1882
1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1883 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1884
1687 if (!bypass_keystate) 1885 if (!bypass_keystate)
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1886 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1887
1690 /* 1888 /*
1691 * VT window processing of button press 1889 * VT window processing of button press
1692 */ 1890 */
1693 if (ev.window == TermWin.vt) 1891 if (ev.window == vt)
1694 { 1892 {
1893 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1894 return;
1895
1695#if ISO_14755 1896#if ISO_14755
1696 // 5.4 1897 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1898 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1899 {
1699 iso14755_54 (ev.x, ev.y); 1900 iso14755_54 (ev.x, ev.y);
1700 return; 1901 return;
1701 } 1902 }
1702#endif 1903#endif
1703 1904
1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1905 clickintime = ev.time - MEvent.time < multiClickTime;
1705 1906
1706 if (reportmode) 1907 if (reportmode)
1707 { 1908 {
1708 /* mouse report from vt window */ 1909 /* mouse report from vt window */
1709 /* save the xbutton state (for ButtonRelease) */ 1910 /* save the xbutton state (for ButtonRelease) */
1710 MEvent.state = ev.state; 1911 MEvent.state = ev.state;
1711#ifdef MOUSE_REPORT_DOUBLECLICK 1912#ifdef MOUSE_REPORT_DOUBLECLICK
1712 if (ev.button == MEvent.button && clickintime) 1913 if (ev.button == MEvent.button && clickintime)
1713 { 1914 {
1714 /* same button, within alloted time */ 1915 /* same button, within allowed time */
1715 MEvent.clicks++; 1916 MEvent.clicks++;
1917
1716 if (MEvent.clicks > 1) 1918 if (MEvent.clicks > 1)
1717 { 1919 {
1718 /* only report double clicks */ 1920 /* only report double clicks */
1719 MEvent.clicks = 2; 1921 MEvent.clicks = 2;
1720 mouse_report (ev); 1922 mouse_report (ev);
… …
1732 mouse_report (ev); 1934 mouse_report (ev);
1733 } 1935 }
1734#else 1936#else
1735 MEvent.button = ev.button; 1937 MEvent.button = ev.button;
1736 mouse_report (ev); 1938 mouse_report (ev);
1737#endif /* MOUSE_REPORT_DOUBLECLICK */ 1939#endif /* MOUSE_REPORT_DOUBLECLICK */
1738 1940
1739 } 1941 }
1740 else 1942 else
1741 { 1943 {
1742 if (ev.button != MEvent.button) 1944 if (ev.button != MEvent.button)
… …
1752#else 1954#else
1753 selection.rect = false; 1955 selection.rect = false;
1754#endif 1956#endif
1755 1957
1756 /* allow shift+left click to extend selection */ 1958 /* allow shift+left click to extend selection */
1757 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1959 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1758 { 1960 {
1759 if (MEvent.button == Button1 && clickintime) 1961 if (MEvent.button == Button1 && clickintime)
1760 selection_rotate (ev.x, ev.y); 1962 selection_rotate (ev.x, ev.y);
1761 else 1963 else
1762 selection_extend (ev.x, ev.y, 1); 1964 selection_extend (ev.x, ev.y, 1);
… …
1790 } 1992 }
1791 1993
1792 /* 1994 /*
1793 * Scrollbar window processing of button press 1995 * Scrollbar window processing of button press
1794 */ 1996 */
1795 if (isScrollbarWindow (ev.window)) 1997 if (scrollBar.state && ev.window == scrollBar.win)
1796 { 1998 {
1797 scrollBar.setIdle (); 1999 page_dirn direction = NO_DIR;
2000
2001 if (scrollBar.upButton (ev.y))
2002 direction = UP; /* up */
2003 else if (scrollBar.dnButton (ev.y))
2004 direction = DN; /* down */
2005
2006 scrollBar.state = SB_STATE_IDLE;
1798 /* 2007 /*
1799 * Rxvt-style scrollbar: 2008 * Rxvt-style scrollbar:
1800 * move up if mouse is above slider 2009 * move up if mouse is above slider
1801 * move dn if mouse is below slider 2010 * move dn if mouse is below slider
1802 * 2011 *
… …
1811 /* 2020 /*
1812 * Mouse report disabled scrollbar: 2021 * Mouse report disabled scrollbar:
1813 * arrow buttons - send up/down 2022 * arrow buttons - send up/down
1814 * click on scrollbar - send pageup/down 2023 * click on scrollbar - send pageup/down
1815 */ 2024 */
1816 if ((scrollBar.style == R_SB_NEXT 2025 if (direction == UP)
1817 && scrollbarnext_upButton (ev.y))
1818 || (scrollBar.style == R_SB_RXVT
1819 && scrollbarrxvt_upButton (ev.y)))
1820 tt_printf ("\033[A"); 2026 tt_printf ("\033[A");
1821 else if ((scrollBar.style == R_SB_NEXT 2027 else if (direction == DN)
1822 && scrollbarnext_dnButton (ev.y))
1823 || (scrollBar.style == R_SB_RXVT
1824 && scrollbarrxvt_dnButton (ev.y)))
1825 tt_printf ("\033[B"); 2028 tt_printf ("\033[B");
1826 else 2029 else
1827 switch (ev.button) 2030 switch (ev.button)
1828 { 2031 {
1829 case Button2: 2032 case Button2:
… …
1836 tt_printf ("\033[5~"); 2039 tt_printf ("\033[5~");
1837 break; 2040 break;
1838 } 2041 }
1839 } 2042 }
1840 else 2043 else
1841#endif /* NO_SCROLLBAR_REPORT */ 2044#endif /* NO_SCROLLBAR_REPORT */
1842
1843 {
1844 char upordown = 0;
1845
1846 if (scrollBar.style == R_SB_NEXT)
1847 { 2045 {
1848 if (scrollbarnext_upButton (ev.y)) 2046 if (direction != NO_DIR)
1849 upordown = -1; /* up */
1850 else if (scrollbarnext_dnButton (ev.y))
1851 upordown = 1; /* down */
1852 }
1853 else if (scrollBar.style == R_SB_RXVT)
1854 {
1855 if (scrollbarrxvt_upButton (ev.y))
1856 upordown = -1; /* up */
1857 else if (scrollbarrxvt_dnButton (ev.y))
1858 upordown = 1; /* down */
1859 }
1860 if (upordown)
1861 { 2047 {
1862#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2049 if (!cont_scroll_ev.is_active ())
1863 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2050 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1864#endif 2051#endif
1865 if (scr_page (upordown < 0 ? UP : DN, 1)) 2052 if (scr_page (direction, 1))
1866 { 2053 {
1867 if (upordown < 0) 2054 if (direction == UP)
1868 scrollBar.setUp (); 2055 scrollBar.state = SB_STATE_UP;
1869 else 2056 else
1870 scrollBar.setDn (); 2057 scrollBar.state = SB_STATE_DOWN;
1871 } 2058 }
1872 } 2059 }
1873 else 2060 else
1874 switch (ev.button) 2061 switch (ev.button)
1875 { 2062 {
1876 case Button2: 2063 case Button2:
1877 switch (scrollbar_align) 2064 switch (scrollBar.align)
1878 { 2065 {
1879 case R_SB_ALIGN_TOP: 2066 case SB_ALIGN_TOP:
1880 csrO = 0; 2067 csrO = 0;
1881 break; 2068 break;
1882 case R_SB_ALIGN_CENTRE: 2069 case SB_ALIGN_CENTRE:
1883 csrO = (scrollBar.bot - scrollBar.top) / 2; 2070 csrO = (scrollBar.bot - scrollBar.top) / 2;
1884 break; 2071 break;
1885 case R_SB_ALIGN_BOTTOM: 2072 case SB_ALIGN_BOTTOM:
1886 csrO = scrollBar.bot - scrollBar.top; 2073 csrO = scrollBar.bot - scrollBar.top;
1887 break; 2074 break;
1888 } 2075 }
1889 2076
1890 if (scrollBar.style == R_SB_XTERM 2077 if (scrollBar.style == SB_STYLE_XTERM
1891 || scrollbar_above_slider (ev.y) 2078 || scrollBar.above_slider (ev.y)
1892 || scrollbar_below_slider (ev.y)) 2079 || scrollBar.below_slider (ev.y))
1893 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2080 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
1894 2081
1895 scrollBar.setMotion (); 2082 scrollBar.state = SB_STATE_MOTION;
1896 break; 2083 break;
1897 2084
1898 case Button1: 2085 case Button1:
1899 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2086 if (scrollBar.align == SB_ALIGN_CENTRE)
1900 csrO = ev.y - scrollBar.top; 2087 csrO = ev.y - scrollBar.top;
1901 /* FALLTHROUGH */ 2088 /* FALLTHROUGH */
1902 2089
1903 case Button3: 2090 case Button3:
1904 if (scrollBar.style != R_SB_XTERM) 2091 if (scrollBar.style != SB_STYLE_XTERM)
1905 { 2092 {
1906 if (scrollbar_above_slider (ev.y)) 2093 if (scrollBar.above_slider (ev.y))
1907# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
1908 scr_page (UP, TermWin.nrow - 1); 2095 scr_page (UP, nrow - 1);
1909# else 2096# else
1910 scr_page (UP, TermWin.nrow / 4); 2097 scr_page (UP, nrow / 4);
1911# endif 2098# endif
1912 else if (scrollbar_below_slider (ev.y)) 2099 else if (scrollBar.below_slider (ev.y))
1913# ifdef RXVT_SCROLL_FULL 2100# ifdef RXVT_SCROLL_FULL
1914 scr_page (DN, TermWin.nrow - 1); 2101 scr_page (DN, nrow - 1);
1915# else 2102# else
1916 scr_page (DN, TermWin.nrow / 4); 2103 scr_page (DN, nrow / 4);
1917# endif 2104# endif
1918 else 2105 else
1919 scrollBar.setMotion (); 2106 scrollBar.state = SB_STATE_MOTION;
1920 } 2107 }
1921 else 2108 else
1922 { 2109 {
1923 scr_page ((ev.button == Button1 ? DN : UP), 2110 scr_page ((ev.button == Button1 ? DN : UP),
1924 (TermWin.nrow 2111 (nrow
1925 * scrollbar_position (ev.y) 2112 * scrollBar.position (ev.y)
1926 / scrollbar_size ())); 2113 / scrollBar.size ()));
1927 } 2114 }
1928 2115
1929 break; 2116 break;
1930 } 2117 }
1931 } 2118 }
2119
1932 return; 2120 return;
1933 } 2121 }
1934#if MENUBAR
1935 /*
1936 * Menubar window processing of button press
1937 */
1938 if (isMenuBarWindow (ev.window))
1939 menubar_control (ev);
1940#endif
1941} 2122}
1942 2123
1943void 2124void
1944rxvt_term::button_release (XButtonEvent &ev) 2125rxvt_term::button_release (XButtonEvent &ev)
1945{ 2126{
… …
1947 2128
1948 csrO = 0; /* reset csr Offset */ 2129 csrO = 0; /* reset csr Offset */
1949 if (!bypass_keystate) 2130 if (!bypass_keystate)
1950 reportmode = !! (priv_modes & PrivMode_mouse_report); 2131 reportmode = !! (priv_modes & PrivMode_mouse_report);
1951 2132
1952 if (scrollbar_isUpDn ()) 2133 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1953 { 2134 {
1954 scrollBar.setIdle (); 2135 scrollBar.state = SB_STATE_IDLE;
1955 scrollbar_show (0); 2136 scrollBar.show (0);
1956#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1957 refresh_type &= ~SMOOTH_REFRESH;
1958#endif
1959 } 2137 }
1960 2138
1961#ifdef SELECTION_SCROLLING 2139#ifdef SELECTION_SCROLLING
1962 if (sel_scroll_ev.active)
1963 sel_scroll_ev.stop(); 2140 sel_scroll_ev.stop();
1964#endif 2141#endif
1965 2142
1966 if (ev.window == TermWin.vt) 2143 if (ev.window == vt)
1967 { 2144 {
2145 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2146 return;
2147
1968#if ISO_14755 2148#if ISO_14755
1969 // 5.4 2149 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2150 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return; 2151 return;
1972#endif 2152#endif
2153
1973 if (reportmode) 2154 if (reportmode)
1974 { 2155 {
1975 /* mouse report from vt window */ 2156 /* mouse report from vt window */
1976 /* don't report release of wheel "buttons" */ 2157 /* don't report release of wheel "buttons" */
1977 if (ev.button >= 4) 2158 if (ev.button >= 4 && ev.button <= 7)
1978 return; 2159 return;
1979#ifdef MOUSE_REPORT_DOUBLECLICK 2160#ifdef MOUSE_REPORT_DOUBLECLICK
1980 /* only report the release of 'slow' single clicks */ 2161 /* only report the release of 'slow' single clicks */
1981 if (MEvent.button != AnyButton 2162 if (MEvent.button != AnyButton
1982 && (ev.button != MEvent.button 2163 && (ev.button != MEvent.button
1983 || (ev.time - MEvent.time 2164 || (ev.time - MEvent.time
1984 > MULTICLICK_TIME / 2))) 2165 > multiClickTime / 2)))
1985 { 2166 {
1986 MEvent.clicks = 0; 2167 MEvent.clicks = 0;
1987 MEvent.button = AnyButton; 2168 MEvent.button = ev.button;
1988 mouse_report (ev); 2169 mouse_report (ev);
1989 } 2170 }
1990#else /* MOUSE_REPORT_DOUBLECLICK */ 2171#else /* MOUSE_REPORT_DOUBLECLICK */
1991 MEvent.button = AnyButton; 2172 MEvent.button = ev.button;
1992 mouse_report (ev); 2173 mouse_report (ev);
1993#endif /* MOUSE_REPORT_DOUBLECLICK */ 2174#endif /* MOUSE_REPORT_DOUBLECLICK */
1994 return; 2175 return;
1995 } 2176 }
1996 2177
1997 /* 2178 /*
1998 * dumb hack to compensate for the failure of click-and-drag 2179 * dumb hack to compensate for the failure of click-and-drag
… …
2007 { 2188 {
2008 case Button1: 2189 case Button1:
2009 case Button3: 2190 case Button3:
2010 selection_make (ev.time); 2191 selection_make (ev.time);
2011 break; 2192 break;
2193
2012 case Button2: 2194 case Button2:
2013 selection_request (ev.time, ev.x, ev.y); 2195 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2196 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2014 break; 2197 break;
2198
2015#ifdef MOUSE_WHEEL 2199#ifdef MOUSE_WHEEL
2016 case Button4: 2200 case Button4:
2017 case Button5: 2201 case Button5:
2018 { 2202 {
2019 int i; 2203 int lines;
2020 page_dirn v; 2204 page_dirn dirn;
2021 2205
2022 v = ev.button == Button4 ? UP : DN; 2206 dirn = ev.button == Button4 ? UP : DN;
2023 2207
2024 if (ev.state & ShiftMask) 2208 if (ev.state & ShiftMask)
2025 i = 1; 2209 lines = 1;
2026 else if (options & Opt_mouseWheelScrollPage) 2210 else if (option (Opt_mouseWheelScrollPage))
2027 i = TermWin.nrow - 1; 2211 lines = nrow - 1;
2028 else 2212 else
2029 i = 5; 2213 lines = 5;
2030 2214
2031# ifdef MOUSE_SLIP_WHEELING 2215# ifdef MOUSE_SLIP_WHEELING
2032 if (ev.state & ControlMask) 2216 if (ev.state & ControlMask)
2033 { 2217 {
2034 mouse_slip_wheel_speed += v ? -1 : 1; 2218 mouse_slip_wheel_speed += dirn;
2035 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2219 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2036 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2037 2220
2038 if (slip_wheel_ev.at < NOW) 2221 if (!slip_wheel_ev.is_active ())
2039 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2222 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2040
2041 slip_wheel_ev.start ();
2042 } 2223 }
2043 else 2224 else
2225# endif
2044 { 2226 {
2045# endif
2046# ifdef JUMP_MOUSE_WHEEL
2047 scr_page (v, i); 2227 scr_page (dirn, lines);
2048 scr_refresh (SMOOTH_REFRESH);
2049 scrollbar_show (1); 2228 scrollBar.show (1);
2050# else
2051 while (i--)
2052 {
2053 scr_page (v, 1);
2054 scr_refresh (SMOOTH_REFRESH);
2055 scrollbar_show (1);
2056 }
2057# endif
2058# ifdef MOUSE_SLIP_WHEELING
2059 } 2229 }
2060#endif
2061 } 2230 }
2062 break; 2231 break;
2063#endif 2232#endif
2064 } 2233 }
2065 } 2234 }
2066#ifdef MENUBAR
2067 else if (isMenuBarWindow (ev.window))
2068 menubar_control (ev);
2069#endif
2070} 2235}
2071
2072#ifdef TRANSPARENT
2073#if TINTING
2074/* taken from aterm-0.4.2 */
2075
2076typedef uint32_t RUINT32T;
2077
2078void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2079{
2080 int sh_r, sh_g, sh_b;
2081 RUINT32T mask_r, mask_g, mask_b;
2082 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2083 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2084 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2085 int i;
2086
2087 Visual *visual = display->visual;
2088
2089 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2090
2091 /* for convenience */
2092 mask_r = visual->red_mask;
2093 mask_g = visual->green_mask;
2094 mask_b = visual->blue_mask;
2095
2096 /* boring lookup table pre-initialization */
2097 switch (srcImage->bits_per_pixel) {
2098 case 15:
2099 if ((mask_r != 0x7c00) ||
2100 (mask_g != 0x03e0) ||
2101 (mask_b != 0x001f))
2102 return;
2103 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2104 lookup_r = lookup;
2105 lookup_g = lookup+32;
2106 lookup_b = lookup+32+32;
2107 sh_r = 10;
2108 sh_g = 5;
2109 sh_b = 0;
2110 break;
2111 case 16:
2112 if ((mask_r != 0xf800) ||
2113 (mask_g != 0x07e0) ||
2114 (mask_b != 0x001f))
2115 return;
2116 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2117 lookup_r = lookup;
2118 lookup_g = lookup+32;
2119 lookup_b = lookup+32+64;
2120 sh_r = 11;
2121 sh_g = 5;
2122 sh_b = 0;
2123 break;
2124 case 24:
2125 if ((mask_r != 0xff0000) ||
2126 (mask_g != 0x00ff00) ||
2127 (mask_b != 0x0000ff))
2128 return;
2129 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2130 lookup_r = lookup;
2131 lookup_g = lookup+256;
2132 lookup_b = lookup+256+256;
2133 sh_r = 16;
2134 sh_g = 8;
2135 sh_b = 0;
2136 break;
2137 case 32:
2138 if ((mask_r != 0xff0000) ||
2139 (mask_g != 0x00ff00) ||
2140 (mask_b != 0x0000ff))
2141 return;
2142 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2143 lookup_r = lookup;
2144 lookup_g = lookup+256;
2145 lookup_b = lookup+256+256;
2146 sh_r = 16;
2147 sh_g = 8;
2148 sh_b = 0;
2149 break;
2150 default:
2151 return; /* we do not support this color depth */
2152 }
2153
2154 /* prepare limits for color transformation (each channel is handled separately) */
2155 if (shade < 0) {
2156 shade = -shade;
2157 if (shade < 0) shade = 0;
2158 if (shade > 100) shade = 100;
2159
2160 lower_lim_r = 65535-rm;
2161 lower_lim_g = 65535-gm;
2162 lower_lim_b = 65535-bm;
2163
2164 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2165 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2166 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2167
2168 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2169 } else {
2170 if (shade < 0) shade = 0;
2171 if (shade > 100) shade = 100;
2172
2173 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2174
2175 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2176 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2177 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2178 }
2179
2180 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2181 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2182 {
2183 unsigned int tmp;
2184
2185 tmp = lower_lim_r;
2186 lower_lim_r = lower_lim_b;
2187 lower_lim_b = tmp;
2188
2189 tmp = upper_lim_r;
2190 upper_lim_r = upper_lim_b;
2191 upper_lim_b = tmp;
2192 }
2193
2194 /* fill our lookup tables */
2195 for (i = 0; i <= mask_r>>sh_r; i++)
2196 {
2197 RUINT32T tmp;
2198 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2199 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2200 lookup_r[i] = (tmp/65535)<<sh_r;
2201 }
2202 for (i = 0; i <= mask_g>>sh_g; i++)
2203 {
2204 RUINT32T tmp;
2205 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2206 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2207 lookup_g[i] = (tmp/65535)<<sh_g;
2208 }
2209 for (i = 0; i <= mask_b>>sh_b; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2213 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2214 lookup_b[i] = (tmp/65535)<<sh_b;
2215 }
2216
2217 /* apply table to input image (replacing colors by newly calculated ones) */
2218 switch (srcImage->bits_per_pixel)
2219 {
2220 case 15:
2221 {
2222 unsigned short *p1, *pf, *p, *pl;
2223 p1 = (unsigned short *) srcImage->data;
2224 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2225 while (p1 < pf)
2226 {
2227 p = p1;
2228 pl = p1 + srcImage->width;
2229 for (; p < pl; p++)
2230 {
2231 *p = lookup_r[(*p & 0x7c00)>>10] |
2232 lookup_g[(*p & 0x03e0)>> 5] |
2233 lookup_b[(*p & 0x001f)];
2234 }
2235 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2236 }
2237 break;
2238 }
2239 case 16:
2240 {
2241 unsigned short *p1, *pf, *p, *pl;
2242 p1 = (unsigned short *) srcImage->data;
2243 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2244 while (p1 < pf)
2245 {
2246 p = p1;
2247 pl = p1 + srcImage->width;
2248 for (; p < pl; p++)
2249 {
2250 *p = lookup_r[(*p & 0xf800)>>11] |
2251 lookup_g[(*p & 0x07e0)>> 5] |
2252 lookup_b[(*p & 0x001f)];
2253 }
2254 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2255 }
2256 break;
2257 }
2258 case 24:
2259 {
2260 unsigned char *p1, *pf, *p, *pl;
2261 p1 = (unsigned char *) srcImage->data;
2262 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2263 while (p1 < pf)
2264 {
2265 p = p1;
2266 pl = p1 + srcImage->width * 3;
2267 for (; p < pl; p += 3)
2268 {
2269 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2270 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2271 p[2] = lookup_r[(p[2] & 0x0000ff)];
2272 }
2273 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2274 }
2275 break;
2276 }
2277 case 32:
2278 {
2279 RUINT32T *p1, *pf, *p, *pl;
2280 p1 = (RUINT32T *) srcImage->data;
2281 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2282
2283 while (p1 < pf)
2284 {
2285 p = p1;
2286 pl = p1 + srcImage->width;
2287 for (; p < pl; p++)
2288 {
2289 *p = lookup_r[(*p & 0xff0000)>>16] |
2290 lookup_g[(*p & 0x00ff00)>> 8] |
2291 lookup_b[(*p & 0x0000ff)] |
2292 (*p & ~0xffffff);
2293 }
2294 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2295 }
2296 break;
2297 }
2298 }
2299
2300 free (lookup);
2301}
2302#endif
2303
2304/*
2305 * Check our parents are still who we think they are.
2306 * Do transparency updates if required
2307 */
2308int
2309rxvt_term::check_our_parents ()
2310{
2311 int i, pchanged, aformat, have_pixmap, rootdepth;
2312 unsigned long nitems, bytes_after;
2313 Atom atype;
2314 unsigned char *prop = NULL;
2315 Window root, oldp, *list;
2316 Pixmap rootpixmap = None;
2317 XWindowAttributes wattr, wrootattr;
2318 dDisp;
2319
2320 pchanged = 0;
2321
2322 if (!(options & Opt_transparent))
2323 return pchanged; /* Don't try any more */
2324
2325 XGetWindowAttributes (disp, display->root, &wrootattr);
2326 rootdepth = wrootattr.depth;
2327
2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2329
2330 if (rootdepth != wattr.depth)
2331 {
2332 if (am_transparent)
2333 {
2334 pchanged = 1;
2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2336 am_transparent = am_pixmap_trans = 0;
2337 }
2338
2339 return pchanged; /* Don't try any more */
2340 }
2341
2342 /* Get all X ops out of the queue so that our information is up-to-date. */
2343 XSync (disp, False);
2344
2345 /*
2346 * Make the frame window set by the window manager have
2347 * the root background. Some window managers put multiple nested frame
2348 * windows for each client, so we have to take care about that.
2349 */
2350 i = (xa[XA_XROOTPMAP_ID]
2351 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2352 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2353 &nitems, &bytes_after, &prop) == Success);
2354
2355 if (!i || prop == NULL)
2356 i = (xa[XA_ESETROOT_PMAP_ID]
2357 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2359 &nitems, &bytes_after, &prop) == Success);
2360
2361 if (!i || prop == NULL
2362#if TINTING
2363 || !rs[Rs_color + Color_tint]
2364#endif
2365 )
2366 have_pixmap = 0;
2367 else
2368 {
2369 have_pixmap = 1;
2370 rootpixmap = *(Pixmap *)prop;
2371 XFree (prop);
2372 }
2373
2374 if (have_pixmap)
2375 {
2376 /*
2377 * Copy display->root pixmap transparency
2378 */
2379 int sx, sy, nx, ny;
2380 unsigned int nw, nh;
2381 Window cr;
2382 XImage *image;
2383 GC gc;
2384 XGCValues gcvalue;
2385
2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2387 0, 0, &sx, &sy, &cr);
2388 nw = (unsigned int)szHint.width;
2389 nh = (unsigned int)szHint.height;
2390 nx = ny = 0;
2391
2392 if (sx < 0)
2393 {
2394 nw += sx;
2395 nx = -sx;
2396 sx = 0;
2397 }
2398
2399 if (sy < 0)
2400 {
2401 nh += sy;
2402 ny = -sy;
2403 sy = 0;
2404 }
2405
2406 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2407 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2408
2409 XSync (disp, False);
2410 allowedxerror = -1;
2411 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2412
2413 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2414 /* XXX: may need a delay here? */
2415 allowedxerror = 0;
2416
2417 if (image == NULL)
2418 {
2419 if (am_transparent && am_pixmap_trans)
2420 {
2421 pchanged = 1;
2422 if (TermWin.pixmap != None)
2423 {
2424 XFreePixmap (disp, TermWin.pixmap);
2425 TermWin.pixmap = None;
2426 }
2427 }
2428
2429 am_pixmap_trans = 0;
2430 }
2431 else
2432 {
2433 if (TermWin.pixmap != None)
2434 XFreePixmap (disp, TermWin.pixmap);
2435
2436#if TINTING
2437 if (ISSET_PIXCOLOR (Color_tint))
2438 {
2439 unsigned short rm, gm, bm;
2440 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2441
2442 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2443
2444 ShadeXImage (display, image, shade, rm, gm, bm);
2445 }
2446#endif
2447
2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2449 szHint.width, szHint.height, image->depth);
2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2452 nx, ny, image->width, image->height);
2453 XFreeGC (disp, gc);
2454 XDestroyImage (image);
2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2456 XClearWindow (disp, TermWin.parent[0]);
2457
2458 if (!am_transparent || !am_pixmap_trans)
2459 pchanged = 1;
2460
2461 am_transparent = am_pixmap_trans = 1;
2462 }
2463 }
2464
2465 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2467 else
2468 {
2469 unsigned int n;
2470 /*
2471 * InheritPixmap transparency
2472 */
2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2474 {
2475 oldp = TermWin.parent[i];
2476 XQueryTree (disp, TermWin.parent[i - 1], &root,
2477 &TermWin.parent[i], &list, &n);
2478 XFree (list);
2479
2480 if (TermWin.parent[i] == display->root)
2481 {
2482 if (oldp != None)
2483 pchanged = 1;
2484
2485 break;
2486 }
2487
2488 if (oldp != TermWin.parent[i])
2489 pchanged = 1;
2490 }
2491
2492 n = 0;
2493
2494 if (pchanged)
2495 {
2496 for (; n < (unsigned int)i; n++)
2497 {
2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500 {
2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2502 break;
2503 }
2504 }
2505 }
2506
2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2508 {
2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2511 am_transparent = 0;
2512 /* XXX: also turn off Opt_transparent? */
2513 }
2514 else
2515 {
2516#if WAIT_FOR_WM
2517 /* wait (an arbitrary period) for the WM to do its thing
2518 * needed for fvwm2.2.2 (and before?) */
2519 sleep (1);
2520#endif
2521 for (n = 0; n < (unsigned int)i; n++)
2522 {
2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2524 XClearWindow (disp, TermWin.parent[n]);
2525 }
2526
2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2528 am_transparent = 1;
2529 }
2530
2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2532 TermWin.parent[i] = None;
2533 }
2534
2535 if (scrollBar.win)
2536 {
2537 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2538 scrollBar.setIdle ();
2539 scrollbar_show (0);
2540 }
2541
2542 if (am_transparent)
2543 {
2544 want_refresh = want_full_refresh = 1;
2545 if (am_pixmap_trans)
2546 flush ();
2547 }
2548
2549 return pchanged;
2550}
2551#endif
2552 2236
2553/*}}} */ 2237/*}}} */
2554 2238
2555bool 2239void ecb_hot
2556rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2557{ 2241{
2558 bool flag = false;
2559 unicode_t ch = NOCHAR; 2242 wchar_t ch = NOCHAR;
2560 unsigned char *seq_begin; // remember start of esc-sequence here 2243 char *seq_begin; // remember start of esc-sequence here
2561 2244
2562 for (;;) 2245 for (;;)
2563 { 2246 {
2564 if (ch == NOCHAR) 2247 if (ecb_unlikely (ch == NOCHAR))
2565 { 2248 {
2566 seq_begin = cmdbuf_ptr; 2249 seq_begin = cmdbuf_ptr;
2567 ch = next_char (); 2250 ch = next_char ();
2568 }
2569 2251
2570 if (ch == NOCHAR) // TODO: improve 2252 if (ch == NOCHAR)
2571 break; 2253 break;
2254 }
2572 2255
2573 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2256 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2574 { 2257 {
2575 if (!seen_input) 2258 if (ecb_unlikely (!seen_input))
2576 { 2259 {
2577 seen_input = 1; 2260 seen_input = 1;
2578 // many badly-written programs (e.g. jed) contain a race condition: 2261 // many badly-written programs (e.g. jed) contain a race condition:
2579 // they first read the screensize and then install a SIGWINCH handler. 2262 // they first read the screensize and then install a SIGWINCH handler.
2580 // some window managers resize the window early, and these programs 2263 // some window managers resize the window early, and these programs
2581 // then sometimes get the size wrong. 2264 // then sometimes get the size wrong.
2582 // unfortunately other programs are even more buggy and dislike 2265 // unfortunately other programs are even more buggy and dislike
2583 // being sent SIGWINCH, so only do it when we were in fact being 2266 // being sent SIGWINCH, so only do it when we were in fact being
2584 // resized. 2267 // resized.
2585 if (seen_resize) 2268 if (seen_resize && cmd_pid)
2586 kill (-cmd_pid, SIGWINCH); 2269 kill (-cmd_pid, SIGWINCH);
2587 } 2270 }
2588 2271
2589 /* Read a text string from the input buffer */ 2272 /* Read a text string from the input buffer */
2590 unicode_t buf[UBUFSIZ]; 2273 wchar_t buf[UBUFSIZ];
2591 bool refreshnow = false; 2274 bool refreshnow = false;
2592 int nlines = 0; 2275 int nlines = 0;
2593 unicode_t *str = buf; 2276 wchar_t *str = buf;
2277 wchar_t *eol = str + min (ncol, UBUFSIZ);
2594 2278
2595 for (;;) 2279 for (;;)
2596 { 2280 {
2597 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2281 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2598 break; 2282 break;
2599 2283
2600 *str++ = ch; 2284 *str++ = ch;
2601 2285
2602 if (ch == C0_LF) 2286 if (ecb_unlikely (ch == C0_LF || str >= eol))
2603 { 2287 {
2288 if (ch == C0_LF)
2604 nlines++; 2289 nlines++;
2290
2605 refresh_count++; 2291 refresh_count++;
2606 2292
2607 if (!(options & Opt_jumpScroll) 2293 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2608 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2609 { 2294 {
2295 refresh_count = 0;
2296
2297 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2298 {
2610 refreshnow = true; 2299 refreshnow = true;
2611 ch = NOCHAR; 2300 ch = NOCHAR;
2612 break; 2301 break;
2302 }
2613 } 2303 }
2614 2304
2615 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2305 // scr_add_lines only works for nlines <= nrow - 1.
2616 if (nlines >= TermWin.nrow - 1) 2306 if (nlines >= nrow - 1)
2617 { 2307 {
2308 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2309 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2618 scr_add_lines (buf, nlines, str - buf); 2310 scr_add_lines (buf, str - buf, nlines);
2311
2619 nlines = 0; 2312 nlines = 0;
2620 str = buf; 2313 str = buf;
2314 eol = str + min (ncol, UBUFSIZ);
2621 } 2315 }
2622 }
2623 2316
2624 if (str >= buf + UBUFSIZ) 2317 if (str >= eol)
2625 { 2318 {
2319 if (eol >= buf + UBUFSIZ)
2320 {
2626 ch = NOCHAR; 2321 ch = NOCHAR;
2627 break; 2322 break;
2323 }
2324 else
2325 eol = min (eol + ncol, buf + UBUFSIZ);
2326 }
2327
2628 } 2328 }
2629 2329
2630 seq_begin = cmdbuf_ptr; 2330 seq_begin = cmdbuf_ptr;
2631 ch = next_char (); 2331 ch = next_char ();
2632 } 2332 }
2633 2333
2334 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2634 scr_add_lines (buf, nlines, str - buf); 2336 scr_add_lines (buf, str - buf, nlines);
2635 2337
2636 /* 2338 /*
2637 * If there have been a lot of new lines, then update the screen 2339 * If there have been a lot of new lines, then update the screen
2638 * What the heck I'll cheat and only refresh less than every page-full. 2340 * What the heck we'll cheat and only refresh less than every page-full.
2639 * the number of pages between refreshes is refresh_limit, which 2341 * if skipScroll is enabled.
2640 * is incremented here because we must be doing flat-out scrolling.
2641 */ 2342 */
2642 if (refreshnow) 2343 if (refreshnow)
2643 { 2344 {
2644 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2645 refresh_limit++;
2646 else
2647 {
2648 flag = true;
2649 scr_refresh (refresh_type); 2345 scr_refresh ();
2650 } 2346 want_refresh = 1;
2651 } 2347 }
2652
2653 } 2348 }
2654 else 2349 else
2655 { 2350 {
2656 try 2351 try
2657 { 2352 {
… …
2665 } 2360 }
2666 2361
2667 ch = NOCHAR; 2362 ch = NOCHAR;
2668 } 2363 }
2669 } 2364 }
2670
2671 return flag;
2672}
2673
2674// read the next octet
2675unicode_t
2676rxvt_term::next_octet ()
2677{
2678 return cmdbuf_ptr < cmdbuf_endp
2679 ? *cmdbuf_ptr++
2680 : NOCHAR;
2681} 2365}
2682 2366
2683// read the next character 2367// read the next character
2684unicode_t 2368wchar_t ecb_hot
2685rxvt_term::next_char () 2369rxvt_term::next_char () noexcept
2686{ 2370{
2687 while (cmdbuf_ptr < cmdbuf_endp) 2371 while (cmdbuf_ptr < cmdbuf_endp)
2688 { 2372 {
2689 // assume 7-bit to be ascii ALWAYS 2373 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2690 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2374 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2691 return *cmdbuf_ptr++; 2375 return *cmdbuf_ptr++;
2692 2376
2693 wchar_t wc; 2377 wchar_t wc;
2694 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2378 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2695 2379
2696 if (len == (size_t)-2) 2380 if (len == (size_t)-2)
2697 { 2381 {
2698 // the mbstate stores incomplete sequences. didn't know this :/ 2382 // the mbstate stores incomplete sequences. didn't know this :/
2699 cmdbuf_ptr = cmdbuf_endp; 2383 cmdbuf_ptr = cmdbuf_endp;
2700 break; 2384 break;
2701 } 2385 }
2702 2386
2703 if (len == (size_t)-1) 2387 if (len == (size_t)-1)
2388 {
2389 mbstate.reset (); // reset now undefined conversion state
2390 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2391 // in which case we "erroneously" return the next byte which might be valid.
2704 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2393 }
2705 2394
2706 // assume wchar == unicode 2395 // assume wchar == unicode
2707 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
2708 return wc & UNICODE_MASK; 2397 return wc & UNICODE_MASK;
2709 } 2398 }
2710 2399
2711 return NOCHAR; 2400 return NOCHAR;
2712} 2401}
2713 2402
2714/* rxvt_cmd_getc () - Return next input character */ 2403// read the next octet
2715/* 2404uint32_t ecb_hot
2716 * Return the next input character after first passing any keyboard input 2405rxvt_term::next_octet () noexcept
2717 * to the command. 2406{
2718 */ 2407 return cmdbuf_ptr < cmdbuf_endp
2719unicode_t 2408 ? (unsigned char)*cmdbuf_ptr++
2409 : NOCHAR;
2410}
2411
2412static class out_of_input out_of_input;
2413
2414wchar_t ecb_hot
2720rxvt_term::cmd_getc () 2415rxvt_term::cmd_getc ()
2721{ 2416{
2722 unicode_t c = next_char (); 2417 wchar_t c = next_char ();
2723 2418
2724 if (c == NOCHAR) 2419 if (c == NOCHAR)
2725 throw out_of_input; 2420 throw out_of_input;
2726 2421
2727 return c; 2422 return c;
2728} 2423}
2729 2424
2730unicode_t 2425uint32_t ecb_hot
2731rxvt_term::cmd_get8 () 2426rxvt_term::cmd_get8 ()
2732{ 2427{
2733 unicode_t c = next_octet (); 2428 uint32_t c = next_octet ();
2734 2429
2735 if (c == NOCHAR) 2430 if (c == NOCHAR)
2736 throw out_of_input; 2431 throw out_of_input;
2737 2432
2738 return c; 2433 return c;
2739} 2434}
2740 2435
2741/*{{{ print pipe */ 2436/*{{{ print pipe */
2742/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2743#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2744FILE * 2439FILE * ecb_cold
2745rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2746{ 2441{
2747 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2748 2443
2749 if (stream == NULL) 2444 if (stream == NULL)
2750 rxvt_warn ("can't open printer pipe, not printing.\n"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2751 2446
2752 return stream; 2447 return stream;
2753} 2448}
2754 2449
2755int 2450int ecb_cold
2756rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2757{ 2452{
2758 fflush (stream); 2453 fflush (stream);
2759 return pclose (stream); 2454 return pclose (stream);
2760} 2455}
2761 2456
2762/* 2457/*
2763 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2764 */ 2459 */
2765void 2460void ecb_cold
2766rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2767{ 2462{
2768 int done; 2463 FILE *fd = popen_printer ();
2769 FILE *fd;
2770 2464
2771 if ((fd = popen_printer ()) == NULL) 2465 if (!fd)
2772 return; 2466 return;
2773 2467
2774 /* 2468 /*
2775 * Send all input to the printer until either ESC[4i or ESC[?4i 2469 * Send all input to the printer until either ESC[4i or ESC[?4i
2776 * is received. 2470 * is received.
2777 */ 2471 */
2778 for (done = 0; !done;) 2472 for (int done = 0; !done; )
2779 { 2473 {
2780 unsigned char buf[8]; 2474 unsigned char buf[8];
2781 unicode_t ch; 2475 unicode_t ch;
2782 unsigned int i, len; 2476 unsigned int i, len;
2783 2477
… …
2802 { 2496 {
2803 if ((buf[len++] = cmd_getc ()) == 'i') 2497 if ((buf[len++] = cmd_getc ()) == 'i')
2804 break; /* done = 1 */ 2498 break; /* done = 1 */
2805 } 2499 }
2806 } 2500 }
2807 2501
2808 for (i = 0; i < len; i++) 2502 for (i = 0; i < len; i++)
2809 if (putc (buf[i], fd) == EOF) 2503 if (putc (buf[i], fd) == EOF)
2810 { 2504 {
2811 done = 1; 2505 done = 1;
2812 break; 2506 break;
… …
2814 } 2508 }
2815 } 2509 }
2816 2510
2817 pclose_printer (fd); 2511 pclose_printer (fd);
2818} 2512}
2819#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2820/*}}} */ 2514/*}}} */
2821 2515
2822/* *INDENT-OFF* */
2823enum { 2516enum {
2824 C1_40 = 0x40, 2517 C1_40 = 0x40,
2825 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2518 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2826 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2519 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2827 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2520 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2828 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2521 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2829}; 2522};
2830/* *INDENT-ON* */
2831 2523
2832/*{{{ process non-printing single characters */ 2524/*{{{ process non-printing single characters */
2833void 2525void ecb_hot
2834rxvt_term::process_nonprinting (unicode_t ch) 2526rxvt_term::process_nonprinting (unicode_t ch)
2835{ 2527{
2836 switch (ch) 2528 switch (ch)
2837 { 2529 {
2838 case C0_ESC: 2530 case C0_ESC:
2839 process_escape_seq (); 2531 process_escape_seq ();
2840 break; 2532 break;
2841 case C0_ENQ: /* terminal Status */ 2533 case C0_ENQ: /* terminal Status */
2842 if (rs[Rs_answerbackstring]) 2534 if (rs[Rs_answerbackstring])
2843 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2535 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2844 (unsigned int)strlen (rs[Rs_answerbackstring]));
2845 else 2536 else
2846 tt_write ((unsigned char *)VT100_ANS, 2537 tt_write (VT100_ANS, strlen (VT100_ANS));
2847 (unsigned int)strlen (VT100_ANS));
2848 break; 2538 break;
2849 case C0_BEL: /* bell */ 2539 case C0_BEL: /* bell */
2850 scr_bell (); 2540 scr_bell ();
2851 break; 2541 break;
2852 case C0_BS: /* backspace */ 2542 case C0_BS: /* backspace */
… …
2870 scr_charset_choose (0); 2560 scr_charset_choose (0);
2871 break; 2561 break;
2872 2562
2873#ifdef EIGHT_BIT_CONTROLS 2563#ifdef EIGHT_BIT_CONTROLS
2874 // 8-bit controls 2564 // 8-bit controls
2875 case 0x90: /* DCS */ 2565 case 0x90: /* DCS */
2876 process_dcs_seq (); 2566 process_dcs_seq ();
2877 break; 2567 break;
2878 case 0x9b: /* CSI */ 2568 case 0x9b: /* CSI */
2879 process_csi_seq (); 2569 process_csi_seq ();
2880 break; 2570 break;
2881 case 0x9d: /* CSI */ 2571 case 0x9d: /* OSC */
2882 process_osc_seq (); 2572 process_osc_seq ();
2883 break; 2573 break;
2884#endif 2574#endif
2885 } 2575 }
2886} 2576}
2887/*}}} */ 2577/*}}} */
2888 2578
2889 2579
2890/*{{{ process VT52 escape sequences */ 2580/*{{{ process VT52 escape sequences */
2891void 2581void ecb_cold
2892rxvt_term::process_escape_vt52 (unicode_t ch) 2582rxvt_term::process_escape_vt52 (unicode_t ch)
2893{ 2583{
2894 int row, col; 2584 int row, col;
2895 2585
2896 switch (ch) 2586 switch (ch)
… …
2930 break; 2620 break;
2931 case 'Z': /* identify the terminal type */ 2621 case 'Z': /* identify the terminal type */
2932 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2622 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2933 break; 2623 break;
2934 case '<': /* turn off VT52 mode */ 2624 case '<': /* turn off VT52 mode */
2935 PrivMode (0, PrivMode_vt52); 2625 priv_modes &= ~PrivMode_vt52;
2936 break; 2626 break;
2937 case 'F': /* use special graphics character set */ 2627 case 'F': /* use special graphics character set */
2938 case 'G': /* use regular character set */ 2628 case 'G': /* use regular character set */
2939 /* unimplemented */ 2629 /* unimplemented */
2940 break; 2630 break;
… …
2946} 2636}
2947/*}}} */ 2637/*}}} */
2948 2638
2949 2639
2950/*{{{ process escape sequences */ 2640/*{{{ process escape sequences */
2951void 2641void ecb_hot
2952rxvt_term::process_escape_seq () 2642rxvt_term::process_escape_seq ()
2953{ 2643{
2954 unicode_t ch = cmd_getc (); 2644 unicode_t ch = cmd_getc ();
2955 2645
2956 if (priv_modes & PrivMode_vt52) 2646 if (priv_modes & PrivMode_vt52)
… …
2959 return; 2649 return;
2960 } 2650 }
2961 2651
2962 switch (ch) 2652 switch (ch)
2963 { 2653 {
2964 /* case 1: do_tek_mode (); break; */
2965 case '#': 2654 case '#':
2966 if (cmd_getc () == '8') 2655 if (cmd_getc () == '8')
2967 scr_E (); 2656 scr_E ();
2968 break; 2657 break;
2969 case '(': 2658 case '(':
… …
2976 scr_charset_set (2, (unsigned int)cmd_getc ()); 2665 scr_charset_set (2, (unsigned int)cmd_getc ());
2977 break; 2666 break;
2978 case '+': 2667 case '+':
2979 scr_charset_set (3, (unsigned int)cmd_getc ()); 2668 scr_charset_set (3, (unsigned int)cmd_getc ());
2980 break; 2669 break;
2981#if ENABLE_FRILLS 2670#if !ENABLE_MINIMAL
2982 case '6': 2671 case '6':
2983 scr_backindex (); 2672 scr_backindex ();
2984 break; 2673 break;
2985#endif 2674#endif
2986 case '7': 2675 case '7':
2987 scr_cursor (SAVE); 2676 scr_cursor (SAVE);
2988 break; 2677 break;
2989 case '8': 2678 case '8':
2990 scr_cursor (RESTORE); 2679 scr_cursor (RESTORE);
2991 break; 2680 break;
2992#if ENABLE_FRILLS 2681#if !ENABLE_MINIMAL
2993 case '9': 2682 case '9':
2994 scr_forwardindex (); 2683 scr_forwardindex ();
2995 break; 2684 break;
2996#endif 2685#endif
2686 // DECPAM/DECPNM
2997 case '=': 2687 case '=':
2688 priv_modes |= PrivMode_aplKP;
2689 break;
2998 case '>': 2690 case '>':
2999 PrivMode ((ch == '='), PrivMode_aplKP); 2691 priv_modes &= ~PrivMode_aplKP;
3000 break; 2692 break;
3001 2693
3002 case C1_40: 2694 case C1_40:
3003 cmd_getc (); 2695 cmd_getc ();
3004 break; 2696 break;
… …
3007 break; 2699 break;
3008 2700
3009 /* 8.3.87: NEXT LINE */ 2701 /* 8.3.87: NEXT LINE */
3010 case C1_NEL: /* ESC E */ 2702 case C1_NEL: /* ESC E */
3011 { 2703 {
3012 unicode_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
3013 scr_add_lines (nlcr, 1, 2); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3014 } 2706 }
3015 break; 2707 break;
3016 2708
2709#if 0 // disabled because embedded newlines can make exploits easier
3017 /* kidnapped escape sequence: Should be 8.3.48 */ 2710 /* kidnapped escape sequence: Should be 8.3.48 */
3018 case C1_ESA: /* ESC G */ 2711 case C1_ESA: /* ESC G */
3019 process_graphics (); 2712 // used by original rxvt for rob nations own graphics mode
2713 if (cmd_getc () == 'Q' && option (Opt_insecure))
2714 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3020 break; 2715 break;
2716#endif
3021 2717
3022 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
3023 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
3024 scr_set_tab (1); 2720 scr_set_tab (1);
3025 break; 2721 break;
… …
3028 case C1_RI: /* ESC M */ 2724 case C1_RI: /* ESC M */
3029 scr_index (DN); 2725 scr_index (DN);
3030 break; 2726 break;
3031 2727
3032 /* 8.3.142: SINGLE-SHIFT TWO */ 2728 /* 8.3.142: SINGLE-SHIFT TWO */
3033 /*case C1_SS2: scr_single_shift (2); break; */ 2729 /* case C1_SS2: break; */
3034 2730
3035 /* 8.3.143: SINGLE-SHIFT THREE */ 2731 /* 8.3.143: SINGLE-SHIFT THREE */
3036 /*case C1_SS3: scr_single_shift (3); break; */ 2732 /* case C1_SS3: break; */
3037 2733
3038 /* 8.3.27: DEVICE CONTROL STRING */ 2734 /* 8.3.27: DEVICE CONTROL STRING */
3039 case C1_DCS: /* ESC P */ 2735 case C1_DCS: /* ESC P */
3040 process_dcs_seq (); 2736 process_dcs_seq ();
3041 break; 2737 break;
3042 2738
3043 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2739 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3044 case C1_SCI: /* ESC Z */ 2740 case C1_SCI: /* ESC Z */
3045 tt_write ((const unsigned char *)ESCZ_ANSWER, 2741 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3046 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3047 break; /* steal obsolete ESC [ c */ 2742 break; /* steal obsolete ESC [ c */
3048 2743
3049 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3050 case C1_CSI: /* ESC [ */ 2745 case C1_CSI: /* ESC [ */
3051 process_csi_seq (); 2746 process_csi_seq ();
3052 break; 2747 break;
3053 2748
3054 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2749 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3055 case C1_OSC: /* ESC ] */ 2750 case C1_OSC: /* ESC ] */
3056 process_osc_seq (); 2751 process_osc_seq ();
3057 break; 2752 break;
3058 2753
3059 /* 8.3.106: RESET TO INITIAL STATE */ 2754 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3060 case 'c': 2755 case 'c':
3061 mbstate.reset (); 2756 mbstate.reset ();
3062 scr_poweron (); 2757 scr_poweron ();
3063 scrollbar_show (1); 2758 scrollBar.show (1);
3064 break; 2759 break;
3065 2760
3066 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2761 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3067 case 'n': 2762 case 'n':
3068 scr_charset_choose (2); 2763 scr_charset_choose (2);
… …
3075 } 2770 }
3076} 2771}
3077/*}}} */ 2772/*}}} */
3078 2773
3079/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3080/* *INDENT-OFF* */
3081enum { 2775enum {
3082 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
3083 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3084 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2778 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3085 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2779 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3088 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2782 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3089 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2783 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3090 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2784 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3091}; 2785};
3092 2786
3093#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2787#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3094 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2788 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3095 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2789 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3096#define get_byte_array_bit(array, bit) \ 2790#define get_byte_array_bit(array, bit) \
3097 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2791 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3098 2792
3099const unsigned char csi_defaults[] = 2793static const unsigned char csi_defaults[] =
3100 { 2794 {
3101 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2795 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3102 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2796 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3103 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2797 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3104 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2798 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3105 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2799 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3106 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2800 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3107 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2801 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3108 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3109 }; 2803 };
3110/* *INDENT-ON* */
3111 2804
3112void 2805void ecb_hot
3113rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
3114{ 2807{
3115 unicode_t ch, priv, i; 2808 unicode_t ch, priv, prev_ch, i;
3116 unsigned int nargs, p; 2809 unsigned int nargs, p;
3117 int n, ndef; 2810 int n, ndef;
3118 int arg[ESC_ARGS]; 2811 int arg[ESC_ARGS] = { };
3119 2812
3120 for (nargs = ESC_ARGS; nargs > 0;) 2813 nargs = 0;
3121 arg[--nargs] = 0;
3122 2814
3123 priv = 0; 2815 priv = 0;
3124 ch = cmd_getc (); 2816 ch = cmd_getc ();
3125 if (ch >= '<' && ch <= '?') 2817 if ((ch >= '<' && ch <= '?') || ch == '!')
2818 {
3126 { /* '<' '=' '>' '?' */ 2819 /* '<' '=' '>' '?' '!' */
3127 priv = ch; 2820 priv = ch;
3128 ch = cmd_getc (); 2821 ch = cmd_getc ();
3129 } 2822 }
3130 2823
2824 prev_ch = 0;
3131 /* read any numerical arguments */ 2825 /* read any numerical arguments */
3132 for (n = -1; ch < CSI_ICH; ) 2826 for (n = -1; ch < CSI_ICH; )
3133 { 2827 {
3134 if (isdigit (ch)) 2828 if (isdigit (ch))
3135 { 2829 {
… …
3145 n = -1; 2839 n = -1;
3146 } 2840 }
3147 else if (IS_CONTROL (ch)) 2841 else if (IS_CONTROL (ch))
3148 process_nonprinting (ch); 2842 process_nonprinting (ch);
3149 2843
2844 prev_ch = ch;
3150 ch = cmd_getc (); 2845 ch = cmd_getc ();
3151 } 2846 }
3152 2847
3153 if (ch > CSI_7F) 2848 if (ch > CSI_7F)
3154 return; 2849 return;
… …
3160 ndef = get_byte_array_bit (csi_defaults, i); 2855 ndef = get_byte_array_bit (csi_defaults, i);
3161 for (p = 0; p < nargs; p++) 2856 for (p = 0; p < nargs; p++)
3162 if (arg[p] == -1) 2857 if (arg[p] == -1)
3163 arg[p] = ndef; 2858 arg[p] = ndef;
3164 2859
3165#ifdef DEBUG_CMD
3166 fprintf (stderr, "CSI ");
3167 for (p = 0; p < nargs; p++)
3168 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3169 fprintf (stderr, "%c\n", ch);
3170#endif
3171
3172 /* 2860 /*
3173 * private mode handling 2861 * private mode handling
3174 */ 2862 */
3175 if (priv) 2863 if (priv)
3176 { 2864 {
3177 switch (priv) 2865 switch (priv)
3178 { 2866 {
3179 case '>': 2867 case '>':
3180 if (ch == CSI_DA) /* secondary device attributes */ 2868 if (ch == CSI_DA) /* secondary device attributes */
3181 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2869 {
2870 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2871 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2872 //
2873 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2874 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2875 // versions.
2876 //
2877 tt_printf ("\033[>%d;95;0c", 'U');
2878 }
3182 break; 2879 break;
2880
3183 case '?': 2881 case '?':
3184 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2882 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3185 process_terminal_mode (ch, priv, nargs, arg); 2883 process_terminal_mode (ch, priv, nargs, arg);
2884 if (prev_ch == '$' && ch == 'p')
2885 process_terminal_mode (ch, priv, nargs, arg);
3186 break; 2886 break;
2887
2888 case '!':
2889 if (ch == CSI_70)
2890 {
2891 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2892 scr_soft_reset ();
2893
2894 static const int pm_h[] = { 7, 25 };
2895 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2896
2897 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2898 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3187 } 2899 }
2900 break;
2901 }
2902
3188 return; 2903 return;
3189 } 2904 }
3190 2905
3191 switch (ch) 2906 switch (ch)
3192 { 2907 {
… …
3206 } 2921 }
3207 break; 2922 break;
3208#endif 2923#endif
3209 2924
3210 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2925 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3211 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2926 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3212 arg[0] = -arg[0]; 2927 arg[0] = -arg[0];
3213 /* FALLTHROUGH */ 2928 /* FALLTHROUGH */
3214 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2929 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3215 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2930 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3216 scr_gotorc (arg[0], 0, RELATIVE); 2931 scr_gotorc (arg[0], 0, RELATIVE);
3217 break; 2932 break;
3218 2933
3219 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2934 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3220 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2935 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
3221#ifdef ISO6429 2936#ifdef ISO6429
3222 arg[0] = -arg[0]; 2937 arg[0] = -arg[0];
3223#else /* emulate common DEC VTs */ 2938#else /* emulate common DEC VTs */
3224 arg[0] = arg[0] ? -arg[0] : -1; 2939 arg[0] = arg[0] ? -arg[0] : -1;
3225#endif 2940#endif
… …
3291 3006
3292 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3007 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3293 arg[0] = -arg[0]; 3008 arg[0] = -arg[0];
3294 /* FALLTHROUGH */ 3009 /* FALLTHROUGH */
3295 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3010 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3296 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3011 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3297 break; 3012 break;
3298 3013
3299 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3014 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3300 tt_write ((const unsigned char *)VT100_ANS, 3015 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3301 (unsigned int) (sizeof (VT100_ANS) - 1));
3302 break; 3016 break;
3303 3017
3304 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3018 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3305 process_sgr_mode (nargs, arg); 3019 process_sgr_mode (nargs, arg);
3306 break; 3020 break;
… …
3313 break; 3027 break;
3314 case 6: /* CPR requested */ 3028 case 6: /* CPR requested */
3315 scr_report_position (); 3029 scr_report_position ();
3316 break; 3030 break;
3317 case 7: /* unofficial extension */ 3031 case 7: /* unofficial extension */
3318 if (options & Opt_insecure) 3032 if (option (Opt_insecure))
3319 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3033 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3320 break; 3034 break;
3321 case 8: /* unofficial extension */ 3035 case 8: /* unofficial extension */
3036 {
3037 string_term st;
3038 st.v[0] = CHAR_ST;
3039 st.v[1] = '\0';
3322 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3040 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3323 break; 3041 break;
3042 }
3324 } 3043 }
3325 break; 3044 break;
3326 3045
3327 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3046 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3328 switch (arg[0]) 3047 switch (arg[0])
… …
3371 scr_insert_mode (1); 3090 scr_insert_mode (1);
3372 else if (arg[0] == 20) 3091 else if (arg[0] == 20)
3373 priv_modes |= PrivMode_LFNL; 3092 priv_modes |= PrivMode_LFNL;
3374 break; 3093 break;
3375 3094
3095 case CSI_71: // DECSCUSR: set cursor style
3096 if (prev_ch == ' ')
3097 set_cursor_style (arg[0]);
3098 break;
3099
3376 /* 3100 /*
3377 * PRIVATE USE beyond this point. All CSI_7? sequences here 3101 * PRIVATE USE beyond this point. All CSI_7? sequences here
3378 */ 3102 */
3379 case CSI_72: /* DECSTBM: set top and bottom margins */ 3103 case CSI_72: /* DECSTBM: set top and bottom margins */
3380 if (nargs == 1) 3104 if (nargs == 1)
… …
3390 break; 3114 break;
3391 case CSI_75: 3115 case CSI_75:
3392 scr_cursor (RESTORE); 3116 scr_cursor (RESTORE);
3393 break; 3117 break;
3394 3118
3395#if ENABLE_FRILLS 3119#if !ENABLE_MINIMAL
3396 case CSI_74: 3120 case CSI_74:
3397 process_window_ops (arg, nargs); 3121 process_window_ops (arg, nargs);
3398 break; 3122 break;
3399#endif 3123#endif
3400 3124
… …
3407 break; 3131 break;
3408 } 3132 }
3409} 3133}
3410/*}}} */ 3134/*}}} */
3411 3135
3412#if ENABLE_FRILLS 3136#if !ENABLE_MINIMAL
3413/* ARGSUSED */
3414void 3137void
3415rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3138rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3416{ 3139{
3417 int x, y; 3140 int x, y;
3418 XWindowAttributes wattr; 3141 XWindowAttributes wattr;
3419 Window wdummy; 3142 Window wdummy;
3420 dDisp; 3143
3144 dLocal (Display *, dpy);
3421 3145
3422 if (nargs == 0) 3146 if (nargs == 0)
3423 return; 3147 return;
3424 3148
3425 switch (args[0]) 3149 switch (args[0])
3426 { 3150 {
3427 /* 3151 /*
3428 * commands 3152 * commands
3429 */ 3153 */
3430 case 1: /* deiconify window */ 3154 case 1: /* deiconify window */
3431 XMapWindow (disp, TermWin.parent[0]); 3155 XMapWindow (dpy, parent);
3432 break; 3156 break;
3433 case 2: /* iconify window */ 3157 case 2: /* iconify window */
3434 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3158 XIconifyWindow (dpy, parent, display->screen);
3435 break; 3159 break;
3436 case 3: /* set position (pixels) */ 3160 case 3: /* set position (pixels) */
3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3161 XMoveWindow (dpy, parent, args[1], args[2]);
3438 break; 3162 break;
3439 case 4: /* set size (pixels) */ 3163 case 4: /* set size (pixels) */
3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3164 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3441 break; 3165 break;
3442 case 5: /* raise window */ 3166 case 5: /* raise window */
3443 XRaiseWindow (disp, TermWin.parent[0]); 3167 XRaiseWindow (dpy, parent);
3444 break; 3168 break;
3445 case 6: /* lower window */ 3169 case 6: /* lower window */
3446 XLowerWindow (disp, TermWin.parent[0]); 3170 XLowerWindow (dpy, parent);
3447 break; 3171 break;
3448 case 7: /* refresh window */ 3172 case 7: /* refresh window */
3449 scr_touch (true); 3173 scr_touch (true);
3450 break; 3174 break;
3451 case 8: /* set size (chars) */ 3175 case 8: /* set size (chars) */
3452 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3176 set_widthheight ((unsigned int) (args[2] * fwidth),
3453 (unsigned int) (args[1] * TermWin.fheight)); 3177 (unsigned int) (args[1] * fheight));
3454 break; 3178 break;
3455 3179
3456 //case 9: NYI, TODO, restore maximized window or maximize window 3180 //case 9: NYI, TODO, restore maximized window or maximize window
3457 default: 3181 default:
3458 if (args[0] >= 24) /* set height (chars) */ 3182 if (args[0] >= 24) /* set height (chars) */
3459 set_widthheight ((unsigned int)TermWin.width, 3183 set_widthheight ((unsigned int)vt_width,
3460 (unsigned int) (args[1] * TermWin.fheight)); 3184 (unsigned int) (args[1] * fheight));
3461 break; 3185 break;
3462
3463 3186
3464 /* 3187 /*
3465 * reports - some output format copied from XTerm 3188 * reports - some output format copied from XTerm
3466 */ 3189 */
3467 case 11: /* report window state */ 3190 case 11: /* report window state */
3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3191 XGetWindowAttributes (dpy, parent, &wattr);
3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3192 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3470 break; 3193 break;
3471 case 13: /* report window position */ 3194 case 13: /* report window position */
3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3195 XGetWindowAttributes (dpy, parent, &wattr);
3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3196 XTranslateCoordinates (dpy, parent, wattr.root,
3474 -wattr.border_width, -wattr.border_width, 3197 -wattr.border_width, -wattr.border_width,
3475 &x, &y, &wdummy); 3198 &x, &y, &wdummy);
3476 tt_printf ("\033[3;%d;%dt", x, y); 3199 tt_printf ("\033[3;%d;%dt", x, y);
3477 break; 3200 break;
3478 case 14: /* report window size (pixels) */ 3201 case 14: /* report window size (pixels) */
3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3203 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3481 break; 3204 break;
3482 case 18: /* report text area size (chars) */ 3205 case 18: /* report text area size (chars) */
3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3206 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3484 break; 3207 break;
3485 case 19: /* report window size (chars) */ 3208 case 19: /* report window size (chars) */
3486 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3209 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3487 break; 3210 break;
3488 case 20: /* report icon label */ 3211 case 20: /* report icon label */
3489 { 3212 {
3490 char *s; 3213 char *s;
3491 XGetIconName (disp, TermWin.parent[0], &s); 3214 XGetIconName (dpy, parent, &s);
3492 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3215 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3493 XFree (s); 3216 XFree (s);
3494 } 3217 }
3495 break; 3218 break;
3496 case 21: /* report window title */ 3219 case 21: /* report window title */
3497 { 3220 {
3498 char *s; 3221 char *s;
3499 XFetchName (disp, TermWin.parent[0], &s); 3222 XFetchName (dpy, parent, &s);
3500 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3223 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3501 XFree (s); 3224 XFree (s);
3502 } 3225 }
3503 break; 3226 break;
3504 } 3227 }
3505} 3228}
… …
3508/*----------------------------------------------------------------------*/ 3231/*----------------------------------------------------------------------*/
3509/* 3232/*
3510 * get input up until STRING TERMINATOR (or BEL) 3233 * get input up until STRING TERMINATOR (or BEL)
3511 * ends_how is terminator used. returned input must be free()'d 3234 * ends_how is terminator used. returned input must be free()'d
3512 */ 3235 */
3513unsigned char * 3236char *
3514rxvt_term::get_to_st (unicode_t &ends_how) 3237rxvt_term::get_to_st (string_term &st)
3515{ 3238{
3516 unicode_t ch; 3239 unicode_t ch;
3517 bool seen_esc = false; 3240 bool seen_esc = false;
3518 unsigned int n = 0; 3241 unsigned int n = 0;
3519 wchar_t string[STRING_MAX]; 3242 wchar_t string[CBUFSIZ];
3520 3243
3521 while ((ch = cmd_getc ()) != NOCHAR) 3244 while ((ch = cmd_getc ()) != NOCHAR)
3522 { 3245 {
3523 if (seen_esc) 3246 if (seen_esc)
3524 { 3247 {
… …
3532 seen_esc = true; 3255 seen_esc = true;
3533 continue; 3256 continue;
3534 } 3257 }
3535 else if (ch == C0_BEL || ch == CHAR_ST) 3258 else if (ch == C0_BEL || ch == CHAR_ST)
3536 break; 3259 break;
3260 else if (ch == C0_SYN)
3261 ch = cmd_get8 ();
3537 else if (ch < 0x20) 3262 else if (ch < 0x20)
3538 return NULL; /* other control character - exit */ 3263 return NULL; /* other control character - exit */
3539 3264
3540 seen_esc = false; 3265 seen_esc = false;
3541 3266
3542 if (n >= sizeof (string) - 1) 3267 if (n >= sizeof (string) - 1)
3543 // stop at some sane length 3268 // stop at some sane length
3544 return NULL; 3269 return NULL;
3545 3270
3546 if (ch == C0_SYN)
3547 string[n++] = cmd_get8 ();
3548 else
3549 string[n++] = ch; 3271 string[n++] = ch;
3550 } 3272 }
3551 3273
3552 string[n++] = '\0'; 3274 string[n++] = '\0';
3553 3275
3554 ends_how = (ch == 0x5c ? C0_ESC : ch); 3276 n = 0;
3277 if (ch == 0x5c)
3278 st.v[n++] = C0_ESC;
3279 st.v[n++] = ch;
3280 st.v[n] = '\0';
3555 3281
3556 return (unsigned char *)rxvt_wcstombs (string); 3282 return rxvt_wcstombs (string);
3557} 3283}
3558 3284
3559/*----------------------------------------------------------------------*/ 3285/*----------------------------------------------------------------------*/
3560/* 3286/*
3561 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3287 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3562 */ 3288 */
3563void 3289void
3564rxvt_term::process_dcs_seq () 3290rxvt_term::process_dcs_seq ()
3565{ 3291{
3566 unsigned char *s;
3567 unicode_t eh;
3568
3569 /* 3292 /*
3570 * Not handled yet 3293 * Not handled yet
3571 */ 3294 */
3295
3296 string_term st;
3572 s = get_to_st (eh); 3297 char *s = get_to_st (st);
3573 if (s) 3298 if (s)
3574 free (s); 3299 free (s);
3575 3300
3576 return; 3301 return;
3577} 3302}
… …
3581 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3306 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3582 */ 3307 */
3583void 3308void
3584rxvt_term::process_osc_seq () 3309rxvt_term::process_osc_seq ()
3585{ 3310{
3586 unicode_t ch, eh;
3587 int arg; 3311 int arg;
3588 3312
3589 ch = cmd_getc (); 3313 unicode_t ch = cmd_getc ();
3590 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3314 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3591 arg = arg * 10 + (ch - '0'); 3315 arg = arg * 10 + (ch - '0');
3592 3316
3593 if (ch == ';') 3317 if (ch == ';')
3594 { 3318 {
3319 string_term st;
3595 unsigned char *s = get_to_st (eh); 3320 char *s = get_to_st (st);
3596 3321
3597 if (s) 3322 if (s)
3598 { 3323 {
3599 process_xterm_seq (arg, (char *)s, eh); 3324 process_xterm_seq (arg, s, st);
3600 free (s); 3325 free (s);
3601 } 3326 }
3602 } 3327 }
3603} 3328}
3604 3329
3330static unsigned int
3331colorcube_index (unsigned int idx_r,
3332 unsigned int idx_g,
3333 unsigned int idx_b)
3334{
3335 assert (idx_r < Red_levels);
3336 assert (idx_g < Green_levels);
3337 assert (idx_b < Blue_levels);
3338
3339 return idx_r * Blue_levels * Green_levels +
3340 idx_g * Blue_levels +
3341 idx_b;
3342}
3343
3344/*
3345 * Find the nearest color slot in the hidden color cube,
3346 * adapt its value to the 32bit RGBA color.
3347 */
3348unsigned int
3349rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3350{
3351 r &= 0xff;
3352 g &= 0xff;
3353 b &= 0xff;
3354 a &= 0xff;
3355
3356 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3357
3358 /* we allow one of the 6 closest neighbouring colours */
3359 /* to replace the current color, if they not used recently */
3360 #if 0
3361 static const unsigned char dxyz[][3] = {
3362 0, 0, 0,
3363 0, 0, 4,
3364 0, 4, 4,
3365 4, 4, 0,
3366 4, 0, 4,
3367 0, 4, 0,
3368 4, 0, 0,
3369 };
3370 #else
3371 // silly compressed verlapping triplets version of above
3372 static const unsigned char dxyz[] = {
3373 0, 0, 0, 4, 4, 0, 4, 0, 0,
3374 };
3375 #endif
3376
3377 static const unsigned char color_level[8][32] = {
3378 // neighbour index
3379 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3380 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3381 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3382 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3383 // Red_levels/Green_levels/Blue_levels index
3384 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3385 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3386 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3387 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3388 };
3389
3390 unsigned int idx;
3391
3392 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3393 {
3394 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3395 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3396 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3397 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3398
3399 if (n == 0)
3400 idx = index;
3401
3402 if (rgb24_color[index] == color)
3403 {
3404 rgb24_seqno[index] = ++rgb24_sequence;
3405 return index + minTermCOLOR24;
3406 }
3407
3408 // minor issue: could update index 0 few more times
3409 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3410 {
3411 idx = index;
3412 goto update;
3413 }
3414
3415 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3416 // but also handles wrap around values well enough
3417 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3418 idx = index;
3419 }
3420
3421update:
3422 rgb24_color[idx] = color;
3423 rgb24_seqno[idx] = ++rgb24_sequence;
3424
3425 idx += minTermCOLOR24;
3426 pix_colors_focused [idx].free (this);
3427 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3428 update_fade_color (idx, false);
3429
3430 return idx;
3431}
3432
3605void 3433void
3606rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3434rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3607{ 3435{
3608 if (str[0] == '?' && !str[1]) 3436 if (str[0] == '?' && !str[1])
3609 { 3437 {
3610 unsigned short r, g, b; 3438 rgba c;
3611 pix_colors_focused[color].get (display, r, g, b); 3439 pix_colors_focused[color].get (c);
3612 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3440 char rgba_str[32];
3441
3442#if XFT
3443 if (c.a != rgba::MAX_CC)
3444 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3445 else
3446#endif
3447 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3448
3449 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3450 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3451 else
3452 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3613 } 3453 }
3614 else 3454 else
3615 set_window_color (color, str); 3455 set_window_color (color, str);
3616} 3456}
3617 3457
3618/* 3458/*
3619 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3459 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3620 * 0 = change iconName/title
3621 * 1 = change iconName
3622 * 2 = change title
3623 * 4 = change color
3624 * 10 = change fg color
3625 * 11 = change bg color
3626 * 12 = change text color
3627 * 13 = change mouse foreground color
3628 * 17 = change highlight character colour
3629 * 18 = change bold character color
3630 * 19 = change underlined character color
3631 * 46 = change logfile (not implemented)
3632 * 50 = change font
3633 *
3634 * rxvt extensions:
3635 * 20 = bg pixmap
3636 * 39 = change default fg color
3637 * 49 = change default bg color
3638 * 55 = dump scrollback buffer and all of screen
3639 * 701 = change locale
3640 * 702 = find font
3641 * 703 = menu
3642 */ 3460 */
3643void 3461void
3644rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3462rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3645{ 3463{
3646 int changed = 0;
3647 int color; 3464 int color;
3648 char *buf, *name; 3465 char *buf, *name;
3649 bool query = str[0] == '?' && !str[1]; 3466 bool query = str[0] == '?' && !str[1];
3650 int saveop = op; 3467 int saveop = op;
3651 dDisp; 3468
3469 dLocal (Display *, dpy);
3652 3470
3653 assert (str != NULL); 3471 assert (str != NULL);
3472
3473 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3474 return;
3475
3654 switch (op) 3476 switch (op)
3655 { 3477 {
3656 case XTerm_name: 3478 case XTerm_name:
3657 set_title (str); 3479 set_title (str);
3658 /* FALLTHROUGH */ 3480 /* FALLTHROUGH */
… …
3672 unsigned long bytes_after; 3494 unsigned long bytes_after;
3673 unsigned char *value = 0; 3495 unsigned char *value = 0;
3674 const char *str = ""; 3496 const char *str = "";
3675 3497
3676 if (prop 3498 if (prop
3677 && XGetWindowProperty (disp, TermWin.parent[0], 3499 && XGetWindowProperty (dpy, parent,
3678 prop, 0, 1<<16, 0, AnyPropertyType, 3500 prop, 0, 1<<16, 0, AnyPropertyType,
3679 &actual_type, &actual_format, 3501 &actual_type, &actual_format,
3680 &nitems, &bytes_after, &value) == Success 3502 &nitems, &bytes_after, &value) == Success
3681 && actual_type != None 3503 && actual_type != None
3682 && actual_format == 8) 3504 && actual_format == 8)
3683 str = (const char *)(value); 3505 str = (const char *)(value);
3684 3506
3685 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3507 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3686 3508
3687 XFree (value); 3509 XFree (value);
3688 } 3510 }
3689 else 3511 else
3690 { 3512 {
3691 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3513 char *eq = strchr (str, '=');
3692 3514
3693 if (eq) 3515 if (eq)
3694 { 3516 {
3695 *eq = 0; 3517 *eq = 0;
3696 set_utf8_property (display->atom (str), eq + 1); 3518 set_utf8_property (display->atom (str), eq + 1);
3697 } 3519 }
3698 else 3520 else
3699 XDeleteProperty (disp, TermWin.parent[0], 3521 XDeleteProperty (dpy, parent,
3700 display->atom (str)); 3522 display->atom (str));
3701 } 3523 }
3702 break; 3524 break;
3703 3525
3704 case XTerm_Color: 3526 case XTerm_Color:
… …
3706 { 3528 {
3707 if ((name = strchr (buf, ';')) == NULL) 3529 if ((name = strchr (buf, ';')) == NULL)
3708 break; 3530 break;
3709 3531
3710 *name++ = '\0'; 3532 *name++ = '\0';
3711 color = atoi (buf); 3533 color = atoi (buf) + minCOLOR;
3712 3534
3713 if (color < 0 || color >= TOTAL_COLORS) 3535 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3714 break; 3536 break;
3715 3537
3716 if ((buf = strchr (name, ';')) != NULL) 3538 if ((buf = strchr (name, ';')) != NULL)
3717 *buf++ = '\0'; 3539 *buf++ = '\0';
3718 3540
3719 if (name[0] == '?' && !name[1]) 3541 process_color_seq (op, color, name, st);
3720 {
3721 unsigned short r, g, b;
3722 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3723 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3724 }
3725 else
3726 set_window_color (color + minCOLOR, name);
3727 } 3542 }
3728 break; 3543 break;
3544 case Rxvt_restoreFG:
3729 case XTerm_Color00: 3545 case XTerm_Color00:
3730 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3546 process_color_seq (op, Color_fg, str, st);
3731 break; 3547 break;
3548 case Rxvt_restoreBG:
3732 case XTerm_Color01: 3549 case XTerm_Color01:
3733 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3550 process_color_seq (op, Color_bg, str, st);
3734 break; 3551 break;
3735#ifndef NO_CURSORCOLOR 3552#ifndef NO_CURSORCOLOR
3736 case XTerm_Color_cursor: 3553 case XTerm_Color_cursor:
3737 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3554 process_color_seq (op, Color_cursor, str, st);
3738 break; 3555 break;
3739#endif 3556#endif
3740 case XTerm_Color_pointer_fg: 3557 case XTerm_Color_pointer_fg:
3741 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3558 process_color_seq (op, Color_pointer_fg, str, st);
3742 break; 3559 break;
3743 case XTerm_Color_pointer_bg: 3560 case XTerm_Color_pointer_bg:
3744 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3561 process_color_seq (op, Color_pointer_bg, str, st);
3745 break; 3562 break;
3563#ifdef OPTION_HC
3564 case XTerm_Color_HC:
3565 process_color_seq (op, Color_HC, str, st);
3566 break;
3567 case XTerm_Color_HTC:
3568 process_color_seq (op, Color_HTC, str, st);
3569 break;
3570#endif
3746#ifndef NO_BOLD_UNDERLINE_REVERSE 3571#ifndef NO_BOLD_UNDERLINE_REVERSE
3747 case XTerm_Color_BD: 3572 case URxvt_Color_BD:
3748 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3573 process_color_seq (op, Color_BD, str, st);
3749 break; 3574 break;
3750 case XTerm_Color_IT:
3751 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3752 break;
3753 case XTerm_Color_UL: 3575 case URxvt_Color_UL:
3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3576 process_color_seq (op, Color_UL, str, st);
3755 break; 3577 break;
3756 case XTerm_Color_RV: 3578 case URxvt_Color_IT:
3579 process_color_seq (op, Color_IT, str, st);
3580 break;
3581#endif
3582 case URxvt_Color_border:
3757 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3583 process_color_seq (op, Color_border, str, st);
3758 break;
3759#endif
3760#if TRANSPARENT && TINTING
3761 case XTerm_Color_tint:
3762 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3763 check_our_parents ();
3764 if (am_transparent)
3765 want_full_refresh = want_refresh = 1;
3766 break;
3767#endif
3768
3769 case XTerm_Pixmap:
3770 if (*str != ';')
3771 {
3772#if XPM_BACKGROUND
3773 scale_pixmap (""); /* reset to default scaling */
3774 set_bgPixmap (str); /* change pixmap */
3775#endif
3776 scr_touch (true);
3777 }
3778 while ((str = strchr (str, ';')) != NULL)
3779 {
3780 str++;
3781#if XPM_BACKGROUND
3782 changed += scale_pixmap (str);
3783#endif
3784 }
3785
3786 if (changed)
3787 {
3788#ifdef XPM_BACKGROUND
3789 resize_pixmap ();
3790#endif
3791 scr_touch (true);
3792 }
3793 break;
3794
3795 case XTerm_restoreFG:
3796 set_window_color (Color_fg, str);
3797 break;
3798 case XTerm_restoreBG:
3799 set_window_color (Color_bg, str);
3800 break; 3584 break;
3801 3585
3802 case XTerm_logfile: 3586 case XTerm_logfile:
3803 // TODO, when secure mode? 3587 // TODO, when secure mode?
3804 break; 3588 break;
3805 3589
3590#if 0
3591 case Rxvt_dumpscreen: /* no error notices */
3592 {
3593 int fd;
3594 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3595 {
3596 scr_dump (fd);
3597 close (fd);
3598 }
3599 }
3600 break;
3601#endif
3806 case XTerm_font: 3602 case XTerm_font:
3807 op = URxvt_font; 3603 op = URxvt_font;
3808 case URxvt_font: 3604 case URxvt_font:
3809#if ENABLE_STYLES 3605#if ENABLE_STYLES
3810 case URxvt_boldFont: 3606 case URxvt_boldFont:
3811 case URxvt_italicFont: 3607 case URxvt_italicFont:
3812 case URxvt_boldItalicFont: 3608 case URxvt_boldItalicFont:
3813#endif 3609#endif
3814 if (query) 3610 if (query)
3815 tt_printf ("\33]%d;%-.250s%c", saveop, 3611 tt_printf ("\33]%d;%-.250s%s", saveop,
3816 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3612 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3817 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3613 ? fontset[op - URxvt_font]->fontdesc : "",
3818 resp); 3614 st.v);
3819 else 3615 else
3820 { 3616 {
3821 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3617 const char *&res = rs[Rs_font + (op - URxvt_font)];
3822 3618
3823 res = strdup (str); 3619 res = strdup (str);
3824 allocated.push_back ((void *)res); 3620 allocated.push_back ((void *)res);
3825 set_fonts (); 3621 set_fonts ();
3826 } 3622 }
3827 break; 3623 break;
3828 3624
3829#if ENABLE_FRILLS 3625 case URxvt_version:
3830 case XTerm_locale:
3831 if (query) 3626 if (query)
3627 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3628 op,
3629 rs[Rs_name], VERSION[0], VERSION[2],
3630 st.v);
3631 break;
3632
3633#if !ENABLE_MINIMAL
3634 case URxvt_cellinfo:
3635 if (query)
3636 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3637 fwidth, fheight, fbase,
3638 st.v);
3639 break;
3640
3641 case URxvt_locale:
3642 if (query)
3832 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3643 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3833 else 3644 else
3834 { 3645 {
3835 set_locale (str); 3646 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8); 3647 pty->set_utf8_mode (enc_utf8);
3837# ifdef USE_XIM
3838 im_cb (); 3648 init_xlocale ();
3839# endif
3840 } 3649 }
3841 break; 3650 break;
3842#endif
3843 3651
3844#ifdef MENUBAR 3652 case URxvt_view_up:
3845 case XTerm_Menu: 3653 case URxvt_view_down:
3846 if (options & Opt_insecure) 3654 {
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3655 int lines = atoi (str);
3656
3657 if (lines)
3658 scr_page (op == URxvt_view_up ? UP : DN, lines);
3659 else
3660 scr_erase_savelines ();
3661 }
3662
3848 break; 3663 break;
3849#endif 3664#endif
3850#if 0 3665
3851 case XTerm_dumpscreen: /* no error notices */ 3666#if ENABLE_PERL
3852 { 3667 case URxvt_perl:
3853 int fd; 3668 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 {
3856 scr_dump (fd);
3857 close (fd);
3858 }
3859 }
3860 break; 3669 break;
3861#endif 3670#endif
3862 } 3671 }
3863} 3672}
3864/*----------------------------------------------------------------------*/ 3673/*----------------------------------------------------------------------*/
… …
3871 * 's' = save 3680 * 's' = save
3872 * 'r' = restore 3681 * 'r' = restore
3873 * 't' = toggle 3682 * 't' = toggle
3874 * so no need for fancy checking 3683 * so no need for fancy checking
3875 */ 3684 */
3876int 3685int ecb_cold
3877rxvt_term::privcases (int mode, unsigned long bit) 3686rxvt_term::privcases (int mode, unsigned long bit)
3878{ 3687{
3879 int state; 3688 int state;
3880 3689
3881 if (mode == 's') 3690 if (mode == 's')
3882 { 3691 {
3883 SavedModes |= (priv_modes & bit); 3692 if (priv_modes & bit)
3693 SavedModes |= bit;
3694 else
3695 SavedModes &= ~bit;
3884 return -1; 3696 return -1;
3885 } 3697 }
3886 else 3698 else
3887 { 3699 {
3888 if (mode == 'r') 3700 if (mode == 'r')
3889 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3701 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3890 else 3702 else
3891 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3703 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3892 PrivMode (state, bit); 3704
3705 if (state)
3706 priv_modes |= bit;
3707 else
3708 priv_modes &= ~bit;
3893 } 3709 }
3894 3710
3895 return state; 3711 return state;
3896} 3712}
3897 3713
3898/* we're not using priv _yet_ */ 3714/* we're not using priv _yet_ */
3899void 3715void
3900rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3716rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3901{ 3717{
3902 unsigned int i, j; 3718 unsigned int i, j;
3903 int state; 3719 int state;
3904 3720
3905 static const struct 3721 static const struct
3906 { 3722 {
3907 const int argval; 3723 const int argval;
3908 const unsigned long bit; 3724 const unsigned long bit;
3909 }
3910
3911 argtopriv[] = { 3725 } argtopriv[] = {
3912 { 1, PrivMode_aplCUR }, 3726 { 1, PrivMode_aplCUR }, // DECCKM
3913 { 2, PrivMode_vt52 }, 3727 { 2, PrivMode_vt52 }, // DECANM
3914 { 3, PrivMode_132 }, 3728 { 3, PrivMode_132 }, // DECCOLM
3915 { 4, PrivMode_smoothScroll }, 3729 { 4, PrivMode_smoothScroll }, // DECSCLM
3916 { 5, PrivMode_rVideo }, 3730 { 5, PrivMode_rVideo }, // DECSCNM
3917 { 6, PrivMode_relOrigin }, 3731 { 6, PrivMode_relOrigin }, // DECOM
3918 { 7, PrivMode_Autowrap }, 3732 { 7, PrivMode_Autowrap }, // DECAWM
3919 // 8, bi-directional support mode 3733 // 8, auto-repeat keys // DECARM
3920 { 9, PrivMode_MouseX10 }, 3734 { 9, PrivMode_MouseX10 },
3921#ifdef menuBar_esc
3922 { menuBar_esc, PrivMode_menuBar },
3923#endif
3924 // 18, 19 printing-related
3925 { 25, PrivMode_VisibleCursor }, 3735 { 12, PrivMode_BlinkingCursor },
3736 // 18 end FF to printer after print screen
3737 // 19 Print screen prints full screen/scroll region
3738 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3926#ifdef scrollBar_esc 3739#ifdef scrollBar_esc
3927 { scrollBar_esc, PrivMode_scrollBar }, 3740 { scrollBar_esc, PrivMode_scrollBar },
3928#endif 3741#endif
3929 { 35, PrivMode_ShiftKeys }, // rxvt extension 3742 { 35, PrivMode_ShiftKeys }, // rxvt extension
3743 // 38, tektronix mode // DECTEK
3930 { 40, PrivMode_132OK }, 3744 { 40, PrivMode_132OK },
3931 // 41 xterm more fixes NYI 3745 // 41 xterm more fixes NYI
3932 // 45 margin bell NYI 3746 // 45 margin bell NYI
3933 // 46 start logging 3747 // 46 start logging
3934 { 47, PrivMode_Screen }, 3748 { 47, PrivMode_Screen },
3935 { 66, PrivMode_aplKP }, 3749 { 66, PrivMode_aplKP }, // DECNKM
3936#ifndef NO_BACKSPACE_KEY 3750#ifndef NO_BACKSPACE_KEY
3937 { 67, PrivMode_BackSpace }, 3751 { 67, PrivMode_BackSpace }, // DECBKM
3938#endif 3752#endif
3939 { 1000, PrivMode_MouseX11 }, 3753 { 1000, PrivMode_MouseX11 },
3940 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3754 { 1002, PrivMode_MouseBtnEvent },
3941 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3755 { 1003, PrivMode_MouseAnyEvent },
3942 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3756#if ENABLE_FRILLS
3757 { 1004, PrivMode_FocusEvent },
3758 { 1005, PrivMode_ExtMouseUTF8 },
3759 { 1006, PrivMode_ExtMouseSGR },
3760#endif
3943 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3761 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3944 { 1011, PrivMode_Keypress }, // rxvt extension 3762 { 1011, PrivMode_Keypress }, // rxvt extension
3763#if ENABLE_FRILLS
3764 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3765#endif
3945 // 1035 enable modifiers for alt, numlock NYI 3766 // 1035 enable modifiers for alt, numlock NYI
3946 // 1036 send ESC for meta keys NYI 3767 // 1036 send ESC for meta keys NYI
3947 // 1037 send DEL for keypad delete NYI 3768 // 1037 send DEL for keypad delete NYI
3948 { 1047, PrivMode_Screen }, 3769 { 1047, PrivMode_Screen },
3949 // 1048 save and restore cursor 3770 // 1048 save and restore cursor, implemented in code
3950 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3771 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3951 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3772 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3773#if ENABLE_FRILLS
3774 { 2004, PrivMode_BracketPaste },
3775#endif
3952 }; 3776 };
3953 3777
3954 if (nargs == 0) 3778 if (nargs == 0)
3955 return; 3779 return;
3780
3781 // DECRQM
3782 if (mode == 'p')
3783 {
3784 int status = 0;
3785 if (nargs != 1)
3786 return;
3787
3788 for (j = 0; j < ecb_array_length (argtopriv); j++)
3789 if (argtopriv[j].argval == arg[0])
3790 {
3791 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3792 break;
3793 }
3794
3795 tt_printf ("\33[?%d;%d$y", arg[0], status);
3796 return;
3797 }
3956 3798
3957 /* make lo/hi boolean */ 3799 /* make lo/hi boolean */
3958 if (mode == 'l') 3800 if (mode == 'l')
3959 mode = 0; /* reset */ 3801 mode = 0; /* reset */
3960 else if (mode == 'h') 3802 else if (mode == 'h')
… …
3963 for (i = 0; i < nargs; i++) 3805 for (i = 0; i < nargs; i++)
3964 { 3806 {
3965 state = -1; 3807 state = -1;
3966 3808
3967 /* basic handling */ 3809 /* basic handling */
3968 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3810 for (j = 0; j < ecb_array_length (argtopriv); j++)
3969 if (argtopriv[j].argval == arg[i]) 3811 if (argtopriv[j].argval == arg[i])
3970 { 3812 {
3971 state = privcases (mode, argtopriv[j].bit); 3813 state = privcases (mode, argtopriv[j].bit);
3972 break; 3814 break;
3973 } 3815 }
3974 3816
3975 /* extra handling for values with state unkept */ 3817 /* extra handling for values with state unkept */
3976 switch (arg[i]) 3818 switch (arg[i])
3977 { 3819 {
3820#if ENABLE_STYLES
3821 case 1021:
3822 set_option (Opt_intensityStyles, mode);
3823
3824 scr_touch (true);
3825 break;
3826#endif
3978 case 1048: /* alternative cursor save */ 3827 case 1048: /* alternative cursor save */
3979 case 1049:
3980 if (options & Opt_secondaryScreen) 3828 if (option (Opt_secondaryScreen))
3981 if (mode == 0) 3829 if (mode == 0)
3982 scr_cursor (RESTORE); 3830 scr_cursor (RESTORE);
3983 else if (mode == 1) 3831 else if (mode == 1)
3984 scr_cursor (SAVE); 3832 scr_cursor (SAVE);
3985 break; 3833 break;
… …
3993 case 2: /* VT52 mode */ 3841 case 2: /* VT52 mode */
3994 /* oddball mode. should be set regardless of set/reset 3842 /* oddball mode. should be set regardless of set/reset
3995 * parameter. Return from VT52 mode with an ESC < from 3843 * parameter. Return from VT52 mode with an ESC < from
3996 * within VT52 mode 3844 * within VT52 mode
3997 */ 3845 */
3998 PrivMode (1, PrivMode_vt52); 3846 priv_modes |= PrivMode_vt52;
3999 break; 3847 break;
4000 case 3: /* 80/132 */ 3848 case 3: /* 80/132 */
4001 if (priv_modes & PrivMode_132OK) 3849 if (priv_modes & PrivMode_132OK)
4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3850 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4003 break; 3851 break;
4004 case 4: /* smooth scrolling */ 3852 case 4: /* smooth scrolling */
4005 if (state)
4006 options &= ~Opt_jumpScroll;
4007 else
4008 options |= Opt_jumpScroll; 3853 set_option (Opt_jumpScroll, !state);
4009 break; 3854 break;
4010 case 5: /* reverse video */ 3855 case 5: /* reverse video */
4011 scr_rvideo_mode (state); 3856 scr_rvideo_mode (state);
4012 break; 3857 break;
4013 case 6: /* relative/absolute origins */ 3858 case 6: /* relative/absolute origins */
… …
4017 scr_autowrap (state); 3862 scr_autowrap (state);
4018 break; 3863 break;
4019 /* case 8: - auto repeat, can't do on a per window basis */ 3864 /* case 8: - auto repeat, can't do on a per window basis */
4020 case 9: /* X10 mouse reporting */ 3865 case 9: /* X10 mouse reporting */
4021 if (state) /* orthogonal */ 3866 if (state) /* orthogonal */
4022 priv_modes &= ~PrivMode_MouseX11; 3867 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4023 break; 3868 break;
4024#ifdef menuBar_esc
4025 case menuBar_esc:
4026#ifdef MENUBAR
4027 map_menuBar (state);
4028#endif
4029 break;
4030#endif
4031#ifdef scrollBar_esc 3869#ifdef scrollBar_esc
4032 case scrollBar_esc: 3870 case scrollBar_esc:
4033 if (scrollbar_mapping (state)) 3871 scrollBar.map (state);
4034 {
4035 resize_all_windows (0, 0, 0); 3872 resize_all_windows (0, 0, 0);
4036 scr_touch (true); 3873 scr_touch (true);
4037 } 3874 break;
3875#endif
3876#ifdef CURSOR_BLINK
3877 case 12:
3878 cursor_blink_reset ();
4038 break; 3879 break;
4039#endif 3880#endif
4040 case 25: /* visible/invisible cursor */ 3881 case 25: /* visible/invisible cursor */
4041 scr_cursor_visible (state); 3882 scr_cursor_visible (state);
4042 break; 3883 break;
… …
4047 break; 3888 break;
4048 /* case 66: - application key pad */ 3889 /* case 66: - application key pad */
4049 /* case 67: - backspace key */ 3890 /* case 67: - backspace key */
4050 case 1000: /* X11 mouse reporting */ 3891 case 1000: /* X11 mouse reporting */
4051 if (state) /* orthogonal */ 3892 if (state) /* orthogonal */
4052 priv_modes &= ~PrivMode_MouseX10; 3893 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4053 break; 3894 break;
4054#if 0
4055 case 1001: 3895 case 1002:
4056 break; /* X11 mouse highlighting */ 3896 case 1003:
4057#endif 3897 if (state)
3898 {
3899 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3900 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3901 mouse_row = mouse_col = 0;
3902 vt_emask_mouse = PointerMotionMask;
3903 }
3904 else
3905 vt_emask_mouse = NoEventMask;
3906
3907 vt_select_input ();
3908 break;
4058 case 1010: /* scroll to bottom on TTY output inhibit */ 3909 case 1010: /* scroll to bottom on TTY output inhibit */
4059 if (state)
4060 options &= ~Opt_scrollTtyOutput;
4061 else
4062 options |= Opt_scrollTtyOutput; 3910 set_option (Opt_scrollTtyOutput, !state);
4063 break; 3911 break;
4064 case 1011: /* scroll to bottom on key press */ 3912 case 1011: /* scroll to bottom on key press */
4065 if (state)
4066 options |= Opt_scrollTtyKeypress; 3913 set_option (Opt_scrollTtyKeypress, state);
4067 else
4068 options &= ~Opt_scrollTtyKeypress;
4069 break; 3914 break;
4070 case 1047: /* secondary screen w/ clearing last */ 3915 case 1047: /* secondary screen w/ clearing last */
4071 if (options & Opt_secondaryScreen) 3916 if (option (Opt_secondaryScreen))
4072 if (current_screen != PRIMARY) 3917 if (!state)
4073 scr_erase_screen (2); 3918 scr_erase_screen (2);
3919
4074 scr_change_screen (state); 3920 scr_change_screen (state);
4075 break; 3921 break;
4076 case 1049: /* secondary screen w/ clearing first */ 3922 case 1049: /* secondary screen w/ clearing first */
3923 if (option (Opt_secondaryScreen))
3924 if (state)
3925 scr_cursor (SAVE);
3926
4077 scr_change_screen (state); 3927 scr_change_screen (state);
3928
4078 if (options & Opt_secondaryScreen) 3929 if (option (Opt_secondaryScreen))
4079 if (current_screen != PRIMARY) 3930 if (state)
4080 scr_erase_screen (2); 3931 scr_erase_screen (2);
3932 else
3933 scr_cursor (RESTORE);
4081 break; 3934 break;
4082 default: 3935 default:
4083 break; 3936 break;
4084 } 3937 }
4085 } 3938 }
4086} 3939}
4087/*}}} */ 3940/*}}} */
4088 3941
4089/*{{{ process sgr sequences */ 3942/*{{{ process sgr sequences */
4090void 3943void ecb_hot
4091rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3944rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4092{ 3945{
4093 unsigned int i; 3946 unsigned int i;
4094 short rendset; 3947 short rendset;
4095 int rendstyle; 3948 int rendstyle;
… …
4137 //case 19: // ninth alt font 3990 //case 19: // ninth alt font
4138 //case 20: // gothic 3991 //case 20: // gothic
4139 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3992 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4140 rendset = 0, rendstyle = RS_Bold; 3993 rendset = 0, rendstyle = RS_Bold;
4141 break; 3994 break;
4142 case 22: // normal intensity 3995 case 22: // bold off (vt220)
4143 rendset = 0, rendstyle = RS_Bold; 3996 rendset = 0, rendstyle = RS_Bold;
4144 break; 3997 break;
4145 case 23: // disable italic 3998 case 23: // disable italic
4146 rendset = 0, rendstyle = RS_Italic; 3999 rendset = 0, rendstyle = RS_Italic;
4147 break; 4000 break;
4148 case 24: 4001 case 24: // underline off (vt220)
4149 rendset = 0, rendstyle = RS_Uline; 4002 rendset = 0, rendstyle = RS_Uline;
4150 break; 4003 break;
4151 case 25: 4004 case 25: // blink off (vt220)
4152 rendset = 0, rendstyle = RS_Blink; 4005 rendset = 0, rendstyle = RS_Blink;
4153 break; 4006 break;
4154 case 26: // variable spacing (iso 8613) 4007 case 26: // variable spacing (iso 8613)
4155 rendset = 0, rendstyle = RS_Blink; 4008 rendset = 0, rendstyle = RS_Blink;
4156 break; 4009 break;
4157 case 27: 4010 case 27: // reverse off (vt220)
4158 rendset = 0, rendstyle = RS_RVid; 4011 rendset = 0, rendstyle = RS_RVid;
4159 break; 4012 break;
4160 //case 28: // visible. NYI 4013 //case 28: // visible. NYI
4161 //case 29: // not crossed-out 4014 //case 29: // not crossed-out
4162 } 4015 }
… …
4177 case 35: 4030 case 35:
4178 case 36: 4031 case 36:
4179 case 37: 4032 case 37:
4180 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4033 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4181 break; 4034 break;
4182 case 38: // set fg color, ISO 8613-6
4183 if (nargs > i + 2 && arg[i + 1] == 5)
4184 {
4185 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4186 i += 2;
4187 }
4188 break;
4189 case 39: /* default fg */ 4035 case 39: /* default fg */
4190 scr_color (Color_fg, Color_fg); 4036 scr_color (Color_fg, Color_fg);
4191 break; 4037 break;
4192 4038
4193 case 40: 4039 case 40:
… …
4198 case 45: 4044 case 45:
4199 case 46: 4045 case 46:
4200 case 47: 4046 case 47:
4201 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4047 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4202 break; 4048 break;
4203 case 48: // set bg color, ISO 8613-6
4204 if (nargs > i + 2 && arg[i + 1] == 5)
4205 {
4206 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4207 i += 2;
4208 }
4209 break;
4210 case 49: /* default bg */ 4049 case 49: /* default bg */
4211 scr_color (Color_bg, Color_bg); 4050 scr_color (Color_bg, Color_bg);
4212 break; 4051 break;
4213 4052
4053 case 38: // set fg color, ISO 8613-6
4054 case 48: // set bg color, ISO 8613-6
4055 {
4056 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4057 unsigned int idx;
4058
4059 if (nargs > i + 2 && arg[i + 1] == 5)
4060 {
4061 idx = minCOLOR + arg[i + 2];
4062 i += 2;
4063
4064 scr_color (idx, fgbg);
4065 }
4066 else if (nargs > i + 4 && arg[i + 1] == 2)
4067 {
4068 unsigned int r = arg[i + 2];
4069 unsigned int g = arg[i + 3];
4070 unsigned int b = arg[i + 4];
4071 unsigned int a = 0xff;
4072
4073 idx = map_rgb24_color (r, g, b, a);
4074
4075 i += 4;
4076
4077 scr_color (idx, fgbg);
4078 }
4079 }
4080 break;
4081
4214 //case 50: // not variable spacing 4082 //case 50: // not variable spacing
4215 4083
4216#ifndef NO_BRIGHTCOLOR 4084#if !ENABLE_MINIMAL
4217 case 90: 4085 case 90:
4218 case 91: /* set bright fg color */ 4086 case 91: /* set bright fg color */
4219 case 92: 4087 case 92:
4220 case 93: 4088 case 93:
4221 case 94: 4089 case 94:
… …
4233 case 106: 4101 case 106:
4234 case 107: 4102 case 107:
4235 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4103 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4236 break; 4104 break;
4237#endif 4105#endif
4238
4239 } 4106 }
4240 } 4107 }
4108}
4109
4110void
4111rxvt_term::set_cursor_style (int style)
4112{
4113 if (!IN_RANGE_INC (style, 0, 6))
4114 return;
4115
4116 if (style == 0)
4117 style = 1;
4118
4119 cursor_type = (style - 1) / 2;
4120 set_option (Opt_cursorUnderline, cursor_type == 1);
4121
4122#ifdef CURSOR_BLINK
4123 set_option (Opt_cursorBlink, style & 1);
4124 cursor_blink_reset ();
4125#endif
4126
4127 want_refresh = 1;
4241} 4128}
4242/*}}} */ 4129/*}}} */
4243 4130
4244/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4245void
4246rxvt_term::process_graphics ()
4247{
4248 unicode_t ch, cmd = cmd_getc ();
4249
4250 if (cmd == 'Q')
4251 { /* query graphics */
4252 tt_printf ("\033G0\012"); /* no graphics */
4253 return;
4254 }
4255 /* swallow other graphics sequences until terminating ':' */
4256 do
4257 ch = cmd_getc ();
4258 while (ch != ':');
4259}
4260/*}}} */
4261
4262/* ------------------------------------------------------------------------- */ 4131/* ---------------------------------------------------------------------- */
4132/* Write data to the pty as typed by the user, pasted with the mouse,
4133 * or generated by us in response to a query ESC sequence.
4134 */
4263 4135
4264/* 4136/*
4265 * Send printf () formatted output to the command. 4137 * Send printf () formatted output to the command.
4266 * Only use for small amounts of data. 4138 * Only use for small amounts of data.
4267 */ 4139 */
4268void 4140void
4269rxvt_term::tt_printf (const char *fmt,...) 4141rxvt_term::tt_printf (const char *fmt,...)
4270{ 4142{
4271 va_list arg_ptr; 4143 va_list arg_ptr;
4272 unsigned char buf[256]; 4144 char buf[256];
4273 4145
4274 va_start (arg_ptr, fmt); 4146 va_start (arg_ptr, fmt);
4275 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4147 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4276 va_end (arg_ptr); 4148 va_end (arg_ptr);
4277 tt_write (buf, strlen (buf)); 4149 tt_write (buf, strlen (buf));
4278} 4150}
4279 4151
4280/* ---------------------------------------------------------------------- */
4281/* Write data to the pty as typed by the user, pasted with the mouse, 4152/* Write data to the pty as typed by the user. */
4282 * or generated by us in response to a query ESC sequence.
4283 */
4284const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4285
4286void 4153void
4287rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4154rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4288{ 4155{
4156 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4157 return;
4158
4159 if (option (Opt_scrollTtyKeypress))
4160 if (view_start)
4161 {
4162 view_start = 0;
4163 want_refresh = 1;
4164 }
4165
4166 tt_write_ (data, len);
4167}
4168
4169void
4170rxvt_term::tt_write (const char *data, unsigned int len)
4171{
4172 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4173 return;
4174
4175 tt_write_ (data, len);
4176}
4177
4178static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4179
4180void
4181rxvt_term::tt_write_ (const char *data, unsigned int len)
4182{
4183 if (pty->pty < 0)
4184 return;
4185
4289 if (v_buflen == 0) 4186 if (v_buflen == 0)
4290 { 4187 {
4291 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4188 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4292 4189
4190 max_it (written, 0);
4191
4293 if ((unsigned int)written == len) 4192 if (written == len)
4294 return; 4193 return;
4295 4194
4296 data += written; 4195 data += written;
4297 len -= written; 4196 len -= written;
4298 } 4197 }
4299 4198
4300 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4199 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4301 4200
4302 memcpy (v_buffer + v_buflen, data, len); 4201 memcpy (v_buffer + v_buflen, data, len);
4303 v_buflen += len; 4202 v_buflen += len;
4304 4203
4305 pty_ev.set (EVENT_READ | EVENT_WRITE); 4204 pty_ev.set (ev::READ | ev::WRITE);
4306} 4205}
4307 4206
4308void rxvt_term::pty_write () 4207void rxvt_term::pty_write ()
4309{ 4208{
4310 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4209 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4311 4210
4312 if (written > 0) 4211 if (written > 0)
4313 { 4212 {
4314 v_buflen -= written; 4213 v_buflen -= written;
4315 4214
4316 if (v_buflen == 0) 4215 if (v_buflen == 0)
4317 { 4216 {
4318 free (v_buffer); 4217 free (v_buffer);
4319 v_buffer = 0; 4218 v_buffer = 0;
4320 v_buflen = 0;
4321 4219
4322 pty_ev.set (EVENT_READ); 4220 pty_ev.set (ev::READ);
4323 return; 4221 return;
4324 } 4222 }
4325 4223
4326 memmove (v_buffer, v_buffer + written, v_buflen); 4224 memmove (v_buffer, v_buffer + written, v_buflen);
4327 } 4225 }
4328 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4226 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329 // original code just ignores this... 4227 pty_ev.set (ev::READ);
4330 destroy ();
4331} 4228}
4332 4229
4333/*----------------------- end-of-file (C source) -----------------------*/ 4230/*----------------------- end-of-file (C source) -----------------------*/
4334 4231

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines