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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC vs.
Revision 1.169 by root, Wed Dec 13 17:30:02 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC vs. Revision 1.169 by root, Wed Dec 13 17:30:02 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC vs.
Revision 1.169 by root, Wed Dec 13 17:30:02 2006 UTC