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.365 by ayin, Thu Nov 15 10:13:37 2007 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 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
… …
278 } 279 }
279 280
280 iso14755buf = 0; 281 iso14755buf = 0;
281} 282}
282 283
283int 284static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
285{ 286{
286 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
289 { 290 {
… …
297 298
298 return -1; 299 return -1;
299} 300}
300#endif 301#endif
301 302
303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381#endif
382 case XK_Help:
383 param = 28;
384 break;
385 case XK_Menu:
386 param = 29;
387 break;
388 }
389 return param;
390}
391
302void 392void
303rxvt_term::key_press (XKeyEvent &ev) 393rxvt_term::key_press (XKeyEvent &ev)
304{ 394{
305 int ctrl, meta, shft, len; 395 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 396 KeySym keysym;
308 int valid_keysym; 397 int valid_keysym;
309 char kbuf[KBUFSZ]; 398 char kbuf[KBUFSZ];
310 399
311#if ISO_14755 400#if ISO_14755
… …
546 } 635 }
547#endif 636#endif
548 637
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 638 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 639 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 641 unsigned int 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 642
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 643 switch (translate_keypad (keysym, kp))
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
584 switch (keysym)
585 { 644 {
586#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace: 646 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace) 647 if (priv_modes & PrivMode_HaveBackSpace)
589 { 648 {
… …
633 } 692 }
634 else if (priv_modes & PrivMode_aplCUR) 693 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O'; 694 kbuf[1] = 'O';
636 break; 695 break;
637 696
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter: 697 case XK_KP_Enter:
647 /* allow shift to override */ 698 /* allow shift to override */
648 if (kp) 699 if (kp)
649 { 700 {
650 strcpy (kbuf, "\033OM"); 701 strcpy (kbuf, "\033OM");
… …
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0'; 754 kbuf[1] = '\0';
704 } 755 }
705 break; 756 break;
706 757
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End: 758 case XK_End:
725 strcpy (kbuf, KS_END); 759 strcpy (kbuf, KS_END);
726 break; 760 break;
727 case XK_Home: 761 case XK_Home:
728 strcpy (kbuf, KS_HOME); 762 strcpy (kbuf, KS_HOME);
729 break; 763 break;
730 764
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default: 765 default:
766 {
767 int param = map_function_key (keysym);
768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
787 newlen = 0; 771 newlen = 0;
772 }
788 break; 773 break;
789 } 774 }
790 775
791 if (newlen) 776 if (newlen)
792 len = strlen (kbuf); 777 len = strlen (kbuf);
793 }
794 778
795 /* 779 /*
796 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
797 */ 781 */
798#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
1041 } 1025 }
1042 1026
1043 display->flush (); 1027 display->flush ();
1044} 1028}
1045 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1046void 1031void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1032rxvt_term::refresh_check ()
1048{ 1033{
1049 make_current (); 1034 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1036
1051 display->flush (); 1037 display->flush ();
1052
1053 if (want_refresh && !flush_ev.active)
1054 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1055} 1038}
1056 1039
1057void 1040void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1041rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1042{
… …
1067void 1050void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1052{
1070 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1054 want_refresh = 1;
1055 refresh_check ();
1072} 1056}
1073#endif 1057#endif
1074 1058
1075#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1076void 1060void
… …
1078{ 1062{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1064 {
1081 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1082 want_refresh = 1; 1066 want_refresh = 1;
1067 refresh_check ();
1083 } 1068 }
1069 else
1070 w.stop ();
1084} 1071}
1085#endif 1072#endif
1086 1073
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088void 1075void
1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1090{ 1077{
1091 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1092 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1080 {
1093 want_refresh = 1; 1081 want_refresh = 1;
1082 refresh_check ();
1083 }
1094 else 1084 else
1095 w.stop (); 1085 w.stop ();
1096} 1086}
1097#endif 1087#endif
1098 1088
… …
1102{ 1092{
1103 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1104 { 1094 {
1105 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106 want_refresh = 1; 1096 want_refresh = 1;
1097 refresh_check ();
1107 } 1098 }
1108 else 1099 else
1109 w.stop (); 1100 w.stop ();
1110} 1101}
1111#endif 1102#endif
1112 1103
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1105void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1107{
1117 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119 : scr_page (UP, mouse_slip_wheel_speed))
1120 { 1109 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1124 want_refresh = 1; 1110 want_refresh = 1;
1111 refresh_check ();
1112 }
1113
1114 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125 } 1115 {
1126 else 1116 mouse_slip_wheel_speed = 0;
1127 w.stop (); 1117 w.stop ();
1118 }
1128} 1119}
1129#endif 1120#endif
1130 1121
1131#if LINUX_YIELD_HACK 1122#if LINUX_YIELD_HACK
1132static struct event_handler 1123static struct event_handler
… …
1204 if (cmd_parse ()) 1195 if (cmd_parse ())
1205 break; 1196 break;
1206 1197
1207 if (revents & ev::WRITE) 1198 if (revents & ev::WRITE)
1208 pty_write (); 1199 pty_write ();
1200
1201 refresh_check ();
1209} 1202}
1210 1203
1211void 1204void
1212rxvt_term::pointer_unblank () 1205rxvt_term::pointer_unblank ()
1213{ 1206{
… …
1428 && ev.xfocus.mode != NotifyGrab) 1421 && ev.xfocus.mode != NotifyGrab)
1429 focus_out (); 1422 focus_out ();
1430 break; 1423 break;
1431 1424
1432 case ConfigureNotify: 1425 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1426 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */ 1428 szHint.width, szHint.height);*/
1436 if (ev.xconfigure.window == parent[0]) 1429 if (ev.xconfigure.window == parent[0])
1437 { 1430 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1432 ;
1440 1433
… …
1445 } 1438 }
1446 else 1439 else
1447 { 1440 {
1448#ifdef HAVE_BG_PIXMAP 1441#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped)
1450 update_background (); 1445 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1451#endif 1449#endif
1452 } 1450 }
1451
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1453 }
1455 break; 1454 break;
1456 1455
1457 case PropertyNotify: 1456 case PropertyNotify:
… …
1474 case SelectionRequest: 1473 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1476 break; 1475 break;
1477 1476
1478 case MapNotify: 1477 case MapNotify:
1478#ifdef HAVE_BG_PIXMAP
1479 /* This is needed spcifically to fix the case of no window manager or a
1480 * non-reparenting window manager. In those cases we never get first
1481 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1482 * care of multiplicity of ConfigureNotify events arriwing while WM does
1483 * reparenting.
1484 * We should not render background immidiately, as there could be several
1485 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1486 * by scheduling background redraw as soon as we can, but giving a short
1487 * bit of time for ConfigureNotifies to arrive.
1488 * We should render background PRIOR to drawing any text, but AFTER all
1489 * of ConfigureNotifys for the best results.
1490 */
1491 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1492 update_background_ev.start (0.025);
1493#endif
1479 mapped = 1; 1494 mapped = 1;
1480#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1481 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1496 text_blink_ev.start ();
1482#endif 1497#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1499 break;
1485 1500
1486 case UnmapNotify: 1501 case UnmapNotify:
… …
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1523 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1511 } 1526 }
1527
1512 want_refresh = 1; 1528 want_refresh = 1;
1513 } 1529 }
1514 else 1530 else
1515 { 1531 {
1516 XEvent unused_event; 1532 XEvent unused_event;
… …
1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1534 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1535 ;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1537 ;
1522 1538
1523 if (isScrollbarWindow (ev.xany.window)) 1539 if (scrollBar.state && ev.xany.window == scrollBar.win)
1524 { 1540 {
1525 scrollBar.setIdle (); 1541 scrollBar.state = STATE_IDLE;
1526 scrollbar_show (0); 1542 scrollbar_show (0);
1527 } 1543 }
1528 } 1544 }
1529 break; 1545 break;
1530 1546
… …
1577 int dist; 1593 int dist;
1578 1594
1579 /* don't clobber the current delay if we are 1595 /* don't clobber the current delay if we are
1580 * already in the middle of scrolling. 1596 * already in the middle of scrolling.
1581 */ 1597 */
1582 if (!sel_scroll_ev.active) 1598 if (!sel_scroll_ev.is_active ())
1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1599 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584 1600
1585 /* save the event params so we can highlight 1601 /* save the event params so we can highlight
1586 * the selection in the pending-scroll loop 1602 * the selection in the pending-scroll loop
1587 */ 1603 */
… …
1610 else 1626 else
1611 { 1627 {
1612 /* we are within the text window, so we 1628 /* we are within the text window, so we
1613 * shouldn't be scrolling 1629 * shouldn't be scrolling
1614 */ 1630 */
1615 if (sel_scroll_ev.active)
1616 sel_scroll_ev.stop(); 1631 sel_scroll_ev.stop();
1617 } 1632 }
1618#endif 1633#endif
1619#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1620 } 1635 }
1621#endif 1636#endif
1622 } 1637 }
1623 } 1638 }
1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1625 { 1640 {
1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1627 MotionNotify, &ev)) 1642 MotionNotify, &ev))
1628 ; 1643 ;
1629 1644
… …
1664 1679
1665 if (ev.type == KeyPress && hidden_pointer == 0) 1680 if (ev.type == KeyPress && hidden_pointer == 0)
1666 pointer_blank (); 1681 pointer_blank ();
1667 } 1682 }
1668#endif 1683#endif
1684
1685 refresh_check ();
1669} 1686}
1670 1687
1671void 1688void
1672rxvt_term::focus_in () 1689rxvt_term::focus_in ()
1673{ 1690{
… …
1685 XSetICFocus (Input_Context); 1702 XSetICFocus (Input_Context);
1686 } 1703 }
1687#endif 1704#endif
1688#if CURSOR_BLINK 1705#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink)) 1706 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1707 cursor_blink_ev.again ();
1691#endif 1708#endif
1692#if OFF_FOCUS_FADING 1709#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade]) 1710 if (rs[Rs_fade])
1694 { 1711 {
1695 pix_colors = pix_colors_focused; 1712 pix_colors = pix_colors_focused;
… …
1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784 { 1801 {
1785 bgPixmap.set_root_pixmap (); 1802 bgPixmap.set_root_pixmap ();
1786 update_background (); 1803 update_background ();
1787 } 1804 }
1805
1788 break; 1806 break;
1789 } 1807 }
1790# endif 1808# endif
1809
1810 refresh_check ();
1791} 1811}
1792#endif 1812#endif
1793 1813
1794void 1814void
1795rxvt_term::button_press (XButtonEvent &ev) 1815rxvt_term::button_press (XButtonEvent &ev)
… …
1850 mouse_report (ev); 1870 mouse_report (ev);
1851 } 1871 }
1852#else 1872#else
1853 MEvent.button = ev.button; 1873 MEvent.button = ev.button;
1854 mouse_report (ev); 1874 mouse_report (ev);
1855#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1856 1876
1857 } 1877 }
1858 else 1878 else
1859 { 1879 {
1860 if (ev.button != MEvent.button) 1880 if (ev.button != MEvent.button)
… …
1908 } 1928 }
1909 1929
1910 /* 1930 /*
1911 * Scrollbar window processing of button press 1931 * Scrollbar window processing of button press
1912 */ 1932 */
1913 if (isScrollbarWindow (ev.window)) 1933 if (scrollBar.state && ev.window == scrollBar.win)
1914 { 1934 {
1915 scrollBar.setIdle (); 1935 page_dirn direction = NO_DIR;
1936
1937 if (scrollBar.upButton (ev.y))
1938 direction = UP; /* up */
1939 else if (scrollBar.dnButton (ev.y))
1940 direction = DN; /* down */
1941
1942 scrollBar.state = STATE_IDLE;
1916 /* 1943 /*
1917 * Rxvt-style scrollbar: 1944 * Rxvt-style scrollbar:
1918 * move up if mouse is above slider 1945 * move up if mouse is above slider
1919 * move dn if mouse is below slider 1946 * move dn if mouse is below slider
1920 * 1947 *
… …
1929 /* 1956 /*
1930 * Mouse report disabled scrollbar: 1957 * Mouse report disabled scrollbar:
1931 * arrow buttons - send up/down 1958 * arrow buttons - send up/down
1932 * click on scrollbar - send pageup/down 1959 * click on scrollbar - send pageup/down
1933 */ 1960 */
1934 if ((scrollBar.style == R_SB_NEXT 1961 if (direction == UP)
1935 && scrollbarnext_upButton (ev.y))
1936 || (scrollBar.style == R_SB_RXVT
1937 && scrollbarrxvt_upButton (ev.y)))
1938 tt_printf ("\033[A"); 1962 tt_printf ("\033[A");
1939 else if ((scrollBar.style == R_SB_NEXT 1963 else if (direction == DN)
1940 && scrollbarnext_dnButton (ev.y))
1941 || (scrollBar.style == R_SB_RXVT
1942 && scrollbarrxvt_dnButton (ev.y)))
1943 tt_printf ("\033[B"); 1964 tt_printf ("\033[B");
1944 else 1965 else
1945 switch (ev.button) 1966 switch (ev.button)
1946 { 1967 {
1947 case Button2: 1968 case Button2:
… …
1954 tt_printf ("\033[5~"); 1975 tt_printf ("\033[5~");
1955 break; 1976 break;
1956 } 1977 }
1957 } 1978 }
1958 else 1979 else
1959#endif /* NO_SCROLLBAR_REPORT */ 1980#endif /* NO_SCROLLBAR_REPORT */
1960
1961 {
1962 char upordown = 0;
1963
1964 if (scrollBar.style == R_SB_NEXT)
1965 { 1981 {
1966 if (scrollbarnext_upButton (ev.y)) 1982 if (direction != NO_DIR)
1967 upordown = -1; /* up */
1968 else if (scrollbarnext_dnButton (ev.y))
1969 upordown = 1; /* down */
1970 }
1971 else if (scrollBar.style == R_SB_RXVT)
1972 {
1973 if (scrollbarrxvt_upButton (ev.y))
1974 upordown = -1; /* up */
1975 else if (scrollbarrxvt_dnButton (ev.y))
1976 upordown = 1; /* down */
1977 }
1978 if (upordown)
1979 { 1983 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1984#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1985 if (!cont_scroll_ev.is_active ())
1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1982#endif 1987#endif
1983 if (scr_page (upordown < 0 ? UP : DN, 1)) 1988 if (scr_page (direction, 1))
1984 { 1989 {
1985 if (upordown < 0) 1990 if (direction == UP)
1986 scrollBar.setUp (); 1991 scrollBar.state = STATE_UP;
1987 else 1992 else
1988 scrollBar.setDn (); 1993 scrollBar.state = STATE_DOWN;
1989 } 1994 }
1990 } 1995 }
1991 else 1996 else
1992 switch (ev.button) 1997 switch (ev.button)
1993 { 1998 {
1994 case Button2: 1999 case Button2:
1995 switch (scrollbar_align) 2000 switch (scrollBar.align)
1996 { 2001 {
1997 case R_SB_ALIGN_TOP: 2002 case R_SB_ALIGN_TOP:
1998 csrO = 0; 2003 csrO = 0;
1999 break; 2004 break;
2000 case R_SB_ALIGN_CENTRE: 2005 case R_SB_ALIGN_CENTRE:
… …
2008 if (scrollBar.style == R_SB_XTERM 2013 if (scrollBar.style == R_SB_XTERM
2009 || scrollbar_above_slider (ev.y) 2014 || scrollbar_above_slider (ev.y)
2010 || scrollbar_below_slider (ev.y)) 2015 || scrollbar_below_slider (ev.y))
2011 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2012 2017
2013 scrollBar.setMotion (); 2018 scrollBar.state = STATE_MOTION;
2014 break; 2019 break;
2015 2020
2016 case Button1: 2021 case Button1:
2017 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2022 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2018 csrO = ev.y - scrollBar.top; 2023 csrO = ev.y - scrollBar.top;
2019 /* FALLTHROUGH */ 2024 /* FALLTHROUGH */
2020 2025
2021 case Button3: 2026 case Button3:
2022 if (scrollBar.style != R_SB_XTERM) 2027 if (scrollBar.style != R_SB_XTERM)
… …
2032 scr_page (DN, nrow - 1); 2037 scr_page (DN, nrow - 1);
2033# else 2038# else
2034 scr_page (DN, nrow / 4); 2039 scr_page (DN, nrow / 4);
2035# endif 2040# endif
2036 else 2041 else
2037 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2038 } 2043 }
2039 else 2044 else
2040 { 2045 {
2041 scr_page ((ev.button == Button1 ? DN : UP), 2046 scr_page ((ev.button == Button1 ? DN : UP),
2042 (nrow 2047 (nrow
… …
2059 2064
2060 csrO = 0; /* reset csr Offset */ 2065 csrO = 0; /* reset csr Offset */
2061 if (!bypass_keystate) 2066 if (!bypass_keystate)
2062 reportmode = !! (priv_modes & PrivMode_mouse_report); 2067 reportmode = !! (priv_modes & PrivMode_mouse_report);
2063 2068
2064 if (scrollbar_isUpDn ()) 2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2065 { 2070 {
2066 scrollBar.setIdle (); 2071 scrollBar.state = STATE_IDLE;
2067 scrollbar_show (0); 2072 scrollbar_show (0);
2068 } 2073 }
2069 2074
2070#ifdef SELECTION_SCROLLING 2075#ifdef SELECTION_SCROLLING
2071 if (sel_scroll_ev.active)
2072 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
2073#endif 2077#endif
2074 2078
2075 if (ev.window == vt) 2079 if (ev.window == vt)
2076 { 2080 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2081 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2101 mouse_report (ev); 2105 mouse_report (ev);
2102 } 2106 }
2103#else /* MOUSE_REPORT_DOUBLECLICK */ 2107#else /* MOUSE_REPORT_DOUBLECLICK */
2104 MEvent.button = AnyButton; 2108 MEvent.button = AnyButton;
2105 mouse_report (ev); 2109 mouse_report (ev);
2106#endif /* MOUSE_REPORT_DOUBLECLICK */ 2110#endif /* MOUSE_REPORT_DOUBLECLICK */
2107 return; 2111 return;
2108 } 2112 }
2109 2113
2110 /* 2114 /*
2111 * dumb hack to compensate for the failure of click-and-drag 2115 * dumb hack to compensate for the failure of click-and-drag
… …
2149 { 2153 {
2150 mouse_slip_wheel_speed += v ? -1 : 1; 2154 mouse_slip_wheel_speed += v ? -1 : 1;
2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2155 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2156 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153 2157
2158 if (!slip_wheel_ev.is_active ())
2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2159 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155 } 2160 }
2156 else 2161 else
2162# endif
2157 { 2163 {
2158# endif
2159 scr_page (v, i); 2164 scr_page (v, i);
2160 scrollbar_show (1); 2165 scrollbar_show (1);
2161# ifdef MOUSE_SLIP_WHEELING
2162 } 2166 }
2163# endif
2164 } 2167 }
2165 break; 2168 break;
2166#endif 2169#endif
2167 } 2170 }
2168 } 2171 }
… …
2227 2230
2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2229 { 2232 {
2230 refresh_count = 0; 2233 refresh_count = 0;
2231 2234
2232 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.) 2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 { 2236 {
2234 refreshnow = true; 2237 refreshnow = true;
2235 ch = NOCHAR; 2238 ch = NOCHAR;
2236 break; 2239 break;
2237 } 2240 }
… …
2448 } 2451 }
2449 } 2452 }
2450 2453
2451 pclose_printer (fd); 2454 pclose_printer (fd);
2452} 2455}
2453#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
2454/*}}} */ 2457/*}}} */
2455 2458
2456/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
2457enum { 2460enum {
2458 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
2751 nargs = 0; 2754 nargs = 0;
2752 2755
2753 priv = 0; 2756 priv = 0;
2754 ch = cmd_getc (); 2757 ch = cmd_getc ();
2755 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
2756 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
2757 priv = ch; 2761 priv = ch;
2758 ch = cmd_getc (); 2762 ch = cmd_getc ();
2759 } 2763 }
2760 2764
2761 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
2810 // versions. 2814 // versions.
2811 // 2815 //
2812 tt_printf ("\033[>%d;95;0c", 'U'); 2816 tt_printf ("\033[>%d;95;0c", 'U');
2813 } 2817 }
2814 break; 2818 break;
2819
2815 case '?': 2820 case '?':
2816 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2817 process_terminal_mode (ch, priv, nargs, arg); 2822 process_terminal_mode (ch, priv, nargs, arg);
2818 break; 2823 break;
2819 } 2824 }
… …
3335 *buf++ = '\0'; 3340 *buf++ = '\0';
3336 3341
3337 process_color_seq (op, color, name, resp); 3342 process_color_seq (op, color, name, resp);
3338 } 3343 }
3339 break; 3344 break;
3345 case Rxvt_restoreFG:
3340 case XTerm_Color00: 3346 case XTerm_Color00:
3341 process_color_seq (op, Color_fg, str, resp); 3347 process_color_seq (op, Color_fg, str, resp);
3342 break; 3348 break;
3349 case Rxvt_restoreBG:
3343 case XTerm_Color01: 3350 case XTerm_Color01:
3344 process_color_seq (op, Color_bg, str, resp); 3351 process_color_seq (op, Color_bg, str, resp);
3345 break; 3352 break;
3346#ifndef NO_CURSORCOLOR 3353#ifndef NO_CURSORCOLOR
3347 case XTerm_Color_cursor: 3354 case XTerm_Color_cursor:
… …
3373#if ENABLE_TRANSPARENCY 3380#if ENABLE_TRANSPARENCY
3374 case URxvt_Color_tint: 3381 case URxvt_Color_tint:
3375 process_color_seq (op, Color_tint, str, resp); 3382 process_color_seq (op, Color_tint, str, resp);
3376 { 3383 {
3377 bool changed = false; 3384 bool changed = false;
3385
3378 if (ISSET_PIXCOLOR (Color_tint)) 3386 if (ISSET_PIXCOLOR (Color_tint))
3379 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3387 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3380 else 3388 else
3381 changed = bgPixmap.unset_tint (); 3389 changed = bgPixmap.unset_tint ();
3390
3382 if (changed) 3391 if (changed)
3383 update_background (); 3392 update_background ();
3384 } 3393 }
3385 3394
3386 break; 3395 break;
… …
3409 changed++; 3418 changed++;
3410 str = strchr (str, ';'); 3419 str = strchr (str, ';');
3411 if (str == NULL) 3420 if (str == NULL)
3412 bgPixmap.set_defaultGeometry (); 3421 bgPixmap.set_defaultGeometry ();
3413 } 3422 }
3423
3414 while (str) 3424 while (str)
3415 { 3425 {
3416 str++; 3426 str++;
3417 if (bgPixmap.set_geometry (str)) 3427 if (bgPixmap.set_geometry (str))
3418 changed++; 3428 changed++;
3419 str = strchr (str, ';'); 3429 str = strchr (str, ';');
3420 } 3430 }
3431
3421 if (changed) 3432 if (changed)
3422 update_background (); 3433 update_background ();
3423 } 3434 }
3424 break; 3435 break;
3425#endif 3436#endif
3426
3427 case Rxvt_restoreFG:
3428 set_window_color (Color_fg, str);
3429 break;
3430 case Rxvt_restoreBG:
3431 set_window_color (Color_bg, str);
3432 break;
3433 3437
3434 case XTerm_logfile: 3438 case XTerm_logfile:
3435 // TODO, when secure mode? 3439 // TODO, when secure mode?
3436 break; 3440 break;
3437 3441
… …
3581 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
3582#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
3583 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
3584#endif 3588#endif
3585 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
3586 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3587 { 1002, PrivMode_MouseBtnEvent }, 3590 { 1002, PrivMode_MouseBtnEvent },
3588 { 1003, PrivMode_MouseAnyEvent }, 3591 { 1003, PrivMode_MouseAnyEvent },
3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3590 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
3591 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
… …
3593 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
3594 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
3595 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
3596 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3597 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
3598 }; 3602 };
3599 3603
3600 if (nargs == 0) 3604 if (nargs == 0)
3601 return; 3605 return;
3602 3606
… …
3650 */ 3654 */
3651 PrivMode (1, PrivMode_vt52); 3655 PrivMode (1, PrivMode_vt52);
3652 break; 3656 break;
3653 case 3: /* 80/132 */ 3657 case 3: /* 80/132 */
3654 if (priv_modes & PrivMode_132OK) 3658 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
3655 set_widthheight (((state ? 132 : 80) * fwidth), height); 3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3662 }
3656 break; 3663 break;
3657 case 4: /* smooth scrolling */ 3664 case 4: /* smooth scrolling */
3658 set_option (Opt_jumpScroll, !state); 3665 set_option (Opt_jumpScroll, !state);
3659 break; 3666 break;
3660 case 5: /* reverse video */ 3667 case 5: /* reverse video */
… …
3692 /* case 67: - backspace key */ 3699 /* case 67: - backspace key */
3693 case 1000: /* X11 mouse reporting */ 3700 case 1000: /* X11 mouse reporting */
3694 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3696 break; 3703 break;
3697#if 0
3698 case 1001:
3699 break; /* X11 mouse highlighting */
3700#endif
3701 case 1002: 3704 case 1002:
3702 case 1003: 3705 case 1003:
3703 if (state) 3706 if (state)
3704 { 3707 {
3705 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
… …
3894rxvt_term::process_graphics () 3897rxvt_term::process_graphics ()
3895{ 3898{
3896 unicode_t ch, cmd = cmd_getc (); 3899 unicode_t ch, cmd = cmd_getc ();
3897 3900
3898 if (cmd == 'Q') 3901 if (cmd == 'Q')
3902 {
3899 { /* query graphics */ 3903 /* query graphics */
3900 tt_printf ("\033G0\012"); /* no graphics */ 3904 tt_printf ("\033G0\012"); /* no graphics */
3901 return; 3905 return;
3902 } 3906 }
3903 /* swallow other graphics sequences until terminating ':' */ 3907 /* swallow other graphics sequences until terminating ':' */
3904 do 3908 do

Diff Legend

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