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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines