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.346 by root, Wed Aug 15 06:48:16 2007 UTC vs.
Revision 1.387 by ayin, Sun Dec 30 23:45:42 2007 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
198 r & RS_Uline ? " uline" : "", 198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 199 r & RS_Careful ? " careful" : "");
200 200
201 int width = wcswidth (fname, wcslen (fname)); 201 int width = wcswidth (fname, wcslen (fname));
202 202
203 max_it (width, 8+5); // for char + hey 203 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 204 max_it (width, strlen (attr));
205 205
206 if (y >= 0) 206 if (y >= 0)
207 { 207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
220 ch = *chr++; 220 ch = *chr++;
221 221
222 sprintf (buf, "%8x", ch); 222 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 223 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 224 scr_overlay_set (9, y, '=');
225# if !UNICODE3 225# if !UNICODE_3
226 if (ch >= 0x10000) 226 if (ch >= 0x10000)
227 ch = 0xfffd; 227 ch = 0xfffd;
228# endif 228# endif
229 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230 230
… …
547#endif 547#endif
548 548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 550 {
551 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 newlen = 1; 553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
553 switch (keysym) 584 switch (keysym)
554 { 585 {
555#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
556 case XK_BackSpace: 587 case XK_BackSpace:
557 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
562 } 593 }
563 else 594 else
564 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
565 break; 596 break;
566#endif 597#endif
567#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior
569 case XK_KP_Delete:
570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572 {
573 strcpy (kbuf, "\033On");
574 break;
575 }
576 /* FALLTHROUGH */
577# endif
578 case XK_Delete: 599 case XK_Delete:
579 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
580 break; 601 break;
581#endif 602#endif
582 case XK_Tab: 603 case XK_Tab:
583 if (shft) 604 if (shft)
584 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
594#endif 615#endif
595 newlen = 0; 616 newlen = 0;
596 } 617 }
597 break; 618 break;
598 619
599#ifdef XK_KP_Left
600 case XK_KP_Up: /* \033Ox or standard */
601 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */
603 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605 {
606 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break;
609 }
610 else
611 /* translate to std. cursor key */
612 keysym = XK_Left + (keysym - XK_KP_Left);
613 /* FALLTHROUGH */
614#endif
615 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
616 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
617 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
618 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
619 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
629 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
630 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
631 break; 636 break;
632 637
633#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior
635 case XK_KP_Prior:
636 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638 {
639 strcpy (kbuf, "\033Oy");
640 break;
641 }
642 /* FALLTHROUGH */
643# endif
644 case XK_Prior: 639 case XK_Prior:
645 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
646 break; 641 break;
647# ifdef XK_KP_Next
648 case XK_KP_Next:
649 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651 {
652 strcpy (kbuf, "\033Os");
653 break;
654 }
655 /* FALLTHROUGH */
656# endif
657 case XK_Next: 642 case XK_Next:
658 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
659 break; 644 break;
660#endif 645#endif
661 case XK_KP_Enter: 646 case XK_KP_Enter:
662 /* allow shift to override */ 647 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
664 { 649 {
665 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
666 break; 651 break;
667 } 652 }
668 653
… …
680 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
681 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
682 } 667 }
683 break; 668 break;
684 669
685#ifdef XK_KP_Begin
686 case XK_KP_Begin:
687 strcpy (kbuf, "\033Ou");
688 break;
689
690#endif
691 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
692 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
693 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
694 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
695 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
711 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */ 694 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
717 { 696 {
718 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
720 } 699 }
721 else 700 else
… …
727 706
728 case XK_Find: 707 case XK_Find:
729 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
730 break; 709 break;
731 710
732#ifdef XK_KP_Insert
733 case XK_KP_Insert:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Op");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
742 case XK_Insert: 711 case XK_Insert:
743 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
744 break; 713 break;
745#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
746 case DXK_Remove: 715 case DXK_Remove:
… …
750 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
751 break; 720 break;
752 case XK_Select: 721 case XK_Select:
753 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
754 break; 723 break;
755#ifdef XK_KP_End
756 case XK_KP_End:
757 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759 {
760 strcpy (kbuf, "\033Oq");
761 break;
762 }
763 /* FALLTHROUGH */
764#endif
765 case XK_End: 724 case XK_End:
766 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
767 break; 726 break;
768#ifdef XK_KP_Home
769 case XK_KP_Home:
770 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
772 {
773 strcpy (kbuf, "\033Ow");
774 break;
775 }
776 /* FALLTHROUGH */
777#endif
778 case XK_Home: 727 case XK_Home:
779 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
780 break; 729 break;
781 730
782#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
1034void 983void
1035rxvt_term::flush () 984rxvt_term::flush ()
1036{ 985{
1037 flush_ev.stop (); 986 flush_ev.stop ();
1038 987
1039#ifdef ENABLE_TRANSPARENCY 988#ifdef HAVE_BG_PIXMAP
1040 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
1041 { 990 {
1042 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
1043 scr_clear ();
1044 scr_touch (false); 992 scr_touch (false);
1045 } 993 }
1046#endif 994#endif
1047 995
1048 if (want_refresh) 996 if (want_refresh)
… …
1093 } 1041 }
1094 1042
1095 display->flush (); 1043 display->flush ();
1096} 1044}
1097 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1098void 1047void
1099rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1100{ 1049{
1101 make_current (); 1050 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1052
1103 display->flush (); 1053 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1054}
1108 1055
1109void 1056void
1110rxvt_term::flush_cb (time_watcher &w) 1057rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1058{
1112 make_current (); 1059 make_current ();
1113 1060
1114 refresh_count = 0; 1061 refresh_count = 0;
1115 flush (); 1062 flush ();
1116} 1063}
1117 1064
1118#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1119void 1066void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1068{
1122 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1070 want_refresh = 1;
1124 1071 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1072}
1127#endif 1073#endif
1128 1074
1129#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1130void 1076void
1131rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1078{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1080 {
1135 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1136 want_refresh = 1; 1082 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
1138 } 1084 }
1085 else
1086 w.stop ();
1139} 1087}
1140#endif 1088#endif
1141 1089
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1091void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1093{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1148 { 1096 {
1149 want_refresh = 1; 1097 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1151 } 1099 }
1100 else
1101 w.stop ();
1152} 1102}
1153#endif 1103#endif
1154 1104
1155#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1156void 1106void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1108{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1110 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1112 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1164 } 1114 }
1115 else
1116 w.stop ();
1165} 1117}
1166#endif 1118#endif
1167 1119
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1121void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1123{
1172 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1125 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1126 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1181 } 1134 }
1182} 1135}
1183#endif 1136#endif
1184 1137
1185#if LINUX_YIELD_HACK 1138#if LINUX_YIELD_HACK
1186static struct event_handler 1139static struct event_handler
1187{ 1140{
1188 check_watcher yield_ev; 1141 ev::prepare yield_ev;
1189 1142
1190 void yield_cb (check_watcher &w) 1143 void yield_cb (ev::prepare &w, int revents)
1191 { 1144 {
1192 // this should really be sched_yield(), but the linux guys thought 1145 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1146 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is 1147 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1148 // allowed by the sus... as is returning ENOSYS.
… …
1246 1199
1247 return false; 1200 return false;
1248} 1201}
1249 1202
1250void 1203void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1205{
1253 make_current (); 1206 make_current ();
1254 1207
1255 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1210 while (pty_fill ())
1258 if (cmd_parse ()) 1211 if (cmd_parse ())
1259 break; 1212 break;
1260 1213
1261 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1262 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1263} 1218}
1264 1219
1265void 1220void
1266rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1267{ 1222{
… …
1270 1225
1271#ifdef POINTER_BLANK 1226#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1227 hidden_pointer = 0;
1273 1228
1274 if (option (Opt_pointerBlank)) 1229 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1230 pointer_ev.start (pointerBlankDelay);
1276#endif 1231#endif
1277} 1232}
1278 1233
1279#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1280void 1235void
… …
1288 1243
1289 hidden_pointer = 1; 1244 hidden_pointer = 1;
1290} 1245}
1291 1246
1292void 1247void
1293rxvt_term::pointer_cb (time_watcher &w) 1248rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1249{
1295 make_current (); 1250 make_current ();
1296 1251
1297 pointer_blank (); 1252 pointer_blank ();
1298} 1253}
… …
1301void 1256void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1257rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1258{
1304 int button_number, key_state = 0; 1259 int button_number, key_state = 0;
1305 int x, y; 1260 int x, y;
1261 int code = 32;
1306 1262
1307 x = ev.x; 1263 x = Pixel2Col (ev.x);
1308 y = ev.y; 1264 y = Pixel2Row (ev.y);
1309 pixel_position (&x, &y); 1265 if (ev.type == MotionNotify)
1266 {
1267 if (x == mouse_row && y == mouse_col)
1268 return;
1269 mouse_row = x;
1270 mouse_col = y;
1271 code += 32;
1272 }
1310 1273
1311 if (MEvent.button == AnyButton) 1274 if (MEvent.button == AnyButton)
1312 button_number = 3; 1275 button_number = 3;
1313 else 1276 else
1314 { 1277 {
… …
1360 x + 1, 1323 x + 1,
1361 y + 1); 1324 y + 1);
1362#endif 1325#endif
1363 1326
1364 tt_printf ("\033[M%c%c%c", 1327 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1328 (code + button_number + key_state),
1366 (32 + x + 1), 1329 (32 + x + 1),
1367 (32 + y + 1)); 1330 (32 + y + 1));
1368} 1331}
1369 1332
1370/*{{{ process an X event */ 1333/*{{{ process an X event */
… …
1474 && ev.xfocus.mode != NotifyGrab) 1437 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1438 focus_out ();
1476 break; 1439 break;
1477 1440
1478 case ConfigureNotify: 1441 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */
1479 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1480 { 1446 {
1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1482 ; 1448 ;
1483 1449
1484 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1485 { 1451 {
1486 seen_resize = 1; 1452 seen_resize = 1;
1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1488#ifdef XPM_BACKGROUND
1489 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1490 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1491 {
1492 bgPixmap.render ();
1493 scr_touch (true);
1494 }
1495#endif
1496 } 1454 }
1455 else
1456 {
1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ())
1459 update_background ();
1460#endif
1461 }
1497 1462
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 bgPixmap.render ();
1503#endif
1504 } 1464 }
1505 break; 1465 break;
1506 1466
1507 case PropertyNotify: 1467 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1468 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1526 break; 1486 break;
1527 1487
1528 case MapNotify: 1488 case MapNotify:
1529 mapped = 1; 1489 mapped = 1;
1530#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1491 text_blink_ev.start ();
1532#endif 1492#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1534 break; 1494 break;
1535 1495
1536 case UnmapNotify: 1496 case UnmapNotify:
… …
1538#ifdef TEXT_BLINK 1498#ifdef TEXT_BLINK
1539 text_blink_ev.stop (); 1499 text_blink_ev.stop ();
1540#endif 1500#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1501 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1502 break;
1543
1544#ifdef ENABLE_TRANSPARENCY
1545 case ReparentNotify:
1546 rootwin_cb (ev);
1547 break;
1548#endif /* ENABLE_TRANSPARENCY */
1549 1503
1550 case GraphicsExpose: 1504 case GraphicsExpose:
1551 case Expose: 1505 case Expose:
1552 if (ev.xany.window == vt) 1506 if (ev.xany.window == vt)
1553 { 1507 {
1554 do 1508 do
1509 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1510 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1511 ev.xexpose.width, ev.xexpose.height, False);
1512 }
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1513 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1558 1514
1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560 1516
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1518 {
1562 scr_expose (ev.xexpose.x, ev.xexpose.y, 1519 scr_expose (ev.xexpose.x, ev.xexpose.y,
1563 ev.xexpose.width, ev.xexpose.height, False); 1520 ev.xexpose.width, ev.xexpose.height, False);
1521 }
1564 1522
1565 want_refresh = 1; 1523 want_refresh = 1;
1566 } 1524 }
1567 else 1525 else
1568 { 1526 {
… …
1584 case MotionNotify: 1542 case MotionNotify:
1585#ifdef POINTER_BLANK 1543#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1544 if (hidden_pointer)
1587 pointer_unblank (); 1545 pointer_unblank ();
1588#endif 1546#endif
1547 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1548 || priv_modes & PrivMode_MouseAnyEvent)
1549 mouse_report (ev.xbutton);
1589 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1590 break; 1551 break;
1591 1552
1592 if (ev.xany.window == vt) 1553 if (ev.xany.window == vt)
1593 { 1554 {
… …
1627 int dist; 1588 int dist;
1628 1589
1629 /* don't clobber the current delay if we are 1590 /* don't clobber the current delay if we are
1630 * already in the middle of scrolling. 1591 * already in the middle of scrolling.
1631 */ 1592 */
1632 if (!sel_scroll_ev.active) 1593 if (!sel_scroll_ev.is_active ())
1633 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1594 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1634 1595
1635 /* save the event params so we can highlight 1596 /* save the event params so we can highlight
1636 * the selection in the pending-scroll loop 1597 * the selection in the pending-scroll loop
1637 */ 1598 */
1638 selection_save_x = ev.xbutton.x; 1599 selection_save_x = ev.xbutton.x;
… …
1660 else 1621 else
1661 { 1622 {
1662 /* we are within the text window, so we 1623 /* we are within the text window, so we
1663 * shouldn't be scrolling 1624 * shouldn't be scrolling
1664 */ 1625 */
1665 if (sel_scroll_ev.active)
1666 sel_scroll_ev.stop(); 1626 sel_scroll_ev.stop();
1667 } 1627 }
1668#endif 1628#endif
1669#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1670 } 1630 }
1671#endif 1631#endif
… …
1697 { 1657 {
1698 hidden_cursor = 0; 1658 hidden_cursor = 0;
1699 want_refresh = 1; 1659 want_refresh = 1;
1700 } 1660 }
1701 1661
1702 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1662 cursor_blink_ev.again ();
1703 } 1663 }
1704#endif 1664#endif
1705 1665
1706#if defined(POINTER_BLANK) 1666#if defined(POINTER_BLANK)
1707 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1667 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1714 1674
1715 if (ev.type == KeyPress && hidden_pointer == 0) 1675 if (ev.type == KeyPress && hidden_pointer == 0)
1716 pointer_blank (); 1676 pointer_blank ();
1717 } 1677 }
1718#endif 1678#endif
1679
1680 refresh_check ();
1719} 1681}
1720 1682
1721void 1683void
1722rxvt_term::focus_in () 1684rxvt_term::focus_in ()
1723{ 1685{
… …
1735 XSetICFocus (Input_Context); 1697 XSetICFocus (Input_Context);
1736 } 1698 }
1737#endif 1699#endif
1738#if CURSOR_BLINK 1700#if CURSOR_BLINK
1739 if (option (Opt_cursorBlink)) 1701 if (option (Opt_cursorBlink))
1740 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1702 cursor_blink_ev.again ();
1741#endif 1703#endif
1742#if OFF_FOCUS_FADING 1704#if OFF_FOCUS_FADING
1743 if (rs[Rs_fade]) 1705 if (rs[Rs_fade])
1744 { 1706 {
1745 pix_colors = pix_colors_focused; 1707 pix_colors = pix_colors_focused;
… …
1747 } 1709 }
1748#endif 1710#endif
1749#if ENABLE_FRILLS 1711#if ENABLE_FRILLS
1750 if (option (Opt_urgentOnBell)) 1712 if (option (Opt_urgentOnBell))
1751 { 1713 {
1752 XWMHints *h;
1753
1754 h = XGetWMHints(dpy, parent[0]); 1714 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1755 if (h != NULL)
1756 { 1715 {
1757 h->flags &= ~XUrgencyHint; 1716 h->flags &= ~XUrgencyHint;
1758 XSetWMHints(dpy, parent[0], h); 1717 XSetWMHints (dpy, parent[0], h);
1759 } 1718 }
1760 } 1719 }
1761#endif 1720#endif
1762 } 1721 }
1763} 1722}
… …
1786 XUnsetICFocus (Input_Context); 1745 XUnsetICFocus (Input_Context);
1787#endif 1746#endif
1788#if CURSOR_BLINK 1747#if CURSOR_BLINK
1789 if (option (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop (); 1749 cursor_blink_ev.stop ();
1750
1791 hidden_cursor = 0; 1751 hidden_cursor = 0;
1792#endif 1752#endif
1793#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1795 { 1755 {
… …
1833 */ 1793 */
1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1794 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1795 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1796 {
1837 bgPixmap.set_root_pixmap (); 1797 bgPixmap.set_root_pixmap ();
1838 bgPixmap.render (); 1798 update_background ();
1839 } 1799 }
1800
1840 break; 1801 break;
1841 } 1802 }
1842# endif 1803# endif
1804
1805 refresh_check ();
1843} 1806}
1844#endif 1807#endif
1845 1808
1846void 1809void
1847rxvt_term::button_press (XButtonEvent &ev) 1810rxvt_term::button_press (XButtonEvent &ev)
… …
1902 mouse_report (ev); 1865 mouse_report (ev);
1903 } 1866 }
1904#else 1867#else
1905 MEvent.button = ev.button; 1868 MEvent.button = ev.button;
1906 mouse_report (ev); 1869 mouse_report (ev);
1907#endif /* MOUSE_REPORT_DOUBLECLICK */ 1870#endif /* MOUSE_REPORT_DOUBLECLICK */
1908 1871
1909 } 1872 }
1910 else 1873 else
1911 { 1874 {
1912 if (ev.button != MEvent.button) 1875 if (ev.button != MEvent.button)
… …
2006 tt_printf ("\033[5~"); 1969 tt_printf ("\033[5~");
2007 break; 1970 break;
2008 } 1971 }
2009 } 1972 }
2010 else 1973 else
2011#endif /* NO_SCROLLBAR_REPORT */ 1974#endif /* NO_SCROLLBAR_REPORT */
2012 1975
2013 { 1976 {
2014 char upordown = 0; 1977 char upordown = 0;
2015 1978
2016 if (scrollBar.style == R_SB_NEXT) 1979 if (scrollBar.style == R_SB_NEXT)
2017 { 1980 {
2018 if (scrollbarnext_upButton (ev.y)) 1981 if (scrollbarnext_upButton (ev.y))
2019 upordown = -1; /* up */ 1982 upordown = -1; /* up */
… …
2025 if (scrollbarrxvt_upButton (ev.y)) 1988 if (scrollbarrxvt_upButton (ev.y))
2026 upordown = -1; /* up */ 1989 upordown = -1; /* up */
2027 else if (scrollbarrxvt_dnButton (ev.y)) 1990 else if (scrollbarrxvt_dnButton (ev.y))
2028 upordown = 1; /* down */ 1991 upordown = 1; /* down */
2029 } 1992 }
1993
2030 if (upordown) 1994 if (upordown)
2031 { 1995 {
2032#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1997 if (!cont_scroll_ev.is_active ())
2033 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1998 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2034#endif 1999#endif
2035 if (scr_page (upordown < 0 ? UP : DN, 1)) 2000 if (scr_page (upordown < 0 ? UP : DN, 1))
2036 { 2001 {
2037 if (upordown < 0) 2002 if (upordown < 0)
2038 scrollBar.setUp (); 2003 scrollBar.setUp ();
… …
2042 } 2007 }
2043 else 2008 else
2044 switch (ev.button) 2009 switch (ev.button)
2045 { 2010 {
2046 case Button2: 2011 case Button2:
2047 switch (scrollbar_align) 2012 switch (scrollBar.align)
2048 { 2013 {
2049 case R_SB_ALIGN_TOP: 2014 case R_SB_ALIGN_TOP:
2050 csrO = 0; 2015 csrO = 0;
2051 break; 2016 break;
2052 case R_SB_ALIGN_CENTRE: 2017 case R_SB_ALIGN_CENTRE:
… …
2064 2029
2065 scrollBar.setMotion (); 2030 scrollBar.setMotion ();
2066 break; 2031 break;
2067 2032
2068 case Button1: 2033 case Button1:
2069 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2034 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2070 csrO = ev.y - scrollBar.top; 2035 csrO = ev.y - scrollBar.top;
2071 /* FALLTHROUGH */ 2036 /* FALLTHROUGH */
2072 2037
2073 case Button3: 2038 case Button3:
2074 if (scrollBar.style != R_SB_XTERM) 2039 if (scrollBar.style != R_SB_XTERM)
… …
2118 scrollBar.setIdle (); 2083 scrollBar.setIdle ();
2119 scrollbar_show (0); 2084 scrollbar_show (0);
2120 } 2085 }
2121 2086
2122#ifdef SELECTION_SCROLLING 2087#ifdef SELECTION_SCROLLING
2123 if (sel_scroll_ev.active)
2124 sel_scroll_ev.stop(); 2088 sel_scroll_ev.stop();
2125#endif 2089#endif
2126 2090
2127 if (ev.window == vt) 2091 if (ev.window == vt)
2128 { 2092 {
2129 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2093 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2153 mouse_report (ev); 2117 mouse_report (ev);
2154 } 2118 }
2155#else /* MOUSE_REPORT_DOUBLECLICK */ 2119#else /* MOUSE_REPORT_DOUBLECLICK */
2156 MEvent.button = AnyButton; 2120 MEvent.button = AnyButton;
2157 mouse_report (ev); 2121 mouse_report (ev);
2158#endif /* MOUSE_REPORT_DOUBLECLICK */ 2122#endif /* MOUSE_REPORT_DOUBLECLICK */
2159 return; 2123 return;
2160 } 2124 }
2161 2125
2162 /* 2126 /*
2163 * dumb hack to compensate for the failure of click-and-drag 2127 * dumb hack to compensate for the failure of click-and-drag
… …
2201 { 2165 {
2202 mouse_slip_wheel_speed += v ? -1 : 1; 2166 mouse_slip_wheel_speed += v ? -1 : 1;
2203 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2204 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2205 2169
2206 if (slip_wheel_ev.at < NOW) 2170 if (!slip_wheel_ev.is_active ())
2207 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2171 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2208
2209 slip_wheel_ev.start ();
2210 } 2172 }
2211 else 2173 else
2212 { 2174 {
2213# endif 2175# endif
2214 scr_page (v, i); 2176 scr_page (v, i);
… …
2282 2244
2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2284 { 2246 {
2285 refresh_count = 0; 2247 refresh_count = 0;
2286 2248
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2288 { 2250 {
2289 refreshnow = true; 2251 refreshnow = true;
2290 ch = NOCHAR; 2252 ch = NOCHAR;
2291 break; 2253 break;
2292 } 2254 }
… …
2503 } 2465 }
2504 } 2466 }
2505 2467
2506 pclose_printer (fd); 2468 pclose_printer (fd);
2507} 2469}
2508#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2509/*}}} */ 2471/*}}} */
2510 2472
2511/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2512enum { 2474enum {
2513 C1_40 = 0x40, 2475 C1_40 = 0x40,
… …
2799rxvt_term::process_csi_seq () 2761rxvt_term::process_csi_seq ()
2800{ 2762{
2801 unicode_t ch, priv, i; 2763 unicode_t ch, priv, i;
2802 unsigned int nargs, p; 2764 unsigned int nargs, p;
2803 int n, ndef; 2765 int n, ndef;
2804 int arg[ESC_ARGS]; 2766 int arg[ESC_ARGS] = { };
2805 2767
2806 memset (arg, 0, sizeof (arg));
2807 nargs = 0; 2768 nargs = 0;
2808 2769
2809 priv = 0; 2770 priv = 0;
2810 ch = cmd_getc (); 2771 ch = cmd_getc ();
2811 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
2812 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
2813 priv = ch; 2775 priv = ch;
2814 ch = cmd_getc (); 2776 ch = cmd_getc ();
2815 } 2777 }
2816 2778
2817 /* read any numerical arguments */ 2779 /* read any numerical arguments */
… …
2860 { 2822 {
2861 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2823 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2862 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2824 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2863 // 2825 //
2864 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2826 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2865 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2827 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2866 // that we do not support xterm mouse reporting (should be 95 when we do). 2828 // versions.
2867 // 2829 //
2868 tt_printf ("\033[>%d;94;0c", 'U'); 2830 tt_printf ("\033[>%d;95;0c", 'U');
2869 } 2831 }
2870 break; 2832 break;
2871 case '?': 2833 case '?':
2872 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2873 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
… …
3429#if ENABLE_TRANSPARENCY 3391#if ENABLE_TRANSPARENCY
3430 case URxvt_Color_tint: 3392 case URxvt_Color_tint:
3431 process_color_seq (op, Color_tint, str, resp); 3393 process_color_seq (op, Color_tint, str, resp);
3432 { 3394 {
3433 bool changed = false; 3395 bool changed = false;
3396
3434 if (ISSET_PIXCOLOR (Color_tint)) 3397 if (ISSET_PIXCOLOR (Color_tint))
3435 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3398 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3436 else 3399 else
3437 changed = bgPixmap.unset_tint (); 3400 changed = bgPixmap.unset_tint ();
3401
3438 if (changed) 3402 if (changed)
3439 bgPixmap.render (); 3403 update_background ();
3440 } 3404 }
3441 3405
3442 break; 3406 break;
3443#endif 3407#endif
3444 3408
3445#if XPM_BACKGROUND 3409#if BG_IMAGE_FROM_FILE
3446 case Rxvt_Pixmap: 3410 case Rxvt_Pixmap:
3447 if (!strcmp (str, "?")) 3411 if (!strcmp (str, "?"))
3448 { 3412 {
3449 char str[256]; 3413 char str[256];
3450 3414
… …
3465 changed++; 3429 changed++;
3466 str = strchr (str, ';'); 3430 str = strchr (str, ';');
3467 if (str == NULL) 3431 if (str == NULL)
3468 bgPixmap.set_defaultGeometry (); 3432 bgPixmap.set_defaultGeometry ();
3469 } 3433 }
3434
3470 while (str) 3435 while (str)
3471 { 3436 {
3472 str++; 3437 str++;
3473 if (bgPixmap.set_geometry (str)) 3438 if (bgPixmap.set_geometry (str))
3474 changed++; 3439 changed++;
3475 str = strchr (str, ';'); 3440 str = strchr (str, ';');
3476 } 3441 }
3442
3477 if (changed) 3443 if (changed)
3478 { 3444 update_background ();
3479 bgPixmap.render ();
3480 scr_touch (true);
3481 }
3482 } 3445 }
3483 break; 3446 break;
3484#endif 3447#endif
3485 3448
3486 case Rxvt_restoreFG: 3449 case Rxvt_restoreFG:
… …
3640 { 66, PrivMode_aplKP }, 3603 { 66, PrivMode_aplKP },
3641#ifndef NO_BACKSPACE_KEY 3604#ifndef NO_BACKSPACE_KEY
3642 { 67, PrivMode_BackSpace }, 3605 { 67, PrivMode_BackSpace },
3643#endif 3606#endif
3644 { 1000, PrivMode_MouseX11 }, 3607 { 1000, PrivMode_MouseX11 },
3645 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3608 { 1002, PrivMode_MouseBtnEvent },
3646 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3609 { 1003, PrivMode_MouseAnyEvent },
3647 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3648 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3649 { 1011, PrivMode_Keypress }, // rxvt extension 3611 { 1011, PrivMode_Keypress }, // rxvt extension
3650 // 1035 enable modifiers for alt, numlock NYI 3612 // 1035 enable modifiers for alt, numlock NYI
3651 // 1036 send ESC for meta keys NYI 3613 // 1036 send ESC for meta keys NYI
3652 // 1037 send DEL for keypad delete NYI 3614 // 1037 send DEL for keypad delete NYI
… …
3726 scr_autowrap (state); 3688 scr_autowrap (state);
3727 break; 3689 break;
3728 /* case 8: - auto repeat, can't do on a per window basis */ 3690 /* case 8: - auto repeat, can't do on a per window basis */
3729 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
3730 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
3731 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3732 break; 3694 break;
3733#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
3734 case scrollBar_esc: 3696 case scrollBar_esc:
3735 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
3736 { 3698 {
… …
3749 break; 3711 break;
3750 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
3751 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
3752 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
3753 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
3754 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3755 break; 3717 break;
3756#if 0
3757 case 1001: 3718 case 1002:
3758 break; /* X11 mouse highlighting */ 3719 case 1003:
3759#endif 3720 if (state)
3721 {
3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724 vt_emask_mouse = PointerMotionMask;
3725 }
3726 else
3727 vt_emask_mouse = NoEventMask;
3728 vt_select_input ();
3729 break;
3760 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
3761 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
3762 break; 3732 break;
3763 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
3764 set_option (Opt_scrollTtyKeypress, state); 3734 set_option (Opt_scrollTtyKeypress, state);
… …
3941rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
3942{ 3912{
3943 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
3944 3914
3945 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
3946 { /* query graphics */ 3917 /* query graphics */
3947 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
3948 return; 3919 return;
3949 } 3920 }
3950 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
3951 do 3922 do
… …
4001 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4002 3973
4003 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
4004 v_buflen += len; 3975 v_buflen += len;
4005 3976
4006 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
4007} 3978}
4008 3979
4009void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4010{ 3981{
4011 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3982 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4016 3987
4017 if (v_buflen == 0) 3988 if (v_buflen == 0)
4018 { 3989 {
4019 free (v_buffer); 3990 free (v_buffer);
4020 v_buffer = 0; 3991 v_buffer = 0;
4021 v_buflen = 0;
4022 3992
4023 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4024 return; 3994 return;
4025 } 3995 }
4026 3996
4027 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4028 } 3998 }
4029 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4030 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4031} 4001}
4032 4002
4033/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4034 4004

Diff Legend

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