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.329 by ayin, Mon Jun 11 19:57:28 2007 UTC vs.
Revision 1.385 by root, Mon Dec 24 06:51:37 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.
… …
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, 99 XK_ISO_Lock, 0x21eb,
100 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,
105 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
199 r & RS_Uline ? " uline" : "", 198 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 199 r & RS_Careful ? " careful" : "");
201 200
202 int width = wcswidth (fname, wcslen (fname)); 201 int width = wcswidth (fname, wcslen (fname));
203 202
204 max_it (width, 8+5); // for char + hey 203 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 204 max_it (width, strlen (attr));
206 205
207 if (y >= 0) 206 if (y >= 0)
208 { 207 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
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
… …
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
… …
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 display->flush ();
1054}
1055
1056void
1057rxvt_term::flush_cb (ev::timer &w, int revents)
1101{ 1058{
1102 make_current (); 1059 make_current ();
1103 1060
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; 1061 refresh_count = 0;
1117 flush (); 1062 flush ();
1118} 1063}
1119 1064
1120#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1121void 1066void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1068{
1124 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1070 want_refresh = 1;
1126 1071 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1072}
1129#endif 1073#endif
1130 1074
1131#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1132void 1076void
1133rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1078{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1080 {
1137 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1138 want_refresh = 1; 1082 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
1140 } 1084 }
1085 else
1086 w.stop ();
1141} 1087}
1142#endif 1088#endif
1143 1089
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1091void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1093{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1150 { 1096 {
1151 want_refresh = 1; 1097 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1153 } 1099 }
1100 else
1101 w.stop ();
1154} 1102}
1155#endif 1103#endif
1156 1104
1157#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1158void 1106void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1108{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1110 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1112 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1166 } 1114 }
1115 else
1116 w.stop ();
1167} 1117}
1168#endif 1118#endif
1169 1119
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1121void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1123{
1174 if (mouse_slip_wheel_speed == 0 1124 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 { 1125 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1126 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1183 } 1134 }
1184} 1135}
1185#endif 1136#endif
1186 1137
1187#if LINUX_YIELD_HACK 1138#if LINUX_YIELD_HACK
1188static struct event_handler 1139static struct event_handler
1189{ 1140{
1190 check_watcher yield_ev; 1141 ev::prepare yield_ev;
1191 1142
1192 void yield_cb (check_watcher &w) 1143 void yield_cb (ev::prepare &w, int revents)
1193 { 1144 {
1194 // this should really be sched_yield(), but the linux guys thought 1145 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1146 // 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 1147 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS. 1148 // allowed by the sus... as is returning ENOSYS.
… …
1248 1199
1249 return false; 1200 return false;
1250} 1201}
1251 1202
1252void 1203void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1205{
1255 make_current (); 1206 make_current ();
1256 1207
1257 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1210 while (pty_fill ())
1260 if (cmd_parse ()) 1211 if (cmd_parse ())
1261 break; 1212 break;
1262 1213
1263 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1264 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1265} 1218}
1266 1219
1267void 1220void
1268rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1269{ 1222{
… …
1272 1225
1273#ifdef POINTER_BLANK 1226#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1227 hidden_pointer = 0;
1275 1228
1276 if (option (Opt_pointerBlank)) 1229 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1230 pointer_ev.start (pointerBlankDelay);
1278#endif 1231#endif
1279} 1232}
1280 1233
1281#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1282void 1235void
… …
1290 1243
1291 hidden_pointer = 1; 1244 hidden_pointer = 1;
1292} 1245}
1293 1246
1294void 1247void
1295rxvt_term::pointer_cb (time_watcher &w) 1248rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1249{
1297 make_current (); 1250 make_current ();
1298 1251
1299 pointer_blank (); 1252 pointer_blank ();
1300} 1253}
… …
1303void 1256void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1257rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1258{
1306 int button_number, key_state = 0; 1259 int button_number, key_state = 0;
1307 int x, y; 1260 int x, y;
1261 int code = 32;
1308 1262
1309 x = ev.x; 1263 x = Pixel2Col (ev.x);
1310 y = ev.y; 1264 y = Pixel2Row (ev.y);
1311 pixel_position (&x, &y); 1265 if (ev.type == MotionNotify)
1266 {
1267 if (x == mouse_row && y == mouse_col)
1268 return;
1269 mouse_row = x;
1270 mouse_col = y;
1271 code += 32;
1272 }
1312 1273
1313 if (MEvent.button == AnyButton) 1274 if (MEvent.button == AnyButton)
1314 button_number = 3; 1275 button_number = 3;
1315 else 1276 else
1316 { 1277 {
… …
1362 x + 1, 1323 x + 1,
1363 y + 1); 1324 y + 1);
1364#endif 1325#endif
1365 1326
1366 tt_printf ("\033[M%c%c%c", 1327 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1328 (code + button_number + key_state),
1368 (32 + x + 1), 1329 (32 + x + 1),
1369 (32 + y + 1)); 1330 (32 + y + 1));
1370} 1331}
1371 1332
1372/*{{{ process an X event */ 1333/*{{{ process an X event */
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1395 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1396 focus_out ();
1436 } 1397 }
1437#endif 1398#endif
1438 } 1399 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1400 break;
1444 1401
1445 /* 1402 /*
1446 * XXX: this is not the _current_ arrangement 1403 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1404 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1437 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1438 focus_out ();
1482 break; 1439 break;
1483 1440
1484 case ConfigureNotify: 1441 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */
1485 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1486 { 1446 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1448 ;
1489 1449
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1451 {
1492 seen_resize = 1; 1452 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1501 } 1454 }
1455 else
1456 {
1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ())
1459 update_background ();
1460#endif
1461 }
1502 1462
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1464 }
1510 break; 1465 break;
1511 1466
1512 case PropertyNotify: 1467 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1468 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1531 break; 1486 break;
1532 1487
1533 case MapNotify: 1488 case MapNotify:
1534 mapped = 1; 1489 mapped = 1;
1535#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1491 text_blink_ev.start ();
1537#endif 1492#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1494 break;
1540 1495
1541 case UnmapNotify: 1496 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1498#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1499 text_blink_ev.stop ();
1545#endif 1500#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1501 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1502 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1503
1555 case GraphicsExpose: 1504 case GraphicsExpose:
1556 case Expose: 1505 case Expose:
1557 if (ev.xany.window == vt) 1506 if (ev.xany.window == vt)
1558 { 1507 {
1559 do 1508 do
1509 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1510 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1511 ev.xexpose.width, ev.xexpose.height, False);
1512 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1513 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1514
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1516
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1518 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1519 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1520 ev.xexpose.width, ev.xexpose.height, False);
1521 }
1569 1522
1570 want_refresh = 1; 1523 want_refresh = 1;
1571 } 1524 }
1572 else 1525 else
1573 { 1526 {
… …
1581 if (isScrollbarWindow (ev.xany.window)) 1534 if (isScrollbarWindow (ev.xany.window))
1582 { 1535 {
1583 scrollBar.setIdle (); 1536 scrollBar.setIdle ();
1584 scrollbar_show (0); 1537 scrollbar_show (0);
1585 } 1538 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1539 }
1592 break; 1540 break;
1593 1541
1594 case MotionNotify: 1542 case MotionNotify:
1595#ifdef POINTER_BLANK 1543#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1544 if (hidden_pointer)
1597 pointer_unblank (); 1545 pointer_unblank ();
1598#endif 1546#endif
1547 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1548 || priv_modes & PrivMode_MouseAnyEvent)
1549 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1551 break;
1601 1552
1602 if (ev.xany.window == vt) 1553 if (ev.xany.window == vt)
1603 { 1554 {
… …
1637 int dist; 1588 int dist;
1638 1589
1639 /* don't clobber the current delay if we are 1590 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1591 * already in the middle of scrolling.
1641 */ 1592 */
1642 if (!sel_scroll_ev.active) 1593 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1594 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1595
1645 /* save the event params so we can highlight 1596 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1597 * the selection in the pending-scroll loop
1647 */ 1598 */
1648 selection_save_x = ev.xbutton.x; 1599 selection_save_x = ev.xbutton.x;
… …
1670 else 1621 else
1671 { 1622 {
1672 /* we are within the text window, so we 1623 /* we are within the text window, so we
1673 * shouldn't be scrolling 1624 * shouldn't be scrolling
1674 */ 1625 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1626 sel_scroll_ev.stop();
1677 } 1627 }
1678#endif 1628#endif
1679#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1680 } 1630 }
1681#endif 1631#endif
… …
1693 &ev.xbutton.x, &ev.xbutton.y, 1643 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1644 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1646 scrollbar_size ());
1697 want_refresh = 1; 1647 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1648 scrollbar_show (1);
1700 } 1649 }
1701 break; 1650 break;
1702 } 1651 }
1703 1652
… …
1708 { 1657 {
1709 hidden_cursor = 0; 1658 hidden_cursor = 0;
1710 want_refresh = 1; 1659 want_refresh = 1;
1711 } 1660 }
1712 1661
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1662 cursor_blink_ev.again ();
1714 } 1663 }
1715#endif 1664#endif
1716 1665
1717#if defined(POINTER_BLANK) 1666#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1667 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1725 1674
1726 if (ev.type == KeyPress && hidden_pointer == 0) 1675 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank (); 1676 pointer_blank ();
1728 } 1677 }
1729#endif 1678#endif
1679
1680 refresh_check ();
1730} 1681}
1731 1682
1732void 1683void
1733rxvt_term::focus_in () 1684rxvt_term::focus_in ()
1734{ 1685{
… …
1746 XSetICFocus (Input_Context); 1697 XSetICFocus (Input_Context);
1747 } 1698 }
1748#endif 1699#endif
1749#if CURSOR_BLINK 1700#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1701 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1702 cursor_blink_ev.again ();
1752#endif 1703#endif
1753#if OFF_FOCUS_FADING 1704#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1705 if (rs[Rs_fade])
1755 { 1706 {
1756 pix_colors = pix_colors_focused; 1707 pix_colors = pix_colors_focused;
… …
1758 } 1709 }
1759#endif 1710#endif
1760#if ENABLE_FRILLS 1711#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1712 if (option (Opt_urgentOnBell))
1762 { 1713 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]); 1714 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1766 if (h != NULL)
1767 { 1715 {
1768 h->flags &= ~XUrgencyHint; 1716 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h); 1717 XSetWMHints (dpy, parent[0], h);
1770 } 1718 }
1771 } 1719 }
1772#endif 1720#endif
1773 } 1721 }
1774} 1722}
… …
1785 1733
1786#if ENABLE_FRILLS || ISO_14755 1734#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1735 if (iso14755buf)
1788 { 1736 {
1789 iso14755buf = 0; 1737 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1738# if ISO_14755
1791 scr_overlay_off (); 1739 scr_overlay_off ();
1792# endif 1740# endif
1793 } 1741 }
1794#endif 1742#endif
1795#if USE_XIM 1743#if USE_XIM
… …
1797 XUnsetICFocus (Input_Context); 1745 XUnsetICFocus (Input_Context);
1798#endif 1746#endif
1799#if CURSOR_BLINK 1747#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1749 cursor_blink_ev.stop ();
1750
1802 hidden_cursor = 0; 1751 hidden_cursor = 0;
1803#endif 1752#endif
1804#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1806 { 1755 {
… …
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1771 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1772 }
1824#endif 1773#endif
1825} 1774}
1826 1775
1827#if TRANSPARENT || ENABLE_PERL 1776#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1777void
1829rxvt_term::rootwin_cb (XEvent &ev) 1778rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1779{
1831 make_current (); 1780 make_current ();
1832 1781
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1782 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1783 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1784 return;
1836 1785
1837# if TRANSPARENT 1786# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1787 switch (ev.type)
1839 { 1788 {
1840 case PropertyNotify: 1789 case PropertyNotify:
1841 /* 1790 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1791 * if user used some Esetroot compatible prog to set the root bg,
1843 * use the property to determine the pixmap. We use it later on. 1792 * use the property to determine the pixmap. We use it later on.
1844 */ 1793 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1794 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1795 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1796 {
1797 bgPixmap.set_root_pixmap ();
1798 update_background ();
1799 }
1848 1800
1849 /* FALLTHROUGH */
1850 case ReparentNotify:
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1801 break;
1854 } 1802 }
1855# endif 1803# endif
1804
1805 refresh_check ();
1856} 1806}
1857#endif 1807#endif
1858 1808
1859void 1809void
1860rxvt_term::button_press (XButtonEvent &ev) 1810rxvt_term::button_press (XButtonEvent &ev)
… …
1915 mouse_report (ev); 1865 mouse_report (ev);
1916 } 1866 }
1917#else 1867#else
1918 MEvent.button = ev.button; 1868 MEvent.button = ev.button;
1919 mouse_report (ev); 1869 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1870#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1871
1922 } 1872 }
1923 else 1873 else
1924 { 1874 {
1925 if (ev.button != MEvent.button) 1875 if (ev.button != MEvent.button)
… …
2019 tt_printf ("\033[5~"); 1969 tt_printf ("\033[5~");
2020 break; 1970 break;
2021 } 1971 }
2022 } 1972 }
2023 else 1973 else
2024#endif /* NO_SCROLLBAR_REPORT */ 1974#endif /* NO_SCROLLBAR_REPORT */
2025 1975
2026 { 1976 {
2027 char upordown = 0; 1977 char upordown = 0;
2028 1978
2029 if (scrollBar.style == R_SB_NEXT) 1979 if (scrollBar.style == R_SB_NEXT)
2030 { 1980 {
2031 if (scrollbarnext_upButton (ev.y)) 1981 if (scrollbarnext_upButton (ev.y))
2032 upordown = -1; /* up */ 1982 upordown = -1; /* up */
… …
2038 if (scrollbarrxvt_upButton (ev.y)) 1988 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */ 1989 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y)) 1990 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */ 1991 upordown = 1; /* down */
2042 } 1992 }
1993
2043 if (upordown) 1994 if (upordown)
2044 { 1995 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1997 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1998 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 1999#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 2000 if (scr_page (upordown < 0 ? UP : DN, 1))
2049 { 2001 {
2050 if (upordown < 0) 2002 if (upordown < 0)
2051 scrollBar.setUp (); 2003 scrollBar.setUp ();
… …
2131 scrollBar.setIdle (); 2083 scrollBar.setIdle ();
2132 scrollbar_show (0); 2084 scrollbar_show (0);
2133 } 2085 }
2134 2086
2135#ifdef SELECTION_SCROLLING 2087#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2088 sel_scroll_ev.stop();
2138#endif 2089#endif
2139 2090
2140 if (ev.window == vt) 2091 if (ev.window == vt)
2141 { 2092 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2093 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2166 mouse_report (ev); 2117 mouse_report (ev);
2167 } 2118 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2119#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2120 MEvent.button = AnyButton;
2170 mouse_report (ev); 2121 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2122#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2123 return;
2173 } 2124 }
2174 2125
2175 /* 2126 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2127 * dumb hack to compensate for the failure of click-and-drag
… …
2214 { 2165 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2166 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2169
2219 if (slip_wheel_ev.at < NOW) 2170 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2171 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2172 }
2224 else 2173 else
2225 { 2174 {
2226# endif 2175# endif
2227 scr_page (v, i); 2176 scr_page (v, i);
… …
2291 if (ch == C0_LF) 2240 if (ch == C0_LF)
2292 nlines++; 2241 nlines++;
2293 2242
2294 refresh_count++; 2243 refresh_count++;
2295 2244
2296 if (!option (Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2298 { 2246 {
2299 refreshnow = true;
2300 refresh_count = 0; 2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2251 refreshnow = true;
2301 ch = NOCHAR; 2252 ch = NOCHAR;
2302 break; 2253 break;
2254 }
2303 } 2255 }
2304 2256
2305 // scr_add_lines only works for nlines <= nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2306 if (nlines >= nrow - 1) 2258 if (nlines >= nrow - 1)
2307 { 2259 {
… …
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2287 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2336 scr_add_lines (buf, str - buf, nlines); 2288 scr_add_lines (buf, str - buf, nlines);
2337 2289
2338 /* 2290 /*
2339 * If there have been a lot of new lines, then update the screen 2291 * If there have been a lot of new lines, then update the screen
2340 * What the heck I'll cheat and only refresh less than every page-full. 2292 * What the heck we'll cheat and only refresh less than every page-full.
2341 * the number of pages between refreshes is refresh_limit, which 2293 * if skipScroll is enabled.
2342 * is incremented here because we must be doing flat-out scrolling.
2343 */ 2294 */
2344 if (refreshnow) 2295 if (refreshnow)
2345 { 2296 {
2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2347 refresh_limit++;
2348 else
2349 {
2350 flag = true; 2297 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2352 scr_refresh (); 2298 scr_refresh ();
2353 want_refresh = 1; 2299 want_refresh = 1;
2354 }
2355 } 2300 }
2356 2301
2357 } 2302 }
2358 else 2303 else
2359 { 2304 {
… …
2520 } 2465 }
2521 } 2466 }
2522 2467
2523 pclose_printer (fd); 2468 pclose_printer (fd);
2524} 2469}
2525#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2526/*}}} */ 2471/*}}} */
2527 2472
2528/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2529enum { 2474enum {
2530 C1_40 = 0x40, 2475 C1_40 = 0x40,
… …
2580 process_dcs_seq (); 2525 process_dcs_seq ();
2581 break; 2526 break;
2582 case 0x9b: /* CSI */ 2527 case 0x9b: /* CSI */
2583 process_csi_seq (); 2528 process_csi_seq ();
2584 break; 2529 break;
2585 case 0x9d: /* CSI */ 2530 case 0x9d: /* OSC */
2586 process_osc_seq (); 2531 process_osc_seq ();
2587 break; 2532 break;
2588#endif 2533#endif
2589 } 2534 }
2590} 2535}
… …
2816rxvt_term::process_csi_seq () 2761rxvt_term::process_csi_seq ()
2817{ 2762{
2818 unicode_t ch, priv, i; 2763 unicode_t ch, priv, i;
2819 unsigned int nargs, p; 2764 unsigned int nargs, p;
2820 int n, ndef; 2765 int n, ndef;
2821 int arg[ESC_ARGS]; 2766 int arg[ESC_ARGS] = { };
2822 2767
2823 for (nargs = ESC_ARGS; nargs > 0;) 2768 nargs = 0;
2824 arg[--nargs] = 0;
2825 2769
2826 priv = 0; 2770 priv = 0;
2827 ch = cmd_getc (); 2771 ch = cmd_getc ();
2828 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
2829 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
2830 priv = ch; 2775 priv = ch;
2831 ch = cmd_getc (); 2776 ch = cmd_getc ();
2832 } 2777 }
2833 2778
2834 /* read any numerical arguments */ 2779 /* read any numerical arguments */
… …
2873 switch (priv) 2818 switch (priv)
2874 { 2819 {
2875 case '>': 2820 case '>':
2876 if (ch == CSI_DA) /* secondary device attributes */ 2821 if (ch == CSI_DA) /* secondary device attributes */
2877 { 2822 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2823 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2824 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 // 2825 //
2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2826 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2827 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2883 // that we do not support xterm mouse reporting (should be 95 when we do). 2828 // versions.
2884 // 2829 //
2885 tt_printf ("\033[>%d;94;0c", 'U'); 2830 tt_printf ("\033[>%d;95;0c", 'U');
2886 } 2831 }
2887 break; 2832 break;
2888 case '?': 2833 case '?':
2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2890 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
… …
3441 break; 3386 break;
3442 case URxvt_Color_IT: 3387 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp); 3388 process_color_seq (op, Color_IT, str, resp);
3444 break; 3389 break;
3445#endif 3390#endif
3446#if TRANSPARENT && TINTING 3391#if ENABLE_TRANSPARENCY
3447 case URxvt_Color_tint: 3392 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp); 3393 process_color_seq (op, Color_tint, str, resp);
3394 {
3395 bool changed = false;
3449 3396
3450 check_our_parents (); 3397 if (ISSET_PIXCOLOR (Color_tint))
3398 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3399 else
3400 changed = bgPixmap.unset_tint ();
3451 3401
3452 if (am_transparent) 3402 if (changed)
3453 want_full_refresh = want_refresh = 1; 3403 update_background ();
3404 }
3454 3405
3455 break; 3406 break;
3456#endif 3407#endif
3457 3408
3409#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap: 3410 case Rxvt_Pixmap:
3459 { 3411 if (!strcmp (str, "?"))
3460 if (*str != ';')
3461 { 3412 {
3462#if XPM_BACKGROUND 3413 char str[256];
3463 scale_pixmap (""); /* reset to default scaling */ 3414
3464 set_bgPixmap (str); /* change pixmap */ 3415 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3465 scr_touch (true); 3416 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3466#endif 3417 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3418 process_xterm_seq (XTerm_title, str, CHAR_ST);
3467 } 3419 }
3468 3420 else
3421 {
3469 int changed = 0; 3422 int changed = 0;
3470 3423
3471 while ((str = strchr (str, ';')) != NULL) 3424 if (*str != ';')
3472 { 3425 {
3426 /* reset to default scaling :*/
3427 bgPixmap.unset_geometry ();
3428 if (bgPixmap.set_file (str)) /* change pixmap */
3429 changed++;
3430 str = strchr (str, ';');
3431 if (str == NULL)
3432 bgPixmap.set_defaultGeometry ();
3433 }
3434
3435 while (str)
3436 {
3473 str++; 3437 str++;
3474#if XPM_BACKGROUND 3438 if (bgPixmap.set_geometry (str))
3475 changed += scale_pixmap (str); 3439 changed++;
3476#endif 3440 str = strchr (str, ';');
3477 } 3441 }
3478 3442
3479 if (changed) 3443 if (changed)
3480 { 3444 update_background ();
3481#ifdef XPM_BACKGROUND
3482 resize_pixmap ();
3483 scr_touch (true);
3484#endif
3485 } 3445 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option (Opt_transparent))
3488 check_our_parents ();
3489#endif
3490 }
3491 break; 3446 break;
3447#endif
3492 3448
3493 case Rxvt_restoreFG: 3449 case Rxvt_restoreFG:
3494 set_window_color (Color_fg, str); 3450 set_window_color (Color_fg, str);
3495 break; 3451 break;
3496 case Rxvt_restoreBG: 3452 case Rxvt_restoreBG:
… …
3618{ 3574{
3619 unsigned int i, j; 3575 unsigned int i, j;
3620 int state; 3576 int state;
3621 3577
3622 static const struct 3578 static const struct
3623 { 3579 {
3624 const int argval; 3580 const int argval;
3625 const unsigned long bit; 3581 const unsigned long bit;
3626 }
3627
3628 argtopriv[] = { 3582 } argtopriv[] = {
3629 { 1, PrivMode_aplCUR }, 3583 { 1, PrivMode_aplCUR },
3630 { 2, PrivMode_vt52 }, 3584 { 2, PrivMode_vt52 },
3631 { 3, PrivMode_132 }, 3585 { 3, PrivMode_132 },
3632 { 4, PrivMode_smoothScroll }, 3586 { 4, PrivMode_smoothScroll },
3633 { 5, PrivMode_rVideo }, 3587 { 5, PrivMode_rVideo },
… …
3649 { 66, PrivMode_aplKP }, 3603 { 66, PrivMode_aplKP },
3650#ifndef NO_BACKSPACE_KEY 3604#ifndef NO_BACKSPACE_KEY
3651 { 67, PrivMode_BackSpace }, 3605 { 67, PrivMode_BackSpace },
3652#endif 3606#endif
3653 { 1000, PrivMode_MouseX11 }, 3607 { 1000, PrivMode_MouseX11 },
3654 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3608 { 1002, PrivMode_MouseBtnEvent },
3655 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3609 { 1003, PrivMode_MouseAnyEvent },
3656 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3657 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3658 { 1011, PrivMode_Keypress }, // rxvt extension 3611 { 1011, PrivMode_Keypress }, // rxvt extension
3659 // 1035 enable modifiers for alt, numlock NYI 3612 // 1035 enable modifiers for alt, numlock NYI
3660 // 1036 send ESC for meta keys NYI 3613 // 1036 send ESC for meta keys NYI
3661 // 1037 send DEL for keypad delete NYI 3614 // 1037 send DEL for keypad delete NYI
… …
3735 scr_autowrap (state); 3688 scr_autowrap (state);
3736 break; 3689 break;
3737 /* case 8: - auto repeat, can't do on a per window basis */ 3690 /* case 8: - auto repeat, can't do on a per window basis */
3738 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
3739 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
3740 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3741 break; 3694 break;
3742#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
3743 case scrollBar_esc: 3696 case scrollBar_esc:
3744 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
3745 { 3698 {
… …
3758 break; 3711 break;
3759 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
3760 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
3761 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
3762 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
3763 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3764 break; 3717 break;
3765#if 0
3766 case 1001: 3718 case 1002:
3767 break; /* X11 mouse highlighting */ 3719 case 1003:
3768#endif 3720 if (state)
3721 {
3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724 vt_emask_mouse = PointerMotionMask;
3725 }
3726 else
3727 vt_emask_mouse = NoEventMask;
3728 vt_select_input ();
3729 break;
3769 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
3770 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
3771 break; 3732 break;
3772 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
3773 set_option (Opt_scrollTtyKeypress, state); 3734 set_option (Opt_scrollTtyKeypress, state);
… …
3950rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
3951{ 3912{
3952 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
3953 3914
3954 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
3955 { /* query graphics */ 3917 /* query graphics */
3956 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
3957 return; 3919 return;
3958 } 3920 }
3959 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
3960 do 3922 do
… …
4010 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4011 3973
4012 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
4013 v_buflen += len; 3975 v_buflen += len;
4014 3976
4015 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
4016} 3978}
4017 3979
4018void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4019{ 3981{
4020 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3982 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4025 3987
4026 if (v_buflen == 0) 3988 if (v_buflen == 0)
4027 { 3989 {
4028 free (v_buffer); 3990 free (v_buffer);
4029 v_buffer = 0; 3991 v_buffer = 0;
4030 v_buflen = 0;
4031 3992
4032 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4033 return; 3994 return;
4034 } 3995 }
4035 3996
4036 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4037 } 3998 }
4038 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4039 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4040} 4001}
4041 4002
4042/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4043 4004

Diff Legend

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