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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.92 by elmex, Tue May 23 17:30:18 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
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
5	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
6	#endif	9	#endif
7		10
8	#include "EXTERN.h"	11	#include "EXTERN.h"
9	#include "perl.h"	12	#include "perl.h"
10	#include "XSUB.h"	13	#include "XSUB.h"
11		14
		15	#ifdef _WIN32
		16	# undef pipe
		17	#endif
		18
12	#include <math.h>	19	#include <math.h>
13	#include <string.h>	20	#include <string.h>
14	#include <stdio.h>	21	#include <stdio.h>
		22	#include <stdlib.h>
15		23
16	#include <SDL.h>	24	#include <SDL.h>
17	#include <SDL_endian.h>	25	#include <SDL_endian.h>
18	#include <SDL_image.h>	26	#include <SDL_image.h>
19	#include <SDL_mixer.h>	27	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	28	#include <SDL_opengl.h>
21		29
		30	#define PANGO_ENABLE_BACKEND
		31	#define G_DISABLE_CAST_CHECKS
		32
22	#include <glib/gmacros.h>	33	#include <glib/gmacros.h>
23		34
24	#include <pango/pango.h>	35	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		36
29	#ifndef _WIN32	37	#ifndef _WIN32
30	# include <sys/types.h>	38	# include <sys/types.h>
31	# include <sys/socket.h>	39	# include <sys/socket.h>
32	# include <netinet/in.h>	40	# include <netinet/in.h>
33	# include <netinet/tcp.h>	41	# include <netinet/tcp.h>
34	# include <inttypes.h>	42	# include <inttypes.h>
35	#else
36	typedef unsigned char uint8_t;
37	typedef unsigned short uint16_t;
38	typedef unsigned int uint32_t;
39	typedef signed char int8_t;
40	typedef signed short int16_t;
41	typedef signed int int32_t;
42	#endif	43	#endif
43		44
44	#include "glext.h"	45	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45		46
46	#define FOW_DARKNESS 32	47	#define FOW_DARKNESS 32
47		48
48	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
50		51
51	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
52		53
53	#define GL_CALL(type,func,args) \	54	#if 0
54	{ \	55	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	56	#else
56	static type fptr_; \	57	# define PARACHUTE 0
57	\	58	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		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
68	typedef Mix_Chunk *CFClient__MixChunk;	83	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	84	typedef Mix_Music *CFPlus__MixMusic;
70		85
71	typedef PangoFontDescription *CFClient__Font;	86	typedef PangoFontDescription *CFPlus__Font;
		87
		88	static int
		89	shape_attr_p (PangoLayoutRun *run)
		90	{
		91	GSList *attrs = run->item->analysis.extra_attrs;
		92
		93	while (attrs)
		94	{
		95	PangoAttribute *attr = attrs->data;
		96
		97	if (attr->klass->type == PANGO_ATTR_SHAPE)
		98	return 1;
		99
		100	attrs = attrs->next;
		101	}
		102
		103	return 0;
		104	}
72		105
73	typedef struct cf_layout {	106	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	107	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	108	float r, g, b, a; // default color for rgba mode
77	int base_height;	109	int base_height;
78	CFClient__Font font;	110	CFPlus__Font font;
79	} *CFClient__Layout;	111	} *CFPlus__Layout;
80		112
81	static CFClient__Font default_font;	113	static CFPlus__Font default_font;
82	static PangoContext ft2_context, cairo_context;	114	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	115	static PangoFontMap *opengl_fontmap;
84		116
85	static void	117	static void
86	substitute_func (FcPattern *pattern, gpointer data)	118	substitute_func (FcPattern *pattern, gpointer data)
87	{	119	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	120	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	121	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	122	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	123	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	124	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	125	}
95		126
96	static void	127	static void
97	layout_update_font (CFClient__Layout self)	128	layout_update_font (CFPlus__Layout self)
98	{	129	{
99	/* 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
100	* reasonably well with bitstream vera	131	* reasonably well with bitstream vera
101	*/	132	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	133	PangoFontDescription *font = self->font ? self->font : default_font;
106		137
107	pango_layout_set_font_description (self->pl, font);	138	pango_layout_set_font_description (self->pl, font);
108	}	139	}
109		140
110	static void	141	static void
111	layout_get_pixel_size (CFClient__Layout self, int w, int h)	142	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
112	{	143	{
		144	PangoRectangle rect;
		145
		146	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	147	pango_layout_get_extents (self->pl, 0, &rect);
114		148
115	if (!w) w = 1;	149	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!h) h = 1;	150	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		151
118	w = (w + 3) & ~3;	152	if (!rect.width) rect.width = 1;
		153	if (!rect.height) rect.height = 1;
		154
		155	*w = rect.width;
		156	*h = rect.height;
119	}	157	}
120		158
121	typedef uint16_t mapface;	159	typedef uint16_t mapface;
122		160
123	typedef struct {	161	typedef struct {
…		…
126	float s, t;	164	float s, t;
127	uint8_t r, g, b, a;	165	uint8_t r, g, b, a;
128	} maptex;	166	} maptex;
129		167
130	typedef struct {	168	typedef struct {
131	int16_t darkness;	169	uint32_t player;
132	mapface face[3];	170	mapface face[3];
		171	uint16_t darkness;
		172	uint8_t stat_width, stat_hp, flags;
133	} mapcell;	173	} mapcell;
134		174
135	typedef struct {	175	typedef struct {
136	int32_t c0, c1;	176	int32_t c0, c1;
137	mapcell *col;	177	mapcell *col;
…		…
146	int texs;	186	int texs;
147	maptex *tex;	187	maptex *tex;
148		188
149	int32_t rows;	189	int32_t rows;
150	maprow *row;	190	maprow *row;
151	} *CFClient__Map;	191	} *CFPlus__Map;
152		192
153	static char *	193	static char *
154	prepend (char *ptr, int sze, int inc)	194	prepend (char *ptr, int sze, int inc)
155	{	195	{
156	char *p;	196	char *p;
…		…
174		214
175	#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))
176	#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))
177		217
178	static maprow *	218	static maprow *
179	map_get_row (CFClient__Map self, int y)	219	map_get_row (CFPlus__Map self, int y)
180	{	220	{
181	if (0 > y)	221	if (0 > y)
182	{	222	{
183	int extend = - y + MAP_EXTEND_Y;	223	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	224	Prepend (maprow, self->row, self->rows, extend);
…		…
222		262
223	return row->col + (x - row->c0);	263	return row->col + (x - row->c0);
224	}	264	}
225		265
226	static mapcell *	266	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	267	map_get_cell (CFPlus__Map self, int x, int y)
228	{	268	{
229	return row_get_cell (map_get_row (self, y), x);	269	return row_get_cell (map_get_row (self, y), x);
230	}	270	}
231		271
232	static void	272	static void
233	map_clear (CFClient__Map self)	273	map_clear (CFPlus__Map self)
234	{	274	{
235	int r;	275	int r;
236		276
237	for (r = 0; r < self->rows; r++)	277	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	278	Safefree (self->row[r].col);
…		…
246	self->row = 0;	286	self->row = 0;
247	self->rows = 0;	287	self->rows = 0;
248	}	288	}
249		289
250	static void	290	static void
251	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)
252	{	292	{
253	int x, y;	293	int x, y;
254	maprow *row;	294	maprow *row;
		295	mapcell *cell;
255		296
256	for (y = y0; y < y0 + h; y++)	297	for (y = y0; y < y0 + h; y++)
257	if (y >= 0)	298	if (y >= 0)
258	{	299	{
259	if (y >= self->rows)	300	if (y >= self->rows)
…		…
265	if (x >= row->c0)	306	if (x >= row->c0)
266	{	307	{
267	if (x >= row->c1)	308	if (x >= row->c1)
268	break;	309	break;
269		310
270	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;
271	}	317	}
272	}	318	}
273	}	319	}
274		320
275	static void	321	static void
…		…
296	ev.data2 = 0;	342	ev.data2 = 0;
297		343
298	SDL_PushEvent ((SDL_Event *)&ev);	344	SDL_PushEvent ((SDL_Event *)&ev);
299	}	345	}
300		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
301	MODULE = CFClient PACKAGE = CFClient	368	MODULE = CFPlus PACKAGE = CFPlus
302		369
303	PROTOTYPES: ENABLE	370	PROTOTYPES: ENABLE
304		371
305	BOOT:	372	BOOT:
306	{	373	{
307	HV *stash = gv_stashpv ("CFClient", 1);	374	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	375	static const struct {
309	const char *name;	376	const char *name;
310	IV iv;	377	IV iv;
311	} *civ, const_iv[] = {	378	} *civ, const_iv[] = {
312	# 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
313	const_iv (SDL_ACTIVEEVENT),	383	const_iv (SDL_ACTIVEEVENT),
314	const_iv (SDL_KEYDOWN),	384	const_iv (SDL_KEYDOWN),
315	const_iv (SDL_KEYUP),	385	const_iv (SDL_KEYUP),
316	const_iv (SDL_MOUSEMOTION),	386	const_iv (SDL_MOUSEMOTION),
317	const_iv (SDL_MOUSEBUTTONDOWN),	387	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
326	const_iv (SDL_EVENT_RESERVEDA),	396	const_iv (SDL_EVENT_RESERVEDA),
327	const_iv (SDL_EVENT_RESERVEDB),	397	const_iv (SDL_EVENT_RESERVEDB),
328	const_iv (SDL_VIDEORESIZE),	398	const_iv (SDL_VIDEORESIZE),
329	const_iv (SDL_VIDEOEXPOSE),	399	const_iv (SDL_VIDEOEXPOSE),
330	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
331	const_iv (SDLK_KP0),	406	const_iv (SDLK_KP0),
332	const_iv (SDLK_KP1),	407	const_iv (SDLK_KP1),
333	const_iv (SDLK_KP2),	408	const_iv (SDLK_KP2),
334	const_iv (SDLK_KP3),	409	const_iv (SDLK_KP3),
335	const_iv (SDLK_KP4),	410	const_iv (SDLK_KP4),
…		…
390	const_iv (SDLK_BREAK),	465	const_iv (SDLK_BREAK),
391	const_iv (SDLK_MENU),	466	const_iv (SDLK_MENU),
392	const_iv (SDLK_POWER),	467	const_iv (SDLK_POWER),
393	const_iv (SDLK_EURO),	468	const_iv (SDLK_EURO),
394	const_iv (SDLK_UNDO),	469	const_iv (SDLK_UNDO),
		470
395	const_iv (KMOD_NONE),	471	const_iv (KMOD_NONE),
		472	const_iv (KMOD_SHIFT),
396	const_iv (KMOD_LSHIFT),	473	const_iv (KMOD_LSHIFT),
397	const_iv (KMOD_RSHIFT),	474	const_iv (KMOD_RSHIFT),
		475	const_iv (KMOD_CTRL),
398	const_iv (KMOD_LCTRL),	476	const_iv (KMOD_LCTRL),
399	const_iv (KMOD_RCTRL),	477	const_iv (KMOD_RCTRL),
		478	const_iv (KMOD_ALT),
400	const_iv (KMOD_LALT),	479	const_iv (KMOD_LALT),
401	const_iv (KMOD_RALT),	480	const_iv (KMOD_RALT),
		481	const_iv (KMOD_META),
402	const_iv (KMOD_LMETA),	482	const_iv (KMOD_LMETA),
403	const_iv (KMOD_RMETA),	483	const_iv (KMOD_RMETA),
404	const_iv (KMOD_NUM),	484	const_iv (KMOD_NUM),
405	const_iv (KMOD_CAPS),	485	const_iv (KMOD_CAPS),
406	const_iv (KMOD_MODE),	486	const_iv (KMOD_MODE),
407	const_iv (KMOD_CTRL),
408	const_iv (KMOD_SHIFT),
409	const_iv (KMOD_ALT),
410	const_iv (KMOD_META)
411	# undef const_iv	487	# undef const_iv
412	};	488	};
413		489
414	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; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	491	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		492
		493	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		494	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
416	}	495	}
		496
		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)
417		507
418	void	508	void
419	pango_init ()	509	pango_init ()
420	CODE:	510	CODE:
421	{	511	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	512	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	513	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	514	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	515	}
430		516
431	int	517	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	518	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		519
434	void	520	void
435	SDL_Quit ()	521	SDL_Quit ()
436		522
437	void	523	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	530	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	531	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	532	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		533
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	534	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	535	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		536
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	537	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	538	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	539	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	540	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		541
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	542	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		543	#if SDL_VERSION_ATLEAST(1,2,10)
		544	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		545	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		546	#endif
457		547
458	SDL_EnableUNICODE (1);	548	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	549	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		550
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	551	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	569	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	570	CODE:
481	RETVAL = !!SDL_SetVideoMode (	571	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	572	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	573	);
		574	if (RETVAL)
		575	{
484	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	}
485	OUTPUT:	581	OUTPUT:
486	RETVAL	582	RETVAL
487		583
488	void	584	void
489	SDL_GL_SwapBuffers ()	585	SDL_GL_SwapBuffers ()
		586
		587	char *
		588	SDL_GetKeyName (int sym)
490		589
491	void	590	void
492	SDL_PollEvent ()	591	SDL_PollEvent ()
493	PPCODE:	592	PPCODE:
494	{	593	{
…		…
504	case SDL_KEYDOWN:	603	case SDL_KEYDOWN:
505	case SDL_KEYUP:	604	case SDL_KEYUP:
506	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
507	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	606	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
508	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 */
509	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	609	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
510	break;	610	break;
511		611
512	case SDL_ACTIVEEVENT:	612	case SDL_ACTIVEEVENT:
513	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	613	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	614	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515	break;	615	break;
516		616
517	case SDL_MOUSEMOTION:	617	case SDL_MOUSEMOTION:
		618	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		619
518	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	620	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	621	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	622	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	623	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	624	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523	break;	625	break;
524		626
525	case SDL_MOUSEBUTTONDOWN:	627	case SDL_MOUSEBUTTONDOWN:
526	case SDL_MOUSEBUTTONUP:	628	case SDL_MOUSEBUTTONUP:
		629	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		630
527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	631	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	632	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	633	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	634	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531	break;	635	break;
…		…
535	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	639	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
536	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	640	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
537	break;	641	break;
538	}	642	}
539		643
540	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	644	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
541	}	645	}
542	}	646	}
543		647
544	int	648	int
545	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	649	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
558	CODE:	662	CODE:
559	#ifndef _WIN32	663	#ifndef _WIN32
560	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	664	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561	#endif	665	#endif
562		666
563	char *	667	void
564	gl_vendor ()	668	win32_proxy_info ()
565	CODE:	669	PPCODE:
566	RETVAL = (char *)glGetString (GL_VENDOR);	670	{
567	OUTPUT:	671	#ifdef _WIN32
568	RETVAL	672	char buffer[2048];
		673	DWORD buflen;
569		674
570	char *	675	EXTEND (SP, 3);
571	gl_version ()	676
572	CODE:	677	buflen = sizeof (buffer);
573	RETVAL = (char *)glGetString (GL_VERSION);	678	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
574	OUTPUT:	679	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
575	RETVAL	680	{
		681	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
576		682
577	char *	683	buflen = sizeof (buffer);
578	gl_extensions ()	684	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
579	CODE:	685	{
580	RETVAL = (char *)glGetString (GL_EXTENSIONS);	686	PUSHs (newSVpv (buffer, 0));
581	OUTPUT:	687
582	RETVAL	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	}
583		695
584	void	696	void
585	add_font (char *file)	697	add_font (char *file)
586	CODE:	698	CODE:
587	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	699	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
588	#ifdef _WIN32
589	// cairo... sigh... requires win2000
590	AddFontResourceEx (file, FR_PRIVATE, 0);
591	#endif
592		700
593	void	701	void
594	load_image_inline (SV *image_)	702	load_image_inline (SV *image_)
595	ALIAS:	703	ALIAS:
596	load_image_file = 1	704	load_image_file = 1
…		…
638		746
639	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	747	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
640		748
641	assert (surface2->pitch == surface2->w * 4);	749	assert (surface2->pitch == surface2->w * 4);
642		750
		751	SDL_LockSurface (surface2);
643	EXTEND (SP, 5);	752	EXTEND (SP, 6);
644	PUSHs (sv_2mortal (newSViv (surface2->w)));	753	PUSHs (sv_2mortal (newSViv (surface2->w)));
645	PUSHs (sv_2mortal (newSViv (surface2->h)));	754	PUSHs (sv_2mortal (newSViv (surface2->h)));
646	SDL_LockSurface (surface2);
647	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	755	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
648	SDL_UnlockSurface (surface2);
649	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)));
650	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	757	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
651	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	758	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		759	SDL_UnlockSurface (surface2);
652		760
653	SDL_FreeSurface (surface);	761	SDL_FreeSurface (surface);
654	SDL_FreeSurface (surface2);	762	SDL_FreeSurface (surface2);
655	}	763	}
656		764
…		…
692	CODE:	800	CODE:
693	fprintf (stderr, "FATAL: %s\n", message);	801	fprintf (stderr, "FATAL: %s\n", message);
694	#ifdef _WIN32	802	#ifdef _WIN32
695	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	803	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
696	#endif	804	#endif
697	exit (1);	805	_exit (1);
698		806
		807	void
		808	_exit (int retval = 0)
		809	CODE:
		810	#ifdef WIN32
		811	ExitThread (retval); // unclean, please beam me up
		812	#else
		813	_exit (retval);
		814	#endif
		815
699	MODULE = CFClient PACKAGE = CFClient::Font	816	MODULE = CFPlus PACKAGE = CFPlus::Font
700		817
701	CFClient::Font	818	CFPlus::Font
702	new_from_file (SV class, char path, int id = 0)	819	new_from_file (SV class, char path, int id = 0)
703	CODE:	820	CODE:
704	{	821	{
705	int count;	822	int count;
706	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	823	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
709	}	826	}
710	OUTPUT:	827	OUTPUT:
711	RETVAL	828	RETVAL
712		829
713	void	830	void
714	DESTROY (CFClient::Font self)	831	DESTROY (CFPlus::Font self)
715	CODE:	832	CODE:
716	pango_font_description_free (self);	833	pango_font_description_free (self);
717		834
718	void	835	void
719	make_default (CFClient::Font self)	836	make_default (CFPlus::Font self)
720	CODE:	837	CODE:
721	default_font = self;	838	default_font = self;
722		839
723	MODULE = CFClient PACKAGE = CFClient::Layout	840	MODULE = CFPlus PACKAGE = CFPlus::Layout
724		841
725	CFClient::Layout	842	void
726	new (SV *class, int rgba = 0)	843	reset_glyph_cache ()
727	CODE:	844	CODE:
728	#if _WIN32	845	tc_clear ();
729	rgba = 0;//D	846
730	#endif	847	CFPlus::Layout
		848	new (SV *class)
		849	CODE:
731	New (0, RETVAL, 1, struct cf_layout);	850	New (0, RETVAL, 1, struct cf_layout);
732		851
733	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	852	RETVAL->pl = pango_layout_new (opengl_context);
734	RETVAL->rgba = rgba;
735	RETVAL->r = 1.;	853	RETVAL->r = 1.;
736	RETVAL->g = 1.;	854	RETVAL->g = 1.;
737	RETVAL->b = 1.;	855	RETVAL->b = 1.;
738	RETVAL->a = 1.;	856	RETVAL->a = 1.;
739	RETVAL->base_height = MIN_FONT_HEIGHT;	857	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
743	layout_update_font (RETVAL);	861	layout_update_font (RETVAL);
744	OUTPUT:	862	OUTPUT:
745	RETVAL	863	RETVAL
746		864
747	void	865	void
748	DESTROY (CFClient::Layout self)	866	DESTROY (CFPlus::Layout self)
749	CODE:	867	CODE:
750	g_object_unref (self->pl);	868	g_object_unref (self->pl);
751	Safefree (self);	869	Safefree (self);
752		870
753	int
754	is_rgba (CFClient::Layout self)
755	CODE:
756	RETVAL = self->rgba;
757	OUTPUT:
758	RETVAL
759
760	void	871	void
761	set_text (CFClient::Layout self, SV *text_)	872	set_text (CFPlus::Layout self, SV *text_)
762	CODE:	873	CODE:
763	{	874	{
764	STRLEN textlen;	875	STRLEN textlen;
765	char *text = SvPVutf8 (text_, textlen);	876	char *text = SvPVutf8 (text_, textlen);
766		877
767	pango_layout_set_text (self->pl, text, textlen);	878	pango_layout_set_text (self->pl, text, textlen);
768	}	879	}
769		880
770	void	881	void
771	set_markup (CFClient::Layout self, SV *text_)	882	set_markup (CFPlus::Layout self, SV *text_)
772	CODE:	883	CODE:
773	{	884	{
774	STRLEN textlen;	885	STRLEN textlen;
775	char *text = SvPVutf8 (text_, textlen);	886	char *text = SvPVutf8 (text_, textlen);
776		887
777	pango_layout_set_markup (self->pl, text, textlen);	888	pango_layout_set_markup (self->pl, text, textlen);
778	}	889	}
779		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
780	SV *	976	SV *
781	get_text (CFClient::Layout self)	977	get_text (CFPlus::Layout self)
782	CODE:	978	CODE:
783	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	979	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
784	SvUTF8_on (RETVAL);	980	sv_utf8_decode (RETVAL);
785	OUTPUT:	981	OUTPUT:
786	RETVAL	982	RETVAL
787		983
788	void	984	void
789	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	985	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
790	CODE:	986	CODE:
791	self->r = r;	987	self->r = r;
792	self->g = g;	988	self->g = g;
793	self->b = b;	989	self->b = b;
794	self->a = a;	990	self->a = a;
795		991
796	void	992	void
797	set_font (CFClient::Layout self, CFClient::Font font = 0)	993	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
798	CODE:	994	CODE:
799	if (self->font != font)	995	if (self->font != font)
800	{	996	{
801	self->font = font;	997	self->font = font;
802	layout_update_font (self);	998	layout_update_font (self);
803	}	999	}
804		1000
805	void	1001	void
806	set_height (CFClient::Layout self, int base_height)	1002	set_height (CFPlus::Layout self, int base_height)
807	CODE:	1003	CODE:
808	if (self->base_height != base_height)	1004	if (self->base_height != base_height)
809	{	1005	{
810	self->base_height = base_height;	1006	self->base_height = base_height;
811	layout_update_font (self);	1007	layout_update_font (self);
812	}	1008	}
813		1009
814	void	1010	void
815	set_width (CFClient::Layout self, int max_width = -1)	1011	set_width (CFPlus::Layout self, int max_width = -1)
816	CODE:	1012	CODE:
817	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);
818		1014
819	void	1015	void
820	set_indent (CFClient::Layout self, int indent)	1016	set_indent (CFPlus::Layout self, int indent)
821	CODE:	1017	CODE:
822	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1018	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
823		1019
824	void	1020	void
825	set_spacing (CFClient::Layout self, int spacing)	1021	set_spacing (CFPlus::Layout self, int spacing)
826	CODE:	1022	CODE:
827	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1023	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
828		1024
829	void	1025	void
830	set_ellipsise (CFClient::Layout self, int ellipsise)	1026	set_ellipsise (CFPlus::Layout self, int ellipsise)
831	CODE:	1027	CODE:
832	pango_layout_set_ellipsize (self->pl,	1028	pango_layout_set_ellipsize (self->pl,
833	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1029	ellipsise == 1 ? PANGO_ELLIPSIZE_START
834	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1030	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
835	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1031	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
836	: PANGO_ELLIPSIZE_NONE	1032	: PANGO_ELLIPSIZE_NONE
837	);	1033	);
838		1034
839	void	1035	void
840	set_single_paragraph_mode (CFClient::Layout self, int spm)	1036	set_single_paragraph_mode (CFPlus::Layout self, int spm)
841	CODE:	1037	CODE:
842	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1038	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
843		1039
844	void	1040	void
845	size (CFClient::Layout self)	1041	size (CFPlus::Layout self)
846	PPCODE:	1042	PPCODE:
847	{	1043	{
848	int w, h;	1044	int w, h;
849		1045
850	layout_get_pixel_size (self, &w, &h);	1046	layout_get_pixel_size (self, &w, &h);
…		…
853	PUSHs (sv_2mortal (newSViv (w)));	1049	PUSHs (sv_2mortal (newSViv (w)));
854	PUSHs (sv_2mortal (newSViv (h)));	1050	PUSHs (sv_2mortal (newSViv (h)));
855	}	1051	}
856		1052
857	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
858	xy_to_index (CFClient::Layout self, int x, int y)	1066	xy_to_index (CFPlus::Layout self, int x, int y)
859	CODE:	1067	CODE:
860	{	1068	{
861	int index, trailing;	1069	int index, trailing;
862	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);
863	RETVAL = index;	1071	RETVAL = index + trailing;
864	}	1072	}
865	OUTPUT:	1073	OUTPUT:
866	RETVAL	1074	RETVAL
867		1075
868	void	1076	void
869	cursor_pos (CFClient::Layout self, int index)	1077	cursor_pos (CFPlus::Layout self, int index)
870	PPCODE:	1078	PPCODE:
871	{	1079	{
872	PangoRectangle strong_pos;	1080	PangoRectangle strong_pos;
873	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1081	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
874		1082
…		…
877	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1085	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
878	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1086	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
879	}	1087	}
880		1088
881	void	1089	void
882	render (CFClient::Layout self)	1090	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
883	PPCODE:	1091	PPCODE:
884	{	1092	{
885	SV *retval;	1093	int line, x;
886	int w, h;
887		1094
888	layout_get_pixel_size (self, &w, &h);	1095	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1096	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
889		1097
890	if (self->rgba)
891	{
892	cairo_surface_t *surface;
893	cairo_t *cairo;
894
895	retval = newSV (w * h * 4);
896	SvPOK_only (retval);
897	SvCUR_set (retval, w * h * 4);
898
899	memset (SvPVX (retval), 0, w * h * 4);
900
901	surface = cairo_image_surface_create_for_data (
902	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
903	cairo = cairo_create (surface);
904	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
905
906	pango_cairo_show_layout (cairo, self->pl);
907
908	cairo_destroy (cairo);
909	cairo_surface_destroy (surface);
910
911	// what a mess, and its premultiplied, too :(
912	{
913	uint32_t p = (uint32_t )SvPVX (retval);
914	uint32_t e = p + w h;
915
916	while (p < e)
917	{
918	uint32_t rgba = *p;
919	rgba = (rgba >> 24) \| (rgba << 8);
920	#if 0
921	#ifdef _WIN32
922	{//D
923	uint8_t r = rgba >> 24;
924	uint8_t g = rgba >> 16;
925	uint8_t b = rgba >> 8;
926	uint8_t a = rgba >> 0;
927
928	rgba = (rgba & 0xffffff00) \| a;
929	}
930	#endif
931	#endif
932	rgba = SDL_SwapBE32 (rgba);
933	*p++ = rgba;
934	}
935	}
936
937	EXTEND (SP, 5);	1098	EXTEND (SP, 2);
938	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)
939	PUSHs (sv_2mortal (newSViv (h)));	1120	PUSHs (sv_2mortal (newSViv (index + trailing)));
940	PUSHs (sv_2mortal (retval));
941	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
942	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
943	}
944	else	1121	else
945	{	1122	{
946	FT_Bitmap bitmap;
947
948	retval = newSV (w * h);
949	SvPOK_only (retval);
950	SvCUR_set (retval, w * h);
951
952	bitmap.rows = h;
953	bitmap.width = w;
954	bitmap.pitch = w;
955	bitmap.buffer = (unsigned char*)SvPVX (retval);
956	bitmap.num_grays = 256;
957	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
958
959	memset (bitmap.buffer, 0, w * h);
960
961	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
962
963	EXTEND (SP, 5);
964	PUSHs (sv_2mortal (newSViv (w)));	1123	PUSHs (sv_2mortal (newSViv (index)));
965	PUSHs (sv_2mortal (newSViv (h)));	1124	PUSHs (sv_2mortal (newSViv (trailing)));
966	PUSHs (sv_2mortal (retval));
967	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
968	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
969	}	1125	}
970	}	1126	}
971		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
972	MODULE = CFClient PACKAGE = CFClient::Texture	1138	MODULE = CFPlus PACKAGE = CFPlus::Texture
973		1139
974	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
975	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.)
976	PROTOTYPE: $$$;$$	1179	PROTOTYPE: $$$;$$
977	ALIAS:	1180	ALIAS:
978	draw_quad_alpha = 1	1181	draw_quad_alpha = 1
979	draw_quad_alpha_premultiplied = 2	1182	draw_quad_alpha_premultiplied = 2
980	CODE:	1183	CODE:
981	{	1184	{
982	HV hv = (HV )SvRV (self);	1185	HV hv = (HV )SvRV (self);
983	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1186	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
984	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1187	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
985	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1188	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
986	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
987		1189
988	if (items < 5)	1190	if (items < 5)
989	{	1191	{
990	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1192	w = SvNV (*hv_fetch (hv, "w", 1, 1));
991	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1193	h = SvNV (*hv_fetch (hv, "h", 1, 1));
992	}	1194	}
993		1195
994	if (ix)	1196	if (ix)
995	{	1197	{
996	glEnable (GL_BLEND);	1198	glEnable (GL_BLEND);
		1199
		1200	if (ix == 2)
997	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	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
998	glEnable (GL_ALPHA_TEST);	1206	glEnable (GL_ALPHA_TEST);
999	glAlphaFunc (GL_GREATER, 0.01f);	1207	glAlphaFunc (GL_GREATER, 0.01f);
1000	}	1208	}
1001		1209
1002	glBindTexture (GL_TEXTURE_2D, name);	1210	glBindTexture (GL_TEXTURE_2D, name);
1003
1004	if (wrap_mode)
1005	{
1006	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1007	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1008	}
1009		1211
1010	glBegin (GL_QUADS);	1212	glBegin (GL_QUADS);
1011	glTexCoord2f (0, 0); glVertex2f (x , y );	1213	glTexCoord2f (0, 0); glVertex2f (x , y );
1012	glTexCoord2f (0, t); glVertex2f (x , y + h);	1214	glTexCoord2f (0, t); glVertex2f (x , y + h);
1013	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1215	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1019	glDisable (GL_ALPHA_TEST);	1221	glDisable (GL_ALPHA_TEST);
1020	glDisable (GL_BLEND);	1222	glDisable (GL_BLEND);
1021	}	1223	}
1022	}	1224	}
1023		1225
1024	MODULE = CFClient PACKAGE = CFClient::Map	1226	MODULE = CFPlus PACKAGE = CFPlus::Map
1025		1227
1026	CFClient::Map	1228	CFPlus::Map
1027	new (SV *class, int map_width, int map_height)	1229	new (SV *class)
1028	CODE:	1230	CODE:
1029	New (0, RETVAL, 1, struct map);	1231	New (0, RETVAL, 1, struct map);
1030	RETVAL->x = 0;	1232	RETVAL->x = 0;
1031	RETVAL->y = 0;	1233	RETVAL->y = 0;
1032	RETVAL->w = map_width;	1234	RETVAL->w = 0;
1033	RETVAL->h = map_height;	1235	RETVAL->h = 0;
1034	RETVAL->ox = 0;	1236	RETVAL->ox = 0;
1035	RETVAL->oy = 0;	1237	RETVAL->oy = 0;
1036	RETVAL->faces = 8192;	1238	RETVAL->faces = 8192;
1037	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1239	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1038	RETVAL->texs = 8192;	1240	RETVAL->texs = 8192;
…		…
1041	RETVAL->row = 0;	1243	RETVAL->row = 0;
1042	OUTPUT:	1244	OUTPUT:
1043	RETVAL	1245	RETVAL
1044		1246
1045	void	1247	void
1046	DESTROY (CFClient::Map self)	1248	DESTROY (CFPlus::Map self)
1047	CODE:	1249	CODE:
1048	{	1250	{
1049	map_clear (self);	1251	map_clear (self);
1050	Safefree (self->face);	1252	Safefree (self->face);
		1253	Safefree (self->tex);
1051	Safefree (self);	1254	Safefree (self);
1052	}	1255	}
1053		1256
1054	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
1055	clear (CFClient::Map self)	1264	clear (CFPlus::Map self)
1056	CODE:	1265	CODE:
1057	map_clear (self);	1266	map_clear (self);
1058		1267
1059	void	1268	void
1060	set_face (CFClient::Map self, int face, int texid)	1269	set_face (CFPlus::Map self, int face, int texid)
1061	CODE:	1270	CODE:
1062	{	1271	{
1063	while (self->faces <= face)	1272	while (self->faces <= face)
1064	{	1273	{
1065	Append (mapface, self->face, self->faces, self->faces);	1274	Append (mapface, self->face, self->faces, self->faces);
…		…
1068		1277
1069	self->face [face] = texid;	1278	self->face [face] = texid;
1070	}	1279	}
1071		1280
1072	void	1281	void
1073	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)
1074	CODE:	1283	CODE:
1075	{	1284	{
1076	while (self->texs <= texid)	1285	while (self->texs <= texid)
1077	{	1286	{
1078	Append (maptex, self->tex, self->texs, self->texs);	1287	Append (maptex, self->tex, self->texs, self->texs);
…		…
1090	tex->r = r;	1299	tex->r = r;
1091	tex->g = g;	1300	tex->g = g;
1092	tex->b = b;	1301	tex->b = b;
1093	tex->a = a;	1302	tex->a = a;
1094	}	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);
1095	}	1313	}
1096		1314
1097	int	1315	int
1098	ox (CFClient::Map self)	1316	ox (CFPlus::Map self)
1099	ALIAS:	1317	ALIAS:
1100	oy = 1	1318	oy = 1
		1319	x = 2
		1320	y = 3
		1321	w = 4
		1322	h = 5
1101	CODE:	1323	CODE:
1102	switch (ix)	1324	switch (ix)
1103	{	1325	{
1104	case 0: RETVAL = self->ox; break;	1326	case 0: RETVAL = self->ox; break;
1105	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;
1106	}	1332	}
1107	OUTPUT:	1333	OUTPUT:
1108	RETVAL	1334	RETVAL
1109		1335
1110	void	1336	void
1111	scroll (CFClient::Map self, int dx, int dy)	1337	scroll (CFPlus::Map self, int dx, int dy)
1112	CODE:	1338	CODE:
1113	{	1339	{
1114	if (dx > 0)	1340	if (dx > 0)
1115	map_blank (self, self->x, self->y, dx - 1, self->h);	1341	map_blank (self, self->x, self->y, dx, self->h);
1116	else if (dx < 0)	1342	else if (dx < 0)
1117	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);
1118		1344
1119	if (dy > 0)	1345	if (dy > 0)
1120	map_blank (self, self->x, self->y, self->w, dy - 1);	1346	map_blank (self, self->x, self->y, self->w, dy);
1121	else if (dy < 0)	1347	else if (dy < 0)
1122	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);
1123		1349
1124	self->ox += dx; self->x += dx;	1350	self->ox += dx; self->x += dx;
1125	self->oy += dy; self->y += dy;	1351	self->oy += dy; self->y += dy;
1126		1352
1127	while (self->y < 0)	1353	while (self->y < 0)
…		…
1132	self->y += MAP_EXTEND_Y;	1358	self->y += MAP_EXTEND_Y;
1133	}	1359	}
1134	}	1360	}
1135		1361
1136	void	1362	void
1137	map1a_update (CFClient::Map self, SV *data_)	1363	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1138	CODE:	1364	CODE:
1139	{	1365	{
1140	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1366	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1141	uint8_t data_end = (uint8_t )SvEND (data_);	1367	uint8_t data_end = (uint8_t )SvEND (data_);
1142	mapcell *cell;	1368	mapcell *cell;
1143	int x, y, flags;	1369	int x, y, flags;
1144		1370
1145	while (data < data_end)	1371	while (data < data_end - 1)
1146	{	1372	{
1147	flags = (data [0] << 8) + data [1]; data += 2;	1373	flags = (data [0] << 8) + data [1]; data += 2;
1148		1374
1149	x = ((flags >> 10) & 63) + self->x;	1375	x = self->x + ((flags >> 10) & 63);
1150	y = ((flags >> 4) & 63) + self->y;	1376	y = self->y + ((flags >> 4) & 63);
1151		1377
1152	cell = map_get_cell (self, x, y);	1378	cell = map_get_cell (self, x, y);
1153		1379
1154	if (flags & 15)	1380	if (flags & 15)
1155	{	1381	{
1156	if (cell->darkness < 0)	1382	if (!cell->darkness)
1157	{	1383	{
		1384	memset (cell, 0, sizeof (*cell));
1158	cell->darkness = 0;	1385	cell->darkness = 256;
1159	cell->face [0] = 0;
1160	cell->face [1] = 0;
1161	cell->face [2] = 0;
1162	}	1386	}
1163		1387
1164	cell->darkness = flags & 8 ? *data++ : 255;
1165
1166	//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	}
1167		1429
1168	if (flags & 4)	1430	if (flags & 4)
1169	{	1431	{
1170	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;
1171	}	1433	}
…		…
1179	{	1441	{
1180	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;
1181	}	1443	}
1182	}	1444	}
1183	else	1445	else
1184	cell->darkness = -1;	1446	cell->darkness = 0;
1185	}	1447	}
1186	}	1448	}
1187		1449
1188	SV *	1450	SV *
1189	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)
1190	CODE:	1452	CODE:
1191	{	1453	{
1192	int x1, x;	1454	int x1, x;
1193	int y1, y;	1455	int y1, y;
1194	int z;	1456	int z;
…		…
1244	}	1506	}
1245	OUTPUT:	1507	OUTPUT:
1246	RETVAL	1508	RETVAL
1247		1509
1248	void	1510	void
1249	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)
1250	PPCODE:	1512	CODE:
1251	{	1513	{
1252	int vx, vy;
1253	int x, y, z;	1514	int x, y, z;
1254	int last_name;	1515	int last_name;
1255	mapface face;	1516	mapface face;
1256	int sw4 = (sw + 3) & ~3;
1257	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1258	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1259
1260	memset (darkness, 255, sw4 * sh);
1261	SvPOK_only (darkness_sv);
1262	SvCUR_set (darkness_sv, sw4 * sh);
1263
1264	vx = self->x + (self->w - sw) / 2 - shift_x;
1265	vy = self->y + (self->h - sh) / 2 - shift_y;
1266
1267	/*
1268	int vx = self->vx = self->w >= sw
1269	? self->x + (self->w - sw) / 2
1270	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1271
1272	int vy = self->vy = self->h >= sh
1273	? self->y + (self->h - sh) / 2
1274	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1275	*/
1276		1517
1277	glColor4ub (255, 255, 255, 255);	1518	glColor4ub (255, 255, 255, 255);
1278		1519
		1520	glEnable (GL_BLEND);
1279	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1521	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1280	glEnable (GL_BLEND);
1281	glEnable (GL_TEXTURE_2D);	1522	glEnable (GL_TEXTURE_2D);
1282	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1523	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1283		1524
1284	glBegin (GL_QUADS);	1525	glBegin (GL_QUADS);
1285		1526
1286	last_name = 0;	1527	last_name = 0;
1287		1528
		1529	mx += self->x;
		1530	my += self->y;
		1531
1288	for (z = 0; z < 3; z++)	1532	for (z = 0; z < 3; z++)
1289	for (y = 0; y < sh; y++)	1533	for (y = 0; y < sh; y++)
1290	if (0 <= y + vy && y + vy < self->rows)	1534	if (0 <= y + my && y + my < self->rows)
1291	{	1535	{
1292	maprow *row = self->row + (y + vy);	1536	maprow *row = self->row + (y + my);
1293		1537
1294	for (x = 0; x < sw; x++)	1538	for (x = 0; x < sw; x++)
1295	if (row->c0 <= x + vx && x + vx < row->c1)	1539	if (row->c0 <= x + mx && x + mx < row->c1)
1296	{	1540	{
1297	mapcell *cell = row->col + (x + vx - row->c0);	1541	mapcell *cell = row->col + (x + mx - row->c0);
1298
1299	darkness[y * sw4 + x] = cell->darkness < 0
1300	? 255 - FOW_DARKNESS
1301	: 255 - cell->darkness;
1302		1542
1303	face = cell->face [z];	1543	face = cell->face [z];
1304		1544
1305	if (face)	1545	if (face && face < self->texs)
1306	{	1546	{
1307	maptex tex = self->tex [face];	1547	maptex tex = self->tex [face];
1308
1309	int px = (x + 1) * 32 - tex.w;	1548	int px = (x + 1) * 32 - tex.w;
1310	int py = (y + 1) * 32 - tex.h;	1549	int py = (y + 1) * 32 - tex.h;
1311		1550
1312	if (last_name != tex.name)	1551	if (last_name != tex.name)
1313	{	1552	{
1314	glEnd ();	1553	glEnd ();
1315	last_name = tex.name;
1316	glBindTexture (GL_TEXTURE_2D, last_name);	1554	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1317	glBegin (GL_QUADS);	1555	glBegin (GL_QUADS);
1318	}	1556	}
1319		1557
1320	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1558	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1321	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1559	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1322	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);
1323	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1561	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1324	}	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	}
1325	}	1582	}
1326	}	1583	}
1327		1584
1328	glEnd ();	1585	glEnd ();
1329		1586
1330	glDisable (GL_TEXTURE_2D);	1587	glDisable (GL_TEXTURE_2D);
1331	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	}
1332		1713
1333	EXTEND (SP, 3);	1714	EXTEND (SP, 3);
1334	PUSHs (sv_2mortal (newSViv (sw4)));	1715	PUSHs (sv_2mortal (newSViv (sw4)));
1335	PUSHs (sv_2mortal (newSViv (sh)));	1716	PUSHs (sv_2mortal (newSViv (sh)));
1336	PUSHs (darkness_sv);	1717	PUSHs (darkness_sv);
1337	}	1718	}
1338		1719
1339	SV *	1720	SV *
1340	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)
1341	CODE:	1722	CODE:
1342	{	1723	{
1343	int x, y, x1, y1;	1724	int x, y, x1, y1;
1344	SV data_sv = newSV (w h * 7 + 5);	1725	SV data_sv = newSV (w h * 7 + 5);
1345	uint8_t data = (uint8_t )SvPVX (data_sv);	1726	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1407	}	1788	}
1408	OUTPUT:	1789	OUTPUT:
1409	RETVAL	1790	RETVAL
1410		1791
1411	void	1792	void
1412	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)
1413	PPCODE:	1794	PPCODE:
1414	{	1795	{
1415	int x, y, z;	1796	int x, y, z;
1416	int w, h;	1797	int w, h;
1417	int x1, y1;	1798	int x1, y1;
…		…
1449		1830
1450	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1831	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1451	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1832	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1452	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1833	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1453		1834
1454	if (cell->darkness <= 0)	1835	if (cell->darkness == 0)
1455	{	1836	{
1456	cell->darkness = -1;	1837	cell->darkness = 0;
1457		1838
1458	for (z = 0; z <= 2; z++)	1839	for (z = 0; z <= 2; z++)
1459	{	1840	{
1460	cell->face[z] = face[z];	1841	cell->face[z] = face[z];
1461		1842
…		…
1466	}	1847	}
1467	}	1848	}
1468	}	1849	}
1469	}	1850	}
1470		1851
1471	MODULE = CFClient PACKAGE = CFClient::MixChunk	1852	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1472		1853
1473	CFClient::MixChunk	1854	CFPlus::MixChunk
1474	new_from_file (SV class, char path)	1855	new_from_file (SV class, char path)
1475	CODE:	1856	CODE:
1476	RETVAL = Mix_LoadWAV (path);	1857	RETVAL = Mix_LoadWAV (path);
1477	OUTPUT:	1858	OUTPUT:
1478	RETVAL	1859	RETVAL
1479		1860
1480	void	1861	void
1481	DESTROY (CFClient::MixChunk self)	1862	DESTROY (CFPlus::MixChunk self)
1482	CODE:	1863	CODE:
1483	Mix_FreeChunk (self);	1864	Mix_FreeChunk (self);
1484		1865
1485	int	1866	int
1486	volume (CFClient::MixChunk self, int volume = -1)	1867	volume (CFPlus::MixChunk self, int volume = -1)
1487	CODE:	1868	CODE:
1488	RETVAL = Mix_VolumeChunk (self, volume);	1869	RETVAL = Mix_VolumeChunk (self, volume);
1489	OUTPUT:	1870	OUTPUT:
1490	RETVAL	1871	RETVAL
1491		1872
1492	int	1873	int
1493	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)
1494	CODE:	1875	CODE:
1495	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1876	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1496	OUTPUT:	1877	OUTPUT:
1497	RETVAL	1878	RETVAL
1498		1879
1499	MODULE = CFClient PACKAGE = CFClient::MixMusic	1880	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1500		1881
1501	int	1882	int
1502	volume (int volume = -1)	1883	volume (int volume = -1)
1503	CODE:	1884	CODE:
1504	RETVAL = Mix_VolumeMusic (volume);	1885	RETVAL = Mix_VolumeMusic (volume);
1505	OUTPUT:	1886	OUTPUT:
1506	RETVAL	1887	RETVAL
1507		1888
1508	CFClient::MixMusic	1889	CFPlus::MixMusic
1509	new_from_file (SV class, char path)	1890	new_from_file (SV class, char path)
1510	CODE:	1891	CODE:
1511	RETVAL = Mix_LoadMUS (path);	1892	RETVAL = Mix_LoadMUS (path);
1512	OUTPUT:	1893	OUTPUT:
1513	RETVAL	1894	RETVAL
1514		1895
1515	void	1896	void
1516	DESTROY (CFClient::MixMusic self)	1897	DESTROY (CFPlus::MixMusic self)
1517	CODE:	1898	CODE:
1518	Mix_FreeMusic (self);	1899	Mix_FreeMusic (self);
1519		1900
1520	int	1901	int
1521	play (CFClient::MixMusic self, int loops = -1)	1902	play (CFPlus::MixMusic self, int loops = -1)
1522	CODE:	1903	CODE:
1523	RETVAL = Mix_PlayMusic (self, loops);	1904	RETVAL = Mix_PlayMusic (self, loops);
1524	OUTPUT:	1905	OUTPUT:
1525	RETVAL	1906	RETVAL
1526		1907
1527	MODULE = CFClient PACKAGE = CFClient::OpenGL	1908	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1528		1909
1529	BOOT:	1910	BOOT:
1530	{	1911	{
1531	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1912	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1532	static const struct {	1913	static const struct {
1533	const char *name;	1914	const char *name;
1534	IV iv;	1915	IV iv;
1535	} *civ, const_iv[] = {	1916	} *civ, const_iv[] = {
1536	# define const_iv(name) { # name, (IV)name }	1917	# define const_iv(name) { # name, (IV)name }
…		…
1543	const_iv (GL_SCISSOR_TEST),	1924	const_iv (GL_SCISSOR_TEST),
1544	const_iv (GL_DEPTH_TEST),	1925	const_iv (GL_DEPTH_TEST),
1545	const_iv (GL_ALPHA_TEST),	1926	const_iv (GL_ALPHA_TEST),
1546	const_iv (GL_NORMALIZE),	1927	const_iv (GL_NORMALIZE),
1547	const_iv (GL_RESCALE_NORMAL),	1928	const_iv (GL_RESCALE_NORMAL),
		1929	const_iv (GL_FRONT),
		1930	const_iv (GL_BACK),
1548	const_iv (GL_AND),	1931	const_iv (GL_AND),
1549	const_iv (GL_ONE),	1932	const_iv (GL_ONE),
1550	const_iv (GL_ZERO),	1933	const_iv (GL_ZERO),
1551	const_iv (GL_SRC_ALPHA),	1934	const_iv (GL_SRC_ALPHA),
1552	const_iv (GL_SRC_ALPHA_SATURATE),	1935	const_iv (GL_DST_ALPHA),
1553	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1936	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1554	const_iv (GL_ONE_MINUS_DST_ALPHA),	1937	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1938	const_iv (GL_SRC_ALPHA_SATURATE),
1555	const_iv (GL_RGB),	1939	const_iv (GL_RGB),
1556	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),
1557	const_iv (GL_UNSIGNED_BYTE),	1944	const_iv (GL_UNSIGNED_BYTE),
1558	const_iv (GL_UNSIGNED_SHORT),	1945	const_iv (GL_UNSIGNED_SHORT),
1559	const_iv (GL_UNSIGNED_INT),	1946	const_iv (GL_UNSIGNED_INT),
1560	const_iv (GL_ALPHA),	1947	const_iv (GL_ALPHA),
1561	const_iv (GL_INTENSITY),	1948	const_iv (GL_INTENSITY),
…		…
1570	const_iv (GL_TEXTURE_MAG_FILTER),	1957	const_iv (GL_TEXTURE_MAG_FILTER),
1571	const_iv (GL_TEXTURE_MIN_FILTER),	1958	const_iv (GL_TEXTURE_MIN_FILTER),
1572	const_iv (GL_TEXTURE_ENV_MODE),	1959	const_iv (GL_TEXTURE_ENV_MODE),
1573	const_iv (GL_TEXTURE_WRAP_S),	1960	const_iv (GL_TEXTURE_WRAP_S),
1574	const_iv (GL_TEXTURE_WRAP_T),	1961	const_iv (GL_TEXTURE_WRAP_T),
		1962	const_iv (GL_REPEAT),
1575	const_iv (GL_CLAMP),	1963	const_iv (GL_CLAMP),
1576	const_iv (GL_REPEAT),	1964	const_iv (GL_CLAMP_TO_EDGE),
1577	const_iv (GL_NEAREST),	1965	const_iv (GL_NEAREST),
1578	const_iv (GL_LINEAR),	1966	const_iv (GL_LINEAR),
1579	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1967	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1580	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1968	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1581	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1969	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1592	const_iv (GL_SEPARABLE_2D),	1980	const_iv (GL_SEPARABLE_2D),
1593	const_iv (GL_CONVOLUTION_2D),	1981	const_iv (GL_CONVOLUTION_2D),
1594	const_iv (GL_CONVOLUTION_BORDER_MODE),	1982	const_iv (GL_CONVOLUTION_BORDER_MODE),
1595	const_iv (GL_CONSTANT_BORDER),	1983	const_iv (GL_CONSTANT_BORDER),
1596	const_iv (GL_LINES),	1984	const_iv (GL_LINES),
		1985	const_iv (GL_LINE_STRIP),
1597	const_iv (GL_LINE_LOOP),	1986	const_iv (GL_LINE_LOOP),
1598	const_iv (GL_QUADS),	1987	const_iv (GL_QUADS),
1599	const_iv (GL_QUAD_STRIP),	1988	const_iv (GL_QUAD_STRIP),
1600	const_iv (GL_TRIANGLES),	1989	const_iv (GL_TRIANGLES),
1601	const_iv (GL_TRIANGLE_STRIP),	1990	const_iv (GL_TRIANGLE_STRIP),
…		…
1611		2000
1612	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; )
1613	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2002	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1614	}	2003	}
1615		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
1616	int glGetError ()	2026	int glGetError ()
		2027
		2028	void glFinish ()
1617		2029
1618	void glClear (int mask)	2030	void glClear (int mask)
1619		2031
1620	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)
1621	PROTOTYPE: @	2033	PROTOTYPE: @
…		…
1628		2040
1629	void glHint (int target, int mode)	2041	void glHint (int target, int mode)
1630		2042
1631	void glBlendFunc (int sfactor, int dfactor)	2043	void glBlendFunc (int sfactor, int dfactor)
1632		2044
		2045	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		2046	CODE:
		2047	gl_BlendFuncSeparate (sa, da, saa, daa);
		2048
1633	void glDepthMask (int flag)	2049	void glDepthMask (int flag)
1634		2050
1635	void glLogicOp (int opcode)	2051	void glLogicOp (int opcode)
1636		2052
1637	void glColorMask (int red, int green, int blue, int alpha)	2053	void glColorMask (int red, int green, int blue, int alpha)
…		…
1641	void glPushMatrix ()	2057	void glPushMatrix ()
1642		2058
1643	void glPopMatrix ()	2059	void glPopMatrix ()
1644		2060
1645	void glLoadIdentity ()	2061	void glLoadIdentity ()
		2062
		2063	void glDrawBuffer (int buffer)
		2064
		2065	void glReadBuffer (int buffer)
1646		2066
1647	# near_ and far_ are due to microsofts buggy "c" compiler	2067	# near_ and far_ are due to microsofts buggy "c" compiler
1648	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2068	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1649		2069
1650	# near_ and far_ are due to microsofts buggy "c" compiler	2070	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1670		2090
1671	void glEnd ()	2091	void glEnd ()
1672		2092
1673	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)
1674	PROTOTYPE: @	2094	PROTOTYPE: @
		2095	ALIAS:
		2096	glColor_premultiply = 1
1675	CODE:	2097	CODE:
		2098	if (ix)
		2099	{
		2100	r *= a;
		2101	g *= a;
		2102	b *= a;
		2103	}
1676	// microsoft visual "c" rounds instead of truncating...	2104	// microsoft visual "c" rounds instead of truncating...
1677	glColor4ub (MIN ((int)(r * 255.f), 255),	2105	glColor4f (r, g, b, a);
1678	MIN ((int)(g * 255.f), 255),
1679	MIN ((int)(b * 255.f), 255),
1680	MIN ((int)(a * 255.f), 255));
1681		2106
1682	void glInterleavedArrays (int format, int stride, char *data)	2107	void glInterleavedArrays (int format, int stride, char *data)
1683		2108
1684	void glDrawElements (int mode, int count, int type, char *indices)	2109	void glDrawElements (int mode, int count, int type, char *indices)
1685		2110
…		…
1708		2133
1709	void glBindTexture (int target, int name)	2134	void glBindTexture (int target, int name)
1710		2135
1711	void glConvolutionParameter (int target, int pname, float params)	2136	void glConvolutionParameter (int target, int pname, float params)
1712	CODE:	2137	CODE:
1713	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2138	if (gl.ConvolutionParameterf)
		2139	gl.ConvolutionParameterf (target, pname, params);
1714		2140
1715	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)
1716	CODE:	2142	CODE:
1717	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2143	if (gl.ConvolutionFilter2D)
1718	(target, internalformat, width, height, format, type, data));	2144	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1719		2145
1720	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2146	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1721	CODE:	2147	CODE:
1722	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2148	if (gl.SeparableFilter2D)
1723	(target, internalformat, width, height, format, type, row, column));	2149	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1724		2150
1725	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)
1726		2152
1727	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)
1728		2154
…		…
1761		2187
1762	void glEndList ()	2188	void glEndList ()
1763		2189
1764	void glCallList (int list)	2190	void glCallList (int list)
1765		2191
1766

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.92 by elmex, Tue May 23 17:30:18 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.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC