[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.173 by root, Wed Apr 4 02:43:29 2007 UTC

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