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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.203 by root, Thu Jul 19 13:45:16 2007 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC vs. Revision 1.203 by root, Thu Jul 19 13:45:16 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.203 by root, Thu Jul 19 13:45:16 2007 UTC