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.113 by root, Wed Jun 14 16:20:21 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"
		14
		15	#ifdef _WIN32
		16	# undef pipe
		17	#endif
11		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>
15	#include <stdlib.h>	22	#include <stdlib.h>
…		…
18	#include <SDL_endian.h>	25	#include <SDL_endian.h>
19	#include <SDL_image.h>	26	#include <SDL_image.h>
20	#include <SDL_mixer.h>	27	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	28	#include <SDL_opengl.h>
22		29
		30	#define PANGO_ENABLE_BACKEND
		31	#define G_DISABLE_CAST_CHECKS
		32
23	#include <glib/gmacros.h>	33	#include <glib/gmacros.h>
24		34
25	#include <pango/pango.h>	35	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		36
30	#ifndef _WIN32	37	#ifndef _WIN32
31	# include <sys/types.h>	38	# include <sys/types.h>
32	# include <sys/socket.h>	39	# include <sys/socket.h>
33	# include <netinet/in.h>	40	# include <netinet/in.h>
34	# include <netinet/tcp.h>	41	# include <netinet/tcp.h>
35	# include <inttypes.h>	42	# 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	43	#endif
44		44
45	#include "glext.h"	45	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46		46
47	#define FOW_DARKNESS 32	47	#define FOW_DARKNESS 32
48		48
49	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
51		51
52	#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
53		59
54	static struct	60	static struct
55	{	61	{
56	#define GL_FUNC(ptr,name) ptr name;	62	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	63	#include "glfunc.h"
…		…
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	72	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	73	else
68	glBlendFunc (sa, da);	74	glBlendFunc (sa, da);
69	}	75	}
70		76
		77	#include "texcache.c"
		78
		79	#include "pango-font.c"
		80	#include "pango-fontmap.c"
		81	#include "pango-render.c"
		82
71	typedef Mix_Chunk *CFClient__MixChunk;	83	typedef Mix_Chunk *CFPlus__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	84	typedef Mix_Music *CFPlus__MixMusic;
73		85
74	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	}
75		105
76	typedef struct cf_layout {	106	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	107	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	108	float r, g, b, a; // default color for rgba mode
80	int base_height;	109	int base_height;
81	CFClient__Font font;	110	CFPlus__Font font;
82	} *CFClient__Layout;	111	} *CFPlus__Layout;
83		112
84	static CFClient__Font default_font;	113	static CFPlus__Font default_font;
85	static PangoContext *ft2_context, *cairo_context;	114	static PangoContext *opengl_context;
86	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	115	static PangoFontMap *opengl_fontmap;
87		116
88	static void	117	static void
89	substitute_func (FcPattern *pattern, gpointer data)	118	substitute_func (FcPattern *pattern, gpointer data)
90	{	119	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	120	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	121	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	122	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	123	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	124	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	125	}
101		126
102	static void	127	static void
103	layout_update_font (CFClient__Layout self)	128	layout_update_font (CFPlus__Layout self)
104	{	129	{
105	/* 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
106	* reasonably well with bitstream vera	131	* reasonably well with bitstream vera
107	*/	132	*/
108	PangoFontDescription *font = self->font ? self->font : default_font;	133	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
112		137
113	pango_layout_set_font_description (self->pl, font);	138	pango_layout_set_font_description (self->pl, font);
114	}	139	}
115		140
116	static void	141	static void
117	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	142	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118	{	143	{
		144	PangoRectangle rect;
		145
		146	// get_pixel_* wrongly rounds down
119	pango_layout_get_pixel_size (self->pl, w, h);	147	pango_layout_get_extents (self->pl, 0, &rect);
120		148
121	if (!*w) *w = 1;	149	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122	if (!*h) *h = 1;	150	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123		151
124	*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;
125	}	157	}
126		158
127	typedef uint16_t mapface;	159	typedef uint16_t mapface;
128		160
129	typedef struct {	161	typedef struct {
…		…
132	float s, t;	164	float s, t;
133	uint8_t r, g, b, a;	165	uint8_t r, g, b, a;
134	} maptex;	166	} maptex;
135		167
136	typedef struct {	168	typedef struct {
137	int16_t darkness;	169	uint32_t player;
138	mapface face[3];	170	mapface face[3];
		171	uint16_t darkness;
		172	uint8_t stat_width, stat_hp, flags;
139	} mapcell;	173	} mapcell;
140		174
141	typedef struct {	175	typedef struct {
142	int32_t c0, c1;	176	int32_t c0, c1;
143	mapcell *col;	177	mapcell *col;
…		…
152	int texs;	186	int texs;
153	maptex *tex;	187	maptex *tex;
154		188
155	int32_t rows;	189	int32_t rows;
156	maprow *row;	190	maprow *row;
157	} *CFClient__Map;	191	} *CFPlus__Map;
158		192
159	static char *	193	static char *
160	prepend (char *ptr, int sze, int inc)	194	prepend (char *ptr, int sze, int inc)
161	{	195	{
162	char *p;	196	char *p;
…		…
180		214
181	#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))
182	#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))
183		217
184	static maprow *	218	static maprow *
185	map_get_row (CFClient__Map self, int y)	219	map_get_row (CFPlus__Map self, int y)
186	{	220	{
187	if (0 > y)	221	if (0 > y)
188	{	222	{
189	int extend = - y + MAP_EXTEND_Y;	223	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	224	Prepend (maprow, self->row, self->rows, extend);
…		…
228		262
229	return row->col + (x - row->c0);	263	return row->col + (x - row->c0);
230	}	264	}
231		265
232	static mapcell *	266	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	267	map_get_cell (CFPlus__Map self, int x, int y)
234	{	268	{
235	return row_get_cell (map_get_row (self, y), x);	269	return row_get_cell (map_get_row (self, y), x);
236	}	270	}
237		271
238	static void	272	static void
239	map_clear (CFClient__Map self)	273	map_clear (CFPlus__Map self)
240	{	274	{
241	int r;	275	int r;
242		276
243	for (r = 0; r < self->rows; r++)	277	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	278	Safefree (self->row[r].col);
…		…
252	self->row = 0;	286	self->row = 0;
253	self->rows = 0;	287	self->rows = 0;
254	}	288	}
255		289
256	static void	290	static void
257	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)
258	{	292	{
259	int x, y;	293	int x, y;
260	maprow *row;	294	maprow *row;
		295	mapcell *cell;
261		296
262	for (y = y0; y < y0 + h; y++)	297	for (y = y0; y < y0 + h; y++)
263	if (y >= 0)	298	if (y >= 0)
264	{	299	{
265	if (y >= self->rows)	300	if (y >= self->rows)
…		…
271	if (x >= row->c0)	306	if (x >= row->c0)
272	{	307	{
273	if (x >= row->c1)	308	if (x >= row->c1)
274	break;	309	break;
275		310
276	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;
277	}	317	}
278	}	318	}
279	}	319	}
280		320
281	static void	321	static void
…		…
319	n |= n >> 16;	359	n |= n >> 16;
320		360
321	return n + 1;	361	return n + 1;
322	}	362	}
323		363
		364	/* SDL should provide this, really. */
		365	#define SDLK_MODIFIER_MIN 300
		366	#define SDLK_MODIFIER_MAX 314
		367
324	MODULE = CFClient PACKAGE = CFClient	368	MODULE = CFPlus PACKAGE = CFPlus
325		369
326	PROTOTYPES: ENABLE	370	PROTOTYPES: ENABLE
327		371
328	BOOT:	372	BOOT:
329	{	373	{
330	HV *stash = gv_stashpv ("CFClient", 1);	374	HV *stash = gv_stashpv ("CFPlus", 1);
331	static const struct {	375	static const struct {
332	const char *name;	376	const char *name;
333	IV iv;	377	IV iv;
334	} *civ, const_iv[] = {	378	} *civ, const_iv[] = {
335	# 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
336	const_iv (SDL_ACTIVEEVENT),	383	const_iv (SDL_ACTIVEEVENT),
337	const_iv (SDL_KEYDOWN),	384	const_iv (SDL_KEYDOWN),
338	const_iv (SDL_KEYUP),	385	const_iv (SDL_KEYUP),
339	const_iv (SDL_MOUSEMOTION),	386	const_iv (SDL_MOUSEMOTION),
340	const_iv (SDL_MOUSEBUTTONDOWN),	387	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
349	const_iv (SDL_EVENT_RESERVEDA),	396	const_iv (SDL_EVENT_RESERVEDA),
350	const_iv (SDL_EVENT_RESERVEDB),	397	const_iv (SDL_EVENT_RESERVEDB),
351	const_iv (SDL_VIDEORESIZE),	398	const_iv (SDL_VIDEORESIZE),
352	const_iv (SDL_VIDEOEXPOSE),	399	const_iv (SDL_VIDEOEXPOSE),
353	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
354	const_iv (SDLK_KP0),	406	const_iv (SDLK_KP0),
355	const_iv (SDLK_KP1),	407	const_iv (SDLK_KP1),
356	const_iv (SDLK_KP2),	408	const_iv (SDLK_KP2),
357	const_iv (SDLK_KP3),	409	const_iv (SDLK_KP3),
358	const_iv (SDLK_KP4),	410	const_iv (SDLK_KP4),
…		…
413	const_iv (SDLK_BREAK),	465	const_iv (SDLK_BREAK),
414	const_iv (SDLK_MENU),	466	const_iv (SDLK_MENU),
415	const_iv (SDLK_POWER),	467	const_iv (SDLK_POWER),
416	const_iv (SDLK_EURO),	468	const_iv (SDLK_EURO),
417	const_iv (SDLK_UNDO),	469	const_iv (SDLK_UNDO),
		470
418	const_iv (KMOD_NONE),	471	const_iv (KMOD_NONE),
		472	const_iv (KMOD_SHIFT),
419	const_iv (KMOD_LSHIFT),	473	const_iv (KMOD_LSHIFT),
420	const_iv (KMOD_RSHIFT),	474	const_iv (KMOD_RSHIFT),
		475	const_iv (KMOD_CTRL),
421	const_iv (KMOD_LCTRL),	476	const_iv (KMOD_LCTRL),
422	const_iv (KMOD_RCTRL),	477	const_iv (KMOD_RCTRL),
		478	const_iv (KMOD_ALT),
423	const_iv (KMOD_LALT),	479	const_iv (KMOD_LALT),
424	const_iv (KMOD_RALT),	480	const_iv (KMOD_RALT),
		481	const_iv (KMOD_META),
425	const_iv (KMOD_LMETA),	482	const_iv (KMOD_LMETA),
426	const_iv (KMOD_RMETA),	483	const_iv (KMOD_RMETA),
427	const_iv (KMOD_NUM),	484	const_iv (KMOD_NUM),
428	const_iv (KMOD_CAPS),	485	const_iv (KMOD_CAPS),
429	const_iv (KMOD_MODE),	486	const_iv (KMOD_MODE),
430	const_iv (KMOD_CTRL),
431	const_iv (KMOD_SHIFT),
432	const_iv (KMOD_ALT),
433	const_iv (KMOD_META)
434	# undef const_iv	487	# undef const_iv
435	};	488	};
436		489
437	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; )
438	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);
439	}	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)
440		507
441	void	508	void
442	pango_init ()	509	pango_init ()
443	CODE:	510	CODE:
444	// delayed, so it can pick up new fonts added by AddFontResourceEx
445	{	511	{
446	{
447	ft2_fontmap = pango_ft2_font_map_new ();	512	opengl_fontmap = pango_opengl_font_map_new ();
448	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);
449	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	514	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
450	}
451	{
452	cairo_font_options_t *fopt = cairo_font_options_create ();
453	cairo_fontmap = pango_cairo_font_map_get_default ();
454	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455	#ifdef _WIN32
456	// cairo looks like shit eaten twice on windows
457	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458	#else
459	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460	#endif
461	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463	pango_cairo_context_set_font_options (cairo_context, fopt);
464	cairo_font_options_destroy (fopt);
465	}
466	}	515	}
467		516
468	int	517	int
469	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	518	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
470		519
471	void	520	void
472	SDL_Quit ()	521	SDL_Quit ()
473		522
474	void	523	void
…		…
481	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	530	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
482	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	531	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
483	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	532	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
484		533
485	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	534	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	535	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
487		536
488	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	537	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
489	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	538	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	539	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	540	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
492		541
493	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
494		547
495	SDL_EnableUNICODE (1);	548	SDL_EnableUNICODE (1);
496	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	549	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
497		550
498	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	551	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
550	case SDL_KEYDOWN:	603	case SDL_KEYDOWN:
551	case SDL_KEYUP:	604	case SDL_KEYUP:
552	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
553	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	606	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
554	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 */
555	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	609	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
556	break;	610	break;
557		611
558	case SDL_ACTIVEEVENT:	612	case SDL_ACTIVEEVENT:
559	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	613	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
585	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	639	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	640	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587	break;	641	break;
588	}	642	}
589		643
590	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	644	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
591	}	645	}
592	}	646	}
593		647
594	int	648	int
595	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)
…		…
609	#ifndef _WIN32	663	#ifndef _WIN32
610	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	664	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
611	#endif	665	#endif
612		666
613	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
614	add_font (char *file)	697	add_font (char *file)
615	CODE:	698	CODE:
616	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	699	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617	#ifdef _WIN32
618	// cairo... sigh... requires win2000
619	AddFontResourceEx (file, FR_PRIVATE, 0);
620	#endif
621		700
622	void	701	void
623	load_image_inline (SV *image_)	702	load_image_inline (SV *image_)
624	ALIAS:	703	ALIAS:
625	load_image_file = 1	704	load_image_file = 1
…		…
667		746
668	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	747	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669		748
670	assert (surface2->pitch == surface2->w * 4);	749	assert (surface2->pitch == surface2->w * 4);
671		750
		751	SDL_LockSurface (surface2);
672	EXTEND (SP, 5);	752	EXTEND (SP, 6);
673	PUSHs (sv_2mortal (newSViv (surface2->w)));	753	PUSHs (sv_2mortal (newSViv (surface2->w)));
674	PUSHs (sv_2mortal (newSViv (surface2->h)));	754	PUSHs (sv_2mortal (newSViv (surface2->h)));
675	SDL_LockSurface (surface2);
676	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	755	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
677	SDL_UnlockSurface (surface2);
678	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)));
679	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	757	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	758	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		759	SDL_UnlockSurface (surface2);
681		760
682	SDL_FreeSurface (surface);	761	SDL_FreeSurface (surface);
683	SDL_FreeSurface (surface2);	762	SDL_FreeSurface (surface2);
684	}	763	}
685		764
…		…
724	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	803	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
725	#endif	804	#endif
726	_exit (1);	805	_exit (1);
727		806
728	void	807	void
729	_exit (int retval)	808	_exit (int retval = 0)
730	CODE:	809	CODE:
		810	#ifdef WIN32
		811	ExitThread (retval); // unclean, please beam me up
		812	#else
731	_exit (retval);	813	_exit (retval);
		814	#endif
732		815
733	MODULE = CFClient PACKAGE = CFClient::Font	816	MODULE = CFPlus PACKAGE = CFPlus::Font
734		817
735	CFClient::Font	818	CFPlus::Font
736	new_from_file (SV *class, char *path, int id = 0)	819	new_from_file (SV *class, char *path, int id = 0)
737	CODE:	820	CODE:
738	{	821	{
739	int count;	822	int count;
740	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	823	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
743	}	826	}
744	OUTPUT:	827	OUTPUT:
745	RETVAL	828	RETVAL
746		829
747	void	830	void
748	DESTROY (CFClient::Font self)	831	DESTROY (CFPlus::Font self)
749	CODE:	832	CODE:
750	pango_font_description_free (self);	833	pango_font_description_free (self);
751		834
752	void	835	void
753	make_default (CFClient::Font self)	836	make_default (CFPlus::Font self)
754	CODE:	837	CODE:
755	default_font = self;	838	default_font = self;
756		839
757	MODULE = CFClient PACKAGE = CFClient::Layout	840	MODULE = CFPlus PACKAGE = CFPlus::Layout
758		841
759	CFClient::Layout	842	void
760	new (SV *class, int rgba = 0)	843	reset_glyph_cache ()
		844	CODE:
		845	tc_clear ();
		846
		847	CFPlus::Layout
		848	new (SV *class)
761	CODE:	849	CODE:
762	New (0, RETVAL, 1, struct cf_layout);	850	New (0, RETVAL, 1, struct cf_layout);
763		851
764	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	852	RETVAL->pl = pango_layout_new (opengl_context);
765	RETVAL->rgba = rgba;
766	RETVAL->r = 1.;	853	RETVAL->r = 1.;
767	RETVAL->g = 1.;	854	RETVAL->g = 1.;
768	RETVAL->b = 1.;	855	RETVAL->b = 1.;
769	RETVAL->a = 1.;	856	RETVAL->a = 1.;
770	RETVAL->base_height = MIN_FONT_HEIGHT;	857	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
774	layout_update_font (RETVAL);	861	layout_update_font (RETVAL);
775	OUTPUT:	862	OUTPUT:
776	RETVAL	863	RETVAL
777		864
778	void	865	void
779	DESTROY (CFClient::Layout self)	866	DESTROY (CFPlus::Layout self)
780	CODE:	867	CODE:
781	g_object_unref (self->pl);	868	g_object_unref (self->pl);
782	Safefree (self);	869	Safefree (self);
783		870
784	int
785	is_rgba (CFClient::Layout self)
786	CODE:
787	RETVAL = self->rgba;
788	OUTPUT:
789	RETVAL
790
791	void	871	void
792	set_text (CFClient::Layout self, SV *text_)	872	set_text (CFPlus::Layout self, SV *text_)
793	CODE:	873	CODE:
794	{	874	{
795	STRLEN textlen;	875	STRLEN textlen;
796	char *text = SvPVutf8 (text_, textlen);	876	char *text = SvPVutf8 (text_, textlen);
797		877
798	pango_layout_set_text (self->pl, text, textlen);	878	pango_layout_set_text (self->pl, text, textlen);
799	}	879	}
800		880
801	void	881	void
802	set_markup (CFClient::Layout self, SV *text_)	882	set_markup (CFPlus::Layout self, SV *text_)
803	CODE:	883	CODE:
804	{	884	{
805	STRLEN textlen;	885	STRLEN textlen;
806	char *text = SvPVutf8 (text_, textlen);	886	char *text = SvPVutf8 (text_, textlen);
807		887
808	pango_layout_set_markup (self->pl, text, textlen);	888	pango_layout_set_markup (self->pl, text, textlen);
809	}	889	}
810		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
811	SV *	976	SV *
812	get_text (CFClient::Layout self)	977	get_text (CFPlus::Layout self)
813	CODE:	978	CODE:
814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	979	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
815	sv_utf8_decode (RETVAL);	980	sv_utf8_decode (RETVAL);
816	OUTPUT:	981	OUTPUT:
817	RETVAL	982	RETVAL
818		983
819	void	984	void
820	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.)
821	CODE:	986	CODE:
822	self->r = r;	987	self->r = r;
823	self->g = g;	988	self->g = g;
824	self->b = b;	989	self->b = b;
825	self->a = a;	990	self->a = a;
826		991
827	void	992	void
828	set_font (CFClient::Layout self, CFClient::Font font = 0)	993	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
829	CODE:	994	CODE:
830	if (self->font != font)	995	if (self->font != font)
831	{	996	{
832	self->font = font;	997	self->font = font;
833	layout_update_font (self);	998	layout_update_font (self);
834	}	999	}
835		1000
836	void	1001	void
837	set_height (CFClient::Layout self, int base_height)	1002	set_height (CFPlus::Layout self, int base_height)
838	CODE:	1003	CODE:
839	if (self->base_height != base_height)	1004	if (self->base_height != base_height)
840	{	1005	{
841	self->base_height = base_height;	1006	self->base_height = base_height;
842	layout_update_font (self);	1007	layout_update_font (self);
843	}	1008	}
844		1009
845	void	1010	void
846	set_width (CFClient::Layout self, int max_width = -1)	1011	set_width (CFPlus::Layout self, int max_width = -1)
847	CODE:	1012	CODE:
848	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);
849		1014
850	void	1015	void
851	set_indent (CFClient::Layout self, int indent)	1016	set_indent (CFPlus::Layout self, int indent)
852	CODE:	1017	CODE:
853	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1018	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854		1019
855	void	1020	void
856	set_spacing (CFClient::Layout self, int spacing)	1021	set_spacing (CFPlus::Layout self, int spacing)
857	CODE:	1022	CODE:
858	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1023	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859		1024
860	void	1025	void
861	set_ellipsise (CFClient::Layout self, int ellipsise)	1026	set_ellipsise (CFPlus::Layout self, int ellipsise)
862	CODE:	1027	CODE:
863	pango_layout_set_ellipsize (self->pl,	1028	pango_layout_set_ellipsize (self->pl,
864	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1029	ellipsise == 1 ? PANGO_ELLIPSIZE_START
865	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1030	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1031	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
867	: PANGO_ELLIPSIZE_NONE	1032	: PANGO_ELLIPSIZE_NONE
868	);	1033	);
869		1034
870	void	1035	void
871	set_single_paragraph_mode (CFClient::Layout self, int spm)	1036	set_single_paragraph_mode (CFPlus::Layout self, int spm)
872	CODE:	1037	CODE:
873	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1038	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874		1039
875	void	1040	void
876	size (CFClient::Layout self)	1041	size (CFPlus::Layout self)
877	PPCODE:	1042	PPCODE:
878	{	1043	{
879	int w, h;	1044	int w, h;
880		1045
881	layout_get_pixel_size (self, &w, &h);	1046	layout_get_pixel_size (self, &w, &h);
…		…
884	PUSHs (sv_2mortal (newSViv (w)));	1049	PUSHs (sv_2mortal (newSViv (w)));
885	PUSHs (sv_2mortal (newSViv (h)));	1050	PUSHs (sv_2mortal (newSViv (h)));
886	}	1051	}
887		1052
888	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
889	xy_to_index (CFClient::Layout self, int x, int y)	1066	xy_to_index (CFPlus::Layout self, int x, int y)
890	CODE:	1067	CODE:
891	{	1068	{
892	int index, trailing;	1069	int index, trailing;
893	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);
894	RETVAL = index;	1071	RETVAL = index + trailing;
895	}	1072	}
896	OUTPUT:	1073	OUTPUT:
897	RETVAL	1074	RETVAL
898		1075
899	void	1076	void
900	cursor_pos (CFClient::Layout self, int index)	1077	cursor_pos (CFPlus::Layout self, int index)
901	PPCODE:	1078	PPCODE:
902	{	1079	{
903	PangoRectangle strong_pos;	1080	PangoRectangle strong_pos;
904	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1081	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
905		1082
…		…
908	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1085	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1086	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910	}	1087	}
911		1088
912	void	1089	void
913	render (CFClient::Layout self)	1090	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
914	PPCODE:	1091	PPCODE:
915	{	1092	{
916	SV *retval;	1093	int line, x;
917	int w, h;
918		1094
919	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 */
920		1097
921	if (self->rgba)
922	{
923	cairo_surface_t *surface;
924	cairo_t *cairo;
925
926	retval = newSV (w * h * 4);
927	SvPOK_only (retval);
928	SvCUR_set (retval, w * h * 4);
929
930	memset (SvPVX (retval), 0, w * h * 4);
931
932	surface = cairo_image_surface_create_for_data (
933	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
934	cairo = cairo_create (surface);
935	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
936
937	pango_cairo_show_layout (cairo, self->pl);
938
939	cairo_destroy (cairo);
940	cairo_surface_destroy (surface);
941
942	// what a mess, and its premultiplied, too :(
943	{
944	uint32_t *p = (uint32_t *)SvPVX (retval);
945	uint32_t *e = p + w * h;
946
947	while (p < e)
948	{
949	uint32_t rgba = *p;
950	rgba = (rgba >> 24) | (rgba << 8);
951	#if 0
952	#ifdef _WIN32
953	{//D
954	uint8_t r = rgba >> 24;
955	uint8_t g = rgba >> 16;
956	uint8_t b = rgba >> 8;
957	uint8_t a = rgba >> 0;
958
959	rgba = (rgba & 0xffffff00) | a;
960	}
961	#endif
962	#endif
963	rgba = SDL_SwapBE32 (rgba);
964	*p++ = rgba;
965	}
966	}
967
968	EXTEND (SP, 5);	1098	EXTEND (SP, 2);
969	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)
970	PUSHs (sv_2mortal (newSViv (h)));	1120	PUSHs (sv_2mortal (newSViv (index + trailing)));
971	PUSHs (sv_2mortal (retval));
972	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
973	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974	}
975	else	1121	else
976	{	1122	{
977	FT_Bitmap bitmap;
978
979	retval = newSV (w * h);
980	SvPOK_only (retval);
981	SvCUR_set (retval, w * h);
982
983	bitmap.rows = h;
984	bitmap.width = w;
985	bitmap.pitch = w;
986	bitmap.buffer = (unsigned char*)SvPVX (retval);
987	bitmap.num_grays = 256;
988	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
989
990	memset (bitmap.buffer, 0, w * h);
991
992	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
993
994	EXTEND (SP, 5);
995	PUSHs (sv_2mortal (newSViv (w)));	1123	PUSHs (sv_2mortal (newSViv (index)));
996	PUSHs (sv_2mortal (newSViv (h)));	1124	PUSHs (sv_2mortal (newSViv (trailing)));
997	PUSHs (sv_2mortal (retval));
998	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
999	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1000	}	1125	}
1001	}	1126	}
1002		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
1003	MODULE = CFClient PACKAGE = CFClient::Texture	1138	MODULE = CFPlus PACKAGE = CFPlus::Texture
1004		1139
1005	void	1140	void
1006	pad2pot (SV *data_, SV *w_, SV *h_)	1141	pad2pot (SV *data_, SV *w_, SV *h_)
1007	CODE:	1142	CODE:
1008	{	1143	{
…		…
1038	}	1173	}
1039	}	1174	}
1040	}	1175	}
1041		1176
1042	void	1177	void
1043	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.)
1044	PROTOTYPE: $$$;$$	1179	PROTOTYPE: $$$;$$
1045	ALIAS:	1180	ALIAS:
1046	draw_quad_alpha = 1	1181	draw_quad_alpha = 1
1047	draw_quad_alpha_premultiplied = 2	1182	draw_quad_alpha_premultiplied = 2
1048	CODE:	1183	CODE:
…		…
1086	glDisable (GL_ALPHA_TEST);	1221	glDisable (GL_ALPHA_TEST);
1087	glDisable (GL_BLEND);	1222	glDisable (GL_BLEND);
1088	}	1223	}
1089	}	1224	}
1090		1225
1091	MODULE = CFClient PACKAGE = CFClient::Map	1226	MODULE = CFPlus PACKAGE = CFPlus::Map
1092		1227
1093	CFClient::Map	1228	CFPlus::Map
1094	new (SV *class, int map_width, int map_height)	1229	new (SV *class)
1095	CODE:	1230	CODE:
1096	New (0, RETVAL, 1, struct map);	1231	New (0, RETVAL, 1, struct map);
1097	RETVAL->x = 0;	1232	RETVAL->x = 0;
1098	RETVAL->y = 0;	1233	RETVAL->y = 0;
1099	RETVAL->w = map_width;	1234	RETVAL->w = 0;
1100	RETVAL->h = map_height;	1235	RETVAL->h = 0;
1101	RETVAL->ox = 0;	1236	RETVAL->ox = 0;
1102	RETVAL->oy = 0;	1237	RETVAL->oy = 0;
1103	RETVAL->faces = 8192;	1238	RETVAL->faces = 8192;
1104	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1239	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1105	RETVAL->texs = 8192;	1240	RETVAL->texs = 8192;
…		…
1108	RETVAL->row = 0;	1243	RETVAL->row = 0;
1109	OUTPUT:	1244	OUTPUT:
1110	RETVAL	1245	RETVAL
1111		1246
1112	void	1247	void
1113	DESTROY (CFClient::Map self)	1248	DESTROY (CFPlus::Map self)
1114	CODE:	1249	CODE:
1115	{	1250	{
1116	map_clear (self);	1251	map_clear (self);
1117	Safefree (self->face);	1252	Safefree (self->face);
1118	Safefree (self->tex);	1253	Safefree (self->tex);
1119	Safefree (self);	1254	Safefree (self);
1120	}	1255	}
1121		1256
1122	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
1123	clear (CFClient::Map self)	1264	clear (CFPlus::Map self)
1124	CODE:	1265	CODE:
1125	map_clear (self);	1266	map_clear (self);
1126		1267
1127	void	1268	void
1128	set_face (CFClient::Map self, int face, int texid)	1269	set_face (CFPlus::Map self, int face, int texid)
1129	CODE:	1270	CODE:
1130	{	1271	{
1131	while (self->faces <= face)	1272	while (self->faces <= face)
1132	{	1273	{
1133	Append (mapface, self->face, self->faces, self->faces);	1274	Append (mapface, self->face, self->faces, self->faces);
…		…
1136		1277
1137	self->face [face] = texid;	1278	self->face [face] = texid;
1138	}	1279	}
1139		1280
1140	void	1281	void
1141	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)
1142	CODE:	1283	CODE:
1143	{	1284	{
1144	while (self->texs <= texid)	1285	while (self->texs <= texid)
1145	{	1286	{
1146	Append (maptex, self->tex, self->texs, self->texs);	1287	Append (maptex, self->tex, self->texs, self->texs);
…		…
1170	// from transparent color bleeding and ugly wrapping effects.	1311	// from transparent color bleeding and ugly wrapping effects.
1171	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1312	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1172	}	1313	}
1173		1314
1174	int	1315	int
1175	ox (CFClient::Map self)	1316	ox (CFPlus::Map self)
1176	ALIAS:	1317	ALIAS:
1177	oy = 1	1318	oy = 1
1178	x = 2	1319	x = 2
1179	y = 3	1320	y = 3
1180	w = 4	1321	w = 4
…		…
1191	}	1332	}
1192	OUTPUT:	1333	OUTPUT:
1193	RETVAL	1334	RETVAL
1194		1335
1195	void	1336	void
1196	scroll (CFClient::Map self, int dx, int dy)	1337	scroll (CFPlus::Map self, int dx, int dy)
1197	CODE:	1338	CODE:
1198	{	1339	{
1199	if (dx > 0)	1340	if (dx > 0)
1200	map_blank (self, self->x, self->y, dx - 1, self->h);	1341	map_blank (self, self->x, self->y, dx, self->h);
1201	else if (dx < 0)	1342	else if (dx < 0)
1202	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);
1203		1344
1204	if (dy > 0)	1345	if (dy > 0)
1205	map_blank (self, self->x, self->y, self->w, dy - 1);	1346	map_blank (self, self->x, self->y, self->w, dy);
1206	else if (dy < 0)	1347	else if (dy < 0)
1207	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);
1208		1349
1209	self->ox += dx; self->x += dx;	1350	self->ox += dx; self->x += dx;
1210	self->oy += dy; self->y += dy;	1351	self->oy += dy; self->y += dy;
1211		1352
1212	while (self->y < 0)	1353	while (self->y < 0)
…		…
1217	self->y += MAP_EXTEND_Y;	1358	self->y += MAP_EXTEND_Y;
1218	}	1359	}
1219	}	1360	}
1220		1361
1221	void	1362	void
1222	map1a_update (CFClient::Map self, SV *data_)	1363	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1223	CODE:	1364	CODE:
1224	{	1365	{
1225	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1366	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1226	uint8_t *data_end = (uint8_t *)SvEND (data_);	1367	uint8_t *data_end = (uint8_t *)SvEND (data_);
1227	mapcell *cell;	1368	mapcell *cell;
1228	int x, y, flags;	1369	int x, y, flags;
1229		1370
1230	while (data < data_end)	1371	while (data < data_end - 1)
1231	{	1372	{
1232	flags = (data [0] << 8) + data [1]; data += 2;	1373	flags = (data [0] << 8) + data [1]; data += 2;
1233		1374
1234	x = ((flags >> 10) & 63) + self->x;	1375	x = self->x + ((flags >> 10) & 63);
1235	y = ((flags >> 4) & 63) + self->y;	1376	y = self->y + ((flags >> 4) & 63);
1236		1377
1237	cell = map_get_cell (self, x, y);	1378	cell = map_get_cell (self, x, y);
1238		1379
1239	if (flags & 15)	1380	if (flags & 15)
1240	{	1381	{
1241	if (cell->darkness < 0)	1382	if (!cell->darkness)
1242	{	1383	{
		1384	memset (cell, 0, sizeof (*cell));
1243	cell->darkness = 0;	1385	cell->darkness = 256;
1244	cell->face [0] = 0;
1245	cell->face [1] = 0;
1246	cell->face [2] = 0;
1247	}	1386	}
1248		1387
1249	cell->darkness = flags & 8 ? *data++ : 255;
1250
1251	//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	}
1252		1429
1253	if (flags & 4)	1430	if (flags & 4)
1254	{	1431	{
1255	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;
1256	}	1433	}
…		…
1264	{	1441	{
1265	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;
1266	}	1443	}
1267	}	1444	}
1268	else	1445	else
1269	cell->darkness = -1;	1446	cell->darkness = 0;
1270	}	1447	}
1271	}	1448	}
1272		1449
1273	SV *	1450	SV *
1274	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)
1275	CODE:	1452	CODE:
1276	{	1453	{
1277	int x1, x;	1454	int x1, x;
1278	int y1, y;	1455	int y1, y;
1279	int z;	1456	int z;
…		…
1329	}	1506	}
1330	OUTPUT:	1507	OUTPUT:
1331	RETVAL	1508	RETVAL
1332		1509
1333	void	1510	void
1334	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)
1335	PPCODE:	1512	CODE:
1336	{	1513	{
1337	int vx, vy;
1338	int x, y, z;	1514	int x, y, z;
1339	int last_name;	1515	int last_name;
1340	mapface face;	1516	mapface face;
1341	int sw4 = (sw + 3) & ~3;
1342	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1343	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1344
1345	memset (darkness, 255, sw4 * sh);
1346	SvPOK_only (darkness_sv);
1347	SvCUR_set (darkness_sv, sw4 * sh);
1348
1349	vx = self->x + (self->w - sw) / 2 - shift_x;
1350	vy = self->y + (self->h - sh) / 2 - shift_y;
1351
1352	/*
1353	int vx = self->vx = self->w >= sw
1354	? self->x + (self->w - sw) / 2
1355	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1356
1357	int vy = self->vy = self->h >= sh
1358	? self->y + (self->h - sh) / 2
1359	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360	*/
1361		1517
1362	glColor4ub (255, 255, 255, 255);	1518	glColor4ub (255, 255, 255, 255);
1363		1519
		1520	glEnable (GL_BLEND);
1364	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1521	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365	glEnable (GL_BLEND);
1366	glEnable (GL_TEXTURE_2D);	1522	glEnable (GL_TEXTURE_2D);
1367	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1523	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368		1524
1369	glBegin (GL_QUADS);	1525	glBegin (GL_QUADS);
1370		1526
1371	last_name = 0;	1527	last_name = 0;
1372		1528
		1529	mx += self->x;
		1530	my += self->y;
		1531
1373	for (z = 0; z < 3; z++)	1532	for (z = 0; z < 3; z++)
1374	for (y = 0; y < sh; y++)	1533	for (y = 0; y < sh; y++)
1375	if (0 <= y + vy && y + vy < self->rows)	1534	if (0 <= y + my && y + my < self->rows)
1376	{	1535	{
1377	maprow *row = self->row + (y + vy);	1536	maprow *row = self->row + (y + my);
1378		1537
1379	for (x = 0; x < sw; x++)	1538	for (x = 0; x < sw; x++)
1380	if (row->c0 <= x + vx && x + vx < row->c1)	1539	if (row->c0 <= x + mx && x + mx < row->c1)
1381	{	1540	{
1382	mapcell *cell = row->col + (x + vx - row->c0);	1541	mapcell *cell = row->col + (x + mx - row->c0);
1383
1384	darkness[y * sw4 + x] = cell->darkness < 0
1385	? 255 - FOW_DARKNESS
1386	: 255 - cell->darkness;
1387		1542
1388	face = cell->face [z];	1543	face = cell->face [z];
1389		1544
1390	if (face)	1545	if (face && face < self->texs)
1391	{	1546	{
1392	maptex tex = self->tex [face];	1547	maptex tex = self->tex [face];
1393
1394	int px = (x + 1) * 32 - tex.w;	1548	int px = (x + 1) * 32 - tex.w;
1395	int py = (y + 1) * 32 - tex.h;	1549	int py = (y + 1) * 32 - tex.h;
1396		1550
1397	if (last_name != tex.name)	1551	if (last_name != tex.name)
1398	{	1552	{
1399	glEnd ();	1553	glEnd ();
1400	last_name = tex.name;
1401	glBindTexture (GL_TEXTURE_2D, last_name);	1554	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1402	glBegin (GL_QUADS);	1555	glBegin (GL_QUADS);
1403	}	1556	}
1404		1557
1405	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1558	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1406	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1559	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1407	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);
1408	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1561	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1409	}	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	}
1410	}	1582	}
1411	}	1583	}
1412		1584
1413	glEnd ();	1585	glEnd ();
1414		1586
1415	glDisable (GL_TEXTURE_2D);	1587	glDisable (GL_TEXTURE_2D);
1416	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	}
1417		1713
1418	EXTEND (SP, 3);	1714	EXTEND (SP, 3);
1419	PUSHs (sv_2mortal (newSViv (sw4)));	1715	PUSHs (sv_2mortal (newSViv (sw4)));
1420	PUSHs (sv_2mortal (newSViv (sh)));	1716	PUSHs (sv_2mortal (newSViv (sh)));
1421	PUSHs (darkness_sv);	1717	PUSHs (darkness_sv);
1422	}	1718	}
1423		1719
1424	SV *	1720	SV *
1425	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)
1426	CODE:	1722	CODE:
1427	{	1723	{
1428	int x, y, x1, y1;	1724	int x, y, x1, y1;
1429	SV *data_sv = newSV (w * h * 7 + 5);	1725	SV *data_sv = newSV (w * h * 7 + 5);
1430	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1726	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1492	}	1788	}
1493	OUTPUT:	1789	OUTPUT:
1494	RETVAL	1790	RETVAL
1495		1791
1496	void	1792	void
1497	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)
1498	PPCODE:	1794	PPCODE:
1499	{	1795	{
1500	int x, y, z;	1796	int x, y, z;
1501	int w, h;	1797	int w, h;
1502	int x1, y1;	1798	int x1, y1;
…		…
1534		1830
1535	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1831	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1536	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1832	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1537	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1833	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1538		1834
1539	if (cell->darkness <= 0)	1835	if (cell->darkness == 0)
1540	{	1836	{
1541	cell->darkness = -1;	1837	cell->darkness = 0;
1542		1838
1543	for (z = 0; z <= 2; z++)	1839	for (z = 0; z <= 2; z++)
1544	{	1840	{
1545	cell->face[z] = face[z];	1841	cell->face[z] = face[z];
1546		1842
…		…
1551	}	1847	}
1552	}	1848	}
1553	}	1849	}
1554	}	1850	}
1555		1851
1556	MODULE = CFClient PACKAGE = CFClient::MixChunk	1852	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1557		1853
1558	CFClient::MixChunk	1854	CFPlus::MixChunk
1559	new_from_file (SV *class, char *path)	1855	new_from_file (SV *class, char *path)
1560	CODE:	1856	CODE:
1561	RETVAL = Mix_LoadWAV (path);	1857	RETVAL = Mix_LoadWAV (path);
1562	OUTPUT:	1858	OUTPUT:
1563	RETVAL	1859	RETVAL
1564		1860
1565	void	1861	void
1566	DESTROY (CFClient::MixChunk self)	1862	DESTROY (CFPlus::MixChunk self)
1567	CODE:	1863	CODE:
1568	Mix_FreeChunk (self);	1864	Mix_FreeChunk (self);
1569		1865
1570	int	1866	int
1571	volume (CFClient::MixChunk self, int volume = -1)	1867	volume (CFPlus::MixChunk self, int volume = -1)
1572	CODE:	1868	CODE:
1573	RETVAL = Mix_VolumeChunk (self, volume);	1869	RETVAL = Mix_VolumeChunk (self, volume);
1574	OUTPUT:	1870	OUTPUT:
1575	RETVAL	1871	RETVAL
1576		1872
1577	int	1873	int
1578	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)
1579	CODE:	1875	CODE:
1580	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1876	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1581	OUTPUT:	1877	OUTPUT:
1582	RETVAL	1878	RETVAL
1583		1879
1584	MODULE = CFClient PACKAGE = CFClient::MixMusic	1880	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1585		1881
1586	int	1882	int
1587	volume (int volume = -1)	1883	volume (int volume = -1)
1588	CODE:	1884	CODE:
1589	RETVAL = Mix_VolumeMusic (volume);	1885	RETVAL = Mix_VolumeMusic (volume);
1590	OUTPUT:	1886	OUTPUT:
1591	RETVAL	1887	RETVAL
1592		1888
1593	CFClient::MixMusic	1889	CFPlus::MixMusic
1594	new_from_file (SV *class, char *path)	1890	new_from_file (SV *class, char *path)
1595	CODE:	1891	CODE:
1596	RETVAL = Mix_LoadMUS (path);	1892	RETVAL = Mix_LoadMUS (path);
1597	OUTPUT:	1893	OUTPUT:
1598	RETVAL	1894	RETVAL
1599		1895
1600	void	1896	void
1601	DESTROY (CFClient::MixMusic self)	1897	DESTROY (CFPlus::MixMusic self)
1602	CODE:	1898	CODE:
1603	Mix_FreeMusic (self);	1899	Mix_FreeMusic (self);
1604		1900
1605	int	1901	int
1606	play (CFClient::MixMusic self, int loops = -1)	1902	play (CFPlus::MixMusic self, int loops = -1)
1607	CODE:	1903	CODE:
1608	RETVAL = Mix_PlayMusic (self, loops);	1904	RETVAL = Mix_PlayMusic (self, loops);
1609	OUTPUT:	1905	OUTPUT:
1610	RETVAL	1906	RETVAL
1611		1907
1612	MODULE = CFClient PACKAGE = CFClient::OpenGL	1908	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1613		1909
1614	BOOT:	1910	BOOT:
1615	{	1911	{
1616	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1912	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1617	static const struct {	1913	static const struct {
1618	const char *name;	1914	const char *name;
1619	IV iv;	1915	IV iv;
1620	} *civ, const_iv[] = {	1916	} *civ, const_iv[] = {
1621	# define const_iv(name) { # name, (IV)name }	1917	# define const_iv(name) { # name, (IV)name }
…		…
1628	const_iv (GL_SCISSOR_TEST),	1924	const_iv (GL_SCISSOR_TEST),
1629	const_iv (GL_DEPTH_TEST),	1925	const_iv (GL_DEPTH_TEST),
1630	const_iv (GL_ALPHA_TEST),	1926	const_iv (GL_ALPHA_TEST),
1631	const_iv (GL_NORMALIZE),	1927	const_iv (GL_NORMALIZE),
1632	const_iv (GL_RESCALE_NORMAL),	1928	const_iv (GL_RESCALE_NORMAL),
		1929	const_iv (GL_FRONT),
		1930	const_iv (GL_BACK),
1633	const_iv (GL_AND),	1931	const_iv (GL_AND),
1634	const_iv (GL_ONE),	1932	const_iv (GL_ONE),
1635	const_iv (GL_ZERO),	1933	const_iv (GL_ZERO),
1636	const_iv (GL_SRC_ALPHA),	1934	const_iv (GL_SRC_ALPHA),
1637	const_iv (GL_DST_ALPHA),	1935	const_iv (GL_DST_ALPHA),
1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1936	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1639	const_iv (GL_ONE_MINUS_DST_ALPHA),	1937	const_iv (GL_ONE_MINUS_DST_ALPHA),
1640	const_iv (GL_SRC_ALPHA_SATURATE),	1938	const_iv (GL_SRC_ALPHA_SATURATE),
1641	const_iv (GL_RGB),	1939	const_iv (GL_RGB),
1642	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),
1643	const_iv (GL_UNSIGNED_BYTE),	1944	const_iv (GL_UNSIGNED_BYTE),
1644	const_iv (GL_UNSIGNED_SHORT),	1945	const_iv (GL_UNSIGNED_SHORT),
1645	const_iv (GL_UNSIGNED_INT),	1946	const_iv (GL_UNSIGNED_INT),
1646	const_iv (GL_ALPHA),	1947	const_iv (GL_ALPHA),
1647	const_iv (GL_INTENSITY),	1948	const_iv (GL_INTENSITY),
…		…
1679	const_iv (GL_SEPARABLE_2D),	1980	const_iv (GL_SEPARABLE_2D),
1680	const_iv (GL_CONVOLUTION_2D),	1981	const_iv (GL_CONVOLUTION_2D),
1681	const_iv (GL_CONVOLUTION_BORDER_MODE),	1982	const_iv (GL_CONVOLUTION_BORDER_MODE),
1682	const_iv (GL_CONSTANT_BORDER),	1983	const_iv (GL_CONSTANT_BORDER),
1683	const_iv (GL_LINES),	1984	const_iv (GL_LINES),
		1985	const_iv (GL_LINE_STRIP),
1684	const_iv (GL_LINE_LOOP),	1986	const_iv (GL_LINE_LOOP),
1685	const_iv (GL_QUADS),	1987	const_iv (GL_QUADS),
1686	const_iv (GL_QUAD_STRIP),	1988	const_iv (GL_QUAD_STRIP),
1687	const_iv (GL_TRIANGLES),	1989	const_iv (GL_TRIANGLES),
1688	const_iv (GL_TRIANGLE_STRIP),	1990	const_iv (GL_TRIANGLE_STRIP),
…		…
1721	OUTPUT:	2023	OUTPUT:
1722	RETVAL	2024	RETVAL
1723		2025
1724	int glGetError ()	2026	int glGetError ()
1725		2027
		2028	void glFinish ()
		2029
1726	void glClear (int mask)	2030	void glClear (int mask)
1727		2031
1728	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)
1729	PROTOTYPE: @	2033	PROTOTYPE: @
1730		2034
…		…
1753	void glPushMatrix ()	2057	void glPushMatrix ()
1754		2058
1755	void glPopMatrix ()	2059	void glPopMatrix ()
1756		2060
1757	void glLoadIdentity ()	2061	void glLoadIdentity ()
		2062
		2063	void glDrawBuffer (int buffer)
		2064
		2065	void glReadBuffer (int buffer)
1758		2066
1759	# near_ and far_ are due to microsofts buggy "c" compiler	2067	# near_ and far_ are due to microsofts buggy "c" compiler
1760	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_)
1761		2069
1762	# near_ and far_ are due to microsofts buggy "c" compiler	2070	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1792	r *= a;	2100	r *= a;
1793	g *= a;	2101	g *= a;
1794	b *= a;	2102	b *= a;
1795	}	2103	}
1796	// microsoft visual "c" rounds instead of truncating...	2104	// microsoft visual "c" rounds instead of truncating...
1797	glColor4ub (MIN ((int)(r * 256.f), 255),	2105	glColor4f (r, g, b, a);
1798	MIN ((int)(g * 256.f), 255),
1799	MIN ((int)(b * 256.f), 255),
1800	MIN ((int)(a * 256.f), 255));
1801		2106
1802	void glInterleavedArrays (int format, int stride, char *data)	2107	void glInterleavedArrays (int format, int stride, char *data)
1803		2108
1804	void glDrawElements (int mode, int count, int type, char *indices)	2109	void glDrawElements (int mode, int count, int type, char *indices)
1805		2110
…		…
1882		2187
1883	void glEndList ()	2188	void glEndList ()
1884		2189
1885	void glCallList (int list)	2190	void glCallList (int list)
1886		2191
1887

Diff Legend

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