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.363 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.406 by ayin, Thu Feb 14 23:53:05 2008 UTC

25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
201 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
202 203
203 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
205 206
206 if (y >= 0) 207 if (y >= 0)
207 { 208 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
220 ch = *chr++; 221 ch = *chr++;
221 222
222 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
225# if !UNICODE3 226# if !UNICODE_3
226 if (ch >= 0x10000) 227 if (ch >= 0x10000)
227 ch = 0xfffd; 228 ch = 0xfffd;
228# endif 229# endif
229 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
230 231
301 302
302void 303void
303rxvt_term::key_press (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
304{ 305{
305 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 307 KeySym keysym;
308 int valid_keysym; 308 int valid_keysym;
309 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310 310
311#if ISO_14755 311#if ISO_14755
546 } 546 }
547#endif 547#endif
548 548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 552 unsigned int newlen = 1;
553#ifdef XK_KP_Home
554 static const KeySym keypadtrans[] = {
555 XK_KP_7, // XK_KP_Home
556 XK_KP_4, // XK_KP_Left
557 XK_KP_8, // XK_KP_Up
558 XK_KP_6, // XK_KP_Right
559 XK_KP_2, // XK_KP_Down
560#ifndef UNSHIFTED_SCROLLKEYS
561 XK_KP_9, // XK_KP_Prior
562 XK_KP_3, // XK_KP_Next
563#else
564 XK_Prior,
565 XK_Next,
566#endif
567 XK_KP_1, // XK_KP_End
568 XK_KP_5, // XK_KP_Begin
569 };
570
571 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
572 {
573 unsigned int index = keysym - XK_KP_Home;
574 keysym = kp ? keypadtrans[index] : XK_Home + index;
575 }
576 else if (keysym == XK_KP_Insert)
577 keysym = kp ? XK_KP_0 : XK_Insert;
578#ifndef NO_DELETE_KEY
579 else if (keysym == XK_KP_Delete)
580 keysym = kp ? XK_KP_Decimal : XK_Delete;
581#endif
582#endif
554 switch (keysym) 583 switch (keysym)
555 { 584 {
556#ifndef NO_BACKSPACE_KEY 585#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace: 586 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace) 587 if (priv_modes & PrivMode_HaveBackSpace)
564 else 593 else
565 strcpy (kbuf, rs[Rs_backspace_key]); 594 strcpy (kbuf, rs[Rs_backspace_key]);
566 break; 595 break;
567#endif 596#endif
568#ifndef NO_DELETE_KEY 597#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: 598 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]); 599 strcpy (kbuf, rs[Rs_delete_key]);
581 break; 600 break;
582#endif 601#endif
583 case XK_Tab: 602 case XK_Tab:
595#endif 614#endif
596 newlen = 0; 615 newlen = 0;
597 } 616 }
598 break; 617 break;
599 618
600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Down: /* \033Or 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" */ 619 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */ 620 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */ 621 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */ 622 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z"); 623 strcpy (kbuf, "\033[Z");
630 else if (priv_modes & PrivMode_aplCUR) 633 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O'; 634 kbuf[1] = 'O';
632 break; 635 break;
633 636
634#ifndef UNSHIFTED_SCROLLKEYS 637#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: 638 case XK_Prior:
646 strcpy (kbuf, "\033[5~"); 639 strcpy (kbuf, "\033[5~");
647 break; 640 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: 641 case XK_Next:
659 strcpy (kbuf, "\033[6~"); 642 strcpy (kbuf, "\033[6~");
660 break; 643 break;
661#endif 644#endif
662 case XK_KP_Enter: 645 case XK_KP_Enter:
681 kbuf[0] = '\015'; 664 kbuf[0] = '\015';
682 kbuf[1] = '\0'; 665 kbuf[1] = '\0';
683 } 666 }
684 break; 667 break;
685 668
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" */ 669 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */ 670 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */ 671 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */ 672 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP"); 673 strcpy (kbuf, "\033OP");
728 705
729 case XK_Find: 706 case XK_Find:
730 strcpy (kbuf, "\033[1~"); 707 strcpy (kbuf, "\033[1~");
731 break; 708 break;
732 709
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: 710 case XK_Insert:
744 strcpy (kbuf, "\033[2~"); 711 strcpy (kbuf, "\033[2~");
745 break; 712 break;
746#ifdef DXK_Remove /* support for DEC remove like key */ 713#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove: 714 case DXK_Remove:
751 strcpy (kbuf, "\033[3~"); 718 strcpy (kbuf, "\033[3~");
752 break; 719 break;
753 case XK_Select: 720 case XK_Select:
754 strcpy (kbuf, "\033[4~"); 721 strcpy (kbuf, "\033[4~");
755 break; 722 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: 723 case XK_End:
767 strcpy (kbuf, KS_END); 724 strcpy (kbuf, KS_END);
768 break; 725 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: 726 case XK_Home:
780 strcpy (kbuf, KS_HOME); 727 strcpy (kbuf, KS_HOME);
781 break; 728 break;
782 729
783#define FKEY(n, fkey) \ 730#define FKEY(n, fkey) \
840 break; 787 break;
841 } 788 }
842 789
843 if (newlen) 790 if (newlen)
844 len = strlen (kbuf); 791 len = strlen (kbuf);
845 }
846 792
847 /* 793 /*
848 * Pass meta for all function keys, if 'meta' option set 794 * Pass meta for all function keys, if 'meta' option set
849 */ 795 */
850#ifdef META8_OPTION 796#ifdef META8_OPTION
1093 } 1039 }
1094 1040
1095 display->flush (); 1041 display->flush ();
1096} 1042}
1097 1043
1044/* checks wether a refresh is requested and starts the refresh timer */
1098void 1045void
1099rxvt_term::prepare_cb (ev::prepare &w, int revents) 1046rxvt_term::refresh_check ()
1100{ 1047{
1101 make_current (); 1048 if (want_refresh && !flush_ev.is_active ())
1049 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1050
1103 display->flush (); 1051 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1107} 1052}
1108 1053
1109void 1054void
1110rxvt_term::flush_cb (ev::timer &w, int revents) 1055rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1056{
1119void 1064void
1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1066{
1122 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1068 want_refresh = 1;
1069 refresh_check ();
1124} 1070}
1125#endif 1071#endif
1126 1072
1127#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
1128void 1074void
1130{ 1076{
1131 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1132 { 1078 {
1133 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1134 want_refresh = 1; 1080 want_refresh = 1;
1081 refresh_check ();
1135 } 1082 }
1083 else
1084 w.stop ();
1136} 1085}
1137#endif 1086#endif
1138 1087
1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1140void 1089void
1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1142{ 1091{
1143 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1144 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1094 {
1145 want_refresh = 1; 1095 want_refresh = 1;
1096 refresh_check ();
1097 }
1146 else 1098 else
1147 w.stop (); 1099 w.stop ();
1148} 1100}
1149#endif 1101#endif
1150 1102
1154{ 1106{
1155 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1156 { 1108 {
1157 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1158 want_refresh = 1; 1110 want_refresh = 1;
1111 refresh_check ();
1159 } 1112 }
1160 else 1113 else
1161 w.stop (); 1114 w.stop ();
1162} 1115}
1163#endif 1116#endif
1164 1117
1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1166void 1119void
1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1168{ 1121{
1169 if (mouse_slip_wheel_speed == 0 1122 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1170 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1171 : scr_page (UP, mouse_slip_wheel_speed))
1172 { 1123 {
1173 if (view_start == top_row || view_start == 0)
1174 mouse_slip_wheel_speed = 0;
1175
1176 want_refresh = 1; 1124 want_refresh = 1;
1125 refresh_check ();
1126 }
1127
1128 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1177 } 1129 {
1178 else 1130 mouse_slip_wheel_speed = 0;
1179 w.stop (); 1131 w.stop ();
1132 }
1180} 1133}
1181#endif 1134#endif
1182 1135
1183#if LINUX_YIELD_HACK 1136#if LINUX_YIELD_HACK
1184static struct event_handler 1137static struct event_handler
1256 if (cmd_parse ()) 1209 if (cmd_parse ())
1257 break; 1210 break;
1258 1211
1259 if (revents & ev::WRITE) 1212 if (revents & ev::WRITE)
1260 pty_write (); 1213 pty_write ();
1214
1215 refresh_check ();
1261} 1216}
1262 1217
1263void 1218void
1264rxvt_term::pointer_unblank () 1219rxvt_term::pointer_unblank ()
1265{ 1220{
1303 int x, y; 1258 int x, y;
1304 int code = 32; 1259 int code = 32;
1305 1260
1306 x = Pixel2Col (ev.x); 1261 x = Pixel2Col (ev.x);
1307 y = Pixel2Row (ev.y); 1262 y = Pixel2Row (ev.y);
1308 if (ev.type == MotionNotify) { 1263 if (ev.type == MotionNotify)
1264 {
1309 if (x == mouse_row && y == mouse_col) 1265 if (x == mouse_row && y == mouse_col)
1310 return; 1266 return;
1311 mouse_row = x; 1267 mouse_row = x;
1312 mouse_col = y; 1268 mouse_col = y;
1313 code += 32; 1269 code += 32;
1314 } 1270 }
1315 1271
1316 if (MEvent.button == AnyButton) 1272 if (MEvent.button == AnyButton)
1317 button_number = 3; 1273 button_number = 3;
1318 else 1274 else
1319 { 1275 {
1479 && ev.xfocus.mode != NotifyGrab) 1435 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1436 focus_out ();
1481 break; 1437 break;
1482 1438
1483 case ConfigureNotify: 1439 case ConfigureNotify:
1484 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1440 /*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, 1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1486 szHint.width, szHint.height); */ 1442 szHint.width, szHint.height);*/
1487 if (ev.xconfigure.window == parent[0]) 1443 if (ev.xconfigure.window == parent[0])
1488 { 1444 {
1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1490 ; 1446 ;
1491 1447
1496 } 1452 }
1497 else 1453 else
1498 { 1454 {
1499#ifdef HAVE_BG_PIXMAP 1455#ifdef HAVE_BG_PIXMAP
1500 if (bgPixmap.window_position_sensitive ()) 1456 if (bgPixmap.window_position_sensitive ())
1457 {
1458 if (mapped)
1501 update_background (); 1459 update_background ();
1460 else
1461 bgPixmap.invalidate ();
1462 }
1502#endif 1463#endif
1503 } 1464 }
1465
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505 } 1467 }
1506 break; 1468 break;
1507 1469
1508 case PropertyNotify: 1470 case PropertyNotify:
1525 case SelectionRequest: 1487 case SelectionRequest:
1526 selection_send (ev.xselectionrequest); 1488 selection_send (ev.xselectionrequest);
1527 break; 1489 break;
1528 1490
1529 case MapNotify: 1491 case MapNotify:
1492#ifdef HAVE_BG_PIXMAP
1493 /* This is needed spcifically to fix the case of no window manager or a
1494 * non-reparenting window manager. In those cases we never get first
1495 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1496 * care of multiplicity of ConfigureNotify events arriwing while WM does
1497 * reparenting.
1498 * We should not render background immidiately, as there could be several
1499 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1500 * by scheduling background redraw as soon as we can, but giving a short
1501 * bit of time for ConfigureNotifies to arrive.
1502 * We should render background PRIOR to drawing any text, but AFTER all
1503 * of ConfigureNotifys for the best results.
1504 */
1505 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1506 update_background_ev.start (0.025);
1507#endif
1530 mapped = 1; 1508 mapped = 1;
1531#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1532 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start ();
1533#endif 1511#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535 break; 1513 break;
1536 1514
1537 case UnmapNotify: 1515 case UnmapNotify:
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 { 1537 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1538 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1539 ev.xexpose.width, ev.xexpose.height, False);
1562 } 1540 }
1541
1563 want_refresh = 1; 1542 want_refresh = 1;
1564 } 1543 }
1565 else 1544 else
1566 { 1545 {
1567 XEvent unused_event; 1546 XEvent unused_event;
1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1548 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1570 ; 1549 ;
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1572 ; 1551 ;
1573 1552
1574 if (isScrollbarWindow (ev.xany.window)) 1553 if (scrollBar.state && ev.xany.window == scrollBar.win)
1575 { 1554 {
1576 scrollBar.setIdle (); 1555 scrollBar.state = STATE_IDLE;
1577 scrollbar_show (0); 1556 scrollbar_show (0);
1578 } 1557 }
1579 } 1558 }
1580 break; 1559 break;
1581 1560
1628 int dist; 1607 int dist;
1629 1608
1630 /* don't clobber the current delay if we are 1609 /* don't clobber the current delay if we are
1631 * already in the middle of scrolling. 1610 * already in the middle of scrolling.
1632 */ 1611 */
1633 if (!sel_scroll_ev.active) 1612 if (!sel_scroll_ev.is_active ())
1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1613 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1635 1614
1636 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1637 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1638 */ 1617 */
1661 else 1640 else
1662 { 1641 {
1663 /* we are within the text window, so we 1642 /* we are within the text window, so we
1664 * shouldn't be scrolling 1643 * shouldn't be scrolling
1665 */ 1644 */
1666 if (sel_scroll_ev.active)
1667 sel_scroll_ev.stop(); 1645 sel_scroll_ev.stop();
1668 } 1646 }
1669#endif 1647#endif
1670#ifdef MOUSE_THRESHOLD 1648#ifdef MOUSE_THRESHOLD
1671 } 1649 }
1672#endif 1650#endif
1673 } 1651 }
1674 } 1652 }
1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1653 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1676 { 1654 {
1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1655 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1678 MotionNotify, &ev)) 1656 MotionNotify, &ev))
1679 ; 1657 ;
1680 1658
1715 1693
1716 if (ev.type == KeyPress && hidden_pointer == 0) 1694 if (ev.type == KeyPress && hidden_pointer == 0)
1717 pointer_blank (); 1695 pointer_blank ();
1718 } 1696 }
1719#endif 1697#endif
1698
1699 refresh_check ();
1720} 1700}
1721 1701
1722void 1702void
1723rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1724{ 1704{
1736 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1737 } 1717 }
1738#endif 1718#endif
1739#if CURSOR_BLINK 1719#if CURSOR_BLINK
1740 if (option (Opt_cursorBlink)) 1720 if (option (Opt_cursorBlink))
1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1721 cursor_blink_ev.again ();
1742#endif 1722#endif
1743#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1744 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1745 { 1725 {
1746 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1835 { 1815 {
1836 bgPixmap.set_root_pixmap (); 1816 bgPixmap.set_root_pixmap ();
1837 update_background (); 1817 update_background ();
1838 } 1818 }
1819
1839 break; 1820 break;
1840 } 1821 }
1841# endif 1822# endif
1823
1824 refresh_check ();
1842} 1825}
1843#endif 1826#endif
1844 1827
1845void 1828void
1846rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
1901 mouse_report (ev); 1884 mouse_report (ev);
1902 } 1885 }
1903#else 1886#else
1904 MEvent.button = ev.button; 1887 MEvent.button = ev.button;
1905 mouse_report (ev); 1888 mouse_report (ev);
1906#endif /* MOUSE_REPORT_DOUBLECLICK */ 1889#endif /* MOUSE_REPORT_DOUBLECLICK */
1907 1890
1908 } 1891 }
1909 else 1892 else
1910 { 1893 {
1911 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
1959 } 1942 }
1960 1943
1961 /* 1944 /*
1962 * Scrollbar window processing of button press 1945 * Scrollbar window processing of button press
1963 */ 1946 */
1964 if (isScrollbarWindow (ev.window)) 1947 if (scrollBar.state && ev.window == scrollBar.win)
1965 { 1948 {
1966 scrollBar.setIdle (); 1949 page_dirn direction = NO_DIR;
1950
1951 if (scrollBar.upButton (ev.y))
1952 direction = UP; /* up */
1953 else if (scrollBar.dnButton (ev.y))
1954 direction = DN; /* down */
1955
1956 scrollBar.state = STATE_IDLE;
1967 /* 1957 /*
1968 * Rxvt-style scrollbar: 1958 * Rxvt-style scrollbar:
1969 * move up if mouse is above slider 1959 * move up if mouse is above slider
1970 * move dn if mouse is below slider 1960 * move dn if mouse is below slider
1971 * 1961 *
1980 /* 1970 /*
1981 * Mouse report disabled scrollbar: 1971 * Mouse report disabled scrollbar:
1982 * arrow buttons - send up/down 1972 * arrow buttons - send up/down
1983 * click on scrollbar - send pageup/down 1973 * click on scrollbar - send pageup/down
1984 */ 1974 */
1985 if ((scrollBar.style == R_SB_NEXT 1975 if (direction == UP)
1986 && scrollbarnext_upButton (ev.y))
1987 || (scrollBar.style == R_SB_RXVT
1988 && scrollbarrxvt_upButton (ev.y)))
1989 tt_printf ("\033[A"); 1976 tt_printf ("\033[A");
1990 else if ((scrollBar.style == R_SB_NEXT 1977 else if (direction == DN)
1991 && scrollbarnext_dnButton (ev.y))
1992 || (scrollBar.style == R_SB_RXVT
1993 && scrollbarrxvt_dnButton (ev.y)))
1994 tt_printf ("\033[B"); 1978 tt_printf ("\033[B");
1995 else 1979 else
1996 switch (ev.button) 1980 switch (ev.button)
1997 { 1981 {
1998 case Button2: 1982 case Button2:
2005 tt_printf ("\033[5~"); 1989 tt_printf ("\033[5~");
2006 break; 1990 break;
2007 } 1991 }
2008 } 1992 }
2009 else 1993 else
2010#endif /* NO_SCROLLBAR_REPORT */ 1994#endif /* NO_SCROLLBAR_REPORT */
2011
2012 {
2013 char upordown = 0;
2014
2015 if (scrollBar.style == R_SB_NEXT)
2016 { 1995 {
2017 if (scrollbarnext_upButton (ev.y)) 1996 if (direction != NO_DIR)
2018 upordown = -1; /* up */
2019 else if (scrollbarnext_dnButton (ev.y))
2020 upordown = 1; /* down */
2021 }
2022 else if (scrollBar.style == R_SB_RXVT)
2023 {
2024 if (scrollbarrxvt_upButton (ev.y))
2025 upordown = -1; /* up */
2026 else if (scrollbarrxvt_dnButton (ev.y))
2027 upordown = 1; /* down */
2028 }
2029 if (upordown)
2030 { 1997 {
2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1998#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1999 if (!cont_scroll_ev.is_active ())
2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2033#endif 2001#endif
2034 if (scr_page (upordown < 0 ? UP : DN, 1)) 2002 if (scr_page (direction, 1))
2035 { 2003 {
2036 if (upordown < 0) 2004 if (direction == UP)
2037 scrollBar.setUp (); 2005 scrollBar.state = STATE_UP;
2038 else 2006 else
2039 scrollBar.setDn (); 2007 scrollBar.state = STATE_DOWN;
2040 } 2008 }
2041 } 2009 }
2042 else 2010 else
2043 switch (ev.button) 2011 switch (ev.button)
2044 { 2012 {
2045 case Button2: 2013 case Button2:
2046 switch (scrollbar_align) 2014 switch (scrollBar.align)
2047 { 2015 {
2048 case R_SB_ALIGN_TOP: 2016 case R_SB_ALIGN_TOP:
2049 csrO = 0; 2017 csrO = 0;
2050 break; 2018 break;
2051 case R_SB_ALIGN_CENTRE: 2019 case R_SB_ALIGN_CENTRE:
2059 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
2060 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
2061 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
2062 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2063 2031
2064 scrollBar.setMotion (); 2032 scrollBar.state = STATE_MOTION;
2065 break; 2033 break;
2066 2034
2067 case Button1: 2035 case Button1:
2068 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2036 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2069 csrO = ev.y - scrollBar.top; 2037 csrO = ev.y - scrollBar.top;
2070 /* FALLTHROUGH */ 2038 /* FALLTHROUGH */
2071 2039
2072 case Button3: 2040 case Button3:
2073 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
2083 scr_page (DN, nrow - 1); 2051 scr_page (DN, nrow - 1);
2084# else 2052# else
2085 scr_page (DN, nrow / 4); 2053 scr_page (DN, nrow / 4);
2086# endif 2054# endif
2087 else 2055 else
2088 scrollBar.setMotion (); 2056 scrollBar.state = STATE_MOTION;
2089 } 2057 }
2090 else 2058 else
2091 { 2059 {
2092 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
2093 (nrow 2061 (nrow
2110 2078
2111 csrO = 0; /* reset csr Offset */ 2079 csrO = 0; /* reset csr Offset */
2112 if (!bypass_keystate) 2080 if (!bypass_keystate)
2113 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2114 2082
2115 if (scrollbar_isUpDn ()) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2116 { 2084 {
2117 scrollBar.setIdle (); 2085 scrollBar.state = STATE_IDLE;
2118 scrollbar_show (0); 2086 scrollbar_show (0);
2119 } 2087 }
2120 2088
2121#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2122 if (sel_scroll_ev.active)
2123 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
2124#endif 2091#endif
2125 2092
2126 if (ev.window == vt) 2093 if (ev.window == vt)
2127 { 2094 {
2128 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2095 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 mouse_report (ev); 2119 mouse_report (ev);
2153 } 2120 }
2154#else /* MOUSE_REPORT_DOUBLECLICK */ 2121#else /* MOUSE_REPORT_DOUBLECLICK */
2155 MEvent.button = AnyButton; 2122 MEvent.button = AnyButton;
2156 mouse_report (ev); 2123 mouse_report (ev);
2157#endif /* MOUSE_REPORT_DOUBLECLICK */ 2124#endif /* MOUSE_REPORT_DOUBLECLICK */
2158 return; 2125 return;
2159 } 2126 }
2160 2127
2161 /* 2128 /*
2162 * dumb hack to compensate for the failure of click-and-drag 2129 * dumb hack to compensate for the failure of click-and-drag
2200 { 2167 {
2201 mouse_slip_wheel_speed += v ? -1 : 1; 2168 mouse_slip_wheel_speed += v ? -1 : 1;
2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2169 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2204 2171
2172 if (!slip_wheel_ev.is_active ())
2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2206 } 2174 }
2207 else 2175 else
2176# endif
2208 { 2177 {
2209# endif
2210 scr_page (v, i); 2178 scr_page (v, i);
2211 scrollbar_show (1); 2179 scrollbar_show (1);
2212# ifdef MOUSE_SLIP_WHEELING
2213 } 2180 }
2214# endif
2215 } 2181 }
2216 break; 2182 break;
2217#endif 2183#endif
2218 } 2184 }
2219 } 2185 }
2278 2244
2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2280 { 2246 {
2281 refresh_count = 0; 2247 refresh_count = 0;
2282 2248
2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.) 2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 { 2250 {
2285 refreshnow = true; 2251 refreshnow = true;
2286 ch = NOCHAR; 2252 ch = NOCHAR;
2287 break; 2253 break;
2288 } 2254 }
2499 } 2465 }
2500 } 2466 }
2501 2467
2502 pclose_printer (fd); 2468 pclose_printer (fd);
2503} 2469}
2504#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2505/*}}} */ 2471/*}}} */
2506 2472
2507/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2508enum { 2474enum {
2509 C1_40 = 0x40, 2475 C1_40 = 0x40,
2802 nargs = 0; 2768 nargs = 0;
2803 2769
2804 priv = 0; 2770 priv = 0;
2805 ch = cmd_getc (); 2771 ch = cmd_getc ();
2806 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
2807 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
2808 priv = ch; 2775 priv = ch;
2809 ch = cmd_getc (); 2776 ch = cmd_getc ();
2810 } 2777 }
2811 2778
2812 /* read any numerical arguments */ 2779 /* read any numerical arguments */
2861 // versions. 2828 // versions.
2862 // 2829 //
2863 tt_printf ("\033[>%d;95;0c", 'U'); 2830 tt_printf ("\033[>%d;95;0c", 'U');
2864 } 2831 }
2865 break; 2832 break;
2833
2866 case '?': 2834 case '?':
2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2868 process_terminal_mode (ch, priv, nargs, arg); 2836 process_terminal_mode (ch, priv, nargs, arg);
2869 break; 2837 break;
2870 } 2838 }
3386 *buf++ = '\0'; 3354 *buf++ = '\0';
3387 3355
3388 process_color_seq (op, color, name, resp); 3356 process_color_seq (op, color, name, resp);
3389 } 3357 }
3390 break; 3358 break;
3359 case Rxvt_restoreFG:
3391 case XTerm_Color00: 3360 case XTerm_Color00:
3392 process_color_seq (op, Color_fg, str, resp); 3361 process_color_seq (op, Color_fg, str, resp);
3393 break; 3362 break;
3363 case Rxvt_restoreBG:
3394 case XTerm_Color01: 3364 case XTerm_Color01:
3395 process_color_seq (op, Color_bg, str, resp); 3365 process_color_seq (op, Color_bg, str, resp);
3396 break; 3366 break;
3397#ifndef NO_CURSORCOLOR 3367#ifndef NO_CURSORCOLOR
3398 case XTerm_Color_cursor: 3368 case XTerm_Color_cursor:
3424#if ENABLE_TRANSPARENCY 3394#if ENABLE_TRANSPARENCY
3425 case URxvt_Color_tint: 3395 case URxvt_Color_tint:
3426 process_color_seq (op, Color_tint, str, resp); 3396 process_color_seq (op, Color_tint, str, resp);
3427 { 3397 {
3428 bool changed = false; 3398 bool changed = false;
3399
3429 if (ISSET_PIXCOLOR (Color_tint)) 3400 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3401 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3431 else 3402 else
3432 changed = bgPixmap.unset_tint (); 3403 changed = bgPixmap.unset_tint ();
3404
3433 if (changed) 3405 if (changed)
3434 update_background (); 3406 update_background ();
3435 } 3407 }
3436 3408
3437 break; 3409 break;
3460 changed++; 3432 changed++;
3461 str = strchr (str, ';'); 3433 str = strchr (str, ';');
3462 if (str == NULL) 3434 if (str == NULL)
3463 bgPixmap.set_defaultGeometry (); 3435 bgPixmap.set_defaultGeometry ();
3464 } 3436 }
3437
3465 while (str) 3438 while (str)
3466 { 3439 {
3467 str++; 3440 str++;
3468 if (bgPixmap.set_geometry (str)) 3441 if (bgPixmap.set_geometry (str))
3469 changed++; 3442 changed++;
3470 str = strchr (str, ';'); 3443 str = strchr (str, ';');
3471 } 3444 }
3445
3472 if (changed) 3446 if (changed)
3473 update_background (); 3447 update_background ();
3474 } 3448 }
3475 break; 3449 break;
3476#endif 3450#endif
3477
3478 case Rxvt_restoreFG:
3479 set_window_color (Color_fg, str);
3480 break;
3481 case Rxvt_restoreBG:
3482 set_window_color (Color_bg, str);
3483 break;
3484 3451
3485 case XTerm_logfile: 3452 case XTerm_logfile:
3486 // TODO, when secure mode? 3453 // TODO, when secure mode?
3487 break; 3454 break;
3488 3455
3632 { 66, PrivMode_aplKP }, 3599 { 66, PrivMode_aplKP },
3633#ifndef NO_BACKSPACE_KEY 3600#ifndef NO_BACKSPACE_KEY
3634 { 67, PrivMode_BackSpace }, 3601 { 67, PrivMode_BackSpace },
3635#endif 3602#endif
3636 { 1000, PrivMode_MouseX11 }, 3603 { 1000, PrivMode_MouseX11 },
3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3638 { 1002, PrivMode_MouseBtnEvent }, 3604 { 1002, PrivMode_MouseBtnEvent },
3639 { 1003, PrivMode_MouseAnyEvent }, 3605 { 1003, PrivMode_MouseAnyEvent },
3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641 { 1011, PrivMode_Keypress }, // rxvt extension 3607 { 1011, PrivMode_Keypress }, // rxvt extension
3642 // 1035 enable modifiers for alt, numlock NYI 3608 // 1035 enable modifiers for alt, numlock NYI
3644 // 1037 send DEL for keypad delete NYI 3610 // 1037 send DEL for keypad delete NYI
3645 { 1047, PrivMode_Screen }, 3611 { 1047, PrivMode_Screen },
3646 // 1048 save and restore cursor 3612 // 1048 save and restore cursor
3647 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3613 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3648 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste },
3649 }; 3616 };
3650 3617
3651 if (nargs == 0) 3618 if (nargs == 0)
3652 return; 3619 return;
3653 3620
3701 */ 3668 */
3702 PrivMode (1, PrivMode_vt52); 3669 PrivMode (1, PrivMode_vt52);
3703 break; 3670 break;
3704 case 3: /* 80/132 */ 3671 case 3: /* 80/132 */
3705 if (priv_modes & PrivMode_132OK) 3672 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
3706 set_widthheight (((state ? 132 : 80) * fwidth), height); 3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3676 }
3707 break; 3677 break;
3708 case 4: /* smooth scrolling */ 3678 case 4: /* smooth scrolling */
3709 set_option (Opt_jumpScroll, !state); 3679 set_option (Opt_jumpScroll, !state);
3710 break; 3680 break;
3711 case 5: /* reverse video */ 3681 case 5: /* reverse video */
3743 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
3744 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
3745 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3717 break;
3748#if 0
3749 case 1001:
3750 break; /* X11 mouse highlighting */
3751#endif
3752 case 1002: 3718 case 1002:
3753 case 1003: 3719 case 1003:
3754 if (state) { 3720 if (state)
3721 {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 vt_emask_mouse = PointerMotionMask; 3724 vt_emask_mouse = PointerMotionMask;
3725 }
3758 } else 3726 else
3759 vt_emask_mouse = NoEventMask; 3727 vt_emask_mouse = NoEventMask;
3760 vt_select_input (); 3728 vt_select_input ();
3761 break; 3729 break;
3762 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
3763 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
3943rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
3944{ 3912{
3945 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
3946 3914
3947 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
3948 { /* query graphics */ 3917 /* query graphics */
3949 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
3950 return; 3919 return;
3951 } 3920 }
3952 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
3953 do 3922 do

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines