[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.132 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define WIN32_LEAN_AND_MEAN	2	# define WIN32_LEAN_AND_MEAN
3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4	# include <malloc.h>	4	# include <malloc.h>
5	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
6	# 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>
7	#endif	14	#endif
8		15
9	#include "EXTERN.h"	16	#include "EXTERN.h"
10	#include "perl.h"	17	#include "perl.h"
11	#include "XSUB.h"	18	#include "XSUB.h"
12		19
13	#ifdef _WIN32	20	#ifdef _WIN32
14	# undef pipe	21	# undef pipe
15	#endif	22	#endif
16		23
		24	#include <assert.h>
17	#include <math.h>	25	#include <math.h>
18	#include <string.h>	26	#include <string.h>
19	#include <stdio.h>	27	#include <stdio.h>
20	#include <stdlib.h>	28	#include <stdlib.h>
21		29
36	# include <sys/types.h>	44	# include <sys/types.h>
37	# include <sys/socket.h>	45	# include <sys/socket.h>
38	# include <netinet/in.h>	46	# include <netinet/in.h>
39	# include <netinet/tcp.h>	47	# include <netinet/tcp.h>
40	# include <inttypes.h>	48	# include <inttypes.h>
41	#else
42	typedef unsigned char uint8_t;
43	typedef unsigned short uint16_t;
44	typedef unsigned int uint32_t;
45	typedef signed char int8_t;
46	typedef signed short int16_t;
47	typedef signed int int32_t;
48	#endif	49	#endif
49		50
50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51		52
52	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
53		54
54	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
55	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
…		…
60	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
61	#else	62	#else
62	# define PARACHUTE 0	63	# define PARACHUTE 0
63	#endif	64	#endif
64		65
		66	static AV *texture_av;
		67
65	static struct	68	static struct
66	{	69	{
67	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
68	#include "glfunc.h"	71	#include "glfunc.h"
69	#undef GL_FUNC	72	#undef GL_FUNC
70	} gl;	73	} gl;
71		74
		75	static void
72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73	{	77	{
74	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
75	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
76	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78	else	82	else
79	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
80	}	84	}
81		85
		86	static GLuint
		87	gen_texture ()
		88	{
		89	GLuint name;
		90
		91	if (AvFILL (texture_av) >= 0)
		92	name = (GLuint)(size_t)av_pop (texture_av);
		93	else
		94	glGenTextures (1, &name);
		95
		96	return name;
		97	}
		98
		99	static void
		100	del_texture (GLuint name)
		101	{
		102	/* make a half-assed attempt at returning the memory used by the texture */
		103	/* textures are frequently being reused by cfplus anyway */
		104	/glBindTexture (GL_TEXTURE_2D, name);/
		105	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		106	av_push (texture_av, (SV *)(size_t)name);
		107	glDeleteTextures (1, &name);
		108	}
		109
82	#include "texcache.c"	110	#include "texcache.c"
83		111
84	#include "pango-font.c"	112	#include "pango-font.c"
85	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
86	#include "pango-render.c"	114	#include "pango-render.c"
87		115
88	typedef Mix_Chunk *CFClient__MixChunk;	116	typedef Mix_Chunk *CFPlus__MixChunk;
89	typedef Mix_Music *CFClient__MixMusic;	117	typedef Mix_Music *CFPlus__MixMusic;
90		118
91	typedef PangoFontDescription *CFClient__Font;	119	typedef PangoFontDescription *CFPlus__Font;
92		120
93	static int	121	static int
94	shape_attr_p (PangoLayoutRun *run)	122	shape_attr_p (PangoLayoutRun *run)
95	{	123	{
96	GSList *attrs = run->item->analysis.extra_attrs;	124	GSList *attrs = run->item->analysis.extra_attrs;
…		…
110		138
111	typedef struct cf_layout {	139	typedef struct cf_layout {
112	PangoLayout *pl;	140	PangoLayout *pl;
113	float r, g, b, a; // default color for rgba mode	141	float r, g, b, a; // default color for rgba mode
114	int base_height;	142	int base_height;
115	CFClient__Font font;	143	CFPlus__Font font;
116	} *CFClient__Layout;	144	} *CFPlus__Layout;
117		145
118	static CFClient__Font default_font;	146	static CFPlus__Font default_font;
119	static PangoContext *opengl_context;	147	static PangoContext *opengl_context;
120	static PangoFontMap *opengl_fontmap;	148	static PangoFontMap *opengl_fontmap;
121		149
122	static void	150	static void
123	substitute_func (FcPattern *pattern, gpointer data)	151	substitute_func (FcPattern *pattern, gpointer data)
…		…
128	#endif	156	#endif
129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	157	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130	}	158	}
131		159
132	static void	160	static void
133	layout_update_font (CFClient__Layout self)	161	layout_update_font (CFPlus__Layout self)
134	{	162	{
135	/* use a random scale factor to account for unknown descenders, 0.8 works	163	/* use a random scale factor to account for unknown descenders, 0.8 works
136	* reasonably well with bitstream vera	164	* reasonably well with bitstream vera
137	*/	165	*/
138	PangoFontDescription *font = self->font ? self->font : default_font;	166	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
142		170
143	pango_layout_set_font_description (self->pl, font);	171	pango_layout_set_font_description (self->pl, font);
144	}	172	}
145		173
146	static void	174	static void
147	layout_get_pixel_size (CFClient__Layout self, int w, int h)	175	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
148	{	176	{
		177	PangoRectangle rect;
		178
		179	// get_pixel_* wrongly rounds down
149	pango_layout_get_pixel_size (self->pl, w, h);	180	pango_layout_get_extents (self->pl, 0, &rect);
150		181
151	if (!w) w = 1;	182	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
152	if (!h) h = 1;	183	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
153		184
154	w = (w + 3) & ~3;	185	if (!rect.width) rect.width = 1;
155	}	186	if (!rect.height) rect.height = 1;
156		187
		188	*w = rect.width;
		189	*h = rect.height;
		190	}
		191
		192	typedef uint16_t tileid;
157	typedef uint16_t mapface;	193	typedef uint16_t faceid;
158		194
159	typedef struct {	195	typedef struct {
160	GLint name;	196	int name;
161	int w, h;	197	int w, h;
162	float s, t;	198	float s, t;
163	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
164	} maptex;	202	} maptex;
165		203
166	typedef struct {	204	typedef struct {
		205	uint32_t player;
		206	tileid tile[3];
167	int16_t darkness;	207	uint16_t darkness;
168	mapface face[3];	208	uint8_t stat_width, stat_hp, flags, smoothmax;
169	} mapcell;	209	} mapcell;
170		210
171	typedef struct {	211	typedef struct {
172	int32_t c0, c1;	212	int32_t c0, c1;
173	mapcell *col;	213	mapcell *col;
174	} maprow;	214	} maprow;
175		215
176	typedef struct map {	216	typedef struct map {
177	int x, y, w, h;	217	int x, y, w, h;
178	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
179	int faces;	219	int faces; tileid *face2tile; // [faceid]
180	mapface *face;	220	int texs; maptex *tex; // [tileid]
181
182	int texs;
183	maptex *tex;
184		221
185	int32_t rows;	222	int32_t rows;
186	maprow *row;	223	maprow *row;
187	} *CFClient__Map;	224	} *CFPlus__Map;
188		225
189	static char *	226	static char *
190	prepend (char *ptr, int sze, int inc)	227	prepend (char *ptr, int sze, int inc)
191	{	228	{
192	char *p;	229	char *p;
…		…
209	}	246	}
210		247
211	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	248	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
212	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	249	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
213		250
		251	static void
		252	need_facenum (struct map *self, faceid face)
		253	{
		254	while (self->faces <= face)
		255	{
		256	Append (tileid, self->face2tile, self->faces, self->faces);
		257	self->faces *= 2;
		258	}
		259	}
		260
		261	static void
		262	need_texid (struct map *self, int texid)
		263	{
		264	while (self->texs <= texid)
		265	{
		266	Append (maptex, self->tex, self->texs, self->texs);
		267	self->texs *= 2;
		268	}
		269	}
		270
214	static maprow *	271	static maprow *
215	map_get_row (CFClient__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
216	{	273	{
217	if (0 > y)	274	if (0 > y)
218	{	275	{
219	int extend = - y + MAP_EXTEND_Y;	276	int extend = - y + MAP_EXTEND_Y;
220	Prepend (maprow, self->row, self->rows, extend);	277	Prepend (maprow, self->row, self->rows, extend);
…		…
258		315
259	return row->col + (x - row->c0);	316	return row->col + (x - row->c0);
260	}	317	}
261		318
262	static mapcell *	319	static mapcell *
263	map_get_cell (CFClient__Map self, int x, int y)	320	map_get_cell (CFPlus__Map self, int x, int y)
264	{	321	{
265	return row_get_cell (map_get_row (self, y), x);	322	return row_get_cell (map_get_row (self, y), x);
266	}	323	}
267		324
268	static void	325	static void
269	map_clear (CFClient__Map self)	326	map_clear (CFPlus__Map self)
270	{	327	{
271	int r;	328	int r;
272		329
273	for (r = 0; r < self->rows; r++)	330	for (r = 0; r < self->rows; r++)
274	Safefree (self->row[r].col);	331	Safefree (self->row[r].col);
…		…
282	self->row = 0;	339	self->row = 0;
283	self->rows = 0;	340	self->rows = 0;
284	}	341	}
285		342
286	static void	343	static void
287	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	344	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
288	{	345	{
289	int x, y;	346	int x, y;
290	maprow *row;	347	maprow *row;
		348	mapcell *cell;
291		349
292	for (y = y0; y < y0 + h; y++)	350	for (y = y0; y < y0 + h; y++)
293	if (y >= 0)	351	if (y >= 0)
294	{	352	{
295	if (y >= self->rows)	353	if (y >= self->rows)
…		…
301	if (x >= row->c0)	359	if (x >= row->c0)
302	{	360	{
303	if (x >= row->c1)	361	if (x >= row->c1)
304	break;	362	break;
305		363
306	row->col[x - row->c0].darkness = -1;	364	cell = row->col + x - row->c0;
		365
		366	cell->darkness = 0;
		367	cell->stat_hp = 0;
		368	cell->flags = 0;
		369	cell->player = 0;
307	}	370	}
308	}	371	}
		372	}
		373
		374	typedef struct {
		375	tileid tile;
		376	uint8_t x, y, level;
		377	} smooth_key;
		378
		379	static void
		380	smooth_or_bits (HV hv, smooth_key key, IV bits)
		381	{
		382	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		383
		384	if (SvIOK (*sv))
		385	SvIV_set (sv, SvIVX (sv) \| bits);
		386	else
		387	sv_setiv (*sv, bits);
309	}	388	}
310		389
311	static void	390	static void
312	music_finished (void)	391	music_finished (void)
313	{	392	{
…		…
349	n \|= n >> 16;	428	n \|= n >> 16;
350		429
351	return n + 1;	430	return n + 1;
352	}	431	}
353		432
		433	/* SDL should provide this, really. */
		434	#define SDLK_MODIFIER_MIN 300
		435	#define SDLK_MODIFIER_MAX 314
		436
354	MODULE = CFClient PACKAGE = CFClient	437	MODULE = CFPlus PACKAGE = CFPlus
355		438
356	PROTOTYPES: ENABLE	439	PROTOTYPES: ENABLE
357		440
358	BOOT:	441	BOOT:
359	{	442	{
360	HV *stash = gv_stashpv ("CFClient", 1);	443	HV *stash = gv_stashpv ("CFPlus", 1);
361	static const struct {	444	static const struct {
362	const char *name;	445	const char *name;
363	IV iv;	446	IV iv;
364	} *civ, const_iv[] = {	447	} *civ, const_iv[] = {
365	# define const_iv(name) { # name, (IV)name }	448	# define const_iv(name) { # name, (IV)name }
		449	const_iv (SDLK_MODIFIER_MIN),
		450	const_iv (SDLK_MODIFIER_MAX),
		451
366	const_iv (SDL_ACTIVEEVENT),	452	const_iv (SDL_ACTIVEEVENT),
367	const_iv (SDL_KEYDOWN),	453	const_iv (SDL_KEYDOWN),
368	const_iv (SDL_KEYUP),	454	const_iv (SDL_KEYUP),
369	const_iv (SDL_MOUSEMOTION),	455	const_iv (SDL_MOUSEMOTION),
370	const_iv (SDL_MOUSEBUTTONDOWN),	456	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
379	const_iv (SDL_EVENT_RESERVEDA),	465	const_iv (SDL_EVENT_RESERVEDA),
380	const_iv (SDL_EVENT_RESERVEDB),	466	const_iv (SDL_EVENT_RESERVEDB),
381	const_iv (SDL_VIDEORESIZE),	467	const_iv (SDL_VIDEORESIZE),
382	const_iv (SDL_VIDEOEXPOSE),	468	const_iv (SDL_VIDEOEXPOSE),
383	const_iv (SDL_USEREVENT),	469	const_iv (SDL_USEREVENT),
		470
		471	const_iv (SDL_APPINPUTFOCUS),
		472	const_iv (SDL_APPMOUSEFOCUS),
		473	const_iv (SDL_APPACTIVE),
		474
384	const_iv (SDLK_KP0),	475	const_iv (SDLK_KP0),
385	const_iv (SDLK_KP1),	476	const_iv (SDLK_KP1),
386	const_iv (SDLK_KP2),	477	const_iv (SDLK_KP2),
387	const_iv (SDLK_KP3),	478	const_iv (SDLK_KP3),
388	const_iv (SDLK_KP4),	479	const_iv (SDLK_KP4),
…		…
443	const_iv (SDLK_BREAK),	534	const_iv (SDLK_BREAK),
444	const_iv (SDLK_MENU),	535	const_iv (SDLK_MENU),
445	const_iv (SDLK_POWER),	536	const_iv (SDLK_POWER),
446	const_iv (SDLK_EURO),	537	const_iv (SDLK_EURO),
447	const_iv (SDLK_UNDO),	538	const_iv (SDLK_UNDO),
		539
448	const_iv (KMOD_NONE),	540	const_iv (KMOD_NONE),
		541	const_iv (KMOD_SHIFT),
449	const_iv (KMOD_LSHIFT),	542	const_iv (KMOD_LSHIFT),
450	const_iv (KMOD_RSHIFT),	543	const_iv (KMOD_RSHIFT),
		544	const_iv (KMOD_CTRL),
451	const_iv (KMOD_LCTRL),	545	const_iv (KMOD_LCTRL),
452	const_iv (KMOD_RCTRL),	546	const_iv (KMOD_RCTRL),
		547	const_iv (KMOD_ALT),
453	const_iv (KMOD_LALT),	548	const_iv (KMOD_LALT),
454	const_iv (KMOD_RALT),	549	const_iv (KMOD_RALT),
		550	const_iv (KMOD_META),
455	const_iv (KMOD_LMETA),	551	const_iv (KMOD_LMETA),
456	const_iv (KMOD_RMETA),	552	const_iv (KMOD_RMETA),
457	const_iv (KMOD_NUM),	553	const_iv (KMOD_NUM),
458	const_iv (KMOD_CAPS),	554	const_iv (KMOD_CAPS),
459	const_iv (KMOD_MODE),	555	const_iv (KMOD_MODE),
460	const_iv (KMOD_CTRL),
461	const_iv (KMOD_SHIFT),
462	const_iv (KMOD_ALT),
463	const_iv (KMOD_META)
464	# undef const_iv	556	# undef const_iv
465	};	557	};
466		558
467	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	559	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	560	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		561
		562	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		563	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
469	}	564	}
		565
		566	void
		567	weaken (SV *rv)
		568	PROTOTYPE: $
		569	CODE:
		570	sv_rvweaken (rv);
470		571
471	int	572	int
472	in_destruct ()	573	in_destruct ()
473	CODE:	574	CODE:
474	RETVAL = PL_main_cv == Nullcv;	575	RETVAL = PL_main_cv == Nullcv;
…		…
512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	613	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
515		616
516	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	617	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		618	#if SDL_VERSION_ATLEAST(1,2,10)
517	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	619	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
518	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	620	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		621	#endif
519		622
520	SDL_EnableUNICODE (1);	623	SDL_EnableUNICODE (1);
521	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	624	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
522		625
523	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	626	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
543	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
544	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
545	);	648	);
546	if (RETVAL)	649	if (RETVAL)
547	{	650	{
		651	av_clear (texture_av);
		652
548	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
549	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	654	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
550	# include "glfunc.h"	655	# include "glfunc.h"
551	# undef GL_FUNC	656	# undef GL_FUNC
		657
552	}	658	}
553	OUTPUT:	659	OUTPUT:
554	RETVAL	660	RETVAL
555		661
556	void	662	void
557	SDL_GL_SwapBuffers ()	663	SDL_GL_SwapBuffers ()
558		664
559	char *	665	char *
560	SDL_GetKeyName (int sym)	666	SDL_GetKeyName (int sym)
561		667
		668	int
		669	SDL_GetAppState ()
		670
562	void	671	void
563	SDL_PollEvent ()	672	poll_events ()
564	PPCODE:	673	PPCODE:
565	{	674	{
566	SDL_Event ev;	675	SDL_Event ev;
567		676
568	while (SDL_PollEvent (&ev))	677	SDL_PumpEvents ();
		678	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
569	{	679	{
570	HV *hv = newHV ();	680	HV *hv = newHV ();
571	hv_store (hv, "type", 4, newSViv (ev.type), 0);	681	hv_store (hv, "type", 4, newSViv (ev.type), 0);
572		682
573	switch (ev.type)	683	switch (ev.type)
…		…
575	case SDL_KEYDOWN:	685	case SDL_KEYDOWN:
576	case SDL_KEYUP:	686	case SDL_KEYUP:
577	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	687	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
578	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	688	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
579	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	689	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		690	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
580	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	691	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
581	break;	692	break;
582		693
583	case SDL_ACTIVEEVENT:	694	case SDL_ACTIVEEVENT:
584	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	695	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
585	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	696	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
586	break;	697	break;
587		698
588	case SDL_MOUSEMOTION:	699	case SDL_MOUSEMOTION:
		700	{
		701	int state = ev.motion.state;
		702	int x = ev.motion.x;
		703	int y = ev.motion.y;
		704	int xrel = ev.motion.xrel;
		705	int yrel = ev.motion.yrel;
		706
		707	/* do simplistic event compression */
		708	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		709	&& state == ev.motion.state)
		710	{
		711	xrel += ev.motion.xrel;
		712	yrel += ev.motion.yrel;
		713	x = ev.motion.x;
		714	y = ev.motion.y;
		715	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		716	}
		717
589	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	718	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
590
591	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	719	hv_store (hv, "state", 5, newSViv (state), 0);
592	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	720	hv_store (hv, "x", 1, newSViv (x), 0);
593	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	721	hv_store (hv, "y", 1, newSViv (y), 0);
594	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	722	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
595	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	723	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		724	}
596	break;	725	break;
597		726
598	case SDL_MOUSEBUTTONDOWN:	727	case SDL_MOUSEBUTTONDOWN:
599	case SDL_MOUSEBUTTONUP:	728	case SDL_MOUSEBUTTONUP:
600	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	729	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
610	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	739	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
611	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	740	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
612	break;	741	break;
613	}	742	}
614		743
615	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFClient::UI::Event", 1))));	744	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
616	}	745	}
617	}	746	}
618		747
619	int	748	int
620	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	749	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
629	Mix_AllocateChannels (int numchans = -1)	758	Mix_AllocateChannels (int numchans = -1)
630		759
631	void	760	void
632	lowdelay (int fd, int val = 1)	761	lowdelay (int fd, int val = 1)
633	CODE:	762	CODE:
		763	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		764
		765	void
		766	win32_proxy_info ()
		767	PPCODE:
		768	{
634	#ifndef _WIN32	769	#ifdef _WIN32
635	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	770	char buffer[2048];
		771	DWORD buflen;
		772
		773	EXTEND (SP, 3);
		774
		775	buflen = sizeof (buffer);
		776	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		777	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		778	{
		779	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		780
		781	buflen = sizeof (buffer);
		782	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		783	{
		784	PUSHs (newSVpv (buffer, 0));
		785
		786	buflen = sizeof (buffer);
		787	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		788	PUSHs (newSVpv (buffer, 0));
		789	}
		790	}
636	#endif	791	#endif
		792	}
637		793
638	void	794	void
639	add_font (char *file)	795	add_font (char *file)
640	CODE:	796	CODE:
641	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	797	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
…		…
745	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	901	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
746	#endif	902	#endif
747	_exit (1);	903	_exit (1);
748		904
749	void	905	void
750	_exit (int retval)	906	_exit (int retval = 0)
751	CODE:	907	CODE:
		908	#ifdef WIN32
		909	ExitThread (retval); // unclean, please beam me up
		910	#else
752	_exit (retval);	911	_exit (retval);
		912	#endif
753		913
		914	void
		915	debug ()
		916	CODE:
		917	{
		918	#if DEBUG
		919	VALGRIND_DO_LEAK_CHECK;
		920	#endif
		921	}
		922
754	MODULE = CFClient PACKAGE = CFClient::Font	923	MODULE = CFPlus PACKAGE = CFPlus::Font
755		924
756	CFClient::Font	925	CFPlus::Font
757	new_from_file (SV class, char path, int id = 0)	926	new_from_file (SV class, char path, int id = 0)
758	CODE:	927	CODE:
759	{	928	{
760	int count;	929	int count;
761	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	930	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
764	}	933	}
765	OUTPUT:	934	OUTPUT:
766	RETVAL	935	RETVAL
767		936
768	void	937	void
769	DESTROY (CFClient::Font self)	938	DESTROY (CFPlus::Font self)
770	CODE:	939	CODE:
771	pango_font_description_free (self);	940	pango_font_description_free (self);
772		941
773	void	942	void
774	make_default (CFClient::Font self)	943	make_default (CFPlus::Font self)
775	CODE:	944	CODE:
776	default_font = self;	945	default_font = self;
777		946
778	MODULE = CFClient PACKAGE = CFClient::Layout	947	MODULE = CFPlus PACKAGE = CFPlus::Layout
779		948
780	void	949	void
781	reset_glyph_cache ()	950	reset_glyph_cache ()
782	CODE:	951	CODE:
783	tc_clear ();	952	tc_clear ();
784		953
785	CFClient::Layout	954	CFPlus::Layout
786	new (SV *class)	955	new (SV *class)
787	CODE:	956	CODE:
788	New (0, RETVAL, 1, struct cf_layout);	957	New (0, RETVAL, 1, struct cf_layout);
789		958
790	RETVAL->pl = pango_layout_new (opengl_context);	959	RETVAL->pl = pango_layout_new (opengl_context);
…		…
799	layout_update_font (RETVAL);	968	layout_update_font (RETVAL);
800	OUTPUT:	969	OUTPUT:
801	RETVAL	970	RETVAL
802		971
803	void	972	void
804	DESTROY (CFClient::Layout self)	973	DESTROY (CFPlus::Layout self)
805	CODE:	974	CODE:
806	g_object_unref (self->pl);	975	g_object_unref (self->pl);
807	Safefree (self);	976	Safefree (self);
808		977
809	void	978	void
810	set_text (CFClient::Layout self, SV *text_)	979	set_text (CFPlus::Layout self, SV *text_)
811	CODE:	980	CODE:
812	{	981	{
813	STRLEN textlen;	982	STRLEN textlen;
814	char *text = SvPVutf8 (text_, textlen);	983	char *text = SvPVutf8 (text_, textlen);
815		984
816	pango_layout_set_text (self->pl, text, textlen);	985	pango_layout_set_text (self->pl, text, textlen);
817	}	986	}
818		987
819	void	988	void
820	set_markup (CFClient::Layout self, SV *text_)	989	set_markup (CFPlus::Layout self, SV *text_)
821	CODE:	990	CODE:
822	{	991	{
823	STRLEN textlen;	992	STRLEN textlen;
824	char *text = SvPVutf8 (text_, textlen);	993	char *text = SvPVutf8 (text_, textlen);
825		994
826	pango_layout_set_markup (self->pl, text, textlen);	995	pango_layout_set_markup (self->pl, text, textlen);
827	}	996	}
828		997
829	void	998	void
830	set_shapes (CFClient::Layout self, ...)	999	set_shapes (CFPlus::Layout self, ...)
831	CODE:	1000	CODE:
832	{	1001	{
833	PangoAttrList *attrs = 0;	1002	PangoAttrList *attrs = 0;
834	const char *text = pango_layout_get_text (self->pl);	1003	const char *text = pango_layout_get_text (self->pl);
835	const char *pos = text;	1004	const char *pos = text;
…		…
870	if (attrs)	1039	if (attrs)
871	pango_layout_set_attributes (self->pl, attrs);	1040	pango_layout_set_attributes (self->pl, attrs);
872	}	1041	}
873		1042
874	void	1043	void
875	get_shapes (CFClient::Layout self)	1044	get_shapes (CFPlus::Layout self)
876	PPCODE:	1045	PPCODE:
877	{	1046	{
878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1047	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879		1048
880	do	1049	do
…		…
895		1064
896	pango_layout_iter_free (iter);	1065	pango_layout_iter_free (iter);
897	}	1066	}
898		1067
899	int	1068	int
900	has_wrapped (CFClient::Layout self)	1069	has_wrapped (CFPlus::Layout self)
901	CODE:	1070	CODE:
902	{	1071	{
903	int lines = 1;	1072	int lines = 1;
904	const char *text = pango_layout_get_text (self->pl);	1073	const char *text = pango_layout_get_text (self->pl);
905		1074
…		…
910	}	1079	}
911	OUTPUT:	1080	OUTPUT:
912	RETVAL	1081	RETVAL
913		1082
914	SV *	1083	SV *
915	get_text (CFClient::Layout self)	1084	get_text (CFPlus::Layout self)
916	CODE:	1085	CODE:
917	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1086	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
918	sv_utf8_decode (RETVAL);	1087	sv_utf8_decode (RETVAL);
919	OUTPUT:	1088	OUTPUT:
920	RETVAL	1089	RETVAL
921		1090
922	void	1091	void
923	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	1092	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
924	CODE:	1093	CODE:
925	self->r = r;	1094	self->r = r;
926	self->g = g;	1095	self->g = g;
927	self->b = b;	1096	self->b = b;
928	self->a = a;	1097	self->a = a;
929		1098
930	void	1099	void
931	set_font (CFClient::Layout self, CFClient::Font font = 0)	1100	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
932	CODE:	1101	CODE:
933	if (self->font != font)	1102	if (self->font != font)
934	{	1103	{
935	self->font = font;	1104	self->font = font;
936	layout_update_font (self);	1105	layout_update_font (self);
937	}	1106	}
938		1107
939	void	1108	void
940	set_height (CFClient::Layout self, int base_height)	1109	set_height (CFPlus::Layout self, int base_height)
941	CODE:	1110	CODE:
942	if (self->base_height != base_height)	1111	if (self->base_height != base_height)
943	{	1112	{
944	self->base_height = base_height;	1113	self->base_height = base_height;
945	layout_update_font (self);	1114	layout_update_font (self);
946	}	1115	}
947		1116
948	void	1117	void
949	set_width (CFClient::Layout self, int max_width = -1)	1118	set_width (CFPlus::Layout self, int max_width = -1)
950	CODE:	1119	CODE:
951	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1120	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
952		1121
953	void	1122	void
954	set_indent (CFClient::Layout self, int indent)	1123	set_indent (CFPlus::Layout self, int indent)
955	CODE:	1124	CODE:
956	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1125	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
957		1126
958	void	1127	void
959	set_spacing (CFClient::Layout self, int spacing)	1128	set_spacing (CFPlus::Layout self, int spacing)
960	CODE:	1129	CODE:
961	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1130	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
962		1131
963	void	1132	void
964	set_ellipsise (CFClient::Layout self, int ellipsise)	1133	set_ellipsise (CFPlus::Layout self, int ellipsise)
965	CODE:	1134	CODE:
966	pango_layout_set_ellipsize (self->pl,	1135	pango_layout_set_ellipsize (self->pl,
967	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1136	ellipsise == 1 ? PANGO_ELLIPSIZE_START
968	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1137	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
969	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1138	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
970	: PANGO_ELLIPSIZE_NONE	1139	: PANGO_ELLIPSIZE_NONE
971	);	1140	);
972		1141
973	void	1142	void
974	set_single_paragraph_mode (CFClient::Layout self, int spm)	1143	set_single_paragraph_mode (CFPlus::Layout self, int spm)
975	CODE:	1144	CODE:
976	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1145	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
977		1146
978	void	1147	void
979	size (CFClient::Layout self)	1148	size (CFPlus::Layout self)
980	PPCODE:	1149	PPCODE:
981	{	1150	{
982	int w, h;	1151	int w, h;
983		1152
984	layout_get_pixel_size (self, &w, &h);	1153	layout_get_pixel_size (self, &w, &h);
…		…
987	PUSHs (sv_2mortal (newSViv (w)));	1156	PUSHs (sv_2mortal (newSViv (w)));
988	PUSHs (sv_2mortal (newSViv (h)));	1157	PUSHs (sv_2mortal (newSViv (h)));
989	}	1158	}
990		1159
991	int	1160	int
992	descent (CFClient::Layout self)	1161	descent (CFPlus::Layout self)
993	CODE:	1162	CODE:
994	{	1163	{
995	PangoRectangle rect;	1164	PangoRectangle rect;
996	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1165	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
997	pango_layout_line_get_pixel_extents (line, 0, &rect);	1166	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
999	}	1168	}
1000	OUTPUT:	1169	OUTPUT:
1001	RETVAL	1170	RETVAL
1002		1171
1003	int	1172	int
1004	xy_to_index (CFClient::Layout self, int x, int y)	1173	xy_to_index (CFPlus::Layout self, int x, int y)
1005	CODE:	1174	CODE:
1006	{	1175	{
1007	int index, trailing;	1176	int index, trailing;
1008	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1177	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1009	RETVAL = index;	1178	RETVAL = index + trailing;
1010	}	1179	}
1011	OUTPUT:	1180	OUTPUT:
1012	RETVAL	1181	RETVAL
1013		1182
1014	void	1183	void
1015	cursor_pos (CFClient::Layout self, int index)	1184	cursor_pos (CFPlus::Layout self, int index)
1016	PPCODE:	1185	PPCODE:
1017	{	1186	{
1018	PangoRectangle strong_pos;	1187	PangoRectangle strong_pos;
1019	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1188	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1020		1189
…		…
1023	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1192	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1024	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1193	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1025	}	1194	}
1026		1195
1027	void	1196	void
		1197	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
		1198	PPCODE:
		1199	{
		1200	int line, x;
		1201
		1202	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1203	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
		1204
		1205	EXTEND (SP, 2);
		1206	PUSHs (sv_2mortal (newSViv (line - 1)));
		1207	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1208	}
		1209
		1210	void
		1211	line_x_to_index (CFPlus::Layout self, int line, int x)
		1212	PPCODE:
		1213	{
		1214	PangoLayoutLine *lp;
		1215	int index, trailing;
		1216
		1217	if (line < 0)
		1218	XSRETURN_EMPTY;
		1219
		1220	if (!(lp = pango_layout_get_line (self->pl, line)))
		1221	XSRETURN_EMPTY; /* do better */
		1222
		1223	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1224
		1225	EXTEND (SP, 2);
		1226	if (GIMME_V == G_SCALAR)
		1227	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1228	else
		1229	{
		1230	PUSHs (sv_2mortal (newSViv (index)));
		1231	PUSHs (sv_2mortal (newSViv (trailing)));
		1232	}
		1233	}
		1234
		1235	void
1028	render (CFClient::Layout self, float x, float y)	1236	render (CFPlus::Layout self, float x, float y, int flags = 0)
1029	PPCODE:	1237	PPCODE:
1030	pango_opengl_render_layout_subpixel (	1238	pango_opengl_render_layout_subpixel (
1031	self->pl,	1239	self->pl,
1032	x * PANGO_SCALE, y * PANGO_SCALE,	1240	x * PANGO_SCALE, y * PANGO_SCALE,
1033	self->r, self->g, self->b, self->a	1241	self->r, self->g, self->b, self->a,
		1242	flags
1034	);	1243	);
1035		1244
1036	MODULE = CFClient PACKAGE = CFClient::Texture	1245	MODULE = CFPlus PACKAGE = CFPlus::Texture
1037		1246
1038	void	1247	void
1039	pad2pot (SV data_, SV w_, SV *h_)	1248	pad2pot (SV data_, SV w_, SV *h_)
1040	CODE:	1249	CODE:
1041	{	1250	{
…		…
1119	glDisable (GL_ALPHA_TEST);	1328	glDisable (GL_ALPHA_TEST);
1120	glDisable (GL_BLEND);	1329	glDisable (GL_BLEND);
1121	}	1330	}
1122	}	1331	}
1123		1332
1124	MODULE = CFClient PACKAGE = CFClient::Map	1333	MODULE = CFPlus PACKAGE = CFPlus::Map
1125		1334
1126	CFClient::Map	1335	CFPlus::Map
1127	new (SV *class, int map_width, int map_height)	1336	new (SV *class)
1128	CODE:	1337	CODE:
1129	New (0, RETVAL, 1, struct map);	1338	New (0, RETVAL, 1, struct map);
1130	RETVAL->x = 0;	1339	RETVAL->x = 0;
1131	RETVAL->y = 0;	1340	RETVAL->y = 0;
1132	RETVAL->w = map_width;	1341	RETVAL->w = 0;
1133	RETVAL->h = map_height;	1342	RETVAL->h = 0;
1134	RETVAL->ox = 0;	1343	RETVAL->ox = 0;
1135	RETVAL->oy = 0;	1344	RETVAL->oy = 0;
1136	RETVAL->faces = 8192;	1345	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1137	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1346	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1138	RETVAL->texs = 8192;
1139	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1140	RETVAL->rows = 0;	1347	RETVAL->rows = 0;
1141	RETVAL->row = 0;	1348	RETVAL->row = 0;
1142	OUTPUT:	1349	OUTPUT:
1143	RETVAL	1350	RETVAL
1144		1351
1145	void	1352	void
1146	DESTROY (CFClient::Map self)	1353	DESTROY (CFPlus::Map self)
1147	CODE:	1354	CODE:
1148	{	1355	{
1149	map_clear (self);	1356	map_clear (self);
1150	Safefree (self->face);	1357	Safefree (self->face2tile);
1151	Safefree (self->tex);	1358	Safefree (self->tex);
1152	Safefree (self);	1359	Safefree (self);
1153	}	1360	}
1154		1361
1155	void	1362	void
		1363	resize (CFPlus::Map self, int map_width, int map_height)
		1364	CODE:
		1365	self->w = map_width;
		1366	self->h = map_height;
		1367
		1368	void
1156	clear (CFClient::Map self)	1369	clear (CFPlus::Map self)
1157	CODE:	1370	CODE:
1158	map_clear (self);	1371	map_clear (self);
1159		1372
1160	void	1373	void
1161	set_face (CFClient::Map self, int face, int texid)	1374	set_tileid (CFPlus::Map self, int face, int tile)
1162	CODE:	1375	CODE:
1163	{	1376	{
1164	while (self->faces <= face)	1377	need_facenum (self, face); self->face2tile [face] = tile;
1165	{	1378	need_texid (self, tile);
1166	Append (mapface, self->face, self->faces, self->faces);
1167	self->faces *= 2;
1168	}
1169
1170	self->face [face] = texid;
1171	}	1379	}
1172		1380
1173	void	1381	void
		1382	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1383	CODE:
		1384	{
		1385	tileid texid;
		1386	maptex *tex;
		1387
		1388	if (face < 0 \|\| face >= self->faces)
		1389	return;
		1390
		1391	if (smooth < 0 \|\| smooth >= self->faces)
		1392	return;
		1393
		1394	texid = self->face2tile [face];
		1395
		1396	if (!texid)
		1397	return;
		1398
		1399	tex = self->tex + texid;
		1400	tex->smoothtile = self->face2tile [smooth];
		1401	tex->smoothlevel = level;
		1402	}
		1403
		1404	void
1174	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)	1405	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)
1175	CODE:	1406	CODE:
1176	{	1407	{
1177	while (self->texs <= texid)	1408	need_texid (self, texid);
1178	{
1179	Append (maptex, self->tex, self->texs, self->texs);
1180	self->texs *= 2;
1181	}
1182		1409
1183	{	1410	{
1184	maptex *tex = self->tex + texid;	1411	maptex *tex = self->tex + texid;
1185		1412
1186	tex->name = name;	1413	tex->name = name;
…		…
1203	// from transparent color bleeding and ugly wrapping effects.	1430	// from transparent color bleeding and ugly wrapping effects.
1204	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1431	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1205	}	1432	}
1206		1433
1207	int	1434	int
1208	ox (CFClient::Map self)	1435	ox (CFPlus::Map self)
1209	ALIAS:	1436	ALIAS:
1210	oy = 1	1437	oy = 1
1211	x = 2	1438	x = 2
1212	y = 3	1439	y = 3
1213	w = 4	1440	w = 4
…		…
1224	}	1451	}
1225	OUTPUT:	1452	OUTPUT:
1226	RETVAL	1453	RETVAL
1227		1454
1228	void	1455	void
1229	scroll (CFClient::Map self, int dx, int dy)	1456	scroll (CFPlus::Map self, int dx, int dy)
1230	CODE:	1457	CODE:
1231	{	1458	{
1232	if (dx > 0)	1459	if (dx > 0)
1233	map_blank (self, self->x, self->y, dx - 1, self->h);	1460	map_blank (self, self->x, self->y, dx, self->h);
1234	else if (dx < 0)	1461	else if (dx < 0)
1235	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1462	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1236		1463
1237	if (dy > 0)	1464	if (dy > 0)
1238	map_blank (self, self->x, self->y, self->w, dy - 1);	1465	map_blank (self, self->x, self->y, self->w, dy);
1239	else if (dy < 0)	1466	else if (dy < 0)
1240	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1467	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1241		1468
1242	self->ox += dx; self->x += dx;	1469	self->ox += dx; self->x += dx;
1243	self->oy += dy; self->y += dy;	1470	self->oy += dy; self->y += dy;
1244		1471
1245	while (self->y < 0)	1472	while (self->y < 0)
…		…
1250	self->y += MAP_EXTEND_Y;	1477	self->y += MAP_EXTEND_Y;
1251	}	1478	}
1252	}	1479	}
1253		1480
1254	void	1481	void
1255	map1a_update (CFClient::Map self, SV *data_)	1482	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1256	CODE:	1483	CODE:
1257	{	1484	{
1258	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1485	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1259	uint8_t data_end = (uint8_t )SvEND (data_);	1486	uint8_t data_end = (uint8_t )SvEND (data_);
1260	mapcell *cell;	1487	mapcell *cell;
1261	int x, y, flags;	1488	int x, y, flags;
1262		1489
1263	while (data < data_end)	1490	while (data < data_end - 1)
1264	{	1491	{
1265	flags = (data [0] << 8) + data [1]; data += 2;	1492	flags = (data [0] << 8) + data [1]; data += 2;
1266		1493
1267	x = self->x + ((flags >> 10) & 63);	1494	x = self->x + ((flags >> 10) & 63);
1268	y = self->y + ((flags >> 4) & 63);	1495	y = self->y + ((flags >> 4) & 63);
1269		1496
1270	cell = map_get_cell (self, x, y);	1497	cell = map_get_cell (self, x, y);
1271		1498
1272	if (flags & 15)	1499	if (flags & 15)
1273	{	1500	{
1274	if (cell->darkness < 0)	1501	if (!cell->darkness)
1275	{	1502	{
		1503	memset (cell, 0, sizeof (*cell));
1276	cell->darkness = 0;	1504	cell->darkness = 256;
1277	cell->face [0] = 0;
1278	cell->face [1] = 0;
1279	cell->face [2] = 0;
1280	}	1505	}
1281		1506
1282	cell->darkness = flags & 8 ? *data++ : 255;
1283
1284	//TODO: don't trust server data to be in-range(!)	1507	//TODO: don't trust server data to be in-range(!)
		1508
		1509	if (flags & 8)
		1510	{
		1511	if (extmap)
		1512	{
		1513	uint8_t ext, cmd;
		1514
		1515	do
		1516	{
		1517	ext = *data++;
		1518	cmd = ext & 0x3f;
		1519
		1520	if (cmd < 4)
		1521	cell->darkness = 255 - ext * 64 + 1;
		1522	else if (cmd == 5) // health
		1523	{
		1524	cell->stat_width = 1;
		1525	cell->stat_hp = *data++;
		1526	}
		1527	else if (cmd == 6) // monster width
		1528	cell->stat_width = *data++ + 1;
		1529	else if (cmd == 0x47)
		1530	{
		1531	if (*data == 4)
		1532	; // decode player count
		1533
		1534	data += *data + 1;
		1535	}
		1536	else if (cmd == 8) // cell flags
		1537	cell->flags = *data++;
		1538	else if (ext & 0x40) // unknown, multibyte => skip
		1539	data += *data + 1;
		1540	else
		1541	data++;
		1542	}
		1543	while (ext & 0x80);
		1544	}
		1545	else
		1546	cell->darkness = *data++ + 1;
		1547	}
1285		1548
1286	if (flags & 4)	1549	if (flags & 4)
1287	{	1550	{
1288	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1551	faceid face = (data [0] << 8) + data [1]; data += 2;
		1552	need_facenum (self, face);
		1553	cell->tile [0] = self->face2tile [face];
1289	}	1554	}
1290		1555
1291	if (flags & 2)	1556	if (flags & 2)
1292	{	1557	{
1293	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1558	faceid face = (data [0] << 8) + data [1]; data += 2;
		1559	need_facenum (self, face);
		1560	cell->tile [1] = self->face2tile [face];
1294	}	1561	}
1295		1562
1296	if (flags & 1)	1563	if (flags & 1)
1297	{	1564	{
1298	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1565	faceid face = (data [0] << 8) + data [1]; data += 2;
		1566	need_facenum (self, face);
		1567	cell->tile [2] = self->face2tile [face];
1299	}	1568	}
1300	}	1569	}
1301	else	1570	else
1302	cell->darkness = -1;	1571	cell->darkness = 0;
1303	}	1572	}
1304	}	1573	}
1305		1574
1306	SV *	1575	SV *
1307	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1576	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1308	CODE:	1577	CODE:
1309	{	1578	{
1310	int x1, x;	1579	int x1, x;
1311	int y1, y;	1580	int y1, y;
1312	int z;	1581	int z;
…		…
1333	{	1602	{
1334	mapcell *cell = row->col + (x - row->c0);	1603	mapcell *cell = row->col + (x - row->c0);
1335		1604
1336	for (z = 0; z <= 0; z++)	1605	for (z = 0; z <= 0; z++)
1337	{	1606	{
1338	mapface face = cell->face [z];
1339
1340	if (face)
1341	{
1342	maptex tex = self->tex [face];	1607	maptex tex = self->tex [cell->tile [z]];
1343	int a0 = 255 - tex.a;	1608	int a0 = 255 - tex.a;
1344	int a1 = tex.a;	1609	int a1 = tex.a;
1345		1610
1346	r = (r * a0 + tex.r * a1) / 255;	1611	r = (r * a0 + tex.r * a1) / 255;
1347	g = (g * a0 + tex.g * a1) / 255;	1612	g = (g * a0 + tex.g * a1) / 255;
1348	b = (b * a0 + tex.b * a1) / 255;	1613	b = (b * a0 + tex.b * a1) / 255;
1349	a = (a * a0 + tex.a * a1) / 255;	1614	a = (a * a0 + tex.a * a1) / 255;
1350	}
1351	}	1615	}
1352	}	1616	}
1353		1617
1354	*map++ = (r )	1618	*map++ = (r )
1355	\| (g << 8)	1619	\| (g << 8)
…		…
1362	}	1626	}
1363	OUTPUT:	1627	OUTPUT:
1364	RETVAL	1628	RETVAL
1365		1629
1366	void	1630	void
1367	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1631	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1368	CODE:	1632	CODE:
1369	{	1633	{
1370	int vx, vy;	1634	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1635	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1636	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1637	smooth_key skey;
1371	int x, y, z;	1638	int x, y, z;
1372	int last_name;	1639	int last_name;
1373	mapface face;
1374		1640
1375	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1641	// thats current max. sorry.
1376	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1642	if (sw > 255) sw = 255;
		1643	if (sh > 255) sh = 255;
1377		1644
1378	/*	1645	// clear key, in case of extra padding
1379	int vx = self->vx = self->w >= sw	1646	memset (&skey, 0, sizeof (skey));
1380	? self->x + (self->w - sw) / 2
1381	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1382
1383	int vy = self->vy = self->h >= sh
1384	? self->y + (self->h - sh) / 2
1385	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1386	*/
1387		1647
1388	glColor4ub (255, 255, 255, 255);	1648	glColor4ub (255, 255, 255, 255);
1389		1649
1390	glEnable (GL_BLEND);	1650	glEnable (GL_BLEND);
1391	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1651	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1394		1654
1395	glBegin (GL_QUADS);	1655	glBegin (GL_QUADS);
1396		1656
1397	last_name = 0;	1657	last_name = 0;
1398		1658
		1659	mx += self->x;
		1660	my += self->y;
		1661
		1662	// first pass: determine smooth_max
		1663	// rather ugly, if you ask me
		1664	// could also be stored inside mapcell and updated on change
		1665	memset (smooth_max, 0, sizeof (smooth_max));
		1666
		1667	for (y = 0; y < sh; y++)
		1668	if (0 <= y + my && y + my < self->rows)
		1669	{
		1670	maprow *row = self->row + (y + my);
		1671
		1672	for (x = 0; x < sw; x++)
		1673	if (row->c0 <= x + mx && x + mx < row->c1)
		1674	{
		1675	mapcell *cell = row->col + (x + mx - row->c0);
		1676
		1677	smooth_max[x + 1][y + 1] =
		1678	MAX (self->tex [cell->tile [0]].smoothlevel,
		1679	MAX (self->tex [cell->tile [1]].smoothlevel,
		1680	self->tex [cell->tile [2]].smoothlevel));
		1681	}
		1682	}
		1683
1399	for (z = 0; z < 3; z++)	1684	for (z = 0; z <= 2; z++)
		1685	{
		1686	memset (smooth_level, 0, sizeof (smooth_level));
		1687
1400	for (y = 0; y < sh; y++)	1688	for (y = 0; y < sh; y++)
1401	if (0 <= y + vy && y + vy < self->rows)	1689	if (0 <= y + my && y + my < self->rows)
1402	{	1690	{
1403	maprow *row = self->row + (y + vy);	1691	maprow *row = self->row + (y + my);
1404		1692
1405	for (x = 0; x < sw; x++)	1693	for (x = 0; x < sw; x++)
1406	if (row->c0 <= x + vx && x + vx < row->c1)	1694	if (row->c0 <= x + mx && x + mx < row->c1)
1407	{	1695	{
1408	mapcell *cell = row->col + (x + vx - row->c0);	1696	mapcell *cell = row->col + (x + mx - row->c0);
1409
1410	face = cell->face [z];	1697	tileid tile = cell->tile [z];
1411		1698
1412	if (face)	1699	if (tile)
		1700	{
		1701	maptex tex = self->tex [tile];
		1702	int px = (x + 1) * T - tex.w;
		1703	int py = (y + 1) * T - tex.h;
		1704
		1705	// suppressing texture state switches here
		1706	// is only moderately effective, but worth the extra effort
		1707	if (last_name != tex.name)
		1708	{
		1709	if (!tex.name)
		1710	tex = self->tex [2]; /* missing, replace by noface */
		1711
		1712	glEnd ();
		1713	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1714	glBegin (GL_QUADS);
		1715	}
		1716
		1717	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1718	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1719	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1720	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1721
		1722	if (cell->flags && z == 2)
		1723	{
		1724	if (cell->flags & 1)
		1725	{
		1726	maptex tex = self->tex [1];
		1727	int px = x * T + T * 2 / 32;
		1728	int py = y * T - T * 6 / 32;
		1729
		1730	glEnd ();
		1731	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1732	glBegin (GL_QUADS);
		1733
		1734	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1735	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1736	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1737	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1738	}
		1739	}
		1740
		1741	// update smooth hash
		1742	if (tex.smoothtile)
		1743	{
		1744	skey.tile = tex.smoothtile;
		1745	skey.level = tex.smoothlevel;
		1746
		1747	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1748
		1749	// add bits to current tile and all neighbours. skey.x\|y is
		1750	// shifted +1\|+1 so we always stay positive.
		1751
		1752	// bits is ___n cccc CCCC bbbb
		1753	// n do not draw borders&corners
		1754	// c draw these corners, but...
		1755	// C ... not these
		1756	// b draw these borders
		1757
		1758	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1759	// ┃· ·· ·┃ ━━
		1760
		1761	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1762	// ·· ·· ·┏ ┓·
		1763
		1764	// full tile
		1765	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1766
		1767	// borders
		1768	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1769	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1770	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1771	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1772
		1773	// corners
		1774	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1775	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1776	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1777	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1778	}
		1779	}
		1780	}
		1781	}
		1782
		1783	// go through all smoothlevels, lowest to highest, then draw.
		1784	// this is basically counting sort
		1785	{
		1786	int w, b;
		1787
		1788	for (w = 0; w < 256 / 32; ++w)
		1789	{
		1790	uint32_t smask = smooth_level [w];
		1791	if (smask)
		1792	for (b = 0; b < 32; ++b)
		1793	if (smask & (((uint32_t)1) << b))
1413	{	1794	{
1414	maptex tex = self->tex [face];	1795	int level = (w << 5) \| b;
		1796	HE *he;
1415		1797
1416	int px = (x + 1) * 32 - tex.w;	1798	hv_iterinit (smooth);
1417	int py = (y + 1) * 32 - tex.h;	1799	while ((he = hv_iternext (smooth)))
1418
1419	if (last_name != tex.name)
1420	{	1800	{
		1801	smooth_key skey = (smooth_key )HeKEY (he);
		1802	IV bits = SvIVX (HeVAL (he));
		1803
		1804	if (!(bits & 0x1000)
		1805	&& skey->level == level
		1806	&& level > smooth_max [skey->x][skey->y])
		1807	{
		1808	maptex tex = self->tex [skey->tile];
		1809	int px = (((int)skey->x) - 1) * T;
		1810	int py = (((int)skey->y) - 1) * T;
		1811	int border = bits & 15;
		1812	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1813	float dx = tex.s * .0625f; // 16 images/row
		1814	float dy = tex.t * .5f ; // 2 images/column
		1815
		1816	// this time naively avoiding texture state changes
		1817	// save gobs of state changes.
		1818	if (last_name != tex.name)
		1819	{
		1820	if (!tex.name)
		1821	continue; // smoothing not yet available
		1822
1421	glEnd ();	1823	glEnd ();
1422	last_name = tex.name;
1423	glBindTexture (GL_TEXTURE_2D, last_name);	1824	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1424	glBegin (GL_QUADS);	1825	glBegin (GL_QUADS);
		1826	}
		1827
		1828	if (border)
		1829	{
		1830	float ox = border * dx;
		1831
		1832	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1833	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1834	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1835	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1836	}
		1837
		1838	if (corner)
		1839	{
		1840	float ox = corner * dx;
		1841
		1842	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1843	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1844	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1845	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1846	}
		1847	}
1425	}	1848	}
1426
1427	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1428	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1429	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1430	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1431	}	1849	}
1432	}
1433	}	1850	}
		1851	}
		1852
		1853	hv_clear (smooth);
		1854	}
1434		1855
1435	glEnd ();	1856	glEnd ();
1436		1857
1437	glDisable (GL_TEXTURE_2D);	1858	glDisable (GL_TEXTURE_2D);
1438	glDisable (GL_BLEND);	1859	glDisable (GL_BLEND);
1439	}
1440		1860
		1861	// top layer: overlays such as the health bar
		1862	for (y = 0; y < sh; y++)
		1863	if (0 <= y + my && y + my < self->rows)
		1864	{
		1865	maprow *row = self->row + (y + my);
		1866
		1867	for (x = 0; x < sw; x++)
		1868	if (row->c0 <= x + mx && x + mx < row->c1)
		1869	{
		1870	mapcell *cell = row->col + (x + mx - row->c0);
		1871
		1872	int px = x * T;
		1873	int py = y * T;
		1874
		1875	if (cell->stat_hp)
		1876	{
		1877	int width = cell->stat_width * T;
		1878	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1879
		1880	glColor3ub (0, 0, 0);
		1881	glRectf (px + 1, py - thick - 2,
		1882	px + width - 1, py);
		1883
		1884	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1885	glRectf (px + 2,
		1886	py - thick - 1,
		1887	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1888	}
		1889	}
		1890	}
		1891	}
		1892
1441	void	1893	void
1442	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1894	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1443	CODE:	1895	CODE:
1444	{	1896	{
1445	static float color[16][3] = {	1897	static float color[16][3] = {
1446	{ 0.00F, 0.00F, 0.00F },	1898	{ 0.00F, 0.00F, 0.00F },
1447	{ 1.00F, 1.00F, 1.00F },	1899	{ 1.00F, 1.00F, 1.00F },
…		…
1497	glDisable (GL_BLEND);	1949	glDisable (GL_BLEND);
1498	glDisable (GL_TEXTURE_2D);	1950	glDisable (GL_TEXTURE_2D);
1499	}	1951	}
1500		1952
1501	void	1953	void
1502	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1954	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1503	PPCODE:	1955	PPCODE:
1504	{	1956	{
1505	int vx, vy;
1506	int x, y;	1957	int x, y;
1507	int sw4 = (sw + 3) & ~3;	1958	int sw4 = (sw + 3) & ~3;
1508	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1959	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1509	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1960	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1510		1961
1511	memset (darkness, 255, sw4 * sh);	1962	memset (darkness, 255, sw4 * sh);
1512	SvPOK_only (darkness_sv);	1963	SvPOK_only (darkness_sv);
1513	SvCUR_set (darkness_sv, sw4 * sh);	1964	SvCUR_set (darkness_sv, sw4 * sh);
1514		1965
1515	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1966	mx += self->x;
1516	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1967	my += self->y;
1517		1968
1518	for (y = 0; y < sh; y++)	1969	for (y = 0; y < sh; y++)
1519	if (0 <= y + vy && y + vy < self->rows)	1970	if (0 <= y + my && y + my < self->rows)
1520	{	1971	{
1521	maprow *row = self->row + (y + vy);	1972	maprow *row = self->row + (y + my);
1522		1973
1523	for (x = 0; x < sw; x++)	1974	for (x = 0; x < sw; x++)
1524	if (row->c0 <= x + vx && x + vx < row->c1)	1975	if (row->c0 <= x + mx && x + mx < row->c1)
1525	{	1976	{
1526	mapcell *cell = row->col + (x + vx - row->c0);	1977	mapcell *cell = row->col + (x + mx - row->c0);
1527		1978
1528	darkness[y * sw4 + x] = cell->darkness < 0	1979	darkness[y * sw4 + x] = cell->darkness
		1980	? 255 - (cell->darkness - 1)
1529	? 255 - FOW_DARKNESS	1981	: 255 - FOW_DARKNESS;
1530	: 255 - cell->darkness;
1531	}	1982	}
1532	}	1983	}
1533		1984
1534	EXTEND (SP, 3);	1985	EXTEND (SP, 3);
1535	PUSHs (sv_2mortal (newSViv (sw4)));	1986	PUSHs (sv_2mortal (newSViv (sw4)));
1536	PUSHs (sv_2mortal (newSViv (sh)));	1987	PUSHs (sv_2mortal (newSViv (sh)));
1537	PUSHs (darkness_sv);	1988	PUSHs (darkness_sv);
1538	}	1989	}
1539		1990
1540	SV *	1991	SV *
1541	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1992	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1542	CODE:	1993	CODE:
1543	{	1994	{
1544	int x, y, x1, y1;	1995	int x, y, x1, y1;
1545	SV data_sv = newSV (w h * 7 + 5);	1996	SV data_sv = newSV (w h * 7 + 5);
1546	uint8_t data = (uint8_t )SvPVX (data_sv);	1997	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1571	if (row && row->c0 <= x && x < row->c1)	2022	if (row && row->c0 <= x && x < row->c1)
1572	{	2023	{
1573	mapcell *cell = row->col + (x - row->c0);	2024	mapcell *cell = row->col + (x - row->c0);
1574	uint8_t flags = 0;	2025	uint8_t flags = 0;
1575		2026
1576	if (cell->face [0]) flags \|= 1;	2027	if (cell->tile [0]) flags \|= 1;
1577	if (cell->face [1]) flags \|= 2;	2028	if (cell->tile [1]) flags \|= 2;
1578	if (cell->face [2]) flags \|= 4;	2029	if (cell->tile [2]) flags \|= 4;
1579		2030
1580	*data++ = flags;	2031	*data++ = flags;
1581		2032
1582	if (flags & 1)	2033	if (flags & 1)
1583	{	2034	{
		2035	tileid tile = cell->tile [0];
1584	*data++ = cell->face [0] >> 8;	2036	*data++ = tile >> 8;
1585	*data++ = cell->face [0];	2037	*data++ = tile;
1586	}	2038	}
1587		2039
1588	if (flags & 2)	2040	if (flags & 2)
1589	{	2041	{
		2042	tileid tile = cell->tile [1];
1590	*data++ = cell->face [1] >> 8;	2043	*data++ = tile >> 8;
1591	*data++ = cell->face [1];	2044	*data++ = tile;
1592	}	2045	}
1593		2046
1594	if (flags & 4)	2047	if (flags & 4)
1595	{	2048	{
		2049	tileid tile = cell->tile [2];
1596	*data++ = cell->face [2] >> 8;	2050	*data++ = tile >> 8;
1597	*data++ = cell->face [2];	2051	*data++ = tile;
1598	}	2052	}
1599	}	2053	}
1600	else	2054	else
1601	*data++ = 0;	2055	*data++ = 0;
1602	}	2056	}
…		…
1608	}	2062	}
1609	OUTPUT:	2063	OUTPUT:
1610	RETVAL	2064	RETVAL
1611		2065
1612	void	2066	void
1613	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	2067	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1614	PPCODE:	2068	PPCODE:
1615	{	2069	{
1616	int x, y, z;	2070	int x, y, z;
1617	int w, h;	2071	int w, h;
1618	int x1, y1;	2072	int x1, y1;
…		…
1642	{	2096	{
1643	uint8_t flags = *data++;	2097	uint8_t flags = *data++;
1644		2098
1645	if (flags)	2099	if (flags)
1646	{	2100	{
1647	mapface face[3] = { 0, 0, 0 };
1648
1649	mapcell *cell = row_get_cell (row, x);	2101	mapcell *cell = row_get_cell (row, x);
		2102	tileid tile[3] = { 0, 0, 0 };
1650		2103
1651	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2104	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1652	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2105	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1653	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2106	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1654		2107
1655	if (cell->darkness <= 0)	2108	if (cell->darkness == 0)
1656	{	2109	{
1657	cell->darkness = -1;	2110	cell->darkness = 0;
1658		2111
1659	for (z = 0; z <= 2; z++)	2112	for (z = 0; z <= 2; z++)
1660	{	2113	{
1661	cell->face[z] = face[z];	2114	tileid t = tile [z];
1662		2115
1663	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2116	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2117	{
1664	XPUSHs (sv_2mortal (newSViv (face[z])));	2118	XPUSHs (sv_2mortal (newSViv (t)));
		2119	need_texid (self, t);
		2120	}
		2121
		2122	cell->tile [z] = t;
1665	}	2123	}
1666	}	2124	}
1667	}	2125	}
1668	}	2126	}
1669	}	2127	}
1670	}	2128	}
1671		2129
1672	MODULE = CFClient PACKAGE = CFClient::MixChunk	2130	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1673		2131
1674	CFClient::MixChunk	2132	CFPlus::MixChunk
1675	new_from_file (SV class, char path)	2133	new_from_file (SV class, char path)
1676	CODE:	2134	CODE:
1677	RETVAL = Mix_LoadWAV (path);	2135	RETVAL = Mix_LoadWAV (path);
1678	OUTPUT:	2136	OUTPUT:
1679	RETVAL	2137	RETVAL
1680		2138
1681	void	2139	void
1682	DESTROY (CFClient::MixChunk self)	2140	DESTROY (CFPlus::MixChunk self)
1683	CODE:	2141	CODE:
1684	Mix_FreeChunk (self);	2142	Mix_FreeChunk (self);
1685		2143
1686	int	2144	int
1687	volume (CFClient::MixChunk self, int volume = -1)	2145	volume (CFPlus::MixChunk self, int volume = -1)
1688	CODE:	2146	CODE:
1689	RETVAL = Mix_VolumeChunk (self, volume);	2147	RETVAL = Mix_VolumeChunk (self, volume);
1690	OUTPUT:	2148	OUTPUT:
1691	RETVAL	2149	RETVAL
1692		2150
1693	int	2151	int
1694	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2152	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1695	CODE:	2153	CODE:
1696	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2154	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1697	OUTPUT:	2155	OUTPUT:
1698	RETVAL	2156	RETVAL
1699		2157
1700	MODULE = CFClient PACKAGE = CFClient::MixMusic	2158	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1701		2159
1702	int	2160	int
1703	volume (int volume = -1)	2161	volume (int volume = -1)
1704	CODE:	2162	CODE:
1705	RETVAL = Mix_VolumeMusic (volume);	2163	RETVAL = Mix_VolumeMusic (volume);
1706	OUTPUT:	2164	OUTPUT:
1707	RETVAL	2165	RETVAL
1708		2166
		2167	int
		2168	fade_out (int ms)
		2169	CODE:
		2170	RETVAL = Mix_FadeOutMusic (ms);
		2171	OUTPUT:
		2172	RETVAL
		2173
1709	CFClient::MixMusic	2174	CFPlus::MixMusic
1710	new_from_file (SV class, char path)	2175	new_from_file (SV class, char path)
1711	CODE:	2176	CODE:
1712	RETVAL = Mix_LoadMUS (path);	2177	RETVAL = Mix_LoadMUS (path);
1713	OUTPUT:	2178	OUTPUT:
1714	RETVAL	2179	RETVAL
1715		2180
1716	void	2181	void
1717	DESTROY (CFClient::MixMusic self)	2182	DESTROY (CFPlus::MixMusic self)
1718	CODE:	2183	CODE:
1719	Mix_FreeMusic (self);	2184	Mix_FreeMusic (self);
1720		2185
1721	int	2186	int
1722	play (CFClient::MixMusic self, int loops = -1)	2187	play (CFPlus::MixMusic self, int loops = -1)
1723	CODE:	2188	CODE:
1724	RETVAL = Mix_PlayMusic (self, loops);	2189	RETVAL = Mix_PlayMusic (self, loops);
1725	OUTPUT:	2190	OUTPUT:
1726	RETVAL	2191	RETVAL
1727		2192
		2193	int
		2194	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2195	CODE:
		2196	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
		2197	OUTPUT:
		2198	RETVAL
		2199
1728	MODULE = CFClient PACKAGE = CFClient::OpenGL	2200	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1729		2201
1730	BOOT:	2202	BOOT:
1731	{	2203	{
1732	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2204	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1733	static const struct {	2205	static const struct {
1734	const char *name;	2206	const char *name;
1735	IV iv;	2207	IV iv;
1736	} *civ, const_iv[] = {	2208	} *civ, const_iv[] = {
1737	# define const_iv(name) { # name, (IV)name }	2209	# define const_iv(name) { # name, (IV)name }
…		…
1800	const_iv (GL_SEPARABLE_2D),	2272	const_iv (GL_SEPARABLE_2D),
1801	const_iv (GL_CONVOLUTION_2D),	2273	const_iv (GL_CONVOLUTION_2D),
1802	const_iv (GL_CONVOLUTION_BORDER_MODE),	2274	const_iv (GL_CONVOLUTION_BORDER_MODE),
1803	const_iv (GL_CONSTANT_BORDER),	2275	const_iv (GL_CONSTANT_BORDER),
1804	const_iv (GL_LINES),	2276	const_iv (GL_LINES),
		2277	const_iv (GL_LINE_STRIP),
1805	const_iv (GL_LINE_LOOP),	2278	const_iv (GL_LINE_LOOP),
1806	const_iv (GL_QUADS),	2279	const_iv (GL_QUADS),
1807	const_iv (GL_QUAD_STRIP),	2280	const_iv (GL_QUAD_STRIP),
1808	const_iv (GL_TRIANGLES),	2281	const_iv (GL_TRIANGLES),
1809	const_iv (GL_TRIANGLE_STRIP),	2282	const_iv (GL_TRIANGLE_STRIP),
…		…
1817	# undef const_iv	2290	# undef const_iv
1818	};	2291	};
1819		2292
1820	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2293	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1821	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2294	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2295
		2296	texture_av = newAV ();
		2297	AvREAL_off (texture_av);
1822	}	2298	}
1823		2299
1824	char *	2300	char *
1825	gl_vendor ()	2301	gl_vendor ()
1826	CODE:	2302	CODE:
…		…
1975		2451
1976	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2452	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1977		2453
1978	int glGenTexture ()	2454	int glGenTexture ()
1979	CODE:	2455	CODE:
1980	{	2456	RETVAL = gen_texture ();
1981	GLuint name;
1982	glGenTextures (1, &name);
1983	RETVAL = name;
1984	}
1985	OUTPUT:	2457	OUTPUT:
1986	RETVAL	2458	RETVAL
1987		2459
1988	void glDeleteTexture (int name)	2460	void glDeleteTexture (int name)
1989	CODE:	2461	CODE:
1990	{
1991	GLuint name_ = name;
1992	glDeleteTextures (1, &name_);	2462	del_texture (name);
1993	}	2463
1994
1995	int glGenList ()	2464	int glGenList ()
1996	CODE:	2465	CODE:
1997	RETVAL = glGenLists (1);	2466	RETVAL = glGenLists (1);
1998	OUTPUT:	2467	OUTPUT:
1999	RETVAL	2468	RETVAL
…		…
2006		2475
2007	void glEndList ()	2476	void glEndList ()
2008		2477
2009	void glCallList (int list)	2478	void glCallList (int list)
2010		2479
2011

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.132 by root, Sun Jul 23 04:37:51 2006 UTC vs. Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.132 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC