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.122 by root, Fri Jun 23 22:35:15 2006 UTC vs.
Revision 1.172 by root, Mon Apr 2 19:29:27 2007 UTC

1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	2	# define WIN32_LEAN_AND_MEAN
		3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
5	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
6	#endif	9	#endif
7		10
8	#include "EXTERN.h"	11	#include "EXTERN.h"
9	#include "perl.h"	12	#include "perl.h"
10	#include "XSUB.h"	13	#include "XSUB.h"
11		14
		15	#ifdef _WIN32
		16	# undef pipe
		17	#endif
		18
		19	#include <assert.h>
12	#include <math.h>	20	#include <math.h>
13	#include <string.h>	21	#include <string.h>
14	#include <stdio.h>	22	#include <stdio.h>
15	#include <stdlib.h>	23	#include <stdlib.h>
16		24
…		…
18	#include <SDL_endian.h>	26	#include <SDL_endian.h>
19	#include <SDL_image.h>	27	#include <SDL_image.h>
20	#include <SDL_mixer.h>	28	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	29	#include <SDL_opengl.h>
22		30
		31	#define PANGO_ENABLE_BACKEND
		32	#define G_DISABLE_CAST_CHECKS
		33
23	#include <glib/gmacros.h>	34	#include <glib/gmacros.h>
24		35
25	#include <pango/pango.h>	36	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		37
30	#ifndef _WIN32	38	#ifndef _WIN32
31	# include <sys/types.h>	39	# include <sys/types.h>
32	# include <sys/socket.h>	40	# include <sys/socket.h>
33	# include <netinet/in.h>	41	# include <netinet/in.h>
34	# include <netinet/tcp.h>	42	# include <netinet/tcp.h>
35	# include <inttypes.h>	43	# include <inttypes.h>
36	#else
37	typedef unsigned char uint8_t;
38	typedef unsigned short uint16_t;
39	typedef unsigned int uint32_t;
40	typedef signed char int8_t;
41	typedef signed short int16_t;
42	typedef signed int int32_t;
43	#endif	44	#endif
44		45
45	#include "glext.h"
46
47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	46	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48		47
49	#define FOW_DARKNESS 32	48	#define FOW_DARKNESS 32
50		49
51	#define MAP_EXTEND_X 32	50	#define MAP_EXTEND_X 32
52	#define MAP_EXTEND_Y 512	51	#define MAP_EXTEND_Y 512
53		52
54	#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
55		60
56	static struct	61	static struct
57	{	62	{
58	#define GL_FUNC(ptr,name) ptr name;	63	#define GL_FUNC(ptr,name) ptr name;
59	#include "glfunc.h"	64	#include "glfunc.h"
…		…
68	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69	else	74	else
70	glBlendFunc (sa, da);	75	glBlendFunc (sa, da);
71	}	76	}
72		77
		78	#include "texcache.c"
		79
		80	#include "pango-font.c"
		81	#include "pango-fontmap.c"
		82	#include "pango-render.c"
		83
73	typedef Mix_Chunk *CFClient__MixChunk;	84	typedef Mix_Chunk *CFPlus__MixChunk;
74	typedef Mix_Music *CFClient__MixMusic;	85	typedef Mix_Music *CFPlus__MixMusic;
75		86
76	typedef PangoFontDescription *CFClient__Font;	87	typedef PangoFontDescription *CFPlus__Font;
77		88
78	static int	89	static int
79	shape_attr_p (PangoLayoutRun *run)	90	shape_attr_p (PangoLayoutRun *run)
80	{	91	{
81	GSList *attrs = run->item->analysis.extra_attrs;	92	GSList *attrs = run->item->analysis.extra_attrs;
…		…
92		103
93	return 0;	104	return 0;
94	}	105	}
95		106
96	typedef struct cf_layout {	107	typedef struct cf_layout {
97	PangoLayout *pl; // either derived from a cairo or ft2 context	108	PangoLayout *pl;
98	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99	float r, g, b, a; // default color for rgba mode	109	float r, g, b, a; // default color for rgba mode
100	int base_height;	110	int base_height;
101	CFClient__Font font;	111	CFPlus__Font font;
102	} *CFClient__Layout;	112	} *CFPlus__Layout;
103		113
104	static CFClient__Font default_font;	114	static CFPlus__Font default_font;
105	static PangoContext *ft2_context, *cairo_context;	115	static PangoContext *opengl_context;
106	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	116	static PangoFontMap *opengl_fontmap;
107		117
108	static void	118	static void
109	substitute_func (FcPattern *pattern, gpointer data)	119	substitute_func (FcPattern *pattern, gpointer data)
110	{	120	{
111	FcPatternAddBool (pattern, FC_HINTING, 1);	121	FcPatternAddBool (pattern, FC_HINTING, 1);
112	#ifdef FC_HINT_STYLE	122	#ifdef FC_HINT_STYLE
113	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	123	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114	#endif	124	#endif
115	#ifdef _WIN32
116	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117	#else
118	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	125	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119	#endif
120	}	126	}
121		127
122	static void	128	static void
123	layout_update_font (CFClient__Layout self)	129	layout_update_font (CFPlus__Layout self)
124	{	130	{
125	/* 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
126	* reasonably well with bitstream vera	132	* reasonably well with bitstream vera
127	*/	133	*/
128	PangoFontDescription *font = self->font ? self->font : default_font;	134	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
132		138
133	pango_layout_set_font_description (self->pl, font);	139	pango_layout_set_font_description (self->pl, font);
134	}	140	}
135		141
136	static void	142	static void
137	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	143	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
138	{	144	{
		145	PangoRectangle rect;
		146
		147	// get_pixel_* wrongly rounds down
139	pango_layout_get_pixel_size (self->pl, w, h);	148	pango_layout_get_extents (self->pl, 0, &rect);
140		149
141	if (!*w) *w = 1;	150	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142	if (!*h) *h = 1;	151	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143		152
144	*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;
145	}	158	}
146		159
147	typedef uint16_t mapface;	160	typedef uint16_t mapface;
148		161
149	typedef struct {	162	typedef struct {
…		…
152	float s, t;	165	float s, t;
153	uint8_t r, g, b, a;	166	uint8_t r, g, b, a;
154	} maptex;	167	} maptex;
155		168
156	typedef struct {	169	typedef struct {
157	int16_t darkness;	170	uint32_t player;
158	mapface face[3];	171	mapface face[3];
		172	uint16_t darkness;
		173	uint8_t stat_width, stat_hp, flags;
159	} mapcell;	174	} mapcell;
160		175
161	typedef struct {	176	typedef struct {
162	int32_t c0, c1;	177	int32_t c0, c1;
163	mapcell *col;	178	mapcell *col;
…		…
172	int texs;	187	int texs;
173	maptex *tex;	188	maptex *tex;
174		189
175	int32_t rows;	190	int32_t rows;
176	maprow *row;	191	maprow *row;
177	} *CFClient__Map;	192	} *CFPlus__Map;
178		193
179	static char *	194	static char *
180	prepend (char *ptr, int sze, int inc)	195	prepend (char *ptr, int sze, int inc)
181	{	196	{
182	char *p;	197	char *p;
…		…
200		215
201	#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))
202	#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))
203		218
204	static maprow *	219	static maprow *
205	map_get_row (CFClient__Map self, int y)	220	map_get_row (CFPlus__Map self, int y)
206	{	221	{
207	if (0 > y)	222	if (0 > y)
208	{	223	{
209	int extend = - y + MAP_EXTEND_Y;	224	int extend = - y + MAP_EXTEND_Y;
210	Prepend (maprow, self->row, self->rows, extend);	225	Prepend (maprow, self->row, self->rows, extend);
…		…
248		263
249	return row->col + (x - row->c0);	264	return row->col + (x - row->c0);
250	}	265	}
251		266
252	static mapcell *	267	static mapcell *
253	map_get_cell (CFClient__Map self, int x, int y)	268	map_get_cell (CFPlus__Map self, int x, int y)
254	{	269	{
255	return row_get_cell (map_get_row (self, y), x);	270	return row_get_cell (map_get_row (self, y), x);
256	}	271	}
257		272
258	static void	273	static void
259	map_clear (CFClient__Map self)	274	map_clear (CFPlus__Map self)
260	{	275	{
261	int r;	276	int r;
262		277
263	for (r = 0; r < self->rows; r++)	278	for (r = 0; r < self->rows; r++)
264	Safefree (self->row[r].col);	279	Safefree (self->row[r].col);
…		…
272	self->row = 0;	287	self->row = 0;
273	self->rows = 0;	288	self->rows = 0;
274	}	289	}
275		290
276	static void	291	static void
277	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)
278	{	293	{
279	int x, y;	294	int x, y;
280	maprow *row;	295	maprow *row;
		296	mapcell *cell;
281		297
282	for (y = y0; y < y0 + h; y++)	298	for (y = y0; y < y0 + h; y++)
283	if (y >= 0)	299	if (y >= 0)
284	{	300	{
285	if (y >= self->rows)	301	if (y >= self->rows)
…		…
291	if (x >= row->c0)	307	if (x >= row->c0)
292	{	308	{
293	if (x >= row->c1)	309	if (x >= row->c1)
294	break;	310	break;
295		311
296	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;
297	}	318	}
298	}	319	}
299	}	320	}
300		321
301	static void	322	static void
…		…
339	n |= n >> 16;	360	n |= n >> 16;
340		361
341	return n + 1;	362	return n + 1;
342	}	363	}
343		364
		365	/* SDL should provide this, really. */
		366	#define SDLK_MODIFIER_MIN 300
		367	#define SDLK_MODIFIER_MAX 314
		368
344	MODULE = CFClient PACKAGE = CFClient	369	MODULE = CFPlus PACKAGE = CFPlus
345		370
346	PROTOTYPES: ENABLE	371	PROTOTYPES: ENABLE
347		372
348	BOOT:	373	BOOT:
349	{	374	{
350	HV *stash = gv_stashpv ("CFClient", 1);	375	HV *stash = gv_stashpv ("CFPlus", 1);
351	static const struct {	376	static const struct {
352	const char *name;	377	const char *name;
353	IV iv;	378	IV iv;
354	} *civ, const_iv[] = {	379	} *civ, const_iv[] = {
355	# 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
356	const_iv (SDL_ACTIVEEVENT),	384	const_iv (SDL_ACTIVEEVENT),
357	const_iv (SDL_KEYDOWN),	385	const_iv (SDL_KEYDOWN),
358	const_iv (SDL_KEYUP),	386	const_iv (SDL_KEYUP),
359	const_iv (SDL_MOUSEMOTION),	387	const_iv (SDL_MOUSEMOTION),
360	const_iv (SDL_MOUSEBUTTONDOWN),	388	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
369	const_iv (SDL_EVENT_RESERVEDA),	397	const_iv (SDL_EVENT_RESERVEDA),
370	const_iv (SDL_EVENT_RESERVEDB),	398	const_iv (SDL_EVENT_RESERVEDB),
371	const_iv (SDL_VIDEORESIZE),	399	const_iv (SDL_VIDEORESIZE),
372	const_iv (SDL_VIDEOEXPOSE),	400	const_iv (SDL_VIDEOEXPOSE),
373	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
374	const_iv (SDLK_KP0),	407	const_iv (SDLK_KP0),
375	const_iv (SDLK_KP1),	408	const_iv (SDLK_KP1),
376	const_iv (SDLK_KP2),	409	const_iv (SDLK_KP2),
377	const_iv (SDLK_KP3),	410	const_iv (SDLK_KP3),
378	const_iv (SDLK_KP4),	411	const_iv (SDLK_KP4),
…		…
433	const_iv (SDLK_BREAK),	466	const_iv (SDLK_BREAK),
434	const_iv (SDLK_MENU),	467	const_iv (SDLK_MENU),
435	const_iv (SDLK_POWER),	468	const_iv (SDLK_POWER),
436	const_iv (SDLK_EURO),	469	const_iv (SDLK_EURO),
437	const_iv (SDLK_UNDO),	470	const_iv (SDLK_UNDO),
		471
438	const_iv (KMOD_NONE),	472	const_iv (KMOD_NONE),
		473	const_iv (KMOD_SHIFT),
439	const_iv (KMOD_LSHIFT),	474	const_iv (KMOD_LSHIFT),
440	const_iv (KMOD_RSHIFT),	475	const_iv (KMOD_RSHIFT),
		476	const_iv (KMOD_CTRL),
441	const_iv (KMOD_LCTRL),	477	const_iv (KMOD_LCTRL),
442	const_iv (KMOD_RCTRL),	478	const_iv (KMOD_RCTRL),
		479	const_iv (KMOD_ALT),
443	const_iv (KMOD_LALT),	480	const_iv (KMOD_LALT),
444	const_iv (KMOD_RALT),	481	const_iv (KMOD_RALT),
		482	const_iv (KMOD_META),
445	const_iv (KMOD_LMETA),	483	const_iv (KMOD_LMETA),
446	const_iv (KMOD_RMETA),	484	const_iv (KMOD_RMETA),
447	const_iv (KMOD_NUM),	485	const_iv (KMOD_NUM),
448	const_iv (KMOD_CAPS),	486	const_iv (KMOD_CAPS),
449	const_iv (KMOD_MODE),	487	const_iv (KMOD_MODE),
450	const_iv (KMOD_CTRL),
451	const_iv (KMOD_SHIFT),
452	const_iv (KMOD_ALT),
453	const_iv (KMOD_META)
454	# undef const_iv	488	# undef const_iv
455	};	489	};
456		490
457	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; )
458	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);
459	}	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
460		510
461	NV floor (NV x)	511	NV floor (NV x)
462		512
463	NV ceil (NV x)	513	NV ceil (NV x)
464		514
465	void	515	void
466	pango_init ()	516	pango_init ()
467	CODE:	517	CODE:
468	// delayed, so it can pick up new fonts added by AddFontResourceEx
469	{	518	{
470	{
471	ft2_fontmap = pango_ft2_font_map_new ();	519	opengl_fontmap = pango_opengl_font_map_new ();
472	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);
473	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	521	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474	}
475	{
476	cairo_font_options_t *fopt = cairo_font_options_create ();
477	cairo_fontmap = pango_cairo_font_map_get_default ();
478	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479	#ifdef _WIN32
480	// cairo looks like shit eaten twice on windows
481	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482	#else
483	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484	#endif
485	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487	pango_cairo_context_set_font_options (cairo_context, fopt);
488	cairo_font_options_destroy (fopt);
489	}
490	}	522	}
491		523
492	int	524	int
493	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	525	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
494		526
495	void	527	void
496	SDL_Quit ()	528	SDL_Quit ()
497		529
498	void	530	void
…		…
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	545	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	546	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	547	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516		548
517	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
518		554
519	SDL_EnableUNICODE (1);	555	SDL_EnableUNICODE (1);
520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	556	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521		557
522	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	558	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
574	case SDL_KEYDOWN:	610	case SDL_KEYDOWN:
575	case SDL_KEYUP:	611	case SDL_KEYUP:
576	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	612	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
577	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	613	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
578	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 */
579	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	616	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
580	break;	617	break;
581		618
582	case SDL_ACTIVEEVENT:	619	case SDL_ACTIVEEVENT:
583	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	620	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	646	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	647	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	648	break;
612	}	649	}
613		650
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	651	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	652	}
616	}	653	}
617		654
618	int	655	int
619	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)
…		…
633	#ifndef _WIN32	670	#ifndef _WIN32
634	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	671	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
635	#endif	672	#endif
636		673
637	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
638	add_font (char *file)	704	add_font (char *file)
639	CODE:	705	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	706	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		707
646	void	708	void
647	load_image_inline (SV *image_)	709	load_image_inline (SV *image_)
648	ALIAS:	710	ALIAS:
649	load_image_file = 1	711	load_image_file = 1
…		…
691		753
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	754	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		755
694	assert (surface2->pitch == surface2->w * 4);	756	assert (surface2->pitch == surface2->w * 4);
695		757
		758	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	759	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	760	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	761	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	762	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701	SDL_UnlockSurface (surface2);
702	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)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	764	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	765	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		766	SDL_UnlockSurface (surface2);
705		767
706	SDL_FreeSurface (surface);	768	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	769	SDL_FreeSurface (surface2);
708	}	770	}
709		771
…		…
748	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	810	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
749	#endif	811	#endif
750	_exit (1);	812	_exit (1);
751		813
752	void	814	void
753	_exit (int retval)	815	_exit (int retval = 0)
754	CODE:	816	CODE:
		817	#ifdef WIN32
		818	ExitThread (retval); // unclean, please beam me up
		819	#else
755	_exit (retval);	820	_exit (retval);
		821	#endif
756		822
757	MODULE = CFClient PACKAGE = CFClient::Font	823	MODULE = CFPlus PACKAGE = CFPlus::Font
758		824
759	CFClient::Font	825	CFPlus::Font
760	new_from_file (SV *class, char *path, int id = 0)	826	new_from_file (SV *class, char *path, int id = 0)
761	CODE:	827	CODE:
762	{	828	{
763	int count;	829	int count;
764	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	830	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
767	}	833	}
768	OUTPUT:	834	OUTPUT:
769	RETVAL	835	RETVAL
770		836
771	void	837	void
772	DESTROY (CFClient::Font self)	838	DESTROY (CFPlus::Font self)
773	CODE:	839	CODE:
774	pango_font_description_free (self);	840	pango_font_description_free (self);
775		841
776	void	842	void
777	make_default (CFClient::Font self)	843	make_default (CFPlus::Font self)
778	CODE:	844	CODE:
779	default_font = self;	845	default_font = self;
780		846
781	MODULE = CFClient PACKAGE = CFClient::Layout	847	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		848
783	CFClient::Layout	849	void
784	new (SV *class, int rgba = 0)	850	reset_glyph_cache ()
		851	CODE:
		852	tc_clear ();
		853
		854	CFPlus::Layout
		855	new (SV *class)
785	CODE:	856	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	857	New (0, RETVAL, 1, struct cf_layout);
787		858
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	859	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	860	RETVAL->r = 1.;
791	RETVAL->g = 1.;	861	RETVAL->g = 1.;
792	RETVAL->b = 1.;	862	RETVAL->b = 1.;
793	RETVAL->a = 1.;	863	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	864	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	868	layout_update_font (RETVAL);
799	OUTPUT:	869	OUTPUT:
800	RETVAL	870	RETVAL
801		871
802	void	872	void
803	DESTROY (CFClient::Layout self)	873	DESTROY (CFPlus::Layout self)
804	CODE:	874	CODE:
805	g_object_unref (self->pl);	875	g_object_unref (self->pl);
806	Safefree (self);	876	Safefree (self);
807		877
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	878	void
816	set_text (CFClient::Layout self, SV *text_)	879	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	880	CODE:
818	{	881	{
819	STRLEN textlen;	882	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	883	char *text = SvPVutf8 (text_, textlen);
821		884
822	pango_layout_set_text (self->pl, text, textlen);	885	pango_layout_set_text (self->pl, text, textlen);
823	}	886	}
824		887
825	void	888	void
826	set_markup (CFClient::Layout self, SV *text_)	889	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	890	CODE:
828	{	891	{
829	STRLEN textlen;	892	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	893	char *text = SvPVutf8 (text_, textlen);
831		894
832	pango_layout_set_markup (self->pl, text, textlen);	895	pango_layout_set_markup (self->pl, text, textlen);
833	}	896	}
834		897
835	void	898	void
836	set_shapes (CFClient::Layout self, ...)	899	set_shapes (CFPlus::Layout self, ...)
837	CODE:	900	CODE:
838	{	901	{
839	PangoAttrList *attrs = 0;	902	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	903	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	904	const char *pos = text;
…		…
876	if (attrs)	939	if (attrs)
877	pango_layout_set_attributes (self->pl, attrs);	940	pango_layout_set_attributes (self->pl, attrs);
878	}	941	}
879		942
880	void	943	void
881	get_shapes (CFClient::Layout self)	944	get_shapes (CFPlus::Layout self)
882	PPCODE:	945	PPCODE:
883	{	946	{
884	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	947	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885		948
886	do	949	do
…		…
890	if (run && shape_attr_p (run))	953	if (run && shape_attr_p (run))
891	{	954	{
892	PangoRectangle extents;	955	PangoRectangle extents;
893	pango_layout_iter_get_run_extents (iter, 0, &extents);	956	pango_layout_iter_get_run_extents (iter, 0, &extents);
894		957
		958	EXTEND (SP, 2);
895	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	959	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	960	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897	}	961	}
898	}	962	}
899	while (pango_layout_iter_next_run (iter));	963	while (pango_layout_iter_next_run (iter));
900		964
901	pango_layout_iter_free (iter);	965	pango_layout_iter_free (iter);
902	}	966	}
903		967
904	int	968	int
905	has_wrapped (CFClient::Layout self)	969	has_wrapped (CFPlus::Layout self)
906	CODE:	970	CODE:
907	{	971	{
908	int lines = 1;	972	int lines = 1;
909	const char *text = pango_layout_get_text (self->pl);	973	const char *text = pango_layout_get_text (self->pl);
910		974
…		…
915	}	979	}
916	OUTPUT:	980	OUTPUT:
917	RETVAL	981	RETVAL
918		982
919	SV *	983	SV *
920	get_text (CFClient::Layout self)	984	get_text (CFPlus::Layout self)
921	CODE:	985	CODE:
922	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	986	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
923	sv_utf8_decode (RETVAL);	987	sv_utf8_decode (RETVAL);
924	OUTPUT:	988	OUTPUT:
925	RETVAL	989	RETVAL
926		990
927	void	991	void
928	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.)
929	CODE:	993	CODE:
930	self->r = r;	994	self->r = r;
931	self->g = g;	995	self->g = g;
932	self->b = b;	996	self->b = b;
933	self->a = a;	997	self->a = a;
934		998
935	void	999	void
936	set_font (CFClient::Layout self, CFClient::Font font = 0)	1000	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
937	CODE:	1001	CODE:
938	if (self->font != font)	1002	if (self->font != font)
939	{	1003	{
940	self->font = font;	1004	self->font = font;
941	layout_update_font (self);	1005	layout_update_font (self);
942	}	1006	}
943		1007
944	void	1008	void
945	set_height (CFClient::Layout self, int base_height)	1009	set_height (CFPlus::Layout self, int base_height)
946	CODE:	1010	CODE:
947	if (self->base_height != base_height)	1011	if (self->base_height != base_height)
948	{	1012	{
949	self->base_height = base_height;	1013	self->base_height = base_height;
950	layout_update_font (self);	1014	layout_update_font (self);
951	}	1015	}
952		1016
953	void	1017	void
954	set_width (CFClient::Layout self, int max_width = -1)	1018	set_width (CFPlus::Layout self, int max_width = -1)
955	CODE:	1019	CODE:
956	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);
957		1021
958	void	1022	void
959	set_indent (CFClient::Layout self, int indent)	1023	set_indent (CFPlus::Layout self, int indent)
960	CODE:	1024	CODE:
961	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1025	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962		1026
963	void	1027	void
964	set_spacing (CFClient::Layout self, int spacing)	1028	set_spacing (CFPlus::Layout self, int spacing)
965	CODE:	1029	CODE:
966	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1030	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967		1031
968	void	1032	void
969	set_ellipsise (CFClient::Layout self, int ellipsise)	1033	set_ellipsise (CFPlus::Layout self, int ellipsise)
970	CODE:	1034	CODE:
971	pango_layout_set_ellipsize (self->pl,	1035	pango_layout_set_ellipsize (self->pl,
972	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1036	ellipsise == 1 ? PANGO_ELLIPSIZE_START
973	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1037	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1038	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
975	: PANGO_ELLIPSIZE_NONE	1039	: PANGO_ELLIPSIZE_NONE
976	);	1040	);
977		1041
978	void	1042	void
979	set_single_paragraph_mode (CFClient::Layout self, int spm)	1043	set_single_paragraph_mode (CFPlus::Layout self, int spm)
980	CODE:	1044	CODE:
981	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1045	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982		1046
983	void	1047	void
984	size (CFClient::Layout self)	1048	size (CFPlus::Layout self)
985	PPCODE:	1049	PPCODE:
986	{	1050	{
987	int w, h;	1051	int w, h;
988		1052
989	layout_get_pixel_size (self, &w, &h);	1053	layout_get_pixel_size (self, &w, &h);
…		…
992	PUSHs (sv_2mortal (newSViv (w)));	1056	PUSHs (sv_2mortal (newSViv (w)));
993	PUSHs (sv_2mortal (newSViv (h)));	1057	PUSHs (sv_2mortal (newSViv (h)));
994	}	1058	}
995		1059
996	int	1060	int
997	descent (CFClient::Layout self)	1061	descent (CFPlus::Layout self)
998	CODE:	1062	CODE:
999	{	1063	{
1000	PangoRectangle rect;	1064	PangoRectangle rect;
1001	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1065	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002	pango_layout_line_get_pixel_extents (line, 0, &rect);	1066	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
1004	}	1068	}
1005	OUTPUT:	1069	OUTPUT:
1006	RETVAL	1070	RETVAL
1007		1071
1008	int	1072	int
1009	xy_to_index (CFClient::Layout self, int x, int y)	1073	xy_to_index (CFPlus::Layout self, int x, int y)
1010	CODE:	1074	CODE:
1011	{	1075	{
1012	int index, trailing;	1076	int index, trailing;
1013	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);
1014	RETVAL = index;	1078	RETVAL = index + trailing;
1015	}	1079	}
1016	OUTPUT:	1080	OUTPUT:
1017	RETVAL	1081	RETVAL
1018		1082
1019	void	1083	void
1020	cursor_pos (CFClient::Layout self, int index)	1084	cursor_pos (CFPlus::Layout self, int index)
1021	PPCODE:	1085	PPCODE:
1022	{	1086	{
1023	PangoRectangle strong_pos;	1087	PangoRectangle strong_pos;
1024	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1088	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1025		1089
…		…
1028	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1092	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1029	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1093	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1030	}	1094	}
1031		1095
1032	void	1096	void
1033	render (CFClient::Layout self)	1097	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1034	PPCODE:	1098	PPCODE:
1035	{	1099	{
1036	SV *retval;	1100	int line, x;
1037	int w, h;
1038		1101
1039	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 */
1040		1104
1041	if (self->rgba)
1042	{
1043	cairo_surface_t *surface;
1044	cairo_t *cairo;
1045
1046	retval = newSV (w * h * 4);
1047	SvPOK_only (retval);
1048	SvCUR_set (retval, w * h * 4);
1049
1050	memset (SvPVX (retval), 0, w * h * 4);
1051
1052	surface = cairo_image_surface_create_for_data (
1053	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
1054	cairo = cairo_create (surface);
1055	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1056
1057	pango_cairo_show_layout (cairo, self->pl);
1058
1059	cairo_destroy (cairo);
1060	cairo_surface_destroy (surface);
1061
1062	// what a mess, and its premultiplied, too :(
1063	{
1064	uint32_t *p = (uint32_t *)SvPVX (retval);
1065	uint32_t *e = p + w * h;
1066
1067	while (p < e)
1068	{
1069	uint32_t rgba = *p;
1070	rgba = (rgba >> 24) | (rgba << 8);
1071	#if 0
1072	#ifdef _WIN32
1073	{//D
1074	uint8_t r = rgba >> 24;
1075	uint8_t g = rgba >> 16;
1076	uint8_t b = rgba >> 8;
1077	uint8_t a = rgba >> 0;
1078
1079	rgba = (rgba & 0xffffff00) | a;
1080	}
1081	#endif
1082	#endif
1083	rgba = SDL_SwapBE32 (rgba);
1084	*p++ = rgba;
1085	}
1086	}
1087
1088	EXTEND (SP, 5);	1105	EXTEND (SP, 2);
1089	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)
1090	PUSHs (sv_2mortal (newSViv (h)));	1127	PUSHs (sv_2mortal (newSViv (index + trailing)));
1091	PUSHs (sv_2mortal (retval));
1092	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1093	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1094	}
1095	else	1128	else
1096	{	1129	{
1097	FT_Bitmap bitmap;
1098
1099	retval = newSV (w * h);
1100	SvPOK_only (retval);
1101	SvCUR_set (retval, w * h);
1102
1103	bitmap.rows = h;
1104	bitmap.width = w;
1105	bitmap.pitch = w;
1106	bitmap.buffer = (unsigned char*)SvPVX (retval);
1107	bitmap.num_grays = 256;
1108	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1109
1110	memset (bitmap.buffer, 0, w * h);
1111
1112	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1113
1114	EXTEND (SP, 5);
1115	PUSHs (sv_2mortal (newSViv (w)));	1130	PUSHs (sv_2mortal (newSViv (index)));
1116	PUSHs (sv_2mortal (newSViv (h)));	1131	PUSHs (sv_2mortal (newSViv (trailing)));
1117	PUSHs (sv_2mortal (retval));
1118	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1119	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1120	}	1132	}
1121	}	1133	}
1122		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
1123	MODULE = CFClient PACKAGE = CFClient::Texture	1145	MODULE = CFPlus PACKAGE = CFPlus::Texture
1124		1146
1125	void	1147	void
1126	pad2pot (SV *data_, SV *w_, SV *h_)	1148	pad2pot (SV *data_, SV *w_, SV *h_)
1127	CODE:	1149	CODE:
1128	{	1150	{
…		…
1206	glDisable (GL_ALPHA_TEST);	1228	glDisable (GL_ALPHA_TEST);
1207	glDisable (GL_BLEND);	1229	glDisable (GL_BLEND);
1208	}	1230	}
1209	}	1231	}
1210		1232
1211	MODULE = CFClient PACKAGE = CFClient::Map	1233	MODULE = CFPlus PACKAGE = CFPlus::Map
1212		1234
1213	CFClient::Map	1235	CFPlus::Map
1214	new (SV *class, int map_width, int map_height)	1236	new (SV *class)
1215	CODE:	1237	CODE:
1216	New (0, RETVAL, 1, struct map);	1238	New (0, RETVAL, 1, struct map);
1217	RETVAL->x = 0;	1239	RETVAL->x = 0;
1218	RETVAL->y = 0;	1240	RETVAL->y = 0;
1219	RETVAL->w = map_width;	1241	RETVAL->w = 0;
1220	RETVAL->h = map_height;	1242	RETVAL->h = 0;
1221	RETVAL->ox = 0;	1243	RETVAL->ox = 0;
1222	RETVAL->oy = 0;	1244	RETVAL->oy = 0;
1223	RETVAL->faces = 8192;	1245	RETVAL->faces = 8192;
1224	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1246	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1225	RETVAL->texs = 8192;	1247	RETVAL->texs = 8192;
…		…
1228	RETVAL->row = 0;	1250	RETVAL->row = 0;
1229	OUTPUT:	1251	OUTPUT:
1230	RETVAL	1252	RETVAL
1231		1253
1232	void	1254	void
1233	DESTROY (CFClient::Map self)	1255	DESTROY (CFPlus::Map self)
1234	CODE:	1256	CODE:
1235	{	1257	{
1236	map_clear (self);	1258	map_clear (self);
1237	Safefree (self->face);	1259	Safefree (self->face);
1238	Safefree (self->tex);	1260	Safefree (self->tex);
1239	Safefree (self);	1261	Safefree (self);
1240	}	1262	}
1241		1263
1242	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
1243	clear (CFClient::Map self)	1271	clear (CFPlus::Map self)
1244	CODE:	1272	CODE:
1245	map_clear (self);	1273	map_clear (self);
1246		1274
1247	void	1275	void
1248	set_face (CFClient::Map self, int face, int texid)	1276	set_face (CFPlus::Map self, int face, int texid)
1249	CODE:	1277	CODE:
1250	{	1278	{
1251	while (self->faces <= face)	1279	while (self->faces <= face)
1252	{	1280	{
1253	Append (mapface, self->face, self->faces, self->faces);	1281	Append (mapface, self->face, self->faces, self->faces);
…		…
1256		1284
1257	self->face [face] = texid;	1285	self->face [face] = texid;
1258	}	1286	}
1259		1287
1260	void	1288	void
1261	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)
1262	CODE:	1290	CODE:
1263	{	1291	{
1264	while (self->texs <= texid)	1292	while (self->texs <= texid)
1265	{	1293	{
1266	Append (maptex, self->tex, self->texs, self->texs);	1294	Append (maptex, self->tex, self->texs, self->texs);
…		…
1290	// from transparent color bleeding and ugly wrapping effects.	1318	// from transparent color bleeding and ugly wrapping effects.
1291	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1319	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1292	}	1320	}
1293		1321
1294	int	1322	int
1295	ox (CFClient::Map self)	1323	ox (CFPlus::Map self)
1296	ALIAS:	1324	ALIAS:
1297	oy = 1	1325	oy = 1
1298	x = 2	1326	x = 2
1299	y = 3	1327	y = 3
1300	w = 4	1328	w = 4
…		…
1311	}	1339	}
1312	OUTPUT:	1340	OUTPUT:
1313	RETVAL	1341	RETVAL
1314		1342
1315	void	1343	void
1316	scroll (CFClient::Map self, int dx, int dy)	1344	scroll (CFPlus::Map self, int dx, int dy)
1317	CODE:	1345	CODE:
1318	{	1346	{
1319	if (dx > 0)	1347	if (dx > 0)
1320	map_blank (self, self->x, self->y, dx - 1, self->h);	1348	map_blank (self, self->x, self->y, dx, self->h);
1321	else if (dx < 0)	1349	else if (dx < 0)
1322	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);
1323		1351
1324	if (dy > 0)	1352	if (dy > 0)
1325	map_blank (self, self->x, self->y, self->w, dy - 1);	1353	map_blank (self, self->x, self->y, self->w, dy);
1326	else if (dy < 0)	1354	else if (dy < 0)
1327	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);
1328		1356
1329	self->ox += dx; self->x += dx;	1357	self->ox += dx; self->x += dx;
1330	self->oy += dy; self->y += dy;	1358	self->oy += dy; self->y += dy;
1331		1359
1332	while (self->y < 0)	1360	while (self->y < 0)
…		…
1337	self->y += MAP_EXTEND_Y;	1365	self->y += MAP_EXTEND_Y;
1338	}	1366	}
1339	}	1367	}
1340		1368
1341	void	1369	void
1342	map1a_update (CFClient::Map self, SV *data_)	1370	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1343	CODE:	1371	CODE:
1344	{	1372	{
1345	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1373	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1346	uint8_t *data_end = (uint8_t *)SvEND (data_);	1374	uint8_t *data_end = (uint8_t *)SvEND (data_);
1347	mapcell *cell;	1375	mapcell *cell;
1348	int x, y, flags;	1376	int x, y, flags;
1349		1377
1350	while (data < data_end)	1378	while (data < data_end - 1)
1351	{	1379	{
1352	flags = (data [0] << 8) + data [1]; data += 2;	1380	flags = (data [0] << 8) + data [1]; data += 2;
1353		1381
1354	x = self->x + ((flags >> 10) & 63);	1382	x = self->x + ((flags >> 10) & 63);
1355	y = self->y + ((flags >> 4) & 63);	1383	y = self->y + ((flags >> 4) & 63);
1356		1384
1357	cell = map_get_cell (self, x, y);	1385	cell = map_get_cell (self, x, y);
1358		1386
1359	if (flags & 15)	1387	if (flags & 15)
1360	{	1388	{
1361	if (cell->darkness < 0)	1389	if (!cell->darkness)
1362	{	1390	{
		1391	memset (cell, 0, sizeof (*cell));
1363	cell->darkness = 0;	1392	cell->darkness = 256;
1364	cell->face [0] = 0;
1365	cell->face [1] = 0;
1366	cell->face [2] = 0;
1367	}	1393	}
1368		1394
1369	cell->darkness = flags & 8 ? *data++ : 255;
1370
1371	//TODO: don't trust server data to be in-range(!)	1395	//TODO: don't trust server data to be in-range(!)
		1396
		1397	if (flags & 8)
		1398	{
		1399	if (extmap)
		1400	{
		1401	uint8_t ext, cmd;
		1402
		1403	do
		1404	{
		1405	ext = *data++;
		1406	cmd = ext & 0x3f;
		1407
		1408	if (cmd < 4)
		1409	cell->darkness = 255 - ext * 64 + 1;
		1410	else if (cmd == 5) // health
		1411	{
		1412	cell->stat_width = 1;
		1413	cell->stat_hp = *data++;
		1414	}
		1415	else if (cmd == 6) // monster width
		1416	cell->stat_width = *data++ + 1;
		1417	else if (cmd == 0x47)
		1418	{
		1419	if (*data == 8)
		1420	; // decode player uuid
		1421
		1422	data += *data + 1;
		1423	}
		1424	else if (cmd == 8) // cell flags
		1425	cell->flags = *data++;
		1426	else if (ext & 0x40) // unknown, multibyte => skip
		1427	data += *data + 1;
		1428	else
		1429	data++;
		1430	}
		1431	while (ext & 0x80);
		1432	}
		1433	else
		1434	cell->darkness = *data++ + 1;
		1435	}
1372		1436
1373	if (flags & 4)	1437	if (flags & 4)
1374	{	1438	{
1375	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;
1376	}	1440	}
…		…
1384	{	1448	{
1385	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;
1386	}	1450	}
1387	}	1451	}
1388	else	1452	else
1389	cell->darkness = -1;	1453	cell->darkness = 0;
1390	}	1454	}
1391	}	1455	}
1392		1456
1393	SV *	1457	SV *
1394	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)
1395	CODE:	1459	CODE:
1396	{	1460	{
1397	int x1, x;	1461	int x1, x;
1398	int y1, y;	1462	int y1, y;
1399	int z;	1463	int z;
…		…
1422		1486
1423	for (z = 0; z <= 0; z++)	1487	for (z = 0; z <= 0; z++)
1424	{	1488	{
1425	mapface face = cell->face [z];	1489	mapface face = cell->face [z];
1426		1490
1427	if (face)	1491	if (face > 0 && face < self->texs)
1428	{	1492	{
1429	maptex tex = self->tex [face];	1493	maptex tex = self->tex [face];
1430	int a0 = 255 - tex.a;	1494	int a0 = 255 - tex.a;
1431	int a1 = tex.a;	1495	int a1 = tex.a;
1432		1496
…		…
1449	}	1513	}
1450	OUTPUT:	1514	OUTPUT:
1451	RETVAL	1515	RETVAL
1452		1516
1453	void	1517	void
1454	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1518	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1455	CODE:	1519	CODE:
1456	{	1520	{
1457	int vx, vy;
1458	int x, y, z;	1521	int x, y, z;
1459	int last_name;	1522	int last_name;
1460	mapface face;	1523	mapface face;
1461
1462	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1463	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1464
1465	/*
1466	int vx = self->vx = self->w >= sw
1467	? self->x + (self->w - sw) / 2
1468	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1469
1470	int vy = self->vy = self->h >= sh
1471	? self->y + (self->h - sh) / 2
1472	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1473	*/
1474		1524
1475	glColor4ub (255, 255, 255, 255);	1525	glColor4ub (255, 255, 255, 255);
1476		1526
1477	glEnable (GL_BLEND);	1527	glEnable (GL_BLEND);
1478	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1528	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1481		1531
1482	glBegin (GL_QUADS);	1532	glBegin (GL_QUADS);
1483		1533
1484	last_name = 0;	1534	last_name = 0;
1485		1535
		1536	mx += self->x;
		1537	my += self->y;
		1538
1486	for (z = 0; z < 3; z++)	1539	for (z = 0; z < 3; z++)
1487	for (y = 0; y < sh; y++)	1540	for (y = 0; y < sh; y++)
1488	if (0 <= y + vy && y + vy < self->rows)	1541	if (0 <= y + my && y + my < self->rows)
1489	{	1542	{
1490	maprow *row = self->row + (y + vy);	1543	maprow *row = self->row + (y + my);
1491		1544
1492	for (x = 0; x < sw; x++)	1545	for (x = 0; x < sw; x++)
1493	if (row->c0 <= x + vx && x + vx < row->c1)	1546	if (row->c0 <= x + mx && x + mx < row->c1)
1494	{	1547	{
1495	mapcell *cell = row->col + (x + vx - row->c0);	1548	mapcell *cell = row->col + (x + mx - row->c0);
1496		1549
1497	face = cell->face [z];	1550	face = cell->face [z];
1498		1551
1499	if (face)	1552	if (face > 0 && face < self->texs)
1500	{	1553	{
1501	maptex tex = self->tex [face];	1554	maptex tex = self->tex [face];
1502
1503	int px = (x + 1) * 32 - tex.w;	1555	int px = (x + 1) * T - tex.w;
1504	int py = (y + 1) * 32 - tex.h;	1556	int py = (y + 1) * T - tex.h;
1505		1557
1506	if (last_name != tex.name)	1558	if (last_name != tex.name)
1507	{	1559	{
1508	glEnd ();	1560	glEnd ();
1509	last_name = tex.name;
1510	glBindTexture (GL_TEXTURE_2D, last_name);	1561	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1511	glBegin (GL_QUADS);	1562	glBegin (GL_QUADS);
1512	}	1563	}
1513		1564
1514	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1565	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1515	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1566	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1516	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);
1517	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1568	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1518	}	1569	}
		1570
		1571	if (cell->flags && z == 2)
		1572	{
		1573	if (cell->flags & 1)
		1574	{
		1575	maptex tex = self->tex [1];
		1576	int px = (x + 1) * T - tex.w + 2;
		1577	int py = (y + 1) * T - tex.h - 6;
		1578
		1579	glEnd ();
		1580	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1581	glBegin (GL_QUADS);
		1582
		1583	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1584	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1585	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1586	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1587	}
		1588	}
1519	}	1589	}
1520	}	1590	}
1521		1591
1522	glEnd ();	1592	glEnd ();
1523		1593
1524	glDisable (GL_TEXTURE_2D);	1594	glDisable (GL_TEXTURE_2D);
1525	glDisable (GL_BLEND);	1595	glDisable (GL_BLEND);
1526	}
1527		1596
		1597	// top layer: overlays such as the health bar
		1598	for (y = 0; y < sh; y++)
		1599	if (0 <= y + my && y + my < self->rows)
		1600	{
		1601	maprow *row = self->row + (y + my);
		1602
		1603	for (x = 0; x < sw; x++)
		1604	if (row->c0 <= x + mx && x + mx < row->c1)
		1605	{
		1606	mapcell *cell = row->col + (x + mx - row->c0);
		1607
		1608	int px = x * T;
		1609	int py = y * T;
		1610
		1611	if (cell->stat_hp)
		1612	{
		1613	int width = cell->stat_width * T;
		1614	int thick = sh / 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
1528	void	1629	void
1529	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1630	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530	CODE:	1631	CODE:
1531	{	1632	{
1532	static float color[16][3] = {	1633	static float color[16][3] = {
1533	{ 0.00, 0.00, 0.00 },	1634	{ 0.00F, 0.00F, 0.00F },
1534	{ 1.00, 1.00, 1.00 },	1635	{ 1.00F, 1.00F, 1.00F },
1535	{ 0.00, 0.00, 0.55 },	1636	{ 0.00F, 0.00F, 0.55F },
1536	{ 1.00, 0.00, 0.00 },	1637	{ 1.00F, 0.00F, 0.00F },
1537		1638
1538	{ 1.00, 0.54, 0.00 },	1639	{ 1.00F, 0.54F, 0.00F },
1539	{ 0.11, 0.56, 1.00 },	1640	{ 0.11F, 0.56F, 1.00F },
1540	{ 0.93, 0.46, 0.00 },	1641	{ 0.93F, 0.46F, 0.00F },
1541	{ 0.18, 0.54, 0.34 },	1642	{ 0.18F, 0.54F, 0.34F },
1542		1643
1543	{ 0.56, 0.73, 0.56 },	1644	{ 0.56F, 0.73F, 0.56F },
1544	{ 0.80, 0.80, 0.80 },	1645	{ 0.80F, 0.80F, 0.80F },
1545	{ 0.55, 0.41, 0.13 },	1646	{ 0.55F, 0.41F, 0.13F },
1546	{ 0.99, 0.77, 0.26 },	1647	{ 0.99F, 0.77F, 0.26F },
1547		1648
1548	{ 0.74, 0.65, 0.41 },	1649	{ 0.74F, 0.65F, 0.41F },
1549		1650
1550	{ 0.00, 1.00, 1.00 },	1651	{ 0.00F, 1.00F, 1.00F },
1551	{ 1.00, 0.00, 1.00 },	1652	{ 1.00F, 0.00F, 1.00F },
1552	{ 1.00, 1.00, 0.00 },	1653	{ 1.00F, 1.00F, 0.00F },
1553	};	1654	};
1554		1655
1555	int x, y;	1656	int x, y;
1556		1657
1557	glEnable (GL_TEXTURE_2D);	1658	glEnable (GL_TEXTURE_2D);
…		…
1584	glDisable (GL_BLEND);	1685	glDisable (GL_BLEND);
1585	glDisable (GL_TEXTURE_2D);	1686	glDisable (GL_TEXTURE_2D);
1586	}	1687	}
1587		1688
1588	void	1689	void
1589	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1690	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1590	PPCODE:	1691	PPCODE:
1591	{	1692	{
1592	int vx, vy;
1593	int x, y;	1693	int x, y;
1594	int sw4 = (sw + 3) & ~3;	1694	int sw4 = (sw + 3) & ~3;
1595	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1695	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1596	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1696	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1597		1697
1598	memset (darkness, 255, sw4 * sh);	1698	memset (darkness, 255, sw4 * sh);
1599	SvPOK_only (darkness_sv);	1699	SvPOK_only (darkness_sv);
1600	SvCUR_set (darkness_sv, sw4 * sh);	1700	SvCUR_set (darkness_sv, sw4 * sh);
1601		1701
1602	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1702	mx += self->x;
1603	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1703	my += self->y;
1604		1704
1605	for (y = 0; y < sh; y++)	1705	for (y = 0; y < sh; y++)
1606	if (0 <= y + vy && y + vy < self->rows)	1706	if (0 <= y + my && y + my < self->rows)
1607	{	1707	{
1608	maprow *row = self->row + (y + vy);	1708	maprow *row = self->row + (y + my);
1609		1709
1610	for (x = 0; x < sw; x++)	1710	for (x = 0; x < sw; x++)
1611	if (row->c0 <= x + vx && x + vx < row->c1)	1711	if (row->c0 <= x + mx && x + mx < row->c1)
1612	{	1712	{
1613	mapcell *cell = row->col + (x + vx - row->c0);	1713	mapcell *cell = row->col + (x + mx - row->c0);
1614		1714
1615	darkness[y * sw4 + x] = cell->darkness < 0	1715	darkness[y * sw4 + x] = cell->darkness
		1716	? 255 - (cell->darkness - 1)
1616	? 255 - FOW_DARKNESS	1717	: 255 - FOW_DARKNESS;
1617	: 255 - cell->darkness;
1618	}	1718	}
1619	}	1719	}
1620		1720
1621	EXTEND (SP, 3);	1721	EXTEND (SP, 3);
1622	PUSHs (sv_2mortal (newSViv (sw4)));	1722	PUSHs (sv_2mortal (newSViv (sw4)));
1623	PUSHs (sv_2mortal (newSViv (sh)));	1723	PUSHs (sv_2mortal (newSViv (sh)));
1624	PUSHs (darkness_sv);	1724	PUSHs (darkness_sv);
1625	}	1725	}
1626		1726
1627	SV *	1727	SV *
1628	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)
1629	CODE:	1729	CODE:
1630	{	1730	{
1631	int x, y, x1, y1;	1731	int x, y, x1, y1;
1632	SV *data_sv = newSV (w * h * 7 + 5);	1732	SV *data_sv = newSV (w * h * 7 + 5);
1633	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1733	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1695	}	1795	}
1696	OUTPUT:	1796	OUTPUT:
1697	RETVAL	1797	RETVAL
1698		1798
1699	void	1799	void
1700	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)
1701	PPCODE:	1801	PPCODE:
1702	{	1802	{
1703	int x, y, z;	1803	int x, y, z;
1704	int w, h;	1804	int w, h;
1705	int x1, y1;	1805	int x1, y1;
…		…
1737		1837
1738	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1838	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1739	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1839	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1740	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1840	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1741		1841
1742	if (cell->darkness <= 0)	1842	if (cell->darkness == 0)
1743	{	1843	{
1744	cell->darkness = -1;	1844	cell->darkness = 0;
1745		1845
1746	for (z = 0; z <= 2; z++)	1846	for (z = 0; z <= 2; z++)
1747	{	1847	{
1748	cell->face[z] = face[z];	1848	cell->face[z] = face[z];
1749		1849
…		…
1754	}	1854	}
1755	}	1855	}
1756	}	1856	}
1757	}	1857	}
1758		1858
1759	MODULE = CFClient PACKAGE = CFClient::MixChunk	1859	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1760		1860
1761	CFClient::MixChunk	1861	CFPlus::MixChunk
1762	new_from_file (SV *class, char *path)	1862	new_from_file (SV *class, char *path)
1763	CODE:	1863	CODE:
1764	RETVAL = Mix_LoadWAV (path);	1864	RETVAL = Mix_LoadWAV (path);
1765	OUTPUT:	1865	OUTPUT:
1766	RETVAL	1866	RETVAL
1767		1867
1768	void	1868	void
1769	DESTROY (CFClient::MixChunk self)	1869	DESTROY (CFPlus::MixChunk self)
1770	CODE:	1870	CODE:
1771	Mix_FreeChunk (self);	1871	Mix_FreeChunk (self);
1772		1872
1773	int	1873	int
1774	volume (CFClient::MixChunk self, int volume = -1)	1874	volume (CFPlus::MixChunk self, int volume = -1)
1775	CODE:	1875	CODE:
1776	RETVAL = Mix_VolumeChunk (self, volume);	1876	RETVAL = Mix_VolumeChunk (self, volume);
1777	OUTPUT:	1877	OUTPUT:
1778	RETVAL	1878	RETVAL
1779		1879
1780	int	1880	int
1781	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)
1782	CODE:	1882	CODE:
1783	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1883	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1784	OUTPUT:	1884	OUTPUT:
1785	RETVAL	1885	RETVAL
1786		1886
1787	MODULE = CFClient PACKAGE = CFClient::MixMusic	1887	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1788		1888
1789	int	1889	int
1790	volume (int volume = -1)	1890	volume (int volume = -1)
1791	CODE:	1891	CODE:
1792	RETVAL = Mix_VolumeMusic (volume);	1892	RETVAL = Mix_VolumeMusic (volume);
1793	OUTPUT:	1893	OUTPUT:
1794	RETVAL	1894	RETVAL
1795		1895
1796	CFClient::MixMusic	1896	CFPlus::MixMusic
1797	new_from_file (SV *class, char *path)	1897	new_from_file (SV *class, char *path)
1798	CODE:	1898	CODE:
1799	RETVAL = Mix_LoadMUS (path);	1899	RETVAL = Mix_LoadMUS (path);
1800	OUTPUT:	1900	OUTPUT:
1801	RETVAL	1901	RETVAL
1802		1902
1803	void	1903	void
1804	DESTROY (CFClient::MixMusic self)	1904	DESTROY (CFPlus::MixMusic self)
1805	CODE:	1905	CODE:
1806	Mix_FreeMusic (self);	1906	Mix_FreeMusic (self);
1807		1907
1808	int	1908	int
1809	play (CFClient::MixMusic self, int loops = -1)	1909	play (CFPlus::MixMusic self, int loops = -1)
1810	CODE:	1910	CODE:
1811	RETVAL = Mix_PlayMusic (self, loops);	1911	RETVAL = Mix_PlayMusic (self, loops);
1812	OUTPUT:	1912	OUTPUT:
1813	RETVAL	1913	RETVAL
1814		1914
1815	MODULE = CFClient PACKAGE = CFClient::OpenGL	1915	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1816		1916
1817	BOOT:	1917	BOOT:
1818	{	1918	{
1819	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1919	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1820	static const struct {	1920	static const struct {
1821	const char *name;	1921	const char *name;
1822	IV iv;	1922	IV iv;
1823	} *civ, const_iv[] = {	1923	} *civ, const_iv[] = {
1824	# define const_iv(name) { # name, (IV)name }	1924	# define const_iv(name) { # name, (IV)name }
…		…
1887	const_iv (GL_SEPARABLE_2D),	1987	const_iv (GL_SEPARABLE_2D),
1888	const_iv (GL_CONVOLUTION_2D),	1988	const_iv (GL_CONVOLUTION_2D),
1889	const_iv (GL_CONVOLUTION_BORDER_MODE),	1989	const_iv (GL_CONVOLUTION_BORDER_MODE),
1890	const_iv (GL_CONSTANT_BORDER),	1990	const_iv (GL_CONSTANT_BORDER),
1891	const_iv (GL_LINES),	1991	const_iv (GL_LINES),
		1992	const_iv (GL_LINE_STRIP),
1892	const_iv (GL_LINE_LOOP),	1993	const_iv (GL_LINE_LOOP),
1893	const_iv (GL_QUADS),	1994	const_iv (GL_QUADS),
1894	const_iv (GL_QUAD_STRIP),	1995	const_iv (GL_QUAD_STRIP),
1895	const_iv (GL_TRIANGLES),	1996	const_iv (GL_TRIANGLES),
1896	const_iv (GL_TRIANGLE_STRIP),	1997	const_iv (GL_TRIANGLE_STRIP),
…		…
2006	r *= a;	2107	r *= a;
2007	g *= a;	2108	g *= a;
2008	b *= a;	2109	b *= a;
2009	}	2110	}
2010	// microsoft visual "c" rounds instead of truncating...	2111	// microsoft visual "c" rounds instead of truncating...
2011	glColor4ub (MIN ((int)(r * 256.f), 255),	2112	glColor4f (r, g, b, a);
2012	MIN ((int)(g * 256.f), 255),
2013	MIN ((int)(b * 256.f), 255),
2014	MIN ((int)(a * 256.f), 255));
2015		2113
2016	void glInterleavedArrays (int format, int stride, char *data)	2114	void glInterleavedArrays (int format, int stride, char *data)
2017		2115
2018	void glDrawElements (int mode, int count, int type, char *indices)	2116	void glDrawElements (int mode, int count, int type, char *indices)
2019		2117
…		…
2096		2194
2097	void glEndList ()	2195	void glEndList ()
2098		2196
2099	void glCallList (int list)	2197	void glCallList (int list)
2100		2198
2101

Diff Legend

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