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.515 by root, Tue Jun 5 11:00:40 2012 UTC vs.
Revision 1.581 by root, Tue Jul 5 16:42:21 2016 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-2014 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
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 ecb_cold 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
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)
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))
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
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
401void ecb_cold 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
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 if (len > 0)
782 {
783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
796 * Pass meta for all function keys, if 'meta' option set
797 */
798#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80))
800 kbuf[len - 1] |= 0x80;
801#endif
802 }
803
804 }
805 else if (ctrl && keysym == XK_minus)
806 {
807 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 }
810 else if (keysym == XK_ISO_Left_Tab)
811 {
812 strcpy (kbuf, "\033[Z");
813 len = 3;
814 }
815 else
816 {
817#ifdef META8_OPTION
818 /* set 8-bit on */
819 if (meta && (meta_char == 0x80))
820 {
821 char *ch;
822
823 for (ch = kbuf; ch < kbuf + len; ch++)
824 *ch |= 0x80;
825
826 meta = 0;
827 }
828#endif
829 /* nil */ ;
830 }
831 } 868 }
832
833 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
834 return;
835 869
836 if (len <= 0) 870 if (len <= 0)
837 return; /* not mapped */ 871 return; /* not mapped */
838 872
839 if (option (Opt_scrollTtyKeypress))
840 if (view_start)
841 {
842 view_start = 0;
843 want_refresh = 1;
844 }
845
846 /* escape prefix */
847 if (meta
848#ifdef META8_OPTION
849 && meta_char == C0_ESC
850#endif
851 )
852 {
853 const char ch = C0_ESC;
854 tt_write (&ch, 1);
855 }
856
857 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
858} 874}
859 875
860void ecb_cold 876void ecb_cold
861rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
862{ 878{
937void 953void
938rxvt_term::flush () 954rxvt_term::flush ()
939{ 955{
940 flush_ev.stop (); 956 flush_ev.stop ();
941 957
942#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
943 if (bg_flags & BG_NEEDS_REFRESH) 959 if (bg_flags & BG_NEEDS_REFRESH)
944 { 960 {
945 bg_flags &= ~BG_NEEDS_REFRESH; 961 bg_flags &= ~BG_NEEDS_REFRESH;
946 scr_touch (false); 962 scr_touch (false);
947 } 963 }
1018 1034
1019#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1020void 1036void
1021rxvt_term::cursor_blink_reset () 1037rxvt_term::cursor_blink_reset ()
1022{ 1038{
1039 if (!focus)
1040 return;
1041
1023 if (hidden_cursor) 1042 if (hidden_cursor)
1024 { 1043 {
1025 hidden_cursor = 0; 1044 hidden_cursor = 0;
1026 want_refresh = 1; 1045 want_refresh = 1;
1027 } 1046 }
1028 1047
1029 if (option (Opt_cursorBlink)) 1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1030 cursor_blink_ev.again (); 1049 cursor_blink_ev.again ();
1031 else 1050 else
1032 cursor_blink_ev.stop (); 1051 cursor_blink_ev.stop ();
1033} 1052}
1034 1053
1073 1092
1074#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1075void 1094void
1076rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1077{ 1096{
1078 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1079 { 1098 {
1080 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1081 want_refresh = 1; 1100 want_refresh = 1;
1082 refresh_check (); 1101 refresh_check ();
1083 } 1102 }
1088 1107
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1109void
1091rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1111{
1093 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1094 { 1113 {
1095 want_refresh = 1; 1114 want_refresh = 1;
1096 refresh_check (); 1115 refresh_check ();
1097 } 1116 }
1098 1117
1223 1242
1224void ecb_cold 1243void ecb_cold
1225rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1226{ 1245{
1227 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1228 recolour_cursor (); 1247 recolor_cursor ();
1229 1248
1230#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1231 hidden_pointer = 0; 1250 hidden_pointer = 0;
1232 1251
1233 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464 ; 1483 ;
1465 1484
1466 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467 1486
1487 bool moved = false;
1468#ifdef HAVE_BG_PIXMAP 1488#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ()) 1489 if (bg_window_position_sensitive ())
1490 {
1470 want_position_change = true; 1491 want_position_change = true;
1492 if (bg_img == 0)
1493 moved = true;
1494 }
1471#endif 1495#endif
1472
1473 bool moved = false;
1474 1496
1475 if (want_position_change) 1497 if (want_position_change)
1476 { 1498 {
1477 int x, y; 1499 int x, y;
1478 1500
1484 else 1506 else
1485 get_window_origin (x, y); 1507 get_window_origin (x, y);
1486 1508
1487 if (x != parent_x || y != parent_y) 1509 if (x != parent_x || y != parent_y)
1488 { 1510 {
1489 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490 parent_x = x; 1511 parent_x = x;
1491 parent_y = y; 1512 parent_y = y;
1513 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1514 moved = true;
1492 } 1515 }
1493
1494 if (bg_set_position (x, y)
1495 || !(bg_flags & BG_IS_VALID))
1496 moved = true;
1497 } 1516 }
1498 1517
1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1518 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1500 { 1519 {
1501 seen_resize = 1; 1520 seen_resize = 1;
1525 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1526 break; 1545 break;
1527 1546
1528 case MapNotify: 1547 case MapNotify:
1529#ifdef HAVE_BG_PIXMAP 1548#ifdef HAVE_BG_PIXMAP
1530 /* This is needed specifically to fix the case of no window manager or a 1549 // This is needed at startup for the case of no window manager
1531 * non-reparenting window manager. In those cases we never get first 1550 // or a non-reparenting window manager and also because we
1532 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1551 // defer bg image updates if the window is not mapped. The
1533 * care of multiplicity of ConfigureNotify events arriving while WM does 1552 // short delay is to optimize for multiple ConfigureNotify
1534 * reparenting. 1553 // events at startup when the window manager reparents the
1535 * We should not render background immediately, as there could be several 1554 // window, so as to perform the computation after we have
1536 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1555 // received all of them.
1537 * by scheduling background redraw as soon as we can, but giving a short 1556 if (bg_img == 0)
1538 * bit of time for ConfigureNotifies to arrive.
1539 * We should render background PRIOR to drawing any text, but AFTER all
1540 * of ConfigureNotifys for the best results.
1541 */
1542 if (!(bg_flags & BG_IS_VALID))
1543 update_background_ev.start (0.025); 1557 update_background_ev.start (0.025);
1544#endif 1558#endif
1545 mapped = 1; 1559 mapped = 1;
1546#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1547 text_blink_ev.start (); 1561 text_blink_ev.start ();
1598 case MotionNotify: 1612 case MotionNotify:
1599#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1600 if (hidden_pointer) 1614 if (hidden_pointer)
1601 pointer_unblank (); 1615 pointer_unblank ();
1602#endif 1616#endif
1617 if (!bypass_keystate
1603 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1604 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1605 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1607 break; 1622 break;
1608 1623
1609 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
1621 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1622 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1623 &ev.xbutton.state); 1638 &ev.xbutton.state);
1624#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1625 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1626 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1627 { 1643 {
1628#endif
1629#if ISO_14755 1644#if ISO_14755
1630 // 5.4 1645 // 5.4
1631 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1632 { 1647 {
1633 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1639 1654
1640#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1641 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1642 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1643 { 1658 {
1659 page_dirn scroll_selection_dir;
1644 int dist; 1660 int dist;
1645 1661
1646 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1647 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1648 */ 1664 */
1671 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1672 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1673 + 1; 1689 + 1;
1674 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1675 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1676 } 1693 }
1677 else 1694 else
1678 { 1695 {
1679 /* we are within the text window, so we 1696 /* we are within the text window, so we
1680 * shouldn't be scrolling 1697 * shouldn't be scrolling
1681 */ 1698 */
1682 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1683 } 1700 }
1684#endif 1701#endif
1685#ifdef MOUSE_THRESHOLD
1686 } 1702 }
1687#endif
1688 } 1703 }
1689 } 1704 }
1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1691 { 1706 {
1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1766#endif 1781#endif
1767#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1769 { 1784 {
1770 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1771 scr_recolour (); 1786 scr_recolor ();
1772 } 1787 }
1773#endif 1788#endif
1774#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1775 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1776 set_urgency (0); 1791 set_urgency (0);
1792
1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1777#endif 1795#endif
1778 1796
1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1780 } 1798 }
1781} 1799}
1789 want_refresh = 1; 1807 want_refresh = 1;
1790 1808
1791#if ENABLE_FRILLS 1809#if ENABLE_FRILLS
1792 if (option (Opt_urgentOnBell)) 1810 if (option (Opt_urgentOnBell))
1793 set_urgency (0); 1811 set_urgency (0);
1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1794#endif 1815#endif
1795#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1796 if (iso14755buf) 1817 if (iso14755buf)
1797 { 1818 {
1798 iso14755buf = 0; 1819 iso14755buf = 0;
1813#endif 1834#endif
1814#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1816 { 1837 {
1817 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1818 scr_recolour (); 1839 scr_recolor ();
1819 } 1840 }
1820#endif 1841#endif
1821 1842
1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1823 } 1844 }
1824} 1845}
1825 1846
1826void ecb_cold 1847void ecb_cold
1827rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1828{ 1849{
1829#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1830 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1831 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1832 rgba c; 1856 rgba c;
1833 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1834 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1835 } 1859 }
1836#endif 1860#endif
1837} 1861}
1838 1862
1839#if ENABLE_TRANSPARENCY || ENABLE_PERL 1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1840void ecb_hot 1864void ecb_hot
1841rxvt_term::rootwin_cb (XEvent &ev) 1865rxvt_term::rootwin_cb (XEvent &ev)
1842{ 1866{
1843 make_current (); 1867 make_current ();
1844 1868
1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1869 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1846 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1870 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1847 return; 1871 return;
1848 1872
1849# if ENABLE_TRANSPARENCY
1850 switch (ev.type) 1873 switch (ev.type)
1851 { 1874 {
1852 case PropertyNotify: 1875 case PropertyNotify:
1853 /* 1876 /*
1854 * if user used some Esetroot compatible prog to set the root bg, 1877 * if user used some Esetroot compatible prog to set the root bg,
1855 * use the property to determine the pixmap. We use it later on. 1878 * use the property to determine the pixmap. We use it later on.
1856 */ 1879 */
1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1859 { 1882 {
1860 bg_set_root_pixmap (); 1883#if BG_IMAGE_FROM_ROOT
1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1861 update_background (); 1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1862 } 1891 }
1863 1892
1864 break; 1893 break;
1865 } 1894 }
1866# endif
1867 1895
1868 refresh_check (); 1896 refresh_check ();
1869} 1897}
1870#endif 1898#endif
1871 1899
1894 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1895 return; 1923 return;
1896 } 1924 }
1897#endif 1925#endif
1898 1926
1899 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1900 1928
1901 if (reportmode) 1929 if (reportmode)
1902 { 1930 {
1903 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1904 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
2154#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2155 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2156 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2157 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2158 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2159 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2160 { 2188 {
2161 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2162 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2163 mouse_report (ev); 2191 mouse_report (ev);
2164 } 2192 }
2192 2220
2193#ifdef MOUSE_WHEEL 2221#ifdef MOUSE_WHEEL
2194 case Button4: 2222 case Button4:
2195 case Button5: 2223 case Button5:
2196 { 2224 {
2197 int i; 2225 int lines;
2198 page_dirn v; 2226 page_dirn dirn;
2199 2227
2200 v = ev.button == Button4 ? UP : DN; 2228 dirn = ev.button == Button4 ? UP : DN;
2201 2229
2202 if (ev.state & ShiftMask) 2230 if (ev.state & ShiftMask)
2203 i = 1; 2231 lines = 1;
2204 else if (option (Opt_mouseWheelScrollPage)) 2232 else if (option (Opt_mouseWheelScrollPage))
2205 i = nrow - 1; 2233 lines = nrow - 1;
2206 else 2234 else
2207 i = 5; 2235 lines = 5;
2208 2236
2209# ifdef MOUSE_SLIP_WHEELING 2237# ifdef MOUSE_SLIP_WHEELING
2210 if (ev.state & ControlMask) 2238 if (ev.state & ControlMask)
2211 { 2239 {
2212 mouse_slip_wheel_speed += v ? -1 : 1; 2240 mouse_slip_wheel_speed += dirn;
2213 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2241 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2214 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2215 2242
2216 if (!slip_wheel_ev.is_active ()) 2243 if (!slip_wheel_ev.is_active ())
2217 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2244 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2218 } 2245 }
2219 else 2246 else
2220# endif 2247# endif
2221 { 2248 {
2222 scr_page (v, i); 2249 scr_page (dirn, lines);
2223 scrollBar.show (1); 2250 scrollBar.show (1);
2224 } 2251 }
2225 } 2252 }
2226 break; 2253 break;
2227#endif 2254#endif
2380 } 2407 }
2381 2408
2382 if (len == (size_t)-1) 2409 if (len == (size_t)-1)
2383 { 2410 {
2384 mbstate.reset (); // reset now undefined conversion state 2411 mbstate.reset (); // reset now undefined conversion state
2412 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2413 // in which case we "erroneously" return the next byte which might be valid.
2385 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2414 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2386 } 2415 }
2387 2416
2388 // assume wchar == unicode 2417 // assume wchar == unicode
2389 cmdbuf_ptr += len; 2418 cmdbuf_ptr += len;
2553 scr_charset_choose (0); 2582 scr_charset_choose (0);
2554 break; 2583 break;
2555 2584
2556#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2557 // 8-bit controls 2586 // 8-bit controls
2558 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2559 process_dcs_seq (); 2588 process_dcs_seq ();
2560 break; 2589 break;
2561 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2562 process_csi_seq (); 2591 process_csi_seq ();
2563 break; 2592 break;
2564 case 0x9d: /* OSC */ 2593 case 0x9d: /* OSC */
2565 process_osc_seq (); 2594 process_osc_seq ();
2566 break; 2595 break;
2567#endif 2596#endif
2568 } 2597 }
2569} 2598}
2794 }; 2823 };
2795 2824
2796void ecb_hot 2825void ecb_hot
2797rxvt_term::process_csi_seq () 2826rxvt_term::process_csi_seq ()
2798{ 2827{
2799 unicode_t ch, priv, i; 2828 unicode_t ch, priv, prev_ch, i;
2800 unsigned int nargs, p; 2829 unsigned int nargs, p;
2801 int n, ndef; 2830 int n, ndef;
2802 int arg[ESC_ARGS] = { }; 2831 int arg[ESC_ARGS] = { };
2803 2832
2804 nargs = 0; 2833 nargs = 0;
2810 /* '<' '=' '>' '?' '!' */ 2839 /* '<' '=' '>' '?' '!' */
2811 priv = ch; 2840 priv = ch;
2812 ch = cmd_getc (); 2841 ch = cmd_getc ();
2813 } 2842 }
2814 2843
2844 prev_ch = 0;
2815 /* read any numerical arguments */ 2845 /* read any numerical arguments */
2816 for (n = -1; ch < CSI_ICH; ) 2846 for (n = -1; ch < CSI_ICH; )
2817 { 2847 {
2818 if (isdigit (ch)) 2848 if (isdigit (ch))
2819 { 2849 {
2829 n = -1; 2859 n = -1;
2830 } 2860 }
2831 else if (IS_CONTROL (ch)) 2861 else if (IS_CONTROL (ch))
2832 process_nonprinting (ch); 2862 process_nonprinting (ch);
2833 2863
2864 prev_ch = ch;
2834 ch = cmd_getc (); 2865 ch = cmd_getc ();
2835 } 2866 }
2836 2867
2837 if (ch > CSI_7F) 2868 if (ch > CSI_7F)
2838 return; 2869 return;
3072 scr_insert_mode (1); 3103 scr_insert_mode (1);
3073 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3074 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3075 break; 3106 break;
3076 3107
3108 case CSI_71: // DECSCUSR: set cursor style
3109 if (prev_ch == ' ')
3110 set_cursor_style (arg[0]);
3111 break;
3112
3077 /* 3113 /*
3078 * PRIVATE USE beyond this point. All CSI_7? sequences here 3114 * PRIVATE USE beyond this point. All CSI_7? sequences here
3079 */ 3115 */
3080 case CSI_72: /* DECSTBM: set top and bottom margins */ 3116 case CSI_72: /* DECSTBM: set top and bottom margins */
3081 if (nargs == 1) 3117 if (nargs == 1)
3214rxvt_term::get_to_st (unicode_t &ends_how) 3250rxvt_term::get_to_st (unicode_t &ends_how)
3215{ 3251{
3216 unicode_t ch; 3252 unicode_t ch;
3217 bool seen_esc = false; 3253 bool seen_esc = false;
3218 unsigned int n = 0; 3254 unsigned int n = 0;
3219 wchar_t string[STRING_MAX]; 3255 wchar_t string[CBUFSIZ];
3220 3256
3221 while ((ch = cmd_getc ()) != NOCHAR) 3257 while ((ch = cmd_getc ()) != NOCHAR)
3222 { 3258 {
3223 if (seen_esc) 3259 if (seen_esc)
3224 { 3260 {
3239 else if (ch < 0x20) 3275 else if (ch < 0x20)
3240 return NULL; /* other control character - exit */ 3276 return NULL; /* other control character - exit */
3241 3277
3242 seen_esc = false; 3278 seen_esc = false;
3243 3279
3244 if (n >= STRING_MAX - 1) 3280 if (n >= sizeof (string) - 1)
3245 // stop at some sane length 3281 // stop at some sane length
3246 return NULL; 3282 return NULL;
3247 3283
3248 string[n++] = ch; 3284 string[n++] = ch;
3249 } 3285 }
3298 free (s); 3334 free (s);
3299 } 3335 }
3300 } 3336 }
3301} 3337}
3302 3338
3339static unsigned int
3340colorcube_index (unsigned int idx_r,
3341 unsigned int idx_g,
3342 unsigned int idx_b)
3343{
3344 assert (idx_r < Red_levels);
3345 assert (idx_g < Green_levels);
3346 assert (idx_b < Blue_levels);
3347
3348 return idx_r * Blue_levels * Green_levels +
3349 idx_g * Blue_levels +
3350 idx_b;
3351}
3352
3353/*
3354 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 32bit RGBA color.
3356 */
3357unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3359{
3360 r &= 0xff;
3361 g &= 0xff;
3362 b &= 0xff;
3363 a &= 0xff;
3364
3365 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3366
3367 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3368 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3369 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3370 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3371
3372 /* we allow one of the 6 directly neighbouring colours */
3373 /* to replace the current color, if they not used recently */
3374 static const signed char dxyz[][3] = {
3375 0, 0, 0,
3376 0, 0, +1,
3377 0, 0, -1,
3378 0, +1, 0,
3379 0, -1, 0,
3380 +1, 0, 0,
3381 -1, 0, 0,
3382 };
3383
3384 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3385 {
3386 int r = idx_r + dxyz[n][0];
3387 int g = idx_g + dxyz[n][1];
3388 int b = idx_b + dxyz[n][2];
3389
3390 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3391 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3392 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3393
3394 unsigned int index = colorcube_index (r, g, b);
3395
3396 if (rgb24_color[index] == color)
3397 {
3398 rgb24_seqno[index] = ++rgb24_sequence;
3399 return index + minTermCOLOR24;
3400 }
3401
3402 // minor issue: could update index 0 few more times
3403 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3404 {
3405 idx = index;
3406 goto update;
3407 }
3408
3409 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3410 // but also handles wrap around values good enough
3411 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3412 idx = index;
3413 }
3414
3415update:
3416 rgb24_color[idx] = color;
3417 rgb24_seqno[idx] = ++rgb24_sequence;
3418
3419 idx += minTermCOLOR24;
3420 pix_colors_focused [idx].free (this);
3421 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3422 update_fade_color (idx, false);
3423
3424 return idx;
3425}
3426
3303void 3427void
3304rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3428rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3305{ 3429{
3306 if (str[0] == '?' && !str[1]) 3430 if (str[0] == '?' && !str[1])
3307 { 3431 {
3308 rgba c; 3432 rgba c;
3309 pix_colors_focused[color].get (c); 3433 pix_colors_focused[color].get (c);
3310 3434
3311#if XFT 3435#if XFT
3312 if (c.a != rgba::MAX_CC) 3436 if (c.a != rgba::MAX_CC)
3313 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3437 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3314 else 3438 else
3315#endif 3439#endif
3316 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3440 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3317 } 3441 }
3318 else 3442 else
3366 &nitems, &bytes_after, &value) == Success 3490 &nitems, &bytes_after, &value) == Success
3367 && actual_type != None 3491 && actual_type != None
3368 && actual_format == 8) 3492 && actual_format == 8)
3369 str = (const char *)(value); 3493 str = (const char *)(value);
3370 3494
3371 tt_printf ("\033]%d;%s%c", op, str, resp); 3495 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3372 3496
3373 XFree (value); 3497 XFree (value);
3374 } 3498 }
3375 else 3499 else
3376 { 3500 {
3444 break; 3568 break;
3445#endif 3569#endif
3446 case URxvt_Color_border: 3570 case URxvt_Color_border:
3447 process_color_seq (op, Color_border, str, resp); 3571 process_color_seq (op, Color_border, str, resp);
3448 break; 3572 break;
3449#if ENABLE_TRANSPARENCY 3573
3574#if BG_IMAGE_FROM_ROOT
3450 case URxvt_Color_tint: 3575 case URxvt_Color_tint:
3451 process_color_seq (op, Color_tint, str, resp); 3576 process_color_seq (op, Color_tint, str, resp);
3452 { 3577 {
3453 bool changed = false; 3578 bool changed = false;
3454 3579
3465#if BG_IMAGE_FROM_FILE 3590#if BG_IMAGE_FROM_FILE
3466 case Rxvt_Pixmap: 3591 case Rxvt_Pixmap:
3467 if (!strcmp (str, "?")) 3592 if (!strcmp (str, "?"))
3468 { 3593 {
3469 char str[256]; 3594 char str[256];
3470 int h_scale = 0, v_scale = 0;
3471 int h_align = 0, v_align = 0;
3472 if (image_vec.size () > 0)
3473 {
3474 h_scale = image_vec[0].h_scale; 3595 int h_scale = fimage.h_scale;
3475 v_scale = image_vec[0].v_scale; 3596 int v_scale = fimage.v_scale;
3476 h_align = image_vec[0].h_align; 3597 int h_align = fimage.h_align;
3477 v_align = image_vec[0].v_align; 3598 int v_align = fimage.v_align;
3478 }
3479 3599
3480 sprintf (str, "[%dx%d+%d+%d]", 3600 sprintf (str, "[%dx%d+%d+%d]",
3481 h_scale, v_scale, 3601 h_scale, v_scale,
3482 h_align, v_align); 3602 h_align, v_align);
3483 process_xterm_seq (XTerm_title, str, CHAR_ST); 3603 process_xterm_seq (XTerm_title, str, CHAR_ST);
3486 { 3606 {
3487 bool changed = false; 3607 bool changed = false;
3488 3608
3489 if (*str != ';') 3609 if (*str != ';')
3490 { 3610 {
3491 if (image_vec.size () > 0)
3492 changed = image_vec[0].set_file_geometry (str);
3493 else 3611 try
3494 { 3612 {
3495 rxvt_image *image = new_image ();
3496 if (!image->set_file_geometry (str)) 3613 fimage.set_file_geometry (this, str);
3497 image_vec.pop_back ();
3498 else
3499 changed = true; 3614 changed = true;
3615 }
3616 catch (const class rxvt_failure_exception &e)
3617 {
3500 } 3618 }
3501 } 3619 }
3502 else 3620 else
3503 { 3621 {
3504 str++; 3622 str++;
3505 if (image_vec.size () > 0)
3506 changed = image_vec[0].set_geometry (str, true); 3623 if (fimage.set_geometry (str, true))
3624 changed = true;
3507 } 3625 }
3508 3626
3509 if (changed) 3627 if (changed)
3510 { 3628 {
3511 if (bg_window_position_sensitive ()) 3629 if (bg_window_position_sensitive ())
3512 { 3630 {
3513 int x, y; 3631 int x, y;
3514 get_window_origin (x, y); 3632 get_window_origin (x, y);
3515 bg_set_position (x, y); 3633 parent_x = x;
3634 parent_y = y;
3516 } 3635 }
3517 update_background (); 3636 update_background ();
3518 } 3637 }
3519 } 3638 }
3520 break; 3639 break;
3660 { 5, PrivMode_rVideo }, // DECSCNM 3779 { 5, PrivMode_rVideo }, // DECSCNM
3661 { 6, PrivMode_relOrigin }, // DECOM 3780 { 6, PrivMode_relOrigin }, // DECOM
3662 { 7, PrivMode_Autowrap }, // DECAWM 3781 { 7, PrivMode_Autowrap }, // DECAWM
3663 // 8, auto-repeat keys // DECARM 3782 // 8, auto-repeat keys // DECARM
3664 { 9, PrivMode_MouseX10 }, 3783 { 9, PrivMode_MouseX10 },
3784 { 12, PrivMode_BlinkingCursor },
3665 // 18 end FF to printer after print screen 3785 // 18 end FF to printer after print screen
3666 // 19 Print screen prints full screen/scroll region 3786 // 19 Print screen prints full screen/scroll region
3667 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3787 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3668#ifdef scrollBar_esc 3788#ifdef scrollBar_esc
3669 { scrollBar_esc, PrivMode_scrollBar }, 3789 { scrollBar_esc, PrivMode_scrollBar },
3681#endif 3801#endif
3682 { 1000, PrivMode_MouseX11 }, 3802 { 1000, PrivMode_MouseX11 },
3683 { 1002, PrivMode_MouseBtnEvent }, 3803 { 1002, PrivMode_MouseBtnEvent },
3684 { 1003, PrivMode_MouseAnyEvent }, 3804 { 1003, PrivMode_MouseAnyEvent },
3685#if ENABLE_FRILLS 3805#if ENABLE_FRILLS
3806 { 1004, PrivMode_FocusEvent },
3686 { 1005, PrivMode_ExtModeMouse }, 3807 { 1005, PrivMode_ExtModeMouse },
3687#endif 3808#endif
3688 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3809 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3689 { 1011, PrivMode_Keypress }, // rxvt extension 3810 { 1011, PrivMode_Keypress }, // rxvt extension
3690#if ENABLE_FRILLS 3811#if ENABLE_FRILLS
3778 scrollBar.map (state); 3899 scrollBar.map (state);
3779 resize_all_windows (0, 0, 0); 3900 resize_all_windows (0, 0, 0);
3780 scr_touch (true); 3901 scr_touch (true);
3781 break; 3902 break;
3782#endif 3903#endif
3904#ifdef CURSOR_BLINK
3905 case 12:
3906 cursor_blink_reset ();
3907 break;
3908#endif
3783 case 25: /* visible/invisible cursor */ 3909 case 25: /* visible/invisible cursor */
3784 scr_cursor_visible (state); 3910 scr_cursor_visible (state);
3785 break; 3911 break;
3786 /* case 35: - shift keys */ 3912 /* case 35: - shift keys */
3787 /* case 40: - 80 <--> 132 mode */ 3913 /* case 40: - 80 <--> 132 mode */
3892 //case 19: // ninth alt font 4018 //case 19: // ninth alt font
3893 //case 20: // gothic 4019 //case 20: // gothic
3894 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 4020 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3895 rendset = 0, rendstyle = RS_Bold; 4021 rendset = 0, rendstyle = RS_Bold;
3896 break; 4022 break;
3897 case 22: // normal intensity 4023 case 22: // bold off (vt220)
3898 rendset = 0, rendstyle = RS_Bold; 4024 rendset = 0, rendstyle = RS_Bold;
3899 break; 4025 break;
3900 case 23: // disable italic 4026 case 23: // disable italic
3901 rendset = 0, rendstyle = RS_Italic; 4027 rendset = 0, rendstyle = RS_Italic;
3902 break; 4028 break;
3903 case 24: 4029 case 24: // underline off (vt220)
3904 rendset = 0, rendstyle = RS_Uline; 4030 rendset = 0, rendstyle = RS_Uline;
3905 break; 4031 break;
3906 case 25: 4032 case 25: // blink off (vt220)
3907 rendset = 0, rendstyle = RS_Blink; 4033 rendset = 0, rendstyle = RS_Blink;
3908 break; 4034 break;
3909 case 26: // variable spacing (iso 8613) 4035 case 26: // variable spacing (iso 8613)
3910 rendset = 0, rendstyle = RS_Blink; 4036 rendset = 0, rendstyle = RS_Blink;
3911 break; 4037 break;
3912 case 27: 4038 case 27: // reverse off (vt220)
3913 rendset = 0, rendstyle = RS_RVid; 4039 rendset = 0, rendstyle = RS_RVid;
3914 break; 4040 break;
3915 //case 28: // visible. NYI 4041 //case 28: // visible. NYI
3916 //case 29: // not crossed-out 4042 //case 29: // not crossed-out
3917 } 4043 }
3932 case 35: 4058 case 35:
3933 case 36: 4059 case 36:
3934 case 37: 4060 case 37:
3935 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4061 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3936 break; 4062 break;
3937 case 38: // set fg color, ISO 8613-6
3938 if (nargs > i + 2 && arg[i + 1] == 5)
3939 {
3940 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3941 i += 2;
3942 }
3943 break;
3944 case 39: /* default fg */ 4063 case 39: /* default fg */
3945 scr_color (Color_fg, Color_fg); 4064 scr_color (Color_fg, Color_fg);
3946 break; 4065 break;
3947 4066
3948 case 40: 4067 case 40:
3953 case 45: 4072 case 45:
3954 case 46: 4073 case 46:
3955 case 47: 4074 case 47:
3956 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4075 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3957 break; 4076 break;
3958 case 48: // set bg color, ISO 8613-6
3959 if (nargs > i + 2 && arg[i + 1] == 5)
3960 {
3961 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3962 i += 2;
3963 }
3964 break;
3965 case 49: /* default bg */ 4077 case 49: /* default bg */
3966 scr_color (Color_bg, Color_bg); 4078 scr_color (Color_bg, Color_bg);
4079 break;
4080
4081 case 38: // set fg color, ISO 8613-6
4082 case 48: // set bg color, ISO 8613-6
4083 {
4084 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4085 unsigned int idx;
4086
4087 if (nargs > i + 2 && arg[i + 1] == 5)
4088 {
4089 idx = minCOLOR + arg[i + 2];
4090 i += 2;
4091
4092 scr_color (idx, fgbg);
4093 }
4094 else if (nargs > i + 4 && arg[i + 1] == 2)
4095 {
4096 unsigned int r = arg[i + 2];
4097 unsigned int g = arg[i + 3];
4098 unsigned int b = arg[i + 4];
4099 unsigned int a = 0xff;
4100
4101 idx = map_rgb24_color (r, g, b, a);
4102
4103 i += 4;
4104
4105 scr_color (idx, fgbg);
4106 }
4107 }
3967 break; 4108 break;
3968 4109
3969 //case 50: // not variable spacing 4110 //case 50: // not variable spacing
3970 4111
3971#if !ENABLE_MINIMAL 4112#if !ENABLE_MINIMAL
3991 break; 4132 break;
3992#endif 4133#endif
3993 } 4134 }
3994 } 4135 }
3995} 4136}
4137
4138void
4139rxvt_term::set_cursor_style (int style)
4140{
4141 if (!IN_RANGE_INC (style, 0, 6))
4142 return;
4143
4144 if (style == 0)
4145 style = 1;
4146
4147 cursor_type = (style - 1) / 2;
4148 set_option (Opt_cursorUnderline, cursor_type == 1);
4149
4150#ifdef CURSOR_BLINK
4151 set_option (Opt_cursorBlink, style & 1);
4152 cursor_blink_reset ();
4153#endif
4154
4155 want_refresh = 1;
4156}
3996/*}}} */ 4157/*}}} */
3997 4158
3998/* ------------------------------------------------------------------------- */ 4159/* ---------------------------------------------------------------------- */
4160/* Write data to the pty as typed by the user, pasted with the mouse,
4161 * or generated by us in response to a query ESC sequence.
4162 */
3999 4163
4000/* 4164/*
4001 * Send printf () formatted output to the command. 4165 * Send printf () formatted output to the command.
4002 * Only use for small amounts of data. 4166 * Only use for small amounts of data.
4003 */ 4167 */
4011 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4175 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4012 va_end (arg_ptr); 4176 va_end (arg_ptr);
4013 tt_write (buf, strlen (buf)); 4177 tt_write (buf, strlen (buf));
4014} 4178}
4015 4179
4016/* ---------------------------------------------------------------------- */
4017/* Write data to the pty as typed by the user, pasted with the mouse, 4180/* Write data to the pty as typed by the user. */
4018 * or generated by us in response to a query ESC sequence. 4181void
4019 */ 4182rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4020static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4183{
4184 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4185 return;
4186
4187 if (option (Opt_scrollTtyKeypress))
4188 if (view_start)
4189 {
4190 view_start = 0;
4191 want_refresh = 1;
4192 }
4193
4194 tt_write_ (data, len);
4195}
4021 4196
4022void 4197void
4023rxvt_term::tt_write (const char *data, unsigned int len) 4198rxvt_term::tt_write (const char *data, unsigned int len)
4024{ 4199{
4025 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4200 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4026 return; 4201 return;
4027 4202
4203 tt_write_ (data, len);
4204}
4205
4206static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4207
4208void
4209rxvt_term::tt_write_ (const char *data, unsigned int len)
4210{
4028 if (pty->pty < 0) 4211 if (pty->pty < 0)
4029 return; 4212 return;
4030 4213
4031 if (v_buflen == 0) 4214 if (v_buflen == 0)
4032 { 4215 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines