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.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.601 by sf-exg, Sat May 6 06:47:29 2023 UTC

… …
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-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * 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,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
170# if ENABLE_COMBINING 170# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
172 { 172 {
173 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 174 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 175 rxvt_composite.expand (ch, chr);
176 } 176 }
177 else 177 else
178# endif 178# endif
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
… …
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
328 }; 324 };
329 325
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
340# endif 336# endif
341#endif 337#endif
342 return keysym; 338 return keysym;
343} 339}
344 340
345static inline int 341static inline int ecb_cold
346map_function_key (KeySym keysym) 342map_function_key (KeySym keysym)
347{ 343{
348 int param = 0; 344 int param = 0;
349 345
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
375 param = 3; 371 param = 3;
376 break; 372 break;
377 case XK_Select: 373 case XK_Select:
378 param = 4; 374 param = 4;
379 break; 375 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior: 376 case XK_Prior:
382 param = 5; 377 param = 5;
383 break; 378 break;
384 case XK_Next: 379 case XK_Next:
385 param = 6; 380 param = 6;
… …
388 param = 7; 383 param = 7;
389 break; 384 break;
390 case XK_End: 385 case XK_End:
391 param = 8; 386 param = 8;
392 break; 387 break;
393#endif
394 case XK_Help: 388 case XK_Help:
395 param = 28; 389 param = 28;
396 break; 390 break;
397 case XK_Menu: 391 case XK_Menu:
398 param = 29; 392 param = 29;
399 break; 393 break;
400 } 394 }
401 return param; 395 return param;
402} 396}
403 397
404void 398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
406{ 409{
407 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
408 KeySym keysym; 411 KeySym keysym = NoSymbol;
409 int valid_keysym;
410 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
411 414
412#if ISO_14755 415#if ISO_14755
413 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
414 return; 417 return;
415#endif 418#endif
… …
424 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
426 429
427 kbuf[0] = 0; 430 kbuf[0] = 0;
428 431
429#ifdef USE_XIM 432#if USE_XIM
430 if (Input_Context) 433 if (Input_Context)
431 { 434 {
432 Status status_return; 435 Status status_return;
433 436
434#if 0 437#if 0
… …
472 } 475 }
473 } 476 }
474 else 477 else
475 len = 0; 478 len = 0;
476 } 479 }
477
478 valid_keysym = status_return == XLookupKeySym
479 || status_return == XLookupBoth;
480 } 480 }
481 else 481 else
482#endif 482#endif
483 { 483 {
484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
485 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
486 } 488 {
489 KeySym orig_keysym = keysym;
487 490
488 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
489 { 704 {
490#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
491 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
492 return; 707 return;
493#endif 708#endif
494 709
495 if (saveLines) 710 if (saveLines)
496 { 711 {
… …
509#endif 724#endif
510 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
511 726
512 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
513 { 728 {
514 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
515 return; 730 return;
516 } 731 }
517 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
518 { 733 {
519 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
520 return; 735 return;
521 } 736 }
522 } 737 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
525 { 740 {
526 if (keysym == XK_Up) 741 if (keysym == XK_Up)
527 { 742 {
528 scr_page (UP, 1); 743 scr_page (1);
529 return; 744 return;
530 } 745 }
531 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
532 { 747 {
533 scr_page (DN, 1); 748 scr_page (-1);
534 return; 749 return;
535 } 750 }
536 } 751 }
537#endif 752#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
540 { 755 {
541 if (keysym == XK_Home) 756 if (keysym == XK_Home)
542 { 757 {
543 scr_move_to (0, 1); 758 scr_changeview (top_row);
544 return; 759 return;
545 } 760 }
546 else if (keysym == XK_End) 761 else if (keysym == XK_End)
547 { 762 {
548 scr_move_to (1, 1); 763 scr_changeview (0);
549 return; 764 return;
550 } 765 }
551 } 766 }
552#endif 767#endif
553 } 768 }
554 769
555 if (shft) 770 if (shft)
556 { 771 {
557 /* Shift + F1 - F10 generates F11 - F20 */
558 if (keysym >= XK_F1 && keysym <= XK_F10)
559 {
560 keysym += (XK_F11 - XK_F1);
561 shft = 0; /* turn off Shift */
562 }
563 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
564 { 773 {
565 switch (keysym) 774 switch (keysym)
566 { 775 {
567 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
568 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
576 return; 785 return;
577#endif 786#endif
578 } 787 }
579 } 788 }
789 }
790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
580 } 804 }
581 805
582#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 807 // ISO 14755 support
584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
639 { 863 {
640 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
641 return; 865 return;
642 } 866 }
643#endif 867#endif
644
645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 if (ev.state & ModNumLockMask)
651 kp = false;
652
653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
656 {
657#ifndef NO_BACKSPACE_KEY
658 case XK_BackSpace:
659 if (priv_modes & PrivMode_HaveBackSpace)
660 {
661 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
662 ^ !!ctrl) ? '\b' : '\177';
663 kbuf[1] = '\0';
664 }
665 else
666 strcpy (kbuf, rs[Rs_backspace_key]);
667 break;
668#endif
669#ifndef NO_DELETE_KEY
670 case XK_Delete:
671 strcpy (kbuf, rs[Rs_delete_key]);
672 break;
673#endif
674 case XK_Tab:
675 if (shft)
676 strcpy (kbuf, "\033[Z");
677 else
678 {
679#ifdef CTRL_TAB_MAKES_META
680 if (ctrl)
681 meta = 1;
682#endif
683#ifdef MOD4_TAB_MAKES_META
684 if (ev.state & Mod4Mask)
685 meta = 1;
686#endif
687 newlen = 0;
688 }
689 break;
690
691 case XK_Up: /* "\033[A" */
692 case XK_Down: /* "\033[B" */
693 case XK_Right: /* "\033[C" */
694 case XK_Left: /* "\033[D" */
695 strcpy (kbuf, "\033[Z");
696 kbuf[2] = "DACB"[keysym - XK_Left];
697 /* do Shift first */
698 if (shft)
699 kbuf[2] = "dacb"[keysym - XK_Left];
700 else if (ctrl)
701 {
702 kbuf[1] = 'O';
703 kbuf[2] = "dacb"[keysym - XK_Left];
704 }
705 else if (priv_modes & PrivMode_aplCUR)
706 kbuf[1] = 'O';
707 break;
708
709 case XK_KP_Enter:
710 /* allow shift to override */
711 if (kp)
712 {
713 strcpy (kbuf, "\033OM");
714 break;
715 }
716
717 /* FALLTHROUGH */
718
719 case XK_Return:
720 if (priv_modes & PrivMode_LFNL)
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\012';
724 kbuf[2] = '\0';
725 }
726 else
727 {
728 kbuf[0] = '\015';
729 kbuf[1] = '\0';
730 }
731 break;
732
733 case XK_KP_F1: /* "\033OP" */
734 case XK_KP_F2: /* "\033OQ" */
735 case XK_KP_F3: /* "\033OR" */
736 case XK_KP_F4: /* "\033OS" */
737 strcpy (kbuf, "\033OP");
738 kbuf[2] += (keysym - XK_KP_F1);
739 break;
740
741 case XK_KP_Multiply: /* "\033Oj" : "*" */
742 case XK_KP_Add: /* "\033Ok" : "+" */
743 case XK_KP_Separator: /* "\033Ol" : "," */
744 case XK_KP_Subtract: /* "\033Om" : "-" */
745 case XK_KP_Decimal: /* "\033On" : "." */
746 case XK_KP_Divide: /* "\033Oo" : "/" */
747 case XK_KP_0: /* "\033Op" : "0" */
748 case XK_KP_1: /* "\033Oq" : "1" */
749 case XK_KP_2: /* "\033Or" : "2" */
750 case XK_KP_3: /* "\033Os" : "3" */
751 case XK_KP_4: /* "\033Ot" : "4" */
752 case XK_KP_5: /* "\033Ou" : "5" */
753 case XK_KP_6: /* "\033Ov" : "6" */
754 case XK_KP_7: /* "\033Ow" : "7" */
755 case XK_KP_8: /* "\033Ox" : "8" */
756 case XK_KP_9: /* "\033Oy" : "9" */
757 /* allow shift to override */
758 if (kp)
759 {
760 strcpy (kbuf, "\033Oj");
761 kbuf[2] += (keysym - XK_KP_Multiply);
762 }
763 else
764 {
765 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
766 kbuf[1] = '\0';
767 }
768 break;
769
770 default:
771 {
772 int param = map_function_key (keysym);
773 if (param > 0)
774 sprintf (kbuf,"\033[%d~", param);
775 else
776 newlen = 0;
777 }
778 break;
779 }
780
781 if (newlen)
782 len = strlen (kbuf);
783
784 /*
785 * Pass meta for all function keys, if 'meta' option set
786 */
787#ifdef META8_OPTION
788 if (meta && (meta_char == 0x80) && len > 0)
789 kbuf[len - 1] |= 0x80;
790#endif
791
792 }
793 else if (ctrl && keysym == XK_minus)
794 {
795 len = 1;
796 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
797 }
798 else if (keysym == XK_ISO_Left_Tab)
799 {
800 strcpy (kbuf, "\033[Z");
801 len = 3;
802 }
803 else
804 {
805#ifdef META8_OPTION
806 /* set 8-bit on */
807 if (meta && (meta_char == 0x80))
808 {
809 char *ch;
810
811 for (ch = kbuf; ch < kbuf + len; ch++)
812 *ch |= 0x80;
813
814 meta = 0;
815 }
816#endif
817 /* nil */ ;
818 }
819 } 868 }
820
821 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
822 return;
823 869
824 if (len <= 0) 870 if (len <= 0)
825 return; /* not mapped */ 871 return; /* not mapped */
826 872
827 if (option (Opt_scrollTtyKeypress))
828 if (view_start)
829 {
830 view_start = 0;
831 want_refresh = 1;
832 }
833
834 /*
835 * these modifications only affect the static keybuffer
836 * pass Shift/Control indicators for function keys ending with `~'
837 *
838 * eg,
839 * Prior = "ESC[5~"
840 * Shift+Prior = "ESC[5$"
841 * Ctrl+Prior = "ESC[5^"
842 * Ctrl+Shift+Prior = "ESC[5@"
843 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
844 */
845 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
846 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
847
848 /* escape prefix */
849 if (meta
850#ifdef META8_OPTION
851 && meta_char == C0_ESC
852#endif
853 )
854 {
855 const char ch = C0_ESC;
856 tt_write (&ch, 1);
857 }
858
859 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
860} 874}
861 875
862void 876void ecb_cold
863rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
864{ 878{
865#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
866 KeySym keysym; 880 KeySym keysym;
867 881
… …
939void 953void
940rxvt_term::flush () 954rxvt_term::flush ()
941{ 955{
942 flush_ev.stop (); 956 flush_ev.stop ();
943 957
944#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
945 if (bg_flags & BG_NEEDS_REFRESH) 959 if (bg_flags & BG_NEEDS_REFRESH)
946 { 960 {
947 bg_flags &= ~BG_NEEDS_REFRESH; 961 bg_flags &= ~BG_NEEDS_REFRESH;
948 scr_touch (false); 962 scr_touch (false);
949 } 963 }
… …
989 while (row < end_row); 1003 while (row < end_row);
990 } 1004 }
991 1005
992 scr_refresh (); 1006 scr_refresh ();
993 scrollBar.show (1); 1007 scrollBar.show (1);
994#ifdef USE_XIM 1008#if USE_XIM
995 IMSendSpot (); 1009 im_send_spot ();
996#endif 1010#endif
997 } 1011 }
998 1012
999 display->flush (); 1013 display->flush ();
1000} 1014}
… …
1002/* checks whether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1003void 1017void
1004rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1005{ 1019{
1006 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1007 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start ();
1008 1022
1009 display->flush (); 1023 display->flush ();
1010} 1024}
1011 1025
1012void 1026void
… …
1017 refresh_count = 0; 1031 refresh_count = 0;
1018 flush (); 1032 flush ();
1019} 1033}
1020 1034
1021#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1022void 1054void
1023rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1024{ 1056{
1025 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1026 want_refresh = 1; 1058 want_refresh = 1;
… …
1045 1077
1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1047void 1079void
1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1049{ 1081{
1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1052 { 1084 {
1053 want_refresh = 1; 1085 want_refresh = 1;
1054 refresh_check (); 1086 refresh_check ();
1055 } 1087 }
1056 else 1088 else
… …
1060 1092
1061#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1062void 1094void
1063rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1064{ 1096{
1065 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1066 { 1098 {
1067 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1068 want_refresh = 1; 1100 want_refresh = 1;
1069 refresh_check (); 1101 refresh_check ();
1070 } 1102 }
… …
1075 1107
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1109void
1078rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1111{
1080 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1081 { 1113 {
1082 want_refresh = 1; 1114 want_refresh = 1;
1083 refresh_check (); 1115 refresh_check ();
1084 } 1116 }
1085 1117
… …
1206 pty_write (); 1238 pty_write ();
1207 1239
1208 refresh_check (); 1240 refresh_check ();
1209} 1241}
1210 1242
1211void 1243void ecb_cold
1212rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1213{ 1245{
1214 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1215 recolour_cursor (); 1247 recolor_cursor ();
1216 1248
1217#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1218 hidden_pointer = 0; 1250 hidden_pointer = 0;
1219 1251
1220 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1221 pointer_ev.start (pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1222#endif 1254#endif
1223} 1255}
1224 1256
1225#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1226void 1258void ecb_cold
1227rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1228{ 1260{
1229 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1230 return; 1262 return;
1231 1263
… …
1233 XFlush (dpy); 1265 XFlush (dpy);
1234 1266
1235 hidden_pointer = 1; 1267 hidden_pointer = 1;
1236} 1268}
1237 1269
1238void 1270void ecb_cold
1239rxvt_term::pointer_cb (ev::timer &w, int revents) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1240{ 1272{
1241 make_current (); 1273 make_current ();
1242 1274
1243 pointer_blank (); 1275 pointer_blank ();
… …
1245#endif 1277#endif
1246 1278
1247void 1279void
1248rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1249{ 1281{
1250 int button_number, key_state = 0; 1282 int button_number, state = 0;
1251 int x, y; 1283 int x, y;
1252 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1253 1285
1254 x = Pixel2Col (ev.x) + 1; 1286 x = Pixel2Col (ev.x) + 1;
1255 y = Pixel2Row (ev.y) + 1; 1287 y = Pixel2Row (ev.y) + 1;
1256 1288
1257 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
… …
1259 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1260 return; 1292 return;
1261 1293
1262 mouse_row = x; 1294 mouse_row = x;
1263 mouse_col = y; 1295 mouse_col = y;
1264 code += 32; 1296 state += 32;
1265 }
1266
1267 if (MEvent.button == AnyButton)
1268 button_number = 3;
1269 else
1270 { 1297 }
1298
1271 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1300 if (button_number > 10)
1301 return;
1302 else if (button_number >= 7)
1303 button_number += 128 - 7;
1273 if (button_number >= 3) 1304 else if (button_number >= 3)
1274 button_number += 64 - 3; 1305 button_number += 64 - 3;
1275 }
1276 1306
1277 if (priv_modes & PrivMode_MouseX10) 1307 if (priv_modes & PrivMode_MouseX10)
1278 { 1308 {
1279 /* 1309 /*
1280 * do not report ButtonRelease 1310 * do not report ButtonRelease
1281 * no state info allowed 1311 * no state info allowed
1282 */ 1312 */
1283 key_state = 0; 1313 if (release)
1284 if (button_number == 3)
1285 return; 1314 return;
1286 } 1315 }
1287 else 1316 else
1288 { 1317 {
1289 /* XTerm mouse reporting needs these values: 1318 /* XTerm mouse reporting needs these values:
… …
1291 * 8 = Meta 1320 * 8 = Meta
1292 * 16 = Control 1321 * 16 = Control
1293 * plus will add in our own Double-Click reporting 1322 * plus will add in our own Double-Click reporting
1294 * 32 = Double Click 1323 * 32 = Double Click
1295 */ 1324 */
1296 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1325 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1297 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1326 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1298 + ((MEvent.state & ControlMask) ? 16 : 0); 1327 + ((MEvent.state & ControlMask) ? 16 : 0);
1299#ifdef MOUSE_REPORT_DOUBLECLICK 1328#ifdef MOUSE_REPORT_DOUBLECLICK
1300 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1329 state += ((MEvent.clicks > 1) ? 32 : 0);
1301#endif 1330#endif
1302 } 1331 }
1332
1333 int code = 32 + (release ? 3 : button_number) + state;
1303 1334
1304#if DEBUG_MOUSEREPORT 1335#if DEBUG_MOUSEREPORT
1305 fprintf (stderr, "Mouse ["); 1336 fprintf (stderr, "Mouse [");
1306 if (key_state & 16) 1337 if (state & 16)
1307 fputc ('C', stderr); 1338 fputc ('C', stderr);
1308 if (key_state & 4) 1339 if (state & 4)
1309 fputc ('S', stderr); 1340 fputc ('S', stderr);
1310 if (key_state & 8) 1341 if (state & 8)
1311 fputc ('A', stderr); 1342 fputc ('A', stderr);
1312 if (key_state & 32) 1343 if (state & 32)
1313 fputc ('2', stderr); 1344 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1345 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1346 button_number,
1316 x, 1347 x,
1317 y); 1348 y);
1318#endif 1349#endif
1319 1350
1320#if ENABLE_FRILLS 1351#if ENABLE_FRILLS
1321 if (priv_modes & PrivMode_ExtMouseRight) 1352 if (priv_modes & PrivMode_ExtMouseSGR)
1353 tt_printf ("\033[<%d;%d;%d%c",
1354 button_number + state,
1355 x,
1356 y,
1357 release ? 'm' : 'M');
1358 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1322 tt_printf ("\033[%d;%d;%dM", 1359 tt_printf ("\033[%d;%d;%dM",
1323 code + button_number + key_state, 1360 code,
1324 x, 1361 x,
1325 y); 1362 y);
1326 else if (priv_modes & PrivMode_ExtModeMouse) 1363 else if (priv_modes & PrivMode_ExtMouseUTF8)
1364 if (code < 128)
1327 tt_printf ("\033[M%c%lc%lc", 1365 tt_printf ("\033[M%c%lc%lc",
1328 code + button_number + key_state, 1366 code,
1329 wint_t (32 + x), 1367 wint_t (32 + x),
1330 wint_t (32 + y)); 1368 wint_t (32 + y));
1369 else
1370 tt_printf ("\033[M%c%c%lc%lc",
1371 0xc0 + (code >> 6),
1372 0x80 + (code & 0x3f),
1373 wint_t (32 + x),
1374 wint_t (32 + y));
1331 else 1375 else
1332#endif 1376#endif
1333 tt_printf ("\033[M%c%c%c", 1377 tt_printf ("\033[M%c%c%c",
1334 code + button_number + key_state, 1378 code,
1335 32 + x, 1379 32 + x,
1336 32 + y); 1380 32 + y);
1337} 1381}
1338 1382
1339/*{{{ process an X event */ 1383/*{{{ process an X event */
1340void 1384void ecb_hot
1341rxvt_term::x_cb (XEvent &ev) 1385rxvt_term::x_cb (XEvent &ev)
1342{ 1386{
1343 make_current (); 1387 make_current ();
1344 1388
1345 dLocal (Display *, dpy); 1389 dLocal (Display *, dpy);
… …
1448 if (ev.xconfigure.window == parent) 1492 if (ev.xconfigure.window == parent)
1449 { 1493 {
1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1494 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ; 1495 ;
1452 1496
1453#ifdef HAVE_BG_PIXMAP 1497 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1454 bool moved = false; 1498
1455 if (bg_window_position_sensitive ()) 1499 if (want_position_change)
1456 { 1500 {
1457 int x, y; 1501 int x, y;
1502
1458 if (ev.xconfigure.send_event) 1503 if (ev.xconfigure.send_event)
1459 { 1504 {
1460 x = ev.xconfigure.x; 1505 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y; 1506 y = ev.xconfigure.y;
1462 } 1507 }
1463 else 1508 else
1464 get_window_origin (x, y); 1509 get_window_origin (x, y);
1465 1510
1466 if (bg_set_position (x, y) 1511 if (x != parent_x || y != parent_y)
1467 || !(bg_flags & BG_IS_VALID)) 1512 {
1468 moved = true; 1513 parent_x = x;
1514 parent_y = y;
1515 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1516 }
1469 } 1517 }
1470#endif
1471 1518
1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1519 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1473 { 1520 {
1474 seen_resize = 1; 1521 seen_resize = 1;
1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1522 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1476 } 1523 }
1477 else
1478 {
1479#ifdef HAVE_BG_PIXMAP
1480 if (moved)
1481 {
1482 if (mapped)
1483 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1487#endif
1488 }
1489 1524
1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1525 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1491 } 1526 }
1492 break; 1527 break;
1493 1528
… …
1502 case SelectionRequest: 1537 case SelectionRequest:
1503 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1504 break; 1539 break;
1505 1540
1506 case MapNotify: 1541 case MapNotify:
1507#ifdef HAVE_BG_PIXMAP
1508 /* This is needed specifically to fix the case of no window manager or a
1509 * non-reparenting window manager. In those cases we never get first
1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1511 * care of multiplicity of ConfigureNotify events arriving while WM does
1512 * reparenting.
1513 * We should not render background immediately, as there could be several
1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1515 * by scheduling background redraw as soon as we can, but giving a short
1516 * bit of time for ConfigureNotifies to arrive.
1517 * We should render background PRIOR to drawing any text, but AFTER all
1518 * of ConfigureNotifys for the best results.
1519 */
1520 if (!(bg_flags & BG_IS_VALID))
1521 update_background_ev.start (0.025);
1522#endif
1523 mapped = 1; 1542 mapped = 1;
1524#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1525 text_blink_ev.start (); 1544 text_blink_ev.start ();
1526#endif 1545#endif
1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566 ; 1585 ;
1567 1586
1568 if (scrollBar.state && ev.xany.window == scrollBar.win) 1587 if (scrollBar.state && ev.xany.window == scrollBar.win)
1569 { 1588 {
1570 scrollBar.state = STATE_IDLE; 1589 scrollBar.state = SB_STATE_IDLE;
1571 scrollBar.show (0); 1590 scrollBar.show (0);
1572 } 1591 }
1573 } 1592 }
1574 break; 1593 break;
1575 1594
1576 case MotionNotify: 1595 case MotionNotify:
1577#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1578 if (hidden_pointer) 1597 if (hidden_pointer)
1579 pointer_unblank (); 1598 pointer_unblank ();
1580#endif 1599#endif
1600 if (!bypass_keystate
1581 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1601 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1582 || priv_modes & PrivMode_MouseAnyEvent) 1602 || priv_modes & PrivMode_MouseAnyEvent))
1583 mouse_report (ev.xbutton); 1603 mouse_report (ev.xbutton);
1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1604 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1585 break; 1605 break;
1586 1606
1587 if (ev.xany.window == vt) 1607 if (ev.xany.window == vt)
… …
1599 &unused_root_x, &unused_root_y, 1619 &unused_root_x, &unused_root_y,
1600 &ev.xbutton.x, &ev.xbutton.y, 1620 &ev.xbutton.x, &ev.xbutton.y,
1601 &ev.xbutton.state); 1621 &ev.xbutton.state);
1602#ifdef MOUSE_THRESHOLD 1622#ifdef MOUSE_THRESHOLD
1603 /* deal with a `jumpy' mouse */ 1623 /* deal with a `jumpy' mouse */
1604 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1624 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1625#endif
1605 { 1626 {
1606#endif
1607#if ISO_14755 1627#if ISO_14755
1608 // 5.4 1628 // 5.4
1609 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1629 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1610 { 1630 {
1611 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1631 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1617 1637
1618#ifdef SELECTION_SCROLLING 1638#ifdef SELECTION_SCROLLING
1619 if (ev.xbutton.y < int_bwidth 1639 if (ev.xbutton.y < int_bwidth
1620 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1640 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1621 { 1641 {
1642 page_dirn scroll_selection_dir;
1622 int dist; 1643 int dist;
1623 1644
1624 /* don't clobber the current delay if we are 1645 /* don't clobber the current delay if we are
1625 * already in the middle of scrolling. 1646 * already in the middle of scrolling.
1626 */ 1647 */
… …
1641 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1642 } 1663 }
1643 else 1664 else
1644 { 1665 {
1645 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1646 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1647 } 1668 }
1648 1669
1649 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1650 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1651 + 1; 1672 + 1;
1652 min_it (scroll_selection_lines, 1673 min_it (scroll_selection_lines,
1653 SELECTION_SCROLL_MAX_LINES); 1674 SELECTION_SCROLL_MAX_LINES);
1675 scroll_selection_lines *= scroll_selection_dir;
1654 } 1676 }
1655 else 1677 else
1656 { 1678 {
1657 /* we are within the text window, so we 1679 /* we are within the text window, so we
1658 * shouldn't be scrolling 1680 * shouldn't be scrolling
1659 */ 1681 */
1660 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1661 } 1683 }
1662#endif 1684#endif
1663#ifdef MOUSE_THRESHOLD
1664 } 1685 }
1665#endif
1666 } 1686 }
1667 } 1687 }
1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1688 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1689 {
1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1690 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1691 MotionNotify, &ev))
1672 ; 1692 ;
1673 1693
1674 XQueryPointer (dpy, scrollBar.win, 1694 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1695 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1696 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1697 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1698 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1699 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1680 scrollBar.size ()); 1700 scrollBar.size ());
1681 want_refresh = 1; 1701 want_refresh = 1;
1682 scrollBar.show (1); 1702 scrollBar.show (1);
1683 } 1703 }
1684 break; 1704 break;
1685 } 1705 }
1686 1706
1687#if defined(CURSOR_BLINK) 1707#if defined(CURSOR_BLINK)
1688 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1708 if (ev.type == KeyPress)
1689 {
1690 if (hidden_cursor)
1691 {
1692 hidden_cursor = 0;
1693 want_refresh = 1;
1694 }
1695
1696 cursor_blink_ev.again (); 1709 cursor_blink_reset ();
1697 }
1698#endif 1710#endif
1699 1711
1700#if defined(POINTER_BLANK) 1712#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 { 1714 {
… …
1713 1725
1714 refresh_check (); 1726 refresh_check ();
1715} 1727}
1716 1728
1717#if ENABLE_FRILLS 1729#if ENABLE_FRILLS
1718void 1730void ecb_cold
1719rxvt_term::set_urgency (bool enable) 1731rxvt_term::set_urgency (bool enable)
1720{ 1732{
1721 if (enable == urgency_hint) 1733 if (enable == urgency_hint)
1722 return; 1734 return;
1723 1735
1724 if (XWMHints *h = XGetWMHints (dpy, parent)) 1736 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 { 1737 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h); 1739 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable; 1740 urgency_hint = enable;
1741 XFree (h);
1729 } 1742 }
1730} 1743}
1731#endif 1744#endif
1732 1745
1733void 1746void ecb_cold
1734rxvt_term::focus_in () 1747rxvt_term::focus_in ()
1735{ 1748{
1736 if (!focus) 1749 if (!focus)
1737 { 1750 {
1738 focus = 1; 1751 focus = 1;
1739 want_refresh = 1; 1752 want_refresh = 1;
1740 1753
1741#if USE_XIM 1754#if USE_XIM
1742 if (Input_Context != NULL) 1755 if (Input_Context != NULL)
1743 { 1756 {
1744 IMSetPosition (); 1757 im_set_position ();
1745 XSetICFocus (Input_Context); 1758 XSetICFocus (Input_Context);
1746 } 1759 }
1747#endif 1760#endif
1748#if CURSOR_BLINK 1761#if CURSOR_BLINK
1749 if (option (Opt_cursorBlink)) 1762 if (option (Opt_cursorBlink))
… …
1751#endif 1764#endif
1752#if OFF_FOCUS_FADING 1765#if OFF_FOCUS_FADING
1753 if (rs[Rs_fade]) 1766 if (rs[Rs_fade])
1754 { 1767 {
1755 pix_colors = pix_colors_focused; 1768 pix_colors = pix_colors_focused;
1756 scr_recolour (); 1769 scr_recolor ();
1757 } 1770 }
1758#endif 1771#endif
1759#if ENABLE_FRILLS 1772#if ENABLE_FRILLS
1760 if (option (Opt_urgentOnBell)) 1773 if (option (Opt_urgentOnBell))
1761 set_urgency (0); 1774 set_urgency (0);
1775
1776 if (priv_modes & PrivMode_FocusEvent)
1777 tt_printf ("\x1b[I");
1762#endif 1778#endif
1763 1779
1764 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1765 } 1781 }
1766} 1782}
1767 1783
1768void 1784void ecb_cold
1769rxvt_term::focus_out () 1785rxvt_term::focus_out ()
1770{ 1786{
1771 if (focus) 1787 if (focus)
1772 { 1788 {
1773 focus = 0; 1789 focus = 0;
1774 want_refresh = 1; 1790 want_refresh = 1;
1775 1791
1776#if ENABLE_FRILLS 1792#if ENABLE_FRILLS
1777 if (option (Opt_urgentOnBell)) 1793 if (option (Opt_urgentOnBell))
1778 set_urgency (0); 1794 set_urgency (0);
1795
1796 if (priv_modes & PrivMode_FocusEvent)
1797 tt_printf ("\x1b[O");
1779#endif 1798#endif
1780#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1781 if (iso14755buf) 1800 if (iso14755buf)
1782 { 1801 {
1783 iso14755buf = 0; 1802 iso14755buf = 0;
… …
1798#endif 1817#endif
1799#if OFF_FOCUS_FADING 1818#if OFF_FOCUS_FADING
1800 if (rs[Rs_fade]) 1819 if (rs[Rs_fade])
1801 { 1820 {
1802 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1803 scr_recolour (); 1822 scr_recolor ();
1804 } 1823 }
1805#endif 1824#endif
1806 1825
1807 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1808 } 1827 }
1809} 1828}
1810 1829
1811void 1830void ecb_cold
1812rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1813{ 1832{
1814#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1816 { 1835 {
1836 if (!first_time)
1837 pix_colors_focused [idx].free (this);
1838
1817 rgba c; 1839 rgba c;
1818 pix_colors [Color_fade].get (c); 1840 pix_colors [Color_fade].get (c);
1819 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1841 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1820 } 1842 }
1821#endif 1843#endif
1822} 1844}
1823 1845
1824#if ENABLE_TRANSPARENCY || ENABLE_PERL 1846#if ENABLE_PERL
1825void 1847void ecb_hot
1826rxvt_term::rootwin_cb (XEvent &ev) 1848rxvt_term::rootwin_cb (XEvent &ev)
1827{ 1849{
1828 make_current (); 1850 make_current ();
1829 1851
1830 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1852 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1831 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1853 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1832 return; 1854 return;
1833 1855
1834# if ENABLE_TRANSPARENCY
1835 switch (ev.type) 1856 switch (ev.type)
1836 { 1857 {
1837 case PropertyNotify: 1858 case PropertyNotify:
1838 /* 1859 /*
1839 * if user used some Esetroot compatible prog to set the root bg, 1860 * if user used some Esetroot compatible prog to set the root bg,
1840 * use the property to determine the pixmap. We use it later on. 1861 * use the property to determine the pixmap. We use it later on.
1841 */ 1862 */
1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1863 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1864 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1844 { 1865 {
1845 bg_set_root_pixmap (); 1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1846 update_background ();
1847 } 1867 }
1848 1868
1849 break; 1869 break;
1850 } 1870 }
1851# endif
1852 1871
1853 refresh_check (); 1872 refresh_check ();
1854} 1873}
1855#endif 1874#endif
1856 1875
… …
1879 iso14755_54 (ev.x, ev.y); 1898 iso14755_54 (ev.x, ev.y);
1880 return; 1899 return;
1881 } 1900 }
1882#endif 1901#endif
1883 1902
1884 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1903 clickintime = ev.time - MEvent.time < multiClickTime;
1885 1904
1886 if (reportmode) 1905 if (reportmode)
1887 { 1906 {
1888 /* mouse report from vt window */ 1907 /* mouse report from vt window */
1889 /* save the xbutton state (for ButtonRelease) */ 1908 /* save the xbutton state (for ButtonRelease) */
… …
1980 if (scrollBar.upButton (ev.y)) 1999 if (scrollBar.upButton (ev.y))
1981 direction = UP; /* up */ 2000 direction = UP; /* up */
1982 else if (scrollBar.dnButton (ev.y)) 2001 else if (scrollBar.dnButton (ev.y))
1983 direction = DN; /* down */ 2002 direction = DN; /* down */
1984 2003
1985 scrollBar.state = STATE_IDLE; 2004 scrollBar.state = SB_STATE_IDLE;
1986 /* 2005 /*
1987 * Rxvt-style scrollbar: 2006 * Rxvt-style scrollbar:
1988 * move up if mouse is above slider 2007 * move up if mouse is above slider
1989 * move dn if mouse is below slider 2008 * move dn if mouse is below slider
1990 * 2009 *
… …
2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2048 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 2049#endif
2031 if (scr_page (direction, 1)) 2050 if (scr_page (direction, 1))
2032 { 2051 {
2033 if (direction == UP) 2052 if (direction == UP)
2034 scrollBar.state = STATE_UP; 2053 scrollBar.state = SB_STATE_UP;
2035 else 2054 else
2036 scrollBar.state = STATE_DOWN; 2055 scrollBar.state = SB_STATE_DOWN;
2037 } 2056 }
2038 } 2057 }
2039 else 2058 else
2040 switch (ev.button) 2059 switch (ev.button)
2041 { 2060 {
2042 case Button2: 2061 case Button2:
2043 switch (scrollBar.align) 2062 switch (scrollBar.align)
2044 { 2063 {
2045 case R_SB_ALIGN_TOP: 2064 case SB_ALIGN_TOP:
2046 csrO = 0; 2065 csrO = 0;
2047 break; 2066 break;
2048 case R_SB_ALIGN_CENTRE: 2067 case SB_ALIGN_CENTRE:
2049 csrO = (scrollBar.bot - scrollBar.top) / 2; 2068 csrO = (scrollBar.bot - scrollBar.top) / 2;
2050 break; 2069 break;
2051 case R_SB_ALIGN_BOTTOM: 2070 case SB_ALIGN_BOTTOM:
2052 csrO = scrollBar.bot - scrollBar.top; 2071 csrO = scrollBar.bot - scrollBar.top;
2053 break; 2072 break;
2054 } 2073 }
2055 2074
2056 if (scrollBar.style == R_SB_XTERM 2075 if (scrollBar.style == SB_STYLE_XTERM
2057 || scrollbar_above_slider (ev.y) 2076 || scrollBar.above_slider (ev.y)
2058 || scrollbar_below_slider (ev.y)) 2077 || scrollBar.below_slider (ev.y))
2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2078 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2060 2079
2061 scrollBar.state = STATE_MOTION; 2080 scrollBar.state = SB_STATE_MOTION;
2062 break; 2081 break;
2063 2082
2064 case Button1: 2083 case Button1:
2065 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2084 if (scrollBar.align == SB_ALIGN_CENTRE)
2066 csrO = ev.y - scrollBar.top; 2085 csrO = ev.y - scrollBar.top;
2067 /* FALLTHROUGH */ 2086 /* FALLTHROUGH */
2068 2087
2069 case Button3: 2088 case Button3:
2070 if (scrollBar.style != R_SB_XTERM) 2089 if (scrollBar.style != SB_STYLE_XTERM)
2071 { 2090 {
2072 if (scrollbar_above_slider (ev.y)) 2091 if (scrollBar.above_slider (ev.y))
2073# ifdef RXVT_SCROLL_FULL 2092# ifdef RXVT_SCROLL_FULL
2074 scr_page (UP, nrow - 1); 2093 scr_page (UP, nrow - 1);
2075# else 2094# else
2076 scr_page (UP, nrow / 4); 2095 scr_page (UP, nrow / 4);
2077# endif 2096# endif
2078 else if (scrollbar_below_slider (ev.y)) 2097 else if (scrollBar.below_slider (ev.y))
2079# ifdef RXVT_SCROLL_FULL 2098# ifdef RXVT_SCROLL_FULL
2080 scr_page (DN, nrow - 1); 2099 scr_page (DN, nrow - 1);
2081# else 2100# else
2082 scr_page (DN, nrow / 4); 2101 scr_page (DN, nrow / 4);
2083# endif 2102# endif
2084 else 2103 else
2085 scrollBar.state = STATE_MOTION; 2104 scrollBar.state = SB_STATE_MOTION;
2086 } 2105 }
2087 else 2106 else
2088 { 2107 {
2089 scr_page ((ev.button == Button1 ? DN : UP), 2108 scr_page ((ev.button == Button1 ? DN : UP),
2090 (nrow 2109 (nrow
2091 * scrollbar_position (ev.y) 2110 * scrollBar.position (ev.y)
2092 / scrollBar.size ())); 2111 / scrollBar.size ()));
2093 } 2112 }
2094 2113
2095 break; 2114 break;
2096 } 2115 }
… …
2107 2126
2108 csrO = 0; /* reset csr Offset */ 2127 csrO = 0; /* reset csr Offset */
2109 if (!bypass_keystate) 2128 if (!bypass_keystate)
2110 reportmode = !! (priv_modes & PrivMode_mouse_report); 2129 reportmode = !! (priv_modes & PrivMode_mouse_report);
2111 2130
2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2131 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2113 { 2132 {
2114 scrollBar.state = STATE_IDLE; 2133 scrollBar.state = SB_STATE_IDLE;
2115 scrollBar.show (0); 2134 scrollBar.show (0);
2116 } 2135 }
2117 2136
2118#ifdef SELECTION_SCROLLING 2137#ifdef SELECTION_SCROLLING
2119 sel_scroll_ev.stop(); 2138 sel_scroll_ev.stop();
… …
2132 2151
2133 if (reportmode) 2152 if (reportmode)
2134 { 2153 {
2135 /* mouse report from vt window */ 2154 /* mouse report from vt window */
2136 /* don't report release of wheel "buttons" */ 2155 /* don't report release of wheel "buttons" */
2137 if (ev.button >= 4) 2156 if (ev.button >= 4 && ev.button <= 7)
2138 return; 2157 return;
2139#ifdef MOUSE_REPORT_DOUBLECLICK 2158#ifdef MOUSE_REPORT_DOUBLECLICK
2140 /* only report the release of 'slow' single clicks */ 2159 /* only report the release of 'slow' single clicks */
2141 if (MEvent.button != AnyButton 2160 if (MEvent.button != AnyButton
2142 && (ev.button != MEvent.button 2161 && (ev.button != MEvent.button
2143 || (ev.time - MEvent.time 2162 || (ev.time - MEvent.time
2144 > MULTICLICK_TIME / 2))) 2163 > multiClickTime / 2)))
2145 { 2164 {
2146 MEvent.clicks = 0; 2165 MEvent.clicks = 0;
2147 MEvent.button = AnyButton; 2166 MEvent.button = ev.button;
2148 mouse_report (ev); 2167 mouse_report (ev);
2149 } 2168 }
2150#else /* MOUSE_REPORT_DOUBLECLICK */ 2169#else /* MOUSE_REPORT_DOUBLECLICK */
2151 MEvent.button = AnyButton; 2170 MEvent.button = ev.button;
2152 mouse_report (ev); 2171 mouse_report (ev);
2153#endif /* MOUSE_REPORT_DOUBLECLICK */ 2172#endif /* MOUSE_REPORT_DOUBLECLICK */
2154 return; 2173 return;
2155 } 2174 }
2156 2175
… …
2169 case Button3: 2188 case Button3:
2170 selection_make (ev.time); 2189 selection_make (ev.time);
2171 break; 2190 break;
2172 2191
2173 case Button2: 2192 case Button2:
2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2193 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2194 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2176 break; 2195 break;
2177 2196
2178#ifdef MOUSE_WHEEL 2197#ifdef MOUSE_WHEEL
2179 case Button4: 2198 case Button4:
2180 case Button5: 2199 case Button5:
2181 { 2200 {
2182 int i; 2201 int lines;
2183 page_dirn v; 2202 page_dirn dirn;
2184 2203
2185 v = ev.button == Button4 ? UP : DN; 2204 dirn = ev.button == Button4 ? UP : DN;
2186 2205
2187 if (ev.state & ShiftMask) 2206 if (ev.state & ShiftMask)
2188 i = 1; 2207 lines = 1;
2189 else if (option (Opt_mouseWheelScrollPage)) 2208 else if (option (Opt_mouseWheelScrollPage))
2190 i = nrow - 1; 2209 lines = nrow - 1;
2191 else 2210 else
2192 i = 5; 2211 lines = 5;
2193 2212
2194# ifdef MOUSE_SLIP_WHEELING 2213# ifdef MOUSE_SLIP_WHEELING
2195 if (ev.state & ControlMask) 2214 if (ev.state & ControlMask)
2196 { 2215 {
2197 mouse_slip_wheel_speed += v ? -1 : 1; 2216 mouse_slip_wheel_speed += dirn;
2198 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2217 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2199 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2200 2218
2201 if (!slip_wheel_ev.is_active ()) 2219 if (!slip_wheel_ev.is_active ())
2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2203 } 2221 }
2204 else 2222 else
2205# endif 2223# endif
2206 { 2224 {
2207 scr_page (v, i); 2225 scr_page (dirn, lines);
2208 scrollBar.show (1); 2226 scrollBar.show (1);
2209 } 2227 }
2210 } 2228 }
2211 break; 2229 break;
2212#endif 2230#endif
… …
2214 } 2232 }
2215} 2233}
2216 2234
2217/*}}} */ 2235/*}}} */
2218 2236
2219void 2237void ecb_hot
2220rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2221{ 2239{
2222 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2223 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2224 2242
2225 for (;;) 2243 for (;;)
2226 { 2244 {
2227 if (expect_false (ch == NOCHAR)) 2245 if (ecb_unlikely (ch == NOCHAR))
2228 { 2246 {
2229 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2230 ch = next_char (); 2248 ch = next_char ();
2231 2249
2232 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2233 break; 2251 break;
2234 } 2252 }
2235 2253
2236 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2237 { 2255 {
2238 if (expect_false (!seen_input)) 2256 if (ecb_unlikely (!seen_input))
2239 { 2257 {
2240 seen_input = 1; 2258 seen_input = 1;
2241 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2242 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2243 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2256 wchar_t *str = buf; 2274 wchar_t *str = buf;
2257 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2258 2276
2259 for (;;) 2277 for (;;)
2260 { 2278 {
2261 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2262 break; 2280 break;
2263 2281
2264 *str++ = ch; 2282 *str++ = ch;
2265 2283
2266 if (expect_false (ch == C0_LF || str >= eol)) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2267 { 2285 {
2268 if (ch == C0_LF) 2286 if (ch == C0_LF)
2269 nlines++; 2287 nlines++;
2270 2288
2271 refresh_count++; 2289 refresh_count++;
… …
2343 } 2361 }
2344 } 2362 }
2345} 2363}
2346 2364
2347// read the next character 2365// read the next character
2348wchar_t 2366wchar_t ecb_hot
2349rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () noexcept
2350{ 2368{
2351 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2352 { 2370 {
2353 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2355 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2356 2374
2357 wchar_t wc; 2375 wchar_t wc;
2358 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2359 2377
… …
2365 } 2383 }
2366 2384
2367 if (len == (size_t)-1) 2385 if (len == (size_t)-1)
2368 { 2386 {
2369 mbstate.reset (); // reset now undefined conversion state 2387 mbstate.reset (); // reset now undefined conversion state
2388 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2389 // in which case we "erroneously" return the next byte which might be valid.
2370 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2390 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2371 } 2391 }
2372 2392
2373 // assume wchar == unicode 2393 // assume wchar == unicode
2374 cmdbuf_ptr += len; 2394 cmdbuf_ptr += len;
… …
2377 2397
2378 return NOCHAR; 2398 return NOCHAR;
2379} 2399}
2380 2400
2381// read the next octet 2401// read the next octet
2382uint32_t 2402uint32_t ecb_hot
2383rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () noexcept
2384{ 2404{
2385 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2386 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2387 : NOCHAR; 2407 : NOCHAR;
2388} 2408}
2389 2409
2390static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2391 2411
2392wchar_t 2412wchar_t ecb_hot
2393rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc ()
2394{ 2414{
2395 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2396 2416
2397 if (c == NOCHAR) 2417 if (c == NOCHAR)
2398 throw out_of_input; 2418 throw out_of_input;
2399 2419
2400 return c; 2420 return c;
2401} 2421}
2402 2422
2403uint32_t 2423uint32_t ecb_hot
2404rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 ()
2405{ 2425{
2406 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2407 2427
2408 if (c == NOCHAR) 2428 if (c == NOCHAR)
2409 throw out_of_input; 2429 throw out_of_input;
… …
2412} 2432}
2413 2433
2414/*{{{ print pipe */ 2434/*{{{ print pipe */
2415/*----------------------------------------------------------------------*/ 2435/*----------------------------------------------------------------------*/
2416#ifdef PRINTPIPE 2436#ifdef PRINTPIPE
2417FILE * 2437FILE * ecb_cold
2418rxvt_term::popen_printer () 2438rxvt_term::popen_printer ()
2419{ 2439{
2420 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2440 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2421 2441
2422 if (stream == NULL) 2442 if (stream == NULL)
2423 rxvt_warn ("can't open printer pipe, not printing.\n"); 2443 rxvt_warn ("can't open printer pipe, not printing.\n");
2424 2444
2425 return stream; 2445 return stream;
2426} 2446}
2427 2447
2428int 2448int ecb_cold
2429rxvt_term::pclose_printer (FILE *stream) 2449rxvt_term::pclose_printer (FILE *stream)
2430{ 2450{
2431 fflush (stream); 2451 fflush (stream);
2432 return pclose (stream); 2452 return pclose (stream);
2433} 2453}
2434 2454
2435/* 2455/*
2436 * simulate attached vt100 printer 2456 * simulate attached vt100 printer
2437 */ 2457 */
2438void 2458void ecb_cold
2439rxvt_term::process_print_pipe () 2459rxvt_term::process_print_pipe ()
2440{ 2460{
2441 FILE *fd = popen_printer (); 2461 FILE *fd = popen_printer ();
2442 2462
2443 if (!fd) 2463 if (!fd)
… …
2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2518 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2519 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2500}; 2520};
2501 2521
2502/*{{{ process non-printing single characters */ 2522/*{{{ process non-printing single characters */
2503void 2523void ecb_hot
2504rxvt_term::process_nonprinting (unicode_t ch) 2524rxvt_term::process_nonprinting (unicode_t ch)
2505{ 2525{
2506 switch (ch) 2526 switch (ch)
2507 { 2527 {
2508 case C0_ESC: 2528 case C0_ESC:
… …
2538 scr_charset_choose (0); 2558 scr_charset_choose (0);
2539 break; 2559 break;
2540 2560
2541#ifdef EIGHT_BIT_CONTROLS 2561#ifdef EIGHT_BIT_CONTROLS
2542 // 8-bit controls 2562 // 8-bit controls
2543 case 0x90: /* DCS */ 2563 case 0x90: /* DCS */
2544 process_dcs_seq (); 2564 process_dcs_seq ();
2545 break; 2565 break;
2546 case 0x9b: /* CSI */ 2566 case 0x9b: /* CSI */
2547 process_csi_seq (); 2567 process_csi_seq ();
2548 break; 2568 break;
2549 case 0x9d: /* OSC */ 2569 case 0x9d: /* OSC */
2550 process_osc_seq (); 2570 process_osc_seq ();
2551 break; 2571 break;
2552#endif 2572#endif
2553 } 2573 }
2554} 2574}
2555/*}}} */ 2575/*}}} */
2556 2576
2557 2577
2558/*{{{ process VT52 escape sequences */ 2578/*{{{ process VT52 escape sequences */
2559void 2579void ecb_cold
2560rxvt_term::process_escape_vt52 (unicode_t ch) 2580rxvt_term::process_escape_vt52 (unicode_t ch)
2561{ 2581{
2562 int row, col; 2582 int row, col;
2563 2583
2564 switch (ch) 2584 switch (ch)
… …
2598 break; 2618 break;
2599 case 'Z': /* identify the terminal type */ 2619 case 'Z': /* identify the terminal type */
2600 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2620 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2601 break; 2621 break;
2602 case '<': /* turn off VT52 mode */ 2622 case '<': /* turn off VT52 mode */
2603 set_privmode (PrivMode_vt52, 0); 2623 priv_modes &= ~PrivMode_vt52;
2604 break; 2624 break;
2605 case 'F': /* use special graphics character set */ 2625 case 'F': /* use special graphics character set */
2606 case 'G': /* use regular character set */ 2626 case 'G': /* use regular character set */
2607 /* unimplemented */ 2627 /* unimplemented */
2608 break; 2628 break;
… …
2614} 2634}
2615/*}}} */ 2635/*}}} */
2616 2636
2617 2637
2618/*{{{ process escape sequences */ 2638/*{{{ process escape sequences */
2619void 2639void ecb_hot
2620rxvt_term::process_escape_seq () 2640rxvt_term::process_escape_seq ()
2621{ 2641{
2622 unicode_t ch = cmd_getc (); 2642 unicode_t ch = cmd_getc ();
2623 2643
2624 if (priv_modes & PrivMode_vt52) 2644 if (priv_modes & PrivMode_vt52)
… …
2627 return; 2647 return;
2628 } 2648 }
2629 2649
2630 switch (ch) 2650 switch (ch)
2631 { 2651 {
2632 /* case 1: do_tek_mode (); break; */
2633 case '#': 2652 case '#':
2634 if (cmd_getc () == '8') 2653 if (cmd_getc () == '8')
2635 scr_E (); 2654 scr_E ();
2636 break; 2655 break;
2637 case '(': 2656 case '(':
… …
2660#if !ENABLE_MINIMAL 2679#if !ENABLE_MINIMAL
2661 case '9': 2680 case '9':
2662 scr_forwardindex (); 2681 scr_forwardindex ();
2663 break; 2682 break;
2664#endif 2683#endif
2684 // DECPAM/DECPNM
2665 case '=': 2685 case '=':
2686 priv_modes |= PrivMode_aplKP;
2687 break;
2666 case '>': 2688 case '>':
2667 set_privmode (PrivMode_aplKP, ch == '='); 2689 priv_modes &= ~PrivMode_aplKP;
2668 break; 2690 break;
2669 2691
2670 case C1_40: 2692 case C1_40:
2671 cmd_getc (); 2693 cmd_getc ();
2672 break; 2694 break;
… …
2676 2698
2677 /* 8.3.87: NEXT LINE */ 2699 /* 8.3.87: NEXT LINE */
2678 case C1_NEL: /* ESC E */ 2700 case C1_NEL: /* ESC E */
2679 { 2701 {
2680 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2681 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2682 } 2704 }
2683 break; 2705 break;
2684 2706
2707#if 0 // disabled because embedded newlines can make exploits easier
2685 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2686 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2687 // used by original rxvt for rob nations own graphics mode 2710 // used by original rxvt for rob nations own graphics mode
2688 if (cmd_getc () == 'Q') 2711 if (cmd_getc () == 'Q' && option (Opt_insecure))
2689 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2690 break; 2713 break;
2714#endif
2691 2715
2692 /* 8.3.63: CHARACTER TABULATION SET */ 2716 /* 8.3.63: CHARACTER TABULATION SET */
2693 case C1_HTS: /* ESC H */ 2717 case C1_HTS: /* ESC H */
2694 scr_set_tab (1); 2718 scr_set_tab (1);
2695 break; 2719 break;
… …
2698 case C1_RI: /* ESC M */ 2722 case C1_RI: /* ESC M */
2699 scr_index (DN); 2723 scr_index (DN);
2700 break; 2724 break;
2701 2725
2702 /* 8.3.142: SINGLE-SHIFT TWO */ 2726 /* 8.3.142: SINGLE-SHIFT TWO */
2703 /*case C1_SS2: scr_single_shift (2); break; */ 2727 /* case C1_SS2: break; */
2704 2728
2705 /* 8.3.143: SINGLE-SHIFT THREE */ 2729 /* 8.3.143: SINGLE-SHIFT THREE */
2706 /*case C1_SS3: scr_single_shift (3); break; */ 2730 /* case C1_SS3: break; */
2707 2731
2708 /* 8.3.27: DEVICE CONTROL STRING */ 2732 /* 8.3.27: DEVICE CONTROL STRING */
2709 case C1_DCS: /* ESC P */ 2733 case C1_DCS: /* ESC P */
2710 process_dcs_seq (); 2734 process_dcs_seq ();
2711 break; 2735 break;
… …
2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2798 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2799 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2800 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2777 }; 2801 };
2778 2802
2779void 2803void ecb_hot
2780rxvt_term::process_csi_seq () 2804rxvt_term::process_csi_seq ()
2781{ 2805{
2782 unicode_t ch, priv, i; 2806 unicode_t ch, priv, prev_ch, i;
2783 unsigned int nargs, p; 2807 unsigned int nargs, p;
2784 int n, ndef; 2808 int n, ndef;
2785 int arg[ESC_ARGS] = { }; 2809 int arg[ESC_ARGS] = { };
2786 2810
2787 nargs = 0; 2811 nargs = 0;
… …
2793 /* '<' '=' '>' '?' '!' */ 2817 /* '<' '=' '>' '?' '!' */
2794 priv = ch; 2818 priv = ch;
2795 ch = cmd_getc (); 2819 ch = cmd_getc ();
2796 } 2820 }
2797 2821
2822 prev_ch = 0;
2798 /* read any numerical arguments */ 2823 /* read any numerical arguments */
2799 for (n = -1; ch < CSI_ICH; ) 2824 for (n = -1; ch < CSI_ICH; )
2800 { 2825 {
2801 if (isdigit (ch)) 2826 if (isdigit (ch))
2802 { 2827 {
… …
2812 n = -1; 2837 n = -1;
2813 } 2838 }
2814 else if (IS_CONTROL (ch)) 2839 else if (IS_CONTROL (ch))
2815 process_nonprinting (ch); 2840 process_nonprinting (ch);
2816 2841
2842 prev_ch = ch;
2817 ch = cmd_getc (); 2843 ch = cmd_getc ();
2818 } 2844 }
2819 2845
2820 if (ch > CSI_7F) 2846 if (ch > CSI_7F)
2821 return; 2847 return;
… …
2851 break; 2877 break;
2852 2878
2853 case '?': 2879 case '?':
2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2855 process_terminal_mode (ch, priv, nargs, arg); 2881 process_terminal_mode (ch, priv, nargs, arg);
2882 if (prev_ch == '$' && ch == 'p')
2883 process_terminal_mode (ch, priv, nargs, arg);
2856 break; 2884 break;
2857 2885
2858 case '!': 2886 case '!':
2859 if (ch == CSI_70) 2887 if (ch == CSI_70)
2860 { 2888 {
2861 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2889 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2862 scr_soft_reset (); 2890 scr_soft_reset ();
2863 2891
2864 static const int pm_h[] = { 7, 25 }; 2892 static const int pm_h[] = { 7, 25 };
2865 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2893 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2866 2894
2867 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2895 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2868 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2896 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2869 } 2897 }
2870 break; 2898 break;
2871 } 2899 }
2872 2900
2873 return; 2901 return;
… …
2891 } 2919 }
2892 break; 2920 break;
2893#endif 2921#endif
2894 2922
2895 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2923 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2924 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2897 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2898 /* FALLTHROUGH */ 2926 /* FALLTHROUGH */
2899 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2927 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2900 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2928 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2901 scr_gotorc (arg[0], 0, RELATIVE); 2929 scr_gotorc (arg[0], 0, RELATIVE);
2902 break; 2930 break;
2903 2931
2904 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2932 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2905 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2933 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2906#ifdef ISO6429 2934#ifdef ISO6429
2907 arg[0] = -arg[0]; 2935 arg[0] = -arg[0];
2908#else /* emulate common DEC VTs */ 2936#else /* emulate common DEC VTs */
2909 arg[0] = arg[0] ? -arg[0] : -1; 2937 arg[0] = arg[0] ? -arg[0] : -1;
2910#endif 2938#endif
… …
3001 case 7: /* unofficial extension */ 3029 case 7: /* unofficial extension */
3002 if (option (Opt_insecure)) 3030 if (option (Opt_insecure))
3003 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3031 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3004 break; 3032 break;
3005 case 8: /* unofficial extension */ 3033 case 8: /* unofficial extension */
3034 {
3035 string_term st;
3036 st.v[0] = CHAR_ST;
3037 st.v[1] = '\0';
3006 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3038 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3007 break; 3039 break;
3040 }
3008 } 3041 }
3009 break; 3042 break;
3010 3043
3011 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3044 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3012 switch (arg[0]) 3045 switch (arg[0])
… …
3055 scr_insert_mode (1); 3088 scr_insert_mode (1);
3056 else if (arg[0] == 20) 3089 else if (arg[0] == 20)
3057 priv_modes |= PrivMode_LFNL; 3090 priv_modes |= PrivMode_LFNL;
3058 break; 3091 break;
3059 3092
3093 case CSI_71: // DECSCUSR: set cursor style
3094 if (prev_ch == ' ')
3095 set_cursor_style (arg[0]);
3096 break;
3097
3060 /* 3098 /*
3061 * PRIVATE USE beyond this point. All CSI_7? sequences here 3099 * PRIVATE USE beyond this point. All CSI_7? sequences here
3062 */ 3100 */
3063 case CSI_72: /* DECSTBM: set top and bottom margins */ 3101 case CSI_72: /* DECSTBM: set top and bottom margins */
3064 if (nargs == 1) 3102 if (nargs == 1)
… …
3138 break; 3176 break;
3139 3177
3140 //case 9: NYI, TODO, restore maximized window or maximize window 3178 //case 9: NYI, TODO, restore maximized window or maximize window
3141 default: 3179 default:
3142 if (args[0] >= 24) /* set height (chars) */ 3180 if (args[0] >= 24) /* set height (chars) */
3143 set_widthheight ((unsigned int)width, 3181 set_widthheight ((unsigned int)vt_width,
3144 (unsigned int) (args[1] * fheight)); 3182 (unsigned int) (args[1] * fheight));
3145 break; 3183 break;
3146 3184
3147 /* 3185 /*
3148 * reports - some output format copied from XTerm 3186 * reports - some output format copied from XTerm
… …
3192/* 3230/*
3193 * get input up until STRING TERMINATOR (or BEL) 3231 * get input up until STRING TERMINATOR (or BEL)
3194 * ends_how is terminator used. returned input must be free()'d 3232 * ends_how is terminator used. returned input must be free()'d
3195 */ 3233 */
3196char * 3234char *
3197rxvt_term::get_to_st (unicode_t &ends_how) 3235rxvt_term::get_to_st (string_term &st)
3198{ 3236{
3199 unicode_t ch; 3237 unicode_t ch;
3200 bool seen_esc = false; 3238 bool seen_esc = false;
3201 unsigned int n = 0; 3239 unsigned int n = 0;
3202 wchar_t string[STRING_MAX]; 3240 wchar_t string[CBUFSIZ];
3203 3241
3204 while ((ch = cmd_getc ()) != NOCHAR) 3242 while ((ch = cmd_getc ()) != NOCHAR)
3205 { 3243 {
3206 if (seen_esc) 3244 if (seen_esc)
3207 { 3245 {
… …
3222 else if (ch < 0x20) 3260 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3261 return NULL; /* other control character - exit */
3224 3262
3225 seen_esc = false; 3263 seen_esc = false;
3226 3264
3227 if (n >= STRING_MAX - 1) 3265 if (n >= sizeof (string) - 1)
3228 // stop at some sane length 3266 // stop at some sane length
3229 return NULL; 3267 return NULL;
3230 3268
3231 string[n++] = ch; 3269 string[n++] = ch;
3232 } 3270 }
3233 3271
3234 string[n++] = '\0'; 3272 string[n++] = '\0';
3235 3273
3236 ends_how = (ch == 0x5c ? C0_ESC : ch); 3274 n = 0;
3275 if (ch == 0x5c)
3276 st.v[n++] = C0_ESC;
3277 st.v[n++] = ch;
3278 st.v[n] = '\0';
3237 3279
3238 return rxvt_wcstombs (string); 3280 return rxvt_wcstombs (string);
3239} 3281}
3240 3282
3241/*----------------------------------------------------------------------*/ 3283/*----------------------------------------------------------------------*/
… …
3247{ 3289{
3248 /* 3290 /*
3249 * Not handled yet 3291 * Not handled yet
3250 */ 3292 */
3251 3293
3252 unicode_t eh; 3294 string_term st;
3253 char *s = get_to_st (eh); 3295 char *s = get_to_st (st);
3254 if (s) 3296 if (s)
3255 free (s); 3297 free (s);
3256 3298
3257 return; 3299 return;
3258} 3300}
… …
3270 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3271 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3272 3314
3273 if (ch == ';') 3315 if (ch == ';')
3274 { 3316 {
3275 unicode_t eh; 3317 string_term st;
3276 char *s = get_to_st (eh); 3318 char *s = get_to_st (st);
3277 3319
3278 if (s) 3320 if (s)
3279 { 3321 {
3280 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, st);
3281 free (s); 3323 free (s);
3282 } 3324 }
3283 } 3325 }
3284} 3326}
3285 3327
3328static unsigned int
3329colorcube_index (unsigned int idx_r,
3330 unsigned int idx_g,
3331 unsigned int idx_b)
3332{
3333 assert (idx_r < Red_levels);
3334 assert (idx_g < Green_levels);
3335 assert (idx_b < Blue_levels);
3336
3337 return idx_r * Blue_levels * Green_levels +
3338 idx_g * Blue_levels +
3339 idx_b;
3340}
3341
3342/*
3343 * Find the nearest color slot in the hidden color cube,
3344 * adapt its value to the 32bit RGBA color.
3345 */
3346unsigned int
3347rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3348{
3349 r &= 0xff;
3350 g &= 0xff;
3351 b &= 0xff;
3352 a &= 0xff;
3353
3354 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3355
3356 /* we allow one of the 6 closest neighbouring colours */
3357 /* to replace the current color, if they not used recently */
3358 #if 0
3359 static const unsigned char dxyz[][3] = {
3360 0, 0, 0,
3361 0, 0, 4,
3362 0, 4, 4,
3363 4, 4, 0,
3364 4, 0, 4,
3365 0, 4, 0,
3366 4, 0, 0,
3367 };
3368 #else
3369 // silly compressed verlapping triplets version of above
3370 static const unsigned char dxyz[] = {
3371 0, 0, 0, 4, 4, 0, 4, 0, 0,
3372 };
3373 #endif
3374
3375 static const unsigned char color_level[8][32] = {
3376 // neighbour index
3377 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3378 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3379 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3380 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3381 // Red_levels/Green_levels/Blue_levels index
3382 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3383 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3384 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3385 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3386 };
3387
3388 unsigned int idx;
3389
3390 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3391 {
3392 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3393 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3394 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3395 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3396
3397 if (n == 0)
3398 idx = index;
3399
3400 if (rgb24_color[index] == color)
3401 {
3402 rgb24_seqno[index] = ++rgb24_sequence;
3403 return index + minTermCOLOR24;
3404 }
3405
3406 // minor issue: could update index 0 few more times
3407 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3408 {
3409 idx = index;
3410 goto update;
3411 }
3412
3413 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3414 // but also handles wrap around values well enough
3415 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3416 idx = index;
3417 }
3418
3419update:
3420 rgb24_color[idx] = color;
3421 rgb24_seqno[idx] = ++rgb24_sequence;
3422
3423 idx += minTermCOLOR24;
3424 pix_colors_focused [idx].free (this);
3425 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3426 update_fade_color (idx, false);
3427
3428 return idx;
3429}
3430
3286void 3431void
3287rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3432rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3288{ 3433{
3289 if (str[0] == '?' && !str[1]) 3434 if (str[0] == '?' && !str[1])
3290 { 3435 {
3291 rgba c; 3436 rgba c;
3292 pix_colors_focused[color].get (c); 3437 pix_colors_focused[color].get (c);
3438 char rgba_str[32];
3293 3439
3294#if XFT 3440#if XFT
3295 if (c.a != rgba::MAX_CC) 3441 if (c.a != rgba::MAX_CC)
3296 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3442 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3297 else 3443 else
3298#endif 3444#endif
3299 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3445 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3446
3447 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3448 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3449 else
3450 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3300 } 3451 }
3301 else 3452 else
3302 set_window_color (color, str); 3453 set_window_color (color, str);
3303} 3454}
3304 3455
3305/* 3456/*
3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3457 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3307 */ 3458 */
3308void 3459void
3309rxvt_term::process_xterm_seq (int op, char *str, char resp) 3460rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3310{ 3461{
3311 int color; 3462 int color;
3312 char *buf, *name; 3463 char *buf, *name;
3313 bool query = str[0] == '?' && !str[1]; 3464 bool query = str[0] == '?' && !str[1];
3314 int saveop = op; 3465 int saveop = op;
… …
3349 &nitems, &bytes_after, &value) == Success 3500 &nitems, &bytes_after, &value) == Success
3350 && actual_type != None 3501 && actual_type != None
3351 && actual_format == 8) 3502 && actual_format == 8)
3352 str = (const char *)(value); 3503 str = (const char *)(value);
3353 3504
3354 tt_printf ("\033]%d;%s%c", op, str, resp); 3505 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3355 3506
3356 XFree (value); 3507 XFree (value);
3357 } 3508 }
3358 else 3509 else
3359 { 3510 {
… …
3383 break; 3534 break;
3384 3535
3385 if ((buf = strchr (name, ';')) != NULL) 3536 if ((buf = strchr (name, ';')) != NULL)
3386 *buf++ = '\0'; 3537 *buf++ = '\0';
3387 3538
3388 process_color_seq (op, color, name, resp); 3539 process_color_seq (op, color, name, st);
3389 } 3540 }
3390 break; 3541 break;
3391 case Rxvt_restoreFG: 3542 case Rxvt_restoreFG:
3392 case XTerm_Color00: 3543 case XTerm_Color00:
3393 process_color_seq (op, Color_fg, str, resp); 3544 process_color_seq (op, Color_fg, str, st);
3394 break; 3545 break;
3395 case Rxvt_restoreBG: 3546 case Rxvt_restoreBG:
3396 case XTerm_Color01: 3547 case XTerm_Color01:
3397 process_color_seq (op, Color_bg, str, resp); 3548 process_color_seq (op, Color_bg, str, st);
3398 break; 3549 break;
3399#ifndef NO_CURSORCOLOR 3550#ifndef NO_CURSORCOLOR
3400 case XTerm_Color_cursor: 3551 case XTerm_Color_cursor:
3401 process_color_seq (op, Color_cursor, str, resp); 3552 process_color_seq (op, Color_cursor, str, st);
3402 break; 3553 break;
3403#endif 3554#endif
3404 case XTerm_Color_pointer_fg: 3555 case XTerm_Color_pointer_fg:
3405 process_color_seq (op, Color_pointer_fg, str, resp); 3556 process_color_seq (op, Color_pointer_fg, str, st);
3406 break; 3557 break;
3407 case XTerm_Color_pointer_bg: 3558 case XTerm_Color_pointer_bg:
3408 process_color_seq (op, Color_pointer_bg, str, resp); 3559 process_color_seq (op, Color_pointer_bg, str, st);
3409 break; 3560 break;
3410#ifdef OPTION_HC 3561#ifdef OPTION_HC
3411 case XTerm_Color_HC: 3562 case XTerm_Color_HC:
3412 process_color_seq (op, Color_HC, str, resp); 3563 process_color_seq (op, Color_HC, str, st);
3413 break; 3564 break;
3414 case XTerm_Color_HTC: 3565 case XTerm_Color_HTC:
3415 process_color_seq (op, Color_HTC, str, resp); 3566 process_color_seq (op, Color_HTC, str, st);
3416 break; 3567 break;
3417#endif 3568#endif
3418#ifndef NO_BOLD_UNDERLINE_REVERSE 3569#ifndef NO_BOLD_UNDERLINE_REVERSE
3419 case URxvt_Color_BD: 3570 case URxvt_Color_BD:
3420 process_color_seq (op, Color_BD, str, resp); 3571 process_color_seq (op, Color_BD, str, st);
3421 break; 3572 break;
3422 case URxvt_Color_UL: 3573 case URxvt_Color_UL:
3423 process_color_seq (op, Color_UL, str, resp); 3574 process_color_seq (op, Color_UL, str, st);
3424 break; 3575 break;
3425 case URxvt_Color_IT: 3576 case URxvt_Color_IT:
3426 process_color_seq (op, Color_IT, str, resp); 3577 process_color_seq (op, Color_IT, str, st);
3427 break; 3578 break;
3428#endif 3579#endif
3429 case URxvt_Color_border: 3580 case URxvt_Color_border:
3430 process_color_seq (op, Color_border, str, resp); 3581 process_color_seq (op, Color_border, str, st);
3431 break; 3582 break;
3432#if ENABLE_TRANSPARENCY
3433 case URxvt_Color_tint:
3434 process_color_seq (op, Color_tint, str, resp);
3435 {
3436 bool changed = false;
3437
3438 if (ISSET_PIXCOLOR (Color_tint))
3439 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3440
3441 if (changed)
3442 update_background ();
3443 }
3444
3445 break;
3446#endif
3447
3448#if BG_IMAGE_FROM_FILE
3449 case Rxvt_Pixmap:
3450 if (!strcmp (str, "?"))
3451 {
3452 char str[256];
3453
3454 sprintf (str, "[%dx%d+%d+%d]",
3455 min (h_scale, 32767), min (v_scale, 32767),
3456 min (h_align, 32767), min (v_align, 32767));
3457 process_xterm_seq (XTerm_title, str, CHAR_ST);
3458 }
3459 else
3460 {
3461 int changed = 0;
3462
3463 if (*str != ';')
3464 {
3465 if (bg_set_file (str)) /* change pixmap */
3466 {
3467 changed++;
3468 str = strchr (str, ';');
3469 if (str == NULL)
3470 bg_set_default_geometry ();
3471 else
3472 bg_set_geometry (str+1);
3473 }
3474 }
3475 else
3476 {
3477 str++;
3478 if (bg_set_geometry (str, true))
3479 changed++;
3480 }
3481
3482 if (changed)
3483 {
3484 if (bg_window_position_sensitive ())
3485 {
3486 int x, y;
3487 get_window_origin (x, y);
3488 bg_set_position (x, y);
3489 }
3490 update_background ();
3491 }
3492 }
3493 break;
3494#endif
3495 3583
3496 case XTerm_logfile: 3584 case XTerm_logfile:
3497 // TODO, when secure mode? 3585 // TODO, when secure mode?
3498 break; 3586 break;
3499 3587
… …
3516 case URxvt_boldFont: 3604 case URxvt_boldFont:
3517 case URxvt_italicFont: 3605 case URxvt_italicFont:
3518 case URxvt_boldItalicFont: 3606 case URxvt_boldItalicFont:
3519#endif 3607#endif
3520 if (query) 3608 if (query)
3521 tt_printf ("\33]%d;%-.250s%c", saveop, 3609 tt_printf ("\33]%d;%-.250s%s", saveop,
3522 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3610 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3523 ? fontset[op - URxvt_font]->fontdesc : "", 3611 ? fontset[op - URxvt_font]->fontdesc : "",
3524 resp); 3612 st.v);
3525 else 3613 else
3526 { 3614 {
3527 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3615 const char *&res = rs[Rs_font + (op - URxvt_font)];
3528 3616
3529 res = strdup (str); 3617 res = strdup (str);
… …
3532 } 3620 }
3533 break; 3621 break;
3534 3622
3535 case URxvt_version: 3623 case URxvt_version:
3536 if (query) 3624 if (query)
3537 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3625 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3538 op, 3626 op,
3539 rs[Rs_name], VERSION[0], VERSION[2], 3627 rs[Rs_name], VERSION[0], VERSION[2],
3540 resp); 3628 st.v);
3541 break; 3629 break;
3542 3630
3543#if !ENABLE_MINIMAL 3631#if !ENABLE_MINIMAL
3632 case URxvt_cellinfo:
3633 if (query)
3634 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3635 fwidth, fheight, fbase,
3636 st.v);
3637 break;
3638
3544 case URxvt_locale: 3639 case URxvt_locale:
3545 if (query) 3640 if (query)
3546 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3641 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3547 else 3642 else
3548 { 3643 {
3549 set_locale (str); 3644 set_locale (str);
3550 pty->set_utf8_mode (enc_utf8); 3645 pty->set_utf8_mode (enc_utf8);
3551 init_xlocale (); 3646 init_xlocale ();
… …
3566 break; 3661 break;
3567#endif 3662#endif
3568 3663
3569#if ENABLE_PERL 3664#if ENABLE_PERL
3570 case URxvt_perl: 3665 case URxvt_perl:
3571 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3666 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3572 break; 3667 break;
3573#endif 3668#endif
3574 } 3669 }
3575} 3670}
3576/*----------------------------------------------------------------------*/ 3671/*----------------------------------------------------------------------*/
… …
3583 * 's' = save 3678 * 's' = save
3584 * 'r' = restore 3679 * 'r' = restore
3585 * 't' = toggle 3680 * 't' = toggle
3586 * so no need for fancy checking 3681 * so no need for fancy checking
3587 */ 3682 */
3588int 3683int ecb_cold
3589rxvt_term::privcases (int mode, unsigned long bit) 3684rxvt_term::privcases (int mode, unsigned long bit)
3590{ 3685{
3591 int state; 3686 int state;
3592 3687
3593 if (mode == 's') 3688 if (mode == 's')
3594 { 3689 {
3595 SavedModes |= (priv_modes & bit); 3690 if (priv_modes & bit)
3691 SavedModes |= bit;
3692 else
3693 SavedModes &= ~bit;
3596 return -1; 3694 return -1;
3597 } 3695 }
3598 else 3696 else
3599 { 3697 {
3600 if (mode == 'r') 3698 if (mode == 'r')
3601 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3699 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3602 else 3700 else
3603 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3701 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3604 3702
3605 set_privmode (bit, state); 3703 if (state)
3704 priv_modes |= bit;
3705 else
3706 priv_modes &= ~bit;
3606 } 3707 }
3607 3708
3608 return state; 3709 return state;
3609} 3710}
3610 3711
3611/* we're not using priv _yet_ */ 3712/* we're not using priv _yet_ */
3612void 3713void
3613rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3714rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3614{ 3715{
3615 unsigned int i, j; 3716 unsigned int i, j;
3616 int state; 3717 int state;
3617 3718
3618 static const struct 3719 static const struct
3619 { 3720 {
3620 const int argval; 3721 const int argval;
3621 const unsigned long bit; 3722 const unsigned long bit;
3622 } argtopriv[] = { 3723 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, // DECCKM 3724 { 1, PrivMode_aplCUR }, // DECCKM
3624 { 2, PrivMode_vt52 }, 3725 { 2, PrivMode_vt52 }, // DECANM
3625 { 3, PrivMode_132 }, // DECCOLM 3726 { 3, PrivMode_132 }, // DECCOLM
3626 { 4, PrivMode_smoothScroll }, // DECSCLM 3727 { 4, PrivMode_smoothScroll }, // DECSCLM
3627 { 5, PrivMode_rVideo }, // DECSCNM 3728 { 5, PrivMode_rVideo }, // DECSCNM
3628 { 6, PrivMode_relOrigin }, // DECOM 3729 { 6, PrivMode_relOrigin }, // DECOM
3629 { 7, PrivMode_Autowrap }, // DECAWM 3730 { 7, PrivMode_Autowrap }, // DECAWM
3630 // 8, auto-repeat keys // DECARM 3731 // 8, auto-repeat keys // DECARM
3631 { 9, PrivMode_MouseX10 }, 3732 { 9, PrivMode_MouseX10 },
3733 { 12, PrivMode_BlinkingCursor },
3632 // 18 end FF to printer after print screen 3734 // 18 end FF to printer after print screen
3633 // 19 Print screen prints full screen/scroll region 3735 // 19 Print screen prints full screen/scroll region
3634 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3736 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3635#ifdef scrollBar_esc 3737#ifdef scrollBar_esc
3636 { scrollBar_esc, PrivMode_scrollBar }, 3738 { scrollBar_esc, PrivMode_scrollBar },
3637#endif 3739#endif
3638 { 35, PrivMode_ShiftKeys }, // rxvt extension 3740 { 35, PrivMode_ShiftKeys }, // rxvt extension
3639 // 38, tektronix mode // DECTEK 3741 // 38, tektronix mode // DECTEK
3640 { 40, PrivMode_132OK }, 3742 { 40, PrivMode_132OK },
3641 // 41 xterm more fixes NYI 3743 // 41 xterm more fixes NYI
3642 // 45 margin bell NYI 3744 // 45 margin bell NYI
3643 // 46 start logging 3745 // 46 start logging
3644 { 47, PrivMode_Screen }, 3746 { 47, PrivMode_Screen },
3645 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3747 { 66, PrivMode_aplKP }, // DECNKM
3646#ifndef NO_BACKSPACE_KEY 3748#ifndef NO_BACKSPACE_KEY
3647 { 67, PrivMode_BackSpace }, // DECBKM 3749 { 67, PrivMode_BackSpace }, // DECBKM
3648#endif 3750#endif
3649 { 1000, PrivMode_MouseX11 }, 3751 { 1000, PrivMode_MouseX11 },
3650 { 1002, PrivMode_MouseBtnEvent }, 3752 { 1002, PrivMode_MouseBtnEvent },
3651 { 1003, PrivMode_MouseAnyEvent }, 3753 { 1003, PrivMode_MouseAnyEvent },
3652#if ENABLE_FRILLS 3754#if ENABLE_FRILLS
3755 { 1004, PrivMode_FocusEvent },
3653 { 1005, PrivMode_ExtModeMouse }, 3756 { 1005, PrivMode_ExtMouseUTF8 },
3757 { 1006, PrivMode_ExtMouseSGR },
3654#endif 3758#endif
3655 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3759 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3656 { 1011, PrivMode_Keypress }, // rxvt extension 3760 { 1011, PrivMode_Keypress }, // rxvt extension
3657#if ENABLE_FRILLS 3761#if ENABLE_FRILLS
3658 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3762 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3659#endif 3763#endif
3660 // 1035 enable modifiers for alt, numlock NYI 3764 // 1035 enable modifiers for alt, numlock NYI
3661 // 1036 send ESC for meta keys NYI 3765 // 1036 send ESC for meta keys NYI
3662 // 1037 send DEL for keypad delete NYI 3766 // 1037 send DEL for keypad delete NYI
3663 { 1047, PrivMode_Screen }, 3767 { 1047, PrivMode_Screen },
3664 // 1048 save and restore cursor, implemented in code 3768 // 1048 save and restore cursor, implemented in code
3665 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3769 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3666 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3770 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3771#if ENABLE_FRILLS
3667 { 2004, PrivMode_BracketPaste }, 3772 { 2004, PrivMode_BracketPaste },
3773#endif
3668 }; 3774 };
3669 3775
3670 if (nargs == 0) 3776 if (nargs == 0)
3671 return; 3777 return;
3778
3779 // DECRQM
3780 if (mode == 'p')
3781 {
3782 int status = 0;
3783 if (nargs != 1)
3784 return;
3785
3786 for (j = 0; j < ecb_array_length (argtopriv); j++)
3787 if (argtopriv[j].argval == arg[0])
3788 {
3789 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3790 break;
3791 }
3792
3793 tt_printf ("\33[?%d;%d$y", arg[0], status);
3794 return;
3795 }
3672 3796
3673 /* make lo/hi boolean */ 3797 /* make lo/hi boolean */
3674 if (mode == 'l') 3798 if (mode == 'l')
3675 mode = 0; /* reset */ 3799 mode = 0; /* reset */
3676 else if (mode == 'h') 3800 else if (mode == 'h')
… …
3679 for (i = 0; i < nargs; i++) 3803 for (i = 0; i < nargs; i++)
3680 { 3804 {
3681 state = -1; 3805 state = -1;
3682 3806
3683 /* basic handling */ 3807 /* basic handling */
3684 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3808 for (j = 0; j < ecb_array_length (argtopriv); j++)
3685 if (argtopriv[j].argval == arg[i]) 3809 if (argtopriv[j].argval == arg[i])
3686 { 3810 {
3687 state = privcases (mode, argtopriv[j].bit); 3811 state = privcases (mode, argtopriv[j].bit);
3688 break; 3812 break;
3689 } 3813 }
… …
3715 case 2: /* VT52 mode */ 3839 case 2: /* VT52 mode */
3716 /* oddball mode. should be set regardless of set/reset 3840 /* oddball mode. should be set regardless of set/reset
3717 * parameter. Return from VT52 mode with an ESC < from 3841 * parameter. Return from VT52 mode with an ESC < from
3718 * within VT52 mode 3842 * within VT52 mode
3719 */ 3843 */
3720 set_privmode (PrivMode_vt52, 1); 3844 priv_modes |= PrivMode_vt52;
3721 break; 3845 break;
3722 case 3: /* 80/132 */ 3846 case 3: /* 80/132 */
3723 if (priv_modes & PrivMode_132OK) 3847 if (priv_modes & PrivMode_132OK)
3724 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3848 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3725 break; 3849 break;
… …
3740 if (state) /* orthogonal */ 3864 if (state) /* orthogonal */
3741 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3865 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3742 break; 3866 break;
3743#ifdef scrollBar_esc 3867#ifdef scrollBar_esc
3744 case scrollBar_esc: 3868 case scrollBar_esc:
3745 if (scrollBar.map (state)) 3869 scrollBar.map (state);
3746 {
3747 resize_all_windows (0, 0, 0); 3870 resize_all_windows (0, 0, 0);
3748 scr_touch (true); 3871 scr_touch (true);
3749 } 3872 break;
3873#endif
3874#ifdef CURSOR_BLINK
3875 case 12:
3876 cursor_blink_reset ();
3750 break; 3877 break;
3751#endif 3878#endif
3752 case 25: /* visible/invisible cursor */ 3879 case 25: /* visible/invisible cursor */
3753 scr_cursor_visible (state); 3880 scr_cursor_visible (state);
3754 break; 3881 break;
… …
3809 } 3936 }
3810} 3937}
3811/*}}} */ 3938/*}}} */
3812 3939
3813/*{{{ process sgr sequences */ 3940/*{{{ process sgr sequences */
3814void 3941void ecb_hot
3815rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3942rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3816{ 3943{
3817 unsigned int i; 3944 unsigned int i;
3818 short rendset; 3945 short rendset;
3819 int rendstyle; 3946 int rendstyle;
… …
3861 //case 19: // ninth alt font 3988 //case 19: // ninth alt font
3862 //case 20: // gothic 3989 //case 20: // gothic
3863 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3990 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3864 rendset = 0, rendstyle = RS_Bold; 3991 rendset = 0, rendstyle = RS_Bold;
3865 break; 3992 break;
3866 case 22: // normal intensity 3993 case 22: // bold off (vt220)
3867 rendset = 0, rendstyle = RS_Bold; 3994 rendset = 0, rendstyle = RS_Bold;
3868 break; 3995 break;
3869 case 23: // disable italic 3996 case 23: // disable italic
3870 rendset = 0, rendstyle = RS_Italic; 3997 rendset = 0, rendstyle = RS_Italic;
3871 break; 3998 break;
3872 case 24: 3999 case 24: // underline off (vt220)
3873 rendset = 0, rendstyle = RS_Uline; 4000 rendset = 0, rendstyle = RS_Uline;
3874 break; 4001 break;
3875 case 25: 4002 case 25: // blink off (vt220)
3876 rendset = 0, rendstyle = RS_Blink; 4003 rendset = 0, rendstyle = RS_Blink;
3877 break; 4004 break;
3878 case 26: // variable spacing (iso 8613) 4005 case 26: // variable spacing (iso 8613)
3879 rendset = 0, rendstyle = RS_Blink; 4006 rendset = 0, rendstyle = RS_Blink;
3880 break; 4007 break;
3881 case 27: 4008 case 27: // reverse off (vt220)
3882 rendset = 0, rendstyle = RS_RVid; 4009 rendset = 0, rendstyle = RS_RVid;
3883 break; 4010 break;
3884 //case 28: // visible. NYI 4011 //case 28: // visible. NYI
3885 //case 29: // not crossed-out 4012 //case 29: // not crossed-out
3886 } 4013 }
… …
3901 case 35: 4028 case 35:
3902 case 36: 4029 case 36:
3903 case 37: 4030 case 37:
3904 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4031 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3905 break; 4032 break;
3906 case 38: // set fg color, ISO 8613-6
3907 if (nargs > i + 2 && arg[i + 1] == 5)
3908 {
3909 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3910 i += 2;
3911 }
3912 break;
3913 case 39: /* default fg */ 4033 case 39: /* default fg */
3914 scr_color (Color_fg, Color_fg); 4034 scr_color (Color_fg, Color_fg);
3915 break; 4035 break;
3916 4036
3917 case 40: 4037 case 40:
… …
3922 case 45: 4042 case 45:
3923 case 46: 4043 case 46:
3924 case 47: 4044 case 47:
3925 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4045 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3926 break; 4046 break;
3927 case 48: // set bg color, ISO 8613-6
3928 if (nargs > i + 2 && arg[i + 1] == 5)
3929 {
3930 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3931 i += 2;
3932 }
3933 break;
3934 case 49: /* default bg */ 4047 case 49: /* default bg */
3935 scr_color (Color_bg, Color_bg); 4048 scr_color (Color_bg, Color_bg);
4049 break;
4050
4051 case 38: // set fg color, ISO 8613-6
4052 case 48: // set bg color, ISO 8613-6
4053 {
4054 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4055 unsigned int idx;
4056
4057 if (nargs > i + 2 && arg[i + 1] == 5)
4058 {
4059 idx = minCOLOR + arg[i + 2];
4060 i += 2;
4061
4062 scr_color (idx, fgbg);
4063 }
4064 else if (nargs > i + 4 && arg[i + 1] == 2)
4065 {
4066 unsigned int r = arg[i + 2];
4067 unsigned int g = arg[i + 3];
4068 unsigned int b = arg[i + 4];
4069 unsigned int a = 0xff;
4070
4071 idx = map_rgb24_color (r, g, b, a);
4072
4073 i += 4;
4074
4075 scr_color (idx, fgbg);
4076 }
4077 }
3936 break; 4078 break;
3937 4079
3938 //case 50: // not variable spacing 4080 //case 50: // not variable spacing
3939 4081
3940#if !ENABLE_MINIMAL 4082#if !ENABLE_MINIMAL
… …
3960 break; 4102 break;
3961#endif 4103#endif
3962 } 4104 }
3963 } 4105 }
3964} 4106}
4107
4108void
4109rxvt_term::set_cursor_style (int style)
4110{
4111 if (!IN_RANGE_INC (style, 0, 6))
4112 return;
4113
4114 if (style == 0)
4115 style = 1;
4116
4117 cursor_type = (style - 1) / 2;
4118 set_option (Opt_cursorUnderline, cursor_type == 1);
4119
4120#ifdef CURSOR_BLINK
4121 set_option (Opt_cursorBlink, style & 1);
4122 cursor_blink_reset ();
4123#endif
4124
4125 want_refresh = 1;
4126}
3965/*}}} */ 4127/*}}} */
3966 4128
3967/* ------------------------------------------------------------------------- */ 4129/* ---------------------------------------------------------------------- */
4130/* Write data to the pty as typed by the user, pasted with the mouse,
4131 * or generated by us in response to a query ESC sequence.
4132 */
3968 4133
3969/* 4134/*
3970 * Send printf () formatted output to the command. 4135 * Send printf () formatted output to the command.
3971 * Only use for small amounts of data. 4136 * Only use for small amounts of data.
3972 */ 4137 */
… …
3980 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4145 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3981 va_end (arg_ptr); 4146 va_end (arg_ptr);
3982 tt_write (buf, strlen (buf)); 4147 tt_write (buf, strlen (buf));
3983} 4148}
3984 4149
3985/* ---------------------------------------------------------------------- */
3986/* Write data to the pty as typed by the user, pasted with the mouse, 4150/* Write data to the pty as typed by the user. */
3987 * or generated by us in response to a query ESC sequence. 4151void
3988 */ 4152rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4153{
4154 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4155 return;
4156
4157 if (option (Opt_scrollTtyKeypress))
4158 if (view_start)
4159 {
4160 view_start = 0;
4161 want_refresh = 1;
4162 }
4163
4164 tt_write_ (data, len);
4165}
3990 4166
3991void 4167void
3992rxvt_term::tt_write (const char *data, unsigned int len) 4168rxvt_term::tt_write (const char *data, unsigned int len)
3993{ 4169{
3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4170 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3995 return; 4171 return;
3996 4172
4173 tt_write_ (data, len);
4174}
4175
4176static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4177
4178void
4179rxvt_term::tt_write_ (const char *data, unsigned int len)
4180{
3997 if (pty->pty < 0) 4181 if (pty->pty < 0)
3998 return; 4182 return;
3999 4183
4000 if (v_buflen == 0) 4184 if (v_buflen == 0)
4001 { 4185 {

Diff Legend

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