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.328 by ayin, Mon Jun 11 17:40:15 2007 UTC vs.
Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC

25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
203 203
204 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
206 206
207 if (y >= 0) 207 if (y >= 0)
208 { 208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
221 ch = *chr++; 221 ch = *chr++;
222 222
223 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
226# if !UNICODE3 226# if !UNICODE_3
227 if (ch >= 0x10000) 227 if (ch >= 0x10000)
228 ch = 0xfffd; 228 ch = 0xfffd;
229# endif 229# endif
230 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231 231
302 302
303void 303void
304rxvt_term::key_press (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
305{ 305{
306 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 307 KeySym keysym;
309 int valid_keysym; 308 int valid_keysym;
310 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
311 310
312#if ISO_14755 311#if ISO_14755
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;
547 } 546 }
548#endif 547#endif
549 548
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 550 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1;
553#ifdef XK_KP_Home
554 static const KeySym keypadtrans[] = {
555 XK_KP_7, // XK_KP_Home
556 XK_KP_4, // XK_KP_Left
557 XK_KP_8, // XK_KP_Up
558 XK_KP_6, // XK_KP_Right
559 XK_KP_2, // XK_KP_Down
560#ifndef UNSHIFTED_SCROLLKEYS
561 XK_KP_9, // XK_KP_Prior
562 XK_KP_3, // XK_KP_Next
563#else
564 XK_Prior,
565 XK_Next,
566#endif
567 XK_KP_1, // XK_KP_End
568 XK_KP_5, // XK_KP_Begin
569 };
570
571 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
552 { 572 {
553 newlen = 1; 573 unsigned int index = keysym - XK_KP_Home;
574 keysym = kp ? keypadtrans[index] : XK_Home + index;
575 }
576 else if (keysym == XK_KP_Insert)
577 keysym = kp ? XK_KP_0 : XK_Insert;
578#ifndef NO_DELETE_KEY
579 else if (keysym == XK_KP_Delete)
580 keysym = kp ? XK_KP_Decimal : XK_Delete;
581#endif
582#endif
554 switch (keysym) 583 switch (keysym)
555 { 584 {
556#ifndef NO_BACKSPACE_KEY 585#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace: 586 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace) 587 if (priv_modes & PrivMode_HaveBackSpace)
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177'; 590 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0'; 591 kbuf[1] = '\0';
563 } 592 }
564 else 593 else
565 strcpy (kbuf, key_backspace); 594 strcpy (kbuf, rs[Rs_backspace_key]);
566 break; 595 break;
567#endif 596#endif
568#ifndef NO_DELETE_KEY 597#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: 598 case XK_Delete:
580 strcpy (kbuf, key_delete); 599 strcpy (kbuf, rs[Rs_delete_key]);
581 break; 600 break;
582#endif 601#endif
583 case XK_Tab: 602 case XK_Tab:
584 if (shft) 603 if (shft)
585 strcpy (kbuf, "\033[Z"); 604 strcpy (kbuf, "\033[Z");
595#endif 614#endif
596 newlen = 0; 615 newlen = 0;
597 } 616 }
598 break; 617 break;
599 618
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" */ 619 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */ 620 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */ 621 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */ 622 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z"); 623 strcpy (kbuf, "\033[Z");
630 else if (priv_modes & PrivMode_aplCUR) 633 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O'; 634 kbuf[1] = 'O';
632 break; 635 break;
633 636
634#ifndef UNSHIFTED_SCROLLKEYS 637#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: 638 case XK_Prior:
646 strcpy (kbuf, "\033[5~"); 639 strcpy (kbuf, "\033[5~");
647 break; 640 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: 641 case XK_Next:
659 strcpy (kbuf, "\033[6~"); 642 strcpy (kbuf, "\033[6~");
660 break; 643 break;
661#endif 644#endif
662 case XK_KP_Enter: 645 case XK_KP_Enter:
663 /* allow shift to override */ 646 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 647 if (kp)
665 { 648 {
666 strcpy (kbuf, "\033OM"); 649 strcpy (kbuf, "\033OM");
667 break; 650 break;
668 } 651 }
669 652
681 kbuf[0] = '\015'; 664 kbuf[0] = '\015';
682 kbuf[1] = '\0'; 665 kbuf[1] = '\0';
683 } 666 }
684 break; 667 break;
685 668
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" */ 669 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */ 670 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */ 671 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */ 672 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP"); 673 strcpy (kbuf, "\033OP");
712 case XK_KP_6: /* "\033Ov" : "6" */ 689 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */ 690 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */ 691 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */ 692 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */ 693 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 694 if (kp)
718 { 695 {
719 strcpy (kbuf, "\033Oj"); 696 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply); 697 kbuf[2] += (keysym - XK_KP_Multiply);
721 } 698 }
722 else 699 else
728 705
729 case XK_Find: 706 case XK_Find:
730 strcpy (kbuf, "\033[1~"); 707 strcpy (kbuf, "\033[1~");
731 break; 708 break;
732 709
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: 710 case XK_Insert:
744 strcpy (kbuf, "\033[2~"); 711 strcpy (kbuf, "\033[2~");
745 break; 712 break;
746#ifdef DXK_Remove /* support for DEC remove like key */ 713#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove: 714 case DXK_Remove:
751 strcpy (kbuf, "\033[3~"); 718 strcpy (kbuf, "\033[3~");
752 break; 719 break;
753 case XK_Select: 720 case XK_Select:
754 strcpy (kbuf, "\033[4~"); 721 strcpy (kbuf, "\033[4~");
755 break; 722 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: 723 case XK_End:
767 strcpy (kbuf, KS_END); 724 strcpy (kbuf, KS_END);
768 break; 725 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: 726 case XK_Home:
780 strcpy (kbuf, KS_HOME); 727 strcpy (kbuf, KS_HOME);
781 break; 728 break;
782 729
783#define FKEY(n, fkey) \ 730#define FKEY(n, fkey) \
840 break; 787 break;
841 } 788 }
842 789
843 if (newlen) 790 if (newlen)
844 len = strlen (kbuf); 791 len = strlen (kbuf);
845 }
846 792
847 /* 793 /*
848 * Pass meta for all function keys, if 'meta' option set 794 * Pass meta for all function keys, if 'meta' option set
849 */ 795 */
850#ifdef META8_OPTION 796#ifdef META8_OPTION
934#if ENABLE_FRILLS || ISO_14755 880#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 881 // ISO 14755 support
936 if (iso14755buf) 882 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 883 if (iso14755buf & ISO_14755_52)
938 { 884 {
939# if ENABLE_OVERLAY 885# if ISO_14755
940 scr_overlay_off (); 886 scr_overlay_off ();
941# endif 887# endif
942# if ISO_14755 888# if ISO_14755
943 // iso14755 part 5.2 handling: release time 889 // iso14755 part 5.2 handling: release time
944 // first: controls 890 // first: controls
967 913
968 return; 914 return;
969 } 915 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 916 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 917 {
972# if ENABLE_OVERLAY 918# if ISO_14755
973 scr_overlay_off (); 919 scr_overlay_off ();
974# endif 920# endif
975 if (iso14755buf & ISO_14755_51) 921 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 922 commit_iso14755 ();
977#if ISO_14755 923#if ISO_14755
1035void 981void
1036rxvt_term::flush () 982rxvt_term::flush ()
1037{ 983{
1038 flush_ev.stop (); 984 flush_ev.stop ();
1039 985
1040#ifdef TRANSPARENT 986#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 987 if (bgPixmap.check_clearChanged ())
1042 { 988 {
1043 want_full_refresh = 0; 989// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 990 scr_touch (false);
1046 } 991 }
1047#endif 992#endif
1048 993
1049 if (want_refresh) 994 if (want_refresh)
1094 } 1039 }
1095 1040
1096 display->flush (); 1041 display->flush ();
1097} 1042}
1098 1043
1044/* checks wether a refresh is requested and starts the refresh timer */
1099void 1045void
1100rxvt_term::check_cb (check_watcher &w) 1046rxvt_term::refresh_check ()
1047{
1048 if (want_refresh && !flush_ev.is_active ())
1049 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050
1051 display->flush ();
1052}
1053
1054void
1055rxvt_term::flush_cb (ev::timer &w, int revents)
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.state == STATE_UP || scrollBar.state == STATE_DOWN)
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == STATE_UP ? 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 ();
1214
1215 refresh_check ();
1265} 1216}
1266 1217
1267void 1218void
1268rxvt_term::pointer_unblank () 1219rxvt_term::pointer_unblank ()
1269{ 1220{
1272 1223
1273#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1225 hidden_pointer = 0;
1275 1226
1276 if (option (Opt_pointerBlank)) 1227 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1228 pointer_ev.start (pointerBlankDelay);
1278#endif 1229#endif
1279} 1230}
1280 1231
1281#ifdef POINTER_BLANK 1232#ifdef POINTER_BLANK
1282void 1233void
1290 1241
1291 hidden_pointer = 1; 1242 hidden_pointer = 1;
1292} 1243}
1293 1244
1294void 1245void
1295rxvt_term::pointer_cb (time_watcher &w) 1246rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1247{
1297 make_current (); 1248 make_current ();
1298 1249
1299 pointer_blank (); 1250 pointer_blank ();
1300} 1251}
1303void 1254void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1255rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1256{
1306 int button_number, key_state = 0; 1257 int button_number, key_state = 0;
1307 int x, y; 1258 int x, y;
1259 int code = 32;
1308 1260
1309 x = ev.x; 1261 x = Pixel2Col (ev.x);
1310 y = ev.y; 1262 y = Pixel2Row (ev.y);
1311 pixel_position (&x, &y); 1263 if (ev.type == MotionNotify)
1264 {
1265 if (x == mouse_row && y == mouse_col)
1266 return;
1267 mouse_row = x;
1268 mouse_col = y;
1269 code += 32;
1270 }
1312 1271
1313 if (MEvent.button == AnyButton) 1272 if (MEvent.button == AnyButton)
1314 button_number = 3; 1273 button_number = 3;
1315 else 1274 else
1316 { 1275 {
1362 x + 1, 1321 x + 1,
1363 y + 1); 1322 y + 1);
1364#endif 1323#endif
1365 1324
1366 tt_printf ("\033[M%c%c%c", 1325 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1326 (code + button_number + key_state),
1368 (32 + x + 1), 1327 (32 + x + 1),
1369 (32 + y + 1)); 1328 (32 + y + 1));
1370} 1329}
1371 1330
1372/*{{{ process an X event */ 1331/*{{{ process an X event */
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1394 focus_out ();
1436 } 1395 }
1437#endif 1396#endif
1438 } 1397 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1398 break;
1444 1399
1445 /* 1400 /*
1446 * XXX: this is not the _current_ arrangement 1401 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1402 * Here's my conclusion:
1480 && ev.xfocus.mode != NotifyGrab) 1435 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1436 focus_out ();
1482 break; 1437 break;
1483 1438
1484 case ConfigureNotify: 1439 case ConfigureNotify:
1440 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height);*/
1485 if (ev.xconfigure.window == parent[0]) 1443 if (ev.xconfigure.window == parent[0])
1486 { 1444 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1446 ;
1489 1447
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1449 {
1492 seen_resize = 1; 1450 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND 1452 }
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize) 1453 else
1454 {
1455#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ())
1496 { 1457 {
1458 if (mapped)
1459 update_background ();
1497 resize_pixmap (); 1460 else
1498 scr_touch (true); 1461 bgPixmap.invalidate ();
1499 } 1462 }
1500#endif 1463#endif
1501 } 1464 }
1502 1465
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1466 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 } 1467 }
1510 break; 1468 break;
1511 1469
1512 case PropertyNotify: 1470 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1471 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1529 case SelectionRequest: 1487 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1488 selection_send (ev.xselectionrequest);
1531 break; 1489 break;
1532 1490
1533 case MapNotify: 1491 case MapNotify:
1492#ifdef HAVE_BG_PIXMAP
1493 /* This is needed spcifically to fix the case of no window manager or a
1494 * non-reparenting window manager. In those cases we never get first
1495 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1496 * care of multiplicity of ConfigureNotify events arriwing while WM does
1497 * reparenting.
1498 * We should not render background immidiately, as there could be several
1499 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1500 * by scheduling background redraw as soon as we can, but giving a short
1501 * bit of time for ConfigureNotifies to arrive.
1502 * We should render background PRIOR to drawing any text, but AFTER all
1503 * of ConfigureNotifys for the best results.
1504 */
1505 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1506 update_background_ev.start (0.025);
1507#endif
1534 mapped = 1; 1508 mapped = 1;
1535#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start ();
1537#endif 1511#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1513 break;
1540 1514
1541 case UnmapNotify: 1515 case UnmapNotify:
1543#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1518 text_blink_ev.stop ();
1545#endif 1519#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1521 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1522
1555 case GraphicsExpose: 1523 case GraphicsExpose:
1556 case Expose: 1524 case Expose:
1557 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1558 { 1526 {
1559 do 1527 do
1528 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1529 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1530 ev.xexpose.width, ev.xexpose.height, False);
1531 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1533
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1534 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1535
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1537 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1538 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1539 ev.xexpose.width, ev.xexpose.height, False);
1540 }
1569 1541
1570 want_refresh = 1; 1542 want_refresh = 1;
1571 } 1543 }
1572 else 1544 else
1573 { 1545 {
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1548 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1549 ;
1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1551 ;
1580 1552
1581 if (isScrollbarWindow (ev.xany.window)) 1553 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1554 {
1583 scrollBar.setIdle (); 1555 scrollBar.state = STATE_IDLE;
1584 scrollbar_show (0); 1556 scrollbar_show (0);
1585 } 1557 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1558 }
1592 break; 1559 break;
1593 1560
1594 case MotionNotify: 1561 case MotionNotify:
1595#ifdef POINTER_BLANK 1562#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1563 if (hidden_pointer)
1597 pointer_unblank (); 1564 pointer_unblank ();
1598#endif 1565#endif
1566 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1567 || priv_modes & PrivMode_MouseAnyEvent)
1568 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1569 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1570 break;
1601 1571
1602 if (ev.xany.window == vt) 1572 if (ev.xany.window == vt)
1603 { 1573 {
1637 int dist; 1607 int dist;
1638 1608
1639 /* don't clobber the current delay if we are 1609 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1610 * already in the middle of scrolling.
1641 */ 1611 */
1642 if (!sel_scroll_ev.active) 1612 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1613 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1614
1645 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1647 */ 1617 */
1648 selection_save_x = ev.xbutton.x; 1618 selection_save_x = ev.xbutton.x;
1670 else 1640 else
1671 { 1641 {
1672 /* we are within the text window, so we 1642 /* we are within the text window, so we
1673 * shouldn't be scrolling 1643 * shouldn't be scrolling
1674 */ 1644 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1645 sel_scroll_ev.stop();
1677 } 1646 }
1678#endif 1647#endif
1679#ifdef MOUSE_THRESHOLD 1648#ifdef MOUSE_THRESHOLD
1680 } 1649 }
1681#endif 1650#endif
1682 } 1651 }
1683 } 1652 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1653 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1654 {
1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1655 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1656 MotionNotify, &ev))
1688 ; 1657 ;
1689 1658
1693 &ev.xbutton.x, &ev.xbutton.y, 1662 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1663 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1665 scrollbar_size ());
1697 want_refresh = 1; 1666 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1667 scrollbar_show (1);
1700 } 1668 }
1701 break; 1669 break;
1702 } 1670 }
1703 1671
1708 { 1676 {
1709 hidden_cursor = 0; 1677 hidden_cursor = 0;
1710 want_refresh = 1; 1678 want_refresh = 1;
1711 } 1679 }
1712 1680
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1681 cursor_blink_ev.again ();
1714 } 1682 }
1715#endif 1683#endif
1716 1684
1717#if defined(POINTER_BLANK) 1685#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1686 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1725 1693
1726 if (ev.type == KeyPress && hidden_pointer == 0) 1694 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank (); 1695 pointer_blank ();
1728 } 1696 }
1729#endif 1697#endif
1698
1699 refresh_check ();
1730} 1700}
1731 1701
1732void 1702void
1733rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1734{ 1704{
1746 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1747 } 1717 }
1748#endif 1718#endif
1749#if CURSOR_BLINK 1719#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1720 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1721 cursor_blink_ev.again ();
1752#endif 1722#endif
1753#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1755 { 1725 {
1756 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
1758 } 1728 }
1759#endif 1729#endif
1760#if ENABLE_FRILLS 1730#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1731 if (option (Opt_urgentOnBell))
1762 { 1732 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]); 1733 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1766 if (h != NULL)
1767 { 1734 {
1768 h->flags &= ~XUrgencyHint; 1735 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h); 1736 XSetWMHints (dpy, parent[0], h);
1770 } 1737 }
1771 } 1738 }
1772#endif 1739#endif
1773 } 1740 }
1774} 1741}
1785 1752
1786#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1754 if (iso14755buf)
1788 { 1755 {
1789 iso14755buf = 0; 1756 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1757# if ISO_14755
1791 scr_overlay_off (); 1758 scr_overlay_off ();
1792# endif 1759# endif
1793 } 1760 }
1794#endif 1761#endif
1795#if USE_XIM 1762#if USE_XIM
1797 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1798#endif 1765#endif
1799#if CURSOR_BLINK 1766#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1802 hidden_cursor = 0; 1770 hidden_cursor = 0;
1803#endif 1771#endif
1804#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1806 { 1774 {
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1791 }
1824#endif 1792#endif
1825} 1793}
1826 1794
1827#if TRANSPARENT || ENABLE_PERL 1795#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1796void
1829rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1798{
1831 make_current (); 1799 make_current ();
1832 1800
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1803 return;
1836 1804
1837# if TRANSPARENT 1805# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1806 switch (ev.type)
1839 { 1807 {
1840 case PropertyNotify: 1808 case PropertyNotify:
1841 /* 1809 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
1843 * use the property to determine the pixmap. We use it later on. 1811 * use the property to determine the pixmap. We use it later on.
1844 */ 1812 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1815 {
1816 bgPixmap.set_root_pixmap ();
1817 update_background ();
1818 }
1848 1819
1849 /* FALLTHROUGH */
1850 case ReparentNotify:
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1820 break;
1854 } 1821 }
1855# endif 1822# endif
1823
1824 refresh_check ();
1856} 1825}
1857#endif 1826#endif
1858 1827
1859void 1828void
1860rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
1915 mouse_report (ev); 1884 mouse_report (ev);
1916 } 1885 }
1917#else 1886#else
1918 MEvent.button = ev.button; 1887 MEvent.button = ev.button;
1919 mouse_report (ev); 1888 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1889#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1890
1922 } 1891 }
1923 else 1892 else
1924 { 1893 {
1925 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
1973 } 1942 }
1974 1943
1975 /* 1944 /*
1976 * Scrollbar window processing of button press 1945 * Scrollbar window processing of button press
1977 */ 1946 */
1978 if (isScrollbarWindow (ev.window)) 1947 if (scrollBar.state && ev.window == scrollBar.win)
1979 { 1948 {
1980 scrollBar.setIdle (); 1949 page_dirn direction = NO_DIR;
1950
1951 if (scrollBar.upButton (ev.y))
1952 direction = UP; /* up */
1953 else if (scrollBar.dnButton (ev.y))
1954 direction = DN; /* down */
1955
1956 scrollBar.state = STATE_IDLE;
1981 /* 1957 /*
1982 * Rxvt-style scrollbar: 1958 * Rxvt-style scrollbar:
1983 * move up if mouse is above slider 1959 * move up if mouse is above slider
1984 * move dn if mouse is below slider 1960 * move dn if mouse is below slider
1985 * 1961 *
1994 /* 1970 /*
1995 * Mouse report disabled scrollbar: 1971 * Mouse report disabled scrollbar:
1996 * arrow buttons - send up/down 1972 * arrow buttons - send up/down
1997 * click on scrollbar - send pageup/down 1973 * click on scrollbar - send pageup/down
1998 */ 1974 */
1999 if ((scrollBar.style == R_SB_NEXT 1975 if (direction == UP)
2000 && scrollbarnext_upButton (ev.y))
2001 || (scrollBar.style == R_SB_RXVT
2002 && scrollbarrxvt_upButton (ev.y)))
2003 tt_printf ("\033[A"); 1976 tt_printf ("\033[A");
2004 else if ((scrollBar.style == R_SB_NEXT 1977 else if (direction == DN)
2005 && scrollbarnext_dnButton (ev.y))
2006 || (scrollBar.style == R_SB_RXVT
2007 && scrollbarrxvt_dnButton (ev.y)))
2008 tt_printf ("\033[B"); 1978 tt_printf ("\033[B");
2009 else 1979 else
2010 switch (ev.button) 1980 switch (ev.button)
2011 { 1981 {
2012 case Button2: 1982 case Button2:
2019 tt_printf ("\033[5~"); 1989 tt_printf ("\033[5~");
2020 break; 1990 break;
2021 } 1991 }
2022 } 1992 }
2023 else 1993 else
2024#endif /* NO_SCROLLBAR_REPORT */ 1994#endif /* NO_SCROLLBAR_REPORT */
2025
2026 {
2027 char upordown = 0;
2028
2029 if (scrollBar.style == R_SB_NEXT)
2030 { 1995 {
2031 if (scrollbarnext_upButton (ev.y)) 1996 if (direction != NO_DIR)
2032 upordown = -1; /* up */
2033 else if (scrollbarnext_dnButton (ev.y))
2034 upordown = 1; /* down */
2035 }
2036 else if (scrollBar.style == R_SB_RXVT)
2037 {
2038 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */
2042 }
2043 if (upordown)
2044 { 1997 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1998#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1999 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 2001#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 2002 if (scr_page (direction, 1))
2049 { 2003 {
2050 if (upordown < 0) 2004 if (direction == UP)
2051 scrollBar.setUp (); 2005 scrollBar.state = STATE_UP;
2052 else 2006 else
2053 scrollBar.setDn (); 2007 scrollBar.state = STATE_DOWN;
2054 } 2008 }
2055 } 2009 }
2056 else 2010 else
2057 switch (ev.button) 2011 switch (ev.button)
2058 { 2012 {
2059 case Button2: 2013 case Button2:
2060 switch (scrollbar_align) 2014 switch (scrollBar.align)
2061 { 2015 {
2062 case R_SB_ALIGN_TOP: 2016 case R_SB_ALIGN_TOP:
2063 csrO = 0; 2017 csrO = 0;
2064 break; 2018 break;
2065 case R_SB_ALIGN_CENTRE: 2019 case R_SB_ALIGN_CENTRE:
2073 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
2074 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
2075 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2077 2031
2078 scrollBar.setMotion (); 2032 scrollBar.state = STATE_MOTION;
2079 break; 2033 break;
2080 2034
2081 case Button1: 2035 case Button1:
2082 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2036 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2083 csrO = ev.y - scrollBar.top; 2037 csrO = ev.y - scrollBar.top;
2084 /* FALLTHROUGH */ 2038 /* FALLTHROUGH */
2085 2039
2086 case Button3: 2040 case Button3:
2087 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
2097 scr_page (DN, nrow - 1); 2051 scr_page (DN, nrow - 1);
2098# else 2052# else
2099 scr_page (DN, nrow / 4); 2053 scr_page (DN, nrow / 4);
2100# endif 2054# endif
2101 else 2055 else
2102 scrollBar.setMotion (); 2056 scrollBar.state = STATE_MOTION;
2103 } 2057 }
2104 else 2058 else
2105 { 2059 {
2106 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
2107 (nrow 2061 (nrow
2124 2078
2125 csrO = 0; /* reset csr Offset */ 2079 csrO = 0; /* reset csr Offset */
2126 if (!bypass_keystate) 2080 if (!bypass_keystate)
2127 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2128 2082
2129 if (scrollbar_isUpDn ()) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2130 { 2084 {
2131 scrollBar.setIdle (); 2085 scrollBar.state = STATE_IDLE;
2132 scrollbar_show (0); 2086 scrollbar_show (0);
2133 } 2087 }
2134 2088
2135#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
2138#endif 2091#endif
2139 2092
2140 if (ev.window == vt) 2093 if (ev.window == vt)
2141 { 2094 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2095 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2166 mouse_report (ev); 2119 mouse_report (ev);
2167 } 2120 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2121#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2122 MEvent.button = AnyButton;
2170 mouse_report (ev); 2123 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2124#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2125 return;
2173 } 2126 }
2174 2127
2175 /* 2128 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2129 * dumb hack to compensate for the failure of click-and-drag
2214 { 2167 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2168 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2169 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2171
2219 if (slip_wheel_ev.at < NOW) 2172 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2174 }
2224 else 2175 else
2176# endif
2225 { 2177 {
2226# endif
2227 scr_page (v, i); 2178 scr_page (v, i);
2228 scrollbar_show (1); 2179 scrollbar_show (1);
2229# ifdef MOUSE_SLIP_WHEELING
2230 } 2180 }
2231# endif
2232 } 2181 }
2233 break; 2182 break;
2234#endif 2183#endif
2235 } 2184 }
2236 } 2185 }
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 {
2508 { 2453 {
2509 if ((buf[len++] = cmd_getc ()) == 'i') 2454 if ((buf[len++] = cmd_getc ()) == 'i')
2510 break; /* done = 1 */ 2455 break; /* done = 1 */
2511 } 2456 }
2512 } 2457 }
2513 2458
2514 for (i = 0; i < len; i++) 2459 for (i = 0; i < len; i++)
2515 if (putc (buf[i], fd) == EOF) 2460 if (putc (buf[i], fd) == EOF)
2516 { 2461 {
2517 done = 1; 2462 done = 1;
2518 break; 2463 break;
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;
2833
2888 case '?': 2834 case '?':
2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2890 process_terminal_mode (ch, priv, nargs, arg); 2836 process_terminal_mode (ch, priv, nargs, arg);
2891 break; 2837 break;
2892 } 2838 }
3336 int saveop = op; 3282 int saveop = op;
3337 3283
3338 dLocal (Display *, dpy); 3284 dLocal (Display *, dpy);
3339 3285
3340 assert (str != NULL); 3286 assert (str != NULL);
3341 3287
3342 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3288 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3343 return; 3289 return;
3344 3290
3345 switch (op) 3291 switch (op)
3346 { 3292 {
3408 *buf++ = '\0'; 3354 *buf++ = '\0';
3409 3355
3410 process_color_seq (op, color, name, resp); 3356 process_color_seq (op, color, name, resp);
3411 } 3357 }
3412 break; 3358 break;
3359 case Rxvt_restoreFG:
3413 case XTerm_Color00: 3360 case XTerm_Color00:
3414 process_color_seq (op, Color_fg, str, resp); 3361 process_color_seq (op, Color_fg, str, resp);
3415 break; 3362 break;
3363 case Rxvt_restoreBG:
3416 case XTerm_Color01: 3364 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp); 3365 process_color_seq (op, Color_bg, str, resp);
3418 break; 3366 break;
3419#ifndef NO_CURSORCOLOR 3367#ifndef NO_CURSORCOLOR
3420 case XTerm_Color_cursor: 3368 case XTerm_Color_cursor:
3441 break; 3389 break;
3442 case URxvt_Color_IT: 3390 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp); 3391 process_color_seq (op, Color_IT, str, resp);
3444 break; 3392 break;
3445#endif 3393#endif
3446#if TRANSPARENT && TINTING 3394#if ENABLE_TRANSPARENCY
3447 case URxvt_Color_tint: 3395 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp); 3396 process_color_seq (op, Color_tint, str, resp);
3397 {
3398 bool changed = false;
3449 3399
3450 check_our_parents (); 3400 if (ISSET_PIXCOLOR (Color_tint))
3401 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3402 else
3403 changed = bgPixmap.unset_tint ();
3451 3404
3452 if (am_transparent) 3405 if (changed)
3453 want_full_refresh = want_refresh = 1; 3406 update_background ();
3407 }
3454 3408
3455 break; 3409 break;
3456#endif 3410#endif
3457 3411
3412#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap: 3413 case Rxvt_Pixmap:
3459 { 3414 if (!strcmp (str, "?"))
3460 if (*str != ';')
3461 { 3415 {
3462#if XPM_BACKGROUND 3416 char str[256];
3463 scale_pixmap (""); /* reset to default scaling */ 3417
3464 set_bgPixmap (str); /* change pixmap */ 3418 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3465 scr_touch (true); 3419 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3466#endif 3420 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3421 process_xterm_seq (XTerm_title, str, CHAR_ST);
3467 } 3422 }
3468 3423 else
3424 {
3469 int changed = 0; 3425 int changed = 0;
3470 3426
3471 while ((str = strchr (str, ';')) != NULL) 3427 if (*str != ';')
3472 { 3428 {
3429 /* reset to default scaling :*/
3430 bgPixmap.unset_geometry ();
3431 if (bgPixmap.set_file (str)) /* change pixmap */
3432 changed++;
3433 str = strchr (str, ';');
3434 if (str == NULL)
3435 bgPixmap.set_defaultGeometry ();
3436 }
3437
3438 while (str)
3439 {
3473 str++; 3440 str++;
3474#if XPM_BACKGROUND 3441 if (bgPixmap.set_geometry (str))
3475 changed += scale_pixmap (str); 3442 changed++;
3476#endif 3443 str = strchr (str, ';');
3477 } 3444 }
3478 3445
3479 if (changed) 3446 if (changed)
3480 { 3447 update_background ();
3481#ifdef XPM_BACKGROUND
3482 resize_pixmap ();
3483 scr_touch (true);
3484#endif
3485 } 3448 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE) 3449 break;
3487 if (option(Opt_transparent))
3488 check_our_parents ();
3489#endif 3450#endif
3490
3491 }
3492 break;
3493
3494 case Rxvt_restoreFG:
3495 set_window_color (Color_fg, str);
3496 break;
3497 case Rxvt_restoreBG:
3498 set_window_color (Color_bg, str);
3499 break;
3500 3451
3501 case XTerm_logfile: 3452 case XTerm_logfile:
3502 // TODO, when secure mode? 3453 // TODO, when secure mode?
3503 break; 3454 break;
3504 3455
3619{ 3570{
3620 unsigned int i, j; 3571 unsigned int i, j;
3621 int state; 3572 int state;
3622 3573
3623 static const struct 3574 static const struct
3624 { 3575 {
3625 const int argval; 3576 const int argval;
3626 const unsigned long bit; 3577 const unsigned long bit;
3627 }
3628
3629 argtopriv[] = { 3578 } argtopriv[] = {
3630 { 1, PrivMode_aplCUR }, 3579 { 1, PrivMode_aplCUR },
3631 { 2, PrivMode_vt52 }, 3580 { 2, PrivMode_vt52 },
3632 { 3, PrivMode_132 }, 3581 { 3, PrivMode_132 },
3633 { 4, PrivMode_smoothScroll }, 3582 { 4, PrivMode_smoothScroll },
3634 { 5, PrivMode_rVideo }, 3583 { 5, PrivMode_rVideo },
3650 { 66, PrivMode_aplKP }, 3599 { 66, PrivMode_aplKP },
3651#ifndef NO_BACKSPACE_KEY 3600#ifndef NO_BACKSPACE_KEY
3652 { 67, PrivMode_BackSpace }, 3601 { 67, PrivMode_BackSpace },
3653#endif 3602#endif
3654 { 1000, PrivMode_MouseX11 }, 3603 { 1000, PrivMode_MouseX11 },
3655 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3604 { 1002, PrivMode_MouseBtnEvent },
3656 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3605 { 1003, PrivMode_MouseAnyEvent },
3657 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3658 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3659 { 1011, PrivMode_Keypress }, // rxvt extension 3607 { 1011, PrivMode_Keypress }, // rxvt extension
3660 // 1035 enable modifiers for alt, numlock NYI 3608 // 1035 enable modifiers for alt, numlock NYI
3661 // 1036 send ESC for meta keys NYI 3609 // 1036 send ESC for meta keys NYI
3662 // 1037 send DEL for keypad delete NYI 3610 // 1037 send DEL for keypad delete NYI
3663 { 1047, PrivMode_Screen }, 3611 { 1047, PrivMode_Screen },
3664 // 1048 save and restore cursor 3612 // 1048 save and restore cursor
3665 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3613 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3666 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste },
3667 }; 3616 };
3668 3617
3669 if (nargs == 0) 3618 if (nargs == 0)
3670 return; 3619 return;
3671 3620
3719 */ 3668 */
3720 PrivMode (1, PrivMode_vt52); 3669 PrivMode (1, PrivMode_vt52);
3721 break; 3670 break;
3722 case 3: /* 80/132 */ 3671 case 3: /* 80/132 */
3723 if (priv_modes & PrivMode_132OK) 3672 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
3724 set_widthheight (((state ? 132 : 80) * fwidth), height); 3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3676 }
3725 break; 3677 break;
3726 case 4: /* smooth scrolling */ 3678 case 4: /* smooth scrolling */
3727 set_option (Opt_jumpScroll, !state); 3679 set_option (Opt_jumpScroll, !state);
3728 break; 3680 break;
3729 case 5: /* reverse video */ 3681 case 5: /* reverse video */
3736 scr_autowrap (state); 3688 scr_autowrap (state);
3737 break; 3689 break;
3738 /* 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 */
3739 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
3740 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
3741 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3742 break; 3694 break;
3743#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
3744 case scrollBar_esc: 3696 case scrollBar_esc:
3745 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
3746 { 3698 {
3759 break; 3711 break;
3760 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
3761 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
3762 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
3763 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
3764 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3765 break; 3717 break;
3766#if 0
3767 case 1001: 3718 case 1002:
3768 break; /* X11 mouse highlighting */ 3719 case 1003:
3769#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;
3770 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
3771 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
3772 break; 3732 break;
3773 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
3774 set_option (Opt_scrollTtyKeypress, state); 3734 set_option (Opt_scrollTtyKeypress, state);
3951rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
3952{ 3912{
3953 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
3954 3914
3955 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
3956 { /* query graphics */ 3917 /* query graphics */
3957 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
3958 return; 3919 return;
3959 } 3920 }
3960 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
3961 do 3922 do
4011 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4012 3973
4013 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
4014 v_buflen += len; 3975 v_buflen += len;
4015 3976
4016 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
4017} 3978}
4018 3979
4019void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4020{ 3981{
4021 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));
4026 3987
4027 if (v_buflen == 0) 3988 if (v_buflen == 0)
4028 { 3989 {
4029 free (v_buffer); 3990 free (v_buffer);
4030 v_buffer = 0; 3991 v_buffer = 0;
4031 v_buflen = 0;
4032 3992
4033 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4034 return; 3994 return;
4035 } 3995 }
4036 3996
4037 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4038 } 3998 }
4039 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4040 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4041} 4001}
4042 4002
4043/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4044 4004

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines