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.236 by root, Thu Jan 5 01:04:10 2006 UTC vs.
Revision 1.365 by ayin, Thu Nov 15 10:13:37 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
101 97
102 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 142 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 143 return;
149 144
150 for (;;) 145 for (;;)
151 { 146 {
152 const line_t &l = ROW(y - view_start); 147 const line_t &l = ROW(y + view_start);
153 148
154 text_t t = l.t[x]; 149 text_t t = l.t[x];
155 150
156 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
157 { 152 {
… …
230# if !UNICODE3 225# if !UNICODE3
231 if (ch >= 0x10000) 226 if (ch >= 0x10000)
232 ch = 0xfffd; 227 ch = 0xfffd;
233# endif 228# endif
234 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
236 } 233 }
237 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
238 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
240 242
241 free (fname); 243 free (fname);
242 244
… …
295 297
296 return -1; 298 return -1;
297} 299}
298#endif 300#endif
299 301
300/*{{{ Convert the keypress event into a string */
301void 302void
302rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
303{ 304{
304 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
305 unsigned int newlen; 306 unsigned int newlen;
306 KeySym keysym; 307 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
443 scr_move_to (0, 1); 446 scr_move_to (0, 1);
444 return; 447 return;
445 } 448 }
446 else if (keysym == XK_End) 449 else if (keysym == XK_End)
447 { 450 {
448 scr_move_to (1, 0); 451 scr_move_to (1, 1);
449 return; 452 return;
450 } 453 }
451 } 454 }
452#endif 455#endif
453 } 456 }
… …
464 { 467 {
465 switch (keysym) 468 switch (keysym)
466 { 469 {
467 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
470 return; 473 return;
471#if TODO 474#if TODO
472 /* rxvt extras */ 475 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
493 { 496 {
494 commit_iso14755 (); 497 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 509# endif
499 return; 510 return;
500 } 511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
536#endif 547#endif
537 548
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 550 {
540 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
542 switch (keysym) 584 switch (keysym)
543 { 585 {
544#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 587 case XK_BackSpace:
546 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
551 } 593 }
552 else 594 else
553 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 596 break;
555#endif 597#endif
556#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete: 599 case XK_Delete:
568 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 601 break;
570#endif 602#endif
571 case XK_Tab: 603 case XK_Tab:
572 if (shft) 604 if (shft)
573 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
583#endif 615#endif
584 newlen = 0; 616 newlen = 0;
585 } 617 }
586 break; 618 break;
587 619
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
618 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
620 break; 636 break;
621 637
622#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior: 639 case XK_Prior:
634 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
635 break; 641 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next: 642 case XK_Next:
647 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
648 break; 644 break;
649#endif 645#endif
650 case XK_KP_Enter: 646 case XK_KP_Enter:
651 /* allow shift to override */ 647 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
653 { 649 {
654 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
655 break; 651 break;
656 } 652 }
657 653
… …
669 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
670 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
671 } 667 }
672 break; 668 break;
673 669
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 694 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
706 { 696 {
707 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 699 }
710 else 700 else
… …
716 706
717 case XK_Find: 707 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
719 break; 709 break;
720 710
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert: 711 case XK_Insert:
732 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
733 break; 713 break;
734#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove: 715 case DXK_Remove:
… …
739 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
740 break; 720 break;
741 case XK_Select: 721 case XK_Select:
742 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
743 break; 723 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End: 724 case XK_End:
755 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
756 break; 726 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home: 727 case XK_Home:
768 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
769 break; 729 break;
770 730
771#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
867#endif 827#endif
868 /* nil */ ; 828 /* nil */ ;
869 } 829 }
870 } 830 }
871 831
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return;
834
872 if (len <= 0) 835 if (len <= 0)
873 return; /* not mapped */ 836 return; /* not mapped */
874 837
875 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 839 if (view_start)
877 { 840 {
878 view_start = 0; 841 view_start = 0;
879 want_refresh = 1; 842 want_refresh = 1;
880 } 843 }
… …
902 { 865 {
903 const char ch = C0_ESC; 866 const char ch = C0_ESC;
904 tt_write (&ch, 1); 867 tt_write (&ch, 1);
905 } 868 }
906 869
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
918} 871}
919/*}}} */
920 872
873void
874rxvt_term::key_release (XKeyEvent &ev)
875{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym;
878
879 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
880#endif
881
882#if ENABLE_FRILLS || ISO_14755
883 // ISO 14755 support
884 if (iso14755buf)
885 if (iso14755buf & ISO_14755_52)
886 {
887# if ISO_14755
888 scr_overlay_off ();
889# endif
890# if ISO_14755
891 // iso14755 part 5.2 handling: release time
892 // first: controls
893 if ((ev.state & ControlMask)
894 && ((keysym >= 0x40 && keysym <= 0x5f)
895 || (keysym >= 0x61 && keysym <= 0x7f)))
896 {
897 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
898 commit_iso14755 ();
899
900 return;
901 }
902
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
904 if (i[0] == keysym)
905 {
906 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 ();
908
909 return;
910 }
911
912 scr_bell ();
913# endif
914 iso14755buf = 0;
915
916 return;
917 }
918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
919 {
920# if ISO_14755
921 scr_overlay_off ();
922# endif
923 if (iso14755buf & ISO_14755_51)
924 commit_iso14755 ();
925#if ISO_14755
926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
927 {
928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
929
930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
932 }
933# endif
934 else
935 iso14755buf = 0;
936 }
937#endif
938
939 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
940 return;
941
942#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
943 if (!(ev.state & ControlMask))
944 slip_wheel_ev.stop ();
945 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0;
947#endif
948}
949
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 951unsigned int
925rxvt_term::cmd_write (const char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 953{
927 unsigned int n, s; 954 unsigned int n, s;
928 955
… …
956void 983void
957rxvt_term::flush () 984rxvt_term::flush ()
958{ 985{
959 flush_ev.stop (); 986 flush_ev.stop ();
960 987
961#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
962 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
963 { 990 {
964 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
965 scr_clear ();
966 scr_touch (false); 992 scr_touch (false);
967 } 993 }
968#endif 994#endif
969 995
970 if (want_refresh) 996 if (want_refresh)
971 { 997 {
998 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
999 {
1000 int row = view_start;
1001 int end_row = row + nrow;
1002
1003 while (row > top_row && ROW (row - 1).is_longer ())
1004 --row;
1005
1006 do
1007 {
1008 int start_row = row;
1009 line_t *l;
1010
1011 do
1012 {
1013 l = &ROW (row++);
1014
1015 if (!(l->f & LINE_FILTERED))
1016 {
1017 // line not filtered, mark it as filtered
1018 l->f |= LINE_FILTERED;
1019 while (l->is_longer ())
1020 {
1021 l = &ROW (row++);
1022 l->f |= LINE_FILTERED;
1023 }
1024
1025 // and filter it
1026 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1027
1028 break;
1029 }
1030 }
1031 while (l->is_longer () && row < end_row);
1032 }
1033 while (row < end_row);
1034 }
1035
972 scr_refresh (refresh_type); 1036 scr_refresh ();
973 scrollbar_show (1); 1037 scrollbar_show (1);
974#ifdef USE_XIM 1038#ifdef USE_XIM
975 IMSendSpot (); 1039 IMSendSpot ();
976#endif 1040#endif
977 } 1041 }
978 1042
979 display->flush (); 1043 display->flush ();
980} 1044}
981 1045
982void 1046void
983rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
984{ 1048{
985 SET_R (this); 1049 make_current ();
986 SET_LOCALE (locale);
987 1050
988 display->flush (); 1051 display->flush ();
989 1052
990 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.active)
991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
992} 1055}
993 1056
994void 1057void
995rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
996{ 1059{
997 SET_R (this); 1060 make_current ();
998 SET_LOCALE (locale);
999 1061
1000 refresh_limit = 1;
1001 refresh_count = 0; 1062 refresh_count = 0;
1002 flush (); 1063 flush ();
1003} 1064}
1004 1065
1005#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1006void 1067void
1007rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1008{ 1069{
1009 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1010 want_refresh = 1; 1071 want_refresh = 1;
1011
1012 w.start (w.at + BLINK_INTERVAL);
1013} 1072}
1014#endif 1073#endif
1015 1074
1016#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1017void 1076void
1018rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1019{ 1078{
1020 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1021 { 1080 {
1022 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1023 want_refresh = 1; 1082 want_refresh = 1;
1024 w.start (w.at + TEXT_BLINK_INTERVAL);
1025 } 1083 }
1026} 1084}
1027#endif 1085#endif
1028 1086
1029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1030void 1088void
1031rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1032{ 1090{
1033 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1034 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1035 {
1036 refresh_type |= SMOOTH_REFRESH;
1037 want_refresh = 1; 1093 want_refresh = 1;
1038 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
1039 } 1095 w.stop ();
1040} 1096}
1041#endif 1097#endif
1042 1098
1043#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1044void 1100void
1045rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1046{ 1102{
1047 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1048 { 1104 {
1049 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1050 refresh_type |= SMOOTH_REFRESH;
1051 want_refresh = 1; 1106 want_refresh = 1;
1052 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1053 } 1107 }
1108 else
1109 w.stop ();
1054} 1110}
1055#endif 1111#endif
1056 1112
1057#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1058void 1114void
1059rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1060{ 1116{
1061 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1063 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
1064 { 1120 {
1065 if (view_start == nsaved || 1121 if (view_start == top_row || view_start == 0)
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0; 1122 mouse_slip_wheel_speed = 0;
1068 1123
1069 refresh_type |= SMOOTH_REFRESH;
1070 want_refresh = 1; 1124 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 } 1125 }
1126 else
1127 w.stop ();
1073} 1128}
1074#endif 1129#endif
1075 1130
1076#if HAVE_SCHED_YIELD 1131#if LINUX_YIELD_HACK
1077static struct event_handler 1132static struct event_handler
1078{ 1133{
1079 check_watcher cw_yield; 1134 ev::prepare yield_ev;
1080 1135
1081 void yield (check_watcher &w) 1136 void yield_cb (ev::prepare &w, int revents)
1082 { 1137 {
1083 sched_yield (); 1138 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS.
1142
1143 struct timespec ts = { 0, 0 };
1144 nanosleep (&ts, 0);
1145
1084 w.stop (); 1146 w.stop ();
1085 } 1147 }
1086 1148
1087 event_handler () 1149 event_handler ()
1088 : cw_yield (this, &event_handler::yield) 1150 : yield_ev (this, &event_handler::yield_cb)
1089 { 1151 {
1090 } 1152 }
1091} event_handler; 1153} event_handler;
1092#endif 1154#endif
1093 1155
… …
1104 1166
1105 memmove (cmdbuf_base, cmdbuf_ptr, n); 1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
1106 cmdbuf_ptr = cmdbuf_base; 1168 cmdbuf_ptr = cmdbuf_base;
1107 cmdbuf_endp = cmdbuf_ptr + n; 1169 cmdbuf_endp = cmdbuf_ptr + n;
1108 1170
1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1110 1172
1111 if (r > 0) 1173 if (r > 0)
1112 { 1174 {
1113 cmdbuf_endp += r; 1175 cmdbuf_endp += r;
1114 return true; 1176 return true;
1115 } 1177 }
1116 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1178 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1117 { 1179 {
1118#if HAVE_SCHED_YIELD 1180#if LINUX_YIELD_HACK
1119 if (display->is_local) 1181 if (display->is_local)
1120 event_handler.cw_yield.start (); 1182 event_handler.yield_ev.start ();
1121#endif 1183#endif
1122 } 1184 }
1123 else 1185 else
1124 { 1186 {
1125 pty_ev.stop (); 1187 pty_ev.stop ();
1126 1188
1127 if (!OPTION (Opt_hold)) 1189 if (!option (Opt_hold))
1128 destroy (); 1190 destroy ();
1129 } 1191 }
1130 1192
1131 return false; 1193 return false;
1132} 1194}
1133 1195
1134void 1196void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
1136{ 1198{
1137 SET_R (this); 1199 make_current ();
1138 SET_LOCALE (locale);
1139 1200
1140 if (revents & EVENT_READ) 1201 if (revents & ev::READ)
1141 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1203 while (pty_fill ())
1143 if (cmd_parse ()) 1204 if (cmd_parse ())
1144 break; 1205 break;
1145 1206
1146 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1147 pty_write (); 1208 pty_write ();
1148} 1209}
1149 1210
1150void 1211void
1151rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1152{ 1213{
1153 XDefineCursor (display->display, vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1215 recolour_cursor ();
1155 1216
1156#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1218 hidden_pointer = 0;
1158 1219
1159 if (OPTION (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1161#endif 1222#endif
1162} 1223}
1163 1224
1164#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1165void 1226void
1166rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
1167{ 1228{
1168 if (! OPTION (Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
1169 return; 1230 return;
1170 1231
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (display->display); 1233 XFlush (dpy);
1173 1234
1174 hidden_pointer = 1; 1235 hidden_pointer = 1;
1175} 1236}
1176 1237
1177void 1238void
1178rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1179{ 1240{
1180 SET_R (this); 1241 make_current ();
1181 SET_LOCALE (locale);
1182 1242
1183 pointer_blank (); 1243 pointer_blank ();
1184} 1244}
1185#endif 1245#endif
1186 1246
1187void 1247void
1188rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1189{ 1249{
1190 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1191 int x, y; 1251 int x, y;
1252 int code = 32;
1192 1253
1193 x = ev.x; 1254 x = Pixel2Col (ev.x);
1194 y = ev.y; 1255 y = Pixel2Row (ev.y);
1195 pixel_position (&x, &y); 1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260 mouse_row = x;
1261 mouse_col = y;
1262 code += 32;
1263 }
1196 1264
1197 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
1198 button_number = 3; 1266 button_number = 3;
1199 else 1267 else
1200 { 1268 {
… …
1246 x + 1, 1314 x + 1,
1247 y + 1); 1315 y + 1);
1248#endif 1316#endif
1249 1317
1250 tt_printf ("\033[M%c%c%c", 1318 tt_printf ("\033[M%c%c%c",
1251 (32 + button_number + key_state), 1319 (code + button_number + key_state),
1252 (32 + x + 1), 1320 (32 + x + 1),
1253 (32 + y + 1)); 1321 (32 + y + 1));
1254} 1322}
1255
1256#ifdef USING_W11LIB
1257void
1258rxvt_W11_process_x_event (XEvent *ev)
1259{
1260 rxvt_t *r = rxvt_get_r ();
1261
1262 x_cb (*ev);
1263}
1264#endif
1265 1323
1266/*{{{ process an X event */ 1324/*{{{ process an X event */
1267void 1325void
1268rxvt_term::x_cb (XEvent &ev) 1326rxvt_term::x_cb (XEvent &ev)
1269{ 1327{
1270 dDisp; 1328 make_current ();
1271 1329
1272 SET_R (this); 1330 dLocal (Display *, dpy);
1273 SET_LOCALE (locale);
1274 1331
1275#if defined(CURSOR_BLINK) 1332 if (ev.xany.window == vt
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1333 && SHOULD_INVOKE (HOOK_X_EVENT)
1277 { 1334 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1278 if (hidden_cursor) 1335 return;
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283 1336
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1337 // for XQueryPointer
1285 }
1286#endif
1287
1288#if defined(POINTER_BLANK)
1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1290 {
1291 if (ev.type == MotionNotify
1292 || ev.type == ButtonPress
1293 || ev.type == ButtonRelease)
1294 if (hidden_pointer)
1295 pointer_unblank ();
1296
1297 if (ev.type == KeyPress && hidden_pointer == 0)
1298 pointer_blank ();
1299 }
1300#endif
1301
1302 Window unused_root, unused_child; 1338 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1339 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1340 unsigned int unused_mask;
1305 1341
1306 switch (ev.type) 1342 switch (ev.type)
1307 { 1343 {
1308 case KeyPress: 1344 case KeyPress:
1309#if ISO_14755 1345 key_press (ev.xkey);
1310 if (!(iso14755buf & ISO_14755_52))
1311#endif
1312 lookup_key (ev.xkey);
1313
1314 break; 1346 break;
1315 1347
1316 case KeyRelease: 1348 case KeyRelease:
1317 { 1349 key_release (ev.xkey);
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1319 KeySym ks;
1320
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif
1323
1324#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support
1326 if (iso14755buf)
1327 if (iso14755buf & ISO_14755_52)
1328 {
1329# if ENABLE_OVERLAY
1330 scr_overlay_off ();
1331# endif
1332# if ISO_14755
1333 // iso14755 part 5.2 handling: release time
1334 // first: controls
1335 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f)))
1338 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1340 commit_iso14755 ();
1341 return; // case-break;
1342 }
1343
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks)
1346 {
1347 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 ();
1349 return; // case-break;
1350 }
1351
1352 scr_bell ();
1353# endif
1354 iso14755buf = 0;
1355 break;
1356 }
1357 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1358 {
1359# if ENABLE_OVERLAY
1360 scr_overlay_off ();
1361# endif
1362 if (iso14755buf & ISO_14755_51)
1363 commit_iso14755 ();
1364#if ISO_14755
1365 else if (iso14755buf & ISO_14755_STARTED)
1366 {
1367 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1368
1369 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1370 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1371 }
1372# endif
1373 else
1374 iso14755buf = 0;
1375 }
1376#endif
1377
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R)
1382 mouse_slip_wheel_speed = 0;
1383#endif
1384 break; 1350 break;
1385 }
1386 1351
1387 case ButtonPress: 1352 case ButtonPress:
1388 button_press (ev.xbutton); 1353 button_press (ev.xbutton);
1389 break; 1354 break;
1390 1355
… …
1392 button_release (ev.xbutton); 1357 button_release (ev.xbutton);
1393 break; 1358 break;
1394 1359
1395 case ClientMessage: 1360 case ClientMessage:
1396 if (ev.xclient.format == 32 1361 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1362 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1398 { 1363 {
1364 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1365 {
1366 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1367 {
1399 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1369 {
1370 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1400 destroy (); 1371 destroy ();
1372 }
1401#if ENABLE_EWMH 1373#if ENABLE_EWMH
1402 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1374 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1403 XSendEvent (disp, ev.xclient.window = display->root, 1375 XSendEvent (dpy, ev.xclient.window = display->root,
1404 False, SubstructureRedirectMask | SubstructureNotifyMask, 1376 False, SubstructureRedirectMask | SubstructureNotifyMask,
1405 &ev); 1377 &ev);
1378#endif
1379 }
1380 }
1381#if ENABLE_XEMBED
1382 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1383 {
1384 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1385 focus_in ();
1386 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1387 focus_out ();
1388 }
1406#endif 1389#endif
1407 } 1390 }
1408#if ENABLE_XEMBED
1409 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1410 {
1411 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1412 focus_in ();
1413 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1414 focus_out ();
1415 }
1416#endif
1417#ifdef OFFIX_DND
1418 /* OffiX Dnd (drag 'n' drop) protocol */
1419 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1420 && (ev.xclient.data.l[0] == DndFile
1421 || ev.xclient.data.l[0] == DndDir
1422 || ev.xclient.data.l[0] == DndLink))
1423 {
1424 /* Get Dnd data */
1425 Atom ActualType;
1426 int ActualFormat;
1427 unsigned char *data;
1428 unsigned long Size, RemainingBytes;
1429
1430 XGetWindowProperty (disp, display->root,
1431 xa[XA_DNDSELECTION],
1432 0L, 1000000L,
1433 False, AnyPropertyType,
1434 &ActualType, &ActualFormat,
1435 &Size, &RemainingBytes,
1436 &data);
1437 set_string_property (XA_CUT_BUFFER0, data);
1438 XFree (data);
1439 selection_paste (display->root, XA_CUT_BUFFER0, true);
1440 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1441 }
1442#endif /* OFFIX_DND */
1443 break;
1444
1445 case MappingNotify:
1446 XRefreshKeyboardMapping (&ev.xmapping);
1447 break; 1391 break;
1448 1392
1449 /* 1393 /*
1450 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1451 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1470 break; 1414 break;
1471 } 1415 }
1472 break; 1416 break;
1473 1417
1474 case FocusIn: 1418 case FocusIn:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1475 focus_in (); 1422 focus_in ();
1476 break; 1423 break;
1477 1424
1478 case FocusOut: 1425 case FocusOut:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1479 focus_out (); 1429 focus_out ();
1480 break; 1430 break;
1481 1431
1482 case ConfigureNotify: 1432 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1483 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1484 { 1437 {
1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ; 1439 ;
1487 1440
1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1489 { 1442 {
1490 seen_resize = 1; 1443 seen_resize = 1;
1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492 } 1445 }
1493 1446 else
1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1447 {
1495 if (OPTION (Opt_transparent)) 1448#ifdef HAVE_BG_PIXMAP
1496 check_our_parents (); 1449 if (bgPixmap.window_position_sensitive ())
1450 update_background ();
1497#endif 1451#endif
1452 }
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 } 1454 }
1499 break; 1455 break;
1500 1456
1501 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1502 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1503 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1504 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1505 1462
1506 break; 1463 break;
1507 1464
1508 case SelectionClear: 1465 case SelectionClear:
1509 selection_clear (); 1466 selection_clear ();
… …
1514 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1515 break; 1472 break;
1516 1473
1517 case SelectionRequest: 1474 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1476 break;
1477
1478 case MapNotify:
1479 mapped = 1;
1480#ifdef TEXT_BLINK
1481 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1482#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1519 break; 1484 break;
1520 1485
1521 case UnmapNotify: 1486 case UnmapNotify:
1522 mapped = 0; 1487 mapped = 0;
1523#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1525#endif 1490#endif
1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1492 break;
1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 break;
1534
1535#ifdef TRANSPARENT
1536 case ReparentNotify:
1537 rootwin_cb (ev);
1538 break;
1539#endif /* TRANSPARENT */
1540 1493
1541 case GraphicsExpose: 1494 case GraphicsExpose:
1542 case Expose: 1495 case Expose:
1543 if (ev.xany.window == vt) 1496 if (ev.xany.window == vt)
1544 { 1497 {
1545 do 1498 do
1499 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1502 }
1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1549 1504
1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1551 1506
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1555 1511 }
1556 scr_refresh (refresh_type); 1512 want_refresh = 1;
1557 } 1513 }
1558 else 1514 else
1559 { 1515 {
1560 XEvent unused_event; 1516 XEvent unused_event;
1561 1517
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1563 ; 1519 ;
1564 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1565 ; 1521 ;
1566 1522
1567 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1568 { 1524 {
1569 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1570 scrollbar_show (0); 1526 scrollbar_show (0);
1571 } 1527 }
1572#ifdef MENUBAR
1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1574 menubar_expose ();
1575#endif
1576
1577#ifdef TRANSPARENT
1578 if (am_transparent && ev.xany.window == parent[0])
1579 XClearWindow (disp, ev.xany.window);
1580#endif
1581 } 1528 }
1582 break; 1529 break;
1583 1530
1584 case MotionNotify: 1531 case MotionNotify:
1585#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1533 if (hidden_pointer)
1587 pointer_unblank (); 1534 pointer_unblank ();
1588#endif 1535#endif
1589#if MENUBAR 1536 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1590 if (isMenuBarWindow (ev.xany.window)) 1537 || priv_modes & PrivMode_MouseAnyEvent)
1591 {
1592 menubar_control (ev.xbutton); 1538 mouse_report (ev.xbutton);
1593 break;
1594 }
1595#endif
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1540 break;
1598 1541
1599 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1600 { 1543 {
1544 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1545 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1546 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1547 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1548 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1549 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1604 ; 1550 ;
1605 1551
1606 XQueryPointer (disp, vt, 1552 XQueryPointer (dpy, vt,
1607 &unused_root, &unused_child, 1553 &unused_root, &unused_child,
1608 &unused_root_x, &unused_root_y, 1554 &unused_root_x, &unused_root_y,
1609 &ev.xbutton.x, &ev.xbutton.y, 1555 &ev.xbutton.x, &ev.xbutton.y,
1610 &ev.xbutton.state); 1556 &ev.xbutton.state);
1611#ifdef MOUSE_THRESHOLD 1557#ifdef MOUSE_THRESHOLD
… …
1632 1578
1633 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1634 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1635 */ 1581 */
1636 if (!sel_scroll_ev.active) 1582 if (!sel_scroll_ev.active)
1637 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1638 1584
1639 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1640 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1641 */ 1587 */
1642 selection_save_x = ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
… …
1675#endif 1621#endif
1676 } 1622 }
1677 } 1623 }
1678 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1679 { 1625 {
1680 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1681 MotionNotify, &ev)) 1627 MotionNotify, &ev))
1682 ; 1628 ;
1683 1629
1684 XQueryPointer (disp, scrollBar.win, 1630 XQueryPointer (dpy, scrollBar.win,
1685 &unused_root, &unused_child, 1631 &unused_root, &unused_child,
1686 &unused_root_x, &unused_root_y, 1632 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1633 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1634 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1635 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1636 scrollbar_size ());
1691 scr_refresh (refresh_type);
1692 refresh_limit = 0; 1637 want_refresh = 1;
1693 scrollbar_show (1); 1638 scrollbar_show (1);
1694 } 1639 }
1695 break; 1640 break;
1696 } 1641 }
1642
1643#if defined(CURSOR_BLINK)
1644 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1645 {
1646 if (hidden_cursor)
1647 {
1648 hidden_cursor = 0;
1649 want_refresh = 1;
1650 }
1651
1652 cursor_blink_ev.again ();
1653 }
1654#endif
1655
1656#if defined(POINTER_BLANK)
1657 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1658 {
1659 if (ev.type == MotionNotify
1660 || ev.type == ButtonPress
1661 || ev.type == ButtonRelease)
1662 if (hidden_pointer)
1663 pointer_unblank ();
1664
1665 if (ev.type == KeyPress && hidden_pointer == 0)
1666 pointer_blank ();
1667 }
1668#endif
1697} 1669}
1698 1670
1699void 1671void
1700rxvt_term::focus_in () 1672rxvt_term::focus_in ()
1701{ 1673{
1702 if (!focus) 1674 if (!focus)
1703 { 1675 {
1704 focus = 1; 1676 focus = 1;
1705 want_refresh = 1; 1677 want_refresh = 1;
1706 1678
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1679 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1708 1680
1709#if USE_XIM 1681#if USE_XIM
1710 if (Input_Context != NULL) 1682 if (Input_Context != NULL)
1711 { 1683 {
1712 IMSetStatusPosition (); 1684 IMSetPosition ();
1713 XSetICFocus (Input_Context); 1685 XSetICFocus (Input_Context);
1714 } 1686 }
1715#endif 1687#endif
1716#if CURSOR_BLINK 1688#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink)) 1689 if (option (Opt_cursorBlink))
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1719#endif 1691#endif
1720#if OFF_FOCUS_FADING 1692#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade]) 1693 if (rs[Rs_fade])
1722 { 1694 {
1723 pix_colors = pix_colors_focused; 1695 pix_colors = pix_colors_focused;
1724 scr_recolour (); 1696 scr_recolour ();
1725 } 1697 }
1726#endif 1698#endif
1699#if ENABLE_FRILLS
1700 if (option (Opt_urgentOnBell))
1701 {
1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1703 {
1704 h->flags &= ~XUrgencyHint;
1705 XSetWMHints (dpy, parent[0], h);
1706 }
1707 }
1708#endif
1727 } 1709 }
1728} 1710}
1729 1711
1730void 1712void
1731rxvt_term::focus_out () 1713rxvt_term::focus_out ()
… …
1733 if (focus) 1715 if (focus)
1734 { 1716 {
1735 focus = 0; 1717 focus = 0;
1736 want_refresh = 1; 1718 want_refresh = 1;
1737 1719
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1720 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1721
1740#if ENABLE_FRILLS || ISO_14755 1722#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1723 if (iso14755buf)
1742 { 1724 {
1743 iso14755buf = 0; 1725 iso14755buf = 0;
1744# if ENABLE_OVERLAY 1726# if ISO_14755
1745 scr_overlay_off (); 1727 scr_overlay_off ();
1746# endif 1728# endif
1747 } 1729 }
1748#endif 1730#endif
1749#if USE_XIM 1731#if USE_XIM
1750 if (Input_Context != NULL) 1732 if (Input_Context != NULL)
1751 XUnsetICFocus (Input_Context); 1733 XUnsetICFocus (Input_Context);
1752#endif 1734#endif
1753#if CURSOR_BLINK 1735#if CURSOR_BLINK
1754 if (OPTION (Opt_cursorBlink)) 1736 if (option (Opt_cursorBlink))
1755 cursor_blink_ev.stop (); 1737 cursor_blink_ev.stop ();
1738
1756 hidden_cursor = 0; 1739 hidden_cursor = 0;
1757#endif 1740#endif
1758#if OFF_FOCUS_FADING 1741#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1742 if (rs[Rs_fade])
1760 { 1743 {
… …
1763 } 1746 }
1764#endif 1747#endif
1765 } 1748 }
1766} 1749}
1767 1750
1768#if TRANSPARENT 1751void
1752rxvt_term::update_fade_color (unsigned int idx)
1753{
1754#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade])
1756 {
1757 rgba c;
1758 pix_colors [Color_fade].get (c);
1759 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1760 }
1761#endif
1762}
1763
1764#if ENABLE_TRANSPARENCY || ENABLE_PERL
1769void 1765void
1770rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1767{
1772 SET_R (this); 1768 make_current ();
1773 SET_LOCALE (locale);
1774 1769
1770 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1771 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1772 return;
1773
1774# if ENABLE_TRANSPARENCY
1775 switch (ev.type) 1775 switch (ev.type)
1776 { 1776 {
1777 case PropertyNotify: 1777 case PropertyNotify:
1778 /* 1778 /*
1779 * if user used some Esetroot compatible prog to set the root bg, 1779 * if user used some Esetroot compatible prog to set the root bg,
1780 * use the property to determine the pixmap. We use it later on. 1780 * use the property to determine the pixmap. We use it later on.
1781 */ 1781 */
1782 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1782 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1783 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784 return; 1784 {
1785 1785 bgPixmap.set_root_pixmap ();
1786 /* FALLTHROUGH */ 1786 update_background ();
1787 case ReparentNotify: 1787 }
1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1789 want_refresh = want_full_refresh = 1;
1790 break; 1788 break;
1791 } 1789 }
1790# endif
1792} 1791}
1793#endif 1792#endif
1794 1793
1795void 1794void
1796rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
… …
1805 /* 1804 /*
1806 * VT window processing of button press 1805 * VT window processing of button press
1807 */ 1806 */
1808 if (ev.window == vt) 1807 if (ev.window == vt)
1809 { 1808 {
1809 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1810 return;
1811
1810#if ISO_14755 1812#if ISO_14755
1811 // 5.4 1813 // 5.4
1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1814 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1813 { 1815 {
1814 iso14755_54 (ev.x, ev.y); 1816 iso14755_54 (ev.x, ev.y);
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1828#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1829 if (ev.button == MEvent.button && clickintime)
1828 { 1830 {
1829 /* same button, within alloted time */ 1831 /* same button, within alloted time */
1830 MEvent.clicks++; 1832 MEvent.clicks++;
1833
1831 if (MEvent.clicks > 1) 1834 if (MEvent.clicks > 1)
1832 { 1835 {
1833 /* only report double clicks */ 1836 /* only report double clicks */
1834 MEvent.clicks = 2; 1837 MEvent.clicks = 2;
1835 mouse_report (ev); 1838 mouse_report (ev);
… …
1855 else 1858 else
1856 { 1859 {
1857 if (ev.button != MEvent.button) 1860 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1861 MEvent.clicks = 0;
1859 1862
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1863 switch (ev.button)
1862 { 1864 {
1863 case Button1: 1865 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1866 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1867 /* should be done in screen.C */
1866#if ENABLE_FRILLS 1868#if ENABLE_FRILLS
1867 selection.rect = !!(ev.state & ModMetaMask); 1869 selection.rect = !!(ev.state & ModMetaMask);
1868#else 1870#else
1869 selection.rect = false; 1871 selection.rect = false;
1870#endif 1872#endif
1871 1873
1872 /* allow shift+left click to extend selection */ 1874 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1875 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1876 {
1875 if (MEvent.button == Button1 && clickintime) 1877 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1878 selection_rotate (ev.x, ev.y);
1877 else 1879 else
1878 selection_extend (ev.x, ev.y, 1); 1880 selection_extend (ev.x, ev.y, 1);
1879 } 1881 }
1880 else 1882 else
1881 { 1883 {
1882 if (MEvent.button == Button1 && clickintime) 1884 if (MEvent.button == Button1 && clickintime)
1883 MEvent.clicks++; 1885 MEvent.clicks++;
1884 else 1886 else
1885 MEvent.clicks = 1; 1887 MEvent.clicks = 1;
1886 1888
1887 selection_click (MEvent.clicks, ev.x, ev.y); 1889 selection_click (MEvent.clicks, ev.x, ev.y);
1888 } 1890 }
1889 1891
1890 MEvent.button = Button1; 1892 MEvent.button = Button1;
1891 break; 1893 break;
1892 1894
1893 case Button3: 1895 case Button3:
1894 if (MEvent.button == Button3 && clickintime) 1896 if (MEvent.button == Button3 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1896 else 1898 else
1897 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1898 1900
1899 MEvent.button = Button3; 1901 MEvent.button = Button3;
1900 break; 1902 break;
1901 } 1903 }
1902 } 1904 }
1903 1905
1904 MEvent.time = ev.time; 1906 MEvent.time = ev.time;
1905 return; 1907 return;
1906 } 1908 }
1907 1909
… …
1974 upordown = 1; /* down */ 1976 upordown = 1; /* down */
1975 } 1977 }
1976 if (upordown) 1978 if (upordown)
1977 { 1979 {
1978#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1979 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1980#endif 1982#endif
1981 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
1982 { 1984 {
1983 if (upordown < 0) 1985 if (upordown < 0)
1984 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
2043 } 2045 }
2044 2046
2045 break; 2047 break;
2046 } 2048 }
2047 } 2049 }
2050
2048 return; 2051 return;
2049 } 2052 }
2050#if MENUBAR
2051 /*
2052 * Menubar window processing of button press
2053 */
2054 if (isMenuBarWindow (ev.window))
2055 menubar_control (ev);
2056#endif
2057} 2053}
2058 2054
2059void 2055void
2060rxvt_term::button_release (XButtonEvent &ev) 2056rxvt_term::button_release (XButtonEvent &ev)
2061{ 2057{
… …
2067 2063
2068 if (scrollbar_isUpDn ()) 2064 if (scrollbar_isUpDn ())
2069 { 2065 {
2070 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
2071 scrollbar_show (0); 2067 scrollbar_show (0);
2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2073 refresh_type &= ~SMOOTH_REFRESH;
2074#endif
2075 } 2068 }
2076 2069
2077#ifdef SELECTION_SCROLLING 2070#ifdef SELECTION_SCROLLING
2078 if (sel_scroll_ev.active) 2071 if (sel_scroll_ev.active)
2079 sel_scroll_ev.stop(); 2072 sel_scroll_ev.stop();
2080#endif 2073#endif
2081 2074
2082 if (ev.window == vt) 2075 if (ev.window == vt)
2083 { 2076 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2078 return;
2079
2084#if ISO_14755 2080#if ISO_14755
2085 // 5.4 2081 // 5.4
2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2087 return; 2083 return;
2088#endif 2084#endif
2085
2089 if (reportmode) 2086 if (reportmode)
2090 { 2087 {
2091 /* mouse report from vt window */ 2088 /* mouse report from vt window */
2092 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
2093 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
2123 { 2120 {
2124 case Button1: 2121 case Button1:
2125 case Button3: 2122 case Button3:
2126 selection_make (ev.time); 2123 selection_make (ev.time);
2127 break; 2124 break;
2125
2128 case Button2: 2126 case Button2:
2129 selection_request (ev.time, ev.x, ev.y); 2127 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2128 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2130 break; 2129 break;
2130
2131#ifdef MOUSE_WHEEL 2131#ifdef MOUSE_WHEEL
2132 case Button4: 2132 case Button4:
2133 case Button5: 2133 case Button5:
2134 { 2134 {
2135 int i; 2135 int i;
… …
2137 2137
2138 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2139 2139
2140 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2141 i = 1; 2141 i = 1;
2142 else if (OPTION (Opt_mouseWheelScrollPage)) 2142 else if (option (Opt_mouseWheelScrollPage))
2143 i = nrow - 1; 2143 i = nrow - 1;
2144 else 2144 else
2145 i = 5; 2145 i = 5;
2146 2146
2147# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
… …
2149 { 2149 {
2150 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153 2153
2154 if (slip_wheel_ev.at < NOW) 2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2156
2157 slip_wheel_ev.start ();
2158 } 2155 }
2159 else 2156 else
2160 { 2157 {
2161# endif 2158# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2159 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2160 scrollbar_show (1);
2166# else
2167 while (i--)
2168 {
2169 scr_page (v, 1);
2170 scr_refresh (SMOOTH_REFRESH);
2171 scrollbar_show (1);
2172 }
2173# endif
2174# ifdef MOUSE_SLIP_WHEELING 2161# ifdef MOUSE_SLIP_WHEELING
2175 } 2162 }
2176#endif 2163# endif
2177 } 2164 }
2178 break; 2165 break;
2179#endif 2166#endif
2180 } 2167 }
2181 } 2168 }
2182#ifdef MENUBAR
2183 else if (isMenuBarWindow (ev.window))
2184 menubar_control (ev);
2185#endif
2186} 2169}
2187
2188#ifdef TRANSPARENT
2189#if TINTING
2190/* taken from aterm-0.4.2 */
2191
2192typedef uint32_t RUINT32T;
2193
2194void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2195{
2196 int sh_r, sh_g, sh_b;
2197 RUINT32T mask_r, mask_g, mask_b;
2198 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2199 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2200 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2201 int i;
2202
2203 Visual *visual = display->visual;
2204
2205 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2206
2207 /* for convenience */
2208 mask_r = visual->red_mask;
2209 mask_g = visual->green_mask;
2210 mask_b = visual->blue_mask;
2211
2212 /* boring lookup table pre-initialization */
2213 switch (srcImage->bits_per_pixel) {
2214 case 15:
2215 if ((mask_r != 0x7c00) ||
2216 (mask_g != 0x03e0) ||
2217 (mask_b != 0x001f))
2218 return;
2219 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2220 lookup_r = lookup;
2221 lookup_g = lookup+32;
2222 lookup_b = lookup+32+32;
2223 sh_r = 10;
2224 sh_g = 5;
2225 sh_b = 0;
2226 break;
2227 case 16:
2228 if ((mask_r != 0xf800) ||
2229 (mask_g != 0x07e0) ||
2230 (mask_b != 0x001f))
2231 return;
2232 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2233 lookup_r = lookup;
2234 lookup_g = lookup+32;
2235 lookup_b = lookup+32+64;
2236 sh_r = 11;
2237 sh_g = 5;
2238 sh_b = 0;
2239 break;
2240 case 24:
2241 if ((mask_r != 0xff0000) ||
2242 (mask_g != 0x00ff00) ||
2243 (mask_b != 0x0000ff))
2244 return;
2245 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2246 lookup_r = lookup;
2247 lookup_g = lookup+256;
2248 lookup_b = lookup+256+256;
2249 sh_r = 16;
2250 sh_g = 8;
2251 sh_b = 0;
2252 break;
2253 case 32:
2254 if ((mask_r != 0xff0000) ||
2255 (mask_g != 0x00ff00) ||
2256 (mask_b != 0x0000ff))
2257 return;
2258 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2259 lookup_r = lookup;
2260 lookup_g = lookup+256;
2261 lookup_b = lookup+256+256;
2262 sh_r = 16;
2263 sh_g = 8;
2264 sh_b = 0;
2265 break;
2266 default:
2267 return; /* we do not support this color depth */
2268 }
2269
2270 /* prepare limits for color transformation (each channel is handled separately) */
2271 if (shade < 0) {
2272 shade = -shade;
2273 if (shade < 0) shade = 0;
2274 if (shade > 100) shade = 100;
2275
2276 lower_lim_r = 65535-rm;
2277 lower_lim_g = 65535-gm;
2278 lower_lim_b = 65535-bm;
2279
2280 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2281 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2282 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2283
2284 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2285 } else {
2286 if (shade < 0) shade = 0;
2287 if (shade > 100) shade = 100;
2288
2289 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2290
2291 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2292 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2293 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2294 }
2295
2296 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2297 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2298 {
2299 unsigned int tmp;
2300
2301 tmp = lower_lim_r;
2302 lower_lim_r = lower_lim_b;
2303 lower_lim_b = tmp;
2304
2305 tmp = upper_lim_r;
2306 upper_lim_r = upper_lim_b;
2307 upper_lim_b = tmp;
2308 }
2309
2310 /* fill our lookup tables */
2311 for (i = 0; i <= mask_r>>sh_r; i++)
2312 {
2313 RUINT32T tmp;
2314 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2315 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2316 lookup_r[i] = (tmp/65535)<<sh_r;
2317 }
2318 for (i = 0; i <= mask_g>>sh_g; i++)
2319 {
2320 RUINT32T tmp;
2321 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2322 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2323 lookup_g[i] = (tmp/65535)<<sh_g;
2324 }
2325 for (i = 0; i <= mask_b>>sh_b; i++)
2326 {
2327 RUINT32T tmp;
2328 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2329 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2330 lookup_b[i] = (tmp/65535)<<sh_b;
2331 }
2332
2333 /* apply table to input image (replacing colors by newly calculated ones) */
2334 switch (srcImage->bits_per_pixel)
2335 {
2336 case 15:
2337 {
2338 unsigned short *p1, *pf, *p, *pl;
2339 p1 = (unsigned short *) srcImage->data;
2340 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2341 while (p1 < pf)
2342 {
2343 p = p1;
2344 pl = p1 + srcImage->width;
2345 for (; p < pl; p++)
2346 {
2347 *p = lookup_r[(*p & 0x7c00)>>10] |
2348 lookup_g[(*p & 0x03e0)>> 5] |
2349 lookup_b[(*p & 0x001f)];
2350 }
2351 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2352 }
2353 break;
2354 }
2355 case 16:
2356 {
2357 unsigned short *p1, *pf, *p, *pl;
2358 p1 = (unsigned short *) srcImage->data;
2359 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2360 while (p1 < pf)
2361 {
2362 p = p1;
2363 pl = p1 + srcImage->width;
2364 for (; p < pl; p++)
2365 {
2366 *p = lookup_r[(*p & 0xf800)>>11] |
2367 lookup_g[(*p & 0x07e0)>> 5] |
2368 lookup_b[(*p & 0x001f)];
2369 }
2370 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2371 }
2372 break;
2373 }
2374 case 24:
2375 {
2376 unsigned char *p1, *pf, *p, *pl;
2377 p1 = (unsigned char *) srcImage->data;
2378 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2379 while (p1 < pf)
2380 {
2381 p = p1;
2382 pl = p1 + srcImage->width * 3;
2383 for (; p < pl; p += 3)
2384 {
2385 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2386 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2387 p[2] = lookup_r[(p[2] & 0x0000ff)];
2388 }
2389 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2390 }
2391 break;
2392 }
2393 case 32:
2394 {
2395 RUINT32T *p1, *pf, *p, *pl;
2396 p1 = (RUINT32T *) srcImage->data;
2397 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2398
2399 while (p1 < pf)
2400 {
2401 p = p1;
2402 pl = p1 + srcImage->width;
2403 for (; p < pl; p++)
2404 {
2405 *p = lookup_r[(*p & 0xff0000)>>16] |
2406 lookup_g[(*p & 0x00ff00)>> 8] |
2407 lookup_b[(*p & 0x0000ff)] |
2408 (*p & ~0xffffff);
2409 }
2410 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2411 }
2412 break;
2413 }
2414 }
2415
2416 free (lookup);
2417}
2418#endif
2419
2420/*
2421 * Check our parents are still who we think they are.
2422 * Do transparency updates if required
2423 */
2424int
2425rxvt_term::check_our_parents ()
2426{
2427 int i, pchanged, aformat, have_pixmap, rootdepth;
2428 unsigned long nitems, bytes_after;
2429 Atom atype;
2430 unsigned char *prop = NULL;
2431 Window root, oldp, *list;
2432 Pixmap rootpixmap = None;
2433 XWindowAttributes wattr, wrootattr;
2434 dDisp;
2435
2436 pchanged = 0;
2437
2438 if (!OPTION (Opt_transparent))
2439 return pchanged; /* Don't try any more */
2440
2441 XGetWindowAttributes (disp, display->root, &wrootattr);
2442 rootdepth = wrootattr.depth;
2443
2444 XGetWindowAttributes (disp, parent[0], &wattr);
2445
2446 if (rootdepth != wattr.depth)
2447 {
2448 if (am_transparent)
2449 {
2450 pchanged = 1;
2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2452 am_transparent = am_pixmap_trans = 0;
2453 }
2454
2455 return pchanged; /* Don't try any more */
2456 }
2457
2458 /* Get all X ops out of the queue so that our information is up-to-date. */
2459 XSync (disp, False);
2460
2461 /*
2462 * Make the frame window set by the window manager have
2463 * the root background. Some window managers put multiple nested frame
2464 * windows for each client, so we have to take care about that.
2465 */
2466 i = (xa[XA_XROOTPMAP_ID]
2467 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2469 &nitems, &bytes_after, &prop) == Success);
2470
2471 if (!i || prop == NULL)
2472 i = (xa[XA_ESETROOT_PMAP_ID]
2473 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2474 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2475 &nitems, &bytes_after, &prop) == Success);
2476
2477 if (!i || prop == NULL
2478#if TINTING
2479 || !rs[Rs_color + Color_tint]
2480#endif
2481 )
2482 have_pixmap = 0;
2483 else
2484 {
2485 have_pixmap = 1;
2486 rootpixmap = *(Pixmap *)prop;
2487 XFree (prop);
2488 }
2489
2490 if (have_pixmap)
2491 {
2492 /*
2493 * Copy display->root pixmap transparency
2494 */
2495 int sx, sy, nx, ny;
2496 unsigned int nw, nh;
2497 Window cr;
2498 XImage *image;
2499 GC gc;
2500 XGCValues gcvalue;
2501
2502 XTranslateCoordinates (disp, parent[0], display->root,
2503 0, 0, &sx, &sy, &cr);
2504 nw = (unsigned int)szHint.width;
2505 nh = (unsigned int)szHint.height;
2506 nx = ny = 0;
2507
2508 if (sx < 0)
2509 {
2510 nw += sx;
2511 nx = -sx;
2512 sx = 0;
2513 }
2514
2515 if (sy < 0)
2516 {
2517 nh += sy;
2518 ny = -sy;
2519 sy = 0;
2520 }
2521
2522 min_it (nw, (unsigned int) (wrootattr.width - sx));
2523 min_it (nh, (unsigned int) (wrootattr.height - sy));
2524
2525 XSync (disp, False);
2526 allowedxerror = -1;
2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2528
2529 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2530 /* XXX: may need a delay here? */
2531 allowedxerror = 0;
2532
2533 if (image == NULL)
2534 {
2535 if (am_transparent && am_pixmap_trans)
2536 {
2537 pchanged = 1;
2538 if (pixmap != None)
2539 {
2540 XFreePixmap (disp, pixmap);
2541 pixmap = None;
2542 }
2543 }
2544
2545 am_pixmap_trans = 0;
2546 }
2547 else
2548 {
2549 if (pixmap != None)
2550 XFreePixmap (disp, pixmap);
2551
2552#if TINTING
2553 if (ISSET_PIXCOLOR (Color_tint))
2554 {
2555 unsigned short rm, gm, bm;
2556 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2557
2558 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2559
2560 ShadeXImage (display, image, shade, rm, gm, bm);
2561 }
2562#endif
2563
2564 pixmap = XCreatePixmap (disp, vt,
2565 szHint.width, szHint.height, image->depth);
2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2567 XPutImage (disp, pixmap, gc, image, 0, 0,
2568 nx, ny, image->width, image->height);
2569 XFreeGC (disp, gc);
2570 XDestroyImage (image);
2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2572 XClearWindow (disp, parent[0]);
2573
2574 if (!am_transparent || !am_pixmap_trans)
2575 pchanged = 1;
2576
2577 am_transparent = am_pixmap_trans = 1;
2578 }
2579 }
2580
2581 if (am_pixmap_trans)
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2583 else
2584 {
2585 unsigned int n;
2586 /*
2587 * InheritPixmap transparency
2588 */
2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2590 {
2591 oldp = parent[i];
2592 XQueryTree (disp, parent[i - 1], &root,
2593 &parent[i], &list, &n);
2594 XFree (list);
2595
2596 if (parent[i] == display->root)
2597 {
2598 if (oldp != None)
2599 pchanged = 1;
2600
2601 break;
2602 }
2603
2604 if (oldp != parent[i])
2605 pchanged = 1;
2606 }
2607
2608 n = 0;
2609
2610 if (pchanged)
2611 {
2612 for (; n < (unsigned int)i; n++)
2613 {
2614 XGetWindowAttributes (disp, parent[n], &wattr);
2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2616 {
2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2618 break;
2619 }
2620 }
2621 }
2622
2623 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2624 {
2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2627 am_transparent = 0;
2628 /* XXX: also turn off Opt_transparent? */
2629 }
2630 else
2631 {
2632#if WAIT_FOR_WM
2633 /* wait (an arbitrary period) for the WM to do its thing
2634 * needed for fvwm2.2.2 (and before?) */
2635 sleep (1);
2636#endif
2637 for (n = 0; n < (unsigned int)i; n++)
2638 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]);
2641 }
2642
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2644 am_transparent = 1;
2645 }
2646
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None;
2649 }
2650
2651 if (scrollBar.win)
2652 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle ();
2655 scrollbar_show (0);
2656 }
2657
2658 if (am_transparent)
2659 {
2660 want_refresh = want_full_refresh = 1;
2661 if (am_pixmap_trans)
2662 flush ();
2663 }
2664
2665 return pchanged;
2666}
2667#endif
2668 2170
2669/*}}} */ 2171/*}}} */
2670 2172
2671bool 2173bool
2672rxvt_term::cmd_parse () 2174rxvt_term::cmd_parse ()
2673{ 2175{
2674 bool flag = false; 2176 bool flag = false;
2675 unicode_t ch = NOCHAR; 2177 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2178 char *seq_begin; // remember start of esc-sequence here
2677 2179
2678 for (;;) 2180 for (;;)
2679 { 2181 {
2680 if (ch == NOCHAR) 2182 if (ch == NOCHAR)
2681 { 2183 {
2682 seq_begin = cmdbuf_ptr; 2184 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2185 ch = next_char ();
2684 }
2685 2186
2686 if (ch == NOCHAR) // TODO: improve 2187 if (ch == NOCHAR)
2687 break; 2188 break;
2189 }
2688 2190
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2191 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2192 {
2691 if (!seen_input) 2193 if (!seen_input)
2692 { 2194 {
… …
2701 if (seen_resize && cmd_pid) 2203 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2204 kill (-cmd_pid, SIGWINCH);
2703 } 2205 }
2704 2206
2705 /* Read a text string from the input buffer */ 2207 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2208 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2209 bool refreshnow = false;
2708 int nlines = 0; 2210 int nlines = 0;
2709 unicode_t *str = buf; 2211 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2212 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2213
2712 for (;;) 2214 for (;;)
2713 { 2215 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2216 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2217 break;
… …
2721 if (ch == C0_LF) 2223 if (ch == C0_LF)
2722 nlines++; 2224 nlines++;
2723 2225
2724 refresh_count++; 2226 refresh_count++;
2725 2227
2726 if (!OPTION (Opt_jumpScroll) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 { 2229 {
2729 refreshnow = true;
2730 refresh_count = 0; 2230 refresh_count = 0;
2231
2232 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2233 {
2234 refreshnow = true;
2731 ch = NOCHAR; 2235 ch = NOCHAR;
2732 break; 2236 break;
2237 }
2733 } 2238 }
2734 2239
2735 // scr_add_lines only works for nlines <= nrow - 1. 2240 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2241 if (nlines >= nrow - 1)
2737 { 2242 {
2243 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2738 if (!PERL_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2244 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2739 scr_add_lines (buf, nlines, str - buf); 2245 scr_add_lines (buf, str - buf, nlines);
2740 2246
2741 nlines = 0; 2247 nlines = 0;
2742 str = buf; 2248 str = buf;
2743 eol = str + min (ncol, UBUFSIZ); 2249 eol = str + min (ncol, UBUFSIZ);
2744 } 2250 }
… …
2758 2264
2759 seq_begin = cmdbuf_ptr; 2265 seq_begin = cmdbuf_ptr;
2760 ch = next_char (); 2266 ch = next_char ();
2761 } 2267 }
2762 2268
2269 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2763 if (!PERL_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2764 scr_add_lines (buf, nlines, str - buf); 2271 scr_add_lines (buf, str - buf, nlines);
2765 2272
2766 /* 2273 /*
2767 * If there have been a lot of new lines, then update the screen 2274 * If there have been a lot of new lines, then update the screen
2768 * What the heck I'll cheat and only refresh less than every page-full. 2275 * What the heck we'll cheat and only refresh less than every page-full.
2769 * the number of pages between refreshes is refresh_limit, which 2276 * if skipScroll is enabled.
2770 * is incremented here because we must be doing flat-out scrolling.
2771 */ 2277 */
2772 if (refreshnow) 2278 if (refreshnow)
2773 { 2279 {
2774 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2775 refresh_limit++;
2776 else
2777 {
2778 flag = true; 2280 flag = true;
2779 scr_refresh (refresh_type); 2281 scr_refresh ();
2780 flush_ev.stop (); 2282 want_refresh = 1;
2781 }
2782 } 2283 }
2783 2284
2784 } 2285 }
2785 else 2286 else
2786 { 2287 {
… …
2800 } 2301 }
2801 2302
2802 return flag; 2303 return flag;
2803} 2304}
2804 2305
2805// read the next octet
2806unicode_t
2807rxvt_term::next_octet ()
2808{
2809 return cmdbuf_ptr < cmdbuf_endp
2810 ? *cmdbuf_ptr++
2811 : NOCHAR;
2812}
2813
2814// read the next character 2306// read the next character
2815unicode_t 2307wchar_t
2816rxvt_term::next_char () 2308rxvt_term::next_char () NOTHROW
2817{ 2309{
2818 while (cmdbuf_ptr < cmdbuf_endp) 2310 while (cmdbuf_ptr < cmdbuf_endp)
2819 { 2311 {
2820 // assume 7-bit to be ascii ALWAYS 2312 // assume 7-bit to be ascii ALWAYS
2821 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2313 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2830 cmdbuf_ptr = cmdbuf_endp; 2322 cmdbuf_ptr = cmdbuf_endp;
2831 break; 2323 break;
2832 } 2324 }
2833 2325
2834 if (len == (size_t)-1) 2326 if (len == (size_t)-1)
2835 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2327 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2836 2328
2837 // assume wchar == unicode 2329 // assume wchar == unicode
2838 cmdbuf_ptr += len; 2330 cmdbuf_ptr += len;
2839 return wc & UNICODE_MASK; 2331 return wc & UNICODE_MASK;
2840 } 2332 }
2841 2333
2842 return NOCHAR; 2334 return NOCHAR;
2843} 2335}
2336
2337// read the next octet
2338uint32_t
2339rxvt_term::next_octet () NOTHROW
2340{
2341 return cmdbuf_ptr < cmdbuf_endp
2342 ? (unsigned char)*cmdbuf_ptr++
2343 : NOCHAR;
2344}
2345
2346static class out_of_input out_of_input;
2844 2347
2845/* rxvt_cmd_getc () - Return next input character */ 2348/* rxvt_cmd_getc () - Return next input character */
2846/* 2349/*
2847 * Return the next input character after first passing any keyboard input 2350 * Return the next input character after first passing any keyboard input
2848 * to the command. 2351 * to the command.
2849 */ 2352 */
2850unicode_t 2353wchar_t
2851rxvt_term::cmd_getc () 2354rxvt_term::cmd_getc () THROW ((class out_of_input))
2852{ 2355{
2853 unicode_t c = next_char (); 2356 wchar_t c = next_char ();
2854 2357
2855 if (c == NOCHAR) 2358 if (c == NOCHAR)
2856 throw out_of_input; 2359 throw out_of_input;
2857 2360
2858 return c; 2361 return c;
2859} 2362}
2860 2363
2861unicode_t 2364uint32_t
2862rxvt_term::cmd_get8 () 2365rxvt_term::cmd_get8 () THROW ((class out_of_input))
2863{ 2366{
2864 unicode_t c = next_octet (); 2367 uint32_t c = next_octet ();
2865 2368
2866 if (c == NOCHAR) 2369 if (c == NOCHAR)
2867 throw out_of_input; 2370 throw out_of_input;
2868 2371
2869 return c; 2372 return c;
… …
2933 { 2436 {
2934 if ((buf[len++] = cmd_getc ()) == 'i') 2437 if ((buf[len++] = cmd_getc ()) == 'i')
2935 break; /* done = 1 */ 2438 break; /* done = 1 */
2936 } 2439 }
2937 } 2440 }
2938 2441
2939 for (i = 0; i < len; i++) 2442 for (i = 0; i < len; i++)
2940 if (putc (buf[i], fd) == EOF) 2443 if (putc (buf[i], fd) == EOF)
2941 { 2444 {
2942 done = 1; 2445 done = 1;
2943 break; 2446 break;
… …
3005 process_dcs_seq (); 2508 process_dcs_seq ();
3006 break; 2509 break;
3007 case 0x9b: /* CSI */ 2510 case 0x9b: /* CSI */
3008 process_csi_seq (); 2511 process_csi_seq ();
3009 break; 2512 break;
3010 case 0x9d: /* CSI */ 2513 case 0x9d: /* OSC */
3011 process_osc_seq (); 2514 process_osc_seq ();
3012 break; 2515 break;
3013#endif 2516#endif
3014 } 2517 }
3015} 2518}
… …
3105 scr_charset_set (2, (unsigned int)cmd_getc ()); 2608 scr_charset_set (2, (unsigned int)cmd_getc ());
3106 break; 2609 break;
3107 case '+': 2610 case '+':
3108 scr_charset_set (3, (unsigned int)cmd_getc ()); 2611 scr_charset_set (3, (unsigned int)cmd_getc ());
3109 break; 2612 break;
3110#if ENABLE_FRILLS 2613#if !ENABLE_MINIMAL
3111 case '6': 2614 case '6':
3112 scr_backindex (); 2615 scr_backindex ();
3113 break; 2616 break;
3114#endif 2617#endif
3115 case '7': 2618 case '7':
3116 scr_cursor (SAVE); 2619 scr_cursor (SAVE);
3117 break; 2620 break;
3118 case '8': 2621 case '8':
3119 scr_cursor (RESTORE); 2622 scr_cursor (RESTORE);
3120 break; 2623 break;
3121#if ENABLE_FRILLS 2624#if !ENABLE_MINIMAL
3122 case '9': 2625 case '9':
3123 scr_forwardindex (); 2626 scr_forwardindex ();
3124 break; 2627 break;
3125#endif 2628#endif
3126 case '=': 2629 case '=':
… …
3136 break; 2639 break;
3137 2640
3138 /* 8.3.87: NEXT LINE */ 2641 /* 8.3.87: NEXT LINE */
3139 case C1_NEL: /* ESC E */ 2642 case C1_NEL: /* ESC E */
3140 { 2643 {
3141 unicode_t nlcr[] = { C0_LF, C0_CR }; 2644 wchar_t nlcr[] = { C0_LF, C0_CR };
3142 scr_add_lines (nlcr, 1, 2); 2645 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3143 } 2646 }
3144 break; 2647 break;
3145 2648
3146 /* kidnapped escape sequence: Should be 8.3.48 */ 2649 /* kidnapped escape sequence: Should be 8.3.48 */
3147 case C1_ESA: /* ESC G */ 2650 case C1_ESA: /* ESC G */
… …
3241rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
3242{ 2745{
3243 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
3244 unsigned int nargs, p; 2747 unsigned int nargs, p;
3245 int n, ndef; 2748 int n, ndef;
3246 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
3247 2750
3248 for (nargs = ESC_ARGS; nargs > 0;) 2751 nargs = 0;
3249 arg[--nargs] = 0;
3250 2752
3251 priv = 0; 2753 priv = 0;
3252 ch = cmd_getc (); 2754 ch = cmd_getc ();
3253 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
3254 { /* '<' '=' '>' '?' */ 2756 { /* '<' '=' '>' '?' */
… …
3288 ndef = get_byte_array_bit (csi_defaults, i); 2790 ndef = get_byte_array_bit (csi_defaults, i);
3289 for (p = 0; p < nargs; p++) 2791 for (p = 0; p < nargs; p++)
3290 if (arg[p] == -1) 2792 if (arg[p] == -1)
3291 arg[p] = ndef; 2793 arg[p] = ndef;
3292 2794
3293#ifdef DEBUG_CMD
3294 fprintf (stderr, "CSI ");
3295 for (p = 0; p < nargs; p++)
3296 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3297 fprintf (stderr, "%c\n", ch);
3298#endif
3299
3300 /* 2795 /*
3301 * private mode handling 2796 * private mode handling
3302 */ 2797 */
3303 if (priv) 2798 if (priv)
3304 { 2799 {
3305 switch (priv) 2800 switch (priv)
3306 { 2801 {
3307 case '>': 2802 case '>':
3308 if (ch == CSI_DA) /* secondary device attributes */ 2803 if (ch == CSI_DA) /* secondary device attributes */
3309 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2804 {
2805 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2806 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2807 //
2808 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2809 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2810 // versions.
2811 //
2812 tt_printf ("\033[>%d;95;0c", 'U');
2813 }
3310 break; 2814 break;
3311 case '?': 2815 case '?':
3312 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2816 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3313 process_terminal_mode (ch, priv, nargs, arg); 2817 process_terminal_mode (ch, priv, nargs, arg);
3314 break; 2818 break;
… …
3440 break; 2944 break;
3441 case 6: /* CPR requested */ 2945 case 6: /* CPR requested */
3442 scr_report_position (); 2946 scr_report_position ();
3443 break; 2947 break;
3444 case 7: /* unofficial extension */ 2948 case 7: /* unofficial extension */
3445 if (OPTION (Opt_insecure)) 2949 if (option (Opt_insecure))
3446 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2950 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3447 break; 2951 break;
3448 case 8: /* unofficial extension */ 2952 case 8: /* unofficial extension */
3449 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2953 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3450 break; 2954 break;
… …
3517 break; 3021 break;
3518 case CSI_75: 3022 case CSI_75:
3519 scr_cursor (RESTORE); 3023 scr_cursor (RESTORE);
3520 break; 3024 break;
3521 3025
3522#if ENABLE_FRILLS 3026#if !ENABLE_MINIMAL
3523 case CSI_74: 3027 case CSI_74:
3524 process_window_ops (arg, nargs); 3028 process_window_ops (arg, nargs);
3525 break; 3029 break;
3526#endif 3030#endif
3527 3031
… …
3534 break; 3038 break;
3535 } 3039 }
3536} 3040}
3537/*}}} */ 3041/*}}} */
3538 3042
3539#if ENABLE_FRILLS 3043#if !ENABLE_MINIMAL
3540/* ARGSUSED */ 3044/* ARGSUSED */
3541void 3045void
3542rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3046rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3543{ 3047{
3544 int x, y; 3048 int x, y;
3545 XWindowAttributes wattr; 3049 XWindowAttributes wattr;
3546 Window wdummy; 3050 Window wdummy;
3547 dDisp; 3051
3052 dLocal (Display *, dpy);
3548 3053
3549 if (nargs == 0) 3054 if (nargs == 0)
3550 return; 3055 return;
3551 3056
3552 switch (args[0]) 3057 switch (args[0])
3553 { 3058 {
3554 /* 3059 /*
3555 * commands 3060 * commands
3556 */ 3061 */
3557 case 1: /* deiconify window */ 3062 case 1: /* deiconify window */
3558 XMapWindow (disp, parent[0]); 3063 XMapWindow (dpy, parent[0]);
3559 break; 3064 break;
3560 case 2: /* iconify window */ 3065 case 2: /* iconify window */
3561 XIconifyWindow (disp, parent[0], display->screen); 3066 XIconifyWindow (dpy, parent[0], display->screen);
3562 break; 3067 break;
3563 case 3: /* set position (pixels) */ 3068 case 3: /* set position (pixels) */
3564 XMoveWindow (disp, parent[0], args[1], args[2]); 3069 XMoveWindow (dpy, parent[0], args[1], args[2]);
3565 break; 3070 break;
3566 case 4: /* set size (pixels) */ 3071 case 4: /* set size (pixels) */
3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3072 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3568 break; 3073 break;
3569 case 5: /* raise window */ 3074 case 5: /* raise window */
3570 XRaiseWindow (disp, parent[0]); 3075 XRaiseWindow (dpy, parent[0]);
3571 break; 3076 break;
3572 case 6: /* lower window */ 3077 case 6: /* lower window */
3573 XLowerWindow (disp, parent[0]); 3078 XLowerWindow (dpy, parent[0]);
3574 break; 3079 break;
3575 case 7: /* refresh window */ 3080 case 7: /* refresh window */
3576 scr_touch (true); 3081 scr_touch (true);
3577 break; 3082 break;
3578 case 8: /* set size (chars) */ 3083 case 8: /* set size (chars) */
… …
3585 if (args[0] >= 24) /* set height (chars) */ 3090 if (args[0] >= 24) /* set height (chars) */
3586 set_widthheight ((unsigned int)width, 3091 set_widthheight ((unsigned int)width,
3587 (unsigned int) (args[1] * fheight)); 3092 (unsigned int) (args[1] * fheight));
3588 break; 3093 break;
3589 3094
3590
3591 /* 3095 /*
3592 * reports - some output format copied from XTerm 3096 * reports - some output format copied from XTerm
3593 */ 3097 */
3594 case 11: /* report window state */ 3098 case 11: /* report window state */
3595 XGetWindowAttributes (disp, parent[0], &wattr); 3099 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3100 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3597 break; 3101 break;
3598 case 13: /* report window position */ 3102 case 13: /* report window position */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3103 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 XTranslateCoordinates (disp, parent[0], wattr.root, 3104 XTranslateCoordinates (dpy, parent[0], wattr.root,
3601 -wattr.border_width, -wattr.border_width, 3105 -wattr.border_width, -wattr.border_width,
3602 &x, &y, &wdummy); 3106 &x, &y, &wdummy);
3603 tt_printf ("\033[3;%d;%dt", x, y); 3107 tt_printf ("\033[3;%d;%dt", x, y);
3604 break; 3108 break;
3605 case 14: /* report window size (pixels) */ 3109 case 14: /* report window size (pixels) */
3606 XGetWindowAttributes (disp, parent[0], &wattr); 3110 XGetWindowAttributes (dpy, parent[0], &wattr);
3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3111 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3608 break; 3112 break;
3609 case 18: /* report text area size (chars) */ 3113 case 18: /* report text area size (chars) */
3610 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3114 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3611 break; 3115 break;
… …
3613 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3117 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3614 break; 3118 break;
3615 case 20: /* report icon label */ 3119 case 20: /* report icon label */
3616 { 3120 {
3617 char *s; 3121 char *s;
3618 XGetIconName (disp, parent[0], &s); 3122 XGetIconName (dpy, parent[0], &s);
3619 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3123 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3124 XFree (s);
3621 } 3125 }
3622 break; 3126 break;
3623 case 21: /* report window title */ 3127 case 21: /* report window title */
3624 { 3128 {
3625 char *s; 3129 char *s;
3626 XFetchName (disp, parent[0], &s); 3130 XFetchName (dpy, parent[0], &s);
3627 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3131 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3628 XFree (s); 3132 XFree (s);
3629 } 3133 }
3630 break; 3134 break;
3631 } 3135 }
3632} 3136}
… …
3659 seen_esc = true; 3163 seen_esc = true;
3660 continue; 3164 continue;
3661 } 3165 }
3662 else if (ch == C0_BEL || ch == CHAR_ST) 3166 else if (ch == C0_BEL || ch == CHAR_ST)
3663 break; 3167 break;
3168 else if (ch == C0_SYN)
3169 ch = cmd_get8 ();
3664 else if (ch < 0x20) 3170 else if (ch < 0x20)
3665 return NULL; /* other control character - exit */ 3171 return NULL; /* other control character - exit */
3666 3172
3667 seen_esc = false; 3173 seen_esc = false;
3668 3174
3669 if (n >= STRING_MAX - 1) 3175 if (n >= STRING_MAX - 1)
3670 // stop at some sane length 3176 // stop at some sane length
3671 return NULL; 3177 return NULL;
3672 3178
3673 if (ch == C0_SYN)
3674 string[n++] = cmd_get8 ();
3675 else
3676 string[n++] = ch; 3179 string[n++] = ch;
3677 } 3180 }
3678 3181
3679 string[n++] = '\0'; 3182 string[n++] = '\0';
3680 3183
3681 ends_how = (ch == 0x5c ? C0_ESC : ch); 3184 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3732void 3235void
3733rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3236rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3734{ 3237{
3735 if (str[0] == '?' && !str[1]) 3238 if (str[0] == '?' && !str[1])
3736 { 3239 {
3737 unsigned short r, g, b; 3240 rgba c;
3738 pix_colors_focused[color].get (display, r, g, b); 3241 pix_colors_focused[color].get (c);
3242
3243#if XFT
3244 if (c.a != rgba::MAX_CC)
3245 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3246 else
3247#endif
3739 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3248 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3740 } 3249 }
3741 else 3250 else
3742 set_window_color (color, str); 3251 set_window_color (color, str);
3743} 3252}
3744 3253
… …
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3255 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3256 */
3748void 3257void
3749rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3258rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3259{
3751 int changed = 0;
3752 int color; 3260 int color;
3753 char *buf, *name; 3261 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3262 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3263 int saveop = op;
3756 dDisp; 3264
3265 dLocal (Display *, dpy);
3757 3266
3758 assert (str != NULL); 3267 assert (str != NULL);
3268
3269 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3270 return;
3271
3759 switch (op) 3272 switch (op)
3760 { 3273 {
3761 case XTerm_name: 3274 case XTerm_name:
3762 set_title (str); 3275 set_title (str);
3763 /* FALLTHROUGH */ 3276 /* FALLTHROUGH */
… …
3777 unsigned long bytes_after; 3290 unsigned long bytes_after;
3778 unsigned char *value = 0; 3291 unsigned char *value = 0;
3779 const char *str = ""; 3292 const char *str = "";
3780 3293
3781 if (prop 3294 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3295 && XGetWindowProperty (dpy, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3296 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3297 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3298 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3299 && actual_type != None
3787 && actual_format == 8) 3300 && actual_format == 8)
3788 str = (const char *)(value); 3301 str = (const char *)(value);
3789 3302
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3303 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3304
3792 XFree (value); 3305 XFree (value);
3793 } 3306 }
3794 else 3307 else
3795 { 3308 {
… …
3799 { 3312 {
3800 *eq = 0; 3313 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3314 set_utf8_property (display->atom (str), eq + 1);
3802 } 3315 }
3803 else 3316 else
3804 XDeleteProperty (disp, parent[0], 3317 XDeleteProperty (dpy, parent[0],
3805 display->atom (str)); 3318 display->atom (str));
3806 } 3319 }
3807 break; 3320 break;
3808 3321
3809 case XTerm_Color: 3322 case XTerm_Color:
… …
3811 { 3324 {
3812 if ((name = strchr (buf, ';')) == NULL) 3325 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3326 break;
3814 3327
3815 *name++ = '\0'; 3328 *name++ = '\0';
3816 color = atoi (buf); 3329 color = atoi (buf) + minCOLOR;
3817 3330
3818 if (color < 0 || color >= TOTAL_COLORS) 3331 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3332 break;
3820 3333
3821 if ((buf = strchr (name, ';')) != NULL) 3334 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3335 *buf++ = '\0';
3823 3336
3824 if (name[0] == '?' && !name[1]) 3337 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color + minCOLOR, name);
3832 } 3338 }
3833 break; 3339 break;
3834 case XTerm_Color00: 3340 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3341 process_color_seq (op, Color_fg, str, resp);
3836 break; 3342 break;
3837 case XTerm_Color01: 3343 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3344 process_color_seq (op, Color_bg, str, resp);
3839 break; 3345 break;
3840#ifndef NO_CURSORCOLOR 3346#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3347 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3348 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3349 break;
3844#endif 3350#endif
3845 case XTerm_Color_pointer_fg: 3351 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3352 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3353 break;
3848 case XTerm_Color_pointer_bg: 3354 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3355 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3356 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3357#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_BD:
3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3854 break;
3855 case XTerm_Color_UL:
3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3857 break;
3858 case XTerm_Color_RV: 3358 case XTerm_Color_RV:
3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3359 process_color_seq (op, Color_RV, str, resp);
3360 break;
3361 case Rxvt_Color_BD:
3362 case URxvt_Color_BD:
3363 process_color_seq (op, Color_BD, str, resp);
3364 break;
3365 case Rxvt_Color_UL:
3366 case URxvt_Color_UL:
3367 process_color_seq (op, Color_UL, str, resp);
3860 break; 3368 break;
3861 case URxvt_Color_IT: 3369 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3370 process_color_seq (op, Color_IT, str, resp);
3863 break; 3371 break;
3864#endif 3372#endif
3865#if TRANSPARENT && TINTING 3373#if ENABLE_TRANSPARENCY
3866 case URxvt_Color_tint: 3374 case URxvt_Color_tint:
3867 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3375 process_color_seq (op, Color_tint, str, resp);
3868 check_our_parents (); 3376 {
3869 if (am_transparent) 3377 bool changed = false;
3870 want_full_refresh = want_refresh = 1; 3378 if (ISSET_PIXCOLOR (Color_tint))
3871 break; 3379 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3872#endif 3380 else
3381 changed = bgPixmap.unset_tint ();
3382 if (changed)
3383 update_background ();
3384 }
3873 3385
3386 break;
3387#endif
3388
3389#if BG_IMAGE_FROM_FILE
3874 case XTerm_Pixmap: 3390 case Rxvt_Pixmap:
3875 if (*str != ';') 3391 if (!strcmp (str, "?"))
3876 { 3392 {
3877#if XPM_BACKGROUND 3393 char str[256];
3878 scale_pixmap (""); /* reset to default scaling */ 3394
3879 set_bgPixmap (str); /* change pixmap */ 3395 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3880#endif 3396 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3881 scr_touch (true); 3397 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3398 process_xterm_seq (XTerm_title, str, CHAR_ST);
3882 } 3399 }
3883 while ((str = strchr (str, ';')) != NULL) 3400 else
3884 { 3401 {
3402 int changed = 0;
3403
3404 if (*str != ';')
3405 {
3406 /* reset to default scaling :*/
3407 bgPixmap.unset_geometry ();
3408 if (bgPixmap.set_file (str)) /* change pixmap */
3409 changed++;
3410 str = strchr (str, ';');
3411 if (str == NULL)
3412 bgPixmap.set_defaultGeometry ();
3413 }
3414 while (str)
3415 {
3885 str++; 3416 str++;
3886#if XPM_BACKGROUND 3417 if (bgPixmap.set_geometry (str))
3887 changed += scale_pixmap (str); 3418 changed++;
3888#endif 3419 str = strchr (str, ';');
3420 }
3421 if (changed)
3422 update_background ();
3889 } 3423 }
3890
3891 if (changed)
3892 {
3893#ifdef XPM_BACKGROUND
3894 resize_pixmap ();
3895#endif
3896 scr_touch (true);
3897 }
3898 break; 3424 break;
3425#endif
3899 3426
3900 case XTerm_restoreFG: 3427 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3428 set_window_color (Color_fg, str);
3902 break; 3429 break;
3903 case XTerm_restoreBG: 3430 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3431 set_window_color (Color_bg, str);
3905 break; 3432 break;
3906 3433
3907 case XTerm_logfile: 3434 case XTerm_logfile:
3908 // TODO, when secure mode? 3435 // TODO, when secure mode?
3909 break; 3436 break;
3910 3437
3911#ifdef MENUBAR
3912 case URxvt_Menu:
3913 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3915 break;
3916#endif
3917#if 0 3438#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3439 case Rxvt_dumpscreen: /* no error notices */
3919 { 3440 {
3920 int fd; 3441 int fd;
3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3442 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3922 { 3443 {
3923 scr_dump (fd); 3444 scr_dump (fd);
… …
3934 case URxvt_italicFont: 3455 case URxvt_italicFont:
3935 case URxvt_boldItalicFont: 3456 case URxvt_boldItalicFont:
3936#endif 3457#endif
3937 if (query) 3458 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", saveop, 3459 tt_printf ("\33]%d;%-.250s%c", saveop,
3939 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3460 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3940 ? fontset[op - URxvt_font]->fontdesc : "", 3461 ? fontset[op - URxvt_font]->fontdesc : "",
3941 resp); 3462 resp);
3942 else 3463 else
3943 { 3464 {
3944 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3465 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3947 allocated.push_back ((void *)res); 3468 allocated.push_back ((void *)res);
3948 set_fonts (); 3469 set_fonts ();
3949 } 3470 }
3950 break; 3471 break;
3951 3472
3952#if ENABLE_FRILLS 3473 case URxvt_version:
3474 if (query)
3475 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3476 op,
3477 rs[Rs_name], VERSION[0], VERSION[2],
3478 resp);
3479 break;
3480
3481#if !ENABLE_MINIMAL
3953 case URxvt_locale: 3482 case URxvt_locale:
3954 if (query) 3483 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3484 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3956 else 3485 else
3957 { 3486 {
3958 set_locale (str); 3487 set_locale (str);
3959 pty.set_utf8_mode (enc_utf8); 3488 pty->set_utf8_mode (enc_utf8);
3960 init_xlocale (); 3489 init_xlocale ();
3961 } 3490 }
3962 break; 3491 break;
3963 3492
3964 case URxvt_view_up: 3493 case URxvt_view_up:
… …
3975 break; 3504 break;
3976#endif 3505#endif
3977 3506
3978#if ENABLE_PERL 3507#if ENABLE_PERL
3979 case URxvt_perl: 3508 case URxvt_perl:
3980 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3509 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3981 ; // no responses yet 3510 ; // no responses yet
3982 break; 3511 break;
3983#endif 3512#endif
3984 } 3513 }
3985} 3514}
… …
4017 return state; 3546 return state;
4018} 3547}
4019 3548
4020/* we're not using priv _yet_ */ 3549/* we're not using priv _yet_ */
4021void 3550void
4022rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3551rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4023{ 3552{
4024 unsigned int i, j; 3553 unsigned int i, j;
4025 int state; 3554 int state;
4026 3555
4027 static const struct 3556 static const struct
4028 { 3557 {
4029 const int argval; 3558 const int argval;
4030 const unsigned long bit; 3559 const unsigned long bit;
4031 }
4032
4033 argtopriv[] = { 3560 } argtopriv[] = {
4034 { 1, PrivMode_aplCUR }, 3561 { 1, PrivMode_aplCUR },
4035 { 2, PrivMode_vt52 }, 3562 { 2, PrivMode_vt52 },
4036 { 3, PrivMode_132 }, 3563 { 3, PrivMode_132 },
4037 { 4, PrivMode_smoothScroll }, 3564 { 4, PrivMode_smoothScroll },
4038 { 5, PrivMode_rVideo }, 3565 { 5, PrivMode_rVideo },
4039 { 6, PrivMode_relOrigin }, 3566 { 6, PrivMode_relOrigin },
4040 { 7, PrivMode_Autowrap }, 3567 { 7, PrivMode_Autowrap },
4041 // 8, bi-directional support mode 3568 // 8, bi-directional support mode
4042 { 9, PrivMode_MouseX10 }, 3569 { 9, PrivMode_MouseX10 },
4043#ifdef menuBar_esc
4044 { menuBar_esc, PrivMode_menuBar },
4045#endif
4046 // 18, 19 printing-related 3570 // 18, 19 printing-related
4047 { 25, PrivMode_VisibleCursor }, 3571 { 25, PrivMode_VisibleCursor },
4048#ifdef scrollBar_esc 3572#ifdef scrollBar_esc
4049 { scrollBar_esc, PrivMode_scrollBar }, 3573 { scrollBar_esc, PrivMode_scrollBar },
4050#endif 3574#endif
… …
4058#ifndef NO_BACKSPACE_KEY 3582#ifndef NO_BACKSPACE_KEY
4059 { 67, PrivMode_BackSpace }, 3583 { 67, PrivMode_BackSpace },
4060#endif 3584#endif
4061 { 1000, PrivMode_MouseX11 }, 3585 { 1000, PrivMode_MouseX11 },
4062 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3586 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4063 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
4064 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
4065 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4066 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
4067 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
4068 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
4069 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
4097 /* extra handling for values with state unkept */ 3621 /* extra handling for values with state unkept */
4098 switch (arg[i]) 3622 switch (arg[i])
4099 { 3623 {
4100#if ENABLE_STYLES 3624#if ENABLE_STYLES
4101 case 1021: 3625 case 1021:
4102 if (mode) 3626 set_option (Opt_intensityStyles, mode);
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106 3627
4107 scr_touch (true); 3628 scr_touch (true);
4108 break; 3629 break;
4109#endif 3630#endif
4110 case 1048: /* alternative cursor save */ 3631 case 1048: /* alternative cursor save */
4111 case 1049: 3632 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 3633 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 3634 if (mode == 0)
4114 scr_cursor (RESTORE); 3635 scr_cursor (RESTORE);
4115 else if (mode == 1) 3636 else if (mode == 1)
4116 scr_cursor (SAVE); 3637 scr_cursor (SAVE);
4117 break; 3638 break;
… …
4132 case 3: /* 80/132 */ 3653 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 3654 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 3655 set_widthheight (((state ? 132 : 80) * fwidth), height);
4135 break; 3656 break;
4136 case 4: /* smooth scrolling */ 3657 case 4: /* smooth scrolling */
4137 if (!state) 3658 set_option (Opt_jumpScroll, !state);
4138 SET_OPTION (Opt_jumpScroll);
4139 else
4140 CLR_OPTION (Opt_jumpScroll);
4141 break; 3659 break;
4142 case 5: /* reverse video */ 3660 case 5: /* reverse video */
4143 scr_rvideo_mode (state); 3661 scr_rvideo_mode (state);
4144 break; 3662 break;
4145 case 6: /* relative/absolute origins */ 3663 case 6: /* relative/absolute origins */
… …
4149 scr_autowrap (state); 3667 scr_autowrap (state);
4150 break; 3668 break;
4151 /* case 8: - auto repeat, can't do on a per window basis */ 3669 /* case 8: - auto repeat, can't do on a per window basis */
4152 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
4153 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
4154 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4155 break; 3673 break;
4156#ifdef menuBar_esc
4157 case menuBar_esc:
4158#ifdef MENUBAR
4159 map_menuBar (state);
4160#endif
4161 break;
4162#endif
4163#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
4164 case scrollBar_esc: 3675 case scrollBar_esc:
4165 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
4166 { 3677 {
4167 resize_all_windows (0, 0, 0); 3678 resize_all_windows (0, 0, 0);
… …
4179 break; 3690 break;
4180 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
4181 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
4182 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
4183 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
4184 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4185 break; 3696 break;
4186#if 0 3697#if 0
4187 case 1001: 3698 case 1001:
4188 break; /* X11 mouse highlighting */ 3699 break; /* X11 mouse highlighting */
4189#endif 3700#endif
3701 case 1002:
3702 case 1003:
3703 if (state)
3704 {
3705 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3706 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3707 vt_emask_mouse = PointerMotionMask;
3708 }
3709 else
3710 vt_emask_mouse = NoEventMask;
3711 vt_select_input ();
3712 break;
4190 case 1010: /* scroll to bottom on TTY output inhibit */ 3713 case 1010: /* scroll to bottom on TTY output inhibit */
4191 if (!state) 3714 set_option (Opt_scrollTtyOutput, !state);
4192 SET_OPTION (Opt_scrollTtyOutput);
4193 else
4194 CLR_OPTION (Opt_scrollTtyOutput);
4195 break; 3715 break;
4196 case 1011: /* scroll to bottom on key press */ 3716 case 1011: /* scroll to bottom on key press */
4197 if (state) 3717 set_option (Opt_scrollTtyKeypress, state);
4198 SET_OPTION (Opt_scrollTtyKeypress);
4199 else
4200 CLR_OPTION (Opt_scrollTtyKeypress);
4201 break; 3718 break;
4202 case 1047: /* secondary screen w/ clearing last */ 3719 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 3720 if (option (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 3721 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 3722 scr_erase_screen (2);
4206 scr_change_screen (state); 3723 scr_change_screen (state);
4207 break; 3724 break;
4208 case 1049: /* secondary screen w/ clearing first */ 3725 case 1049: /* secondary screen w/ clearing first */
4209 scr_change_screen (state); 3726 scr_change_screen (state);
4210 if (OPTION (Opt_secondaryScreen)) 3727 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 3728 if (current_screen != PRIMARY)
4212 scr_erase_screen (2); 3729 scr_erase_screen (2);
4213 break; 3730 break;
4214 default: 3731 default:
4215 break; 3732 break;
… …
4343 scr_color (Color_bg, Color_bg); 3860 scr_color (Color_bg, Color_bg);
4344 break; 3861 break;
4345 3862
4346 //case 50: // not variable spacing 3863 //case 50: // not variable spacing
4347 3864
4348#if ENABLE_FRILLS 3865#if !ENABLE_MINIMAL
4349 case 90: 3866 case 90:
4350 case 91: /* set bright fg color */ 3867 case 91: /* set bright fg color */
4351 case 92: 3868 case 92:
4352 case 93: 3869 case 93:
4353 case 94: 3870 case 94:
… …
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3932const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416 3933
4417void 3934void
4418rxvt_term::tt_write (const char *data, unsigned int len) 3935rxvt_term::tt_write (const char *data, unsigned int len)
4419{ 3936{
3937 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3938 return;
3939
3940 if (pty->pty < 0)
3941 return;
3942
4420 if (v_buflen == 0) 3943 if (v_buflen == 0)
4421 { 3944 {
4422 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3945 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4423 3946
4424 if ((unsigned int)written == len) 3947 if ((unsigned int)written == len)
4425 return; 3948 return;
4426 3949
4427 data += written; 3950 data += written;
… …
4431 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4432 3955
4433 memcpy (v_buffer + v_buflen, data, len); 3956 memcpy (v_buffer + v_buflen, data, len);
4434 v_buflen += len; 3957 v_buflen += len;
4435 3958
4436 pty_ev.set (EVENT_READ | EVENT_WRITE); 3959 pty_ev.set (ev::READ | ev::WRITE);
4437} 3960}
4438 3961
4439void rxvt_term::pty_write () 3962void rxvt_term::pty_write ()
4440{ 3963{
4441 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3964 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4442 3965
4443 if (written > 0) 3966 if (written > 0)
4444 { 3967 {
4445 v_buflen -= written; 3968 v_buflen -= written;
4446 3969
4447 if (v_buflen == 0) 3970 if (v_buflen == 0)
4448 { 3971 {
4449 free (v_buffer); 3972 free (v_buffer);
4450 v_buffer = 0; 3973 v_buffer = 0;
4451 v_buflen = 0;
4452 3974
4453 pty_ev.set (EVENT_READ); 3975 pty_ev.set (ev::READ);
4454 return; 3976 return;
4455 } 3977 }
4456 3978
4457 memmove (v_buffer, v_buffer + written, v_buflen); 3979 memmove (v_buffer, v_buffer + written, v_buflen);
4458 } 3980 }
4459 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3981 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4460 pty_ev.set (EVENT_READ); 3982 pty_ev.set (ev::READ);
4461} 3983}
4462 3984
4463/*----------------------- end-of-file (C source) -----------------------*/ 3985/*----------------------- end-of-file (C source) -----------------------*/
4464 3986

Diff Legend

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