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.279 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 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 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * 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 34 * 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 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
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 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
200 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
202 201
203 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
204 203
205 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
207 206
208 if (y >= 0) 207 if (y >= 0)
209 { 208 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
222 ch = *chr++; 221 ch = *chr++;
223 222
224 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
227# if !UNICODE3 226# if !UNICODE_3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */
298void 303void
299rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
300{ 305{
301 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
302 unsigned int newlen;
303 KeySym keysym; 307 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 308 int valid_keysym;
308 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
309 315
310 /* 316 /*
311 * 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
312 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
313 * 319 *
… …
493# if ISO_14755 499# if ISO_14755
494 iso14755_51 (0); 500 iso14755_51 (0);
495# endif 501# endif
496 return; 502 return;
497 } 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 }
498 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
499 { 513 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
502# if ISO_14755 516# if ISO_14755
… …
504# endif 518# endif
505 return; 519 return;
506 } 520 }
507 else 521 else
508 { 522 {
509# if ENABLE_OVERLAY 523# if ISO_14755
510 scr_overlay_off (); 524 scr_overlay_off ();
511# endif 525# endif
512 iso14755buf = 0; 526 iso14755buf = 0;
513 } 527 }
514 } 528 }
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
518 { 532 {
519 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 534# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 537# endif
524 } 538 }
525#endif 539#endif
526 540
527#ifdef PRINTPIPE 541#ifdef PRINTPIPE
528 if (keysym == XK_Print) 542 if (keysym == XK_Print)
529 { 543 {
530 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
531 return; 545 return;
532 } 546 }
533#endif 547#endif
534 548
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 550 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1;
553#ifdef XK_KP_Home
554 static const KeySym keypadtrans[] = {
555 XK_KP_7, // XK_KP_Home
556 XK_KP_4, // XK_KP_Left
557 XK_KP_8, // XK_KP_Up
558 XK_KP_6, // XK_KP_Right
559 XK_KP_2, // XK_KP_Down
560#ifndef UNSHIFTED_SCROLLKEYS
561 XK_KP_9, // XK_KP_Prior
562 XK_KP_3, // XK_KP_Next
563#else
564 XK_Prior,
565 XK_Next,
566#endif
567 XK_KP_1, // XK_KP_End
568 XK_KP_5, // XK_KP_Begin
569 };
570
571 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
537 { 572 {
538 newlen = 1; 573 unsigned int index = keysym - XK_KP_Home;
574 keysym = kp ? keypadtrans[index] : XK_Home + index;
575 }
576 else if (keysym == XK_KP_Insert)
577 keysym = kp ? XK_KP_0 : XK_Insert;
578#ifndef NO_DELETE_KEY
579 else if (keysym == XK_KP_Delete)
580 keysym = kp ? XK_KP_Decimal : XK_Delete;
581#endif
582#endif
539 switch (keysym) 583 switch (keysym)
540 { 584 {
541#ifndef NO_BACKSPACE_KEY 585#ifndef NO_BACKSPACE_KEY
542 case XK_BackSpace: 586 case XK_BackSpace:
543 if (priv_modes & PrivMode_HaveBackSpace) 587 if (priv_modes & PrivMode_HaveBackSpace)
… …
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177'; 590 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0'; 591 kbuf[1] = '\0';
548 } 592 }
549 else 593 else
550 strcpy (kbuf, key_backspace); 594 strcpy (kbuf, rs[Rs_backspace_key]);
551 break; 595 break;
552#endif 596#endif
553#ifndef NO_DELETE_KEY 597#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
564 case XK_Delete: 598 case XK_Delete:
565 strcpy (kbuf, key_delete); 599 strcpy (kbuf, rs[Rs_delete_key]);
566 break; 600 break;
567#endif 601#endif
568 case XK_Tab: 602 case XK_Tab:
569 if (shft) 603 if (shft)
570 strcpy (kbuf, "\033[Z"); 604 strcpy (kbuf, "\033[Z");
… …
580#endif 614#endif
581 newlen = 0; 615 newlen = 0;
582 } 616 }
583 break; 617 break;
584 618
585#ifdef XK_KP_Left
586 case XK_KP_Up: /* \033Ox or standard */
587 case XK_KP_Down: /* \033Or or standard */
588 case XK_KP_Right: /* \033Ov or standard */
589 case XK_KP_Left: /* \033Ot or standard */
590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
591 {
592 strcpy (kbuf, "\033OZ");
593 kbuf[2] = "txvr"[keysym - XK_KP_Left];
594 break;
595 }
596 else
597 /* translate to std. cursor key */
598 keysym = XK_Left + (keysym - XK_KP_Left);
599 /* FALLTHROUGH */
600#endif
601 case XK_Up: /* "\033[A" */ 619 case XK_Up: /* "\033[A" */
602 case XK_Down: /* "\033[B" */ 620 case XK_Down: /* "\033[B" */
603 case XK_Right: /* "\033[C" */ 621 case XK_Right: /* "\033[C" */
604 case XK_Left: /* "\033[D" */ 622 case XK_Left: /* "\033[D" */
605 strcpy (kbuf, "\033[Z"); 623 strcpy (kbuf, "\033[Z");
… …
615 else if (priv_modes & PrivMode_aplCUR) 633 else if (priv_modes & PrivMode_aplCUR)
616 kbuf[1] = 'O'; 634 kbuf[1] = 'O';
617 break; 635 break;
618 636
619#ifndef UNSHIFTED_SCROLLKEYS 637#ifndef UNSHIFTED_SCROLLKEYS
620# ifdef XK_KP_Prior
621 case XK_KP_Prior:
622 /* allow shift to override */
623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
624 {
625 strcpy (kbuf, "\033Oy");
626 break;
627 }
628 /* FALLTHROUGH */
629# endif
630 case XK_Prior: 638 case XK_Prior:
631 strcpy (kbuf, "\033[5~"); 639 strcpy (kbuf, "\033[5~");
632 break; 640 break;
633# ifdef XK_KP_Next
634 case XK_KP_Next:
635 /* allow shift to override */
636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
637 {
638 strcpy (kbuf, "\033Os");
639 break;
640 }
641 /* FALLTHROUGH */
642# endif
643 case XK_Next: 641 case XK_Next:
644 strcpy (kbuf, "\033[6~"); 642 strcpy (kbuf, "\033[6~");
645 break; 643 break;
646#endif 644#endif
647 case XK_KP_Enter: 645 case XK_KP_Enter:
648 /* allow shift to override */ 646 /* allow shift to override */
649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 647 if (kp)
650 { 648 {
651 strcpy (kbuf, "\033OM"); 649 strcpy (kbuf, "\033OM");
652 break; 650 break;
653 } 651 }
654 652
… …
666 kbuf[0] = '\015'; 664 kbuf[0] = '\015';
667 kbuf[1] = '\0'; 665 kbuf[1] = '\0';
668 } 666 }
669 break; 667 break;
670 668
671#ifdef XK_KP_Begin
672 case XK_KP_Begin:
673 strcpy (kbuf, "\033Ou");
674 break;
675
676#endif
677 case XK_KP_F1: /* "\033OP" */ 669 case XK_KP_F1: /* "\033OP" */
678 case XK_KP_F2: /* "\033OQ" */ 670 case XK_KP_F2: /* "\033OQ" */
679 case XK_KP_F3: /* "\033OR" */ 671 case XK_KP_F3: /* "\033OR" */
680 case XK_KP_F4: /* "\033OS" */ 672 case XK_KP_F4: /* "\033OS" */
681 strcpy (kbuf, "\033OP"); 673 strcpy (kbuf, "\033OP");
… …
697 case XK_KP_6: /* "\033Ov" : "6" */ 689 case XK_KP_6: /* "\033Ov" : "6" */
698 case XK_KP_7: /* "\033Ow" : "7" */ 690 case XK_KP_7: /* "\033Ow" : "7" */
699 case XK_KP_8: /* "\033Ox" : "8" */ 691 case XK_KP_8: /* "\033Ox" : "8" */
700 case XK_KP_9: /* "\033Oy" : "9" */ 692 case XK_KP_9: /* "\033Oy" : "9" */
701 /* allow shift to override */ 693 /* allow shift to override */
702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 694 if (kp)
703 { 695 {
704 strcpy (kbuf, "\033Oj"); 696 strcpy (kbuf, "\033Oj");
705 kbuf[2] += (keysym - XK_KP_Multiply); 697 kbuf[2] += (keysym - XK_KP_Multiply);
706 } 698 }
707 else 699 else
… …
713 705
714 case XK_Find: 706 case XK_Find:
715 strcpy (kbuf, "\033[1~"); 707 strcpy (kbuf, "\033[1~");
716 break; 708 break;
717 709
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_Insert: 710 case XK_Insert:
729 strcpy (kbuf, "\033[2~"); 711 strcpy (kbuf, "\033[2~");
730 break; 712 break;
731#ifdef DXK_Remove /* support for DEC remove like key */ 713#ifdef DXK_Remove /* support for DEC remove like key */
732 case DXK_Remove: 714 case DXK_Remove:
… …
736 strcpy (kbuf, "\033[3~"); 718 strcpy (kbuf, "\033[3~");
737 break; 719 break;
738 case XK_Select: 720 case XK_Select:
739 strcpy (kbuf, "\033[4~"); 721 strcpy (kbuf, "\033[4~");
740 break; 722 break;
741#ifdef XK_KP_End
742 case XK_KP_End:
743 /* allow shift to override */
744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
745 {
746 strcpy (kbuf, "\033Oq");
747 break;
748 }
749 /* FALLTHROUGH */
750#endif
751 case XK_End: 723 case XK_End:
752 strcpy (kbuf, KS_END); 724 strcpy (kbuf, KS_END);
753 break; 725 break;
754#ifdef XK_KP_Home
755 case XK_KP_Home:
756 /* allow shift to override */
757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
758 {
759 strcpy (kbuf, "\033Ow");
760 break;
761 }
762 /* FALLTHROUGH */
763#endif
764 case XK_Home: 726 case XK_Home:
765 strcpy (kbuf, KS_HOME); 727 strcpy (kbuf, KS_HOME);
766 break; 728 break;
767 729
768#define FKEY(n, fkey) \ 730#define FKEY(n, fkey) \
… …
825 break; 787 break;
826 } 788 }
827 789
828 if (newlen) 790 if (newlen)
829 len = strlen (kbuf); 791 len = strlen (kbuf);
830 }
831 792
832 /* 793 /*
833 * Pass meta for all function keys, if 'meta' option set 794 * Pass meta for all function keys, if 'meta' option set
834 */ 795 */
835#ifdef META8_OPTION 796#ifdef META8_OPTION
… …
870 return; 831 return;
871 832
872 if (len <= 0) 833 if (len <= 0)
873 return; /* not mapped */ 834 return; /* not mapped */
874 835
875 if (OPTION (Opt_scrollTtyKeypress)) 836 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 837 if (view_start)
877 { 838 {
878 view_start = 0; 839 view_start = 0;
879 want_refresh = 1; 840 want_refresh = 1;
880 } 841 }
… …
902 { 863 {
903 const char ch = C0_ESC; 864 const char ch = C0_ESC;
904 tt_write (&ch, 1); 865 tt_write (&ch, 1);
905 } 866 }
906 867
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 868 tt_write (kbuf, (unsigned int)len);
918} 869}
919/*}}} */ 870
871void
872rxvt_term::key_release (XKeyEvent &ev)
873{
874#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
875 KeySym keysym;
876
877 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
878#endif
879
880#if ENABLE_FRILLS || ISO_14755
881 // ISO 14755 support
882 if (iso14755buf)
883 if (iso14755buf & ISO_14755_52)
884 {
885# if ISO_14755
886 scr_overlay_off ();
887# endif
888# if ISO_14755
889 // iso14755 part 5.2 handling: release time
890 // first: controls
891 if ((ev.state & ControlMask)
892 && ((keysym >= 0x40 && keysym <= 0x5f)
893 || (keysym >= 0x61 && keysym <= 0x7f)))
894 {
895 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
896 commit_iso14755 ();
897
898 return;
899 }
900
901 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
902 if (i[0] == keysym)
903 {
904 iso14755buf = ISO_14755_51 | i[1];
905 commit_iso14755 ();
906
907 return;
908 }
909
910 scr_bell ();
911# endif
912 iso14755buf = 0;
913
914 return;
915 }
916 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
917 {
918# if ISO_14755
919 scr_overlay_off ();
920# endif
921 if (iso14755buf & ISO_14755_51)
922 commit_iso14755 ();
923#if ISO_14755
924 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
925 {
926 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
927
928 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
929 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
930 }
931# endif
932 else
933 iso14755buf = 0;
934 }
935#endif
936
937 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
938 return;
939
940#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
941 if (!(ev.state & ControlMask))
942 slip_wheel_ev.stop ();
943 else if (keysym == XK_Control_L || keysym == XK_Control_R)
944 mouse_slip_wheel_speed = 0;
945#endif
946}
920 947
921#if defined (KEYSYM_RESOURCE) 948#if defined (KEYSYM_RESOURCE)
922unsigned int 949unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 950rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 951{
… …
954void 981void
955rxvt_term::flush () 982rxvt_term::flush ()
956{ 983{
957 flush_ev.stop (); 984 flush_ev.stop ();
958 985
959#ifdef TRANSPARENT 986#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 987 if (bgPixmap.check_clearChanged ())
961 { 988 {
962 want_full_refresh = 0; 989// scr_clear (true); This needs to be researched further!
963 scr_clear ();
964 scr_touch (false); 990 scr_touch (false);
965 } 991 }
966#endif 992#endif
967 993
968 if (want_refresh) 994 if (want_refresh)
… …
1013 } 1039 }
1014 1040
1015 display->flush (); 1041 display->flush ();
1016} 1042}
1017 1043
1044/* checks wether a refresh is requested and starts the refresh timer */
1018void 1045void
1019rxvt_term::check_cb (check_watcher &w) 1046rxvt_term::refresh_check ()
1047{
1048 if (want_refresh && !flush_ev.is_active ())
1049 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050
1051 display->flush ();
1052}
1053
1054void
1055rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1056{
1021 make_current (); 1057 make_current ();
1022 1058
1023 display->flush ();
1024
1025 if (want_refresh && !flush_ev.active)
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1027}
1028
1029void
1030rxvt_term::flush_cb (time_watcher &w)
1031{
1032 make_current ();
1033
1034 refresh_limit = 1;
1035 refresh_count = 0; 1059 refresh_count = 0;
1036 flush (); 1060 flush ();
1037} 1061}
1038 1062
1039#ifdef CURSOR_BLINK 1063#ifdef CURSOR_BLINK
1040void 1064void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1066{
1043 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1068 want_refresh = 1;
1045 1069 refresh_check ();
1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1047} 1070}
1048#endif 1071#endif
1049 1072
1050#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
1051void 1074void
1052rxvt_term::text_blink_cb (time_watcher &w) 1075rxvt_term::text_blink_cb (ev::timer &w, int revents)
1053{ 1076{
1054 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1055 { 1078 {
1056 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1057 want_refresh = 1; 1080 want_refresh = 1;
1058 w.start (w.at + TEXT_BLINK_INTERVAL); 1081 refresh_check ();
1059 } 1082 }
1083 else
1084 w.stop ();
1060} 1085}
1061#endif 1086#endif
1062 1087
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1089void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1091{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1069 { 1094 {
1070 want_refresh = 1; 1095 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1072 } 1097 }
1098 else
1099 w.stop ();
1073} 1100}
1074#endif 1101#endif
1075 1102
1076#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1077void 1104void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1106{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1108 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1110 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1085 } 1112 }
1113 else
1114 w.stop ();
1086} 1115}
1087#endif 1116#endif
1088 1117
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1119void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1121{
1093 if (mouse_slip_wheel_speed == 0 1122 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1095 : scr_page (UP, mouse_slip_wheel_speed))
1096 { 1123 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1; 1124 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1125 refresh_check ();
1126 }
1127
1128 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1102 } 1129 {
1130 mouse_slip_wheel_speed = 0;
1131 w.stop ();
1132 }
1103} 1133}
1104#endif 1134#endif
1105 1135
1106#if HAVE_SCHED_YIELD 1136#if LINUX_YIELD_HACK
1107static struct event_handler 1137static struct event_handler
1108{ 1138{
1109 check_watcher cw_yield; 1139 ev::prepare yield_ev;
1110 1140
1111 void yield (check_watcher &w) 1141 void yield_cb (ev::prepare &w, int revents)
1112 { 1142 {
1113 sched_yield (); 1143 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than
1145 // ones with high nice levels is a useful thing to do. It surely is is
1146 // allowed by the sus... as is returning ENOSYS.
1147
1148 struct timespec ts = { 0, 0 };
1149 nanosleep (&ts, 0);
1150
1114 w.stop (); 1151 w.stop ();
1115 } 1152 }
1116 1153
1117 event_handler () 1154 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1155 : yield_ev (this, &event_handler::yield_cb)
1119 { 1156 {
1120 } 1157 }
1121} event_handler; 1158} event_handler;
1122#endif 1159#endif
1123 1160
… …
1143 cmdbuf_endp += r; 1180 cmdbuf_endp += r;
1144 return true; 1181 return true;
1145 } 1182 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1183 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1184 {
1148#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1149 if (display->is_local) 1186 if (display->is_local)
1150 event_handler.cw_yield.start (); 1187 event_handler.yield_ev.start ();
1151#endif 1188#endif
1152 } 1189 }
1153 else 1190 else
1154 { 1191 {
1155 pty_ev.stop (); 1192 pty_ev.stop ();
1156 1193
1157 if (!OPTION (Opt_hold)) 1194 if (!option (Opt_hold))
1158 destroy (); 1195 destroy ();
1159 } 1196 }
1160 1197
1161 return false; 1198 return false;
1162} 1199}
1163 1200
1164void 1201void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1202rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1203{
1167 make_current (); 1204 make_current ();
1168 1205
1169 if (revents & EVENT_READ) 1206 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1207 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1208 while (pty_fill ())
1172 if (cmd_parse ()) 1209 if (cmd_parse ())
1173 break; 1210 break;
1174 1211
1175 if (revents & EVENT_WRITE) 1212 if (revents & ev::WRITE)
1176 pty_write (); 1213 pty_write ();
1214
1215 refresh_check ();
1177} 1216}
1178 1217
1179void 1218void
1180rxvt_term::pointer_unblank () 1219rxvt_term::pointer_unblank ()
1181{ 1220{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1221 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1222 recolour_cursor ();
1184 1223
1185#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1225 hidden_pointer = 0;
1187 1226
1188 if (OPTION (Opt_pointerBlank)) 1227 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1228 pointer_ev.start (pointerBlankDelay);
1190#endif 1229#endif
1191} 1230}
1192 1231
1193#ifdef POINTER_BLANK 1232#ifdef POINTER_BLANK
1194void 1233void
1195rxvt_term::pointer_blank () 1234rxvt_term::pointer_blank ()
1196{ 1235{
1197 if (!OPTION (Opt_pointerBlank)) 1236 if (!option (Opt_pointerBlank))
1198 return; 1237 return;
1199 1238
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1239 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1240 XFlush (dpy);
1202 1241
1203 hidden_pointer = 1; 1242 hidden_pointer = 1;
1204} 1243}
1205 1244
1206void 1245void
1207rxvt_term::pointer_cb (time_watcher &w) 1246rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1247{
1209 make_current (); 1248 make_current ();
1210 1249
1211 pointer_blank (); 1250 pointer_blank ();
1212} 1251}
… …
1215void 1254void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1255rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1256{
1218 int button_number, key_state = 0; 1257 int button_number, key_state = 0;
1219 int x, y; 1258 int x, y;
1259 int code = 32;
1220 1260
1221 x = ev.x; 1261 x = Pixel2Col (ev.x);
1222 y = ev.y; 1262 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1263 if (ev.type == MotionNotify)
1264 {
1265 if (x == mouse_row && y == mouse_col)
1266 return;
1267 mouse_row = x;
1268 mouse_col = y;
1269 code += 32;
1270 }
1224 1271
1225 if (MEvent.button == AnyButton) 1272 if (MEvent.button == AnyButton)
1226 button_number = 3; 1273 button_number = 3;
1227 else 1274 else
1228 { 1275 {
… …
1274 x + 1, 1321 x + 1,
1275 y + 1); 1322 y + 1);
1276#endif 1323#endif
1277 1324
1278 tt_printf ("\033[M%c%c%c", 1325 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1326 (code + button_number + key_state),
1280 (32 + x + 1), 1327 (32 + x + 1),
1281 (32 + y + 1)); 1328 (32 + y + 1));
1282} 1329}
1283
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293 1330
1294/*{{{ process an X event */ 1331/*{{{ process an X event */
1295void 1332void
1296rxvt_term::x_cb (XEvent &ev) 1333rxvt_term::x_cb (XEvent &ev)
1297{ 1334{
1298 make_current (); 1335 make_current ();
1299 1336
1300 dDisp; 1337 dLocal (Display *, dpy);
1301 1338
1302 if (ev.xany.window == vt 1339 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1340 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1341 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1342 return;
… …
1310 unsigned int unused_mask; 1347 unsigned int unused_mask;
1311 1348
1312 switch (ev.type) 1349 switch (ev.type)
1313 { 1350 {
1314 case KeyPress: 1351 case KeyPress:
1315#if ISO_14755 1352 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1353 break;
1321 1354
1322 case KeyRelease: 1355 case KeyRelease:
1323 { 1356 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1357 break;
1395 }
1396 1358
1397 case ButtonPress: 1359 case ButtonPress:
1398 button_press (ev.xbutton); 1360 button_press (ev.xbutton);
1399 break; 1361 break;
1400 1362
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1377 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1378 destroy ();
1417 } 1379 }
1418#if ENABLE_EWMH 1380#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1382 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1384 &ev);
1423#endif 1385#endif
1424 } 1386 }
1425 } 1387 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1394 focus_out ();
1433 } 1395 }
1434#endif 1396#endif
1435 } 1397 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1398 break;
1441 1399
1442 /* 1400 /*
1443 * XXX: this is not the _current_ arrangement 1401 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1402 * Here's my conclusion:
… …
1463 break; 1421 break;
1464 } 1422 }
1465 break; 1423 break;
1466 1424
1467 case FocusIn: 1425 case FocusIn:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1429 focus_in ();
1469 break; 1430 break;
1470 1431
1471 case FocusOut: 1432 case FocusOut:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1436 focus_out ();
1473 break; 1437 break;
1474 1438
1475 case ConfigureNotify: 1439 case ConfigureNotify:
1440 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height);*/
1476 if (ev.xconfigure.window == parent[0]) 1443 if (ev.xconfigure.window == parent[0])
1477 { 1444 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1446 ;
1480 1447
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1449 {
1483 seen_resize = 1; 1450 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1452 }
1453 else
1454 {
1455#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ())
1457 {
1458 if (mapped)
1459 update_background ();
1460 else
1461 bgPixmap.invalidate ();
1462 }
1463#endif
1464 }
1486 1465
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1490 if (OPTION (Opt_transparent))
1491 check_our_parents ();
1492#endif
1493 } 1467 }
1494 break; 1468 break;
1495 1469
1496 case PropertyNotify: 1470 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1471 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1513 case SelectionRequest: 1487 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1488 selection_send (ev.xselectionrequest);
1515 break; 1489 break;
1516 1490
1517 case MapNotify: 1491 case MapNotify:
1492#ifdef HAVE_BG_PIXMAP
1493 /* This is needed spcifically to fix the case of no window manager or a
1494 * non-reparenting window manager. In those cases we never get first
1495 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1496 * care of multiplicity of ConfigureNotify events arriwing while WM does
1497 * reparenting.
1498 * We should not render background immidiately, as there could be several
1499 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1500 * by scheduling background redraw as soon as we can, but giving a short
1501 * bit of time for ConfigureNotifies to arrive.
1502 * We should render background PRIOR to drawing any text, but AFTER all
1503 * of ConfigureNotifys for the best results.
1504 */
1505 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1506 update_background_ev.start (0.025);
1507#endif
1518 mapped = 1; 1508 mapped = 1;
1519#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start ();
1521#endif 1511#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1513 break;
1524 1514
1525 case UnmapNotify: 1515 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1518 text_blink_ev.stop ();
1529#endif 1519#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1521 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1522
1539 case GraphicsExpose: 1523 case GraphicsExpose:
1540 case Expose: 1524 case Expose:
1541 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1542 { 1526 {
1543 do 1527 do
1528 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1529 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1530 ev.xexpose.width, ev.xexpose.height, False);
1531 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1533
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1534 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1535
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1537 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1538 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1539 ev.xexpose.width, ev.xexpose.height, False);
1540 }
1553 1541
1554 want_refresh = 1; 1542 want_refresh = 1;
1555 } 1543 }
1556 else 1544 else
1557 { 1545 {
1558 XEvent unused_event; 1546 XEvent unused_event;
1559 1547
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1548 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1549 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1551 ;
1564 1552
1565 if (isScrollbarWindow (ev.xany.window)) 1553 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1554 {
1567 scrollBar.setIdle (); 1555 scrollBar.state = STATE_IDLE;
1568 scrollbar_show (0); 1556 scrollbar_show (0);
1569 } 1557 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1558 }
1576 break; 1559 break;
1577 1560
1578 case MotionNotify: 1561 case MotionNotify:
1579#ifdef POINTER_BLANK 1562#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1563 if (hidden_pointer)
1581 pointer_unblank (); 1564 pointer_unblank ();
1582#endif 1565#endif
1566 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1567 || priv_modes & PrivMode_MouseAnyEvent)
1568 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1569 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1570 break;
1585 1571
1586 if (ev.xany.window == vt) 1572 if (ev.xany.window == vt)
1587 { 1573 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1574 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1575 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1576 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1577 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1578 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1579 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1580 ;
1595 1581
1596 XQueryPointer (disp, vt, 1582 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1583 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1584 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1585 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1586 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1587#ifdef MOUSE_THRESHOLD
… …
1621 int dist; 1607 int dist;
1622 1608
1623 /* don't clobber the current delay if we are 1609 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1610 * already in the middle of scrolling.
1625 */ 1611 */
1626 if (!sel_scroll_ev.active) 1612 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1613 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1614
1629 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1631 */ 1617 */
1632 selection_save_x = ev.xbutton.x; 1618 selection_save_x = ev.xbutton.x;
… …
1654 else 1640 else
1655 { 1641 {
1656 /* we are within the text window, so we 1642 /* we are within the text window, so we
1657 * shouldn't be scrolling 1643 * shouldn't be scrolling
1658 */ 1644 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1645 sel_scroll_ev.stop();
1661 } 1646 }
1662#endif 1647#endif
1663#ifdef MOUSE_THRESHOLD 1648#ifdef MOUSE_THRESHOLD
1664 } 1649 }
1665#endif 1650#endif
1666 } 1651 }
1667 } 1652 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1653 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1654 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1655 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1656 MotionNotify, &ev))
1672 ; 1657 ;
1673 1658
1674 XQueryPointer (disp, scrollBar.win, 1659 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1660 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1661 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1662 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1663 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1665 scrollbar_size ());
1681 want_refresh = 1; 1666 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1667 scrollbar_show (1);
1684 } 1668 }
1685 break; 1669 break;
1686 } 1670 }
1687 1671
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1672#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1673 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1674 {
1693 if (hidden_cursor) 1675 if (hidden_cursor)
1694 { 1676 {
1695 hidden_cursor = 0; 1677 hidden_cursor = 0;
1696 want_refresh = 1; 1678 want_refresh = 1;
1697 } 1679 }
1698 1680
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1681 cursor_blink_ev.again ();
1700 } 1682 }
1701#endif 1683#endif
1702 1684
1703#if defined(POINTER_BLANK) 1685#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1686 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1687 {
1706 if (ev.type == MotionNotify 1688 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1689 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1690 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1691 if (hidden_pointer)
… …
1711 1693
1712 if (ev.type == KeyPress && hidden_pointer == 0) 1694 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank (); 1695 pointer_blank ();
1714 } 1696 }
1715#endif 1697#endif
1698
1699 refresh_check ();
1716} 1700}
1717 1701
1718void 1702void
1719rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1720{ 1704{
1721 if (!focus) 1705 if (!focus)
1722 { 1706 {
1723 focus = 1; 1707 focus = 1;
1724 want_refresh = 1; 1708 want_refresh = 1;
1725 1709
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1710 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727 1711
1728#if USE_XIM 1712#if USE_XIM
1729 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1730 { 1714 {
1731 IMSetStatusPosition (); 1715 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1733 } 1717 }
1734#endif 1718#endif
1735#if CURSOR_BLINK 1719#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1720 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1721 cursor_blink_ev.again ();
1738#endif 1722#endif
1739#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1741 { 1725 {
1742 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1727 scr_recolour ();
1744 } 1728 }
1745#endif 1729#endif
1730#if ENABLE_FRILLS
1731 if (option (Opt_urgentOnBell))
1732 {
1733 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1734 {
1735 h->flags &= ~XUrgencyHint;
1736 XSetWMHints (dpy, parent[0], h);
1737 }
1738 }
1739#endif
1746 } 1740 }
1747} 1741}
1748 1742
1749void 1743void
1750rxvt_term::focus_out () 1744rxvt_term::focus_out ()
… …
1758 1752
1759#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1754 if (iso14755buf)
1761 { 1755 {
1762 iso14755buf = 0; 1756 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1757# if ISO_14755
1764 scr_overlay_off (); 1758 scr_overlay_off ();
1765# endif 1759# endif
1766 } 1760 }
1767#endif 1761#endif
1768#if USE_XIM 1762#if USE_XIM
1769 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1771#endif 1765#endif
1772#if CURSOR_BLINK 1766#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1775 hidden_cursor = 0; 1770 hidden_cursor = 0;
1776#endif 1771#endif
1777#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1779 { 1774 {
… …
1782 } 1777 }
1783#endif 1778#endif
1784 } 1779 }
1785} 1780}
1786 1781
1787#if TRANSPARENT 1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1796void
1789rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1798{
1791 make_current (); 1799 make_current ();
1792 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if ENABLE_TRANSPARENCY
1793 switch (ev.type) 1806 switch (ev.type)
1794 { 1807 {
1795 case PropertyNotify: 1808 case PropertyNotify:
1796 /* 1809 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
1798 * use the property to determine the pixmap. We use it later on. 1811 * use the property to determine the pixmap. We use it later on.
1799 */ 1812 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1815 {
1816 bgPixmap.set_root_pixmap ();
1817 update_background ();
1818 }
1803 1819
1804 /* FALLTHROUGH */
1805 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1820 break;
1809 } 1821 }
1822# endif
1823
1824 refresh_check ();
1810} 1825}
1811#endif 1826#endif
1812 1827
1813void 1828void
1814rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
… …
1823 /* 1838 /*
1824 * VT window processing of button press 1839 * VT window processing of button press
1825 */ 1840 */
1826 if (ev.window == vt) 1841 if (ev.window == vt)
1827 { 1842 {
1843 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1844 return;
1845
1828#if ISO_14755 1846#if ISO_14755
1829 // 5.4 1847 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1848 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1849 {
1832 iso14755_54 (ev.x, ev.y); 1850 iso14755_54 (ev.x, ev.y);
… …
1866 mouse_report (ev); 1884 mouse_report (ev);
1867 } 1885 }
1868#else 1886#else
1869 MEvent.button = ev.button; 1887 MEvent.button = ev.button;
1870 mouse_report (ev); 1888 mouse_report (ev);
1871#endif /* MOUSE_REPORT_DOUBLECLICK */ 1889#endif /* MOUSE_REPORT_DOUBLECLICK */
1872 1890
1873 } 1891 }
1874 else 1892 else
1875 { 1893 {
1876 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1895 MEvent.clicks = 0;
1878 1896
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1897 switch (ev.button)
1881 { 1898 {
1882 case Button1: 1899 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1900 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1901 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1902#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1903 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1904#else
1888 selection.rect = false; 1905 selection.rect = false;
1889#endif 1906#endif
1890 1907
1891 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1910 {
1894 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1896 else 1913 else
1897 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
1898 } 1915 }
1899 else 1916 else
1900 { 1917 {
1901 if (MEvent.button == Button1 && clickintime) 1918 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1919 MEvent.clicks++;
1903 else 1920 else
1904 MEvent.clicks = 1; 1921 MEvent.clicks = 1;
1905 1922
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1923 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1924 }
1908 1925
1909 MEvent.button = Button1; 1926 MEvent.button = Button1;
1910 break; 1927 break;
1911 1928
1912 case Button3: 1929 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1930 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1915 else 1932 else
1916 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
1917 1934
1918 MEvent.button = Button3; 1935 MEvent.button = Button3;
1919 break; 1936 break;
1920 } 1937 }
1921 } 1938 }
1922 1939
1923 MEvent.time = ev.time; 1940 MEvent.time = ev.time;
1924 return; 1941 return;
1925 } 1942 }
1926 1943
1927 /* 1944 /*
1928 * Scrollbar window processing of button press 1945 * Scrollbar window processing of button press
1929 */ 1946 */
1930 if (isScrollbarWindow (ev.window)) 1947 if (scrollBar.state && ev.window == scrollBar.win)
1931 { 1948 {
1932 scrollBar.setIdle (); 1949 page_dirn direction = NO_DIR;
1950
1951 if (scrollBar.upButton (ev.y))
1952 direction = UP; /* up */
1953 else if (scrollBar.dnButton (ev.y))
1954 direction = DN; /* down */
1955
1956 scrollBar.state = STATE_IDLE;
1933 /* 1957 /*
1934 * Rxvt-style scrollbar: 1958 * Rxvt-style scrollbar:
1935 * move up if mouse is above slider 1959 * move up if mouse is above slider
1936 * move dn if mouse is below slider 1960 * move dn if mouse is below slider
1937 * 1961 *
… …
1946 /* 1970 /*
1947 * Mouse report disabled scrollbar: 1971 * Mouse report disabled scrollbar:
1948 * arrow buttons - send up/down 1972 * arrow buttons - send up/down
1949 * click on scrollbar - send pageup/down 1973 * click on scrollbar - send pageup/down
1950 */ 1974 */
1951 if ((scrollBar.style == R_SB_NEXT 1975 if (direction == UP)
1952 && scrollbarnext_upButton (ev.y))
1953 || (scrollBar.style == R_SB_RXVT
1954 && scrollbarrxvt_upButton (ev.y)))
1955 tt_printf ("\033[A"); 1976 tt_printf ("\033[A");
1956 else if ((scrollBar.style == R_SB_NEXT 1977 else if (direction == DN)
1957 && scrollbarnext_dnButton (ev.y))
1958 || (scrollBar.style == R_SB_RXVT
1959 && scrollbarrxvt_dnButton (ev.y)))
1960 tt_printf ("\033[B"); 1978 tt_printf ("\033[B");
1961 else 1979 else
1962 switch (ev.button) 1980 switch (ev.button)
1963 { 1981 {
1964 case Button2: 1982 case Button2:
… …
1971 tt_printf ("\033[5~"); 1989 tt_printf ("\033[5~");
1972 break; 1990 break;
1973 } 1991 }
1974 } 1992 }
1975 else 1993 else
1976#endif /* NO_SCROLLBAR_REPORT */ 1994#endif /* NO_SCROLLBAR_REPORT */
1977
1978 {
1979 char upordown = 0;
1980
1981 if (scrollBar.style == R_SB_NEXT)
1982 { 1995 {
1983 if (scrollbarnext_upButton (ev.y)) 1996 if (direction != NO_DIR)
1984 upordown = -1; /* up */
1985 else if (scrollbarnext_dnButton (ev.y))
1986 upordown = 1; /* down */
1987 }
1988 else if (scrollBar.style == R_SB_RXVT)
1989 {
1990 if (scrollbarrxvt_upButton (ev.y))
1991 upordown = -1; /* up */
1992 else if (scrollbarrxvt_dnButton (ev.y))
1993 upordown = 1; /* down */
1994 }
1995 if (upordown)
1996 { 1997 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1998#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1999 if (!cont_scroll_ev.is_active ())
1998 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999#endif 2001#endif
2000 if (scr_page (upordown < 0 ? UP : DN, 1)) 2002 if (scr_page (direction, 1))
2001 { 2003 {
2002 if (upordown < 0) 2004 if (direction == UP)
2003 scrollBar.setUp (); 2005 scrollBar.state = STATE_UP;
2004 else 2006 else
2005 scrollBar.setDn (); 2007 scrollBar.state = STATE_DOWN;
2006 } 2008 }
2007 } 2009 }
2008 else 2010 else
2009 switch (ev.button) 2011 switch (ev.button)
2010 { 2012 {
2011 case Button2: 2013 case Button2:
2012 switch (scrollbar_align) 2014 switch (scrollBar.align)
2013 { 2015 {
2014 case R_SB_ALIGN_TOP: 2016 case R_SB_ALIGN_TOP:
2015 csrO = 0; 2017 csrO = 0;
2016 break; 2018 break;
2017 case R_SB_ALIGN_CENTRE: 2019 case R_SB_ALIGN_CENTRE:
… …
2025 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
2026 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
2027 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
2028 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2029 2031
2030 scrollBar.setMotion (); 2032 scrollBar.state = STATE_MOTION;
2031 break; 2033 break;
2032 2034
2033 case Button1: 2035 case Button1:
2034 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2036 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2035 csrO = ev.y - scrollBar.top; 2037 csrO = ev.y - scrollBar.top;
2036 /* FALLTHROUGH */ 2038 /* FALLTHROUGH */
2037 2039
2038 case Button3: 2040 case Button3:
2039 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
… …
2049 scr_page (DN, nrow - 1); 2051 scr_page (DN, nrow - 1);
2050# else 2052# else
2051 scr_page (DN, nrow / 4); 2053 scr_page (DN, nrow / 4);
2052# endif 2054# endif
2053 else 2055 else
2054 scrollBar.setMotion (); 2056 scrollBar.state = STATE_MOTION;
2055 } 2057 }
2056 else 2058 else
2057 { 2059 {
2058 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
2059 (nrow 2061 (nrow
… …
2076 2078
2077 csrO = 0; /* reset csr Offset */ 2079 csrO = 0; /* reset csr Offset */
2078 if (!bypass_keystate) 2080 if (!bypass_keystate)
2079 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2080 2082
2081 if (scrollbar_isUpDn ()) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2082 { 2084 {
2083 scrollBar.setIdle (); 2085 scrollBar.state = STATE_IDLE;
2084 scrollbar_show (0); 2086 scrollbar_show (0);
2085 } 2087 }
2086 2088
2087#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2088 if (sel_scroll_ev.active)
2089 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
2090#endif 2091#endif
2091 2092
2092 if (ev.window == vt) 2093 if (ev.window == vt)
2093 { 2094 {
2095 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2096 return;
2097
2094#if ISO_14755 2098#if ISO_14755
2095 // 5.4 2099 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2100 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2101 return;
2098#endif 2102#endif
2103
2099 if (reportmode) 2104 if (reportmode)
2100 { 2105 {
2101 /* mouse report from vt window */ 2106 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2107 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2108 if (ev.button >= 4)
… …
2114 mouse_report (ev); 2119 mouse_report (ev);
2115 } 2120 }
2116#else /* MOUSE_REPORT_DOUBLECLICK */ 2121#else /* MOUSE_REPORT_DOUBLECLICK */
2117 MEvent.button = AnyButton; 2122 MEvent.button = AnyButton;
2118 mouse_report (ev); 2123 mouse_report (ev);
2119#endif /* MOUSE_REPORT_DOUBLECLICK */ 2124#endif /* MOUSE_REPORT_DOUBLECLICK */
2120 return; 2125 return;
2121 } 2126 }
2122 2127
2123 /* 2128 /*
2124 * dumb hack to compensate for the failure of click-and-drag 2129 * dumb hack to compensate for the failure of click-and-drag
… …
2127 if (priv_modes & PrivMode_mouse_report 2132 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2133 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2134 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2135 selection_extend (ev.x, ev.y, 0);
2131 2136
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2137 switch (ev.button)
2136 { 2138 {
2137 case Button1: 2139 case Button1:
2138 case Button3: 2140 case Button3:
2139 selection_make (ev.time); 2141 selection_make (ev.time);
2140 break; 2142 break;
2141 2143
2142 case Button2: 2144 case Button2:
2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2145 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2145 break; 2147 break;
2146 2148
2147#ifdef MOUSE_WHEEL 2149#ifdef MOUSE_WHEEL
2148 case Button4: 2150 case Button4:
2149 case Button5: 2151 case Button5:
… …
2153 2155
2154 v = ev.button == Button4 ? UP : DN; 2156 v = ev.button == Button4 ? UP : DN;
2155 2157
2156 if (ev.state & ShiftMask) 2158 if (ev.state & ShiftMask)
2157 i = 1; 2159 i = 1;
2158 else if (OPTION (Opt_mouseWheelScrollPage)) 2160 else if (option (Opt_mouseWheelScrollPage))
2159 i = nrow - 1; 2161 i = nrow - 1;
2160 else 2162 else
2161 i = 5; 2163 i = 5;
2162 2164
2163# ifdef MOUSE_SLIP_WHEELING 2165# ifdef MOUSE_SLIP_WHEELING
… …
2165 { 2167 {
2166 mouse_slip_wheel_speed += v ? -1 : 1; 2168 mouse_slip_wheel_speed += v ? -1 : 1;
2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2169 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2169 2171
2170 if (slip_wheel_ev.at < NOW) 2172 if (!slip_wheel_ev.is_active ())
2171 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2172
2173 slip_wheel_ev.start ();
2174 } 2174 }
2175 else 2175 else
2176# endif
2176 { 2177 {
2177# endif
2178 scr_page (v, i); 2178 scr_page (v, i);
2179 scrollbar_show (1); 2179 scrollbar_show (1);
2180# ifdef MOUSE_SLIP_WHEELING
2181 } 2180 }
2182# endif
2183 } 2181 }
2184 break; 2182 break;
2185#endif 2183#endif
2186 } 2184 }
2187 } 2185 }
2188} 2186}
2189
2190#ifdef TRANSPARENT
2191#if TINTING
2192/* taken from aterm-0.4.2 */
2193
2194typedef uint32_t RUINT32T;
2195
2196void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2197{
2198 int sh_r, sh_g, sh_b;
2199 RUINT32T mask_r, mask_g, mask_b;
2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2203 int i;
2204
2205 Visual *visual = display->visual;
2206
2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2208
2209 /* for convenience */
2210 mask_r = visual->red_mask;
2211 mask_g = visual->green_mask;
2212 mask_b = visual->blue_mask;
2213
2214 /* boring lookup table pre-initialization */
2215 switch (srcImage->bits_per_pixel) {
2216 case 15:
2217 if ((mask_r != 0x7c00) ||
2218 (mask_g != 0x03e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+32;
2225 sh_r = 10;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 16:
2230 if ((mask_r != 0xf800) ||
2231 (mask_g != 0x07e0) ||
2232 (mask_b != 0x001f))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2235 lookup_r = lookup;
2236 lookup_g = lookup+32;
2237 lookup_b = lookup+32+64;
2238 sh_r = 11;
2239 sh_g = 5;
2240 sh_b = 0;
2241 break;
2242 case 24:
2243 if ((mask_r != 0xff0000) ||
2244 (mask_g != 0x00ff00) ||
2245 (mask_b != 0x0000ff))
2246 return;
2247 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2248 lookup_r = lookup;
2249 lookup_g = lookup+256;
2250 lookup_b = lookup+256+256;
2251 sh_r = 16;
2252 sh_g = 8;
2253 sh_b = 0;
2254 break;
2255 case 32:
2256 if ((mask_r != 0xff0000) ||
2257 (mask_g != 0x00ff00) ||
2258 (mask_b != 0x0000ff))
2259 return;
2260 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2261 lookup_r = lookup;
2262 lookup_g = lookup+256;
2263 lookup_b = lookup+256+256;
2264 sh_r = 16;
2265 sh_g = 8;
2266 sh_b = 0;
2267 break;
2268 default:
2269 return; /* we do not support this color depth */
2270 }
2271
2272 /* prepare limits for color transformation (each channel is handled separately) */
2273 if (shade < 0) {
2274 shade = -shade;
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = 65535-rm;
2279 lower_lim_g = 65535-gm;
2280 lower_lim_b = 65535-bm;
2281
2282 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2283 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2284 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2285
2286 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2287 } else {
2288 if (shade < 0) shade = 0;
2289 if (shade > 100) shade = 100;
2290
2291 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2292
2293 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2294 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2295 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2296 }
2297
2298 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2299 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2300 {
2301 unsigned int tmp;
2302
2303 tmp = lower_lim_r;
2304 lower_lim_r = lower_lim_b;
2305 lower_lim_b = tmp;
2306
2307 tmp = upper_lim_r;
2308 upper_lim_r = upper_lim_b;
2309 upper_lim_b = tmp;
2310 }
2311
2312 /* fill our lookup tables */
2313 for (i = 0; i <= mask_r>>sh_r; i++)
2314 {
2315 RUINT32T tmp;
2316 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2317 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2318 lookup_r[i] = (tmp/65535)<<sh_r;
2319 }
2320 for (i = 0; i <= mask_g>>sh_g; i++)
2321 {
2322 RUINT32T tmp;
2323 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2324 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2325 lookup_g[i] = (tmp/65535)<<sh_g;
2326 }
2327 for (i = 0; i <= mask_b>>sh_b; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2331 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2332 lookup_b[i] = (tmp/65535)<<sh_b;
2333 }
2334
2335 /* apply table to input image (replacing colors by newly calculated ones) */
2336 switch (srcImage->bits_per_pixel)
2337 {
2338 case 15:
2339 {
2340 unsigned short *p1, *pf, *p, *pl;
2341 p1 = (unsigned short *) srcImage->data;
2342 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2343 while (p1 < pf)
2344 {
2345 p = p1;
2346 pl = p1 + srcImage->width;
2347 for (; p < pl; p++)
2348 {
2349 *p = lookup_r[(*p & 0x7c00)>>10] |
2350 lookup_g[(*p & 0x03e0)>> 5] |
2351 lookup_b[(*p & 0x001f)];
2352 }
2353 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2354 }
2355 break;
2356 }
2357 case 16:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0xf800)>>11] |
2369 lookup_g[(*p & 0x07e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 24:
2377 {
2378 unsigned char *p1, *pf, *p, *pl;
2379 p1 = (unsigned char *) srcImage->data;
2380 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width * 3;
2385 for (; p < pl; p += 3)
2386 {
2387 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2388 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2389 p[2] = lookup_r[(p[2] & 0x0000ff)];
2390 }
2391 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 32:
2396 {
2397 RUINT32T *p1, *pf, *p, *pl;
2398 p1 = (RUINT32T *) srcImage->data;
2399 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400
2401 while (p1 < pf)
2402 {
2403 p = p1;
2404 pl = p1 + srcImage->width;
2405 for (; p < pl; p++)
2406 {
2407 *p = lookup_r[(*p & 0xff0000)>>16] |
2408 lookup_g[(*p & 0x00ff00)>> 8] |
2409 lookup_b[(*p & 0x0000ff)] |
2410 (*p & ~0xffffff);
2411 }
2412 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 }
2417
2418 free (lookup);
2419}
2420#endif
2421
2422/*
2423 * Check our parents are still who we think they are.
2424 * Do transparency updates if required
2425 */
2426int
2427rxvt_term::check_our_parents ()
2428{
2429 int i, pchanged, aformat, have_pixmap, rootdepth;
2430 unsigned long nitems, bytes_after;
2431 Atom atype;
2432 unsigned char *prop = NULL;
2433 Window root, oldp, *list;
2434 Pixmap rootpixmap = None;
2435 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2437
2438 pchanged = 0;
2439
2440 if (!OPTION (Opt_transparent))
2441 return pchanged; /* Don't try any more */
2442
2443 XGetWindowAttributes (disp, display->root, &wrootattr);
2444 rootdepth = wrootattr.depth;
2445
2446 XGetWindowAttributes (disp, parent[0], &wattr);
2447
2448 if (rootdepth != wattr.depth)
2449 {
2450 if (am_transparent)
2451 {
2452 pchanged = 1;
2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2454 am_transparent = am_pixmap_trans = 0;
2455 }
2456
2457 return pchanged; /* Don't try any more */
2458 }
2459
2460 /* Get all X ops out of the queue so that our information is up-to-date. */
2461 XSync (disp, False);
2462
2463 /*
2464 * Make the frame window set by the window manager have
2465 * the root background. Some window managers put multiple nested frame
2466 * windows for each client, so we have to take care about that.
2467 */
2468 i = (xa[XA_XROOTPMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success);
2472
2473 if (!i || prop == NULL)
2474 i = (xa[XA_ESETROOT_PMAP_ID]
2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2477 &nitems, &bytes_after, &prop) == Success);
2478
2479 if (!i || prop == NULL
2480#if TINTING
2481 || !rs[Rs_color + Color_tint]
2482#endif
2483 )
2484 have_pixmap = 0;
2485 else
2486 {
2487 have_pixmap = 1;
2488 rootpixmap = *(Pixmap *)prop;
2489 XFree (prop);
2490 }
2491
2492 if (have_pixmap)
2493 {
2494 /*
2495 * Copy display->root pixmap transparency
2496 */
2497 int sx, sy, nx, ny;
2498 unsigned int nw, nh;
2499 Window cr;
2500 XImage *image;
2501 GC gc;
2502 XGCValues gcvalue;
2503
2504 XTranslateCoordinates (disp, parent[0], display->root,
2505 0, 0, &sx, &sy, &cr);
2506 nw = (unsigned int)szHint.width;
2507 nh = (unsigned int)szHint.height;
2508 nx = ny = 0;
2509
2510 if (sx < 0)
2511 {
2512 nw += sx;
2513 nx = -sx;
2514 sx = 0;
2515 }
2516
2517 if (sy < 0)
2518 {
2519 nh += sy;
2520 ny = -sy;
2521 sy = 0;
2522 }
2523
2524 min_it (nw, (unsigned int) (wrootattr.width - sx));
2525 min_it (nh, (unsigned int) (wrootattr.height - sy));
2526
2527 XSync (disp, False);
2528 allowedxerror = -1;
2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2530
2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2532 /* XXX: may need a delay here? */
2533 allowedxerror = 0;
2534
2535 if (image == NULL)
2536 {
2537 if (am_transparent && am_pixmap_trans)
2538 {
2539 pchanged = 1;
2540 if (pixmap != None)
2541 {
2542 XFreePixmap (disp, pixmap);
2543 pixmap = None;
2544 }
2545 }
2546
2547 am_pixmap_trans = 0;
2548 }
2549 else
2550 {
2551 if (pixmap != None)
2552 XFreePixmap (disp, pixmap);
2553
2554#if TINTING
2555 if (ISSET_PIXCOLOR (Color_tint))
2556 {
2557 unsigned short rm, gm, bm;
2558 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2559
2560 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2561
2562 ShadeXImage (display, image, shade, rm, gm, bm);
2563 }
2564#endif
2565
2566 pixmap = XCreatePixmap (disp, vt,
2567 szHint.width, szHint.height, image->depth);
2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2569 XPutImage (disp, pixmap, gc, image, 0, 0,
2570 nx, ny, image->width, image->height);
2571 XFreeGC (disp, gc);
2572 XDestroyImage (image);
2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2574 XClearWindow (disp, parent[0]);
2575
2576 if (!am_transparent || !am_pixmap_trans)
2577 pchanged = 1;
2578
2579 am_transparent = am_pixmap_trans = 1;
2580 }
2581 }
2582
2583 if (am_pixmap_trans)
2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 else
2586 {
2587 unsigned int n;
2588 /*
2589 * InheritPixmap transparency
2590 */
2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2592 {
2593 oldp = parent[i];
2594 XQueryTree (disp, parent[i - 1], &root,
2595 &parent[i], &list, &n);
2596 XFree (list);
2597
2598 if (parent[i] == display->root)
2599 {
2600 if (oldp != None)
2601 pchanged = 1;
2602
2603 break;
2604 }
2605
2606 if (oldp != parent[i])
2607 pchanged = 1;
2608 }
2609
2610 n = 0;
2611
2612 if (pchanged)
2613 {
2614 for (; n < (unsigned int)i; n++)
2615 {
2616 XGetWindowAttributes (disp, parent[n], &wattr);
2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2618 {
2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2620 break;
2621 }
2622 }
2623 }
2624
2625 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2626 {
2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2629 am_transparent = 0;
2630 /* XXX: also turn off Opt_transparent? */
2631 }
2632 else
2633 {
2634 for (n = 0; n < (unsigned int)i; n++)
2635 {
2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]);
2638 }
2639
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 am_transparent = 1;
2642 }
2643
2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645 parent[i] = None;
2646 }
2647
2648 if (scrollBar.win)
2649 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle ();
2652 scrollbar_show (0);
2653 }
2654
2655 if (am_transparent)
2656 {
2657 want_refresh = want_full_refresh = 1;
2658 if (am_pixmap_trans)
2659 flush ();
2660 }
2661
2662 return pchanged;
2663}
2664#endif
2665 2187
2666/*}}} */ 2188/*}}} */
2667 2189
2668bool 2190bool
2669rxvt_term::cmd_parse () 2191rxvt_term::cmd_parse ()
… …
2718 if (ch == C0_LF) 2240 if (ch == C0_LF)
2719 nlines++; 2241 nlines++;
2720 2242
2721 refresh_count++; 2243 refresh_count++;
2722 2244
2723 if (!OPTION (Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2725 { 2246 {
2726 refreshnow = true;
2727 refresh_count = 0; 2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2251 refreshnow = true;
2728 ch = NOCHAR; 2252 ch = NOCHAR;
2729 break; 2253 break;
2254 }
2730 } 2255 }
2731 2256
2732 // scr_add_lines only works for nlines <= nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2258 if (nlines >= nrow - 1)
2734 { 2259 {
… …
2762 && 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))))
2763 scr_add_lines (buf, str - buf, nlines); 2288 scr_add_lines (buf, str - buf, nlines);
2764 2289
2765 /* 2290 /*
2766 * 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
2767 * 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.
2768 * the number of pages between refreshes is refresh_limit, which 2293 * if skipScroll is enabled.
2769 * is incremented here because we must be doing flat-out scrolling.
2770 */ 2294 */
2771 if (refreshnow) 2295 if (refreshnow)
2772 { 2296 {
2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2774 refresh_limit++;
2775 else
2776 {
2777 flag = true; 2297 flag = true;
2778 scr_refresh (); 2298 scr_refresh ();
2779 want_refresh = 1; 2299 want_refresh = 1;
2780 }
2781 } 2300 }
2782 2301
2783 } 2302 }
2784 else 2303 else
2785 { 2304 {
… …
2934 { 2453 {
2935 if ((buf[len++] = cmd_getc ()) == 'i') 2454 if ((buf[len++] = cmd_getc ()) == 'i')
2936 break; /* done = 1 */ 2455 break; /* done = 1 */
2937 } 2456 }
2938 } 2457 }
2939 2458
2940 for (i = 0; i < len; i++) 2459 for (i = 0; i < len; i++)
2941 if (putc (buf[i], fd) == EOF) 2460 if (putc (buf[i], fd) == EOF)
2942 { 2461 {
2943 done = 1; 2462 done = 1;
2944 break; 2463 break;
… …
2946 } 2465 }
2947 } 2466 }
2948 2467
2949 pclose_printer (fd); 2468 pclose_printer (fd);
2950} 2469}
2951#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2952/*}}} */ 2471/*}}} */
2953 2472
2954/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2955enum { 2474enum {
2956 C1_40 = 0x40, 2475 C1_40 = 0x40,
… …
3006 process_dcs_seq (); 2525 process_dcs_seq ();
3007 break; 2526 break;
3008 case 0x9b: /* CSI */ 2527 case 0x9b: /* CSI */
3009 process_csi_seq (); 2528 process_csi_seq ();
3010 break; 2529 break;
3011 case 0x9d: /* CSI */ 2530 case 0x9d: /* OSC */
3012 process_osc_seq (); 2531 process_osc_seq ();
3013 break; 2532 break;
3014#endif 2533#endif
3015 } 2534 }
3016} 2535}
… …
3106 scr_charset_set (2, (unsigned int)cmd_getc ()); 2625 scr_charset_set (2, (unsigned int)cmd_getc ());
3107 break; 2626 break;
3108 case '+': 2627 case '+':
3109 scr_charset_set (3, (unsigned int)cmd_getc ()); 2628 scr_charset_set (3, (unsigned int)cmd_getc ());
3110 break; 2629 break;
3111#if ENABLE_FRILLS 2630#if !ENABLE_MINIMAL
3112 case '6': 2631 case '6':
3113 scr_backindex (); 2632 scr_backindex ();
3114 break; 2633 break;
3115#endif 2634#endif
3116 case '7': 2635 case '7':
3117 scr_cursor (SAVE); 2636 scr_cursor (SAVE);
3118 break; 2637 break;
3119 case '8': 2638 case '8':
3120 scr_cursor (RESTORE); 2639 scr_cursor (RESTORE);
3121 break; 2640 break;
3122#if ENABLE_FRILLS 2641#if !ENABLE_MINIMAL
3123 case '9': 2642 case '9':
3124 scr_forwardindex (); 2643 scr_forwardindex ();
3125 break; 2644 break;
3126#endif 2645#endif
3127 case '=': 2646 case '=':
… …
3242rxvt_term::process_csi_seq () 2761rxvt_term::process_csi_seq ()
3243{ 2762{
3244 unicode_t ch, priv, i; 2763 unicode_t ch, priv, i;
3245 unsigned int nargs, p; 2764 unsigned int nargs, p;
3246 int n, ndef; 2765 int n, ndef;
3247 int arg[ESC_ARGS]; 2766 int arg[ESC_ARGS] = { };
3248 2767
3249 for (nargs = ESC_ARGS; nargs > 0;) 2768 nargs = 0;
3250 arg[--nargs] = 0;
3251 2769
3252 priv = 0; 2770 priv = 0;
3253 ch = cmd_getc (); 2771 ch = cmd_getc ();
3254 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
3255 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
3256 priv = ch; 2775 priv = ch;
3257 ch = cmd_getc (); 2776 ch = cmd_getc ();
3258 } 2777 }
3259 2778
3260 /* read any numerical arguments */ 2779 /* read any numerical arguments */
… …
3289 ndef = get_byte_array_bit (csi_defaults, i); 2808 ndef = get_byte_array_bit (csi_defaults, i);
3290 for (p = 0; p < nargs; p++) 2809 for (p = 0; p < nargs; p++)
3291 if (arg[p] == -1) 2810 if (arg[p] == -1)
3292 arg[p] = ndef; 2811 arg[p] = ndef;
3293 2812
3294#ifdef DEBUG_CMD
3295 fprintf (stderr, "CSI ");
3296 for (p = 0; p < nargs; p++)
3297 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3298 fprintf (stderr, "%c\n", ch);
3299#endif
3300
3301 /* 2813 /*
3302 * private mode handling 2814 * private mode handling
3303 */ 2815 */
3304 if (priv) 2816 if (priv)
3305 { 2817 {
3306 switch (priv) 2818 switch (priv)
3307 { 2819 {
3308 case '>': 2820 case '>':
3309 if (ch == CSI_DA) /* secondary device attributes */ 2821 if (ch == CSI_DA) /* secondary device attributes */
3310 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 }
3311 break; 2832 break;
2833
3312 case '?': 2834 case '?':
3313 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3314 process_terminal_mode (ch, priv, nargs, arg); 2836 process_terminal_mode (ch, priv, nargs, arg);
3315 break; 2837 break;
3316 } 2838 }
… …
3441 break; 2963 break;
3442 case 6: /* CPR requested */ 2964 case 6: /* CPR requested */
3443 scr_report_position (); 2965 scr_report_position ();
3444 break; 2966 break;
3445 case 7: /* unofficial extension */ 2967 case 7: /* unofficial extension */
3446 if (OPTION (Opt_insecure)) 2968 if (option (Opt_insecure))
3447 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2969 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3448 break; 2970 break;
3449 case 8: /* unofficial extension */ 2971 case 8: /* unofficial extension */
3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2972 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3451 break; 2973 break;
… …
3518 break; 3040 break;
3519 case CSI_75: 3041 case CSI_75:
3520 scr_cursor (RESTORE); 3042 scr_cursor (RESTORE);
3521 break; 3043 break;
3522 3044
3523#if ENABLE_FRILLS 3045#if !ENABLE_MINIMAL
3524 case CSI_74: 3046 case CSI_74:
3525 process_window_ops (arg, nargs); 3047 process_window_ops (arg, nargs);
3526 break; 3048 break;
3527#endif 3049#endif
3528 3050
… …
3535 break; 3057 break;
3536 } 3058 }
3537} 3059}
3538/*}}} */ 3060/*}}} */
3539 3061
3540#if ENABLE_FRILLS 3062#if !ENABLE_MINIMAL
3541/* ARGSUSED */ 3063/* ARGSUSED */
3542void 3064void
3543rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3065rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544{ 3066{
3545 int x, y; 3067 int x, y;
3546 XWindowAttributes wattr; 3068 XWindowAttributes wattr;
3547 Window wdummy; 3069 Window wdummy;
3548 dDisp; 3070
3071 dLocal (Display *, dpy);
3549 3072
3550 if (nargs == 0) 3073 if (nargs == 0)
3551 return; 3074 return;
3552 3075
3553 switch (args[0]) 3076 switch (args[0])
3554 { 3077 {
3555 /* 3078 /*
3556 * commands 3079 * commands
3557 */ 3080 */
3558 case 1: /* deiconify window */ 3081 case 1: /* deiconify window */
3559 XMapWindow (disp, parent[0]); 3082 XMapWindow (dpy, parent[0]);
3560 break; 3083 break;
3561 case 2: /* iconify window */ 3084 case 2: /* iconify window */
3562 XIconifyWindow (disp, parent[0], display->screen); 3085 XIconifyWindow (dpy, parent[0], display->screen);
3563 break; 3086 break;
3564 case 3: /* set position (pixels) */ 3087 case 3: /* set position (pixels) */
3565 XMoveWindow (disp, parent[0], args[1], args[2]); 3088 XMoveWindow (dpy, parent[0], args[1], args[2]);
3566 break; 3089 break;
3567 case 4: /* set size (pixels) */ 3090 case 4: /* set size (pixels) */
3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3091 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569 break; 3092 break;
3570 case 5: /* raise window */ 3093 case 5: /* raise window */
3571 XRaiseWindow (disp, parent[0]); 3094 XRaiseWindow (dpy, parent[0]);
3572 break; 3095 break;
3573 case 6: /* lower window */ 3096 case 6: /* lower window */
3574 XLowerWindow (disp, parent[0]); 3097 XLowerWindow (dpy, parent[0]);
3575 break; 3098 break;
3576 case 7: /* refresh window */ 3099 case 7: /* refresh window */
3577 scr_touch (true); 3100 scr_touch (true);
3578 break; 3101 break;
3579 case 8: /* set size (chars) */ 3102 case 8: /* set size (chars) */
… …
3586 if (args[0] >= 24) /* set height (chars) */ 3109 if (args[0] >= 24) /* set height (chars) */
3587 set_widthheight ((unsigned int)width, 3110 set_widthheight ((unsigned int)width,
3588 (unsigned int) (args[1] * fheight)); 3111 (unsigned int) (args[1] * fheight));
3589 break; 3112 break;
3590 3113
3591
3592 /* 3114 /*
3593 * reports - some output format copied from XTerm 3115 * reports - some output format copied from XTerm
3594 */ 3116 */
3595 case 11: /* report window state */ 3117 case 11: /* report window state */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3118 XGetWindowAttributes (dpy, parent[0], &wattr);
3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3119 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598 break; 3120 break;
3599 case 13: /* report window position */ 3121 case 13: /* report window position */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3122 XGetWindowAttributes (dpy, parent[0], &wattr);
3601 XTranslateCoordinates (disp, parent[0], wattr.root, 3123 XTranslateCoordinates (dpy, parent[0], wattr.root,
3602 -wattr.border_width, -wattr.border_width, 3124 -wattr.border_width, -wattr.border_width,
3603 &x, &y, &wdummy); 3125 &x, &y, &wdummy);
3604 tt_printf ("\033[3;%d;%dt", x, y); 3126 tt_printf ("\033[3;%d;%dt", x, y);
3605 break; 3127 break;
3606 case 14: /* report window size (pixels) */ 3128 case 14: /* report window size (pixels) */
3607 XGetWindowAttributes (disp, parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3130 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609 break; 3131 break;
3610 case 18: /* report text area size (chars) */ 3132 case 18: /* report text area size (chars) */
3611 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3133 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612 break; 3134 break;
… …
3614 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3136 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615 break; 3137 break;
3616 case 20: /* report icon label */ 3138 case 20: /* report icon label */
3617 { 3139 {
3618 char *s; 3140 char *s;
3619 XGetIconName (disp, parent[0], &s); 3141 XGetIconName (dpy, parent[0], &s);
3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3142 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3143 XFree (s);
3622 } 3144 }
3623 break; 3145 break;
3624 case 21: /* report window title */ 3146 case 21: /* report window title */
3625 { 3147 {
3626 char *s; 3148 char *s;
3627 XFetchName (disp, parent[0], &s); 3149 XFetchName (dpy, parent[0], &s);
3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3150 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3151 XFree (s);
3630 } 3152 }
3631 break; 3153 break;
3632 } 3154 }
3633} 3155}
… …
3660 seen_esc = true; 3182 seen_esc = true;
3661 continue; 3183 continue;
3662 } 3184 }
3663 else if (ch == C0_BEL || ch == CHAR_ST) 3185 else if (ch == C0_BEL || ch == CHAR_ST)
3664 break; 3186 break;
3187 else if (ch == C0_SYN)
3188 ch = cmd_get8 ();
3665 else if (ch < 0x20) 3189 else if (ch < 0x20)
3666 return NULL; /* other control character - exit */ 3190 return NULL; /* other control character - exit */
3667 3191
3668 seen_esc = false; 3192 seen_esc = false;
3669 3193
3670 if (n >= STRING_MAX - 1) 3194 if (n >= STRING_MAX - 1)
3671 // stop at some sane length 3195 // stop at some sane length
3672 return NULL; 3196 return NULL;
3673 3197
3674 if (ch == C0_SYN)
3675 string[n++] = cmd_get8 ();
3676 else
3677 string[n++] = ch; 3198 string[n++] = ch;
3678 } 3199 }
3679 3200
3680 string[n++] = '\0'; 3201 string[n++] = '\0';
3681 3202
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3203 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3733void 3254void
3734rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3255rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3256{
3736 if (str[0] == '?' && !str[1]) 3257 if (str[0] == '?' && !str[1])
3737 { 3258 {
3738 unsigned short r, g, b; 3259 rgba c;
3739 pix_colors_focused[color].get (display, r, g, b); 3260 pix_colors_focused[color].get (c);
3261
3262#if XFT
3263 if (c.a != rgba::MAX_CC)
3264 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3265 else
3266#endif
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3267 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3741 } 3268 }
3742 else 3269 else
3743 set_window_color (color, str); 3270 set_window_color (color, str);
3744} 3271}
3745 3272
… …
3751{ 3278{
3752 int color; 3279 int color;
3753 char *buf, *name; 3280 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3281 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3282 int saveop = op;
3756 dDisp; 3283
3284 dLocal (Display *, dpy);
3757 3285
3758 assert (str != NULL); 3286 assert (str != NULL);
3287
3288 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3289 return;
3290
3759 switch (op) 3291 switch (op)
3760 { 3292 {
3761 case XTerm_name: 3293 case XTerm_name:
3762 set_title (str); 3294 set_title (str);
3763 /* FALLTHROUGH */ 3295 /* FALLTHROUGH */
… …
3777 unsigned long bytes_after; 3309 unsigned long bytes_after;
3778 unsigned char *value = 0; 3310 unsigned char *value = 0;
3779 const char *str = ""; 3311 const char *str = "";
3780 3312
3781 if (prop 3313 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3314 && XGetWindowProperty (dpy, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3315 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3316 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3317 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3318 && actual_type != None
3787 && actual_format == 8) 3319 && actual_format == 8)
3788 str = (const char *)(value); 3320 str = (const char *)(value);
3789 3321
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3322 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3323
3792 XFree (value); 3324 XFree (value);
3793 } 3325 }
3794 else 3326 else
3795 { 3327 {
… …
3799 { 3331 {
3800 *eq = 0; 3332 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3333 set_utf8_property (display->atom (str), eq + 1);
3802 } 3334 }
3803 else 3335 else
3804 XDeleteProperty (disp, parent[0], 3336 XDeleteProperty (dpy, parent[0],
3805 display->atom (str)); 3337 display->atom (str));
3806 } 3338 }
3807 break; 3339 break;
3808 3340
3809 case XTerm_Color: 3341 case XTerm_Color:
… …
3819 break; 3351 break;
3820 3352
3821 if ((buf = strchr (name, ';')) != NULL) 3353 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3354 *buf++ = '\0';
3823 3355
3824 if (name[0] == '?' && !name[1]) 3356 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color, name);
3832 } 3357 }
3833 break; 3358 break;
3359 case Rxvt_restoreFG:
3834 case XTerm_Color00: 3360 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3361 process_color_seq (op, Color_fg, str, resp);
3836 break; 3362 break;
3363 case Rxvt_restoreBG:
3837 case XTerm_Color01: 3364 case XTerm_Color01:
3838 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3365 process_color_seq (op, Color_bg, str, resp);
3839 break; 3366 break;
3840#ifndef NO_CURSORCOLOR 3367#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3368 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3369 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3370 break;
3844#endif 3371#endif
3845 case XTerm_Color_pointer_fg: 3372 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3373 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3374 break;
3848 case XTerm_Color_pointer_bg: 3375 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3376 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3377 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3378#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_RV: 3379 case XTerm_Color_RV:
3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3380 process_color_seq (op, Color_RV, str, resp);
3854 break; 3381 break;
3855 case Rxvt_Color_BD: 3382 case Rxvt_Color_BD:
3856 case URxvt_Color_BD: 3383 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp); 3384 process_color_seq (op, Color_BD, str, resp);
3858 break; 3385 break;
3859 case Rxvt_Color_UL: 3386 case Rxvt_Color_UL:
3860 case URxvt_Color_UL: 3387 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp); 3388 process_color_seq (op, Color_UL, str, resp);
3862 break; 3389 break;
3863 case URxvt_Color_IT: 3390 case URxvt_Color_IT:
3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3391 process_color_seq (op, Color_IT, str, resp);
3865 break; 3392 break;
3866#endif 3393#endif
3867#if TRANSPARENT && TINTING 3394#if ENABLE_TRANSPARENCY
3868 case URxvt_Color_tint: 3395 case URxvt_Color_tint:
3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3396 process_color_seq (op, Color_tint, str, resp);
3870 check_our_parents (); 3397 {
3871 if (am_transparent) 3398 bool changed = false;
3872 want_full_refresh = want_refresh = 1;
3873 break;
3874#endif
3875 3399
3400 if (ISSET_PIXCOLOR (Color_tint))
3401 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3402 else
3403 changed = bgPixmap.unset_tint ();
3404
3405 if (changed)
3406 update_background ();
3407 }
3408
3409 break;
3410#endif
3411
3412#if BG_IMAGE_FROM_FILE
3876 case Rxvt_Pixmap: 3413 case Rxvt_Pixmap:
3877 { 3414 if (!strcmp (str, "?"))
3878 if (*str != ';')
3879 { 3415 {
3880#if XPM_BACKGROUND 3416 char str[256];
3881 scale_pixmap (""); /* reset to default scaling */ 3417
3882 set_bgPixmap (str); /* change pixmap */ 3418 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3883 scr_touch (true); 3419 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3884#endif 3420 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3421 process_xterm_seq (XTerm_title, str, CHAR_ST);
3885 } 3422 }
3886 3423 else
3424 {
3887 int changed = 0; 3425 int changed = 0;
3888 3426
3889 while ((str = strchr (str, ';')) != NULL) 3427 if (*str != ';')
3890 { 3428 {
3429 /* reset to default scaling :*/
3430 bgPixmap.unset_geometry ();
3431 if (bgPixmap.set_file (str)) /* change pixmap */
3432 changed++;
3433 str = strchr (str, ';');
3434 if (str == NULL)
3435 bgPixmap.set_defaultGeometry ();
3436 }
3437
3438 while (str)
3439 {
3891 str++; 3440 str++;
3892#if XPM_BACKGROUND 3441 if (bgPixmap.set_geometry (str))
3893 changed += scale_pixmap (str); 3442 changed++;
3894#endif 3443 str = strchr (str, ';');
3895 } 3444 }
3896 3445
3897 if (changed) 3446 if (changed)
3898 { 3447 update_background ();
3899#ifdef XPM_BACKGROUND
3900 resize_pixmap ();
3901 scr_touch (true);
3902#endif
3903 } 3448 }
3904 }
3905 break; 3449 break;
3906 3450#endif
3907 case Rxvt_restoreFG:
3908 set_window_color (Color_fg, str);
3909 break;
3910 case Rxvt_restoreBG:
3911 set_window_color (Color_bg, str);
3912 break;
3913 3451
3914 case XTerm_logfile: 3452 case XTerm_logfile:
3915 // TODO, when secure mode? 3453 // TODO, when secure mode?
3916 break; 3454 break;
3917 3455
… …
3935 case URxvt_italicFont: 3473 case URxvt_italicFont:
3936 case URxvt_boldItalicFont: 3474 case URxvt_boldItalicFont:
3937#endif 3475#endif
3938 if (query) 3476 if (query)
3939 tt_printf ("\33]%d;%-.250s%c", saveop, 3477 tt_printf ("\33]%d;%-.250s%c", saveop,
3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3478 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3941 ? fontset[op - URxvt_font]->fontdesc : "", 3479 ? fontset[op - URxvt_font]->fontdesc : "",
3942 resp); 3480 resp);
3943 else 3481 else
3944 { 3482 {
3945 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3483 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3948 allocated.push_back ((void *)res); 3486 allocated.push_back ((void *)res);
3949 set_fonts (); 3487 set_fonts ();
3950 } 3488 }
3951 break; 3489 break;
3952 3490
3953#if ENABLE_FRILLS 3491 case URxvt_version:
3492 if (query)
3493 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3494 op,
3495 rs[Rs_name], VERSION[0], VERSION[2],
3496 resp);
3497 break;
3498
3499#if !ENABLE_MINIMAL
3954 case URxvt_locale: 3500 case URxvt_locale:
3955 if (query) 3501 if (query)
3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3502 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3957 else 3503 else
3958 { 3504 {
3959 set_locale (str); 3505 set_locale (str);
3960 pty->set_utf8_mode (enc_utf8); 3506 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale (); 3507 init_xlocale ();
… …
3976 break; 3522 break;
3977#endif 3523#endif
3978 3524
3979#if ENABLE_PERL 3525#if ENABLE_PERL
3980 case URxvt_perl: 3526 case URxvt_perl:
3981 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3527 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3982 ; // no responses yet 3528 ; // no responses yet
3983 break; 3529 break;
3984#endif 3530#endif
3985 } 3531 }
3986} 3532}
… …
4024{ 3570{
4025 unsigned int i, j; 3571 unsigned int i, j;
4026 int state; 3572 int state;
4027 3573
4028 static const struct 3574 static const struct
4029 { 3575 {
4030 const int argval; 3576 const int argval;
4031 const unsigned long bit; 3577 const unsigned long bit;
4032 }
4033
4034 argtopriv[] = { 3578 } argtopriv[] = {
4035 { 1, PrivMode_aplCUR }, 3579 { 1, PrivMode_aplCUR },
4036 { 2, PrivMode_vt52 }, 3580 { 2, PrivMode_vt52 },
4037 { 3, PrivMode_132 }, 3581 { 3, PrivMode_132 },
4038 { 4, PrivMode_smoothScroll }, 3582 { 4, PrivMode_smoothScroll },
4039 { 5, PrivMode_rVideo }, 3583 { 5, PrivMode_rVideo },
… …
4055 { 66, PrivMode_aplKP }, 3599 { 66, PrivMode_aplKP },
4056#ifndef NO_BACKSPACE_KEY 3600#ifndef NO_BACKSPACE_KEY
4057 { 67, PrivMode_BackSpace }, 3601 { 67, PrivMode_BackSpace },
4058#endif 3602#endif
4059 { 1000, PrivMode_MouseX11 }, 3603 { 1000, PrivMode_MouseX11 },
4060 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3604 { 1002, PrivMode_MouseBtnEvent },
4061 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3605 { 1003, PrivMode_MouseAnyEvent },
4062 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4063 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4064 { 1011, PrivMode_Keypress }, // rxvt extension 3607 { 1011, PrivMode_Keypress }, // rxvt extension
4065 // 1035 enable modifiers for alt, numlock NYI 3608 // 1035 enable modifiers for alt, numlock NYI
4066 // 1036 send ESC for meta keys NYI 3609 // 1036 send ESC for meta keys NYI
4067 // 1037 send DEL for keypad delete NYI 3610 // 1037 send DEL for keypad delete NYI
4068 { 1047, PrivMode_Screen }, 3611 { 1047, PrivMode_Screen },
4069 // 1048 save and restore cursor 3612 // 1048 save and restore cursor
4070 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3613 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4071 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste },
4072 }; 3616 };
4073 3617
4074 if (nargs == 0) 3618 if (nargs == 0)
4075 return; 3619 return;
4076 3620
… …
4102 scr_touch (true); 3646 scr_touch (true);
4103 break; 3647 break;
4104#endif 3648#endif
4105 case 1048: /* alternative cursor save */ 3649 case 1048: /* alternative cursor save */
4106 case 1049: 3650 case 1049:
4107 if (OPTION (Opt_secondaryScreen)) 3651 if (option (Opt_secondaryScreen))
4108 if (mode == 0) 3652 if (mode == 0)
4109 scr_cursor (RESTORE); 3653 scr_cursor (RESTORE);
4110 else if (mode == 1) 3654 else if (mode == 1)
4111 scr_cursor (SAVE); 3655 scr_cursor (SAVE);
4112 break; 3656 break;
… …
4124 */ 3668 */
4125 PrivMode (1, PrivMode_vt52); 3669 PrivMode (1, PrivMode_vt52);
4126 break; 3670 break;
4127 case 3: /* 80/132 */ 3671 case 3: /* 80/132 */
4128 if (priv_modes & PrivMode_132OK) 3672 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
4129 set_widthheight (((state ? 132 : 80) * fwidth), height); 3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3676 }
4130 break; 3677 break;
4131 case 4: /* smooth scrolling */ 3678 case 4: /* smooth scrolling */
4132 set_option (Opt_jumpScroll, !state); 3679 set_option (Opt_jumpScroll, !state);
4133 break; 3680 break;
4134 case 5: /* reverse video */ 3681 case 5: /* reverse video */
… …
4141 scr_autowrap (state); 3688 scr_autowrap (state);
4142 break; 3689 break;
4143 /* 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 */
4144 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
4145 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
4146 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4147 break; 3694 break;
4148#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
4149 case scrollBar_esc: 3696 case scrollBar_esc:
4150 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
4151 { 3698 {
… …
4164 break; 3711 break;
4165 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
4166 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
4167 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
4168 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
4169 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4170 break; 3717 break;
4171#if 0
4172 case 1001: 3718 case 1002:
4173 break; /* X11 mouse highlighting */ 3719 case 1003:
4174#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;
4175 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
4176 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
4177 break; 3732 break;
4178 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
4179 set_option (Opt_scrollTtyKeypress, state); 3734 set_option (Opt_scrollTtyKeypress, state);
4180 break; 3735 break;
4181 case 1047: /* secondary screen w/ clearing last */ 3736 case 1047: /* secondary screen w/ clearing last */
4182 if (OPTION (Opt_secondaryScreen)) 3737 if (option (Opt_secondaryScreen))
4183 if (current_screen != PRIMARY) 3738 if (current_screen != PRIMARY)
4184 scr_erase_screen (2); 3739 scr_erase_screen (2);
4185 scr_change_screen (state); 3740 scr_change_screen (state);
4186 break; 3741 break;
4187 case 1049: /* secondary screen w/ clearing first */ 3742 case 1049: /* secondary screen w/ clearing first */
4188 scr_change_screen (state); 3743 scr_change_screen (state);
4189 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4190 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4191 scr_erase_screen (2); 3746 scr_erase_screen (2);
4192 break; 3747 break;
4193 default: 3748 default:
4194 break; 3749 break;
… …
4322 scr_color (Color_bg, Color_bg); 3877 scr_color (Color_bg, Color_bg);
4323 break; 3878 break;
4324 3879
4325 //case 50: // not variable spacing 3880 //case 50: // not variable spacing
4326 3881
4327#if ENABLE_FRILLS 3882#if !ENABLE_MINIMAL
4328 case 90: 3883 case 90:
4329 case 91: /* set bright fg color */ 3884 case 91: /* set bright fg color */
4330 case 92: 3885 case 92:
4331 case 93: 3886 case 93:
4332 case 94: 3887 case 94:
… …
4356rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
4357{ 3912{
4358 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
4359 3914
4360 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
4361 { /* query graphics */ 3917 /* query graphics */
4362 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
4363 return; 3919 return;
4364 } 3920 }
4365 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
4366 do 3922 do
… …
4416 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4417 3973
4418 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
4419 v_buflen += len; 3975 v_buflen += len;
4420 3976
4421 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
4422} 3978}
4423 3979
4424void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4425{ 3981{
4426 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));
… …
4431 3987
4432 if (v_buflen == 0) 3988 if (v_buflen == 0)
4433 { 3989 {
4434 free (v_buffer); 3990 free (v_buffer);
4435 v_buffer = 0; 3991 v_buffer = 0;
4436 v_buflen = 0;
4437 3992
4438 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4439 return; 3994 return;
4440 } 3995 }
4441 3996
4442 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4443 } 3998 }
4444 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4445 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4446} 4001}
4447 4002
4448/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4449 4004

Diff Legend

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