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.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC vs.
Revision 1.476 by sf-exg, Fri Feb 11 01:24:46 2011 UTC

… …
889 commit_iso14755 (); 889 commit_iso14755 ();
890 890
891 return; 891 return;
892 } 892 }
893 893
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 895 if (i[0] == keysym)
896 { 896 {
897 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 898 commit_iso14755 ();
899 899
… …
975rxvt_term::flush () 975rxvt_term::flush ()
976{ 976{
977 flush_ev.stop (); 977 flush_ev.stop ();
978 978
979#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 980 if (bg_flags & BG_NEEDS_REFRESH)
981 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 982 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 983 scr_touch (false);
985 } 984 }
986#endif 985#endif
987 986
988 if (want_refresh) 987 if (want_refresh)
… …
1252{ 1251{
1253 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1254 int x, y; 1253 int x, y;
1255 int code = 32; 1254 int code = 32;
1256 1255
1257 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1259 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1260 { 1260 {
1261 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1262 return; 1262 return;
1263
1263 mouse_row = x; 1264 mouse_row = x;
1264 mouse_col = y; 1265 mouse_col = y;
1265 code += 32; 1266 code += 32;
1266 } 1267 }
1267 1268
… …
1270 else 1271 else
1271 { 1272 {
1272 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1275 if (button_number >= 3)
1275 button_number += (64 - 3); 1276 button_number += 64 - 3;
1276 } 1277 }
1277 1278
1278 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1279 { 1280 {
1280 /* 1281 /*
… …
1312 fputc ('A', stderr); 1313 fputc ('A', stderr);
1313 if (key_state & 32) 1314 if (key_state & 32)
1314 fputc ('2', stderr); 1315 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1317 button_number,
1317 x + 1, 1318 x,
1318 y + 1); 1319 y);
1319#endif 1320#endif
1320 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1321 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1336 code + button_number + key_state,
1323 (32 + x + 1), 1337 32 + x,
1324 (32 + y + 1)); 1338 32 + y);
1325} 1339}
1326 1340
1327/*{{{ process an X event */ 1341/*{{{ process an X event */
1328void 1342void
1329rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1453 ;
1440 1454
1441#ifdef HAVE_BG_PIXMAP 1455#ifdef HAVE_BG_PIXMAP
1442 bool moved = false; 1456 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ()) 1457 if (bg_window_position_sensitive ())
1444 { 1458 {
1445 int x, y; 1459 int x, y;
1446 if (ev.xconfigure.send_event) 1460 if (ev.xconfigure.send_event)
1447 { 1461 {
1448 x = ev.xconfigure.x; 1462 x = ev.xconfigure.x;
1449 y = ev.xconfigure.y; 1463 y = ev.xconfigure.y;
1450 } 1464 }
1451 else 1465 else
1452 get_window_origin (x, y); 1466 get_window_origin (x, y);
1453 1467
1454 if (bgPixmap.set_position (x, y) 1468 if (bg_set_position (x, y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1469 || !(bg_flags & BG_IS_VALID))
1456 moved = true; 1470 moved = true;
1457 } 1471 }
1458#endif 1472#endif
1459 1473
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
1468 if (moved) 1482 if (moved)
1469 { 1483 {
1470 if (mapped) 1484 if (mapped)
1471 update_background (); 1485 update_background ();
1472 else 1486 else
1473 bgPixmap.invalidate (); 1487 bg_invalidate ();
1474 } 1488 }
1475#endif 1489#endif
1476 } 1490 }
1477 1491
1478 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1479 } 1493 }
1480 break; 1494 break;
1481 1495
1482 case PropertyNotify: 1496 case PropertyNotify:
1483 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1485 && ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487
1488 break; 1498 break;
1489 1499
1490 case SelectionClear: 1500 case SelectionClear:
1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1492 break;
1493
1494 case SelectionNotify:
1495 if (selection_wait == Sel_normal)
1496 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1497 break; 1502 break;
1498 1503
1499 case SelectionRequest: 1504 case SelectionRequest:
1500 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1501 break; 1506 break;
… …
1512 * by scheduling background redraw as soon as we can, but giving a short 1517 * by scheduling background redraw as soon as we can, but giving a short
1513 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all 1519 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1516 */ 1521 */
1517 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1518 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1519#endif 1524#endif
1520 mapped = 1; 1525 mapped = 1;
1521#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1522 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1537 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1538 { 1543 {
1539 do 1544 do
1540 { 1545 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1548 }
1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1545 1550
1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1547 1552
1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 { 1554 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1552 } 1557 }
1553 1558
1554 want_refresh = 1; 1559 want_refresh = 1;
1555 } 1560 }
1556 else 1561 else
… …
1837 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1838 */ 1843 */
1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 { 1846 {
1842 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1843 update_background (); 1848 update_background ();
1844 } 1849 }
1845 1850
1846 break; 1851 break;
1847 } 1852 }
… …
2680 2685
2681 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2682 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2683 { 2688 {
2684 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2685 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2686 } 2691 }
2687 break; 2692 break;
2688 2693
2689 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2690 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
… …
2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2764 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2765 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2766 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2762}; 2767};
2763 2768
2764#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2769#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2770 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2771 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2767#define get_byte_array_bit(array, bit) \ 2772#define get_byte_array_bit(array, bit) \
2768 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2773 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2769 2774
2770const unsigned char csi_defaults[] = 2775static const unsigned char csi_defaults[] =
2771 { 2776 {
2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2777 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2778 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2779 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2780 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2864 { 2869 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2870 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset (); 2871 scr_soft_reset ();
2867 2872
2868 static const int pm_h[] = { 7, 25 }; 2873 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2874 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2870 2875
2871 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2876 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2872 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2873 } 2878 }
2874 break; 2879 break;
2875 } 2880 }
2876 2881
2877 return; 2882 return;
… …
3439 process_color_seq (op, Color_tint, str, resp); 3444 process_color_seq (op, Color_tint, str, resp);
3440 { 3445 {
3441 bool changed = false; 3446 bool changed = false;
3442 3447
3443 if (ISSET_PIXCOLOR (Color_tint)) 3448 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3449 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3445 else
3446 changed = bgPixmap.unset_tint ();
3447 3450
3448 if (changed) 3451 if (changed)
3449 update_background (); 3452 update_background ();
3450 } 3453 }
3451 3454
… …
3457 if (!strcmp (str, "?")) 3460 if (!strcmp (str, "?"))
3458 { 3461 {
3459 char str[256]; 3462 char str[256];
3460 3463
3461 sprintf (str, "[%dx%d+%d+%d]", 3464 sprintf (str, "[%dx%d+%d+%d]",
3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3465 min (h_scale, 32767), min (v_scale, 32767),
3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3466 min (h_align, 32767), min (v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST); 3467 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 } 3468 }
3466 else 3469 else
3467 { 3470 {
3468 int changed = 0; 3471 int changed = 0;
3469 3472
3470 if (*str != ';') 3473 if (*str != ';')
3471 { 3474 {
3472 if (bgPixmap.set_file (str)) /* change pixmap */ 3475 if (bg_set_file (str)) /* change pixmap */
3473 { 3476 {
3474 changed++; 3477 changed++;
3475 str = strchr (str, ';'); 3478 str = strchr (str, ';');
3476 if (str == NULL) 3479 if (str == NULL)
3477 bgPixmap.set_defaultGeometry (); 3480 bg_set_default_geometry ();
3478 else 3481 else
3479 bgPixmap.set_geometry (str+1); 3482 bg_set_geometry (str+1);
3480 } 3483 }
3481 } 3484 }
3482 else 3485 else
3483 { 3486 {
3484 str++; 3487 str++;
3485 if (bgPixmap.set_geometry (str, true)) 3488 if (bg_set_geometry (str, true))
3486 changed++; 3489 changed++;
3487 } 3490 }
3488 3491
3489 if (changed) 3492 if (changed)
3490 { 3493 {
3491 if (bgPixmap.window_position_sensitive ()) 3494 if (bg_window_position_sensitive ())
3492 { 3495 {
3493 int x, y; 3496 int x, y;
3494 get_window_origin (x, y); 3497 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y); 3498 bg_set_position (x, y);
3496 } 3499 }
3497 update_background (); 3500 update_background ();
3498 } 3501 }
3499 } 3502 }
3500 break; 3503 break;
… …
3654 { 67, PrivMode_BackSpace }, // DECBKM 3657 { 67, PrivMode_BackSpace }, // DECBKM
3655#endif 3658#endif
3656 { 1000, PrivMode_MouseX11 }, 3659 { 1000, PrivMode_MouseX11 },
3657 { 1002, PrivMode_MouseBtnEvent }, 3660 { 1002, PrivMode_MouseBtnEvent },
3658 { 1003, PrivMode_MouseAnyEvent }, 3661 { 1003, PrivMode_MouseAnyEvent },
3662#if ENABLE_FRILLS
3663 { 1005, PrivMode_ExtModeMouse },
3664#endif
3659 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3665 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3660 { 1011, PrivMode_Keypress }, // rxvt extension 3666 { 1011, PrivMode_Keypress }, // rxvt extension
3667#if ENABLE_FRILLS
3668 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3669#endif
3661 // 1035 enable modifiers for alt, numlock NYI 3670 // 1035 enable modifiers for alt, numlock NYI
3662 // 1036 send ESC for meta keys NYI 3671 // 1036 send ESC for meta keys NYI
3663 // 1037 send DEL for keypad delete NYI 3672 // 1037 send DEL for keypad delete NYI
3664 { 1047, PrivMode_Screen }, 3673 { 1047, PrivMode_Screen },
3665 // 1048 save and restore cursor 3674 // 1048 save and restore cursor, implemented in code
3666 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3675 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3667 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3676 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3668 { 2004, PrivMode_BracketPaste }, 3677 { 2004, PrivMode_BracketPaste },
3669 }; 3678 };
3670 3679
… …
3680 for (i = 0; i < nargs; i++) 3689 for (i = 0; i < nargs; i++)
3681 { 3690 {
3682 state = -1; 3691 state = -1;
3683 3692
3684 /* basic handling */ 3693 /* basic handling */
3685 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3686 if (argtopriv[j].argval == arg[i]) 3695 if (argtopriv[j].argval == arg[i])
3687 { 3696 {
3688 state = privcases (mode, argtopriv[j].bit); 3697 state = privcases (mode, argtopriv[j].bit);
3689 break; 3698 break;
3690 } 3699 }
… …
3768 case 1003: 3777 case 1003:
3769 if (state) 3778 if (state)
3770 { 3779 {
3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3780 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3772 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3781 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3782 mouse_row = mouse_col = 0;
3773 vt_emask_mouse = PointerMotionMask; 3783 vt_emask_mouse = PointerMotionMask;
3774 } 3784 }
3775 else 3785 else
3776 vt_emask_mouse = NoEventMask; 3786 vt_emask_mouse = NoEventMask;
3777 3787
… …
4003 4013
4004/* ---------------------------------------------------------------------- */ 4014/* ---------------------------------------------------------------------- */
4005/* Write data to the pty as typed by the user, pasted with the mouse, 4015/* Write data to the pty as typed by the user, pasted with the mouse,
4006 * or generated by us in response to a query ESC sequence. 4016 * or generated by us in response to a query ESC sequence.
4007 */ 4017 */
4008const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4018static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4009 4019
4010void 4020void
4011rxvt_term::tt_write (const char *data, unsigned int len) 4021rxvt_term::tt_write (const char *data, unsigned int len)
4012{ 4022{
4013 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4023 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4025 4035
4026 data += written; 4036 data += written;
4027 len -= written; 4037 len -= written;
4028 } 4038 }
4029 4039
4030 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4040 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4031 4041
4032 memcpy (v_buffer + v_buflen, data, len); 4042 memcpy (v_buffer + v_buflen, data, len);
4033 v_buflen += len; 4043 v_buflen += len;
4034 4044
4035 pty_ev.set (ev::READ | ev::WRITE); 4045 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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