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.391 by root, Wed Jan 9 01:14:29 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
519# endif 519# endif
520 return; 520 return;
521 } 521 }
522 else 522 else
523 { 523 {
524# if ENABLE_OVERLAY 524# if ISO_14755
525 scr_overlay_off (); 525 scr_overlay_off ();
526# endif 526# endif
527 iso14755buf = 0; 527 iso14755buf = 0;
528 } 528 }
529 } 529 }
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
533 { 533 {
534 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 535# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 538# endif
539 } 539 }
540#endif 540#endif
541 541
542#ifdef PRINTPIPE 542#ifdef PRINTPIPE
543 if (keysym == XK_Print) 543 if (keysym == XK_Print)
544 { 544 {
545 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
546 return; 546 return;
548#endif 548#endif
549 549
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 551 {
552 { 552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 554 newlen = 1;
555#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 };
572
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
574 {
575 unsigned int index = keysym - XK_KP_Home;
576 keysym = kp ? keypadtrans[index] : XK_Home + index;
577 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
554 switch (keysym) 585 switch (keysym)
555 { 586 {
556#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace: 588 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace) 589 if (priv_modes & PrivMode_HaveBackSpace)
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177'; 592 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0'; 593 kbuf[1] = '\0';
563 } 594 }
564 else 595 else
565 strcpy (kbuf, key_backspace); 596 strcpy (kbuf, rs[Rs_backspace_key]);
566 break; 597 break;
567#endif 598#endif
568#ifndef NO_DELETE_KEY 599#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: 600 case XK_Delete:
580 strcpy (kbuf, key_delete); 601 strcpy (kbuf, rs[Rs_delete_key]);
581 break; 602 break;
582#endif 603#endif
583 case XK_Tab: 604 case XK_Tab:
584 if (shft) 605 if (shft)
585 strcpy (kbuf, "\033[Z"); 606 strcpy (kbuf, "\033[Z");
595#endif 616#endif
596 newlen = 0; 617 newlen = 0;
597 } 618 }
598 break; 619 break;
599 620
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" */ 621 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */ 622 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */ 623 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */ 624 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z"); 625 strcpy (kbuf, "\033[Z");
630 else if (priv_modes & PrivMode_aplCUR) 635 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O'; 636 kbuf[1] = 'O';
632 break; 637 break;
633 638
634#ifndef UNSHIFTED_SCROLLKEYS 639#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: 640 case XK_Prior:
646 strcpy (kbuf, "\033[5~"); 641 strcpy (kbuf, "\033[5~");
647 break; 642 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: 643 case XK_Next:
659 strcpy (kbuf, "\033[6~"); 644 strcpy (kbuf, "\033[6~");
660 break; 645 break;
661#endif 646#endif
662 case XK_KP_Enter: 647 case XK_KP_Enter:
663 /* allow shift to override */ 648 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 649 if (kp)
665 { 650 {
666 strcpy (kbuf, "\033OM"); 651 strcpy (kbuf, "\033OM");
667 break; 652 break;
668 } 653 }
669 654
681 kbuf[0] = '\015'; 666 kbuf[0] = '\015';
682 kbuf[1] = '\0'; 667 kbuf[1] = '\0';
683 } 668 }
684 break; 669 break;
685 670
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" */ 671 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */ 672 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */ 673 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */ 674 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP"); 675 strcpy (kbuf, "\033OP");
712 case XK_KP_6: /* "\033Ov" : "6" */ 691 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */ 692 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */ 693 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */ 694 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */ 695 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 696 if (kp)
718 { 697 {
719 strcpy (kbuf, "\033Oj"); 698 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply); 699 kbuf[2] += (keysym - XK_KP_Multiply);
721 } 700 }
722 else 701 else
728 707
729 case XK_Find: 708 case XK_Find:
730 strcpy (kbuf, "\033[1~"); 709 strcpy (kbuf, "\033[1~");
731 break; 710 break;
732 711
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: 712 case XK_Insert:
744 strcpy (kbuf, "\033[2~"); 713 strcpy (kbuf, "\033[2~");
745 break; 714 break;
746#ifdef DXK_Remove /* support for DEC remove like key */ 715#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove: 716 case DXK_Remove:
751 strcpy (kbuf, "\033[3~"); 720 strcpy (kbuf, "\033[3~");
752 break; 721 break;
753 case XK_Select: 722 case XK_Select:
754 strcpy (kbuf, "\033[4~"); 723 strcpy (kbuf, "\033[4~");
755 break; 724 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: 725 case XK_End:
767 strcpy (kbuf, KS_END); 726 strcpy (kbuf, KS_END);
768 break; 727 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: 728 case XK_Home:
780 strcpy (kbuf, KS_HOME); 729 strcpy (kbuf, KS_HOME);
781 break; 730 break;
782 731
783#define FKEY(n, fkey) \ 732#define FKEY(n, fkey) \
934#if ENABLE_FRILLS || ISO_14755 883#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 884 // ISO 14755 support
936 if (iso14755buf) 885 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 886 if (iso14755buf & ISO_14755_52)
938 { 887 {
939# if ENABLE_OVERLAY 888# if ISO_14755
940 scr_overlay_off (); 889 scr_overlay_off ();
941# endif 890# endif
942# if ISO_14755 891# if ISO_14755
943 // iso14755 part 5.2 handling: release time 892 // iso14755 part 5.2 handling: release time
944 // first: controls 893 // first: controls
967 916
968 return; 917 return;
969 } 918 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 919 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 920 {
972# if ENABLE_OVERLAY 921# if ISO_14755
973 scr_overlay_off (); 922 scr_overlay_off ();
974# endif 923# endif
975 if (iso14755buf & ISO_14755_51) 924 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 925 commit_iso14755 ();
977#if ISO_14755 926#if ISO_14755
1035void 984void
1036rxvt_term::flush () 985rxvt_term::flush ()
1037{ 986{
1038 flush_ev.stop (); 987 flush_ev.stop ();
1039 988
1040#ifdef TRANSPARENT 989#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 990 if (bgPixmap.check_clearChanged ())
1042 { 991 {
1043 want_full_refresh = 0; 992// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 993 scr_touch (false);
1046 } 994 }
1047#endif 995#endif
1048 996
1049 if (want_refresh) 997 if (want_refresh)
1094 } 1042 }
1095 1043
1096 display->flush (); 1044 display->flush ();
1097} 1045}
1098 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
1099void 1048void
1100rxvt_term::check_cb (check_watcher &w) 1049rxvt_term::refresh_check ()
1050{
1051 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1053
1054 display->flush ();
1055}
1056
1057void
1058rxvt_term::flush_cb (ev::timer &w, int revents)
1101{ 1059{
1102 make_current (); 1060 make_current ();
1103 1061
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; 1062 refresh_count = 0;
1117 flush (); 1063 flush ();
1118} 1064}
1119 1065
1120#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1121void 1067void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1069{
1124 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1071 want_refresh = 1;
1126 1072 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1073}
1129#endif 1074#endif
1130 1075
1131#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1132void 1077void
1133rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1079{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1081 {
1137 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1138 want_refresh = 1; 1083 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
1140 } 1085 }
1086 else
1087 w.stop ();
1141} 1088}
1142#endif 1089#endif
1143 1090
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1092void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1094{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollbar_isUp () || scrollbar_isDn ())
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1150 { 1097 {
1151 want_refresh = 1; 1098 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1153 } 1100 }
1101 else
1102 w.stop ();
1154} 1103}
1155#endif 1104#endif
1156 1105
1157#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1158void 1107void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1109{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1111 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1113 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1166 } 1115 }
1116 else
1117 w.stop ();
1167} 1118}
1168#endif 1119#endif
1169 1120
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1122void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1124{
1174 if (mouse_slip_wheel_speed == 0 1125 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 { 1126 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1127 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1132 {
1133 mouse_slip_wheel_speed = 0;
1134 w.stop ();
1183 } 1135 }
1184} 1136}
1185#endif 1137#endif
1186 1138
1187#if LINUX_YIELD_HACK 1139#if LINUX_YIELD_HACK
1188static struct event_handler 1140static struct event_handler
1189{ 1141{
1190 check_watcher yield_ev; 1142 ev::prepare yield_ev;
1191 1143
1192 void yield_cb (check_watcher &w) 1144 void yield_cb (ev::prepare &w, int revents)
1193 { 1145 {
1194 // this should really be sched_yield(), but the linux guys thought 1146 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1147 // 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 1148 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS. 1149 // allowed by the sus... as is returning ENOSYS.
1243 pty_ev.stop (); 1195 pty_ev.stop ();
1244 1196
1245 if (!option (Opt_hold)) 1197 if (!option (Opt_hold))
1246 destroy (); 1198 destroy ();
1247 } 1199 }
1248 1200
1249 return false; 1201 return false;
1250} 1202}
1251 1203
1252void 1204void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1205rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1206{
1255 make_current (); 1207 make_current ();
1256 1208
1257 if (revents & EVENT_READ) 1209 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1210 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1211 while (pty_fill ())
1260 if (cmd_parse ()) 1212 if (cmd_parse ())
1261 break; 1213 break;
1262 1214
1263 if (revents & EVENT_WRITE) 1215 if (revents & ev::WRITE)
1264 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1265} 1219}
1266 1220
1267void 1221void
1268rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1269{ 1223{
1272 1226
1273#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1228 hidden_pointer = 0;
1275 1229
1276 if (option (Opt_pointerBlank)) 1230 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1231 pointer_ev.start (pointerBlankDelay);
1278#endif 1232#endif
1279} 1233}
1280 1234
1281#ifdef POINTER_BLANK 1235#ifdef POINTER_BLANK
1282void 1236void
1290 1244
1291 hidden_pointer = 1; 1245 hidden_pointer = 1;
1292} 1246}
1293 1247
1294void 1248void
1295rxvt_term::pointer_cb (time_watcher &w) 1249rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1250{
1297 make_current (); 1251 make_current ();
1298 1252
1299 pointer_blank (); 1253 pointer_blank ();
1300} 1254}
1303void 1257void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1258rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1259{
1306 int button_number, key_state = 0; 1260 int button_number, key_state = 0;
1307 int x, y; 1261 int x, y;
1262 int code = 32;
1308 1263
1309 x = ev.x; 1264 x = Pixel2Col (ev.x);
1310 y = ev.y; 1265 y = Pixel2Row (ev.y);
1311 pixel_position (&x, &y); 1266 if (ev.type == MotionNotify)
1267 {
1268 if (x == mouse_row && y == mouse_col)
1269 return;
1270 mouse_row = x;
1271 mouse_col = y;
1272 code += 32;
1273 }
1312 1274
1313 if (MEvent.button == AnyButton) 1275 if (MEvent.button == AnyButton)
1314 button_number = 3; 1276 button_number = 3;
1315 else 1277 else
1316 { 1278 {
1362 x + 1, 1324 x + 1,
1363 y + 1); 1325 y + 1);
1364#endif 1326#endif
1365 1327
1366 tt_printf ("\033[M%c%c%c", 1328 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1329 (code + button_number + key_state),
1368 (32 + x + 1), 1330 (32 + x + 1),
1369 (32 + y + 1)); 1331 (32 + y + 1));
1370} 1332}
1371 1333
1372/*{{{ process an X event */ 1334/*{{{ process an X event */
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1396 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1397 focus_out ();
1436 } 1398 }
1437#endif 1399#endif
1438 } 1400 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1401 break;
1444 1402
1445 /* 1403 /*
1446 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1405 * Here's my conclusion:
1480 && ev.xfocus.mode != NotifyGrab) 1438 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1439 focus_out ();
1482 break; 1440 break;
1483 1441
1484 case ConfigureNotify: 1442 case ConfigureNotify:
1443 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */
1485 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1486 { 1447 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1449 ;
1489 1450
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1452 {
1492 seen_resize = 1; 1453 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1454 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 } 1455 }
1456 else
1457 {
1458#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ())
1460 update_background ();
1461#endif
1462 }
1502 1463
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1464 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 } 1465 }
1510 break; 1466 break;
1511 1467
1512 case PropertyNotify: 1468 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1469 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1531 break; 1487 break;
1532 1488
1533 case MapNotify: 1489 case MapNotify:
1534 mapped = 1; 1490 mapped = 1;
1535#ifdef TEXT_BLINK 1491#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1492 text_blink_ev.start ();
1537#endif 1493#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1494 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1495 break;
1540 1496
1541 case UnmapNotify: 1497 case UnmapNotify:
1543#ifdef TEXT_BLINK 1499#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1500 text_blink_ev.stop ();
1545#endif 1501#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1502 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1503 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1504
1555 case GraphicsExpose: 1505 case GraphicsExpose:
1556 case Expose: 1506 case Expose:
1557 if (ev.xany.window == vt) 1507 if (ev.xany.window == vt)
1558 { 1508 {
1559 do 1509 do
1510 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1513 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1514 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1515
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1517
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1519 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1520 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1521 ev.xexpose.width, ev.xexpose.height, False);
1522 }
1569 1523
1570 want_refresh = 1; 1524 want_refresh = 1;
1571 } 1525 }
1572 else 1526 else
1573 { 1527 {
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1531 ;
1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1532 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1533 ;
1580 1534
1581 if (isScrollbarWindow (ev.xany.window)) 1535 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1536 {
1583 scrollBar.setIdle (); 1537 scrollBar.setIdle ();
1584 scrollbar_show (0); 1538 scrollbar_show (0);
1585 } 1539 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1540 }
1592 break; 1541 break;
1593 1542
1594 case MotionNotify: 1543 case MotionNotify:
1595#ifdef POINTER_BLANK 1544#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1545 if (hidden_pointer)
1597 pointer_unblank (); 1546 pointer_unblank ();
1598#endif 1547#endif
1548 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1549 || priv_modes & PrivMode_MouseAnyEvent)
1550 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1552 break;
1601 1553
1602 if (ev.xany.window == vt) 1554 if (ev.xany.window == vt)
1603 { 1555 {
1637 int dist; 1589 int dist;
1638 1590
1639 /* don't clobber the current delay if we are 1591 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1592 * already in the middle of scrolling.
1641 */ 1593 */
1642 if (!sel_scroll_ev.active) 1594 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1595 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1596
1645 /* save the event params so we can highlight 1597 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1598 * the selection in the pending-scroll loop
1647 */ 1599 */
1648 selection_save_x = ev.xbutton.x; 1600 selection_save_x = ev.xbutton.x;
1670 else 1622 else
1671 { 1623 {
1672 /* we are within the text window, so we 1624 /* we are within the text window, so we
1673 * shouldn't be scrolling 1625 * shouldn't be scrolling
1674 */ 1626 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1627 sel_scroll_ev.stop();
1677 } 1628 }
1678#endif 1629#endif
1679#ifdef MOUSE_THRESHOLD 1630#ifdef MOUSE_THRESHOLD
1680 } 1631 }
1681#endif 1632#endif
1682 } 1633 }
1683 } 1634 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1635 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1685 { 1636 {
1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1637 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1638 MotionNotify, &ev))
1688 ; 1639 ;
1689 1640
1693 &ev.xbutton.x, &ev.xbutton.y, 1644 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1645 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1646 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1647 scrollbar_size ());
1697 want_refresh = 1; 1648 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1649 scrollbar_show (1);
1700 } 1650 }
1701 break; 1651 break;
1702 } 1652 }
1703 1653
1708 { 1658 {
1709 hidden_cursor = 0; 1659 hidden_cursor = 0;
1710 want_refresh = 1; 1660 want_refresh = 1;
1711 } 1661 }
1712 1662
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1663 cursor_blink_ev.again ();
1714 } 1664 }
1715#endif 1665#endif
1716 1666
1717#if defined(POINTER_BLANK) 1667#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1668 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1725 1675
1726 if (ev.type == KeyPress && hidden_pointer == 0) 1676 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank (); 1677 pointer_blank ();
1728 } 1678 }
1729#endif 1679#endif
1680
1681 refresh_check ();
1730} 1682}
1731 1683
1732void 1684void
1733rxvt_term::focus_in () 1685rxvt_term::focus_in ()
1734{ 1686{
1746 XSetICFocus (Input_Context); 1698 XSetICFocus (Input_Context);
1747 } 1699 }
1748#endif 1700#endif
1749#if CURSOR_BLINK 1701#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1702 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1703 cursor_blink_ev.again ();
1752#endif 1704#endif
1753#if OFF_FOCUS_FADING 1705#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1706 if (rs[Rs_fade])
1755 { 1707 {
1756 pix_colors = pix_colors_focused; 1708 pix_colors = pix_colors_focused;
1758 } 1710 }
1759#endif 1711#endif
1760#if ENABLE_FRILLS 1712#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1713 if (option (Opt_urgentOnBell))
1762 { 1714 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]); 1715 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1766 if (h != NULL)
1767 { 1716 {
1768 h->flags &= ~XUrgencyHint; 1717 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h); 1718 XSetWMHints (dpy, parent[0], h);
1770 } 1719 }
1771 } 1720 }
1772#endif 1721#endif
1773 } 1722 }
1774} 1723}
1785 1734
1786#if ENABLE_FRILLS || ISO_14755 1735#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1736 if (iso14755buf)
1788 { 1737 {
1789 iso14755buf = 0; 1738 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1739# if ISO_14755
1791 scr_overlay_off (); 1740 scr_overlay_off ();
1792# endif 1741# endif
1793 } 1742 }
1794#endif 1743#endif
1795#if USE_XIM 1744#if USE_XIM
1797 XUnsetICFocus (Input_Context); 1746 XUnsetICFocus (Input_Context);
1798#endif 1747#endif
1799#if CURSOR_BLINK 1748#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1749 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1750 cursor_blink_ev.stop ();
1751
1802 hidden_cursor = 0; 1752 hidden_cursor = 0;
1803#endif 1753#endif
1804#if OFF_FOCUS_FADING 1754#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1755 if (rs[Rs_fade])
1806 { 1756 {
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1772 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1773 }
1824#endif 1774#endif
1825} 1775}
1826 1776
1827#if TRANSPARENT || ENABLE_PERL 1777#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1778void
1829rxvt_term::rootwin_cb (XEvent &ev) 1779rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1780{
1831 make_current (); 1781 make_current ();
1832 1782
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1783 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1784 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1785 return;
1836 1786
1837# if TRANSPARENT 1787# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1788 switch (ev.type)
1839 { 1789 {
1840 case PropertyNotify: 1790 case PropertyNotify:
1841 /* 1791 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1792 * 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. 1793 * use the property to determine the pixmap. We use it later on.
1844 */ 1794 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1795 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1796 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1797 {
1798 bgPixmap.set_root_pixmap ();
1799 update_background ();
1800 }
1848 1801
1849 /* FALLTHROUGH */
1850 case ReparentNotify:
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1802 break;
1854 } 1803 }
1855# endif 1804# endif
1805
1806 refresh_check ();
1856} 1807}
1857#endif 1808#endif
1858 1809
1859void 1810void
1860rxvt_term::button_press (XButtonEvent &ev) 1811rxvt_term::button_press (XButtonEvent &ev)
1915 mouse_report (ev); 1866 mouse_report (ev);
1916 } 1867 }
1917#else 1868#else
1918 MEvent.button = ev.button; 1869 MEvent.button = ev.button;
1919 mouse_report (ev); 1870 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1871#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1872
1922 } 1873 }
1923 else 1874 else
1924 { 1875 {
1925 if (ev.button != MEvent.button) 1876 if (ev.button != MEvent.button)
1973 } 1924 }
1974 1925
1975 /* 1926 /*
1976 * Scrollbar window processing of button press 1927 * Scrollbar window processing of button press
1977 */ 1928 */
1978 if (isScrollbarWindow (ev.window)) 1929 if (scrollBar.state && ev.window == scrollBar.win)
1979 { 1930 {
1980 scrollBar.setIdle (); 1931 scrollBar.setIdle ();
1981 /* 1932 /*
1982 * Rxvt-style scrollbar: 1933 * Rxvt-style scrollbar:
1983 * move up if mouse is above slider 1934 * move up if mouse is above slider
2019 tt_printf ("\033[5~"); 1970 tt_printf ("\033[5~");
2020 break; 1971 break;
2021 } 1972 }
2022 } 1973 }
2023 else 1974 else
2024#endif /* NO_SCROLLBAR_REPORT */ 1975#endif /* NO_SCROLLBAR_REPORT */
2025 1976
2026 { 1977 {
2027 char upordown = 0; 1978 char upordown = 0;
2028 1979
2029 if (scrollBar.style == R_SB_NEXT) 1980 if (scrollBar.style == R_SB_NEXT)
2030 { 1981 {
2031 if (scrollbarnext_upButton (ev.y)) 1982 if (scrollbarnext_upButton (ev.y))
2032 upordown = -1; /* up */ 1983 upordown = -1; /* up */
2038 if (scrollbarrxvt_upButton (ev.y)) 1989 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */ 1990 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y)) 1991 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */ 1992 upordown = 1; /* down */
2042 } 1993 }
1994
2043 if (upordown) 1995 if (upordown)
2044 { 1996 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 2000#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 2001 if (scr_page (upordown < 0 ? UP : DN, 1))
2049 { 2002 {
2050 if (upordown < 0) 2003 if (upordown < 0)
2051 scrollBar.setUp (); 2004 scrollBar.setUp ();
2055 } 2008 }
2056 else 2009 else
2057 switch (ev.button) 2010 switch (ev.button)
2058 { 2011 {
2059 case Button2: 2012 case Button2:
2060 switch (scrollbar_align) 2013 switch (scrollBar.align)
2061 { 2014 {
2062 case R_SB_ALIGN_TOP: 2015 case R_SB_ALIGN_TOP:
2063 csrO = 0; 2016 csrO = 0;
2064 break; 2017 break;
2065 case R_SB_ALIGN_CENTRE: 2018 case R_SB_ALIGN_CENTRE:
2077 2030
2078 scrollBar.setMotion (); 2031 scrollBar.setMotion ();
2079 break; 2032 break;
2080 2033
2081 case Button1: 2034 case Button1:
2082 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2035 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2083 csrO = ev.y - scrollBar.top; 2036 csrO = ev.y - scrollBar.top;
2084 /* FALLTHROUGH */ 2037 /* FALLTHROUGH */
2085 2038
2086 case Button3: 2039 case Button3:
2087 if (scrollBar.style != R_SB_XTERM) 2040 if (scrollBar.style != R_SB_XTERM)
2131 scrollBar.setIdle (); 2084 scrollBar.setIdle ();
2132 scrollbar_show (0); 2085 scrollbar_show (0);
2133 } 2086 }
2134 2087
2135#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
2138#endif 2090#endif
2139 2091
2140 if (ev.window == vt) 2092 if (ev.window == vt)
2141 { 2093 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2094 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2166 mouse_report (ev); 2118 mouse_report (ev);
2167 } 2119 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2120#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2121 MEvent.button = AnyButton;
2170 mouse_report (ev); 2122 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2123#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2124 return;
2173 } 2125 }
2174 2126
2175 /* 2127 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2128 * dumb hack to compensate for the failure of click-and-drag
2214 { 2166 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2167 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2170
2219 if (slip_wheel_ev.at < NOW) 2171 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2173 }
2224 else 2174 else
2175# endif
2225 { 2176 {
2226# endif
2227 scr_page (v, i); 2177 scr_page (v, i);
2228 scrollbar_show (1); 2178 scrollbar_show (1);
2229# ifdef MOUSE_SLIP_WHEELING
2230 } 2179 }
2231# endif
2232 } 2180 }
2233 break; 2181 break;
2234#endif 2182#endif
2235 } 2183 }
2236 } 2184 }
2291 if (ch == C0_LF) 2239 if (ch == C0_LF)
2292 nlines++; 2240 nlines++;
2293 2241
2294 refresh_count++; 2242 refresh_count++;
2295 2243
2296 if (!option (Opt_jumpScroll) 2244 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2298 { 2245 {
2299 refreshnow = true;
2300 refresh_count = 0; 2246 refresh_count = 0;
2247
2248 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2249 {
2250 refreshnow = true;
2301 ch = NOCHAR; 2251 ch = NOCHAR;
2302 break; 2252 break;
2253 }
2303 } 2254 }
2304 2255
2305 // scr_add_lines only works for nlines <= nrow - 1. 2256 // scr_add_lines only works for nlines <= nrow - 1.
2306 if (nlines >= nrow - 1) 2257 if (nlines >= nrow - 1)
2307 { 2258 {
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2286 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2336 scr_add_lines (buf, str - buf, nlines); 2287 scr_add_lines (buf, str - buf, nlines);
2337 2288
2338 /* 2289 /*
2339 * If there have been a lot of new lines, then update the screen 2290 * 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. 2291 * 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 2292 * if skipScroll is enabled.
2342 * is incremented here because we must be doing flat-out scrolling.
2343 */ 2293 */
2344 if (refreshnow) 2294 if (refreshnow)
2345 { 2295 {
2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2347 refresh_limit++;
2348 else
2349 {
2350 flag = true; 2296 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2352 scr_refresh (); 2297 scr_refresh ();
2353 want_refresh = 1; 2298 want_refresh = 1;
2354 }
2355 } 2299 }
2356 2300
2357 } 2301 }
2358 else 2302 else
2359 { 2303 {
2508 { 2452 {
2509 if ((buf[len++] = cmd_getc ()) == 'i') 2453 if ((buf[len++] = cmd_getc ()) == 'i')
2510 break; /* done = 1 */ 2454 break; /* done = 1 */
2511 } 2455 }
2512 } 2456 }
2513 2457
2514 for (i = 0; i < len; i++) 2458 for (i = 0; i < len; i++)
2515 if (putc (buf[i], fd) == EOF) 2459 if (putc (buf[i], fd) == EOF)
2516 { 2460 {
2517 done = 1; 2461 done = 1;
2518 break; 2462 break;
2520 } 2464 }
2521 } 2465 }
2522 2466
2523 pclose_printer (fd); 2467 pclose_printer (fd);
2524} 2468}
2525#endif /* PRINTPIPE */ 2469#endif /* PRINTPIPE */
2526/*}}} */ 2470/*}}} */
2527 2471
2528/* *INDENT-OFF* */ 2472/* *INDENT-OFF* */
2529enum { 2473enum {
2530 C1_40 = 0x40, 2474 C1_40 = 0x40,
2580 process_dcs_seq (); 2524 process_dcs_seq ();
2581 break; 2525 break;
2582 case 0x9b: /* CSI */ 2526 case 0x9b: /* CSI */
2583 process_csi_seq (); 2527 process_csi_seq ();
2584 break; 2528 break;
2585 case 0x9d: /* CSI */ 2529 case 0x9d: /* OSC */
2586 process_osc_seq (); 2530 process_osc_seq ();
2587 break; 2531 break;
2588#endif 2532#endif
2589 } 2533 }
2590} 2534}
2816rxvt_term::process_csi_seq () 2760rxvt_term::process_csi_seq ()
2817{ 2761{
2818 unicode_t ch, priv, i; 2762 unicode_t ch, priv, i;
2819 unsigned int nargs, p; 2763 unsigned int nargs, p;
2820 int n, ndef; 2764 int n, ndef;
2821 int arg[ESC_ARGS]; 2765 int arg[ESC_ARGS] = { };
2822 2766
2823 for (nargs = ESC_ARGS; nargs > 0;) 2767 nargs = 0;
2824 arg[--nargs] = 0;
2825 2768
2826 priv = 0; 2769 priv = 0;
2827 ch = cmd_getc (); 2770 ch = cmd_getc ();
2828 if (ch >= '<' && ch <= '?') 2771 if (ch >= '<' && ch <= '?')
2772 {
2829 { /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' */
2830 priv = ch; 2774 priv = ch;
2831 ch = cmd_getc (); 2775 ch = cmd_getc ();
2832 } 2776 }
2833 2777
2834 /* read any numerical arguments */ 2778 /* read any numerical arguments */
2873 switch (priv) 2817 switch (priv)
2874 { 2818 {
2875 case '>': 2819 case '>':
2876 if (ch == CSI_DA) /* secondary device attributes */ 2820 if (ch == CSI_DA) /* secondary device attributes */
2877 { 2821 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2822 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2823 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 // 2824 //
2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2825 // 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 2826 // 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). 2827 // versions.
2884 // 2828 //
2885 tt_printf ("\033[>%d;94;0c", 'U'); 2829 tt_printf ("\033[>%d;95;0c", 'U');
2886 } 2830 }
2887 break; 2831 break;
2888 case '?': 2832 case '?':
2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2890 process_terminal_mode (ch, priv, nargs, arg); 2834 process_terminal_mode (ch, priv, nargs, arg);
3336 int saveop = op; 3280 int saveop = op;
3337 3281
3338 dLocal (Display *, dpy); 3282 dLocal (Display *, dpy);
3339 3283
3340 assert (str != NULL); 3284 assert (str != NULL);
3341 3285
3342 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3286 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3343 return; 3287 return;
3344 3288
3345 switch (op) 3289 switch (op)
3346 { 3290 {
3441 break; 3385 break;
3442 case URxvt_Color_IT: 3386 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp); 3387 process_color_seq (op, Color_IT, str, resp);
3444 break; 3388 break;
3445#endif 3389#endif
3446#if TRANSPARENT && TINTING 3390#if ENABLE_TRANSPARENCY
3447 case URxvt_Color_tint: 3391 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp); 3392 process_color_seq (op, Color_tint, str, resp);
3393 {
3394 bool changed = false;
3449 3395
3450 check_our_parents (); 3396 if (ISSET_PIXCOLOR (Color_tint))
3397 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3398 else
3399 changed = bgPixmap.unset_tint ();
3451 3400
3452 if (am_transparent) 3401 if (changed)
3453 want_full_refresh = want_refresh = 1; 3402 update_background ();
3403 }
3454 3404
3455 break; 3405 break;
3456#endif 3406#endif
3457 3407
3408#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap: 3409 case Rxvt_Pixmap:
3459 { 3410 if (!strcmp (str, "?"))
3460 if (*str != ';')
3461 { 3411 {
3462#if XPM_BACKGROUND 3412 char str[256];
3463 scale_pixmap (""); /* reset to default scaling */ 3413
3464 set_bgPixmap (str); /* change pixmap */ 3414 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3465 scr_touch (true); 3415 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3466#endif 3416 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3417 process_xterm_seq (XTerm_title, str, CHAR_ST);
3467 } 3418 }
3468 3419 else
3420 {
3469 int changed = 0; 3421 int changed = 0;
3470 3422
3471 while ((str = strchr (str, ';')) != NULL) 3423 if (*str != ';')
3472 { 3424 {
3425 /* reset to default scaling :*/
3426 bgPixmap.unset_geometry ();
3427 if (bgPixmap.set_file (str)) /* change pixmap */
3428 changed++;
3429 str = strchr (str, ';');
3430 if (str == NULL)
3431 bgPixmap.set_defaultGeometry ();
3432 }
3433
3434 while (str)
3435 {
3473 str++; 3436 str++;
3474#if XPM_BACKGROUND 3437 if (bgPixmap.set_geometry (str))
3475 changed += scale_pixmap (str); 3438 changed++;
3476#endif 3439 str = strchr (str, ';');
3477 } 3440 }
3478 3441
3479 if (changed) 3442 if (changed)
3480 { 3443 update_background ();
3481#ifdef XPM_BACKGROUND
3482 resize_pixmap ();
3483 scr_touch (true);
3484#endif
3485 } 3444 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE) 3445 break;
3487 if (option(Opt_transparent))
3488 check_our_parents ();
3489#endif 3446#endif
3490
3491 }
3492 break;
3493 3447
3494 case Rxvt_restoreFG: 3448 case Rxvt_restoreFG:
3495 set_window_color (Color_fg, str); 3449 set_window_color (Color_fg, str);
3496 break; 3450 break;
3497 case Rxvt_restoreBG: 3451 case Rxvt_restoreBG:
3619{ 3573{
3620 unsigned int i, j; 3574 unsigned int i, j;
3621 int state; 3575 int state;
3622 3576
3623 static const struct 3577 static const struct
3624 { 3578 {
3625 const int argval; 3579 const int argval;
3626 const unsigned long bit; 3580 const unsigned long bit;
3627 }
3628
3629 argtopriv[] = { 3581 } argtopriv[] = {
3630 { 1, PrivMode_aplCUR }, 3582 { 1, PrivMode_aplCUR },
3631 { 2, PrivMode_vt52 }, 3583 { 2, PrivMode_vt52 },
3632 { 3, PrivMode_132 }, 3584 { 3, PrivMode_132 },
3633 { 4, PrivMode_smoothScroll }, 3585 { 4, PrivMode_smoothScroll },
3634 { 5, PrivMode_rVideo }, 3586 { 5, PrivMode_rVideo },
3650 { 66, PrivMode_aplKP }, 3602 { 66, PrivMode_aplKP },
3651#ifndef NO_BACKSPACE_KEY 3603#ifndef NO_BACKSPACE_KEY
3652 { 67, PrivMode_BackSpace }, 3604 { 67, PrivMode_BackSpace },
3653#endif 3605#endif
3654 { 1000, PrivMode_MouseX11 }, 3606 { 1000, PrivMode_MouseX11 },
3655 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3607 { 1002, PrivMode_MouseBtnEvent },
3656 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3608 { 1003, PrivMode_MouseAnyEvent },
3657 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3658 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3609 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3659 { 1011, PrivMode_Keypress }, // rxvt extension 3610 { 1011, PrivMode_Keypress }, // rxvt extension
3660 // 1035 enable modifiers for alt, numlock NYI 3611 // 1035 enable modifiers for alt, numlock NYI
3661 // 1036 send ESC for meta keys NYI 3612 // 1036 send ESC for meta keys NYI
3662 // 1037 send DEL for keypad delete NYI 3613 // 1037 send DEL for keypad delete NYI
3719 */ 3670 */
3720 PrivMode (1, PrivMode_vt52); 3671 PrivMode (1, PrivMode_vt52);
3721 break; 3672 break;
3722 case 3: /* 80/132 */ 3673 case 3: /* 80/132 */
3723 if (priv_modes & PrivMode_132OK) 3674 if (priv_modes & PrivMode_132OK)
3675 {
3676 scr_poweron ();
3724 set_widthheight (((state ? 132 : 80) * fwidth), height); 3677 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3678 }
3725 break; 3679 break;
3726 case 4: /* smooth scrolling */ 3680 case 4: /* smooth scrolling */
3727 set_option (Opt_jumpScroll, !state); 3681 set_option (Opt_jumpScroll, !state);
3728 break; 3682 break;
3729 case 5: /* reverse video */ 3683 case 5: /* reverse video */
3736 scr_autowrap (state); 3690 scr_autowrap (state);
3737 break; 3691 break;
3738 /* case 8: - auto repeat, can't do on a per window basis */ 3692 /* case 8: - auto repeat, can't do on a per window basis */
3739 case 9: /* X10 mouse reporting */ 3693 case 9: /* X10 mouse reporting */
3740 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
3741 priv_modes &= ~PrivMode_MouseX11; 3695 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3742 break; 3696 break;
3743#ifdef scrollBar_esc 3697#ifdef scrollBar_esc
3744 case scrollBar_esc: 3698 case scrollBar_esc:
3745 if (scrollbar_mapping (state)) 3699 if (scrollbar_mapping (state))
3746 { 3700 {
3759 break; 3713 break;
3760 /* case 66: - application key pad */ 3714 /* case 66: - application key pad */
3761 /* case 67: - backspace key */ 3715 /* case 67: - backspace key */
3762 case 1000: /* X11 mouse reporting */ 3716 case 1000: /* X11 mouse reporting */
3763 if (state) /* orthogonal */ 3717 if (state) /* orthogonal */
3764 priv_modes &= ~PrivMode_MouseX10; 3718 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3765 break; 3719 break;
3766#if 0
3767 case 1001: 3720 case 1002:
3768 break; /* X11 mouse highlighting */ 3721 case 1003:
3769#endif 3722 if (state)
3723 {
3724 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3725 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3726 vt_emask_mouse = PointerMotionMask;
3727 }
3728 else
3729 vt_emask_mouse = NoEventMask;
3730 vt_select_input ();
3731 break;
3770 case 1010: /* scroll to bottom on TTY output inhibit */ 3732 case 1010: /* scroll to bottom on TTY output inhibit */
3771 set_option (Opt_scrollTtyOutput, !state); 3733 set_option (Opt_scrollTtyOutput, !state);
3772 break; 3734 break;
3773 case 1011: /* scroll to bottom on key press */ 3735 case 1011: /* scroll to bottom on key press */
3774 set_option (Opt_scrollTtyKeypress, state); 3736 set_option (Opt_scrollTtyKeypress, state);
3951rxvt_term::process_graphics () 3913rxvt_term::process_graphics ()
3952{ 3914{
3953 unicode_t ch, cmd = cmd_getc (); 3915 unicode_t ch, cmd = cmd_getc ();
3954 3916
3955 if (cmd == 'Q') 3917 if (cmd == 'Q')
3918 {
3956 { /* query graphics */ 3919 /* query graphics */
3957 tt_printf ("\033G0\012"); /* no graphics */ 3920 tt_printf ("\033G0\012"); /* no graphics */
3958 return; 3921 return;
3959 } 3922 }
3960 /* swallow other graphics sequences until terminating ':' */ 3923 /* swallow other graphics sequences until terminating ':' */
3961 do 3924 do
4011 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3974 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4012 3975
4013 memcpy (v_buffer + v_buflen, data, len); 3976 memcpy (v_buffer + v_buflen, data, len);
4014 v_buflen += len; 3977 v_buflen += len;
4015 3978
4016 pty_ev.set (EVENT_READ | EVENT_WRITE); 3979 pty_ev.set (ev::READ | ev::WRITE);
4017} 3980}
4018 3981
4019void rxvt_term::pty_write () 3982void rxvt_term::pty_write ()
4020{ 3983{
4021 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3984 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4026 3989
4027 if (v_buflen == 0) 3990 if (v_buflen == 0)
4028 { 3991 {
4029 free (v_buffer); 3992 free (v_buffer);
4030 v_buffer = 0; 3993 v_buffer = 0;
4031 v_buflen = 0;
4032 3994
4033 pty_ev.set (EVENT_READ); 3995 pty_ev.set (ev::READ);
4034 return; 3996 return;
4035 } 3997 }
4036 3998
4037 memmove (v_buffer, v_buffer + written, v_buflen); 3999 memmove (v_buffer, v_buffer + written, v_buflen);
4038 } 4000 }
4039 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4001 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4040 pty_ev.set (EVENT_READ); 4002 pty_ev.set (ev::READ);
4041} 4003}
4042 4004
4043/*----------------------- end-of-file (C source) -----------------------*/ 4005/*----------------------- end-of-file (C source) -----------------------*/
4044 4006

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines