ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvttoolkit.C
(Generate patch)

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.98 by root, Sat Jan 26 13:13:20 2008 UTC vs.
Revision 1.118 by sf-exg, Sat Feb 12 00:50:04 2011 UTC

2 * File: rxvttoolkit.C 2 * File: rxvttoolkit.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2011 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
33 34
34#if XFT 35#if XFT
35# include <X11/extensions/Xrender.h> 36# include <X11/extensions/Xrender.h>
36#endif 37#endif
37 38
38const char *const xa_names[] = 39static const char *const xa_names[] =
39{ 40{
40 "TEXT", 41 "TEXT",
41 "COMPOUND_TEXT", 42 "COMPOUND_TEXT",
42 "UTF8_STRING", 43 "UTF8_STRING",
43 "MULTIPLE", 44 "MULTIPLE",
59#if ENABLE_EWMH 60#if ENABLE_EWMH
60 "_NET_WM_PID", 61 "_NET_WM_PID",
61 "_NET_WM_NAME", 62 "_NET_WM_NAME",
62 "_NET_WM_ICON_NAME", 63 "_NET_WM_ICON_NAME",
63 "_NET_WM_PING", 64 "_NET_WM_PING",
65 "_NET_WM_ICON",
64#endif 66#endif
65#if USE_XIM 67#if USE_XIM
66 "WM_LOCALE_NAME", 68 "WM_LOCALE_NAME",
67 "XIM_SERVERS", 69 "XIM_SERVERS",
68#endif 70#endif
226{ 228{
227} 229}
228 230
229rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h) 231rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
230{ 232{
231 // it's actually faster to re-allocate every time. don't ask me
232 // why, but its likely no big deal there are no roundtrips
233 // (I think/hope).
234 if (!scratch_area || w > scratch_w || h > scratch_h || 1/*D*/) 233 if (!scratch_area || w > scratch_w || h > scratch_h)
235 { 234 {
236 if (scratch_area) 235 if (scratch_area)
237 { 236 {
238 XFreePixmap (dpy, scratch_area->drawable); 237 XFreePixmap (dpy, scratch_area->drawable);
239 delete scratch_area; 238 delete scratch_area;
296///////////////////////////////////////////////////////////////////////////// 295/////////////////////////////////////////////////////////////////////////////
297 296
298rxvt_display::rxvt_display (const char *id) 297rxvt_display::rxvt_display (const char *id)
299: refcounted (id) 298: refcounted (id)
300, selection_owner (0) 299, selection_owner (0)
300, clipboard_owner (0)
301{ 301{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this); 302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this); 303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
304} 304}
305 305
312 /* 312 /*
313 * get resources using the X library function 313 * get resources using the X library function
314 */ 314 */
315 char *displayResource, *xe; 315 char *displayResource, *xe;
316 XrmDatabase rdb1, database = 0; 316 XrmDatabase rdb1, database = 0;
317
318#if !XLIB_ILLEGAL_ACCESS
319 /* work around a bug in XrmSetDatabase where it frees the db, see ref_next */
320 database = XrmGetStringDatabase ("");
321#endif
317 322
318 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 323 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
319 // as opposed to "standard practise", we always read in ~/.Xdefaults 324 // as opposed to "standard practise", we always read in ~/.Xdefaults
320 325
321 // 6. System wide per application default file. 326 // 6. System wide per application default file.
360 XA_STRING, &actual_type, &actual_format, 365 XA_STRING, &actual_type, &actual_format,
361 &nitems, &nremaining, 366 &nitems, &nremaining,
362 (unsigned char **)&val) == Success 367 (unsigned char **)&val) == Success
363 && actual_type == XA_STRING 368 && actual_type == XA_STRING
364 && actual_format == 8) 369 && actual_format == 8)
365 displayResource = val; 370 displayResource = val;
366 else 371 else
367 { 372 {
368 displayResource = 0; 373 displayResource = 0;
369 374
370 if (val) 375 if (val)
371 XFree(val); 376 XFree (val);
372 } 377 }
373 378
374#if XLIB_ILLEGAL_ACCESS 379#if XLIB_ILLEGAL_ACCESS
375 dpy->xdefaults = displayResource; 380 dpy->xdefaults = displayResource;
376#endif 381#endif
377 } 382 }
425bool rxvt_display::ref_init () 430bool rxvt_display::ref_init ()
426{ 431{
427#ifdef LOCAL_X_IS_UNIX 432#ifdef LOCAL_X_IS_UNIX
428 if (id[0] == ':') 433 if (id[0] == ':')
429 { 434 {
430 val = rxvt_malloc (5 + strlen (id) + 1); 435 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
436 return false;
431 strcpy (val, "unix/"); 437 strcpy (val, "unix/");
432 strcat (val, id); 438 strcat (val, id);
433 dpy = XOpenDisplay (val); 439 dpy = XOpenDisplay (val);
434 free (val);
435 } 440 }
436 else 441 else
437#endif 442#endif
438 dpy = 0; 443 dpy = 0;
439 444
444 return false; 449 return false;
445 450
446 screen = DefaultScreen (dpy); 451 screen = DefaultScreen (dpy);
447 root = DefaultRootWindow (dpy); 452 root = DefaultRootWindow (dpy);
448 453
449 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 454 assert (ARRAY_LENGTH(xa_names) == NUM_XA);
450 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 455 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
451 456
452 XrmSetDatabase (dpy, get_resources (false)); 457 XrmSetDatabase (dpy, get_resources (false));
453 458
454#ifdef POINTER_BLANK 459#ifdef POINTER_BLANK
462 XUnloadFont (dpy, f); 467 XUnloadFont (dpy, f);
463#endif 468#endif
464 469
465 int fd = XConnectionNumber (dpy); 470 int fd = XConnectionNumber (dpy);
466 471
467 // try to detect wether we have a local connection. 472 // try to detect whether we have a local connection.
468 // assume unix domain socket == local, everything else not 473 // assume unix domain socket == local, everything else not
469 // TODO: might want to check for inet/127.0.0.1 474 // TODO: might want to check for inet/127.0.0.1
470 is_local = 0; 475 is_local = 0;
471 sockaddr_un sa; 476 sockaddr_un sa;
472 socklen_t sl = sizeof (sa); 477 socklen_t sl = sizeof (sa);
486} 491}
487 492
488void 493void
489rxvt_display::ref_next () 494rxvt_display::ref_next ()
490{ 495{
491 // TODO: somehow check wether the database files/resources changed 496 // TODO: somehow check whether the database files/resources changed
492 // before affording re-loading/parsing 497 // before affording re-loading/parsing
493 XrmDestroyDatabase (XrmGetDatabase (dpy)); 498 XrmDestroyDatabase (XrmGetDatabase (dpy));
499#if XLIB_ILLEGAL_ACCESS
500 /* work around a bug in XrmSetDatabase where it frees the db */
501 dpy->db = 0;
502#endif
494 XrmSetDatabase (dpy, get_resources (true)); 503 XrmSetDatabase (dpy, get_resources (true));
495} 504}
496 505
497rxvt_display::~rxvt_display () 506rxvt_display::~rxvt_display ()
498{ 507{
505 x_ev.stop (); 514 x_ev.stop ();
506 flush_ev.stop (); 515 flush_ev.stop ();
507#ifdef USE_XIM 516#ifdef USE_XIM
508 xims.clear (); 517 xims.clear ();
509#endif 518#endif
519 XrmDestroyDatabase (XrmGetDatabase (dpy));
510 XCloseDisplay (dpy); 520 XCloseDisplay (dpy);
511} 521}
512 522
513#ifdef USE_XIM 523#ifdef USE_XIM
514void rxvt_display::im_change_cb () 524void rxvt_display::im_change_cb ()
526 unsigned long nitems, bytes_after; 536 unsigned long nitems, bytes_after;
527 537
528 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 538 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
529 False, XA_ATOM, &actual_type, &actual_format, 539 False, XA_ATOM, &actual_type, &actual_format,
530 &nitems, &bytes_after, (unsigned char **)&atoms) 540 &nitems, &bytes_after, (unsigned char **)&atoms)
531 != Success ) 541 != Success)
532 return; 542 return;
533 543
534 if (actual_type == XA_ATOM && actual_format == 32) 544 if (actual_type == XA_ATOM && actual_format == 32)
535 for (int i = 0; i < nitems; i++) 545 for (int i = 0; i < nitems; i++)
536 if (XGetSelectionOwner (dpy, atoms[i])) 546 if (XGetSelectionOwner (dpy, atoms[i]))
537 { 547 {
538 im_change_cb (); 548 im_change_cb ();
539 break; 549 break;
543} 553}
544#endif 554#endif
545 555
546void rxvt_display::x_cb (ev::io &w, int revents) 556void rxvt_display::x_cb (ev::io &w, int revents)
547{ 557{
558 flush_ev.start ();
559}
560
561void rxvt_display::flush_cb (ev::prepare &w, int revents)
562{
548 while (XEventsQueued (dpy, QueuedAfterReading)) 563 while (XEventsQueued (dpy, QueuedAfterFlush))
564 do
549 { 565 {
550 XEvent xev; 566 XEvent xev;
551 XNextEvent (dpy, &xev); 567 XNextEvent (dpy, &xev);
552 568
553#ifdef USE_XIM 569#ifdef USE_XIM
554 if (!XFilterEvent (&xev, None)) 570 if (!XFilterEvent (&xev, None))
555#endif
556 { 571 {
557 if (xev.type == PropertyNotify 572 if (xev.type == PropertyNotify
558 && xev.xany.window == root 573 && xev.xany.window == root
559 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 574 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
560 im_change_check (); 575 im_change_check ();
561 576#endif
562 if (xev.type == MappingNotify) 577 if (xev.type == MappingNotify)
563 XRefreshKeyboardMapping (&xev.xmapping); 578 XRefreshKeyboardMapping (&xev.xmapping);
564 579
565 for (int i = xw.size (); i--; ) 580 for (int i = xw.size (); i--; )
566 { 581 {
567 if (!xw[i]) 582 if (!xw[i])
568 xw.erase_unordered (i); 583 xw.erase_unordered (i);
569 else if (xw[i]->window == xev.xany.window) 584 else if (xw[i]->window == xev.xany.window)
570 xw[i]->call (xev); 585 xw[i]->call (xev);
571 } 586 }
587#ifdef USE_XIM
572 } 588 }
589#endif
573 } 590 }
574}
575
576void rxvt_display::flush_cb (ev::prepare &w, int revents)
577{
578 while (XEventsQueued (dpy, QueuedAfterFlush)) 591 while (XEventsQueued (dpy, QueuedAlready));
579 x_cb (x_ev, EV_READ);
580 592
581 w.stop (); 593 w.stop ();
582} 594}
583 595
584void rxvt_display::reg (xevent_watcher *w) 596void rxvt_display::reg (xevent_watcher *w)
597 xw[w->active - 1] = 0; 609 xw[w->active - 1] = 0;
598 w->active = 0; 610 w->active = 0;
599 } 611 }
600} 612}
601 613
602void rxvt_display::set_selection_owner (rxvt_term *owner) 614void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
603{ 615{
616 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
617
604 if (selection_owner && selection_owner != owner) 618 if (cur_owner && cur_owner != owner)
605 { 619 {
606 rxvt_term *owner = selection_owner; 620 rxvt_term *term = cur_owner;
607
608 owner->selection_clear (); 621 term->selection_clear (clipboard);
609 owner->flush (); 622 term->flush ();
610 } 623 }
611 624
612 selection_owner = owner; 625 cur_owner = owner;
613} 626}
614 627
615#ifdef USE_XIM 628#ifdef USE_XIM
616 629
617void rxvt_display::reg (im_watcher *w) 630void rxvt_display::reg (im_watcher *w)
630 int l, m; 643 int l, m;
631 644
632 l = strlen (locale); 645 l = strlen (locale);
633 m = strlen (modifiers); 646 m = strlen (modifiers);
634 647
635 if (!(id = (char *)malloc (l + m + 2))) 648 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
636 return 0; 649 return 0;
637 650
638 memcpy (id, locale, l); id[l] = '\n'; 651 memcpy (id, locale, l); id[l] = '\n';
639 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 652 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
640 653
641 rxvt_xim *xim = xims.get (id); 654 rxvt_xim *xim = xims.get (id);
642
643 free (id);
644 655
645 return xim; 656 return xim;
646} 657}
647 658
648void rxvt_display::put_xim (rxvt_xim *xim) 659void rxvt_display::put_xim (rxvt_xim *xim)
717 c.green = color.g; 728 c.green = color.g;
718 c.blue = color.b; 729 c.blue = color.b;
719 730
720 if (screen->visual->c_class == TrueColor) 731 if (screen->visual->c_class == TrueColor)
721 { 732 {
722 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask )) 733 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
723 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) 734 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
724 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask )); 735 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
725 736
726 return true; 737 return true;
727 } 738 }
728 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 739 else if (XAllocColor (screen->dpy, screen->cmap, &c))
729 return true; 740 return true;
881 lerp (c.a, to.a, percent) 892 lerp (c.a, to.a, percent)
882 ) 893 )
883 ); 894 );
884} 895}
885 896
886#if TRACE_PIXMAPS 897rxvt_selection::rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, sel_cb cb, void *ptr)
887# undef XCreatePixmap 898: display (disp), request_time (tm), request_win (win), request_prop (prop), request_cb (cb), user_data (ptr)
888# undef XFreePixmap
889Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
890{ 899{
891 Pixmap res = XCreatePixmap (dpy, r, w, h, d); 900 assert (selnum >= Sel_Primary && selnum <= Sel_Clipboard);
892 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res); 901
902 timer_ev.set<rxvt_selection, &rxvt_selection::timer_cb> (this);
903 timer_ev.repeat = 10.;
904 x_ev.set<rxvt_selection, &rxvt_selection::x_cb> (this);
905
906 incr_buf = 0;
907 incr_buf_size = incr_buf_fill = 0;
908 selection_wait = Sel_normal;
909 selection_type = selnum;
910}
911
912void
913rxvt_selection::run ()
914{
915 int selnum = selection_type;
916
917#if X_HAVE_UTF8_STRING
918 selection_type = Sel_UTF8String;
919 if (request (display->xa[XA_UTF8_STRING], selnum))
920 return;
921#else
922 selection_type = Sel_CompoundText;
923 if (request (display->xa[XA_COMPOUND_TEXT], selnum))
924 return;
925#endif
926
927 // fallback to CUT_BUFFER0 if the requested property has no owner
928 handle_selection (display->root, XA_CUT_BUFFER0, false);
929}
930
931rxvt_selection::~rxvt_selection ()
932{
933 stop ();
934}
935
936void
937rxvt_selection::stop ()
938{
939 free (incr_buf);
940 incr_buf = 0;
941 timer_ev.stop ();
942 x_ev.stop (display);
943}
944
945bool
946rxvt_selection::request (Atom target, int selnum)
947{
948 Atom sel;
949
950 selection_type |= selnum;
951
952 if (selnum == Sel_Primary)
953 sel = XA_PRIMARY;
954 else if (selnum == Sel_Secondary)
955 sel = XA_SECONDARY;
956 else
957 sel = display->xa[XA_CLIPBOARD];
958
959 if (XGetSelectionOwner (display->dpy, sel) != None)
960 {
961 XConvertSelection (display->dpy, sel, target, request_prop,
962 request_win, request_time);
963 x_ev.start (display, request_win);
964 timer_ev.again ();
965 return true;
966 }
967
893 return res; 968 return false;
894} 969}
895 970
896void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p) 971void
972rxvt_selection::handle_selection (Window win, Atom prop, bool delete_prop)
897{ 973{
898 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p); 974 Display *dpy = display->dpy;
899 XFreePixmap (dpy,p); 975 char *data = 0;
900} 976 unsigned int data_len = 0;
977 unsigned long bytes_after;
978 XTextProperty ct;
979
980 // check for failed XConvertSelection
981 if (prop == None)
982 {
983 bool error = true;
984 int selnum = selection_type & Sel_whereMask;
985
986 if (selection_type & Sel_CompoundText)
987 {
988 selection_type = 0;
989 error = !request (XA_STRING, selnum);
990 }
991
992 if (selection_type & Sel_UTF8String)
993 {
994 selection_type = Sel_CompoundText;
995 error = !request (display->xa[XA_COMPOUND_TEXT], selnum);
996 }
997
998 if (error)
999 {
1000 ct.value = 0;
1001 goto bailout;
1002 }
1003
1004 return;
1005 }
1006
1007 // length == (2^31 - 1) / 4, as gdk
1008 if (XGetWindowProperty (dpy, win, prop,
1009 0, 0x1fffffff,
1010 delete_prop, AnyPropertyType,
1011 &ct.encoding, &ct.format,
1012 &ct.nitems, &bytes_after,
1013 &ct.value) != Success)
1014 {
1015 ct.value = 0;
1016 goto bailout;
1017 }
1018
1019 if (ct.encoding == None)
1020 goto bailout;
1021
1022 if (ct.value == 0)
1023 goto bailout;
1024
1025 if (ct.encoding == display->xa[XA_INCR])
1026 {
1027 // INCR selection, start handshake
1028 if (!delete_prop)
1029 XDeleteProperty (dpy, win, prop);
1030
1031 selection_wait = Sel_incr;
1032 timer_ev.again ();
1033
1034 goto bailout;
1035 }
1036
1037 if (ct.nitems == 0)
1038 {
1039 if (selection_wait == Sel_incr)
1040 {
1041 XFree (ct.value);
1042
1043 // finally complete, now paste the whole thing
1044 selection_wait = Sel_normal;
1045 ct.value = (unsigned char *)incr_buf;
1046 ct.nitems = incr_buf_fill;
1047 incr_buf = 0;
1048 timer_ev.stop ();
1049 }
1050 else
1051 {
1052 // avoid recursion
1053 if (win != display->root || prop != XA_CUT_BUFFER0)
1054 {
1055 XFree (ct.value);
1056
1057 // fallback to CUT_BUFFER0 if the requested property
1058 // has an owner but is empty
1059 handle_selection (display->root, XA_CUT_BUFFER0, False);
1060 return;
1061 }
1062
1063 goto bailout;
1064 }
1065 }
1066 else if (selection_wait == Sel_incr)
1067 {
1068 timer_ev.again ();
1069
1070 while (incr_buf_fill + ct.nitems > incr_buf_size)
1071 {
1072 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
1073 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
1074 }
1075
1076 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
1077 incr_buf_fill += ct.nitems;
1078
1079 goto bailout;
1080 }
1081
1082 char **cl;
1083 int cr;
1084
1085 // we honour the first item only
1086
1087#if !ENABLE_MINIMAL
1088 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
1089 // so recode it manually
1090 if (ct.encoding == display->xa[XA_UTF8_STRING])
1091 {
1092 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
1093 data = rxvt_wcstombs (w);
1094 free (w);
1095 }
1096 else
901#endif 1097#endif
1098 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
1099 && cl)
1100 {
1101 data = strdup (cl[0]);
1102 XFreeStringList (cl);
1103 }
1104 else
1105 {
1106 // paste raw
1107 data = strdup ((const char *)ct.value);
1108 }
1109
1110 data_len = strlen (data);
1111
1112bailout:
1113 XFree (ct.value);
1114
1115 if (selection_wait == Sel_normal)
1116 {
1117 stop ();
1118 request_cb (data, data_len, this);
1119 free (data);
1120 }
1121}
1122
1123void
1124rxvt_selection::timer_cb (ev::timer &w, int revents)
1125{
1126 if (selection_wait == Sel_incr)
1127 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
1128
1129 stop ();
1130 request_cb (NULL, 0, this);
1131}
1132
1133void
1134rxvt_selection::x_cb (XEvent &xev)
1135{
1136 switch (xev.type)
1137 {
1138 case PropertyNotify:
1139 if (selection_wait == Sel_incr
1140 && xev.xproperty.atom == request_prop
1141 && xev.xproperty.state == PropertyNewValue)
1142 handle_selection (xev.xproperty.window, xev.xproperty.atom, true);
1143 break;
1144
1145 case SelectionNotify:
1146 if (selection_wait == Sel_normal
1147 && xev.xselection.time == request_time
1148 && xev.xselection.property == request_prop)
1149 {
1150 timer_ev.stop ();
1151 handle_selection (xev.xselection.requestor, xev.xselection.property, true);
1152 }
1153 break;
1154 }
1155}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines