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.354 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.384 by ayin, Tue Dec 18 13:07:55 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;
… …
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 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
554 switch (keysym) 584 switch (keysym)
555 { 585 {
556#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace: 587 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
564 else 594 else
565 strcpy (kbuf, rs[Rs_backspace_key]); 595 strcpy (kbuf, rs[Rs_backspace_key]);
566 break; 596 break;
567#endif 597#endif
568#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete: 599 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]); 600 strcpy (kbuf, rs[Rs_delete_key]);
581 break; 601 break;
582#endif 602#endif
583 case XK_Tab: 603 case XK_Tab:
… …
595#endif 615#endif
596 newlen = 0; 616 newlen = 0;
597 } 617 }
598 break; 618 break;
599 619
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if (kp)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
630 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
632 break; 636 break;
633 637
634#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if (kp)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior: 639 case XK_Prior:
646 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
647 break; 641 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if (kp)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next: 642 case XK_Next:
659 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
660 break; 644 break;
661#endif 645#endif
662 case XK_KP_Enter: 646 case XK_KP_Enter:
… …
681 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
682 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
683 } 667 }
684 break; 668 break;
685 669
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
728 706
729 case XK_Find: 707 case XK_Find:
730 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
731 break; 709 break;
732 710
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert: 711 case XK_Insert:
744 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
745 break; 713 break;
746#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove: 715 case DXK_Remove:
… …
751 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
752 break; 720 break;
753 case XK_Select: 721 case XK_Select:
754 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
755 break; 723 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End: 724 case XK_End:
767 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
768 break; 726 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if (kp)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home: 727 case XK_Home:
780 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
781 break; 729 break;
782 730
783#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
1035void 983void
1036rxvt_term::flush () 984rxvt_term::flush ()
1037{ 985{
1038 flush_ev.stop (); 986 flush_ev.stop ();
1039 987
988#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ())
990 {
991// scr_clear (true); This needs to be researched further!
992 scr_touch (false);
993 }
994#endif
995
1040 if (want_refresh) 996 if (want_refresh)
1041 { 997 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 998 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 { 999 {
1044 int row = view_start; 1000 int row = view_start;
… …
1085 } 1041 }
1086 1042
1087 display->flush (); 1043 display->flush ();
1088} 1044}
1089 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1090void 1047void
1091rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1092{ 1049{
1093 make_current (); 1050 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1094 1052
1095 display->flush (); 1053 display->flush ();
1096
1097 if (want_refresh && !flush_ev.active)
1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099} 1054}
1100 1055
1101void 1056void
1102rxvt_term::flush_cb (time_watcher &w) 1057rxvt_term::flush_cb (ev::timer &w, int revents)
1103{ 1058{
1104 make_current (); 1059 make_current ();
1105 1060
1106 refresh_count = 0; 1061 refresh_count = 0;
1107 flush (); 1062 flush ();
1108} 1063}
1109 1064
1110#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1111void 1066void
1112rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113{ 1068{
1114 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1115 want_refresh = 1; 1070 want_refresh = 1;
1116 1071 refresh_check ();
1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1118} 1072}
1119#endif 1073#endif
1120 1074
1121#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1122void 1076void
1123rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1124{ 1078{
1125 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1126 { 1080 {
1127 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1128 want_refresh = 1; 1082 want_refresh = 1;
1129 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
1130 } 1084 }
1085 else
1086 w.stop ();
1131} 1087}
1132#endif 1088#endif
1133 1089
1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135void 1091void
1136rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137{ 1093{
1138 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
1139 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1140 { 1096 {
1141 want_refresh = 1; 1097 want_refresh = 1;
1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1143 } 1099 }
1100 else
1101 w.stop ();
1144} 1102}
1145#endif 1103#endif
1146 1104
1147#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1148void 1106void
1149rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150{ 1108{
1151 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152 { 1110 {
1153 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154 want_refresh = 1; 1112 want_refresh = 1;
1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1156 } 1114 }
1115 else
1116 w.stop ();
1157} 1117}
1158#endif 1118#endif
1159 1119
1160#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161void 1121void
1162rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163{ 1123{
1164 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166 : scr_page (UP, mouse_slip_wheel_speed))
1167 { 1125 {
1168 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0;
1170
1171 want_refresh = 1; 1126 want_refresh = 1;
1172 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 ();
1173 } 1134 }
1174} 1135}
1175#endif 1136#endif
1176 1137
1177#if LINUX_YIELD_HACK 1138#if LINUX_YIELD_HACK
1178static struct event_handler 1139static struct event_handler
1179{ 1140{
1180 check_watcher yield_ev; 1141 ev::prepare yield_ev;
1181 1142
1182 void yield_cb (check_watcher &w) 1143 void yield_cb (ev::prepare &w, int revents)
1183 { 1144 {
1184 // this should really be sched_yield(), but the linux guys thought 1145 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than 1146 // that giving a process calling sched_yield () less cpu time than
1186 // 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
1187 // allowed by the sus... as is returning ENOSYS. 1148 // allowed by the sus... as is returning ENOSYS.
… …
1238 1199
1239 return false; 1200 return false;
1240} 1201}
1241 1202
1242void 1203void
1243rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1244{ 1205{
1245 make_current (); 1206 make_current ();
1246 1207
1247 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1248 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1249 while (pty_fill ()) 1210 while (pty_fill ())
1250 if (cmd_parse ()) 1211 if (cmd_parse ())
1251 break; 1212 break;
1252 1213
1253 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1254 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1255} 1218}
1256 1219
1257void 1220void
1258rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1259{ 1222{
… …
1262 1225
1263#ifdef POINTER_BLANK 1226#ifdef POINTER_BLANK
1264 hidden_pointer = 0; 1227 hidden_pointer = 0;
1265 1228
1266 if (option (Opt_pointerBlank)) 1229 if (option (Opt_pointerBlank))
1267 pointer_ev.start (NOW + pointerBlankDelay); 1230 pointer_ev.start (pointerBlankDelay);
1268#endif 1231#endif
1269} 1232}
1270 1233
1271#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1272void 1235void
… …
1280 1243
1281 hidden_pointer = 1; 1244 hidden_pointer = 1;
1282} 1245}
1283 1246
1284void 1247void
1285rxvt_term::pointer_cb (time_watcher &w) 1248rxvt_term::pointer_cb (ev::timer &w, int revents)
1286{ 1249{
1287 make_current (); 1250 make_current ();
1288 1251
1289 pointer_blank (); 1252 pointer_blank ();
1290} 1253}
… …
1293void 1256void
1294rxvt_term::mouse_report (XButtonEvent &ev) 1257rxvt_term::mouse_report (XButtonEvent &ev)
1295{ 1258{
1296 int button_number, key_state = 0; 1259 int button_number, key_state = 0;
1297 int x, y; 1260 int x, y;
1261 int code = 32;
1298 1262
1299 x = ev.x; 1263 x = Pixel2Col (ev.x);
1300 y = ev.y; 1264 y = Pixel2Row (ev.y);
1301 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 }
1302 1273
1303 if (MEvent.button == AnyButton) 1274 if (MEvent.button == AnyButton)
1304 button_number = 3; 1275 button_number = 3;
1305 else 1276 else
1306 { 1277 {
… …
1352 x + 1, 1323 x + 1,
1353 y + 1); 1324 y + 1);
1354#endif 1325#endif
1355 1326
1356 tt_printf ("\033[M%c%c%c", 1327 tt_printf ("\033[M%c%c%c",
1357 (32 + button_number + key_state), 1328 (code + button_number + key_state),
1358 (32 + x + 1), 1329 (32 + x + 1),
1359 (32 + y + 1)); 1330 (32 + y + 1));
1360} 1331}
1361 1332
1362/*{{{ process an X event */ 1333/*{{{ process an X event */
… …
1466 && ev.xfocus.mode != NotifyGrab) 1437 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1438 focus_out ();
1468 break; 1439 break;
1469 1440
1470 case ConfigureNotify: 1441 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/ 1444 szHint.width, szHint.height); */
1474 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1475 { 1446 {
1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477 ; 1448 ;
1478 1449
… …
1514 break; 1485 break;
1515 1486
1516 case MapNotify: 1487 case MapNotify:
1517 mapped = 1; 1488 mapped = 1;
1518#ifdef TEXT_BLINK 1489#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1490 text_blink_ev.start ();
1520#endif 1491#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1493 break;
1523 1494
1524 case UnmapNotify: 1495 case UnmapNotify:
… …
1532 case GraphicsExpose: 1503 case GraphicsExpose:
1533 case Expose: 1504 case Expose:
1534 if (ev.xany.window == vt) 1505 if (ev.xany.window == vt)
1535 { 1506 {
1536 do 1507 do
1508 {
1537 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1538 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1511 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1513
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1514 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1515
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1516 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1517 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1518 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1519 ev.xexpose.width, ev.xexpose.height, False);
1520 }
1546 1521
1547 want_refresh = 1; 1522 want_refresh = 1;
1548 } 1523 }
1549 else 1524 else
1550 { 1525 {
… …
1566 case MotionNotify: 1541 case MotionNotify:
1567#ifdef POINTER_BLANK 1542#ifdef POINTER_BLANK
1568 if (hidden_pointer) 1543 if (hidden_pointer)
1569 pointer_unblank (); 1544 pointer_unblank ();
1570#endif 1545#endif
1546 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1547 || priv_modes & PrivMode_MouseAnyEvent)
1548 mouse_report (ev.xbutton);
1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1549 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572 break; 1550 break;
1573 1551
1574 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1575 { 1553 {
… …
1609 int dist; 1587 int dist;
1610 1588
1611 /* don't clobber the current delay if we are 1589 /* don't clobber the current delay if we are
1612 * already in the middle of scrolling. 1590 * already in the middle of scrolling.
1613 */ 1591 */
1614 if (!sel_scroll_ev.active) 1592 if (!sel_scroll_ev.is_active ())
1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1593 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616 1594
1617 /* save the event params so we can highlight 1595 /* save the event params so we can highlight
1618 * the selection in the pending-scroll loop 1596 * the selection in the pending-scroll loop
1619 */ 1597 */
1620 selection_save_x = ev.xbutton.x; 1598 selection_save_x = ev.xbutton.x;
… …
1642 else 1620 else
1643 { 1621 {
1644 /* we are within the text window, so we 1622 /* we are within the text window, so we
1645 * shouldn't be scrolling 1623 * shouldn't be scrolling
1646 */ 1624 */
1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 1625 sel_scroll_ev.stop();
1649 } 1626 }
1650#endif 1627#endif
1651#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1652 } 1629 }
1653#endif 1630#endif
… …
1679 { 1656 {
1680 hidden_cursor = 0; 1657 hidden_cursor = 0;
1681 want_refresh = 1; 1658 want_refresh = 1;
1682 } 1659 }
1683 1660
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1661 cursor_blink_ev.again ();
1685 } 1662 }
1686#endif 1663#endif
1687 1664
1688#if defined(POINTER_BLANK) 1665#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1666 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1696 1673
1697 if (ev.type == KeyPress && hidden_pointer == 0) 1674 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank (); 1675 pointer_blank ();
1699 } 1676 }
1700#endif 1677#endif
1678
1679 refresh_check ();
1701} 1680}
1702 1681
1703void 1682void
1704rxvt_term::focus_in () 1683rxvt_term::focus_in ()
1705{ 1684{
… …
1717 XSetICFocus (Input_Context); 1696 XSetICFocus (Input_Context);
1718 } 1697 }
1719#endif 1698#endif
1720#if CURSOR_BLINK 1699#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1700 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1701 cursor_blink_ev.again ();
1723#endif 1702#endif
1724#if OFF_FOCUS_FADING 1703#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade]) 1704 if (rs[Rs_fade])
1726 { 1705 {
1727 pix_colors = pix_colors_focused; 1706 pix_colors = pix_colors_focused;
… …
1729 } 1708 }
1730#endif 1709#endif
1731#if ENABLE_FRILLS 1710#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell)) 1711 if (option (Opt_urgentOnBell))
1733 { 1712 {
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]); 1713 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 if (h != NULL)
1738 { 1714 {
1739 h->flags &= ~XUrgencyHint; 1715 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h); 1716 XSetWMHints (dpy, parent[0], h);
1741 } 1717 }
1742 } 1718 }
1743#endif 1719#endif
1744 } 1720 }
1745} 1721}
… …
1768 XUnsetICFocus (Input_Context); 1744 XUnsetICFocus (Input_Context);
1769#endif 1745#endif
1770#if CURSOR_BLINK 1746#if CURSOR_BLINK
1771 if (option (Opt_cursorBlink)) 1747 if (option (Opt_cursorBlink))
1772 cursor_blink_ev.stop (); 1748 cursor_blink_ev.stop ();
1749
1773 hidden_cursor = 0; 1750 hidden_cursor = 0;
1774#endif 1751#endif
1775#if OFF_FOCUS_FADING 1752#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1753 if (rs[Rs_fade])
1777 { 1754 {
… …
1820 update_background (); 1797 update_background ();
1821 } 1798 }
1822 break; 1799 break;
1823 } 1800 }
1824# endif 1801# endif
1802
1803 refresh_check ();
1825} 1804}
1826#endif 1805#endif
1827 1806
1828void 1807void
1829rxvt_term::button_press (XButtonEvent &ev) 1808rxvt_term::button_press (XButtonEvent &ev)
… …
1884 mouse_report (ev); 1863 mouse_report (ev);
1885 } 1864 }
1886#else 1865#else
1887 MEvent.button = ev.button; 1866 MEvent.button = ev.button;
1888 mouse_report (ev); 1867 mouse_report (ev);
1889#endif /* MOUSE_REPORT_DOUBLECLICK */ 1868#endif /* MOUSE_REPORT_DOUBLECLICK */
1890 1869
1891 } 1870 }
1892 else 1871 else
1893 { 1872 {
1894 if (ev.button != MEvent.button) 1873 if (ev.button != MEvent.button)
… …
1988 tt_printf ("\033[5~"); 1967 tt_printf ("\033[5~");
1989 break; 1968 break;
1990 } 1969 }
1991 } 1970 }
1992 else 1971 else
1993#endif /* NO_SCROLLBAR_REPORT */ 1972#endif /* NO_SCROLLBAR_REPORT */
1994 1973
1995 { 1974 {
1996 char upordown = 0; 1975 char upordown = 0;
1997 1976
1998 if (scrollBar.style == R_SB_NEXT) 1977 if (scrollBar.style == R_SB_NEXT)
1999 { 1978 {
2000 if (scrollbarnext_upButton (ev.y)) 1979 if (scrollbarnext_upButton (ev.y))
2001 upordown = -1; /* up */ 1980 upordown = -1; /* up */
… …
2007 if (scrollbarrxvt_upButton (ev.y)) 1986 if (scrollbarrxvt_upButton (ev.y))
2008 upordown = -1; /* up */ 1987 upordown = -1; /* up */
2009 else if (scrollbarrxvt_dnButton (ev.y)) 1988 else if (scrollbarrxvt_dnButton (ev.y))
2010 upordown = 1; /* down */ 1989 upordown = 1; /* down */
2011 } 1990 }
1991
2012 if (upordown) 1992 if (upordown)
2013 { 1993 {
2014#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1994#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1995 if (!cont_scroll_ev.is_active ())
2015 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1996 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2016#endif 1997#endif
2017 if (scr_page (upordown < 0 ? UP : DN, 1)) 1998 if (scr_page (upordown < 0 ? UP : DN, 1))
2018 { 1999 {
2019 if (upordown < 0) 2000 if (upordown < 0)
2020 scrollBar.setUp (); 2001 scrollBar.setUp ();
… …
2100 scrollBar.setIdle (); 2081 scrollBar.setIdle ();
2101 scrollbar_show (0); 2082 scrollbar_show (0);
2102 } 2083 }
2103 2084
2104#ifdef SELECTION_SCROLLING 2085#ifdef SELECTION_SCROLLING
2105 if (sel_scroll_ev.active)
2106 sel_scroll_ev.stop(); 2086 sel_scroll_ev.stop();
2107#endif 2087#endif
2108 2088
2109 if (ev.window == vt) 2089 if (ev.window == vt)
2110 { 2090 {
2111 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2091 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2135 mouse_report (ev); 2115 mouse_report (ev);
2136 } 2116 }
2137#else /* MOUSE_REPORT_DOUBLECLICK */ 2117#else /* MOUSE_REPORT_DOUBLECLICK */
2138 MEvent.button = AnyButton; 2118 MEvent.button = AnyButton;
2139 mouse_report (ev); 2119 mouse_report (ev);
2140#endif /* MOUSE_REPORT_DOUBLECLICK */ 2120#endif /* MOUSE_REPORT_DOUBLECLICK */
2141 return; 2121 return;
2142 } 2122 }
2143 2123
2144 /* 2124 /*
2145 * dumb hack to compensate for the failure of click-and-drag 2125 * dumb hack to compensate for the failure of click-and-drag
… …
2183 { 2163 {
2184 mouse_slip_wheel_speed += v ? -1 : 1; 2164 mouse_slip_wheel_speed += v ? -1 : 1;
2185 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2165 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2186 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2166 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2187 2167
2188 if (slip_wheel_ev.at < NOW) 2168 if (!slip_wheel_ev.is_active ())
2189 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2169 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2190
2191 slip_wheel_ev.start ();
2192 } 2170 }
2193 else 2171 else
2194 { 2172 {
2195# endif 2173# endif
2196 scr_page (v, i); 2174 scr_page (v, i);
… …
2264 2242
2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2243 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2266 { 2244 {
2267 refresh_count = 0; 2245 refresh_count = 0;
2268 2246
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2247 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 { 2248 {
2271 refreshnow = true; 2249 refreshnow = true;
2272 ch = NOCHAR; 2250 ch = NOCHAR;
2273 break; 2251 break;
2274 } 2252 }
… …
2485 } 2463 }
2486 } 2464 }
2487 2465
2488 pclose_printer (fd); 2466 pclose_printer (fd);
2489} 2467}
2490#endif /* PRINTPIPE */ 2468#endif /* PRINTPIPE */
2491/*}}} */ 2469/*}}} */
2492 2470
2493/* *INDENT-OFF* */ 2471/* *INDENT-OFF* */
2494enum { 2472enum {
2495 C1_40 = 0x40, 2473 C1_40 = 0x40,
… …
2788 nargs = 0; 2766 nargs = 0;
2789 2767
2790 priv = 0; 2768 priv = 0;
2791 ch = cmd_getc (); 2769 ch = cmd_getc ();
2792 if (ch >= '<' && ch <= '?') 2770 if (ch >= '<' && ch <= '?')
2771 {
2793 { /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' */
2794 priv = ch; 2773 priv = ch;
2795 ch = cmd_getc (); 2774 ch = cmd_getc ();
2796 } 2775 }
2797 2776
2798 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
2841 { 2820 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2821 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2822 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 // 2823 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2824 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2825 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2847 // that we do not support xterm mouse reporting (should be 95 when we do). 2826 // versions.
2848 // 2827 //
2849 tt_printf ("\033[>%d;94;0c", 'U'); 2828 tt_printf ("\033[>%d;95;0c", 'U');
2850 } 2829 }
2851 break; 2830 break;
2852 case '?': 2831 case '?':
2853 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2854 process_terminal_mode (ch, priv, nargs, arg); 2833 process_terminal_mode (ch, priv, nargs, arg);
… …
3618 { 66, PrivMode_aplKP }, 3597 { 66, PrivMode_aplKP },
3619#ifndef NO_BACKSPACE_KEY 3598#ifndef NO_BACKSPACE_KEY
3620 { 67, PrivMode_BackSpace }, 3599 { 67, PrivMode_BackSpace },
3621#endif 3600#endif
3622 { 1000, PrivMode_MouseX11 }, 3601 { 1000, PrivMode_MouseX11 },
3623 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3602 { 1002, PrivMode_MouseBtnEvent },
3624 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3603 { 1003, PrivMode_MouseAnyEvent },
3625 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627 { 1011, PrivMode_Keypress }, // rxvt extension 3605 { 1011, PrivMode_Keypress }, // rxvt extension
3628 // 1035 enable modifiers for alt, numlock NYI 3606 // 1035 enable modifiers for alt, numlock NYI
3629 // 1036 send ESC for meta keys NYI 3607 // 1036 send ESC for meta keys NYI
3630 // 1037 send DEL for keypad delete NYI 3608 // 1037 send DEL for keypad delete NYI
… …
3704 scr_autowrap (state); 3682 scr_autowrap (state);
3705 break; 3683 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 3684 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 3685 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 3686 if (state) /* orthogonal */
3709 priv_modes &= ~PrivMode_MouseX11; 3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3710 break; 3688 break;
3711#ifdef scrollBar_esc 3689#ifdef scrollBar_esc
3712 case scrollBar_esc: 3690 case scrollBar_esc:
3713 if (scrollbar_mapping (state)) 3691 if (scrollbar_mapping (state))
3714 { 3692 {
… …
3727 break; 3705 break;
3728 /* case 66: - application key pad */ 3706 /* case 66: - application key pad */
3729 /* case 67: - backspace key */ 3707 /* case 67: - backspace key */
3730 case 1000: /* X11 mouse reporting */ 3708 case 1000: /* X11 mouse reporting */
3731 if (state) /* orthogonal */ 3709 if (state) /* orthogonal */
3732 priv_modes &= ~PrivMode_MouseX10; 3710 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3733 break; 3711 break;
3734#if 0
3735 case 1001: 3712 case 1002:
3736 break; /* X11 mouse highlighting */ 3713 case 1003:
3737#endif 3714 if (state)
3715 {
3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3717 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3718 vt_emask_mouse = PointerMotionMask;
3719 }
3720 else
3721 vt_emask_mouse = NoEventMask;
3722 vt_select_input ();
3723 break;
3738 case 1010: /* scroll to bottom on TTY output inhibit */ 3724 case 1010: /* scroll to bottom on TTY output inhibit */
3739 set_option (Opt_scrollTtyOutput, !state); 3725 set_option (Opt_scrollTtyOutput, !state);
3740 break; 3726 break;
3741 case 1011: /* scroll to bottom on key press */ 3727 case 1011: /* scroll to bottom on key press */
3742 set_option (Opt_scrollTtyKeypress, state); 3728 set_option (Opt_scrollTtyKeypress, state);
… …
3919rxvt_term::process_graphics () 3905rxvt_term::process_graphics ()
3920{ 3906{
3921 unicode_t ch, cmd = cmd_getc (); 3907 unicode_t ch, cmd = cmd_getc ();
3922 3908
3923 if (cmd == 'Q') 3909 if (cmd == 'Q')
3910 {
3924 { /* query graphics */ 3911 /* query graphics */
3925 tt_printf ("\033G0\012"); /* no graphics */ 3912 tt_printf ("\033G0\012"); /* no graphics */
3926 return; 3913 return;
3927 } 3914 }
3928 /* swallow other graphics sequences until terminating ':' */ 3915 /* swallow other graphics sequences until terminating ':' */
3929 do 3916 do
… …
3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3966 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3980 3967
3981 memcpy (v_buffer + v_buflen, data, len); 3968 memcpy (v_buffer + v_buflen, data, len);
3982 v_buflen += len; 3969 v_buflen += len;
3983 3970
3984 pty_ev.set (EVENT_READ | EVENT_WRITE); 3971 pty_ev.set (ev::READ | ev::WRITE);
3985} 3972}
3986 3973
3987void rxvt_term::pty_write () 3974void rxvt_term::pty_write ()
3988{ 3975{
3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3976 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
3994 3981
3995 if (v_buflen == 0) 3982 if (v_buflen == 0)
3996 { 3983 {
3997 free (v_buffer); 3984 free (v_buffer);
3998 v_buffer = 0; 3985 v_buffer = 0;
3999 v_buflen = 0;
4000 3986
4001 pty_ev.set (EVENT_READ); 3987 pty_ev.set (ev::READ);
4002 return; 3988 return;
4003 } 3989 }
4004 3990
4005 memmove (v_buffer, v_buffer + written, v_buflen); 3991 memmove (v_buffer, v_buffer + written, v_buflen);
4006 } 3992 }
4007 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3993 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4008 pty_ev.set (EVENT_READ); 3994 pty_ev.set (ev::READ);
4009} 3995}
4010 3996
4011/*----------------------- end-of-file (C source) -----------------------*/ 3997/*----------------------- end-of-file (C source) -----------------------*/
4012 3998

Diff Legend

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