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

Diff Legend

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