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.272 by root, Thu Jan 19 16:22:12 2006 UTC vs.
Revision 1.386 by ayin, Fri Dec 28 11:02:31 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,
… …
203 r & RS_Uline ? " uline" : "", 198 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : ""); 199 r & RS_Careful ? " careful" : "");
205 200
206 int width = wcswidth (fname, wcslen (fname)); 201 int width = wcswidth (fname, wcslen (fname));
207 202
208 max_it (width, 8+5); // for char + hey 203 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 204 max_it (width, strlen (attr));
210 205
211 if (y >= 0) 206 if (y >= 0)
212 { 207 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
225 ch = *chr++; 220 ch = *chr++;
226 221
227 sprintf (buf, "%8x", ch); 222 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 223 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '='); 224 scr_overlay_set (9, y, '=');
230# if !UNICODE3 225# if !UNICODE_3
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 *
… …
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
498# endif 501# endif
499 return; 502 return;
500 } 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);
509# endif
510 return;
511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
505# if ISO_14755 516# if ISO_14755
… …
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/*}}} */ 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}
923 949
924#if defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
925unsigned int 951unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 953{
… …
957void 983void
958rxvt_term::flush () 984rxvt_term::flush ()
959{ 985{
960 flush_ev.stop (); 986 flush_ev.stop ();
961 987
962#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
963 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
964 { 990 {
965 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
966 scr_clear ();
967 scr_touch (false); 992 scr_touch (false);
968 } 993 }
969#endif 994#endif
970 995
971 if (want_refresh) 996 if (want_refresh)
… …
1016 } 1041 }
1017 1042
1018 display->flush (); 1043 display->flush ();
1019} 1044}
1020 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1021void 1047void
1022rxvt_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)
1023{ 1058{
1024 make_current (); 1059 make_current ();
1025 1060
1026 display->flush ();
1027
1028 if (want_refresh && !flush_ev.active)
1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1030}
1031
1032void
1033rxvt_term::flush_cb (time_watcher &w)
1034{
1035 make_current ();
1036
1037 refresh_limit = 1;
1038 refresh_count = 0; 1061 refresh_count = 0;
1039 flush (); 1062 flush ();
1040} 1063}
1041 1064
1042#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1043void 1066void
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1045{ 1068{
1046 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1070 want_refresh = 1;
1048 1071 refresh_check ();
1049 w.start (w.at + BLINK_INTERVAL);
1050} 1072}
1051#endif 1073#endif
1052 1074
1053#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1054void 1076void
1055rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1056{ 1078{
1057 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1058 { 1080 {
1059 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1060 want_refresh = 1; 1082 want_refresh = 1;
1061 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
1062 } 1084 }
1085 else
1086 w.stop ();
1063} 1087}
1064#endif 1088#endif
1065 1089
1066#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1067void 1091void
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1069{ 1093{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1072 { 1096 {
1073 want_refresh = 1; 1097 want_refresh = 1;
1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1075 } 1099 }
1100 else
1101 w.stop ();
1076} 1102}
1077#endif 1103#endif
1078 1104
1079#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1080void 1106void
1081rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1082{ 1108{
1083 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1084 { 1110 {
1085 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1086 want_refresh = 1; 1112 want_refresh = 1;
1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1088 } 1114 }
1115 else
1116 w.stop ();
1089} 1117}
1090#endif 1118#endif
1091 1119
1092#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1093void 1121void
1094rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1095{ 1123{
1096 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1098 : scr_page (UP, mouse_slip_wheel_speed))
1099 { 1125 {
1100 if (view_start == top_row || view_start == 0)
1101 mouse_slip_wheel_speed = 0;
1102
1103 want_refresh = 1; 1126 want_refresh = 1;
1104 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)
1105 } 1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1134 }
1106} 1135}
1107#endif 1136#endif
1108 1137
1109#if HAVE_SCHED_YIELD 1138#if LINUX_YIELD_HACK
1110static struct event_handler 1139static struct event_handler
1111{ 1140{
1112 check_watcher cw_yield; 1141 ev::prepare yield_ev;
1113 1142
1114 void yield (check_watcher &w) 1143 void yield_cb (ev::prepare &w, int revents)
1115 { 1144 {
1116 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
1117 w.stop (); 1153 w.stop ();
1118 } 1154 }
1119 1155
1120 event_handler () 1156 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1157 : yield_ev (this, &event_handler::yield_cb)
1122 { 1158 {
1123 } 1159 }
1124} event_handler; 1160} event_handler;
1125#endif 1161#endif
1126 1162
… …
1146 cmdbuf_endp += r; 1182 cmdbuf_endp += r;
1147 return true; 1183 return true;
1148 } 1184 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1185 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1186 {
1151#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1152 if (display->is_local) 1188 if (display->is_local)
1153 event_handler.cw_yield.start (); 1189 event_handler.yield_ev.start ();
1154#endif 1190#endif
1155 } 1191 }
1156 else 1192 else
1157 { 1193 {
1158 pty_ev.stop (); 1194 pty_ev.stop ();
1159 1195
1160 if (!OPTION (Opt_hold)) 1196 if (!option (Opt_hold))
1161 destroy (); 1197 destroy ();
1162 } 1198 }
1163 1199
1164 return false; 1200 return false;
1165} 1201}
1166 1202
1167void 1203void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1169{ 1205{
1170 make_current (); 1206 make_current ();
1171 1207
1172 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1173 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1174 while (pty_fill ()) 1210 while (pty_fill ())
1175 if (cmd_parse ()) 1211 if (cmd_parse ())
1176 break; 1212 break;
1177 1213
1178 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1179 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1180} 1218}
1181 1219
1182void 1220void
1183rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1184{ 1222{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1223 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1224 recolour_cursor ();
1187 1225
1188#ifdef POINTER_BLANK 1226#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1227 hidden_pointer = 0;
1190 1228
1191 if (OPTION (Opt_pointerBlank)) 1229 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1230 pointer_ev.start (pointerBlankDelay);
1193#endif 1231#endif
1194} 1232}
1195 1233
1196#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1197void 1235void
1198rxvt_term::pointer_blank () 1236rxvt_term::pointer_blank ()
1199{ 1237{
1200 if (!OPTION (Opt_pointerBlank)) 1238 if (!option (Opt_pointerBlank))
1201 return; 1239 return;
1202 1240
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1241 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1242 XFlush (dpy);
1205 1243
1206 hidden_pointer = 1; 1244 hidden_pointer = 1;
1207} 1245}
1208 1246
1209void 1247void
1210rxvt_term::pointer_cb (time_watcher &w) 1248rxvt_term::pointer_cb (ev::timer &w, int revents)
1211{ 1249{
1212 make_current (); 1250 make_current ();
1213 1251
1214 pointer_blank (); 1252 pointer_blank ();
1215} 1253}
… …
1218void 1256void
1219rxvt_term::mouse_report (XButtonEvent &ev) 1257rxvt_term::mouse_report (XButtonEvent &ev)
1220{ 1258{
1221 int button_number, key_state = 0; 1259 int button_number, key_state = 0;
1222 int x, y; 1260 int x, y;
1261 int code = 32;
1223 1262
1224 x = ev.x; 1263 x = Pixel2Col (ev.x);
1225 y = ev.y; 1264 y = Pixel2Row (ev.y);
1226 pixel_position (&x, &y); 1265 if (ev.type == MotionNotify)
1266 {
1267 if (x == mouse_row && y == mouse_col)
1268 return;
1269 mouse_row = x;
1270 mouse_col = y;
1271 code += 32;
1272 }
1227 1273
1228 if (MEvent.button == AnyButton) 1274 if (MEvent.button == AnyButton)
1229 button_number = 3; 1275 button_number = 3;
1230 else 1276 else
1231 { 1277 {
… …
1277 x + 1, 1323 x + 1,
1278 y + 1); 1324 y + 1);
1279#endif 1325#endif
1280 1326
1281 tt_printf ("\033[M%c%c%c", 1327 tt_printf ("\033[M%c%c%c",
1282 (32 + button_number + key_state), 1328 (code + button_number + key_state),
1283 (32 + x + 1), 1329 (32 + x + 1),
1284 (32 + y + 1)); 1330 (32 + y + 1));
1285} 1331}
1286
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296 1332
1297/*{{{ process an X event */ 1333/*{{{ process an X event */
1298void 1334void
1299rxvt_term::x_cb (XEvent &ev) 1335rxvt_term::x_cb (XEvent &ev)
1300{ 1336{
1301 make_current (); 1337 make_current ();
1302 1338
1303 dDisp; 1339 dLocal (Display *, dpy);
1304 1340
1305 if (ev.xany.window == vt 1341 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1342 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1343 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1344 return;
… …
1313 unsigned int unused_mask; 1349 unsigned int unused_mask;
1314 1350
1315 switch (ev.type) 1351 switch (ev.type)
1316 { 1352 {
1317 case KeyPress: 1353 case KeyPress:
1318#if ISO_14755 1354 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1355 break;
1324 1356
1325 case KeyRelease: 1357 case KeyRelease:
1326 { 1358 key_release (ev.xkey);
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395 mouse_slip_wheel_speed = 0;
1396#endif
1397 break; 1359 break;
1398 }
1399 1360
1400 case ButtonPress: 1361 case ButtonPress:
1401 button_press (ev.xbutton); 1362 button_press (ev.xbutton);
1402 break; 1363 break;
1403 1364
… …
1405 button_release (ev.xbutton); 1366 button_release (ev.xbutton);
1406 break; 1367 break;
1407 1368
1408 case ClientMessage: 1369 case ClientMessage:
1409 if (ev.xclient.format == 32 1370 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1371 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1372 {
1373 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1374 {
1375 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1376 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1377 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1378 {
1379 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1380 destroy ();
1381 }
1414#if ENABLE_EWMH 1382#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1383 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1384 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1385 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1386 &ev);
1387#endif
1388 }
1389 }
1390#if ENABLE_XEMBED
1391 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1392 {
1393 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1394 focus_in ();
1395 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1396 focus_out ();
1397 }
1419#endif 1398#endif
1420 } 1399 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break;
1457
1458 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1400 break;
1461 1401
1462 /* 1402 /*
1463 * XXX: this is not the _current_ arrangement 1403 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1404 * Here's my conclusion:
… …
1483 break; 1423 break;
1484 } 1424 }
1485 break; 1425 break;
1486 1426
1487 case FocusIn: 1427 case FocusIn:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1431 focus_in ();
1489 break; 1432 break;
1490 1433
1491 case FocusOut: 1434 case FocusOut:
1435 if (ev.xfocus.detail != NotifyInferior
1436 && ev.xfocus.detail != NotifyPointer
1437 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1438 focus_out ();
1493 break; 1439 break;
1494 1440
1495 case ConfigureNotify: 1441 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */
1496 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1497 { 1446 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1448 ;
1500 1449
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1451 {
1503 seen_resize = 1; 1452 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1454 }
1455 else
1456 {
1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ())
1459 update_background ();
1460#endif
1461 }
1506 1462
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1510 if (OPTION (Opt_transparent))
1511 check_our_parents ();
1512#endif
1513 } 1464 }
1514 break; 1465 break;
1515 1466
1516 case PropertyNotify: 1467 case PropertyNotify:
1468 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1469 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1470 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1471 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1472
1521 break; 1473 break;
1522 1474
1523 case SelectionClear: 1475 case SelectionClear:
1524 selection_clear (); 1476 selection_clear ();
… …
1534 break; 1486 break;
1535 1487
1536 case MapNotify: 1488 case MapNotify:
1537 mapped = 1; 1489 mapped = 1;
1538#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1491 text_blink_ev.start ();
1540#endif 1492#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1494 break;
1543 1495
1544 case UnmapNotify: 1496 case UnmapNotify:
… …
1546#ifdef TEXT_BLINK 1498#ifdef TEXT_BLINK
1547 text_blink_ev.stop (); 1499 text_blink_ev.stop ();
1548#endif 1500#endif
1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1501 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1502 break;
1551
1552#ifdef TRANSPARENT
1553 case ReparentNotify:
1554 rootwin_cb (ev);
1555 break;
1556#endif /* TRANSPARENT */
1557 1503
1558 case GraphicsExpose: 1504 case GraphicsExpose:
1559 case Expose: 1505 case Expose:
1560 if (ev.xany.window == vt) 1506 if (ev.xany.window == vt)
1561 { 1507 {
1562 do 1508 do
1509 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1510 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1511 ev.xexpose.width, ev.xexpose.height, False);
1512 }
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1513 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1514
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1516
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1518 {
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1519 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1520 ev.xexpose.width, ev.xexpose.height, False);
1521 }
1572 1522
1573 want_refresh = 1; 1523 want_refresh = 1;
1574 } 1524 }
1575 else 1525 else
1576 { 1526 {
1577 XEvent unused_event; 1527 XEvent unused_event;
1578 1528
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1529 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1530 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1531 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1532 ;
1583 1533
1584 if (isScrollbarWindow (ev.xany.window)) 1534 if (isScrollbarWindow (ev.xany.window))
1585 { 1535 {
1586 scrollBar.setIdle (); 1536 scrollBar.setIdle ();
1587 scrollbar_show (0); 1537 scrollbar_show (0);
1588 } 1538 }
1589
1590#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window);
1593#endif
1594 } 1539 }
1595 break; 1540 break;
1596 1541
1597 case MotionNotify: 1542 case MotionNotify:
1598#ifdef POINTER_BLANK 1543#ifdef POINTER_BLANK
1599 if (hidden_pointer) 1544 if (hidden_pointer)
1600 pointer_unblank (); 1545 pointer_unblank ();
1601#endif 1546#endif
1547 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1548 || priv_modes & PrivMode_MouseAnyEvent)
1549 mouse_report (ev.xbutton);
1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1603 break; 1551 break;
1604 1552
1605 if (ev.xany.window == vt) 1553 if (ev.xany.window == vt)
1606 { 1554 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1555 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1556 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1557 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1558 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1559 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1561 ;
1614 1562
1615 XQueryPointer (disp, vt, 1563 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1564 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1565 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1566 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1567 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1568#ifdef MOUSE_THRESHOLD
… …
1640 int dist; 1588 int dist;
1641 1589
1642 /* don't clobber the current delay if we are 1590 /* don't clobber the current delay if we are
1643 * already in the middle of scrolling. 1591 * already in the middle of scrolling.
1644 */ 1592 */
1645 if (!sel_scroll_ev.active) 1593 if (!sel_scroll_ev.is_active ())
1646 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1594 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1647 1595
1648 /* save the event params so we can highlight 1596 /* save the event params so we can highlight
1649 * the selection in the pending-scroll loop 1597 * the selection in the pending-scroll loop
1650 */ 1598 */
1651 selection_save_x = ev.xbutton.x; 1599 selection_save_x = ev.xbutton.x;
… …
1673 else 1621 else
1674 { 1622 {
1675 /* we are within the text window, so we 1623 /* we are within the text window, so we
1676 * shouldn't be scrolling 1624 * shouldn't be scrolling
1677 */ 1625 */
1678 if (sel_scroll_ev.active)
1679 sel_scroll_ev.stop(); 1626 sel_scroll_ev.stop();
1680 } 1627 }
1681#endif 1628#endif
1682#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1683 } 1630 }
1684#endif 1631#endif
1685 } 1632 }
1686 } 1633 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1634 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688 { 1635 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1636 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1637 MotionNotify, &ev))
1691 ; 1638 ;
1692 1639
1693 XQueryPointer (disp, scrollBar.win, 1640 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1641 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1642 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1643 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1644 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1699 scrollbar_size ()); 1646 scrollbar_size ());
1700 want_refresh = 1; 1647 want_refresh = 1;
1701 refresh_limit = 0;
1702 scrollbar_show (1); 1648 scrollbar_show (1);
1703 } 1649 }
1704 break; 1650 break;
1705 } 1651 }
1706 1652
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1653#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1654 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711 { 1655 {
1712 if (hidden_cursor) 1656 if (hidden_cursor)
1713 { 1657 {
1714 hidden_cursor = 0; 1658 hidden_cursor = 0;
1715 want_refresh = 1; 1659 want_refresh = 1;
1716 } 1660 }
1717 1661
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1662 cursor_blink_ev.again ();
1719 } 1663 }
1720#endif 1664#endif
1721 1665
1722#if defined(POINTER_BLANK) 1666#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1667 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1668 {
1725 if (ev.type == MotionNotify 1669 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1670 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1671 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1672 if (hidden_pointer)
… …
1730 1674
1731 if (ev.type == KeyPress && hidden_pointer == 0) 1675 if (ev.type == KeyPress && hidden_pointer == 0)
1732 pointer_blank (); 1676 pointer_blank ();
1733 } 1677 }
1734#endif 1678#endif
1679
1680 refresh_check ();
1735} 1681}
1736 1682
1737void 1683void
1738rxvt_term::focus_in () 1684rxvt_term::focus_in ()
1739{ 1685{
1740 if (!focus) 1686 if (!focus)
1741 { 1687 {
1742 focus = 1; 1688 focus = 1;
1743 want_refresh = 1; 1689 want_refresh = 1;
1744 1690
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1691 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 1692
1747#if USE_XIM 1693#if USE_XIM
1748 if (Input_Context != NULL) 1694 if (Input_Context != NULL)
1749 { 1695 {
1750 IMSetStatusPosition (); 1696 IMSetPosition ();
1751 XSetICFocus (Input_Context); 1697 XSetICFocus (Input_Context);
1752 } 1698 }
1753#endif 1699#endif
1754#if CURSOR_BLINK 1700#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1701 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1702 cursor_blink_ev.again ();
1757#endif 1703#endif
1758#if OFF_FOCUS_FADING 1704#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1705 if (rs[Rs_fade])
1760 { 1706 {
1761 pix_colors = pix_colors_focused; 1707 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1708 scr_recolour ();
1763 } 1709 }
1764#endif 1710#endif
1711#if ENABLE_FRILLS
1712 if (option (Opt_urgentOnBell))
1713 {
1714 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1715 {
1716 h->flags &= ~XUrgencyHint;
1717 XSetWMHints (dpy, parent[0], h);
1718 }
1719 }
1720#endif
1765 } 1721 }
1766} 1722}
1767 1723
1768void 1724void
1769rxvt_term::focus_out () 1725rxvt_term::focus_out ()
… …
1777 1733
1778#if ENABLE_FRILLS || ISO_14755 1734#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf) 1735 if (iso14755buf)
1780 { 1736 {
1781 iso14755buf = 0; 1737 iso14755buf = 0;
1782# if ENABLE_OVERLAY 1738# if ISO_14755
1783 scr_overlay_off (); 1739 scr_overlay_off ();
1784# endif 1740# endif
1785 } 1741 }
1786#endif 1742#endif
1787#if USE_XIM 1743#if USE_XIM
1788 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1745 XUnsetICFocus (Input_Context);
1790#endif 1746#endif
1791#if CURSOR_BLINK 1747#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1749 cursor_blink_ev.stop ();
1750
1794 hidden_cursor = 0; 1751 hidden_cursor = 0;
1795#endif 1752#endif
1796#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1798 { 1755 {
… …
1801 } 1758 }
1802#endif 1759#endif
1803 } 1760 }
1804} 1761}
1805 1762
1806#if TRANSPARENT 1763void
1764rxvt_term::update_fade_color (unsigned int idx)
1765{
1766#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade])
1768 {
1769 rgba c;
1770 pix_colors [Color_fade].get (c);
1771 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1772 }
1773#endif
1774}
1775
1776#if ENABLE_TRANSPARENCY || ENABLE_PERL
1807void 1777void
1808rxvt_term::rootwin_cb (XEvent &ev) 1778rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1779{
1810 make_current (); 1780 make_current ();
1811 1781
1782 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1783 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1784 return;
1785
1786# if ENABLE_TRANSPARENCY
1812 switch (ev.type) 1787 switch (ev.type)
1813 { 1788 {
1814 case PropertyNotify: 1789 case PropertyNotify:
1815 /* 1790 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1791 * if user used some Esetroot compatible prog to set the root bg,
1817 * use the property to determine the pixmap. We use it later on. 1792 * use the property to determine the pixmap. We use it later on.
1818 */ 1793 */
1819 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1794 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1795 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 return; 1796 {
1797 bgPixmap.set_root_pixmap ();
1798 update_background ();
1799 }
1822 1800
1823 /* FALLTHROUGH */
1824 case ReparentNotify:
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1826 want_refresh = want_full_refresh = 1;
1827 break; 1801 break;
1828 } 1802 }
1803# endif
1804
1805 refresh_check ();
1829} 1806}
1830#endif 1807#endif
1831 1808
1832void 1809void
1833rxvt_term::button_press (XButtonEvent &ev) 1810rxvt_term::button_press (XButtonEvent &ev)
… …
1842 /* 1819 /*
1843 * VT window processing of button press 1820 * VT window processing of button press
1844 */ 1821 */
1845 if (ev.window == vt) 1822 if (ev.window == vt)
1846 { 1823 {
1824 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1825 return;
1826
1847#if ISO_14755 1827#if ISO_14755
1848 // 5.4 1828 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1829 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1830 {
1851 iso14755_54 (ev.x, ev.y); 1831 iso14755_54 (ev.x, ev.y);
… …
1885 mouse_report (ev); 1865 mouse_report (ev);
1886 } 1866 }
1887#else 1867#else
1888 MEvent.button = ev.button; 1868 MEvent.button = ev.button;
1889 mouse_report (ev); 1869 mouse_report (ev);
1890#endif /* MOUSE_REPORT_DOUBLECLICK */ 1870#endif /* MOUSE_REPORT_DOUBLECLICK */
1891 1871
1892 } 1872 }
1893 else 1873 else
1894 { 1874 {
1895 if (ev.button != MEvent.button) 1875 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1876 MEvent.clicks = 0;
1897 1877
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1878 switch (ev.button)
1900 { 1879 {
1901 case Button1: 1880 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1881 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1882 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1883#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1884 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1885#else
1907 selection.rect = false; 1886 selection.rect = false;
1908#endif 1887#endif
1909 1888
1910 /* allow shift+left click to extend selection */ 1889 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1890 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1891 {
1913 if (MEvent.button == Button1 && clickintime) 1892 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1893 selection_rotate (ev.x, ev.y);
1915 else 1894 else
1916 selection_extend (ev.x, ev.y, 1); 1895 selection_extend (ev.x, ev.y, 1);
1917 } 1896 }
1918 else 1897 else
1919 { 1898 {
1920 if (MEvent.button == Button1 && clickintime) 1899 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1900 MEvent.clicks++;
1922 else 1901 else
1923 MEvent.clicks = 1; 1902 MEvent.clicks = 1;
1924 1903
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1904 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1905 }
1927 1906
1928 MEvent.button = Button1; 1907 MEvent.button = Button1;
1929 break; 1908 break;
1930 1909
1931 case Button3: 1910 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1911 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1934 else 1913 else
1935 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
1936 1915
1937 MEvent.button = Button3; 1916 MEvent.button = Button3;
1938 break; 1917 break;
1939 } 1918 }
1940 } 1919 }
1941 1920
1942 MEvent.time = ev.time; 1921 MEvent.time = ev.time;
1943 return; 1922 return;
1944 } 1923 }
1945 1924
… …
1990 tt_printf ("\033[5~"); 1969 tt_printf ("\033[5~");
1991 break; 1970 break;
1992 } 1971 }
1993 } 1972 }
1994 else 1973 else
1995#endif /* NO_SCROLLBAR_REPORT */ 1974#endif /* NO_SCROLLBAR_REPORT */
1996 1975
1997 { 1976 {
1998 char upordown = 0; 1977 char upordown = 0;
1999 1978
2000 if (scrollBar.style == R_SB_NEXT) 1979 if (scrollBar.style == R_SB_NEXT)
2001 { 1980 {
2002 if (scrollbarnext_upButton (ev.y)) 1981 if (scrollbarnext_upButton (ev.y))
2003 upordown = -1; /* up */ 1982 upordown = -1; /* up */
… …
2009 if (scrollbarrxvt_upButton (ev.y)) 1988 if (scrollbarrxvt_upButton (ev.y))
2010 upordown = -1; /* up */ 1989 upordown = -1; /* up */
2011 else if (scrollbarrxvt_dnButton (ev.y)) 1990 else if (scrollbarrxvt_dnButton (ev.y))
2012 upordown = 1; /* down */ 1991 upordown = 1; /* down */
2013 } 1992 }
1993
2014 if (upordown) 1994 if (upordown)
2015 { 1995 {
2016#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1997 if (!cont_scroll_ev.is_active ())
2017 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1998 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2018#endif 1999#endif
2019 if (scr_page (upordown < 0 ? UP : DN, 1)) 2000 if (scr_page (upordown < 0 ? UP : DN, 1))
2020 { 2001 {
2021 if (upordown < 0) 2002 if (upordown < 0)
2022 scrollBar.setUp (); 2003 scrollBar.setUp ();
… …
2102 scrollBar.setIdle (); 2083 scrollBar.setIdle ();
2103 scrollbar_show (0); 2084 scrollbar_show (0);
2104 } 2085 }
2105 2086
2106#ifdef SELECTION_SCROLLING 2087#ifdef SELECTION_SCROLLING
2107 if (sel_scroll_ev.active)
2108 sel_scroll_ev.stop(); 2088 sel_scroll_ev.stop();
2109#endif 2089#endif
2110 2090
2111 if (ev.window == vt) 2091 if (ev.window == vt)
2112 { 2092 {
2093 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2094 return;
2095
2113#if ISO_14755 2096#if ISO_14755
2114 // 5.4 2097 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2098 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2099 return;
2117#endif 2100#endif
2101
2118 if (reportmode) 2102 if (reportmode)
2119 { 2103 {
2120 /* mouse report from vt window */ 2104 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2105 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2106 if (ev.button >= 4)
… …
2133 mouse_report (ev); 2117 mouse_report (ev);
2134 } 2118 }
2135#else /* MOUSE_REPORT_DOUBLECLICK */ 2119#else /* MOUSE_REPORT_DOUBLECLICK */
2136 MEvent.button = AnyButton; 2120 MEvent.button = AnyButton;
2137 mouse_report (ev); 2121 mouse_report (ev);
2138#endif /* MOUSE_REPORT_DOUBLECLICK */ 2122#endif /* MOUSE_REPORT_DOUBLECLICK */
2139 return; 2123 return;
2140 } 2124 }
2141 2125
2142 /* 2126 /*
2143 * dumb hack to compensate for the failure of click-and-drag 2127 * dumb hack to compensate for the failure of click-and-drag
… …
2146 if (priv_modes & PrivMode_mouse_report 2130 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2131 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2132 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2133 selection_extend (ev.x, ev.y, 0);
2150 2134
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2135 switch (ev.button)
2155 { 2136 {
2156 case Button1: 2137 case Button1:
2157 case Button3: 2138 case Button3:
2158 selection_make (ev.time); 2139 selection_make (ev.time);
2159 break; 2140 break;
2160 2141
2161 case Button2: 2142 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) 2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2144 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164 selection_request (ev.time);
2165
2166 break; 2145 break;
2167 2146
2168#ifdef MOUSE_WHEEL 2147#ifdef MOUSE_WHEEL
2169 case Button4: 2148 case Button4:
2170 case Button5: 2149 case Button5:
… …
2174 2153
2175 v = ev.button == Button4 ? UP : DN; 2154 v = ev.button == Button4 ? UP : DN;
2176 2155
2177 if (ev.state & ShiftMask) 2156 if (ev.state & ShiftMask)
2178 i = 1; 2157 i = 1;
2179 else if (OPTION (Opt_mouseWheelScrollPage)) 2158 else if (option (Opt_mouseWheelScrollPage))
2180 i = nrow - 1; 2159 i = nrow - 1;
2181 else 2160 else
2182 i = 5; 2161 i = 5;
2183 2162
2184# ifdef MOUSE_SLIP_WHEELING 2163# ifdef MOUSE_SLIP_WHEELING
… …
2186 { 2165 {
2187 mouse_slip_wheel_speed += v ? -1 : 1; 2166 mouse_slip_wheel_speed += v ? -1 : 1;
2188 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2189 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2190 2169
2191 if (slip_wheel_ev.at < NOW) 2170 if (!slip_wheel_ev.is_active ())
2192 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2171 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2193
2194 slip_wheel_ev.start ();
2195 } 2172 }
2196 else 2173 else
2197 { 2174 {
2198# endif 2175# endif
2199 scr_page (v, i); 2176 scr_page (v, i);
… …
2205 break; 2182 break;
2206#endif 2183#endif
2207 } 2184 }
2208 } 2185 }
2209} 2186}
2210
2211#ifdef TRANSPARENT
2212#if TINTING
2213/* taken from aterm-0.4.2 */
2214
2215typedef uint32_t RUINT32T;
2216
2217void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2218{
2219 int sh_r, sh_g, sh_b;
2220 RUINT32T mask_r, mask_g, mask_b;
2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2224 int i;
2225
2226 Visual *visual = display->visual;
2227
2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2229
2230 /* for convenience */
2231 mask_r = visual->red_mask;
2232 mask_g = visual->green_mask;
2233 mask_b = visual->blue_mask;
2234
2235 /* boring lookup table pre-initialization */
2236 switch (srcImage->bits_per_pixel) {
2237 case 15:
2238 if ((mask_r != 0x7c00) ||
2239 (mask_g != 0x03e0) ||
2240 (mask_b != 0x001f))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2243 lookup_r = lookup;
2244 lookup_g = lookup+32;
2245 lookup_b = lookup+32+32;
2246 sh_r = 10;
2247 sh_g = 5;
2248 sh_b = 0;
2249 break;
2250 case 16:
2251 if ((mask_r != 0xf800) ||
2252 (mask_g != 0x07e0) ||
2253 (mask_b != 0x001f))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2256 lookup_r = lookup;
2257 lookup_g = lookup+32;
2258 lookup_b = lookup+32+64;
2259 sh_r = 11;
2260 sh_g = 5;
2261 sh_b = 0;
2262 break;
2263 case 24:
2264 if ((mask_r != 0xff0000) ||
2265 (mask_g != 0x00ff00) ||
2266 (mask_b != 0x0000ff))
2267 return;
2268 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2269 lookup_r = lookup;
2270 lookup_g = lookup+256;
2271 lookup_b = lookup+256+256;
2272 sh_r = 16;
2273 sh_g = 8;
2274 sh_b = 0;
2275 break;
2276 case 32:
2277 if ((mask_r != 0xff0000) ||
2278 (mask_g != 0x00ff00) ||
2279 (mask_b != 0x0000ff))
2280 return;
2281 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2282 lookup_r = lookup;
2283 lookup_g = lookup+256;
2284 lookup_b = lookup+256+256;
2285 sh_r = 16;
2286 sh_g = 8;
2287 sh_b = 0;
2288 break;
2289 default:
2290 return; /* we do not support this color depth */
2291 }
2292
2293 /* prepare limits for color transformation (each channel is handled separately) */
2294 if (shade < 0) {
2295 shade = -shade;
2296 if (shade < 0) shade = 0;
2297 if (shade > 100) shade = 100;
2298
2299 lower_lim_r = 65535-rm;
2300 lower_lim_g = 65535-gm;
2301 lower_lim_b = 65535-bm;
2302
2303 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2304 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2305 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2306
2307 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2308 } else {
2309 if (shade < 0) shade = 0;
2310 if (shade > 100) shade = 100;
2311
2312 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2313
2314 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2315 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2316 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2317 }
2318
2319 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2320 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2321 {
2322 unsigned int tmp;
2323
2324 tmp = lower_lim_r;
2325 lower_lim_r = lower_lim_b;
2326 lower_lim_b = tmp;
2327
2328 tmp = upper_lim_r;
2329 upper_lim_r = upper_lim_b;
2330 upper_lim_b = tmp;
2331 }
2332
2333 /* fill our lookup tables */
2334 for (i = 0; i <= mask_r>>sh_r; i++)
2335 {
2336 RUINT32T tmp;
2337 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2338 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2339 lookup_r[i] = (tmp/65535)<<sh_r;
2340 }
2341 for (i = 0; i <= mask_g>>sh_g; i++)
2342 {
2343 RUINT32T tmp;
2344 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2345 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2346 lookup_g[i] = (tmp/65535)<<sh_g;
2347 }
2348 for (i = 0; i <= mask_b>>sh_b; i++)
2349 {
2350 RUINT32T tmp;
2351 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2352 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2353 lookup_b[i] = (tmp/65535)<<sh_b;
2354 }
2355
2356 /* apply table to input image (replacing colors by newly calculated ones) */
2357 switch (srcImage->bits_per_pixel)
2358 {
2359 case 15:
2360 {
2361 unsigned short *p1, *pf, *p, *pl;
2362 p1 = (unsigned short *) srcImage->data;
2363 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364 while (p1 < pf)
2365 {
2366 p = p1;
2367 pl = p1 + srcImage->width;
2368 for (; p < pl; p++)
2369 {
2370 *p = lookup_r[(*p & 0x7c00)>>10] |
2371 lookup_g[(*p & 0x03e0)>> 5] |
2372 lookup_b[(*p & 0x001f)];
2373 }
2374 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2375 }
2376 break;
2377 }
2378 case 16:
2379 {
2380 unsigned short *p1, *pf, *p, *pl;
2381 p1 = (unsigned short *) srcImage->data;
2382 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2383 while (p1 < pf)
2384 {
2385 p = p1;
2386 pl = p1 + srcImage->width;
2387 for (; p < pl; p++)
2388 {
2389 *p = lookup_r[(*p & 0xf800)>>11] |
2390 lookup_g[(*p & 0x07e0)>> 5] |
2391 lookup_b[(*p & 0x001f)];
2392 }
2393 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2394 }
2395 break;
2396 }
2397 case 24:
2398 {
2399 unsigned char *p1, *pf, *p, *pl;
2400 p1 = (unsigned char *) srcImage->data;
2401 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2402 while (p1 < pf)
2403 {
2404 p = p1;
2405 pl = p1 + srcImage->width * 3;
2406 for (; p < pl; p += 3)
2407 {
2408 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2409 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2410 p[2] = lookup_r[(p[2] & 0x0000ff)];
2411 }
2412 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 case 32:
2417 {
2418 RUINT32T *p1, *pf, *p, *pl;
2419 p1 = (RUINT32T *) srcImage->data;
2420 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2421
2422 while (p1 < pf)
2423 {
2424 p = p1;
2425 pl = p1 + srcImage->width;
2426 for (; p < pl; p++)
2427 {
2428 *p = lookup_r[(*p & 0xff0000)>>16] |
2429 lookup_g[(*p & 0x00ff00)>> 8] |
2430 lookup_b[(*p & 0x0000ff)] |
2431 (*p & ~0xffffff);
2432 }
2433 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2434 }
2435 break;
2436 }
2437 }
2438
2439 free (lookup);
2440}
2441#endif
2442
2443/*
2444 * Check our parents are still who we think they are.
2445 * Do transparency updates if required
2446 */
2447int
2448rxvt_term::check_our_parents ()
2449{
2450 int i, pchanged, aformat, have_pixmap, rootdepth;
2451 unsigned long nitems, bytes_after;
2452 Atom atype;
2453 unsigned char *prop = NULL;
2454 Window root, oldp, *list;
2455 Pixmap rootpixmap = None;
2456 XWindowAttributes wattr, wrootattr;
2457 dDisp;
2458
2459 pchanged = 0;
2460
2461 if (!OPTION (Opt_transparent))
2462 return pchanged; /* Don't try any more */
2463
2464 XGetWindowAttributes (disp, display->root, &wrootattr);
2465 rootdepth = wrootattr.depth;
2466
2467 XGetWindowAttributes (disp, parent[0], &wattr);
2468
2469 if (rootdepth != wattr.depth)
2470 {
2471 if (am_transparent)
2472 {
2473 pchanged = 1;
2474 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2475 am_transparent = am_pixmap_trans = 0;
2476 }
2477
2478 return pchanged; /* Don't try any more */
2479 }
2480
2481 /* Get all X ops out of the queue so that our information is up-to-date. */
2482 XSync (disp, False);
2483
2484 /*
2485 * Make the frame window set by the window manager have
2486 * the root background. Some window managers put multiple nested frame
2487 * windows for each client, so we have to take care about that.
2488 */
2489 i = (xa[XA_XROOTPMAP_ID]
2490 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2491 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2492 &nitems, &bytes_after, &prop) == Success);
2493
2494 if (!i || prop == NULL)
2495 i = (xa[XA_ESETROOT_PMAP_ID]
2496 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2497 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2498 &nitems, &bytes_after, &prop) == Success);
2499
2500 if (!i || prop == NULL
2501#if TINTING
2502 || !rs[Rs_color + Color_tint]
2503#endif
2504 )
2505 have_pixmap = 0;
2506 else
2507 {
2508 have_pixmap = 1;
2509 rootpixmap = *(Pixmap *)prop;
2510 XFree (prop);
2511 }
2512
2513 if (have_pixmap)
2514 {
2515 /*
2516 * Copy display->root pixmap transparency
2517 */
2518 int sx, sy, nx, ny;
2519 unsigned int nw, nh;
2520 Window cr;
2521 XImage *image;
2522 GC gc;
2523 XGCValues gcvalue;
2524
2525 XTranslateCoordinates (disp, parent[0], display->root,
2526 0, 0, &sx, &sy, &cr);
2527 nw = (unsigned int)szHint.width;
2528 nh = (unsigned int)szHint.height;
2529 nx = ny = 0;
2530
2531 if (sx < 0)
2532 {
2533 nw += sx;
2534 nx = -sx;
2535 sx = 0;
2536 }
2537
2538 if (sy < 0)
2539 {
2540 nh += sy;
2541 ny = -sy;
2542 sy = 0;
2543 }
2544
2545 min_it (nw, (unsigned int) (wrootattr.width - sx));
2546 min_it (nh, (unsigned int) (wrootattr.height - sy));
2547
2548 XSync (disp, False);
2549 allowedxerror = -1;
2550 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2551
2552 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2553 /* XXX: may need a delay here? */
2554 allowedxerror = 0;
2555
2556 if (image == NULL)
2557 {
2558 if (am_transparent && am_pixmap_trans)
2559 {
2560 pchanged = 1;
2561 if (pixmap != None)
2562 {
2563 XFreePixmap (disp, pixmap);
2564 pixmap = None;
2565 }
2566 }
2567
2568 am_pixmap_trans = 0;
2569 }
2570 else
2571 {
2572 if (pixmap != None)
2573 XFreePixmap (disp, pixmap);
2574
2575#if TINTING
2576 if (ISSET_PIXCOLOR (Color_tint))
2577 {
2578 unsigned short rm, gm, bm;
2579 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580
2581 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2582
2583 ShadeXImage (display, image, shade, rm, gm, bm);
2584 }
2585#endif
2586
2587 pixmap = XCreatePixmap (disp, vt,
2588 szHint.width, szHint.height, image->depth);
2589 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2590 XPutImage (disp, pixmap, gc, image, 0, 0,
2591 nx, ny, image->width, image->height);
2592 XFreeGC (disp, gc);
2593 XDestroyImage (image);
2594 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2595 XClearWindow (disp, parent[0]);
2596
2597 if (!am_transparent || !am_pixmap_trans)
2598 pchanged = 1;
2599
2600 am_transparent = am_pixmap_trans = 1;
2601 }
2602 }
2603
2604 if (am_pixmap_trans)
2605 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2606 else
2607 {
2608 unsigned int n;
2609 /*
2610 * InheritPixmap transparency
2611 */
2612 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2613 {
2614 oldp = parent[i];
2615 XQueryTree (disp, parent[i - 1], &root,
2616 &parent[i], &list, &n);
2617 XFree (list);
2618
2619 if (parent[i] == display->root)
2620 {
2621 if (oldp != None)
2622 pchanged = 1;
2623
2624 break;
2625 }
2626
2627 if (oldp != parent[i])
2628 pchanged = 1;
2629 }
2630
2631 n = 0;
2632
2633 if (pchanged)
2634 {
2635 for (; n < (unsigned int)i; n++)
2636 {
2637 XGetWindowAttributes (disp, parent[n], &wattr);
2638 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2639 {
2640 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2641 break;
2642 }
2643 }
2644 }
2645
2646 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2647 {
2648 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2649 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2650 am_transparent = 0;
2651 /* XXX: also turn off Opt_transparent? */
2652 }
2653 else
2654 {
2655#if WAIT_FOR_WM
2656 /* wait (an arbitrary period) for the WM to do its thing
2657 * needed for fvwm2.2.2 (and before?) */
2658 sleep (1);
2659#endif
2660 for (n = 0; n < (unsigned int)i; n++)
2661 {
2662 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2663 XClearWindow (disp, parent[n]);
2664 }
2665
2666 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2667 am_transparent = 1;
2668 }
2669
2670 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2671 parent[i] = None;
2672 }
2673
2674 if (scrollBar.win)
2675 {
2676 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2677 scrollBar.setIdle ();
2678 scrollbar_show (0);
2679 }
2680
2681 if (am_transparent)
2682 {
2683 want_refresh = want_full_refresh = 1;
2684 if (am_pixmap_trans)
2685 flush ();
2686 }
2687
2688 return pchanged;
2689}
2690#endif
2691 2187
2692/*}}} */ 2188/*}}} */
2693 2189
2694bool 2190bool
2695rxvt_term::cmd_parse () 2191rxvt_term::cmd_parse ()
… …
2744 if (ch == C0_LF) 2240 if (ch == C0_LF)
2745 nlines++; 2241 nlines++;
2746 2242
2747 refresh_count++; 2243 refresh_count++;
2748 2244
2749 if (!OPTION (Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2750 || (refresh_count >= refresh_limit * (nrow - 1)))
2751 { 2246 {
2752 refreshnow = true;
2753 refresh_count = 0; 2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2251 refreshnow = true;
2754 ch = NOCHAR; 2252 ch = NOCHAR;
2755 break; 2253 break;
2254 }
2756 } 2255 }
2757 2256
2758 // scr_add_lines only works for nlines <= nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2759 if (nlines >= nrow - 1) 2258 if (nlines >= nrow - 1)
2760 { 2259 {
… …
2788 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2287 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, str - buf, nlines); 2288 scr_add_lines (buf, str - buf, nlines);
2790 2289
2791 /* 2290 /*
2792 * If there have been a lot of new lines, then update the screen 2291 * If there have been a lot of new lines, then update the screen
2793 * What the heck I'll cheat and only refresh less than every page-full. 2292 * What the heck we'll cheat and only refresh less than every page-full.
2794 * the number of pages between refreshes is refresh_limit, which 2293 * if skipScroll is enabled.
2795 * is incremented here because we must be doing flat-out scrolling.
2796 */ 2294 */
2797 if (refreshnow) 2295 if (refreshnow)
2798 { 2296 {
2799 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2800 refresh_limit++;
2801 else
2802 {
2803 flag = true; 2297 flag = true;
2804 scr_refresh (); 2298 scr_refresh ();
2805 want_refresh = 1; 2299 want_refresh = 1;
2806 }
2807 } 2300 }
2808 2301
2809 } 2302 }
2810 else 2303 else
2811 { 2304 {
… …
2827 return flag; 2320 return flag;
2828} 2321}
2829 2322
2830// read the next character 2323// read the next character
2831wchar_t 2324wchar_t
2832rxvt_term::next_char () 2325rxvt_term::next_char () NOTHROW
2833{ 2326{
2834 while (cmdbuf_ptr < cmdbuf_endp) 2327 while (cmdbuf_ptr < cmdbuf_endp)
2835 { 2328 {
2836 // assume 7-bit to be ascii ALWAYS 2329 // assume 7-bit to be ascii ALWAYS
2837 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2330 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2858 return NOCHAR; 2351 return NOCHAR;
2859} 2352}
2860 2353
2861// read the next octet 2354// read the next octet
2862uint32_t 2355uint32_t
2863rxvt_term::next_octet () 2356rxvt_term::next_octet () NOTHROW
2864{ 2357{
2865 return cmdbuf_ptr < cmdbuf_endp 2358 return cmdbuf_ptr < cmdbuf_endp
2866 ? (unsigned char)*cmdbuf_ptr++ 2359 ? (unsigned char)*cmdbuf_ptr++
2867 : NOCHAR; 2360 : NOCHAR;
2868} 2361}
2362
2363static class out_of_input out_of_input;
2869 2364
2870/* rxvt_cmd_getc () - Return next input character */ 2365/* rxvt_cmd_getc () - Return next input character */
2871/* 2366/*
2872 * Return the next input character after first passing any keyboard input 2367 * Return the next input character after first passing any keyboard input
2873 * to the command. 2368 * to the command.
2874 */ 2369 */
2875wchar_t 2370wchar_t
2876rxvt_term::cmd_getc () 2371rxvt_term::cmd_getc () THROW ((class out_of_input))
2877{ 2372{
2878 wchar_t c = next_char (); 2373 wchar_t c = next_char ();
2879 2374
2880 if (c == NOCHAR) 2375 if (c == NOCHAR)
2881 throw out_of_input; 2376 throw out_of_input;
2882 2377
2883 return c; 2378 return c;
2884} 2379}
2885 2380
2886uint32_t 2381uint32_t
2887rxvt_term::cmd_get8 () 2382rxvt_term::cmd_get8 () THROW ((class out_of_input))
2888{ 2383{
2889 uint32_t c = next_octet (); 2384 uint32_t c = next_octet ();
2890 2385
2891 if (c == NOCHAR) 2386 if (c == NOCHAR)
2892 throw out_of_input; 2387 throw out_of_input;
… …
2958 { 2453 {
2959 if ((buf[len++] = cmd_getc ()) == 'i') 2454 if ((buf[len++] = cmd_getc ()) == 'i')
2960 break; /* done = 1 */ 2455 break; /* done = 1 */
2961 } 2456 }
2962 } 2457 }
2963 2458
2964 for (i = 0; i < len; i++) 2459 for (i = 0; i < len; i++)
2965 if (putc (buf[i], fd) == EOF) 2460 if (putc (buf[i], fd) == EOF)
2966 { 2461 {
2967 done = 1; 2462 done = 1;
2968 break; 2463 break;
… …
2970 } 2465 }
2971 } 2466 }
2972 2467
2973 pclose_printer (fd); 2468 pclose_printer (fd);
2974} 2469}
2975#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2976/*}}} */ 2471/*}}} */
2977 2472
2978/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2979enum { 2474enum {
2980 C1_40 = 0x40, 2475 C1_40 = 0x40,
… …
3030 process_dcs_seq (); 2525 process_dcs_seq ();
3031 break; 2526 break;
3032 case 0x9b: /* CSI */ 2527 case 0x9b: /* CSI */
3033 process_csi_seq (); 2528 process_csi_seq ();
3034 break; 2529 break;
3035 case 0x9d: /* CSI */ 2530 case 0x9d: /* OSC */
3036 process_osc_seq (); 2531 process_osc_seq ();
3037 break; 2532 break;
3038#endif 2533#endif
3039 } 2534 }
3040} 2535}
… …
3130 scr_charset_set (2, (unsigned int)cmd_getc ()); 2625 scr_charset_set (2, (unsigned int)cmd_getc ());
3131 break; 2626 break;
3132 case '+': 2627 case '+':
3133 scr_charset_set (3, (unsigned int)cmd_getc ()); 2628 scr_charset_set (3, (unsigned int)cmd_getc ());
3134 break; 2629 break;
3135#if ENABLE_FRILLS 2630#if !ENABLE_MINIMAL
3136 case '6': 2631 case '6':
3137 scr_backindex (); 2632 scr_backindex ();
3138 break; 2633 break;
3139#endif 2634#endif
3140 case '7': 2635 case '7':
3141 scr_cursor (SAVE); 2636 scr_cursor (SAVE);
3142 break; 2637 break;
3143 case '8': 2638 case '8':
3144 scr_cursor (RESTORE); 2639 scr_cursor (RESTORE);
3145 break; 2640 break;
3146#if ENABLE_FRILLS 2641#if !ENABLE_MINIMAL
3147 case '9': 2642 case '9':
3148 scr_forwardindex (); 2643 scr_forwardindex ();
3149 break; 2644 break;
3150#endif 2645#endif
3151 case '=': 2646 case '=':
… …
3266rxvt_term::process_csi_seq () 2761rxvt_term::process_csi_seq ()
3267{ 2762{
3268 unicode_t ch, priv, i; 2763 unicode_t ch, priv, i;
3269 unsigned int nargs, p; 2764 unsigned int nargs, p;
3270 int n, ndef; 2765 int n, ndef;
3271 int arg[ESC_ARGS]; 2766 int arg[ESC_ARGS] = { };
3272 2767
3273 for (nargs = ESC_ARGS; nargs > 0;) 2768 nargs = 0;
3274 arg[--nargs] = 0;
3275 2769
3276 priv = 0; 2770 priv = 0;
3277 ch = cmd_getc (); 2771 ch = cmd_getc ();
3278 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
3279 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
3280 priv = ch; 2775 priv = ch;
3281 ch = cmd_getc (); 2776 ch = cmd_getc ();
3282 } 2777 }
3283 2778
3284 /* read any numerical arguments */ 2779 /* read any numerical arguments */
… …
3313 ndef = get_byte_array_bit (csi_defaults, i); 2808 ndef = get_byte_array_bit (csi_defaults, i);
3314 for (p = 0; p < nargs; p++) 2809 for (p = 0; p < nargs; p++)
3315 if (arg[p] == -1) 2810 if (arg[p] == -1)
3316 arg[p] = ndef; 2811 arg[p] = ndef;
3317 2812
3318#ifdef DEBUG_CMD
3319 fprintf (stderr, "CSI ");
3320 for (p = 0; p < nargs; p++)
3321 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3322 fprintf (stderr, "%c\n", ch);
3323#endif
3324
3325 /* 2813 /*
3326 * private mode handling 2814 * private mode handling
3327 */ 2815 */
3328 if (priv) 2816 if (priv)
3329 { 2817 {
3330 switch (priv) 2818 switch (priv)
3331 { 2819 {
3332 case '>': 2820 case '>':
3333 if (ch == CSI_DA) /* secondary device attributes */ 2821 if (ch == CSI_DA) /* secondary device attributes */
3334 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2822 {
2823 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2824 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2825 //
2826 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2827 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2828 // versions.
2829 //
2830 tt_printf ("\033[>%d;95;0c", 'U');
2831 }
3335 break; 2832 break;
3336 case '?': 2833 case '?':
3337 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3338 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
3339 break; 2836 break;
… …
3465 break; 2962 break;
3466 case 6: /* CPR requested */ 2963 case 6: /* CPR requested */
3467 scr_report_position (); 2964 scr_report_position ();
3468 break; 2965 break;
3469 case 7: /* unofficial extension */ 2966 case 7: /* unofficial extension */
3470 if (OPTION (Opt_insecure)) 2967 if (option (Opt_insecure))
3471 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2968 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3472 break; 2969 break;
3473 case 8: /* unofficial extension */ 2970 case 8: /* unofficial extension */
3474 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3475 break; 2972 break;
… …
3542 break; 3039 break;
3543 case CSI_75: 3040 case CSI_75:
3544 scr_cursor (RESTORE); 3041 scr_cursor (RESTORE);
3545 break; 3042 break;
3546 3043
3547#if ENABLE_FRILLS 3044#if !ENABLE_MINIMAL
3548 case CSI_74: 3045 case CSI_74:
3549 process_window_ops (arg, nargs); 3046 process_window_ops (arg, nargs);
3550 break; 3047 break;
3551#endif 3048#endif
3552 3049
… …
3559 break; 3056 break;
3560 } 3057 }
3561} 3058}
3562/*}}} */ 3059/*}}} */
3563 3060
3564#if ENABLE_FRILLS 3061#if !ENABLE_MINIMAL
3565/* ARGSUSED */ 3062/* ARGSUSED */
3566void 3063void
3567rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3064rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3568{ 3065{
3569 int x, y; 3066 int x, y;
3570 XWindowAttributes wattr; 3067 XWindowAttributes wattr;
3571 Window wdummy; 3068 Window wdummy;
3572 dDisp; 3069
3070 dLocal (Display *, dpy);
3573 3071
3574 if (nargs == 0) 3072 if (nargs == 0)
3575 return; 3073 return;
3576 3074
3577 switch (args[0]) 3075 switch (args[0])
3578 { 3076 {
3579 /* 3077 /*
3580 * commands 3078 * commands
3581 */ 3079 */
3582 case 1: /* deiconify window */ 3080 case 1: /* deiconify window */
3583 XMapWindow (disp, parent[0]); 3081 XMapWindow (dpy, parent[0]);
3584 break; 3082 break;
3585 case 2: /* iconify window */ 3083 case 2: /* iconify window */
3586 XIconifyWindow (disp, parent[0], display->screen); 3084 XIconifyWindow (dpy, parent[0], display->screen);
3587 break; 3085 break;
3588 case 3: /* set position (pixels) */ 3086 case 3: /* set position (pixels) */
3589 XMoveWindow (disp, parent[0], args[1], args[2]); 3087 XMoveWindow (dpy, parent[0], args[1], args[2]);
3590 break; 3088 break;
3591 case 4: /* set size (pixels) */ 3089 case 4: /* set size (pixels) */
3592 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3090 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3593 break; 3091 break;
3594 case 5: /* raise window */ 3092 case 5: /* raise window */
3595 XRaiseWindow (disp, parent[0]); 3093 XRaiseWindow (dpy, parent[0]);
3596 break; 3094 break;
3597 case 6: /* lower window */ 3095 case 6: /* lower window */
3598 XLowerWindow (disp, parent[0]); 3096 XLowerWindow (dpy, parent[0]);
3599 break; 3097 break;
3600 case 7: /* refresh window */ 3098 case 7: /* refresh window */
3601 scr_touch (true); 3099 scr_touch (true);
3602 break; 3100 break;
3603 case 8: /* set size (chars) */ 3101 case 8: /* set size (chars) */
… …
3610 if (args[0] >= 24) /* set height (chars) */ 3108 if (args[0] >= 24) /* set height (chars) */
3611 set_widthheight ((unsigned int)width, 3109 set_widthheight ((unsigned int)width,
3612 (unsigned int) (args[1] * fheight)); 3110 (unsigned int) (args[1] * fheight));
3613 break; 3111 break;
3614 3112
3615
3616 /* 3113 /*
3617 * reports - some output format copied from XTerm 3114 * reports - some output format copied from XTerm
3618 */ 3115 */
3619 case 11: /* report window state */ 3116 case 11: /* report window state */
3620 XGetWindowAttributes (disp, parent[0], &wattr); 3117 XGetWindowAttributes (dpy, parent[0], &wattr);
3621 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3118 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3622 break; 3119 break;
3623 case 13: /* report window position */ 3120 case 13: /* report window position */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3121 XGetWindowAttributes (dpy, parent[0], &wattr);
3625 XTranslateCoordinates (disp, parent[0], wattr.root, 3122 XTranslateCoordinates (dpy, parent[0], wattr.root,
3626 -wattr.border_width, -wattr.border_width, 3123 -wattr.border_width, -wattr.border_width,
3627 &x, &y, &wdummy); 3124 &x, &y, &wdummy);
3628 tt_printf ("\033[3;%d;%dt", x, y); 3125 tt_printf ("\033[3;%d;%dt", x, y);
3629 break; 3126 break;
3630 case 14: /* report window size (pixels) */ 3127 case 14: /* report window size (pixels) */
3631 XGetWindowAttributes (disp, parent[0], &wattr); 3128 XGetWindowAttributes (dpy, parent[0], &wattr);
3632 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3129 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3633 break; 3130 break;
3634 case 18: /* report text area size (chars) */ 3131 case 18: /* report text area size (chars) */
3635 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3132 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3636 break; 3133 break;
… …
3638 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3135 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3639 break; 3136 break;
3640 case 20: /* report icon label */ 3137 case 20: /* report icon label */
3641 { 3138 {
3642 char *s; 3139 char *s;
3643 XGetIconName (disp, parent[0], &s); 3140 XGetIconName (dpy, parent[0], &s);
3644 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3141 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s); 3142 XFree (s);
3646 } 3143 }
3647 break; 3144 break;
3648 case 21: /* report window title */ 3145 case 21: /* report window title */
3649 { 3146 {
3650 char *s; 3147 char *s;
3651 XFetchName (disp, parent[0], &s); 3148 XFetchName (dpy, parent[0], &s);
3652 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3149 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3653 XFree (s); 3150 XFree (s);
3654 } 3151 }
3655 break; 3152 break;
3656 } 3153 }
3657} 3154}
… …
3684 seen_esc = true; 3181 seen_esc = true;
3685 continue; 3182 continue;
3686 } 3183 }
3687 else if (ch == C0_BEL || ch == CHAR_ST) 3184 else if (ch == C0_BEL || ch == CHAR_ST)
3688 break; 3185 break;
3186 else if (ch == C0_SYN)
3187 ch = cmd_get8 ();
3689 else if (ch < 0x20) 3188 else if (ch < 0x20)
3690 return NULL; /* other control character - exit */ 3189 return NULL; /* other control character - exit */
3691 3190
3692 seen_esc = false; 3191 seen_esc = false;
3693 3192
3694 if (n >= STRING_MAX - 1) 3193 if (n >= STRING_MAX - 1)
3695 // stop at some sane length 3194 // stop at some sane length
3696 return NULL; 3195 return NULL;
3697 3196
3698 if (ch == C0_SYN)
3699 string[n++] = cmd_get8 ();
3700 else
3701 string[n++] = ch; 3197 string[n++] = ch;
3702 } 3198 }
3703 3199
3704 string[n++] = '\0'; 3200 string[n++] = '\0';
3705 3201
3706 ends_how = (ch == 0x5c ? C0_ESC : ch); 3202 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3757void 3253void
3758rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3254rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3759{ 3255{
3760 if (str[0] == '?' && !str[1]) 3256 if (str[0] == '?' && !str[1])
3761 { 3257 {
3762 unsigned short r, g, b; 3258 rgba c;
3763 pix_colors_focused[color].get (display, r, g, b); 3259 pix_colors_focused[color].get (c);
3260
3261#if XFT
3262 if (c.a != rgba::MAX_CC)
3263 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3264 else
3265#endif
3764 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3266 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3765 } 3267 }
3766 else 3268 else
3767 set_window_color (color, str); 3269 set_window_color (color, str);
3768} 3270}
3769 3271
… …
3775{ 3277{
3776 int color; 3278 int color;
3777 char *buf, *name; 3279 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3280 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3281 int saveop = op;
3780 dDisp; 3282
3283 dLocal (Display *, dpy);
3781 3284
3782 assert (str != NULL); 3285 assert (str != NULL);
3286
3287 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3288 return;
3289
3783 switch (op) 3290 switch (op)
3784 { 3291 {
3785 case XTerm_name: 3292 case XTerm_name:
3786 set_title (str); 3293 set_title (str);
3787 /* FALLTHROUGH */ 3294 /* FALLTHROUGH */
… …
3801 unsigned long bytes_after; 3308 unsigned long bytes_after;
3802 unsigned char *value = 0; 3309 unsigned char *value = 0;
3803 const char *str = ""; 3310 const char *str = "";
3804 3311
3805 if (prop 3312 if (prop
3806 && XGetWindowProperty (disp, parent[0], 3313 && XGetWindowProperty (dpy, parent[0],
3807 prop, 0, 1<<16, 0, AnyPropertyType, 3314 prop, 0, 1<<16, 0, AnyPropertyType,
3808 &actual_type, &actual_format, 3315 &actual_type, &actual_format,
3809 &nitems, &bytes_after, &value) == Success 3316 &nitems, &bytes_after, &value) == Success
3810 && actual_type != None 3317 && actual_type != None
3811 && actual_format == 8) 3318 && actual_format == 8)
3812 str = (const char *)(value); 3319 str = (const char *)(value);
3813 3320
3814 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3321 tt_printf ("\033]%d;%s%c", op, str, resp);
3815 3322
3816 XFree (value); 3323 XFree (value);
3817 } 3324 }
3818 else 3325 else
3819 { 3326 {
… …
3823 { 3330 {
3824 *eq = 0; 3331 *eq = 0;
3825 set_utf8_property (display->atom (str), eq + 1); 3332 set_utf8_property (display->atom (str), eq + 1);
3826 } 3333 }
3827 else 3334 else
3828 XDeleteProperty (disp, parent[0], 3335 XDeleteProperty (dpy, parent[0],
3829 display->atom (str)); 3336 display->atom (str));
3830 } 3337 }
3831 break; 3338 break;
3832 3339
3833 case XTerm_Color: 3340 case XTerm_Color:
… …
3843 break; 3350 break;
3844 3351
3845 if ((buf = strchr (name, ';')) != NULL) 3352 if ((buf = strchr (name, ';')) != NULL)
3846 *buf++ = '\0'; 3353 *buf++ = '\0';
3847 3354
3848 if (name[0] == '?' && !name[1]) 3355 process_color_seq (op, color, name, resp);
3849 {
3850 unsigned short r, g, b;
3851 pix_colors_focused[color].get (display, r, g, b);
3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853 }
3854 else
3855 set_window_color (color, name);
3856 } 3356 }
3857 break; 3357 break;
3858 case XTerm_Color00: 3358 case XTerm_Color00:
3859 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3359 process_color_seq (op, Color_fg, str, resp);
3860 break; 3360 break;
3861 case XTerm_Color01: 3361 case XTerm_Color01:
3862 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3362 process_color_seq (op, Color_bg, str, resp);
3863 break; 3363 break;
3864#ifndef NO_CURSORCOLOR 3364#ifndef NO_CURSORCOLOR
3865 case XTerm_Color_cursor: 3365 case XTerm_Color_cursor:
3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3366 process_color_seq (op, Color_cursor, str, resp);
3867 break; 3367 break;
3868#endif 3368#endif
3869 case XTerm_Color_pointer_fg: 3369 case XTerm_Color_pointer_fg:
3870 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3370 process_color_seq (op, Color_pointer_fg, str, resp);
3871 break; 3371 break;
3872 case XTerm_Color_pointer_bg: 3372 case XTerm_Color_pointer_bg:
3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3373 process_color_seq (op, Color_pointer_bg, str, resp);
3874 break; 3374 break;
3875#ifndef NO_BOLD_UNDERLINE_REVERSE 3375#ifndef NO_BOLD_UNDERLINE_REVERSE
3876 case XTerm_Color_RV: 3376 case XTerm_Color_RV:
3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3377 process_color_seq (op, Color_RV, str, resp);
3878 break; 3378 break;
3879 case Rxvt_Color_BD: 3379 case Rxvt_Color_BD:
3880 case URxvt_Color_BD: 3380 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp); 3381 process_color_seq (op, Color_BD, str, resp);
3882 break; 3382 break;
3883 case Rxvt_Color_UL: 3383 case Rxvt_Color_UL:
3884 case URxvt_Color_UL: 3384 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp); 3385 process_color_seq (op, Color_UL, str, resp);
3886 break; 3386 break;
3887 case URxvt_Color_IT: 3387 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3388 process_color_seq (op, Color_IT, str, resp);
3889 break; 3389 break;
3890#endif 3390#endif
3891#if TRANSPARENT && TINTING 3391#if ENABLE_TRANSPARENCY
3892 case URxvt_Color_tint: 3392 case URxvt_Color_tint:
3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3393 process_color_seq (op, Color_tint, str, resp);
3894 check_our_parents (); 3394 {
3895 if (am_transparent) 3395 bool changed = false;
3896 want_full_refresh = want_refresh = 1;
3897 break;
3898#endif
3899 3396
3397 if (ISSET_PIXCOLOR (Color_tint))
3398 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3399 else
3400 changed = bgPixmap.unset_tint ();
3401
3402 if (changed)
3403 update_background ();
3404 }
3405
3406 break;
3407#endif
3408
3409#if BG_IMAGE_FROM_FILE
3900 case Rxvt_Pixmap: 3410 case Rxvt_Pixmap:
3901 { 3411 if (!strcmp (str, "?"))
3902 if (*str != ';')
3903 { 3412 {
3904#if XPM_BACKGROUND 3413 char str[256];
3905 scale_pixmap (""); /* reset to default scaling */ 3414
3906 set_bgPixmap (str); /* change pixmap */ 3415 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3907 scr_touch (true); 3416 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3908#endif 3417 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3418 process_xterm_seq (XTerm_title, str, CHAR_ST);
3909 } 3419 }
3910 3420 else
3421 {
3911 int changed = 0; 3422 int changed = 0;
3912 3423
3913 while ((str = strchr (str, ';')) != NULL) 3424 if (*str != ';')
3914 { 3425 {
3426 /* reset to default scaling :*/
3427 bgPixmap.unset_geometry ();
3428 if (bgPixmap.set_file (str)) /* change pixmap */
3429 changed++;
3430 str = strchr (str, ';');
3431 if (str == NULL)
3432 bgPixmap.set_defaultGeometry ();
3433 }
3434
3435 while (str)
3436 {
3915 str++; 3437 str++;
3916#if XPM_BACKGROUND 3438 if (bgPixmap.set_geometry (str))
3917 changed += scale_pixmap (str); 3439 changed++;
3918#endif 3440 str = strchr (str, ';');
3919 } 3441 }
3920 3442
3921 if (changed) 3443 if (changed)
3922 { 3444 update_background ();
3923#ifdef XPM_BACKGROUND
3924 resize_pixmap ();
3925 scr_touch (true);
3926#endif
3927 } 3445 }
3928 }
3929 break; 3446 break;
3447#endif
3930 3448
3931 case Rxvt_restoreFG: 3449 case Rxvt_restoreFG:
3932 set_window_color (Color_fg, str); 3450 set_window_color (Color_fg, str);
3933 break; 3451 break;
3934 case Rxvt_restoreBG: 3452 case Rxvt_restoreBG:
… …
3959 case URxvt_italicFont: 3477 case URxvt_italicFont:
3960 case URxvt_boldItalicFont: 3478 case URxvt_boldItalicFont:
3961#endif 3479#endif
3962 if (query) 3480 if (query)
3963 tt_printf ("\33]%d;%-.250s%c", saveop, 3481 tt_printf ("\33]%d;%-.250s%c", saveop,
3964 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3482 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3965 ? fontset[op - URxvt_font]->fontdesc : "", 3483 ? fontset[op - URxvt_font]->fontdesc : "",
3966 resp); 3484 resp);
3967 else 3485 else
3968 { 3486 {
3969 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3487 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3972 allocated.push_back ((void *)res); 3490 allocated.push_back ((void *)res);
3973 set_fonts (); 3491 set_fonts ();
3974 } 3492 }
3975 break; 3493 break;
3976 3494
3977#if ENABLE_FRILLS 3495 case URxvt_version:
3496 if (query)
3497 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3498 op,
3499 rs[Rs_name], VERSION[0], VERSION[2],
3500 resp);
3501 break;
3502
3503#if !ENABLE_MINIMAL
3978 case URxvt_locale: 3504 case URxvt_locale:
3979 if (query) 3505 if (query)
3980 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3506 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3981 else 3507 else
3982 { 3508 {
3983 set_locale (str); 3509 set_locale (str);
3984 pty->set_utf8_mode (enc_utf8); 3510 pty->set_utf8_mode (enc_utf8);
3985 init_xlocale (); 3511 init_xlocale ();
… …
4000 break; 3526 break;
4001#endif 3527#endif
4002 3528
4003#if ENABLE_PERL 3529#if ENABLE_PERL
4004 case URxvt_perl: 3530 case URxvt_perl:
4005 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3531 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4006 ; // no responses yet 3532 ; // no responses yet
4007 break; 3533 break;
4008#endif 3534#endif
4009 } 3535 }
4010} 3536}
… …
4042 return state; 3568 return state;
4043} 3569}
4044 3570
4045/* we're not using priv _yet_ */ 3571/* we're not using priv _yet_ */
4046void 3572void
4047rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3573rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4048{ 3574{
4049 unsigned int i, j; 3575 unsigned int i, j;
4050 int state; 3576 int state;
4051 3577
4052 static const struct 3578 static const struct
4053 { 3579 {
4054 const int argval; 3580 const int argval;
4055 const unsigned long bit; 3581 const unsigned long bit;
4056 }
4057
4058 argtopriv[] = { 3582 } argtopriv[] = {
4059 { 1, PrivMode_aplCUR }, 3583 { 1, PrivMode_aplCUR },
4060 { 2, PrivMode_vt52 }, 3584 { 2, PrivMode_vt52 },
4061 { 3, PrivMode_132 }, 3585 { 3, PrivMode_132 },
4062 { 4, PrivMode_smoothScroll }, 3586 { 4, PrivMode_smoothScroll },
4063 { 5, PrivMode_rVideo }, 3587 { 5, PrivMode_rVideo },
… …
4079 { 66, PrivMode_aplKP }, 3603 { 66, PrivMode_aplKP },
4080#ifndef NO_BACKSPACE_KEY 3604#ifndef NO_BACKSPACE_KEY
4081 { 67, PrivMode_BackSpace }, 3605 { 67, PrivMode_BackSpace },
4082#endif 3606#endif
4083 { 1000, PrivMode_MouseX11 }, 3607 { 1000, PrivMode_MouseX11 },
4084 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3608 { 1002, PrivMode_MouseBtnEvent },
4085 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3609 { 1003, PrivMode_MouseAnyEvent },
4086 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4087 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4088 { 1011, PrivMode_Keypress }, // rxvt extension 3611 { 1011, PrivMode_Keypress }, // rxvt extension
4089 // 1035 enable modifiers for alt, numlock NYI 3612 // 1035 enable modifiers for alt, numlock NYI
4090 // 1036 send ESC for meta keys NYI 3613 // 1036 send ESC for meta keys NYI
4091 // 1037 send DEL for keypad delete NYI 3614 // 1037 send DEL for keypad delete NYI
… …
4126 scr_touch (true); 3649 scr_touch (true);
4127 break; 3650 break;
4128#endif 3651#endif
4129 case 1048: /* alternative cursor save */ 3652 case 1048: /* alternative cursor save */
4130 case 1049: 3653 case 1049:
4131 if (OPTION (Opt_secondaryScreen)) 3654 if (option (Opt_secondaryScreen))
4132 if (mode == 0) 3655 if (mode == 0)
4133 scr_cursor (RESTORE); 3656 scr_cursor (RESTORE);
4134 else if (mode == 1) 3657 else if (mode == 1)
4135 scr_cursor (SAVE); 3658 scr_cursor (SAVE);
4136 break; 3659 break;
… …
4165 scr_autowrap (state); 3688 scr_autowrap (state);
4166 break; 3689 break;
4167 /* case 8: - auto repeat, can't do on a per window basis */ 3690 /* case 8: - auto repeat, can't do on a per window basis */
4168 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
4169 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
4170 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4171 break; 3694 break;
4172#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
4173 case scrollBar_esc: 3696 case scrollBar_esc:
4174 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
4175 { 3698 {
… …
4188 break; 3711 break;
4189 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
4190 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
4191 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
4192 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
4193 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4194 break; 3717 break;
4195#if 0
4196 case 1001: 3718 case 1002:
4197 break; /* X11 mouse highlighting */ 3719 case 1003:
4198#endif 3720 if (state)
3721 {
3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724 vt_emask_mouse = PointerMotionMask;
3725 }
3726 else
3727 vt_emask_mouse = NoEventMask;
3728 vt_select_input ();
3729 break;
4199 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
4200 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
4201 break; 3732 break;
4202 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
4203 set_option (Opt_scrollTtyKeypress, state); 3734 set_option (Opt_scrollTtyKeypress, state);
4204 break; 3735 break;
4205 case 1047: /* secondary screen w/ clearing last */ 3736 case 1047: /* secondary screen w/ clearing last */
4206 if (OPTION (Opt_secondaryScreen)) 3737 if (option (Opt_secondaryScreen))
4207 if (current_screen != PRIMARY) 3738 if (current_screen != PRIMARY)
4208 scr_erase_screen (2); 3739 scr_erase_screen (2);
4209 scr_change_screen (state); 3740 scr_change_screen (state);
4210 break; 3741 break;
4211 case 1049: /* secondary screen w/ clearing first */ 3742 case 1049: /* secondary screen w/ clearing first */
4212 scr_change_screen (state); 3743 scr_change_screen (state);
4213 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4214 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4215 scr_erase_screen (2); 3746 scr_erase_screen (2);
4216 break; 3747 break;
4217 default: 3748 default:
4218 break; 3749 break;
… …
4346 scr_color (Color_bg, Color_bg); 3877 scr_color (Color_bg, Color_bg);
4347 break; 3878 break;
4348 3879
4349 //case 50: // not variable spacing 3880 //case 50: // not variable spacing
4350 3881
4351#if ENABLE_FRILLS 3882#if !ENABLE_MINIMAL
4352 case 90: 3883 case 90:
4353 case 91: /* set bright fg color */ 3884 case 91: /* set bright fg color */
4354 case 92: 3885 case 92:
4355 case 93: 3886 case 93:
4356 case 94: 3887 case 94:
… …
4380rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
4381{ 3912{
4382 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
4383 3914
4384 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
4385 { /* query graphics */ 3917 /* query graphics */
4386 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
4387 return; 3919 return;
4388 } 3920 }
4389 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
4390 do 3922 do
… …
4440 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4441 3973
4442 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
4443 v_buflen += len; 3975 v_buflen += len;
4444 3976
4445 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
4446} 3978}
4447 3979
4448void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4449{ 3981{
4450 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3982 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4455 3987
4456 if (v_buflen == 0) 3988 if (v_buflen == 0)
4457 { 3989 {
4458 free (v_buffer); 3990 free (v_buffer);
4459 v_buffer = 0; 3991 v_buffer = 0;
4460 v_buflen = 0;
4461 3992
4462 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4463 return; 3994 return;
4464 } 3995 }
4465 3996
4466 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4467 } 3998 }
4468 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4469 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4470} 4001}
4471 4002
4472/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4473 4004

Diff Legend

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