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.288 by root, Sat Jan 28 20:33:31 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 int valid_keysym; 308 int valid_keysym;
305 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
306 315
307 /* 316 /*
308 * 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
309 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
310 * 319 *
… …
490# if ISO_14755 499# if ISO_14755
491 iso14755_51 (0); 500 iso14755_51 (0);
492# endif 501# endif
493 return; 502 return;
494 } 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 }
495 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
496 { 513 {
497 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
499# if ISO_14755 516# if ISO_14755
… …
501# endif 518# endif
502 return; 519 return;
503 } 520 }
504 else 521 else
505 { 522 {
506# if ENABLE_OVERLAY 523# if ISO_14755
507 scr_overlay_off (); 524 scr_overlay_off ();
508# endif 525# endif
509 iso14755buf = 0; 526 iso14755buf = 0;
510 } 527 }
511 } 528 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
515 { 532 {
516 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 534# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 537# endif
521 } 538 }
522#endif 539#endif
523 540
524#ifdef PRINTPIPE 541#ifdef PRINTPIPE
525 if (keysym == XK_Print) 542 if (keysym == XK_Print)
526 { 543 {
527 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
528 return; 545 return;
529 } 546 }
530#endif 547#endif
531 548
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 { 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))
534 { 572 {
535 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
536 switch (keysym) 583 switch (keysym)
537 { 584 {
538#ifndef NO_BACKSPACE_KEY 585#ifndef NO_BACKSPACE_KEY
539 case XK_BackSpace: 586 case XK_BackSpace:
540 if (priv_modes & PrivMode_HaveBackSpace) 587 if (priv_modes & PrivMode_HaveBackSpace)
… …
542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543 ^ !!ctrl) ? '\b' : '\177'; 590 ^ !!ctrl) ? '\b' : '\177';
544 kbuf[1] = '\0'; 591 kbuf[1] = '\0';
545 } 592 }
546 else 593 else
547 strcpy (kbuf, key_backspace); 594 strcpy (kbuf, rs[Rs_backspace_key]);
548 break; 595 break;
549#endif 596#endif
550#ifndef NO_DELETE_KEY 597#ifndef NO_DELETE_KEY
551# ifdef XK_KP_Prior
552 case XK_KP_Delete:
553 /* allow shift to override */
554 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
555 {
556 strcpy (kbuf, "\033On");
557 break;
558 }
559 /* FALLTHROUGH */
560# endif
561 case XK_Delete: 598 case XK_Delete:
562 strcpy (kbuf, key_delete); 599 strcpy (kbuf, rs[Rs_delete_key]);
563 break; 600 break;
564#endif 601#endif
565 case XK_Tab: 602 case XK_Tab:
566 if (shft) 603 if (shft)
567 strcpy (kbuf, "\033[Z"); 604 strcpy (kbuf, "\033[Z");
… …
577#endif 614#endif
578 newlen = 0; 615 newlen = 0;
579 } 616 }
580 break; 617 break;
581 618
582#ifdef XK_KP_Left
583 case XK_KP_Up: /* \033Ox or standard */
584 case XK_KP_Down: /* \033Or or standard */
585 case XK_KP_Right: /* \033Ov or standard */
586 case XK_KP_Left: /* \033Ot or standard */
587 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
588 {
589 strcpy (kbuf, "\033OZ");
590 kbuf[2] = "txvr"[keysym - XK_KP_Left];
591 break;
592 }
593 else
594 /* translate to std. cursor key */
595 keysym = XK_Left + (keysym - XK_KP_Left);
596 /* FALLTHROUGH */
597#endif
598 case XK_Up: /* "\033[A" */ 619 case XK_Up: /* "\033[A" */
599 case XK_Down: /* "\033[B" */ 620 case XK_Down: /* "\033[B" */
600 case XK_Right: /* "\033[C" */ 621 case XK_Right: /* "\033[C" */
601 case XK_Left: /* "\033[D" */ 622 case XK_Left: /* "\033[D" */
602 strcpy (kbuf, "\033[Z"); 623 strcpy (kbuf, "\033[Z");
… …
612 else if (priv_modes & PrivMode_aplCUR) 633 else if (priv_modes & PrivMode_aplCUR)
613 kbuf[1] = 'O'; 634 kbuf[1] = 'O';
614 break; 635 break;
615 636
616#ifndef UNSHIFTED_SCROLLKEYS 637#ifndef UNSHIFTED_SCROLLKEYS
617# ifdef XK_KP_Prior
618 case XK_KP_Prior:
619 /* allow shift to override */
620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
621 {
622 strcpy (kbuf, "\033Oy");
623 break;
624 }
625 /* FALLTHROUGH */
626# endif
627 case XK_Prior: 638 case XK_Prior:
628 strcpy (kbuf, "\033[5~"); 639 strcpy (kbuf, "\033[5~");
629 break; 640 break;
630# ifdef XK_KP_Next
631 case XK_KP_Next:
632 /* allow shift to override */
633 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
634 {
635 strcpy (kbuf, "\033Os");
636 break;
637 }
638 /* FALLTHROUGH */
639# endif
640 case XK_Next: 641 case XK_Next:
641 strcpy (kbuf, "\033[6~"); 642 strcpy (kbuf, "\033[6~");
642 break; 643 break;
643#endif 644#endif
644 case XK_KP_Enter: 645 case XK_KP_Enter:
645 /* allow shift to override */ 646 /* allow shift to override */
646 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 647 if (kp)
647 { 648 {
648 strcpy (kbuf, "\033OM"); 649 strcpy (kbuf, "\033OM");
649 break; 650 break;
650 } 651 }
651 652
… …
663 kbuf[0] = '\015'; 664 kbuf[0] = '\015';
664 kbuf[1] = '\0'; 665 kbuf[1] = '\0';
665 } 666 }
666 break; 667 break;
667 668
668#ifdef XK_KP_Begin
669 case XK_KP_Begin:
670 strcpy (kbuf, "\033Ou");
671 break;
672
673#endif
674 case XK_KP_F1: /* "\033OP" */ 669 case XK_KP_F1: /* "\033OP" */
675 case XK_KP_F2: /* "\033OQ" */ 670 case XK_KP_F2: /* "\033OQ" */
676 case XK_KP_F3: /* "\033OR" */ 671 case XK_KP_F3: /* "\033OR" */
677 case XK_KP_F4: /* "\033OS" */ 672 case XK_KP_F4: /* "\033OS" */
678 strcpy (kbuf, "\033OP"); 673 strcpy (kbuf, "\033OP");
… …
694 case XK_KP_6: /* "\033Ov" : "6" */ 689 case XK_KP_6: /* "\033Ov" : "6" */
695 case XK_KP_7: /* "\033Ow" : "7" */ 690 case XK_KP_7: /* "\033Ow" : "7" */
696 case XK_KP_8: /* "\033Ox" : "8" */ 691 case XK_KP_8: /* "\033Ox" : "8" */
697 case XK_KP_9: /* "\033Oy" : "9" */ 692 case XK_KP_9: /* "\033Oy" : "9" */
698 /* allow shift to override */ 693 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 694 if (kp)
700 { 695 {
701 strcpy (kbuf, "\033Oj"); 696 strcpy (kbuf, "\033Oj");
702 kbuf[2] += (keysym - XK_KP_Multiply); 697 kbuf[2] += (keysym - XK_KP_Multiply);
703 } 698 }
704 else 699 else
… …
710 705
711 case XK_Find: 706 case XK_Find:
712 strcpy (kbuf, "\033[1~"); 707 strcpy (kbuf, "\033[1~");
713 break; 708 break;
714 709
715#ifdef XK_KP_End
716 case XK_KP_Insert:
717 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
719 {
720 strcpy (kbuf, "\033Op");
721 break;
722 }
723 /* FALLTHROUGH */
724#endif
725 case XK_Insert: 710 case XK_Insert:
726 strcpy (kbuf, "\033[2~"); 711 strcpy (kbuf, "\033[2~");
727 break; 712 break;
728#ifdef DXK_Remove /* support for DEC remove like key */ 713#ifdef DXK_Remove /* support for DEC remove like key */
729 case DXK_Remove: 714 case DXK_Remove:
… …
733 strcpy (kbuf, "\033[3~"); 718 strcpy (kbuf, "\033[3~");
734 break; 719 break;
735 case XK_Select: 720 case XK_Select:
736 strcpy (kbuf, "\033[4~"); 721 strcpy (kbuf, "\033[4~");
737 break; 722 break;
738#ifdef XK_KP_End
739 case XK_KP_End:
740 /* allow shift to override */
741 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
742 {
743 strcpy (kbuf, "\033Oq");
744 break;
745 }
746 /* FALLTHROUGH */
747#endif
748 case XK_End: 723 case XK_End:
749 strcpy (kbuf, KS_END); 724 strcpy (kbuf, KS_END);
750 break; 725 break;
751#ifdef XK_KP_Home
752 case XK_KP_Home:
753 /* allow shift to override */
754 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
755 {
756 strcpy (kbuf, "\033Ow");
757 break;
758 }
759 /* FALLTHROUGH */
760#endif
761 case XK_Home: 726 case XK_Home:
762 strcpy (kbuf, KS_HOME); 727 strcpy (kbuf, KS_HOME);
763 break; 728 break;
764 729
765#define FKEY(n, fkey) \ 730#define FKEY(n, fkey) \
… …
822 break; 787 break;
823 } 788 }
824 789
825 if (newlen) 790 if (newlen)
826 len = strlen (kbuf); 791 len = strlen (kbuf);
827 }
828 792
829 /* 793 /*
830 * Pass meta for all function keys, if 'meta' option set 794 * Pass meta for all function keys, if 'meta' option set
831 */ 795 */
832#ifdef META8_OPTION 796#ifdef META8_OPTION
… …
867 return; 831 return;
868 832
869 if (len <= 0) 833 if (len <= 0)
870 return; /* not mapped */ 834 return; /* not mapped */
871 835
872 if (OPTION (Opt_scrollTtyKeypress)) 836 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 837 if (view_start)
874 { 838 {
875 view_start = 0; 839 view_start = 0;
876 want_refresh = 1; 840 want_refresh = 1;
877 } 841 }
… …
901 tt_write (&ch, 1); 865 tt_write (&ch, 1);
902 } 866 }
903 867
904 tt_write (kbuf, (unsigned int)len); 868 tt_write (kbuf, (unsigned int)len);
905} 869}
906/*}}} */ 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}
907 947
908#if defined (KEYSYM_RESOURCE) 948#if defined (KEYSYM_RESOURCE)
909unsigned int 949unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 950rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 951{
… …
941void 981void
942rxvt_term::flush () 982rxvt_term::flush ()
943{ 983{
944 flush_ev.stop (); 984 flush_ev.stop ();
945 985
946#ifdef TRANSPARENT 986#ifdef HAVE_BG_PIXMAP
947 if (want_full_refresh) 987 if (bgPixmap.check_clearChanged ())
948 { 988 {
949 want_full_refresh = 0; 989// scr_clear (true); This needs to be researched further!
950 scr_clear ();
951 scr_touch (false); 990 scr_touch (false);
952 } 991 }
953#endif 992#endif
954 993
955 if (want_refresh) 994 if (want_refresh)
… …
1000 } 1039 }
1001 1040
1002 display->flush (); 1041 display->flush ();
1003} 1042}
1004 1043
1044/* checks wether a refresh is requested and starts the refresh timer */
1005void 1045void
1006rxvt_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)
1007{ 1056{
1008 make_current (); 1057 make_current ();
1009 1058
1010 display->flush ();
1011
1012 if (want_refresh && !flush_ev.active)
1013 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1014}
1015
1016void
1017rxvt_term::flush_cb (time_watcher &w)
1018{
1019 make_current ();
1020
1021 refresh_limit = 1;
1022 refresh_count = 0; 1059 refresh_count = 0;
1023 flush (); 1060 flush ();
1024} 1061}
1025 1062
1026#ifdef CURSOR_BLINK 1063#ifdef CURSOR_BLINK
1027void 1064void
1028rxvt_term::cursor_blink_cb (time_watcher &w) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1029{ 1066{
1030 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1031 want_refresh = 1; 1068 want_refresh = 1;
1032 1069 refresh_check ();
1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1034} 1070}
1035#endif 1071#endif
1036 1072
1037#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
1038void 1074void
1039rxvt_term::text_blink_cb (time_watcher &w) 1075rxvt_term::text_blink_cb (ev::timer &w, int revents)
1040{ 1076{
1041 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1042 { 1078 {
1043 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1044 want_refresh = 1; 1080 want_refresh = 1;
1045 w.start (w.at + TEXT_BLINK_INTERVAL); 1081 refresh_check ();
1046 } 1082 }
1083 else
1084 w.stop ();
1047} 1085}
1048#endif 1086#endif
1049 1087
1050#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1051void 1089void
1052rxvt_term::cont_scroll_cb (time_watcher &w) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1053{ 1091{
1054 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1055 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1056 { 1094 {
1057 want_refresh = 1; 1095 want_refresh = 1;
1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1059 } 1097 }
1098 else
1099 w.stop ();
1060} 1100}
1061#endif 1101#endif
1062 1102
1063#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1064void 1104void
1065rxvt_term::sel_scroll_cb (time_watcher &w) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1066{ 1106{
1067 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1068 { 1108 {
1069 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1070 want_refresh = 1; 1110 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1072 } 1112 }
1113 else
1114 w.stop ();
1073} 1115}
1074#endif 1116#endif
1075 1117
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1119void
1078rxvt_term::slip_wheel_cb (time_watcher &w) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1121{
1080 if (mouse_slip_wheel_speed == 0 1122 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1081 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1082 : scr_page (UP, mouse_slip_wheel_speed))
1083 { 1123 {
1084 if (view_start == top_row || view_start == 0)
1085 mouse_slip_wheel_speed = 0;
1086
1087 want_refresh = 1; 1124 want_refresh = 1;
1088 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)
1089 } 1129 {
1130 mouse_slip_wheel_speed = 0;
1131 w.stop ();
1132 }
1090} 1133}
1091#endif 1134#endif
1092 1135
1093#if HAVE_SCHED_YIELD 1136#if LINUX_YIELD_HACK
1094static struct event_handler 1137static struct event_handler
1095{ 1138{
1096 check_watcher cw_yield; 1139 ev::prepare yield_ev;
1097 1140
1098 void yield (check_watcher &w) 1141 void yield_cb (ev::prepare &w, int revents)
1099 { 1142 {
1100 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
1101 w.stop (); 1151 w.stop ();
1102 } 1152 }
1103 1153
1104 event_handler () 1154 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1155 : yield_ev (this, &event_handler::yield_cb)
1106 { 1156 {
1107 } 1157 }
1108} event_handler; 1158} event_handler;
1109#endif 1159#endif
1110 1160
… …
1130 cmdbuf_endp += r; 1180 cmdbuf_endp += r;
1131 return true; 1181 return true;
1132 } 1182 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1183 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1184 {
1135#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1136 if (display->is_local) 1186 if (display->is_local)
1137 event_handler.cw_yield.start (); 1187 event_handler.yield_ev.start ();
1138#endif 1188#endif
1139 } 1189 }
1140 else 1190 else
1141 { 1191 {
1142 pty_ev.stop (); 1192 pty_ev.stop ();
1143 1193
1144 if (!OPTION (Opt_hold)) 1194 if (!option (Opt_hold))
1145 destroy (); 1195 destroy ();
1146 } 1196 }
1147 1197
1148 return false; 1198 return false;
1149} 1199}
1150 1200
1151void 1201void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1202rxvt_term::pty_cb (ev::io &w, int revents)
1153{ 1203{
1154 make_current (); 1204 make_current ();
1155 1205
1156 if (revents & EVENT_READ) 1206 if (revents & ev::READ)
1157 // loop, but don't allow a single term to monopolize us 1207 // loop, but don't allow a single term to monopolize us
1158 while (pty_fill ()) 1208 while (pty_fill ())
1159 if (cmd_parse ()) 1209 if (cmd_parse ())
1160 break; 1210 break;
1161 1211
1162 if (revents & EVENT_WRITE) 1212 if (revents & ev::WRITE)
1163 pty_write (); 1213 pty_write ();
1214
1215 refresh_check ();
1164} 1216}
1165 1217
1166void 1218void
1167rxvt_term::pointer_unblank () 1219rxvt_term::pointer_unblank ()
1168{ 1220{
1169 XDefineCursor (xdisp, vt, TermWin_cursor); 1221 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1222 recolour_cursor ();
1171 1223
1172#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1225 hidden_pointer = 0;
1174 1226
1175 if (OPTION (Opt_pointerBlank)) 1227 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1228 pointer_ev.start (pointerBlankDelay);
1177#endif 1229#endif
1178} 1230}
1179 1231
1180#ifdef POINTER_BLANK 1232#ifdef POINTER_BLANK
1181void 1233void
1182rxvt_term::pointer_blank () 1234rxvt_term::pointer_blank ()
1183{ 1235{
1184 if (!OPTION (Opt_pointerBlank)) 1236 if (!option (Opt_pointerBlank))
1185 return; 1237 return;
1186 1238
1187 XDefineCursor (xdisp, vt, display->blank_cursor); 1239 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (xdisp); 1240 XFlush (dpy);
1189 1241
1190 hidden_pointer = 1; 1242 hidden_pointer = 1;
1191} 1243}
1192 1244
1193void 1245void
1194rxvt_term::pointer_cb (time_watcher &w) 1246rxvt_term::pointer_cb (ev::timer &w, int revents)
1195{ 1247{
1196 make_current (); 1248 make_current ();
1197 1249
1198 pointer_blank (); 1250 pointer_blank ();
1199} 1251}
… …
1202void 1254void
1203rxvt_term::mouse_report (XButtonEvent &ev) 1255rxvt_term::mouse_report (XButtonEvent &ev)
1204{ 1256{
1205 int button_number, key_state = 0; 1257 int button_number, key_state = 0;
1206 int x, y; 1258 int x, y;
1259 int code = 32;
1207 1260
1208 x = ev.x; 1261 x = Pixel2Col (ev.x);
1209 y = ev.y; 1262 y = Pixel2Row (ev.y);
1210 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 }
1211 1271
1212 if (MEvent.button == AnyButton) 1272 if (MEvent.button == AnyButton)
1213 button_number = 3; 1273 button_number = 3;
1214 else 1274 else
1215 { 1275 {
… …
1261 x + 1, 1321 x + 1,
1262 y + 1); 1322 y + 1);
1263#endif 1323#endif
1264 1324
1265 tt_printf ("\033[M%c%c%c", 1325 tt_printf ("\033[M%c%c%c",
1266 (32 + button_number + key_state), 1326 (code + button_number + key_state),
1267 (32 + x + 1), 1327 (32 + x + 1),
1268 (32 + y + 1)); 1328 (32 + y + 1));
1269} 1329}
1270 1330
1271/*{{{ process an X event */ 1331/*{{{ process an X event */
1272void 1332void
1273rxvt_term::x_cb (XEvent &ev) 1333rxvt_term::x_cb (XEvent &ev)
1274{ 1334{
1275 make_current (); 1335 make_current ();
1276 1336
1277 dLocal (Display *, xdisp); 1337 dLocal (Display *, dpy);
1278 1338
1279 if (ev.xany.window == vt 1339 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1340 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1341 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1342 return;
… …
1287 unsigned int unused_mask; 1347 unsigned int unused_mask;
1288 1348
1289 switch (ev.type) 1349 switch (ev.type)
1290 { 1350 {
1291 case KeyPress: 1351 case KeyPress:
1292#if ISO_14755 1352 key_press (ev.xkey);
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1295 lookup_key (ev.xkey);
1296
1297 break; 1353 break;
1298 1354
1299 case KeyRelease: 1355 case KeyRelease:
1300 { 1356 key_release (ev.xkey);
1301#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1302 KeySym keysym;
1303
1304 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1305#endif
1306
1307#if ENABLE_FRILLS || ISO_14755
1308 // ISO 14755 support
1309 if (iso14755buf)
1310 if (iso14755buf & ISO_14755_52)
1311 {
1312# if ENABLE_OVERLAY
1313 scr_overlay_off ();
1314# endif
1315# if ISO_14755
1316 // iso14755 part 5.2 handling: release time
1317 // first: controls
1318 if ((ev.xkey.state & ControlMask)
1319 && ((keysym >= 0x40 && keysym <= 0x5f)
1320 || (keysym >= 0x61 && keysym <= 0x7f)))
1321 {
1322 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1323 commit_iso14755 ();
1324 goto skip_switch;
1325 }
1326
1327 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1328 if (i[0] == keysym)
1329 {
1330 iso14755buf = ISO_14755_51 | i[1];
1331 commit_iso14755 ();
1332 goto skip_switch;
1333 }
1334
1335 scr_bell ();
1336# endif
1337 iso14755buf = 0;
1338 break;
1339 }
1340 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345 if (iso14755buf & ISO_14755_51)
1346 commit_iso14755 ();
1347#if ISO_14755
1348 else if (iso14755buf & ISO_14755_STARTED)
1349 {
1350 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1351
1352 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1353 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1354 }
1355# endif
1356 else
1357 iso14755buf = 0;
1358 }
1359#endif
1360
1361 if (ev.xany.window == vt
1362 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1363 break;
1364
1365#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1366 if (!(ev.xkey.state & ControlMask))
1367 slip_wheel_ev.stop ();
1368 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1369 mouse_slip_wheel_speed = 0;
1370#endif
1371 break; 1357 break;
1372 }
1373 1358
1374 case ButtonPress: 1359 case ButtonPress:
1375 button_press (ev.xbutton); 1360 button_press (ev.xbutton);
1376 break; 1361 break;
1377 1362
… …
1392 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)))
1393 destroy (); 1378 destroy ();
1394 } 1379 }
1395#if ENABLE_EWMH 1380#if ENABLE_EWMH
1396 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])
1397 XSendEvent (xdisp, ev.xclient.window = display->root, 1382 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1384 &ev);
1400#endif 1385#endif
1401 } 1386 }
1402 } 1387 }
… …
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out (); 1394 focus_out ();
1410 } 1395 }
1411#endif 1396#endif
1412 } 1397 }
1413 break;
1414
1415 case MappingNotify:
1416 XRefreshKeyboardMapping (&ev.xmapping);
1417 break; 1398 break;
1418 1399
1419 /* 1400 /*
1420 * XXX: this is not the _current_ arrangement 1401 * XXX: this is not the _current_ arrangement
1421 * Here's my conclusion: 1402 * Here's my conclusion:
… …
1440 break; 1421 break;
1441 } 1422 }
1442 break; 1423 break;
1443 1424
1444 case FocusIn: 1425 case FocusIn:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1445 focus_in (); 1429 focus_in ();
1446 break; 1430 break;
1447 1431
1448 case FocusOut: 1432 case FocusOut:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1449 focus_out (); 1436 focus_out ();
1450 break; 1437 break;
1451 1438
1452 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);*/
1453 if (ev.xconfigure.window == parent[0]) 1443 if (ev.xconfigure.window == parent[0])
1454 { 1444 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1446 ;
1457 1447
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1449 {
1460 seen_resize = 1; 1450 seen_resize = 1;
1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1462 } 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 }
1463 1465
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1467 if (OPTION (Opt_transparent))
1468 check_our_parents ();
1469#endif
1470 } 1467 }
1471 break; 1468 break;
1472 1469
1473 case PropertyNotify: 1470 case PropertyNotify:
1474 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)))
… …
1490 case SelectionRequest: 1487 case SelectionRequest:
1491 selection_send (ev.xselectionrequest); 1488 selection_send (ev.xselectionrequest);
1492 break; 1489 break;
1493 1490
1494 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
1495 mapped = 1; 1508 mapped = 1;
1496#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start ();
1498#endif 1511#endif
1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 break; 1513 break;
1501 1514
1502 case UnmapNotify: 1515 case UnmapNotify:
… …
1504#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1505 text_blink_ev.stop (); 1518 text_blink_ev.stop ();
1506#endif 1519#endif
1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 break; 1521 break;
1509
1510#ifdef TRANSPARENT
1511 case ReparentNotify:
1512 rootwin_cb (ev);
1513 break;
1514#endif /* TRANSPARENT */
1515 1522
1516 case GraphicsExpose: 1523 case GraphicsExpose:
1517 case Expose: 1524 case Expose:
1518 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1519 { 1526 {
1520 do 1527 do
1528 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1529 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1530 ev.xexpose.width, ev.xexpose.height, False);
1531 }
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1533
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1534 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1535
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1537 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1538 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1539 ev.xexpose.width, ev.xexpose.height, False);
1540 }
1530 1541
1531 want_refresh = 1; 1542 want_refresh = 1;
1532 } 1543 }
1533 else 1544 else
1534 { 1545 {
1535 XEvent unused_event; 1546 XEvent unused_event;
1536 1547
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1548 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1549 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1551 ;
1541 1552
1542 if (isScrollbarWindow (ev.xany.window)) 1553 if (scrollBar.state && ev.xany.window == scrollBar.win)
1543 { 1554 {
1544 scrollBar.setIdle (); 1555 scrollBar.state = STATE_IDLE;
1545 scrollbar_show (0); 1556 scrollbar_show (0);
1546 } 1557 }
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window);
1551#endif
1552 } 1558 }
1553 break; 1559 break;
1554 1560
1555 case MotionNotify: 1561 case MotionNotify:
1556#ifdef POINTER_BLANK 1562#ifdef POINTER_BLANK
1557 if (hidden_pointer) 1563 if (hidden_pointer)
1558 pointer_unblank (); 1564 pointer_unblank ();
1559#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);
1560 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1569 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1561 break; 1570 break;
1562 1571
1563 if (ev.xany.window == vt) 1572 if (ev.xany.window == vt)
1564 { 1573 {
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1574 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1575 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1576 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1577 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1578 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1579 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1580 ;
1572 1581
1573 XQueryPointer (xdisp, vt, 1582 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1583 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1584 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1585 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1586 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1587#ifdef MOUSE_THRESHOLD
… …
1598 int dist; 1607 int dist;
1599 1608
1600 /* don't clobber the current delay if we are 1609 /* don't clobber the current delay if we are
1601 * already in the middle of scrolling. 1610 * already in the middle of scrolling.
1602 */ 1611 */
1603 if (!sel_scroll_ev.active) 1612 if (!sel_scroll_ev.is_active ())
1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1613 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1605 1614
1606 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1607 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1608 */ 1617 */
1609 selection_save_x = ev.xbutton.x; 1618 selection_save_x = ev.xbutton.x;
… …
1631 else 1640 else
1632 { 1641 {
1633 /* we are within the text window, so we 1642 /* we are within the text window, so we
1634 * shouldn't be scrolling 1643 * shouldn't be scrolling
1635 */ 1644 */
1636 if (sel_scroll_ev.active)
1637 sel_scroll_ev.stop(); 1645 sel_scroll_ev.stop();
1638 } 1646 }
1639#endif 1647#endif
1640#ifdef MOUSE_THRESHOLD 1648#ifdef MOUSE_THRESHOLD
1641 } 1649 }
1642#endif 1650#endif
1643 } 1651 }
1644 } 1652 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1653 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1646 { 1654 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1655 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1656 MotionNotify, &ev))
1649 ; 1657 ;
1650 1658
1651 XQueryPointer (xdisp, scrollBar.win, 1659 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1660 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1661 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1662 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1663 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1657 scrollbar_size ()); 1665 scrollbar_size ());
1658 want_refresh = 1; 1666 want_refresh = 1;
1659 refresh_limit = 0;
1660 scrollbar_show (1); 1667 scrollbar_show (1);
1661 } 1668 }
1662 break; 1669 break;
1663 } 1670 }
1664 1671
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1672#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1673 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1674 {
1670 if (hidden_cursor) 1675 if (hidden_cursor)
1671 { 1676 {
1672 hidden_cursor = 0; 1677 hidden_cursor = 0;
1673 want_refresh = 1; 1678 want_refresh = 1;
1674 } 1679 }
1675 1680
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1681 cursor_blink_ev.again ();
1677 } 1682 }
1678#endif 1683#endif
1679 1684
1680#if defined(POINTER_BLANK) 1685#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1686 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1687 {
1683 if (ev.type == MotionNotify 1688 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress 1689 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease) 1690 || ev.type == ButtonRelease)
1686 if (hidden_pointer) 1691 if (hidden_pointer)
… …
1688 1693
1689 if (ev.type == KeyPress && hidden_pointer == 0) 1694 if (ev.type == KeyPress && hidden_pointer == 0)
1690 pointer_blank (); 1695 pointer_blank ();
1691 } 1696 }
1692#endif 1697#endif
1698
1699 refresh_check ();
1693} 1700}
1694 1701
1695void 1702void
1696rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1697{ 1704{
1698 if (!focus) 1705 if (!focus)
1699 { 1706 {
1700 focus = 1; 1707 focus = 1;
1701 want_refresh = 1; 1708 want_refresh = 1;
1702 1709
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1710 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1711
1705#if USE_XIM 1712#if USE_XIM
1706 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1707 { 1714 {
1708 IMSetStatusPosition (); 1715 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1710 } 1717 }
1711#endif 1718#endif
1712#if CURSOR_BLINK 1719#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1720 if (option (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1721 cursor_blink_ev.again ();
1715#endif 1722#endif
1716#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1718 { 1725 {
1719 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
1720 scr_recolour (); 1727 scr_recolour ();
1721 } 1728 }
1722#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
1723 } 1740 }
1724} 1741}
1725 1742
1726void 1743void
1727rxvt_term::focus_out () 1744rxvt_term::focus_out ()
… …
1735 1752
1736#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1737 if (iso14755buf) 1754 if (iso14755buf)
1738 { 1755 {
1739 iso14755buf = 0; 1756 iso14755buf = 0;
1740# if ENABLE_OVERLAY 1757# if ISO_14755
1741 scr_overlay_off (); 1758 scr_overlay_off ();
1742# endif 1759# endif
1743 } 1760 }
1744#endif 1761#endif
1745#if USE_XIM 1762#if USE_XIM
1746 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1748#endif 1765#endif
1749#if CURSOR_BLINK 1766#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1752 hidden_cursor = 0; 1770 hidden_cursor = 0;
1753#endif 1771#endif
1754#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1756 { 1774 {
… …
1759 } 1777 }
1760#endif 1778#endif
1761 } 1779 }
1762} 1780}
1763 1781
1764#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
1765void 1796void
1766rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1798{
1768 make_current (); 1799 make_current ();
1769 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
1770 switch (ev.type) 1806 switch (ev.type)
1771 { 1807 {
1772 case PropertyNotify: 1808 case PropertyNotify:
1773 /* 1809 /*
1774 * 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,
1775 * 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.
1776 */ 1812 */
1777 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1779 return; 1815 {
1816 bgPixmap.set_root_pixmap ();
1817 update_background ();
1818 }
1780 1819
1781 /* FALLTHROUGH */
1782 case ReparentNotify:
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1784 want_refresh = want_full_refresh = 1;
1785 break; 1820 break;
1786 } 1821 }
1822# endif
1823
1824 refresh_check ();
1787} 1825}
1788#endif 1826#endif
1789 1827
1790void 1828void
1791rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
… …
1846 mouse_report (ev); 1884 mouse_report (ev);
1847 } 1885 }
1848#else 1886#else
1849 MEvent.button = ev.button; 1887 MEvent.button = ev.button;
1850 mouse_report (ev); 1888 mouse_report (ev);
1851#endif /* MOUSE_REPORT_DOUBLECLICK */ 1889#endif /* MOUSE_REPORT_DOUBLECLICK */
1852 1890
1853 } 1891 }
1854 else 1892 else
1855 { 1893 {
1856 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
… …
1904 } 1942 }
1905 1943
1906 /* 1944 /*
1907 * Scrollbar window processing of button press 1945 * Scrollbar window processing of button press
1908 */ 1946 */
1909 if (isScrollbarWindow (ev.window)) 1947 if (scrollBar.state && ev.window == scrollBar.win)
1910 { 1948 {
1911 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;
1912 /* 1957 /*
1913 * Rxvt-style scrollbar: 1958 * Rxvt-style scrollbar:
1914 * move up if mouse is above slider 1959 * move up if mouse is above slider
1915 * move dn if mouse is below slider 1960 * move dn if mouse is below slider
1916 * 1961 *
… …
1925 /* 1970 /*
1926 * Mouse report disabled scrollbar: 1971 * Mouse report disabled scrollbar:
1927 * arrow buttons - send up/down 1972 * arrow buttons - send up/down
1928 * click on scrollbar - send pageup/down 1973 * click on scrollbar - send pageup/down
1929 */ 1974 */
1930 if ((scrollBar.style == R_SB_NEXT 1975 if (direction == UP)
1931 && scrollbarnext_upButton (ev.y))
1932 || (scrollBar.style == R_SB_RXVT
1933 && scrollbarrxvt_upButton (ev.y)))
1934 tt_printf ("\033[A"); 1976 tt_printf ("\033[A");
1935 else if ((scrollBar.style == R_SB_NEXT 1977 else if (direction == DN)
1936 && scrollbarnext_dnButton (ev.y))
1937 || (scrollBar.style == R_SB_RXVT
1938 && scrollbarrxvt_dnButton (ev.y)))
1939 tt_printf ("\033[B"); 1978 tt_printf ("\033[B");
1940 else 1979 else
1941 switch (ev.button) 1980 switch (ev.button)
1942 { 1981 {
1943 case Button2: 1982 case Button2:
… …
1950 tt_printf ("\033[5~"); 1989 tt_printf ("\033[5~");
1951 break; 1990 break;
1952 } 1991 }
1953 } 1992 }
1954 else 1993 else
1955#endif /* NO_SCROLLBAR_REPORT */ 1994#endif /* NO_SCROLLBAR_REPORT */
1956
1957 {
1958 char upordown = 0;
1959
1960 if (scrollBar.style == R_SB_NEXT)
1961 { 1995 {
1962 if (scrollbarnext_upButton (ev.y)) 1996 if (direction != NO_DIR)
1963 upordown = -1; /* up */
1964 else if (scrollbarnext_dnButton (ev.y))
1965 upordown = 1; /* down */
1966 }
1967 else if (scrollBar.style == R_SB_RXVT)
1968 {
1969 if (scrollbarrxvt_upButton (ev.y))
1970 upordown = -1; /* up */
1971 else if (scrollbarrxvt_dnButton (ev.y))
1972 upordown = 1; /* down */
1973 }
1974 if (upordown)
1975 { 1997 {
1976#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1998#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1999 if (!cont_scroll_ev.is_active ())
1977 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1978#endif 2001#endif
1979 if (scr_page (upordown < 0 ? UP : DN, 1)) 2002 if (scr_page (direction, 1))
1980 { 2003 {
1981 if (upordown < 0) 2004 if (direction == UP)
1982 scrollBar.setUp (); 2005 scrollBar.state = STATE_UP;
1983 else 2006 else
1984 scrollBar.setDn (); 2007 scrollBar.state = STATE_DOWN;
1985 } 2008 }
1986 } 2009 }
1987 else 2010 else
1988 switch (ev.button) 2011 switch (ev.button)
1989 { 2012 {
1990 case Button2: 2013 case Button2:
1991 switch (scrollbar_align) 2014 switch (scrollBar.align)
1992 { 2015 {
1993 case R_SB_ALIGN_TOP: 2016 case R_SB_ALIGN_TOP:
1994 csrO = 0; 2017 csrO = 0;
1995 break; 2018 break;
1996 case R_SB_ALIGN_CENTRE: 2019 case R_SB_ALIGN_CENTRE:
… …
2004 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
2005 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
2006 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
2007 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2008 2031
2009 scrollBar.setMotion (); 2032 scrollBar.state = STATE_MOTION;
2010 break; 2033 break;
2011 2034
2012 case Button1: 2035 case Button1:
2013 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2036 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2014 csrO = ev.y - scrollBar.top; 2037 csrO = ev.y - scrollBar.top;
2015 /* FALLTHROUGH */ 2038 /* FALLTHROUGH */
2016 2039
2017 case Button3: 2040 case Button3:
2018 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
… …
2028 scr_page (DN, nrow - 1); 2051 scr_page (DN, nrow - 1);
2029# else 2052# else
2030 scr_page (DN, nrow / 4); 2053 scr_page (DN, nrow / 4);
2031# endif 2054# endif
2032 else 2055 else
2033 scrollBar.setMotion (); 2056 scrollBar.state = STATE_MOTION;
2034 } 2057 }
2035 else 2058 else
2036 { 2059 {
2037 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
2038 (nrow 2061 (nrow
… …
2055 2078
2056 csrO = 0; /* reset csr Offset */ 2079 csrO = 0; /* reset csr Offset */
2057 if (!bypass_keystate) 2080 if (!bypass_keystate)
2058 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2059 2082
2060 if (scrollbar_isUpDn ()) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2061 { 2084 {
2062 scrollBar.setIdle (); 2085 scrollBar.state = STATE_IDLE;
2063 scrollbar_show (0); 2086 scrollbar_show (0);
2064 } 2087 }
2065 2088
2066#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2067 if (sel_scroll_ev.active)
2068 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
2069#endif 2091#endif
2070 2092
2071 if (ev.window == vt) 2093 if (ev.window == vt)
2072 { 2094 {
2073 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2095 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2097 mouse_report (ev); 2119 mouse_report (ev);
2098 } 2120 }
2099#else /* MOUSE_REPORT_DOUBLECLICK */ 2121#else /* MOUSE_REPORT_DOUBLECLICK */
2100 MEvent.button = AnyButton; 2122 MEvent.button = AnyButton;
2101 mouse_report (ev); 2123 mouse_report (ev);
2102#endif /* MOUSE_REPORT_DOUBLECLICK */ 2124#endif /* MOUSE_REPORT_DOUBLECLICK */
2103 return; 2125 return;
2104 } 2126 }
2105 2127
2106 /* 2128 /*
2107 * dumb hack to compensate for the failure of click-and-drag 2129 * dumb hack to compensate for the failure of click-and-drag
… …
2119 selection_make (ev.time); 2141 selection_make (ev.time);
2120 break; 2142 break;
2121 2143
2122 case Button2: 2144 case Button2:
2123 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?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2147 break;
2126 2148
2127#ifdef MOUSE_WHEEL 2149#ifdef MOUSE_WHEEL
2128 case Button4: 2150 case Button4:
2129 case Button5: 2151 case Button5:
… …
2133 2155
2134 v = ev.button == Button4 ? UP : DN; 2156 v = ev.button == Button4 ? UP : DN;
2135 2157
2136 if (ev.state & ShiftMask) 2158 if (ev.state & ShiftMask)
2137 i = 1; 2159 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2160 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2161 i = nrow - 1;
2140 else 2162 else
2141 i = 5; 2163 i = 5;
2142 2164
2143# ifdef MOUSE_SLIP_WHEELING 2165# ifdef MOUSE_SLIP_WHEELING
… …
2145 { 2167 {
2146 mouse_slip_wheel_speed += v ? -1 : 1; 2168 mouse_slip_wheel_speed += v ? -1 : 1;
2147 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2169 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2149 2171
2150 if (slip_wheel_ev.at < NOW) 2172 if (!slip_wheel_ev.is_active ())
2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2152
2153 slip_wheel_ev.start ();
2154 } 2174 }
2155 else 2175 else
2176# endif
2156 { 2177 {
2157# endif
2158 scr_page (v, i); 2178 scr_page (v, i);
2159 scrollbar_show (1); 2179 scrollbar_show (1);
2160# ifdef MOUSE_SLIP_WHEELING
2161 } 2180 }
2162# endif
2163 } 2181 }
2164 break; 2182 break;
2165#endif 2183#endif
2166 } 2184 }
2167 } 2185 }
2168} 2186}
2169
2170#ifdef TRANSPARENT
2171#if TINTING
2172/* taken from aterm-0.4.2 */
2173
2174typedef uint32_t RUINT32T;
2175
2176void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2177{
2178 int sh_r, sh_g, sh_b;
2179 RUINT32T mask_r, mask_g, mask_b;
2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2183 int i;
2184
2185 Visual *visual = term->visual;
2186
2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2188
2189 /* for convenience */
2190 mask_r = visual->red_mask;
2191 mask_g = visual->green_mask;
2192 mask_b = visual->blue_mask;
2193
2194 /* boring lookup table pre-initialization */
2195 switch (srcImage->bits_per_pixel) {
2196 case 15:
2197 if ((mask_r != 0x7c00) ||
2198 (mask_g != 0x03e0) ||
2199 (mask_b != 0x001f))
2200 return;
2201 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2202 lookup_r = lookup;
2203 lookup_g = lookup+32;
2204 lookup_b = lookup+32+32;
2205 sh_r = 10;
2206 sh_g = 5;
2207 sh_b = 0;
2208 break;
2209 case 16:
2210 if ((mask_r != 0xf800) ||
2211 (mask_g != 0x07e0) ||
2212 (mask_b != 0x001f))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2215 lookup_r = lookup;
2216 lookup_g = lookup+32;
2217 lookup_b = lookup+32+64;
2218 sh_r = 11;
2219 sh_g = 5;
2220 sh_b = 0;
2221 break;
2222 case 24:
2223 if ((mask_r != 0xff0000) ||
2224 (mask_g != 0x00ff00) ||
2225 (mask_b != 0x0000ff))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2228 lookup_r = lookup;
2229 lookup_g = lookup+256;
2230 lookup_b = lookup+256+256;
2231 sh_r = 16;
2232 sh_g = 8;
2233 sh_b = 0;
2234 break;
2235 case 32:
2236 if ((mask_r != 0xff0000) ||
2237 (mask_g != 0x00ff00) ||
2238 (mask_b != 0x0000ff))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2241 lookup_r = lookup;
2242 lookup_g = lookup+256;
2243 lookup_b = lookup+256+256;
2244 sh_r = 16;
2245 sh_g = 8;
2246 sh_b = 0;
2247 break;
2248 default:
2249 return; /* we do not support this color depth */
2250 }
2251
2252 /* prepare limits for color transformation (each channel is handled separately) */
2253 if (shade < 0) {
2254 shade = -shade;
2255 if (shade < 0) shade = 0;
2256 if (shade > 100) shade = 100;
2257
2258 lower_lim_r = 65535-rm;
2259 lower_lim_g = 65535-gm;
2260 lower_lim_b = 65535-bm;
2261
2262 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2263 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2264 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2265
2266 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2267 } else {
2268 if (shade < 0) shade = 0;
2269 if (shade > 100) shade = 100;
2270
2271 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2272
2273 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2274 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2275 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2276 }
2277
2278 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2279 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2280 {
2281 unsigned int tmp;
2282
2283 tmp = lower_lim_r;
2284 lower_lim_r = lower_lim_b;
2285 lower_lim_b = tmp;
2286
2287 tmp = upper_lim_r;
2288 upper_lim_r = upper_lim_b;
2289 upper_lim_b = tmp;
2290 }
2291
2292 /* fill our lookup tables */
2293 for (i = 0; i <= mask_r>>sh_r; i++)
2294 {
2295 RUINT32T tmp;
2296 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2297 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2298 lookup_r[i] = (tmp/65535)<<sh_r;
2299 }
2300 for (i = 0; i <= mask_g>>sh_g; i++)
2301 {
2302 RUINT32T tmp;
2303 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2304 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2305 lookup_g[i] = (tmp/65535)<<sh_g;
2306 }
2307 for (i = 0; i <= mask_b>>sh_b; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2311 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2312 lookup_b[i] = (tmp/65535)<<sh_b;
2313 }
2314
2315 /* apply table to input image (replacing colors by newly calculated ones) */
2316 switch (srcImage->bits_per_pixel)
2317 {
2318 case 15:
2319 {
2320 unsigned short *p1, *pf, *p, *pl;
2321 p1 = (unsigned short *) srcImage->data;
2322 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2323 while (p1 < pf)
2324 {
2325 p = p1;
2326 pl = p1 + srcImage->width;
2327 for (; p < pl; p++)
2328 {
2329 *p = lookup_r[(*p & 0x7c00)>>10] |
2330 lookup_g[(*p & 0x03e0)>> 5] |
2331 lookup_b[(*p & 0x001f)];
2332 }
2333 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2334 }
2335 break;
2336 }
2337 case 16:
2338 {
2339 unsigned short *p1, *pf, *p, *pl;
2340 p1 = (unsigned short *) srcImage->data;
2341 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2342 while (p1 < pf)
2343 {
2344 p = p1;
2345 pl = p1 + srcImage->width;
2346 for (; p < pl; p++)
2347 {
2348 *p = lookup_r[(*p & 0xf800)>>11] |
2349 lookup_g[(*p & 0x07e0)>> 5] |
2350 lookup_b[(*p & 0x001f)];
2351 }
2352 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353 }
2354 break;
2355 }
2356 case 24:
2357 {
2358 unsigned char *p1, *pf, *p, *pl;
2359 p1 = (unsigned char *) srcImage->data;
2360 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361 while (p1 < pf)
2362 {
2363 p = p1;
2364 pl = p1 + srcImage->width * 3;
2365 for (; p < pl; p += 3)
2366 {
2367 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2368 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2369 p[2] = lookup_r[(p[2] & 0x0000ff)];
2370 }
2371 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2372 }
2373 break;
2374 }
2375 case 32:
2376 {
2377 RUINT32T *p1, *pf, *p, *pl;
2378 p1 = (RUINT32T *) srcImage->data;
2379 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width;
2385 for (; p < pl; p++)
2386 {
2387 *p = lookup_r[(*p & 0xff0000)>>16] |
2388 lookup_g[(*p & 0x00ff00)>> 8] |
2389 lookup_b[(*p & 0x0000ff)] |
2390 (*p & ~0xffffff);
2391 }
2392 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2393 }
2394 break;
2395 }
2396 }
2397
2398 free (lookup);
2399}
2400#endif
2401
2402/*
2403 * Check our parents are still who we think they are.
2404 * Do transparency updates if required
2405 */
2406int
2407rxvt_term::check_our_parents ()
2408{
2409 int i, pchanged, aformat, have_pixmap, rootdepth;
2410 unsigned long nitems, bytes_after;
2411 Atom atype;
2412 unsigned char *prop = NULL;
2413 Window root, oldp, *list;
2414 Pixmap rootpixmap = None;
2415 XWindowAttributes wattr, wrootattr;
2416
2417 pchanged = 0;
2418
2419 if (!OPTION (Opt_transparent))
2420 return pchanged; /* Don't try any more */
2421
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth;
2424
2425 XGetWindowAttributes (xdisp, parent[0], &wattr);
2426
2427 if (rootdepth != wattr.depth)
2428 {
2429 if (am_transparent)
2430 {
2431 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0;
2434 }
2435
2436 return pchanged; /* Don't try any more */
2437 }
2438
2439 /* Get all X ops out of the queue so that our information is up-to-date. */
2440 XSync (xdisp, False);
2441
2442 /*
2443 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame
2445 * windows for each client, so we have to take care about that.
2446 */
2447 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success);
2451
2452 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success);
2457
2458 if (!i || prop == NULL
2459#if TINTING
2460 || !rs[Rs_color + Color_tint]
2461#endif
2462 )
2463 have_pixmap = 0;
2464 else
2465 {
2466 have_pixmap = 1;
2467 rootpixmap = *(Pixmap *)prop;
2468 XFree (prop);
2469 }
2470
2471 if (have_pixmap)
2472 {
2473 /*
2474 * Copy display->root pixmap transparency
2475 */
2476 int sx, sy, nx, ny;
2477 unsigned int nw, nh;
2478 Window cr;
2479 XImage *image;
2480 GC gc;
2481 XGCValues gcvalue;
2482
2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height;
2487 nx = ny = 0;
2488
2489 if (sx < 0)
2490 {
2491 nw += sx;
2492 nx = -sx;
2493 sx = 0;
2494 }
2495
2496 if (sy < 0)
2497 {
2498 nh += sy;
2499 ny = -sy;
2500 sy = 0;
2501 }
2502
2503 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505
2506 XSync (xdisp, False);
2507 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */
2512 allowedxerror = 0;
2513
2514 if (image == NULL)
2515 {
2516 if (am_transparent && am_pixmap_trans)
2517 {
2518 pchanged = 1;
2519 if (pixmap != None)
2520 {
2521 XFreePixmap (xdisp, pixmap);
2522 pixmap = None;
2523 }
2524 }
2525
2526 am_pixmap_trans = 0;
2527 }
2528 else
2529 {
2530 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap);
2532
2533#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint))
2535 {
2536 unsigned short rm, gm, bm;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538
2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2540
2541 ShadeXImage (this, image, shade, rm, gm, bm);
2542 }
2543#endif
2544
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc);
2550 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]);
2553
2554 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1;
2556
2557 am_transparent = am_pixmap_trans = 1;
2558 }
2559 }
2560
2561 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2563 else
2564 {
2565 unsigned int n;
2566 /*
2567 * InheritPixmap transparency
2568 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 {
2571 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root,
2573 &parent[i], &list, &n);
2574 XFree (list);
2575
2576 if (parent[i] == display->root)
2577 {
2578 if (oldp != None)
2579 pchanged = 1;
2580
2581 break;
2582 }
2583
2584 if (oldp != parent[i])
2585 pchanged = 1;
2586 }
2587
2588 n = 0;
2589
2590 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++)
2593 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break;
2599 }
2600 }
2601 }
2602
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2604 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */
2609 }
2610 else
2611 {
2612 for (n = 0; n < (unsigned int)i; n++)
2613 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]);
2616 }
2617
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2619 am_transparent = 1;
2620 }
2621
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None;
2624 }
2625
2626 if (scrollBar.win)
2627 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle ();
2630 scrollbar_show (0);
2631 }
2632
2633 if (am_transparent)
2634 {
2635 want_refresh = want_full_refresh = 1;
2636 if (am_pixmap_trans)
2637 flush ();
2638 }
2639
2640 return pchanged;
2641}
2642#endif
2643 2187
2644/*}}} */ 2188/*}}} */
2645 2189
2646bool 2190bool
2647rxvt_term::cmd_parse () 2191rxvt_term::cmd_parse ()
… …
2696 if (ch == C0_LF) 2240 if (ch == C0_LF)
2697 nlines++; 2241 nlines++;
2698 2242
2699 refresh_count++; 2243 refresh_count++;
2700 2244
2701 if (!OPTION (Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2246 {
2704 refreshnow = true;
2705 refresh_count = 0; 2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2251 refreshnow = true;
2706 ch = NOCHAR; 2252 ch = NOCHAR;
2707 break; 2253 break;
2254 }
2708 } 2255 }
2709 2256
2710 // scr_add_lines only works for nlines <= nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2711 if (nlines >= nrow - 1) 2258 if (nlines >= nrow - 1)
2712 { 2259 {
… …
2740 && 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))))
2741 scr_add_lines (buf, str - buf, nlines); 2288 scr_add_lines (buf, str - buf, nlines);
2742 2289
2743 /* 2290 /*
2744 * 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
2745 * 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.
2746 * the number of pages between refreshes is refresh_limit, which 2293 * if skipScroll is enabled.
2747 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2294 */
2749 if (refreshnow) 2295 if (refreshnow)
2750 { 2296 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++;
2753 else
2754 {
2755 flag = true; 2297 flag = true;
2756 scr_refresh (); 2298 scr_refresh ();
2757 want_refresh = 1; 2299 want_refresh = 1;
2758 }
2759 } 2300 }
2760 2301
2761 } 2302 }
2762 else 2303 else
2763 { 2304 {
… …
2912 { 2453 {
2913 if ((buf[len++] = cmd_getc ()) == 'i') 2454 if ((buf[len++] = cmd_getc ()) == 'i')
2914 break; /* done = 1 */ 2455 break; /* done = 1 */
2915 } 2456 }
2916 } 2457 }
2917 2458
2918 for (i = 0; i < len; i++) 2459 for (i = 0; i < len; i++)
2919 if (putc (buf[i], fd) == EOF) 2460 if (putc (buf[i], fd) == EOF)
2920 { 2461 {
2921 done = 1; 2462 done = 1;
2922 break; 2463 break;
… …
2924 } 2465 }
2925 } 2466 }
2926 2467
2927 pclose_printer (fd); 2468 pclose_printer (fd);
2928} 2469}
2929#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2930/*}}} */ 2471/*}}} */
2931 2472
2932/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2933enum { 2474enum {
2934 C1_40 = 0x40, 2475 C1_40 = 0x40,
… …
2984 process_dcs_seq (); 2525 process_dcs_seq ();
2985 break; 2526 break;
2986 case 0x9b: /* CSI */ 2527 case 0x9b: /* CSI */
2987 process_csi_seq (); 2528 process_csi_seq ();
2988 break; 2529 break;
2989 case 0x9d: /* CSI */ 2530 case 0x9d: /* OSC */
2990 process_osc_seq (); 2531 process_osc_seq ();
2991 break; 2532 break;
2992#endif 2533#endif
2993 } 2534 }
2994} 2535}
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 2625 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 2626 break;
3086 case '+': 2627 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 2628 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 2629 break;
3089#if ENABLE_FRILLS 2630#if !ENABLE_MINIMAL
3090 case '6': 2631 case '6':
3091 scr_backindex (); 2632 scr_backindex ();
3092 break; 2633 break;
3093#endif 2634#endif
3094 case '7': 2635 case '7':
3095 scr_cursor (SAVE); 2636 scr_cursor (SAVE);
3096 break; 2637 break;
3097 case '8': 2638 case '8':
3098 scr_cursor (RESTORE); 2639 scr_cursor (RESTORE);
3099 break; 2640 break;
3100#if ENABLE_FRILLS 2641#if !ENABLE_MINIMAL
3101 case '9': 2642 case '9':
3102 scr_forwardindex (); 2643 scr_forwardindex ();
3103 break; 2644 break;
3104#endif 2645#endif
3105 case '=': 2646 case '=':
… …
3220rxvt_term::process_csi_seq () 2761rxvt_term::process_csi_seq ()
3221{ 2762{
3222 unicode_t ch, priv, i; 2763 unicode_t ch, priv, i;
3223 unsigned int nargs, p; 2764 unsigned int nargs, p;
3224 int n, ndef; 2765 int n, ndef;
3225 int arg[ESC_ARGS]; 2766 int arg[ESC_ARGS] = { };
3226 2767
3227 for (nargs = ESC_ARGS; nargs > 0;) 2768 nargs = 0;
3228 arg[--nargs] = 0;
3229 2769
3230 priv = 0; 2770 priv = 0;
3231 ch = cmd_getc (); 2771 ch = cmd_getc ();
3232 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
3233 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
3234 priv = ch; 2775 priv = ch;
3235 ch = cmd_getc (); 2776 ch = cmd_getc ();
3236 } 2777 }
3237 2778
3238 /* read any numerical arguments */ 2779 /* read any numerical arguments */
… …
3277 switch (priv) 2818 switch (priv)
3278 { 2819 {
3279 case '>': 2820 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 2821 if (ch == CSI_DA) /* secondary device attributes */
3281 { 2822 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2823 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3283 // 'U' for rxvt-unicode <= 7.2. 2824 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 2825 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2826 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2827 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3287 // that we do not support xterm mouse reporting (should be 95 when we do). 2828 // versions.
3288 // 2829 //
3289 tt_printf ("\033[>0;94;0c"); 2830 tt_printf ("\033[>%d;95;0c", 'U');
3290 } 2831 }
3291 break; 2832 break;
2833
3292 case '?': 2834 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 2836 process_terminal_mode (ch, priv, nargs, arg);
3295 break; 2837 break;
3296 } 2838 }
… …
3421 break; 2963 break;
3422 case 6: /* CPR requested */ 2964 case 6: /* CPR requested */
3423 scr_report_position (); 2965 scr_report_position ();
3424 break; 2966 break;
3425 case 7: /* unofficial extension */ 2967 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 2968 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2969 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 2970 break;
3429 case 8: /* unofficial extension */ 2971 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2972 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 2973 break;
… …
3498 break; 3040 break;
3499 case CSI_75: 3041 case CSI_75:
3500 scr_cursor (RESTORE); 3042 scr_cursor (RESTORE);
3501 break; 3043 break;
3502 3044
3503#if ENABLE_FRILLS 3045#if !ENABLE_MINIMAL
3504 case CSI_74: 3046 case CSI_74:
3505 process_window_ops (arg, nargs); 3047 process_window_ops (arg, nargs);
3506 break; 3048 break;
3507#endif 3049#endif
3508 3050
… …
3515 break; 3057 break;
3516 } 3058 }
3517} 3059}
3518/*}}} */ 3060/*}}} */
3519 3061
3520#if ENABLE_FRILLS 3062#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3063/* ARGSUSED */
3522void 3064void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3065rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3066{
3525 int x, y; 3067 int x, y;
3526 XWindowAttributes wattr; 3068 XWindowAttributes wattr;
3527 Window wdummy; 3069 Window wdummy;
3528 3070
3529 dLocal (Display *, xdisp); 3071 dLocal (Display *, dpy);
3530 3072
3531 if (nargs == 0) 3073 if (nargs == 0)
3532 return; 3074 return;
3533 3075
3534 switch (args[0]) 3076 switch (args[0])
3535 { 3077 {
3536 /* 3078 /*
3537 * commands 3079 * commands
3538 */ 3080 */
3539 case 1: /* deiconify window */ 3081 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3082 XMapWindow (dpy, parent[0]);
3541 break; 3083 break;
3542 case 2: /* iconify window */ 3084 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3085 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3086 break;
3545 case 3: /* set position (pixels) */ 3087 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3088 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3089 break;
3548 case 4: /* set size (pixels) */ 3090 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3091 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3092 break;
3551 case 5: /* raise window */ 3093 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3094 XRaiseWindow (dpy, parent[0]);
3553 break; 3095 break;
3554 case 6: /* lower window */ 3096 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3097 XLowerWindow (dpy, parent[0]);
3556 break; 3098 break;
3557 case 7: /* refresh window */ 3099 case 7: /* refresh window */
3558 scr_touch (true); 3100 scr_touch (true);
3559 break; 3101 break;
3560 case 8: /* set size (chars) */ 3102 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3109 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3110 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3111 (unsigned int) (args[1] * fheight));
3570 break; 3112 break;
3571 3113
3572
3573 /* 3114 /*
3574 * reports - some output format copied from XTerm 3115 * reports - some output format copied from XTerm
3575 */ 3116 */
3576 case 11: /* report window state */ 3117 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3118 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3119 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3120 break;
3580 case 13: /* report window position */ 3121 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3122 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3123 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3124 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3125 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3126 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3127 break;
3587 case 14: /* report window size (pixels) */ 3128 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3130 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3131 break;
3591 case 18: /* report text area size (chars) */ 3132 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3133 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3134 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3136 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3137 break;
3597 case 20: /* report icon label */ 3138 case 20: /* report icon label */
3598 { 3139 {
3599 char *s; 3140 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3141 XGetIconName (dpy, parent[0], &s);
3601 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 */
3602 XFree (s); 3143 XFree (s);
3603 } 3144 }
3604 break; 3145 break;
3605 case 21: /* report window title */ 3146 case 21: /* report window title */
3606 { 3147 {
3607 char *s; 3148 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3149 XFetchName (dpy, parent[0], &s);
3609 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 */
3610 XFree (s); 3151 XFree (s);
3611 } 3152 }
3612 break; 3153 break;
3613 } 3154 }
3614} 3155}
… …
3641 seen_esc = true; 3182 seen_esc = true;
3642 continue; 3183 continue;
3643 } 3184 }
3644 else if (ch == C0_BEL || ch == CHAR_ST) 3185 else if (ch == C0_BEL || ch == CHAR_ST)
3645 break; 3186 break;
3187 else if (ch == C0_SYN)
3188 ch = cmd_get8 ();
3646 else if (ch < 0x20) 3189 else if (ch < 0x20)
3647 return NULL; /* other control character - exit */ 3190 return NULL; /* other control character - exit */
3648 3191
3649 seen_esc = false; 3192 seen_esc = false;
3650 3193
3651 if (n >= STRING_MAX - 1) 3194 if (n >= STRING_MAX - 1)
3652 // stop at some sane length 3195 // stop at some sane length
3653 return NULL; 3196 return NULL;
3654 3197
3655 if (ch == C0_SYN)
3656 string[n++] = cmd_get8 ();
3657 else
3658 string[n++] = ch; 3198 string[n++] = ch;
3659 } 3199 }
3660 3200
3661 string[n++] = '\0'; 3201 string[n++] = '\0';
3662 3202
3663 ends_how = (ch == 0x5c ? C0_ESC : ch); 3203 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3714void 3254void
3715rxvt_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)
3716{ 3256{
3717 if (str[0] == '?' && !str[1]) 3257 if (str[0] == '?' && !str[1])
3718 { 3258 {
3719 unsigned short r, g, b; 3259 rgba c;
3720 pix_colors_focused[color].get (this, 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
3721 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);
3722 } 3268 }
3723 else 3269 else
3724 set_window_color (color, str); 3270 set_window_color (color, str);
3725} 3271}
3726 3272
… …
3733 int color; 3279 int color;
3734 char *buf, *name; 3280 char *buf, *name;
3735 bool query = str[0] == '?' && !str[1]; 3281 bool query = str[0] == '?' && !str[1];
3736 int saveop = op; 3282 int saveop = op;
3737 3283
3738 dLocal (Display *, xdisp); 3284 dLocal (Display *, dpy);
3739 3285
3740 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
3741 switch (op) 3291 switch (op)
3742 { 3292 {
3743 case XTerm_name: 3293 case XTerm_name:
3744 set_title (str); 3294 set_title (str);
3745 /* FALLTHROUGH */ 3295 /* FALLTHROUGH */
… …
3759 unsigned long bytes_after; 3309 unsigned long bytes_after;
3760 unsigned char *value = 0; 3310 unsigned char *value = 0;
3761 const char *str = ""; 3311 const char *str = "";
3762 3312
3763 if (prop 3313 if (prop
3764 && XGetWindowProperty (xdisp, parent[0], 3314 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3315 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3316 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3317 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3318 && actual_type != None
3769 && actual_format == 8) 3319 && actual_format == 8)
3770 str = (const char *)(value); 3320 str = (const char *)(value);
3771 3321
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3322 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3323
3774 XFree (value); 3324 XFree (value);
3775 } 3325 }
3776 else 3326 else
3777 { 3327 {
… …
3781 { 3331 {
3782 *eq = 0; 3332 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3333 set_utf8_property (display->atom (str), eq + 1);
3784 } 3334 }
3785 else 3335 else
3786 XDeleteProperty (xdisp, parent[0], 3336 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 3337 display->atom (str));
3788 } 3338 }
3789 break; 3339 break;
3790 3340
3791 case XTerm_Color: 3341 case XTerm_Color:
… …
3801 break; 3351 break;
3802 3352
3803 if ((buf = strchr (name, ';')) != NULL) 3353 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3354 *buf++ = '\0';
3805 3355
3806 if (name[0] == '?' && !name[1]) 3356 process_color_seq (op, color, name, resp);
3807 {
3808 unsigned short r, g, b;
3809 pix_colors_focused[color].get (this, r, g, b);
3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3811 }
3812 else
3813 set_window_color (color, name);
3814 } 3357 }
3815 break; 3358 break;
3359 case Rxvt_restoreFG:
3816 case XTerm_Color00: 3360 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3361 process_color_seq (op, Color_fg, str, resp);
3818 break; 3362 break;
3363 case Rxvt_restoreBG:
3819 case XTerm_Color01: 3364 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3365 process_color_seq (op, Color_bg, str, resp);
3821 break; 3366 break;
3822#ifndef NO_CURSORCOLOR 3367#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3368 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3369 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3370 break;
3826#endif 3371#endif
3827 case XTerm_Color_pointer_fg: 3372 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3373 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3374 break;
3830 case XTerm_Color_pointer_bg: 3375 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3376 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3377 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3378#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3379 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3380 process_color_seq (op, Color_RV, str, resp);
3836 break; 3381 break;
3837 case Rxvt_Color_BD: 3382 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3383 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3384 process_color_seq (op, Color_BD, str, resp);
3840 break; 3385 break;
3841 case Rxvt_Color_UL: 3386 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3387 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3388 process_color_seq (op, Color_UL, str, resp);
3844 break; 3389 break;
3845 case URxvt_Color_IT: 3390 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3391 process_color_seq (op, Color_IT, str, resp);
3847 break; 3392 break;
3848#endif 3393#endif
3849#if TRANSPARENT && TINTING 3394#if ENABLE_TRANSPARENCY
3850 case URxvt_Color_tint: 3395 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3396 process_color_seq (op, Color_tint, str, resp);
3852 check_our_parents (); 3397 {
3853 if (am_transparent) 3398 bool changed = false;
3854 want_full_refresh = want_refresh = 1;
3855 break;
3856#endif
3857 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
3858 case Rxvt_Pixmap: 3413 case Rxvt_Pixmap:
3859 { 3414 if (!strcmp (str, "?"))
3860 if (*str != ';')
3861 { 3415 {
3862#if XPM_BACKGROUND 3416 char str[256];
3863 scale_pixmap (""); /* reset to default scaling */ 3417
3864 set_bgPixmap (str); /* change pixmap */ 3418 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3865 scr_touch (true); 3419 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3866#endif 3420 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3421 process_xterm_seq (XTerm_title, str, CHAR_ST);
3867 } 3422 }
3868 3423 else
3424 {
3869 int changed = 0; 3425 int changed = 0;
3870 3426
3871 while ((str = strchr (str, ';')) != NULL) 3427 if (*str != ';')
3872 { 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 {
3873 str++; 3440 str++;
3874#if XPM_BACKGROUND 3441 if (bgPixmap.set_geometry (str))
3875 changed += scale_pixmap (str); 3442 changed++;
3876#endif 3443 str = strchr (str, ';');
3877 } 3444 }
3878 3445
3879 if (changed) 3446 if (changed)
3880 { 3447 update_background ();
3881#ifdef XPM_BACKGROUND
3882 resize_pixmap ();
3883 scr_touch (true);
3884#endif
3885 } 3448 }
3886 }
3887 break; 3449 break;
3888 3450#endif
3889 case Rxvt_restoreFG:
3890 set_window_color (Color_fg, str);
3891 break;
3892 case Rxvt_restoreBG:
3893 set_window_color (Color_bg, str);
3894 break;
3895 3451
3896 case XTerm_logfile: 3452 case XTerm_logfile:
3897 // TODO, when secure mode? 3453 // TODO, when secure mode?
3898 break; 3454 break;
3899 3455
… …
3917 case URxvt_italicFont: 3473 case URxvt_italicFont:
3918 case URxvt_boldItalicFont: 3474 case URxvt_boldItalicFont:
3919#endif 3475#endif
3920 if (query) 3476 if (query)
3921 tt_printf ("\33]%d;%-.250s%c", saveop, 3477 tt_printf ("\33]%d;%-.250s%c", saveop,
3922 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3478 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3923 ? fontset[op - URxvt_font]->fontdesc : "", 3479 ? fontset[op - URxvt_font]->fontdesc : "",
3924 resp); 3480 resp);
3925 else 3481 else
3926 { 3482 {
3927 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3483 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3933 break; 3489 break;
3934 3490
3935 case URxvt_version: 3491 case URxvt_version:
3936 if (query) 3492 if (query)
3937 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3493 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3938 URxvt_version, 3494 op,
3939 rs[Rs_name],
3940 VERSION[0], VERSION[2], 3495 rs[Rs_name], VERSION[0], VERSION[2],
3941 resp); 3496 resp);
3942 break; 3497 break;
3943 3498
3944#if ENABLE_FRILLS 3499#if !ENABLE_MINIMAL
3945 case URxvt_locale: 3500 case URxvt_locale:
3946 if (query) 3501 if (query)
3947 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);
3948 else 3503 else
3949 { 3504 {
3950 set_locale (str); 3505 set_locale (str);
3951 pty->set_utf8_mode (enc_utf8); 3506 pty->set_utf8_mode (enc_utf8);
3952 init_xlocale (); 3507 init_xlocale ();
… …
3967 break; 3522 break;
3968#endif 3523#endif
3969 3524
3970#if ENABLE_PERL 3525#if ENABLE_PERL
3971 case URxvt_perl: 3526 case URxvt_perl:
3972 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)))
3973 ; // no responses yet 3528 ; // no responses yet
3974 break; 3529 break;
3975#endif 3530#endif
3976 } 3531 }
3977} 3532}
… …
4015{ 3570{
4016 unsigned int i, j; 3571 unsigned int i, j;
4017 int state; 3572 int state;
4018 3573
4019 static const struct 3574 static const struct
4020 { 3575 {
4021 const int argval; 3576 const int argval;
4022 const unsigned long bit; 3577 const unsigned long bit;
4023 }
4024
4025 argtopriv[] = { 3578 } argtopriv[] = {
4026 { 1, PrivMode_aplCUR }, 3579 { 1, PrivMode_aplCUR },
4027 { 2, PrivMode_vt52 }, 3580 { 2, PrivMode_vt52 },
4028 { 3, PrivMode_132 }, 3581 { 3, PrivMode_132 },
4029 { 4, PrivMode_smoothScroll }, 3582 { 4, PrivMode_smoothScroll },
4030 { 5, PrivMode_rVideo }, 3583 { 5, PrivMode_rVideo },
… …
4046 { 66, PrivMode_aplKP }, 3599 { 66, PrivMode_aplKP },
4047#ifndef NO_BACKSPACE_KEY 3600#ifndef NO_BACKSPACE_KEY
4048 { 67, PrivMode_BackSpace }, 3601 { 67, PrivMode_BackSpace },
4049#endif 3602#endif
4050 { 1000, PrivMode_MouseX11 }, 3603 { 1000, PrivMode_MouseX11 },
4051 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3604 { 1002, PrivMode_MouseBtnEvent },
4052 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3605 { 1003, PrivMode_MouseAnyEvent },
4053 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4054 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4055 { 1011, PrivMode_Keypress }, // rxvt extension 3607 { 1011, PrivMode_Keypress }, // rxvt extension
4056 // 1035 enable modifiers for alt, numlock NYI 3608 // 1035 enable modifiers for alt, numlock NYI
4057 // 1036 send ESC for meta keys NYI 3609 // 1036 send ESC for meta keys NYI
4058 // 1037 send DEL for keypad delete NYI 3610 // 1037 send DEL for keypad delete NYI
4059 { 1047, PrivMode_Screen }, 3611 { 1047, PrivMode_Screen },
4060 // 1048 save and restore cursor 3612 // 1048 save and restore cursor
4061 { 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 */
4062 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste },
4063 }; 3616 };
4064 3617
4065 if (nargs == 0) 3618 if (nargs == 0)
4066 return; 3619 return;
4067 3620
… …
4093 scr_touch (true); 3646 scr_touch (true);
4094 break; 3647 break;
4095#endif 3648#endif
4096 case 1048: /* alternative cursor save */ 3649 case 1048: /* alternative cursor save */
4097 case 1049: 3650 case 1049:
4098 if (OPTION (Opt_secondaryScreen)) 3651 if (option (Opt_secondaryScreen))
4099 if (mode == 0) 3652 if (mode == 0)
4100 scr_cursor (RESTORE); 3653 scr_cursor (RESTORE);
4101 else if (mode == 1) 3654 else if (mode == 1)
4102 scr_cursor (SAVE); 3655 scr_cursor (SAVE);
4103 break; 3656 break;
… …
4115 */ 3668 */
4116 PrivMode (1, PrivMode_vt52); 3669 PrivMode (1, PrivMode_vt52);
4117 break; 3670 break;
4118 case 3: /* 80/132 */ 3671 case 3: /* 80/132 */
4119 if (priv_modes & PrivMode_132OK) 3672 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
4120 set_widthheight (((state ? 132 : 80) * fwidth), height); 3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3676 }
4121 break; 3677 break;
4122 case 4: /* smooth scrolling */ 3678 case 4: /* smooth scrolling */
4123 set_option (Opt_jumpScroll, !state); 3679 set_option (Opt_jumpScroll, !state);
4124 break; 3680 break;
4125 case 5: /* reverse video */ 3681 case 5: /* reverse video */
… …
4132 scr_autowrap (state); 3688 scr_autowrap (state);
4133 break; 3689 break;
4134 /* 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 */
4135 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
4136 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
4137 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4138 break; 3694 break;
4139#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
4140 case scrollBar_esc: 3696 case scrollBar_esc:
4141 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
4142 { 3698 {
… …
4155 break; 3711 break;
4156 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
4157 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
4158 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
4159 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
4160 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4161 break; 3717 break;
4162#if 0
4163 case 1001: 3718 case 1002:
4164 break; /* X11 mouse highlighting */ 3719 case 1003:
4165#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;
4166 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
4167 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
4168 break; 3732 break;
4169 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
4170 set_option (Opt_scrollTtyKeypress, state); 3734 set_option (Opt_scrollTtyKeypress, state);
4171 break; 3735 break;
4172 case 1047: /* secondary screen w/ clearing last */ 3736 case 1047: /* secondary screen w/ clearing last */
4173 if (OPTION (Opt_secondaryScreen)) 3737 if (option (Opt_secondaryScreen))
4174 if (current_screen != PRIMARY) 3738 if (current_screen != PRIMARY)
4175 scr_erase_screen (2); 3739 scr_erase_screen (2);
4176 scr_change_screen (state); 3740 scr_change_screen (state);
4177 break; 3741 break;
4178 case 1049: /* secondary screen w/ clearing first */ 3742 case 1049: /* secondary screen w/ clearing first */
4179 scr_change_screen (state); 3743 scr_change_screen (state);
4180 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4181 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4182 scr_erase_screen (2); 3746 scr_erase_screen (2);
4183 break; 3747 break;
4184 default: 3748 default:
4185 break; 3749 break;
… …
4313 scr_color (Color_bg, Color_bg); 3877 scr_color (Color_bg, Color_bg);
4314 break; 3878 break;
4315 3879
4316 //case 50: // not variable spacing 3880 //case 50: // not variable spacing
4317 3881
4318#if ENABLE_FRILLS 3882#if !ENABLE_MINIMAL
4319 case 90: 3883 case 90:
4320 case 91: /* set bright fg color */ 3884 case 91: /* set bright fg color */
4321 case 92: 3885 case 92:
4322 case 93: 3886 case 93:
4323 case 94: 3887 case 94:
… …
4347rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
4348{ 3912{
4349 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
4350 3914
4351 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
4352 { /* query graphics */ 3917 /* query graphics */
4353 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
4354 return; 3919 return;
4355 } 3920 }
4356 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
4357 do 3922 do
… …
4407 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4408 3973
4409 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
4410 v_buflen += len; 3975 v_buflen += len;
4411 3976
4412 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
4413} 3978}
4414 3979
4415void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4416{ 3981{
4417 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));
… …
4422 3987
4423 if (v_buflen == 0) 3988 if (v_buflen == 0)
4424 { 3989 {
4425 free (v_buffer); 3990 free (v_buffer);
4426 v_buffer = 0; 3991 v_buffer = 0;
4427 v_buflen = 0;
4428 3992
4429 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4430 return; 3994 return;
4431 } 3995 }
4432 3996
4433 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4434 } 3998 }
4435 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4436 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4437} 4001}
4438 4002
4439/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4440 4004

Diff Legend

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