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.309 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC

… …
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.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
203 203
204 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
206 206
207 if (y >= 0) 207 if (y >= 0)
208 { 208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
221 ch = *chr++; 221 ch = *chr++;
222 222
223 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
226# if !UNICODE3 226# if !UNICODE_3
227 if (ch >= 0x10000) 227 if (ch >= 0x10000)
228 ch = 0xfffd; 228 ch = 0xfffd;
229# endif 229# endif
230 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231 231
… …
279 } 279 }
280 280
281 iso14755buf = 0; 281 iso14755buf = 0;
282} 282}
283 283
284int 284static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
286{ 286{
287 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
290 { 290 {
… …
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
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
303void 339void
304rxvt_term::key_press (XKeyEvent &ev) 340rxvt_term::key_press (XKeyEvent &ev)
305{ 341{
306 int ctrl, meta, shft, len; 342 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 343 KeySym keysym;
309 int valid_keysym; 344 int valid_keysym;
310 char kbuf[KBUFSZ]; 345 char kbuf[KBUFSZ];
311 346
312#if ISO_14755 347#if ISO_14755
… …
500# if ISO_14755 535# if ISO_14755
501 iso14755_51 (0); 536 iso14755_51 (0);
502# endif 537# endif
503 return; 538 return;
504 } 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 }
505 else if ((hv = hex_keyval (ev)) >= 0) 548 else if ((hv = hex_keyval (ev)) >= 0)
506 { 549 {
507 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 550 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508 | hv | ISO_14755_51; 551 | hv | ISO_14755_51;
509# if ISO_14755 552# if ISO_14755
… …
511# endif 554# endif
512 return; 555 return;
513 } 556 }
514 else 557 else
515 { 558 {
516# if ENABLE_OVERLAY 559# if ISO_14755
517 scr_overlay_off (); 560 scr_overlay_off ();
518# endif 561# endif
519 iso14755buf = 0; 562 iso14755buf = 0;
520 } 563 }
521 } 564 }
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 565 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 566 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524 if (!(iso14755buf & ISO_14755_STARTED)) 567 if (!(iso14755buf & ISO_14755_STARTED))
525 { 568 {
526 iso14755buf |= ISO_14755_STARTED; 569 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 570# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 571 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 572 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 573# endif
531 } 574 }
532#endif 575#endif
533 576
534#ifdef PRINTPIPE 577#ifdef PRINTPIPE
535 if (keysym == XK_Print) 578 if (keysym == XK_Print)
536 { 579 {
537 scr_printscreen (ctrl | shft); 580 scr_printscreen (ctrl | shft);
538 return; 581 return;
539 } 582 }
540#endif 583#endif
541 584
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 585 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 586 {
544 { 587 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
545 newlen = 1; 588 unsigned int newlen = 1;
546 switch (keysym) 589
590 switch (translate_keypad (keysym, kp))
547 { 591 {
548#ifndef NO_BACKSPACE_KEY 592#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace: 593 case XK_BackSpace:
550 if (priv_modes & PrivMode_HaveBackSpace) 594 if (priv_modes & PrivMode_HaveBackSpace)
551 { 595 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 596 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177'; 597 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0'; 598 kbuf[1] = '\0';
555 } 599 }
556 else 600 else
557 strcpy (kbuf, key_backspace); 601 strcpy (kbuf, rs[Rs_backspace_key]);
558 break; 602 break;
559#endif 603#endif
560#ifndef NO_DELETE_KEY 604#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete: 605 case XK_Delete:
572 strcpy (kbuf, key_delete); 606 strcpy (kbuf, rs[Rs_delete_key]);
573 break; 607 break;
574#endif 608#endif
575 case XK_Tab: 609 case XK_Tab:
576 if (shft) 610 if (shft)
577 strcpy (kbuf, "\033[Z"); 611 strcpy (kbuf, "\033[Z");
… …
587#endif 621#endif
588 newlen = 0; 622 newlen = 0;
589 } 623 }
590 break; 624 break;
591 625
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */ 626 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */ 627 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */ 628 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */ 629 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z"); 630 strcpy (kbuf, "\033[Z");
… …
622 else if (priv_modes & PrivMode_aplCUR) 640 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O'; 641 kbuf[1] = 'O';
624 break; 642 break;
625 643
626#ifndef UNSHIFTED_SCROLLKEYS 644#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior: 645 case XK_Prior:
638 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
639 break; 647 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next: 648 case XK_Next:
651 strcpy (kbuf, "\033[6~"); 649 strcpy (kbuf, "\033[6~");
652 break; 650 break;
653#endif 651#endif
654 case XK_KP_Enter: 652 case XK_KP_Enter:
655 /* allow shift to override */ 653 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 654 if (kp)
657 { 655 {
658 strcpy (kbuf, "\033OM"); 656 strcpy (kbuf, "\033OM");
659 break; 657 break;
660 } 658 }
661 659
… …
673 kbuf[0] = '\015'; 671 kbuf[0] = '\015';
674 kbuf[1] = '\0'; 672 kbuf[1] = '\0';
675 } 673 }
676 break; 674 break;
677 675
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */ 676 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */ 677 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */ 678 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */ 679 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP"); 680 strcpy (kbuf, "\033OP");
… …
704 case XK_KP_6: /* "\033Ov" : "6" */ 696 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */ 697 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */ 698 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */ 699 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */ 700 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 701 if (kp)
710 { 702 {
711 strcpy (kbuf, "\033Oj"); 703 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply); 704 kbuf[2] += (keysym - XK_KP_Multiply);
713 } 705 }
714 else 706 else
… …
720 712
721 case XK_Find: 713 case XK_Find:
722 strcpy (kbuf, "\033[1~"); 714 strcpy (kbuf, "\033[1~");
723 break; 715 break;
724 716
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert: 717 case XK_Insert:
736 strcpy (kbuf, "\033[2~"); 718 strcpy (kbuf, "\033[2~");
737 break; 719 break;
738#ifdef DXK_Remove /* support for DEC remove like key */ 720#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove: 721 case DXK_Remove:
… …
743 strcpy (kbuf, "\033[3~"); 725 strcpy (kbuf, "\033[3~");
744 break; 726 break;
745 case XK_Select: 727 case XK_Select:
746 strcpy (kbuf, "\033[4~"); 728 strcpy (kbuf, "\033[4~");
747 break; 729 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End: 730 case XK_End:
759 strcpy (kbuf, KS_END); 731 strcpy (kbuf, KS_END);
760 break; 732 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home: 733 case XK_Home:
772 strcpy (kbuf, KS_HOME); 734 strcpy (kbuf, KS_HOME);
773 break; 735 break;
774 736
775#define FKEY(n, fkey) \ 737#define FKEY(n, fkey) \
… …
832 break; 794 break;
833 } 795 }
834 796
835 if (newlen) 797 if (newlen)
836 len = strlen (kbuf); 798 len = strlen (kbuf);
837 }
838 799
839 /* 800 /*
840 * Pass meta for all function keys, if 'meta' option set 801 * Pass meta for all function keys, if 'meta' option set
841 */ 802 */
842#ifdef META8_OPTION 803#ifdef META8_OPTION
… …
877 return; 838 return;
878 839
879 if (len <= 0) 840 if (len <= 0)
880 return; /* not mapped */ 841 return; /* not mapped */
881 842
882 if (OPTION (Opt_scrollTtyKeypress)) 843 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 844 if (view_start)
884 { 845 {
885 view_start = 0; 846 view_start = 0;
886 want_refresh = 1; 847 want_refresh = 1;
887 } 848 }
… …
926#if ENABLE_FRILLS || ISO_14755 887#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 888 // ISO 14755 support
928 if (iso14755buf) 889 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 890 if (iso14755buf & ISO_14755_52)
930 { 891 {
931# if ENABLE_OVERLAY 892# if ISO_14755
932 scr_overlay_off (); 893 scr_overlay_off ();
933# endif 894# endif
934# if ISO_14755 895# if ISO_14755
935 // iso14755 part 5.2 handling: release time 896 // iso14755 part 5.2 handling: release time
936 // first: controls 897 // first: controls
… …
959 920
960 return; 921 return;
961 } 922 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 923 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 924 {
964# if ENABLE_OVERLAY 925# if ISO_14755
965 scr_overlay_off (); 926 scr_overlay_off ();
966# endif 927# endif
967 if (iso14755buf & ISO_14755_51) 928 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 929 commit_iso14755 ();
969#if ISO_14755 930#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 931 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 932 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 933 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 934
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 935 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 936 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 988void
1028rxvt_term::flush () 989rxvt_term::flush ()
1029{ 990{
1030 flush_ev.stop (); 991 flush_ev.stop ();
1031 992
1032#ifdef TRANSPARENT 993#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 994 if (bgPixmap.check_clearChanged ())
1034 { 995 {
1035 want_full_refresh = 0; 996// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 997 scr_touch (false);
1038 } 998 }
1039#endif 999#endif
1040 1000
1041 if (want_refresh) 1001 if (want_refresh)
… …
1086 } 1046 }
1087 1047
1088 display->flush (); 1048 display->flush ();
1089} 1049}
1090 1050
1051/* checks wether a refresh is requested and starts the refresh timer */
1091void 1052void
1092rxvt_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)
1093{ 1063{
1094 make_current (); 1064 make_current ();
1095 1065
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1066 refresh_count = 0;
1109 flush (); 1067 flush ();
1110} 1068}
1111 1069
1112#ifdef CURSOR_BLINK 1070#ifdef CURSOR_BLINK
1113void 1071void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1072rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1073{
1116 hidden_cursor = !hidden_cursor; 1074 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1075 want_refresh = 1;
1118 1076 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1077}
1121#endif 1078#endif
1122 1079
1123#ifdef TEXT_BLINK 1080#ifdef TEXT_BLINK
1124void 1081void
1125rxvt_term::text_blink_cb (time_watcher &w) 1082rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1083{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1084 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1085 {
1129 hidden_text = !hidden_text; 1086 hidden_text = !hidden_text;
1130 want_refresh = 1; 1087 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1088 refresh_check ();
1132 } 1089 }
1090 else
1091 w.stop ();
1133} 1092}
1134#endif 1093#endif
1135 1094
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1095#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1096void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1097rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1098{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1099 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1100 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1142 { 1101 {
1143 want_refresh = 1; 1102 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1103 refresh_check ();
1145 } 1104 }
1105 else
1106 w.stop ();
1146} 1107}
1147#endif 1108#endif
1148 1109
1149#ifdef SELECTION_SCROLLING 1110#ifdef SELECTION_SCROLLING
1150void 1111void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1112rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1113{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1114 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1115 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1116 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1117 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1158 } 1119 }
1120 else
1121 w.stop ();
1159} 1122}
1160#endif 1123#endif
1161 1124
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1125#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1126void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1127rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1128{
1166 if (mouse_slip_wheel_speed == 0 1129 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1130 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1131 want_refresh = 1;
1174 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)
1136 {
1137 mouse_slip_wheel_speed = 0;
1138 w.stop ();
1175 } 1139 }
1176} 1140}
1177#endif 1141#endif
1178 1142
1179#if LINUX_YIELD_HACK 1143#if LINUX_YIELD_HACK
1180static struct event_handler 1144static struct event_handler
1181{ 1145{
1182 check_watcher yield_ev; 1146 ev::prepare yield_ev;
1183 1147
1184 void yield_cb (check_watcher &w) 1148 void yield_cb (ev::prepare &w, int revents)
1185 { 1149 {
1186 // this should really be sched_yield(), but the linux guys thought 1150 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1151 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1152 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1153 // allowed by the sus... as is returning ENOSYS.
… …
1232 } 1196 }
1233 else 1197 else
1234 { 1198 {
1235 pty_ev.stop (); 1199 pty_ev.stop ();
1236 1200
1237 if (!OPTION (Opt_hold)) 1201 if (!option (Opt_hold))
1238 destroy (); 1202 destroy ();
1239 } 1203 }
1240 1204
1241 return false; 1205 return false;
1242} 1206}
1243 1207
1244void 1208void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1210{
1247 make_current (); 1211 make_current ();
1248 1212
1249 if (revents & EVENT_READ) 1213 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1215 while (pty_fill ())
1252 if (cmd_parse ()) 1216 if (cmd_parse ())
1253 break; 1217 break;
1254 1218
1255 if (revents & EVENT_WRITE) 1219 if (revents & ev::WRITE)
1256 pty_write (); 1220 pty_write ();
1221
1222 refresh_check ();
1257} 1223}
1258 1224
1259void 1225void
1260rxvt_term::pointer_unblank () 1226rxvt_term::pointer_unblank ()
1261{ 1227{
… …
1263 recolour_cursor (); 1229 recolour_cursor ();
1264 1230
1265#ifdef POINTER_BLANK 1231#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1232 hidden_pointer = 0;
1267 1233
1268 if (OPTION (Opt_pointerBlank)) 1234 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1235 pointer_ev.start (pointerBlankDelay);
1270#endif 1236#endif
1271} 1237}
1272 1238
1273#ifdef POINTER_BLANK 1239#ifdef POINTER_BLANK
1274void 1240void
1275rxvt_term::pointer_blank () 1241rxvt_term::pointer_blank ()
1276{ 1242{
1277 if (!OPTION (Opt_pointerBlank)) 1243 if (!option (Opt_pointerBlank))
1278 return; 1244 return;
1279 1245
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1246 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1247 XFlush (dpy);
1282 1248
1283 hidden_pointer = 1; 1249 hidden_pointer = 1;
1284} 1250}
1285 1251
1286void 1252void
1287rxvt_term::pointer_cb (time_watcher &w) 1253rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1254{
1289 make_current (); 1255 make_current ();
1290 1256
1291 pointer_blank (); 1257 pointer_blank ();
1292} 1258}
… …
1295void 1261void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1262rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1263{
1298 int button_number, key_state = 0; 1264 int button_number, key_state = 0;
1299 int x, y; 1265 int x, y;
1266 int code = 32;
1300 1267
1301 x = ev.x; 1268 x = Pixel2Col (ev.x);
1302 y = ev.y; 1269 y = Pixel2Row (ev.y);
1303 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 }
1304 1278
1305 if (MEvent.button == AnyButton) 1279 if (MEvent.button == AnyButton)
1306 button_number = 3; 1280 button_number = 3;
1307 else 1281 else
1308 { 1282 {
… …
1354 x + 1, 1328 x + 1,
1355 y + 1); 1329 y + 1);
1356#endif 1330#endif
1357 1331
1358 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1333 (code + button_number + key_state),
1360 (32 + x + 1), 1334 (32 + x + 1),
1361 (32 + y + 1)); 1335 (32 + y + 1));
1362} 1336}
1363 1337
1364/*{{{ process an X event */ 1338/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1400 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1401 focus_out ();
1428 } 1402 }
1429#endif 1403#endif
1430 } 1404 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1405 break;
1436 1406
1437 /* 1407 /*
1438 * XXX: this is not the _current_ arrangement 1408 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1409 * Here's my conclusion:
… …
1458 break; 1428 break;
1459 } 1429 }
1460 break; 1430 break;
1461 1431
1462 case FocusIn: 1432 case FocusIn:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1436 focus_in ();
1464 break; 1437 break;
1465 1438
1466 case FocusOut: 1439 case FocusOut:
1440 if (ev.xfocus.detail != NotifyInferior
1441 && ev.xfocus.detail != NotifyPointer
1442 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1443 focus_out ();
1468 break; 1444 break;
1469 1445
1470 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);*/
1471 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1472 { 1451 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1453 ;
1475 1454
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1455 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1456 {
1478 seen_resize = 1; 1457 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1458 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 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 }
1481 1472
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1473 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1474 }
1489 break; 1475 break;
1490 1476
1491 case PropertyNotify: 1477 case PropertyNotify:
1492 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)))
… …
1508 case SelectionRequest: 1494 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1510 break; 1496 break;
1511 1497
1512 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
1513 mapped = 1; 1515 mapped = 1;
1514#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1517 text_blink_ev.start ();
1516#endif 1518#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1520 break;
1519 1521
1520 case UnmapNotify: 1522 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1524#endif 1526#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1528 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1529
1534 case GraphicsExpose: 1530 case GraphicsExpose:
1535 case Expose: 1531 case Expose:
1536 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1537 { 1533 {
1538 do 1534 do
1535 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, False);
1538 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1540
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1542
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1548 1548
1549 want_refresh = 1; 1549 want_refresh = 1;
1550 } 1550 }
1551 else 1551 else
1552 { 1552 {
… …
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1556 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1558 ;
1559 1559
1560 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1561 {
1562 scrollBar.setIdle (); 1562 scrollBar.state = STATE_IDLE;
1563 scrollbar_show (0); 1563 scrollbar_show (0);
1564 } 1564 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1565 }
1571 break; 1566 break;
1572 1567
1573 case MotionNotify: 1568 case MotionNotify:
1574#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1570 if (hidden_pointer)
1576 pointer_unblank (); 1571 pointer_unblank ();
1577#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);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1577 break;
1580 1578
1581 if (ev.xany.window == vt) 1579 if (ev.xany.window == vt)
1582 { 1580 {
… …
1616 int dist; 1614 int dist;
1617 1615
1618 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1620 */ 1618 */
1621 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1621
1624 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1626 */ 1624 */
1627 selection_save_x = ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
… …
1649 else 1647 else
1650 { 1648 {
1651 /* we are within the text window, so we 1649 /* we are within the text window, so we
1652 * shouldn't be scrolling 1650 * shouldn't be scrolling
1653 */ 1651 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1656 } 1653 }
1657#endif 1654#endif
1658#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1659 } 1656 }
1660#endif 1657#endif
1661 } 1658 }
1662 } 1659 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1664 { 1661 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1667 ; 1664 ;
1668 1665
… …
1672 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1670 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1672 scrollbar_size ());
1676 want_refresh = 1; 1673 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1674 scrollbar_show (1);
1679 } 1675 }
1680 break; 1676 break;
1681 } 1677 }
1682 1678
1683#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1680 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1681 {
1686 if (hidden_cursor) 1682 if (hidden_cursor)
1687 { 1683 {
1688 hidden_cursor = 0; 1684 hidden_cursor = 0;
1689 want_refresh = 1; 1685 want_refresh = 1;
1690 } 1686 }
1691 1687
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1693 } 1689 }
1694#endif 1690#endif
1695 1691
1696#if defined(POINTER_BLANK) 1692#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1694 {
1699 if (ev.type == MotionNotify 1695 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1696 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1697 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1698 if (hidden_pointer)
… …
1704 1700
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1702 pointer_blank ();
1707 } 1703 }
1708#endif 1704#endif
1705
1706 refresh_check ();
1709} 1707}
1710 1708
1711void 1709void
1712rxvt_term::focus_in () 1710rxvt_term::focus_in ()
1713{ 1711{
… …
1724 IMSetPosition (); 1722 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1723 XSetICFocus (Input_Context);
1726 } 1724 }
1727#endif 1725#endif
1728#if CURSOR_BLINK 1726#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1727 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1728 cursor_blink_ev.again ();
1731#endif 1729#endif
1732#if OFF_FOCUS_FADING 1730#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1731 if (rs[Rs_fade])
1734 { 1732 {
1735 pix_colors = pix_colors_focused; 1733 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1734 scr_recolour ();
1737 } 1735 }
1738#endif 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 }
1745 }
1746#endif
1739 } 1747 }
1740} 1748}
1741 1749
1742void 1750void
1743rxvt_term::focus_out () 1751rxvt_term::focus_out ()
… …
1751 1759
1752#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1761 if (iso14755buf)
1754 { 1762 {
1755 iso14755buf = 0; 1763 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1764# if ISO_14755
1757 scr_overlay_off (); 1765 scr_overlay_off ();
1758# endif 1766# endif
1759 } 1767 }
1760#endif 1768#endif
1761#if USE_XIM 1769#if USE_XIM
1762 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1771 XUnsetICFocus (Input_Context);
1764#endif 1772#endif
1765#if CURSOR_BLINK 1773#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1774 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1775 cursor_blink_ev.stop ();
1776
1768 hidden_cursor = 0; 1777 hidden_cursor = 0;
1769#endif 1778#endif
1770#if OFF_FOCUS_FADING 1779#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1780 if (rs[Rs_fade])
1772 { 1781 {
… …
1775 } 1784 }
1776#endif 1785#endif
1777 } 1786 }
1778} 1787}
1779 1788
1780#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
1781void 1803void
1782rxvt_term::rootwin_cb (XEvent &ev) 1804rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1805{
1784 make_current (); 1806 make_current ();
1785 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
1786 switch (ev.type) 1813 switch (ev.type)
1787 { 1814 {
1788 case PropertyNotify: 1815 case PropertyNotify:
1789 /* 1816 /*
1790 * 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,
1791 * 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.
1792 */ 1819 */
1793 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 return; 1822 {
1823 bgPixmap.set_root_pixmap ();
1824 update_background ();
1825 }
1796 1826
1797 /* FALLTHROUGH */
1798 case ReparentNotify:
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1800 want_refresh = want_full_refresh = 1;
1801 break; 1827 break;
1802 } 1828 }
1829# endif
1830
1831 refresh_check ();
1803} 1832}
1804#endif 1833#endif
1805 1834
1806void 1835void
1807rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
… …
1862 mouse_report (ev); 1891 mouse_report (ev);
1863 } 1892 }
1864#else 1893#else
1865 MEvent.button = ev.button; 1894 MEvent.button = ev.button;
1866 mouse_report (ev); 1895 mouse_report (ev);
1867#endif /* MOUSE_REPORT_DOUBLECLICK */ 1896#endif /* MOUSE_REPORT_DOUBLECLICK */
1868 1897
1869 } 1898 }
1870 else 1899 else
1871 { 1900 {
1872 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
… …
1920 } 1949 }
1921 1950
1922 /* 1951 /*
1923 * Scrollbar window processing of button press 1952 * Scrollbar window processing of button press
1924 */ 1953 */
1925 if (isScrollbarWindow (ev.window)) 1954 if (scrollBar.state && ev.window == scrollBar.win)
1926 { 1955 {
1927 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;
1928 /* 1964 /*
1929 * Rxvt-style scrollbar: 1965 * Rxvt-style scrollbar:
1930 * move up if mouse is above slider 1966 * move up if mouse is above slider
1931 * move dn if mouse is below slider 1967 * move dn if mouse is below slider
1932 * 1968 *
… …
1941 /* 1977 /*
1942 * Mouse report disabled scrollbar: 1978 * Mouse report disabled scrollbar:
1943 * arrow buttons - send up/down 1979 * arrow buttons - send up/down
1944 * click on scrollbar - send pageup/down 1980 * click on scrollbar - send pageup/down
1945 */ 1981 */
1946 if ((scrollBar.style == R_SB_NEXT 1982 if (direction == UP)
1947 && scrollbarnext_upButton (ev.y))
1948 || (scrollBar.style == R_SB_RXVT
1949 && scrollbarrxvt_upButton (ev.y)))
1950 tt_printf ("\033[A"); 1983 tt_printf ("\033[A");
1951 else if ((scrollBar.style == R_SB_NEXT 1984 else if (direction == DN)
1952 && scrollbarnext_dnButton (ev.y))
1953 || (scrollBar.style == R_SB_RXVT
1954 && scrollbarrxvt_dnButton (ev.y)))
1955 tt_printf ("\033[B"); 1985 tt_printf ("\033[B");
1956 else 1986 else
1957 switch (ev.button) 1987 switch (ev.button)
1958 { 1988 {
1959 case Button2: 1989 case Button2:
… …
1966 tt_printf ("\033[5~"); 1996 tt_printf ("\033[5~");
1967 break; 1997 break;
1968 } 1998 }
1969 } 1999 }
1970 else 2000 else
1971#endif /* NO_SCROLLBAR_REPORT */ 2001#endif /* NO_SCROLLBAR_REPORT */
1972
1973 {
1974 char upordown = 0;
1975
1976 if (scrollBar.style == R_SB_NEXT)
1977 { 2002 {
1978 if (scrollbarnext_upButton (ev.y)) 2003 if (direction != NO_DIR)
1979 upordown = -1; /* up */
1980 else if (scrollbarnext_dnButton (ev.y))
1981 upordown = 1; /* down */
1982 }
1983 else if (scrollBar.style == R_SB_RXVT)
1984 {
1985 if (scrollbarrxvt_upButton (ev.y))
1986 upordown = -1; /* up */
1987 else if (scrollbarrxvt_dnButton (ev.y))
1988 upordown = 1; /* down */
1989 }
1990 if (upordown)
1991 { 2004 {
1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2006 if (!cont_scroll_ev.is_active ())
1993 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1994#endif 2008#endif
1995 if (scr_page (upordown < 0 ? UP : DN, 1)) 2009 if (scr_page (direction, 1))
1996 { 2010 {
1997 if (upordown < 0) 2011 if (direction == UP)
1998 scrollBar.setUp (); 2012 scrollBar.state = STATE_UP;
1999 else 2013 else
2000 scrollBar.setDn (); 2014 scrollBar.state = STATE_DOWN;
2001 } 2015 }
2002 } 2016 }
2003 else 2017 else
2004 switch (ev.button) 2018 switch (ev.button)
2005 { 2019 {
2006 case Button2: 2020 case Button2:
2007 switch (scrollbar_align) 2021 switch (scrollBar.align)
2008 { 2022 {
2009 case R_SB_ALIGN_TOP: 2023 case R_SB_ALIGN_TOP:
2010 csrO = 0; 2024 csrO = 0;
2011 break; 2025 break;
2012 case R_SB_ALIGN_CENTRE: 2026 case R_SB_ALIGN_CENTRE:
… …
2020 if (scrollBar.style == R_SB_XTERM 2034 if (scrollBar.style == R_SB_XTERM
2021 || scrollbar_above_slider (ev.y) 2035 || scrollbar_above_slider (ev.y)
2022 || scrollbar_below_slider (ev.y)) 2036 || scrollbar_below_slider (ev.y))
2023 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2024 2038
2025 scrollBar.setMotion (); 2039 scrollBar.state = STATE_MOTION;
2026 break; 2040 break;
2027 2041
2028 case Button1: 2042 case Button1:
2029 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2043 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2030 csrO = ev.y - scrollBar.top; 2044 csrO = ev.y - scrollBar.top;
2031 /* FALLTHROUGH */ 2045 /* FALLTHROUGH */
2032 2046
2033 case Button3: 2047 case Button3:
2034 if (scrollBar.style != R_SB_XTERM) 2048 if (scrollBar.style != R_SB_XTERM)
… …
2044 scr_page (DN, nrow - 1); 2058 scr_page (DN, nrow - 1);
2045# else 2059# else
2046 scr_page (DN, nrow / 4); 2060 scr_page (DN, nrow / 4);
2047# endif 2061# endif
2048 else 2062 else
2049 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2050 } 2064 }
2051 else 2065 else
2052 { 2066 {
2053 scr_page ((ev.button == Button1 ? DN : UP), 2067 scr_page ((ev.button == Button1 ? DN : UP),
2054 (nrow 2068 (nrow
… …
2071 2085
2072 csrO = 0; /* reset csr Offset */ 2086 csrO = 0; /* reset csr Offset */
2073 if (!bypass_keystate) 2087 if (!bypass_keystate)
2074 reportmode = !! (priv_modes & PrivMode_mouse_report); 2088 reportmode = !! (priv_modes & PrivMode_mouse_report);
2075 2089
2076 if (scrollbar_isUpDn ()) 2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2077 { 2091 {
2078 scrollBar.setIdle (); 2092 scrollBar.state = STATE_IDLE;
2079 scrollbar_show (0); 2093 scrollbar_show (0);
2080 } 2094 }
2081 2095
2082#ifdef SELECTION_SCROLLING 2096#ifdef SELECTION_SCROLLING
2083 if (sel_scroll_ev.active)
2084 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2085#endif 2098#endif
2086 2099
2087 if (ev.window == vt) 2100 if (ev.window == vt)
2088 { 2101 {
2089 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)))
… …
2113 mouse_report (ev); 2126 mouse_report (ev);
2114 } 2127 }
2115#else /* MOUSE_REPORT_DOUBLECLICK */ 2128#else /* MOUSE_REPORT_DOUBLECLICK */
2116 MEvent.button = AnyButton; 2129 MEvent.button = AnyButton;
2117 mouse_report (ev); 2130 mouse_report (ev);
2118#endif /* MOUSE_REPORT_DOUBLECLICK */ 2131#endif /* MOUSE_REPORT_DOUBLECLICK */
2119 return; 2132 return;
2120 } 2133 }
2121 2134
2122 /* 2135 /*
2123 * dumb hack to compensate for the failure of click-and-drag 2136 * dumb hack to compensate for the failure of click-and-drag
… …
2135 selection_make (ev.time); 2148 selection_make (ev.time);
2136 break; 2149 break;
2137 2150
2138 case Button2: 2151 case Button2:
2139 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?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2154 break;
2142 2155
2143#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2144 case Button4: 2157 case Button4:
2145 case Button5: 2158 case Button5:
… …
2149 2162
2150 v = ev.button == Button4 ? UP : DN; 2163 v = ev.button == Button4 ? UP : DN;
2151 2164
2152 if (ev.state & ShiftMask) 2165 if (ev.state & ShiftMask)
2153 i = 1; 2166 i = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2167 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2168 i = nrow - 1;
2156 else 2169 else
2157 i = 5; 2170 i = 5;
2158 2171
2159# ifdef MOUSE_SLIP_WHEELING 2172# ifdef MOUSE_SLIP_WHEELING
… …
2161 { 2174 {
2162 mouse_slip_wheel_speed += v ? -1 : 1; 2175 mouse_slip_wheel_speed += v ? -1 : 1;
2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2165 2178
2166 if (slip_wheel_ev.at < NOW) 2179 if (!slip_wheel_ev.is_active ())
2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2168
2169 slip_wheel_ev.start ();
2170 } 2181 }
2171 else 2182 else
2183# endif
2172 { 2184 {
2173# endif
2174 scr_page (v, i); 2185 scr_page (v, i);
2175 scrollbar_show (1); 2186 scrollbar_show (1);
2176# ifdef MOUSE_SLIP_WHEELING
2177 } 2187 }
2178# endif
2179 } 2188 }
2180 break; 2189 break;
2181#endif 2190#endif
2182 } 2191 }
2183 } 2192 }
2184} 2193}
2185
2186#ifdef TRANSPARENT
2187#if TINTING
2188/* taken from aterm-0.4.2 */
2189
2190typedef uint32_t RUINT32T;
2191
2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2193{
2194 int sh_r, sh_g, sh_b;
2195 RUINT32T mask_r, mask_g, mask_b;
2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2199 int i;
2200
2201 Visual *visual = term->visual;
2202
2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2204
2205 /* for convenience */
2206 mask_r = visual->red_mask;
2207 mask_g = visual->green_mask;
2208 mask_b = visual->blue_mask;
2209
2210 /* boring lookup table pre-initialization */
2211 switch (srcImage->bits_per_pixel) {
2212 case 15:
2213 if ((mask_r != 0x7c00) ||
2214 (mask_g != 0x03e0) ||
2215 (mask_b != 0x001f))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2218 lookup_r = lookup;
2219 lookup_g = lookup+32;
2220 lookup_b = lookup+32+32;
2221 sh_r = 10;
2222 sh_g = 5;
2223 sh_b = 0;
2224 break;
2225 case 16:
2226 if ((mask_r != 0xf800) ||
2227 (mask_g != 0x07e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+64;
2234 sh_r = 11;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 24:
2239 if ((mask_r != 0xff0000) ||
2240 (mask_g != 0x00ff00) ||
2241 (mask_b != 0x0000ff))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2244 lookup_r = lookup;
2245 lookup_g = lookup+256;
2246 lookup_b = lookup+256+256;
2247 sh_r = 16;
2248 sh_g = 8;
2249 sh_b = 0;
2250 break;
2251 case 32:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 default:
2265 return; /* we do not support this color depth */
2266 }
2267
2268 /* prepare limits for color transformation (each channel is handled separately) */
2269 if (shade < 0) {
2270 shade = -shade;
2271 if (shade < 0) shade = 0;
2272 if (shade > 100) shade = 100;
2273
2274 lower_lim_r = 65535-rm;
2275 lower_lim_g = 65535-gm;
2276 lower_lim_b = 65535-bm;
2277
2278 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2279 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2280 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2281
2282 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2283 } else {
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2288
2289 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2290 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2291 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2292 }
2293
2294 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2295 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2296 {
2297 unsigned int tmp;
2298
2299 tmp = lower_lim_r;
2300 lower_lim_r = lower_lim_b;
2301 lower_lim_b = tmp;
2302
2303 tmp = upper_lim_r;
2304 upper_lim_r = upper_lim_b;
2305 upper_lim_b = tmp;
2306 }
2307
2308 /* fill our lookup tables */
2309 for (i = 0; i <= mask_r>>sh_r; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2313 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2314 lookup_r[i] = (tmp/65535)<<sh_r;
2315 }
2316 for (i = 0; i <= mask_g>>sh_g; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2320 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2321 lookup_g[i] = (tmp/65535)<<sh_g;
2322 }
2323 for (i = 0; i <= mask_b>>sh_b; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2327 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2328 lookup_b[i] = (tmp/65535)<<sh_b;
2329 }
2330
2331 /* apply table to input image (replacing colors by newly calculated ones) */
2332 switch (srcImage->bits_per_pixel)
2333 {
2334 case 15:
2335 {
2336 unsigned short *p1, *pf, *p, *pl;
2337 p1 = (unsigned short *) srcImage->data;
2338 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339 while (p1 < pf)
2340 {
2341 p = p1;
2342 pl = p1 + srcImage->width;
2343 for (; p < pl; p++)
2344 {
2345 *p = lookup_r[(*p & 0x7c00)>>10] |
2346 lookup_g[(*p & 0x03e0)>> 5] |
2347 lookup_b[(*p & 0x001f)];
2348 }
2349 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 case 16:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0xf800)>>11] |
2365 lookup_g[(*p & 0x07e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 24:
2373 {
2374 unsigned char *p1, *pf, *p, *pl;
2375 p1 = (unsigned char *) srcImage->data;
2376 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width * 3;
2381 for (; p < pl; p += 3)
2382 {
2383 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2384 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2385 p[2] = lookup_r[(p[2] & 0x0000ff)];
2386 }
2387 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 32:
2392 {
2393 RUINT32T *p1, *pf, *p, *pl;
2394 p1 = (RUINT32T *) srcImage->data;
2395 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0xff0000)>>16] |
2404 lookup_g[(*p & 0x00ff00)>> 8] |
2405 lookup_b[(*p & 0x0000ff)] |
2406 (*p & ~0xffffff);
2407 }
2408 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 }
2413
2414 free (lookup);
2415}
2416#endif
2417
2418/*
2419 * Check our parents are still who we think they are.
2420 * Do transparency updates if required
2421 */
2422int
2423rxvt_term::check_our_parents ()
2424{
2425 int i, pchanged, aformat, have_pixmap, rootdepth;
2426 unsigned long nitems, bytes_after;
2427 Atom atype;
2428 unsigned char *prop = NULL;
2429 Window root, oldp, *list;
2430 Pixmap rootpixmap = None;
2431 XWindowAttributes wattr, wrootattr;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (dpy, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !ISSET_PIXCOLOR (Color_tint)
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (dpy, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (dpy, False);
2523 allowedxerror = -1;
2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (dpy, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (dpy, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 rgba c;
2555 pix_colors_focused [Color_tint].get (c);
2556
2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2564 nx, ny, image->width, image->height);
2565 XFreeGC (dpy, gc);
2566 XDestroyImage (image);
2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2568 XClearWindow (dpy, parent[0]);
2569
2570 if (!am_transparent || !am_pixmap_trans)
2571 pchanged = 1;
2572
2573 am_transparent = am_pixmap_trans = 1;
2574 }
2575 }
2576
2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 else
2580 {
2581 unsigned int n;
2582 /*
2583 * InheritPixmap transparency
2584 */
2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586 {
2587 oldp = parent[i];
2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2589 XFree (list);
2590
2591 if (parent[i] == display->root)
2592 {
2593 if (oldp != None)
2594 pchanged = 1;
2595
2596 break;
2597 }
2598
2599 if (oldp != parent[i])
2600 pchanged = 1;
2601 }
2602
2603 n = 0;
2604
2605 if (pchanged)
2606 for (; n < (unsigned int)i; n++)
2607 {
2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2611 {
2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2613 break;
2614 }
2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2618 {
2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2621 am_transparent = 0;
2622 /* XXX: also turn off Opt_transparent? */
2623 }
2624 else
2625 {
2626 for (n = 0; n < (unsigned int)i; n++)
2627 {
2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2629 XClearWindow (dpy, parent[n]);
2630 }
2631
2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 am_transparent = 1;
2634 }
2635
2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 parent[i] = None;
2638 }
2639
2640 if (scrollBar.win)
2641 {
2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2643 scrollBar.setIdle ();
2644 scrollbar_show (0);
2645 }
2646
2647 if (am_transparent)
2648 {
2649 want_refresh = want_full_refresh = 1;
2650 if (am_pixmap_trans)
2651 flush ();
2652 }
2653
2654 return pchanged;
2655}
2656#endif
2657 2194
2658/*}}} */ 2195/*}}} */
2659 2196
2660bool 2197bool
2661rxvt_term::cmd_parse () 2198rxvt_term::cmd_parse ()
… …
2710 if (ch == C0_LF) 2247 if (ch == C0_LF)
2711 nlines++; 2248 nlines++;
2712 2249
2713 refresh_count++; 2250 refresh_count++;
2714 2251
2715 if (!OPTION (Opt_jumpScroll) 2252 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2253 {
2718 refreshnow = true;
2719 refresh_count = 0; 2254 refresh_count = 0;
2255
2256 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2257 {
2258 refreshnow = true;
2720 ch = NOCHAR; 2259 ch = NOCHAR;
2721 break; 2260 break;
2261 }
2722 } 2262 }
2723 2263
2724 // scr_add_lines only works for nlines <= nrow - 1. 2264 // scr_add_lines only works for nlines <= nrow - 1.
2725 if (nlines >= nrow - 1) 2265 if (nlines >= nrow - 1)
2726 { 2266 {
… …
2754 && 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))))
2755 scr_add_lines (buf, str - buf, nlines); 2295 scr_add_lines (buf, str - buf, nlines);
2756 2296
2757 /* 2297 /*
2758 * 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
2759 * 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.
2760 * the number of pages between refreshes is refresh_limit, which 2300 * if skipScroll is enabled.
2761 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2301 */
2763 if (refreshnow) 2302 if (refreshnow)
2764 { 2303 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++;
2767 else
2768 {
2769 flag = true; 2304 flag = true;
2770 scr_refresh (); 2305 scr_refresh ();
2771 want_refresh = 1; 2306 want_refresh = 1;
2772 }
2773 } 2307 }
2774 2308
2775 } 2309 }
2776 else 2310 else
2777 { 2311 {
… …
2926 { 2460 {
2927 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2928 break; /* done = 1 */ 2462 break; /* done = 1 */
2929 } 2463 }
2930 } 2464 }
2931 2465
2932 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2933 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2934 { 2468 {
2935 done = 1; 2469 done = 1;
2936 break; 2470 break;
… …
2938 } 2472 }
2939 } 2473 }
2940 2474
2941 pclose_printer (fd); 2475 pclose_printer (fd);
2942} 2476}
2943#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2944/*}}} */ 2478/*}}} */
2945 2479
2946/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2947enum { 2481enum {
2948 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
2998 process_dcs_seq (); 2532 process_dcs_seq ();
2999 break; 2533 break;
3000 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
3001 process_csi_seq (); 2535 process_csi_seq ();
3002 break; 2536 break;
3003 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
3004 process_osc_seq (); 2538 process_osc_seq ();
3005 break; 2539 break;
3006#endif 2540#endif
3007 } 2541 }
3008} 2542}
… …
3234rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
3235{ 2769{
3236 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
3237 unsigned int nargs, p; 2771 unsigned int nargs, p;
3238 int n, ndef; 2772 int n, ndef;
3239 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
3240 2774
3241 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
3242 arg[--nargs] = 0;
3243 2776
3244 priv = 0; 2777 priv = 0;
3245 ch = cmd_getc (); 2778 ch = cmd_getc ();
3246 if (ch >= '<' && ch <= '?') 2779 if (ch >= '<' && ch <= '?')
2780 {
3247 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' */
3248 priv = ch; 2782 priv = ch;
3249 ch = cmd_getc (); 2783 ch = cmd_getc ();
3250 } 2784 }
3251 2785
3252 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
3291 switch (priv) 2825 switch (priv)
3292 { 2826 {
3293 case '>': 2827 case '>':
3294 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
3295 { 2829 {
3296 // 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,
3297 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3298 // 2832 //
3299 // 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
3300 // 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
3301 // that we do not support xterm mouse reporting (should be 95 when we do). 2835 // versions.
3302 // 2836 //
3303 tt_printf ("\033[>%d;94;0c", 'U'); 2837 tt_printf ("\033[>%d;95;0c", 'U');
3304 } 2838 }
3305 break; 2839 break;
2840
3306 case '?': 2841 case '?':
3307 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3308 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
3309 break; 2844 break;
3310 } 2845 }
… …
3435 break; 2970 break;
3436 case 6: /* CPR requested */ 2971 case 6: /* CPR requested */
3437 scr_report_position (); 2972 scr_report_position ();
3438 break; 2973 break;
3439 case 7: /* unofficial extension */ 2974 case 7: /* unofficial extension */
3440 if (OPTION (Opt_insecure)) 2975 if (option (Opt_insecure))
3441 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2976 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3442 break; 2977 break;
3443 case 8: /* unofficial extension */ 2978 case 8: /* unofficial extension */
3444 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2979 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3445 break; 2980 break;
… …
3609 break; 3144 break;
3610 case 20: /* report icon label */ 3145 case 20: /* report icon label */
3611 { 3146 {
3612 char *s; 3147 char *s;
3613 XGetIconName (dpy, parent[0], &s); 3148 XGetIconName (dpy, parent[0], &s);
3614 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 */
3615 XFree (s); 3150 XFree (s);
3616 } 3151 }
3617 break; 3152 break;
3618 case 21: /* report window title */ 3153 case 21: /* report window title */
3619 { 3154 {
3620 char *s; 3155 char *s;
3621 XFetchName (dpy, parent[0], &s); 3156 XFetchName (dpy, parent[0], &s);
3622 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 */
3623 XFree (s); 3158 XFree (s);
3624 } 3159 }
3625 break; 3160 break;
3626 } 3161 }
3627} 3162}
… …
3654 seen_esc = true; 3189 seen_esc = true;
3655 continue; 3190 continue;
3656 } 3191 }
3657 else if (ch == C0_BEL || ch == CHAR_ST) 3192 else if (ch == C0_BEL || ch == CHAR_ST)
3658 break; 3193 break;
3194 else if (ch == C0_SYN)
3195 ch = cmd_get8 ();
3659 else if (ch < 0x20) 3196 else if (ch < 0x20)
3660 return NULL; /* other control character - exit */ 3197 return NULL; /* other control character - exit */
3661 3198
3662 seen_esc = false; 3199 seen_esc = false;
3663 3200
3664 if (n >= STRING_MAX - 1) 3201 if (n >= STRING_MAX - 1)
3665 // stop at some sane length 3202 // stop at some sane length
3666 return NULL; 3203 return NULL;
3667 3204
3668 if (ch == C0_SYN)
3669 string[n++] = cmd_get8 ();
3670 else
3671 string[n++] = ch; 3205 string[n++] = ch;
3672 } 3206 }
3673 3207
3674 string[n++] = '\0'; 3208 string[n++] = '\0';
3675 3209
3676 ends_how = (ch == 0x5c ? C0_ESC : ch); 3210 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3755 int saveop = op; 3289 int saveop = op;
3756 3290
3757 dLocal (Display *, dpy); 3291 dLocal (Display *, dpy);
3758 3292
3759 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
3760 switch (op) 3298 switch (op)
3761 { 3299 {
3762 case XTerm_name: 3300 case XTerm_name:
3763 set_title (str); 3301 set_title (str);
3764 /* FALLTHROUGH */ 3302 /* FALLTHROUGH */
… …
3823 *buf++ = '\0'; 3361 *buf++ = '\0';
3824 3362
3825 process_color_seq (op, color, name, resp); 3363 process_color_seq (op, color, name, resp);
3826 } 3364 }
3827 break; 3365 break;
3366 case Rxvt_restoreFG:
3828 case XTerm_Color00: 3367 case XTerm_Color00:
3829 process_color_seq (op, Color_fg, str, resp); 3368 process_color_seq (op, Color_fg, str, resp);
3830 break; 3369 break;
3370 case Rxvt_restoreBG:
3831 case XTerm_Color01: 3371 case XTerm_Color01:
3832 process_color_seq (op, Color_bg, str, resp); 3372 process_color_seq (op, Color_bg, str, resp);
3833 break; 3373 break;
3834#ifndef NO_CURSORCOLOR 3374#ifndef NO_CURSORCOLOR
3835 case XTerm_Color_cursor: 3375 case XTerm_Color_cursor:
… …
3856 break; 3396 break;
3857 case URxvt_Color_IT: 3397 case URxvt_Color_IT:
3858 process_color_seq (op, Color_IT, str, resp); 3398 process_color_seq (op, Color_IT, str, resp);
3859 break; 3399 break;
3860#endif 3400#endif
3861#if TRANSPARENT && TINTING 3401#if ENABLE_TRANSPARENCY
3862 case URxvt_Color_tint: 3402 case URxvt_Color_tint:
3863 process_color_seq (op, Color_tint, str, resp); 3403 process_color_seq (op, Color_tint, str, resp);
3404 {
3405 bool changed = false;
3864 3406
3865 check_our_parents (); 3407 if (ISSET_PIXCOLOR (Color_tint))
3408 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3409 else
3410 changed = bgPixmap.unset_tint ();
3866 3411
3867 if (am_transparent) 3412 if (changed)
3868 want_full_refresh = want_refresh = 1; 3413 update_background ();
3414 }
3869 3415
3870 break; 3416 break;
3871#endif 3417#endif
3872 3418
3419#if BG_IMAGE_FROM_FILE
3873 case Rxvt_Pixmap: 3420 case Rxvt_Pixmap:
3874 { 3421 if (!strcmp (str, "?"))
3875 if (*str != ';')
3876 { 3422 {
3877#if XPM_BACKGROUND 3423 char str[256];
3878 scale_pixmap (""); /* reset to default scaling */ 3424
3879 set_bgPixmap (str); /* change pixmap */ 3425 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3880 scr_touch (true); 3426 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3881#endif 3427 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3428 process_xterm_seq (XTerm_title, str, CHAR_ST);
3882 } 3429 }
3883 3430 else
3431 {
3884 int changed = 0; 3432 int changed = 0;
3885 3433
3886 while ((str = strchr (str, ';')) != NULL) 3434 if (*str != ';')
3887 { 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 {
3888 str++; 3447 str++;
3889#if XPM_BACKGROUND 3448 if (bgPixmap.set_geometry (str))
3890 changed += scale_pixmap (str); 3449 changed++;
3891#endif 3450 str = strchr (str, ';');
3892 } 3451 }
3893 3452
3894 if (changed) 3453 if (changed)
3895 { 3454 update_background ();
3896#ifdef XPM_BACKGROUND
3897 resize_pixmap ();
3898 scr_touch (true);
3899#endif
3900 } 3455 }
3901 }
3902 break; 3456 break;
3903 3457#endif
3904 case Rxvt_restoreFG:
3905 set_window_color (Color_fg, str);
3906 break;
3907 case Rxvt_restoreBG:
3908 set_window_color (Color_bg, str);
3909 break;
3910 3458
3911 case XTerm_logfile: 3459 case XTerm_logfile:
3912 // TODO, when secure mode? 3460 // TODO, when secure mode?
3913 break; 3461 break;
3914 3462
… …
3932 case URxvt_italicFont: 3480 case URxvt_italicFont:
3933 case URxvt_boldItalicFont: 3481 case URxvt_boldItalicFont:
3934#endif 3482#endif
3935 if (query) 3483 if (query)
3936 tt_printf ("\33]%d;%-.250s%c", saveop, 3484 tt_printf ("\33]%d;%-.250s%c", saveop,
3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3485 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3938 ? fontset[op - URxvt_font]->fontdesc : "", 3486 ? fontset[op - URxvt_font]->fontdesc : "",
3939 resp); 3487 resp);
3940 else 3488 else
3941 { 3489 {
3942 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3490 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3956 break; 3504 break;
3957 3505
3958#if !ENABLE_MINIMAL 3506#if !ENABLE_MINIMAL
3959 case URxvt_locale: 3507 case URxvt_locale:
3960 if (query) 3508 if (query)
3961 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);
3962 else 3510 else
3963 { 3511 {
3964 set_locale (str); 3512 set_locale (str);
3965 pty->set_utf8_mode (enc_utf8); 3513 pty->set_utf8_mode (enc_utf8);
3966 init_xlocale (); 3514 init_xlocale ();
… …
3981 break; 3529 break;
3982#endif 3530#endif
3983 3531
3984#if ENABLE_PERL 3532#if ENABLE_PERL
3985 case URxvt_perl: 3533 case URxvt_perl:
3986 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)))
3987 ; // no responses yet 3535 ; // no responses yet
3988 break; 3536 break;
3989#endif 3537#endif
3990 } 3538 }
3991} 3539}
… …
4029{ 3577{
4030 unsigned int i, j; 3578 unsigned int i, j;
4031 int state; 3579 int state;
4032 3580
4033 static const struct 3581 static const struct
4034 { 3582 {
4035 const int argval; 3583 const int argval;
4036 const unsigned long bit; 3584 const unsigned long bit;
4037 }
4038
4039 argtopriv[] = { 3585 } argtopriv[] = {
4040 { 1, PrivMode_aplCUR }, 3586 { 1, PrivMode_aplCUR },
4041 { 2, PrivMode_vt52 }, 3587 { 2, PrivMode_vt52 },
4042 { 3, PrivMode_132 }, 3588 { 3, PrivMode_132 },
4043 { 4, PrivMode_smoothScroll }, 3589 { 4, PrivMode_smoothScroll },
4044 { 5, PrivMode_rVideo }, 3590 { 5, PrivMode_rVideo },
… …
4060 { 66, PrivMode_aplKP }, 3606 { 66, PrivMode_aplKP },
4061#ifndef NO_BACKSPACE_KEY 3607#ifndef NO_BACKSPACE_KEY
4062 { 67, PrivMode_BackSpace }, 3608 { 67, PrivMode_BackSpace },
4063#endif 3609#endif
4064 { 1000, PrivMode_MouseX11 }, 3610 { 1000, PrivMode_MouseX11 },
4065 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3611 { 1002, PrivMode_MouseBtnEvent },
4066 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3612 { 1003, PrivMode_MouseAnyEvent },
4067 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4068 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4069 { 1011, PrivMode_Keypress }, // rxvt extension 3614 { 1011, PrivMode_Keypress }, // rxvt extension
4070 // 1035 enable modifiers for alt, numlock NYI 3615 // 1035 enable modifiers for alt, numlock NYI
4071 // 1036 send ESC for meta keys NYI 3616 // 1036 send ESC for meta keys NYI
4072 // 1037 send DEL for keypad delete NYI 3617 // 1037 send DEL for keypad delete NYI
4073 { 1047, PrivMode_Screen }, 3618 { 1047, PrivMode_Screen },
4074 // 1048 save and restore cursor 3619 // 1048 save and restore cursor
4075 { 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 */
4076 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3621 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3622 { 2004, PrivMode_BracketPaste },
4077 }; 3623 };
4078 3624
4079 if (nargs == 0) 3625 if (nargs == 0)
4080 return; 3626 return;
4081 3627
… …
4107 scr_touch (true); 3653 scr_touch (true);
4108 break; 3654 break;
4109#endif 3655#endif
4110 case 1048: /* alternative cursor save */ 3656 case 1048: /* alternative cursor save */
4111 case 1049: 3657 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 3658 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 3659 if (mode == 0)
4114 scr_cursor (RESTORE); 3660 scr_cursor (RESTORE);
4115 else if (mode == 1) 3661 else if (mode == 1)
4116 scr_cursor (SAVE); 3662 scr_cursor (SAVE);
4117 break; 3663 break;
… …
4129 */ 3675 */
4130 PrivMode (1, PrivMode_vt52); 3676 PrivMode (1, PrivMode_vt52);
4131 break; 3677 break;
4132 case 3: /* 80/132 */ 3678 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 3679 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3683 }
4135 break; 3684 break;
4136 case 4: /* smooth scrolling */ 3685 case 4: /* smooth scrolling */
4137 set_option (Opt_jumpScroll, !state); 3686 set_option (Opt_jumpScroll, !state);
4138 break; 3687 break;
4139 case 5: /* reverse video */ 3688 case 5: /* reverse video */
… …
4146 scr_autowrap (state); 3695 scr_autowrap (state);
4147 break; 3696 break;
4148 /* 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 */
4149 case 9: /* X10 mouse reporting */ 3698 case 9: /* X10 mouse reporting */
4150 if (state) /* orthogonal */ 3699 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX11; 3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4152 break; 3701 break;
4153#ifdef scrollBar_esc 3702#ifdef scrollBar_esc
4154 case scrollBar_esc: 3703 case scrollBar_esc:
4155 if (scrollbar_mapping (state)) 3704 if (scrollbar_mapping (state))
4156 { 3705 {
… …
4169 break; 3718 break;
4170 /* case 66: - application key pad */ 3719 /* case 66: - application key pad */
4171 /* case 67: - backspace key */ 3720 /* case 67: - backspace key */
4172 case 1000: /* X11 mouse reporting */ 3721 case 1000: /* X11 mouse reporting */
4173 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4174 priv_modes &= ~PrivMode_MouseX10; 3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4175 break; 3724 break;
4176#if 0
4177 case 1001: 3725 case 1002:
4178 break; /* X11 mouse highlighting */ 3726 case 1003:
4179#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;
4180 case 1010: /* scroll to bottom on TTY output inhibit */ 3737 case 1010: /* scroll to bottom on TTY output inhibit */
4181 set_option (Opt_scrollTtyOutput, !state); 3738 set_option (Opt_scrollTtyOutput, !state);
4182 break; 3739 break;
4183 case 1011: /* scroll to bottom on key press */ 3740 case 1011: /* scroll to bottom on key press */
4184 set_option (Opt_scrollTtyKeypress, state); 3741 set_option (Opt_scrollTtyKeypress, state);
4185 break; 3742 break;
4186 case 1047: /* secondary screen w/ clearing last */ 3743 case 1047: /* secondary screen w/ clearing last */
4187 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4188 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4189 scr_erase_screen (2); 3746 scr_erase_screen (2);
4190 scr_change_screen (state); 3747 scr_change_screen (state);
4191 break; 3748 break;
4192 case 1049: /* secondary screen w/ clearing first */ 3749 case 1049: /* secondary screen w/ clearing first */
4193 scr_change_screen (state); 3750 scr_change_screen (state);
4194 if (OPTION (Opt_secondaryScreen)) 3751 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3752 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 3753 scr_erase_screen (2);
4197 break; 3754 break;
4198 default: 3755 default:
4199 break; 3756 break;
… …
4361rxvt_term::process_graphics () 3918rxvt_term::process_graphics ()
4362{ 3919{
4363 unicode_t ch, cmd = cmd_getc (); 3920 unicode_t ch, cmd = cmd_getc ();
4364 3921
4365 if (cmd == 'Q') 3922 if (cmd == 'Q')
3923 {
4366 { /* query graphics */ 3924 /* query graphics */
4367 tt_printf ("\033G0\012"); /* no graphics */ 3925 tt_printf ("\033G0\012"); /* no graphics */
4368 return; 3926 return;
4369 } 3927 }
4370 /* swallow other graphics sequences until terminating ':' */ 3928 /* swallow other graphics sequences until terminating ':' */
4371 do 3929 do
… …
4421 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4422 3980
4423 memcpy (v_buffer + v_buflen, data, len); 3981 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 3982 v_buflen += len;
4425 3983
4426 pty_ev.set (EVENT_READ | EVENT_WRITE); 3984 pty_ev.set (ev::READ | ev::WRITE);
4427} 3985}
4428 3986
4429void rxvt_term::pty_write () 3987void rxvt_term::pty_write ()
4430{ 3988{
4431 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));
… …
4436 3994
4437 if (v_buflen == 0) 3995 if (v_buflen == 0)
4438 { 3996 {
4439 free (v_buffer); 3997 free (v_buffer);
4440 v_buffer = 0; 3998 v_buffer = 0;
4441 v_buflen = 0;
4442 3999
4443 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4444 return; 4001 return;
4445 } 4002 }
4446 4003
4447 memmove (v_buffer, v_buffer + written, v_buflen); 4004 memmove (v_buffer, v_buffer + written, v_buflen);
4448 } 4005 }
4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4006 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4450 pty_ev.set (EVENT_READ); 4007 pty_ev.set (ev::READ);
4451} 4008}
4452 4009
4453/*----------------------- end-of-file (C source) -----------------------*/ 4010/*----------------------- end-of-file (C source) -----------------------*/
4454 4011

Diff Legend

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