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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs.
Revision 1.169 by root, Wed Dec 13 17:30:02 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs. Revision 1.169 by root, Wed Dec 13 17:30:02 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs.
Revision 1.169 by root, Wed Dec 13 17:30:02 2006 UTC