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

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