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.603 by root, Mon Jun 5 13:39:34 2023 UTC

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

Diff Legend

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