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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.67 by root, Tue Apr 25 11:18:48 2006 UTC vs. Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.67 by root, Tue Apr 25 11:18:48 2006 UTC vs.
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC