ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.117 by root, Thu Jun 15 15:33:57 2006 UTC vs.
Revision 1.174 by root, Fri Apr 6 07:45:34 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>
15	#include <stdlib.h>	23	#include <stdlib.h>
16		24
…		…
18	#include <SDL_endian.h>	26	#include <SDL_endian.h>
19	#include <SDL_image.h>	27	#include <SDL_image.h>
20	#include <SDL_mixer.h>	28	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	29	#include <SDL_opengl.h>
22		30
		31	#define PANGO_ENABLE_BACKEND
		32	#define G_DISABLE_CAST_CHECKS
		33
23	#include <glib/gmacros.h>	34	#include <glib/gmacros.h>
24		35
25	#include <pango/pango.h>	36	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		37
30	#ifndef _WIN32	38	#ifndef _WIN32
31	# include <sys/types.h>	39	# include <sys/types.h>
32	# include <sys/socket.h>	40	# include <sys/socket.h>
33	# include <netinet/in.h>	41	# include <netinet/in.h>
34	# include <netinet/tcp.h>	42	# include <netinet/tcp.h>
35	# include <inttypes.h>	43	# include <inttypes.h>
36	#else
37	typedef unsigned char uint8_t;
38	typedef unsigned short uint16_t;
39	typedef unsigned int uint32_t;
40	typedef signed char int8_t;
41	typedef signed short int16_t;
42	typedef signed int int32_t;
43	#endif	44	#endif
44		45
45	#include "glext.h"	46	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46		47
47	#define FOW_DARKNESS 32	48	#define FOW_DARKNESS 32
48		49
49	#define MAP_EXTEND_X 32	50	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	51	#define MAP_EXTEND_Y 512
51		52
52	#define MIN_FONT_HEIGHT 10	53	#define MIN_FONT_HEIGHT 10
		54
		55	#if 0
		56	# define PARACHUTE SDL_INIT_NOPARACHUTE
		57	#else
		58	# define PARACHUTE 0
		59	#endif
53		60
54	static struct	61	static struct
55	{	62	{
56	#define GL_FUNC(ptr,name) ptr name;	63	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	64	#include "glfunc.h"
…		…
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	74	else
68	glBlendFunc (sa, da);	75	glBlendFunc (sa, da);
69	}	76	}
70		77
		78	#include "texcache.c"
		79
		80	#include "pango-font.c"
		81	#include "pango-fontmap.c"
		82	#include "pango-render.c"
		83
71	typedef Mix_Chunk *CFClient__MixChunk;	84	typedef Mix_Chunk *CFPlus__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	85	typedef Mix_Music *CFPlus__MixMusic;
73		86
74	typedef PangoFontDescription *CFClient__Font;	87	typedef PangoFontDescription *CFPlus__Font;
		88
		89	static int
		90	shape_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	}
75		106
76	typedef struct cf_layout {	107	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	108	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	109	float r, g, b, a; // default color for rgba mode
80	int base_height;	110	int base_height;
81	CFClient__Font font;	111	CFPlus__Font font;
82	} *CFClient__Layout;	112	} *CFPlus__Layout;
83		113
84	static CFClient__Font default_font;	114	static CFPlus__Font default_font;
85	static PangoContext *ft2_context, *cairo_context;	115	static PangoContext *opengl_context;
86	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	116	static PangoFontMap *opengl_fontmap;
87		117
88	static void	118	static void
89	substitute_func (FcPattern *pattern, gpointer data)	119	substitute_func (FcPattern *pattern, gpointer data)
90	{	120	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	121	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	122	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	123	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	124	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	125	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	126	}
101		127
102	static void	128	static void
103	layout_update_font (CFClient__Layout self)	129	layout_update_font (CFPlus__Layout self)
104	{	130	{
105	/* 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
106	* reasonably well with bitstream vera	132	* reasonably well with bitstream vera
107	*/	133	*/
108	PangoFontDescription *font = self->font ? self->font : default_font;	134	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
112		138
113	pango_layout_set_font_description (self->pl, font);	139	pango_layout_set_font_description (self->pl, font);
114	}	140	}
115		141
116	static void	142	static void
117	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	143	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118	{	144	{
		145	PangoRectangle rect;
		146
		147	// get_pixel_* wrongly rounds down
119	pango_layout_get_pixel_size (self->pl, w, h);	148	pango_layout_get_extents (self->pl, 0, &rect);
120		149
121	if (!*w) *w = 1;	150	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122	if (!*h) *h = 1;	151	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123		152
124	*w = (*w + 3) & ~3;	153	if (!rect.width) rect.width = 1;
125	}	154	if (!rect.height) rect.height = 1;
126		155
		156	*w = rect.width;
		157	*h = rect.height;
		158	}
		159
		160	typedef uint16_t tileid;
127	typedef uint16_t mapface;	161	typedef uint16_t faceid;
128		162
129	typedef struct {	163	typedef struct {
130	GLint name;	164	int name;
131	int w, h;	165	int w, h;
132	float s, t;	166	float s, t;
133	uint8_t r, g, b, a;	167	uint8_t r, g, b, a;
134	} maptex;	168	} maptex;
135		169
136	typedef struct {	170	typedef struct {
		171	uint32_t player;
		172	tileid tile[3];
137	int16_t darkness;	173	uint16_t darkness;
138	mapface face[3];	174	uint8_t stat_width, stat_hp, flags;
139	} mapcell;	175	} mapcell;
140		176
141	typedef struct {	177	typedef struct {
142	int32_t c0, c1;	178	int32_t c0, c1;
143	mapcell *col;	179	mapcell *col;
144	} maprow;	180	} maprow;
145		181
146	typedef struct map {	182	typedef struct map {
147	int x, y, w, h;	183	int x, y, w, h;
148	int ox, oy; /* offset to virtual global coordinate system */	184	int ox, oy; /* offset to virtual global coordinate system */
149	int faces;	185	int faces; tileid *face2tile; // [faceid]
150	mapface *face;	186	int texs; maptex *tex; // [tileid]
151
152	int texs;
153	maptex *tex;
154		187
155	int32_t rows;	188	int32_t rows;
156	maprow *row;	189	maprow *row;
157	} *CFClient__Map;	190	} *CFPlus__Map;
158		191
159	static char *	192	static char *
160	prepend (char *ptr, int sze, int inc)	193	prepend (char *ptr, int sze, int inc)
161	{	194	{
162	char *p;	195	char *p;
…		…
179	}	212	}
180		213
181	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	214	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	215	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183		216
		217	static void
		218	need_facenum (struct map *self, faceid face)
		219	{
		220	while (self->faces <= face)
		221	{
		222	Append (tileid, self->face2tile, self->faces, self->faces);
		223	self->faces *= 2;
		224	}
		225	}
		226
		227	static void
		228	need_texid (struct map *self, int texid)
		229	{
		230	while (self->texs <= texid)
		231	{
		232	Append (maptex, self->tex, self->texs, self->texs);
		233	self->texs *= 2;
		234	}
		235	}
		236
184	static maprow *	237	static maprow *
185	map_get_row (CFClient__Map self, int y)	238	map_get_row (CFPlus__Map self, int y)
186	{	239	{
187	if (0 > y)	240	if (0 > y)
188	{	241	{
189	int extend = - y + MAP_EXTEND_Y;	242	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	243	Prepend (maprow, self->row, self->rows, extend);
…		…
228		281
229	return row->col + (x - row->c0);	282	return row->col + (x - row->c0);
230	}	283	}
231		284
232	static mapcell *	285	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	286	map_get_cell (CFPlus__Map self, int x, int y)
234	{	287	{
235	return row_get_cell (map_get_row (self, y), x);	288	return row_get_cell (map_get_row (self, y), x);
236	}	289	}
237		290
238	static void	291	static void
239	map_clear (CFClient__Map self)	292	map_clear (CFPlus__Map self)
240	{	293	{
241	int r;	294	int r;
242		295
243	for (r = 0; r < self->rows; r++)	296	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	297	Safefree (self->row[r].col);
…		…
252	self->row = 0;	305	self->row = 0;
253	self->rows = 0;	306	self->rows = 0;
254	}	307	}
255		308
256	static void	309	static void
257	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	310	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258	{	311	{
259	int x, y;	312	int x, y;
260	maprow *row;	313	maprow *row;
		314	mapcell *cell;
261		315
262	for (y = y0; y < y0 + h; y++)	316	for (y = y0; y < y0 + h; y++)
263	if (y >= 0)	317	if (y >= 0)
264	{	318	{
265	if (y >= self->rows)	319	if (y >= self->rows)
…		…
271	if (x >= row->c0)	325	if (x >= row->c0)
272	{	326	{
273	if (x >= row->c1)	327	if (x >= row->c1)
274	break;	328	break;
275		329
276	row->col[x - row->c0].darkness = -1;	330	cell = row->col + x - row->c0;
		331
		332	cell->darkness = 0;
		333	cell->stat_hp = 0;
		334	cell->flags = 0;
		335	cell->player = 0;
277	}	336	}
278	}	337	}
279	}	338	}
280		339
281	static void	340	static void
…		…
319	n |= n >> 16;	378	n |= n >> 16;
320		379
321	return n + 1;	380	return n + 1;
322	}	381	}
323		382
		383	/* SDL should provide this, really. */
		384	#define SDLK_MODIFIER_MIN 300
		385	#define SDLK_MODIFIER_MAX 314
		386
324	MODULE = CFClient PACKAGE = CFClient	387	MODULE = CFPlus PACKAGE = CFPlus
325		388
326	PROTOTYPES: ENABLE	389	PROTOTYPES: ENABLE
327		390
328	BOOT:	391	BOOT:
329	{	392	{
330	HV *stash = gv_stashpv ("CFClient", 1);	393	HV *stash = gv_stashpv ("CFPlus", 1);
331	static const struct {	394	static const struct {
332	const char *name;	395	const char *name;
333	IV iv;	396	IV iv;
334	} *civ, const_iv[] = {	397	} *civ, const_iv[] = {
335	# define const_iv(name) { # name, (IV)name }	398	# define const_iv(name) { # name, (IV)name }
		399	const_iv (SDLK_MODIFIER_MIN),
		400	const_iv (SDLK_MODIFIER_MAX),
		401
336	const_iv (SDL_ACTIVEEVENT),	402	const_iv (SDL_ACTIVEEVENT),
337	const_iv (SDL_KEYDOWN),	403	const_iv (SDL_KEYDOWN),
338	const_iv (SDL_KEYUP),	404	const_iv (SDL_KEYUP),
339	const_iv (SDL_MOUSEMOTION),	405	const_iv (SDL_MOUSEMOTION),
340	const_iv (SDL_MOUSEBUTTONDOWN),	406	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
349	const_iv (SDL_EVENT_RESERVEDA),	415	const_iv (SDL_EVENT_RESERVEDA),
350	const_iv (SDL_EVENT_RESERVEDB),	416	const_iv (SDL_EVENT_RESERVEDB),
351	const_iv (SDL_VIDEORESIZE),	417	const_iv (SDL_VIDEORESIZE),
352	const_iv (SDL_VIDEOEXPOSE),	418	const_iv (SDL_VIDEOEXPOSE),
353	const_iv (SDL_USEREVENT),	419	const_iv (SDL_USEREVENT),
		420
		421	const_iv (SDL_APPINPUTFOCUS),
		422	const_iv (SDL_APPMOUSEFOCUS),
		423	const_iv (SDL_APPACTIVE),
		424
354	const_iv (SDLK_KP0),	425	const_iv (SDLK_KP0),
355	const_iv (SDLK_KP1),	426	const_iv (SDLK_KP1),
356	const_iv (SDLK_KP2),	427	const_iv (SDLK_KP2),
357	const_iv (SDLK_KP3),	428	const_iv (SDLK_KP3),
358	const_iv (SDLK_KP4),	429	const_iv (SDLK_KP4),
…		…
413	const_iv (SDLK_BREAK),	484	const_iv (SDLK_BREAK),
414	const_iv (SDLK_MENU),	485	const_iv (SDLK_MENU),
415	const_iv (SDLK_POWER),	486	const_iv (SDLK_POWER),
416	const_iv (SDLK_EURO),	487	const_iv (SDLK_EURO),
417	const_iv (SDLK_UNDO),	488	const_iv (SDLK_UNDO),
		489
418	const_iv (KMOD_NONE),	490	const_iv (KMOD_NONE),
		491	const_iv (KMOD_SHIFT),
419	const_iv (KMOD_LSHIFT),	492	const_iv (KMOD_LSHIFT),
420	const_iv (KMOD_RSHIFT),	493	const_iv (KMOD_RSHIFT),
		494	const_iv (KMOD_CTRL),
421	const_iv (KMOD_LCTRL),	495	const_iv (KMOD_LCTRL),
422	const_iv (KMOD_RCTRL),	496	const_iv (KMOD_RCTRL),
		497	const_iv (KMOD_ALT),
423	const_iv (KMOD_LALT),	498	const_iv (KMOD_LALT),
424	const_iv (KMOD_RALT),	499	const_iv (KMOD_RALT),
		500	const_iv (KMOD_META),
425	const_iv (KMOD_LMETA),	501	const_iv (KMOD_LMETA),
426	const_iv (KMOD_RMETA),	502	const_iv (KMOD_RMETA),
427	const_iv (KMOD_NUM),	503	const_iv (KMOD_NUM),
428	const_iv (KMOD_CAPS),	504	const_iv (KMOD_CAPS),
429	const_iv (KMOD_MODE),	505	const_iv (KMOD_MODE),
430	const_iv (KMOD_CTRL),
431	const_iv (KMOD_SHIFT),
432	const_iv (KMOD_ALT),
433	const_iv (KMOD_META)
434	# undef const_iv	506	# undef const_iv
435	};	507	};
436		508
437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	509	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	510	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		511
		512	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		513	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
439	}	514	}
		515
		516	void
		517	weaken (SV *rv)
		518	PROTOTYPE: $
		519	CODE:
		520	sv_rvweaken (rv);
		521
		522	int
		523	in_destruct ()
		524	CODE:
		525	RETVAL = PL_main_cv == Nullcv;
		526	OUTPUT:
		527	RETVAL
440		528
441	NV floor (NV x)	529	NV floor (NV x)
442		530
443	NV ceil (NV x)	531	NV ceil (NV x)
444		532
445	void	533	void
446	pango_init ()	534	pango_init ()
447	CODE:	535	CODE:
448	// delayed, so it can pick up new fonts added by AddFontResourceEx
449	{	536	{
450	{
451	ft2_fontmap = pango_ft2_font_map_new ();	537	opengl_fontmap = pango_opengl_font_map_new ();
452	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	538	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	539	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
454	}
455	{
456	cairo_font_options_t *fopt = cairo_font_options_create ();
457	cairo_fontmap = pango_cairo_font_map_get_default ();
458	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459	#ifdef _WIN32
460	// cairo looks like shit eaten twice on windows
461	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462	#else
463	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464	#endif
465	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
466	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
467	pango_cairo_context_set_font_options (cairo_context, fopt);
468	cairo_font_options_destroy (fopt);
469	}
470	}	540	}
471		541
472	int	542	int
473	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	543	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
474		544
475	void	545	void
476	SDL_Quit ()	546	SDL_Quit ()
477		547
478	void	548	void
…		…
493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	563	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	564	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	565	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496		566
497	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	567	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		568	#if SDL_VERSION_ATLEAST(1,2,10)
		569	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		570	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		571	#endif
498		572
499	SDL_EnableUNICODE (1);	573	SDL_EnableUNICODE (1);
500	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	574	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501		575
502	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	576	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
554	case SDL_KEYDOWN:	628	case SDL_KEYDOWN:
555	case SDL_KEYUP:	629	case SDL_KEYUP:
556	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	630	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
557	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	631	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
558	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	632	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		633	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
559	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	634	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
560	break;	635	break;
561		636
562	case SDL_ACTIVEEVENT:	637	case SDL_ACTIVEEVENT:
563	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	638	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
589	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	664	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	665	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591	break;	666	break;
592	}	667	}
593		668
594	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	669	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595	}	670	}
596	}	671	}
597		672
598	int	673	int
599	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	674	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
613	#ifndef _WIN32	688	#ifndef _WIN32
614	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	689	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
615	#endif	690	#endif
616		691
617	void	692	void
		693	win32_proxy_info ()
		694	PPCODE:
		695	{
		696	#ifdef _WIN32
		697	char buffer[2048];
		698	DWORD buflen;
		699
		700	EXTEND (SP, 3);
		701
		702	buflen = sizeof (buffer);
		703	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		704	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		705	{
		706	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		707
		708	buflen = sizeof (buffer);
		709	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		710	{
		711	PUSHs (newSVpv (buffer, 0));
		712
		713	buflen = sizeof (buffer);
		714	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		715	PUSHs (newSVpv (buffer, 0));
		716	}
		717	}
		718	#endif
		719	}
		720
		721	void
618	add_font (char *file)	722	add_font (char *file)
619	CODE:	723	CODE:
620	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	724	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621	#ifdef _WIN32
622	// cairo... sigh... requires win2000
623	AddFontResourceEx (file, FR_PRIVATE, 0);
624	#endif
625		725
626	void	726	void
627	load_image_inline (SV *image_)	727	load_image_inline (SV *image_)
628	ALIAS:	728	ALIAS:
629	load_image_file = 1	729	load_image_file = 1
…		…
671		771
672	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	772	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673		773
674	assert (surface2->pitch == surface2->w * 4);	774	assert (surface2->pitch == surface2->w * 4);
675		775
		776	SDL_LockSurface (surface2);
676	EXTEND (SP, 5);	777	EXTEND (SP, 6);
677	PUSHs (sv_2mortal (newSViv (surface2->w)));	778	PUSHs (sv_2mortal (newSViv (surface2->w)));
678	PUSHs (sv_2mortal (newSViv (surface2->h)));	779	PUSHs (sv_2mortal (newSViv (surface2->h)));
679	SDL_LockSurface (surface2);
680	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	780	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
681	SDL_UnlockSurface (surface2);
682	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	781	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
683	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	782	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	783	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		784	SDL_UnlockSurface (surface2);
685		785
686	SDL_FreeSurface (surface);	786	SDL_FreeSurface (surface);
687	SDL_FreeSurface (surface2);	787	SDL_FreeSurface (surface2);
688	}	788	}
689		789
…		…
728	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	828	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
729	#endif	829	#endif
730	_exit (1);	830	_exit (1);
731		831
732	void	832	void
733	_exit (int retval)	833	_exit (int retval = 0)
734	CODE:	834	CODE:
		835	#ifdef WIN32
		836	ExitThread (retval); // unclean, please beam me up
		837	#else
735	_exit (retval);	838	_exit (retval);
		839	#endif
736		840
737	MODULE = CFClient PACKAGE = CFClient::Font	841	MODULE = CFPlus PACKAGE = CFPlus::Font
738		842
739	CFClient::Font	843	CFPlus::Font
740	new_from_file (SV *class, char *path, int id = 0)	844	new_from_file (SV *class, char *path, int id = 0)
741	CODE:	845	CODE:
742	{	846	{
743	int count;	847	int count;
744	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	848	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
747	}	851	}
748	OUTPUT:	852	OUTPUT:
749	RETVAL	853	RETVAL
750		854
751	void	855	void
752	DESTROY (CFClient::Font self)	856	DESTROY (CFPlus::Font self)
753	CODE:	857	CODE:
754	pango_font_description_free (self);	858	pango_font_description_free (self);
755		859
756	void	860	void
757	make_default (CFClient::Font self)	861	make_default (CFPlus::Font self)
758	CODE:	862	CODE:
759	default_font = self;	863	default_font = self;
760		864
761	MODULE = CFClient PACKAGE = CFClient::Layout	865	MODULE = CFPlus PACKAGE = CFPlus::Layout
762		866
763	CFClient::Layout	867	void
764	new (SV *class, int rgba = 0)	868	reset_glyph_cache ()
		869	CODE:
		870	tc_clear ();
		871
		872	CFPlus::Layout
		873	new (SV *class)
765	CODE:	874	CODE:
766	New (0, RETVAL, 1, struct cf_layout);	875	New (0, RETVAL, 1, struct cf_layout);
767		876
768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	877	RETVAL->pl = pango_layout_new (opengl_context);
769	RETVAL->rgba = rgba;
770	RETVAL->r = 1.;	878	RETVAL->r = 1.;
771	RETVAL->g = 1.;	879	RETVAL->g = 1.;
772	RETVAL->b = 1.;	880	RETVAL->b = 1.;
773	RETVAL->a = 1.;	881	RETVAL->a = 1.;
774	RETVAL->base_height = MIN_FONT_HEIGHT;	882	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
778	layout_update_font (RETVAL);	886	layout_update_font (RETVAL);
779	OUTPUT:	887	OUTPUT:
780	RETVAL	888	RETVAL
781		889
782	void	890	void
783	DESTROY (CFClient::Layout self)	891	DESTROY (CFPlus::Layout self)
784	CODE:	892	CODE:
785	g_object_unref (self->pl);	893	g_object_unref (self->pl);
786	Safefree (self);	894	Safefree (self);
787		895
		896	void
		897	set_text (CFPlus::Layout self, SV *text_)
		898	CODE:
		899	{
		900	STRLEN textlen;
		901	char *text = SvPVutf8 (text_, textlen);
		902
		903	pango_layout_set_text (self->pl, text, textlen);
		904	}
		905
		906	void
		907	set_markup (CFPlus::Layout self, SV *text_)
		908	CODE:
		909	{
		910	STRLEN textlen;
		911	char *text = SvPVutf8 (text_, textlen);
		912
		913	pango_layout_set_markup (self->pl, text, textlen);
		914	}
		915
		916	void
		917	set_shapes (CFPlus::Layout self, ...)
		918	CODE:
		919	{
		920	PangoAttrList *attrs = 0;
		921	const char *text = pango_layout_get_text (self->pl);
		922	const char *pos = text;
		923	int arg = 4;
		924
		925	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		926	{
		927	PangoRectangle inkrect, rect;
		928	PangoAttribute *attr;
		929
		930	int x = SvIV (ST (arg - 3));
		931	int y = SvIV (ST (arg - 2));
		932	int w = SvIV (ST (arg - 1));
		933	int h = SvIV (ST (arg ));
		934
		935	inkrect.x = 0;
		936	inkrect.y = 0;
		937	inkrect.width = 0;
		938	inkrect.height = 0;
		939
		940	rect.x = x * PANGO_SCALE;
		941	rect.y = y * PANGO_SCALE;
		942	rect.width = w * PANGO_SCALE;
		943	rect.height = h * PANGO_SCALE;
		944
		945	if (!attrs)
		946	attrs = pango_layout_get_attributes (self->pl);
		947
		948	attr = pango_attr_shape_new (&inkrect, &rect);
		949	attr->start_index = pos - text;
		950	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		951	pango_attr_list_insert (attrs, attr);
		952
		953	arg += 4;
		954	pos += sizeof (OBJ_STR) - 1;
		955	}
		956
		957	if (attrs)
		958	pango_layout_set_attributes (self->pl, attrs);
		959	}
		960
		961	void
		962	get_shapes (CFPlus::Layout self)
		963	PPCODE:
		964	{
		965	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		966
		967	do
		968	{
		969	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		970
		971	if (run && shape_attr_p (run))
		972	{
		973	PangoRectangle extents;
		974	pango_layout_iter_get_run_extents (iter, 0, &extents);
		975
		976	EXTEND (SP, 2);
		977	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		978	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		979	}
		980	}
		981	while (pango_layout_iter_next_run (iter));
		982
		983	pango_layout_iter_free (iter);
		984	}
		985
788	int	986	int
789	is_rgba (CFClient::Layout self)	987	has_wrapped (CFPlus::Layout self)
790	CODE:	988	CODE:
791	RETVAL = self->rgba;	989	{
		990	int lines = 1;
		991	const char *text = pango_layout_get_text (self->pl);
		992
		993	while (*text)
		994	lines += *text++ == '\n';
		995
		996	RETVAL = lines < pango_layout_get_line_count (self->pl);
		997	}
792	OUTPUT:	998	OUTPUT:
793	RETVAL	999	RETVAL
794		1000
795	void
796	set_text (CFClient::Layout self, SV *text_)
797	CODE:
798	{
799	STRLEN textlen;
800	char *text = SvPVutf8 (text_, textlen);
801
802	pango_layout_set_text (self->pl, text, textlen);
803	}
804
805	void
806	set_markup (CFClient::Layout self, SV *text_)
807	CODE:
808	{
809	STRLEN textlen;
810	char *text = SvPVutf8 (text_, textlen);
811
812	pango_layout_set_markup (self->pl, text, textlen);
813	}
814
815	SV *	1001	SV *
816	get_text (CFClient::Layout self)	1002	get_text (CFPlus::Layout self)
817	CODE:	1003	CODE:
818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1004	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819	sv_utf8_decode (RETVAL);	1005	sv_utf8_decode (RETVAL);
820	OUTPUT:	1006	OUTPUT:
821	RETVAL	1007	RETVAL
822		1008
823	void	1009	void
824	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	1010	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
825	CODE:	1011	CODE:
826	self->r = r;	1012	self->r = r;
827	self->g = g;	1013	self->g = g;
828	self->b = b;	1014	self->b = b;
829	self->a = a;	1015	self->a = a;
830		1016
831	void	1017	void
832	set_font (CFClient::Layout self, CFClient::Font font = 0)	1018	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833	CODE:	1019	CODE:
834	if (self->font != font)	1020	if (self->font != font)
835	{	1021	{
836	self->font = font;	1022	self->font = font;
837	layout_update_font (self);	1023	layout_update_font (self);
838	}	1024	}
839		1025
840	void	1026	void
841	set_height (CFClient::Layout self, int base_height)	1027	set_height (CFPlus::Layout self, int base_height)
842	CODE:	1028	CODE:
843	if (self->base_height != base_height)	1029	if (self->base_height != base_height)
844	{	1030	{
845	self->base_height = base_height;	1031	self->base_height = base_height;
846	layout_update_font (self);	1032	layout_update_font (self);
847	}	1033	}
848		1034
849	void	1035	void
850	set_width (CFClient::Layout self, int max_width = -1)	1036	set_width (CFPlus::Layout self, int max_width = -1)
851	CODE:	1037	CODE:
852	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1038	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
853		1039
854	void	1040	void
855	set_indent (CFClient::Layout self, int indent)	1041	set_indent (CFPlus::Layout self, int indent)
856	CODE:	1042	CODE:
857	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1043	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858		1044
859	void	1045	void
860	set_spacing (CFClient::Layout self, int spacing)	1046	set_spacing (CFPlus::Layout self, int spacing)
861	CODE:	1047	CODE:
862	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1048	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863		1049
864	void	1050	void
865	set_ellipsise (CFClient::Layout self, int ellipsise)	1051	set_ellipsise (CFPlus::Layout self, int ellipsise)
866	CODE:	1052	CODE:
867	pango_layout_set_ellipsize (self->pl,	1053	pango_layout_set_ellipsize (self->pl,
868	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1054	ellipsise == 1 ? PANGO_ELLIPSIZE_START
869	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1055	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1056	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
871	: PANGO_ELLIPSIZE_NONE	1057	: PANGO_ELLIPSIZE_NONE
872	);	1058	);
873		1059
874	void	1060	void
875	set_single_paragraph_mode (CFClient::Layout self, int spm)	1061	set_single_paragraph_mode (CFPlus::Layout self, int spm)
876	CODE:	1062	CODE:
877	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1063	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878		1064
879	void	1065	void
880	size (CFClient::Layout self)	1066	size (CFPlus::Layout self)
881	PPCODE:	1067	PPCODE:
882	{	1068	{
883	int w, h;	1069	int w, h;
884		1070
885	layout_get_pixel_size (self, &w, &h);	1071	layout_get_pixel_size (self, &w, &h);
…		…
888	PUSHs (sv_2mortal (newSViv (w)));	1074	PUSHs (sv_2mortal (newSViv (w)));
889	PUSHs (sv_2mortal (newSViv (h)));	1075	PUSHs (sv_2mortal (newSViv (h)));
890	}	1076	}
891		1077
892	int	1078	int
		1079	descent (CFPlus::Layout self)
		1080	CODE:
		1081	{
		1082	PangoRectangle rect;
		1083	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1084	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1085	RETVAL = PANGO_DESCENT (rect);
		1086	}
		1087	OUTPUT:
		1088	RETVAL
		1089
		1090	int
893	xy_to_index (CFClient::Layout self, int x, int y)	1091	xy_to_index (CFPlus::Layout self, int x, int y)
894	CODE:	1092	CODE:
895	{	1093	{
896	int index, trailing;	1094	int index, trailing;
897	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1095	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
898	RETVAL = index;	1096	RETVAL = index + trailing;
899	}	1097	}
900	OUTPUT:	1098	OUTPUT:
901	RETVAL	1099	RETVAL
902		1100
903	void	1101	void
904	cursor_pos (CFClient::Layout self, int index)	1102	cursor_pos (CFPlus::Layout self, int index)
905	PPCODE:	1103	PPCODE:
906	{	1104	{
907	PangoRectangle strong_pos;	1105	PangoRectangle strong_pos;
908	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1106	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909		1107
…		…
912	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1110	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1111	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914	}	1112	}
915		1113
916	void	1114	void
917	render (CFClient::Layout self)	1115	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
918	PPCODE:	1116	PPCODE:
919	{	1117	{
920	SV *retval;	1118	int line, x;
921	int w, h;
922		1119
923	layout_get_pixel_size (self, &w, &h);	1120	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1121	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
924		1122
925	if (self->rgba)
926	{
927	cairo_surface_t *surface;
928	cairo_t *cairo;
929
930	retval = newSV (w * h * 4);
931	SvPOK_only (retval);
932	SvCUR_set (retval, w * h * 4);
933
934	memset (SvPVX (retval), 0, w * h * 4);
935
936	surface = cairo_image_surface_create_for_data (
937	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
938	cairo = cairo_create (surface);
939	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
940
941	pango_cairo_show_layout (cairo, self->pl);
942
943	cairo_destroy (cairo);
944	cairo_surface_destroy (surface);
945
946	// what a mess, and its premultiplied, too :(
947	{
948	uint32_t *p = (uint32_t *)SvPVX (retval);
949	uint32_t *e = p + w * h;
950
951	while (p < e)
952	{
953	uint32_t rgba = *p;
954	rgba = (rgba >> 24) | (rgba << 8);
955	#if 0
956	#ifdef _WIN32
957	{//D
958	uint8_t r = rgba >> 24;
959	uint8_t g = rgba >> 16;
960	uint8_t b = rgba >> 8;
961	uint8_t a = rgba >> 0;
962
963	rgba = (rgba & 0xffffff00) | a;
964	}
965	#endif
966	#endif
967	rgba = SDL_SwapBE32 (rgba);
968	*p++ = rgba;
969	}
970	}
971
972	EXTEND (SP, 5);	1123	EXTEND (SP, 2);
973	PUSHs (sv_2mortal (newSViv (w)));	1124	PUSHs (sv_2mortal (newSViv (line - 1)));
		1125	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1126	}
		1127
		1128	void
		1129	line_x_to_index (CFPlus::Layout self, int line, int x)
		1130	PPCODE:
		1131	{
		1132	PangoLayoutLine *lp;
		1133	int index, trailing;
		1134
		1135	if (line < 0)
		1136	XSRETURN_EMPTY;
		1137
		1138	if (!(lp = pango_layout_get_line (self->pl, line)))
		1139	XSRETURN_EMPTY; /* do better */
		1140
		1141	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1142
		1143	EXTEND (SP, 2);
		1144	if (GIMME_V == G_SCALAR)
974	PUSHs (sv_2mortal (newSViv (h)));	1145	PUSHs (sv_2mortal (newSViv (index + trailing)));
975	PUSHs (sv_2mortal (retval));
976	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
977	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
978	}
979	else	1146	else
980	{	1147	{
981	FT_Bitmap bitmap;
982
983	retval = newSV (w * h);
984	SvPOK_only (retval);
985	SvCUR_set (retval, w * h);
986
987	bitmap.rows = h;
988	bitmap.width = w;
989	bitmap.pitch = w;
990	bitmap.buffer = (unsigned char*)SvPVX (retval);
991	bitmap.num_grays = 256;
992	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
993
994	memset (bitmap.buffer, 0, w * h);
995
996	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
997
998	EXTEND (SP, 5);
999	PUSHs (sv_2mortal (newSViv (w)));	1148	PUSHs (sv_2mortal (newSViv (index)));
1000	PUSHs (sv_2mortal (newSViv (h)));	1149	PUSHs (sv_2mortal (newSViv (trailing)));
1001	PUSHs (sv_2mortal (retval));
1002	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1003	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1004	}	1150	}
1005	}	1151	}
1006		1152
		1153	void
		1154	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1155	PPCODE:
		1156	pango_opengl_render_layout_subpixel (
		1157	self->pl,
		1158	x * PANGO_SCALE, y * PANGO_SCALE,
		1159	self->r, self->g, self->b, self->a,
		1160	flags
		1161	);
		1162
1007	MODULE = CFClient PACKAGE = CFClient::Texture	1163	MODULE = CFPlus PACKAGE = CFPlus::Texture
1008		1164
1009	void	1165	void
1010	pad2pot (SV *data_, SV *w_, SV *h_)	1166	pad2pot (SV *data_, SV *w_, SV *h_)
1011	CODE:	1167	CODE:
1012	{	1168	{
…		…
1090	glDisable (GL_ALPHA_TEST);	1246	glDisable (GL_ALPHA_TEST);
1091	glDisable (GL_BLEND);	1247	glDisable (GL_BLEND);
1092	}	1248	}
1093	}	1249	}
1094		1250
1095	MODULE = CFClient PACKAGE = CFClient::Map	1251	MODULE = CFPlus PACKAGE = CFPlus::Map
1096		1252
1097	CFClient::Map	1253	CFPlus::Map
1098	new (SV *class, int map_width, int map_height)	1254	new (SV *class)
1099	CODE:	1255	CODE:
1100	New (0, RETVAL, 1, struct map);	1256	New (0, RETVAL, 1, struct map);
1101	RETVAL->x = 0;	1257	RETVAL->x = 0;
1102	RETVAL->y = 0;	1258	RETVAL->y = 0;
1103	RETVAL->w = map_width;	1259	RETVAL->w = 0;
1104	RETVAL->h = map_height;	1260	RETVAL->h = 0;
1105	RETVAL->ox = 0;	1261	RETVAL->ox = 0;
1106	RETVAL->oy = 0;	1262	RETVAL->oy = 0;
1107	RETVAL->faces = 8192;	1263	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1108	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1264	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1109	RETVAL->texs = 8192;
1110	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1111	RETVAL->rows = 0;	1265	RETVAL->rows = 0;
1112	RETVAL->row = 0;	1266	RETVAL->row = 0;
1113	OUTPUT:	1267	OUTPUT:
1114	RETVAL	1268	RETVAL
1115		1269
1116	void	1270	void
1117	DESTROY (CFClient::Map self)	1271	DESTROY (CFPlus::Map self)
1118	CODE:	1272	CODE:
1119	{	1273	{
1120	map_clear (self);	1274	map_clear (self);
1121	Safefree (self->face);	1275	Safefree (self->face2tile);
1122	Safefree (self->tex);	1276	Safefree (self->tex);
1123	Safefree (self);	1277	Safefree (self);
1124	}	1278	}
1125		1279
1126	void	1280	void
		1281	resize (CFPlus::Map self, int map_width, int map_height)
		1282	CODE:
		1283	self->w = map_width;
		1284	self->h = map_height;
		1285
		1286	void
1127	clear (CFClient::Map self)	1287	clear (CFPlus::Map self)
1128	CODE:	1288	CODE:
1129	map_clear (self);	1289	map_clear (self);
1130		1290
1131	void	1291	void
1132	set_face (CFClient::Map self, int face, int texid)	1292	set_tileid (CFPlus::Map self, int face, int tile)
1133	CODE:	1293	CODE:
1134	{	1294	{
1135	while (self->faces <= face)	1295	need_facenum (self, face); self->face2tile [face] = tile;
1136	{	1296	need_texid (self, tile);
1137	Append (mapface, self->face, self->faces, self->faces);
1138	self->faces *= 2;
1139	}
1140
1141	self->face [face] = texid;
1142	}	1297	}
1143		1298
1144	void	1299	void
1145	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1300	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1146	CODE:	1301	CODE:
1147	{	1302	{
1148	while (self->texs <= texid)	1303	need_texid (self, texid);
1149	{
1150	Append (maptex, self->tex, self->texs, self->texs);
1151	self->texs *= 2;
1152	}
1153		1304
1154	{	1305	{
1155	maptex *tex = self->tex + texid;	1306	maptex *tex = self->tex + texid;
1156		1307
1157	tex->name = name;	1308	tex->name = name;
…		…
1174	// from transparent color bleeding and ugly wrapping effects.	1325	// from transparent color bleeding and ugly wrapping effects.
1175	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1326	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176	}	1327	}
1177		1328
1178	int	1329	int
1179	ox (CFClient::Map self)	1330	ox (CFPlus::Map self)
1180	ALIAS:	1331	ALIAS:
1181	oy = 1	1332	oy = 1
1182	x = 2	1333	x = 2
1183	y = 3	1334	y = 3
1184	w = 4	1335	w = 4
…		…
1195	}	1346	}
1196	OUTPUT:	1347	OUTPUT:
1197	RETVAL	1348	RETVAL
1198		1349
1199	void	1350	void
1200	scroll (CFClient::Map self, int dx, int dy)	1351	scroll (CFPlus::Map self, int dx, int dy)
1201	CODE:	1352	CODE:
1202	{	1353	{
1203	if (dx > 0)	1354	if (dx > 0)
1204	map_blank (self, self->x, self->y, dx - 1, self->h);	1355	map_blank (self, self->x, self->y, dx, self->h);
1205	else if (dx < 0)	1356	else if (dx < 0)
1206	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1357	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1207		1358
1208	if (dy > 0)	1359	if (dy > 0)
1209	map_blank (self, self->x, self->y, self->w, dy - 1);	1360	map_blank (self, self->x, self->y, self->w, dy);
1210	else if (dy < 0)	1361	else if (dy < 0)
1211	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1362	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1212		1363
1213	self->ox += dx; self->x += dx;	1364	self->ox += dx; self->x += dx;
1214	self->oy += dy; self->y += dy;	1365	self->oy += dy; self->y += dy;
1215		1366
1216	while (self->y < 0)	1367	while (self->y < 0)
…		…
1221	self->y += MAP_EXTEND_Y;	1372	self->y += MAP_EXTEND_Y;
1222	}	1373	}
1223	}	1374	}
1224		1375
1225	void	1376	void
1226	map1a_update (CFClient::Map self, SV *data_)	1377	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1227	CODE:	1378	CODE:
1228	{	1379	{
1229	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1380	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1230	uint8_t *data_end = (uint8_t *)SvEND (data_);	1381	uint8_t *data_end = (uint8_t *)SvEND (data_);
1231	mapcell *cell;	1382	mapcell *cell;
1232	int x, y, flags;	1383	int x, y, flags;
1233		1384
1234	while (data < data_end)	1385	while (data < data_end - 1)
1235	{	1386	{
1236	flags = (data [0] << 8) + data [1]; data += 2;	1387	flags = (data [0] << 8) + data [1]; data += 2;
1237		1388
1238	x = ((flags >> 10) & 63) + self->x;	1389	x = self->x + ((flags >> 10) & 63);
1239	y = ((flags >> 4) & 63) + self->y;	1390	y = self->y + ((flags >> 4) & 63);
1240		1391
1241	cell = map_get_cell (self, x, y);	1392	cell = map_get_cell (self, x, y);
1242		1393
1243	if (flags & 15)	1394	if (flags & 15)
1244	{	1395	{
1245	if (cell->darkness < 0)	1396	if (!cell->darkness)
1246	{	1397	{
		1398	memset (cell, 0, sizeof (*cell));
1247	cell->darkness = 0;	1399	cell->darkness = 256;
1248	cell->face [0] = 0;
1249	cell->face [1] = 0;
1250	cell->face [2] = 0;
1251	}	1400	}
1252		1401
1253	cell->darkness = flags & 8 ? *data++ : 255;
1254
1255	//TODO: don't trust server data to be in-range(!)	1402	//TODO: don't trust server data to be in-range(!)
		1403
		1404	if (flags & 8)
		1405	{
		1406	if (extmap)
		1407	{
		1408	uint8_t ext, cmd;
		1409
		1410	do
		1411	{
		1412	ext = *data++;
		1413	cmd = ext & 0x3f;
		1414
		1415	if (cmd < 4)
		1416	cell->darkness = 255 - ext * 64 + 1;
		1417	else if (cmd == 5) // health
		1418	{
		1419	cell->stat_width = 1;
		1420	cell->stat_hp = *data++;
		1421	}
		1422	else if (cmd == 6) // monster width
		1423	cell->stat_width = *data++ + 1;
		1424	else if (cmd == 0x47)
		1425	{
		1426	if (*data == 8)
		1427	; // decode player uuid
		1428
		1429	data += *data + 1;
		1430	}
		1431	else if (cmd == 8) // cell flags
		1432	cell->flags = *data++;
		1433	else if (ext & 0x40) // unknown, multibyte => skip
		1434	data += *data + 1;
		1435	else
		1436	data++;
		1437	}
		1438	while (ext & 0x80);
		1439	}
		1440	else
		1441	cell->darkness = *data++ + 1;
		1442	}
1256		1443
1257	if (flags & 4)	1444	if (flags & 4)
1258	{	1445	{
1259	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1446	faceid face = (data [0] << 8) + data [1]; data += 2;
		1447	need_facenum (self, face);
		1448	cell->tile [0] = self->face2tile [face];
1260	}	1449	}
1261		1450
1262	if (flags & 2)	1451	if (flags & 2)
1263	{	1452	{
1264	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1453	faceid face = (data [0] << 8) + data [1]; data += 2;
		1454	need_facenum (self, face);
		1455	cell->tile [1] = self->face2tile [face];
1265	}	1456	}
1266		1457
1267	if (flags & 1)	1458	if (flags & 1)
1268	{	1459	{
1269	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1460	faceid face = (data [0] << 8) + data [1]; data += 2;
		1461	need_facenum (self, face);
		1462	cell->tile [2] = self->face2tile [face];
1270	}	1463	}
1271	}	1464	}
1272	else	1465	else
1273	cell->darkness = -1;	1466	cell->darkness = 0;
1274	}	1467	}
1275	}	1468	}
1276		1469
1277	SV *	1470	SV *
1278	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1471	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1279	CODE:	1472	CODE:
1280	{	1473	{
1281	int x1, x;	1474	int x1, x;
1282	int y1, y;	1475	int y1, y;
1283	int z;	1476	int z;
…		…
1304	{	1497	{
1305	mapcell *cell = row->col + (x - row->c0);	1498	mapcell *cell = row->col + (x - row->c0);
1306		1499
1307	for (z = 0; z <= 0; z++)	1500	for (z = 0; z <= 0; z++)
1308	{	1501	{
1309	mapface face = cell->face [z];
1310
1311	if (face)
1312	{
1313	maptex tex = self->tex [face];	1502	maptex tex = self->tex [cell->tile [z]];
1314	int a0 = 255 - tex.a;	1503	int a0 = 255 - tex.a;
1315	int a1 = tex.a;	1504	int a1 = tex.a;
1316		1505
1317	r = (r * a0 + tex.r * a1) / 255;	1506	r = (r * a0 + tex.r * a1) / 255;
1318	g = (g * a0 + tex.g * a1) / 255;	1507	g = (g * a0 + tex.g * a1) / 255;
1319	b = (b * a0 + tex.b * a1) / 255;	1508	b = (b * a0 + tex.b * a1) / 255;
1320	a = (a * a0 + tex.a * a1) / 255;	1509	a = (a * a0 + tex.a * a1) / 255;
1321	}
1322	}	1510	}
1323	}	1511	}
1324		1512
1325	*map++ = (r )	1513	*map++ = (r )
1326	| (g << 8)	1514	| (g << 8)
…		…
1333	}	1521	}
1334	OUTPUT:	1522	OUTPUT:
1335	RETVAL	1523	RETVAL
1336		1524
1337	void	1525	void
1338	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1526	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1339	CODE:	1527	CODE:
1340	{	1528	{
1341	int vx, vy;
1342	int x, y, z;	1529	int x, y, z;
1343	int last_name;	1530	int last_name;
1344	mapface face;
1345
1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1348
1349	/*
1350	int vx = self->vx = self->w >= sw
1351	? self->x + (self->w - sw) / 2
1352	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1353
1354	int vy = self->vy = self->h >= sh
1355	? self->y + (self->h - sh) / 2
1356	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1357	*/
1358		1531
1359	glColor4ub (255, 255, 255, 255);	1532	glColor4ub (255, 255, 255, 255);
1360		1533
1361	glEnable (GL_BLEND);	1534	glEnable (GL_BLEND);
1362	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1535	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1365		1538
1366	glBegin (GL_QUADS);	1539	glBegin (GL_QUADS);
1367		1540
1368	last_name = 0;	1541	last_name = 0;
1369		1542
		1543	mx += self->x;
		1544	my += self->y;
		1545
1370	for (z = 0; z < 3; z++)	1546	for (z = 0; z < 3; z++)
1371	for (y = 0; y < sh; y++)	1547	for (y = 0; y < sh; y++)
1372	if (0 <= y + vy && y + vy < self->rows)	1548	if (0 <= y + my && y + my < self->rows)
1373	{	1549	{
1374	maprow *row = self->row + (y + vy);	1550	maprow *row = self->row + (y + my);
1375		1551
1376	for (x = 0; x < sw; x++)	1552	for (x = 0; x < sw; x++)
1377	if (row->c0 <= x + vx && x + vx < row->c1)	1553	if (row->c0 <= x + mx && x + mx < row->c1)
1378	{	1554	{
1379	mapcell *cell = row->col + (x + vx - row->c0);	1555	mapcell *cell = row->col + (x + mx - row->c0);
1380
1381	face = cell->face [z];	1556	tileid tile = cell->tile [z];
1382		1557
1383	if (face)	1558	if (tile)
1384	{	1559	{
1385	maptex tex = self->tex [face];	1560	maptex tex = self->tex [tile];
1386
1387	int px = (x + 1) * 32 - tex.w;	1561	int px = (x + 1) * T - tex.w;
1388	int py = (y + 1) * 32 - tex.h;	1562	int py = (y + 1) * T - tex.h;
1389		1563
1390	if (last_name != tex.name)	1564	if (last_name != tex.name)
1391	{	1565	{
		1566	if (!tex.name)
		1567	tex = self->tex [2]; /* missing, replace by noface */
		1568
1392	glEnd ();	1569	glEnd ();
1393	last_name = tex.name;
1394	glBindTexture (GL_TEXTURE_2D, last_name);	1570	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1395	glBegin (GL_QUADS);	1571	glBegin (GL_QUADS);
1396	}	1572	}
1397		1573
1398	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1574	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1399	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1575	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1400	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1576	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1401	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1577	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1578
		1579	if (cell->flags && z == 2)
		1580	{
		1581	if (cell->flags & 1)
		1582	{
		1583	maptex tex = self->tex [1];
		1584	int px = x * T + T * 2 / 32;
		1585	int py = y * T - T * 6 / 32;
		1586
		1587	glEnd ();
		1588	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1589	glBegin (GL_QUADS);
		1590
		1591	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1592	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1593	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1594	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1595	}
		1596	}
1402	}	1597	}
1403	}	1598	}
1404	}	1599	}
1405		1600
1406	glEnd ();	1601	glEnd ();
1407		1602
1408	glDisable (GL_TEXTURE_2D);	1603	glDisable (GL_TEXTURE_2D);
1409	glDisable (GL_BLEND);	1604	glDisable (GL_BLEND);
1410	}
1411		1605
		1606	// top layer: overlays such as the health bar
		1607	for (y = 0; y < sh; y++)
		1608	if (0 <= y + my && y + my < self->rows)
		1609	{
		1610	maprow *row = self->row + (y + my);
		1611
		1612	for (x = 0; x < sw; x++)
		1613	if (row->c0 <= x + mx && x + mx < row->c1)
		1614	{
		1615	mapcell *cell = row->col + (x + mx - row->c0);
		1616
		1617	int px = x * T;
		1618	int py = y * T;
		1619
		1620	if (cell->stat_hp)
		1621	{
		1622	int width = cell->stat_width * T;
		1623	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1624
		1625	glColor3ub (0, 0, 0);
		1626	glRectf (px + 1, py - thick - 2,
		1627	px + width - 1, py);
		1628
		1629	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1630	glRectf (px + 2,
		1631	py - thick - 1,
		1632	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1633	}
		1634	}
		1635	}
		1636	}
		1637
1412	void	1638	void
1413	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1639	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414	CODE:	1640	CODE:
1415	{	1641	{
1416	static float color[16][3] = {	1642	static float color[16][3] = {
1417	{ 0.00, 0.00, 0.00 },	1643	{ 0.00F, 0.00F, 0.00F },
1418	{ 1.00, 1.00, 1.00 },	1644	{ 1.00F, 1.00F, 1.00F },
1419	{ 0.00, 0.00, 0.55 },	1645	{ 0.00F, 0.00F, 0.55F },
1420	{ 1.00, 0.00, 0.00 },	1646	{ 1.00F, 0.00F, 0.00F },
1421		1647
1422	{ 1.00, 0.54, 0.00 },	1648	{ 1.00F, 0.54F, 0.00F },
1423	{ 0.11, 0.56, 1.00 },	1649	{ 0.11F, 0.56F, 1.00F },
1424	{ 0.93, 0.46, 0.00 },	1650	{ 0.93F, 0.46F, 0.00F },
1425	{ 0.18, 0.54, 0.34 },	1651	{ 0.18F, 0.54F, 0.34F },
1426		1652
1427	{ 0.56, 0.73, 0.56 },	1653	{ 0.56F, 0.73F, 0.56F },
1428	{ 0.80, 0.80, 0.80 },	1654	{ 0.80F, 0.80F, 0.80F },
1429	{ 0.55, 0.41, 0.13 },	1655	{ 0.55F, 0.41F, 0.13F },
1430	{ 0.99, 0.77, 0.26 },	1656	{ 0.99F, 0.77F, 0.26F },
1431		1657
1432	{ 0.74, 0.65, 0.41 },	1658	{ 0.74F, 0.65F, 0.41F },
1433		1659
1434	{ 0.00, 1.00, 1.00 },	1660	{ 0.00F, 1.00F, 1.00F },
1435	{ 1.00, 0.00, 1.00 },	1661	{ 1.00F, 0.00F, 1.00F },
1436	{ 1.00, 1.00, 0.00 },	1662	{ 1.00F, 1.00F, 0.00F },
1437	};	1663	};
1438		1664
1439	int x, y;	1665	int x, y;
1440		1666
1441	glEnable (GL_TEXTURE_2D);	1667	glEnable (GL_TEXTURE_2D);
…		…
1447	for (y = 0; y < h; y++)	1673	for (y = 0; y < h; y++)
1448	for (x = 0; x < w; x++)	1674	for (x = 0; x < w; x++)
1449	{	1675	{
1450	unsigned char m = data [x + y * w];	1676	unsigned char m = data [x + y * w];
1451		1677
		1678	if (m)
		1679	{
1452	float *c = color [m & 15];	1680	float *c = color [m & 15];
1453		1681
1454	float tx1 = m & 0x40 ? 0.5 : m & 0x80 ? 0.25 : 0.;	1682	float tx1 = m & 0x40 ? 0.5 : 0.;
1455	float tx2 = tx1 + 0.25;	1683	float tx2 = tx1 + 0.5;
1456		1684
1457	glColor4f (c[0], c[1], c[2], 0.75);	1685	glColor4f (c[0], c[1], c[2], 0.75);
1458	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	1686	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1459	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	1687	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1460	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	1688	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1461	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	1689	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1690	}
1462	}	1691	}
1463		1692
1464	glEnd ();	1693	glEnd ();
1465	glDisable (GL_BLEND);	1694	glDisable (GL_BLEND);
1466	glDisable (GL_TEXTURE_2D);	1695	glDisable (GL_TEXTURE_2D);
1467	}	1696	}
1468		1697
1469	void	1698	void
1470	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1699	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1471	PPCODE:	1700	PPCODE:
1472	{	1701	{
1473	int vx, vy;
1474	int x, y;	1702	int x, y;
1475	int sw4 = (sw + 3) & ~3;	1703	int sw4 = (sw + 3) & ~3;
1476	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1704	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1477	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1705	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1478		1706
1479	memset (darkness, 255, sw4 * sh);	1707	memset (darkness, 255, sw4 * sh);
1480	SvPOK_only (darkness_sv);	1708	SvPOK_only (darkness_sv);
1481	SvCUR_set (darkness_sv, sw4 * sh);	1709	SvCUR_set (darkness_sv, sw4 * sh);
1482		1710
1483	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1711	mx += self->x;
1484	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1712	my += self->y;
1485		1713
1486	for (y = 0; y < sh; y++)	1714	for (y = 0; y < sh; y++)
1487	if (0 <= y + vy && y + vy < self->rows)	1715	if (0 <= y + my && y + my < self->rows)
1488	{	1716	{
1489	maprow *row = self->row + (y + vy);	1717	maprow *row = self->row + (y + my);
1490		1718
1491	for (x = 0; x < sw; x++)	1719	for (x = 0; x < sw; x++)
1492	if (row->c0 <= x + vx && x + vx < row->c1)	1720	if (row->c0 <= x + mx && x + mx < row->c1)
1493	{	1721	{
1494	mapcell *cell = row->col + (x + vx - row->c0);	1722	mapcell *cell = row->col + (x + mx - row->c0);
1495		1723
1496	darkness[y * sw4 + x] = cell->darkness < 0	1724	darkness[y * sw4 + x] = cell->darkness
		1725	? 255 - (cell->darkness - 1)
1497	? 255 - FOW_DARKNESS	1726	: 255 - FOW_DARKNESS;
1498	: 255 - cell->darkness;
1499	}	1727	}
1500	}	1728	}
1501		1729
1502	EXTEND (SP, 3);	1730	EXTEND (SP, 3);
1503	PUSHs (sv_2mortal (newSViv (sw4)));	1731	PUSHs (sv_2mortal (newSViv (sw4)));
1504	PUSHs (sv_2mortal (newSViv (sh)));	1732	PUSHs (sv_2mortal (newSViv (sh)));
1505	PUSHs (darkness_sv);	1733	PUSHs (darkness_sv);
1506	}	1734	}
1507		1735
1508	SV *	1736	SV *
1509	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1737	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1510	CODE:	1738	CODE:
1511	{	1739	{
1512	int x, y, x1, y1;	1740	int x, y, x1, y1;
1513	SV *data_sv = newSV (w * h * 7 + 5);	1741	SV *data_sv = newSV (w * h * 7 + 5);
1514	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1742	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1539	if (row && row->c0 <= x && x < row->c1)	1767	if (row && row->c0 <= x && x < row->c1)
1540	{	1768	{
1541	mapcell *cell = row->col + (x - row->c0);	1769	mapcell *cell = row->col + (x - row->c0);
1542	uint8_t flags = 0;	1770	uint8_t flags = 0;
1543		1771
1544	if (cell->face [0]) flags |= 1;	1772	if (cell->tile [0]) flags |= 1;
1545	if (cell->face [1]) flags |= 2;	1773	if (cell->tile [1]) flags |= 2;
1546	if (cell->face [2]) flags |= 4;	1774	if (cell->tile [2]) flags |= 4;
1547		1775
1548	*data++ = flags;	1776	*data++ = flags;
1549		1777
1550	if (flags & 1)	1778	if (flags & 1)
1551	{	1779	{
		1780	tileid tile = cell->tile [0];
1552	*data++ = cell->face [0] >> 8;	1781	*data++ = tile >> 8;
1553	*data++ = cell->face [0];	1782	*data++ = tile;
1554	}	1783	}
1555		1784
1556	if (flags & 2)	1785	if (flags & 2)
1557	{	1786	{
		1787	tileid tile = cell->tile [1];
1558	*data++ = cell->face [1] >> 8;	1788	*data++ = tile >> 8;
1559	*data++ = cell->face [1];	1789	*data++ = tile;
1560	}	1790	}
1561		1791
1562	if (flags & 4)	1792	if (flags & 4)
1563	{	1793	{
		1794	tileid tile = cell->tile [2];
1564	*data++ = cell->face [2] >> 8;	1795	*data++ = tile >> 8;
1565	*data++ = cell->face [2];	1796	*data++ = tile;
1566	}	1797	}
1567	}	1798	}
1568	else	1799	else
1569	*data++ = 0;	1800	*data++ = 0;
1570	}	1801	}
…		…
1576	}	1807	}
1577	OUTPUT:	1808	OUTPUT:
1578	RETVAL	1809	RETVAL
1579		1810
1580	void	1811	void
1581	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1812	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1582	PPCODE:	1813	PPCODE:
1583	{	1814	{
1584	int x, y, z;	1815	int x, y, z;
1585	int w, h;	1816	int w, h;
1586	int x1, y1;	1817	int x1, y1;
…		…
1610	{	1841	{
1611	uint8_t flags = *data++;	1842	uint8_t flags = *data++;
1612		1843
1613	if (flags)	1844	if (flags)
1614	{	1845	{
1615	mapface face[3] = { 0, 0, 0 };
1616
1617	mapcell *cell = row_get_cell (row, x);	1846	mapcell *cell = row_get_cell (row, x);
		1847	tileid tile[3] = { 0, 0, 0 };
1618		1848
1619	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1849	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1620	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1850	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1621	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1851	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1622		1852
1623	if (cell->darkness <= 0)	1853	if (cell->darkness == 0)
1624	{	1854	{
1625	cell->darkness = -1;	1855	cell->darkness = 0;
1626		1856
1627	for (z = 0; z <= 2; z++)	1857	for (z = 0; z <= 2; z++)
1628	{	1858	{
1629	cell->face[z] = face[z];	1859	tileid t = tile [z];
1630		1860
1631	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	1861	if (t >= self->texs || !self->tex [t].name)
		1862	{
1632	XPUSHs (sv_2mortal (newSViv (face[z])));	1863	XPUSHs (sv_2mortal (newSViv (t)));
		1864	need_texid (self, t);
		1865	}
		1866
		1867	cell->tile [z] = t;
1633	}	1868	}
1634	}	1869	}
1635	}	1870	}
1636	}	1871	}
1637	}	1872	}
1638	}	1873	}
1639		1874
1640	MODULE = CFClient PACKAGE = CFClient::MixChunk	1875	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1641		1876
1642	CFClient::MixChunk	1877	CFPlus::MixChunk
1643	new_from_file (SV *class, char *path)	1878	new_from_file (SV *class, char *path)
1644	CODE:	1879	CODE:
1645	RETVAL = Mix_LoadWAV (path);	1880	RETVAL = Mix_LoadWAV (path);
1646	OUTPUT:	1881	OUTPUT:
1647	RETVAL	1882	RETVAL
1648		1883
1649	void	1884	void
1650	DESTROY (CFClient::MixChunk self)	1885	DESTROY (CFPlus::MixChunk self)
1651	CODE:	1886	CODE:
1652	Mix_FreeChunk (self);	1887	Mix_FreeChunk (self);
1653		1888
1654	int	1889	int
1655	volume (CFClient::MixChunk self, int volume = -1)	1890	volume (CFPlus::MixChunk self, int volume = -1)
1656	CODE:	1891	CODE:
1657	RETVAL = Mix_VolumeChunk (self, volume);	1892	RETVAL = Mix_VolumeChunk (self, volume);
1658	OUTPUT:	1893	OUTPUT:
1659	RETVAL	1894	RETVAL
1660		1895
1661	int	1896	int
1662	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1897	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1663	CODE:	1898	CODE:
1664	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1899	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1665	OUTPUT:	1900	OUTPUT:
1666	RETVAL	1901	RETVAL
1667		1902
1668	MODULE = CFClient PACKAGE = CFClient::MixMusic	1903	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1669		1904
1670	int	1905	int
1671	volume (int volume = -1)	1906	volume (int volume = -1)
1672	CODE:	1907	CODE:
1673	RETVAL = Mix_VolumeMusic (volume);	1908	RETVAL = Mix_VolumeMusic (volume);
1674	OUTPUT:	1909	OUTPUT:
1675	RETVAL	1910	RETVAL
1676		1911
1677	CFClient::MixMusic	1912	CFPlus::MixMusic
1678	new_from_file (SV *class, char *path)	1913	new_from_file (SV *class, char *path)
1679	CODE:	1914	CODE:
1680	RETVAL = Mix_LoadMUS (path);	1915	RETVAL = Mix_LoadMUS (path);
1681	OUTPUT:	1916	OUTPUT:
1682	RETVAL	1917	RETVAL
1683		1918
1684	void	1919	void
1685	DESTROY (CFClient::MixMusic self)	1920	DESTROY (CFPlus::MixMusic self)
1686	CODE:	1921	CODE:
1687	Mix_FreeMusic (self);	1922	Mix_FreeMusic (self);
1688		1923
1689	int	1924	int
1690	play (CFClient::MixMusic self, int loops = -1)	1925	play (CFPlus::MixMusic self, int loops = -1)
1691	CODE:	1926	CODE:
1692	RETVAL = Mix_PlayMusic (self, loops);	1927	RETVAL = Mix_PlayMusic (self, loops);
1693	OUTPUT:	1928	OUTPUT:
1694	RETVAL	1929	RETVAL
1695		1930
1696	MODULE = CFClient PACKAGE = CFClient::OpenGL	1931	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1697		1932
1698	BOOT:	1933	BOOT:
1699	{	1934	{
1700	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1935	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1701	static const struct {	1936	static const struct {
1702	const char *name;	1937	const char *name;
1703	IV iv;	1938	IV iv;
1704	} *civ, const_iv[] = {	1939	} *civ, const_iv[] = {
1705	# define const_iv(name) { # name, (IV)name }	1940	# define const_iv(name) { # name, (IV)name }
…		…
1712	const_iv (GL_SCISSOR_TEST),	1947	const_iv (GL_SCISSOR_TEST),
1713	const_iv (GL_DEPTH_TEST),	1948	const_iv (GL_DEPTH_TEST),
1714	const_iv (GL_ALPHA_TEST),	1949	const_iv (GL_ALPHA_TEST),
1715	const_iv (GL_NORMALIZE),	1950	const_iv (GL_NORMALIZE),
1716	const_iv (GL_RESCALE_NORMAL),	1951	const_iv (GL_RESCALE_NORMAL),
		1952	const_iv (GL_FRONT),
		1953	const_iv (GL_BACK),
1717	const_iv (GL_AND),	1954	const_iv (GL_AND),
1718	const_iv (GL_ONE),	1955	const_iv (GL_ONE),
1719	const_iv (GL_ZERO),	1956	const_iv (GL_ZERO),
1720	const_iv (GL_SRC_ALPHA),	1957	const_iv (GL_SRC_ALPHA),
1721	const_iv (GL_DST_ALPHA),	1958	const_iv (GL_DST_ALPHA),
…		…
1766	const_iv (GL_SEPARABLE_2D),	2003	const_iv (GL_SEPARABLE_2D),
1767	const_iv (GL_CONVOLUTION_2D),	2004	const_iv (GL_CONVOLUTION_2D),
1768	const_iv (GL_CONVOLUTION_BORDER_MODE),	2005	const_iv (GL_CONVOLUTION_BORDER_MODE),
1769	const_iv (GL_CONSTANT_BORDER),	2006	const_iv (GL_CONSTANT_BORDER),
1770	const_iv (GL_LINES),	2007	const_iv (GL_LINES),
		2008	const_iv (GL_LINE_STRIP),
1771	const_iv (GL_LINE_LOOP),	2009	const_iv (GL_LINE_LOOP),
1772	const_iv (GL_QUADS),	2010	const_iv (GL_QUADS),
1773	const_iv (GL_QUAD_STRIP),	2011	const_iv (GL_QUAD_STRIP),
1774	const_iv (GL_TRIANGLES),	2012	const_iv (GL_TRIANGLES),
1775	const_iv (GL_TRIANGLE_STRIP),	2013	const_iv (GL_TRIANGLE_STRIP),
…		…
1843		2081
1844	void glPopMatrix ()	2082	void glPopMatrix ()
1845		2083
1846	void glLoadIdentity ()	2084	void glLoadIdentity ()
1847		2085
		2086	void glDrawBuffer (int buffer)
		2087
		2088	void glReadBuffer (int buffer)
		2089
1848	# near_ and far_ are due to microsofts buggy "c" compiler	2090	# near_ and far_ are due to microsofts buggy "c" compiler
1849	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2091	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1850		2092
1851	# near_ and far_ are due to microsofts buggy "c" compiler	2093	# near_ and far_ are due to microsofts buggy "c" compiler
1852	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2094	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
…		…
1881	r *= a;	2123	r *= a;
1882	g *= a;	2124	g *= a;
1883	b *= a;	2125	b *= a;
1884	}	2126	}
1885	// microsoft visual "c" rounds instead of truncating...	2127	// microsoft visual "c" rounds instead of truncating...
1886	glColor4ub (MIN ((int)(r * 256.f), 255),	2128	glColor4f (r, g, b, a);
1887	MIN ((int)(g * 256.f), 255),
1888	MIN ((int)(b * 256.f), 255),
1889	MIN ((int)(a * 256.f), 255));
1890		2129
1891	void glInterleavedArrays (int format, int stride, char *data)	2130	void glInterleavedArrays (int format, int stride, char *data)
1892		2131
1893	void glDrawElements (int mode, int count, int type, char *indices)	2132	void glDrawElements (int mode, int count, int type, char *indices)
1894		2133
…		…
1971		2210
1972	void glEndList ()	2211	void glEndList ()
1973		2212
1974	void glCallList (int list)	2213	void glCallList (int list)
1975		2214
1976

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines