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.244 by root, Fri Jan 6 17:09:27 2006 UTC vs.
Revision 1.367 by root, Sat Nov 24 11:06:12 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>
… …
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
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END))) 832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 833 return;
874 834
875 if (len <= 0) 835 if (len <= 0)
876 return; /* not mapped */ 836 return; /* not mapped */
877 837
878 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 839 if (view_start)
880 { 840 {
881 view_start = 0; 841 view_start = 0;
882 want_refresh = 1; 842 want_refresh = 1;
883 } 843 }
… …
905 { 865 {
906 const char ch = C0_ESC; 866 const char ch = C0_ESC;
907 tt_write (&ch, 1); 867 tt_write (&ch, 1);
908 } 868 }
909 869
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
921} 871}
922/*}}} */
923 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
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 951unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 953{
930 unsigned int n, s; 954 unsigned int n, s;
931 955
… …
959void 983void
960rxvt_term::flush () 984rxvt_term::flush ()
961{ 985{
962 flush_ev.stop (); 986 flush_ev.stop ();
963 987
964#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
965 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
966 { 990 {
967 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
968 scr_clear ();
969 scr_touch (false); 992 scr_touch (false);
970 } 993 }
971#endif 994#endif
972 995
973 if (want_refresh) 996 if (want_refresh)
974 { 997 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 998 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 999 {
977 int row = -view_start; 1000 int row = view_start;
1001 int end_row = row + nrow;
978 1002
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1003 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1004 --row;
981 1005
982 while (row < -view_start + nrow) 1006 do
983 { 1007 {
984 int start_row = row; 1008 int start_row = row;
985 line_t *l; 1009 line_t *l;
986 1010
987 do 1011 do
988 { 1012 {
989 l = &ROW (row); 1013 l = &ROW (row++);
990 1014
991 if (!(l->f & LINE_FILTERED)) 1015 if (!(l->f & LINE_FILTERED))
992 { 1016 {
993 // line not filtered, mark it as filtered 1017 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1018 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1019 while (l->is_longer ())
996 { 1020 {
997 l = &ROW (++row); 1021 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1022 l->f |= LINE_FILTERED;
999 } 1023 }
1000 1024
1001 // and filter it 1025 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1026 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1027
1004 break; 1028 break;
1005 } 1029 }
1006 } 1030 }
1007 while (l->is_longer ()); 1031 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1032 }
1033 while (row < end_row);
1011 1034 }
1012 }
1013 1035
1014 scr_refresh (refresh_type); 1036 scr_refresh ();
1015 scrollbar_show (1); 1037 scrollbar_show (1);
1016#ifdef USE_XIM 1038#ifdef USE_XIM
1017 IMSendSpot (); 1039 IMSendSpot ();
1018#endif 1040#endif
1019 } 1041 }
1020 1042
1021 display->flush (); 1043 display->flush ();
1022} 1044}
1023 1045
1024void 1046void
1025rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
1026{ 1048{
1027 SET_R (this); 1049 make_current ();
1028 SET_LOCALE (locale);
1029 1050
1030 display->flush (); 1051 display->flush ();
1031 1052
1032 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1034} 1055}
1035 1056
1036void 1057void
1037rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1038{ 1059{
1039 SET_R (this); 1060 make_current ();
1040 SET_LOCALE (locale);
1041 1061
1042 refresh_limit = 1;
1043 refresh_count = 0; 1062 refresh_count = 0;
1044 flush (); 1063 flush ();
1045} 1064}
1046 1065
1047#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1048void 1067void
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1050{ 1069{
1051 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1071 want_refresh = 1;
1053
1054 w.start (w.at + BLINK_INTERVAL);
1055} 1072}
1056#endif 1073#endif
1057 1074
1058#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1059void 1076void
1060rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1061{ 1078{
1062 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1063 { 1080 {
1064 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1065 want_refresh = 1; 1082 want_refresh = 1;
1066 w.start (w.at + TEXT_BLINK_INTERVAL);
1067 } 1083 }
1068} 1084}
1069#endif 1085#endif
1070 1086
1071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1072void 1088void
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1074{ 1090{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1093 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
1081 } 1095 w.stop ();
1082} 1096}
1083#endif 1097#endif
1084 1098
1085#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1086void 1100void
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1088{ 1102{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1104 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1106 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1107 }
1108 else
1109 w.stop ();
1096} 1110}
1097#endif 1111#endif
1098 1112
1099#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1100void 1114void
1101rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1102{ 1116{
1103 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
1104 || 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)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1120 {
1107 if (view_start == nsaved || 1121 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1122 mouse_slip_wheel_speed = 0;
1110 1123
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1124 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1125 }
1126 else
1127 w.stop ();
1115} 1128}
1116#endif 1129#endif
1117 1130
1118#if HAVE_SCHED_YIELD 1131#if LINUX_YIELD_HACK
1119static struct event_handler 1132static struct event_handler
1120{ 1133{
1121 check_watcher cw_yield; 1134 ev::prepare yield_ev;
1122 1135
1123 void yield (check_watcher &w) 1136 void yield_cb (ev::prepare &w, int revents)
1124 { 1137 {
1125 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
1126 w.stop (); 1146 w.stop ();
1127 } 1147 }
1128 1148
1129 event_handler () 1149 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1150 : yield_ev (this, &event_handler::yield_cb)
1131 { 1151 {
1132 } 1152 }
1133} event_handler; 1153} event_handler;
1134#endif 1154#endif
1135 1155
… …
1146 1166
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1168 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1169 cmdbuf_endp = cmdbuf_ptr + n;
1150 1170
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1172
1153 if (r > 0) 1173 if (r > 0)
1154 { 1174 {
1155 cmdbuf_endp += r; 1175 cmdbuf_endp += r;
1156 return true; 1176 return true;
1157 } 1177 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1178 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1179 {
1160#if HAVE_SCHED_YIELD 1180#if LINUX_YIELD_HACK
1161 if (display->is_local) 1181 if (display->is_local)
1162 event_handler.cw_yield.start (); 1182 event_handler.yield_ev.start ();
1163#endif 1183#endif
1164 } 1184 }
1165 else 1185 else
1166 { 1186 {
1167 pty_ev.stop (); 1187 pty_ev.stop ();
1168 1188
1169 if (!OPTION (Opt_hold)) 1189 if (!option (Opt_hold))
1170 destroy (); 1190 destroy ();
1171 } 1191 }
1172 1192
1173 return false; 1193 return false;
1174} 1194}
1175 1195
1176void 1196void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
1178{ 1198{
1179 SET_R (this); 1199 make_current ();
1180 SET_LOCALE (locale);
1181 1200
1182 if (revents & EVENT_READ) 1201 if (revents & ev::READ)
1183 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1203 while (pty_fill ())
1185 if (cmd_parse ()) 1204 if (cmd_parse ())
1186 break; 1205 break;
1187 1206
1188 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1189 pty_write (); 1208 pty_write ();
1190} 1209}
1191 1210
1192void 1211void
1193rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1194{ 1213{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1215 recolour_cursor ();
1197 1216
1198#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1218 hidden_pointer = 0;
1200 1219
1201 if (OPTION (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1203#endif 1222#endif
1204} 1223}
1205 1224
1206#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1207void 1226void
1208rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
1209{ 1228{
1210 if (!OPTION (Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
1211 return; 1230 return;
1212 1231
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1233 XFlush (dpy);
1215 1234
1216 hidden_pointer = 1; 1235 hidden_pointer = 1;
1217} 1236}
1218 1237
1219void 1238void
1220rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1221{ 1240{
1222 SET_R (this); 1241 make_current ();
1223 SET_LOCALE (locale);
1224 1242
1225 pointer_blank (); 1243 pointer_blank ();
1226} 1244}
1227#endif 1245#endif
1228 1246
1229void 1247void
1230rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1231{ 1249{
1232 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1233 int x, y; 1251 int x, y;
1252 int code = 32;
1234 1253
1235 x = ev.x; 1254 x = Pixel2Col (ev.x);
1236 y = ev.y; 1255 y = Pixel2Row (ev.y);
1237 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 }
1238 1264
1239 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
1240 button_number = 3; 1266 button_number = 3;
1241 else 1267 else
1242 { 1268 {
… …
1288 x + 1, 1314 x + 1,
1289 y + 1); 1315 y + 1);
1290#endif 1316#endif
1291 1317
1292 tt_printf ("\033[M%c%c%c", 1318 tt_printf ("\033[M%c%c%c",
1293 (32 + button_number + key_state), 1319 (code + button_number + key_state),
1294 (32 + x + 1), 1320 (32 + x + 1),
1295 (32 + y + 1)); 1321 (32 + y + 1));
1296} 1322}
1297
1298#ifdef USING_W11LIB
1299void
1300rxvt_W11_process_x_event (XEvent *ev)
1301{
1302 rxvt_t *r = rxvt_get_r ();
1303
1304 x_cb (*ev);
1305}
1306#endif
1307 1323
1308/*{{{ process an X event */ 1324/*{{{ process an X event */
1309void 1325void
1310rxvt_term::x_cb (XEvent &ev) 1326rxvt_term::x_cb (XEvent &ev)
1311{ 1327{
1312 dDisp; 1328 make_current ();
1313 1329
1314 SET_R (this); 1330 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1331
1317#if defined(CURSOR_BLINK) 1332 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1333 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1334 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1335 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1336
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1337 // for XQueryPointer
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1338 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1339 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1340 unsigned int unused_mask;
1347 1341
1348 switch (ev.type) 1342 switch (ev.type)
1349 { 1343 {
1350 case KeyPress: 1344 case KeyPress:
1351#if ISO_14755 1345 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1346 break;
1357 1347
1358 case KeyRelease: 1348 case KeyRelease:
1359 { 1349 key_release (ev.xkey);
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1423
1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425 if (!(ev.xkey.state & ControlMask))
1426 slip_wheel_ev.stop ();
1427 else if (ks == XK_Control_L || ks == XK_Control_R)
1428 mouse_slip_wheel_speed = 0;
1429#endif
1430 break; 1350 break;
1431 }
1432 1351
1433 case ButtonPress: 1352 case ButtonPress:
1434 button_press (ev.xbutton); 1353 button_press (ev.xbutton);
1435 break; 1354 break;
1436 1355
… …
1438 button_release (ev.xbutton); 1357 button_release (ev.xbutton);
1439 break; 1358 break;
1440 1359
1441 case ClientMessage: 1360 case ClientMessage:
1442 if (ev.xclient.format == 32 1361 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1362 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444 { 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 {
1445 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)))
1446 destroy (); 1371 destroy ();
1372 }
1447#if ENABLE_EWMH 1373#if ENABLE_EWMH
1448 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])
1449 XSendEvent (disp, ev.xclient.window = display->root, 1375 XSendEvent (dpy, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask, 1376 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &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 }
1452#endif 1389#endif
1453 } 1390 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1463#ifdef OFFIX_DND
1464 /* OffiX Dnd (drag 'n' drop) protocol */
1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1466 && (ev.xclient.data.l[0] == DndFile
1467 || ev.xclient.data.l[0] == DndDir
1468 || ev.xclient.data.l[0] == DndLink))
1469 {
1470 /* Get Dnd data */
1471 Atom ActualType;
1472 int ActualFormat;
1473 unsigned char *data;
1474 unsigned long Size, RemainingBytes;
1475
1476 XGetWindowProperty (disp, display->root,
1477 xa[XA_DNDSELECTION],
1478 0L, 1000000L,
1479 False, AnyPropertyType,
1480 &ActualType, &ActualFormat,
1481 &Size, &RemainingBytes,
1482 &data);
1483 set_string_property (XA_CUT_BUFFER0, data);
1484 XFree (data);
1485 selection_paste (display->root, XA_CUT_BUFFER0, true);
1486 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1487 }
1488#endif /* OFFIX_DND */
1489 break;
1490
1491 case MappingNotify:
1492 XRefreshKeyboardMapping (&ev.xmapping);
1493 break; 1391 break;
1494 1392
1495 /* 1393 /*
1496 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1497 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1516 break; 1414 break;
1517 } 1415 }
1518 break; 1416 break;
1519 1417
1520 case FocusIn: 1418 case FocusIn:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1521 focus_in (); 1422 focus_in ();
1522 break; 1423 break;
1523 1424
1524 case FocusOut: 1425 case FocusOut:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1525 focus_out (); 1429 focus_out ();
1526 break; 1430 break;
1527 1431
1528 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); */
1529 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1530 { 1437 {
1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ; 1439 ;
1533 1440
1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535 { 1442 {
1536 seen_resize = 1; 1443 seen_resize = 1;
1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538 } 1445 }
1539 1446 else
1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1447 {
1541 if (OPTION (Opt_transparent)) 1448#ifdef HAVE_BG_PIXMAP
1542 check_our_parents (); 1449 if (bgPixmap.window_position_sensitive ())
1450 update_background ();
1543#endif 1451#endif
1452 }
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1544 } 1454 }
1545 break; 1455 break;
1546 1456
1547 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1549 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1550 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1551 1462
1552 break; 1463 break;
1553 1464
1554 case SelectionClear: 1465 case SelectionClear:
1555 selection_clear (); 1466 selection_clear ();
… …
1560 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1561 break; 1472 break;
1562 1473
1563 case SelectionRequest: 1474 case SelectionRequest:
1564 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));
1565 break; 1484 break;
1566 1485
1567 case UnmapNotify: 1486 case UnmapNotify:
1568 mapped = 0; 1487 mapped = 0;
1569#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1570 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1571#endif 1490#endif
1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1572 break; 1492 break;
1573
1574 case MapNotify:
1575 mapped = 1;
1576#ifdef TEXT_BLINK
1577 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578#endif
1579 break;
1580
1581#ifdef TRANSPARENT
1582 case ReparentNotify:
1583 rootwin_cb (ev);
1584 break;
1585#endif /* TRANSPARENT */
1586 1493
1587 case GraphicsExpose: 1494 case GraphicsExpose:
1588 case Expose: 1495 case Expose:
1589 if (ev.xany.window == vt) 1496 if (ev.xany.window == vt)
1590 { 1497 {
1591 do 1498 do
1499 {
1592 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1593 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1502 }
1594 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1595 1504
1596 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1597 1506
1598 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1599 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1600 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1601 1511 }
1602 scr_refresh (refresh_type); 1512 want_refresh = 1;
1603 } 1513 }
1604 else 1514 else
1605 { 1515 {
1606 XEvent unused_event; 1516 XEvent unused_event;
1607 1517
1608 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1609 ; 1519 ;
1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1611 ; 1521 ;
1612 1522
1613 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1614 { 1524 {
1615 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1616 scrollbar_show (0); 1526 scrollbar_show (0);
1617 } 1527 }
1618#ifdef MENUBAR
1619 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1620 menubar_expose ();
1621#endif
1622
1623#ifdef TRANSPARENT
1624 if (am_transparent && ev.xany.window == parent[0])
1625 XClearWindow (disp, ev.xany.window);
1626#endif
1627 } 1528 }
1628 break; 1529 break;
1629 1530
1630 case MotionNotify: 1531 case MotionNotify:
1631#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1632 if (hidden_pointer) 1533 if (hidden_pointer)
1633 pointer_unblank (); 1534 pointer_unblank ();
1634#endif 1535#endif
1635#if MENUBAR 1536 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1636 if (isMenuBarWindow (ev.xany.window)) 1537 || priv_modes & PrivMode_MouseAnyEvent)
1637 {
1638 menubar_control (ev.xbutton); 1538 mouse_report (ev.xbutton);
1639 break;
1640 }
1641#endif
1642 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1643 break; 1540 break;
1644 1541
1645 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1646 { 1543 {
1544 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1647 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1545 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648 ; // nop 1546 ; // nop
1649 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1547 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1650 { 1548 {
1651 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1549 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1652 ; 1550 ;
1653 1551
1654 XQueryPointer (disp, vt, 1552 XQueryPointer (dpy, vt,
1655 &unused_root, &unused_child, 1553 &unused_root, &unused_child,
1656 &unused_root_x, &unused_root_y, 1554 &unused_root_x, &unused_root_y,
1657 &ev.xbutton.x, &ev.xbutton.y, 1555 &ev.xbutton.x, &ev.xbutton.y,
1658 &ev.xbutton.state); 1556 &ev.xbutton.state);
1659#ifdef MOUSE_THRESHOLD 1557#ifdef MOUSE_THRESHOLD
… …
1680 1578
1681 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1682 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1683 */ 1581 */
1684 if (!sel_scroll_ev.active) 1582 if (!sel_scroll_ev.active)
1685 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1686 1584
1687 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1688 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1689 */ 1587 */
1690 selection_save_x = ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
… …
1723#endif 1621#endif
1724 } 1622 }
1725 } 1623 }
1726 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1727 { 1625 {
1728 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1729 MotionNotify, &ev)) 1627 MotionNotify, &ev))
1730 ; 1628 ;
1731 1629
1732 XQueryPointer (disp, scrollBar.win, 1630 XQueryPointer (dpy, scrollBar.win,
1733 &unused_root, &unused_child, 1631 &unused_root, &unused_child,
1734 &unused_root_x, &unused_root_y, 1632 &unused_root_x, &unused_root_y,
1735 &ev.xbutton.x, &ev.xbutton.y, 1633 &ev.xbutton.x, &ev.xbutton.y,
1736 &unused_mask); 1634 &unused_mask);
1737 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1635 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1738 scrollbar_size ()); 1636 scrollbar_size ());
1739 scr_refresh (refresh_type);
1740 refresh_limit = 0; 1637 want_refresh = 1;
1741 scrollbar_show (1); 1638 scrollbar_show (1);
1742 } 1639 }
1743 break; 1640 break;
1744 } 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
1745} 1669}
1746 1670
1747void 1671void
1748rxvt_term::focus_in () 1672rxvt_term::focus_in ()
1749{ 1673{
1750 if (!focus) 1674 if (!focus)
1751 { 1675 {
1752 focus = 1; 1676 focus = 1;
1753 want_refresh = 1; 1677 want_refresh = 1;
1754 1678
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1679 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1756 1680
1757#if USE_XIM 1681#if USE_XIM
1758 if (Input_Context != NULL) 1682 if (Input_Context != NULL)
1759 { 1683 {
1760 IMSetStatusPosition (); 1684 IMSetPosition ();
1761 XSetICFocus (Input_Context); 1685 XSetICFocus (Input_Context);
1762 } 1686 }
1763#endif 1687#endif
1764#if CURSOR_BLINK 1688#if CURSOR_BLINK
1765 if (OPTION (Opt_cursorBlink)) 1689 if (option (Opt_cursorBlink))
1766 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1767#endif 1691#endif
1768#if OFF_FOCUS_FADING 1692#if OFF_FOCUS_FADING
1769 if (rs[Rs_fade]) 1693 if (rs[Rs_fade])
1770 { 1694 {
1771 pix_colors = pix_colors_focused; 1695 pix_colors = pix_colors_focused;
1772 scr_recolour (); 1696 scr_recolour ();
1773 } 1697 }
1774#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
1775 } 1709 }
1776} 1710}
1777 1711
1778void 1712void
1779rxvt_term::focus_out () 1713rxvt_term::focus_out ()
… …
1787 1721
1788#if ENABLE_FRILLS || ISO_14755 1722#if ENABLE_FRILLS || ISO_14755
1789 if (iso14755buf) 1723 if (iso14755buf)
1790 { 1724 {
1791 iso14755buf = 0; 1725 iso14755buf = 0;
1792# if ENABLE_OVERLAY 1726# if ISO_14755
1793 scr_overlay_off (); 1727 scr_overlay_off ();
1794# endif 1728# endif
1795 } 1729 }
1796#endif 1730#endif
1797#if USE_XIM 1731#if USE_XIM
1798 if (Input_Context != NULL) 1732 if (Input_Context != NULL)
1799 XUnsetICFocus (Input_Context); 1733 XUnsetICFocus (Input_Context);
1800#endif 1734#endif
1801#if CURSOR_BLINK 1735#if CURSOR_BLINK
1802 if (OPTION (Opt_cursorBlink)) 1736 if (option (Opt_cursorBlink))
1803 cursor_blink_ev.stop (); 1737 cursor_blink_ev.stop ();
1738
1804 hidden_cursor = 0; 1739 hidden_cursor = 0;
1805#endif 1740#endif
1806#if OFF_FOCUS_FADING 1741#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1742 if (rs[Rs_fade])
1808 { 1743 {
… …
1811 } 1746 }
1812#endif 1747#endif
1813 } 1748 }
1814} 1749}
1815 1750
1816#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
1817void 1765void
1818rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1767{
1820 SET_R (this); 1768 make_current ();
1821 SET_LOCALE (locale);
1822 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
1823 switch (ev.type) 1775 switch (ev.type)
1824 { 1776 {
1825 case PropertyNotify: 1777 case PropertyNotify:
1826 /* 1778 /*
1827 * 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,
1828 * 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.
1829 */ 1781 */
1830 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1782 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832 return; 1784 {
1833 1785 bgPixmap.set_root_pixmap ();
1834 /* FALLTHROUGH */ 1786 update_background ();
1835 case ReparentNotify: 1787 }
1836 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1837 want_refresh = want_full_refresh = 1;
1838 break; 1788 break;
1839 } 1789 }
1790# endif
1840} 1791}
1841#endif 1792#endif
1842 1793
1843void 1794void
1844rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
… …
1853 /* 1804 /*
1854 * VT window processing of button press 1805 * VT window processing of button press
1855 */ 1806 */
1856 if (ev.window == vt) 1807 if (ev.window == vt)
1857 { 1808 {
1809 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1810 return;
1811
1858#if ISO_14755 1812#if ISO_14755
1859 // 5.4 1813 // 5.4
1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1814 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1861 { 1815 {
1862 iso14755_54 (ev.x, ev.y); 1816 iso14755_54 (ev.x, ev.y);
… …
1896 mouse_report (ev); 1850 mouse_report (ev);
1897 } 1851 }
1898#else 1852#else
1899 MEvent.button = ev.button; 1853 MEvent.button = ev.button;
1900 mouse_report (ev); 1854 mouse_report (ev);
1901#endif /* MOUSE_REPORT_DOUBLECLICK */ 1855#endif /* MOUSE_REPORT_DOUBLECLICK */
1902 1856
1903 } 1857 }
1904 else 1858 else
1905 { 1859 {
1906 if (ev.button != MEvent.button) 1860 if (ev.button != MEvent.button)
1907 MEvent.clicks = 0; 1861 MEvent.clicks = 0;
1908 1862
1909 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1910 switch (ev.button) 1863 switch (ev.button)
1911 { 1864 {
1912 case Button1: 1865 case Button1:
1913 /* allow meta + click to select rectangular areas */ 1866 /* allow meta + click to select rectangular areas */
1914 /* should be done in screen.C */ 1867 /* should be done in screen.C */
1915#if ENABLE_FRILLS 1868#if ENABLE_FRILLS
1916 selection.rect = !!(ev.state & ModMetaMask); 1869 selection.rect = !!(ev.state & ModMetaMask);
1917#else 1870#else
1918 selection.rect = false; 1871 selection.rect = false;
1919#endif 1872#endif
1920 1873
1921 /* allow shift+left click to extend selection */ 1874 /* allow shift+left click to extend selection */
1922 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1875 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1923 { 1876 {
1924 if (MEvent.button == Button1 && clickintime) 1877 if (MEvent.button == Button1 && clickintime)
1925 selection_rotate (ev.x, ev.y); 1878 selection_rotate (ev.x, ev.y);
1926 else 1879 else
1927 selection_extend (ev.x, ev.y, 1); 1880 selection_extend (ev.x, ev.y, 1);
1928 } 1881 }
1929 else 1882 else
1930 { 1883 {
1931 if (MEvent.button == Button1 && clickintime) 1884 if (MEvent.button == Button1 && clickintime)
1932 MEvent.clicks++; 1885 MEvent.clicks++;
1933 else 1886 else
1934 MEvent.clicks = 1; 1887 MEvent.clicks = 1;
1935 1888
1936 selection_click (MEvent.clicks, ev.x, ev.y); 1889 selection_click (MEvent.clicks, ev.x, ev.y);
1937 } 1890 }
1938 1891
1939 MEvent.button = Button1; 1892 MEvent.button = Button1;
1940 break; 1893 break;
1941 1894
1942 case Button3: 1895 case Button3:
1943 if (MEvent.button == Button3 && clickintime) 1896 if (MEvent.button == Button3 && clickintime)
1944 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1945 else 1898 else
1946 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1947 1900
1948 MEvent.button = Button3; 1901 MEvent.button = Button3;
1949 break; 1902 break;
1950 } 1903 }
1951 } 1904 }
1952 1905
1953 MEvent.time = ev.time; 1906 MEvent.time = ev.time;
1954 return; 1907 return;
1955 } 1908 }
1956 1909
… …
2001 tt_printf ("\033[5~"); 1954 tt_printf ("\033[5~");
2002 break; 1955 break;
2003 } 1956 }
2004 } 1957 }
2005 else 1958 else
2006#endif /* NO_SCROLLBAR_REPORT */ 1959#endif /* NO_SCROLLBAR_REPORT */
2007 1960
2008 { 1961 {
2009 char upordown = 0; 1962 char upordown = 0;
2010 1963
2011 if (scrollBar.style == R_SB_NEXT) 1964 if (scrollBar.style == R_SB_NEXT)
… …
2023 upordown = 1; /* down */ 1976 upordown = 1; /* down */
2024 } 1977 }
2025 if (upordown) 1978 if (upordown)
2026 { 1979 {
2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2029#endif 1982#endif
2030 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
2031 { 1984 {
2032 if (upordown < 0) 1985 if (upordown < 0)
2033 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
2095 } 2048 }
2096 } 2049 }
2097 2050
2098 return; 2051 return;
2099 } 2052 }
2100
2101#if MENUBAR
2102 /*
2103 * Menubar window processing of button press
2104 */
2105 if (isMenuBarWindow (ev.window))
2106 menubar_control (ev);
2107#endif
2108} 2053}
2109 2054
2110void 2055void
2111rxvt_term::button_release (XButtonEvent &ev) 2056rxvt_term::button_release (XButtonEvent &ev)
2112{ 2057{
… …
2118 2063
2119 if (scrollbar_isUpDn ()) 2064 if (scrollbar_isUpDn ())
2120 { 2065 {
2121 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
2122 scrollbar_show (0); 2067 scrollbar_show (0);
2123#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2124 refresh_type &= ~SMOOTH_REFRESH;
2125#endif
2126 } 2068 }
2127 2069
2128#ifdef SELECTION_SCROLLING 2070#ifdef SELECTION_SCROLLING
2129 if (sel_scroll_ev.active) 2071 if (sel_scroll_ev.active)
2130 sel_scroll_ev.stop(); 2072 sel_scroll_ev.stop();
2131#endif 2073#endif
2132 2074
2133 if (ev.window == vt) 2075 if (ev.window == vt)
2134 { 2076 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2078 return;
2079
2135#if ISO_14755 2080#if ISO_14755
2136 // 5.4 2081 // 5.4
2137 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2138 return; 2083 return;
2139#endif 2084#endif
2085
2140 if (reportmode) 2086 if (reportmode)
2141 { 2087 {
2142 /* mouse report from vt window */ 2088 /* mouse report from vt window */
2143 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
2144 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
2155 mouse_report (ev); 2101 mouse_report (ev);
2156 } 2102 }
2157#else /* MOUSE_REPORT_DOUBLECLICK */ 2103#else /* MOUSE_REPORT_DOUBLECLICK */
2158 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
2159 mouse_report (ev); 2105 mouse_report (ev);
2160#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
2161 return; 2107 return;
2162 } 2108 }
2163 2109
2164 /* 2110 /*
2165 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
… …
2168 if (priv_modes & PrivMode_mouse_report 2114 if (priv_modes & PrivMode_mouse_report
2169 && bypass_keystate 2115 && bypass_keystate
2170 && ev.button == Button1 && MEvent.clicks <= 1) 2116 && ev.button == Button1 && MEvent.clicks <= 1)
2171 selection_extend (ev.x, ev.y, 0); 2117 selection_extend (ev.x, ev.y, 0);
2172 2118
2173 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174 return;
2175
2176 switch (ev.button) 2119 switch (ev.button)
2177 { 2120 {
2178 case Button1: 2121 case Button1:
2179 case Button3: 2122 case Button3:
2180 selection_make (ev.time); 2123 selection_make (ev.time);
2181 break; 2124 break;
2125
2182 case Button2: 2126 case Button2:
2183 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);
2184 break; 2129 break;
2130
2185#ifdef MOUSE_WHEEL 2131#ifdef MOUSE_WHEEL
2186 case Button4: 2132 case Button4:
2187 case Button5: 2133 case Button5:
2188 { 2134 {
2189 int i; 2135 int i;
… …
2191 2137
2192 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2193 2139
2194 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2195 i = 1; 2141 i = 1;
2196 else if (OPTION (Opt_mouseWheelScrollPage)) 2142 else if (option (Opt_mouseWheelScrollPage))
2197 i = nrow - 1; 2143 i = nrow - 1;
2198 else 2144 else
2199 i = 5; 2145 i = 5;
2200 2146
2201# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
… …
2203 { 2149 {
2204 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2205 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2206 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2207 2153
2208 if (slip_wheel_ev.at < NOW) 2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2209 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2210
2211 slip_wheel_ev.start ();
2212 } 2155 }
2213 else 2156 else
2214 { 2157 {
2215# endif 2158# endif
2216# ifdef JUMP_MOUSE_WHEEL
2217 scr_page (v, i); 2159 scr_page (v, i);
2218 scr_refresh (SMOOTH_REFRESH);
2219 scrollbar_show (1); 2160 scrollbar_show (1);
2220# else
2221 while (i--)
2222 {
2223 scr_page (v, 1);
2224 scr_refresh (SMOOTH_REFRESH);
2225 scrollbar_show (1);
2226 }
2227# endif
2228# ifdef MOUSE_SLIP_WHEELING 2161# ifdef MOUSE_SLIP_WHEELING
2229 } 2162 }
2230#endif 2163# endif
2231 } 2164 }
2232 break; 2165 break;
2233#endif 2166#endif
2234 } 2167 }
2235 } 2168 }
2236#ifdef MENUBAR
2237 else if (isMenuBarWindow (ev.window))
2238 menubar_control (ev);
2239#endif
2240} 2169}
2241
2242#ifdef TRANSPARENT
2243#if TINTING
2244/* taken from aterm-0.4.2 */
2245
2246typedef uint32_t RUINT32T;
2247
2248void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2249{
2250 int sh_r, sh_g, sh_b;
2251 RUINT32T mask_r, mask_g, mask_b;
2252 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2253 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2254 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2255 int i;
2256
2257 Visual *visual = display->visual;
2258
2259 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2260
2261 /* for convenience */
2262 mask_r = visual->red_mask;
2263 mask_g = visual->green_mask;
2264 mask_b = visual->blue_mask;
2265
2266 /* boring lookup table pre-initialization */
2267 switch (srcImage->bits_per_pixel) {
2268 case 15:
2269 if ((mask_r != 0x7c00) ||
2270 (mask_g != 0x03e0) ||
2271 (mask_b != 0x001f))
2272 return;
2273 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2274 lookup_r = lookup;
2275 lookup_g = lookup+32;
2276 lookup_b = lookup+32+32;
2277 sh_r = 10;
2278 sh_g = 5;
2279 sh_b = 0;
2280 break;
2281 case 16:
2282 if ((mask_r != 0xf800) ||
2283 (mask_g != 0x07e0) ||
2284 (mask_b != 0x001f))
2285 return;
2286 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2287 lookup_r = lookup;
2288 lookup_g = lookup+32;
2289 lookup_b = lookup+32+64;
2290 sh_r = 11;
2291 sh_g = 5;
2292 sh_b = 0;
2293 break;
2294 case 24:
2295 if ((mask_r != 0xff0000) ||
2296 (mask_g != 0x00ff00) ||
2297 (mask_b != 0x0000ff))
2298 return;
2299 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2300 lookup_r = lookup;
2301 lookup_g = lookup+256;
2302 lookup_b = lookup+256+256;
2303 sh_r = 16;
2304 sh_g = 8;
2305 sh_b = 0;
2306 break;
2307 case 32:
2308 if ((mask_r != 0xff0000) ||
2309 (mask_g != 0x00ff00) ||
2310 (mask_b != 0x0000ff))
2311 return;
2312 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2313 lookup_r = lookup;
2314 lookup_g = lookup+256;
2315 lookup_b = lookup+256+256;
2316 sh_r = 16;
2317 sh_g = 8;
2318 sh_b = 0;
2319 break;
2320 default:
2321 return; /* we do not support this color depth */
2322 }
2323
2324 /* prepare limits for color transformation (each channel is handled separately) */
2325 if (shade < 0) {
2326 shade = -shade;
2327 if (shade < 0) shade = 0;
2328 if (shade > 100) shade = 100;
2329
2330 lower_lim_r = 65535-rm;
2331 lower_lim_g = 65535-gm;
2332 lower_lim_b = 65535-bm;
2333
2334 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2335 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2336 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2337
2338 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2339 } else {
2340 if (shade < 0) shade = 0;
2341 if (shade > 100) shade = 100;
2342
2343 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2344
2345 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2346 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2347 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2348 }
2349
2350 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2351 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2352 {
2353 unsigned int tmp;
2354
2355 tmp = lower_lim_r;
2356 lower_lim_r = lower_lim_b;
2357 lower_lim_b = tmp;
2358
2359 tmp = upper_lim_r;
2360 upper_lim_r = upper_lim_b;
2361 upper_lim_b = tmp;
2362 }
2363
2364 /* fill our lookup tables */
2365 for (i = 0; i <= mask_r>>sh_r; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2369 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2370 lookup_r[i] = (tmp/65535)<<sh_r;
2371 }
2372 for (i = 0; i <= mask_g>>sh_g; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2376 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2377 lookup_g[i] = (tmp/65535)<<sh_g;
2378 }
2379 for (i = 0; i <= mask_b>>sh_b; i++)
2380 {
2381 RUINT32T tmp;
2382 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2383 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2384 lookup_b[i] = (tmp/65535)<<sh_b;
2385 }
2386
2387 /* apply table to input image (replacing colors by newly calculated ones) */
2388 switch (srcImage->bits_per_pixel)
2389 {
2390 case 15:
2391 {
2392 unsigned short *p1, *pf, *p, *pl;
2393 p1 = (unsigned short *) srcImage->data;
2394 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395 while (p1 < pf)
2396 {
2397 p = p1;
2398 pl = p1 + srcImage->width;
2399 for (; p < pl; p++)
2400 {
2401 *p = lookup_r[(*p & 0x7c00)>>10] |
2402 lookup_g[(*p & 0x03e0)>> 5] |
2403 lookup_b[(*p & 0x001f)];
2404 }
2405 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2406 }
2407 break;
2408 }
2409 case 16:
2410 {
2411 unsigned short *p1, *pf, *p, *pl;
2412 p1 = (unsigned short *) srcImage->data;
2413 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2414 while (p1 < pf)
2415 {
2416 p = p1;
2417 pl = p1 + srcImage->width;
2418 for (; p < pl; p++)
2419 {
2420 *p = lookup_r[(*p & 0xf800)>>11] |
2421 lookup_g[(*p & 0x07e0)>> 5] |
2422 lookup_b[(*p & 0x001f)];
2423 }
2424 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2425 }
2426 break;
2427 }
2428 case 24:
2429 {
2430 unsigned char *p1, *pf, *p, *pl;
2431 p1 = (unsigned char *) srcImage->data;
2432 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2433 while (p1 < pf)
2434 {
2435 p = p1;
2436 pl = p1 + srcImage->width * 3;
2437 for (; p < pl; p += 3)
2438 {
2439 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2440 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2441 p[2] = lookup_r[(p[2] & 0x0000ff)];
2442 }
2443 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2444 }
2445 break;
2446 }
2447 case 32:
2448 {
2449 RUINT32T *p1, *pf, *p, *pl;
2450 p1 = (RUINT32T *) srcImage->data;
2451 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2452
2453 while (p1 < pf)
2454 {
2455 p = p1;
2456 pl = p1 + srcImage->width;
2457 for (; p < pl; p++)
2458 {
2459 *p = lookup_r[(*p & 0xff0000)>>16] |
2460 lookup_g[(*p & 0x00ff00)>> 8] |
2461 lookup_b[(*p & 0x0000ff)] |
2462 (*p & ~0xffffff);
2463 }
2464 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2465 }
2466 break;
2467 }
2468 }
2469
2470 free (lookup);
2471}
2472#endif
2473
2474/*
2475 * Check our parents are still who we think they are.
2476 * Do transparency updates if required
2477 */
2478int
2479rxvt_term::check_our_parents ()
2480{
2481 int i, pchanged, aformat, have_pixmap, rootdepth;
2482 unsigned long nitems, bytes_after;
2483 Atom atype;
2484 unsigned char *prop = NULL;
2485 Window root, oldp, *list;
2486 Pixmap rootpixmap = None;
2487 XWindowAttributes wattr, wrootattr;
2488 dDisp;
2489
2490 pchanged = 0;
2491
2492 if (!OPTION (Opt_transparent))
2493 return pchanged; /* Don't try any more */
2494
2495 XGetWindowAttributes (disp, display->root, &wrootattr);
2496 rootdepth = wrootattr.depth;
2497
2498 XGetWindowAttributes (disp, parent[0], &wattr);
2499
2500 if (rootdepth != wattr.depth)
2501 {
2502 if (am_transparent)
2503 {
2504 pchanged = 1;
2505 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2506 am_transparent = am_pixmap_trans = 0;
2507 }
2508
2509 return pchanged; /* Don't try any more */
2510 }
2511
2512 /* Get all X ops out of the queue so that our information is up-to-date. */
2513 XSync (disp, False);
2514
2515 /*
2516 * Make the frame window set by the window manager have
2517 * the root background. Some window managers put multiple nested frame
2518 * windows for each client, so we have to take care about that.
2519 */
2520 i = (xa[XA_XROOTPMAP_ID]
2521 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2522 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2523 &nitems, &bytes_after, &prop) == Success);
2524
2525 if (!i || prop == NULL)
2526 i = (xa[XA_ESETROOT_PMAP_ID]
2527 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2528 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2529 &nitems, &bytes_after, &prop) == Success);
2530
2531 if (!i || prop == NULL
2532#if TINTING
2533 || !rs[Rs_color + Color_tint]
2534#endif
2535 )
2536 have_pixmap = 0;
2537 else
2538 {
2539 have_pixmap = 1;
2540 rootpixmap = *(Pixmap *)prop;
2541 XFree (prop);
2542 }
2543
2544 if (have_pixmap)
2545 {
2546 /*
2547 * Copy display->root pixmap transparency
2548 */
2549 int sx, sy, nx, ny;
2550 unsigned int nw, nh;
2551 Window cr;
2552 XImage *image;
2553 GC gc;
2554 XGCValues gcvalue;
2555
2556 XTranslateCoordinates (disp, parent[0], display->root,
2557 0, 0, &sx, &sy, &cr);
2558 nw = (unsigned int)szHint.width;
2559 nh = (unsigned int)szHint.height;
2560 nx = ny = 0;
2561
2562 if (sx < 0)
2563 {
2564 nw += sx;
2565 nx = -sx;
2566 sx = 0;
2567 }
2568
2569 if (sy < 0)
2570 {
2571 nh += sy;
2572 ny = -sy;
2573 sy = 0;
2574 }
2575
2576 min_it (nw, (unsigned int) (wrootattr.width - sx));
2577 min_it (nh, (unsigned int) (wrootattr.height - sy));
2578
2579 XSync (disp, False);
2580 allowedxerror = -1;
2581 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2582
2583 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2584 /* XXX: may need a delay here? */
2585 allowedxerror = 0;
2586
2587 if (image == NULL)
2588 {
2589 if (am_transparent && am_pixmap_trans)
2590 {
2591 pchanged = 1;
2592 if (pixmap != None)
2593 {
2594 XFreePixmap (disp, pixmap);
2595 pixmap = None;
2596 }
2597 }
2598
2599 am_pixmap_trans = 0;
2600 }
2601 else
2602 {
2603 if (pixmap != None)
2604 XFreePixmap (disp, pixmap);
2605
2606#if TINTING
2607 if (ISSET_PIXCOLOR (Color_tint))
2608 {
2609 unsigned short rm, gm, bm;
2610 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2611
2612 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2613
2614 ShadeXImage (display, image, shade, rm, gm, bm);
2615 }
2616#endif
2617
2618 pixmap = XCreatePixmap (disp, vt,
2619 szHint.width, szHint.height, image->depth);
2620 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2621 XPutImage (disp, pixmap, gc, image, 0, 0,
2622 nx, ny, image->width, image->height);
2623 XFreeGC (disp, gc);
2624 XDestroyImage (image);
2625 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2626 XClearWindow (disp, parent[0]);
2627
2628 if (!am_transparent || !am_pixmap_trans)
2629 pchanged = 1;
2630
2631 am_transparent = am_pixmap_trans = 1;
2632 }
2633 }
2634
2635 if (am_pixmap_trans)
2636 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2637 else
2638 {
2639 unsigned int n;
2640 /*
2641 * InheritPixmap transparency
2642 */
2643 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2644 {
2645 oldp = parent[i];
2646 XQueryTree (disp, parent[i - 1], &root,
2647 &parent[i], &list, &n);
2648 XFree (list);
2649
2650 if (parent[i] == display->root)
2651 {
2652 if (oldp != None)
2653 pchanged = 1;
2654
2655 break;
2656 }
2657
2658 if (oldp != parent[i])
2659 pchanged = 1;
2660 }
2661
2662 n = 0;
2663
2664 if (pchanged)
2665 {
2666 for (; n < (unsigned int)i; n++)
2667 {
2668 XGetWindowAttributes (disp, parent[n], &wattr);
2669 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2670 {
2671 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2672 break;
2673 }
2674 }
2675 }
2676
2677 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2678 {
2679 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2680 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2681 am_transparent = 0;
2682 /* XXX: also turn off Opt_transparent? */
2683 }
2684 else
2685 {
2686#if WAIT_FOR_WM
2687 /* wait (an arbitrary period) for the WM to do its thing
2688 * needed for fvwm2.2.2 (and before?) */
2689 sleep (1);
2690#endif
2691 for (n = 0; n < (unsigned int)i; n++)
2692 {
2693 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2694 XClearWindow (disp, parent[n]);
2695 }
2696
2697 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2698 am_transparent = 1;
2699 }
2700
2701 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2702 parent[i] = None;
2703 }
2704
2705 if (scrollBar.win)
2706 {
2707 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2708 scrollBar.setIdle ();
2709 scrollbar_show (0);
2710 }
2711
2712 if (am_transparent)
2713 {
2714 want_refresh = want_full_refresh = 1;
2715 if (am_pixmap_trans)
2716 flush ();
2717 }
2718
2719 return pchanged;
2720}
2721#endif
2722 2170
2723/*}}} */ 2171/*}}} */
2724 2172
2725bool 2173bool
2726rxvt_term::cmd_parse () 2174rxvt_term::cmd_parse ()
2727{ 2175{
2728 bool flag = false; 2176 bool flag = false;
2729 unicode_t ch = NOCHAR; 2177 wchar_t ch = NOCHAR;
2730 char *seq_begin; // remember start of esc-sequence here 2178 char *seq_begin; // remember start of esc-sequence here
2731 2179
2732 for (;;) 2180 for (;;)
2733 { 2181 {
2734 if (ch == NOCHAR) 2182 if (ch == NOCHAR)
… …
2755 if (seen_resize && cmd_pid) 2203 if (seen_resize && cmd_pid)
2756 kill (-cmd_pid, SIGWINCH); 2204 kill (-cmd_pid, SIGWINCH);
2757 } 2205 }
2758 2206
2759 /* Read a text string from the input buffer */ 2207 /* Read a text string from the input buffer */
2760 unicode_t buf[UBUFSIZ]; 2208 wchar_t buf[UBUFSIZ];
2761 bool refreshnow = false; 2209 bool refreshnow = false;
2762 int nlines = 0; 2210 int nlines = 0;
2763 unicode_t *str = buf; 2211 wchar_t *str = buf;
2764 unicode_t *eol = str + min (ncol, UBUFSIZ); 2212 wchar_t *eol = str + min (ncol, UBUFSIZ);
2765 2213
2766 for (;;) 2214 for (;;)
2767 { 2215 {
2768 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))
2769 break; 2217 break;
… …
2775 if (ch == C0_LF) 2223 if (ch == C0_LF)
2776 nlines++; 2224 nlines++;
2777 2225
2778 refresh_count++; 2226 refresh_count++;
2779 2227
2780 if (!OPTION (Opt_jumpScroll) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2781 || (refresh_count >= refresh_limit * (nrow - 1)))
2782 { 2229 {
2783 refreshnow = true;
2784 refresh_count = 0; 2230 refresh_count = 0;
2231
2232 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 {
2234 refreshnow = true;
2785 ch = NOCHAR; 2235 ch = NOCHAR;
2786 break; 2236 break;
2237 }
2787 } 2238 }
2788 2239
2789 // scr_add_lines only works for nlines <= nrow - 1. 2240 // scr_add_lines only works for nlines <= nrow - 1.
2790 if (nlines >= nrow - 1) 2241 if (nlines >= nrow - 1)
2791 { 2242 {
2243 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792 if (!HOOK_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))))
2793 scr_add_lines (buf, nlines, str - buf); 2245 scr_add_lines (buf, str - buf, nlines);
2794 2246
2795 nlines = 0; 2247 nlines = 0;
2796 str = buf; 2248 str = buf;
2797 eol = str + min (ncol, UBUFSIZ); 2249 eol = str + min (ncol, UBUFSIZ);
2798 } 2250 }
… …
2812 2264
2813 seq_begin = cmdbuf_ptr; 2265 seq_begin = cmdbuf_ptr;
2814 ch = next_char (); 2266 ch = next_char ();
2815 } 2267 }
2816 2268
2269 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2817 if (!HOOK_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))))
2818 scr_add_lines (buf, nlines, str - buf); 2271 scr_add_lines (buf, str - buf, nlines);
2819 2272
2820 /* 2273 /*
2821 * 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
2822 * 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.
2823 * the number of pages between refreshes is refresh_limit, which 2276 * if skipScroll is enabled.
2824 * is incremented here because we must be doing flat-out scrolling.
2825 */ 2277 */
2826 if (refreshnow) 2278 if (refreshnow)
2827 { 2279 {
2828 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2829 refresh_limit++;
2830 else
2831 {
2832 flag = true; 2280 flag = true;
2833 scr_refresh (refresh_type); 2281 scr_refresh ();
2834 flush_ev.stop (); 2282 want_refresh = 1;
2835 }
2836 } 2283 }
2837 2284
2838 } 2285 }
2839 else 2286 else
2840 { 2287 {
… …
2854 } 2301 }
2855 2302
2856 return flag; 2303 return flag;
2857} 2304}
2858 2305
2859// read the next octet
2860unicode_t
2861rxvt_term::next_octet ()
2862{
2863 return cmdbuf_ptr < cmdbuf_endp
2864 ? *cmdbuf_ptr++
2865 : NOCHAR;
2866}
2867
2868// read the next character 2306// read the next character
2869unicode_t 2307wchar_t
2870rxvt_term::next_char () 2308rxvt_term::next_char () NOTHROW
2871{ 2309{
2872 while (cmdbuf_ptr < cmdbuf_endp) 2310 while (cmdbuf_ptr < cmdbuf_endp)
2873 { 2311 {
2874 // assume 7-bit to be ascii ALWAYS 2312 // assume 7-bit to be ascii ALWAYS
2875 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2313 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2884 cmdbuf_ptr = cmdbuf_endp; 2322 cmdbuf_ptr = cmdbuf_endp;
2885 break; 2323 break;
2886 } 2324 }
2887 2325
2888 if (len == (size_t)-1) 2326 if (len == (size_t)-1)
2889 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
2890 2328
2891 // assume wchar == unicode 2329 // assume wchar == unicode
2892 cmdbuf_ptr += len; 2330 cmdbuf_ptr += len;
2893 return wc & UNICODE_MASK; 2331 return wc & UNICODE_MASK;
2894 } 2332 }
2895 2333
2896 return NOCHAR; 2334 return NOCHAR;
2897} 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;
2898 2347
2899/* rxvt_cmd_getc () - Return next input character */ 2348/* rxvt_cmd_getc () - Return next input character */
2900/* 2349/*
2901 * Return the next input character after first passing any keyboard input 2350 * Return the next input character after first passing any keyboard input
2902 * to the command. 2351 * to the command.
2903 */ 2352 */
2904unicode_t 2353wchar_t
2905rxvt_term::cmd_getc () 2354rxvt_term::cmd_getc () THROW ((class out_of_input))
2906{ 2355{
2907 unicode_t c = next_char (); 2356 wchar_t c = next_char ();
2908 2357
2909 if (c == NOCHAR) 2358 if (c == NOCHAR)
2910 throw out_of_input; 2359 throw out_of_input;
2911 2360
2912 return c; 2361 return c;
2913} 2362}
2914 2363
2915unicode_t 2364uint32_t
2916rxvt_term::cmd_get8 () 2365rxvt_term::cmd_get8 () THROW ((class out_of_input))
2917{ 2366{
2918 unicode_t c = next_octet (); 2367 uint32_t c = next_octet ();
2919 2368
2920 if (c == NOCHAR) 2369 if (c == NOCHAR)
2921 throw out_of_input; 2370 throw out_of_input;
2922 2371
2923 return c; 2372 return c;
… …
2987 { 2436 {
2988 if ((buf[len++] = cmd_getc ()) == 'i') 2437 if ((buf[len++] = cmd_getc ()) == 'i')
2989 break; /* done = 1 */ 2438 break; /* done = 1 */
2990 } 2439 }
2991 } 2440 }
2992 2441
2993 for (i = 0; i < len; i++) 2442 for (i = 0; i < len; i++)
2994 if (putc (buf[i], fd) == EOF) 2443 if (putc (buf[i], fd) == EOF)
2995 { 2444 {
2996 done = 1; 2445 done = 1;
2997 break; 2446 break;
… …
2999 } 2448 }
3000 } 2449 }
3001 2450
3002 pclose_printer (fd); 2451 pclose_printer (fd);
3003} 2452}
3004#endif /* PRINTPIPE */ 2453#endif /* PRINTPIPE */
3005/*}}} */ 2454/*}}} */
3006 2455
3007/* *INDENT-OFF* */ 2456/* *INDENT-OFF* */
3008enum { 2457enum {
3009 C1_40 = 0x40, 2458 C1_40 = 0x40,
… …
3059 process_dcs_seq (); 2508 process_dcs_seq ();
3060 break; 2509 break;
3061 case 0x9b: /* CSI */ 2510 case 0x9b: /* CSI */
3062 process_csi_seq (); 2511 process_csi_seq ();
3063 break; 2512 break;
3064 case 0x9d: /* CSI */ 2513 case 0x9d: /* OSC */
3065 process_osc_seq (); 2514 process_osc_seq ();
3066 break; 2515 break;
3067#endif 2516#endif
3068 } 2517 }
3069} 2518}
… …
3159 scr_charset_set (2, (unsigned int)cmd_getc ()); 2608 scr_charset_set (2, (unsigned int)cmd_getc ());
3160 break; 2609 break;
3161 case '+': 2610 case '+':
3162 scr_charset_set (3, (unsigned int)cmd_getc ()); 2611 scr_charset_set (3, (unsigned int)cmd_getc ());
3163 break; 2612 break;
3164#if ENABLE_FRILLS 2613#if !ENABLE_MINIMAL
3165 case '6': 2614 case '6':
3166 scr_backindex (); 2615 scr_backindex ();
3167 break; 2616 break;
3168#endif 2617#endif
3169 case '7': 2618 case '7':
3170 scr_cursor (SAVE); 2619 scr_cursor (SAVE);
3171 break; 2620 break;
3172 case '8': 2621 case '8':
3173 scr_cursor (RESTORE); 2622 scr_cursor (RESTORE);
3174 break; 2623 break;
3175#if ENABLE_FRILLS 2624#if !ENABLE_MINIMAL
3176 case '9': 2625 case '9':
3177 scr_forwardindex (); 2626 scr_forwardindex ();
3178 break; 2627 break;
3179#endif 2628#endif
3180 case '=': 2629 case '=':
… …
3190 break; 2639 break;
3191 2640
3192 /* 8.3.87: NEXT LINE */ 2641 /* 8.3.87: NEXT LINE */
3193 case C1_NEL: /* ESC E */ 2642 case C1_NEL: /* ESC E */
3194 { 2643 {
3195 unicode_t nlcr[] = { C0_LF, C0_CR }; 2644 wchar_t nlcr[] = { C0_LF, C0_CR };
3196 scr_add_lines (nlcr, 1, 2); 2645 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3197 } 2646 }
3198 break; 2647 break;
3199 2648
3200 /* kidnapped escape sequence: Should be 8.3.48 */ 2649 /* kidnapped escape sequence: Should be 8.3.48 */
3201 case C1_ESA: /* ESC G */ 2650 case C1_ESA: /* ESC G */
… …
3295rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
3296{ 2745{
3297 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
3298 unsigned int nargs, p; 2747 unsigned int nargs, p;
3299 int n, ndef; 2748 int n, ndef;
3300 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
3301 2750
3302 for (nargs = ESC_ARGS; nargs > 0;) 2751 nargs = 0;
3303 arg[--nargs] = 0;
3304 2752
3305 priv = 0; 2753 priv = 0;
3306 ch = cmd_getc (); 2754 ch = cmd_getc ();
3307 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
3308 { /* '<' '=' '>' '?' */ 2756 { /* '<' '=' '>' '?' */
… …
3342 ndef = get_byte_array_bit (csi_defaults, i); 2790 ndef = get_byte_array_bit (csi_defaults, i);
3343 for (p = 0; p < nargs; p++) 2791 for (p = 0; p < nargs; p++)
3344 if (arg[p] == -1) 2792 if (arg[p] == -1)
3345 arg[p] = ndef; 2793 arg[p] = ndef;
3346 2794
3347#ifdef DEBUG_CMD
3348 fprintf (stderr, "CSI ");
3349 for (p = 0; p < nargs; p++)
3350 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3351 fprintf (stderr, "%c\n", ch);
3352#endif
3353
3354 /* 2795 /*
3355 * private mode handling 2796 * private mode handling
3356 */ 2797 */
3357 if (priv) 2798 if (priv)
3358 { 2799 {
3359 switch (priv) 2800 switch (priv)
3360 { 2801 {
3361 case '>': 2802 case '>':
3362 if (ch == CSI_DA) /* secondary device attributes */ 2803 if (ch == CSI_DA) /* secondary device attributes */
3363 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 }
3364 break; 2814 break;
3365 case '?': 2815 case '?':
3366 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2816 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3367 process_terminal_mode (ch, priv, nargs, arg); 2817 process_terminal_mode (ch, priv, nargs, arg);
3368 break; 2818 break;
… …
3494 break; 2944 break;
3495 case 6: /* CPR requested */ 2945 case 6: /* CPR requested */
3496 scr_report_position (); 2946 scr_report_position ();
3497 break; 2947 break;
3498 case 7: /* unofficial extension */ 2948 case 7: /* unofficial extension */
3499 if (OPTION (Opt_insecure)) 2949 if (option (Opt_insecure))
3500 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2950 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3501 break; 2951 break;
3502 case 8: /* unofficial extension */ 2952 case 8: /* unofficial extension */
3503 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2953 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3504 break; 2954 break;
… …
3571 break; 3021 break;
3572 case CSI_75: 3022 case CSI_75:
3573 scr_cursor (RESTORE); 3023 scr_cursor (RESTORE);
3574 break; 3024 break;
3575 3025
3576#if ENABLE_FRILLS 3026#if !ENABLE_MINIMAL
3577 case CSI_74: 3027 case CSI_74:
3578 process_window_ops (arg, nargs); 3028 process_window_ops (arg, nargs);
3579 break; 3029 break;
3580#endif 3030#endif
3581 3031
… …
3588 break; 3038 break;
3589 } 3039 }
3590} 3040}
3591/*}}} */ 3041/*}}} */
3592 3042
3593#if ENABLE_FRILLS 3043#if !ENABLE_MINIMAL
3594/* ARGSUSED */ 3044/* ARGSUSED */
3595void 3045void
3596rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3046rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3597{ 3047{
3598 int x, y; 3048 int x, y;
3599 XWindowAttributes wattr; 3049 XWindowAttributes wattr;
3600 Window wdummy; 3050 Window wdummy;
3601 dDisp; 3051
3052 dLocal (Display *, dpy);
3602 3053
3603 if (nargs == 0) 3054 if (nargs == 0)
3604 return; 3055 return;
3605 3056
3606 switch (args[0]) 3057 switch (args[0])
3607 { 3058 {
3608 /* 3059 /*
3609 * commands 3060 * commands
3610 */ 3061 */
3611 case 1: /* deiconify window */ 3062 case 1: /* deiconify window */
3612 XMapWindow (disp, parent[0]); 3063 XMapWindow (dpy, parent[0]);
3613 break; 3064 break;
3614 case 2: /* iconify window */ 3065 case 2: /* iconify window */
3615 XIconifyWindow (disp, parent[0], display->screen); 3066 XIconifyWindow (dpy, parent[0], display->screen);
3616 break; 3067 break;
3617 case 3: /* set position (pixels) */ 3068 case 3: /* set position (pixels) */
3618 XMoveWindow (disp, parent[0], args[1], args[2]); 3069 XMoveWindow (dpy, parent[0], args[1], args[2]);
3619 break; 3070 break;
3620 case 4: /* set size (pixels) */ 3071 case 4: /* set size (pixels) */
3621 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3072 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3622 break; 3073 break;
3623 case 5: /* raise window */ 3074 case 5: /* raise window */
3624 XRaiseWindow (disp, parent[0]); 3075 XRaiseWindow (dpy, parent[0]);
3625 break; 3076 break;
3626 case 6: /* lower window */ 3077 case 6: /* lower window */
3627 XLowerWindow (disp, parent[0]); 3078 XLowerWindow (dpy, parent[0]);
3628 break; 3079 break;
3629 case 7: /* refresh window */ 3080 case 7: /* refresh window */
3630 scr_touch (true); 3081 scr_touch (true);
3631 break; 3082 break;
3632 case 8: /* set size (chars) */ 3083 case 8: /* set size (chars) */
… …
3639 if (args[0] >= 24) /* set height (chars) */ 3090 if (args[0] >= 24) /* set height (chars) */
3640 set_widthheight ((unsigned int)width, 3091 set_widthheight ((unsigned int)width,
3641 (unsigned int) (args[1] * fheight)); 3092 (unsigned int) (args[1] * fheight));
3642 break; 3093 break;
3643 3094
3644
3645 /* 3095 /*
3646 * reports - some output format copied from XTerm 3096 * reports - some output format copied from XTerm
3647 */ 3097 */
3648 case 11: /* report window state */ 3098 case 11: /* report window state */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3099 XGetWindowAttributes (dpy, parent[0], &wattr);
3650 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3100 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3651 break; 3101 break;
3652 case 13: /* report window position */ 3102 case 13: /* report window position */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3103 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 XTranslateCoordinates (disp, parent[0], wattr.root, 3104 XTranslateCoordinates (dpy, parent[0], wattr.root,
3655 -wattr.border_width, -wattr.border_width, 3105 -wattr.border_width, -wattr.border_width,
3656 &x, &y, &wdummy); 3106 &x, &y, &wdummy);
3657 tt_printf ("\033[3;%d;%dt", x, y); 3107 tt_printf ("\033[3;%d;%dt", x, y);
3658 break; 3108 break;
3659 case 14: /* report window size (pixels) */ 3109 case 14: /* report window size (pixels) */
3660 XGetWindowAttributes (disp, parent[0], &wattr); 3110 XGetWindowAttributes (dpy, parent[0], &wattr);
3661 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3111 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3662 break; 3112 break;
3663 case 18: /* report text area size (chars) */ 3113 case 18: /* report text area size (chars) */
3664 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3114 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3665 break; 3115 break;
… …
3667 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3117 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3668 break; 3118 break;
3669 case 20: /* report icon label */ 3119 case 20: /* report icon label */
3670 { 3120 {
3671 char *s; 3121 char *s;
3672 XGetIconName (disp, parent[0], &s); 3122 XGetIconName (dpy, parent[0], &s);
3673 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 */
3674 XFree (s); 3124 XFree (s);
3675 } 3125 }
3676 break; 3126 break;
3677 case 21: /* report window title */ 3127 case 21: /* report window title */
3678 { 3128 {
3679 char *s; 3129 char *s;
3680 XFetchName (disp, parent[0], &s); 3130 XFetchName (dpy, parent[0], &s);
3681 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 */
3682 XFree (s); 3132 XFree (s);
3683 } 3133 }
3684 break; 3134 break;
3685 } 3135 }
3686} 3136}
… …
3713 seen_esc = true; 3163 seen_esc = true;
3714 continue; 3164 continue;
3715 } 3165 }
3716 else if (ch == C0_BEL || ch == CHAR_ST) 3166 else if (ch == C0_BEL || ch == CHAR_ST)
3717 break; 3167 break;
3168 else if (ch == C0_SYN)
3169 ch = cmd_get8 ();
3718 else if (ch < 0x20) 3170 else if (ch < 0x20)
3719 return NULL; /* other control character - exit */ 3171 return NULL; /* other control character - exit */
3720 3172
3721 seen_esc = false; 3173 seen_esc = false;
3722 3174
3723 if (n >= STRING_MAX - 1) 3175 if (n >= STRING_MAX - 1)
3724 // stop at some sane length 3176 // stop at some sane length
3725 return NULL; 3177 return NULL;
3726 3178
3727 if (ch == C0_SYN)
3728 string[n++] = cmd_get8 ();
3729 else
3730 string[n++] = ch; 3179 string[n++] = ch;
3731 } 3180 }
3732 3181
3733 string[n++] = '\0'; 3182 string[n++] = '\0';
3734 3183
3735 ends_how = (ch == 0x5c ? C0_ESC : ch); 3184 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3786void 3235void
3787rxvt_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)
3788{ 3237{
3789 if (str[0] == '?' && !str[1]) 3238 if (str[0] == '?' && !str[1])
3790 { 3239 {
3791 unsigned short r, g, b; 3240 rgba c;
3792 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
3793 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);
3794 } 3249 }
3795 else 3250 else
3796 set_window_color (color, str); 3251 set_window_color (color, str);
3797} 3252}
3798 3253
… …
3800 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3255 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3801 */ 3256 */
3802void 3257void
3803rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3258rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3804{ 3259{
3805 int changed = 0;
3806 int color; 3260 int color;
3807 char *buf, *name; 3261 char *buf, *name;
3808 bool query = str[0] == '?' && !str[1]; 3262 bool query = str[0] == '?' && !str[1];
3809 int saveop = op; 3263 int saveop = op;
3810 dDisp; 3264
3265 dLocal (Display *, dpy);
3811 3266
3812 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
3813 switch (op) 3272 switch (op)
3814 { 3273 {
3815 case XTerm_name: 3274 case XTerm_name:
3816 set_title (str); 3275 set_title (str);
3817 /* FALLTHROUGH */ 3276 /* FALLTHROUGH */
… …
3831 unsigned long bytes_after; 3290 unsigned long bytes_after;
3832 unsigned char *value = 0; 3291 unsigned char *value = 0;
3833 const char *str = ""; 3292 const char *str = "";
3834 3293
3835 if (prop 3294 if (prop
3836 && XGetWindowProperty (disp, parent[0], 3295 && XGetWindowProperty (dpy, parent[0],
3837 prop, 0, 1<<16, 0, AnyPropertyType, 3296 prop, 0, 1<<16, 0, AnyPropertyType,
3838 &actual_type, &actual_format, 3297 &actual_type, &actual_format,
3839 &nitems, &bytes_after, &value) == Success 3298 &nitems, &bytes_after, &value) == Success
3840 && actual_type != None 3299 && actual_type != None
3841 && actual_format == 8) 3300 && actual_format == 8)
3842 str = (const char *)(value); 3301 str = (const char *)(value);
3843 3302
3844 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3303 tt_printf ("\033]%d;%s%c", op, str, resp);
3845 3304
3846 XFree (value); 3305 XFree (value);
3847 } 3306 }
3848 else 3307 else
3849 { 3308 {
… …
3853 { 3312 {
3854 *eq = 0; 3313 *eq = 0;
3855 set_utf8_property (display->atom (str), eq + 1); 3314 set_utf8_property (display->atom (str), eq + 1);
3856 } 3315 }
3857 else 3316 else
3858 XDeleteProperty (disp, parent[0], 3317 XDeleteProperty (dpy, parent[0],
3859 display->atom (str)); 3318 display->atom (str));
3860 } 3319 }
3861 break; 3320 break;
3862 3321
3863 case XTerm_Color: 3322 case XTerm_Color:
… …
3865 { 3324 {
3866 if ((name = strchr (buf, ';')) == NULL) 3325 if ((name = strchr (buf, ';')) == NULL)
3867 break; 3326 break;
3868 3327
3869 *name++ = '\0'; 3328 *name++ = '\0';
3870 color = atoi (buf); 3329 color = atoi (buf) + minCOLOR;
3871 3330
3872 if (color < 0 || color >= TOTAL_COLORS) 3331 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3873 break; 3332 break;
3874 3333
3875 if ((buf = strchr (name, ';')) != NULL) 3334 if ((buf = strchr (name, ';')) != NULL)
3876 *buf++ = '\0'; 3335 *buf++ = '\0';
3877 3336
3878 if (name[0] == '?' && !name[1]) 3337 process_color_seq (op, color, name, resp);
3879 {
3880 unsigned short r, g, b;
3881 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3882 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3883 }
3884 else
3885 set_window_color (color + minCOLOR, name);
3886 } 3338 }
3887 break; 3339 break;
3888 case XTerm_Color00: 3340 case XTerm_Color00:
3889 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3341 process_color_seq (op, Color_fg, str, resp);
3890 break; 3342 break;
3891 case XTerm_Color01: 3343 case XTerm_Color01:
3892 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3344 process_color_seq (op, Color_bg, str, resp);
3893 break; 3345 break;
3894#ifndef NO_CURSORCOLOR 3346#ifndef NO_CURSORCOLOR
3895 case XTerm_Color_cursor: 3347 case XTerm_Color_cursor:
3896 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3348 process_color_seq (op, Color_cursor, str, resp);
3897 break; 3349 break;
3898#endif 3350#endif
3899 case XTerm_Color_pointer_fg: 3351 case XTerm_Color_pointer_fg:
3900 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3352 process_color_seq (op, Color_pointer_fg, str, resp);
3901 break; 3353 break;
3902 case XTerm_Color_pointer_bg: 3354 case XTerm_Color_pointer_bg:
3903 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3355 process_color_seq (op, Color_pointer_bg, str, resp);
3904 break; 3356 break;
3905#ifndef NO_BOLD_UNDERLINE_REVERSE 3357#ifndef NO_BOLD_UNDERLINE_REVERSE
3906 case XTerm_Color_BD:
3907 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3908 break;
3909 case XTerm_Color_UL:
3910 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3911 break;
3912 case XTerm_Color_RV: 3358 case XTerm_Color_RV:
3913 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);
3914 break; 3368 break;
3915 case URxvt_Color_IT: 3369 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3370 process_color_seq (op, Color_IT, str, resp);
3917 break; 3371 break;
3918#endif 3372#endif
3919#if TRANSPARENT && TINTING 3373#if ENABLE_TRANSPARENCY
3920 case URxvt_Color_tint: 3374 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3375 process_color_seq (op, Color_tint, str, resp);
3922 check_our_parents (); 3376 {
3923 if (am_transparent) 3377 bool changed = false;
3924 want_full_refresh = want_refresh = 1; 3378 if (ISSET_PIXCOLOR (Color_tint))
3925 break; 3379 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3926#endif 3380 else
3381 changed = bgPixmap.unset_tint ();
3382 if (changed)
3383 update_background ();
3384 }
3927 3385
3386 break;
3387#endif
3388
3389#if BG_IMAGE_FROM_FILE
3928 case XTerm_Pixmap: 3390 case Rxvt_Pixmap:
3929 if (*str != ';') 3391 if (!strcmp (str, "?"))
3930 { 3392 {
3931#if XPM_BACKGROUND 3393 char str[256];
3932 scale_pixmap (""); /* reset to default scaling */ 3394
3933 set_bgPixmap (str); /* change pixmap */ 3395 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3934#endif 3396 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3935 scr_touch (true); 3397 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3398 process_xterm_seq (XTerm_title, str, CHAR_ST);
3936 } 3399 }
3937 while ((str = strchr (str, ';')) != NULL) 3400 else
3938 { 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 {
3939 str++; 3416 str++;
3940#if XPM_BACKGROUND 3417 if (bgPixmap.set_geometry (str))
3941 changed += scale_pixmap (str); 3418 changed++;
3942#endif 3419 str = strchr (str, ';');
3420 }
3421 if (changed)
3422 update_background ();
3943 } 3423 }
3944
3945 if (changed)
3946 {
3947#ifdef XPM_BACKGROUND
3948 resize_pixmap ();
3949#endif
3950 scr_touch (true);
3951 }
3952 break; 3424 break;
3425#endif
3953 3426
3954 case XTerm_restoreFG: 3427 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str); 3428 set_window_color (Color_fg, str);
3956 break; 3429 break;
3957 case XTerm_restoreBG: 3430 case Rxvt_restoreBG:
3958 set_window_color (Color_bg, str); 3431 set_window_color (Color_bg, str);
3959 break; 3432 break;
3960 3433
3961 case XTerm_logfile: 3434 case XTerm_logfile:
3962 // TODO, when secure mode? 3435 // TODO, when secure mode?
3963 break; 3436 break;
3964 3437
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0 3438#if 0
3972 case XTerm_dumpscreen: /* no error notices */ 3439 case Rxvt_dumpscreen: /* no error notices */
3973 { 3440 {
3974 int fd; 3441 int fd;
3975 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)
3976 { 3443 {
3977 scr_dump (fd); 3444 scr_dump (fd);
… …
3988 case URxvt_italicFont: 3455 case URxvt_italicFont:
3989 case URxvt_boldItalicFont: 3456 case URxvt_boldItalicFont:
3990#endif 3457#endif
3991 if (query) 3458 if (query)
3992 tt_printf ("\33]%d;%-.250s%c", saveop, 3459 tt_printf ("\33]%d;%-.250s%c", saveop,
3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3460 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3994 ? fontset[op - URxvt_font]->fontdesc : "", 3461 ? fontset[op - URxvt_font]->fontdesc : "",
3995 resp); 3462 resp);
3996 else 3463 else
3997 { 3464 {
3998 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3465 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4001 allocated.push_back ((void *)res); 3468 allocated.push_back ((void *)res);
4002 set_fonts (); 3469 set_fonts ();
4003 } 3470 }
4004 break; 3471 break;
4005 3472
4006#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
4007 case URxvt_locale: 3482 case URxvt_locale:
4008 if (query) 3483 if (query)
4009 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);
4010 else 3485 else
4011 { 3486 {
4012 set_locale (str); 3487 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8); 3488 pty->set_utf8_mode (enc_utf8);
4014 init_xlocale (); 3489 init_xlocale ();
4015 } 3490 }
4016 break; 3491 break;
4017 3492
4018 case URxvt_view_up: 3493 case URxvt_view_up:
… …
4029 break; 3504 break;
4030#endif 3505#endif
4031 3506
4032#if ENABLE_PERL 3507#if ENABLE_PERL
4033 case URxvt_perl: 3508 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3509 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4035 ; // no responses yet 3510 ; // no responses yet
4036 break; 3511 break;
4037#endif 3512#endif
4038 } 3513 }
4039} 3514}
… …
4071 return state; 3546 return state;
4072} 3547}
4073 3548
4074/* we're not using priv _yet_ */ 3549/* we're not using priv _yet_ */
4075void 3550void
4076rxvt_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)
4077{ 3552{
4078 unsigned int i, j; 3553 unsigned int i, j;
4079 int state; 3554 int state;
4080 3555
4081 static const struct 3556 static const struct
4082 { 3557 {
4083 const int argval; 3558 const int argval;
4084 const unsigned long bit; 3559 const unsigned long bit;
4085 }
4086
4087 argtopriv[] = { 3560 } argtopriv[] = {
4088 { 1, PrivMode_aplCUR }, 3561 { 1, PrivMode_aplCUR },
4089 { 2, PrivMode_vt52 }, 3562 { 2, PrivMode_vt52 },
4090 { 3, PrivMode_132 }, 3563 { 3, PrivMode_132 },
4091 { 4, PrivMode_smoothScroll }, 3564 { 4, PrivMode_smoothScroll },
4092 { 5, PrivMode_rVideo }, 3565 { 5, PrivMode_rVideo },
4093 { 6, PrivMode_relOrigin }, 3566 { 6, PrivMode_relOrigin },
4094 { 7, PrivMode_Autowrap }, 3567 { 7, PrivMode_Autowrap },
4095 // 8, bi-directional support mode 3568 // 8, bi-directional support mode
4096 { 9, PrivMode_MouseX10 }, 3569 { 9, PrivMode_MouseX10 },
4097#ifdef menuBar_esc
4098 { menuBar_esc, PrivMode_menuBar },
4099#endif
4100 // 18, 19 printing-related 3570 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor }, 3571 { 25, PrivMode_VisibleCursor },
4102#ifdef scrollBar_esc 3572#ifdef scrollBar_esc
4103 { scrollBar_esc, PrivMode_scrollBar }, 3573 { scrollBar_esc, PrivMode_scrollBar },
4104#endif 3574#endif
… …
4112#ifndef NO_BACKSPACE_KEY 3582#ifndef NO_BACKSPACE_KEY
4113 { 67, PrivMode_BackSpace }, 3583 { 67, PrivMode_BackSpace },
4114#endif 3584#endif
4115 { 1000, PrivMode_MouseX11 }, 3585 { 1000, PrivMode_MouseX11 },
4116 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3586 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4117 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
4118 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
4119 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4120 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
4121 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
4122 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
4123 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
4151 /* extra handling for values with state unkept */ 3621 /* extra handling for values with state unkept */
4152 switch (arg[i]) 3622 switch (arg[i])
4153 { 3623 {
4154#if ENABLE_STYLES 3624#if ENABLE_STYLES
4155 case 1021: 3625 case 1021:
4156 if (mode) 3626 set_option (Opt_intensityStyles, mode);
4157 SET_OPTION (Opt_intensityStyles);
4158 else
4159 CLR_OPTION (Opt_intensityStyles);
4160 3627
4161 scr_touch (true); 3628 scr_touch (true);
4162 break; 3629 break;
4163#endif 3630#endif
4164 case 1048: /* alternative cursor save */ 3631 case 1048: /* alternative cursor save */
4165 case 1049: 3632 case 1049:
4166 if (OPTION (Opt_secondaryScreen)) 3633 if (option (Opt_secondaryScreen))
4167 if (mode == 0) 3634 if (mode == 0)
4168 scr_cursor (RESTORE); 3635 scr_cursor (RESTORE);
4169 else if (mode == 1) 3636 else if (mode == 1)
4170 scr_cursor (SAVE); 3637 scr_cursor (SAVE);
4171 break; 3638 break;
… …
4186 case 3: /* 80/132 */ 3653 case 3: /* 80/132 */
4187 if (priv_modes & PrivMode_132OK) 3654 if (priv_modes & PrivMode_132OK)
4188 set_widthheight (((state ? 132 : 80) * fwidth), height); 3655 set_widthheight (((state ? 132 : 80) * fwidth), height);
4189 break; 3656 break;
4190 case 4: /* smooth scrolling */ 3657 case 4: /* smooth scrolling */
4191 if (!state) 3658 set_option (Opt_jumpScroll, !state);
4192 SET_OPTION (Opt_jumpScroll);
4193 else
4194 CLR_OPTION (Opt_jumpScroll);
4195 break; 3659 break;
4196 case 5: /* reverse video */ 3660 case 5: /* reverse video */
4197 scr_rvideo_mode (state); 3661 scr_rvideo_mode (state);
4198 break; 3662 break;
4199 case 6: /* relative/absolute origins */ 3663 case 6: /* relative/absolute origins */
… …
4203 scr_autowrap (state); 3667 scr_autowrap (state);
4204 break; 3668 break;
4205 /* 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 */
4206 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
4207 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
4208 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4209 break; 3673 break;
4210#ifdef menuBar_esc
4211 case menuBar_esc:
4212#ifdef MENUBAR
4213 map_menuBar (state);
4214#endif
4215 break;
4216#endif
4217#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
4218 case scrollBar_esc: 3675 case scrollBar_esc:
4219 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
4220 { 3677 {
4221 resize_all_windows (0, 0, 0); 3678 resize_all_windows (0, 0, 0);
… …
4233 break; 3690 break;
4234 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
4235 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
4236 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
4237 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
4238 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4239 break; 3696 break;
4240#if 0 3697#if 0
4241 case 1001: 3698 case 1001:
4242 break; /* X11 mouse highlighting */ 3699 break; /* X11 mouse highlighting */
4243#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;
4244 case 1010: /* scroll to bottom on TTY output inhibit */ 3713 case 1010: /* scroll to bottom on TTY output inhibit */
4245 if (!state) 3714 set_option (Opt_scrollTtyOutput, !state);
4246 SET_OPTION (Opt_scrollTtyOutput);
4247 else
4248 CLR_OPTION (Opt_scrollTtyOutput);
4249 break; 3715 break;
4250 case 1011: /* scroll to bottom on key press */ 3716 case 1011: /* scroll to bottom on key press */
4251 if (state) 3717 set_option (Opt_scrollTtyKeypress, state);
4252 SET_OPTION (Opt_scrollTtyKeypress);
4253 else
4254 CLR_OPTION (Opt_scrollTtyKeypress);
4255 break; 3718 break;
4256 case 1047: /* secondary screen w/ clearing last */ 3719 case 1047: /* secondary screen w/ clearing last */
4257 if (OPTION (Opt_secondaryScreen)) 3720 if (option (Opt_secondaryScreen))
4258 if (current_screen != PRIMARY) 3721 if (current_screen != PRIMARY)
4259 scr_erase_screen (2); 3722 scr_erase_screen (2);
4260 scr_change_screen (state); 3723 scr_change_screen (state);
4261 break; 3724 break;
4262 case 1049: /* secondary screen w/ clearing first */ 3725 case 1049: /* secondary screen w/ clearing first */
4263 scr_change_screen (state); 3726 scr_change_screen (state);
4264 if (OPTION (Opt_secondaryScreen)) 3727 if (option (Opt_secondaryScreen))
4265 if (current_screen != PRIMARY) 3728 if (current_screen != PRIMARY)
4266 scr_erase_screen (2); 3729 scr_erase_screen (2);
4267 break; 3730 break;
4268 default: 3731 default:
4269 break; 3732 break;
… …
4397 scr_color (Color_bg, Color_bg); 3860 scr_color (Color_bg, Color_bg);
4398 break; 3861 break;
4399 3862
4400 //case 50: // not variable spacing 3863 //case 50: // not variable spacing
4401 3864
4402#if ENABLE_FRILLS 3865#if !ENABLE_MINIMAL
4403 case 90: 3866 case 90:
4404 case 91: /* set bright fg color */ 3867 case 91: /* set bright fg color */
4405 case 92: 3868 case 92:
4406 case 93: 3869 case 93:
4407 case 94: 3870 case 94:
… …
4469const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3932const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470 3933
4471void 3934void
4472rxvt_term::tt_write (const char *data, unsigned int len) 3935rxvt_term::tt_write (const char *data, unsigned int len)
4473{ 3936{
4474 if (pty.pty < 0) 3937 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4475 return; 3938 return;
4476 3939
3940 if (pty->pty < 0)
3941 return;
3942
4477 if (v_buflen == 0) 3943 if (v_buflen == 0)
4478 { 3944 {
4479 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));
4480 3946
4481 if ((unsigned int)written == len) 3947 if ((unsigned int)written == len)
4482 return; 3948 return;
4483 3949
4484 data += written; 3950 data += written;
… …
4488 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4489 3955
4490 memcpy (v_buffer + v_buflen, data, len); 3956 memcpy (v_buffer + v_buflen, data, len);
4491 v_buflen += len; 3957 v_buflen += len;
4492 3958
4493 pty_ev.set (EVENT_READ | EVENT_WRITE); 3959 pty_ev.set (ev::READ | ev::WRITE);
4494} 3960}
4495 3961
4496void rxvt_term::pty_write () 3962void rxvt_term::pty_write ()
4497{ 3963{
4498 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));
4499 3965
4500 if (written > 0) 3966 if (written > 0)
4501 { 3967 {
4502 v_buflen -= written; 3968 v_buflen -= written;
4503 3969
4504 if (v_buflen == 0) 3970 if (v_buflen == 0)
4505 { 3971 {
4506 free (v_buffer); 3972 free (v_buffer);
4507 v_buffer = 0; 3973 v_buffer = 0;
4508 v_buflen = 0;
4509 3974
4510 pty_ev.set (EVENT_READ); 3975 pty_ev.set (ev::READ);
4511 return; 3976 return;
4512 } 3977 }
4513 3978
4514 memmove (v_buffer, v_buffer + written, v_buflen); 3979 memmove (v_buffer, v_buffer + written, v_buflen);
4515 } 3980 }
4516 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3981 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4517 pty_ev.set (EVENT_READ); 3982 pty_ev.set (ev::READ);
4518} 3983}
4519 3984
4520/*----------------------- end-of-file (C source) -----------------------*/ 3985/*----------------------- end-of-file (C source) -----------------------*/
4521 3986

Diff Legend

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