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.335 by ayin, Tue Jun 26 15:17:24 2007 UTC vs.
Revision 1.402 by ayin, Fri Feb 1 14:13:52 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
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 ENABLE_TRANSPARENCY 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 ()
1101{ 1050{
1102 make_current (); 1051 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1053
1104 display->flush (); 1054 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1055}
1109 1056
1110void 1057void
1111rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1059{
1113 make_current (); 1060 make_current ();
1114 1061
1115 refresh_count = 0; 1062 refresh_count = 0;
1116 flush (); 1063 flush ();
1117} 1064}
1118 1065
1119#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1120void 1067void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1069{
1123 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1071 want_refresh = 1;
1125 1072 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1073}
1128#endif 1074#endif
1129 1075
1130#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1131void 1077void
1132rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1079{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1081 {
1136 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1137 want_refresh = 1; 1083 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
1139 } 1085 }
1086 else
1087 w.stop ();
1140} 1088}
1141#endif 1089#endif
1142 1090
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1092void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1094{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149 { 1097 {
1150 want_refresh = 1; 1098 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1152 } 1100 }
1101 else
1102 w.stop ();
1153} 1103}
1154#endif 1104#endif
1155 1105
1156#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1157void 1107void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1109{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1111 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1113 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1165 } 1115 }
1116 else
1117 w.stop ();
1166} 1118}
1167#endif 1119#endif
1168 1120
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1122void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1124{
1173 if (mouse_slip_wheel_speed == 0 1125 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1126 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1127 want_refresh = 1;
1181 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 ();
1182 } 1135 }
1183} 1136}
1184#endif 1137#endif
1185 1138
1186#if LINUX_YIELD_HACK 1139#if LINUX_YIELD_HACK
1187static struct event_handler 1140static struct event_handler
1188{ 1141{
1189 check_watcher yield_ev; 1142 ev::prepare yield_ev;
1190 1143
1191 void yield_cb (check_watcher &w) 1144 void yield_cb (ev::prepare &w, int revents)
1192 { 1145 {
1193 // this should really be sched_yield(), but the linux guys thought 1146 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1147 // that giving a process calling sched_yield () less cpu time than
1195 // 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
1196 // allowed by the sus... as is returning ENOSYS. 1149 // allowed by the sus... as is returning ENOSYS.
1247 1200
1248 return false; 1201 return false;
1249} 1202}
1250 1203
1251void 1204void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1205rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1206{
1254 make_current (); 1207 make_current ();
1255 1208
1256 if (revents & EVENT_READ) 1209 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1210 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1211 while (pty_fill ())
1259 if (cmd_parse ()) 1212 if (cmd_parse ())
1260 break; 1213 break;
1261 1214
1262 if (revents & EVENT_WRITE) 1215 if (revents & ev::WRITE)
1263 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1264} 1219}
1265 1220
1266void 1221void
1267rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1268{ 1223{
1271 1226
1272#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1228 hidden_pointer = 0;
1274 1229
1275 if (option (Opt_pointerBlank)) 1230 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1231 pointer_ev.start (pointerBlankDelay);
1277#endif 1232#endif
1278} 1233}
1279 1234
1280#ifdef POINTER_BLANK 1235#ifdef POINTER_BLANK
1281void 1236void
1289 1244
1290 hidden_pointer = 1; 1245 hidden_pointer = 1;
1291} 1246}
1292 1247
1293void 1248void
1294rxvt_term::pointer_cb (time_watcher &w) 1249rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1250{
1296 make_current (); 1251 make_current ();
1297 1252
1298 pointer_blank (); 1253 pointer_blank ();
1299} 1254}
1302void 1257void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1258rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1259{
1305 int button_number, key_state = 0; 1260 int button_number, key_state = 0;
1306 int x, y; 1261 int x, y;
1262 int code = 32;
1307 1263
1308 x = ev.x; 1264 x = Pixel2Col (ev.x);
1309 y = ev.y; 1265 y = Pixel2Row (ev.y);
1310 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 }
1311 1274
1312 if (MEvent.button == AnyButton) 1275 if (MEvent.button == AnyButton)
1313 button_number = 3; 1276 button_number = 3;
1314 else 1277 else
1315 { 1278 {
1361 x + 1, 1324 x + 1,
1362 y + 1); 1325 y + 1);
1363#endif 1326#endif
1364 1327
1365 tt_printf ("\033[M%c%c%c", 1328 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1329 (code + button_number + key_state),
1367 (32 + x + 1), 1330 (32 + x + 1),
1368 (32 + y + 1)); 1331 (32 + y + 1));
1369} 1332}
1370 1333
1371/*{{{ process an X event */ 1334/*{{{ process an X event */
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1396 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out (); 1397 focus_out ();
1435 } 1398 }
1436#endif 1399#endif
1437 } 1400 }
1438 break;
1439
1440 case MappingNotify:
1441 XRefreshKeyboardMapping (&ev.xmapping);
1442 break; 1401 break;
1443 1402
1444 /* 1403 /*
1445 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1446 * Here's my conclusion: 1405 * Here's my conclusion:
1479 && ev.xfocus.mode != NotifyGrab) 1438 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1439 focus_out ();
1481 break; 1440 break;
1482 1441
1483 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);*/
1484 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1485 { 1447 {
1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487 ; 1449 ;
1488 1450
1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1490 { 1452 {
1491 seen_resize = 1; 1453 seen_resize = 1;
1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND 1455 }
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1456 else
1457 {
1458#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ())
1495 { 1460 {
1461 if (mapped)
1462 update_background ();
1496 resize_pixmap (); 1463 else
1497 scr_touch (true); 1464 bgPixmap.invalidate ();
1498 } 1465 }
1499#endif 1466#endif
1500 } 1467 }
1501 1468
1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef ENABLE_TRANSPARENCY
1505 if (option (Opt_transparent))
1506 check_our_parents ();
1507#endif
1508 } 1470 }
1509 break; 1471 break;
1510 1472
1511 case PropertyNotify: 1473 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1528 case SelectionRequest: 1490 case SelectionRequest:
1529 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1530 break; 1492 break;
1531 1493
1532 case MapNotify: 1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1533 mapped = 1; 1511 mapped = 1;
1534#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1535 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1513 text_blink_ev.start ();
1536#endif 1514#endif
1537 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1516 break;
1539 1517
1540 case UnmapNotify: 1518 case UnmapNotify:
1542#ifdef TEXT_BLINK 1520#ifdef TEXT_BLINK
1543 text_blink_ev.stop (); 1521 text_blink_ev.stop ();
1544#endif 1522#endif
1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1523 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break; 1524 break;
1547
1548#ifdef ENABLE_TRANSPARENCY
1549 case ReparentNotify:
1550 rootwin_cb (ev);
1551 break;
1552#endif /* ENABLE_TRANSPARENCY */
1553 1525
1554 case GraphicsExpose: 1526 case GraphicsExpose:
1555 case Expose: 1527 case Expose:
1556 if (ev.xany.window == vt) 1528 if (ev.xany.window == vt)
1557 { 1529 {
1558 do 1530 do
1531 {
1559 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1560 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1534 }
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1562 1536
1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1564 1538
1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1543 }
1568 1544
1569 want_refresh = 1; 1545 want_refresh = 1;
1570 } 1546 }
1571 else 1547 else
1572 { 1548 {
1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1576 ; 1552 ;
1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578 ; 1554 ;
1579 1555
1580 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1581 { 1557 {
1582 scrollBar.setIdle (); 1558 scrollBar.state = STATE_IDLE;
1583 scrollbar_show (0); 1559 scrollbar_show (0);
1584 } 1560 }
1585
1586#ifdef ENABLE_TRANSPARENCY
1587 if (am_transparent && ev.xany.window == parent[0])
1588 XClearWindow (dpy, ev.xany.window);
1589#endif
1590 } 1561 }
1591 break; 1562 break;
1592 1563
1593 case MotionNotify: 1564 case MotionNotify:
1594#ifdef POINTER_BLANK 1565#ifdef POINTER_BLANK
1595 if (hidden_pointer) 1566 if (hidden_pointer)
1596 pointer_unblank (); 1567 pointer_unblank ();
1597#endif 1568#endif
1569 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1570 || priv_modes & PrivMode_MouseAnyEvent)
1571 mouse_report (ev.xbutton);
1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1599 break; 1573 break;
1600 1574
1601 if (ev.xany.window == vt) 1575 if (ev.xany.window == vt)
1602 { 1576 {
1636 int dist; 1610 int dist;
1637 1611
1638 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1639 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1640 */ 1614 */
1641 if (!sel_scroll_ev.active) 1615 if (!sel_scroll_ev.is_active ())
1642 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1616 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1643 1617
1644 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1645 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1646 */ 1620 */
1647 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1669 else 1643 else
1670 { 1644 {
1671 /* we are within the text window, so we 1645 /* we are within the text window, so we
1672 * shouldn't be scrolling 1646 * shouldn't be scrolling
1673 */ 1647 */
1674 if (sel_scroll_ev.active)
1675 sel_scroll_ev.stop(); 1648 sel_scroll_ev.stop();
1676 } 1649 }
1677#endif 1650#endif
1678#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1679 } 1652 }
1680#endif 1653#endif
1681 } 1654 }
1682 } 1655 }
1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1684 { 1657 {
1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1686 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1687 ; 1660 ;
1688 1661
1706 { 1679 {
1707 hidden_cursor = 0; 1680 hidden_cursor = 0;
1708 want_refresh = 1; 1681 want_refresh = 1;
1709 } 1682 }
1710 1683
1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1684 cursor_blink_ev.again ();
1712 } 1685 }
1713#endif 1686#endif
1714 1687
1715#if defined(POINTER_BLANK) 1688#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1723 1696
1724 if (ev.type == KeyPress && hidden_pointer == 0) 1697 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank (); 1698 pointer_blank ();
1726 } 1699 }
1727#endif 1700#endif
1701
1702 refresh_check ();
1728} 1703}
1729 1704
1730void 1705void
1731rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1732{ 1707{
1744 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1745 } 1720 }
1746#endif 1721#endif
1747#if CURSOR_BLINK 1722#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1723 if (option (Opt_cursorBlink))
1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1724 cursor_blink_ev.again ();
1750#endif 1725#endif
1751#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1752 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1753 { 1728 {
1754 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
1756 } 1731 }
1757#endif 1732#endif
1758#if ENABLE_FRILLS 1733#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell)) 1734 if (option (Opt_urgentOnBell))
1760 { 1735 {
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]); 1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1764 if (h != NULL)
1765 { 1737 {
1766 h->flags &= ~XUrgencyHint; 1738 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h); 1739 XSetWMHints (dpy, parent[0], h);
1768 } 1740 }
1769 } 1741 }
1770#endif 1742#endif
1771 } 1743 }
1772} 1744}
1783 1755
1784#if ENABLE_FRILLS || ISO_14755 1756#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf) 1757 if (iso14755buf)
1786 { 1758 {
1787 iso14755buf = 0; 1759 iso14755buf = 0;
1788# if ENABLE_OVERLAY 1760# if ISO_14755
1789 scr_overlay_off (); 1761 scr_overlay_off ();
1790# endif 1762# endif
1791 } 1763 }
1792#endif 1764#endif
1793#if USE_XIM 1765#if USE_XIM
1795 XUnsetICFocus (Input_Context); 1767 XUnsetICFocus (Input_Context);
1796#endif 1768#endif
1797#if CURSOR_BLINK 1769#if CURSOR_BLINK
1798 if (option (Opt_cursorBlink)) 1770 if (option (Opt_cursorBlink))
1799 cursor_blink_ev.stop (); 1771 cursor_blink_ev.stop ();
1772
1800 hidden_cursor = 0; 1773 hidden_cursor = 0;
1801#endif 1774#endif
1802#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
1804 { 1777 {
1838 case PropertyNotify: 1811 case PropertyNotify:
1839 /* 1812 /*
1840 * if user used some Esetroot compatible prog to set the root bg, 1813 * if user used some Esetroot compatible prog to set the root bg,
1841 * use the property to determine the pixmap. We use it later on. 1814 * use the property to determine the pixmap. We use it later on.
1842 */ 1815 */
1843 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 return; 1818 {
1819 bgPixmap.set_root_pixmap ();
1820 update_background ();
1821 }
1846 1822
1847 /* FALLTHROUGH */
1848 case ReparentNotify:
1849 if (option (Opt_transparent))
1850 check_our_parents ();
1851 break; 1823 break;
1852 } 1824 }
1853# endif 1825# endif
1826
1827 refresh_check ();
1854} 1828}
1855#endif 1829#endif
1856 1830
1857void 1831void
1858rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
1913 mouse_report (ev); 1887 mouse_report (ev);
1914 } 1888 }
1915#else 1889#else
1916 MEvent.button = ev.button; 1890 MEvent.button = ev.button;
1917 mouse_report (ev); 1891 mouse_report (ev);
1918#endif /* MOUSE_REPORT_DOUBLECLICK */ 1892#endif /* MOUSE_REPORT_DOUBLECLICK */
1919 1893
1920 } 1894 }
1921 else 1895 else
1922 { 1896 {
1923 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
1971 } 1945 }
1972 1946
1973 /* 1947 /*
1974 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1975 */ 1949 */
1976 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1977 { 1951 {
1978 scrollBar.setIdle (); 1952 int upordown = 0;
1953
1954 if (scrollBar.upButton (ev.y))
1955 upordown = -1; /* up */
1956 else if (scrollBar.dnButton (ev.y))
1957 upordown = 1; /* down */
1958
1959 scrollBar.state = STATE_IDLE;
1979 /* 1960 /*
1980 * Rxvt-style scrollbar: 1961 * Rxvt-style scrollbar:
1981 * move up if mouse is above slider 1962 * move up if mouse is above slider
1982 * move dn if mouse is below slider 1963 * move dn if mouse is below slider
1983 * 1964 *
1992 /* 1973 /*
1993 * Mouse report disabled scrollbar: 1974 * Mouse report disabled scrollbar:
1994 * arrow buttons - send up/down 1975 * arrow buttons - send up/down
1995 * click on scrollbar - send pageup/down 1976 * click on scrollbar - send pageup/down
1996 */ 1977 */
1997 if ((scrollBar.style == R_SB_NEXT 1978 if (upordown < 0)
1998 && scrollbarnext_upButton (ev.y))
1999 || (scrollBar.style == R_SB_RXVT
2000 && scrollbarrxvt_upButton (ev.y)))
2001 tt_printf ("\033[A"); 1979 tt_printf ("\033[A");
2002 else if ((scrollBar.style == R_SB_NEXT 1980 else if (upordown > 0)
2003 && scrollbarnext_dnButton (ev.y))
2004 || (scrollBar.style == R_SB_RXVT
2005 && scrollbarrxvt_dnButton (ev.y)))
2006 tt_printf ("\033[B"); 1981 tt_printf ("\033[B");
2007 else 1982 else
2008 switch (ev.button) 1983 switch (ev.button)
2009 { 1984 {
2010 case Button2: 1985 case Button2:
2017 tt_printf ("\033[5~"); 1992 tt_printf ("\033[5~");
2018 break; 1993 break;
2019 } 1994 }
2020 } 1995 }
2021 else 1996 else
2022#endif /* NO_SCROLLBAR_REPORT */ 1997#endif /* NO_SCROLLBAR_REPORT */
2023 1998
2024 {
2025 char upordown = 0;
2026
2027 if (scrollBar.style == R_SB_NEXT)
2028 { 1999 {
2029 if (scrollbarnext_upButton (ev.y))
2030 upordown = -1; /* up */
2031 else if (scrollbarnext_dnButton (ev.y))
2032 upordown = 1; /* down */
2033 }
2034 else if (scrollBar.style == R_SB_RXVT)
2035 {
2036 if (scrollbarrxvt_upButton (ev.y))
2037 upordown = -1; /* up */
2038 else if (scrollbarrxvt_dnButton (ev.y))
2039 upordown = 1; /* down */
2040 }
2041 if (upordown) 2000 if (upordown)
2042 { 2001 {
2043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2003 if (!cont_scroll_ev.is_active ())
2044 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2045#endif 2005#endif
2046 if (scr_page (upordown < 0 ? UP : DN, 1)) 2006 if (scr_page (upordown < 0 ? UP : DN, 1))
2047 { 2007 {
2048 if (upordown < 0) 2008 if (upordown < 0)
2049 scrollBar.setUp (); 2009 scrollBar.state = STATE_UP;
2050 else 2010 else
2051 scrollBar.setDn (); 2011 scrollBar.state = STATE_DOWN;
2052 } 2012 }
2053 } 2013 }
2054 else 2014 else
2055 switch (ev.button) 2015 switch (ev.button)
2056 { 2016 {
2057 case Button2: 2017 case Button2:
2058 switch (scrollbar_align) 2018 switch (scrollBar.align)
2059 { 2019 {
2060 case R_SB_ALIGN_TOP: 2020 case R_SB_ALIGN_TOP:
2061 csrO = 0; 2021 csrO = 0;
2062 break; 2022 break;
2063 case R_SB_ALIGN_CENTRE: 2023 case R_SB_ALIGN_CENTRE:
2071 if (scrollBar.style == R_SB_XTERM 2031 if (scrollBar.style == R_SB_XTERM
2072 || scrollbar_above_slider (ev.y) 2032 || scrollbar_above_slider (ev.y)
2073 || scrollbar_below_slider (ev.y)) 2033 || scrollbar_below_slider (ev.y))
2074 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2075 2035
2076 scrollBar.setMotion (); 2036 scrollBar.state = STATE_MOTION;
2077 break; 2037 break;
2078 2038
2079 case Button1: 2039 case Button1:
2080 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2040 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2081 csrO = ev.y - scrollBar.top; 2041 csrO = ev.y - scrollBar.top;
2082 /* FALLTHROUGH */ 2042 /* FALLTHROUGH */
2083 2043
2084 case Button3: 2044 case Button3:
2085 if (scrollBar.style != R_SB_XTERM) 2045 if (scrollBar.style != R_SB_XTERM)
2095 scr_page (DN, nrow - 1); 2055 scr_page (DN, nrow - 1);
2096# else 2056# else
2097 scr_page (DN, nrow / 4); 2057 scr_page (DN, nrow / 4);
2098# endif 2058# endif
2099 else 2059 else
2100 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2101 } 2061 }
2102 else 2062 else
2103 { 2063 {
2104 scr_page ((ev.button == Button1 ? DN : UP), 2064 scr_page ((ev.button == Button1 ? DN : UP),
2105 (nrow 2065 (nrow
2122 2082
2123 csrO = 0; /* reset csr Offset */ 2083 csrO = 0; /* reset csr Offset */
2124 if (!bypass_keystate) 2084 if (!bypass_keystate)
2125 reportmode = !! (priv_modes & PrivMode_mouse_report); 2085 reportmode = !! (priv_modes & PrivMode_mouse_report);
2126 2086
2127 if (scrollbar_isUpDn ()) 2087 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2128 { 2088 {
2129 scrollBar.setIdle (); 2089 scrollBar.state = STATE_IDLE;
2130 scrollbar_show (0); 2090 scrollbar_show (0);
2131 } 2091 }
2132 2092
2133#ifdef SELECTION_SCROLLING 2093#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2094 sel_scroll_ev.stop();
2136#endif 2095#endif
2137 2096
2138 if (ev.window == vt) 2097 if (ev.window == vt)
2139 { 2098 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2099 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2164 mouse_report (ev); 2123 mouse_report (ev);
2165 } 2124 }
2166#else /* MOUSE_REPORT_DOUBLECLICK */ 2125#else /* MOUSE_REPORT_DOUBLECLICK */
2167 MEvent.button = AnyButton; 2126 MEvent.button = AnyButton;
2168 mouse_report (ev); 2127 mouse_report (ev);
2169#endif /* MOUSE_REPORT_DOUBLECLICK */ 2128#endif /* MOUSE_REPORT_DOUBLECLICK */
2170 return; 2129 return;
2171 } 2130 }
2172 2131
2173 /* 2132 /*
2174 * dumb hack to compensate for the failure of click-and-drag 2133 * dumb hack to compensate for the failure of click-and-drag
2212 { 2171 {
2213 mouse_slip_wheel_speed += v ? -1 : 1; 2172 mouse_slip_wheel_speed += v ? -1 : 1;
2214 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2173 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2174 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216 2175
2217 if (slip_wheel_ev.at < NOW) 2176 if (!slip_wheel_ev.is_active ())
2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2177 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2219
2220 slip_wheel_ev.start ();
2221 } 2178 }
2222 else 2179 else
2180# endif
2223 { 2181 {
2224# endif
2225 scr_page (v, i); 2182 scr_page (v, i);
2226 scrollbar_show (1); 2183 scrollbar_show (1);
2227# ifdef MOUSE_SLIP_WHEELING
2228 } 2184 }
2229# endif
2230 } 2185 }
2231 break; 2186 break;
2232#endif 2187#endif
2233 } 2188 }
2234 } 2189 }
2293 2248
2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2249 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2295 { 2250 {
2296 refresh_count = 0; 2251 refresh_count = 0;
2297 2252
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2253 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2299 { 2254 {
2300 refreshnow = true; 2255 refreshnow = true;
2301 ch = NOCHAR; 2256 ch = NOCHAR;
2302 break; 2257 break;
2303 } 2258 }
2514 } 2469 }
2515 } 2470 }
2516 2471
2517 pclose_printer (fd); 2472 pclose_printer (fd);
2518} 2473}
2519#endif /* PRINTPIPE */ 2474#endif /* PRINTPIPE */
2520/*}}} */ 2475/*}}} */
2521 2476
2522/* *INDENT-OFF* */ 2477/* *INDENT-OFF* */
2523enum { 2478enum {
2524 C1_40 = 0x40, 2479 C1_40 = 0x40,
2810rxvt_term::process_csi_seq () 2765rxvt_term::process_csi_seq ()
2811{ 2766{
2812 unicode_t ch, priv, i; 2767 unicode_t ch, priv, i;
2813 unsigned int nargs, p; 2768 unsigned int nargs, p;
2814 int n, ndef; 2769 int n, ndef;
2815 int arg[ESC_ARGS]; 2770 int arg[ESC_ARGS] = { };
2816 2771
2817 memset (arg, 0, sizeof (arg));
2818 nargs = 0; 2772 nargs = 0;
2819 2773
2820 priv = 0; 2774 priv = 0;
2821 ch = cmd_getc (); 2775 ch = cmd_getc ();
2822 if (ch >= '<' && ch <= '?') 2776 if (ch >= '<' && ch <= '?')
2777 {
2823 { /* '<' '=' '>' '?' */ 2778 /* '<' '=' '>' '?' */
2824 priv = ch; 2779 priv = ch;
2825 ch = cmd_getc (); 2780 ch = cmd_getc ();
2826 } 2781 }
2827 2782
2828 /* read any numerical arguments */ 2783 /* read any numerical arguments */
2871 { 2826 {
2872 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2827 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2828 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 // 2829 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2830 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2831 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2877 // that we do not support xterm mouse reporting (should be 95 when we do). 2832 // versions.
2878 // 2833 //
2879 tt_printf ("\033[>%d;94;0c", 'U'); 2834 tt_printf ("\033[>%d;95;0c", 'U');
2880 } 2835 }
2881 break; 2836 break;
2837
2882 case '?': 2838 case '?':
2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2884 process_terminal_mode (ch, priv, nargs, arg); 2840 process_terminal_mode (ch, priv, nargs, arg);
2885 break; 2841 break;
2886 } 2842 }
3402 *buf++ = '\0'; 3358 *buf++ = '\0';
3403 3359
3404 process_color_seq (op, color, name, resp); 3360 process_color_seq (op, color, name, resp);
3405 } 3361 }
3406 break; 3362 break;
3363 case Rxvt_restoreFG:
3407 case XTerm_Color00: 3364 case XTerm_Color00:
3408 process_color_seq (op, Color_fg, str, resp); 3365 process_color_seq (op, Color_fg, str, resp);
3409 break; 3366 break;
3367 case Rxvt_restoreBG:
3410 case XTerm_Color01: 3368 case XTerm_Color01:
3411 process_color_seq (op, Color_bg, str, resp); 3369 process_color_seq (op, Color_bg, str, resp);
3412 break; 3370 break;
3413#ifndef NO_CURSORCOLOR 3371#ifndef NO_CURSORCOLOR
3414 case XTerm_Color_cursor: 3372 case XTerm_Color_cursor:
3435 break; 3393 break;
3436 case URxvt_Color_IT: 3394 case URxvt_Color_IT:
3437 process_color_seq (op, Color_IT, str, resp); 3395 process_color_seq (op, Color_IT, str, resp);
3438 break; 3396 break;
3439#endif 3397#endif
3440#if ENABLE_TRANSPARENCY && TINTING 3398#if ENABLE_TRANSPARENCY
3441 case URxvt_Color_tint: 3399 case URxvt_Color_tint:
3442 process_color_seq (op, Color_tint, str, resp); 3400 process_color_seq (op, Color_tint, str, resp);
3401 {
3402 bool changed = false;
3443 3403
3444 check_our_parents (); 3404 if (ISSET_PIXCOLOR (Color_tint))
3405 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3406 else
3407 changed = bgPixmap.unset_tint ();
3445 3408
3446 if (am_transparent) 3409 if (changed)
3447 want_full_refresh = want_refresh = 1; 3410 update_background ();
3411 }
3448 3412
3449 break; 3413 break;
3450#endif 3414#endif
3451 3415
3416#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3417 case Rxvt_Pixmap:
3453 { 3418 if (!strcmp (str, "?"))
3454 if (*str != ';')
3455 { 3419 {
3456#if XPM_BACKGROUND 3420 char str[256];
3457 scale_pixmap (""); /* reset to default scaling */ 3421
3458 set_bgPixmap (str); /* change pixmap */ 3422 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3459 scr_touch (true); 3423 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3460#endif 3424 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3425 process_xterm_seq (XTerm_title, str, CHAR_ST);
3461 } 3426 }
3462 3427 else
3428 {
3463 int changed = 0; 3429 int changed = 0;
3464 3430
3465 while ((str = strchr (str, ';')) != NULL) 3431 if (*str != ';')
3466 { 3432 {
3433 /* reset to default scaling :*/
3434 bgPixmap.unset_geometry ();
3435 if (bgPixmap.set_file (str)) /* change pixmap */
3436 changed++;
3437 str = strchr (str, ';');
3438 if (str == NULL)
3439 bgPixmap.set_defaultGeometry ();
3440 }
3441
3442 while (str)
3443 {
3467 str++; 3444 str++;
3468#if XPM_BACKGROUND 3445 if (bgPixmap.set_geometry (str))
3469 changed += scale_pixmap (str); 3446 changed++;
3470#endif 3447 str = strchr (str, ';');
3471 } 3448 }
3472 3449
3473 if (changed) 3450 if (changed)
3474 { 3451 update_background ();
3475#ifdef XPM_BACKGROUND
3476 resize_pixmap ();
3477 scr_touch (true);
3478#endif
3479 } 3452 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3485 break; 3453 break;
3486 3454#endif
3487 case Rxvt_restoreFG:
3488 set_window_color (Color_fg, str);
3489 break;
3490 case Rxvt_restoreBG:
3491 set_window_color (Color_bg, str);
3492 break;
3493 3455
3494 case XTerm_logfile: 3456 case XTerm_logfile:
3495 // TODO, when secure mode? 3457 // TODO, when secure mode?
3496 break; 3458 break;
3497 3459
3612{ 3574{
3613 unsigned int i, j; 3575 unsigned int i, j;
3614 int state; 3576 int state;
3615 3577
3616 static const struct 3578 static const struct
3617 { 3579 {
3618 const int argval; 3580 const int argval;
3619 const unsigned long bit; 3581 const unsigned long bit;
3620 }
3621
3622 argtopriv[] = { 3582 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, 3583 { 1, PrivMode_aplCUR },
3624 { 2, PrivMode_vt52 }, 3584 { 2, PrivMode_vt52 },
3625 { 3, PrivMode_132 }, 3585 { 3, PrivMode_132 },
3626 { 4, PrivMode_smoothScroll }, 3586 { 4, PrivMode_smoothScroll },
3627 { 5, PrivMode_rVideo }, 3587 { 5, PrivMode_rVideo },
3643 { 66, PrivMode_aplKP }, 3603 { 66, PrivMode_aplKP },
3644#ifndef NO_BACKSPACE_KEY 3604#ifndef NO_BACKSPACE_KEY
3645 { 67, PrivMode_BackSpace }, 3605 { 67, PrivMode_BackSpace },
3646#endif 3606#endif
3647 { 1000, PrivMode_MouseX11 }, 3607 { 1000, PrivMode_MouseX11 },
3648 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3608 { 1002, PrivMode_MouseBtnEvent },
3649 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3609 { 1003, PrivMode_MouseAnyEvent },
3650 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3652 { 1011, PrivMode_Keypress }, // rxvt extension 3611 { 1011, PrivMode_Keypress }, // rxvt extension
3653 // 1035 enable modifiers for alt, numlock NYI 3612 // 1035 enable modifiers for alt, numlock NYI
3654 // 1036 send ESC for meta keys NYI 3613 // 1036 send ESC for meta keys NYI
3655 // 1037 send DEL for keypad delete NYI 3614 // 1037 send DEL for keypad delete NYI
3656 { 1047, PrivMode_Screen }, 3615 { 1047, PrivMode_Screen },
3657 // 1048 save and restore cursor 3616 // 1048 save and restore cursor
3658 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3617 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3659 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3619 { 2004, PrivMode_BracketPaste },
3660 }; 3620 };
3661 3621
3662 if (nargs == 0) 3622 if (nargs == 0)
3663 return; 3623 return;
3664 3624
3712 */ 3672 */
3713 PrivMode (1, PrivMode_vt52); 3673 PrivMode (1, PrivMode_vt52);
3714 break; 3674 break;
3715 case 3: /* 80/132 */ 3675 case 3: /* 80/132 */
3716 if (priv_modes & PrivMode_132OK) 3676 if (priv_modes & PrivMode_132OK)
3677 {
3678 scr_poweron ();
3717 set_widthheight (((state ? 132 : 80) * fwidth), height); 3679 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3680 }
3718 break; 3681 break;
3719 case 4: /* smooth scrolling */ 3682 case 4: /* smooth scrolling */
3720 set_option (Opt_jumpScroll, !state); 3683 set_option (Opt_jumpScroll, !state);
3721 break; 3684 break;
3722 case 5: /* reverse video */ 3685 case 5: /* reverse video */
3729 scr_autowrap (state); 3692 scr_autowrap (state);
3730 break; 3693 break;
3731 /* case 8: - auto repeat, can't do on a per window basis */ 3694 /* case 8: - auto repeat, can't do on a per window basis */
3732 case 9: /* X10 mouse reporting */ 3695 case 9: /* X10 mouse reporting */
3733 if (state) /* orthogonal */ 3696 if (state) /* orthogonal */
3734 priv_modes &= ~PrivMode_MouseX11; 3697 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3735 break; 3698 break;
3736#ifdef scrollBar_esc 3699#ifdef scrollBar_esc
3737 case scrollBar_esc: 3700 case scrollBar_esc:
3738 if (scrollbar_mapping (state)) 3701 if (scrollbar_mapping (state))
3739 { 3702 {
3752 break; 3715 break;
3753 /* case 66: - application key pad */ 3716 /* case 66: - application key pad */
3754 /* case 67: - backspace key */ 3717 /* case 67: - backspace key */
3755 case 1000: /* X11 mouse reporting */ 3718 case 1000: /* X11 mouse reporting */
3756 if (state) /* orthogonal */ 3719 if (state) /* orthogonal */
3757 priv_modes &= ~PrivMode_MouseX10; 3720 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3758 break; 3721 break;
3759#if 0
3760 case 1001: 3722 case 1002:
3761 break; /* X11 mouse highlighting */ 3723 case 1003:
3762#endif 3724 if (state)
3725 {
3726 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3727 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3728 vt_emask_mouse = PointerMotionMask;
3729 }
3730 else
3731 vt_emask_mouse = NoEventMask;
3732 vt_select_input ();
3733 break;
3763 case 1010: /* scroll to bottom on TTY output inhibit */ 3734 case 1010: /* scroll to bottom on TTY output inhibit */
3764 set_option (Opt_scrollTtyOutput, !state); 3735 set_option (Opt_scrollTtyOutput, !state);
3765 break; 3736 break;
3766 case 1011: /* scroll to bottom on key press */ 3737 case 1011: /* scroll to bottom on key press */
3767 set_option (Opt_scrollTtyKeypress, state); 3738 set_option (Opt_scrollTtyKeypress, state);
3944rxvt_term::process_graphics () 3915rxvt_term::process_graphics ()
3945{ 3916{
3946 unicode_t ch, cmd = cmd_getc (); 3917 unicode_t ch, cmd = cmd_getc ();
3947 3918
3948 if (cmd == 'Q') 3919 if (cmd == 'Q')
3920 {
3949 { /* query graphics */ 3921 /* query graphics */
3950 tt_printf ("\033G0\012"); /* no graphics */ 3922 tt_printf ("\033G0\012"); /* no graphics */
3951 return; 3923 return;
3952 } 3924 }
3953 /* swallow other graphics sequences until terminating ':' */ 3925 /* swallow other graphics sequences until terminating ':' */
3954 do 3926 do
4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3976 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4005 3977
4006 memcpy (v_buffer + v_buflen, data, len); 3978 memcpy (v_buffer + v_buflen, data, len);
4007 v_buflen += len; 3979 v_buflen += len;
4008 3980
4009 pty_ev.set (EVENT_READ | EVENT_WRITE); 3981 pty_ev.set (ev::READ | ev::WRITE);
4010} 3982}
4011 3983
4012void rxvt_term::pty_write () 3984void rxvt_term::pty_write ()
4013{ 3985{
4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3986 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4019 3991
4020 if (v_buflen == 0) 3992 if (v_buflen == 0)
4021 { 3993 {
4022 free (v_buffer); 3994 free (v_buffer);
4023 v_buffer = 0; 3995 v_buffer = 0;
4024 v_buflen = 0;
4025 3996
4026 pty_ev.set (EVENT_READ); 3997 pty_ev.set (ev::READ);
4027 return; 3998 return;
4028 } 3999 }
4029 4000
4030 memmove (v_buffer, v_buffer + written, v_buflen); 4001 memmove (v_buffer, v_buffer + written, v_buflen);
4031 } 4002 }
4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4003 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4033 pty_ev.set (EVENT_READ); 4004 pty_ev.set (ev::READ);
4034} 4005}
4035 4006
4036/*----------------------- end-of-file (C source) -----------------------*/ 4007/*----------------------- end-of-file (C source) -----------------------*/
4037 4008

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines