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

Diff Legend

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