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

Diff Legend

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