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.107 by root, Mon Jun 5 05:23:19 2006 UTC vs.
Revision 1.211 by root, Sat Jul 28 00:45:28 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)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
6#endif 14#endif
7 15
8#include "EXTERN.h" 16#include "EXTERN.h"
9#include "perl.h" 17#include "perl.h"
10#include "XSUB.h" 18#include "XSUB.h"
11 19
20#ifdef _WIN32
21# undef pipe
22#endif
23
24#include <assert.h>
12#include <math.h> 25#include <math.h>
13#include <string.h> 26#include <string.h>
14#include <stdio.h> 27#include <stdio.h>
28#include <stdlib.h>
15 29
16#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
17#include <SDL_endian.h> 32#include <SDL_endian.h>
18#include <SDL_image.h> 33#include <SDL_image.h>
19#include <SDL_mixer.h> 34#include <SDL_mixer.h>
20#include <SDL_opengl.h> 35#include <SDL_opengl.h>
21 36
37#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS
39
22#include <glib/gmacros.h> 40#include <glib/gmacros.h>
23 41
24#include <pango/pango.h> 42#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 43
29#ifndef _WIN32 44#ifndef _WIN32
30# include <sys/types.h> 45# include <sys/types.h>
31# include <sys/socket.h> 46# include <sys/socket.h>
32# include <netinet/in.h> 47# include <netinet/in.h>
33# include <netinet/tcp.h> 48# include <netinet/tcp.h>
34# include <inttypes.h> 49# 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 50#endif
43 51
44#include "glext.h" 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 53
46#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
47 55
48#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
50 58
51#define MIN_FONT_HEIGHT 10 59#define MIN_FONT_HEIGHT 10
60
61#if 0
62# define PARACHUTE SDL_INIT_NOPARACHUTE
63#else
64# define PARACHUTE 0
65#endif
66
67static AV *texture_av;
52 68
53static struct 69static struct
54{ 70{
55#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
56#include "glfunc.h" 72#include "glfunc.h"
57#undef GL_FUNC 73#undef GL_FUNC
58} gl; 74} gl;
59 75
76static void
60static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61{ 78{
62 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
63 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
64 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
65 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 else 83 else
67 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
68} 85}
69 86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
109}
110
111#include "texcache.c"
112
113#include "pango-font.c"
114#include "pango-fontmap.c"
115#include "pango-render.c"
116
70typedef Mix_Chunk *CFClient__MixChunk; 117typedef Mix_Chunk *CFPlus__MixChunk;
71typedef Mix_Music *CFClient__MixMusic; 118typedef Mix_Music *CFPlus__MixMusic;
72 119
73typedef PangoFontDescription *CFClient__Font; 120typedef PangoFontDescription *CFPlus__Font;
121
122static int
123shape_attr_p (PangoLayoutRun *run)
124{
125 GSList *attrs = run->item->analysis.extra_attrs;
126
127 while (attrs)
128 {
129 PangoAttribute *attr = attrs->data;
130
131 if (attr->klass->type == PANGO_ATTR_SHAPE)
132 return 1;
133
134 attrs = attrs->next;
135 }
136
137 return 0;
138}
74 139
75typedef struct cf_layout { 140typedef struct cf_layout {
76 PangoLayout *pl; // either derived from a cairo or ft2 context 141 PangoLayout *pl;
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode 142 float r, g, b, a; // default color for rgba mode
79 int base_height; 143 int base_height;
80 CFClient__Font font; 144 CFPlus__Font font;
81} *CFClient__Layout; 145} *CFPlus__Layout;
82 146
83static CFClient__Font default_font; 147static CFPlus__Font default_font;
84static PangoContext *ft2_context, *cairo_context; 148static PangoContext *opengl_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 149static PangoFontMap *opengl_fontmap;
86 150
87static void 151static void
88substitute_func (FcPattern *pattern, gpointer data) 152substitute_func (FcPattern *pattern, gpointer data)
89{ 153{
90 FcPatternAddBool (pattern, FC_HINTING , 1); 154 FcPatternAddBool (pattern, FC_HINTING, 1);
91#ifdef _WIN32 155#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 156 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#else 157#endif
94 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 158 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif
96} 159}
97 160
98static void 161static void
99layout_update_font (CFClient__Layout self) 162layout_update_font (CFPlus__Layout self)
100{ 163{
101 /* use a random scale factor to account for unknown descenders, 0.8 works 164 /* use a random scale factor to account for unknown descenders, 0.8 works
102 * reasonably well with bitstream vera 165 * reasonably well with bitstream vera
103 */ 166 */
104 PangoFontDescription *font = self->font ? self->font : default_font; 167 PangoFontDescription *font = self->font ? self->font : default_font;
108 171
109 pango_layout_set_font_description (self->pl, font); 172 pango_layout_set_font_description (self->pl, font);
110} 173}
111 174
112static void 175static void
113layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
114{ 177{
178 PangoRectangle rect;
179
180 // get_pixel_* wrongly rounds down
115 pango_layout_get_pixel_size (self->pl, w, h); 181 pango_layout_get_extents (self->pl, 0, &rect);
116 182
117 if (!*w) *w = 1; 183 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118 if (!*h) *h = 1; 184 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119 185
120 *w = (*w + 3) & ~3; 186 if (!rect.width) rect.width = 1;
121} 187 if (!rect.height) rect.height = 1;
122 188
189 *w = rect.width;
190 *h = rect.height;
191}
192
193typedef uint16_t tileid;
123typedef uint16_t mapface; 194typedef uint16_t faceid;
124 195
125typedef struct { 196typedef struct {
126 GLint name; 197 int name;
127 int w, h; 198 int w, h;
128 float s, t; 199 float s, t;
129 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
130} maptex; 203} maptex;
131 204
132typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
133 int16_t darkness; 208 uint16_t darkness;
134 mapface face[3]; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
135} mapcell; 210} mapcell;
136 211
137typedef struct { 212typedef struct {
138 int32_t c0, c1; 213 int32_t c0, c1;
139 mapcell *col; 214 mapcell *col;
140} maprow; 215} maprow;
141 216
142typedef struct map { 217typedef struct map {
143 int x, y, w, h; 218 int x, y, w, h;
144 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
145 int faces; 220 int faces; tileid *face2tile; // [faceid]
146 mapface *face; 221 int texs; maptex *tex; // [tileid]
147
148 int texs;
149 maptex *tex;
150 222
151 int32_t rows; 223 int32_t rows;
152 maprow *row; 224 maprow *row;
153} *CFClient__Map; 225} *CFPlus__Map;
154 226
155static char * 227static char *
156prepend (char *ptr, int sze, int inc) 228prepend (char *ptr, int sze, int inc)
157{ 229{
158 char *p; 230 char *p;
175} 247}
176 248
177#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
178#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 250#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
179 251
252static void
253need_facenum (struct map *self, faceid face)
254{
255 while (self->faces <= face)
256 {
257 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2;
259 }
260}
261
262static void
263need_texid (struct map *self, int texid)
264{
265 while (self->texs <= texid)
266 {
267 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2;
269 }
270}
271
180static maprow * 272static maprow *
181map_get_row (CFClient__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
182{ 274{
183 if (0 > y) 275 if (0 > y)
184 { 276 {
185 int extend = - y + MAP_EXTEND_Y; 277 int extend = - y + MAP_EXTEND_Y;
186 Prepend (maprow, self->row, self->rows, extend); 278 Prepend (maprow, self->row, self->rows, extend);
224 316
225 return row->col + (x - row->c0); 317 return row->col + (x - row->c0);
226} 318}
227 319
228static mapcell * 320static mapcell *
229map_get_cell (CFClient__Map self, int x, int y) 321map_get_cell (CFPlus__Map self, int x, int y)
230{ 322{
231 return row_get_cell (map_get_row (self, y), x); 323 return row_get_cell (map_get_row (self, y), x);
232} 324}
233 325
234static void 326static void
235map_clear (CFClient__Map self) 327map_clear (CFPlus__Map self)
236{ 328{
237 int r; 329 int r;
238 330
239 for (r = 0; r < self->rows; r++) 331 for (r = 0; r < self->rows; r++)
240 Safefree (self->row[r].col); 332 Safefree (self->row[r].col);
248 self->row = 0; 340 self->row = 0;
249 self->rows = 0; 341 self->rows = 0;
250} 342}
251 343
252static void 344static void
253map_blank (CFClient__Map self, int x0, int y0, int w, int h) 345map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
254{ 346{
255 int x, y; 347 int x, y;
256 maprow *row; 348 maprow *row;
349 mapcell *cell;
257 350
258 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
259 if (y >= 0) 352 if (y >= 0)
260 { 353 {
261 if (y >= self->rows) 354 if (y >= self->rows)
267 if (x >= row->c0) 360 if (x >= row->c0)
268 { 361 {
269 if (x >= row->c1) 362 if (x >= row->c1)
270 break; 363 break;
271 364
272 row->col[x - row->c0].darkness = -1; 365 cell = row->col + x - row->c0;
366
367 cell->darkness = 0;
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
273 } 371 }
274 } 372 }
373}
374
375typedef struct {
376 tileid tile;
377 uint8_t x, y, level;
378} smooth_key;
379
380static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
382{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
384
385 if (SvIOK (*sv))
386 SvIV_set (*sv, SvIVX (*sv) | bits);
387 else
388 sv_setiv (*sv, bits);
275} 389}
276 390
277static void 391static void
278music_finished (void) 392music_finished (void)
279{ 393{
298 ev.data2 = 0; 412 ev.data2 = 0;
299 413
300 SDL_PushEvent ((SDL_Event *)&ev); 414 SDL_PushEvent ((SDL_Event *)&ev);
301} 415}
302 416
417static unsigned int
418minpot (unsigned int n)
419{
420 if (!n)
421 return 0;
422
423 --n;
424
425 n |= n >> 1;
426 n |= n >> 2;
427 n |= n >> 4;
428 n |= n >> 8;
429 n |= n >> 16;
430
431 return n + 1;
432}
433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
437
438/******************************************************************************/
439
440static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
441static GV *hover_gv;
442
443static int
444within_widget (SV *widget, NV x, NV y)
445{
446 HV *self;
447 SV **svp;
448 NV wx, ww, wy, wh;
449
450 if (!SvROK (widget))
451 return 0;
452
453 self = (HV *)SvRV (widget);
454
455 if (SvTYPE (self) != SVt_PVHV)
456 return 0;
457
458 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
459 if (y < wy)
460 return 0;
461
462 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
463 if (y >= wy + wh)
464 return 0;
465
466 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
467 if (x < wx)
468 return 0;
469
470 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
471 if (x >= wx + ww)
472 return 0;
473
474 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
475 if (!svp || !SvTRUE (*svp))
476 return 0;
477
478 return 1;
479}
480
303MODULE = CFClient PACKAGE = CFClient 481MODULE = CFPlus PACKAGE = CFPlus
304 482
305PROTOTYPES: ENABLE 483PROTOTYPES: ENABLE
306 484
307BOOT: 485BOOT:
308{ 486{
309 HV *stash = gv_stashpv ("CFClient", 1); 487 HV *stash = gv_stashpv ("CFPlus", 1);
310 static const struct { 488 static const struct {
311 const char *name; 489 const char *name;
312 IV iv; 490 IV iv;
313 } *civ, const_iv[] = { 491 } *civ, const_iv[] = {
314# define const_iv(name) { # name, (IV)name } 492# define const_iv(name) { # name, (IV)name }
493 const_iv (SDLK_MODIFIER_MIN),
494 const_iv (SDLK_MODIFIER_MAX),
495
315 const_iv (SDL_ACTIVEEVENT), 496 const_iv (SDL_ACTIVEEVENT),
316 const_iv (SDL_KEYDOWN), 497 const_iv (SDL_KEYDOWN),
317 const_iv (SDL_KEYUP), 498 const_iv (SDL_KEYUP),
318 const_iv (SDL_MOUSEMOTION), 499 const_iv (SDL_MOUSEMOTION),
319 const_iv (SDL_MOUSEBUTTONDOWN), 500 const_iv (SDL_MOUSEBUTTONDOWN),
328 const_iv (SDL_EVENT_RESERVEDA), 509 const_iv (SDL_EVENT_RESERVEDA),
329 const_iv (SDL_EVENT_RESERVEDB), 510 const_iv (SDL_EVENT_RESERVEDB),
330 const_iv (SDL_VIDEORESIZE), 511 const_iv (SDL_VIDEORESIZE),
331 const_iv (SDL_VIDEOEXPOSE), 512 const_iv (SDL_VIDEOEXPOSE),
332 const_iv (SDL_USEREVENT), 513 const_iv (SDL_USEREVENT),
514
515 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE),
518
333 const_iv (SDLK_KP0), 519 const_iv (SDLK_KP0),
334 const_iv (SDLK_KP1), 520 const_iv (SDLK_KP1),
335 const_iv (SDLK_KP2), 521 const_iv (SDLK_KP2),
336 const_iv (SDLK_KP3), 522 const_iv (SDLK_KP3),
337 const_iv (SDLK_KP4), 523 const_iv (SDLK_KP4),
392 const_iv (SDLK_BREAK), 578 const_iv (SDLK_BREAK),
393 const_iv (SDLK_MENU), 579 const_iv (SDLK_MENU),
394 const_iv (SDLK_POWER), 580 const_iv (SDLK_POWER),
395 const_iv (SDLK_EURO), 581 const_iv (SDLK_EURO),
396 const_iv (SDLK_UNDO), 582 const_iv (SDLK_UNDO),
583
397 const_iv (KMOD_NONE), 584 const_iv (KMOD_NONE),
585 const_iv (KMOD_SHIFT),
398 const_iv (KMOD_LSHIFT), 586 const_iv (KMOD_LSHIFT),
399 const_iv (KMOD_RSHIFT), 587 const_iv (KMOD_RSHIFT),
588 const_iv (KMOD_CTRL),
400 const_iv (KMOD_LCTRL), 589 const_iv (KMOD_LCTRL),
401 const_iv (KMOD_RCTRL), 590 const_iv (KMOD_RCTRL),
591 const_iv (KMOD_ALT),
402 const_iv (KMOD_LALT), 592 const_iv (KMOD_LALT),
403 const_iv (KMOD_RALT), 593 const_iv (KMOD_RALT),
594 const_iv (KMOD_META),
404 const_iv (KMOD_LMETA), 595 const_iv (KMOD_LMETA),
405 const_iv (KMOD_RMETA), 596 const_iv (KMOD_RMETA),
406 const_iv (KMOD_NUM), 597 const_iv (KMOD_NUM),
407 const_iv (KMOD_CAPS), 598 const_iv (KMOD_CAPS),
408 const_iv (KMOD_MODE), 599 const_iv (KMOD_MODE),
409 const_iv (KMOD_CTRL),
410 const_iv (KMOD_SHIFT),
411 const_iv (KMOD_ALT),
412 const_iv (KMOD_META)
413# undef const_iv 600# undef const_iv
414 }; 601 };
415 602
416 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 603 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
605
606 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
607 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
418} 608}
609
610void
611weaken (SV *rv)
612 PROTOTYPE: $
613 CODE:
614 sv_rvweaken (rv);
615
616int
617in_destruct ()
618 CODE:
619 RETVAL = PL_main_cv == Nullcv;
620 OUTPUT:
621 RETVAL
622
623NV floor (NV x)
624
625NV ceil (NV x)
419 626
420void 627void
421pango_init () 628pango_init ()
422 CODE: 629 CODE:
423 // delayed, so it can pick up new fonts added by AddFontResourceEx
424{ 630{
425 {
426 ft2_fontmap = pango_ft2_font_map_new (); 631 opengl_fontmap = pango_opengl_font_map_new ();
427 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
428 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 633 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
429 }
430 {
431 cairo_font_options_t *fopt = cairo_font_options_create ();
432 cairo_fontmap = pango_cairo_font_map_get_default ();
433 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
434#ifdef _WIN32
435 // cairo looks like shit eaten twice on windows
436 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
437#else
438 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
439#endif
440 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
441 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
442 pango_cairo_context_set_font_options (cairo_context, fopt);
443 cairo_font_options_destroy (fopt);
444 }
445} 634}
635
636char *
637SDL_GetError ()
446 638
447int 639int
448SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
449 641
450void 642void
451SDL_Quit () 643SDL_Quit ()
452 644
453void 645void
454SDL_ListModes () 646SDL_ListModes (int rgb, int alpha)
455 PPCODE: 647 PPCODE:
456{ 648{
457 SDL_Rect **m; 649 SDL_Rect **m;
458 650
459 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 651 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
460 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 652 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
461 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 653 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
462 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 654 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
463 655
464 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 656 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
465 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 657 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
466 658
467 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 659 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
468 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
469 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
470 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
471 663
472 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
473 665#if SDL_VERSION_ATLEAST(1,2,10)
474 SDL_EnableUNICODE (1); 666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
475 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
476 669
477 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
478 671
479 if (m && m != (SDL_Rect **)-1) 672 if (m && m != (SDL_Rect **)-1)
480 while (*m) 673 while (*m)
481 { 674 {
675 if ((*m)->w >= 640 && (*m)->h >= 480)
676 {
482 AV *av = newAV (); 677 AV *av = newAV ();
483 av_push (av, newSViv ((*m)->w)); 678 av_push (av, newSViv ((*m)->w));
484 av_push (av, newSViv ((*m)->h)); 679 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb));
681 av_push (av, newSViv (alpha));
485 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 682 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
683 }
486 684
487 ++m; 685 ++m;
488 } 686 }
489} 687}
490 688
491char *
492SDL_GetError ()
493
494int 689int
495SDL_SetVideoMode (int w, int h, int fullscreen) 690SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
496 CODE: 691 CODE:
692{
693 SDL_EnableUNICODE (1);
694 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
695
696 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
697 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
698 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
699 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
700
497 RETVAL = !!SDL_SetVideoMode ( 701 RETVAL = !!SDL_SetVideoMode (
498 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 702 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
499 ); 703 );
704
500 if (RETVAL) 705 if (RETVAL)
501 { 706 {
707 av_clear (texture_av);
708
502 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
503# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
504# include "glfunc.h" 711#include "glfunc.h"
505# undef GL_FUNC 712#undef GL_FUNC
506 } 713 }
714}
507 OUTPUT: 715 OUTPUT:
508 RETVAL 716 RETVAL
509 717
510void 718void
511SDL_GL_SwapBuffers () 719SDL_GL_SwapBuffers ()
512 720
513char * 721char *
514SDL_GetKeyName (int sym) 722SDL_GetKeyName (int sym)
515 723
724int
725SDL_GetAppState ()
726
516void 727void
517SDL_PollEvent () 728poll_events ()
518 PPCODE: 729 PPCODE:
519{ 730{
520 SDL_Event ev; 731 SDL_Event ev;
521 732
522 while (SDL_PollEvent (&ev)) 733 SDL_PumpEvents ();
734 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
523 { 735 {
524 HV *hv = newHV (); 736 HV *hv = newHV ();
525 hv_store (hv, "type", 4, newSViv (ev.type), 0); 737 hv_store (hv, "type", 4, newSViv (ev.type), 0);
526 738
527 switch (ev.type) 739 switch (ev.type)
529 case SDL_KEYDOWN: 741 case SDL_KEYDOWN:
530 case SDL_KEYUP: 742 case SDL_KEYUP:
531 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
532 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
533 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
746 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
534 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
535 break; 748 break;
536 749
537 case SDL_ACTIVEEVENT: 750 case SDL_ACTIVEEVENT:
538 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
539 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 752 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
540 break; 753 break;
541 754
542 case SDL_MOUSEMOTION: 755 case SDL_MOUSEMOTION:
756 {
757 int state = ev.motion.state;
758 int x = ev.motion.x;
759 int y = ev.motion.y;
760 int xrel = ev.motion.xrel;
761 int yrel = ev.motion.yrel;
762
763 /* do simplistic event compression */
764 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
765 && state == ev.motion.state)
766 {
767 xrel += ev.motion.xrel;
768 yrel += ev.motion.yrel;
769 x = ev.motion.x;
770 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 }
773
543 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
544
545 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 775 hv_store (hv, "state", 5, newSViv (state), 0);
546 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 776 hv_store (hv, "x", 1, newSViv (x), 0);
547 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 777 hv_store (hv, "y", 1, newSViv (y), 0);
548 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 778 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
549 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 779 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 }
550 break; 781 break;
551 782
552 case SDL_MOUSEBUTTONDOWN: 783 case SDL_MOUSEBUTTONDOWN:
553 case SDL_MOUSEBUTTONUP: 784 case SDL_MOUSEBUTTONUP:
554 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
564 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
565 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
566 break; 797 break;
567 } 798 }
568 799
569 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
570 } 801 }
571} 802}
572 803
573int 804int
574Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 805Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
575 POSTCALL: 806 POSTCALL:
576 Mix_HookMusicFinished (music_finished); 807 Mix_HookMusicFinished (music_finished);
577 Mix_ChannelFinished (channel_finished); 808 Mix_ChannelFinished (channel_finished);
578 809
579void 810void
583Mix_AllocateChannels (int numchans = -1) 814Mix_AllocateChannels (int numchans = -1)
584 815
585void 816void
586lowdelay (int fd, int val = 1) 817lowdelay (int fd, int val = 1)
587 CODE: 818 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
820
821void
822win32_proxy_info ()
823 PPCODE:
824{
588#ifndef _WIN32 825#ifdef _WIN32
589 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 826 char buffer[2048];
827 DWORD buflen;
828
829 EXTEND (SP, 3);
830
831 buflen = sizeof (buffer);
832 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
833 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
834 {
835 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
836
837 buflen = sizeof (buffer);
838 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
839 {
840 PUSHs (newSVpv (buffer, 0));
841
842 buflen = sizeof (buffer);
843 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
844 PUSHs (newSVpv (buffer, 0));
845 }
846 }
590#endif 847#endif
848}
591 849
592void 850void
593add_font (char *file) 851add_font (char *file)
594 CODE: 852 CODE:
595 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 853 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
596#ifdef _WIN32
597 // cairo... sigh... requires win2000
598 AddFontResourceEx (file, FR_PRIVATE, 0);
599#endif
600 854
601void 855void
602load_image_inline (SV *image_) 856load_image_inline (SV *image_)
603 ALIAS: 857 ALIAS:
604 load_image_file = 1 858 load_image_file = 1
646 900
647 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 901 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
648 902
649 assert (surface2->pitch == surface2->w * 4); 903 assert (surface2->pitch == surface2->w * 4);
650 904
905 SDL_LockSurface (surface2);
651 EXTEND (SP, 5); 906 EXTEND (SP, 6);
652 PUSHs (sv_2mortal (newSViv (surface2->w))); 907 PUSHs (sv_2mortal (newSViv (surface2->w)));
653 PUSHs (sv_2mortal (newSViv (surface2->h))); 908 PUSHs (sv_2mortal (newSViv (surface2->h)));
654 SDL_LockSurface (surface2);
655 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 909 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
656 SDL_UnlockSurface (surface2);
657 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 910 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
658 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 911 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
659 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 912 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
913 SDL_UnlockSurface (surface2);
660 914
661 SDL_FreeSurface (surface); 915 SDL_FreeSurface (surface);
662 SDL_FreeSurface (surface2); 916 SDL_FreeSurface (surface2);
663} 917}
664 918
700 CODE: 954 CODE:
701 fprintf (stderr, "FATAL: %s\n", message); 955 fprintf (stderr, "FATAL: %s\n", message);
702#ifdef _WIN32 956#ifdef _WIN32
703 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
704#endif 958#endif
705 exit (1); 959 _exit (1);
706 960
961void
962_exit (int retval = 0)
963 CODE:
964#ifdef WIN32
965 ExitThread (retval); // unclean, please beam me up
966#else
967 _exit (retval);
968#endif
969
970void
971debug ()
972 CODE:
973{
974#if DEBUG
975 VALGRIND_DO_LEAK_CHECK;
976#endif
977}
978
707MODULE = CFClient PACKAGE = CFClient::Font 979MODULE = CFPlus PACKAGE = CFPlus::Font
708 980
709CFClient::Font 981PROTOTYPES: DISABLE
982
983CFPlus::Font
710new_from_file (SV *class, char *path, int id = 0) 984new_from_file (SV *class, char *path, int id = 0)
711 CODE: 985 CODE:
712{ 986{
713 int count; 987 int count;
714 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
717} 991}
718 OUTPUT: 992 OUTPUT:
719 RETVAL 993 RETVAL
720 994
721void 995void
722DESTROY (CFClient::Font self) 996DESTROY (CFPlus::Font self)
723 CODE: 997 CODE:
724 pango_font_description_free (self); 998 pango_font_description_free (self);
725 999
726void 1000void
727make_default (CFClient::Font self) 1001make_default (CFPlus::Font self)
1002 PROTOTYPE: $
728 CODE: 1003 CODE:
729 default_font = self; 1004 default_font = self;
730 1005
731MODULE = CFClient PACKAGE = CFClient::Layout 1006MODULE = CFPlus PACKAGE = CFPlus::Layout
732 1007
733CFClient::Layout 1008PROTOTYPES: DISABLE
734new (SV *class, int rgba = 0) 1009
1010void
1011reset_glyph_cache ()
1012 PROTOTYPE:
1013 CODE:
1014 tc_clear ();
1015
1016CFPlus::Layout
1017new (SV *class)
735 CODE: 1018 CODE:
736 New (0, RETVAL, 1, struct cf_layout); 1019 New (0, RETVAL, 1, struct cf_layout);
737 1020
738 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 1021 RETVAL->pl = pango_layout_new (opengl_context);
739 RETVAL->rgba = rgba;
740 RETVAL->r = 1.; 1022 RETVAL->r = 1.;
741 RETVAL->g = 1.; 1023 RETVAL->g = 1.;
742 RETVAL->b = 1.; 1024 RETVAL->b = 1.;
743 RETVAL->a = 1.; 1025 RETVAL->a = 1.;
744 RETVAL->base_height = MIN_FONT_HEIGHT; 1026 RETVAL->base_height = MIN_FONT_HEIGHT;
748 layout_update_font (RETVAL); 1030 layout_update_font (RETVAL);
749 OUTPUT: 1031 OUTPUT:
750 RETVAL 1032 RETVAL
751 1033
752void 1034void
753DESTROY (CFClient::Layout self) 1035DESTROY (CFPlus::Layout self)
754 CODE: 1036 CODE:
755 g_object_unref (self->pl); 1037 g_object_unref (self->pl);
756 Safefree (self); 1038 Safefree (self);
757 1039
758int
759is_rgba (CFClient::Layout self)
760 CODE:
761 RETVAL = self->rgba;
762 OUTPUT:
763 RETVAL
764
765void 1040void
766set_text (CFClient::Layout self, SV *text_) 1041set_text (CFPlus::Layout self, SV *text_)
767 CODE: 1042 CODE:
768{ 1043{
769 STRLEN textlen; 1044 STRLEN textlen;
770 char *text = SvPVutf8 (text_, textlen); 1045 char *text = SvPVutf8 (text_, textlen);
771 1046
772 pango_layout_set_text (self->pl, text, textlen); 1047 pango_layout_set_text (self->pl, text, textlen);
773} 1048}
774 1049
775void 1050void
776set_markup (CFClient::Layout self, SV *text_) 1051set_markup (CFPlus::Layout self, SV *text_)
777 CODE: 1052 CODE:
778{ 1053{
779 STRLEN textlen; 1054 STRLEN textlen;
780 char *text = SvPVutf8 (text_, textlen); 1055 char *text = SvPVutf8 (text_, textlen);
781 1056
782 pango_layout_set_markup (self->pl, text, textlen); 1057 pango_layout_set_markup (self->pl, text, textlen);
783} 1058}
784 1059
1060void
1061set_shapes (CFPlus::Layout self, ...)
1062 CODE:
1063{
1064 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text;
1067 int arg = 4;
1068
1069 while (arg < items && (pos = strstr (pos, OBJ_STR)))
1070 {
1071 PangoRectangle inkrect, rect;
1072 PangoAttribute *attr;
1073
1074 int x = SvIV (ST (arg - 3));
1075 int y = SvIV (ST (arg - 2));
1076 int w = SvIV (ST (arg - 1));
1077 int h = SvIV (ST (arg ));
1078
1079 inkrect.x = 0;
1080 inkrect.y = 0;
1081 inkrect.width = 0;
1082 inkrect.height = 0;
1083
1084 rect.x = x * PANGO_SCALE;
1085 rect.y = y * PANGO_SCALE;
1086 rect.width = w * PANGO_SCALE;
1087 rect.height = h * PANGO_SCALE;
1088
1089 if (!attrs)
1090 attrs = pango_layout_get_attributes (self->pl);
1091
1092 attr = pango_attr_shape_new (&inkrect, &rect);
1093 attr->start_index = pos - text;
1094 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
1095 pango_attr_list_insert (attrs, attr);
1096
1097 arg += 4;
1098 pos += sizeof (OBJ_STR) - 1;
1099 }
1100
1101 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs);
1103}
1104
1105void
1106get_shapes (CFPlus::Layout self)
1107 PPCODE:
1108{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110
1111 do
1112 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
1114
1115 if (run && shape_attr_p (run))
1116 {
1117 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents);
1119
1120 EXTEND (SP, 2);
1121 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
1122 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1123 }
1124 }
1125 while (pango_layout_iter_next_run (iter));
1126
1127 pango_layout_iter_free (iter);
1128}
1129
1130int
1131has_wrapped (CFPlus::Layout self)
1132 CODE:
1133{
1134 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl);
1136
1137 while (*text)
1138 lines += *text++ == '\n';
1139
1140 RETVAL = lines < pango_layout_get_line_count (self->pl);
1141}
1142 OUTPUT:
1143 RETVAL
1144
785SV * 1145SV *
786get_text (CFClient::Layout self) 1146get_text (CFPlus::Layout self)
787 CODE: 1147 CODE:
788 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
789 sv_utf8_decode (RETVAL); 1149 sv_utf8_decode (RETVAL);
790 OUTPUT: 1150 OUTPUT:
791 RETVAL 1151 RETVAL
792 1152
793void 1153void
794set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
795 CODE: 1155 CODE:
796 self->r = r; 1156 self->r = r;
797 self->g = g; 1157 self->g = g;
798 self->b = b; 1158 self->b = b;
799 self->a = a; 1159 self->a = a;
800 1160
801void 1161void
802set_font (CFClient::Layout self, CFClient::Font font = 0) 1162set_font (CFPlus::Layout self, CFPlus::Font font = 0)
803 CODE: 1163 CODE:
804 if (self->font != font) 1164 if (self->font != font)
805 { 1165 {
806 self->font = font; 1166 self->font = font;
807 layout_update_font (self); 1167 layout_update_font (self);
808 } 1168 }
809 1169
810void 1170void
811set_height (CFClient::Layout self, int base_height) 1171set_height (CFPlus::Layout self, int base_height)
812 CODE: 1172 CODE:
813 if (self->base_height != base_height) 1173 if (self->base_height != base_height)
814 { 1174 {
815 self->base_height = base_height; 1175 self->base_height = base_height;
816 layout_update_font (self); 1176 layout_update_font (self);
817 } 1177 }
818 1178
819void 1179void
820set_width (CFClient::Layout self, int max_width = -1) 1180set_width (CFPlus::Layout self, int max_width = -1)
821 CODE: 1181 CODE:
822 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
823 1183
824void 1184void
825set_indent (CFClient::Layout self, int indent) 1185set_indent (CFPlus::Layout self, int indent)
826 CODE: 1186 CODE:
827 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
828 1188
829void 1189void
830set_spacing (CFClient::Layout self, int spacing) 1190set_spacing (CFPlus::Layout self, int spacing)
831 CODE: 1191 CODE:
832 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
833 1193
834void 1194void
835set_ellipsise (CFClient::Layout self, int ellipsise) 1195set_ellipsise (CFPlus::Layout self, int ellipsise)
836 CODE: 1196 CODE:
837 pango_layout_set_ellipsize (self->pl, 1197 pango_layout_set_ellipsize (self->pl,
838 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START
839 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
840 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
841 : PANGO_ELLIPSIZE_NONE 1201 : PANGO_ELLIPSIZE_NONE
842 ); 1202 );
843 1203
844void 1204void
845set_single_paragraph_mode (CFClient::Layout self, int spm) 1205set_single_paragraph_mode (CFPlus::Layout self, int spm)
846 CODE: 1206 CODE:
847 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
848 1208
849void 1209void
850size (CFClient::Layout self) 1210size (CFPlus::Layout self)
851 PPCODE: 1211 PPCODE:
852{ 1212{
853 int w, h; 1213 int w, h;
854 1214
855 layout_get_pixel_size (self, &w, &h); 1215 layout_get_pixel_size (self, &w, &h);
858 PUSHs (sv_2mortal (newSViv (w))); 1218 PUSHs (sv_2mortal (newSViv (w)));
859 PUSHs (sv_2mortal (newSViv (h))); 1219 PUSHs (sv_2mortal (newSViv (h)));
860} 1220}
861 1221
862int 1222int
1223descent (CFPlus::Layout self)
1224 CODE:
1225{
1226 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect);
1230}
1231 OUTPUT:
1232 RETVAL
1233
1234int
863xy_to_index (CFClient::Layout self, int x, int y) 1235xy_to_index (CFPlus::Layout self, int x, int y)
864 CODE: 1236 CODE:
865{ 1237{
866 int index, trailing; 1238 int index, trailing;
867 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
868 RETVAL = index; 1240 RETVAL = index + trailing;
869} 1241}
870 OUTPUT: 1242 OUTPUT:
871 RETVAL 1243 RETVAL
872 1244
873void 1245void
874cursor_pos (CFClient::Layout self, int index) 1246cursor_pos (CFPlus::Layout self, int index)
875 PPCODE: 1247 PPCODE:
876{ 1248{
877 PangoRectangle strong_pos; 1249 PangoRectangle strong_pos;
878 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
879 1251
882 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
883 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
884} 1256}
885 1257
886void 1258void
887render (CFClient::Layout self) 1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
888 PPCODE: 1260 PPCODE:
889{ 1261{
890 SV *retval; 1262 int line, x;
891 int w, h;
892 1263
893 layout_get_pixel_size (self, &w, &h); 1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
894 1266
895 if (self->rgba)
896 {
897 cairo_surface_t *surface;
898 cairo_t *cairo;
899
900 retval = newSV (w * h * 4);
901 SvPOK_only (retval);
902 SvCUR_set (retval, w * h * 4);
903
904 memset (SvPVX (retval), 0, w * h * 4);
905
906 surface = cairo_image_surface_create_for_data (
907 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
908 cairo = cairo_create (surface);
909 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
910
911 pango_cairo_show_layout (cairo, self->pl);
912
913 cairo_destroy (cairo);
914 cairo_surface_destroy (surface);
915
916 // what a mess, and its premultiplied, too :(
917 {
918 uint32_t *p = (uint32_t *)SvPVX (retval);
919 uint32_t *e = p + w * h;
920
921 while (p < e)
922 {
923 uint32_t rgba = *p;
924 rgba = (rgba >> 24) | (rgba << 8);
925#if 0
926#ifdef _WIN32
927 {//D
928 uint8_t r = rgba >> 24;
929 uint8_t g = rgba >> 16;
930 uint8_t b = rgba >> 8;
931 uint8_t a = rgba >> 0;
932
933 rgba = (rgba & 0xffffff00) | a;
934 }
935#endif
936#endif
937 rgba = SDL_SwapBE32 (rgba);
938 *p++ = rgba;
939 }
940 }
941
942 EXTEND (SP, 5); 1267 EXTEND (SP, 2);
943 PUSHs (sv_2mortal (newSViv (w))); 1268 PUSHs (sv_2mortal (newSViv (line - 1)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270}
1271
1272void
1273line_x_to_index (CFPlus::Layout self, int line, int x)
1274 PPCODE:
1275{
1276 PangoLayoutLine *lp;
1277 int index, trailing;
1278
1279 if (line < 0)
1280 XSRETURN_EMPTY;
1281
1282 if (!(lp = pango_layout_get_line (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */
1284
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286
1287 EXTEND (SP, 2);
1288 if (GIMME_V == G_SCALAR)
944 PUSHs (sv_2mortal (newSViv (h))); 1289 PUSHs (sv_2mortal (newSViv (index + trailing)));
945 PUSHs (sv_2mortal (retval));
946 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
947 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
948 }
949 else 1290 else
950 { 1291 {
951 FT_Bitmap bitmap;
952
953 retval = newSV (w * h);
954 SvPOK_only (retval);
955 SvCUR_set (retval, w * h);
956
957 bitmap.rows = h;
958 bitmap.width = w;
959 bitmap.pitch = w;
960 bitmap.buffer = (unsigned char*)SvPVX (retval);
961 bitmap.num_grays = 256;
962 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
963
964 memset (bitmap.buffer, 0, w * h);
965
966 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
967
968 EXTEND (SP, 5);
969 PUSHs (sv_2mortal (newSViv (w))); 1292 PUSHs (sv_2mortal (newSViv (index)));
970 PUSHs (sv_2mortal (newSViv (h))); 1293 PUSHs (sv_2mortal (newSViv (trailing)));
971 PUSHs (sv_2mortal (retval));
972 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
973 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
974 } 1294 }
975} 1295}
976 1296
1297void
1298render (CFPlus::Layout self, float x, float y, int flags = 0)
1299 PPCODE:
1300 pango_opengl_render_layout_subpixel (
1301 self->pl,
1302 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a,
1304 flags
1305 );
1306
977MODULE = CFClient PACKAGE = CFClient::Texture 1307MODULE = CFPlus PACKAGE = CFPlus::Texture
978 1308
1309PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312
979void 1313void
1314pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE:
1316{
1317 if ((nw != ow || nh != oh) && SvOK (data_))
1318 {
1319 STRLEN datalen;
1320 char *data = SvPVbyte (data_, datalen);
1321 int bpp = datalen / (ow * oh);
1322 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1323
1324 SvPOK_only (result_);
1325 SvCUR_set (result_, nw * nh * bpp);
1326
1327 memset (SvPVX (result_), 0, nw * nh * bpp);
1328 while (oh--)
1329 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1330
1331 sv_setsv (data_, result_);
1332 }
1333}
1334
1335void
980draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1336draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
981 PROTOTYPE: $$$;$$ 1337 PROTOTYPE: $$$;$$
982 ALIAS: 1338 ALIAS:
983 draw_quad_alpha = 1 1339 draw_quad_alpha = 1
984 draw_quad_alpha_premultiplied = 2 1340 draw_quad_alpha_premultiplied = 2
985 CODE: 1341 CODE:
1023 glDisable (GL_ALPHA_TEST); 1379 glDisable (GL_ALPHA_TEST);
1024 glDisable (GL_BLEND); 1380 glDisable (GL_BLEND);
1025 } 1381 }
1026} 1382}
1027 1383
1384IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1385 CODE:
1386{
1387 GLint width;
1388 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1389 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1390 RETVAL = width > 0;
1391}
1392 OUTPUT:
1393 RETVAL
1394
1028MODULE = CFClient PACKAGE = CFClient::Map 1395MODULE = CFPlus PACKAGE = CFPlus::Map
1029 1396
1030CFClient::Map 1397PROTOTYPES: DISABLE
1031new (SV *class, int map_width, int map_height) 1398
1399CFPlus::Map
1400new (SV *class)
1032 CODE: 1401 CODE:
1033 New (0, RETVAL, 1, struct map); 1402 New (0, RETVAL, 1, struct map);
1034 RETVAL->x = 0; 1403 RETVAL->x = 0;
1035 RETVAL->y = 0; 1404 RETVAL->y = 0;
1036 RETVAL->w = map_width; 1405 RETVAL->w = 0;
1037 RETVAL->h = map_height; 1406 RETVAL->h = 0;
1038 RETVAL->ox = 0; 1407 RETVAL->ox = 0;
1039 RETVAL->oy = 0; 1408 RETVAL->oy = 0;
1040 RETVAL->faces = 8192; 1409 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1041 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1410 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1042 RETVAL->texs = 8192;
1043 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1044 RETVAL->rows = 0; 1411 RETVAL->rows = 0;
1045 RETVAL->row = 0; 1412 RETVAL->row = 0;
1046 OUTPUT: 1413 OUTPUT:
1047 RETVAL 1414 RETVAL
1048 1415
1049void 1416void
1050DESTROY (CFClient::Map self) 1417DESTROY (CFPlus::Map self)
1051 CODE: 1418 CODE:
1052{ 1419{
1053 map_clear (self); 1420 map_clear (self);
1054 Safefree (self->face); 1421 Safefree (self->face2tile);
1422 Safefree (self->tex);
1055 Safefree (self); 1423 Safefree (self);
1056} 1424}
1057 1425
1058void 1426void
1427resize (CFPlus::Map self, int map_width, int map_height)
1428 CODE:
1429 self->w = map_width;
1430 self->h = map_height;
1431
1432void
1059clear (CFClient::Map self) 1433clear (CFPlus::Map self)
1060 CODE: 1434 CODE:
1061 map_clear (self); 1435 map_clear (self);
1062 1436
1063void 1437void
1064set_face (CFClient::Map self, int face, int texid) 1438set_tileid (CFPlus::Map self, int face, int tile)
1065 CODE: 1439 CODE:
1066{ 1440{
1067 while (self->faces <= face) 1441 need_facenum (self, face); self->face2tile [face] = tile;
1068 { 1442 need_texid (self, tile);
1069 Append (mapface, self->face, self->faces, self->faces);
1070 self->faces *= 2;
1071 }
1072
1073 self->face [face] = texid;
1074} 1443}
1075 1444
1076void 1445void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level)
1447 CODE:
1448{
1449 tileid texid;
1450 maptex *tex;
1451
1452 if (face < 0 || face >= self->faces)
1453 return;
1454
1455 if (smooth < 0 || smooth >= self->faces)
1456 return;
1457
1458 texid = self->face2tile [face];
1459
1460 if (!texid)
1461 return;
1462
1463 tex = self->tex + texid;
1464 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level;
1466}
1467
1468void
1077set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1469set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1078 CODE: 1470 CODE:
1079{ 1471{
1080 while (self->texs <= texid) 1472 need_texid (self, texid);
1081 {
1082 Append (maptex, self->tex, self->texs, self->texs);
1083 self->texs *= 2;
1084 }
1085 1473
1086 { 1474 {
1087 maptex *tex = self->tex + texid; 1475 maptex *tex = self->tex + texid;
1088 1476
1089 tex->name = name; 1477 tex->name = name;
1106 // from transparent color bleeding and ugly wrapping effects. 1494 // from transparent color bleeding and ugly wrapping effects.
1107 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1108} 1496}
1109 1497
1110int 1498int
1111ox (CFClient::Map self) 1499ox (CFPlus::Map self)
1112 ALIAS: 1500 ALIAS:
1113 oy = 1 1501 oy = 1
1114 x = 2 1502 x = 2
1115 y = 3 1503 y = 3
1116 w = 4 1504 w = 4
1127 } 1515 }
1128 OUTPUT: 1516 OUTPUT:
1129 RETVAL 1517 RETVAL
1130 1518
1131void 1519void
1132scroll (CFClient::Map self, int dx, int dy) 1520scroll (CFPlus::Map self, int dx, int dy)
1133 CODE: 1521 CODE:
1134{ 1522{
1135 if (dx > 0) 1523 if (dx > 0)
1136 map_blank (self, self->x, self->y, dx - 1, self->h); 1524 map_blank (self, self->x, self->y, dx, self->h);
1137 else if (dx < 0) 1525 else if (dx < 0)
1138 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1526 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1139 1527
1140 if (dy > 0) 1528 if (dy > 0)
1141 map_blank (self, self->x, self->y, self->w, dy - 1); 1529 map_blank (self, self->x, self->y, self->w, dy);
1142 else if (dy < 0) 1530 else if (dy < 0)
1143 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1531 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1144 1532
1145 self->ox += dx; self->x += dx; 1533 self->ox += dx; self->x += dx;
1146 self->oy += dy; self->y += dy; 1534 self->oy += dy; self->y += dy;
1147 1535
1148 while (self->y < 0) 1536 while (self->y < 0)
1153 self->y += MAP_EXTEND_Y; 1541 self->y += MAP_EXTEND_Y;
1154 } 1542 }
1155} 1543}
1156 1544
1157void 1545void
1158map1a_update (CFClient::Map self, SV *data_) 1546map1a_update (CFPlus::Map self, SV *data_, int extmap)
1159 CODE: 1547 CODE:
1160{ 1548{
1161 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1162 uint8_t *data_end = (uint8_t *)SvEND (data_); 1550 uint8_t *data_end = (uint8_t *)SvEND (data_);
1163 mapcell *cell; 1551 mapcell *cell;
1164 int x, y, flags; 1552 int x, y, flags;
1165 1553
1166 while (data < data_end) 1554 while (data < data_end - 1)
1167 { 1555 {
1168 flags = (data [0] << 8) + data [1]; data += 2; 1556 flags = (data [0] << 8) + data [1]; data += 2;
1169 1557
1170 x = ((flags >> 10) & 63) + self->x; 1558 x = self->x + ((flags >> 10) & 63);
1171 y = ((flags >> 4) & 63) + self->y; 1559 y = self->y + ((flags >> 4) & 63);
1172 1560
1173 cell = map_get_cell (self, x, y); 1561 cell = map_get_cell (self, x, y);
1174 1562
1175 if (flags & 15) 1563 if (flags & 15)
1176 { 1564 {
1177 if (cell->darkness < 0) 1565 if (!cell->darkness)
1178 { 1566 {
1567 memset (cell, 0, sizeof (*cell));
1179 cell->darkness = 0; 1568 cell->darkness = 256;
1180 cell->face [0] = 0;
1181 cell->face [1] = 0;
1182 cell->face [2] = 0;
1183 } 1569 }
1184 1570
1185 cell->darkness = flags & 8 ? *data++ : 255;
1186
1187 //TODO: don't trust server data to be in-range(!) 1571 //TODO: don't trust server data to be in-range(!)
1572
1573 if (flags & 8)
1574 {
1575 if (extmap)
1576 {
1577 uint8_t ext, cmd;
1578
1579 do
1580 {
1581 ext = *data++;
1582 cmd = ext & 0x3f;
1583
1584 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health
1587 {
1588 cell->stat_width = 1;
1589 cell->stat_hp = *data++;
1590 }
1591 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47)
1594 {
1595 if (*data == 4)
1596 ; // decode player count
1597
1598 data += *data + 1;
1599 }
1600 else if (cmd == 8) // cell flags
1601 cell->flags = *data++;
1602 else if (ext & 0x40) // unknown, multibyte => skip
1603 data += *data + 1;
1604 else
1605 data++;
1606 }
1607 while (ext & 0x80);
1608 }
1609 else
1610 cell->darkness = *data++ + 1;
1611 }
1188 1612
1189 if (flags & 4) 1613 if (flags & 4)
1190 { 1614 {
1191 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1615 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face];
1192 } 1618 }
1193 1619
1194 if (flags & 2) 1620 if (flags & 2)
1195 { 1621 {
1196 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1197 } 1625 }
1198 1626
1199 if (flags & 1) 1627 if (flags & 1)
1200 { 1628 {
1201 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1202 } 1632 }
1203 } 1633 }
1204 else 1634 else
1205 cell->darkness = -1; 1635 cell->darkness = 0;
1206 } 1636 }
1207} 1637}
1208 1638
1209SV * 1639SV *
1210mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1211 CODE: 1641 CODE:
1212{ 1642{
1213 int x1, x; 1643 int x1, x;
1214 int y1, y; 1644 int y1, y;
1215 int z; 1645 int z;
1236 { 1666 {
1237 mapcell *cell = row->col + (x - row->c0); 1667 mapcell *cell = row->col + (x - row->c0);
1238 1668
1239 for (z = 0; z <= 0; z++) 1669 for (z = 0; z <= 0; z++)
1240 { 1670 {
1241 mapface face = cell->face [z];
1242
1243 if (face)
1244 {
1245 maptex tex = self->tex [face]; 1671 maptex tex = self->tex [cell->tile [z]];
1246 int a0 = 255 - tex.a; 1672 int a0 = 255 - tex.a;
1247 int a1 = tex.a; 1673 int a1 = tex.a;
1248 1674
1249 r = (r * a0 + tex.r * a1) / 255; 1675 r = (r * a0 + tex.r * a1) / 255;
1250 g = (g * a0 + tex.g * a1) / 255; 1676 g = (g * a0 + tex.g * a1) / 255;
1251 b = (b * a0 + tex.b * a1) / 255; 1677 b = (b * a0 + tex.b * a1) / 255;
1252 a = (a * a0 + tex.a * a1) / 255; 1678 a = (a * a0 + tex.a * a1) / 255;
1253 }
1254 } 1679 }
1255 } 1680 }
1256 1681
1257 *map++ = (r ) 1682 *map++ = (r )
1258 | (g << 8) 1683 | (g << 8)
1265} 1690}
1266 OUTPUT: 1691 OUTPUT:
1267 RETVAL 1692 RETVAL
1268 1693
1269void 1694void
1270draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1271 PPCODE: 1696 CODE:
1272{ 1697{
1273 int vx, vy; 1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1701 smooth_key skey;
1274 int x, y, z; 1702 int x, y, z;
1275 int last_name; 1703 int last_name;
1276 mapface face;
1277 int sw4 = (sw + 3) & ~3;
1278 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1279 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1280 1704
1281 memset (darkness, 255, sw4 * sh); 1705 // thats current max. sorry.
1282 SvPOK_only (darkness_sv); 1706 if (sw > 255) sw = 255;
1283 SvCUR_set (darkness_sv, sw4 * sh); 1707 if (sh > 255) sh = 255;
1284 1708
1285 vx = self->x + (self->w - sw) / 2 - shift_x; 1709 // clear key, in case of extra padding
1286 vy = self->y + (self->h - sh) / 2 - shift_y; 1710 memset (&skey, 0, sizeof (skey));
1287
1288 /*
1289 int vx = self->vx = self->w >= sw
1290 ? self->x + (self->w - sw) / 2
1291 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1292
1293 int vy = self->vy = self->h >= sh
1294 ? self->y + (self->h - sh) / 2
1295 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1296 */
1297 1711
1298 glColor4ub (255, 255, 255, 255); 1712 glColor4ub (255, 255, 255, 255);
1299 1713
1714 glEnable (GL_BLEND);
1300 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1301 glEnable (GL_BLEND);
1302 glEnable (GL_TEXTURE_2D); 1716 glEnable (GL_TEXTURE_2D);
1303 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1304 1718
1305 glBegin (GL_QUADS); 1719 glBegin (GL_QUADS);
1306 1720
1307 last_name = 0; 1721 last_name = 0;
1308 1722
1723 mx += self->x;
1724 my += self->y;
1725
1726 // first pass: determine smooth_max
1727 // rather ugly, if you ask me
1728 // could also be stored inside mapcell and updated on change
1729 memset (smooth_max, 0, sizeof (smooth_max));
1730
1731 for (y = 0; y < sh; y++)
1732 if (0 <= y + my && y + my < self->rows)
1733 {
1734 maprow *row = self->row + (y + my);
1735
1736 for (x = 0; x < sw; x++)
1737 if (row->c0 <= x + mx && x + mx < row->c1)
1738 {
1739 mapcell *cell = row->col + (x + mx - row->c0);
1740
1741 smooth_max[x + 1][y + 1] =
1742 MAX (self->tex [cell->tile [0]].smoothlevel,
1743 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel));
1745 }
1746 }
1747
1309 for (z = 0; z < 3; z++) 1748 for (z = 0; z <= 2; z++)
1749 {
1750 memset (smooth_level, 0, sizeof (smooth_level));
1751
1310 for (y = 0; y < sh; y++) 1752 for (y = 0; y < sh; y++)
1311 if (0 <= y + vy && y + vy < self->rows) 1753 if (0 <= y + my && y + my < self->rows)
1312 { 1754 {
1313 maprow *row = self->row + (y + vy); 1755 maprow *row = self->row + (y + my);
1314 1756
1315 for (x = 0; x < sw; x++) 1757 for (x = 0; x < sw; x++)
1316 if (row->c0 <= x + vx && x + vx < row->c1) 1758 if (row->c0 <= x + mx && x + mx < row->c1)
1317 { 1759 {
1318 mapcell *cell = row->col + (x + vx - row->c0); 1760 mapcell *cell = row->col + (x + mx - row->c0);
1319
1320 darkness[y * sw4 + x] = cell->darkness < 0
1321 ? 255 - FOW_DARKNESS
1322 : 255 - cell->darkness;
1323
1324 face = cell->face [z]; 1761 tileid tile = cell->tile [z];
1325 1762
1326 if (face) 1763 if (tile)
1764 {
1765 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w;
1767 int py = (y + 1) * T - tex.h;
1768
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name)
1772 {
1773 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */
1775
1776 glEnd ();
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1778 glBegin (GL_QUADS);
1779 }
1780
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785
1786 if (cell->flags && z == 2)
1787 {
1788 if (cell->flags & 1)
1789 {
1790 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32;
1793
1794 glEnd ();
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1796 glBegin (GL_QUADS);
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 }
1803 }
1804
1805 // update smooth hash
1806 if (tex.smoothtile)
1807 {
1808 skey.tile = tex.smoothtile;
1809 skey.level = tex.smoothlevel;
1810
1811 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1812
1813 // add bits to current tile and all neighbours. skey.x|y is
1814 // shifted +1|+1 so we always stay positive.
1815
1816 // bits is ___n cccc CCCC bbbb
1817 // n do not draw borders&corners
1818 // c draw these corners, but...
1819 // C ... not these
1820 // b draw these borders
1821
1822 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1823 // ┃· ·· ·┃ ━━
1824
1825 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1826 // ·· ·· ·┏ ┓·
1827
1828 // full tile
1829 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1830
1831 // borders
1832 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1833 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1834 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1835 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1836
1837 // corners
1838 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1839 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1840 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1841 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1842 }
1843 }
1844 }
1845 }
1846
1847 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort
1849 {
1850 int w, b;
1851
1852 for (w = 0; w < 256 / 32; ++w)
1853 {
1854 uint32_t smask = smooth_level [w];
1855 if (smask)
1856 for (b = 0; b < 32; ++b)
1857 if (smask & (((uint32_t)1) << b))
1327 { 1858 {
1328 maptex tex = self->tex [face]; 1859 int level = (w << 5) | b;
1860 HE *he;
1329 1861
1330 int px = (x + 1) * 32 - tex.w; 1862 hv_iterinit (smooth);
1331 int py = (y + 1) * 32 - tex.h; 1863 while ((he = hv_iternext (smooth)))
1332
1333 if (last_name != tex.name)
1334 { 1864 {
1865 smooth_key *skey = (smooth_key *)HeKEY (he);
1866 IV bits = SvIVX (HeVAL (he));
1867
1868 if (!(bits & 0x1000)
1869 && skey->level == level
1870 && level > smooth_max [skey->x][skey->y])
1871 {
1872 maptex tex = self->tex [skey->tile];
1873 int px = (((int)skey->x) - 1) * T;
1874 int py = (((int)skey->y) - 1) * T;
1875 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column
1879
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name)
1883 {
1884 if (!tex.name)
1885 continue; // smoothing not yet available
1886
1335 glEnd (); 1887 glEnd ();
1336 last_name = tex.name;
1337 glBindTexture (GL_TEXTURE_2D, last_name); 1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1338 glBegin (GL_QUADS); 1889 glBegin (GL_QUADS);
1890 }
1891
1892 if (border)
1893 {
1894 float ox = border * dx;
1895
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1900 }
1901
1902 if (corner)
1903 {
1904 float ox = corner * dx;
1905
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1910 }
1911 }
1339 } 1912 }
1340
1341 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1342 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1343 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1344 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1345 } 1913 }
1346 }
1347 } 1914 }
1915 }
1916
1917 hv_clear (smooth);
1918 }
1348 1919
1349 glEnd (); 1920 glEnd ();
1350 1921
1351 glDisable (GL_TEXTURE_2D); 1922 glDisable (GL_TEXTURE_2D);
1352 glDisable (GL_BLEND); 1923 glDisable (GL_BLEND);
1353 1924
1925 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows)
1928 {
1929 maprow *row = self->row + (y + my);
1930
1931 for (x = 0; x < sw; x++)
1932 if (row->c0 <= x + mx && x + mx < row->c1)
1933 {
1934 mapcell *cell = row->col + (x + mx - row->c0);
1935
1936 int px = x * T;
1937 int py = y * T;
1938
1939 if (cell->stat_hp)
1940 {
1941 int width = cell->stat_width * T;
1942 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1943
1944 glColor3ub (0, 0, 0);
1945 glRectf (px + 1, py - thick - 2,
1946 px + width - 1, py);
1947
1948 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1949 glRectf (px + 2,
1950 py - thick - 1,
1951 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1952 }
1953 }
1954 }
1955}
1956
1957void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1959 CODE:
1960{
1961 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F },
1964 { 0.00F, 0.00F, 0.55F },
1965 { 1.00F, 0.00F, 0.00F },
1966
1967 { 1.00F, 0.54F, 0.00F },
1968 { 0.11F, 0.56F, 1.00F },
1969 { 0.93F, 0.46F, 0.00F },
1970 { 0.18F, 0.54F, 0.34F },
1971
1972 { 0.56F, 0.73F, 0.56F },
1973 { 0.80F, 0.80F, 0.80F },
1974 { 0.55F, 0.41F, 0.13F },
1975 { 0.99F, 0.77F, 0.26F },
1976
1977 { 0.74F, 0.65F, 0.41F },
1978
1979 { 0.00F, 1.00F, 1.00F },
1980 { 1.00F, 0.00F, 1.00F },
1981 { 1.00F, 1.00F, 0.00F },
1982 };
1983
1984 int x, y;
1985
1986 glEnable (GL_TEXTURE_2D);
1987 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1988 glEnable (GL_BLEND);
1989 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1990 glBegin (GL_QUADS);
1991
1992 for (y = 0; y < h; y++)
1993 for (x = 0; x < w; x++)
1994 {
1995 unsigned char m = data [x + y * w];
1996
1997 if (m)
1998 {
1999 float *c = color [m & 15];
2000
2001 float tx1 = m & 0x40 ? 0.5 : 0.;
2002 float tx2 = tx1 + 0.5;
2003
2004 glColor4f (c[0], c[1], c[2], 0.75);
2005 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2006 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2007 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2008 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2009 }
2010 }
2011
2012 glEnd ();
2013 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D);
2015}
2016
2017void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
2019 PPCODE:
2020{
2021 int x, y;
2022 int sw1 = sw + 2;
2023 int sh1 = sh + 2;
2024 int sh3 = sh * 3;
2025 int sw34 = (sw * 3 + 3) & ~3;
2026 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2027 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
2028 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2029
2030 SvPOK_only (darkness3_sv);
2031 SvCUR_set (darkness3_sv, sw34 * sh3);
2032
2033 mx += self->x - 1;
2034 my += self->y - 1;
2035
2036 memset (darkness1, 255, sw1 * sh1);
2037
2038 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows)
2040 {
2041 maprow *row = self->row + (y + my);
2042
2043 for (x = 0; x < sw1; x++)
2044 if (row->c0 <= x + mx && x + mx < row->c1)
2045 {
2046 mapcell *cell = row->col + (x + mx - row->c0);
2047
2048 darkness1 [y * sw1 + x] = cell->darkness
2049 ? 255 - (cell->darkness - 1)
2050 : 255 - FOW_DARKNESS;
2051 }
2052 }
2053
2054 for (y = 0; y < sh; ++y)
2055 for (x = 0; x < sw; ++x)
2056 {
2057 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2058 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2059 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2060 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2061 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2062 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2063 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2064 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2065 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2066
2067 uint8_t r11 = (d11 + d21 + d12) / 3;
2068 uint8_t r21 = d21;
2069 uint8_t r31 = (d21 + d31 + d32) / 3;
2070
2071 uint8_t r12 = d12;
2072 uint8_t r22 = d22;
2073 uint8_t r32 = d32;
2074
2075 uint8_t r13 = (d13 + d23 + d12) / 3;
2076 uint8_t r23 = d23;
2077 uint8_t r33 = (d23 + d33 + d32) / 3;
2078
2079 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2080 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2081 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2082 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2083 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2084 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2085 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2086 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2087 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2088 }
2089
2090 free (darkness1);
2091
1354 EXTEND (SP, 3); 2092 EXTEND (SP, 3);
1355 PUSHs (sv_2mortal (newSViv (sw4))); 2093 PUSHs (sv_2mortal (newSViv (sw34)));
1356 PUSHs (sv_2mortal (newSViv (sh))); 2094 PUSHs (sv_2mortal (newSViv (sh3)));
1357 PUSHs (darkness_sv); 2095 PUSHs (darkness3_sv);
1358} 2096}
1359 2097
1360SV * 2098SV *
1361get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1362 CODE: 2100 CODE:
1363{ 2101{
1364 int x, y, x1, y1; 2102 int x, y, x1, y1;
1365 SV *data_sv = newSV (w * h * 7 + 5); 2103 SV *data_sv = newSV (w * h * 7 + 5);
1366 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2104 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1391 if (row && row->c0 <= x && x < row->c1) 2129 if (row && row->c0 <= x && x < row->c1)
1392 { 2130 {
1393 mapcell *cell = row->col + (x - row->c0); 2131 mapcell *cell = row->col + (x - row->c0);
1394 uint8_t flags = 0; 2132 uint8_t flags = 0;
1395 2133
1396 if (cell->face [0]) flags |= 1; 2134 if (cell->tile [0]) flags |= 1;
1397 if (cell->face [1]) flags |= 2; 2135 if (cell->tile [1]) flags |= 2;
1398 if (cell->face [2]) flags |= 4; 2136 if (cell->tile [2]) flags |= 4;
1399 2137
1400 *data++ = flags; 2138 *data++ = flags;
1401 2139
1402 if (flags & 1) 2140 if (flags & 1)
1403 { 2141 {
2142 tileid tile = cell->tile [0];
1404 *data++ = cell->face [0] >> 8; 2143 *data++ = tile >> 8;
1405 *data++ = cell->face [0]; 2144 *data++ = tile;
1406 } 2145 }
1407 2146
1408 if (flags & 2) 2147 if (flags & 2)
1409 { 2148 {
2149 tileid tile = cell->tile [1];
1410 *data++ = cell->face [1] >> 8; 2150 *data++ = tile >> 8;
1411 *data++ = cell->face [1]; 2151 *data++ = tile;
1412 } 2152 }
1413 2153
1414 if (flags & 4) 2154 if (flags & 4)
1415 { 2155 {
2156 tileid tile = cell->tile [2];
1416 *data++ = cell->face [2] >> 8; 2157 *data++ = tile >> 8;
1417 *data++ = cell->face [2]; 2158 *data++ = tile;
1418 } 2159 }
1419 } 2160 }
1420 else 2161 else
1421 *data++ = 0; 2162 *data++ = 0;
1422 } 2163 }
1428} 2169}
1429 OUTPUT: 2170 OUTPUT:
1430 RETVAL 2171 RETVAL
1431 2172
1432void 2173void
1433set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1434 PPCODE: 2175 PPCODE:
1435{ 2176{
1436 int x, y, z; 2177 int x, y, z;
1437 int w, h; 2178 int w, h;
1438 int x1, y1; 2179 int x1, y1;
1462 { 2203 {
1463 uint8_t flags = *data++; 2204 uint8_t flags = *data++;
1464 2205
1465 if (flags) 2206 if (flags)
1466 { 2207 {
1467 mapface face[3] = { 0, 0, 0 };
1468
1469 mapcell *cell = row_get_cell (row, x); 2208 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 };
1470 2210
1471 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2211 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1472 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1473 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1474 2214
1475 if (cell->darkness <= 0) 2215 if (cell->darkness == 0)
1476 { 2216 {
1477 cell->darkness = -1; 2217 cell->darkness = 0;
1478 2218
1479 for (z = 0; z <= 2; z++) 2219 for (z = 0; z <= 2; z++)
1480 { 2220 {
1481 cell->face[z] = face[z]; 2221 tileid t = tile [z];
1482 2222
1483 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2223 if (t >= self->texs || (t && !self->tex [t].name))
2224 {
1484 XPUSHs (sv_2mortal (newSViv (face[z]))); 2225 XPUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t);
2227 }
2228
2229 cell->tile [z] = t;
1485 } 2230 }
1486 } 2231 }
1487 } 2232 }
1488 } 2233 }
1489 } 2234 }
1490} 2235}
1491 2236
1492MODULE = CFClient PACKAGE = CFClient::MixChunk 2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1493 2238
2239PROTOTYPES: DISABLE
2240
1494CFClient::MixChunk 2241CFPlus::MixChunk
2242new (SV *class, SV *data_sv)
2243 CODE:
2244{
2245 STRLEN datalen;
2246 char *data = SvPVbyte (data_sv, datalen);
2247
2248 RETVAL = Mix_LoadWAV_RW (SDL_RWFromConstMem (data, datalen), 1);
2249}
2250 OUTPUT:
2251 RETVAL
2252
2253CFPlus::MixChunk
1495new_from_file (SV *class, char *path) 2254new_from_file (SV *class, char *path)
1496 CODE: 2255 CODE:
1497 RETVAL = Mix_LoadWAV (path); 2256 RETVAL = Mix_LoadWAV (path);
1498 OUTPUT: 2257 OUTPUT:
1499 RETVAL 2258 RETVAL
1500 2259
1501void 2260void
1502DESTROY (CFClient::MixChunk self) 2261DESTROY (CFPlus::MixChunk self)
1503 CODE: 2262 CODE:
1504 Mix_FreeChunk (self); 2263 Mix_FreeChunk (self);
1505 2264
1506int 2265int
1507volume (CFClient::MixChunk self, int volume = -1) 2266volume (CFPlus::MixChunk self, int volume = -1)
1508 CODE: 2267 CODE:
1509 RETVAL = Mix_VolumeChunk (self, volume); 2268 RETVAL = Mix_VolumeChunk (self, volume);
1510 OUTPUT: 2269 OUTPUT:
1511 RETVAL 2270 RETVAL
1512 2271
1513int 2272int
1514play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2273play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1515 CODE: 2274 CODE:
1516 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2275 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1517 OUTPUT: 2276 OUTPUT:
1518 RETVAL 2277 RETVAL
1519 2278
1520MODULE = CFClient PACKAGE = CFClient::MixMusic 2279MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1521 2280
1522int 2281int
1523volume (int volume = -1) 2282volume (int volume = -1)
2283 PROTOTYPE: ;$
1524 CODE: 2284 CODE:
1525 RETVAL = Mix_VolumeMusic (volume); 2285 RETVAL = Mix_VolumeMusic (volume);
1526 OUTPUT: 2286 OUTPUT:
1527 RETVAL 2287 RETVAL
1528 2288
2289int
2290fade_out (int ms)
2291 CODE:
2292 RETVAL = Mix_FadeOutMusic (ms);
2293 OUTPUT:
2294 RETVAL
2295
1529CFClient::MixMusic 2296CFPlus::MixMusic
1530new_from_file (SV *class, char *path) 2297new_from_file (SV *class, char *path)
1531 CODE: 2298 CODE:
1532 RETVAL = Mix_LoadMUS (path); 2299 RETVAL = Mix_LoadMUS (path);
1533 OUTPUT: 2300 OUTPUT:
1534 RETVAL 2301 RETVAL
1535 2302
1536void 2303void
1537DESTROY (CFClient::MixMusic self) 2304DESTROY (CFPlus::MixMusic self)
1538 CODE: 2305 CODE:
1539 Mix_FreeMusic (self); 2306 Mix_FreeMusic (self);
1540 2307
1541int 2308int
1542play (CFClient::MixMusic self, int loops = -1) 2309play (CFPlus::MixMusic self, int loops = -1)
1543 CODE: 2310 CODE:
1544 RETVAL = Mix_PlayMusic (self, loops); 2311 RETVAL = Mix_PlayMusic (self, loops);
1545 OUTPUT: 2312 OUTPUT:
1546 RETVAL 2313 RETVAL
1547 2314
2315int
2316fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2317 CODE:
2318 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2319 OUTPUT:
2320 RETVAL
2321
1548MODULE = CFClient PACKAGE = CFClient::OpenGL 2322MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2323
2324PROTOTYPES: ENABLE
1549 2325
1550BOOT: 2326BOOT:
1551{ 2327{
1552 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2328 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1553 static const struct { 2329 static const struct {
1554 const char *name; 2330 const char *name;
1555 IV iv; 2331 IV iv;
1556 } *civ, const_iv[] = { 2332 } *civ, const_iv[] = {
1557# define const_iv(name) { # name, (IV)name } 2333# define const_iv(name) { # name, (IV)name }
2334 const_iv (GL_VENDOR),
2335 const_iv (GL_VERSION),
2336 const_iv (GL_EXTENSIONS),
1558 const_iv (GL_COLOR_MATERIAL), 2337 const_iv (GL_COLOR_MATERIAL),
1559 const_iv (GL_SMOOTH), 2338 const_iv (GL_SMOOTH),
1560 const_iv (GL_FLAT), 2339 const_iv (GL_FLAT),
1561 const_iv (GL_DITHER), 2340 const_iv (GL_DITHER),
1562 const_iv (GL_BLEND), 2341 const_iv (GL_BLEND),
1564 const_iv (GL_SCISSOR_TEST), 2343 const_iv (GL_SCISSOR_TEST),
1565 const_iv (GL_DEPTH_TEST), 2344 const_iv (GL_DEPTH_TEST),
1566 const_iv (GL_ALPHA_TEST), 2345 const_iv (GL_ALPHA_TEST),
1567 const_iv (GL_NORMALIZE), 2346 const_iv (GL_NORMALIZE),
1568 const_iv (GL_RESCALE_NORMAL), 2347 const_iv (GL_RESCALE_NORMAL),
2348 const_iv (GL_FRONT),
2349 const_iv (GL_BACK),
2350 const_iv (GL_AUX0),
1569 const_iv (GL_AND), 2351 const_iv (GL_AND),
1570 const_iv (GL_ONE), 2352 const_iv (GL_ONE),
1571 const_iv (GL_ZERO), 2353 const_iv (GL_ZERO),
1572 const_iv (GL_SRC_ALPHA), 2354 const_iv (GL_SRC_ALPHA),
1573 const_iv (GL_DST_ALPHA), 2355 const_iv (GL_DST_ALPHA),
1574 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2356 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1575 const_iv (GL_ONE_MINUS_DST_ALPHA), 2357 const_iv (GL_ONE_MINUS_DST_ALPHA),
1576 const_iv (GL_SRC_ALPHA_SATURATE), 2358 const_iv (GL_SRC_ALPHA_SATURATE),
1577 const_iv (GL_RGB), 2359 const_iv (GL_RGB),
1578 const_iv (GL_RGBA), 2360 const_iv (GL_RGBA),
2361 const_iv (GL_RGBA4),
2362 const_iv (GL_RGBA8),
2363 const_iv (GL_RGB5_A1),
1579 const_iv (GL_UNSIGNED_BYTE), 2364 const_iv (GL_UNSIGNED_BYTE),
1580 const_iv (GL_UNSIGNED_SHORT), 2365 const_iv (GL_UNSIGNED_SHORT),
1581 const_iv (GL_UNSIGNED_INT), 2366 const_iv (GL_UNSIGNED_INT),
1582 const_iv (GL_ALPHA), 2367 const_iv (GL_ALPHA),
1583 const_iv (GL_INTENSITY), 2368 const_iv (GL_INTENSITY),
1584 const_iv (GL_LUMINANCE), 2369 const_iv (GL_LUMINANCE),
1585 const_iv (GL_LUMINANCE_ALPHA), 2370 const_iv (GL_LUMINANCE_ALPHA),
1586 const_iv (GL_FLOAT), 2371 const_iv (GL_FLOAT),
1587 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2372 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1588 const_iv (GL_COMPILE), 2373 const_iv (GL_COMPILE),
2374 const_iv (GL_PROXY_TEXTURE_1D),
2375 const_iv (GL_PROXY_TEXTURE_2D),
1589 const_iv (GL_TEXTURE_1D), 2376 const_iv (GL_TEXTURE_1D),
1590 const_iv (GL_TEXTURE_2D), 2377 const_iv (GL_TEXTURE_2D),
1591 const_iv (GL_TEXTURE_ENV), 2378 const_iv (GL_TEXTURE_ENV),
1592 const_iv (GL_TEXTURE_MAG_FILTER), 2379 const_iv (GL_TEXTURE_MAG_FILTER),
1593 const_iv (GL_TEXTURE_MIN_FILTER), 2380 const_iv (GL_TEXTURE_MIN_FILTER),
1614 const_iv (GL_COLOR_LOGIC_OP), 2401 const_iv (GL_COLOR_LOGIC_OP),
1615 const_iv (GL_SEPARABLE_2D), 2402 const_iv (GL_SEPARABLE_2D),
1616 const_iv (GL_CONVOLUTION_2D), 2403 const_iv (GL_CONVOLUTION_2D),
1617 const_iv (GL_CONVOLUTION_BORDER_MODE), 2404 const_iv (GL_CONVOLUTION_BORDER_MODE),
1618 const_iv (GL_CONSTANT_BORDER), 2405 const_iv (GL_CONSTANT_BORDER),
2406 const_iv (GL_POINTS),
1619 const_iv (GL_LINES), 2407 const_iv (GL_LINES),
2408 const_iv (GL_LINE_STRIP),
1620 const_iv (GL_LINE_LOOP), 2409 const_iv (GL_LINE_LOOP),
1621 const_iv (GL_QUADS), 2410 const_iv (GL_QUADS),
1622 const_iv (GL_QUAD_STRIP), 2411 const_iv (GL_QUAD_STRIP),
1623 const_iv (GL_TRIANGLES), 2412 const_iv (GL_TRIANGLES),
1624 const_iv (GL_TRIANGLE_STRIP), 2413 const_iv (GL_TRIANGLE_STRIP),
1625 const_iv (GL_TRIANGLE_FAN), 2414 const_iv (GL_TRIANGLE_FAN),
2415 const_iv (GL_POLYGON),
1626 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2416 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2417 const_iv (GL_POINT_SMOOTH_HINT),
2418 const_iv (GL_LINE_SMOOTH_HINT),
2419 const_iv (GL_POLYGON_SMOOTH_HINT),
2420 const_iv (GL_GENERATE_MIPMAP_HINT),
1627 const_iv (GL_FASTEST), 2421 const_iv (GL_FASTEST),
2422 const_iv (GL_DONT_CARE),
2423 const_iv (GL_NICEST),
1628 const_iv (GL_V2F), 2424 const_iv (GL_V2F),
1629 const_iv (GL_V3F), 2425 const_iv (GL_V3F),
1630 const_iv (GL_T2F_V3F), 2426 const_iv (GL_T2F_V3F),
1631 const_iv (GL_T2F_N3F_V3F), 2427 const_iv (GL_T2F_N3F_V3F),
1632# undef const_iv 2428# undef const_iv
1633 }; 2429 };
1634 2430
1635 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2431 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1636 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2432 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2433
2434 texture_av = newAV ();
2435 AvREAL_off (texture_av);
1637} 2436}
1638 2437
1639char * 2438char *
1640gl_vendor () 2439gl_vendor ()
1641 CODE: 2440 CODE:
1655 CODE: 2454 CODE:
1656 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2455 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1657 OUTPUT: 2456 OUTPUT:
1658 RETVAL 2457 RETVAL
1659 2458
2459const char *glGetString (GLenum pname)
2460
2461GLint glGetInteger (GLenum pname)
2462 CODE:
2463 glGetIntegerv (pname, &RETVAL);
2464 OUTPUT:
2465 RETVAL
2466
2467GLdouble glGetDouble (GLenum pname)
2468 CODE:
2469 glGetDoublev (pname, &RETVAL);
2470 OUTPUT:
2471 RETVAL
2472
1660int glGetError () 2473int glGetError ()
2474
2475void glFinish ()
1661 2476
1662void glClear (int mask) 2477void glClear (int mask)
1663 2478
1664void glClearColor (float r, float g, float b, float a = 1.0) 2479void glClearColor (float r, float g, float b, float a = 1.0)
1665 PROTOTYPE: @ 2480 PROTOTYPE: @
1690 2505
1691void glPopMatrix () 2506void glPopMatrix ()
1692 2507
1693void glLoadIdentity () 2508void glLoadIdentity ()
1694 2509
2510void glDrawBuffer (int buffer)
2511
2512void glReadBuffer (int buffer)
2513
1695# near_ and far_ are due to microsofts buggy "c" compiler 2514# near_ and far_ are due to microsofts buggy "c" compiler
1696void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2515void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1697 2516
1698# near_ and far_ are due to microsofts buggy "c" compiler 2517# near_ and far_ are due to microsofts buggy "c" compiler
1699void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2518void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2519
2520PROTOTYPES: DISABLE
1700 2521
1701void glViewport (int x, int y, int width, int height) 2522void glViewport (int x, int y, int width, int height)
1702 2523
1703void glScissor (int x, int y, int width, int height) 2524void glScissor (int x, int y, int width, int height)
1704 2525
1712 2533
1713void glRotate (float angle, float x, float y, float z) 2534void glRotate (float angle, float x, float y, float z)
1714 CODE: 2535 CODE:
1715 glRotatef (angle, x, y, z); 2536 glRotatef (angle, x, y, z);
1716 2537
1717void glBegin (int mode)
1718
1719void glEnd ()
1720
1721void glColor (float r, float g, float b, float a = 1.0) 2538void glColor (float r, float g, float b, float a = 1.0)
1722 PROTOTYPE: @
1723 ALIAS: 2539 ALIAS:
1724 glColor_premultiply = 1 2540 glColor_premultiply = 1
1725 CODE: 2541 CODE:
1726 if (ix) 2542 if (ix)
1727 { 2543 {
1728 r *= a; 2544 r *= a;
1729 g *= a; 2545 g *= a;
1730 b *= a; 2546 b *= a;
1731 } 2547 }
1732 // microsoft visual "c" rounds instead of truncating... 2548 // microsoft visual "c" rounds instead of truncating...
1733 glColor4ub (MIN ((int)(r * 256.f), 255), 2549 glColor4f (r, g, b, a);
1734 MIN ((int)(g * 256.f), 255),
1735 MIN ((int)(b * 256.f), 255),
1736 MIN ((int)(a * 256.f), 255));
1737
1738void glInterleavedArrays (int format, int stride, char *data)
1739
1740void glDrawElements (int mode, int count, int type, char *indices)
1741
1742# 1.2 void glDrawRangeElements (int mode, int start, int end
1743 2550
1744void glRasterPos (float x, float y, float z = 0.) 2551void glRasterPos (float x, float y, float z = 0.)
1745 CODE: 2552 CODE:
1746 glRasterPos3f (0, 0, z); 2553 glRasterPos3f (0, 0, z);
1747 glBitmap (0, 0, 0, 0, x, y, 0); 2554 glBitmap (0, 0, 0, 0, x, y, 0);
1752 2559
1753void glTexCoord (float s, float t) 2560void glTexCoord (float s, float t)
1754 CODE: 2561 CODE:
1755 glTexCoord2f (s, t); 2562 glTexCoord2f (s, t);
1756 2563
2564void glRect (float x1, float y1, float x2, float y2)
2565 CODE:
2566 glRectf (x1, y1, x2, y2);
2567
2568PROTOTYPES: ENABLE
2569
2570void glBegin (int mode)
2571
2572void glEnd ()
2573
2574void glPointSize (GLfloat size)
2575
2576void glLineWidth (GLfloat width)
2577
2578void glInterleavedArrays (int format, int stride, char *data)
2579
2580void glDrawElements (int mode, int count, int type, char *indices)
2581
2582# 1.2 void glDrawRangeElements (int mode, int start, int end
2583
1757void glTexEnv (int target, int pname, float param) 2584void glTexEnv (int target, int pname, float param)
1758 CODE: 2585 CODE:
1759 glTexEnvf (target, pname, param); 2586 glTexEnvf (target, pname, param);
1760 2587
1761void glTexParameter (int target, int pname, float param) 2588void glTexParameter (int target, int pname, float param)
1783 2610
1784void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2611void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1785 2612
1786void glDrawPixels (int width, int height, int format, int type, char *pixels) 2613void glDrawPixels (int width, int height, int format, int type, char *pixels)
1787 2614
2615void glPixelZoom (float x, float y)
2616
1788void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2617void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1789 2618
1790int glGenTexture () 2619int glGenTexture ()
1791 CODE: 2620 CODE:
1792{ 2621 RETVAL = gen_texture ();
1793 GLuint name;
1794 glGenTextures (1, &name);
1795 RETVAL = name;
1796}
1797 OUTPUT: 2622 OUTPUT:
1798 RETVAL 2623 RETVAL
1799 2624
1800void glDeleteTexture (int name) 2625void glDeleteTexture (int name)
1801 CODE: 2626 CODE:
1802{
1803 GLuint name_ = name;
1804 glDeleteTextures (1, &name_); 2627 del_texture (name);
1805} 2628
1806
1807int glGenList () 2629int glGenList ()
1808 CODE: 2630 CODE:
1809 RETVAL = glGenLists (1); 2631 RETVAL = glGenLists (1);
1810 OUTPUT: 2632 OUTPUT:
1811 RETVAL 2633 RETVAL
1818 2640
1819void glEndList () 2641void glEndList ()
1820 2642
1821void glCallList (int list) 2643void glCallList (int list)
1822 2644
2645MODULE = CFPlus PACKAGE = CFPlus::UI::Base
1823 2646
2647PROTOTYPES: DISABLE
2648
2649void
2650find_widget (SV *self, NV x, NV y)
2651 PPCODE:
2652{
2653 if (within_widget (self, x, y))
2654 XPUSHs (self);
2655}
2656
2657BOOT:
2658{
2659 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
2660
2661 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
2662 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
2663 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
2664 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
2665}
2666
2667void
2668draw (SV *self)
2669 CODE:
2670{
2671 HV *hv;
2672 SV **svp;
2673 NV x, y, w, h;
2674 SV *draw_x_sv = GvSV (draw_x_gv);
2675 SV *draw_y_sv = GvSV (draw_y_gv);
2676 SV *draw_w_sv = GvSV (draw_w_gv);
2677 SV *draw_h_sv = GvSV (draw_h_gv);
2678 SV *hover;
2679 double draw_x, draw_y, draw_w, draw_h;
2680
2681 if (!SvROK (self))
2682 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2683
2684 hv = (HV *)SvRV (self);
2685
2686 if (SvTYPE (hv) != SVt_PVHV)
2687 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
2688
2689 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2690 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2691
2692 if (!h || !w)
2693 XSRETURN_EMPTY;
2694
2695 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2696 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2697
2698 draw_x = SvNV (draw_x_sv) + x;
2699 draw_y = SvNV (draw_y_sv) + y;
2700
2701 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2702 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2703 XSRETURN_EMPTY;
2704
2705 sv_setnv (draw_x_sv, draw_x);
2706 sv_setnv (draw_y_sv, draw_y);
2707
2708 glPushMatrix ();
2709 glTranslated (x, y, 0);
2710
2711 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2712 {
2713 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2714
2715 if (svp && SvTRUE (*svp))
2716 {
2717 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);
2718 glEnable (GL_BLEND);
2719 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2720 glBegin (GL_QUADS);
2721 glVertex2f (0, 0);
2722 glVertex2f (w, 0);
2723 glVertex2f (w, h);
2724 glVertex2f (0, h);
2725 glEnd ();
2726 glDisable (GL_BLEND);
2727 }
2728 }
2729#if 0
2730 if ($ENV{CFPLUS_DEBUG} & 1) {
2731 glPushMatrix;
2732 glColor 1, 1, 0, 1;
2733 glTranslate 0.375, 0.375;
2734 glBegin GL_LINE_LOOP;
2735 glVertex 0 , 0;
2736 glVertex $self->{w} - 1, 0;
2737 glVertex $self->{w} - 1, $self->{h} - 1;
2738 glVertex 0 , $self->{h} - 1;
2739 glEnd;
2740 glPopMatrix;
2741 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2742 }
2743#endif
2744 PUSHMARK (SP);
2745 XPUSHs (self);
2746 PUTBACK;
2747 call_method ("_draw", G_VOID | G_DISCARD);
2748 SPAGAIN;
2749
2750 glPopMatrix ();
2751
2752 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
2753 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
2754}
2755

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines