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.323 by ayin, Mon May 28 18:38:03 2007 UTC vs.
Revision 1.381 by root, Fri Dec 14 05:25:23 2007 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 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
94 XK_ISO_Left_Tab, 0x21e6, 94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
97 97
98 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
… …
519# endif 518# endif
520 return; 519 return;
521 } 520 }
522 else 521 else
523 { 522 {
524# if ENABLE_OVERLAY 523# if ISO_14755
525 scr_overlay_off (); 524 scr_overlay_off ();
526# endif 525# endif
527 iso14755buf = 0; 526 iso14755buf = 0;
528 } 527 }
529 } 528 }
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
533 { 532 {
534 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 534# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 537# endif
539 } 538 }
540#endif 539#endif
541 540
542#ifdef PRINTPIPE 541#ifdef PRINTPIPE
543 if (keysym == XK_Print) 542 if (keysym == XK_Print)
544 { 543 {
545 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
546 return; 545 return;
… …
548#endif 547#endif
549 548
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 550 {
552 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
554 switch (keysym) 584 switch (keysym)
555 { 585 {
556#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace: 587 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
563 } 593 }
564 else 594 else
565 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
566 break; 596 break;
567#endif 597#endif
568#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete: 599 case XK_Delete:
580 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
581 break; 601 break;
582#endif 602#endif
583 case XK_Tab: 603 case XK_Tab:
584 if (shft) 604 if (shft)
585 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
595#endif 615#endif
596 newlen = 0; 616 newlen = 0;
597 } 617 }
598 break; 618 break;
599 619
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
630 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
632 break; 636 break;
633 637
634#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior: 639 case XK_Prior:
646 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
647 break; 641 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next: 642 case XK_Next:
659 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
660 break; 644 break;
661#endif 645#endif
662 case XK_KP_Enter: 646 case XK_KP_Enter:
663 /* allow shift to override */ 647 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
665 { 649 {
666 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
667 break; 651 break;
668 } 652 }
669 653
… …
681 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
682 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
683 } 667 }
684 break; 668 break;
685 669
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
712 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */ 694 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
718 { 696 {
719 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
721 } 699 }
722 else 700 else
… …
728 706
729 case XK_Find: 707 case XK_Find:
730 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
731 break; 709 break;
732 710
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert: 711 case XK_Insert:
744 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
745 break; 713 break;
746#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove: 715 case DXK_Remove:
… …
751 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
752 break; 720 break;
753 case XK_Select: 721 case XK_Select:
754 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
755 break; 723 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End: 724 case XK_End:
767 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
768 break; 726 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home: 727 case XK_Home:
780 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
781 break; 729 break;
782 730
783#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
934#if ENABLE_FRILLS || ISO_14755 882#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 883 // ISO 14755 support
936 if (iso14755buf) 884 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 885 if (iso14755buf & ISO_14755_52)
938 { 886 {
939# if ENABLE_OVERLAY 887# if ISO_14755
940 scr_overlay_off (); 888 scr_overlay_off ();
941# endif 889# endif
942# if ISO_14755 890# if ISO_14755
943 // iso14755 part 5.2 handling: release time 891 // iso14755 part 5.2 handling: release time
944 // first: controls 892 // first: controls
… …
967 915
968 return; 916 return;
969 } 917 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 919 {
972# if ENABLE_OVERLAY 920# if ISO_14755
973 scr_overlay_off (); 921 scr_overlay_off ();
974# endif 922# endif
975 if (iso14755buf & ISO_14755_51) 923 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 924 commit_iso14755 ();
977#if ISO_14755 925#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED) 926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 { 927 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981 929
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1035void 983void
1036rxvt_term::flush () 984rxvt_term::flush ()
1037{ 985{
1038 flush_ev.stop (); 986 flush_ev.stop ();
1039 987
1040#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
1042 { 990 {
1043 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 992 scr_touch (false);
1046 } 993 }
1047#endif 994#endif
1048 995
1049 if (want_refresh) 996 if (want_refresh)
… …
1094 } 1041 }
1095 1042
1096 display->flush (); 1043 display->flush ();
1097} 1044}
1098 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1099void 1047void
1100rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1049{
1050 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1052}
1053
1054void
1055rxvt_term::flush_cb (ev::timer &w, int revents)
1101{ 1056{
1102 make_current (); 1057 make_current ();
1103 1058
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_limit = 1;
1116 refresh_count = 0; 1059 refresh_count = 0;
1117 flush (); 1060 flush ();
1118} 1061}
1119 1062
1120#ifdef CURSOR_BLINK 1063#ifdef CURSOR_BLINK
1121void 1064void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1066{
1124 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1068 want_refresh = 1;
1126 1069 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1070}
1129#endif 1071#endif
1130 1072
1131#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
1132void 1074void
1133rxvt_term::text_blink_cb (time_watcher &w) 1075rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1076{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1078 {
1137 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1138 want_refresh = 1; 1080 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1081 refresh_check ();
1140 } 1082 }
1083 else
1084 w.stop ();
1141} 1085}
1142#endif 1086#endif
1143 1087
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1089void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1091{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollbar_isUp () || scrollbar_isDn ())
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1150 { 1094 {
1151 want_refresh = 1; 1095 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1153 } 1097 }
1098 else
1099 w.stop ();
1154} 1100}
1155#endif 1101#endif
1156 1102
1157#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1158void 1104void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1106{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1108 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1110 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1166 } 1112 }
1113 else
1114 w.stop ();
1167} 1115}
1168#endif 1116#endif
1169 1117
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1119void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1121{
1174 if (mouse_slip_wheel_speed == 0 1122 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1123 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1124 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1125 refresh_check ();
1126 }
1127
1128 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1129 {
1130 mouse_slip_wheel_speed = 0;
1131 w.stop ();
1183 } 1132 }
1184} 1133}
1185#endif 1134#endif
1186 1135
1187#if LINUX_YIELD_HACK 1136#if LINUX_YIELD_HACK
1188static struct event_handler 1137static struct event_handler
1189{ 1138{
1190 check_watcher yield_ev; 1139 ev::prepare yield_ev;
1191 1140
1192 void yield_cb (check_watcher &w) 1141 void yield_cb (ev::prepare &w, int revents)
1193 { 1142 {
1194 // this should really be sched_yield(), but the linux guys thought 1143 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1144 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is 1145 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS. 1146 // allowed by the sus... as is returning ENOSYS.
… …
1243 pty_ev.stop (); 1192 pty_ev.stop ();
1244 1193
1245 if (!option (Opt_hold)) 1194 if (!option (Opt_hold))
1246 destroy (); 1195 destroy ();
1247 } 1196 }
1248 1197
1249 return false; 1198 return false;
1250} 1199}
1251 1200
1252void 1201void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1202rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1203{
1255 make_current (); 1204 make_current ();
1256 1205
1257 if (revents & EVENT_READ) 1206 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1207 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1208 while (pty_fill ())
1260 if (cmd_parse ()) 1209 if (cmd_parse ())
1261 break; 1210 break;
1262 1211
1263 if (revents & EVENT_WRITE) 1212 if (revents & ev::WRITE)
1264 pty_write (); 1213 pty_write ();
1265} 1214}
1266 1215
1267void 1216void
1268rxvt_term::pointer_unblank () 1217rxvt_term::pointer_unblank ()
… …
1272 1221
1273#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1223 hidden_pointer = 0;
1275 1224
1276 if (option (Opt_pointerBlank)) 1225 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1226 pointer_ev.start (pointerBlankDelay);
1278#endif 1227#endif
1279} 1228}
1280 1229
1281#ifdef POINTER_BLANK 1230#ifdef POINTER_BLANK
1282void 1231void
… …
1290 1239
1291 hidden_pointer = 1; 1240 hidden_pointer = 1;
1292} 1241}
1293 1242
1294void 1243void
1295rxvt_term::pointer_cb (time_watcher &w) 1244rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1245{
1297 make_current (); 1246 make_current ();
1298 1247
1299 pointer_blank (); 1248 pointer_blank ();
1300} 1249}
… …
1303void 1252void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1253rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1254{
1306 int button_number, key_state = 0; 1255 int button_number, key_state = 0;
1307 int x, y; 1256 int x, y;
1257 int code = 32;
1308 1258
1309 x = ev.x; 1259 x = Pixel2Col (ev.x);
1310 y = ev.y; 1260 y = Pixel2Row (ev.y);
1311 pixel_position (&x, &y); 1261 if (ev.type == MotionNotify)
1262 {
1263 if (x == mouse_row && y == mouse_col)
1264 return;
1265 mouse_row = x;
1266 mouse_col = y;
1267 code += 32;
1268 }
1312 1269
1313 if (MEvent.button == AnyButton) 1270 if (MEvent.button == AnyButton)
1314 button_number = 3; 1271 button_number = 3;
1315 else 1272 else
1316 { 1273 {
… …
1362 x + 1, 1319 x + 1,
1363 y + 1); 1320 y + 1);
1364#endif 1321#endif
1365 1322
1366 tt_printf ("\033[M%c%c%c", 1323 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1324 (code + button_number + key_state),
1368 (32 + x + 1), 1325 (32 + x + 1),
1369 (32 + y + 1)); 1326 (32 + y + 1));
1370} 1327}
1371 1328
1372/*{{{ process an X event */ 1329/*{{{ process an X event */
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1391 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1392 focus_out ();
1436 } 1393 }
1437#endif 1394#endif
1438 } 1395 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1396 break;
1444 1397
1445 /* 1398 /*
1446 * XXX: this is not the _current_ arrangement 1399 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1400 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1433 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1434 focus_out ();
1482 break; 1435 break;
1483 1436
1484 case ConfigureNotify: 1437 case ConfigureNotify:
1438 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1439 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1440 szHint.width, szHint.height); */
1485 if (ev.xconfigure.window == parent[0]) 1441 if (ev.xconfigure.window == parent[0])
1486 { 1442 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1443 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1444 ;
1489 1445
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1446 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1447 {
1492 seen_resize = 1; 1448 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1449 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494 } 1450 }
1495 1451 else
1452 {
1453#ifdef HAVE_BG_PIXMAP
1454 if (bgPixmap.window_position_sensitive ())
1455 update_background ();
1456#endif
1457 }
1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1497
1498#ifdef TRANSPARENT
1499 if (option (Opt_transparent))
1500 check_our_parents ();
1501#endif
1502 } 1459 }
1503 break; 1460 break;
1504 1461
1505 case PropertyNotify: 1462 case PropertyNotify:
1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1524 break; 1481 break;
1525 1482
1526 case MapNotify: 1483 case MapNotify:
1527 mapped = 1; 1484 mapped = 1;
1528#ifdef TEXT_BLINK 1485#ifdef TEXT_BLINK
1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1486 text_blink_ev.start ();
1530#endif 1487#endif
1531 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 break; 1489 break;
1533 1490
1534 case UnmapNotify: 1491 case UnmapNotify:
… …
1536#ifdef TEXT_BLINK 1493#ifdef TEXT_BLINK
1537 text_blink_ev.stop (); 1494 text_blink_ev.stop ();
1538#endif 1495#endif
1539 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1496 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break; 1497 break;
1541
1542#ifdef TRANSPARENT
1543 case ReparentNotify:
1544 rootwin_cb (ev);
1545 break;
1546#endif /* TRANSPARENT */
1547 1498
1548 case GraphicsExpose: 1499 case GraphicsExpose:
1549 case Expose: 1500 case Expose:
1550 if (ev.xany.window == vt) 1501 if (ev.xany.window == vt)
1551 { 1502 {
1552 do 1503 do
1504 {
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1507 }
1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1508 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1556 1509
1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1558 1511
1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1513 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1562 1517
1563 want_refresh = 1; 1518 want_refresh = 1;
1564 } 1519 }
1565 else 1520 else
1566 { 1521 {
… …
1574 if (isScrollbarWindow (ev.xany.window)) 1529 if (isScrollbarWindow (ev.xany.window))
1575 { 1530 {
1576 scrollBar.setIdle (); 1531 scrollBar.setIdle ();
1577 scrollbar_show (0); 1532 scrollbar_show (0);
1578 } 1533 }
1579
1580#ifdef TRANSPARENT
1581 if (am_transparent && ev.xany.window == parent[0])
1582 XClearWindow (dpy, ev.xany.window);
1583#endif
1584 } 1534 }
1585 break; 1535 break;
1586 1536
1587 case MotionNotify: 1537 case MotionNotify:
1588#ifdef POINTER_BLANK 1538#ifdef POINTER_BLANK
1589 if (hidden_pointer) 1539 if (hidden_pointer)
1590 pointer_unblank (); 1540 pointer_unblank ();
1591#endif 1541#endif
1542 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1543 || priv_modes & PrivMode_MouseAnyEvent)
1544 mouse_report (ev.xbutton);
1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1593 break; 1546 break;
1594 1547
1595 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1596 { 1549 {
… …
1630 int dist; 1583 int dist;
1631 1584
1632 /* don't clobber the current delay if we are 1585 /* don't clobber the current delay if we are
1633 * already in the middle of scrolling. 1586 * already in the middle of scrolling.
1634 */ 1587 */
1635 if (!sel_scroll_ev.active) 1588 if (!sel_scroll_ev.is_active ())
1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1589 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1637 1590
1638 /* save the event params so we can highlight 1591 /* save the event params so we can highlight
1639 * the selection in the pending-scroll loop 1592 * the selection in the pending-scroll loop
1640 */ 1593 */
1641 selection_save_x = ev.xbutton.x; 1594 selection_save_x = ev.xbutton.x;
… …
1663 else 1616 else
1664 { 1617 {
1665 /* we are within the text window, so we 1618 /* we are within the text window, so we
1666 * shouldn't be scrolling 1619 * shouldn't be scrolling
1667 */ 1620 */
1668 if (sel_scroll_ev.active)
1669 sel_scroll_ev.stop(); 1621 sel_scroll_ev.stop();
1670 } 1622 }
1671#endif 1623#endif
1672#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1673 } 1625 }
1674#endif 1626#endif
… …
1686 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1639 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1641 scrollbar_size ());
1690 want_refresh = 1; 1642 want_refresh = 1;
1691 refresh_limit = 0;
1692 scrollbar_show (1); 1643 scrollbar_show (1);
1693 } 1644 }
1694 break; 1645 break;
1695 } 1646 }
1696 1647
… …
1701 { 1652 {
1702 hidden_cursor = 0; 1653 hidden_cursor = 0;
1703 want_refresh = 1; 1654 want_refresh = 1;
1704 } 1655 }
1705 1656
1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1657 cursor_blink_ev.again ();
1707 } 1658 }
1708#endif 1659#endif
1709 1660
1710#if defined(POINTER_BLANK) 1661#if defined(POINTER_BLANK)
1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1662 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1718 1669
1719 if (ev.type == KeyPress && hidden_pointer == 0) 1670 if (ev.type == KeyPress && hidden_pointer == 0)
1720 pointer_blank (); 1671 pointer_blank ();
1721 } 1672 }
1722#endif 1673#endif
1674
1675 refresh_check ();
1723} 1676}
1724 1677
1725void 1678void
1726rxvt_term::focus_in () 1679rxvt_term::focus_in ()
1727{ 1680{
… …
1739 XSetICFocus (Input_Context); 1692 XSetICFocus (Input_Context);
1740 } 1693 }
1741#endif 1694#endif
1742#if CURSOR_BLINK 1695#if CURSOR_BLINK
1743 if (option (Opt_cursorBlink)) 1696 if (option (Opt_cursorBlink))
1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1697 cursor_blink_ev.again ();
1745#endif 1698#endif
1746#if OFF_FOCUS_FADING 1699#if OFF_FOCUS_FADING
1747 if (rs[Rs_fade]) 1700 if (rs[Rs_fade])
1748 { 1701 {
1749 pix_colors = pix_colors_focused; 1702 pix_colors = pix_colors_focused;
… …
1751 } 1704 }
1752#endif 1705#endif
1753#if ENABLE_FRILLS 1706#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell)) 1707 if (option (Opt_urgentOnBell))
1755 { 1708 {
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]); 1709 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1759 if (h != NULL)
1760 { 1710 {
1761 h->flags &= ~XUrgencyHint; 1711 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h); 1712 XSetWMHints (dpy, parent[0], h);
1763 } 1713 }
1764 } 1714 }
1765#endif 1715#endif
1766 } 1716 }
1767} 1717}
… …
1778 1728
1779#if ENABLE_FRILLS || ISO_14755 1729#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf) 1730 if (iso14755buf)
1781 { 1731 {
1782 iso14755buf = 0; 1732 iso14755buf = 0;
1783# if ENABLE_OVERLAY 1733# if ISO_14755
1784 scr_overlay_off (); 1734 scr_overlay_off ();
1785# endif 1735# endif
1786 } 1736 }
1787#endif 1737#endif
1788#if USE_XIM 1738#if USE_XIM
… …
1790 XUnsetICFocus (Input_Context); 1740 XUnsetICFocus (Input_Context);
1791#endif 1741#endif
1792#if CURSOR_BLINK 1742#if CURSOR_BLINK
1793 if (option (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1794 cursor_blink_ev.stop (); 1744 cursor_blink_ev.stop ();
1745
1795 hidden_cursor = 0; 1746 hidden_cursor = 0;
1796#endif 1747#endif
1797#if OFF_FOCUS_FADING 1748#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade]) 1749 if (rs[Rs_fade])
1799 { 1750 {
… …
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1766 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 } 1767 }
1817#endif 1768#endif
1818} 1769}
1819 1770
1820#if TRANSPARENT || ENABLE_PERL 1771#if ENABLE_TRANSPARENCY || ENABLE_PERL
1821void 1772void
1822rxvt_term::rootwin_cb (XEvent &ev) 1773rxvt_term::rootwin_cb (XEvent &ev)
1823{ 1774{
1824 make_current (); 1775 make_current ();
1825 1776
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1777 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1778 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return; 1779 return;
1829 1780
1830# if TRANSPARENT 1781# if ENABLE_TRANSPARENCY
1831 switch (ev.type) 1782 switch (ev.type)
1832 { 1783 {
1833 case PropertyNotify: 1784 case PropertyNotify:
1834 /* 1785 /*
1835 * if user used some Esetroot compatible prog to set the root bg, 1786 * if user used some Esetroot compatible prog to set the root bg,
1836 * use the property to determine the pixmap. We use it later on. 1787 * use the property to determine the pixmap. We use it later on.
1837 */ 1788 */
1838 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1789 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1790 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1840 return; 1791 {
1841 1792 bgPixmap.set_root_pixmap ();
1842 /* FALLTHROUGH */ 1793 update_background ();
1843 case ReparentNotify: 1794 }
1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1845 want_refresh = want_full_refresh = 1;
1846 break; 1795 break;
1847 } 1796 }
1848# endif 1797# endif
1798
1799 refresh_check ();
1849} 1800}
1850#endif 1801#endif
1851 1802
1852void 1803void
1853rxvt_term::button_press (XButtonEvent &ev) 1804rxvt_term::button_press (XButtonEvent &ev)
… …
1908 mouse_report (ev); 1859 mouse_report (ev);
1909 } 1860 }
1910#else 1861#else
1911 MEvent.button = ev.button; 1862 MEvent.button = ev.button;
1912 mouse_report (ev); 1863 mouse_report (ev);
1913#endif /* MOUSE_REPORT_DOUBLECLICK */ 1864#endif /* MOUSE_REPORT_DOUBLECLICK */
1914 1865
1915 } 1866 }
1916 else 1867 else
1917 { 1868 {
1918 if (ev.button != MEvent.button) 1869 if (ev.button != MEvent.button)
… …
2012 tt_printf ("\033[5~"); 1963 tt_printf ("\033[5~");
2013 break; 1964 break;
2014 } 1965 }
2015 } 1966 }
2016 else 1967 else
2017#endif /* NO_SCROLLBAR_REPORT */ 1968#endif /* NO_SCROLLBAR_REPORT */
2018 1969
2019 { 1970 {
2020 char upordown = 0; 1971 char upordown = 0;
2021 1972
2022 if (scrollBar.style == R_SB_NEXT) 1973 if (scrollBar.style == R_SB_NEXT)
2023 { 1974 {
2024 if (scrollbarnext_upButton (ev.y)) 1975 if (scrollbarnext_upButton (ev.y))
2025 upordown = -1; /* up */ 1976 upordown = -1; /* up */
… …
2031 if (scrollbarrxvt_upButton (ev.y)) 1982 if (scrollbarrxvt_upButton (ev.y))
2032 upordown = -1; /* up */ 1983 upordown = -1; /* up */
2033 else if (scrollbarrxvt_dnButton (ev.y)) 1984 else if (scrollbarrxvt_dnButton (ev.y))
2034 upordown = 1; /* down */ 1985 upordown = 1; /* down */
2035 } 1986 }
1987
2036 if (upordown) 1988 if (upordown)
2037 { 1989 {
2038#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1990#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1991 if (!cont_scroll_ev.is_active ())
2039 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1992 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2040#endif 1993#endif
2041 if (scr_page (upordown < 0 ? UP : DN, 1)) 1994 if (scr_page (upordown < 0 ? UP : DN, 1))
2042 { 1995 {
2043 if (upordown < 0) 1996 if (upordown < 0)
2044 scrollBar.setUp (); 1997 scrollBar.setUp ();
… …
2124 scrollBar.setIdle (); 2077 scrollBar.setIdle ();
2125 scrollbar_show (0); 2078 scrollbar_show (0);
2126 } 2079 }
2127 2080
2128#ifdef SELECTION_SCROLLING 2081#ifdef SELECTION_SCROLLING
2129 if (sel_scroll_ev.active)
2130 sel_scroll_ev.stop(); 2082 sel_scroll_ev.stop();
2131#endif 2083#endif
2132 2084
2133 if (ev.window == vt) 2085 if (ev.window == vt)
2134 { 2086 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2087 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2159 mouse_report (ev); 2111 mouse_report (ev);
2160 } 2112 }
2161#else /* MOUSE_REPORT_DOUBLECLICK */ 2113#else /* MOUSE_REPORT_DOUBLECLICK */
2162 MEvent.button = AnyButton; 2114 MEvent.button = AnyButton;
2163 mouse_report (ev); 2115 mouse_report (ev);
2164#endif /* MOUSE_REPORT_DOUBLECLICK */ 2116#endif /* MOUSE_REPORT_DOUBLECLICK */
2165 return; 2117 return;
2166 } 2118 }
2167 2119
2168 /* 2120 /*
2169 * dumb hack to compensate for the failure of click-and-drag 2121 * dumb hack to compensate for the failure of click-and-drag
… …
2207 { 2159 {
2208 mouse_slip_wheel_speed += v ? -1 : 1; 2160 mouse_slip_wheel_speed += v ? -1 : 1;
2209 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2161 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2162 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2211 2163
2212 if (slip_wheel_ev.at < NOW) 2164 if (!slip_wheel_ev.is_active ())
2213 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2165 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2214
2215 slip_wheel_ev.start ();
2216 } 2166 }
2217 else 2167 else
2218 { 2168 {
2219# endif 2169# endif
2220 scr_page (v, i); 2170 scr_page (v, i);
… …
2226 break; 2176 break;
2227#endif 2177#endif
2228 } 2178 }
2229 } 2179 }
2230} 2180}
2231
2232#ifdef TRANSPARENT
2233#if TINTING
2234/* taken from aterm-0.4.2 */
2235
2236typedef uint32_t RUINT32T;
2237
2238void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2239{
2240 int sh_r, sh_g, sh_b;
2241 RUINT32T mask_r, mask_g, mask_b;
2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2245 int i;
2246
2247 Visual *visual = term->visual;
2248
2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2250
2251 /* for convenience */
2252 mask_r = visual->red_mask;
2253 mask_g = visual->green_mask;
2254 mask_b = visual->blue_mask;
2255
2256 /* boring lookup table pre-initialization */
2257 switch (srcImage->bits_per_pixel) {
2258 case 15:
2259 if ((mask_r != 0x7c00) ||
2260 (mask_g != 0x03e0) ||
2261 (mask_b != 0x001f))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2264 lookup_r = lookup;
2265 lookup_g = lookup+32;
2266 lookup_b = lookup+32+32;
2267 sh_r = 10;
2268 sh_g = 5;
2269 sh_b = 0;
2270 break;
2271 case 16:
2272 if ((mask_r != 0xf800) ||
2273 (mask_g != 0x07e0) ||
2274 (mask_b != 0x001f))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2277 lookup_r = lookup;
2278 lookup_g = lookup+32;
2279 lookup_b = lookup+32+64;
2280 sh_r = 11;
2281 sh_g = 5;
2282 sh_b = 0;
2283 break;
2284 case 24:
2285 if ((mask_r != 0xff0000) ||
2286 (mask_g != 0x00ff00) ||
2287 (mask_b != 0x0000ff))
2288 return;
2289 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2290 lookup_r = lookup;
2291 lookup_g = lookup+256;
2292 lookup_b = lookup+256+256;
2293 sh_r = 16;
2294 sh_g = 8;
2295 sh_b = 0;
2296 break;
2297 case 32:
2298 if ((mask_r != 0xff0000) ||
2299 (mask_g != 0x00ff00) ||
2300 (mask_b != 0x0000ff))
2301 return;
2302 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2303 lookup_r = lookup;
2304 lookup_g = lookup+256;
2305 lookup_b = lookup+256+256;
2306 sh_r = 16;
2307 sh_g = 8;
2308 sh_b = 0;
2309 break;
2310 default:
2311 return; /* we do not support this color depth */
2312 }
2313
2314 /* prepare limits for color transformation (each channel is handled separately) */
2315 if (shade < 0) {
2316 shade = -shade;
2317 if (shade < 0) shade = 0;
2318 if (shade > 100) shade = 100;
2319
2320 lower_lim_r = 65535-rm;
2321 lower_lim_g = 65535-gm;
2322 lower_lim_b = 65535-bm;
2323
2324 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2325 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2326 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2327
2328 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2329 } else {
2330 if (shade < 0) shade = 0;
2331 if (shade > 100) shade = 100;
2332
2333 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2334
2335 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2336 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2337 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2338 }
2339
2340 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2341 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2342 {
2343 unsigned int tmp;
2344
2345 tmp = lower_lim_r;
2346 lower_lim_r = lower_lim_b;
2347 lower_lim_b = tmp;
2348
2349 tmp = upper_lim_r;
2350 upper_lim_r = upper_lim_b;
2351 upper_lim_b = tmp;
2352 }
2353
2354 /* fill our lookup tables */
2355 for (i = 0; i <= mask_r>>sh_r; i++)
2356 {
2357 RUINT32T tmp;
2358 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2359 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2360 lookup_r[i] = (tmp/65535)<<sh_r;
2361 }
2362 for (i = 0; i <= mask_g>>sh_g; i++)
2363 {
2364 RUINT32T tmp;
2365 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2366 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2367 lookup_g[i] = (tmp/65535)<<sh_g;
2368 }
2369 for (i = 0; i <= mask_b>>sh_b; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2373 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2374 lookup_b[i] = (tmp/65535)<<sh_b;
2375 }
2376
2377 /* apply table to input image (replacing colors by newly calculated ones) */
2378 switch (srcImage->bits_per_pixel)
2379 {
2380 case 15:
2381 {
2382 unsigned short *p1, *pf, *p, *pl;
2383 p1 = (unsigned short *) srcImage->data;
2384 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2385 while (p1 < pf)
2386 {
2387 p = p1;
2388 pl = p1 + srcImage->width;
2389 for (; p < pl; p++)
2390 {
2391 *p = lookup_r[(*p & 0x7c00)>>10] |
2392 lookup_g[(*p & 0x03e0)>> 5] |
2393 lookup_b[(*p & 0x001f)];
2394 }
2395 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2396 }
2397 break;
2398 }
2399 case 16:
2400 {
2401 unsigned short *p1, *pf, *p, *pl;
2402 p1 = (unsigned short *) srcImage->data;
2403 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2404 while (p1 < pf)
2405 {
2406 p = p1;
2407 pl = p1 + srcImage->width;
2408 for (; p < pl; p++)
2409 {
2410 *p = lookup_r[(*p & 0xf800)>>11] |
2411 lookup_g[(*p & 0x07e0)>> 5] |
2412 lookup_b[(*p & 0x001f)];
2413 }
2414 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2415 }
2416 break;
2417 }
2418 case 24:
2419 {
2420 unsigned char *p1, *pf, *p, *pl;
2421 p1 = (unsigned char *) srcImage->data;
2422 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2423 while (p1 < pf)
2424 {
2425 p = p1;
2426 pl = p1 + srcImage->width * 3;
2427 for (; p < pl; p += 3)
2428 {
2429 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2430 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2431 p[2] = lookup_r[(p[2] & 0x0000ff)];
2432 }
2433 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2434 }
2435 break;
2436 }
2437 case 32:
2438 {
2439 RUINT32T *p1, *pf, *p, *pl;
2440 p1 = (RUINT32T *) srcImage->data;
2441 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2442
2443 while (p1 < pf)
2444 {
2445 p = p1;
2446 pl = p1 + srcImage->width;
2447 for (; p < pl; p++)
2448 {
2449 *p = lookup_r[(*p & 0xff0000)>>16] |
2450 lookup_g[(*p & 0x00ff00)>> 8] |
2451 lookup_b[(*p & 0x0000ff)] |
2452 (*p & ~0xffffff);
2453 }
2454 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2455 }
2456 break;
2457 }
2458 }
2459
2460 free (lookup);
2461}
2462#endif
2463
2464/*
2465 * Check our parents are still who we think they are.
2466 * Do transparency updates if required
2467 */
2468int
2469rxvt_term::check_our_parents ()
2470{
2471 int i, pchanged, aformat, have_pixmap, rootdepth;
2472 unsigned long nitems, bytes_after;
2473 Atom atype;
2474 unsigned char *prop = NULL;
2475 Window root, oldp, *list;
2476 Pixmap rootpixmap = None;
2477 XWindowAttributes wattr, wrootattr;
2478
2479 pchanged = 0;
2480
2481 if (!option (Opt_transparent))
2482 return pchanged; /* Don't try any more */
2483
2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2485 rootdepth = wrootattr.depth;
2486
2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2488
2489 if (rootdepth != wattr.depth)
2490 {
2491 if (am_transparent)
2492 {
2493 pchanged = 1;
2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2495 am_transparent = am_pixmap_trans = 0;
2496 }
2497
2498 return pchanged; /* Don't try any more */
2499 }
2500
2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2502 XSync (dpy, False);
2503
2504 /*
2505 * Make the frame window set by the window manager have
2506 * the root background. Some window managers put multiple nested frame
2507 * windows for each client, so we have to take care about that.
2508 */
2509 i = (xa[XA_XROOTPMAP_ID]
2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2512 &nitems, &bytes_after, &prop) == Success);
2513
2514 if (!i || prop == NULL)
2515 i = (xa[XA_ESETROOT_PMAP_ID]
2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2518 &nitems, &bytes_after, &prop) == Success);
2519
2520 if (!i || prop == NULL
2521#if TINTING
2522 || !ISSET_PIXCOLOR (Color_tint)
2523#endif
2524 )
2525 have_pixmap = 0;
2526 else
2527 {
2528 have_pixmap = 1;
2529 rootpixmap = *(Pixmap *)prop;
2530 XFree (prop);
2531 }
2532
2533 if (have_pixmap)
2534 {
2535 /*
2536 * Copy display->root pixmap transparency
2537 */
2538 int sx, sy, nx, ny;
2539 unsigned int nw, nh;
2540 Window cr;
2541 XImage *image;
2542 GC gc;
2543 XGCValues gcvalue;
2544
2545 XTranslateCoordinates (dpy, parent[0], display->root,
2546 0, 0, &sx, &sy, &cr);
2547 nw = (unsigned int)szHint.width;
2548 nh = (unsigned int)szHint.height;
2549 nx = ny = 0;
2550
2551 if (sx < 0)
2552 {
2553 nw += sx;
2554 nx = -sx;
2555 sx = 0;
2556 }
2557
2558 if (sy < 0)
2559 {
2560 nh += sy;
2561 ny = -sy;
2562 sy = 0;
2563 }
2564
2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2567
2568 XSync (dpy, False);
2569 allowedxerror = -1;
2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2571
2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2573 /* XXX: may need a delay here? */
2574 allowedxerror = 0;
2575
2576 if (image == NULL)
2577 {
2578 if (am_transparent && am_pixmap_trans)
2579 {
2580 pchanged = 1;
2581 if (pixmap != None)
2582 {
2583 XFreePixmap (dpy, pixmap);
2584 pixmap = None;
2585 }
2586 }
2587
2588 am_pixmap_trans = 0;
2589 }
2590 else
2591 {
2592 if (pixmap != None)
2593 XFreePixmap (dpy, pixmap);
2594
2595#if TINTING
2596 if (ISSET_PIXCOLOR (Color_tint))
2597 {
2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2599
2600 rgba c;
2601 pix_colors_focused [Color_tint].get (c);
2602
2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2604 }
2605#endif
2606
2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2610 nx, ny, image->width, image->height);
2611 XFreeGC (dpy, gc);
2612 XDestroyImage (image);
2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2614 XClearWindow (dpy, parent[0]);
2615
2616 if (!am_transparent || !am_pixmap_trans)
2617 pchanged = 1;
2618
2619 am_transparent = am_pixmap_trans = 1;
2620 }
2621 }
2622
2623 if (am_pixmap_trans)
2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2625 else
2626 {
2627 unsigned int n;
2628 /*
2629 * InheritPixmap transparency
2630 */
2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2632 {
2633 oldp = parent[i];
2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2635 XFree (list);
2636
2637 if (parent[i] == display->root)
2638 {
2639 if (oldp != None)
2640 pchanged = 1;
2641
2642 break;
2643 }
2644
2645 if (oldp != parent[i])
2646 pchanged = 1;
2647 }
2648
2649 n = 0;
2650
2651 if (pchanged)
2652 for (; n < (unsigned int)i; n++)
2653 {
2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2657 {
2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2659 break;
2660 }
2661 }
2662
2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2664 {
2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2667 am_transparent = 0;
2668 /* XXX: also turn off Opt_transparent? */
2669 }
2670 else
2671 {
2672 for (n = 0; n < (unsigned int)i; n++)
2673 {
2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2675 XClearWindow (dpy, parent[n]);
2676 }
2677
2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2679 am_transparent = 1;
2680 }
2681
2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2683 parent[i] = None;
2684 }
2685
2686 if (scrollBar.win)
2687 {
2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2689 scrollBar.setIdle ();
2690 scrollbar_show (0);
2691 }
2692
2693 if (am_transparent)
2694 {
2695 want_refresh = want_full_refresh = 1;
2696 if (am_pixmap_trans)
2697 flush ();
2698 }
2699
2700 return pchanged;
2701}
2702#endif
2703 2181
2704/*}}} */ 2182/*}}} */
2705 2183
2706bool 2184bool
2707rxvt_term::cmd_parse () 2185rxvt_term::cmd_parse ()
… …
2756 if (ch == C0_LF) 2234 if (ch == C0_LF)
2757 nlines++; 2235 nlines++;
2758 2236
2759 refresh_count++; 2237 refresh_count++;
2760 2238
2761 if (!option (Opt_jumpScroll) 2239 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2763 { 2240 {
2764 refreshnow = true;
2765 refresh_count = 0; 2241 refresh_count = 0;
2242
2243 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2244 {
2245 refreshnow = true;
2766 ch = NOCHAR; 2246 ch = NOCHAR;
2767 break; 2247 break;
2248 }
2768 } 2249 }
2769 2250
2770 // scr_add_lines only works for nlines <= nrow - 1. 2251 // scr_add_lines only works for nlines <= nrow - 1.
2771 if (nlines >= nrow - 1) 2252 if (nlines >= nrow - 1)
2772 { 2253 {
… …
2800 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2281 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2801 scr_add_lines (buf, str - buf, nlines); 2282 scr_add_lines (buf, str - buf, nlines);
2802 2283
2803 /* 2284 /*
2804 * If there have been a lot of new lines, then update the screen 2285 * If there have been a lot of new lines, then update the screen
2805 * What the heck I'll cheat and only refresh less than every page-full. 2286 * What the heck we'll cheat and only refresh less than every page-full.
2806 * the number of pages between refreshes is refresh_limit, which 2287 * if skipScroll is enabled.
2807 * is incremented here because we must be doing flat-out scrolling.
2808 */ 2288 */
2809 if (refreshnow) 2289 if (refreshnow)
2810 { 2290 {
2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2812 refresh_limit++;
2813 else
2814 {
2815 flag = true; 2291 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2817 scr_refresh (); 2292 scr_refresh ();
2818 want_refresh = 1; 2293 want_refresh = 1;
2819 }
2820 } 2294 }
2821 2295
2822 } 2296 }
2823 else 2297 else
2824 { 2298 {
… …
2834 } 2308 }
2835 2309
2836 ch = NOCHAR; 2310 ch = NOCHAR;
2837 } 2311 }
2838 } 2312 }
2313
2314 refresh_check ();
2839 2315
2840 return flag; 2316 return flag;
2841} 2317}
2842 2318
2843// read the next character 2319// read the next character
… …
2973 { 2449 {
2974 if ((buf[len++] = cmd_getc ()) == 'i') 2450 if ((buf[len++] = cmd_getc ()) == 'i')
2975 break; /* done = 1 */ 2451 break; /* done = 1 */
2976 } 2452 }
2977 } 2453 }
2978 2454
2979 for (i = 0; i < len; i++) 2455 for (i = 0; i < len; i++)
2980 if (putc (buf[i], fd) == EOF) 2456 if (putc (buf[i], fd) == EOF)
2981 { 2457 {
2982 done = 1; 2458 done = 1;
2983 break; 2459 break;
… …
2985 } 2461 }
2986 } 2462 }
2987 2463
2988 pclose_printer (fd); 2464 pclose_printer (fd);
2989} 2465}
2990#endif /* PRINTPIPE */ 2466#endif /* PRINTPIPE */
2991/*}}} */ 2467/*}}} */
2992 2468
2993/* *INDENT-OFF* */ 2469/* *INDENT-OFF* */
2994enum { 2470enum {
2995 C1_40 = 0x40, 2471 C1_40 = 0x40,
… …
3045 process_dcs_seq (); 2521 process_dcs_seq ();
3046 break; 2522 break;
3047 case 0x9b: /* CSI */ 2523 case 0x9b: /* CSI */
3048 process_csi_seq (); 2524 process_csi_seq ();
3049 break; 2525 break;
3050 case 0x9d: /* CSI */ 2526 case 0x9d: /* OSC */
3051 process_osc_seq (); 2527 process_osc_seq ();
3052 break; 2528 break;
3053#endif 2529#endif
3054 } 2530 }
3055} 2531}
… …
3281rxvt_term::process_csi_seq () 2757rxvt_term::process_csi_seq ()
3282{ 2758{
3283 unicode_t ch, priv, i; 2759 unicode_t ch, priv, i;
3284 unsigned int nargs, p; 2760 unsigned int nargs, p;
3285 int n, ndef; 2761 int n, ndef;
3286 int arg[ESC_ARGS]; 2762 int arg[ESC_ARGS] = { };
3287 2763
3288 for (nargs = ESC_ARGS; nargs > 0;) 2764 nargs = 0;
3289 arg[--nargs] = 0;
3290 2765
3291 priv = 0; 2766 priv = 0;
3292 ch = cmd_getc (); 2767 ch = cmd_getc ();
3293 if (ch >= '<' && ch <= '?') 2768 if (ch >= '<' && ch <= '?')
2769 {
3294 { /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' */
3295 priv = ch; 2771 priv = ch;
3296 ch = cmd_getc (); 2772 ch = cmd_getc ();
3297 } 2773 }
3298 2774
3299 /* read any numerical arguments */ 2775 /* read any numerical arguments */
… …
3338 switch (priv) 2814 switch (priv)
3339 { 2815 {
3340 case '>': 2816 case '>':
3341 if (ch == CSI_DA) /* secondary device attributes */ 2817 if (ch == CSI_DA) /* secondary device attributes */
3342 { 2818 {
3343 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2819 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3344 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2820 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3345 // 2821 //
3346 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2822 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3347 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2823 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3348 // that we do not support xterm mouse reporting (should be 95 when we do). 2824 // versions.
3349 // 2825 //
3350 tt_printf ("\033[>%d;94;0c", 'U'); 2826 tt_printf ("\033[>%d;95;0c", 'U');
3351 } 2827 }
3352 break; 2828 break;
3353 case '?': 2829 case '?':
3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2830 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3355 process_terminal_mode (ch, priv, nargs, arg); 2831 process_terminal_mode (ch, priv, nargs, arg);
… …
3801 int saveop = op; 3277 int saveop = op;
3802 3278
3803 dLocal (Display *, dpy); 3279 dLocal (Display *, dpy);
3804 3280
3805 assert (str != NULL); 3281 assert (str != NULL);
3806 3282
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3283 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return; 3284 return;
3809 3285
3810 switch (op) 3286 switch (op)
3811 { 3287 {
… …
3906 break; 3382 break;
3907 case URxvt_Color_IT: 3383 case URxvt_Color_IT:
3908 process_color_seq (op, Color_IT, str, resp); 3384 process_color_seq (op, Color_IT, str, resp);
3909 break; 3385 break;
3910#endif 3386#endif
3911#if TRANSPARENT && TINTING 3387#if ENABLE_TRANSPARENCY
3912 case URxvt_Color_tint: 3388 case URxvt_Color_tint:
3913 process_color_seq (op, Color_tint, str, resp); 3389 process_color_seq (op, Color_tint, str, resp);
3390 {
3391 bool changed = false;
3392 if (ISSET_PIXCOLOR (Color_tint))
3393 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3394 else
3395 changed = bgPixmap.unset_tint ();
3396 if (changed)
3397 update_background ();
3398 }
3914 3399
3915 check_our_parents ();
3916
3917 if (am_transparent)
3918 want_full_refresh = want_refresh = 1;
3919
3920 break; 3400 break;
3921#endif 3401#endif
3922 3402
3403#if BG_IMAGE_FROM_FILE
3923 case Rxvt_Pixmap: 3404 case Rxvt_Pixmap:
3924 { 3405 if (!strcmp (str, "?"))
3925 if (*str != ';')
3926 { 3406 {
3927#if XPM_BACKGROUND 3407 char str[256];
3928 scale_pixmap (""); /* reset to default scaling */ 3408
3929 set_bgPixmap (str); /* change pixmap */ 3409 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3930 scr_touch (true); 3410 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3931#endif 3411 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3412 process_xterm_seq (XTerm_title, str, CHAR_ST);
3932 } 3413 }
3933 3414 else
3415 {
3934 int changed = 0; 3416 int changed = 0;
3935 3417
3936 while ((str = strchr (str, ';')) != NULL) 3418 if (*str != ';')
3937 { 3419 {
3420 /* reset to default scaling :*/
3421 bgPixmap.unset_geometry ();
3422 if (bgPixmap.set_file (str)) /* change pixmap */
3423 changed++;
3424 str = strchr (str, ';');
3425 if (str == NULL)
3426 bgPixmap.set_defaultGeometry ();
3427 }
3428 while (str)
3429 {
3938 str++; 3430 str++;
3939#if XPM_BACKGROUND 3431 if (bgPixmap.set_geometry (str))
3940 changed += scale_pixmap (str); 3432 changed++;
3941#endif 3433 str = strchr (str, ';');
3942 } 3434 }
3943
3944 if (changed) 3435 if (changed)
3945 { 3436 update_background ();
3946#ifdef XPM_BACKGROUND
3947 resize_pixmap ();
3948 scr_touch (true);
3949#endif
3950 } 3437 }
3951 }
3952 break; 3438 break;
3439#endif
3953 3440
3954 case Rxvt_restoreFG: 3441 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str); 3442 set_window_color (Color_fg, str);
3956 break; 3443 break;
3957 case Rxvt_restoreBG: 3444 case Rxvt_restoreBG:
… …
4079{ 3566{
4080 unsigned int i, j; 3567 unsigned int i, j;
4081 int state; 3568 int state;
4082 3569
4083 static const struct 3570 static const struct
4084 { 3571 {
4085 const int argval; 3572 const int argval;
4086 const unsigned long bit; 3573 const unsigned long bit;
4087 }
4088
4089 argtopriv[] = { 3574 } argtopriv[] = {
4090 { 1, PrivMode_aplCUR }, 3575 { 1, PrivMode_aplCUR },
4091 { 2, PrivMode_vt52 }, 3576 { 2, PrivMode_vt52 },
4092 { 3, PrivMode_132 }, 3577 { 3, PrivMode_132 },
4093 { 4, PrivMode_smoothScroll }, 3578 { 4, PrivMode_smoothScroll },
4094 { 5, PrivMode_rVideo }, 3579 { 5, PrivMode_rVideo },
… …
4110 { 66, PrivMode_aplKP }, 3595 { 66, PrivMode_aplKP },
4111#ifndef NO_BACKSPACE_KEY 3596#ifndef NO_BACKSPACE_KEY
4112 { 67, PrivMode_BackSpace }, 3597 { 67, PrivMode_BackSpace },
4113#endif 3598#endif
4114 { 1000, PrivMode_MouseX11 }, 3599 { 1000, PrivMode_MouseX11 },
4115 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3600 { 1002, PrivMode_MouseBtnEvent },
4116 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3601 { 1003, PrivMode_MouseAnyEvent },
4117 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4118 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3602 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4119 { 1011, PrivMode_Keypress }, // rxvt extension 3603 { 1011, PrivMode_Keypress }, // rxvt extension
4120 // 1035 enable modifiers for alt, numlock NYI 3604 // 1035 enable modifiers for alt, numlock NYI
4121 // 1036 send ESC for meta keys NYI 3605 // 1036 send ESC for meta keys NYI
4122 // 1037 send DEL for keypad delete NYI 3606 // 1037 send DEL for keypad delete NYI
… …
4196 scr_autowrap (state); 3680 scr_autowrap (state);
4197 break; 3681 break;
4198 /* case 8: - auto repeat, can't do on a per window basis */ 3682 /* case 8: - auto repeat, can't do on a per window basis */
4199 case 9: /* X10 mouse reporting */ 3683 case 9: /* X10 mouse reporting */
4200 if (state) /* orthogonal */ 3684 if (state) /* orthogonal */
4201 priv_modes &= ~PrivMode_MouseX11; 3685 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4202 break; 3686 break;
4203#ifdef scrollBar_esc 3687#ifdef scrollBar_esc
4204 case scrollBar_esc: 3688 case scrollBar_esc:
4205 if (scrollbar_mapping (state)) 3689 if (scrollbar_mapping (state))
4206 { 3690 {
… …
4219 break; 3703 break;
4220 /* case 66: - application key pad */ 3704 /* case 66: - application key pad */
4221 /* case 67: - backspace key */ 3705 /* case 67: - backspace key */
4222 case 1000: /* X11 mouse reporting */ 3706 case 1000: /* X11 mouse reporting */
4223 if (state) /* orthogonal */ 3707 if (state) /* orthogonal */
4224 priv_modes &= ~PrivMode_MouseX10; 3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4225 break; 3709 break;
4226#if 0
4227 case 1001: 3710 case 1002:
4228 break; /* X11 mouse highlighting */ 3711 case 1003:
4229#endif 3712 if (state)
3713 {
3714 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3715 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3716 vt_emask_mouse = PointerMotionMask;
3717 }
3718 else
3719 vt_emask_mouse = NoEventMask;
3720 vt_select_input ();
3721 break;
4230 case 1010: /* scroll to bottom on TTY output inhibit */ 3722 case 1010: /* scroll to bottom on TTY output inhibit */
4231 set_option (Opt_scrollTtyOutput, !state); 3723 set_option (Opt_scrollTtyOutput, !state);
4232 break; 3724 break;
4233 case 1011: /* scroll to bottom on key press */ 3725 case 1011: /* scroll to bottom on key press */
4234 set_option (Opt_scrollTtyKeypress, state); 3726 set_option (Opt_scrollTtyKeypress, state);
… …
4411rxvt_term::process_graphics () 3903rxvt_term::process_graphics ()
4412{ 3904{
4413 unicode_t ch, cmd = cmd_getc (); 3905 unicode_t ch, cmd = cmd_getc ();
4414 3906
4415 if (cmd == 'Q') 3907 if (cmd == 'Q')
3908 {
4416 { /* query graphics */ 3909 /* query graphics */
4417 tt_printf ("\033G0\012"); /* no graphics */ 3910 tt_printf ("\033G0\012"); /* no graphics */
4418 return; 3911 return;
4419 } 3912 }
4420 /* swallow other graphics sequences until terminating ':' */ 3913 /* swallow other graphics sequences until terminating ':' */
4421 do 3914 do
… …
4471 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3964 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4472 3965
4473 memcpy (v_buffer + v_buflen, data, len); 3966 memcpy (v_buffer + v_buflen, data, len);
4474 v_buflen += len; 3967 v_buflen += len;
4475 3968
4476 pty_ev.set (EVENT_READ | EVENT_WRITE); 3969 pty_ev.set (ev::READ | ev::WRITE);
4477} 3970}
4478 3971
4479void rxvt_term::pty_write () 3972void rxvt_term::pty_write ()
4480{ 3973{
4481 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3974 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4486 3979
4487 if (v_buflen == 0) 3980 if (v_buflen == 0)
4488 { 3981 {
4489 free (v_buffer); 3982 free (v_buffer);
4490 v_buffer = 0; 3983 v_buffer = 0;
4491 v_buflen = 0;
4492 3984
4493 pty_ev.set (EVENT_READ); 3985 pty_ev.set (ev::READ);
4494 return; 3986 return;
4495 } 3987 }
4496 3988
4497 memmove (v_buffer, v_buffer + written, v_buflen); 3989 memmove (v_buffer, v_buffer + written, v_buflen);
4498 } 3990 }
4499 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3991 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4500 pty_ev.set (EVENT_READ); 3992 pty_ev.set (ev::READ);
4501} 3993}
4502 3994
4503/*----------------------- end-of-file (C source) -----------------------*/ 3995/*----------------------- end-of-file (C source) -----------------------*/
4504 3996

Diff Legend

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