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.167 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

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