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.347 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.363 by root, Sun Nov 11 04:08:00 2007 UTC

… …
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;
553 switch (keysym) 554 switch (keysym)
554 { 555 {
555#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
556 case XK_BackSpace: 557 case XK_BackSpace:
… …
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
562 } 563 }
563 else 564 else
564 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
565 break; 566 break;
566#endif 567#endif
567#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
569 case XK_KP_Delete: 570 case XK_KP_Delete:
570 /* allow shift to override */ 571 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
572 { 573 {
573 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
574 break; 575 break;
575 } 576 }
576 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
577# endif 578# endif
578 case XK_Delete: 579 case XK_Delete:
579 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
580 break; 581 break;
581#endif 582#endif
582 case XK_Tab: 583 case XK_Tab:
583 if (shft) 584 if (shft)
584 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
595 newlen = 0; 596 newlen = 0;
596 } 597 }
597 break; 598 break;
598 599
599#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
600 case XK_KP_Up: /* \033Ox or standard */ 602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
601 case XK_KP_Down: /* \033Or or standard */ 604 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */ 605 if (kp)
603 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605 { 606 {
606 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break; 609 break;
609 } 610 }
… …
632 633
633#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
635 case XK_KP_Prior: 636 case XK_KP_Prior:
636 /* allow shift to override */ 637 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
638 { 639 {
639 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
640 break; 641 break;
641 } 642 }
642 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
645 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
646 break; 647 break;
647# ifdef XK_KP_Next 648# ifdef XK_KP_Next
648 case XK_KP_Next: 649 case XK_KP_Next:
649 /* allow shift to override */ 650 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
651 { 652 {
652 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
653 break; 654 break;
654 } 655 }
655 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
658 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
659 break; 660 break;
660#endif 661#endif
661 case XK_KP_Enter: 662 case XK_KP_Enter:
662 /* allow shift to override */ 663 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
664 { 665 {
665 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
666 break; 667 break;
667 } 668 }
668 669
… …
711 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */ 716 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
717 { 718 {
718 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
720 } 721 }
721 else 722 else
… …
730 break; 731 break;
731 732
732#ifdef XK_KP_Insert 733#ifdef XK_KP_Insert
733 case XK_KP_Insert: 734 case XK_KP_Insert:
734 /* allow shift to override */ 735 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
736 { 737 {
737 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
738 break; 739 break;
739 } 740 }
740 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
753 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
754 break; 755 break;
755#ifdef XK_KP_End 756#ifdef XK_KP_End
756 case XK_KP_End: 757 case XK_KP_End:
757 /* allow shift to override */ 758 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
759 { 760 {
760 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
761 break; 762 break;
762 } 763 }
763 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
766 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
767 break; 768 break;
768#ifdef XK_KP_Home 769#ifdef XK_KP_Home
769 case XK_KP_Home: 770 case XK_KP_Home:
770 /* allow shift to override */ 771 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
772 { 773 {
773 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
774 break; 775 break;
775 } 776 }
776 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
1034void 1035void
1035rxvt_term::flush () 1036rxvt_term::flush ()
1036{ 1037{
1037 flush_ev.stop (); 1038 flush_ev.stop ();
1038 1039
1039#ifdef ENABLE_TRANSPARENCY 1040#ifdef HAVE_BG_PIXMAP
1040 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
1041 { 1042 {
1042 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
1043 scr_clear ();
1044 scr_touch (false); 1044 scr_touch (false);
1045 } 1045 }
1046#endif 1046#endif
1047 1047
1048 if (want_refresh) 1048 if (want_refresh)
… …
1094 1094
1095 display->flush (); 1095 display->flush ();
1096} 1096}
1097 1097
1098void 1098void
1099rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::prepare_cb (ev::prepare &w, int revents)
1100{ 1100{
1101 make_current (); 1101 make_current ();
1102 1102
1103 display->flush (); 1103 display->flush ();
1104 1104
1105 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1107} 1107}
1108 1108
1109void 1109void
1110rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1111{
1112 make_current (); 1112 make_current ();
1113 1113
1114 refresh_count = 0; 1114 refresh_count = 0;
1115 flush (); 1115 flush ();
1116} 1116}
1117 1117
1118#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
1119void 1119void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1121{
1122 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1123 want_refresh = 1;
1124
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1124}
1127#endif 1125#endif
1128 1126
1129#ifdef TEXT_BLINK 1127#ifdef TEXT_BLINK
1130void 1128void
1131rxvt_term::text_blink_cb (time_watcher &w) 1129rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1130{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1131 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1132 {
1135 hidden_text = !hidden_text; 1133 hidden_text = !hidden_text;
1136 want_refresh = 1; 1134 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL);
1138 } 1135 }
1139} 1136}
1140#endif 1137#endif
1141 1138
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1140void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1142{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1143 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1144 scr_page (scrollbar_isUp() ? UP : DN, 1))
1148 {
1149 want_refresh = 1; 1145 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1146 else
1151 } 1147 w.stop ();
1152} 1148}
1153#endif 1149#endif
1154 1150
1155#ifdef SELECTION_SCROLLING 1151#ifdef SELECTION_SCROLLING
1156void 1152void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1153rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1154{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1155 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1156 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1157 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1158 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1164 } 1159 }
1160 else
1161 w.stop ();
1165} 1162}
1166#endif 1163#endif
1167 1164
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1166void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1168{
1172 if (mouse_slip_wheel_speed == 0 1169 if (mouse_slip_wheel_speed == 0
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1170 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed)) 1171 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1172 {
1176 if (view_start == top_row || view_start == 0) 1173 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0; 1174 mouse_slip_wheel_speed = 0;
1178 1175
1179 want_refresh = 1; 1176 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1181 } 1177 }
1178 else
1179 w.stop ();
1182} 1180}
1183#endif 1181#endif
1184 1182
1185#if LINUX_YIELD_HACK 1183#if LINUX_YIELD_HACK
1186static struct event_handler 1184static struct event_handler
1187{ 1185{
1188 check_watcher yield_ev; 1186 ev::prepare yield_ev;
1189 1187
1190 void yield_cb (check_watcher &w) 1188 void yield_cb (ev::prepare &w, int revents)
1191 { 1189 {
1192 // this should really be sched_yield(), but the linux guys thought 1190 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1191 // 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 1192 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1193 // allowed by the sus... as is returning ENOSYS.
… …
1246 1244
1247 return false; 1245 return false;
1248} 1246}
1249 1247
1250void 1248void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1249rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1250{
1253 make_current (); 1251 make_current ();
1254 1252
1255 if (revents & EVENT_READ) 1253 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1254 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1255 while (pty_fill ())
1258 if (cmd_parse ()) 1256 if (cmd_parse ())
1259 break; 1257 break;
1260 1258
1261 if (revents & EVENT_WRITE) 1259 if (revents & ev::WRITE)
1262 pty_write (); 1260 pty_write ();
1263} 1261}
1264 1262
1265void 1263void
1266rxvt_term::pointer_unblank () 1264rxvt_term::pointer_unblank ()
… …
1270 1268
1271#ifdef POINTER_BLANK 1269#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1270 hidden_pointer = 0;
1273 1271
1274 if (option (Opt_pointerBlank)) 1272 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1273 pointer_ev.start (pointerBlankDelay);
1276#endif 1274#endif
1277} 1275}
1278 1276
1279#ifdef POINTER_BLANK 1277#ifdef POINTER_BLANK
1280void 1278void
… …
1288 1286
1289 hidden_pointer = 1; 1287 hidden_pointer = 1;
1290} 1288}
1291 1289
1292void 1290void
1293rxvt_term::pointer_cb (time_watcher &w) 1291rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1292{
1295 make_current (); 1293 make_current ();
1296 1294
1297 pointer_blank (); 1295 pointer_blank ();
1298} 1296}
… …
1301void 1299void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1300rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1301{
1304 int button_number, key_state = 0; 1302 int button_number, key_state = 0;
1305 int x, y; 1303 int x, y;
1304 int code = 32;
1306 1305
1307 x = ev.x; 1306 x = Pixel2Col (ev.x);
1308 y = ev.y; 1307 y = Pixel2Row (ev.y);
1309 pixel_position (&x, &y); 1308 if (ev.type == MotionNotify) {
1309 if (x == mouse_row && y == mouse_col)
1310 return;
1311 mouse_row = x;
1312 mouse_col = y;
1313 code += 32;
1314 }
1310 1315
1311 if (MEvent.button == AnyButton) 1316 if (MEvent.button == AnyButton)
1312 button_number = 3; 1317 button_number = 3;
1313 else 1318 else
1314 { 1319 {
… …
1360 x + 1, 1365 x + 1,
1361 y + 1); 1366 y + 1);
1362#endif 1367#endif
1363 1368
1364 tt_printf ("\033[M%c%c%c", 1369 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1370 (code + button_number + key_state),
1366 (32 + x + 1), 1371 (32 + x + 1),
1367 (32 + y + 1)); 1372 (32 + y + 1));
1368} 1373}
1369 1374
1370/*{{{ process an X event */ 1375/*{{{ process an X event */
… …
1474 && ev.xfocus.mode != NotifyGrab) 1479 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1480 focus_out ();
1476 break; 1481 break;
1477 1482
1478 case ConfigureNotify: 1483 case ConfigureNotify:
1484 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1485 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1486 szHint.width, szHint.height); */
1479 if (ev.xconfigure.window == parent[0]) 1487 if (ev.xconfigure.window == parent[0])
1480 { 1488 {
1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1482 ; 1490 ;
1483 1491
… …
1486 seen_resize = 1; 1494 seen_resize = 1;
1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1495 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1488 } 1496 }
1489 else 1497 else
1490 { 1498 {
1491#ifdef ENABLE_TRANSPARENCY 1499#ifdef HAVE_BG_PIXMAP
1492 if (option (Opt_transparent)) 1500 if (bgPixmap.window_position_sensitive ())
1493 if (bgPixmap.render ()) 1501 update_background ();
1494 scr_touch (false);
1495#endif 1502#endif
1496 } 1503 }
1497 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 } 1505 }
1499 break; 1506 break;
… …
1520 break; 1527 break;
1521 1528
1522 case MapNotify: 1529 case MapNotify:
1523 mapped = 1; 1530 mapped = 1;
1524#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1525 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1532 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1526#endif 1533#endif
1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528 break; 1535 break;
1529 1536
1530 case UnmapNotify: 1537 case UnmapNotify:
… …
1532#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1533 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1534#endif 1541#endif
1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1536 break; 1543 break;
1537
1538#ifdef ENABLE_TRANSPARENCY
1539 case ReparentNotify:
1540 rootwin_cb (ev);
1541 break;
1542#endif /* ENABLE_TRANSPARENCY */
1543 1544
1544 case GraphicsExpose: 1545 case GraphicsExpose:
1545 case Expose: 1546 case Expose:
1546 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1547 { 1548 {
1548 do 1549 do
1550 {
1549 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1550 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1553 }
1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1552 1555
1553 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1554 1557
1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1558 1562 }
1559 want_refresh = 1; 1563 want_refresh = 1;
1560 } 1564 }
1561 else 1565 else
1562 { 1566 {
1563 XEvent unused_event; 1567 XEvent unused_event;
… …
1578 case MotionNotify: 1582 case MotionNotify:
1579#ifdef POINTER_BLANK 1583#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1584 if (hidden_pointer)
1581 pointer_unblank (); 1585 pointer_unblank ();
1582#endif 1586#endif
1587 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1588 || priv_modes & PrivMode_MouseAnyEvent)
1589 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1591 break;
1585 1592
1586 if (ev.xany.window == vt) 1593 if (ev.xany.window == vt)
1587 { 1594 {
… …
1622 1629
1623 /* don't clobber the current delay if we are 1630 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1631 * already in the middle of scrolling.
1625 */ 1632 */
1626 if (!sel_scroll_ev.active) 1633 if (!sel_scroll_ev.active)
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1635
1629 /* save the event params so we can highlight 1636 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1637 * the selection in the pending-scroll loop
1631 */ 1638 */
1632 selection_save_x = ev.xbutton.x; 1639 selection_save_x = ev.xbutton.x;
… …
1691 { 1698 {
1692 hidden_cursor = 0; 1699 hidden_cursor = 0;
1693 want_refresh = 1; 1700 want_refresh = 1;
1694 } 1701 }
1695 1702
1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1703 cursor_blink_ev.again ();
1697 } 1704 }
1698#endif 1705#endif
1699 1706
1700#if defined(POINTER_BLANK) 1707#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1729 XSetICFocus (Input_Context); 1736 XSetICFocus (Input_Context);
1730 } 1737 }
1731#endif 1738#endif
1732#if CURSOR_BLINK 1739#if CURSOR_BLINK
1733 if (option (Opt_cursorBlink)) 1740 if (option (Opt_cursorBlink))
1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1735#endif 1742#endif
1736#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1737 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1738 { 1745 {
1739 pix_colors = pix_colors_focused; 1746 pix_colors = pix_colors_focused;
… …
1741 } 1748 }
1742#endif 1749#endif
1743#if ENABLE_FRILLS 1750#if ENABLE_FRILLS
1744 if (option (Opt_urgentOnBell)) 1751 if (option (Opt_urgentOnBell))
1745 { 1752 {
1746 XWMHints *h;
1747
1748 h = XGetWMHints(dpy, parent[0]); 1753 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1749 if (h != NULL)
1750 { 1754 {
1751 h->flags &= ~XUrgencyHint; 1755 h->flags &= ~XUrgencyHint;
1752 XSetWMHints(dpy, parent[0], h); 1756 XSetWMHints (dpy, parent[0], h);
1753 } 1757 }
1754 } 1758 }
1755#endif 1759#endif
1756 } 1760 }
1757} 1761}
… …
1780 XUnsetICFocus (Input_Context); 1784 XUnsetICFocus (Input_Context);
1781#endif 1785#endif
1782#if CURSOR_BLINK 1786#if CURSOR_BLINK
1783 if (option (Opt_cursorBlink)) 1787 if (option (Opt_cursorBlink))
1784 cursor_blink_ev.stop (); 1788 cursor_blink_ev.stop ();
1789
1785 hidden_cursor = 0; 1790 hidden_cursor = 0;
1786#endif 1791#endif
1787#if OFF_FOCUS_FADING 1792#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade]) 1793 if (rs[Rs_fade])
1789 { 1794 {
… …
1827 */ 1832 */
1828 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1833 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1829 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1830 { 1835 {
1831 bgPixmap.set_root_pixmap (); 1836 bgPixmap.set_root_pixmap ();
1832 bgPixmap.render (); 1837 update_background ();
1833 } 1838 }
1834 break; 1839 break;
1835 } 1840 }
1836# endif 1841# endif
1837} 1842}
… …
2022 upordown = 1; /* down */ 2027 upordown = 1; /* down */
2023 } 2028 }
2024 if (upordown) 2029 if (upordown)
2025 { 2030 {
2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2027 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2028#endif 2033#endif
2029 if (scr_page (upordown < 0 ? UP : DN, 1)) 2034 if (scr_page (upordown < 0 ? UP : DN, 1))
2030 { 2035 {
2031 if (upordown < 0) 2036 if (upordown < 0)
2032 scrollBar.setUp (); 2037 scrollBar.setUp ();
… …
2195 { 2200 {
2196 mouse_slip_wheel_speed += v ? -1 : 1; 2201 mouse_slip_wheel_speed += v ? -1 : 1;
2197 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2198 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2199 2204
2200 if (slip_wheel_ev.at < NOW) 2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2201 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2202
2203 slip_wheel_ev.start ();
2204 } 2206 }
2205 else 2207 else
2206 { 2208 {
2207# endif 2209# endif
2208 scr_page (v, i); 2210 scr_page (v, i);
… …
2276 2278
2277 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2278 { 2280 {
2279 refresh_count = 0; 2281 refresh_count = 0;
2280 2282
2281 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2282 { 2284 {
2283 refreshnow = true; 2285 refreshnow = true;
2284 ch = NOCHAR; 2286 ch = NOCHAR;
2285 break; 2287 break;
2286 } 2288 }
… …
2793rxvt_term::process_csi_seq () 2795rxvt_term::process_csi_seq ()
2794{ 2796{
2795 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
2796 unsigned int nargs, p; 2798 unsigned int nargs, p;
2797 int n, ndef; 2799 int n, ndef;
2798 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS] = { };
2799 2801
2800 memset (arg, 0, sizeof (arg));
2801 nargs = 0; 2802 nargs = 0;
2802 2803
2803 priv = 0; 2804 priv = 0;
2804 ch = cmd_getc (); 2805 ch = cmd_getc ();
2805 if (ch >= '<' && ch <= '?') 2806 if (ch >= '<' && ch <= '?')
… …
2854 { 2855 {
2855 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2856 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2857 // 2858 //
2858 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2859 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2860 // that we do not support xterm mouse reporting (should be 95 when we do). 2861 // versions.
2861 // 2862 //
2862 tt_printf ("\033[>%d;94;0c", 'U'); 2863 tt_printf ("\033[>%d;95;0c", 'U');
2863 } 2864 }
2864 break; 2865 break;
2865 case '?': 2866 case '?':
2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2867 process_terminal_mode (ch, priv, nargs, arg); 2868 process_terminal_mode (ch, priv, nargs, arg);
… …
3428 if (ISSET_PIXCOLOR (Color_tint)) 3429 if (ISSET_PIXCOLOR (Color_tint))
3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3430 else 3431 else
3431 changed = bgPixmap.unset_tint (); 3432 changed = bgPixmap.unset_tint ();
3432 if (changed) 3433 if (changed)
3433 bgPixmap.render (); 3434 update_background ();
3434 } 3435 }
3435 3436
3436 break; 3437 break;
3437#endif 3438#endif
3438 3439
3439#if XPM_BACKGROUND 3440#if BG_IMAGE_FROM_FILE
3440 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3441 if (!strcmp (str, "?")) 3442 if (!strcmp (str, "?"))
3442 { 3443 {
3443 char str[256]; 3444 char str[256];
3444 3445
… …
3467 if (bgPixmap.set_geometry (str)) 3468 if (bgPixmap.set_geometry (str))
3468 changed++; 3469 changed++;
3469 str = strchr (str, ';'); 3470 str = strchr (str, ';');
3470 } 3471 }
3471 if (changed) 3472 if (changed)
3472 { 3473 update_background ();
3473 bgPixmap.render ();
3474 scr_touch (true);
3475 }
3476 } 3474 }
3477 break; 3475 break;
3478#endif 3476#endif
3479 3477
3480 case Rxvt_restoreFG: 3478 case Rxvt_restoreFG:
… …
3635#ifndef NO_BACKSPACE_KEY 3633#ifndef NO_BACKSPACE_KEY
3636 { 67, PrivMode_BackSpace }, 3634 { 67, PrivMode_BackSpace },
3637#endif 3635#endif
3638 { 1000, PrivMode_MouseX11 }, 3636 { 1000, PrivMode_MouseX11 },
3639 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3640 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3638 { 1002, PrivMode_MouseBtnEvent },
3641 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3639 { 1003, PrivMode_MouseAnyEvent },
3642 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3643 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
3644 // 1035 enable modifiers for alt, numlock NYI 3642 // 1035 enable modifiers for alt, numlock NYI
3645 // 1036 send ESC for meta keys NYI 3643 // 1036 send ESC for meta keys NYI
3646 // 1037 send DEL for keypad delete NYI 3644 // 1037 send DEL for keypad delete NYI
… …
3720 scr_autowrap (state); 3718 scr_autowrap (state);
3721 break; 3719 break;
3722 /* case 8: - auto repeat, can't do on a per window basis */ 3720 /* case 8: - auto repeat, can't do on a per window basis */
3723 case 9: /* X10 mouse reporting */ 3721 case 9: /* X10 mouse reporting */
3724 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
3725 priv_modes &= ~PrivMode_MouseX11; 3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3726 break; 3724 break;
3727#ifdef scrollBar_esc 3725#ifdef scrollBar_esc
3728 case scrollBar_esc: 3726 case scrollBar_esc:
3729 if (scrollbar_mapping (state)) 3727 if (scrollbar_mapping (state))
3730 { 3728 {
… …
3743 break; 3741 break;
3744 /* case 66: - application key pad */ 3742 /* case 66: - application key pad */
3745 /* case 67: - backspace key */ 3743 /* case 67: - backspace key */
3746 case 1000: /* X11 mouse reporting */ 3744 case 1000: /* X11 mouse reporting */
3747 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
3748 priv_modes &= ~PrivMode_MouseX10; 3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3749 break; 3747 break;
3750#if 0 3748#if 0
3751 case 1001: 3749 case 1001:
3752 break; /* X11 mouse highlighting */ 3750 break; /* X11 mouse highlighting */
3753#endif 3751#endif
3752 case 1002:
3753 case 1003:
3754 if (state) {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 vt_emask_mouse = PointerMotionMask;
3758 } else
3759 vt_emask_mouse = NoEventMask;
3760 vt_select_input ();
3761 break;
3754 case 1010: /* scroll to bottom on TTY output inhibit */ 3762 case 1010: /* scroll to bottom on TTY output inhibit */
3755 set_option (Opt_scrollTtyOutput, !state); 3763 set_option (Opt_scrollTtyOutput, !state);
3756 break; 3764 break;
3757 case 1011: /* scroll to bottom on key press */ 3765 case 1011: /* scroll to bottom on key press */
3758 set_option (Opt_scrollTtyKeypress, state); 3766 set_option (Opt_scrollTtyKeypress, state);
… …
3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3996 4004
3997 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
3998 v_buflen += len; 4006 v_buflen += len;
3999 4007
4000 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4001} 4009}
4002 4010
4003void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4004{ 4012{
4005 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4010 4018
4011 if (v_buflen == 0) 4019 if (v_buflen == 0)
4012 { 4020 {
4013 free (v_buffer); 4021 free (v_buffer);
4014 v_buffer = 0; 4022 v_buffer = 0;
4015 v_buflen = 0;
4016 4023
4017 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4018 return; 4025 return;
4019 } 4026 }
4020 4027
4021 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4022 } 4029 }
4023 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4024 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4025} 4032}
4026 4033
4027/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4028 4035

Diff Legend

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