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.295 by root, Tue Jan 31 00:25:16 2006 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 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);
232 231
… …
280 } 279 }
281 280
282 iso14755buf = 0; 281 iso14755buf = 0;
283} 282}
284 283
285int 284static int
286rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
287{ 286{
288 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
289 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
290 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
291 { 290 {
… …
299 298
300 return -1; 299 return -1;
301} 300}
302#endif 301#endif
303 302
304/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
305void 339void
306rxvt_term::lookup_key (XKeyEvent &ev) 340rxvt_term::key_press (XKeyEvent &ev)
307{ 341{
308 int ctrl, meta, shft, len; 342 int ctrl, meta, shft, len;
309 unsigned int newlen;
310 KeySym keysym; 343 KeySym keysym;
311 int valid_keysym; 344 int valid_keysym;
312 char kbuf[KBUFSZ]; 345 char kbuf[KBUFSZ];
346
347#if ISO_14755
348 if (iso14755buf & ISO_14755_52)
349 return;
350#endif
313 351
314 /* 352 /*
315 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 353 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
316 * escape sequence to toggle the Keypad. 354 * escape sequence to toggle the Keypad.
317 * 355 *
… …
497# if ISO_14755 535# if ISO_14755
498 iso14755_51 (0); 536 iso14755_51 (0);
499# endif 537# endif
500 return; 538 return;
501 } 539 }
540 else if (keysym == XK_BackSpace)
541 {
542 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
543# if ISO_14755
544 iso14755_51 (iso14755buf & ISO_14755_MASK);
545# endif
546 return;
547 }
502 else if ((hv = hex_keyval (ev)) >= 0) 548 else if ((hv = hex_keyval (ev)) >= 0)
503 { 549 {
504 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 550 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
505 | hv | ISO_14755_51; 551 | hv | ISO_14755_51;
506# if ISO_14755 552# if ISO_14755
… …
508# endif 554# endif
509 return; 555 return;
510 } 556 }
511 else 557 else
512 { 558 {
513# if ENABLE_OVERLAY 559# if ISO_14755
514 scr_overlay_off (); 560 scr_overlay_off ();
515# endif 561# endif
516 iso14755buf = 0; 562 iso14755buf = 0;
517 } 563 }
518 } 564 }
519 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 565 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
520 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 566 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
521 if (!(iso14755buf & ISO_14755_STARTED)) 567 if (!(iso14755buf & ISO_14755_STARTED))
522 { 568 {
523 iso14755buf |= ISO_14755_STARTED; 569 iso14755buf |= ISO_14755_STARTED;
524# if ENABLE_OVERLAY 570# if ISO_14755
525 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 571 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
526 scr_overlay_set (0, 0, "ISO 14755 mode"); 572 scr_overlay_set (0, 0, "ISO 14755 mode");
527# endif 573# endif
528 } 574 }
529#endif 575#endif
530 576
531#ifdef PRINTPIPE 577#ifdef PRINTPIPE
532 if (keysym == XK_Print) 578 if (keysym == XK_Print)
533 { 579 {
534 scr_printscreen (ctrl | shft); 580 scr_printscreen (ctrl | shft);
535 return; 581 return;
536 } 582 }
537#endif 583#endif
538 584
539 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 585 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
540 { 586 {
541 { 587 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
542 newlen = 1; 588 unsigned int newlen = 1;
543 switch (keysym) 589
590 switch (translate_keypad (keysym, kp))
544 { 591 {
545#ifndef NO_BACKSPACE_KEY 592#ifndef NO_BACKSPACE_KEY
546 case XK_BackSpace: 593 case XK_BackSpace:
547 if (priv_modes & PrivMode_HaveBackSpace) 594 if (priv_modes & PrivMode_HaveBackSpace)
548 { 595 {
549 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 596 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
550 ^ !!ctrl) ? '\b' : '\177'; 597 ^ !!ctrl) ? '\b' : '\177';
551 kbuf[1] = '\0'; 598 kbuf[1] = '\0';
552 } 599 }
553 else 600 else
554 strcpy (kbuf, key_backspace); 601 strcpy (kbuf, rs[Rs_backspace_key]);
555 break; 602 break;
556#endif 603#endif
557#ifndef NO_DELETE_KEY 604#ifndef NO_DELETE_KEY
558# ifdef XK_KP_Prior
559 case XK_KP_Delete:
560 /* allow shift to override */
561 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
562 {
563 strcpy (kbuf, "\033On");
564 break;
565 }
566 /* FALLTHROUGH */
567# endif
568 case XK_Delete: 605 case XK_Delete:
569 strcpy (kbuf, key_delete); 606 strcpy (kbuf, rs[Rs_delete_key]);
570 break; 607 break;
571#endif 608#endif
572 case XK_Tab: 609 case XK_Tab:
573 if (shft) 610 if (shft)
574 strcpy (kbuf, "\033[Z"); 611 strcpy (kbuf, "\033[Z");
… …
584#endif 621#endif
585 newlen = 0; 622 newlen = 0;
586 } 623 }
587 break; 624 break;
588 625
589#ifdef XK_KP_Left
590 case XK_KP_Up: /* \033Ox or standard */
591 case XK_KP_Down: /* \033Or or standard */
592 case XK_KP_Right: /* \033Ov or standard */
593 case XK_KP_Left: /* \033Ot or standard */
594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
595 {
596 strcpy (kbuf, "\033OZ");
597 kbuf[2] = "txvr"[keysym - XK_KP_Left];
598 break;
599 }
600 else
601 /* translate to std. cursor key */
602 keysym = XK_Left + (keysym - XK_KP_Left);
603 /* FALLTHROUGH */
604#endif
605 case XK_Up: /* "\033[A" */ 626 case XK_Up: /* "\033[A" */
606 case XK_Down: /* "\033[B" */ 627 case XK_Down: /* "\033[B" */
607 case XK_Right: /* "\033[C" */ 628 case XK_Right: /* "\033[C" */
608 case XK_Left: /* "\033[D" */ 629 case XK_Left: /* "\033[D" */
609 strcpy (kbuf, "\033[Z"); 630 strcpy (kbuf, "\033[Z");
… …
619 else if (priv_modes & PrivMode_aplCUR) 640 else if (priv_modes & PrivMode_aplCUR)
620 kbuf[1] = 'O'; 641 kbuf[1] = 'O';
621 break; 642 break;
622 643
623#ifndef UNSHIFTED_SCROLLKEYS 644#ifndef UNSHIFTED_SCROLLKEYS
624# ifdef XK_KP_Prior
625 case XK_KP_Prior:
626 /* allow shift to override */
627 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
628 {
629 strcpy (kbuf, "\033Oy");
630 break;
631 }
632 /* FALLTHROUGH */
633# endif
634 case XK_Prior: 645 case XK_Prior:
635 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
636 break; 647 break;
637# ifdef XK_KP_Next
638 case XK_KP_Next:
639 /* allow shift to override */
640 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
641 {
642 strcpy (kbuf, "\033Os");
643 break;
644 }
645 /* FALLTHROUGH */
646# endif
647 case XK_Next: 648 case XK_Next:
648 strcpy (kbuf, "\033[6~"); 649 strcpy (kbuf, "\033[6~");
649 break; 650 break;
650#endif 651#endif
651 case XK_KP_Enter: 652 case XK_KP_Enter:
652 /* allow shift to override */ 653 /* allow shift to override */
653 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 654 if (kp)
654 { 655 {
655 strcpy (kbuf, "\033OM"); 656 strcpy (kbuf, "\033OM");
656 break; 657 break;
657 } 658 }
658 659
… …
670 kbuf[0] = '\015'; 671 kbuf[0] = '\015';
671 kbuf[1] = '\0'; 672 kbuf[1] = '\0';
672 } 673 }
673 break; 674 break;
674 675
675#ifdef XK_KP_Begin
676 case XK_KP_Begin:
677 strcpy (kbuf, "\033Ou");
678 break;
679
680#endif
681 case XK_KP_F1: /* "\033OP" */ 676 case XK_KP_F1: /* "\033OP" */
682 case XK_KP_F2: /* "\033OQ" */ 677 case XK_KP_F2: /* "\033OQ" */
683 case XK_KP_F3: /* "\033OR" */ 678 case XK_KP_F3: /* "\033OR" */
684 case XK_KP_F4: /* "\033OS" */ 679 case XK_KP_F4: /* "\033OS" */
685 strcpy (kbuf, "\033OP"); 680 strcpy (kbuf, "\033OP");
… …
701 case XK_KP_6: /* "\033Ov" : "6" */ 696 case XK_KP_6: /* "\033Ov" : "6" */
702 case XK_KP_7: /* "\033Ow" : "7" */ 697 case XK_KP_7: /* "\033Ow" : "7" */
703 case XK_KP_8: /* "\033Ox" : "8" */ 698 case XK_KP_8: /* "\033Ox" : "8" */
704 case XK_KP_9: /* "\033Oy" : "9" */ 699 case XK_KP_9: /* "\033Oy" : "9" */
705 /* allow shift to override */ 700 /* allow shift to override */
706 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 701 if (kp)
707 { 702 {
708 strcpy (kbuf, "\033Oj"); 703 strcpy (kbuf, "\033Oj");
709 kbuf[2] += (keysym - XK_KP_Multiply); 704 kbuf[2] += (keysym - XK_KP_Multiply);
710 } 705 }
711 else 706 else
… …
717 712
718 case XK_Find: 713 case XK_Find:
719 strcpy (kbuf, "\033[1~"); 714 strcpy (kbuf, "\033[1~");
720 break; 715 break;
721 716
722#ifdef XK_KP_End
723 case XK_KP_Insert:
724 /* allow shift to override */
725 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
726 {
727 strcpy (kbuf, "\033Op");
728 break;
729 }
730 /* FALLTHROUGH */
731#endif
732 case XK_Insert: 717 case XK_Insert:
733 strcpy (kbuf, "\033[2~"); 718 strcpy (kbuf, "\033[2~");
734 break; 719 break;
735#ifdef DXK_Remove /* support for DEC remove like key */ 720#ifdef DXK_Remove /* support for DEC remove like key */
736 case DXK_Remove: 721 case DXK_Remove:
… …
740 strcpy (kbuf, "\033[3~"); 725 strcpy (kbuf, "\033[3~");
741 break; 726 break;
742 case XK_Select: 727 case XK_Select:
743 strcpy (kbuf, "\033[4~"); 728 strcpy (kbuf, "\033[4~");
744 break; 729 break;
745#ifdef XK_KP_End
746 case XK_KP_End:
747 /* allow shift to override */
748 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
749 {
750 strcpy (kbuf, "\033Oq");
751 break;
752 }
753 /* FALLTHROUGH */
754#endif
755 case XK_End: 730 case XK_End:
756 strcpy (kbuf, KS_END); 731 strcpy (kbuf, KS_END);
757 break; 732 break;
758#ifdef XK_KP_Home
759 case XK_KP_Home:
760 /* allow shift to override */
761 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
762 {
763 strcpy (kbuf, "\033Ow");
764 break;
765 }
766 /* FALLTHROUGH */
767#endif
768 case XK_Home: 733 case XK_Home:
769 strcpy (kbuf, KS_HOME); 734 strcpy (kbuf, KS_HOME);
770 break; 735 break;
771 736
772#define FKEY(n, fkey) \ 737#define FKEY(n, fkey) \
… …
829 break; 794 break;
830 } 795 }
831 796
832 if (newlen) 797 if (newlen)
833 len = strlen (kbuf); 798 len = strlen (kbuf);
834 }
835 799
836 /* 800 /*
837 * Pass meta for all function keys, if 'meta' option set 801 * Pass meta for all function keys, if 'meta' option set
838 */ 802 */
839#ifdef META8_OPTION 803#ifdef META8_OPTION
… …
874 return; 838 return;
875 839
876 if (len <= 0) 840 if (len <= 0)
877 return; /* not mapped */ 841 return; /* not mapped */
878 842
879 if (OPTION (Opt_scrollTtyKeypress)) 843 if (option (Opt_scrollTtyKeypress))
880 if (view_start) 844 if (view_start)
881 { 845 {
882 view_start = 0; 846 view_start = 0;
883 want_refresh = 1; 847 want_refresh = 1;
884 } 848 }
… …
908 tt_write (&ch, 1); 872 tt_write (&ch, 1);
909 } 873 }
910 874
911 tt_write (kbuf, (unsigned int)len); 875 tt_write (kbuf, (unsigned int)len);
912} 876}
913/*}}} */ 877
878void
879rxvt_term::key_release (XKeyEvent &ev)
880{
881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
882 KeySym keysym;
883
884 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
885#endif
886
887#if ENABLE_FRILLS || ISO_14755
888 // ISO 14755 support
889 if (iso14755buf)
890 if (iso14755buf & ISO_14755_52)
891 {
892# if ISO_14755
893 scr_overlay_off ();
894# endif
895# if ISO_14755
896 // iso14755 part 5.2 handling: release time
897 // first: controls
898 if ((ev.state & ControlMask)
899 && ((keysym >= 0x40 && keysym <= 0x5f)
900 || (keysym >= 0x61 && keysym <= 0x7f)))
901 {
902 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
903 commit_iso14755 ();
904
905 return;
906 }
907
908 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
909 if (i[0] == keysym)
910 {
911 iso14755buf = ISO_14755_51 | i[1];
912 commit_iso14755 ();
913
914 return;
915 }
916
917 scr_bell ();
918# endif
919 iso14755buf = 0;
920
921 return;
922 }
923 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
924 {
925# if ISO_14755
926 scr_overlay_off ();
927# endif
928 if (iso14755buf & ISO_14755_51)
929 commit_iso14755 ();
930#if ISO_14755
931 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
932 {
933 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
934
935 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
936 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
937 }
938# endif
939 else
940 iso14755buf = 0;
941 }
942#endif
943
944 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
945 return;
946
947#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
948 if (!(ev.state & ControlMask))
949 slip_wheel_ev.stop ();
950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
951 mouse_slip_wheel_speed = 0;
952#endif
953}
914 954
915#if defined (KEYSYM_RESOURCE) 955#if defined (KEYSYM_RESOURCE)
916unsigned int 956unsigned int
917rxvt_term::cmd_write (const char *str, unsigned int count) 957rxvt_term::cmd_write (const char *str, unsigned int count)
918{ 958{
… …
948void 988void
949rxvt_term::flush () 989rxvt_term::flush ()
950{ 990{
951 flush_ev.stop (); 991 flush_ev.stop ();
952 992
953#ifdef TRANSPARENT 993#ifdef HAVE_BG_PIXMAP
954 if (want_full_refresh) 994 if (bgPixmap.check_clearChanged ())
955 { 995 {
956 want_full_refresh = 0; 996// scr_clear (true); This needs to be researched further!
957 scr_clear ();
958 scr_touch (false); 997 scr_touch (false);
959 } 998 }
960#endif 999#endif
961 1000
962 if (want_refresh) 1001 if (want_refresh)
… …
1007 } 1046 }
1008 1047
1009 display->flush (); 1048 display->flush ();
1010} 1049}
1011 1050
1051/* checks wether a refresh is requested and starts the refresh timer */
1012void 1052void
1013rxvt_term::check_cb (check_watcher &w) 1053rxvt_term::refresh_check ()
1054{
1055 if (want_refresh && !flush_ev.is_active ())
1056 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1057
1058 display->flush ();
1059}
1060
1061void
1062rxvt_term::flush_cb (ev::timer &w, int revents)
1014{ 1063{
1015 make_current (); 1064 make_current ();
1016 1065
1017 display->flush ();
1018
1019 if (want_refresh && !flush_ev.active)
1020 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1021}
1022
1023void
1024rxvt_term::flush_cb (time_watcher &w)
1025{
1026 make_current ();
1027
1028 refresh_limit = 1;
1029 refresh_count = 0; 1066 refresh_count = 0;
1030 flush (); 1067 flush ();
1031} 1068}
1032 1069
1033#ifdef CURSOR_BLINK 1070#ifdef CURSOR_BLINK
1034void 1071void
1035rxvt_term::cursor_blink_cb (time_watcher &w) 1072rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1036{ 1073{
1037 hidden_cursor = !hidden_cursor; 1074 hidden_cursor = !hidden_cursor;
1038 want_refresh = 1; 1075 want_refresh = 1;
1039 1076 refresh_check ();
1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
1041} 1077}
1042#endif 1078#endif
1043 1079
1044#ifdef TEXT_BLINK 1080#ifdef TEXT_BLINK
1045void 1081void
1046rxvt_term::text_blink_cb (time_watcher &w) 1082rxvt_term::text_blink_cb (ev::timer &w, int revents)
1047{ 1083{
1048 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1084 if (scr_refresh_rend (RS_Blink, RS_Blink))
1049 { 1085 {
1050 hidden_text = !hidden_text; 1086 hidden_text = !hidden_text;
1051 want_refresh = 1; 1087 want_refresh = 1;
1052 w.start (w.at + TEXT_BLINK_INTERVAL); 1088 refresh_check ();
1053 } 1089 }
1090 else
1091 w.stop ();
1054} 1092}
1055#endif 1093#endif
1056 1094
1057#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1095#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1058void 1096void
1059rxvt_term::cont_scroll_cb (time_watcher &w) 1097rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1060{ 1098{
1061 if ((scrollbar_isUp() || scrollbar_isDn()) && 1099 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1062 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1100 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1063 { 1101 {
1064 want_refresh = 1; 1102 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1103 refresh_check ();
1066 } 1104 }
1105 else
1106 w.stop ();
1067} 1107}
1068#endif 1108#endif
1069 1109
1070#ifdef SELECTION_SCROLLING 1110#ifdef SELECTION_SCROLLING
1071void 1111void
1072rxvt_term::sel_scroll_cb (time_watcher &w) 1112rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1073{ 1113{
1074 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1114 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1075 { 1115 {
1076 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1116 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1077 want_refresh = 1; 1117 want_refresh = 1;
1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1079 } 1119 }
1120 else
1121 w.stop ();
1080} 1122}
1081#endif 1123#endif
1082 1124
1083#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1125#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1084void 1126void
1085rxvt_term::slip_wheel_cb (time_watcher &w) 1127rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1086{ 1128{
1087 if (mouse_slip_wheel_speed == 0 1129 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1088 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1089 : scr_page (UP, mouse_slip_wheel_speed))
1090 { 1130 {
1091 if (view_start == top_row || view_start == 0)
1092 mouse_slip_wheel_speed = 0;
1093
1094 want_refresh = 1; 1131 want_refresh = 1;
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1132 refresh_check ();
1133 }
1134
1135 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1096 } 1136 {
1137 mouse_slip_wheel_speed = 0;
1138 w.stop ();
1139 }
1097} 1140}
1098#endif 1141#endif
1099 1142
1100#if HAVE_SCHED_YIELD 1143#if LINUX_YIELD_HACK
1101static struct event_handler 1144static struct event_handler
1102{ 1145{
1103 check_watcher cw_yield; 1146 ev::prepare yield_ev;
1104 1147
1105 void yield (check_watcher &w) 1148 void yield_cb (ev::prepare &w, int revents)
1106 { 1149 {
1107 sched_yield (); 1150 // this should really be sched_yield(), but the linux guys thought
1151 // that giving a process calling sched_yield () less cpu time than
1152 // ones with high nice levels is a useful thing to do. It surely is is
1153 // allowed by the sus... as is returning ENOSYS.
1154
1155 struct timespec ts = { 0, 0 };
1156 nanosleep (&ts, 0);
1157
1108 w.stop (); 1158 w.stop ();
1109 } 1159 }
1110 1160
1111 event_handler () 1161 event_handler ()
1112 : cw_yield (this, &event_handler::yield) 1162 : yield_ev (this, &event_handler::yield_cb)
1113 { 1163 {
1114 } 1164 }
1115} event_handler; 1165} event_handler;
1116#endif 1166#endif
1117 1167
… …
1137 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1138 return true; 1188 return true;
1139 } 1189 }
1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1190 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 { 1191 {
1142#if HAVE_SCHED_YIELD 1192#if LINUX_YIELD_HACK
1143 if (display->is_local) 1193 if (display->is_local)
1144 event_handler.cw_yield.start (); 1194 event_handler.yield_ev.start ();
1145#endif 1195#endif
1146 } 1196 }
1147 else 1197 else
1148 { 1198 {
1149 pty_ev.stop (); 1199 pty_ev.stop ();
1150 1200
1151 if (!OPTION (Opt_hold)) 1201 if (!option (Opt_hold))
1152 destroy (); 1202 destroy ();
1153 } 1203 }
1154 1204
1155 return false; 1205 return false;
1156} 1206}
1157 1207
1158void 1208void
1159rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
1160{ 1210{
1161 make_current (); 1211 make_current ();
1162 1212
1163 if (revents & EVENT_READ) 1213 if (revents & ev::READ)
1164 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1165 while (pty_fill ()) 1215 while (pty_fill ())
1166 if (cmd_parse ()) 1216 if (cmd_parse ())
1167 break; 1217 break;
1168 1218
1169 if (revents & EVENT_WRITE) 1219 if (revents & ev::WRITE)
1170 pty_write (); 1220 pty_write ();
1221
1222 refresh_check ();
1171} 1223}
1172 1224
1173void 1225void
1174rxvt_term::pointer_unblank () 1226rxvt_term::pointer_unblank ()
1175{ 1227{
1176 XDefineCursor (xdisp, vt, TermWin_cursor); 1228 XDefineCursor (dpy, vt, TermWin_cursor);
1177 recolour_cursor (); 1229 recolour_cursor ();
1178 1230
1179#ifdef POINTER_BLANK 1231#ifdef POINTER_BLANK
1180 hidden_pointer = 0; 1232 hidden_pointer = 0;
1181 1233
1182 if (OPTION (Opt_pointerBlank)) 1234 if (option (Opt_pointerBlank))
1183 pointer_ev.start (NOW + pointerBlankDelay); 1235 pointer_ev.start (pointerBlankDelay);
1184#endif 1236#endif
1185} 1237}
1186 1238
1187#ifdef POINTER_BLANK 1239#ifdef POINTER_BLANK
1188void 1240void
1189rxvt_term::pointer_blank () 1241rxvt_term::pointer_blank ()
1190{ 1242{
1191 if (!OPTION (Opt_pointerBlank)) 1243 if (!option (Opt_pointerBlank))
1192 return; 1244 return;
1193 1245
1194 XDefineCursor (xdisp, vt, display->blank_cursor); 1246 XDefineCursor (dpy, vt, display->blank_cursor);
1195 XFlush (xdisp); 1247 XFlush (dpy);
1196 1248
1197 hidden_pointer = 1; 1249 hidden_pointer = 1;
1198} 1250}
1199 1251
1200void 1252void
1201rxvt_term::pointer_cb (time_watcher &w) 1253rxvt_term::pointer_cb (ev::timer &w, int revents)
1202{ 1254{
1203 make_current (); 1255 make_current ();
1204 1256
1205 pointer_blank (); 1257 pointer_blank ();
1206} 1258}
… …
1209void 1261void
1210rxvt_term::mouse_report (XButtonEvent &ev) 1262rxvt_term::mouse_report (XButtonEvent &ev)
1211{ 1263{
1212 int button_number, key_state = 0; 1264 int button_number, key_state = 0;
1213 int x, y; 1265 int x, y;
1266 int code = 32;
1214 1267
1215 x = ev.x; 1268 x = Pixel2Col (ev.x);
1216 y = ev.y; 1269 y = Pixel2Row (ev.y);
1217 pixel_position (&x, &y); 1270 if (ev.type == MotionNotify)
1271 {
1272 if (x == mouse_row && y == mouse_col)
1273 return;
1274 mouse_row = x;
1275 mouse_col = y;
1276 code += 32;
1277 }
1218 1278
1219 if (MEvent.button == AnyButton) 1279 if (MEvent.button == AnyButton)
1220 button_number = 3; 1280 button_number = 3;
1221 else 1281 else
1222 { 1282 {
… …
1268 x + 1, 1328 x + 1,
1269 y + 1); 1329 y + 1);
1270#endif 1330#endif
1271 1331
1272 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1273 (32 + button_number + key_state), 1333 (code + button_number + key_state),
1274 (32 + x + 1), 1334 (32 + x + 1),
1275 (32 + y + 1)); 1335 (32 + y + 1));
1276} 1336}
1277 1337
1278/*{{{ process an X event */ 1338/*{{{ process an X event */
1279void 1339void
1280rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
1281{ 1341{
1282 make_current (); 1342 make_current ();
1283 1343
1284 dLocal (Display *, xdisp); 1344 dLocal (Display *, dpy);
1285 1345
1286 if (ev.xany.window == vt 1346 if (ev.xany.window == vt
1287 && SHOULD_INVOKE (HOOK_X_EVENT) 1347 && SHOULD_INVOKE (HOOK_X_EVENT)
1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1348 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1289 return; 1349 return;
… …
1294 unsigned int unused_mask; 1354 unsigned int unused_mask;
1295 1355
1296 switch (ev.type) 1356 switch (ev.type)
1297 { 1357 {
1298 case KeyPress: 1358 case KeyPress:
1299#if ISO_14755 1359 key_press (ev.xkey);
1300 if (!(iso14755buf & ISO_14755_52))
1301#endif
1302 lookup_key (ev.xkey);
1303
1304 break; 1360 break;
1305 1361
1306 case KeyRelease: 1362 case KeyRelease:
1307 { 1363 key_release (ev.xkey);
1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1309 KeySym keysym;
1310
1311 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1312#endif
1313
1314#if ENABLE_FRILLS || ISO_14755
1315 // ISO 14755 support
1316 if (iso14755buf)
1317 if (iso14755buf & ISO_14755_52)
1318 {
1319# if ENABLE_OVERLAY
1320 scr_overlay_off ();
1321# endif
1322# if ISO_14755
1323 // iso14755 part 5.2 handling: release time
1324 // first: controls
1325 if ((ev.xkey.state & ControlMask)
1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1328 {
1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1330 commit_iso14755 ();
1331 goto skip_switch;
1332 }
1333
1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1335 if (i[0] == keysym)
1336 {
1337 iso14755buf = ISO_14755_51 | i[1];
1338 commit_iso14755 ();
1339 goto skip_switch;
1340 }
1341
1342 scr_bell ();
1343# endif
1344 iso14755buf = 0;
1345 break;
1346 }
1347 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1348 {
1349# if ENABLE_OVERLAY
1350 scr_overlay_off ();
1351# endif
1352 if (iso14755buf & ISO_14755_51)
1353 commit_iso14755 ();
1354#if ISO_14755
1355 else if (iso14755buf & ISO_14755_STARTED)
1356 {
1357 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1358
1359 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1360 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1361 }
1362# endif
1363 else
1364 iso14755buf = 0;
1365 }
1366#endif
1367
1368 if (ev.xany.window == vt
1369 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1370 break;
1371
1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1373 if (!(ev.xkey.state & ControlMask))
1374 slip_wheel_ev.stop ();
1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1376 mouse_slip_wheel_speed = 0;
1377#endif
1378 break; 1364 break;
1379 }
1380 1365
1381 case ButtonPress: 1366 case ButtonPress:
1382 button_press (ev.xbutton); 1367 button_press (ev.xbutton);
1383 break; 1368 break;
1384 1369
… …
1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1384 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1400 destroy (); 1385 destroy ();
1401 } 1386 }
1402#if ENABLE_EWMH 1387#if ENABLE_EWMH
1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1388 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1404 XSendEvent (xdisp, ev.xclient.window = display->root, 1389 XSendEvent (dpy, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask, 1390 False, SubstructureRedirectMask | SubstructureNotifyMask,
1406 &ev); 1391 &ev);
1407#endif 1392#endif
1408 } 1393 }
1409 } 1394 }
… …
1415 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1400 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1416 focus_out (); 1401 focus_out ();
1417 } 1402 }
1418#endif 1403#endif
1419 } 1404 }
1420 break;
1421
1422 case MappingNotify:
1423 XRefreshKeyboardMapping (&ev.xmapping);
1424 break; 1405 break;
1425 1406
1426 /* 1407 /*
1427 * XXX: this is not the _current_ arrangement 1408 * XXX: this is not the _current_ arrangement
1428 * Here's my conclusion: 1409 * Here's my conclusion:
… …
1447 break; 1428 break;
1448 } 1429 }
1449 break; 1430 break;
1450 1431
1451 case FocusIn: 1432 case FocusIn:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1452 focus_in (); 1436 focus_in ();
1453 break; 1437 break;
1454 1438
1455 case FocusOut: 1439 case FocusOut:
1440 if (ev.xfocus.detail != NotifyInferior
1441 && ev.xfocus.detail != NotifyPointer
1442 && ev.xfocus.mode != NotifyGrab)
1456 focus_out (); 1443 focus_out ();
1457 break; 1444 break;
1458 1445
1459 case ConfigureNotify: 1446 case ConfigureNotify:
1447 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1448 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1449 szHint.width, szHint.height);*/
1460 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1461 { 1451 {
1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1463 ; 1453 ;
1464 1454
1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1455 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1456 {
1467 seen_resize = 1; 1457 seen_resize = 1;
1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1458 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1459 }
1460 else
1461 {
1462#ifdef HAVE_BG_PIXMAP
1463 if (bgPixmap.window_position_sensitive ())
1464 {
1465 if (mapped)
1466 update_background ();
1467 else
1468 bgPixmap.invalidate ();
1469 }
1470#endif
1471 }
1470 1472
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1473 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1474 if (OPTION (Opt_transparent))
1475 check_our_parents ();
1476#endif
1477 } 1474 }
1478 break; 1475 break;
1479 1476
1480 case PropertyNotify: 1477 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1478 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1497 case SelectionRequest: 1494 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1499 break; 1496 break;
1500 1497
1501 case MapNotify: 1498 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed spcifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriwing while WM does
1504 * reparenting.
1505 * We should not render background immidiately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1513 update_background_ev.start (0.025);
1514#endif
1502 mapped = 1; 1515 mapped = 1;
1503#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1504 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1517 text_blink_ev.start ();
1505#endif 1518#endif
1506 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1507 break; 1520 break;
1508 1521
1509 case UnmapNotify: 1522 case UnmapNotify:
… …
1511#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1512 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1513#endif 1526#endif
1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1515 break; 1528 break;
1516
1517#ifdef TRANSPARENT
1518 case ReparentNotify:
1519 rootwin_cb (ev);
1520 break;
1521#endif /* TRANSPARENT */
1522 1529
1523 case GraphicsExpose: 1530 case GraphicsExpose:
1524 case Expose: 1531 case Expose:
1525 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1526 { 1533 {
1527 do 1534 do
1535 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, False);
1538 }
1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1531 1540
1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1533 1542
1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 {
1535 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1536 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1537 1548
1538 want_refresh = 1; 1549 want_refresh = 1;
1539 } 1550 }
1540 else 1551 else
1541 { 1552 {
1542 XEvent unused_event; 1553 XEvent unused_event;
1543 1554
1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1545 ; 1556 ;
1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547 ; 1558 ;
1548 1559
1549 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1550 { 1561 {
1551 scrollBar.setIdle (); 1562 scrollBar.state = STATE_IDLE;
1552 scrollbar_show (0); 1563 scrollbar_show (0);
1553 } 1564 }
1554
1555#ifdef TRANSPARENT
1556 if (am_transparent && ev.xany.window == parent[0])
1557 XClearWindow (xdisp, ev.xany.window);
1558#endif
1559 } 1565 }
1560 break; 1566 break;
1561 1567
1562 case MotionNotify: 1568 case MotionNotify:
1563#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1564 if (hidden_pointer) 1570 if (hidden_pointer)
1565 pointer_unblank (); 1571 pointer_unblank ();
1566#endif 1572#endif
1573 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1574 || priv_modes & PrivMode_MouseAnyEvent)
1575 mouse_report (ev.xbutton);
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1577 break;
1569 1578
1570 if (ev.xany.window == vt) 1579 if (ev.xany.window == vt)
1571 { 1580 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1581 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1582 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop 1583 ; // nop
1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1584 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1576 { 1585 {
1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1586 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1578 ; 1587 ;
1579 1588
1580 XQueryPointer (xdisp, vt, 1589 XQueryPointer (dpy, vt,
1581 &unused_root, &unused_child, 1590 &unused_root, &unused_child,
1582 &unused_root_x, &unused_root_y, 1591 &unused_root_x, &unused_root_y,
1583 &ev.xbutton.x, &ev.xbutton.y, 1592 &ev.xbutton.x, &ev.xbutton.y,
1584 &ev.xbutton.state); 1593 &ev.xbutton.state);
1585#ifdef MOUSE_THRESHOLD 1594#ifdef MOUSE_THRESHOLD
… …
1605 int dist; 1614 int dist;
1606 1615
1607 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1608 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1609 */ 1618 */
1610 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1611 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1612 1621
1613 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1614 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1615 */ 1624 */
1616 selection_save_x = ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
… …
1638 else 1647 else
1639 { 1648 {
1640 /* we are within the text window, so we 1649 /* we are within the text window, so we
1641 * shouldn't be scrolling 1650 * shouldn't be scrolling
1642 */ 1651 */
1643 if (sel_scroll_ev.active)
1644 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1645 } 1653 }
1646#endif 1654#endif
1647#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1648 } 1656 }
1649#endif 1657#endif
1650 } 1658 }
1651 } 1659 }
1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1653 { 1661 {
1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1655 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1656 ; 1664 ;
1657 1665
1658 XQueryPointer (xdisp, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1659 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1660 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1661 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1662 &unused_mask); 1670 &unused_mask);
1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1664 scrollbar_size ()); 1672 scrollbar_size ());
1665 want_refresh = 1; 1673 want_refresh = 1;
1666 refresh_limit = 0;
1667 scrollbar_show (1); 1674 scrollbar_show (1);
1668 } 1675 }
1669 break; 1676 break;
1670 } 1677 }
1671 1678
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1680 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1676 { 1681 {
1677 if (hidden_cursor) 1682 if (hidden_cursor)
1678 { 1683 {
1679 hidden_cursor = 0; 1684 hidden_cursor = 0;
1680 want_refresh = 1; 1685 want_refresh = 1;
1681 } 1686 }
1682 1687
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1684 } 1689 }
1685#endif 1690#endif
1686 1691
1687#if defined(POINTER_BLANK) 1692#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 { 1694 {
1690 if (ev.type == MotionNotify 1695 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress 1696 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease) 1697 || ev.type == ButtonRelease)
1693 if (hidden_pointer) 1698 if (hidden_pointer)
… …
1695 1700
1696 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1697 pointer_blank (); 1702 pointer_blank ();
1698 } 1703 }
1699#endif 1704#endif
1705
1706 refresh_check ();
1700} 1707}
1701 1708
1702void 1709void
1703rxvt_term::focus_in () 1710rxvt_term::focus_in ()
1704{ 1711{
1705 if (!focus) 1712 if (!focus)
1706 { 1713 {
1707 focus = 1; 1714 focus = 1;
1715 want_refresh = 1;
1708 1716
1709 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1717 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1710 1718
1711#if USE_XIM 1719#if USE_XIM
1712 if (Input_Context != NULL) 1720 if (Input_Context != NULL)
1713 { 1721 {
1714 IMSetStatusPosition (); 1722 IMSetPosition ();
1715 XSetICFocus (Input_Context); 1723 XSetICFocus (Input_Context);
1716 } 1724 }
1717#endif 1725#endif
1718#if CURSOR_BLINK 1726#if CURSOR_BLINK
1719 if (OPTION (Opt_cursorBlink)) 1727 if (option (Opt_cursorBlink))
1720 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1728 cursor_blink_ev.again ();
1721#endif 1729#endif
1722#if OFF_FOCUS_FADING 1730#if OFF_FOCUS_FADING
1723 if (rs[Rs_fade]) 1731 if (rs[Rs_fade])
1724 { 1732 {
1725 pix_colors = pix_colors_focused; 1733 pix_colors = pix_colors_focused;
1726 want_refresh = 1;
1727 scr_recolour (); 1734 scr_recolour ();
1735 }
1736#endif
1737#if ENABLE_FRILLS
1738 if (option (Opt_urgentOnBell))
1739 {
1740 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1741 {
1742 h->flags &= ~XUrgencyHint;
1743 XSetWMHints (dpy, parent[0], h);
1744 }
1728 } 1745 }
1729#endif 1746#endif
1730 } 1747 }
1731} 1748}
1732 1749
… …
1734rxvt_term::focus_out () 1751rxvt_term::focus_out ()
1735{ 1752{
1736 if (focus) 1753 if (focus)
1737 { 1754 {
1738 focus = 0; 1755 focus = 0;
1756 want_refresh = 1;
1739 1757
1740 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1741 1759
1742#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1743 if (iso14755buf) 1761 if (iso14755buf)
1744 { 1762 {
1745 iso14755buf = 0; 1763 iso14755buf = 0;
1746# if ENABLE_OVERLAY 1764# if ISO_14755
1747 scr_overlay_off (); 1765 scr_overlay_off ();
1748# endif 1766# endif
1749 } 1767 }
1750#endif 1768#endif
1751#if USE_XIM 1769#if USE_XIM
1752 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1753 XUnsetICFocus (Input_Context); 1771 XUnsetICFocus (Input_Context);
1754#endif 1772#endif
1755#if CURSOR_BLINK 1773#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink)) 1774 if (option (Opt_cursorBlink))
1757 cursor_blink_ev.stop (); 1775 cursor_blink_ev.stop ();
1776
1758 hidden_cursor = 0; 1777 hidden_cursor = 0;
1759#endif 1778#endif
1760#if OFF_FOCUS_FADING 1779#if OFF_FOCUS_FADING
1761 if (rs[Rs_fade]) 1780 if (rs[Rs_fade])
1762 { 1781 {
1763 pix_colors = pix_colors_unfocused; 1782 pix_colors = pix_colors_unfocused;
1764 want_refresh = 1;
1765 scr_recolour (); 1783 scr_recolour ();
1766 } 1784 }
1767#endif 1785#endif
1768 } 1786 }
1769} 1787}
1770 1788
1771#if TRANSPARENT 1789void
1790rxvt_term::update_fade_color (unsigned int idx)
1791{
1792#if OFF_FOCUS_FADING
1793 if (rs[Rs_fade])
1794 {
1795 rgba c;
1796 pix_colors [Color_fade].get (c);
1797 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1798 }
1799#endif
1800}
1801
1802#if ENABLE_TRANSPARENCY || ENABLE_PERL
1772void 1803void
1773rxvt_term::rootwin_cb (XEvent &ev) 1804rxvt_term::rootwin_cb (XEvent &ev)
1774{ 1805{
1775 make_current (); 1806 make_current ();
1776 1807
1808 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1809 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1810 return;
1811
1812# if ENABLE_TRANSPARENCY
1777 switch (ev.type) 1813 switch (ev.type)
1778 { 1814 {
1779 case PropertyNotify: 1815 case PropertyNotify:
1780 /* 1816 /*
1781 * if user used some Esetroot compatible prog to set the root bg, 1817 * if user used some Esetroot compatible prog to set the root bg,
1782 * use the property to determine the pixmap. We use it later on. 1818 * use the property to determine the pixmap. We use it later on.
1783 */ 1819 */
1784 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 return; 1822 {
1823 bgPixmap.set_root_pixmap ();
1824 update_background ();
1825 }
1787 1826
1788 /* FALLTHROUGH */
1789 case ReparentNotify:
1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1791 want_refresh = want_full_refresh = 1;
1792 break; 1827 break;
1793 } 1828 }
1829# endif
1830
1831 refresh_check ();
1794} 1832}
1795#endif 1833#endif
1796 1834
1797void 1835void
1798rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
… …
1853 mouse_report (ev); 1891 mouse_report (ev);
1854 } 1892 }
1855#else 1893#else
1856 MEvent.button = ev.button; 1894 MEvent.button = ev.button;
1857 mouse_report (ev); 1895 mouse_report (ev);
1858#endif /* MOUSE_REPORT_DOUBLECLICK */ 1896#endif /* MOUSE_REPORT_DOUBLECLICK */
1859 1897
1860 } 1898 }
1861 else 1899 else
1862 { 1900 {
1863 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
… …
1911 } 1949 }
1912 1950
1913 /* 1951 /*
1914 * Scrollbar window processing of button press 1952 * Scrollbar window processing of button press
1915 */ 1953 */
1916 if (isScrollbarWindow (ev.window)) 1954 if (scrollBar.state && ev.window == scrollBar.win)
1917 { 1955 {
1918 scrollBar.setIdle (); 1956 page_dirn direction = NO_DIR;
1957
1958 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */
1962
1963 scrollBar.state = STATE_IDLE;
1919 /* 1964 /*
1920 * Rxvt-style scrollbar: 1965 * Rxvt-style scrollbar:
1921 * move up if mouse is above slider 1966 * move up if mouse is above slider
1922 * move dn if mouse is below slider 1967 * move dn if mouse is below slider
1923 * 1968 *
… …
1932 /* 1977 /*
1933 * Mouse report disabled scrollbar: 1978 * Mouse report disabled scrollbar:
1934 * arrow buttons - send up/down 1979 * arrow buttons - send up/down
1935 * click on scrollbar - send pageup/down 1980 * click on scrollbar - send pageup/down
1936 */ 1981 */
1937 if ((scrollBar.style == R_SB_NEXT 1982 if (direction == UP)
1938 && scrollbarnext_upButton (ev.y))
1939 || (scrollBar.style == R_SB_RXVT
1940 && scrollbarrxvt_upButton (ev.y)))
1941 tt_printf ("\033[A"); 1983 tt_printf ("\033[A");
1942 else if ((scrollBar.style == R_SB_NEXT 1984 else if (direction == DN)
1943 && scrollbarnext_dnButton (ev.y))
1944 || (scrollBar.style == R_SB_RXVT
1945 && scrollbarrxvt_dnButton (ev.y)))
1946 tt_printf ("\033[B"); 1985 tt_printf ("\033[B");
1947 else 1986 else
1948 switch (ev.button) 1987 switch (ev.button)
1949 { 1988 {
1950 case Button2: 1989 case Button2:
… …
1957 tt_printf ("\033[5~"); 1996 tt_printf ("\033[5~");
1958 break; 1997 break;
1959 } 1998 }
1960 } 1999 }
1961 else 2000 else
1962#endif /* NO_SCROLLBAR_REPORT */ 2001#endif /* NO_SCROLLBAR_REPORT */
1963
1964 {
1965 char upordown = 0;
1966
1967 if (scrollBar.style == R_SB_NEXT)
1968 { 2002 {
1969 if (scrollbarnext_upButton (ev.y)) 2003 if (direction != NO_DIR)
1970 upordown = -1; /* up */
1971 else if (scrollbarnext_dnButton (ev.y))
1972 upordown = 1; /* down */
1973 }
1974 else if (scrollBar.style == R_SB_RXVT)
1975 {
1976 if (scrollbarrxvt_upButton (ev.y))
1977 upordown = -1; /* up */
1978 else if (scrollbarrxvt_dnButton (ev.y))
1979 upordown = 1; /* down */
1980 }
1981 if (upordown)
1982 { 2004 {
1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2006 if (!cont_scroll_ev.is_active ())
1984 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1985#endif 2008#endif
1986 if (scr_page (upordown < 0 ? UP : DN, 1)) 2009 if (scr_page (direction, 1))
1987 { 2010 {
1988 if (upordown < 0) 2011 if (direction == UP)
1989 scrollBar.setUp (); 2012 scrollBar.state = STATE_UP;
1990 else 2013 else
1991 scrollBar.setDn (); 2014 scrollBar.state = STATE_DOWN;
1992 } 2015 }
1993 } 2016 }
1994 else 2017 else
1995 switch (ev.button) 2018 switch (ev.button)
1996 { 2019 {
1997 case Button2: 2020 case Button2:
1998 switch (scrollbar_align) 2021 switch (scrollBar.align)
1999 { 2022 {
2000 case R_SB_ALIGN_TOP: 2023 case R_SB_ALIGN_TOP:
2001 csrO = 0; 2024 csrO = 0;
2002 break; 2025 break;
2003 case R_SB_ALIGN_CENTRE: 2026 case R_SB_ALIGN_CENTRE:
… …
2011 if (scrollBar.style == R_SB_XTERM 2034 if (scrollBar.style == R_SB_XTERM
2012 || scrollbar_above_slider (ev.y) 2035 || scrollbar_above_slider (ev.y)
2013 || scrollbar_below_slider (ev.y)) 2036 || scrollbar_below_slider (ev.y))
2014 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2015 2038
2016 scrollBar.setMotion (); 2039 scrollBar.state = STATE_MOTION;
2017 break; 2040 break;
2018 2041
2019 case Button1: 2042 case Button1:
2020 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2043 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2021 csrO = ev.y - scrollBar.top; 2044 csrO = ev.y - scrollBar.top;
2022 /* FALLTHROUGH */ 2045 /* FALLTHROUGH */
2023 2046
2024 case Button3: 2047 case Button3:
2025 if (scrollBar.style != R_SB_XTERM) 2048 if (scrollBar.style != R_SB_XTERM)
… …
2035 scr_page (DN, nrow - 1); 2058 scr_page (DN, nrow - 1);
2036# else 2059# else
2037 scr_page (DN, nrow / 4); 2060 scr_page (DN, nrow / 4);
2038# endif 2061# endif
2039 else 2062 else
2040 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2041 } 2064 }
2042 else 2065 else
2043 { 2066 {
2044 scr_page ((ev.button == Button1 ? DN : UP), 2067 scr_page ((ev.button == Button1 ? DN : UP),
2045 (nrow 2068 (nrow
… …
2062 2085
2063 csrO = 0; /* reset csr Offset */ 2086 csrO = 0; /* reset csr Offset */
2064 if (!bypass_keystate) 2087 if (!bypass_keystate)
2065 reportmode = !! (priv_modes & PrivMode_mouse_report); 2088 reportmode = !! (priv_modes & PrivMode_mouse_report);
2066 2089
2067 if (scrollbar_isUpDn ()) 2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2068 { 2091 {
2069 scrollBar.setIdle (); 2092 scrollBar.state = STATE_IDLE;
2070 scrollbar_show (0); 2093 scrollbar_show (0);
2071 } 2094 }
2072 2095
2073#ifdef SELECTION_SCROLLING 2096#ifdef SELECTION_SCROLLING
2074 if (sel_scroll_ev.active)
2075 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2076#endif 2098#endif
2077 2099
2078 if (ev.window == vt) 2100 if (ev.window == vt)
2079 { 2101 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2102 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2104 mouse_report (ev); 2126 mouse_report (ev);
2105 } 2127 }
2106#else /* MOUSE_REPORT_DOUBLECLICK */ 2128#else /* MOUSE_REPORT_DOUBLECLICK */
2107 MEvent.button = AnyButton; 2129 MEvent.button = AnyButton;
2108 mouse_report (ev); 2130 mouse_report (ev);
2109#endif /* MOUSE_REPORT_DOUBLECLICK */ 2131#endif /* MOUSE_REPORT_DOUBLECLICK */
2110 return; 2132 return;
2111 } 2133 }
2112 2134
2113 /* 2135 /*
2114 * dumb hack to compensate for the failure of click-and-drag 2136 * dumb hack to compensate for the failure of click-and-drag
… …
2126 selection_make (ev.time); 2148 selection_make (ev.time);
2127 break; 2149 break;
2128 2150
2129 case Button2: 2151 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2154 break;
2133 2155
2134#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2135 case Button4: 2157 case Button4:
2136 case Button5: 2158 case Button5:
… …
2140 2162
2141 v = ev.button == Button4 ? UP : DN; 2163 v = ev.button == Button4 ? UP : DN;
2142 2164
2143 if (ev.state & ShiftMask) 2165 if (ev.state & ShiftMask)
2144 i = 1; 2166 i = 1;
2145 else if (OPTION (Opt_mouseWheelScrollPage)) 2167 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2168 i = nrow - 1;
2147 else 2169 else
2148 i = 5; 2170 i = 5;
2149 2171
2150# ifdef MOUSE_SLIP_WHEELING 2172# ifdef MOUSE_SLIP_WHEELING
… …
2152 { 2174 {
2153 mouse_slip_wheel_speed += v ? -1 : 1; 2175 mouse_slip_wheel_speed += v ? -1 : 1;
2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2156 2178
2157 if (slip_wheel_ev.at < NOW) 2179 if (!slip_wheel_ev.is_active ())
2158 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2159
2160 slip_wheel_ev.start ();
2161 } 2181 }
2162 else 2182 else
2183# endif
2163 { 2184 {
2164# endif
2165 scr_page (v, i); 2185 scr_page (v, i);
2166 scrollbar_show (1); 2186 scrollbar_show (1);
2167# ifdef MOUSE_SLIP_WHEELING
2168 } 2187 }
2169# endif
2170 } 2188 }
2171 break; 2189 break;
2172#endif 2190#endif
2173 } 2191 }
2174 } 2192 }
2175} 2193}
2176
2177#ifdef TRANSPARENT
2178#if TINTING
2179/* taken from aterm-0.4.2 */
2180
2181typedef uint32_t RUINT32T;
2182
2183void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2184{
2185 int sh_r, sh_g, sh_b;
2186 RUINT32T mask_r, mask_g, mask_b;
2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2190 int i;
2191
2192 Visual *visual = term->visual;
2193
2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2195
2196 /* for convenience */
2197 mask_r = visual->red_mask;
2198 mask_g = visual->green_mask;
2199 mask_b = visual->blue_mask;
2200
2201 /* boring lookup table pre-initialization */
2202 switch (srcImage->bits_per_pixel) {
2203 case 15:
2204 if ((mask_r != 0x7c00) ||
2205 (mask_g != 0x03e0) ||
2206 (mask_b != 0x001f))
2207 return;
2208 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2209 lookup_r = lookup;
2210 lookup_g = lookup+32;
2211 lookup_b = lookup+32+32;
2212 sh_r = 10;
2213 sh_g = 5;
2214 sh_b = 0;
2215 break;
2216 case 16:
2217 if ((mask_r != 0xf800) ||
2218 (mask_g != 0x07e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+64;
2225 sh_r = 11;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 24:
2230 if ((mask_r != 0xff0000) ||
2231 (mask_g != 0x00ff00) ||
2232 (mask_b != 0x0000ff))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2235 lookup_r = lookup;
2236 lookup_g = lookup+256;
2237 lookup_b = lookup+256+256;
2238 sh_r = 16;
2239 sh_g = 8;
2240 sh_b = 0;
2241 break;
2242 case 32:
2243 if ((mask_r != 0xff0000) ||
2244 (mask_g != 0x00ff00) ||
2245 (mask_b != 0x0000ff))
2246 return;
2247 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2248 lookup_r = lookup;
2249 lookup_g = lookup+256;
2250 lookup_b = lookup+256+256;
2251 sh_r = 16;
2252 sh_g = 8;
2253 sh_b = 0;
2254 break;
2255 default:
2256 return; /* we do not support this color depth */
2257 }
2258
2259 /* prepare limits for color transformation (each channel is handled separately) */
2260 if (shade < 0) {
2261 shade = -shade;
2262 if (shade < 0) shade = 0;
2263 if (shade > 100) shade = 100;
2264
2265 lower_lim_r = 65535-rm;
2266 lower_lim_g = 65535-gm;
2267 lower_lim_b = 65535-bm;
2268
2269 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2270 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2271 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2272
2273 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2274 } else {
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2279
2280 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2281 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2282 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2283 }
2284
2285 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2286 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2287 {
2288 unsigned int tmp;
2289
2290 tmp = lower_lim_r;
2291 lower_lim_r = lower_lim_b;
2292 lower_lim_b = tmp;
2293
2294 tmp = upper_lim_r;
2295 upper_lim_r = upper_lim_b;
2296 upper_lim_b = tmp;
2297 }
2298
2299 /* fill our lookup tables */
2300 for (i = 0; i <= mask_r>>sh_r; i++)
2301 {
2302 RUINT32T tmp;
2303 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2304 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2305 lookup_r[i] = (tmp/65535)<<sh_r;
2306 }
2307 for (i = 0; i <= mask_g>>sh_g; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2311 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2312 lookup_g[i] = (tmp/65535)<<sh_g;
2313 }
2314 for (i = 0; i <= mask_b>>sh_b; i++)
2315 {
2316 RUINT32T tmp;
2317 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2318 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2319 lookup_b[i] = (tmp/65535)<<sh_b;
2320 }
2321
2322 /* apply table to input image (replacing colors by newly calculated ones) */
2323 switch (srcImage->bits_per_pixel)
2324 {
2325 case 15:
2326 {
2327 unsigned short *p1, *pf, *p, *pl;
2328 p1 = (unsigned short *) srcImage->data;
2329 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2330 while (p1 < pf)
2331 {
2332 p = p1;
2333 pl = p1 + srcImage->width;
2334 for (; p < pl; p++)
2335 {
2336 *p = lookup_r[(*p & 0x7c00)>>10] |
2337 lookup_g[(*p & 0x03e0)>> 5] |
2338 lookup_b[(*p & 0x001f)];
2339 }
2340 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2341 }
2342 break;
2343 }
2344 case 16:
2345 {
2346 unsigned short *p1, *pf, *p, *pl;
2347 p1 = (unsigned short *) srcImage->data;
2348 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2349 while (p1 < pf)
2350 {
2351 p = p1;
2352 pl = p1 + srcImage->width;
2353 for (; p < pl; p++)
2354 {
2355 *p = lookup_r[(*p & 0xf800)>>11] |
2356 lookup_g[(*p & 0x07e0)>> 5] |
2357 lookup_b[(*p & 0x001f)];
2358 }
2359 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2360 }
2361 break;
2362 }
2363 case 24:
2364 {
2365 unsigned char *p1, *pf, *p, *pl;
2366 p1 = (unsigned char *) srcImage->data;
2367 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2368 while (p1 < pf)
2369 {
2370 p = p1;
2371 pl = p1 + srcImage->width * 3;
2372 for (; p < pl; p += 3)
2373 {
2374 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2375 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2376 p[2] = lookup_r[(p[2] & 0x0000ff)];
2377 }
2378 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2379 }
2380 break;
2381 }
2382 case 32:
2383 {
2384 RUINT32T *p1, *pf, *p, *pl;
2385 p1 = (RUINT32T *) srcImage->data;
2386 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2387
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0xff0000)>>16] |
2395 lookup_g[(*p & 0x00ff00)>> 8] |
2396 lookup_b[(*p & 0x0000ff)] |
2397 (*p & ~0xffffff);
2398 }
2399 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2400 }
2401 break;
2402 }
2403 }
2404
2405 free (lookup);
2406}
2407#endif
2408
2409/*
2410 * Check our parents are still who we think they are.
2411 * Do transparency updates if required
2412 */
2413int
2414rxvt_term::check_our_parents ()
2415{
2416 int i, pchanged, aformat, have_pixmap, rootdepth;
2417 unsigned long nitems, bytes_after;
2418 Atom atype;
2419 unsigned char *prop = NULL;
2420 Window root, oldp, *list;
2421 Pixmap rootpixmap = None;
2422 XWindowAttributes wattr, wrootattr;
2423
2424 pchanged = 0;
2425
2426 if (!OPTION (Opt_transparent))
2427 return pchanged; /* Don't try any more */
2428
2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2430 rootdepth = wrootattr.depth;
2431
2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2433
2434 if (rootdepth != wattr.depth)
2435 {
2436 if (am_transparent)
2437 {
2438 pchanged = 1;
2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2440 am_transparent = am_pixmap_trans = 0;
2441 }
2442
2443 return pchanged; /* Don't try any more */
2444 }
2445
2446 /* Get all X ops out of the queue so that our information is up-to-date. */
2447 XSync (xdisp, False);
2448
2449 /*
2450 * Make the frame window set by the window manager have
2451 * the root background. Some window managers put multiple nested frame
2452 * windows for each client, so we have to take care about that.
2453 */
2454 i = (xa[XA_XROOTPMAP_ID]
2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457 &nitems, &bytes_after, &prop) == Success);
2458
2459 if (!i || prop == NULL)
2460 i = (xa[XA_ESETROOT_PMAP_ID]
2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success);
2464
2465 if (!i || prop == NULL
2466#if TINTING
2467 || !rs[Rs_color + Color_tint]
2468#endif
2469 )
2470 have_pixmap = 0;
2471 else
2472 {
2473 have_pixmap = 1;
2474 rootpixmap = *(Pixmap *)prop;
2475 XFree (prop);
2476 }
2477
2478 if (have_pixmap)
2479 {
2480 /*
2481 * Copy display->root pixmap transparency
2482 */
2483 int sx, sy, nx, ny;
2484 unsigned int nw, nh;
2485 Window cr;
2486 XImage *image;
2487 GC gc;
2488 XGCValues gcvalue;
2489
2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2491 0, 0, &sx, &sy, &cr);
2492 nw = (unsigned int)szHint.width;
2493 nh = (unsigned int)szHint.height;
2494 nx = ny = 0;
2495
2496 if (sx < 0)
2497 {
2498 nw += sx;
2499 nx = -sx;
2500 sx = 0;
2501 }
2502
2503 if (sy < 0)
2504 {
2505 nh += sy;
2506 ny = -sy;
2507 sy = 0;
2508 }
2509
2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2512
2513 XSync (xdisp, False);
2514 allowedxerror = -1;
2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2516
2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2518 /* XXX: may need a delay here? */
2519 allowedxerror = 0;
2520
2521 if (image == NULL)
2522 {
2523 if (am_transparent && am_pixmap_trans)
2524 {
2525 pchanged = 1;
2526 if (pixmap != None)
2527 {
2528 XFreePixmap (xdisp, pixmap);
2529 pixmap = None;
2530 }
2531 }
2532
2533 am_pixmap_trans = 0;
2534 }
2535 else
2536 {
2537 if (pixmap != None)
2538 XFreePixmap (xdisp, pixmap);
2539
2540#if TINTING
2541 if (ISSET_PIXCOLOR (Color_tint))
2542 {
2543 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2544
2545 rxvt_rgba c;
2546 pix_colors_focused [Color_tint].get (this, c);
2547
2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2549 }
2550#endif
2551
2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2555 nx, ny, image->width, image->height);
2556 XFreeGC (xdisp, gc);
2557 XDestroyImage (image);
2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2559 XClearWindow (xdisp, parent[0]);
2560
2561 if (!am_transparent || !am_pixmap_trans)
2562 pchanged = 1;
2563
2564 am_transparent = am_pixmap_trans = 1;
2565 }
2566 }
2567
2568 if (am_pixmap_trans)
2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2570 else
2571 {
2572 unsigned int n;
2573 /*
2574 * InheritPixmap transparency
2575 */
2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2577 {
2578 oldp = parent[i];
2579 XQueryTree (xdisp, parent[i - 1], &root,
2580 &parent[i], &list, &n);
2581 XFree (list);
2582
2583 if (parent[i] == display->root)
2584 {
2585 if (oldp != None)
2586 pchanged = 1;
2587
2588 break;
2589 }
2590
2591 if (oldp != parent[i])
2592 pchanged = 1;
2593 }
2594
2595 n = 0;
2596
2597 if (pchanged)
2598 {
2599 for (; n < (unsigned int)i; n++)
2600 {
2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2603 {
2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2605 break;
2606 }
2607 }
2608 }
2609
2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2611 {
2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2614 am_transparent = 0;
2615 /* XXX: also turn off Opt_transparent? */
2616 }
2617 else
2618 {
2619 for (n = 0; n < (unsigned int)i; n++)
2620 {
2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2622 XClearWindow (xdisp, parent[n]);
2623 }
2624
2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2626 am_transparent = 1;
2627 }
2628
2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2630 parent[i] = None;
2631 }
2632
2633 if (scrollBar.win)
2634 {
2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2636 scrollBar.setIdle ();
2637 scrollbar_show (0);
2638 }
2639
2640 if (am_transparent)
2641 {
2642 want_refresh = want_full_refresh = 1;
2643 if (am_pixmap_trans)
2644 flush ();
2645 }
2646
2647 return pchanged;
2648}
2649#endif
2650 2194
2651/*}}} */ 2195/*}}} */
2652 2196
2653bool 2197bool
2654rxvt_term::cmd_parse () 2198rxvt_term::cmd_parse ()
… …
2703 if (ch == C0_LF) 2247 if (ch == C0_LF)
2704 nlines++; 2248 nlines++;
2705 2249
2706 refresh_count++; 2250 refresh_count++;
2707 2251
2708 if (!OPTION (Opt_jumpScroll) 2252 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2709 || (refresh_count >= refresh_limit * (nrow - 1)))
2710 { 2253 {
2711 refreshnow = true;
2712 refresh_count = 0; 2254 refresh_count = 0;
2255
2256 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2257 {
2258 refreshnow = true;
2713 ch = NOCHAR; 2259 ch = NOCHAR;
2714 break; 2260 break;
2261 }
2715 } 2262 }
2716 2263
2717 // scr_add_lines only works for nlines <= nrow - 1. 2264 // scr_add_lines only works for nlines <= nrow - 1.
2718 if (nlines >= nrow - 1) 2265 if (nlines >= nrow - 1)
2719 { 2266 {
… …
2747 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2294 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2748 scr_add_lines (buf, str - buf, nlines); 2295 scr_add_lines (buf, str - buf, nlines);
2749 2296
2750 /* 2297 /*
2751 * If there have been a lot of new lines, then update the screen 2298 * If there have been a lot of new lines, then update the screen
2752 * What the heck I'll cheat and only refresh less than every page-full. 2299 * What the heck we'll cheat and only refresh less than every page-full.
2753 * the number of pages between refreshes is refresh_limit, which 2300 * if skipScroll is enabled.
2754 * is incremented here because we must be doing flat-out scrolling.
2755 */ 2301 */
2756 if (refreshnow) 2302 if (refreshnow)
2757 { 2303 {
2758 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2759 refresh_limit++;
2760 else
2761 {
2762 flag = true; 2304 flag = true;
2763 scr_refresh (); 2305 scr_refresh ();
2764 want_refresh = 1; 2306 want_refresh = 1;
2765 }
2766 } 2307 }
2767 2308
2768 } 2309 }
2769 else 2310 else
2770 { 2311 {
… …
2919 { 2460 {
2920 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2921 break; /* done = 1 */ 2462 break; /* done = 1 */
2922 } 2463 }
2923 } 2464 }
2924 2465
2925 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2926 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2927 { 2468 {
2928 done = 1; 2469 done = 1;
2929 break; 2470 break;
… …
2931 } 2472 }
2932 } 2473 }
2933 2474
2934 pclose_printer (fd); 2475 pclose_printer (fd);
2935} 2476}
2936#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2937/*}}} */ 2478/*}}} */
2938 2479
2939/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2940enum { 2481enum {
2941 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
2991 process_dcs_seq (); 2532 process_dcs_seq ();
2992 break; 2533 break;
2993 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
2994 process_csi_seq (); 2535 process_csi_seq ();
2995 break; 2536 break;
2996 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
2997 process_osc_seq (); 2538 process_osc_seq ();
2998 break; 2539 break;
2999#endif 2540#endif
3000 } 2541 }
3001} 2542}
… …
3227rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
3228{ 2769{
3229 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
3230 unsigned int nargs, p; 2771 unsigned int nargs, p;
3231 int n, ndef; 2772 int n, ndef;
3232 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
3233 2774
3234 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
3235 arg[--nargs] = 0;
3236 2776
3237 priv = 0; 2777 priv = 0;
3238 ch = cmd_getc (); 2778 ch = cmd_getc ();
3239 if (ch >= '<' && ch <= '?') 2779 if (ch >= '<' && ch <= '?')
2780 {
3240 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' */
3241 priv = ch; 2782 priv = ch;
3242 ch = cmd_getc (); 2783 ch = cmd_getc ();
3243 } 2784 }
3244 2785
3245 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
3284 switch (priv) 2825 switch (priv)
3285 { 2826 {
3286 case '>': 2827 case '>':
3287 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
3288 { 2829 {
3289 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2830 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3290 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3291 // 2832 //
3292 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2833 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3293 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2834 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3294 // that we do not support xterm mouse reporting (should be 95 when we do). 2835 // versions.
3295 // 2836 //
3296 tt_printf ("\033[>%d;94;0c", 'U'); 2837 tt_printf ("\033[>%d;95;0c", 'U');
3297 } 2838 }
3298 break; 2839 break;
2840
3299 case '?': 2841 case '?':
3300 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3301 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
3302 break; 2844 break;
3303 } 2845 }
… …
3428 break; 2970 break;
3429 case 6: /* CPR requested */ 2971 case 6: /* CPR requested */
3430 scr_report_position (); 2972 scr_report_position ();
3431 break; 2973 break;
3432 case 7: /* unofficial extension */ 2974 case 7: /* unofficial extension */
3433 if (OPTION (Opt_insecure)) 2975 if (option (Opt_insecure))
3434 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2976 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3435 break; 2977 break;
3436 case 8: /* unofficial extension */ 2978 case 8: /* unofficial extension */
3437 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2979 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3438 break; 2980 break;
… …
3531{ 3073{
3532 int x, y; 3074 int x, y;
3533 XWindowAttributes wattr; 3075 XWindowAttributes wattr;
3534 Window wdummy; 3076 Window wdummy;
3535 3077
3536 dLocal (Display *, xdisp); 3078 dLocal (Display *, dpy);
3537 3079
3538 if (nargs == 0) 3080 if (nargs == 0)
3539 return; 3081 return;
3540 3082
3541 switch (args[0]) 3083 switch (args[0])
3542 { 3084 {
3543 /* 3085 /*
3544 * commands 3086 * commands
3545 */ 3087 */
3546 case 1: /* deiconify window */ 3088 case 1: /* deiconify window */
3547 XMapWindow (xdisp, parent[0]); 3089 XMapWindow (dpy, parent[0]);
3548 break; 3090 break;
3549 case 2: /* iconify window */ 3091 case 2: /* iconify window */
3550 XIconifyWindow (xdisp, parent[0], display->screen); 3092 XIconifyWindow (dpy, parent[0], display->screen);
3551 break; 3093 break;
3552 case 3: /* set position (pixels) */ 3094 case 3: /* set position (pixels) */
3553 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3095 XMoveWindow (dpy, parent[0], args[1], args[2]);
3554 break; 3096 break;
3555 case 4: /* set size (pixels) */ 3097 case 4: /* set size (pixels) */
3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3098 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3557 break; 3099 break;
3558 case 5: /* raise window */ 3100 case 5: /* raise window */
3559 XRaiseWindow (xdisp, parent[0]); 3101 XRaiseWindow (dpy, parent[0]);
3560 break; 3102 break;
3561 case 6: /* lower window */ 3103 case 6: /* lower window */
3562 XLowerWindow (xdisp, parent[0]); 3104 XLowerWindow (dpy, parent[0]);
3563 break; 3105 break;
3564 case 7: /* refresh window */ 3106 case 7: /* refresh window */
3565 scr_touch (true); 3107 scr_touch (true);
3566 break; 3108 break;
3567 case 8: /* set size (chars) */ 3109 case 8: /* set size (chars) */
… …
3574 if (args[0] >= 24) /* set height (chars) */ 3116 if (args[0] >= 24) /* set height (chars) */
3575 set_widthheight ((unsigned int)width, 3117 set_widthheight ((unsigned int)width,
3576 (unsigned int) (args[1] * fheight)); 3118 (unsigned int) (args[1] * fheight));
3577 break; 3119 break;
3578 3120
3579
3580 /* 3121 /*
3581 * reports - some output format copied from XTerm 3122 * reports - some output format copied from XTerm
3582 */ 3123 */
3583 case 11: /* report window state */ 3124 case 11: /* report window state */
3584 XGetWindowAttributes (xdisp, parent[0], &wattr); 3125 XGetWindowAttributes (dpy, parent[0], &wattr);
3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3126 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3586 break; 3127 break;
3587 case 13: /* report window position */ 3128 case 13: /* report window position */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3130 XTranslateCoordinates (dpy, parent[0], wattr.root,
3590 -wattr.border_width, -wattr.border_width, 3131 -wattr.border_width, -wattr.border_width,
3591 &x, &y, &wdummy); 3132 &x, &y, &wdummy);
3592 tt_printf ("\033[3;%d;%dt", x, y); 3133 tt_printf ("\033[3;%d;%dt", x, y);
3593 break; 3134 break;
3594 case 14: /* report window size (pixels) */ 3135 case 14: /* report window size (pixels) */
3595 XGetWindowAttributes (xdisp, parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3137 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3597 break; 3138 break;
3598 case 18: /* report text area size (chars) */ 3139 case 18: /* report text area size (chars) */
3599 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3140 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3600 break; 3141 break;
… …
3602 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3143 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3603 break; 3144 break;
3604 case 20: /* report icon label */ 3145 case 20: /* report icon label */
3605 { 3146 {
3606 char *s; 3147 char *s;
3607 XGetIconName (xdisp, parent[0], &s); 3148 XGetIconName (dpy, parent[0], &s);
3608 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3149 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3609 XFree (s); 3150 XFree (s);
3610 } 3151 }
3611 break; 3152 break;
3612 case 21: /* report window title */ 3153 case 21: /* report window title */
3613 { 3154 {
3614 char *s; 3155 char *s;
3615 XFetchName (xdisp, parent[0], &s); 3156 XFetchName (dpy, parent[0], &s);
3616 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3157 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3617 XFree (s); 3158 XFree (s);
3618 } 3159 }
3619 break; 3160 break;
3620 } 3161 }
3621} 3162}
… …
3648 seen_esc = true; 3189 seen_esc = true;
3649 continue; 3190 continue;
3650 } 3191 }
3651 else if (ch == C0_BEL || ch == CHAR_ST) 3192 else if (ch == C0_BEL || ch == CHAR_ST)
3652 break; 3193 break;
3194 else if (ch == C0_SYN)
3195 ch = cmd_get8 ();
3653 else if (ch < 0x20) 3196 else if (ch < 0x20)
3654 return NULL; /* other control character - exit */ 3197 return NULL; /* other control character - exit */
3655 3198
3656 seen_esc = false; 3199 seen_esc = false;
3657 3200
3658 if (n >= STRING_MAX - 1) 3201 if (n >= STRING_MAX - 1)
3659 // stop at some sane length 3202 // stop at some sane length
3660 return NULL; 3203 return NULL;
3661 3204
3662 if (ch == C0_SYN)
3663 string[n++] = cmd_get8 ();
3664 else
3665 string[n++] = ch; 3205 string[n++] = ch;
3666 } 3206 }
3667 3207
3668 string[n++] = '\0'; 3208 string[n++] = '\0';
3669 3209
3670 ends_how = (ch == 0x5c ? C0_ESC : ch); 3210 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3721void 3261void
3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3262rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3723{ 3263{
3724 if (str[0] == '?' && !str[1]) 3264 if (str[0] == '?' && !str[1])
3725 { 3265 {
3726 rxvt_rgba c; 3266 rgba c;
3727 pix_colors_focused[color].get (this, c); 3267 pix_colors_focused[color].get (c);
3728 3268
3729#if XFT 3269#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC) 3270 if (c.a != rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3271 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else 3272 else
3733#endif 3273#endif
3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3274 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3735 } 3275 }
… …
3746 int color; 3286 int color;
3747 char *buf, *name; 3287 char *buf, *name;
3748 bool query = str[0] == '?' && !str[1]; 3288 bool query = str[0] == '?' && !str[1];
3749 int saveop = op; 3289 int saveop = op;
3750 3290
3751 dLocal (Display *, xdisp); 3291 dLocal (Display *, dpy);
3752 3292
3753 assert (str != NULL); 3293 assert (str != NULL);
3294
3295 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3296 return;
3297
3754 switch (op) 3298 switch (op)
3755 { 3299 {
3756 case XTerm_name: 3300 case XTerm_name:
3757 set_title (str); 3301 set_title (str);
3758 /* FALLTHROUGH */ 3302 /* FALLTHROUGH */
… …
3772 unsigned long bytes_after; 3316 unsigned long bytes_after;
3773 unsigned char *value = 0; 3317 unsigned char *value = 0;
3774 const char *str = ""; 3318 const char *str = "";
3775 3319
3776 if (prop 3320 if (prop
3777 && XGetWindowProperty (xdisp, parent[0], 3321 && XGetWindowProperty (dpy, parent[0],
3778 prop, 0, 1<<16, 0, AnyPropertyType, 3322 prop, 0, 1<<16, 0, AnyPropertyType,
3779 &actual_type, &actual_format, 3323 &actual_type, &actual_format,
3780 &nitems, &bytes_after, &value) == Success 3324 &nitems, &bytes_after, &value) == Success
3781 && actual_type != None 3325 && actual_type != None
3782 && actual_format == 8) 3326 && actual_format == 8)
… …
3794 { 3338 {
3795 *eq = 0; 3339 *eq = 0;
3796 set_utf8_property (display->atom (str), eq + 1); 3340 set_utf8_property (display->atom (str), eq + 1);
3797 } 3341 }
3798 else 3342 else
3799 XDeleteProperty (xdisp, parent[0], 3343 XDeleteProperty (dpy, parent[0],
3800 display->atom (str)); 3344 display->atom (str));
3801 } 3345 }
3802 break; 3346 break;
3803 3347
3804 case XTerm_Color: 3348 case XTerm_Color:
… …
3817 *buf++ = '\0'; 3361 *buf++ = '\0';
3818 3362
3819 process_color_seq (op, color, name, resp); 3363 process_color_seq (op, color, name, resp);
3820 } 3364 }
3821 break; 3365 break;
3366 case Rxvt_restoreFG:
3822 case XTerm_Color00: 3367 case XTerm_Color00:
3823 process_color_seq (op, Color_fg, str, resp); 3368 process_color_seq (op, Color_fg, str, resp);
3824 break; 3369 break;
3370 case Rxvt_restoreBG:
3825 case XTerm_Color01: 3371 case XTerm_Color01:
3826 process_color_seq (op, Color_bg, str, resp); 3372 process_color_seq (op, Color_bg, str, resp);
3827 break; 3373 break;
3828#ifndef NO_CURSORCOLOR 3374#ifndef NO_CURSORCOLOR
3829 case XTerm_Color_cursor: 3375 case XTerm_Color_cursor:
… …
3850 break; 3396 break;
3851 case URxvt_Color_IT: 3397 case URxvt_Color_IT:
3852 process_color_seq (op, Color_IT, str, resp); 3398 process_color_seq (op, Color_IT, str, resp);
3853 break; 3399 break;
3854#endif 3400#endif
3855#if TRANSPARENT && TINTING 3401#if ENABLE_TRANSPARENCY
3856 case URxvt_Color_tint: 3402 case URxvt_Color_tint:
3857 process_color_seq (op, Color_tint, str, resp); 3403 process_color_seq (op, Color_tint, str, resp);
3858 check_our_parents (); 3404 {
3859 if (am_transparent) 3405 bool changed = false;
3860 want_full_refresh = want_refresh = 1;
3861 break;
3862#endif
3863 3406
3407 if (ISSET_PIXCOLOR (Color_tint))
3408 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3409 else
3410 changed = bgPixmap.unset_tint ();
3411
3412 if (changed)
3413 update_background ();
3414 }
3415
3416 break;
3417#endif
3418
3419#if BG_IMAGE_FROM_FILE
3864 case Rxvt_Pixmap: 3420 case Rxvt_Pixmap:
3865 { 3421 if (!strcmp (str, "?"))
3866 if (*str != ';')
3867 { 3422 {
3868#if XPM_BACKGROUND 3423 char str[256];
3869 scale_pixmap (""); /* reset to default scaling */ 3424
3870 set_bgPixmap (str); /* change pixmap */ 3425 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3871 scr_touch (true); 3426 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3872#endif 3427 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3428 process_xterm_seq (XTerm_title, str, CHAR_ST);
3873 } 3429 }
3874 3430 else
3431 {
3875 int changed = 0; 3432 int changed = 0;
3876 3433
3877 while ((str = strchr (str, ';')) != NULL) 3434 if (*str != ';')
3878 { 3435 {
3436 /* reset to default scaling :*/
3437 bgPixmap.unset_geometry ();
3438 if (bgPixmap.set_file (str)) /* change pixmap */
3439 changed++;
3440 str = strchr (str, ';');
3441 if (str == NULL)
3442 bgPixmap.set_defaultGeometry ();
3443 }
3444
3445 while (str)
3446 {
3879 str++; 3447 str++;
3880#if XPM_BACKGROUND 3448 if (bgPixmap.set_geometry (str))
3881 changed += scale_pixmap (str); 3449 changed++;
3882#endif 3450 str = strchr (str, ';');
3883 } 3451 }
3884 3452
3885 if (changed) 3453 if (changed)
3886 { 3454 update_background ();
3887#ifdef XPM_BACKGROUND
3888 resize_pixmap ();
3889 scr_touch (true);
3890#endif
3891 } 3455 }
3892 }
3893 break; 3456 break;
3894 3457#endif
3895 case Rxvt_restoreFG:
3896 set_window_color (Color_fg, str);
3897 break;
3898 case Rxvt_restoreBG:
3899 set_window_color (Color_bg, str);
3900 break;
3901 3458
3902 case XTerm_logfile: 3459 case XTerm_logfile:
3903 // TODO, when secure mode? 3460 // TODO, when secure mode?
3904 break; 3461 break;
3905 3462
… …
3923 case URxvt_italicFont: 3480 case URxvt_italicFont:
3924 case URxvt_boldItalicFont: 3481 case URxvt_boldItalicFont:
3925#endif 3482#endif
3926 if (query) 3483 if (query)
3927 tt_printf ("\33]%d;%-.250s%c", saveop, 3484 tt_printf ("\33]%d;%-.250s%c", saveop,
3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3485 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3929 ? fontset[op - URxvt_font]->fontdesc : "", 3486 ? fontset[op - URxvt_font]->fontdesc : "",
3930 resp); 3487 resp);
3931 else 3488 else
3932 { 3489 {
3933 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3490 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3947 break; 3504 break;
3948 3505
3949#if !ENABLE_MINIMAL 3506#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3507 case URxvt_locale:
3951 if (query) 3508 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3509 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3953 else 3510 else
3954 { 3511 {
3955 set_locale (str); 3512 set_locale (str);
3956 pty->set_utf8_mode (enc_utf8); 3513 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3514 init_xlocale ();
… …
3972 break; 3529 break;
3973#endif 3530#endif
3974 3531
3975#if ENABLE_PERL 3532#if ENABLE_PERL
3976 case URxvt_perl: 3533 case URxvt_perl:
3977 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3534 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3978 ; // no responses yet 3535 ; // no responses yet
3979 break; 3536 break;
3980#endif 3537#endif
3981 } 3538 }
3982} 3539}
… …
4020{ 3577{
4021 unsigned int i, j; 3578 unsigned int i, j;
4022 int state; 3579 int state;
4023 3580
4024 static const struct 3581 static const struct
4025 { 3582 {
4026 const int argval; 3583 const int argval;
4027 const unsigned long bit; 3584 const unsigned long bit;
4028 }
4029
4030 argtopriv[] = { 3585 } argtopriv[] = {
4031 { 1, PrivMode_aplCUR }, 3586 { 1, PrivMode_aplCUR },
4032 { 2, PrivMode_vt52 }, 3587 { 2, PrivMode_vt52 },
4033 { 3, PrivMode_132 }, 3588 { 3, PrivMode_132 },
4034 { 4, PrivMode_smoothScroll }, 3589 { 4, PrivMode_smoothScroll },
4035 { 5, PrivMode_rVideo }, 3590 { 5, PrivMode_rVideo },
… …
4051 { 66, PrivMode_aplKP }, 3606 { 66, PrivMode_aplKP },
4052#ifndef NO_BACKSPACE_KEY 3607#ifndef NO_BACKSPACE_KEY
4053 { 67, PrivMode_BackSpace }, 3608 { 67, PrivMode_BackSpace },
4054#endif 3609#endif
4055 { 1000, PrivMode_MouseX11 }, 3610 { 1000, PrivMode_MouseX11 },
4056 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3611 { 1002, PrivMode_MouseBtnEvent },
4057 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3612 { 1003, PrivMode_MouseAnyEvent },
4058 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4059 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4060 { 1011, PrivMode_Keypress }, // rxvt extension 3614 { 1011, PrivMode_Keypress }, // rxvt extension
4061 // 1035 enable modifiers for alt, numlock NYI 3615 // 1035 enable modifiers for alt, numlock NYI
4062 // 1036 send ESC for meta keys NYI 3616 // 1036 send ESC for meta keys NYI
4063 // 1037 send DEL for keypad delete NYI 3617 // 1037 send DEL for keypad delete NYI
4064 { 1047, PrivMode_Screen }, 3618 { 1047, PrivMode_Screen },
4065 // 1048 save and restore cursor 3619 // 1048 save and restore cursor
4066 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3620 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4067 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3621 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3622 { 2004, PrivMode_BracketPaste },
4068 }; 3623 };
4069 3624
4070 if (nargs == 0) 3625 if (nargs == 0)
4071 return; 3626 return;
4072 3627
… …
4098 scr_touch (true); 3653 scr_touch (true);
4099 break; 3654 break;
4100#endif 3655#endif
4101 case 1048: /* alternative cursor save */ 3656 case 1048: /* alternative cursor save */
4102 case 1049: 3657 case 1049:
4103 if (OPTION (Opt_secondaryScreen)) 3658 if (option (Opt_secondaryScreen))
4104 if (mode == 0) 3659 if (mode == 0)
4105 scr_cursor (RESTORE); 3660 scr_cursor (RESTORE);
4106 else if (mode == 1) 3661 else if (mode == 1)
4107 scr_cursor (SAVE); 3662 scr_cursor (SAVE);
4108 break; 3663 break;
… …
4120 */ 3675 */
4121 PrivMode (1, PrivMode_vt52); 3676 PrivMode (1, PrivMode_vt52);
4122 break; 3677 break;
4123 case 3: /* 80/132 */ 3678 case 3: /* 80/132 */
4124 if (priv_modes & PrivMode_132OK) 3679 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
4125 set_widthheight (((state ? 132 : 80) * fwidth), height); 3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3683 }
4126 break; 3684 break;
4127 case 4: /* smooth scrolling */ 3685 case 4: /* smooth scrolling */
4128 set_option (Opt_jumpScroll, !state); 3686 set_option (Opt_jumpScroll, !state);
4129 break; 3687 break;
4130 case 5: /* reverse video */ 3688 case 5: /* reverse video */
… …
4137 scr_autowrap (state); 3695 scr_autowrap (state);
4138 break; 3696 break;
4139 /* case 8: - auto repeat, can't do on a per window basis */ 3697 /* case 8: - auto repeat, can't do on a per window basis */
4140 case 9: /* X10 mouse reporting */ 3698 case 9: /* X10 mouse reporting */
4141 if (state) /* orthogonal */ 3699 if (state) /* orthogonal */
4142 priv_modes &= ~PrivMode_MouseX11; 3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4143 break; 3701 break;
4144#ifdef scrollBar_esc 3702#ifdef scrollBar_esc
4145 case scrollBar_esc: 3703 case scrollBar_esc:
4146 if (scrollbar_mapping (state)) 3704 if (scrollbar_mapping (state))
4147 { 3705 {
… …
4160 break; 3718 break;
4161 /* case 66: - application key pad */ 3719 /* case 66: - application key pad */
4162 /* case 67: - backspace key */ 3720 /* case 67: - backspace key */
4163 case 1000: /* X11 mouse reporting */ 3721 case 1000: /* X11 mouse reporting */
4164 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4165 priv_modes &= ~PrivMode_MouseX10; 3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4166 break; 3724 break;
4167#if 0
4168 case 1001: 3725 case 1002:
4169 break; /* X11 mouse highlighting */ 3726 case 1003:
4170#endif 3727 if (state)
3728 {
3729 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3730 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3731 vt_emask_mouse = PointerMotionMask;
3732 }
3733 else
3734 vt_emask_mouse = NoEventMask;
3735 vt_select_input ();
3736 break;
4171 case 1010: /* scroll to bottom on TTY output inhibit */ 3737 case 1010: /* scroll to bottom on TTY output inhibit */
4172 set_option (Opt_scrollTtyOutput, !state); 3738 set_option (Opt_scrollTtyOutput, !state);
4173 break; 3739 break;
4174 case 1011: /* scroll to bottom on key press */ 3740 case 1011: /* scroll to bottom on key press */
4175 set_option (Opt_scrollTtyKeypress, state); 3741 set_option (Opt_scrollTtyKeypress, state);
4176 break; 3742 break;
4177 case 1047: /* secondary screen w/ clearing last */ 3743 case 1047: /* secondary screen w/ clearing last */
4178 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4179 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4180 scr_erase_screen (2); 3746 scr_erase_screen (2);
4181 scr_change_screen (state); 3747 scr_change_screen (state);
4182 break; 3748 break;
4183 case 1049: /* secondary screen w/ clearing first */ 3749 case 1049: /* secondary screen w/ clearing first */
4184 scr_change_screen (state); 3750 scr_change_screen (state);
4185 if (OPTION (Opt_secondaryScreen)) 3751 if (option (Opt_secondaryScreen))
4186 if (current_screen != PRIMARY) 3752 if (current_screen != PRIMARY)
4187 scr_erase_screen (2); 3753 scr_erase_screen (2);
4188 break; 3754 break;
4189 default: 3755 default:
4190 break; 3756 break;
… …
4352rxvt_term::process_graphics () 3918rxvt_term::process_graphics ()
4353{ 3919{
4354 unicode_t ch, cmd = cmd_getc (); 3920 unicode_t ch, cmd = cmd_getc ();
4355 3921
4356 if (cmd == 'Q') 3922 if (cmd == 'Q')
3923 {
4357 { /* query graphics */ 3924 /* query graphics */
4358 tt_printf ("\033G0\012"); /* no graphics */ 3925 tt_printf ("\033G0\012"); /* no graphics */
4359 return; 3926 return;
4360 } 3927 }
4361 /* swallow other graphics sequences until terminating ':' */ 3928 /* swallow other graphics sequences until terminating ':' */
4362 do 3929 do
… …
4412 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4413 3980
4414 memcpy (v_buffer + v_buflen, data, len); 3981 memcpy (v_buffer + v_buflen, data, len);
4415 v_buflen += len; 3982 v_buflen += len;
4416 3983
4417 pty_ev.set (EVENT_READ | EVENT_WRITE); 3984 pty_ev.set (ev::READ | ev::WRITE);
4418} 3985}
4419 3986
4420void rxvt_term::pty_write () 3987void rxvt_term::pty_write ()
4421{ 3988{
4422 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4427 3994
4428 if (v_buflen == 0) 3995 if (v_buflen == 0)
4429 { 3996 {
4430 free (v_buffer); 3997 free (v_buffer);
4431 v_buffer = 0; 3998 v_buffer = 0;
4432 v_buflen = 0;
4433 3999
4434 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4435 return; 4001 return;
4436 } 4002 }
4437 4003
4438 memmove (v_buffer, v_buffer + written, v_buflen); 4004 memmove (v_buffer, v_buffer + written, v_buflen);
4439 } 4005 }
4440 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4006 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4441 pty_ev.set (EVENT_READ); 4007 pty_ev.set (ev::READ);
4442} 4008}
4443 4009
4444/*----------------------- end-of-file (C source) -----------------------*/ 4010/*----------------------- end-of-file (C source) -----------------------*/
4445 4011

Diff Legend

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