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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.60 by root, Sun Apr 23 04:47:02 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 8 * PANGO_SCALE	52	#define MIN_FONT_HEIGHT 10
46		53
		54	#if 0
		55	# define PARACHUTE SDL_INIT_NOPARACHUTE
		56	#else
		57	# define PARACHUTE 0
		58	#endif
		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
47	typedef Mix_Chunk *CFClient__MixChunk;	83	typedef Mix_Chunk *CFPlus__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	84	typedef Mix_Music *CFPlus__MixMusic;
49		85
50	static PangoContext *context;	86	typedef PangoFontDescription *CFPlus__Font;
51	static PangoFontMap *fontmap;	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	}
52		105
53	typedef struct cf_layout {	106	typedef struct cf_layout {
54	PangoLayout *pl;	107	PangoLayout *pl;
		108	float r, g, b, a; // default color for rgba mode
55	int base_height;	109	int base_height;
		110	CFPlus__Font font;
56	} *CFClient__Layout;	111	} *CFPlus__Layout;
		112
		113	static CFPlus__Font default_font;
		114	static PangoContext *opengl_context;
		115	static PangoFontMap *opengl_fontmap;
57		116
58	static void	117	static void
59	substitute_func (FcPattern *pattern, gpointer data)	118	substitute_func (FcPattern *pattern, gpointer data)
60	{	119	{
61	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
62	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	124	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
63	}	125	}
64		126
65	static void	127	static void
66	layout_update (CFClient__Layout self)	128	layout_update_font (CFPlus__Layout self)
67	{	129	{
68	/* 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
69	* reasonably well with bitstream vera	131	* reasonably well with bitstream vera
70	*/	132	*/
71	PangoFontDescription font = (PangoFontDescription )	133	PangoFontDescription *font = self->font ? self->font : default_font;
72	pango_layout_get_font_description (self->pl);
73		134
74	int height = self->base_height * (PANGO_SCALE * 8 / 10);
75
76	if (height < MIN_FONT_HEIGHT)
77	height = MIN_FONT_HEIGHT;
78
79	if (pango_font_description_get_size (font) != height)
80	{
81	font = pango_font_description_copy (font);
82	pango_font_description_set_absolute_size (font, height);	135	pango_font_description_set_absolute_size (font,
		136	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
		137
83	pango_layout_set_font_description (self->pl, font);	138	pango_layout_set_font_description (self->pl, font);
84	}
85	}	139	}
86		140
87	static void	141	static void
88	layout_get_pixel_size (CFClient__Layout self, int w, int h)	142	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
89	{	143	{
90	layout_update (self);	144	PangoRectangle rect;
91		145
		146	// get_pixel_* wrongly rounds down
92	pango_layout_get_pixel_size (self->pl, w, h);	147	pango_layout_get_extents (self->pl, 0, &rect);
93		148
94	w = (w + 3) & ~3;	149	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
95	if (!w) w = 1;	150	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
96	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;
97	}	157	}
98		158
99	typedef uint16_t mapface;	159	typedef uint16_t mapface;
100		160
101	typedef struct {	161	typedef struct {
104	float s, t;	164	float s, t;
105	uint8_t r, g, b, a;	165	uint8_t r, g, b, a;
106	} maptex;	166	} maptex;
107		167
108	typedef struct {	168	typedef struct {
109	int16_t darkness;	169	uint32_t player;
110	mapface face[3];	170	mapface face[3];
		171	uint16_t darkness;
		172	uint8_t stat_width, stat_hp, flags;
111	} mapcell;	173	} mapcell;
112		174
113	typedef struct {	175	typedef struct {
114	int32_t c0, c1;	176	int32_t c0, c1;
115	mapcell *col;	177	mapcell *col;
…		…
124	int texs;	186	int texs;
125	maptex *tex;	187	maptex *tex;
126		188
127	int32_t rows;	189	int32_t rows;
128	maprow *row;	190	maprow *row;
129	} *CFClient__Map;	191	} *CFPlus__Map;
130		192
131	static char *	193	static char *
132	prepend (char *ptr, int sze, int inc)	194	prepend (char *ptr, int sze, int inc)
133	{	195	{
134	char *p;	196	char *p;
…		…
152		214
153	#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))
154	#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))
155		217
156	static maprow *	218	static maprow *
157	map_get_row (CFClient__Map self, int y)	219	map_get_row (CFPlus__Map self, int y)
158	{	220	{
159	if (0 > y)	221	if (0 > y)
160	{	222	{
161	int extend = - y + MAP_EXTEND_Y;	223	int extend = - y + MAP_EXTEND_Y;
162	Prepend (maprow, self->row, self->rows, extend);	224	Prepend (maprow, self->row, self->rows, extend);
…		…
200		262
201	return row->col + (x - row->c0);	263	return row->col + (x - row->c0);
202	}	264	}
203		265
204	static mapcell *	266	static mapcell *
205	map_get_cell (CFClient__Map self, int x, int y)	267	map_get_cell (CFPlus__Map self, int x, int y)
206	{	268	{
207	return row_get_cell (map_get_row (self, y), x);	269	return row_get_cell (map_get_row (self, y), x);
208	}	270	}
209		271
210	static void	272	static void
211	map_clear (CFClient__Map self)	273	map_clear (CFPlus__Map self)
212	{	274	{
213	int r;	275	int r;
214		276
215	for (r = 0; r < self->rows; r++)	277	for (r = 0; r < self->rows; r++)
216	Safefree (self->row[r].col);	278	Safefree (self->row[r].col);
…		…
224	self->row = 0;	286	self->row = 0;
225	self->rows = 0;	287	self->rows = 0;
226	}	288	}
227		289
228	static void	290	static void
229	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)
230	{	292	{
231	int x, y;	293	int x, y;
232	maprow *row;	294	maprow *row;
		295	mapcell *cell;
233		296
234	for (y = y0; y < y0 + h; y++)	297	for (y = y0; y < y0 + h; y++)
235	if (y >= 0)	298	if (y >= 0)
236	{	299	{
237	if (y >= self->rows)	300	if (y >= self->rows)
…		…
243	if (x >= row->c0)	306	if (x >= row->c0)
244	{	307	{
245	if (x >= row->c1)	308	if (x >= row->c1)
246	break;	309	break;
247		310
248	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;
249	}	317	}
250	}	318	}
251	}	319	}
252		320
253	static void	321	static void
254	music_finished ()	322	music_finished (void)
255	{	323	{
256	SDL_UserEvent ev;	324	SDL_UserEvent ev;
257		325
258	ev.type = SDL_USEREVENT;	326	ev.type = SDL_USEREVENT;
259	ev.code = 0;	327	ev.code = 0;
…		…
261	ev.data2 = 0;	329	ev.data2 = 0;
262		330
263	SDL_PushEvent ((SDL_Event *)&ev);	331	SDL_PushEvent ((SDL_Event *)&ev);
264	}	332	}
265		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
266	MODULE = CFClient PACKAGE = CFClient	368	MODULE = CFPlus PACKAGE = CFPlus
267		369
268	PROTOTYPES: ENABLE	370	PROTOTYPES: ENABLE
269		371
270	BOOT:	372	BOOT:
271	{	373	{
272	HV *stash = gv_stashpv ("CFClient", 1);	374	HV *stash = gv_stashpv ("CFPlus", 1);
273	static const struct {	375	static const struct {
274	const char *name;	376	const char *name;
275	IV iv;	377	IV iv;
276	} *civ, const_iv[] = {	378	} *civ, const_iv[] = {
277	# 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
278	const_iv (SDL_ACTIVEEVENT),	383	const_iv (SDL_ACTIVEEVENT),
279	const_iv (SDL_KEYDOWN),	384	const_iv (SDL_KEYDOWN),
280	const_iv (SDL_KEYUP),	385	const_iv (SDL_KEYUP),
281	const_iv (SDL_MOUSEMOTION),	386	const_iv (SDL_MOUSEMOTION),
282	const_iv (SDL_MOUSEBUTTONDOWN),	387	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
291	const_iv (SDL_EVENT_RESERVEDA),	396	const_iv (SDL_EVENT_RESERVEDA),
292	const_iv (SDL_EVENT_RESERVEDB),	397	const_iv (SDL_EVENT_RESERVEDB),
293	const_iv (SDL_VIDEORESIZE),	398	const_iv (SDL_VIDEORESIZE),
294	const_iv (SDL_VIDEOEXPOSE),	399	const_iv (SDL_VIDEOEXPOSE),
295	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
296	const_iv (SDLK_KP0),	406	const_iv (SDLK_KP0),
297	const_iv (SDLK_KP1),	407	const_iv (SDLK_KP1),
298	const_iv (SDLK_KP2),	408	const_iv (SDLK_KP2),
299	const_iv (SDLK_KP3),	409	const_iv (SDLK_KP3),
300	const_iv (SDLK_KP4),	410	const_iv (SDLK_KP4),
…		…
355	const_iv (SDLK_BREAK),	465	const_iv (SDLK_BREAK),
356	const_iv (SDLK_MENU),	466	const_iv (SDLK_MENU),
357	const_iv (SDLK_POWER),	467	const_iv (SDLK_POWER),
358	const_iv (SDLK_EURO),	468	const_iv (SDLK_EURO),
359	const_iv (SDLK_UNDO),	469	const_iv (SDLK_UNDO),
		470
360	const_iv (KMOD_NONE),	471	const_iv (KMOD_NONE),
		472	const_iv (KMOD_SHIFT),
361	const_iv (KMOD_LSHIFT),	473	const_iv (KMOD_LSHIFT),
362	const_iv (KMOD_RSHIFT),	474	const_iv (KMOD_RSHIFT),
		475	const_iv (KMOD_CTRL),
363	const_iv (KMOD_LCTRL),	476	const_iv (KMOD_LCTRL),
364	const_iv (KMOD_RCTRL),	477	const_iv (KMOD_RCTRL),
		478	const_iv (KMOD_ALT),
365	const_iv (KMOD_LALT),	479	const_iv (KMOD_LALT),
366	const_iv (KMOD_RALT),	480	const_iv (KMOD_RALT),
		481	const_iv (KMOD_META),
367	const_iv (KMOD_LMETA),	482	const_iv (KMOD_LMETA),
368	const_iv (KMOD_RMETA),	483	const_iv (KMOD_RMETA),
369	const_iv (KMOD_NUM),	484	const_iv (KMOD_NUM),
370	const_iv (KMOD_CAPS),	485	const_iv (KMOD_CAPS),
371	const_iv (KMOD_MODE),	486	const_iv (KMOD_MODE),
372	const_iv (KMOD_CTRL),
373	const_iv (KMOD_SHIFT),
374	const_iv (KMOD_ALT),
375	const_iv (KMOD_META)
376	# undef const_iv	487	# undef const_iv
377	};	488	};
378		489
379	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; )
380	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	491	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
381		492
382	fontmap = pango_ft2_font_map_new ();	493	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
383	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	494	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
384	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
385	}	495	}
386		496
387	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
388	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	518	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
389		519
390	void	520	void
391	SDL_Quit ()	521	SDL_Quit ()
392		522
393	void	523	void
…		…
399	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	529	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
400	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	530	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
401	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	531	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
402	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	532	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
403		533
		534	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		535	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		536
404	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	537	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
405	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	538	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
406	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	539	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
407	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	540	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
408		541
409	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	542	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		543	#if SDL_VERSION_ATLEAST(1,2,10)
410	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	544	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
411	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	545	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		546	#endif
412		547
413	SDL_EnableUNICODE (1);	548	SDL_EnableUNICODE (1);
414	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	549	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
415		550
416	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	551	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
425		560
426	++m;	561	++m;
427	}	562	}
428	}	563	}
429		564
		565	char *
		566	SDL_GetError ()
		567
430	int	568	int
431	SDL_SetVideoMode (int w, int h, int fullscreen)	569	SDL_SetVideoMode (int w, int h, int fullscreen)
432	CODE:	570	CODE:
433	RETVAL = !!SDL_SetVideoMode (	571	RETVAL = !!SDL_SetVideoMode (
434	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	572	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
435	);	573	);
		574	if (RETVAL)
		575	{
436	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	}
437	OUTPUT:	581	OUTPUT:
438	RETVAL	582	RETVAL
439		583
440	void	584	void
441	SDL_GL_SwapBuffers ()	585	SDL_GL_SwapBuffers ()
		586
		587	char *
		588	SDL_GetKeyName (int sym)
442		589
443	void	590	void
444	SDL_PollEvent ()	591	SDL_PollEvent ()
445	PPCODE:	592	PPCODE:
446	{	593	{
…		…
448		595
449	while (SDL_PollEvent (&ev))	596	while (SDL_PollEvent (&ev))
450	{	597	{
451	HV *hv = newHV ();	598	HV *hv = newHV ();
452	hv_store (hv, "type", 4, newSViv (ev.type), 0);	599	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		600
453	switch (ev.type)	601	switch (ev.type)
454	{	602	{
455	case SDL_KEYDOWN:	603	case SDL_KEYDOWN:
456	case SDL_KEYUP:	604	case SDL_KEYUP:
457	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
458	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	606	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
459	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 */
460	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	609	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
461	break;	610	break;
462		611
463	case SDL_ACTIVEEVENT:	612	case SDL_ACTIVEEVENT:
464	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	613	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
465	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	614	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
466	break;	615	break;
467		616
468	case SDL_MOUSEMOTION:	617	case SDL_MOUSEMOTION:
		618	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		619
469	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	620	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
470	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	621	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
471	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	622	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
472	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	623	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
473	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	624	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
474	break;	625	break;
475		626
476	case SDL_MOUSEBUTTONDOWN:	627	case SDL_MOUSEBUTTONDOWN:
477	case SDL_MOUSEBUTTONUP:	628	case SDL_MOUSEBUTTONUP:
		629	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		630
478	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	631	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
479	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	632	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
480	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	633	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
481	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;
482	}	642	}
483		643
484	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	644	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
485	}	645	}
486	}	646	}
487		647
488	int	648	int
489	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)
490	POSTCALL:	650	POSTCALL:
491	Mix_HookMusicFinished (music_finished);	651	Mix_HookMusicFinished (music_finished);
		652	Mix_ChannelFinished (channel_finished);
492		653
493	void	654	void
494	Mix_CloseAudio ()	655	Mix_CloseAudio ()
495		656
496	int	657	int
…		…
501	CODE:	662	CODE:
502	#ifndef _WIN32	663	#ifndef _WIN32
503	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	664	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
504	#endif	665	#endif
505		666
506	char *	667	void
507	gl_version ()	668	win32_proxy_info ()
508	CODE:	669	PPCODE:
509	RETVAL = (char *)glGetString (GL_VERSION);	670	{
510	OUTPUT:	671	#ifdef _WIN32
511	RETVAL	672	char buffer[2048];
		673	DWORD buflen;
512		674
513	char *	675	EXTEND (SP, 3);
514	gl_extensions ()	676
515	CODE:	677	buflen = sizeof (buffer);
516	RETVAL = (char *)glGetString (GL_EXTENSIONS);	678	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
517	OUTPUT:	679	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
518	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	}
519		695
520	void	696	void
521	add_font (char *file)	697	add_font (char *file)
522	CODE:	698	CODE:
523	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	699	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
524
525	void
526	set_font (char *file)
527	CODE:
528	{
529	int count;
530	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
531	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
532	FcPatternDestroy (pattern);
533	pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
534	pango_context_set_font_description (context, font);
535	}
536		700
537	void	701	void
538	load_image_inline (SV *image_)	702	load_image_inline (SV *image_)
539	ALIAS:	703	ALIAS:
540	load_image_file = 1	704	load_image_file = 1
…		…
582		746
583	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	747	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
584		748
585	assert (surface2->pitch == surface2->w * 4);	749	assert (surface2->pitch == surface2->w * 4);
586		750
		751	SDL_LockSurface (surface2);
587	EXTEND (SP, 5);	752	EXTEND (SP, 6);
588	PUSHs (sv_2mortal (newSViv (surface2->w)));	753	PUSHs (sv_2mortal (newSViv (surface2->w)));
589	PUSHs (sv_2mortal (newSViv (surface2->h)));	754	PUSHs (sv_2mortal (newSViv (surface2->h)));
590	SDL_LockSurface (surface2);
591	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	755	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
592	SDL_UnlockSurface (surface2);
593	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)));
594	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	757	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
595	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	758	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		759	SDL_UnlockSurface (surface2);
596		760
597	SDL_FreeSurface (surface);	761	SDL_FreeSurface (surface);
598	SDL_FreeSurface (surface2);	762	SDL_FreeSurface (surface2);
599	}	763	}
600		764
…		…
622	PUSHs (sv_2mortal (newSViv (b / y)));	786	PUSHs (sv_2mortal (newSViv (b / y)));
623	PUSHs (sv_2mortal (newSViv (a / y)));	787	PUSHs (sv_2mortal (newSViv (a / y)));
624	}	788	}
625		789
626	void	790	void
		791	error (char *message)
		792	CODE:
		793	fprintf (stderr, "ERROR: %s\n", message);
		794	#ifdef _WIN32
		795	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
		796	#endif
		797
		798	void
627	fatal (char *message)	799	fatal (char *message)
628	CODE:	800	CODE:
		801	fprintf (stderr, "FATAL: %s\n", message);
629	#ifdef _WIN32	802	#ifdef _WIN32
630	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	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
631	#else	812	#else
632	fprintf (stderr, "FATAL: %s\n", message);	813	_exit (retval);
633	#endif	814	#endif
634	exit (1);
635		815
		816	MODULE = CFPlus PACKAGE = CFPlus::Font
		817
		818	CFPlus::Font
		819	new_from_file (SV class, char path, int id = 0)
		820	CODE:
		821	{
		822	int count;
		823	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		824	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		825	FcPatternDestroy (pattern);
		826	}
		827	OUTPUT:
		828	RETVAL
		829
		830	void
		831	DESTROY (CFPlus::Font self)
		832	CODE:
		833	pango_font_description_free (self);
		834
		835	void
		836	make_default (CFPlus::Font self)
		837	CODE:
		838	default_font = self;
		839
636	MODULE = CFClient PACKAGE = CFClient::Layout	840	MODULE = CFPlus PACKAGE = CFPlus::Layout
637		841
638	CFClient::Layout	842	void
639	new (SV *class, int base_height = 10)	843	reset_glyph_cache ()
		844	CODE:
		845	tc_clear ();
		846
		847	CFPlus::Layout
		848	new (SV *class)
640	CODE:	849	CODE:
641	New (0, RETVAL, 1, struct cf_layout);	850	New (0, RETVAL, 1, struct cf_layout);
642	RETVAL->base_height = base_height;	851
643	RETVAL->pl = pango_layout_new (context);	852	RETVAL->pl = pango_layout_new (opengl_context);
		853	RETVAL->r = 1.;
		854	RETVAL->g = 1.;
		855	RETVAL->b = 1.;
		856	RETVAL->a = 1.;
		857	RETVAL->base_height = MIN_FONT_HEIGHT;
		858	RETVAL->font = 0;
		859
644	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	860	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
645	pango_layout_set_font_description (RETVAL->pl,	861	layout_update_font (RETVAL);
646	pango_font_description_copy (
647	pango_context_get_font_description (context)));
648	OUTPUT:	862	OUTPUT:
649	RETVAL	863	RETVAL
650		864
651	void	865	void
652	DESTROY (CFClient::Layout self)	866	DESTROY (CFPlus::Layout self)
653	CODE:	867	CODE:
654	g_object_unref (self->pl);	868	g_object_unref (self->pl);
655	Safefree (self);	869	Safefree (self);
656		870
657	void	871	void
658	set_text (CFClient::Layout self, SV *text_)	872	set_text (CFPlus::Layout self, SV *text_)
659	CODE:	873	CODE:
660	{	874	{
661	STRLEN textlen;	875	STRLEN textlen;
662	char *text = SvPVutf8 (text_, textlen);	876	char *text = SvPVutf8 (text_, textlen);
663		877
664	pango_layout_set_text (self->pl, text, textlen);	878	pango_layout_set_text (self->pl, text, textlen);
665	}	879	}
666		880
667	void	881	void
668	set_markup (CFClient::Layout self, SV *text_)	882	set_markup (CFPlus::Layout self, SV *text_)
669	CODE:	883	CODE:
670	{	884	{
671	STRLEN textlen;	885	STRLEN textlen;
672	char *text = SvPVutf8 (text_, textlen);	886	char *text = SvPVutf8 (text_, textlen);
673		887
674	pango_layout_set_markup (self->pl, text, textlen);	888	pango_layout_set_markup (self->pl, text, textlen);
675	}	889	}
676		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
677	SV *	976	SV *
678	get_text (CFClient::Layout self)	977	get_text (CFPlus::Layout self)
679	CODE:	978	CODE:
680	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	979	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
681	SvUTF8_on (RETVAL);	980	sv_utf8_decode (RETVAL);
682	OUTPUT:	981	OUTPUT:
683	RETVAL	982	RETVAL
684		983
685	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
		993	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
		994	CODE:
		995	if (self->font != font)
		996	{
		997	self->font = font;
		998	layout_update_font (self);
		999	}
		1000
		1001	void
686	set_height (CFClient::Layout self, int base_height)	1002	set_height (CFPlus::Layout self, int base_height)
687	CODE:	1003	CODE:
		1004	if (self->base_height != base_height)
		1005	{
688	self->base_height = base_height;	1006	self->base_height = base_height;
		1007	layout_update_font (self);
		1008	}
689		1009
690	void	1010	void
691	set_width (CFClient::Layout self, int max_width = -1)	1011	set_width (CFPlus::Layout self, int max_width = -1)
692	CODE:	1012	CODE:
693	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);
694		1014
695	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
696	size (CFClient::Layout self)	1041	size (CFPlus::Layout self)
697	PPCODE:	1042	PPCODE:
698	{	1043	{
699	int w, h;	1044	int w, h;
700		1045
701	layout_update (self);
702	layout_get_pixel_size (self, &w, &h);	1046	layout_get_pixel_size (self, &w, &h);
703		1047
704	EXTEND (SP, 2);	1048	EXTEND (SP, 2);
705	PUSHs (sv_2mortal (newSViv (w)));	1049	PUSHs (sv_2mortal (newSViv (w)));
706	PUSHs (sv_2mortal (newSViv (h)));	1050	PUSHs (sv_2mortal (newSViv (h)));
707	}	1051	}
708		1052
709	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
710	xy_to_index (CFClient::Layout self, int x, int y)	1066	xy_to_index (CFPlus::Layout self, int x, int y)
711	CODE:	1067	CODE:
712	{	1068	{
713	int index, trailing;	1069	int index, trailing;
714
715	layout_update (self);
716	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);
717
718	RETVAL = index;	1071	RETVAL = index + trailing;
719	}	1072	}
720	OUTPUT:	1073	OUTPUT:
721	RETVAL	1074	RETVAL
722		1075
723	void	1076	void
724	cursor_pos (CFClient::Layout self, int index)	1077	cursor_pos (CFPlus::Layout self, int index)
725	PPCODE:	1078	PPCODE:
726	{	1079	{
727	PangoRectangle strong_pos;	1080	PangoRectangle strong_pos;
728	layout_update (self);
729	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1081	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
730		1082
731	EXTEND (SP, 3);	1083	EXTEND (SP, 3);
732	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1084	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
733	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1085	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
734	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1086	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
735	}	1087	}
736		1088
737	void	1089	void
738	render (CFClient::Layout self)	1090	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
739	PPCODE:	1091	PPCODE:
740	{	1092	{
741	SV *retval;	1093	int line, x;
742	int w, h;
743	FT_Bitmap bitmap;
744		1094
745	layout_update (self);	1095	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
746	layout_get_pixel_size (self, &w, &h);	1096	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
747		1097
748	retval = newSV (w * h);
749	SvPOK_only (retval);
750	SvCUR_set (retval, w * h);
751
752	bitmap.rows = h;
753	bitmap.width = w;
754	bitmap.pitch = w;
755	bitmap.buffer = (unsigned char*)SvPVX (retval);
756	bitmap.num_grays = 256;
757	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
758
759	memset (bitmap.buffer, 0, w * h);
760
761	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
762
763	EXTEND (SP, 3);	1098	EXTEND (SP, 2);
764	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	{
765	PUSHs (sv_2mortal (newSViv (h)));	1123	PUSHs (sv_2mortal (newSViv (index)));
766	PUSHs (sv_2mortal (retval));	1124	PUSHs (sv_2mortal (newSViv (trailing)));
		1125	}
767	}	1126	}
768		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
769	MODULE = CFClient PACKAGE = CFClient::Texture	1138	MODULE = CFPlus PACKAGE = CFPlus::Texture
770		1139
771	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
772	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.)
773	PROTOTYPE: $$$;$$	1179	PROTOTYPE: $$$;$$
		1180	ALIAS:
		1181	draw_quad_alpha = 1
		1182	draw_quad_alpha_premultiplied = 2
774	CODE:	1183	CODE:
775	{	1184	{
776	HV hv = (HV )SvRV (self);	1185	HV hv = (HV )SvRV (self);
777	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1186	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
778	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1187	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
779	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1188	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
780	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
781		1189
782	if (items < 5)	1190	if (items < 5)
783	{	1191	{
784	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1192	w = SvNV (*hv_fetch (hv, "w", 1, 1));
785	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1193	h = SvNV (*hv_fetch (hv, "h", 1, 1));
786	}	1194	}
787		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
788	glBindTexture (GL_TEXTURE_2D, name);	1210	glBindTexture (GL_TEXTURE_2D, name);
789	if (wrap_mode) {	1211
790	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
791	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
792	}
793	glBegin (GL_QUADS);	1212	glBegin (GL_QUADS);
794	glTexCoord2f (0, 0); glVertex2f (x , y );	1213	glTexCoord2f (0, 0); glVertex2f (x , y );
795	glTexCoord2f (0, t); glVertex2f (x , y + h);	1214	glTexCoord2f (0, t); glVertex2f (x , y + h);
796	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1215	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
797	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1216	glTexCoord2f (s, 0); glVertex2f (x + w, y );
798	glEnd ();	1217	glEnd ();
799	}
800		1218
		1219	if (ix)
		1220	{
		1221	glDisable (GL_ALPHA_TEST);
		1222	glDisable (GL_BLEND);
		1223	}
		1224	}
		1225
801	MODULE = CFClient PACKAGE = CFClient::Map	1226	MODULE = CFPlus PACKAGE = CFPlus::Map
802		1227
803	CFClient::Map	1228	CFPlus::Map
804	new (SV *class, int map_width, int map_height)	1229	new (SV *class)
805	CODE:	1230	CODE:
806	New (0, RETVAL, 1, struct map);	1231	New (0, RETVAL, 1, struct map);
807	RETVAL->x = 0;	1232	RETVAL->x = 0;
808	RETVAL->y = 0;	1233	RETVAL->y = 0;
809	RETVAL->w = map_width;	1234	RETVAL->w = 0;
810	RETVAL->h = map_height;	1235	RETVAL->h = 0;
811	RETVAL->ox = 0;	1236	RETVAL->ox = 0;
812	RETVAL->oy = 0;	1237	RETVAL->oy = 0;
813	RETVAL->faces = 8192;	1238	RETVAL->faces = 8192;
814	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1239	Newz (0, RETVAL->face, RETVAL->faces, mapface);
815	RETVAL->texs = 8192;	1240	RETVAL->texs = 8192;
…		…
818	RETVAL->row = 0;	1243	RETVAL->row = 0;
819	OUTPUT:	1244	OUTPUT:
820	RETVAL	1245	RETVAL
821		1246
822	void	1247	void
823	DESTROY (CFClient::Map self)	1248	DESTROY (CFPlus::Map self)
824	CODE:	1249	CODE:
825	{	1250	{
826	map_clear (self);	1251	map_clear (self);
827	Safefree (self->face);	1252	Safefree (self->face);
		1253	Safefree (self->tex);
828	Safefree (self);	1254	Safefree (self);
829	}	1255	}
830		1256
831	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
832	clear (CFClient::Map self)	1264	clear (CFPlus::Map self)
833	CODE:	1265	CODE:
834	map_clear (self);	1266	map_clear (self);
835		1267
836	void	1268	void
837	set_face (CFClient::Map self, int face, int texid)	1269	set_face (CFPlus::Map self, int face, int texid)
838	CODE:	1270	CODE:
839	{	1271	{
840	while (self->faces <= face)	1272	while (self->faces <= face)
841	{	1273	{
842	Append (mapface, self->face, self->faces, self->faces);	1274	Append (mapface, self->face, self->faces, self->faces);
…		…
845		1277
846	self->face [face] = texid;	1278	self->face [face] = texid;
847	}	1279	}
848		1280
849	void	1281	void
850	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)
851	CODE:	1283	CODE:
852	{	1284	{
853	while (self->texs <= texid)	1285	while (self->texs <= texid)
854	{	1286	{
855	Append (maptex, self->tex, self->texs, self->texs);	1287	Append (maptex, self->tex, self->texs, self->texs);
…		…
867	tex->r = r;	1299	tex->r = r;
868	tex->g = g;	1300	tex->g = g;
869	tex->b = b;	1301	tex->b = b;
870	tex->a = a;	1302	tex->a = a;
871	}	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);
872	}	1313	}
873		1314
874	int	1315	int
875	ox (CFClient::Map self)	1316	ox (CFPlus::Map self)
876	ALIAS:	1317	ALIAS:
877	oy = 1	1318	oy = 1
		1319	x = 2
		1320	y = 3
		1321	w = 4
		1322	h = 5
878	CODE:	1323	CODE:
879	switch (ix)	1324	switch (ix)
880	{	1325	{
881	case 0: RETVAL = self->ox; break;	1326	case 0: RETVAL = self->ox; break;
882	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;
883	}	1332	}
884	OUTPUT:	1333	OUTPUT:
885	RETVAL	1334	RETVAL
886		1335
887	void	1336	void
888	scroll (CFClient::Map self, int dx, int dy)	1337	scroll (CFPlus::Map self, int dx, int dy)
889	CODE:	1338	CODE:
890	{	1339	{
891	if (dx > 0)	1340	if (dx > 0)
892	map_blank (self, self->x, self->y, dx - 1, self->h);	1341	map_blank (self, self->x, self->y, dx, self->h);
893	else if (dx < 0)	1342	else if (dx < 0)
894	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);
895		1344
896	if (dy > 0)	1345	if (dy > 0)
897	map_blank (self, self->x, self->y, self->w, dy - 1);	1346	map_blank (self, self->x, self->y, self->w, dy);
898	else if (dy < 0)	1347	else if (dy < 0)
899	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);
900		1349
901	self->ox += dx; self->x += dx;	1350	self->ox += dx; self->x += dx;
902	self->oy += dy; self->y += dy;	1351	self->oy += dy; self->y += dy;
903		1352
904	while (self->y < 0)	1353	while (self->y < 0)
…		…
909	self->y += MAP_EXTEND_Y;	1358	self->y += MAP_EXTEND_Y;
910	}	1359	}
911	}	1360	}
912		1361
913	void	1362	void
914	map1a_update (CFClient::Map self, SV *data_)	1363	map1a_update (CFPlus::Map self, SV *data_, int extmap)
915	CODE:	1364	CODE:
916	{	1365	{
917	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1366	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
918	uint8_t data_end = (uint8_t )SvEND (data_);	1367	uint8_t data_end = (uint8_t )SvEND (data_);
919	mapcell *cell;	1368	mapcell *cell;
920	int x, y, flags;	1369	int x, y, flags;
921		1370
922	while (data < data_end)	1371	while (data < data_end - 1)
923	{	1372	{
924	flags = (data [0] << 8) + data [1]; data += 2;	1373	flags = (data [0] << 8) + data [1]; data += 2;
925		1374
926	x = ((flags >> 10) & 63) + self->x;	1375	x = self->x + ((flags >> 10) & 63);
927	y = ((flags >> 4) & 63) + self->y;	1376	y = self->y + ((flags >> 4) & 63);
928		1377
929	cell = map_get_cell (self, x, y);	1378	cell = map_get_cell (self, x, y);
930		1379
931	if (flags & 15)	1380	if (flags & 15)
932	{	1381	{
933	if (cell->darkness < 0)	1382	if (!cell->darkness)
934	{	1383	{
		1384	memset (cell, 0, sizeof (*cell));
935	cell->darkness = 0;	1385	cell->darkness = 256;
936	cell->face [0] = 0;
937	cell->face [1] = 0;
938	cell->face [2] = 0;
939	}	1386	}
940		1387
941	cell->darkness = flags & 8 ? *data++ : 255;
942
943	//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	}
944		1429
945	if (flags & 4)	1430	if (flags & 4)
946	{	1431	{
947	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;
948	}	1433	}
…		…
956	{	1441	{
957	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;
958	}	1443	}
959	}	1444	}
960	else	1445	else
961	cell->darkness = -1;	1446	cell->darkness = 0;
962	}	1447	}
963	}	1448	}
964		1449
965	SV *	1450	SV *
966	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)
967	CODE:	1452	CODE:
968	{	1453	{
969	int x1, x;	1454	int x1, x;
970	int y1, y;	1455	int y1, y;
971	int z;	1456	int z;
…		…
1021	}	1506	}
1022	OUTPUT:	1507	OUTPUT:
1023	RETVAL	1508	RETVAL
1024		1509
1025	void	1510	void
1026	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)
1027	PPCODE:	1512	CODE:
1028	{	1513	{
1029	int vx, vy;
1030	int x, y, z;	1514	int x, y, z;
1031	int last_name;	1515	int last_name;
1032	mapface face;	1516	mapface face;
1033	int sw4 = (sw + 3) & ~3;
1034	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1035	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1036
1037	memset (darkness, 255, sw4 * sh);
1038	SvPOK_only (darkness_sv);
1039	SvCUR_set (darkness_sv, sw4 * sh);
1040
1041	vx = self->x + (self->w - sw) / 2 - shift_x;
1042	vy = self->y + (self->h - sh) / 2 - shift_y;
1043
1044	/*
1045	int vx = self->vx = self->w >= sw
1046	? self->x + (self->w - sw) / 2
1047	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1048
1049	int vy = self->vy = self->h >= sh
1050	? self->y + (self->h - sh) / 2
1051	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1052	*/
1053		1517
1054	glColor4ub (255, 255, 255, 255);	1518	glColor4ub (255, 255, 255, 255);
1055		1519
		1520	glEnable (GL_BLEND);
1056	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1521	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1057	glEnable (GL_BLEND);
1058	glEnable (GL_TEXTURE_2D);	1522	glEnable (GL_TEXTURE_2D);
1059	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1523	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1060		1524
1061	glBegin (GL_QUADS);	1525	glBegin (GL_QUADS);
1062		1526
1063	last_name = 0;	1527	last_name = 0;
1064		1528
		1529	mx += self->x;
		1530	my += self->y;
		1531
1065	for (z = 0; z < 3; z++)	1532	for (z = 0; z < 3; z++)
1066	for (y = 0; y < sh; y++)	1533	for (y = 0; y < sh; y++)
1067	if (0 <= y + vy && y + vy < self->rows)	1534	if (0 <= y + my && y + my < self->rows)
1068	{	1535	{
1069	maprow *row = self->row + (y + vy);	1536	maprow *row = self->row + (y + my);
1070		1537
1071	for (x = 0; x < sw; x++)	1538	for (x = 0; x < sw; x++)
1072	if (row->c0 <= x + vx && x + vx < row->c1)	1539	if (row->c0 <= x + mx && x + mx < row->c1)
1073	{	1540	{
1074	mapcell *cell = row->col + (x + vx - row->c0);	1541	mapcell *cell = row->col + (x + mx - row->c0);
1075
1076	darkness[y * sw4 + x] = cell->darkness < 0
1077	? 255 - FOW_DARKNESS
1078	: 255 - cell->darkness;
1079		1542
1080	face = cell->face [z];	1543	face = cell->face [z];
1081		1544
1082	if (face)	1545	if (face && face < self->texs)
1083	{	1546	{
1084	maptex tex = self->tex [face];	1547	maptex tex = self->tex [face];
1085
1086	int px = (x + 1) * 32 - tex.w;	1548	int px = (x + 1) * 32 - tex.w;
1087	int py = (y + 1) * 32 - tex.h;	1549	int py = (y + 1) * 32 - tex.h;
1088		1550
1089	if (last_name != tex.name)	1551	if (last_name != tex.name)
1090	{	1552	{
1091	glEnd ();	1553	glEnd ();
1092	last_name = tex.name;
1093	glBindTexture (GL_TEXTURE_2D, last_name);	1554	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1094	glBegin (GL_QUADS);	1555	glBegin (GL_QUADS);
1095	}	1556	}
1096		1557
1097	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1558	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1098	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1559	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1099	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);
1100	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1561	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1101	}	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	}
1102	}	1582	}
1103	}	1583	}
1104		1584
1105	glEnd ();	1585	glEnd ();
1106		1586
1107	glDisable (GL_TEXTURE_2D);	1587	glDisable (GL_TEXTURE_2D);
1108	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	}
1109		1713
1110	EXTEND (SP, 3);	1714	EXTEND (SP, 3);
1111	PUSHs (sv_2mortal (newSViv (sw4)));	1715	PUSHs (sv_2mortal (newSViv (sw4)));
1112	PUSHs (sv_2mortal (newSViv (sh)));	1716	PUSHs (sv_2mortal (newSViv (sh)));
1113	PUSHs (darkness_sv);	1717	PUSHs (darkness_sv);
1114	}	1718	}
1115		1719
1116	SV *	1720	SV *
1117	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)
1118	CODE:	1722	CODE:
1119	{	1723	{
1120	int x, y, x1, y1;	1724	int x, y, x1, y1;
1121	SV data_sv = newSV (w h * 7 + 5);	1725	SV data_sv = newSV (w h * 7 + 5);
1122	uint8_t data = (uint8_t )SvPVX (data_sv);	1726	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1184	}	1788	}
1185	OUTPUT:	1789	OUTPUT:
1186	RETVAL	1790	RETVAL
1187		1791
1188	void	1792	void
1189	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)
1190	PPCODE:	1794	PPCODE:
1191	{	1795	{
1192	int x, y, z;	1796	int x, y, z;
1193	int w, h;	1797	int w, h;
1194	int x1, y1;	1798	int x1, y1;
…		…
1226		1830
1227	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1831	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1228	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1832	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1229	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1833	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1230		1834
1231	if (cell->darkness <= 0)	1835	if (cell->darkness == 0)
1232	{	1836	{
1233	cell->darkness = -1;	1837	cell->darkness = 0;
1234		1838
1235	for (z = 0; z <= 2; z++)	1839	for (z = 0; z <= 2; z++)
1236	{	1840	{
1237	cell->face[z] = face[z];	1841	cell->face[z] = face[z];
1238		1842
…		…
1243	}	1847	}
1244	}	1848	}
1245	}	1849	}
1246	}	1850	}
1247		1851
1248	MODULE = CFClient PACKAGE = CFClient::MixChunk	1852	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1249		1853
1250	CFClient::MixChunk	1854	CFPlus::MixChunk
1251	new_from_file (SV class, char path)	1855	new_from_file (SV class, char path)
1252	CODE:	1856	CODE:
1253	RETVAL = Mix_LoadWAV (path);	1857	RETVAL = Mix_LoadWAV (path);
1254	OUTPUT:	1858	OUTPUT:
1255	RETVAL	1859	RETVAL
1256		1860
1257	void	1861	void
1258	DESTROY (CFClient::MixChunk self)	1862	DESTROY (CFPlus::MixChunk self)
1259	CODE:	1863	CODE:
1260	Mix_FreeChunk (self);	1864	Mix_FreeChunk (self);
1261		1865
1262	int	1866	int
1263	volume (CFClient::MixChunk self, int volume = -1)	1867	volume (CFPlus::MixChunk self, int volume = -1)
1264	CODE:	1868	CODE:
1265	RETVAL = Mix_VolumeChunk (self, volume);	1869	RETVAL = Mix_VolumeChunk (self, volume);
1266	OUTPUT:	1870	OUTPUT:
1267	RETVAL	1871	RETVAL
1268		1872
1269	int	1873	int
1270	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)
1271	CODE:	1875	CODE:
1272	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1876	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1273	OUTPUT:	1877	OUTPUT:
1274	RETVAL	1878	RETVAL
1275		1879
1276	MODULE = CFClient PACKAGE = CFClient::MixMusic	1880	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1277		1881
1278	int	1882	int
1279	volume (int volume = -1)	1883	volume (int volume = -1)
1280	CODE:	1884	CODE:
1281	RETVAL = Mix_VolumeMusic (volume);	1885	RETVAL = Mix_VolumeMusic (volume);
1282	OUTPUT:	1886	OUTPUT:
1283	RETVAL	1887	RETVAL
1284		1888
1285	CFClient::MixMusic	1889	CFPlus::MixMusic
1286	new_from_file (SV class, char path)	1890	new_from_file (SV class, char path)
1287	CODE:	1891	CODE:
1288	RETVAL = Mix_LoadMUS (path);	1892	RETVAL = Mix_LoadMUS (path);
1289	OUTPUT:	1893	OUTPUT:
1290	RETVAL	1894	RETVAL
1291		1895
1292	void	1896	void
1293	DESTROY (CFClient::MixMusic self)	1897	DESTROY (CFPlus::MixMusic self)
1294	CODE:	1898	CODE:
1295	Mix_FreeMusic (self);	1899	Mix_FreeMusic (self);
1296		1900
1297	int	1901	int
1298	play (CFClient::MixMusic self, int loops = -1)	1902	play (CFPlus::MixMusic self, int loops = -1)
1299	CODE:	1903	CODE:
1300	RETVAL = Mix_PlayMusic (self, loops);	1904	RETVAL = Mix_PlayMusic (self, loops);
1301	OUTPUT:	1905	OUTPUT:
1302	RETVAL	1906	RETVAL
1303		1907
1304	MODULE = CFClient PACKAGE = CFClient::OpenGL	1908	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1305		1909
1306	BOOT:	1910	BOOT:
1307	{	1911	{
1308	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1912	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1309	static const struct {	1913	static const struct {
1310	const char *name;	1914	const char *name;
1311	IV iv;	1915	IV iv;
1312	} *civ, const_iv[] = {	1916	} *civ, const_iv[] = {
1313	# define const_iv(name) { # name, (IV)name }	1917	# define const_iv(name) { # name, (IV)name }
1314	const_iv (GL_COLOR_MATERIAL),	1918	const_iv (GL_COLOR_MATERIAL),
1315	const_iv (GL_SMOOTH),	1919	const_iv (GL_SMOOTH),
1316	const_iv (GL_FLAT),	1920	const_iv (GL_FLAT),
		1921	const_iv (GL_DITHER),
1317	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),
1318	const_iv (GL_AND),	1931	const_iv (GL_AND),
		1932	const_iv (GL_ONE),
		1933	const_iv (GL_ZERO),
1319	const_iv (GL_SRC_ALPHA),	1934	const_iv (GL_SRC_ALPHA),
		1935	const_iv (GL_DST_ALPHA),
1320	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1936	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1937	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1938	const_iv (GL_SRC_ALPHA_SATURATE),
1321	const_iv (GL_RGB),	1939	const_iv (GL_RGB),
1322	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),
1323	const_iv (GL_UNSIGNED_BYTE),	1944	const_iv (GL_UNSIGNED_BYTE),
1324	const_iv (GL_ALPHA4),	1945	const_iv (GL_UNSIGNED_SHORT),
		1946	const_iv (GL_UNSIGNED_INT),
1325	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),
1326	const_iv (GL_FLOAT),	1951	const_iv (GL_FLOAT),
1327	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1952	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1328	const_iv (GL_COMPILE),	1953	const_iv (GL_COMPILE),
1329	const_iv (GL_TEXTURE_1D),	1954	const_iv (GL_TEXTURE_1D),
1330	const_iv (GL_TEXTURE_2D),	1955	const_iv (GL_TEXTURE_2D),
…		…
1332	const_iv (GL_TEXTURE_MAG_FILTER),	1957	const_iv (GL_TEXTURE_MAG_FILTER),
1333	const_iv (GL_TEXTURE_MIN_FILTER),	1958	const_iv (GL_TEXTURE_MIN_FILTER),
1334	const_iv (GL_TEXTURE_ENV_MODE),	1959	const_iv (GL_TEXTURE_ENV_MODE),
1335	const_iv (GL_TEXTURE_WRAP_S),	1960	const_iv (GL_TEXTURE_WRAP_S),
1336	const_iv (GL_TEXTURE_WRAP_T),	1961	const_iv (GL_TEXTURE_WRAP_T),
		1962	const_iv (GL_REPEAT),
1337	const_iv (GL_CLAMP),	1963	const_iv (GL_CLAMP),
1338	const_iv (GL_REPEAT),	1964	const_iv (GL_CLAMP_TO_EDGE),
1339	const_iv (GL_NEAREST),	1965	const_iv (GL_NEAREST),
1340	const_iv (GL_LINEAR),	1966	const_iv (GL_LINEAR),
1341	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1967	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1342	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1968	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1343	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1969	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1344	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1970	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1345	const_iv (GL_GENERATE_MIPMAP),	1971	const_iv (GL_GENERATE_MIPMAP),
1346	const_iv (GL_LINEAR),
1347	const_iv (GL_MODULATE),	1972	const_iv (GL_MODULATE),
		1973	const_iv (GL_DECAL),
1348	const_iv (GL_REPLACE),	1974	const_iv (GL_REPLACE),
		1975	const_iv (GL_DEPTH_BUFFER_BIT),
1349	const_iv (GL_COLOR_BUFFER_BIT),	1976	const_iv (GL_COLOR_BUFFER_BIT),
1350	const_iv (GL_PROJECTION),	1977	const_iv (GL_PROJECTION),
1351	const_iv (GL_MODELVIEW),	1978	const_iv (GL_MODELVIEW),
1352	const_iv (GL_COLOR_LOGIC_OP),	1979	const_iv (GL_COLOR_LOGIC_OP),
		1980	const_iv (GL_SEPARABLE_2D),
1353	const_iv (GL_CONVOLUTION_2D),	1981	const_iv (GL_CONVOLUTION_2D),
1354	const_iv (GL_CONVOLUTION_BORDER_MODE),	1982	const_iv (GL_CONVOLUTION_BORDER_MODE),
1355	const_iv (GL_CONSTANT_BORDER),	1983	const_iv (GL_CONSTANT_BORDER),
1356	const_iv (GL_LINES),	1984	const_iv (GL_LINES),
		1985	const_iv (GL_LINE_STRIP),
		1986	const_iv (GL_LINE_LOOP),
1357	const_iv (GL_QUADS),	1987	const_iv (GL_QUADS),
1358	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),
1359	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1992	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1360	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),
1361	# undef const_iv	1998	# undef const_iv
1362	};	1999	};
1363		2000
1364	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; )
1365	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2002	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1366	}	2003	}
1367		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
1368	int glGetError ()	2026	int glGetError ()
		2027
		2028	void glFinish ()
1369		2029
1370	void glClear (int mask)	2030	void glClear (int mask)
1371		2031
1372	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)
1373	PROTOTYPE: @	2033	PROTOTYPE: @
…		…
1380		2040
1381	void glHint (int target, int mode)	2041	void glHint (int target, int mode)
1382		2042
1383	void glBlendFunc (int sfactor, int dfactor)	2043	void glBlendFunc (int sfactor, int dfactor)
1384		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
1385	void glLogicOp (int opcode)	2051	void glLogicOp (int opcode)
1386		2052
		2053	void glColorMask (int red, int green, int blue, int alpha)
		2054
1387	void glMatrixMode (int mode)	2055	void glMatrixMode (int mode)
1388		2056
1389	void glPushMatrix ()	2057	void glPushMatrix ()
1390		2058
1391	void glPopMatrix ()	2059	void glPopMatrix ()
1392		2060
1393	void glLoadIdentity ()	2061	void glLoadIdentity ()
1394		2062
		2063	void glDrawBuffer (int buffer)
		2064
		2065	void glReadBuffer (int buffer)
		2066
		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
1395	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_)
1396		2072
1397	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)
1398		2076
1399	void glTranslate (float x, float y, float z = 0.)	2077	void glTranslate (float x, float y, float z = 0.)
1400	CODE:	2078	CODE:
1401	glTranslatef (x, y, z);	2079	glTranslatef (x, y, z);
1402		2080
1403	void glScale (float x, float y, float z)	2081	void glScale (float x, float y, float z = 1.)
1404	CODE:	2082	CODE:
1405	glScalef (x, y, z);	2083	glScalef (x, y, z);
1406		2084
1407	void glRotate (float angle, float x, float y, float z)	2085	void glRotate (float angle, float x, float y, float z)
1408	CODE:	2086	CODE:
…		…
1412		2090
1413	void glEnd ()	2091	void glEnd ()
1414		2092
1415	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)
1416	PROTOTYPE: @	2094	PROTOTYPE: @
		2095	ALIAS:
		2096	glColor_premultiply = 1
1417	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...
1418	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);
1419		2117
1420	void glVertex (float x, float y, float z = 0.)	2118	void glVertex (float x, float y, float z = 0.)
1421	CODE:	2119	CODE:
1422	glVertex3f (x, y, z);	2120	glVertex3f (x, y, z);
1423		2121
…		…
1435		2133
1436	void glBindTexture (int target, int name)	2134	void glBindTexture (int target, int name)
1437		2135
1438	void glConvolutionParameter (int target, int pname, float params)	2136	void glConvolutionParameter (int target, int pname, float params)
1439	CODE:	2137	CODE:
		2138	if (gl.ConvolutionParameterf)
1440	glConvolutionParameterf (target, pname, params);	2139	gl.ConvolutionParameterf (target, pname, params);
1441		2140
1442	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)
		2142	CODE:
		2143	if (gl.ConvolutionFilter2D)
		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);
1443		2150
1444	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)
1445		2152
1446	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)
1447		2158
1448	int glGenTexture ()	2159	int glGenTexture ()
1449	CODE:	2160	CODE:
1450	{	2161	{
1451	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.60 by root, Sun Apr 23 04:47:02 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.60 by root, Sun Apr 23 04:47:02 2006 UTC vs.
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC