ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.109 by root, Wed Jun 7 23:29:13 2006 UTC

48#define MAP_EXTEND_X 32 48#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 49#define MAP_EXTEND_Y 512
50 50
51#define MIN_FONT_HEIGHT 10 51#define MIN_FONT_HEIGHT 10
52 52
53#define GL_CALL(type,func,args) \ 53static struct
54 { \ 54{
55 static int init_; \ 55#define GL_FUNC(ptr,name) ptr name;
56 static type fptr_; \ 56#include "glfunc.h"
57 \ 57#undef GL_FUNC
58 if (!init_) \ 58} gl;
59 { \ 59
60 init_ = 1; \ 60static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \ 61{
62 } \ 62 if (gl.BlendFuncSeparate)
63 \ 63 gl.BlendFuncSeparate (sa, da, saa, daa);
64 if (fptr_) \ 64 else if (gl.BlendFuncSeparateEXT)
65 fptr_ args; \ 65 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 } 66 else
67 glBlendFunc (sa, da);
68}
67 69
68typedef Mix_Chunk *CFClient__MixChunk; 70typedef Mix_Chunk *CFClient__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 71typedef Mix_Music *CFClient__MixMusic;
70 72
71typedef PangoFontDescription *CFClient__Font; 73typedef PangoFontDescription *CFClient__Font;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 85static PangoFontMap *ft2_fontmap, *cairo_fontmap;
84 86
85static void 87static void
86substitute_func (FcPattern *pattern, gpointer data) 88substitute_func (FcPattern *pattern, gpointer data)
87{ 89{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 90 FcPatternAddBool (pattern, FC_HINTING, 1);
91 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
89#ifdef _WIN32 92#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 93 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else 94#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 95 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif 96#endif
416} 419}
417 420
418void 421void
419pango_init () 422pango_init ()
420 CODE: 423 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx 424 // delayed, so it can pick up new fonts added by AddFontResourceEx
425{
426 {
423 ft2_fontmap = pango_ft2_font_map_new (); 427 ft2_fontmap = pango_ft2_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 428 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 429 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426 430 }
431 {
432 cairo_font_options_t *fopt = cairo_font_options_create ();
427 cairo_fontmap = pango_cairo_font_map_get_default (); 433 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 434 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
435#ifdef _WIN32
436 // cairo looks like shit eaten twice on windows
437 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
438#else
439 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
440#endif
441 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
442 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
443 pango_cairo_context_set_font_options (cairo_context, fopt);
444 cairo_font_options_destroy (fopt);
445 }
429} 446}
430 447
431int 448int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 449SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
433 450
479SDL_SetVideoMode (int w, int h, int fullscreen) 496SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 497 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 498 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 499 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 500 );
501 if (RETVAL)
502 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 503 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
504# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
505# include "glfunc.h"
506# undef GL_FUNC
507 }
485 OUTPUT: 508 OUTPUT:
486 RETVAL 509 RETVAL
487 510
488void 511void
489SDL_GL_SwapBuffers () 512SDL_GL_SwapBuffers ()
513
514char *
515SDL_GetKeyName (int sym)
490 516
491void 517void
492SDL_PollEvent () 518SDL_PollEvent ()
493 PPCODE: 519 PPCODE:
494{ 520{
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 539 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 540 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 541 break;
516 542
517 case SDL_MOUSEMOTION: 543 case SDL_MOUSEMOTION:
544 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
545
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 546 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 547 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 548 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 549 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 550 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 551 break;
524 552
525 case SDL_MOUSEBUTTONDOWN: 553 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 554 case SDL_MOUSEBUTTONUP:
555 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
556
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 557 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 558 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 559 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 560 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 561 break;
557lowdelay (int fd, int val = 1) 587lowdelay (int fd, int val = 1)
558 CODE: 588 CODE:
559#ifndef _WIN32 589#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 590 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 591#endif
562
563char *
564gl_vendor ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VENDOR);
567 OUTPUT:
568 RETVAL
569
570char *
571gl_version ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VERSION);
574 OUTPUT:
575 RETVAL
576
577char *
578gl_extensions ()
579 CODE:
580 RETVAL = (char *)glGetString (GL_EXTENSIONS);
581 OUTPUT:
582 RETVAL
583 592
584void 593void
585add_font (char *file) 594add_font (char *file)
586 CODE: 595 CODE:
587 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 596 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
723MODULE = CFClient PACKAGE = CFClient::Layout 732MODULE = CFClient PACKAGE = CFClient::Layout
724 733
725CFClient::Layout 734CFClient::Layout
726new (SV *class, int rgba = 0) 735new (SV *class, int rgba = 0)
727 CODE: 736 CODE:
728#if _WIN32
729 rgba = 0;//D
730#endif
731 New (0, RETVAL, 1, struct cf_layout); 737 New (0, RETVAL, 1, struct cf_layout);
732 738
733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 739 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
734 RETVAL->rgba = rgba; 740 RETVAL->rgba = rgba;
735 RETVAL->r = 1.; 741 RETVAL->r = 1.;
779 785
780SV * 786SV *
781get_text (CFClient::Layout self) 787get_text (CFClient::Layout self)
782 CODE: 788 CODE:
783 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 789 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
784 SvUTF8_on (RETVAL); 790 sv_utf8_decode (RETVAL);
785 OUTPUT: 791 OUTPUT:
786 RETVAL 792 RETVAL
787 793
788void 794void
789set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 795set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
981{ 987{
982 HV *hv = (HV *)SvRV (self); 988 HV *hv = (HV *)SvRV (self);
983 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 989 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
984 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 990 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
985 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 991 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
986 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
987 992
988 if (items < 5) 993 if (items < 5)
989 { 994 {
990 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 995 w = SvNV (*hv_fetch (hv, "w", 1, 1));
991 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 996 h = SvNV (*hv_fetch (hv, "h", 1, 1));
992 } 997 }
993 998
994 if (ix) 999 if (ix)
995 { 1000 {
996 glEnable (GL_BLEND); 1001 glEnable (GL_BLEND);
1002
1003 if (ix == 2)
997 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1004 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1005 else
1006 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1007 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1008
998 glEnable (GL_ALPHA_TEST); 1009 glEnable (GL_ALPHA_TEST);
999 glAlphaFunc (GL_GREATER, 0.01f); 1010 glAlphaFunc (GL_GREATER, 0.01f);
1000 } 1011 }
1001 1012
1002 glBindTexture (GL_TEXTURE_2D, name); 1013 glBindTexture (GL_TEXTURE_2D, name);
1003
1004 if (wrap_mode)
1005 {
1006 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1007 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1008 }
1009 1014
1010 glBegin (GL_QUADS); 1015 glBegin (GL_QUADS);
1011 glTexCoord2f (0, 0); glVertex2f (x , y ); 1016 glTexCoord2f (0, 0); glVertex2f (x , y );
1012 glTexCoord2f (0, t); glVertex2f (x , y + h); 1017 glTexCoord2f (0, t); glVertex2f (x , y + h);
1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1018 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1090 tex->r = r; 1095 tex->r = r;
1091 tex->g = g; 1096 tex->g = g;
1092 tex->b = b; 1097 tex->b = b;
1093 tex->a = a; 1098 tex->a = a;
1094 } 1099 }
1100
1101 // somewhat hackish, but for textures that require it, it really
1102 // improves the look, and most others don't suffer.
1103 glBindTexture (GL_TEXTURE_2D, name);
1104 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1105 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1106 // use uglier nearest interpolation because linear suffers
1107 // from transparent color bleeding and ugly wrapping effects.
1108 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1095} 1109}
1096 1110
1097int 1111int
1098ox (CFClient::Map self) 1112ox (CFClient::Map self)
1099 ALIAS: 1113 ALIAS:
1100 oy = 1 1114 oy = 1
1115 x = 2
1116 y = 3
1117 w = 4
1118 h = 5
1101 CODE: 1119 CODE:
1102 switch (ix) 1120 switch (ix)
1103 { 1121 {
1104 case 0: RETVAL = self->ox; break; 1122 case 0: RETVAL = self->ox; break;
1105 case 1: RETVAL = self->oy; break; 1123 case 1: RETVAL = self->oy; break;
1124 case 2: RETVAL = self->x; break;
1125 case 3: RETVAL = self->y; break;
1126 case 4: RETVAL = self->w; break;
1127 case 5: RETVAL = self->h; break;
1106 } 1128 }
1107 OUTPUT: 1129 OUTPUT:
1108 RETVAL 1130 RETVAL
1109 1131
1110void 1132void
1547 const_iv (GL_RESCALE_NORMAL), 1569 const_iv (GL_RESCALE_NORMAL),
1548 const_iv (GL_AND), 1570 const_iv (GL_AND),
1549 const_iv (GL_ONE), 1571 const_iv (GL_ONE),
1550 const_iv (GL_ZERO), 1572 const_iv (GL_ZERO),
1551 const_iv (GL_SRC_ALPHA), 1573 const_iv (GL_SRC_ALPHA),
1552 const_iv (GL_SRC_ALPHA_SATURATE), 1574 const_iv (GL_DST_ALPHA),
1553 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1575 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1554 const_iv (GL_ONE_MINUS_DST_ALPHA), 1576 const_iv (GL_ONE_MINUS_DST_ALPHA),
1577 const_iv (GL_SRC_ALPHA_SATURATE),
1555 const_iv (GL_RGB), 1578 const_iv (GL_RGB),
1556 const_iv (GL_RGBA), 1579 const_iv (GL_RGBA),
1557 const_iv (GL_UNSIGNED_BYTE), 1580 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT), 1581 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT), 1582 const_iv (GL_UNSIGNED_INT),
1570 const_iv (GL_TEXTURE_MAG_FILTER), 1593 const_iv (GL_TEXTURE_MAG_FILTER),
1571 const_iv (GL_TEXTURE_MIN_FILTER), 1594 const_iv (GL_TEXTURE_MIN_FILTER),
1572 const_iv (GL_TEXTURE_ENV_MODE), 1595 const_iv (GL_TEXTURE_ENV_MODE),
1573 const_iv (GL_TEXTURE_WRAP_S), 1596 const_iv (GL_TEXTURE_WRAP_S),
1574 const_iv (GL_TEXTURE_WRAP_T), 1597 const_iv (GL_TEXTURE_WRAP_T),
1598 const_iv (GL_REPEAT),
1575 const_iv (GL_CLAMP), 1599 const_iv (GL_CLAMP),
1576 const_iv (GL_REPEAT), 1600 const_iv (GL_CLAMP_TO_EDGE),
1577 const_iv (GL_NEAREST), 1601 const_iv (GL_NEAREST),
1578 const_iv (GL_LINEAR), 1602 const_iv (GL_LINEAR),
1579 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1603 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1580 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1604 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1581 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1605 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1611 1635
1612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1636 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1614} 1638}
1615 1639
1640char *
1641gl_vendor ()
1642 CODE:
1643 RETVAL = (char *)glGetString (GL_VENDOR);
1644 OUTPUT:
1645 RETVAL
1646
1647char *
1648gl_version ()
1649 CODE:
1650 RETVAL = (char *)glGetString (GL_VERSION);
1651 OUTPUT:
1652 RETVAL
1653
1654char *
1655gl_extensions ()
1656 CODE:
1657 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1658 OUTPUT:
1659 RETVAL
1660
1616int glGetError () 1661int glGetError ()
1617 1662
1618void glClear (int mask) 1663void glClear (int mask)
1619 1664
1620void glClearColor (float r, float g, float b, float a = 1.0) 1665void glClearColor (float r, float g, float b, float a = 1.0)
1627void glShadeModel (int mode) 1672void glShadeModel (int mode)
1628 1673
1629void glHint (int target, int mode) 1674void glHint (int target, int mode)
1630 1675
1631void glBlendFunc (int sfactor, int dfactor) 1676void glBlendFunc (int sfactor, int dfactor)
1677
1678void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1679 CODE:
1680 gl_BlendFuncSeparate (sa, da, saa, daa);
1632 1681
1633void glDepthMask (int flag) 1682void glDepthMask (int flag)
1634 1683
1635void glLogicOp (int opcode) 1684void glLogicOp (int opcode)
1636 1685
1670 1719
1671void glEnd () 1720void glEnd ()
1672 1721
1673void glColor (float r, float g, float b, float a = 1.0) 1722void glColor (float r, float g, float b, float a = 1.0)
1674 PROTOTYPE: @ 1723 PROTOTYPE: @
1724 ALIAS:
1725 glColor_premultiply = 1
1675 CODE: 1726 CODE:
1727 if (ix)
1728 {
1729 r *= a;
1730 g *= a;
1731 b *= a;
1732 }
1676 // microsoft visual "c" rounds instead of truncating... 1733 // microsoft visual "c" rounds instead of truncating...
1677 glColor4ub (MIN ((int)(r * 255.f), 255), 1734 glColor4ub (MIN ((int)(r * 256.f), 255),
1678 MIN ((int)(g * 255.f), 255), 1735 MIN ((int)(g * 256.f), 255),
1679 MIN ((int)(b * 255.f), 255), 1736 MIN ((int)(b * 256.f), 255),
1680 MIN ((int)(a * 255.f), 255)); 1737 MIN ((int)(a * 256.f), 255));
1681 1738
1682void glInterleavedArrays (int format, int stride, char *data) 1739void glInterleavedArrays (int format, int stride, char *data)
1683 1740
1684void glDrawElements (int mode, int count, int type, char *indices) 1741void glDrawElements (int mode, int count, int type, char *indices)
1685 1742
1708 1765
1709void glBindTexture (int target, int name) 1766void glBindTexture (int target, int name)
1710 1767
1711void glConvolutionParameter (int target, int pname, float params) 1768void glConvolutionParameter (int target, int pname, float params)
1712 CODE: 1769 CODE:
1713 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1770 if (gl.ConvolutionParameterf)
1771 gl.ConvolutionParameterf (target, pname, params);
1714 1772
1715void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1773void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1716 CODE: 1774 CODE:
1717 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1775 if (gl.ConvolutionFilter2D)
1718 (target, internalformat, width, height, format, type, data)); 1776 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1719 1777
1720void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1778void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1721 CODE: 1779 CODE:
1722 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1780 if (gl.SeparableFilter2D)
1723 (target, internalformat, width, height, format, type, row, column)); 1781 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1724 1782
1725void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1783void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1726 1784
1727void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1785void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1728 1786

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines