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.52 by root, Wed Apr 19 21:17:15 2006 UTC vs.
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 3# include <malloc.h>
4# include <windows.h>
5# pragma warning(disable:4244)
3#endif 6#endif
4 7
5#include "EXTERN.h" 8#include "EXTERN.h"
6#include "perl.h" 9#include "perl.h"
7#include "XSUB.h" 10#include "XSUB.h"
8 11
12#include <math.h>
9#include <string.h> 13#include <string.h>
10#include <stdio.h> 14#include <stdio.h>
11 15
12#include <SDL.h> 16#include <SDL.h>
17#include <SDL_endian.h>
13#include <SDL_image.h> 18#include <SDL_image.h>
14#include <SDL_mixer.h> 19#include <SDL_mixer.h>
15#include <SDL_opengl.h> 20#include <SDL_opengl.h>
16 21
17#include <glib/gmacros.h> 22#include <glib/gmacros.h>
18 23
19#include <pango/pango.h> 24#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h> 25#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h> 26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
22 28
23#ifndef _WIN32 29#ifndef _WIN32
24# include <sys/types.h> 30# include <sys/types.h>
25# include <sys/socket.h> 31# include <sys/socket.h>
26# include <netinet/in.h> 32# include <netinet/in.h>
33 typedef signed char int8_t; 39 typedef signed char int8_t;
34 typedef signed short int16_t; 40 typedef signed short int16_t;
35 typedef signed int int32_t; 41 typedef signed int int32_t;
36#endif 42#endif
37 43
44#include "glext.h"
45
38#define FOW_DARKNESS 32 46#define FOW_DARKNESS 32
39 47
40#define MAP_EXTEND_X 32 48#define MAP_EXTEND_X 32
41#define MAP_EXTEND_Y 512 49#define MAP_EXTEND_Y 512
42 50
51#define MIN_FONT_HEIGHT 10
52
53static struct
54{
55#define GL_FUNC(ptr,name) ptr name;
56#include "glfunc.h"
57#undef GL_FUNC
58} gl;
59
60static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61{
62 if (gl.BlendFuncSeparate)
63 gl.BlendFuncSeparate (sa, da, saa, daa);
64 else if (gl.BlendFuncSeparateEXT)
65 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 else
67 glBlendFunc (sa, da);
68}
69
43typedef Mix_Chunk *CFClient__MixChunk; 70typedef Mix_Chunk *CFClient__MixChunk;
44typedef Mix_Music *CFClient__MixMusic; 71typedef Mix_Music *CFClient__MixMusic;
45 72
46static PangoContext *context; 73typedef PangoFontDescription *CFClient__Font;
47static PangoFontMap *fontmap;
48 74
49typedef struct cf_layout { 75typedef struct cf_layout {
50 PangoLayout *pl; 76 PangoLayout *pl; // either derived from a cairo or ft2 context
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode
51 int base_height; 79 int base_height;
80 CFClient__Font font;
52} *CFClient__Layout; 81} *CFClient__Layout;
82
83static CFClient__Font default_font;
84static PangoContext *ft2_context, *cairo_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap;
53 86
54static void 87static void
55substitute_func (FcPattern *pattern, gpointer data) 88substitute_func (FcPattern *pattern, gpointer data)
56{ 89{
57 FcPatternAddBool (pattern, FC_HINTING , 1); 90 FcPatternAddBool (pattern, FC_HINTING , 1);
91#ifdef _WIN32
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
93#else
58 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 94 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif
59} 96}
60 97
61static void 98static void
62layout_update (CFClient__Layout self) 99layout_update_font (CFClient__Layout self)
63{ 100{
64 /* use a random scale factor to account for unknown descenders, 0.8 works 101 /* use a random scale factor to account for unknown descenders, 0.8 works
65 * reasonably well with bitstream vera 102 * reasonably well with bitstream vera
66 */ 103 */
67 PangoFontDescription *font = pango_context_get_font_description (context); 104 PangoFontDescription *font = self->font ? self->font : default_font;
68 105
69 int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71 if (pango_font_description_get_size (font) != height)
72 {
73 pango_font_description_set_absolute_size (font, height); 106 pango_font_description_set_absolute_size (font,
74 pango_layout_context_changed (self->pl); 107 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75 } 108
109 pango_layout_set_font_description (self->pl, font);
76} 110}
77 111
78static void 112static void
79layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 113layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
80{ 114{
81 layout_update (self);
82
83 pango_layout_get_pixel_size (self->pl, w, h); 115 pango_layout_get_pixel_size (self->pl, w, h);
84 116
85 *w = (*w + 3) & ~3;
86 if (!*w) *w = 1; 117 if (!*w) *w = 1;
87 if (!*h) *h = 1; 118 if (!*h) *h = 1;
119
120 *w = (*w + 3) & ~3;
88} 121}
89 122
90typedef uint16_t mapface; 123typedef uint16_t mapface;
91 124
92typedef struct { 125typedef struct {
237 break; 270 break;
238 271
239 row->col[x - row->c0].darkness = -1; 272 row->col[x - row->c0].darkness = -1;
240 } 273 }
241 } 274 }
275}
276
277static void
278music_finished (void)
279{
280 SDL_UserEvent ev;
281
282 ev.type = SDL_USEREVENT;
283 ev.code = 0;
284 ev.data1 = 0;
285 ev.data2 = 0;
286
287 SDL_PushEvent ((SDL_Event *)&ev);
288}
289
290static void
291channel_finished (int channel)
292{
293 SDL_UserEvent ev;
294
295 ev.type = SDL_USEREVENT;
296 ev.code = 1;
297 ev.data1 = (void *)(long)channel;
298 ev.data2 = 0;
299
300 SDL_PushEvent ((SDL_Event *)&ev);
242} 301}
243 302
244MODULE = CFClient PACKAGE = CFClient 303MODULE = CFClient PACKAGE = CFClient
245 304
246PROTOTYPES: ENABLE 305PROTOTYPES: ENABLE
354# undef const_iv 413# undef const_iv
355 }; 414 };
356 415
357 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 416 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
358 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418}
359 419
420void
421pango_init ()
422 CODE:
423{
424 // delayed, so it can pick up new fonts added by AddFontResourceEx
360 fontmap = pango_ft2_font_map_new (); 425 ft2_fontmap = pango_ft2_font_map_new ();
361 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); 426 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
362 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap); 427 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
428
429 cairo_fontmap = pango_cairo_font_map_get_default ();
430 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
363} 431}
364 432
365int 433int
366SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 434SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
367 435
377 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
378 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 446 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
379 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 447 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
380 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 448 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
381 449
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
452
382 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
383 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
384 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 455 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
385 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 456 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
386 457
387 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 458 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
388 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 459
389 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 460 SDL_EnableUNICODE (1);
461 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
390 462
391 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 463 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
392 464
393 if (m && m != (SDL_Rect **)-1) 465 if (m && m != (SDL_Rect **)-1)
394 while (*m) 466 while (*m)
400 472
401 ++m; 473 ++m;
402 } 474 }
403} 475}
404 476
477char *
478SDL_GetError ()
479
405int 480int
406SDL_SetVideoMode (int w, int h, int fullscreen) 481SDL_SetVideoMode (int w, int h, int fullscreen)
407 CODE: 482 CODE:
408 RETVAL = !!SDL_SetVideoMode ( 483 RETVAL = !!SDL_SetVideoMode (
409 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 484 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
410 ); 485 );
486 if (RETVAL)
487 {
411 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 488 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
489# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
490# include "glfunc.h"
491# undef GL_FUNC
492 }
412 OUTPUT: 493 OUTPUT:
413 RETVAL 494 RETVAL
495
496void
497SDL_GL_SwapBuffers ()
498
499char *
500SDL_GetKeyName (int sym)
501
502void
503SDL_PollEvent ()
504 PPCODE:
505{
506 SDL_Event ev;
507
508 while (SDL_PollEvent (&ev))
509 {
510 HV *hv = newHV ();
511 hv_store (hv, "type", 4, newSViv (ev.type), 0);
512
513 switch (ev.type)
514 {
515 case SDL_KEYDOWN:
516 case SDL_KEYUP:
517 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
518 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
519 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
520 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
521 break;
522
523 case SDL_ACTIVEEVENT:
524 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
525 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
526 break;
527
528 case SDL_MOUSEMOTION:
529 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
530
531 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
532 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
533 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
534 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
535 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
536 break;
537
538 case SDL_MOUSEBUTTONDOWN:
539 case SDL_MOUSEBUTTONUP:
540 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
541
542 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
543 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
544 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
545 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
546 break;
547
548 case SDL_USEREVENT:
549 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
550 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552 break;
553 }
554
555 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
556 }
557}
414 558
415int 559int
416Mix_VolumeMusic (int newvol = -1)
417
418int
419Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 560Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
561 POSTCALL:
562 Mix_HookMusicFinished (music_finished);
563 Mix_ChannelFinished (channel_finished);
420 564
421void 565void
422Mix_CloseAudio () 566Mix_CloseAudio ()
423 567
424int 568int
429 CODE: 573 CODE:
430#ifndef _WIN32 574#ifndef _WIN32
431 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 575 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
432#endif 576#endif
433 577
434char *
435gl_version ()
436 CODE:
437 RETVAL = (char *)glGetString (GL_VERSION);
438 OUTPUT:
439 RETVAL
440
441char *
442gl_extensions ()
443 CODE:
444 RETVAL = (char *)glGetString (GL_EXTENSIONS);
445 OUTPUT:
446 RETVAL
447
448void 578void
449add_font (char *file) 579add_font (char *file)
450 CODE: 580 CODE:
451 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 581 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
452 582#ifdef _WIN32
453void 583 // cairo... sigh... requires win2000
454set_font (char *file) 584 AddFontResourceEx (file, FR_PRIVATE, 0);
455 CODE: 585#endif
456{
457 int count;
458 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
459 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
460 FcPatternDestroy (pattern);
461 pango_context_set_font_description (context, font);
462}
463 586
464void 587void
465load_image_inline (SV *image_) 588load_image_inline (SV *image_)
466 ALIAS: 589 ALIAS:
467 load_image_file = 1 590 load_image_file = 1
549 PUSHs (sv_2mortal (newSViv (b / y))); 672 PUSHs (sv_2mortal (newSViv (b / y)));
550 PUSHs (sv_2mortal (newSViv (a / y))); 673 PUSHs (sv_2mortal (newSViv (a / y)));
551} 674}
552 675
553void 676void
677error (char *message)
678 CODE:
679 fprintf (stderr, "ERROR: %s\n", message);
680#ifdef _WIN32
681 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
682#endif
683
684void
554fatal (char *message) 685fatal (char *message)
555 CODE: 686 CODE:
687 fprintf (stderr, "FATAL: %s\n", message);
556#ifdef _WIN32 688#ifdef _WIN32
557 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 689 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
558#else
559 fprintf (stderr, "FATAL: %s\n", message);
560#endif 690#endif
561 exit (1); 691 exit (1);
562 692
693MODULE = CFClient PACKAGE = CFClient::Font
694
695CFClient::Font
696new_from_file (SV *class, char *path, int id = 0)
697 CODE:
698{
699 int count;
700 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
701 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
702 FcPatternDestroy (pattern);
703}
704 OUTPUT:
705 RETVAL
706
707void
708DESTROY (CFClient::Font self)
709 CODE:
710 pango_font_description_free (self);
711
712void
713make_default (CFClient::Font self)
714 CODE:
715 default_font = self;
716
563MODULE = CFClient PACKAGE = CFClient::Layout 717MODULE = CFClient PACKAGE = CFClient::Layout
564 718
565CFClient::Layout 719CFClient::Layout
566new (SV *class, int base_height = 10) 720new (SV *class, int rgba = 0)
567 CODE: 721 CODE:
722#if _WIN32
723 //rgba = 0;//D makes text nicer, breaks TextView
724#endif
568 New (0, RETVAL, 1, struct cf_layout); 725 New (0, RETVAL, 1, struct cf_layout);
569 RETVAL->base_height = base_height; 726
570 RETVAL->pl = pango_layout_new (context); 727 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
728 RETVAL->rgba = rgba;
729 RETVAL->r = 1.;
730 RETVAL->g = 1.;
731 RETVAL->b = 1.;
732 RETVAL->a = 1.;
733 RETVAL->base_height = MIN_FONT_HEIGHT;
734 RETVAL->font = 0;
735
571 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 736 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
737 layout_update_font (RETVAL);
572 OUTPUT: 738 OUTPUT:
573 RETVAL 739 RETVAL
574 740
575void 741void
576DESTROY (CFClient::Layout self) 742DESTROY (CFClient::Layout self)
577 CODE: 743 CODE:
578 g_object_unref (self->pl); 744 g_object_unref (self->pl);
579 Safefree (self); 745 Safefree (self);
580 746
747int
748is_rgba (CFClient::Layout self)
749 CODE:
750 RETVAL = self->rgba;
751 OUTPUT:
752 RETVAL
753
581void 754void
582set_text (CFClient::Layout self, SV *text_) 755set_text (CFClient::Layout self, SV *text_)
583 CODE: 756 CODE:
584{ 757{
585 STRLEN textlen; 758 STRLEN textlen;
605 SvUTF8_on (RETVAL); 778 SvUTF8_on (RETVAL);
606 OUTPUT: 779 OUTPUT:
607 RETVAL 780 RETVAL
608 781
609void 782void
783set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
784 CODE:
785 self->r = r;
786 self->g = g;
787 self->b = b;
788 self->a = a;
789
790void
791set_font (CFClient::Layout self, CFClient::Font font = 0)
792 CODE:
793 if (self->font != font)
794 {
795 self->font = font;
796 layout_update_font (self);
797 }
798
799void
610set_height (CFClient::Layout self, int base_height) 800set_height (CFClient::Layout self, int base_height)
611 CODE: 801 CODE:
802 if (self->base_height != base_height)
803 {
612 self->base_height = base_height; 804 self->base_height = base_height;
805 layout_update_font (self);
806 }
613 807
614void 808void
615set_width (CFClient::Layout self, int max_width = -1) 809set_width (CFClient::Layout self, int max_width = -1)
616 CODE: 810 CODE:
617 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 811 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
812
813void
814set_indent (CFClient::Layout self, int indent)
815 CODE:
816 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817
818void
819set_spacing (CFClient::Layout self, int spacing)
820 CODE:
821 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822
823void
824set_ellipsise (CFClient::Layout self, int ellipsise)
825 CODE:
826 pango_layout_set_ellipsize (self->pl,
827 ellipsise == 1 ? PANGO_ELLIPSIZE_START
828 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
830 : PANGO_ELLIPSIZE_NONE
831 );
832
833void
834set_single_paragraph_mode (CFClient::Layout self, int spm)
835 CODE:
836 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
618 837
619void 838void
620size (CFClient::Layout self) 839size (CFClient::Layout self)
621 PPCODE: 840 PPCODE:
622{ 841{
623 int w, h; 842 int w, h;
624 843
625 layout_update (self);
626 layout_get_pixel_size (self, &w, &h); 844 layout_get_pixel_size (self, &w, &h);
627 845
628 EXTEND (SP, 2); 846 EXTEND (SP, 2);
629 PUSHs (sv_2mortal (newSViv (w))); 847 PUSHs (sv_2mortal (newSViv (w)));
630 PUSHs (sv_2mortal (newSViv (h))); 848 PUSHs (sv_2mortal (newSViv (h)));
633int 851int
634xy_to_index (CFClient::Layout self, int x, int y) 852xy_to_index (CFClient::Layout self, int x, int y)
635 CODE: 853 CODE:
636{ 854{
637 int index, trailing; 855 int index, trailing;
638
639 layout_update (self);
640 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 856 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
641
642 RETVAL = index; 857 RETVAL = index;
643} 858}
644 OUTPUT: 859 OUTPUT:
645 RETVAL 860 RETVAL
646 861
647void 862void
648cursor_pos (CFClient::Layout self, int index) 863cursor_pos (CFClient::Layout self, int index)
649 PPCODE: 864 PPCODE:
650{ 865{
651 PangoRectangle strong_pos; 866 PangoRectangle strong_pos;
652 layout_update (self);
653 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 867 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
654 868
655 EXTEND (SP, 3); 869 EXTEND (SP, 3);
656 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 870 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
657 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 871 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
662render (CFClient::Layout self) 876render (CFClient::Layout self)
663 PPCODE: 877 PPCODE:
664{ 878{
665 SV *retval; 879 SV *retval;
666 int w, h; 880 int w, h;
667 FT_Bitmap bitmap;
668 881
669 layout_update (self);
670 layout_get_pixel_size (self, &w, &h); 882 layout_get_pixel_size (self, &w, &h);
671 883
884 if (self->rgba)
885 {
886 cairo_surface_t *surface;
887 cairo_t *cairo;
888
889 retval = newSV (w * h * 4);
890 SvPOK_only (retval);
891 SvCUR_set (retval, w * h * 4);
892
893 memset (SvPVX (retval), 0, w * h * 4);
894
895 surface = cairo_image_surface_create_for_data (
896 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
897 cairo = cairo_create (surface);
898 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
899
900 pango_cairo_show_layout (cairo, self->pl);
901
902 cairo_destroy (cairo);
903 cairo_surface_destroy (surface);
904
905 // what a mess, and its premultiplied, too :(
906 {
907 uint32_t *p = (uint32_t *)SvPVX (retval);
908 uint32_t *e = p + w * h;
909
910 while (p < e)
911 {
912 uint32_t rgba = *p;
913 rgba = (rgba >> 24) | (rgba << 8);
914#if 0
915#ifdef _WIN32
916 {//D
917 uint8_t r = rgba >> 24;
918 uint8_t g = rgba >> 16;
919 uint8_t b = rgba >> 8;
920 uint8_t a = rgba >> 0;
921
922 rgba = (rgba & 0xffffff00) | a;
923 }
924#endif
925#endif
926 rgba = SDL_SwapBE32 (rgba);
927 *p++ = rgba;
928 }
929 }
930
931 EXTEND (SP, 5);
932 PUSHs (sv_2mortal (newSViv (w)));
933 PUSHs (sv_2mortal (newSViv (h)));
934 PUSHs (sv_2mortal (retval));
935 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937 }
938 else
939 {
940 FT_Bitmap bitmap;
941
672 retval = newSV (w * h); 942 retval = newSV (w * h);
673 SvPOK_only (retval); 943 SvPOK_only (retval);
674 SvCUR_set (retval, w * h); 944 SvCUR_set (retval, w * h);
675 945
676 bitmap.rows = h; 946 bitmap.rows = h;
677 bitmap.width = w; 947 bitmap.width = w;
678 bitmap.pitch = w; 948 bitmap.pitch = w;
679 bitmap.buffer = (unsigned char*)SvPVX (retval); 949 bitmap.buffer = (unsigned char*)SvPVX (retval);
680 bitmap.num_grays = 256; 950 bitmap.num_grays = 256;
681 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; 951 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
682 952
683 memset (bitmap.buffer, 0, w * h); 953 memset (bitmap.buffer, 0, w * h);
684 954
685 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 955 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
686 956
687 EXTEND (SP, 3); 957 EXTEND (SP, 5);
688 PUSHs (sv_2mortal (newSViv (w))); 958 PUSHs (sv_2mortal (newSViv (w)));
689 PUSHs (sv_2mortal (newSViv (h))); 959 PUSHs (sv_2mortal (newSViv (h)));
690 PUSHs (sv_2mortal (retval)); 960 PUSHs (sv_2mortal (retval));
961 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963 }
691} 964}
692 965
693MODULE = CFClient PACKAGE = CFClient::Texture 966MODULE = CFClient PACKAGE = CFClient::Texture
694 967
695void 968void
696draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 969draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
697 PROTOTYPE: $$$;$$ 970 PROTOTYPE: $$$;$$
971 ALIAS:
972 draw_quad_alpha = 1
973 draw_quad_alpha_premultiplied = 2
698 CODE: 974 CODE:
699{ 975{
700 HV *hv = (HV *)SvRV (self); 976 HV *hv = (HV *)SvRV (self);
701 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 977 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
702 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 978 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
703 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 979 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
704 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
705 980
706 if (items < 5) 981 if (items < 5)
707 { 982 {
708 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 983 w = SvNV (*hv_fetch (hv, "w", 1, 1));
709 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 984 h = SvNV (*hv_fetch (hv, "h", 1, 1));
710 } 985 }
711 986
987 if (ix)
988 {
989 glEnable (GL_BLEND);
990
991 if (ix == 2)
992 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993 else
994 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995 GL_ONE_MINUS_DST_ALPHA, GL_ONE);
996
997 glEnable (GL_ALPHA_TEST);
998 glAlphaFunc (GL_GREATER, 0.01f);
999 }
1000
712 glBindTexture (GL_TEXTURE_2D, name); 1001 glBindTexture (GL_TEXTURE_2D, name);
713 if (wrap_mode) { 1002
714 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
715 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
716 }
717 glBegin (GL_QUADS); 1003 glBegin (GL_QUADS);
718 glTexCoord2f (0, 0); glVertex2f (x , y ); 1004 glTexCoord2f (0, 0); glVertex2f (x , y );
719 glTexCoord2f (0, t); glVertex2f (x , y + h); 1005 glTexCoord2f (0, t); glVertex2f (x , y + h);
720 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
721 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1007 glTexCoord2f (s, 0); glVertex2f (x + w, y );
722 glEnd (); 1008 glEnd ();
1009
1010 if (ix)
1011 {
1012 glDisable (GL_ALPHA_TEST);
1013 glDisable (GL_BLEND);
1014 }
723} 1015}
724 1016
725MODULE = CFClient PACKAGE = CFClient::Map 1017MODULE = CFClient PACKAGE = CFClient::Map
726 1018
727CFClient::Map 1019CFClient::Map
791 tex->r = r; 1083 tex->r = r;
792 tex->g = g; 1084 tex->g = g;
793 tex->b = b; 1085 tex->b = b;
794 tex->a = a; 1086 tex->a = a;
795 } 1087 }
1088
1089 // somewhat hackish, but for textures that require it, it really
1090 // improves the look, and most others don't suffer.
1091 glBindTexture (GL_TEXTURE_2D, name);
1092 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1093 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1094 // use uglier nearest interpolation because linear suffers
1095 // from transparent color bleeding and ugly wrapping effects.
1096 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
796} 1097}
797 1098
798int 1099int
799ox (CFClient::Map self) 1100ox (CFClient::Map self)
800 ALIAS: 1101 ALIAS:
801 oy = 1 1102 oy = 1
1103 x = 2
1104 y = 3
1105 w = 4
1106 h = 5
802 CODE: 1107 CODE:
803 switch (ix) 1108 switch (ix)
804 { 1109 {
805 case 0: RETVAL = self->ox; break; 1110 case 0: RETVAL = self->ox; break;
806 case 1: RETVAL = self->oy; break; 1111 case 1: RETVAL = self->oy; break;
1112 case 2: RETVAL = self->x; break;
1113 case 3: RETVAL = self->y; break;
1114 case 4: RETVAL = self->w; break;
1115 case 5: RETVAL = self->h; break;
807 } 1116 }
808 OUTPUT: 1117 OUTPUT:
809 RETVAL 1118 RETVAL
810 1119
811void 1120void
885 cell->darkness = -1; 1194 cell->darkness = -1;
886 } 1195 }
887} 1196}
888 1197
889SV * 1198SV *
890mapmap (CFClient::Map self, int w, int h) 1199mapmap (CFClient::Map self, int x0, int y0, int w, int h)
891 CODE: 1200 CODE:
892{ 1201{
893 int x0, x1, x; 1202 int x1, x;
894 int y0, y1, y; 1203 int y1, y;
895 int z; 1204 int z;
896 SV *map_sv = newSV (w * h * sizeof (uint32_t)); 1205 SV *map_sv = newSV (w * h * sizeof (uint32_t));
897 uint32_t *map = (uint32_t *)SvPVX (map_sv); 1206 uint32_t *map = (uint32_t *)SvPVX (map_sv);
898 1207
899 SvPOK_only (map_sv); 1208 SvPOK_only (map_sv);
900 SvCUR_set (map_sv, w * h * sizeof (uint32_t)); 1209 SvCUR_set (map_sv, w * h * sizeof (uint32_t));
901 1210
902 x0 = self->x - w / 2; x1 = x0 + w; 1211 x0 += self->x; x1 = x0 + w;
903 y0 = self->y - h / 2; y1 = y0 + h; 1212 y0 += self->y; y1 = y0 + h;
904 1213
905 for (y = y0; y < y1; y++) 1214 for (y = y0; y < y1; y++)
906 { 1215 {
907 maprow *row = 0 <= y && y < self->rows 1216 maprow *row = 0 <= y && y < self->rows
908 ? self->row + y 1217 ? self->row + y
1048 *data++ = 0; /* version 0 format */ 1357 *data++ = 0; /* version 0 format */
1049 *data++ = w >> 8; *data++ = w; 1358 *data++ = w >> 8; *data++ = w;
1050 *data++ = h >> 8; *data++ = h; 1359 *data++ = h >> 8; *data++ = h;
1051 1360
1052 // we need to do this 'cause we don't keep an absolute coord system for rows 1361 // we need to do this 'cause we don't keep an absolute coord system for rows
1053 // TODO: treat rows as we treat 1362 // TODO: treat rows as we treat columns
1054 map_get_row (self, y0 + self->y - self->oy);//D 1363 map_get_row (self, y0 + self->y - self->oy);//D
1055 map_get_row (self, y0 + self->y - self->oy + h - 1);//D 1364 map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1056 1365
1057 x0 += self->x - self->ox; 1366 x0 += self->x - self->ox;
1058 y0 += self->y - self->oy; 1367 y0 += self->y - self->oy;
1122 1431
1123 w = *data++ << 8; w |= *data++; 1432 w = *data++ << 8; w |= *data++;
1124 h = *data++ << 8; h |= *data++; 1433 h = *data++ << 8; h |= *data++;
1125 1434
1126 // we need to do this 'cause we don't keep an absolute coord system for rows 1435 // we need to do this 'cause we don't keep an absolute coord system for rows
1127 // TODO: treat rows as we treat 1436 // TODO: treat rows as we treat columns
1128 map_get_row (self, y0 + self->y - self->oy);//D 1437 map_get_row (self, y0 + self->y - self->oy);//D
1129 map_get_row (self, y0 + self->y - self->oy + h - 1);//D 1438 map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1130 1439
1131 x0 += self->x - self->ox; 1440 x0 += self->x - self->ox;
1132 y0 += self->y - self->oy; 1441 y0 += self->y - self->oy;
1223 CODE: 1532 CODE:
1224 RETVAL = Mix_PlayMusic (self, loops); 1533 RETVAL = Mix_PlayMusic (self, loops);
1225 OUTPUT: 1534 OUTPUT:
1226 RETVAL 1535 RETVAL
1227 1536
1537MODULE = CFClient PACKAGE = CFClient::OpenGL
1538
1539BOOT:
1540{
1541 HV *stash = gv_stashpv ("CFClient::OpenGL", 1);
1542 static const struct {
1543 const char *name;
1544 IV iv;
1545 } *civ, const_iv[] = {
1546# define const_iv(name) { # name, (IV)name }
1547 const_iv (GL_COLOR_MATERIAL),
1548 const_iv (GL_SMOOTH),
1549 const_iv (GL_FLAT),
1550 const_iv (GL_DITHER),
1551 const_iv (GL_BLEND),
1552 const_iv (GL_CULL_FACE),
1553 const_iv (GL_SCISSOR_TEST),
1554 const_iv (GL_DEPTH_TEST),
1555 const_iv (GL_ALPHA_TEST),
1556 const_iv (GL_NORMALIZE),
1557 const_iv (GL_RESCALE_NORMAL),
1558 const_iv (GL_AND),
1559 const_iv (GL_ONE),
1560 const_iv (GL_ZERO),
1561 const_iv (GL_SRC_ALPHA),
1562 const_iv (GL_SRC_ALPHA_SATURATE),
1563 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564 const_iv (GL_ONE_MINUS_DST_ALPHA),
1565 const_iv (GL_RGB),
1566 const_iv (GL_RGBA),
1567 const_iv (GL_UNSIGNED_BYTE),
1568 const_iv (GL_UNSIGNED_SHORT),
1569 const_iv (GL_UNSIGNED_INT),
1570 const_iv (GL_ALPHA),
1571 const_iv (GL_INTENSITY),
1572 const_iv (GL_LUMINANCE),
1573 const_iv (GL_LUMINANCE_ALPHA),
1574 const_iv (GL_FLOAT),
1575 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1576 const_iv (GL_COMPILE),
1577 const_iv (GL_TEXTURE_1D),
1578 const_iv (GL_TEXTURE_2D),
1579 const_iv (GL_TEXTURE_ENV),
1580 const_iv (GL_TEXTURE_MAG_FILTER),
1581 const_iv (GL_TEXTURE_MIN_FILTER),
1582 const_iv (GL_TEXTURE_ENV_MODE),
1583 const_iv (GL_TEXTURE_WRAP_S),
1584 const_iv (GL_TEXTURE_WRAP_T),
1585 const_iv (GL_REPEAT),
1586 const_iv (GL_CLAMP),
1587 const_iv (GL_CLAMP_TO_EDGE),
1588 const_iv (GL_NEAREST),
1589 const_iv (GL_LINEAR),
1590 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1591 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1592 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1593 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1594 const_iv (GL_GENERATE_MIPMAP),
1595 const_iv (GL_MODULATE),
1596 const_iv (GL_DECAL),
1597 const_iv (GL_REPLACE),
1598 const_iv (GL_DEPTH_BUFFER_BIT),
1599 const_iv (GL_COLOR_BUFFER_BIT),
1600 const_iv (GL_PROJECTION),
1601 const_iv (GL_MODELVIEW),
1602 const_iv (GL_COLOR_LOGIC_OP),
1603 const_iv (GL_SEPARABLE_2D),
1604 const_iv (GL_CONVOLUTION_2D),
1605 const_iv (GL_CONVOLUTION_BORDER_MODE),
1606 const_iv (GL_CONSTANT_BORDER),
1607 const_iv (GL_LINES),
1608 const_iv (GL_LINE_LOOP),
1609 const_iv (GL_QUADS),
1610 const_iv (GL_QUAD_STRIP),
1611 const_iv (GL_TRIANGLES),
1612 const_iv (GL_TRIANGLE_STRIP),
1613 const_iv (GL_TRIANGLE_FAN),
1614 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1615 const_iv (GL_FASTEST),
1616 const_iv (GL_V2F),
1617 const_iv (GL_V3F),
1618 const_iv (GL_T2F_V3F),
1619 const_iv (GL_T2F_N3F_V3F),
1620# undef const_iv
1621 };
1622
1623 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1624 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1625}
1626
1627char *
1628gl_vendor ()
1629 CODE:
1630 RETVAL = (char *)glGetString (GL_VENDOR);
1631 OUTPUT:
1632 RETVAL
1633
1634char *
1635gl_version ()
1636 CODE:
1637 RETVAL = (char *)glGetString (GL_VERSION);
1638 OUTPUT:
1639 RETVAL
1640
1641char *
1642gl_extensions ()
1643 CODE:
1644 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1645 OUTPUT:
1646 RETVAL
1647
1648int glGetError ()
1649
1650void glClear (int mask)
1651
1652void glClearColor (float r, float g, float b, float a = 1.0)
1653 PROTOTYPE: @
1654
1655void glEnable (int cap)
1656
1657void glDisable (int cap)
1658
1659void glShadeModel (int mode)
1660
1661void glHint (int target, int mode)
1662
1663void glBlendFunc (int sfactor, int dfactor)
1664
1665void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1666 CODE:
1667 gl_BlendFuncSeparate (sa, da, saa, daa);
1668
1669void glDepthMask (int flag)
1670
1671void glLogicOp (int opcode)
1672
1673void glColorMask (int red, int green, int blue, int alpha)
1674
1675void glMatrixMode (int mode)
1676
1677void glPushMatrix ()
1678
1679void glPopMatrix ()
1680
1681void glLoadIdentity ()
1682
1683# near_ and far_ are due to microsofts buggy "c" compiler
1684void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1685
1686# near_ and far_ are due to microsofts buggy "c" compiler
1687void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1688
1689void glViewport (int x, int y, int width, int height)
1690
1691void glScissor (int x, int y, int width, int height)
1692
1693void glTranslate (float x, float y, float z = 0.)
1694 CODE:
1695 glTranslatef (x, y, z);
1696
1697void glScale (float x, float y, float z = 1.)
1698 CODE:
1699 glScalef (x, y, z);
1700
1701void glRotate (float angle, float x, float y, float z)
1702 CODE:
1703 glRotatef (angle, x, y, z);
1704
1705void glBegin (int mode)
1706
1707void glEnd ()
1708
1709void glColor (float r, float g, float b, float a = 1.0)
1710 PROTOTYPE: @
1711 ALIAS:
1712 glColor_premultiply = 1
1713 CODE:
1714 if (ix)
1715 {
1716 r *= a;
1717 g *= a;
1718 b *= a;
1719 }
1720 // microsoft visual "c" rounds instead of truncating...
1721 glColor4ub (MIN ((int)(r * 256.f), 255),
1722 MIN ((int)(g * 256.f), 255),
1723 MIN ((int)(b * 256.f), 255),
1724 MIN ((int)(a * 256.f), 255));
1725
1726void glInterleavedArrays (int format, int stride, char *data)
1727
1728void glDrawElements (int mode, int count, int type, char *indices)
1729
1730# 1.2 void glDrawRangeElements (int mode, int start, int end
1731
1732void glRasterPos (float x, float y, float z = 0.)
1733 CODE:
1734 glRasterPos3f (0, 0, z);
1735 glBitmap (0, 0, 0, 0, x, y, 0);
1736
1737void glVertex (float x, float y, float z = 0.)
1738 CODE:
1739 glVertex3f (x, y, z);
1740
1741void glTexCoord (float s, float t)
1742 CODE:
1743 glTexCoord2f (s, t);
1744
1745void glTexEnv (int target, int pname, float param)
1746 CODE:
1747 glTexEnvf (target, pname, param);
1748
1749void glTexParameter (int target, int pname, float param)
1750 CODE:
1751 glTexParameterf (target, pname, param);
1752
1753void glBindTexture (int target, int name)
1754
1755void glConvolutionParameter (int target, int pname, float params)
1756 CODE:
1757 if (gl.ConvolutionParameterf)
1758 gl.ConvolutionParameterf (target, pname, params);
1759
1760void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1761 CODE:
1762 if (gl.ConvolutionFilter2D)
1763 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1764
1765void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1766 CODE:
1767 if (gl.SeparableFilter2D)
1768 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1769
1770void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1771
1772void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1773
1774void glDrawPixels (int width, int height, int format, int type, char *pixels)
1775
1776void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1777
1778int glGenTexture ()
1779 CODE:
1780{
1781 GLuint name;
1782 glGenTextures (1, &name);
1783 RETVAL = name;
1784}
1785 OUTPUT:
1786 RETVAL
1787
1788void glDeleteTexture (int name)
1789 CODE:
1790{
1791 GLuint name_ = name;
1792 glDeleteTextures (1, &name_);
1793}
1794
1795int glGenList ()
1796 CODE:
1797 RETVAL = glGenLists (1);
1798 OUTPUT:
1799 RETVAL
1800
1801void glDeleteList (int list)
1802 CODE:
1803 glDeleteLists (list, 1);
1804
1805void glNewList (int list, int mode = GL_COMPILE)
1806
1807void glEndList ()
1808
1809void glCallList (int list)
1810
1811

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines