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.86 by root, Fri May 19 16:43:56 2006 UTC vs.
Revision 1.173 by root, Wed Apr 4 02:43:29 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
6#endif 9#endif
7 10
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
19#include <assert.h>
12#include <math.h> 20#include <math.h>
13#include <string.h> 21#include <string.h>
14#include <stdio.h> 22#include <stdio.h>
23#include <stdlib.h>
15 24
16#include <SDL.h> 25#include <SDL.h>
17#include <SDL_endian.h> 26#include <SDL_endian.h>
18#include <SDL_image.h> 27#include <SDL_image.h>
19#include <SDL_mixer.h> 28#include <SDL_mixer.h>
20#include <SDL_opengl.h> 29#include <SDL_opengl.h>
21 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
22#include <glib/gmacros.h> 34#include <glib/gmacros.h>
23 35
24#include <pango/pango.h> 36#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 37
29#ifndef _WIN32 38#ifndef _WIN32
30# include <sys/types.h> 39# include <sys/types.h>
31# include <sys/socket.h> 40# include <sys/socket.h>
32# include <netinet/in.h> 41# include <netinet/in.h>
33# include <netinet/tcp.h> 42# include <netinet/tcp.h>
34# include <inttypes.h> 43# include <inttypes.h>
35#else
36 typedef unsigned char uint8_t;
37 typedef unsigned short uint16_t;
38 typedef unsigned int uint32_t;
39 typedef signed char int8_t;
40 typedef signed short int16_t;
41 typedef signed int int32_t;
42#endif 44#endif
43 45
44#include "glext.h" 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 47
46#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
47 49
48#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
50 52
51#define MIN_FONT_HEIGHT 10 53#define MIN_FONT_HEIGHT 10
52 54
53#define GL_CALL(type,func,args) \ 55#if 0
54 { \ 56# define PARACHUTE SDL_INIT_NOPARACHUTE
55 static int init_; \ 57#else
56 static type fptr_; \ 58# define PARACHUTE 0
57 \ 59#endif
58 if (!init_) \
59 { \
60 init_ = 1; \
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62 } \
63 \
64 if (fptr_) \
65 fptr_ args; \
66 }
67 60
61static struct
62{
63#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h"
65#undef GL_FUNC
66} gl;
67
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{
70 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else
75 glBlendFunc (sa, da);
76}
77
78#include "texcache.c"
79
80#include "pango-font.c"
81#include "pango-fontmap.c"
82#include "pango-render.c"
83
68typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
70 86
71typedef PangoFontDescription *CFClient__Font; 87typedef PangoFontDescription *CFPlus__Font;
88
89static int
90shape_attr_p (PangoLayoutRun *run)
91{
92 GSList *attrs = run->item->analysis.extra_attrs;
93
94 while (attrs)
95 {
96 PangoAttribute *attr = attrs->data;
97
98 if (attr->klass->type == PANGO_ATTR_SHAPE)
99 return 1;
100
101 attrs = attrs->next;
102 }
103
104 return 0;
105}
72 106
73typedef struct cf_layout { 107typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 108 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 109 float r, g, b, a; // default color for rgba mode
77 int base_height; 110 int base_height;
78 CFClient__Font font; 111 CFPlus__Font font;
79} *CFClient__Layout; 112} *CFPlus__Layout;
80 113
81static CFClient__Font default_font; 114static CFPlus__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 115static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 116static PangoFontMap *opengl_fontmap;
84 117
85static void 118static void
86substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
87{ 120{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 121 FcPatternAddBool (pattern, FC_HINTING, 1);
89#ifdef _WIN32 122#ifdef FC_HINT_STYLE
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91#else 124#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 126}
95 127
96static void 128static void
97layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
98{ 130{
99 /* use a random scale factor to account for unknown descenders, 0.8 works 131 /* use a random scale factor to account for unknown descenders, 0.8 works
100 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
101 */ 133 */
102 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
106 138
107 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
108} 140}
109 141
110static void 142static void
111layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
113 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
114 149
115 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117 152
118 *w = (*w + 3) & ~3; 153 if (!rect.width) rect.width = 1;
154 if (!rect.height) rect.height = 1;
155
156 *w = rect.width;
157 *h = rect.height;
119} 158}
120 159
121typedef uint16_t mapface; 160typedef uint16_t mapface;
122 161
123typedef struct { 162typedef struct {
126 float s, t; 165 float s, t;
127 uint8_t r, g, b, a; 166 uint8_t r, g, b, a;
128} maptex; 167} maptex;
129 168
130typedef struct { 169typedef struct {
131 int16_t darkness; 170 uint32_t player;
132 mapface face[3]; 171 mapface face[3];
172 uint16_t darkness;
173 uint8_t stat_width, stat_hp, flags;
133} mapcell; 174} mapcell;
134 175
135typedef struct { 176typedef struct {
136 int32_t c0, c1; 177 int32_t c0, c1;
137 mapcell *col; 178 mapcell *col;
146 int texs; 187 int texs;
147 maptex *tex; 188 maptex *tex;
148 189
149 int32_t rows; 190 int32_t rows;
150 maprow *row; 191 maprow *row;
151} *CFClient__Map; 192} *CFPlus__Map;
152 193
153static char * 194static char *
154prepend (char *ptr, int sze, int inc) 195prepend (char *ptr, int sze, int inc)
155{ 196{
156 char *p; 197 char *p;
174 215
175#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 217#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177 218
178static maprow * 219static maprow *
179map_get_row (CFClient__Map self, int y) 220map_get_row (CFPlus__Map self, int y)
180{ 221{
181 if (0 > y) 222 if (0 > y)
182 { 223 {
183 int extend = - y + MAP_EXTEND_Y; 224 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 225 Prepend (maprow, self->row, self->rows, extend);
222 263
223 return row->col + (x - row->c0); 264 return row->col + (x - row->c0);
224} 265}
225 266
226static mapcell * 267static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 268map_get_cell (CFPlus__Map self, int x, int y)
228{ 269{
229 return row_get_cell (map_get_row (self, y), x); 270 return row_get_cell (map_get_row (self, y), x);
230} 271}
231 272
232static void 273static void
233map_clear (CFClient__Map self) 274map_clear (CFPlus__Map self)
234{ 275{
235 int r; 276 int r;
236 277
237 for (r = 0; r < self->rows; r++) 278 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 279 Safefree (self->row[r].col);
246 self->row = 0; 287 self->row = 0;
247 self->rows = 0; 288 self->rows = 0;
248} 289}
249 290
250static void 291static void
251map_blank (CFClient__Map self, int x0, int y0, int w, int h) 292map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252{ 293{
253 int x, y; 294 int x, y;
254 maprow *row; 295 maprow *row;
296 mapcell *cell;
255 297
256 for (y = y0; y < y0 + h; y++) 298 for (y = y0; y < y0 + h; y++)
257 if (y >= 0) 299 if (y >= 0)
258 { 300 {
259 if (y >= self->rows) 301 if (y >= self->rows)
265 if (x >= row->c0) 307 if (x >= row->c0)
266 { 308 {
267 if (x >= row->c1) 309 if (x >= row->c1)
268 break; 310 break;
269 311
270 row->col[x - row->c0].darkness = -1; 312 cell = row->col + x - row->c0;
313
314 cell->darkness = 0;
315 cell->stat_hp = 0;
316 cell->flags = 0;
317 cell->player = 0;
271 } 318 }
272 } 319 }
273} 320}
274 321
275static void 322static void
296 ev.data2 = 0; 343 ev.data2 = 0;
297 344
298 SDL_PushEvent ((SDL_Event *)&ev); 345 SDL_PushEvent ((SDL_Event *)&ev);
299} 346}
300 347
348static unsigned int
349minpot (unsigned int n)
350{
351 if (!n)
352 return 0;
353
354 --n;
355
356 n |= n >> 1;
357 n |= n >> 2;
358 n |= n >> 4;
359 n |= n >> 8;
360 n |= n >> 16;
361
362 return n + 1;
363}
364
365/* SDL should provide this, really. */
366#define SDLK_MODIFIER_MIN 300
367#define SDLK_MODIFIER_MAX 314
368
301MODULE = CFClient PACKAGE = CFClient 369MODULE = CFPlus PACKAGE = CFPlus
302 370
303PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
304 372
305BOOT: 373BOOT:
306{ 374{
307 HV *stash = gv_stashpv ("CFClient", 1); 375 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 376 static const struct {
309 const char *name; 377 const char *name;
310 IV iv; 378 IV iv;
311 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
312# define const_iv(name) { # name, (IV)name } 380# define const_iv(name) { # name, (IV)name }
381 const_iv (SDLK_MODIFIER_MIN),
382 const_iv (SDLK_MODIFIER_MAX),
383
313 const_iv (SDL_ACTIVEEVENT), 384 const_iv (SDL_ACTIVEEVENT),
314 const_iv (SDL_KEYDOWN), 385 const_iv (SDL_KEYDOWN),
315 const_iv (SDL_KEYUP), 386 const_iv (SDL_KEYUP),
316 const_iv (SDL_MOUSEMOTION), 387 const_iv (SDL_MOUSEMOTION),
317 const_iv (SDL_MOUSEBUTTONDOWN), 388 const_iv (SDL_MOUSEBUTTONDOWN),
326 const_iv (SDL_EVENT_RESERVEDA), 397 const_iv (SDL_EVENT_RESERVEDA),
327 const_iv (SDL_EVENT_RESERVEDB), 398 const_iv (SDL_EVENT_RESERVEDB),
328 const_iv (SDL_VIDEORESIZE), 399 const_iv (SDL_VIDEORESIZE),
329 const_iv (SDL_VIDEOEXPOSE), 400 const_iv (SDL_VIDEOEXPOSE),
330 const_iv (SDL_USEREVENT), 401 const_iv (SDL_USEREVENT),
402
403 const_iv (SDL_APPINPUTFOCUS),
404 const_iv (SDL_APPMOUSEFOCUS),
405 const_iv (SDL_APPACTIVE),
406
331 const_iv (SDLK_KP0), 407 const_iv (SDLK_KP0),
332 const_iv (SDLK_KP1), 408 const_iv (SDLK_KP1),
333 const_iv (SDLK_KP2), 409 const_iv (SDLK_KP2),
334 const_iv (SDLK_KP3), 410 const_iv (SDLK_KP3),
335 const_iv (SDLK_KP4), 411 const_iv (SDLK_KP4),
390 const_iv (SDLK_BREAK), 466 const_iv (SDLK_BREAK),
391 const_iv (SDLK_MENU), 467 const_iv (SDLK_MENU),
392 const_iv (SDLK_POWER), 468 const_iv (SDLK_POWER),
393 const_iv (SDLK_EURO), 469 const_iv (SDLK_EURO),
394 const_iv (SDLK_UNDO), 470 const_iv (SDLK_UNDO),
471
395 const_iv (KMOD_NONE), 472 const_iv (KMOD_NONE),
473 const_iv (KMOD_SHIFT),
396 const_iv (KMOD_LSHIFT), 474 const_iv (KMOD_LSHIFT),
397 const_iv (KMOD_RSHIFT), 475 const_iv (KMOD_RSHIFT),
476 const_iv (KMOD_CTRL),
398 const_iv (KMOD_LCTRL), 477 const_iv (KMOD_LCTRL),
399 const_iv (KMOD_RCTRL), 478 const_iv (KMOD_RCTRL),
479 const_iv (KMOD_ALT),
400 const_iv (KMOD_LALT), 480 const_iv (KMOD_LALT),
401 const_iv (KMOD_RALT), 481 const_iv (KMOD_RALT),
482 const_iv (KMOD_META),
402 const_iv (KMOD_LMETA), 483 const_iv (KMOD_LMETA),
403 const_iv (KMOD_RMETA), 484 const_iv (KMOD_RMETA),
404 const_iv (KMOD_NUM), 485 const_iv (KMOD_NUM),
405 const_iv (KMOD_CAPS), 486 const_iv (KMOD_CAPS),
406 const_iv (KMOD_MODE), 487 const_iv (KMOD_MODE),
407 const_iv (KMOD_CTRL),
408 const_iv (KMOD_SHIFT),
409 const_iv (KMOD_ALT),
410 const_iv (KMOD_META)
411# undef const_iv 488# undef const_iv
412 }; 489 };
413 490
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 491 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 492 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
493
494 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
495 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
416} 496}
497
498void
499weaken (SV *rv)
500 PROTOTYPE: $
501 CODE:
502 sv_rvweaken (rv);
503
504int
505in_destruct ()
506 CODE:
507 RETVAL = PL_main_cv == Nullcv;
508 OUTPUT:
509 RETVAL
510
511NV floor (NV x)
512
513NV ceil (NV x)
417 514
418void 515void
419pango_init () 516pango_init ()
420 CODE: 517 CODE:
421{ 518{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 519 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 520 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 521 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429} 522}
430 523
431int 524int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 525SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 526
434void 527void
435SDL_Quit () 528SDL_Quit ()
436 529
437void 530void
441 SDL_Rect **m; 534 SDL_Rect **m;
442 535
443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 536 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 537 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 538 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16); 539 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 540
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64); 541 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 542 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 543
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 544 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 545 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 546 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 547 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 548
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 549 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
550#if SDL_VERSION_ATLEAST(1,2,10)
551 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
552 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
553#endif
457 554
458 SDL_EnableUNICODE (1); 555 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 556 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 557
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 558 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
470 567
471 ++m; 568 ++m;
472 } 569 }
473} 570}
474 571
572char *
573SDL_GetError ()
574
475int 575int
476SDL_SetVideoMode (int w, int h, int fullscreen) 576SDL_SetVideoMode (int w, int h, int fullscreen)
477 CODE: 577 CODE:
478 RETVAL = !!SDL_SetVideoMode ( 578 RETVAL = !!SDL_SetVideoMode (
479 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 579 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
480 ); 580 );
581 if (RETVAL)
582 {
481 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 583 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
584# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
585# include "glfunc.h"
586# undef GL_FUNC
587 }
482 OUTPUT: 588 OUTPUT:
483 RETVAL 589 RETVAL
484 590
485void 591void
486SDL_GL_SwapBuffers () 592SDL_GL_SwapBuffers ()
593
594char *
595SDL_GetKeyName (int sym)
487 596
488void 597void
489SDL_PollEvent () 598SDL_PollEvent ()
490 PPCODE: 599 PPCODE:
491{ 600{
501 case SDL_KEYDOWN: 610 case SDL_KEYDOWN:
502 case SDL_KEYUP: 611 case SDL_KEYUP:
503 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 612 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
504 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 613 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
505 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 614 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
615 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
506 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 616 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
507 break; 617 break;
508 618
509 case SDL_ACTIVEEVENT: 619 case SDL_ACTIVEEVENT:
510 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 620 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 621 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512 break; 622 break;
513 623
514 case SDL_MOUSEMOTION: 624 case SDL_MOUSEMOTION:
625 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
626
515 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 627 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 628 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 629 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 630 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 631 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520 break; 632 break;
521 633
522 case SDL_MOUSEBUTTONDOWN: 634 case SDL_MOUSEBUTTONDOWN:
523 case SDL_MOUSEBUTTONUP: 635 case SDL_MOUSEBUTTONUP:
636 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
637
524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 638 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 639 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 640 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 641 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528 break; 642 break;
532 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 646 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
533 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 647 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
534 break; 648 break;
535 } 649 }
536 650
537 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 651 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
538 } 652 }
539} 653}
540 654
541int 655int
542Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 656Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
555 CODE: 669 CODE:
556#ifndef _WIN32 670#ifndef _WIN32
557 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 671 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558#endif 672#endif
559 673
560char * 674void
561gl_version () 675win32_proxy_info ()
562 CODE: 676 PPCODE:
563 RETVAL = (char *)glGetString (GL_VERSION); 677{
564 OUTPUT: 678#ifdef _WIN32
565 RETVAL 679 char buffer[2048];
680 DWORD buflen;
566 681
567char * 682 EXTEND (SP, 3);
568gl_extensions () 683
569 CODE: 684 buflen = sizeof (buffer);
570 RETVAL = (char *)glGetString (GL_EXTENSIONS); 685 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
571 OUTPUT: 686 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
572 RETVAL 687 {
688 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
689
690 buflen = sizeof (buffer);
691 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
692 {
693 PUSHs (newSVpv (buffer, 0));
694
695 buflen = sizeof (buffer);
696 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
697 PUSHs (newSVpv (buffer, 0));
698 }
699 }
700#endif
701}
573 702
574void 703void
575add_font (char *file) 704add_font (char *file)
576 CODE: 705 CODE:
577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 706 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
578#ifdef _WIN32
579 // cairo... sigh... requires win2000
580 AddFontResourceEx (file, FR_PRIVATE, 0);
581#endif
582 707
583void 708void
584load_image_inline (SV *image_) 709load_image_inline (SV *image_)
585 ALIAS: 710 ALIAS:
586 load_image_file = 1 711 load_image_file = 1
628 753
629 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 754 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
630 755
631 assert (surface2->pitch == surface2->w * 4); 756 assert (surface2->pitch == surface2->w * 4);
632 757
758 SDL_LockSurface (surface2);
633 EXTEND (SP, 5); 759 EXTEND (SP, 6);
634 PUSHs (sv_2mortal (newSViv (surface2->w))); 760 PUSHs (sv_2mortal (newSViv (surface2->w)));
635 PUSHs (sv_2mortal (newSViv (surface2->h))); 761 PUSHs (sv_2mortal (newSViv (surface2->h)));
636 SDL_LockSurface (surface2);
637 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 762 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
638 SDL_UnlockSurface (surface2);
639 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 763 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
640 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 764 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
641 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 765 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
766 SDL_UnlockSurface (surface2);
642 767
643 SDL_FreeSurface (surface); 768 SDL_FreeSurface (surface);
644 SDL_FreeSurface (surface2); 769 SDL_FreeSurface (surface2);
645} 770}
646 771
682 CODE: 807 CODE:
683 fprintf (stderr, "FATAL: %s\n", message); 808 fprintf (stderr, "FATAL: %s\n", message);
684#ifdef _WIN32 809#ifdef _WIN32
685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 810 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
686#endif 811#endif
687 exit (1); 812 _exit (1);
688 813
814void
815_exit (int retval = 0)
816 CODE:
817#ifdef WIN32
818 ExitThread (retval); // unclean, please beam me up
819#else
820 _exit (retval);
821#endif
822
689MODULE = CFClient PACKAGE = CFClient::Font 823MODULE = CFPlus PACKAGE = CFPlus::Font
690 824
691CFClient::Font 825CFPlus::Font
692new_from_file (SV *class, char *path, int id = 0) 826new_from_file (SV *class, char *path, int id = 0)
693 CODE: 827 CODE:
694{ 828{
695 int count; 829 int count;
696 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 830 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
699} 833}
700 OUTPUT: 834 OUTPUT:
701 RETVAL 835 RETVAL
702 836
703void 837void
704DESTROY (CFClient::Font self) 838DESTROY (CFPlus::Font self)
705 CODE: 839 CODE:
706 pango_font_description_free (self); 840 pango_font_description_free (self);
707 841
708void 842void
709make_default (CFClient::Font self) 843make_default (CFPlus::Font self)
710 CODE: 844 CODE:
711 default_font = self; 845 default_font = self;
712 846
713MODULE = CFClient PACKAGE = CFClient::Layout 847MODULE = CFPlus PACKAGE = CFPlus::Layout
714 848
715CFClient::Layout 849void
716new (SV *class, int rgba = 0) 850reset_glyph_cache ()
851 CODE:
852 tc_clear ();
853
854CFPlus::Layout
855new (SV *class)
717 CODE: 856 CODE:
718 New (0, RETVAL, 1, struct cf_layout); 857 New (0, RETVAL, 1, struct cf_layout);
719 858
720 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 859 RETVAL->pl = pango_layout_new (opengl_context);
721 RETVAL->rgba = rgba;
722 RETVAL->r = 1.; 860 RETVAL->r = 1.;
723 RETVAL->g = 1.; 861 RETVAL->g = 1.;
724 RETVAL->b = 1.; 862 RETVAL->b = 1.;
725 RETVAL->a = 1.; 863 RETVAL->a = 1.;
726 RETVAL->base_height = MIN_FONT_HEIGHT; 864 RETVAL->base_height = MIN_FONT_HEIGHT;
730 layout_update_font (RETVAL); 868 layout_update_font (RETVAL);
731 OUTPUT: 869 OUTPUT:
732 RETVAL 870 RETVAL
733 871
734void 872void
735DESTROY (CFClient::Layout self) 873DESTROY (CFPlus::Layout self)
736 CODE: 874 CODE:
737 g_object_unref (self->pl); 875 g_object_unref (self->pl);
738 Safefree (self); 876 Safefree (self);
739 877
740int
741is_rgba (CFClient::Layout self)
742 CODE:
743 RETVAL = self->rgba;
744 OUTPUT:
745 RETVAL
746
747void 878void
748set_text (CFClient::Layout self, SV *text_) 879set_text (CFPlus::Layout self, SV *text_)
749 CODE: 880 CODE:
750{ 881{
751 STRLEN textlen; 882 STRLEN textlen;
752 char *text = SvPVutf8 (text_, textlen); 883 char *text = SvPVutf8 (text_, textlen);
753 884
754 pango_layout_set_text (self->pl, text, textlen); 885 pango_layout_set_text (self->pl, text, textlen);
755} 886}
756 887
757void 888void
758set_markup (CFClient::Layout self, SV *text_) 889set_markup (CFPlus::Layout self, SV *text_)
759 CODE: 890 CODE:
760{ 891{
761 STRLEN textlen; 892 STRLEN textlen;
762 char *text = SvPVutf8 (text_, textlen); 893 char *text = SvPVutf8 (text_, textlen);
763 894
764 pango_layout_set_markup (self->pl, text, textlen); 895 pango_layout_set_markup (self->pl, text, textlen);
765} 896}
766 897
898void
899set_shapes (CFPlus::Layout self, ...)
900 CODE:
901{
902 PangoAttrList *attrs = 0;
903 const char *text = pango_layout_get_text (self->pl);
904 const char *pos = text;
905 int arg = 4;
906
907 while (arg < items && (pos = strstr (pos, OBJ_STR)))
908 {
909 PangoRectangle inkrect, rect;
910 PangoAttribute *attr;
911
912 int x = SvIV (ST (arg - 3));
913 int y = SvIV (ST (arg - 2));
914 int w = SvIV (ST (arg - 1));
915 int h = SvIV (ST (arg ));
916
917 inkrect.x = 0;
918 inkrect.y = 0;
919 inkrect.width = 0;
920 inkrect.height = 0;
921
922 rect.x = x * PANGO_SCALE;
923 rect.y = y * PANGO_SCALE;
924 rect.width = w * PANGO_SCALE;
925 rect.height = h * PANGO_SCALE;
926
927 if (!attrs)
928 attrs = pango_layout_get_attributes (self->pl);
929
930 attr = pango_attr_shape_new (&inkrect, &rect);
931 attr->start_index = pos - text;
932 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
933 pango_attr_list_insert (attrs, attr);
934
935 arg += 4;
936 pos += sizeof (OBJ_STR) - 1;
937 }
938
939 if (attrs)
940 pango_layout_set_attributes (self->pl, attrs);
941}
942
943void
944get_shapes (CFPlus::Layout self)
945 PPCODE:
946{
947 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
948
949 do
950 {
951 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
952
953 if (run && shape_attr_p (run))
954 {
955 PangoRectangle extents;
956 pango_layout_iter_get_run_extents (iter, 0, &extents);
957
958 EXTEND (SP, 2);
959 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
960 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
961 }
962 }
963 while (pango_layout_iter_next_run (iter));
964
965 pango_layout_iter_free (iter);
966}
967
968int
969has_wrapped (CFPlus::Layout self)
970 CODE:
971{
972 int lines = 1;
973 const char *text = pango_layout_get_text (self->pl);
974
975 while (*text)
976 lines += *text++ == '\n';
977
978 RETVAL = lines < pango_layout_get_line_count (self->pl);
979}
980 OUTPUT:
981 RETVAL
982
767SV * 983SV *
768get_text (CFClient::Layout self) 984get_text (CFPlus::Layout self)
769 CODE: 985 CODE:
770 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 986 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
771 SvUTF8_on (RETVAL); 987 sv_utf8_decode (RETVAL);
772 OUTPUT: 988 OUTPUT:
773 RETVAL 989 RETVAL
774 990
775void 991void
776set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 992set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
777 CODE: 993 CODE:
778 self->r = r; 994 self->r = r;
779 self->g = g; 995 self->g = g;
780 self->b = b; 996 self->b = b;
781 self->a = a; 997 self->a = a;
782 998
783void 999void
784set_font (CFClient::Layout self, CFClient::Font font = 0) 1000set_font (CFPlus::Layout self, CFPlus::Font font = 0)
785 CODE: 1001 CODE:
786 if (self->font != font) 1002 if (self->font != font)
787 { 1003 {
788 self->font = font; 1004 self->font = font;
789 layout_update_font (self); 1005 layout_update_font (self);
790 } 1006 }
791 1007
792void 1008void
793set_height (CFClient::Layout self, int base_height) 1009set_height (CFPlus::Layout self, int base_height)
794 CODE: 1010 CODE:
795 if (self->base_height != base_height) 1011 if (self->base_height != base_height)
796 { 1012 {
797 self->base_height = base_height; 1013 self->base_height = base_height;
798 layout_update_font (self); 1014 layout_update_font (self);
799 } 1015 }
800 1016
801void 1017void
802set_width (CFClient::Layout self, int max_width = -1) 1018set_width (CFPlus::Layout self, int max_width = -1)
803 CODE: 1019 CODE:
804 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1020 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
805 1021
806void 1022void
807set_indent (CFClient::Layout self, int indent) 1023set_indent (CFPlus::Layout self, int indent)
808 CODE: 1024 CODE:
809 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1025 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
810 1026
811void 1027void
812set_spacing (CFClient::Layout self, int spacing) 1028set_spacing (CFPlus::Layout self, int spacing)
813 CODE: 1029 CODE:
814 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1030 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
815 1031
816void 1032void
817set_ellipsise (CFClient::Layout self, int ellipsise) 1033set_ellipsise (CFPlus::Layout self, int ellipsise)
818 CODE: 1034 CODE:
819 pango_layout_set_ellipsize (self->pl, 1035 pango_layout_set_ellipsize (self->pl,
820 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1036 ellipsise == 1 ? PANGO_ELLIPSIZE_START
821 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1037 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
822 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1038 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
823 : PANGO_ELLIPSIZE_NONE 1039 : PANGO_ELLIPSIZE_NONE
824 ); 1040 );
825 1041
826void 1042void
827set_single_paragraph_mode (CFClient::Layout self, int spm) 1043set_single_paragraph_mode (CFPlus::Layout self, int spm)
828 CODE: 1044 CODE:
829 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1045 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
830 1046
831void 1047void
832size (CFClient::Layout self) 1048size (CFPlus::Layout self)
833 PPCODE: 1049 PPCODE:
834{ 1050{
835 int w, h; 1051 int w, h;
836 1052
837 layout_get_pixel_size (self, &w, &h); 1053 layout_get_pixel_size (self, &w, &h);
840 PUSHs (sv_2mortal (newSViv (w))); 1056 PUSHs (sv_2mortal (newSViv (w)));
841 PUSHs (sv_2mortal (newSViv (h))); 1057 PUSHs (sv_2mortal (newSViv (h)));
842} 1058}
843 1059
844int 1060int
1061descent (CFPlus::Layout self)
1062 CODE:
1063{
1064 PangoRectangle rect;
1065 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1066 pango_layout_line_get_pixel_extents (line, 0, &rect);
1067 RETVAL = PANGO_DESCENT (rect);
1068}
1069 OUTPUT:
1070 RETVAL
1071
1072int
845xy_to_index (CFClient::Layout self, int x, int y) 1073xy_to_index (CFPlus::Layout self, int x, int y)
846 CODE: 1074 CODE:
847{ 1075{
848 int index, trailing; 1076 int index, trailing;
849 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1077 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
850 RETVAL = index; 1078 RETVAL = index + trailing;
851} 1079}
852 OUTPUT: 1080 OUTPUT:
853 RETVAL 1081 RETVAL
854 1082
855void 1083void
856cursor_pos (CFClient::Layout self, int index) 1084cursor_pos (CFPlus::Layout self, int index)
857 PPCODE: 1085 PPCODE:
858{ 1086{
859 PangoRectangle strong_pos; 1087 PangoRectangle strong_pos;
860 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1088 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
861 1089
864 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1092 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
865 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1093 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
866} 1094}
867 1095
868void 1096void
869render (CFClient::Layout self) 1097index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
870 PPCODE: 1098 PPCODE:
871{ 1099{
872 SV *retval; 1100 int line, x;
873 int w, h;
874 1101
875 layout_get_pixel_size (self, &w, &h); 1102 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1103 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
876 1104
877 if (self->rgba)
878 {
879 cairo_surface_t *surface;
880 cairo_t *cairo;
881
882 retval = newSV (w * h * 4);
883 SvPOK_only (retval);
884 SvCUR_set (retval, w * h * 4);
885
886 memset (SvPVX (retval), 0, w * h * 4);
887
888 surface = cairo_image_surface_create_for_data (
889 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
890 cairo = cairo_create (surface);
891 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
892
893 pango_cairo_show_layout (cairo, self->pl);
894
895 cairo_destroy (cairo);
896 cairo_surface_destroy (surface);
897
898 // what a mess, and its premultiplied, too :(
899 {
900 uint32_t *p = (uint32_t *)SvPVX (retval);
901 uint32_t *e = p + w * h;
902
903 while (p < e)
904 {
905 uint32_t rgba = *p;
906 rgba = (rgba >> 24) | (rgba << 8);
907 rgba = SDL_SwapBE32 (rgba);
908 *p++ = rgba;
909 }
910 }
911
912 EXTEND (SP, 5); 1105 EXTEND (SP, 2);
913 PUSHs (sv_2mortal (newSViv (w))); 1106 PUSHs (sv_2mortal (newSViv (line - 1)));
1107 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1108}
1109
1110void
1111line_x_to_index (CFPlus::Layout self, int line, int x)
1112 PPCODE:
1113{
1114 PangoLayoutLine *lp;
1115 int index, trailing;
1116
1117 if (line < 0)
1118 XSRETURN_EMPTY;
1119
1120 if (!(lp = pango_layout_get_line (self->pl, line)))
1121 XSRETURN_EMPTY; /* do better */
1122
1123 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1124
1125 EXTEND (SP, 2);
1126 if (GIMME_V == G_SCALAR)
914 PUSHs (sv_2mortal (newSViv (h))); 1127 PUSHs (sv_2mortal (newSViv (index + trailing)));
915 PUSHs (sv_2mortal (retval));
916 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
917 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
918 }
919 else 1128 else
920 { 1129 {
921 FT_Bitmap bitmap;
922
923 retval = newSV (w * h);
924 SvPOK_only (retval);
925 SvCUR_set (retval, w * h);
926
927 bitmap.rows = h;
928 bitmap.width = w;
929 bitmap.pitch = w;
930 bitmap.buffer = (unsigned char*)SvPVX (retval);
931 bitmap.num_grays = 256;
932 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
933
934 memset (bitmap.buffer, 0, w * h);
935
936 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
937
938 EXTEND (SP, 5);
939 PUSHs (sv_2mortal (newSViv (w))); 1130 PUSHs (sv_2mortal (newSViv (index)));
940 PUSHs (sv_2mortal (newSViv (h))); 1131 PUSHs (sv_2mortal (newSViv (trailing)));
941 PUSHs (sv_2mortal (retval));
942 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
943 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
944 } 1132 }
945} 1133}
946 1134
1135void
1136render (CFPlus::Layout self, float x, float y, int flags = 0)
1137 PPCODE:
1138 pango_opengl_render_layout_subpixel (
1139 self->pl,
1140 x * PANGO_SCALE, y * PANGO_SCALE,
1141 self->r, self->g, self->b, self->a,
1142 flags
1143 );
1144
947MODULE = CFClient PACKAGE = CFClient::Texture 1145MODULE = CFPlus PACKAGE = CFPlus::Texture
948 1146
949void 1147void
1148pad2pot (SV *data_, SV *w_, SV *h_)
1149 CODE:
1150{
1151 int ow = SvIV (w_);
1152 int oh = SvIV (h_);
1153
1154 if (ow && oh)
1155 {
1156 int nw = minpot (ow);
1157 int nh = minpot (oh);
1158
1159 if (nw != ow || nh != oh)
1160 {
1161 if (SvOK (data_))
1162 {
1163 STRLEN datalen;
1164 char *data = SvPVbyte (data_, datalen);
1165 int bpp = datalen / (ow * oh);
1166 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1167
1168 SvPOK_only (result_);
1169 SvCUR_set (result_, nw * nh * bpp);
1170
1171 memset (SvPVX (result_), 0, nw * nh * bpp);
1172 while (oh--)
1173 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1174
1175 sv_setsv (data_, result_);
1176 }
1177
1178 sv_setiv (w_, nw);
1179 sv_setiv (h_, nh);
1180 }
1181 }
1182}
1183
1184void
950draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1185draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
951 PROTOTYPE: $$$;$$ 1186 PROTOTYPE: $$$;$$
952 ALIAS: 1187 ALIAS:
953 draw_quad_alpha = 1 1188 draw_quad_alpha = 1
954 draw_quad_alpha_premultiplied = 2 1189 draw_quad_alpha_premultiplied = 2
955 CODE: 1190 CODE:
956{ 1191{
957 HV *hv = (HV *)SvRV (self); 1192 HV *hv = (HV *)SvRV (self);
958 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1193 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
959 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1194 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
960 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1195 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
961 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
962 1196
963 if (items < 5) 1197 if (items < 5)
964 { 1198 {
965 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1199 w = SvNV (*hv_fetch (hv, "w", 1, 1));
966 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1200 h = SvNV (*hv_fetch (hv, "h", 1, 1));
967 } 1201 }
968 1202
969 if (ix) 1203 if (ix)
970 { 1204 {
971 glEnable (GL_BLEND); 1205 glEnable (GL_BLEND);
1206
1207 if (ix == 2)
972 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1208 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1209 else
1210 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1211 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1212
973 glEnable (GL_ALPHA_TEST); 1213 glEnable (GL_ALPHA_TEST);
974 glAlphaFunc (GL_GREATER, 0.01f); 1214 glAlphaFunc (GL_GREATER, 0.01f);
975 } 1215 }
976 1216
977 glBindTexture (GL_TEXTURE_2D, name); 1217 glBindTexture (GL_TEXTURE_2D, name);
978
979 if (wrap_mode)
980 {
981 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983 }
984 1218
985 glBegin (GL_QUADS); 1219 glBegin (GL_QUADS);
986 glTexCoord2f (0, 0); glVertex2f (x , y ); 1220 glTexCoord2f (0, 0); glVertex2f (x , y );
987 glTexCoord2f (0, t); glVertex2f (x , y + h); 1221 glTexCoord2f (0, t); glVertex2f (x , y + h);
988 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1222 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
994 glDisable (GL_ALPHA_TEST); 1228 glDisable (GL_ALPHA_TEST);
995 glDisable (GL_BLEND); 1229 glDisable (GL_BLEND);
996 } 1230 }
997} 1231}
998 1232
999MODULE = CFClient PACKAGE = CFClient::Map 1233MODULE = CFPlus PACKAGE = CFPlus::Map
1000 1234
1001CFClient::Map 1235CFPlus::Map
1002new (SV *class, int map_width, int map_height) 1236new (SV *class)
1003 CODE: 1237 CODE:
1004 New (0, RETVAL, 1, struct map); 1238 New (0, RETVAL, 1, struct map);
1005 RETVAL->x = 0; 1239 RETVAL->x = 0;
1006 RETVAL->y = 0; 1240 RETVAL->y = 0;
1007 RETVAL->w = map_width; 1241 RETVAL->w = 0;
1008 RETVAL->h = map_height; 1242 RETVAL->h = 0;
1009 RETVAL->ox = 0; 1243 RETVAL->ox = 0;
1010 RETVAL->oy = 0; 1244 RETVAL->oy = 0;
1011 RETVAL->faces = 8192; 1245 RETVAL->faces = 8192;
1012 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1246 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1013 RETVAL->texs = 8192; 1247 RETVAL->texs = 8192;
1016 RETVAL->row = 0; 1250 RETVAL->row = 0;
1017 OUTPUT: 1251 OUTPUT:
1018 RETVAL 1252 RETVAL
1019 1253
1020void 1254void
1021DESTROY (CFClient::Map self) 1255DESTROY (CFPlus::Map self)
1022 CODE: 1256 CODE:
1023{ 1257{
1024 map_clear (self); 1258 map_clear (self);
1025 Safefree (self->face); 1259 Safefree (self->face);
1260 Safefree (self->tex);
1026 Safefree (self); 1261 Safefree (self);
1027} 1262}
1028 1263
1029void 1264void
1265resize (CFPlus::Map self, int map_width, int map_height)
1266 CODE:
1267 self->w = map_width;
1268 self->h = map_height;
1269
1270void
1030clear (CFClient::Map self) 1271clear (CFPlus::Map self)
1031 CODE: 1272 CODE:
1032 map_clear (self); 1273 map_clear (self);
1033 1274
1034void 1275void
1035set_face (CFClient::Map self, int face, int texid) 1276set_face (CFPlus::Map self, int face, int texid)
1036 CODE: 1277 CODE:
1037{ 1278{
1038 while (self->faces <= face) 1279 while (self->faces <= face)
1039 { 1280 {
1040 Append (mapface, self->face, self->faces, self->faces); 1281 Append (mapface, self->face, self->faces, self->faces);
1043 1284
1044 self->face [face] = texid; 1285 self->face [face] = texid;
1045} 1286}
1046 1287
1047void 1288void
1048set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1289set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1049 CODE: 1290 CODE:
1050{ 1291{
1051 while (self->texs <= texid) 1292 while (self->texs <= texid)
1052 { 1293 {
1053 Append (maptex, self->tex, self->texs, self->texs); 1294 Append (maptex, self->tex, self->texs, self->texs);
1065 tex->r = r; 1306 tex->r = r;
1066 tex->g = g; 1307 tex->g = g;
1067 tex->b = b; 1308 tex->b = b;
1068 tex->a = a; 1309 tex->a = a;
1069 } 1310 }
1311
1312 // somewhat hackish, but for textures that require it, it really
1313 // improves the look, and most others don't suffer.
1314 glBindTexture (GL_TEXTURE_2D, name);
1315 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1316 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1317 // use uglier nearest interpolation because linear suffers
1318 // from transparent color bleeding and ugly wrapping effects.
1319 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1070} 1320}
1071 1321
1072int 1322int
1073ox (CFClient::Map self) 1323ox (CFPlus::Map self)
1074 ALIAS: 1324 ALIAS:
1075 oy = 1 1325 oy = 1
1326 x = 2
1327 y = 3
1328 w = 4
1329 h = 5
1076 CODE: 1330 CODE:
1077 switch (ix) 1331 switch (ix)
1078 { 1332 {
1079 case 0: RETVAL = self->ox; break; 1333 case 0: RETVAL = self->ox; break;
1080 case 1: RETVAL = self->oy; break; 1334 case 1: RETVAL = self->oy; break;
1335 case 2: RETVAL = self->x; break;
1336 case 3: RETVAL = self->y; break;
1337 case 4: RETVAL = self->w; break;
1338 case 5: RETVAL = self->h; break;
1081 } 1339 }
1082 OUTPUT: 1340 OUTPUT:
1083 RETVAL 1341 RETVAL
1084 1342
1085void 1343void
1086scroll (CFClient::Map self, int dx, int dy) 1344scroll (CFPlus::Map self, int dx, int dy)
1087 CODE: 1345 CODE:
1088{ 1346{
1089 if (dx > 0) 1347 if (dx > 0)
1090 map_blank (self, self->x, self->y, dx - 1, self->h); 1348 map_blank (self, self->x, self->y, dx, self->h);
1091 else if (dx < 0) 1349 else if (dx < 0)
1092 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1350 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1093 1351
1094 if (dy > 0) 1352 if (dy > 0)
1095 map_blank (self, self->x, self->y, self->w, dy - 1); 1353 map_blank (self, self->x, self->y, self->w, dy);
1096 else if (dy < 0) 1354 else if (dy < 0)
1097 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1355 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1098 1356
1099 self->ox += dx; self->x += dx; 1357 self->ox += dx; self->x += dx;
1100 self->oy += dy; self->y += dy; 1358 self->oy += dy; self->y += dy;
1101 1359
1102 while (self->y < 0) 1360 while (self->y < 0)
1107 self->y += MAP_EXTEND_Y; 1365 self->y += MAP_EXTEND_Y;
1108 } 1366 }
1109} 1367}
1110 1368
1111void 1369void
1112map1a_update (CFClient::Map self, SV *data_) 1370map1a_update (CFPlus::Map self, SV *data_, int extmap)
1113 CODE: 1371 CODE:
1114{ 1372{
1115 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1373 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1116 uint8_t *data_end = (uint8_t *)SvEND (data_); 1374 uint8_t *data_end = (uint8_t *)SvEND (data_);
1117 mapcell *cell; 1375 mapcell *cell;
1118 int x, y, flags; 1376 int x, y, flags;
1119 1377
1120 while (data < data_end) 1378 while (data < data_end - 1)
1121 { 1379 {
1122 flags = (data [0] << 8) + data [1]; data += 2; 1380 flags = (data [0] << 8) + data [1]; data += 2;
1123 1381
1124 x = ((flags >> 10) & 63) + self->x; 1382 x = self->x + ((flags >> 10) & 63);
1125 y = ((flags >> 4) & 63) + self->y; 1383 y = self->y + ((flags >> 4) & 63);
1126 1384
1127 cell = map_get_cell (self, x, y); 1385 cell = map_get_cell (self, x, y);
1128 1386
1129 if (flags & 15) 1387 if (flags & 15)
1130 { 1388 {
1131 if (cell->darkness < 0) 1389 if (!cell->darkness)
1132 { 1390 {
1391 memset (cell, 0, sizeof (*cell));
1133 cell->darkness = 0; 1392 cell->darkness = 256;
1134 cell->face [0] = 0;
1135 cell->face [1] = 0;
1136 cell->face [2] = 0;
1137 } 1393 }
1138 1394
1139 cell->darkness = flags & 8 ? *data++ : 255;
1140
1141 //TODO: don't trust server data to be in-range(!) 1395 //TODO: don't trust server data to be in-range(!)
1396
1397 if (flags & 8)
1398 {
1399 if (extmap)
1400 {
1401 uint8_t ext, cmd;
1402
1403 do
1404 {
1405 ext = *data++;
1406 cmd = ext & 0x3f;
1407
1408 if (cmd < 4)
1409 cell->darkness = 255 - ext * 64 + 1;
1410 else if (cmd == 5) // health
1411 {
1412 cell->stat_width = 1;
1413 cell->stat_hp = *data++;
1414 }
1415 else if (cmd == 6) // monster width
1416 cell->stat_width = *data++ + 1;
1417 else if (cmd == 0x47)
1418 {
1419 if (*data == 8)
1420 ; // decode player uuid
1421
1422 data += *data + 1;
1423 }
1424 else if (cmd == 8) // cell flags
1425 cell->flags = *data++;
1426 else if (ext & 0x40) // unknown, multibyte => skip
1427 data += *data + 1;
1428 else
1429 data++;
1430 }
1431 while (ext & 0x80);
1432 }
1433 else
1434 cell->darkness = *data++ + 1;
1435 }
1142 1436
1143 if (flags & 4) 1437 if (flags & 4)
1144 { 1438 {
1145 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1439 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1146 } 1440 }
1154 { 1448 {
1155 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1449 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1156 } 1450 }
1157 } 1451 }
1158 else 1452 else
1159 cell->darkness = -1; 1453 cell->darkness = 0;
1160 } 1454 }
1161} 1455}
1162 1456
1163SV * 1457SV *
1164mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1458mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1165 CODE: 1459 CODE:
1166{ 1460{
1167 int x1, x; 1461 int x1, x;
1168 int y1, y; 1462 int y1, y;
1169 int z; 1463 int z;
1192 1486
1193 for (z = 0; z <= 0; z++) 1487 for (z = 0; z <= 0; z++)
1194 { 1488 {
1195 mapface face = cell->face [z]; 1489 mapface face = cell->face [z];
1196 1490
1197 if (face) 1491 if (face > 0 && face < self->texs)
1198 { 1492 {
1199 maptex tex = self->tex [face]; 1493 maptex tex = self->tex [face];
1200 int a0 = 255 - tex.a; 1494 int a0 = 255 - tex.a;
1201 int a1 = tex.a; 1495 int a1 = tex.a;
1202 1496
1219} 1513}
1220 OUTPUT: 1514 OUTPUT:
1221 RETVAL 1515 RETVAL
1222 1516
1223void 1517void
1224draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1518draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1225 PPCODE: 1519 CODE:
1226{ 1520{
1227 int vx, vy;
1228 int x, y, z; 1521 int x, y, z;
1229 int last_name; 1522 int last_name;
1230 mapface face; 1523 mapface face;
1231 int sw4 = (sw + 3) & ~3;
1232 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1233 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1234
1235 memset (darkness, 255, sw4 * sh);
1236 SvPOK_only (darkness_sv);
1237 SvCUR_set (darkness_sv, sw4 * sh);
1238
1239 vx = self->x + (self->w - sw) / 2 - shift_x;
1240 vy = self->y + (self->h - sh) / 2 - shift_y;
1241
1242 /*
1243 int vx = self->vx = self->w >= sw
1244 ? self->x + (self->w - sw) / 2
1245 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1246
1247 int vy = self->vy = self->h >= sh
1248 ? self->y + (self->h - sh) / 2
1249 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1250 */
1251 1524
1252 glColor4ub (255, 255, 255, 255); 1525 glColor4ub (255, 255, 255, 255);
1253 1526
1527 glEnable (GL_BLEND);
1254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1528 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1255 glEnable (GL_BLEND);
1256 glEnable (GL_TEXTURE_2D); 1529 glEnable (GL_TEXTURE_2D);
1257 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1530 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1258 1531
1259 glBegin (GL_QUADS); 1532 glBegin (GL_QUADS);
1260 1533
1261 last_name = 0; 1534 last_name = 0;
1262 1535
1536 mx += self->x;
1537 my += self->y;
1538
1263 for (z = 0; z < 3; z++) 1539 for (z = 0; z < 3; z++)
1264 for (y = 0; y < sh; y++) 1540 for (y = 0; y < sh; y++)
1265 if (0 <= y + vy && y + vy < self->rows) 1541 if (0 <= y + my && y + my < self->rows)
1266 { 1542 {
1267 maprow *row = self->row + (y + vy); 1543 maprow *row = self->row + (y + my);
1268 1544
1269 for (x = 0; x < sw; x++) 1545 for (x = 0; x < sw; x++)
1270 if (row->c0 <= x + vx && x + vx < row->c1) 1546 if (row->c0 <= x + mx && x + mx < row->c1)
1271 { 1547 {
1272 mapcell *cell = row->col + (x + vx - row->c0); 1548 mapcell *cell = row->col + (x + mx - row->c0);
1273
1274 darkness[y * sw4 + x] = cell->darkness < 0
1275 ? 255 - FOW_DARKNESS
1276 : 255 - cell->darkness;
1277 1549
1278 face = cell->face [z]; 1550 face = cell->face [z];
1279 1551
1280 if (face) 1552 if (face > 0 && face < self->texs)
1281 { 1553 {
1282 maptex tex = self->tex [face]; 1554 maptex tex = self->tex [face];
1283
1284 int px = (x + 1) * 32 - tex.w; 1555 int px = (x + 1) * T - tex.w;
1285 int py = (y + 1) * 32 - tex.h; 1556 int py = (y + 1) * T - tex.h;
1286 1557
1287 if (last_name != tex.name) 1558 if (last_name != tex.name)
1288 { 1559 {
1289 glEnd (); 1560 glEnd ();
1290 last_name = tex.name;
1291 glBindTexture (GL_TEXTURE_2D, last_name); 1561 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1292 glBegin (GL_QUADS); 1562 glBegin (GL_QUADS);
1293 } 1563 }
1294 1564
1295 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1565 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1296 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1566 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1297 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1567 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1298 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1568 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1299 } 1569 }
1570
1571 if (cell->flags && z == 2)
1572 {
1573 if (cell->flags & 1)
1574 {
1575 maptex tex = self->tex [1];
1576 int px = (x + 1) * T - tex.w + 2;
1577 int py = (y + 1) * T - tex.h - 6;
1578
1579 glEnd ();
1580 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1581 glBegin (GL_QUADS);
1582
1583 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1584 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1585 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1586 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1587 }
1588 }
1300 } 1589 }
1301 } 1590 }
1302 1591
1303 glEnd (); 1592 glEnd ();
1304 1593
1305 glDisable (GL_TEXTURE_2D); 1594 glDisable (GL_TEXTURE_2D);
1306 glDisable (GL_BLEND); 1595 glDisable (GL_BLEND);
1596
1597 // top layer: overlays such as the health bar
1598 for (y = 0; y < sh; y++)
1599 if (0 <= y + my && y + my < self->rows)
1600 {
1601 maprow *row = self->row + (y + my);
1602
1603 for (x = 0; x < sw; x++)
1604 if (row->c0 <= x + mx && x + mx < row->c1)
1605 {
1606 mapcell *cell = row->col + (x + mx - row->c0);
1607
1608 int px = x * T;
1609 int py = y * T;
1610
1611 if (cell->stat_hp)
1612 {
1613 int width = cell->stat_width * T;
1614 int thick = (sh * T / 32) / 28 + 1 + cell->stat_width;
1615
1616 glColor3ub (0, 0, 0);
1617 glRectf (px + 1, py - thick - 2,
1618 px + width - 1, py);
1619
1620 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1621 glRectf (px + 2,
1622 py - thick - 1,
1623 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1624 }
1625 }
1626 }
1627}
1628
1629void
1630draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1631 CODE:
1632{
1633 static float color[16][3] = {
1634 { 0.00F, 0.00F, 0.00F },
1635 { 1.00F, 1.00F, 1.00F },
1636 { 0.00F, 0.00F, 0.55F },
1637 { 1.00F, 0.00F, 0.00F },
1638
1639 { 1.00F, 0.54F, 0.00F },
1640 { 0.11F, 0.56F, 1.00F },
1641 { 0.93F, 0.46F, 0.00F },
1642 { 0.18F, 0.54F, 0.34F },
1643
1644 { 0.56F, 0.73F, 0.56F },
1645 { 0.80F, 0.80F, 0.80F },
1646 { 0.55F, 0.41F, 0.13F },
1647 { 0.99F, 0.77F, 0.26F },
1648
1649 { 0.74F, 0.65F, 0.41F },
1650
1651 { 0.00F, 1.00F, 1.00F },
1652 { 1.00F, 0.00F, 1.00F },
1653 { 1.00F, 1.00F, 0.00F },
1654 };
1655
1656 int x, y;
1657
1658 glEnable (GL_TEXTURE_2D);
1659 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1660 glEnable (GL_BLEND);
1661 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1662 glBegin (GL_QUADS);
1663
1664 for (y = 0; y < h; y++)
1665 for (x = 0; x < w; x++)
1666 {
1667 unsigned char m = data [x + y * w];
1668
1669 if (m)
1670 {
1671 float *c = color [m & 15];
1672
1673 float tx1 = m & 0x40 ? 0.5 : 0.;
1674 float tx2 = tx1 + 0.5;
1675
1676 glColor4f (c[0], c[1], c[2], 0.75);
1677 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1678 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1679 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1680 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1681 }
1682 }
1683
1684 glEnd ();
1685 glDisable (GL_BLEND);
1686 glDisable (GL_TEXTURE_2D);
1687}
1688
1689void
1690fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1691 PPCODE:
1692{
1693 int x, y;
1694 int sw4 = (sw + 3) & ~3;
1695 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1696 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1697
1698 memset (darkness, 255, sw4 * sh);
1699 SvPOK_only (darkness_sv);
1700 SvCUR_set (darkness_sv, sw4 * sh);
1701
1702 mx += self->x;
1703 my += self->y;
1704
1705 for (y = 0; y < sh; y++)
1706 if (0 <= y + my && y + my < self->rows)
1707 {
1708 maprow *row = self->row + (y + my);
1709
1710 for (x = 0; x < sw; x++)
1711 if (row->c0 <= x + mx && x + mx < row->c1)
1712 {
1713 mapcell *cell = row->col + (x + mx - row->c0);
1714
1715 darkness[y * sw4 + x] = cell->darkness
1716 ? 255 - (cell->darkness - 1)
1717 : 255 - FOW_DARKNESS;
1718 }
1719 }
1307 1720
1308 EXTEND (SP, 3); 1721 EXTEND (SP, 3);
1309 PUSHs (sv_2mortal (newSViv (sw4))); 1722 PUSHs (sv_2mortal (newSViv (sw4)));
1310 PUSHs (sv_2mortal (newSViv (sh))); 1723 PUSHs (sv_2mortal (newSViv (sh)));
1311 PUSHs (darkness_sv); 1724 PUSHs (darkness_sv);
1312} 1725}
1313 1726
1314SV * 1727SV *
1315get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1728get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1316 CODE: 1729 CODE:
1317{ 1730{
1318 int x, y, x1, y1; 1731 int x, y, x1, y1;
1319 SV *data_sv = newSV (w * h * 7 + 5); 1732 SV *data_sv = newSV (w * h * 7 + 5);
1320 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1733 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1382} 1795}
1383 OUTPUT: 1796 OUTPUT:
1384 RETVAL 1797 RETVAL
1385 1798
1386void 1799void
1387set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1800set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1388 PPCODE: 1801 PPCODE:
1389{ 1802{
1390 int x, y, z; 1803 int x, y, z;
1391 int w, h; 1804 int w, h;
1392 int x1, y1; 1805 int x1, y1;
1424 1837
1425 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1838 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1426 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1839 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1427 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1840 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1428 1841
1429 if (cell->darkness <= 0) 1842 if (cell->darkness == 0)
1430 { 1843 {
1431 cell->darkness = -1; 1844 cell->darkness = 0;
1432 1845
1433 for (z = 0; z <= 2; z++) 1846 for (z = 0; z <= 2; z++)
1434 { 1847 {
1435 cell->face[z] = face[z]; 1848 cell->face[z] = face[z];
1436 1849
1441 } 1854 }
1442 } 1855 }
1443 } 1856 }
1444} 1857}
1445 1858
1446MODULE = CFClient PACKAGE = CFClient::MixChunk 1859MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1447 1860
1448CFClient::MixChunk 1861CFPlus::MixChunk
1449new_from_file (SV *class, char *path) 1862new_from_file (SV *class, char *path)
1450 CODE: 1863 CODE:
1451 RETVAL = Mix_LoadWAV (path); 1864 RETVAL = Mix_LoadWAV (path);
1452 OUTPUT: 1865 OUTPUT:
1453 RETVAL 1866 RETVAL
1454 1867
1455void 1868void
1456DESTROY (CFClient::MixChunk self) 1869DESTROY (CFPlus::MixChunk self)
1457 CODE: 1870 CODE:
1458 Mix_FreeChunk (self); 1871 Mix_FreeChunk (self);
1459 1872
1460int 1873int
1461volume (CFClient::MixChunk self, int volume = -1) 1874volume (CFPlus::MixChunk self, int volume = -1)
1462 CODE: 1875 CODE:
1463 RETVAL = Mix_VolumeChunk (self, volume); 1876 RETVAL = Mix_VolumeChunk (self, volume);
1464 OUTPUT: 1877 OUTPUT:
1465 RETVAL 1878 RETVAL
1466 1879
1467int 1880int
1468play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1881play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1469 CODE: 1882 CODE:
1470 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1471 OUTPUT: 1884 OUTPUT:
1472 RETVAL 1885 RETVAL
1473 1886
1474MODULE = CFClient PACKAGE = CFClient::MixMusic 1887MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1475 1888
1476int 1889int
1477volume (int volume = -1) 1890volume (int volume = -1)
1478 CODE: 1891 CODE:
1479 RETVAL = Mix_VolumeMusic (volume); 1892 RETVAL = Mix_VolumeMusic (volume);
1480 OUTPUT: 1893 OUTPUT:
1481 RETVAL 1894 RETVAL
1482 1895
1483CFClient::MixMusic 1896CFPlus::MixMusic
1484new_from_file (SV *class, char *path) 1897new_from_file (SV *class, char *path)
1485 CODE: 1898 CODE:
1486 RETVAL = Mix_LoadMUS (path); 1899 RETVAL = Mix_LoadMUS (path);
1487 OUTPUT: 1900 OUTPUT:
1488 RETVAL 1901 RETVAL
1489 1902
1490void 1903void
1491DESTROY (CFClient::MixMusic self) 1904DESTROY (CFPlus::MixMusic self)
1492 CODE: 1905 CODE:
1493 Mix_FreeMusic (self); 1906 Mix_FreeMusic (self);
1494 1907
1495int 1908int
1496play (CFClient::MixMusic self, int loops = -1) 1909play (CFPlus::MixMusic self, int loops = -1)
1497 CODE: 1910 CODE:
1498 RETVAL = Mix_PlayMusic (self, loops); 1911 RETVAL = Mix_PlayMusic (self, loops);
1499 OUTPUT: 1912 OUTPUT:
1500 RETVAL 1913 RETVAL
1501 1914
1502MODULE = CFClient PACKAGE = CFClient::OpenGL 1915MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1503 1916
1504BOOT: 1917BOOT:
1505{ 1918{
1506 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1919 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1507 static const struct { 1920 static const struct {
1508 const char *name; 1921 const char *name;
1509 IV iv; 1922 IV iv;
1510 } *civ, const_iv[] = { 1923 } *civ, const_iv[] = {
1511# define const_iv(name) { # name, (IV)name } 1924# define const_iv(name) { # name, (IV)name }
1512 const_iv (GL_COLOR_MATERIAL), 1925 const_iv (GL_COLOR_MATERIAL),
1513 const_iv (GL_SMOOTH), 1926 const_iv (GL_SMOOTH),
1514 const_iv (GL_FLAT), 1927 const_iv (GL_FLAT),
1515 const_iv (GL_DITHER), 1928 const_iv (GL_DITHER),
1516 const_iv (GL_BLEND), 1929 const_iv (GL_BLEND),
1930 const_iv (GL_CULL_FACE),
1517 const_iv (GL_SCISSOR_TEST), 1931 const_iv (GL_SCISSOR_TEST),
1932 const_iv (GL_DEPTH_TEST),
1933 const_iv (GL_ALPHA_TEST),
1934 const_iv (GL_NORMALIZE),
1935 const_iv (GL_RESCALE_NORMAL),
1936 const_iv (GL_FRONT),
1937 const_iv (GL_BACK),
1518 const_iv (GL_AND), 1938 const_iv (GL_AND),
1519 const_iv (GL_ONE), 1939 const_iv (GL_ONE),
1520 const_iv (GL_ZERO), 1940 const_iv (GL_ZERO),
1521 const_iv (GL_SRC_ALPHA), 1941 const_iv (GL_SRC_ALPHA),
1522 const_iv (GL_SRC_ALPHA_SATURATE), 1942 const_iv (GL_DST_ALPHA),
1523 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1943 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524 const_iv (GL_ONE_MINUS_DST_ALPHA), 1944 const_iv (GL_ONE_MINUS_DST_ALPHA),
1945 const_iv (GL_SRC_ALPHA_SATURATE),
1525 const_iv (GL_RGB), 1946 const_iv (GL_RGB),
1526 const_iv (GL_RGBA), 1947 const_iv (GL_RGBA),
1948 const_iv (GL_RGBA4),
1949 const_iv (GL_RGBA8),
1950 const_iv (GL_RGB5_A1),
1527 const_iv (GL_UNSIGNED_BYTE), 1951 const_iv (GL_UNSIGNED_BYTE),
1952 const_iv (GL_UNSIGNED_SHORT),
1953 const_iv (GL_UNSIGNED_INT),
1528 const_iv (GL_ALPHA), 1954 const_iv (GL_ALPHA),
1529 const_iv (GL_INTENSITY), 1955 const_iv (GL_INTENSITY),
1530 const_iv (GL_LUMINANCE), 1956 const_iv (GL_LUMINANCE),
1531 const_iv (GL_LUMINANCE_ALPHA), 1957 const_iv (GL_LUMINANCE_ALPHA),
1532 const_iv (GL_FLOAT), 1958 const_iv (GL_FLOAT),
1538 const_iv (GL_TEXTURE_MAG_FILTER), 1964 const_iv (GL_TEXTURE_MAG_FILTER),
1539 const_iv (GL_TEXTURE_MIN_FILTER), 1965 const_iv (GL_TEXTURE_MIN_FILTER),
1540 const_iv (GL_TEXTURE_ENV_MODE), 1966 const_iv (GL_TEXTURE_ENV_MODE),
1541 const_iv (GL_TEXTURE_WRAP_S), 1967 const_iv (GL_TEXTURE_WRAP_S),
1542 const_iv (GL_TEXTURE_WRAP_T), 1968 const_iv (GL_TEXTURE_WRAP_T),
1969 const_iv (GL_REPEAT),
1543 const_iv (GL_CLAMP), 1970 const_iv (GL_CLAMP),
1544 const_iv (GL_REPEAT), 1971 const_iv (GL_CLAMP_TO_EDGE),
1545 const_iv (GL_NEAREST), 1972 const_iv (GL_NEAREST),
1546 const_iv (GL_LINEAR), 1973 const_iv (GL_LINEAR),
1547 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1974 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1548 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1975 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1549 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1976 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1550 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1977 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551 const_iv (GL_GENERATE_MIPMAP), 1978 const_iv (GL_GENERATE_MIPMAP),
1552 const_iv (GL_MODULATE), 1979 const_iv (GL_MODULATE),
1553 const_iv (GL_DECAL), 1980 const_iv (GL_DECAL),
1554 const_iv (GL_REPLACE), 1981 const_iv (GL_REPLACE),
1982 const_iv (GL_DEPTH_BUFFER_BIT),
1555 const_iv (GL_COLOR_BUFFER_BIT), 1983 const_iv (GL_COLOR_BUFFER_BIT),
1556 const_iv (GL_PROJECTION), 1984 const_iv (GL_PROJECTION),
1557 const_iv (GL_MODELVIEW), 1985 const_iv (GL_MODELVIEW),
1558 const_iv (GL_COLOR_LOGIC_OP), 1986 const_iv (GL_COLOR_LOGIC_OP),
1559 const_iv (GL_SEPARABLE_2D), 1987 const_iv (GL_SEPARABLE_2D),
1560 const_iv (GL_CONVOLUTION_2D), 1988 const_iv (GL_CONVOLUTION_2D),
1561 const_iv (GL_CONVOLUTION_BORDER_MODE), 1989 const_iv (GL_CONVOLUTION_BORDER_MODE),
1562 const_iv (GL_CONSTANT_BORDER), 1990 const_iv (GL_CONSTANT_BORDER),
1563 const_iv (GL_LINES), 1991 const_iv (GL_LINES),
1992 const_iv (GL_LINE_STRIP),
1993 const_iv (GL_LINE_LOOP),
1564 const_iv (GL_QUADS), 1994 const_iv (GL_QUADS),
1565 const_iv (GL_LINE_LOOP), 1995 const_iv (GL_QUAD_STRIP),
1996 const_iv (GL_TRIANGLES),
1997 const_iv (GL_TRIANGLE_STRIP),
1998 const_iv (GL_TRIANGLE_FAN),
1566 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1999 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1567 const_iv (GL_FASTEST), 2000 const_iv (GL_FASTEST),
2001 const_iv (GL_V2F),
2002 const_iv (GL_V3F),
2003 const_iv (GL_T2F_V3F),
2004 const_iv (GL_T2F_N3F_V3F),
1568# undef const_iv 2005# undef const_iv
1569 }; 2006 };
1570 2007
1571 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2008 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1572 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2009 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1573} 2010}
1574 2011
2012char *
2013gl_vendor ()
2014 CODE:
2015 RETVAL = (char *)glGetString (GL_VENDOR);
2016 OUTPUT:
2017 RETVAL
2018
2019char *
2020gl_version ()
2021 CODE:
2022 RETVAL = (char *)glGetString (GL_VERSION);
2023 OUTPUT:
2024 RETVAL
2025
2026char *
2027gl_extensions ()
2028 CODE:
2029 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2030 OUTPUT:
2031 RETVAL
2032
1575int glGetError () 2033int glGetError ()
2034
2035void glFinish ()
1576 2036
1577void glClear (int mask) 2037void glClear (int mask)
1578 2038
1579void glClearColor (float r, float g, float b, float a = 1.0) 2039void glClearColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 2040 PROTOTYPE: @
1587 2047
1588void glHint (int target, int mode) 2048void glHint (int target, int mode)
1589 2049
1590void glBlendFunc (int sfactor, int dfactor) 2050void glBlendFunc (int sfactor, int dfactor)
1591 2051
2052void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2053 CODE:
2054 gl_BlendFuncSeparate (sa, da, saa, daa);
2055
2056void glDepthMask (int flag)
2057
1592void glLogicOp (int opcode) 2058void glLogicOp (int opcode)
1593 2059
1594void glColorMask (int red, int green, int blue, int alpha) 2060void glColorMask (int red, int green, int blue, int alpha)
1595 2061
1596void glMatrixMode (int mode) 2062void glMatrixMode (int mode)
1599 2065
1600void glPopMatrix () 2066void glPopMatrix ()
1601 2067
1602void glLoadIdentity () 2068void glLoadIdentity ()
1603 2069
2070void glDrawBuffer (int buffer)
2071
2072void glReadBuffer (int buffer)
2073
1604# near and far are due to microsofts buggy c compiler 2074# near_ and far_ are due to microsofts buggy "c" compiler
2075void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2076
2077# near_ and far_ are due to microsofts buggy "c" compiler
1605void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2078void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1606 2079
1607void glViewport (int x, int y, int width, int height) 2080void glViewport (int x, int y, int width, int height)
1608 2081
1609void glScissor (int x, int y, int width, int height) 2082void glScissor (int x, int y, int width, int height)
1624 2097
1625void glEnd () 2098void glEnd ()
1626 2099
1627void glColor (float r, float g, float b, float a = 1.0) 2100void glColor (float r, float g, float b, float a = 1.0)
1628 PROTOTYPE: @ 2101 PROTOTYPE: @
2102 ALIAS:
2103 glColor_premultiply = 1
1629 CODE: 2104 CODE:
1630 glColor4ub (MIN ((int)(r * 255.f), 255), 2105 if (ix)
1631 MIN ((int)(g * 255.f), 255), 2106 {
1632 MIN ((int)(b * 255.f), 255), 2107 r *= a;
1633 MIN ((int)(a * 255.f), 255)); 2108 g *= a;
2109 b *= a;
2110 }
2111 // microsoft visual "c" rounds instead of truncating...
2112 glColor4f (r, g, b, a);
2113
2114void glInterleavedArrays (int format, int stride, char *data)
2115
2116void glDrawElements (int mode, int count, int type, char *indices)
2117
2118# 1.2 void glDrawRangeElements (int mode, int start, int end
2119
2120void glRasterPos (float x, float y, float z = 0.)
2121 CODE:
2122 glRasterPos3f (0, 0, z);
2123 glBitmap (0, 0, 0, 0, x, y, 0);
1634 2124
1635void glVertex (float x, float y, float z = 0.) 2125void glVertex (float x, float y, float z = 0.)
1636 CODE: 2126 CODE:
1637 glVertex3f (x, y, z); 2127 glVertex3f (x, y, z);
1638 2128
1650 2140
1651void glBindTexture (int target, int name) 2141void glBindTexture (int target, int name)
1652 2142
1653void glConvolutionParameter (int target, int pname, float params) 2143void glConvolutionParameter (int target, int pname, float params)
1654 CODE: 2144 CODE:
1655 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2145 if (gl.ConvolutionParameterf)
2146 gl.ConvolutionParameterf (target, pname, params);
1656 2147
1657void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2148void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1658 CODE: 2149 CODE:
1659 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2150 if (gl.ConvolutionFilter2D)
1660 (target, internalformat, width, height, format, type, data)); 2151 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1661 2152
1662void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2153void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1663 CODE: 2154 CODE:
1664 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2155 if (gl.SeparableFilter2D)
1665 (target, internalformat, width, height, format, type, row, column)); 2156 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1666 2157
1667void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2158void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1668 2159
1669void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2160void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1670 2161
1671void glRasterPos (int x, int y) 2162void glDrawPixels (int width, int height, int format, int type, char *pixels)
1672 CODE:
1673 glRasterPos2i (x, y);
1674 2163
1675void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2164void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1676 2165
1677int glGenTexture () 2166int glGenTexture ()
1678 CODE: 2167 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines