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.266 by root, Mon Jan 16 08:57:02 2006 UTC vs.
Revision 1.382 by root, Fri Dec 14 06:04:56 2007 UTC

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

Diff Legend

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