ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.110 by root, Sat Jun 10 02:22:33 2006 UTC vs.
Revision 1.168 by root, Sat Dec 9 21:26:45 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
		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
		54
		55	#if 0
		56	# define PARACHUTE SDL_INIT_NOPARACHUTE
		57	#else
		58	# define PARACHUTE 0
		59	#endif
52		60
53	static struct	61	static struct
54	{	62	{
55	#define GL_FUNC(ptr,name) ptr name;	63	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	64	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	74	else
67	glBlendFunc (sa, da);	75	glBlendFunc (sa, da);
68	}	76	}
69		77
		78	#include "texcache.c"
		79
		80	#include "pango-font.c"
		81	#include "pango-fontmap.c"
		82	#include "pango-render.c"
		83
70	typedef Mix_Chunk *CFClient__MixChunk;	84	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	85	typedef Mix_Music *CFPlus__MixMusic;
72		86
73	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	}
74		106
75	typedef struct cf_layout {	107	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	108	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	109	float r, g, b, a; // default color for rgba mode
79	int base_height;	110	int base_height;
80	CFClient__Font font;	111	CFPlus__Font font;
81	} *CFClient__Layout;	112	} *CFPlus__Layout;
82		113
83	static CFClient__Font default_font;	114	static CFPlus__Font default_font;
84	static PangoContext *ft2_context, *cairo_context;	115	static PangoContext *opengl_context;
85	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	116	static PangoFontMap *opengl_fontmap;
86		117
87	static void	118	static void
88	substitute_func (FcPattern *pattern, gpointer data)	119	substitute_func (FcPattern *pattern, gpointer data)
89	{	120	{
90	FcPatternAddBool (pattern, FC_HINTING, 1);	121	FcPatternAddBool (pattern, FC_HINTING, 1);
91	#ifdef FC_HINT_STYLE	122	#ifdef FC_HINT_STYLE
92	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	123	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93	#endif	124	#endif
94	#ifdef _WIN32
95	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
96	#else
97	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	125	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
98	#endif
99	}	126	}
100		127
101	static void	128	static void
102	layout_update_font (CFClient__Layout self)	129	layout_update_font (CFPlus__Layout self)
103	{	130	{
104	/* 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
105	* reasonably well with bitstream vera	132	* reasonably well with bitstream vera
106	*/	133	*/
107	PangoFontDescription *font = self->font ? self->font : default_font;	134	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
111		138
112	pango_layout_set_font_description (self->pl, font);	139	pango_layout_set_font_description (self->pl, font);
113	}	140	}
114		141
115	static void	142	static void
116	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	143	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
117	{	144	{
		145	PangoRectangle rect;
		146
		147	// get_pixel_* wrongly rounds down
118	pango_layout_get_pixel_size (self->pl, w, h);	148	pango_layout_get_extents (self->pl, 0, &rect);
119		149
120	if (!*w) *w = 1;	150	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
121	if (!*h) *h = 1;	151	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
122		152
123	*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;
124	}	158	}
125		159
126	typedef uint16_t mapface;	160	typedef uint16_t mapface;
127		161
128	typedef struct {	162	typedef struct {
…		…
131	float s, t;	165	float s, t;
132	uint8_t r, g, b, a;	166	uint8_t r, g, b, a;
133	} maptex;	167	} maptex;
134		168
135	typedef struct {	169	typedef struct {
136	int16_t darkness;	170	uint32_t player;
137	mapface face[3];	171	mapface face[3];
		172	uint16_t darkness;
		173	uint8_t stat_width, stat_hp, flags;
138	} mapcell;	174	} mapcell;
139		175
140	typedef struct {	176	typedef struct {
141	int32_t c0, c1;	177	int32_t c0, c1;
142	mapcell *col;	178	mapcell *col;
…		…
151	int texs;	187	int texs;
152	maptex *tex;	188	maptex *tex;
153		189
154	int32_t rows;	190	int32_t rows;
155	maprow *row;	191	maprow *row;
156	} *CFClient__Map;	192	} *CFPlus__Map;
157		193
158	static char *	194	static char *
159	prepend (char *ptr, int sze, int inc)	195	prepend (char *ptr, int sze, int inc)
160	{	196	{
161	char *p;	197	char *p;
…		…
179		215
180	#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))
181	#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))
182		218
183	static maprow *	219	static maprow *
184	map_get_row (CFClient__Map self, int y)	220	map_get_row (CFPlus__Map self, int y)
185	{	221	{
186	if (0 > y)	222	if (0 > y)
187	{	223	{
188	int extend = - y + MAP_EXTEND_Y;	224	int extend = - y + MAP_EXTEND_Y;
189	Prepend (maprow, self->row, self->rows, extend);	225	Prepend (maprow, self->row, self->rows, extend);
…		…
227		263
228	return row->col + (x - row->c0);	264	return row->col + (x - row->c0);
229	}	265	}
230		266
231	static mapcell *	267	static mapcell *
232	map_get_cell (CFClient__Map self, int x, int y)	268	map_get_cell (CFPlus__Map self, int x, int y)
233	{	269	{
234	return row_get_cell (map_get_row (self, y), x);	270	return row_get_cell (map_get_row (self, y), x);
235	}	271	}
236		272
237	static void	273	static void
238	map_clear (CFClient__Map self)	274	map_clear (CFPlus__Map self)
239	{	275	{
240	int r;	276	int r;
241		277
242	for (r = 0; r < self->rows; r++)	278	for (r = 0; r < self->rows; r++)
243	Safefree (self->row[r].col);	279	Safefree (self->row[r].col);
…		…
251	self->row = 0;	287	self->row = 0;
252	self->rows = 0;	288	self->rows = 0;
253	}	289	}
254		290
255	static void	291	static void
256	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)
257	{	293	{
258	int x, y;	294	int x, y;
259	maprow *row;	295	maprow *row;
		296	mapcell *cell;
260		297
261	for (y = y0; y < y0 + h; y++)	298	for (y = y0; y < y0 + h; y++)
262	if (y >= 0)	299	if (y >= 0)
263	{	300	{
264	if (y >= self->rows)	301	if (y >= self->rows)
…		…
270	if (x >= row->c0)	307	if (x >= row->c0)
271	{	308	{
272	if (x >= row->c1)	309	if (x >= row->c1)
273	break;	310	break;
274		311
275	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;
276	}	318	}
277	}	319	}
278	}	320	}
279		321
280	static void	322	static void
…		…
301	ev.data2 = 0;	343	ev.data2 = 0;
302		344
303	SDL_PushEvent ((SDL_Event *)&ev);	345	SDL_PushEvent ((SDL_Event *)&ev);
304	}	346	}
305		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
306	MODULE = CFClient PACKAGE = CFClient	369	MODULE = CFPlus PACKAGE = CFPlus
307		370
308	PROTOTYPES: ENABLE	371	PROTOTYPES: ENABLE
309		372
310	BOOT:	373	BOOT:
311	{	374	{
312	HV *stash = gv_stashpv ("CFClient", 1);	375	HV *stash = gv_stashpv ("CFPlus", 1);
313	static const struct {	376	static const struct {
314	const char *name;	377	const char *name;
315	IV iv;	378	IV iv;
316	} *civ, const_iv[] = {	379	} *civ, const_iv[] = {
317	# 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
318	const_iv (SDL_ACTIVEEVENT),	384	const_iv (SDL_ACTIVEEVENT),
319	const_iv (SDL_KEYDOWN),	385	const_iv (SDL_KEYDOWN),
320	const_iv (SDL_KEYUP),	386	const_iv (SDL_KEYUP),
321	const_iv (SDL_MOUSEMOTION),	387	const_iv (SDL_MOUSEMOTION),
322	const_iv (SDL_MOUSEBUTTONDOWN),	388	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
331	const_iv (SDL_EVENT_RESERVEDA),	397	const_iv (SDL_EVENT_RESERVEDA),
332	const_iv (SDL_EVENT_RESERVEDB),	398	const_iv (SDL_EVENT_RESERVEDB),
333	const_iv (SDL_VIDEORESIZE),	399	const_iv (SDL_VIDEORESIZE),
334	const_iv (SDL_VIDEOEXPOSE),	400	const_iv (SDL_VIDEOEXPOSE),
335	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
336	const_iv (SDLK_KP0),	407	const_iv (SDLK_KP0),
337	const_iv (SDLK_KP1),	408	const_iv (SDLK_KP1),
338	const_iv (SDLK_KP2),	409	const_iv (SDLK_KP2),
339	const_iv (SDLK_KP3),	410	const_iv (SDLK_KP3),
340	const_iv (SDLK_KP4),	411	const_iv (SDLK_KP4),
…		…
395	const_iv (SDLK_BREAK),	466	const_iv (SDLK_BREAK),
396	const_iv (SDLK_MENU),	467	const_iv (SDLK_MENU),
397	const_iv (SDLK_POWER),	468	const_iv (SDLK_POWER),
398	const_iv (SDLK_EURO),	469	const_iv (SDLK_EURO),
399	const_iv (SDLK_UNDO),	470	const_iv (SDLK_UNDO),
		471
400	const_iv (KMOD_NONE),	472	const_iv (KMOD_NONE),
		473	const_iv (KMOD_SHIFT),
401	const_iv (KMOD_LSHIFT),	474	const_iv (KMOD_LSHIFT),
402	const_iv (KMOD_RSHIFT),	475	const_iv (KMOD_RSHIFT),
		476	const_iv (KMOD_CTRL),
403	const_iv (KMOD_LCTRL),	477	const_iv (KMOD_LCTRL),
404	const_iv (KMOD_RCTRL),	478	const_iv (KMOD_RCTRL),
		479	const_iv (KMOD_ALT),
405	const_iv (KMOD_LALT),	480	const_iv (KMOD_LALT),
406	const_iv (KMOD_RALT),	481	const_iv (KMOD_RALT),
		482	const_iv (KMOD_META),
407	const_iv (KMOD_LMETA),	483	const_iv (KMOD_LMETA),
408	const_iv (KMOD_RMETA),	484	const_iv (KMOD_RMETA),
409	const_iv (KMOD_NUM),	485	const_iv (KMOD_NUM),
410	const_iv (KMOD_CAPS),	486	const_iv (KMOD_CAPS),
411	const_iv (KMOD_MODE),	487	const_iv (KMOD_MODE),
412	const_iv (KMOD_CTRL),
413	const_iv (KMOD_SHIFT),
414	const_iv (KMOD_ALT),
415	const_iv (KMOD_META)
416	# undef const_iv	488	# undef const_iv
417	};	489	};
418		490
419	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; )
420	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);
421	}	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)
422		514
423	void	515	void
424	pango_init ()	516	pango_init ()
425	CODE:	517	CODE:
426	// delayed, so it can pick up new fonts added by AddFontResourceEx
427	{	518	{
428	{
429	ft2_fontmap = pango_ft2_font_map_new ();	519	opengl_fontmap = pango_opengl_font_map_new ();
430	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);
431	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	521	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
432	}
433	{
434	cairo_font_options_t *fopt = cairo_font_options_create ();
435	cairo_fontmap = pango_cairo_font_map_get_default ();
436	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
437	#ifdef _WIN32
438	// cairo looks like shit eaten twice on windows
439	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
440	#else
441	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
442	#endif
443	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
444	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
445	pango_cairo_context_set_font_options (cairo_context, fopt);
446	cairo_font_options_destroy (fopt);
447	}
448	}	522	}
449		523
450	int	524	int
451	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	525	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
452		526
453	void	527	void
454	SDL_Quit ()	528	SDL_Quit ()
455		529
456	void	530	void
…		…
463	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	537	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
464	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	538	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
465	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	539	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
466		540
467	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	541	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
468	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	542	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
469		543
470	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	544	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
471	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	545	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
472	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	546	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
473	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	547	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
474		548
475	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
476		554
477	SDL_EnableUNICODE (1);	555	SDL_EnableUNICODE (1);
478	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	556	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
479		557
480	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	558	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
532	case SDL_KEYDOWN:	610	case SDL_KEYDOWN:
533	case SDL_KEYUP:	611	case SDL_KEYUP:
534	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	612	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
535	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	613	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
536	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 */
537	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	616	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
538	break;	617	break;
539		618
540	case SDL_ACTIVEEVENT:	619	case SDL_ACTIVEEVENT:
541	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	620	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
567	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	646	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
568	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	647	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
569	break;	648	break;
570	}	649	}
571		650
572	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	651	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
573	}	652	}
574	}	653	}
575		654
576	int	655	int
577	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)
…		…
591	#ifndef _WIN32	670	#ifndef _WIN32
592	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	671	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
593	#endif	672	#endif
594		673
595	void	674	void
		675	win32_proxy_info ()
		676	PPCODE:
		677	{
		678	#ifdef _WIN32
		679	char buffer[2048];
		680	DWORD buflen;
		681
		682	EXTEND (SP, 3);
		683
		684	buflen = sizeof (buffer);
		685	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		686	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		687	{
		688	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		689
		690	buflen = sizeof (buffer);
		691	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		692	{
		693	PUSHs (newSVpv (buffer, 0));
		694
		695	buflen = sizeof (buffer);
		696	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		697	PUSHs (newSVpv (buffer, 0));
		698	}
		699	}
		700	#endif
		701	}
		702
		703	void
596	add_font (char *file)	704	add_font (char *file)
597	CODE:	705	CODE:
598	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	706	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
599	#ifdef _WIN32
600	// cairo... sigh... requires win2000
601	AddFontResourceEx (file, FR_PRIVATE, 0);
602	#endif
603		707
604	void	708	void
605	load_image_inline (SV *image_)	709	load_image_inline (SV *image_)
606	ALIAS:	710	ALIAS:
607	load_image_file = 1	711	load_image_file = 1
…		…
649		753
650	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	754	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
651		755
652	assert (surface2->pitch == surface2->w * 4);	756	assert (surface2->pitch == surface2->w * 4);
653		757
		758	SDL_LockSurface (surface2);
654	EXTEND (SP, 5);	759	EXTEND (SP, 6);
655	PUSHs (sv_2mortal (newSViv (surface2->w)));	760	PUSHs (sv_2mortal (newSViv (surface2->w)));
656	PUSHs (sv_2mortal (newSViv (surface2->h)));	761	PUSHs (sv_2mortal (newSViv (surface2->h)));
657	SDL_LockSurface (surface2);
658	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	762	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
659	SDL_UnlockSurface (surface2);
660	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)));
661	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	764	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
662	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	765	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		766	SDL_UnlockSurface (surface2);
663		767
664	SDL_FreeSurface (surface);	768	SDL_FreeSurface (surface);
665	SDL_FreeSurface (surface2);	769	SDL_FreeSurface (surface2);
666	}	770	}
667		771
…		…
703	CODE:	807	CODE:
704	fprintf (stderr, "FATAL: %s\n", message);	808	fprintf (stderr, "FATAL: %s\n", message);
705	#ifdef _WIN32	809	#ifdef _WIN32
706	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	810	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
707	#endif	811	#endif
708	exit (1);	812	_exit (1);
709		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
710	MODULE = CFClient PACKAGE = CFClient::Font	823	MODULE = CFPlus PACKAGE = CFPlus::Font
711		824
712	CFClient::Font	825	CFPlus::Font
713	new_from_file (SV *class, char *path, int id = 0)	826	new_from_file (SV *class, char *path, int id = 0)
714	CODE:	827	CODE:
715	{	828	{
716	int count;	829	int count;
717	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	830	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
720	}	833	}
721	OUTPUT:	834	OUTPUT:
722	RETVAL	835	RETVAL
723		836
724	void	837	void
725	DESTROY (CFClient::Font self)	838	DESTROY (CFPlus::Font self)
726	CODE:	839	CODE:
727	pango_font_description_free (self);	840	pango_font_description_free (self);
728		841
729	void	842	void
730	make_default (CFClient::Font self)	843	make_default (CFPlus::Font self)
731	CODE:	844	CODE:
732	default_font = self;	845	default_font = self;
733		846
734	MODULE = CFClient PACKAGE = CFClient::Layout	847	MODULE = CFPlus PACKAGE = CFPlus::Layout
735		848
736	CFClient::Layout	849	void
737	new (SV *class, int rgba = 0)	850	reset_glyph_cache ()
		851	CODE:
		852	tc_clear ();
		853
		854	CFPlus::Layout
		855	new (SV *class)
738	CODE:	856	CODE:
739	New (0, RETVAL, 1, struct cf_layout);	857	New (0, RETVAL, 1, struct cf_layout);
740		858
741	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	859	RETVAL->pl = pango_layout_new (opengl_context);
742	RETVAL->rgba = rgba;
743	RETVAL->r = 1.;	860	RETVAL->r = 1.;
744	RETVAL->g = 1.;	861	RETVAL->g = 1.;
745	RETVAL->b = 1.;	862	RETVAL->b = 1.;
746	RETVAL->a = 1.;	863	RETVAL->a = 1.;
747	RETVAL->base_height = MIN_FONT_HEIGHT;	864	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
751	layout_update_font (RETVAL);	868	layout_update_font (RETVAL);
752	OUTPUT:	869	OUTPUT:
753	RETVAL	870	RETVAL
754		871
755	void	872	void
756	DESTROY (CFClient::Layout self)	873	DESTROY (CFPlus::Layout self)
757	CODE:	874	CODE:
758	g_object_unref (self->pl);	875	g_object_unref (self->pl);
759	Safefree (self);	876	Safefree (self);
760		877
761	int
762	is_rgba (CFClient::Layout self)
763	CODE:
764	RETVAL = self->rgba;
765	OUTPUT:
766	RETVAL
767
768	void	878	void
769	set_text (CFClient::Layout self, SV *text_)	879	set_text (CFPlus::Layout self, SV *text_)
770	CODE:	880	CODE:
771	{	881	{
772	STRLEN textlen;	882	STRLEN textlen;
773	char *text = SvPVutf8 (text_, textlen);	883	char *text = SvPVutf8 (text_, textlen);
774		884
775	pango_layout_set_text (self->pl, text, textlen);	885	pango_layout_set_text (self->pl, text, textlen);
776	}	886	}
777		887
778	void	888	void
779	set_markup (CFClient::Layout self, SV *text_)	889	set_markup (CFPlus::Layout self, SV *text_)
780	CODE:	890	CODE:
781	{	891	{
782	STRLEN textlen;	892	STRLEN textlen;
783	char *text = SvPVutf8 (text_, textlen);	893	char *text = SvPVutf8 (text_, textlen);
784		894
785	pango_layout_set_markup (self->pl, text, textlen);	895	pango_layout_set_markup (self->pl, text, textlen);
786	}	896	}
787		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
788	SV *	983	SV *
789	get_text (CFClient::Layout self)	984	get_text (CFPlus::Layout self)
790	CODE:	985	CODE:
791	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	986	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
792	sv_utf8_decode (RETVAL);	987	sv_utf8_decode (RETVAL);
793	OUTPUT:	988	OUTPUT:
794	RETVAL	989	RETVAL
795		990
796	void	991	void
797	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.)
798	CODE:	993	CODE:
799	self->r = r;	994	self->r = r;
800	self->g = g;	995	self->g = g;
801	self->b = b;	996	self->b = b;
802	self->a = a;	997	self->a = a;
803		998
804	void	999	void
805	set_font (CFClient::Layout self, CFClient::Font font = 0)	1000	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
806	CODE:	1001	CODE:
807	if (self->font != font)	1002	if (self->font != font)
808	{	1003	{
809	self->font = font;	1004	self->font = font;
810	layout_update_font (self);	1005	layout_update_font (self);
811	}	1006	}
812		1007
813	void	1008	void
814	set_height (CFClient::Layout self, int base_height)	1009	set_height (CFPlus::Layout self, int base_height)
815	CODE:	1010	CODE:
816	if (self->base_height != base_height)	1011	if (self->base_height != base_height)
817	{	1012	{
818	self->base_height = base_height;	1013	self->base_height = base_height;
819	layout_update_font (self);	1014	layout_update_font (self);
820	}	1015	}
821		1016
822	void	1017	void
823	set_width (CFClient::Layout self, int max_width = -1)	1018	set_width (CFPlus::Layout self, int max_width = -1)
824	CODE:	1019	CODE:
825	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);
826		1021
827	void	1022	void
828	set_indent (CFClient::Layout self, int indent)	1023	set_indent (CFPlus::Layout self, int indent)
829	CODE:	1024	CODE:
830	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1025	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
831		1026
832	void	1027	void
833	set_spacing (CFClient::Layout self, int spacing)	1028	set_spacing (CFPlus::Layout self, int spacing)
834	CODE:	1029	CODE:
835	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1030	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
836		1031
837	void	1032	void
838	set_ellipsise (CFClient::Layout self, int ellipsise)	1033	set_ellipsise (CFPlus::Layout self, int ellipsise)
839	CODE:	1034	CODE:
840	pango_layout_set_ellipsize (self->pl,	1035	pango_layout_set_ellipsize (self->pl,
841	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1036	ellipsise == 1 ? PANGO_ELLIPSIZE_START
842	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1037	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
843	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1038	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
844	: PANGO_ELLIPSIZE_NONE	1039	: PANGO_ELLIPSIZE_NONE
845	);	1040	);
846		1041
847	void	1042	void
848	set_single_paragraph_mode (CFClient::Layout self, int spm)	1043	set_single_paragraph_mode (CFPlus::Layout self, int spm)
849	CODE:	1044	CODE:
850	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1045	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
851		1046
852	void	1047	void
853	size (CFClient::Layout self)	1048	size (CFPlus::Layout self)
854	PPCODE:	1049	PPCODE:
855	{	1050	{
856	int w, h;	1051	int w, h;
857		1052
858	layout_get_pixel_size (self, &w, &h);	1053	layout_get_pixel_size (self, &w, &h);
…		…
861	PUSHs (sv_2mortal (newSViv (w)));	1056	PUSHs (sv_2mortal (newSViv (w)));
862	PUSHs (sv_2mortal (newSViv (h)));	1057	PUSHs (sv_2mortal (newSViv (h)));
863	}	1058	}
864		1059
865	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
866	xy_to_index (CFClient::Layout self, int x, int y)	1073	xy_to_index (CFPlus::Layout self, int x, int y)
867	CODE:	1074	CODE:
868	{	1075	{
869	int index, trailing;	1076	int index, trailing;
870	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);
871	RETVAL = index;	1078	RETVAL = index + trailing;
872	}	1079	}
873	OUTPUT:	1080	OUTPUT:
874	RETVAL	1081	RETVAL
875		1082
876	void	1083	void
877	cursor_pos (CFClient::Layout self, int index)	1084	cursor_pos (CFPlus::Layout self, int index)
878	PPCODE:	1085	PPCODE:
879	{	1086	{
880	PangoRectangle strong_pos;	1087	PangoRectangle strong_pos;
881	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1088	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
882		1089
…		…
885	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1092	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
886	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1093	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
887	}	1094	}
888		1095
889	void	1096	void
890	render (CFClient::Layout self)	1097	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
891	PPCODE:	1098	PPCODE:
892	{	1099	{
893	SV *retval;	1100	int line, x;
894	int w, h;
895		1101
896	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 */
897		1104
898	if (self->rgba)
899	{
900	cairo_surface_t *surface;
901	cairo_t *cairo;
902
903	retval = newSV (w * h * 4);
904	SvPOK_only (retval);
905	SvCUR_set (retval, w * h * 4);
906
907	memset (SvPVX (retval), 0, w * h * 4);
908
909	surface = cairo_image_surface_create_for_data (
910	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
911	cairo = cairo_create (surface);
912	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
913
914	pango_cairo_show_layout (cairo, self->pl);
915
916	cairo_destroy (cairo);
917	cairo_surface_destroy (surface);
918
919	// what a mess, and its premultiplied, too :(
920	{
921	uint32_t *p = (uint32_t *)SvPVX (retval);
922	uint32_t *e = p + w * h;
923
924	while (p < e)
925	{
926	uint32_t rgba = *p;
927	rgba = (rgba >> 24) | (rgba << 8);
928	#if 0
929	#ifdef _WIN32
930	{//D
931	uint8_t r = rgba >> 24;
932	uint8_t g = rgba >> 16;
933	uint8_t b = rgba >> 8;
934	uint8_t a = rgba >> 0;
935
936	rgba = (rgba & 0xffffff00) | a;
937	}
938	#endif
939	#endif
940	rgba = SDL_SwapBE32 (rgba);
941	*p++ = rgba;
942	}
943	}
944
945	EXTEND (SP, 5);	1105	EXTEND (SP, 2);
946	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)
947	PUSHs (sv_2mortal (newSViv (h)));	1127	PUSHs (sv_2mortal (newSViv (index + trailing)));
948	PUSHs (sv_2mortal (retval));
949	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
951	}
952	else	1128	else
953	{	1129	{
954	FT_Bitmap bitmap;
955
956	retval = newSV (w * h);
957	SvPOK_only (retval);
958	SvCUR_set (retval, w * h);
959
960	bitmap.rows = h;
961	bitmap.width = w;
962	bitmap.pitch = w;
963	bitmap.buffer = (unsigned char*)SvPVX (retval);
964	bitmap.num_grays = 256;
965	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
966
967	memset (bitmap.buffer, 0, w * h);
968
969	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
970
971	EXTEND (SP, 5);
972	PUSHs (sv_2mortal (newSViv (w)));	1130	PUSHs (sv_2mortal (newSViv (index)));
973	PUSHs (sv_2mortal (newSViv (h)));	1131	PUSHs (sv_2mortal (newSViv (trailing)));
974	PUSHs (sv_2mortal (retval));
975	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
977	}	1132	}
978	}	1133	}
979		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
980	MODULE = CFClient PACKAGE = CFClient::Texture	1145	MODULE = CFPlus PACKAGE = CFPlus::Texture
981		1146
982	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
983	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.)
984	PROTOTYPE: $$$;$$	1186	PROTOTYPE: $$$;$$
985	ALIAS:	1187	ALIAS:
986	draw_quad_alpha = 1	1188	draw_quad_alpha = 1
987	draw_quad_alpha_premultiplied = 2	1189	draw_quad_alpha_premultiplied = 2
988	CODE:	1190	CODE:
…		…
1026	glDisable (GL_ALPHA_TEST);	1228	glDisable (GL_ALPHA_TEST);
1027	glDisable (GL_BLEND);	1229	glDisable (GL_BLEND);
1028	}	1230	}
1029	}	1231	}
1030		1232
1031	MODULE = CFClient PACKAGE = CFClient::Map	1233	MODULE = CFPlus PACKAGE = CFPlus::Map
1032		1234
1033	CFClient::Map	1235	CFPlus::Map
1034	new (SV *class, int map_width, int map_height)	1236	new (SV *class)
1035	CODE:	1237	CODE:
1036	New (0, RETVAL, 1, struct map);	1238	New (0, RETVAL, 1, struct map);
1037	RETVAL->x = 0;	1239	RETVAL->x = 0;
1038	RETVAL->y = 0;	1240	RETVAL->y = 0;
1039	RETVAL->w = map_width;	1241	RETVAL->w = 0;
1040	RETVAL->h = map_height;	1242	RETVAL->h = 0;
1041	RETVAL->ox = 0;	1243	RETVAL->ox = 0;
1042	RETVAL->oy = 0;	1244	RETVAL->oy = 0;
1043	RETVAL->faces = 8192;	1245	RETVAL->faces = 8192;
1044	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1246	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1045	RETVAL->texs = 8192;	1247	RETVAL->texs = 8192;
…		…
1048	RETVAL->row = 0;	1250	RETVAL->row = 0;
1049	OUTPUT:	1251	OUTPUT:
1050	RETVAL	1252	RETVAL
1051		1253
1052	void	1254	void
1053	DESTROY (CFClient::Map self)	1255	DESTROY (CFPlus::Map self)
1054	CODE:	1256	CODE:
1055	{	1257	{
1056	map_clear (self);	1258	map_clear (self);
1057	Safefree (self->face);	1259	Safefree (self->face);
		1260	Safefree (self->tex);
1058	Safefree (self);	1261	Safefree (self);
1059	}	1262	}
1060		1263
1061	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
1062	clear (CFClient::Map self)	1271	clear (CFPlus::Map self)
1063	CODE:	1272	CODE:
1064	map_clear (self);	1273	map_clear (self);
1065		1274
1066	void	1275	void
1067	set_face (CFClient::Map self, int face, int texid)	1276	set_face (CFPlus::Map self, int face, int texid)
1068	CODE:	1277	CODE:
1069	{	1278	{
1070	while (self->faces <= face)	1279	while (self->faces <= face)
1071	{	1280	{
1072	Append (mapface, self->face, self->faces, self->faces);	1281	Append (mapface, self->face, self->faces, self->faces);
…		…
1075		1284
1076	self->face [face] = texid;	1285	self->face [face] = texid;
1077	}	1286	}
1078		1287
1079	void	1288	void
1080	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)
1081	CODE:	1290	CODE:
1082	{	1291	{
1083	while (self->texs <= texid)	1292	while (self->texs <= texid)
1084	{	1293	{
1085	Append (maptex, self->tex, self->texs, self->texs);	1294	Append (maptex, self->tex, self->texs, self->texs);
…		…
1109	// from transparent color bleeding and ugly wrapping effects.	1318	// from transparent color bleeding and ugly wrapping effects.
1110	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1319	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1111	}	1320	}
1112		1321
1113	int	1322	int
1114	ox (CFClient::Map self)	1323	ox (CFPlus::Map self)
1115	ALIAS:	1324	ALIAS:
1116	oy = 1	1325	oy = 1
1117	x = 2	1326	x = 2
1118	y = 3	1327	y = 3
1119	w = 4	1328	w = 4
…		…
1130	}	1339	}
1131	OUTPUT:	1340	OUTPUT:
1132	RETVAL	1341	RETVAL
1133		1342
1134	void	1343	void
1135	scroll (CFClient::Map self, int dx, int dy)	1344	scroll (CFPlus::Map self, int dx, int dy)
1136	CODE:	1345	CODE:
1137	{	1346	{
1138	if (dx > 0)	1347	if (dx > 0)
1139	map_blank (self, self->x, self->y, dx - 1, self->h);	1348	map_blank (self, self->x, self->y, dx, self->h);
1140	else if (dx < 0)	1349	else if (dx < 0)
1141	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);
1142		1351
1143	if (dy > 0)	1352	if (dy > 0)
1144	map_blank (self, self->x, self->y, self->w, dy - 1);	1353	map_blank (self, self->x, self->y, self->w, dy);
1145	else if (dy < 0)	1354	else if (dy < 0)
1146	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);
1147		1356
1148	self->ox += dx; self->x += dx;	1357	self->ox += dx; self->x += dx;
1149	self->oy += dy; self->y += dy;	1358	self->oy += dy; self->y += dy;
1150		1359
1151	while (self->y < 0)	1360	while (self->y < 0)
…		…
1156	self->y += MAP_EXTEND_Y;	1365	self->y += MAP_EXTEND_Y;
1157	}	1366	}
1158	}	1367	}
1159		1368
1160	void	1369	void
1161	map1a_update (CFClient::Map self, SV *data_)	1370	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1162	CODE:	1371	CODE:
1163	{	1372	{
1164	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1373	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1165	uint8_t *data_end = (uint8_t *)SvEND (data_);	1374	uint8_t *data_end = (uint8_t *)SvEND (data_);
1166	mapcell *cell;	1375	mapcell *cell;
1167	int x, y, flags;	1376	int x, y, flags;
1168		1377
1169	while (data < data_end)	1378	while (data < data_end - 1)
1170	{	1379	{
1171	flags = (data [0] << 8) + data [1]; data += 2;	1380	flags = (data [0] << 8) + data [1]; data += 2;
1172		1381
1173	x = ((flags >> 10) & 63) + self->x;	1382	x = self->x + ((flags >> 10) & 63);
1174	y = ((flags >> 4) & 63) + self->y;	1383	y = self->y + ((flags >> 4) & 63);
1175		1384
1176	cell = map_get_cell (self, x, y);	1385	cell = map_get_cell (self, x, y);
1177		1386
1178	if (flags & 15)	1387	if (flags & 15)
1179	{	1388	{
1180	if (cell->darkness < 0)	1389	if (!cell->darkness)
1181	{	1390	{
		1391	memset (cell, 0, sizeof (*cell));
1182	cell->darkness = 0;	1392	cell->darkness = 256;
1183	cell->face [0] = 0;
1184	cell->face [1] = 0;
1185	cell->face [2] = 0;
1186	}	1393	}
1187		1394
1188	cell->darkness = flags & 8 ? *data++ : 255;
1189
1190	//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) // monster width
		1418	{
		1419	if (*data == 4)
		1420	; // decode player tag
		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	}
1191		1436
1192	if (flags & 4)	1437	if (flags & 4)
1193	{	1438	{
1194	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;
1195	}	1440	}
…		…
1203	{	1448	{
1204	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;
1205	}	1450	}
1206	}	1451	}
1207	else	1452	else
1208	cell->darkness = -1;	1453	cell->darkness = 0;
1209	}	1454	}
1210	}	1455	}
1211		1456
1212	SV *	1457	SV *
1213	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)
1214	CODE:	1459	CODE:
1215	{	1460	{
1216	int x1, x;	1461	int x1, x;
1217	int y1, y;	1462	int y1, y;
1218	int z;	1463	int z;
…		…
1268	}	1513	}
1269	OUTPUT:	1514	OUTPUT:
1270	RETVAL	1515	RETVAL
1271		1516
1272	void	1517	void
1273	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)
1274	PPCODE:	1519	CODE:
1275	{	1520	{
1276	int vx, vy;
1277	int x, y, z;	1521	int x, y, z;
1278	int last_name;	1522	int last_name;
1279	mapface face;	1523	mapface face;
1280	int sw4 = (sw + 3) & ~3;
1281	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1282	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1283
1284	memset (darkness, 255, sw4 * sh);
1285	SvPOK_only (darkness_sv);
1286	SvCUR_set (darkness_sv, sw4 * sh);
1287
1288	vx = self->x + (self->w - sw) / 2 - shift_x;
1289	vy = self->y + (self->h - sh) / 2 - shift_y;
1290
1291	/*
1292	int vx = self->vx = self->w >= sw
1293	? self->x + (self->w - sw) / 2
1294	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1295
1296	int vy = self->vy = self->h >= sh
1297	? self->y + (self->h - sh) / 2
1298	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1299	*/
1300		1524
1301	glColor4ub (255, 255, 255, 255);	1525	glColor4ub (255, 255, 255, 255);
1302		1526
		1527	glEnable (GL_BLEND);
1303	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1528	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1304	glEnable (GL_BLEND);
1305	glEnable (GL_TEXTURE_2D);	1529	glEnable (GL_TEXTURE_2D);
1306	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1530	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1307		1531
1308	glBegin (GL_QUADS);	1532	glBegin (GL_QUADS);
1309		1533
1310	last_name = 0;	1534	last_name = 0;
1311		1535
		1536	mx += self->x;
		1537	my += self->y;
		1538
1312	for (z = 0; z < 3; z++)	1539	for (z = 0; z < 3; z++)
1313	for (y = 0; y < sh; y++)	1540	for (y = 0; y < sh; y++)
1314	if (0 <= y + vy && y + vy < self->rows)	1541	if (0 <= y + my && y + my < self->rows)
1315	{	1542	{
1316	maprow *row = self->row + (y + vy);	1543	maprow *row = self->row + (y + my);
1317		1544
1318	for (x = 0; x < sw; x++)	1545	for (x = 0; x < sw; x++)
1319	if (row->c0 <= x + vx && x + vx < row->c1)	1546	if (row->c0 <= x + mx && x + mx < row->c1)
1320	{	1547	{
1321	mapcell *cell = row->col + (x + vx - row->c0);	1548	mapcell *cell = row->col + (x + mx - row->c0);
1322
1323	darkness[y * sw4 + x] = cell->darkness < 0
1324	? 255 - FOW_DARKNESS
1325	: 255 - cell->darkness;
1326		1549
1327	face = cell->face [z];	1550	face = cell->face [z];
1328		1551
1329	if (face)	1552	if (face && face < self->texs)
1330	{	1553	{
1331	maptex tex = self->tex [face];	1554	maptex tex = self->tex [face];
1332
1333	int px = (x + 1) * 32 - tex.w;	1555	int px = (x + 1) * 32 - tex.w;
1334	int py = (y + 1) * 32 - tex.h;	1556	int py = (y + 1) * 32 - tex.h;
1335		1557
1336	if (last_name != tex.name)	1558	if (last_name != tex.name)
1337	{	1559	{
1338	glEnd ();	1560	glEnd ();
1339	last_name = tex.name;
1340	glBindTexture (GL_TEXTURE_2D, last_name);	1561	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1341	glBegin (GL_QUADS);	1562	glBegin (GL_QUADS);
1342	}	1563	}
1343		1564
1344	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1565	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1345	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1566	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1346	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);
1347	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1568	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1348	}	1569	}
		1570
		1571	if (cell->flags && z == 2)
		1572	{
		1573	if (cell->flags & 1)
		1574	{
		1575	maptex tex = self->tex [1];
		1576	int px = (x + 1) * 32 - tex.w + 2;
		1577	int py = (y + 1) * 32 - tex.h - 6;
		1578
		1579	glEnd ();
		1580	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1581	glBegin (GL_QUADS);
		1582
		1583	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1584	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1585	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1586	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1587	}
		1588	}
1349	}	1589	}
1350	}	1590	}
1351		1591
1352	glEnd ();	1592	glEnd ();
1353		1593
1354	glDisable (GL_TEXTURE_2D);	1594	glDisable (GL_TEXTURE_2D);
1355	glDisable (GL_BLEND);	1595	glDisable (GL_BLEND);
		1596
		1597	// top layer: overlays such as the health bar
		1598	for (y = 0; y < sh; y++)
		1599	if (0 <= y + my && y + my < self->rows)
		1600	{
		1601	maprow *row = self->row + (y + my);
		1602
		1603	for (x = 0; x < sw; x++)
		1604	if (row->c0 <= x + mx && x + mx < row->c1)
		1605	{
		1606	mapcell *cell = row->col + (x + mx - row->c0);
		1607
		1608	int px = x * 32;
		1609	int py = y * 32;
		1610
		1611	if (cell->stat_hp)
		1612	{
		1613	int width = cell->stat_width * 32;
		1614	int thick = sh / 28 + 1 + cell->stat_width;
		1615
		1616	glColor3ub (0, 0, 0);
		1617	glRectf (px + 1, py - thick - 2,
		1618	px + width - 1, py);
		1619
		1620	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1621	glRectf (px + 2,
		1622	py - thick - 1,
		1623	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1624	}
		1625	}
		1626	}
		1627	}
		1628
		1629	void
		1630	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1631	CODE:
		1632	{
		1633	static float color[16][3] = {
		1634	{ 0.00F, 0.00F, 0.00F },
		1635	{ 1.00F, 1.00F, 1.00F },
		1636	{ 0.00F, 0.00F, 0.55F },
		1637	{ 1.00F, 0.00F, 0.00F },
		1638
		1639	{ 1.00F, 0.54F, 0.00F },
		1640	{ 0.11F, 0.56F, 1.00F },
		1641	{ 0.93F, 0.46F, 0.00F },
		1642	{ 0.18F, 0.54F, 0.34F },
		1643
		1644	{ 0.56F, 0.73F, 0.56F },
		1645	{ 0.80F, 0.80F, 0.80F },
		1646	{ 0.55F, 0.41F, 0.13F },
		1647	{ 0.99F, 0.77F, 0.26F },
		1648
		1649	{ 0.74F, 0.65F, 0.41F },
		1650
		1651	{ 0.00F, 1.00F, 1.00F },
		1652	{ 1.00F, 0.00F, 1.00F },
		1653	{ 1.00F, 1.00F, 0.00F },
		1654	};
		1655
		1656	int x, y;
		1657
		1658	glEnable (GL_TEXTURE_2D);
		1659	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1660	glEnable (GL_BLEND);
		1661	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1662	glBegin (GL_QUADS);
		1663
		1664	for (y = 0; y < h; y++)
		1665	for (x = 0; x < w; x++)
		1666	{
		1667	unsigned char m = data [x + y * w];
		1668
		1669	if (m)
		1670	{
		1671	float *c = color [m & 15];
		1672
		1673	float tx1 = m & 0x40 ? 0.5 : 0.;
		1674	float tx2 = tx1 + 0.5;
		1675
		1676	glColor4f (c[0], c[1], c[2], 0.75);
		1677	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1678	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1679	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1680	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1681	}
		1682	}
		1683
		1684	glEnd ();
		1685	glDisable (GL_BLEND);
		1686	glDisable (GL_TEXTURE_2D);
		1687	}
		1688
		1689	void
		1690	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1691	PPCODE:
		1692	{
		1693	int x, y;
		1694	int sw4 = (sw + 3) & ~3;
		1695	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1696	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1697
		1698	memset (darkness, 255, sw4 * sh);
		1699	SvPOK_only (darkness_sv);
		1700	SvCUR_set (darkness_sv, sw4 * sh);
		1701
		1702	mx += self->x;
		1703	my += self->y;
		1704
		1705	for (y = 0; y < sh; y++)
		1706	if (0 <= y + my && y + my < self->rows)
		1707	{
		1708	maprow *row = self->row + (y + my);
		1709
		1710	for (x = 0; x < sw; x++)
		1711	if (row->c0 <= x + mx && x + mx < row->c1)
		1712	{
		1713	mapcell *cell = row->col + (x + mx - row->c0);
		1714
		1715	darkness[y * sw4 + x] = cell->darkness
		1716	? 255 - (cell->darkness - 1)
		1717	: 255 - FOW_DARKNESS;
		1718	}
		1719	}
1356		1720
1357	EXTEND (SP, 3);	1721	EXTEND (SP, 3);
1358	PUSHs (sv_2mortal (newSViv (sw4)));	1722	PUSHs (sv_2mortal (newSViv (sw4)));
1359	PUSHs (sv_2mortal (newSViv (sh)));	1723	PUSHs (sv_2mortal (newSViv (sh)));
1360	PUSHs (darkness_sv);	1724	PUSHs (darkness_sv);
1361	}	1725	}
1362		1726
1363	SV *	1727	SV *
1364	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)
1365	CODE:	1729	CODE:
1366	{	1730	{
1367	int x, y, x1, y1;	1731	int x, y, x1, y1;
1368	SV *data_sv = newSV (w * h * 7 + 5);	1732	SV *data_sv = newSV (w * h * 7 + 5);
1369	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1733	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1431	}	1795	}
1432	OUTPUT:	1796	OUTPUT:
1433	RETVAL	1797	RETVAL
1434		1798
1435	void	1799	void
1436	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)
1437	PPCODE:	1801	PPCODE:
1438	{	1802	{
1439	int x, y, z;	1803	int x, y, z;
1440	int w, h;	1804	int w, h;
1441	int x1, y1;	1805	int x1, y1;
…		…
1473		1837
1474	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1838	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1475	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1839	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1476	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1840	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1477		1841
1478	if (cell->darkness <= 0)	1842	if (cell->darkness == 0)
1479	{	1843	{
1480	cell->darkness = -1;	1844	cell->darkness = 0;
1481		1845
1482	for (z = 0; z <= 2; z++)	1846	for (z = 0; z <= 2; z++)
1483	{	1847	{
1484	cell->face[z] = face[z];	1848	cell->face[z] = face[z];
1485		1849
…		…
1490	}	1854	}
1491	}	1855	}
1492	}	1856	}
1493	}	1857	}
1494		1858
1495	MODULE = CFClient PACKAGE = CFClient::MixChunk	1859	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1496		1860
1497	CFClient::MixChunk	1861	CFPlus::MixChunk
1498	new_from_file (SV *class, char *path)	1862	new_from_file (SV *class, char *path)
1499	CODE:	1863	CODE:
1500	RETVAL = Mix_LoadWAV (path);	1864	RETVAL = Mix_LoadWAV (path);
1501	OUTPUT:	1865	OUTPUT:
1502	RETVAL	1866	RETVAL
1503		1867
1504	void	1868	void
1505	DESTROY (CFClient::MixChunk self)	1869	DESTROY (CFPlus::MixChunk self)
1506	CODE:	1870	CODE:
1507	Mix_FreeChunk (self);	1871	Mix_FreeChunk (self);
1508		1872
1509	int	1873	int
1510	volume (CFClient::MixChunk self, int volume = -1)	1874	volume (CFPlus::MixChunk self, int volume = -1)
1511	CODE:	1875	CODE:
1512	RETVAL = Mix_VolumeChunk (self, volume);	1876	RETVAL = Mix_VolumeChunk (self, volume);
1513	OUTPUT:	1877	OUTPUT:
1514	RETVAL	1878	RETVAL
1515		1879
1516	int	1880	int
1517	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)
1518	CODE:	1882	CODE:
1519	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1883	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1520	OUTPUT:	1884	OUTPUT:
1521	RETVAL	1885	RETVAL
1522		1886
1523	MODULE = CFClient PACKAGE = CFClient::MixMusic	1887	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1524		1888
1525	int	1889	int
1526	volume (int volume = -1)	1890	volume (int volume = -1)
1527	CODE:	1891	CODE:
1528	RETVAL = Mix_VolumeMusic (volume);	1892	RETVAL = Mix_VolumeMusic (volume);
1529	OUTPUT:	1893	OUTPUT:
1530	RETVAL	1894	RETVAL
1531		1895
1532	CFClient::MixMusic	1896	CFPlus::MixMusic
1533	new_from_file (SV *class, char *path)	1897	new_from_file (SV *class, char *path)
1534	CODE:	1898	CODE:
1535	RETVAL = Mix_LoadMUS (path);	1899	RETVAL = Mix_LoadMUS (path);
1536	OUTPUT:	1900	OUTPUT:
1537	RETVAL	1901	RETVAL
1538		1902
1539	void	1903	void
1540	DESTROY (CFClient::MixMusic self)	1904	DESTROY (CFPlus::MixMusic self)
1541	CODE:	1905	CODE:
1542	Mix_FreeMusic (self);	1906	Mix_FreeMusic (self);
1543		1907
1544	int	1908	int
1545	play (CFClient::MixMusic self, int loops = -1)	1909	play (CFPlus::MixMusic self, int loops = -1)
1546	CODE:	1910	CODE:
1547	RETVAL = Mix_PlayMusic (self, loops);	1911	RETVAL = Mix_PlayMusic (self, loops);
1548	OUTPUT:	1912	OUTPUT:
1549	RETVAL	1913	RETVAL
1550		1914
1551	MODULE = CFClient PACKAGE = CFClient::OpenGL	1915	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1552		1916
1553	BOOT:	1917	BOOT:
1554	{	1918	{
1555	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1919	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1556	static const struct {	1920	static const struct {
1557	const char *name;	1921	const char *name;
1558	IV iv;	1922	IV iv;
1559	} *civ, const_iv[] = {	1923	} *civ, const_iv[] = {
1560	# define const_iv(name) { # name, (IV)name }	1924	# define const_iv(name) { # name, (IV)name }
…		…
1567	const_iv (GL_SCISSOR_TEST),	1931	const_iv (GL_SCISSOR_TEST),
1568	const_iv (GL_DEPTH_TEST),	1932	const_iv (GL_DEPTH_TEST),
1569	const_iv (GL_ALPHA_TEST),	1933	const_iv (GL_ALPHA_TEST),
1570	const_iv (GL_NORMALIZE),	1934	const_iv (GL_NORMALIZE),
1571	const_iv (GL_RESCALE_NORMAL),	1935	const_iv (GL_RESCALE_NORMAL),
		1936	const_iv (GL_FRONT),
		1937	const_iv (GL_BACK),
1572	const_iv (GL_AND),	1938	const_iv (GL_AND),
1573	const_iv (GL_ONE),	1939	const_iv (GL_ONE),
1574	const_iv (GL_ZERO),	1940	const_iv (GL_ZERO),
1575	const_iv (GL_SRC_ALPHA),	1941	const_iv (GL_SRC_ALPHA),
1576	const_iv (GL_DST_ALPHA),	1942	const_iv (GL_DST_ALPHA),
1577	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1943	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1578	const_iv (GL_ONE_MINUS_DST_ALPHA),	1944	const_iv (GL_ONE_MINUS_DST_ALPHA),
1579	const_iv (GL_SRC_ALPHA_SATURATE),	1945	const_iv (GL_SRC_ALPHA_SATURATE),
1580	const_iv (GL_RGB),	1946	const_iv (GL_RGB),
1581	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),
1582	const_iv (GL_UNSIGNED_BYTE),	1951	const_iv (GL_UNSIGNED_BYTE),
1583	const_iv (GL_UNSIGNED_SHORT),	1952	const_iv (GL_UNSIGNED_SHORT),
1584	const_iv (GL_UNSIGNED_INT),	1953	const_iv (GL_UNSIGNED_INT),
1585	const_iv (GL_ALPHA),	1954	const_iv (GL_ALPHA),
1586	const_iv (GL_INTENSITY),	1955	const_iv (GL_INTENSITY),
…		…
1618	const_iv (GL_SEPARABLE_2D),	1987	const_iv (GL_SEPARABLE_2D),
1619	const_iv (GL_CONVOLUTION_2D),	1988	const_iv (GL_CONVOLUTION_2D),
1620	const_iv (GL_CONVOLUTION_BORDER_MODE),	1989	const_iv (GL_CONVOLUTION_BORDER_MODE),
1621	const_iv (GL_CONSTANT_BORDER),	1990	const_iv (GL_CONSTANT_BORDER),
1622	const_iv (GL_LINES),	1991	const_iv (GL_LINES),
		1992	const_iv (GL_LINE_STRIP),
1623	const_iv (GL_LINE_LOOP),	1993	const_iv (GL_LINE_LOOP),
1624	const_iv (GL_QUADS),	1994	const_iv (GL_QUADS),
1625	const_iv (GL_QUAD_STRIP),	1995	const_iv (GL_QUAD_STRIP),
1626	const_iv (GL_TRIANGLES),	1996	const_iv (GL_TRIANGLES),
1627	const_iv (GL_TRIANGLE_STRIP),	1997	const_iv (GL_TRIANGLE_STRIP),
…		…
1660	OUTPUT:	2030	OUTPUT:
1661	RETVAL	2031	RETVAL
1662		2032
1663	int glGetError ()	2033	int glGetError ()
1664		2034
		2035	void glFinish ()
		2036
1665	void glClear (int mask)	2037	void glClear (int mask)
1666		2038
1667	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)
1668	PROTOTYPE: @	2040	PROTOTYPE: @
1669		2041
…		…
1692	void glPushMatrix ()	2064	void glPushMatrix ()
1693		2065
1694	void glPopMatrix ()	2066	void glPopMatrix ()
1695		2067
1696	void glLoadIdentity ()	2068	void glLoadIdentity ()
		2069
		2070	void glDrawBuffer (int buffer)
		2071
		2072	void glReadBuffer (int buffer)
1697		2073
1698	# near_ and far_ are due to microsofts buggy "c" compiler	2074	# near_ and far_ are due to microsofts buggy "c" compiler
1699	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_)
1700		2076
1701	# near_ and far_ are due to microsofts buggy "c" compiler	2077	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1731	r *= a;	2107	r *= a;
1732	g *= a;	2108	g *= a;
1733	b *= a;	2109	b *= a;
1734	}	2110	}
1735	// microsoft visual "c" rounds instead of truncating...	2111	// microsoft visual "c" rounds instead of truncating...
1736	glColor4ub (MIN ((int)(r * 256.f), 255),	2112	glColor4f (r, g, b, a);
1737	MIN ((int)(g * 256.f), 255),
1738	MIN ((int)(b * 256.f), 255),
1739	MIN ((int)(a * 256.f), 255));
1740		2113
1741	void glInterleavedArrays (int format, int stride, char *data)	2114	void glInterleavedArrays (int format, int stride, char *data)
1742		2115
1743	void glDrawElements (int mode, int count, int type, char *indices)	2116	void glDrawElements (int mode, int count, int type, char *indices)
1744		2117
…		…
1821		2194
1822	void glEndList ()	2195	void glEndList ()
1823		2196
1824	void glCallList (int list)	2197	void glCallList (int list)
1825		2198
1826

Diff Legend

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