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.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.152 by root, Sat Aug 19 18:18:36 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>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
15		21
16	#include <SDL.h>	22	#include <SDL.h>
17	#include <SDL_endian.h>	23	#include <SDL_endian.h>
18	#include <SDL_image.h>	24	#include <SDL_image.h>
19	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
21		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
22	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
23		32
24	#include <pango/pango.h>	33	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		34
29	#ifndef _WIN32	35	#ifndef _WIN32
30	# include <sys/types.h>	36	# include <sys/types.h>
31	# include <sys/socket.h>	37	# include <sys/socket.h>
32	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
39	typedef signed char int8_t;	45	typedef signed char int8_t;
40	typedef signed short int16_t;	46	typedef signed short int16_t;
41	typedef signed int int32_t;	47	typedef signed int int32_t;
42	#endif	48	#endif
43		49
44	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		51
46	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
47		53
48	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
50		56
51	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
52		58
53	#define GL_CALL(type,func,args) \	59	#if 0
54	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	61	#else
56	static type fptr_; \	62	# define PARACHUTE 0
57	\	63	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		64
		65	static struct
		66	{
		67	#define GL_FUNC(ptr,name) ptr name;
		68	#include "glfunc.h"
		69	#undef GL_FUNC
		70	} gl;
		71
		72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		73	{
		74	if (gl.BlendFuncSeparate)
		75	gl.BlendFuncSeparate (sa, da, saa, daa);
		76	else if (gl.BlendFuncSeparateEXT)
		77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		78	else
		79	glBlendFunc (sa, da);
		80	}
		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
68	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
70		90
71	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
72		110
73	typedef struct cf_layout {	111	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
77	int base_height;	114	int base_height;
78	CFClient__Font font;	115	CFPlus__Font font;
79	} *CFClient__Layout;	116	} *CFPlus__Layout;
80		117
81	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
82	static PangoContext *ft2_context, *cairo_context;	119	static PangoContext *opengl_context;
83	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
84		121
85	static void	122	static void
86	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
87	{	124	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	126	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	128	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	130	}
95		131
96	static void	132	static void
97	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
98	{	134	{
99	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
100	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
101	*/	137	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		142
107	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
108	}	144	}
109		145
110	static void	146	static void
111	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	147	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
114		153
115	if (!*w) *w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!*h) *h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		156
118	*w = (*w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
119	}	162	}
120		163
121	typedef uint16_t mapface;	164	typedef uint16_t mapface;
122		165
123	typedef struct {	166	typedef struct {
…		…
126	float s, t;	169	float s, t;
127	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
128	} maptex;	171	} maptex;
129		172
130	typedef struct {	173	typedef struct {
131	int16_t darkness;	174	uint16_t darkness;
132	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_width, stat_hp;
133	} mapcell;	177	} mapcell;
134		178
135	typedef struct {	179	typedef struct {
136	int32_t c0, c1;	180	int32_t c0, c1;
137	mapcell *col;	181	mapcell *col;
…		…
146	int texs;	190	int texs;
147	maptex *tex;	191	maptex *tex;
148		192
149	int32_t rows;	193	int32_t rows;
150	maprow *row;	194	maprow *row;
151	} *CFClient__Map;	195	} *CFPlus__Map;
152		196
153	static char *	197	static char *
154	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
155	{	199	{
156	char *p;	200	char *p;
…		…
174		218
175	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	219	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		221
178	static maprow *	222	static maprow *
179	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
180	{	224	{
181	if (0 > y)	225	if (0 > y)
182	{	226	{
183	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
222		266
223	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
224	}	268	}
225		269
226	static mapcell *	270	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
228	{	272	{
229	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
230	}	274	}
231		275
232	static void	276	static void
233	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
234	{	278	{
235	int r;	279	int r;
236		280
237	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
246	self->row = 0;	290	self->row = 0;
247	self->rows = 0;	291	self->rows = 0;
248	}	292	}
249		293
250	static void	294	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	295	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	296	{
253	int x, y;	297	int x, y;
254	maprow *row;	298	maprow *row;
		299	mapcell *cell;
255		300
256	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
257	if (y >= 0)	302	if (y >= 0)
258	{	303	{
259	if (y >= self->rows)	304	if (y >= self->rows)
…		…
265	if (x >= row->c0)	310	if (x >= row->c0)
266	{	311	{
267	if (x >= row->c1)	312	if (x >= row->c1)
268	break;	313	break;
269		314
270	row->col[x - row->c0].darkness = -1;	315	cell = row->col + x - row->c0;
		316
		317	cell->darkness = 0;
		318	cell->stat_hp = 0;
271	}	319	}
272	}	320	}
273	}	321	}
274		322
275	static void	323	static void
…		…
296	ev.data2 = 0;	344	ev.data2 = 0;
297		345
298	SDL_PushEvent ((SDL_Event *)&ev);	346	SDL_PushEvent ((SDL_Event *)&ev);
299	}	347	}
300		348
		349	static unsigned int
		350	minpot (unsigned int n)
		351	{
		352	if (!n)
		353	return 0;
		354
		355	--n;
		356
		357	n |= n >> 1;
		358	n |= n >> 2;
		359	n |= n >> 4;
		360	n |= n >> 8;
		361	n |= n >> 16;
		362
		363	return n + 1;
		364	}
		365
301	MODULE = CFClient PACKAGE = CFClient	366	MODULE = CFPlus PACKAGE = CFPlus
302		367
303	PROTOTYPES: ENABLE	368	PROTOTYPES: ENABLE
304		369
305	BOOT:	370	BOOT:
306	{	371	{
307	HV *stash = gv_stashpv ("CFClient", 1);	372	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	373	static const struct {
309	const char *name;	374	const char *name;
310	IV iv;	375	IV iv;
311	} *civ, const_iv[] = {	376	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	377	# define const_iv(name) { # name, (IV)name }
…		…
413		478
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	479	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	480	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	481	}
417		482
		483	int
		484	in_destruct ()
		485	CODE:
		486	RETVAL = PL_main_cv == Nullcv;
		487	OUTPUT:
		488	RETVAL
		489
		490	NV floor (NV x)
		491
		492	NV ceil (NV x)
		493
418	void	494	void
419	pango_init ()	495	pango_init ()
420	CODE:	496	CODE:
421	{	497	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	498	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	499	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	500	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	501	}
430		502
431	int	503	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	504	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433		505
434	void	506	void
435	SDL_Quit ()	507	SDL_Quit ()
436		508
437	void	509	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	516	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	517	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	518	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		519
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	520	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	521	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		522
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		527
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	528	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		529	#if SDL_VERSION_ATLEAST(1,2,10)
		530	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		531	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		532	#endif
457		533
458	SDL_EnableUNICODE (1);	534	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	535	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		536
461	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	537	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	555	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	556	CODE:
481	RETVAL = !!SDL_SetVideoMode (	557	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	558	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483	);	559	);
		560	if (RETVAL)
		561	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	562	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		563	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		564	# include "glfunc.h"
		565	# undef GL_FUNC
		566	}
485	OUTPUT:	567	OUTPUT:
486	RETVAL	568	RETVAL
487		569
488	void	570	void
489	SDL_GL_SwapBuffers ()	571	SDL_GL_SwapBuffers ()
		572
		573	char *
		574	SDL_GetKeyName (int sym)
490		575
491	void	576	void
492	SDL_PollEvent ()	577	SDL_PollEvent ()
493	PPCODE:	578	PPCODE:
494	{	579	{
495	SDL_Event ev;	580	SDL_Event ev;
496	int i;
497	static int modifier;
498	static int modkey[] = {
499	SDLK_RSHIFT, KMOD_RSHIFT,
500	SDLK_LSHIFT, KMOD_LSHIFT,
501	SDLK_RCTRL, KMOD_RCTRL,
502	SDLK_LCTRL, KMOD_LCTRL,
503	SDLK_RALT, KMOD_RALT,
504	SDLK_LALT, KMOD_LALT,
505	SDLK_RMETA, KMOD_RMETA,
506	SDLK_LMETA, KMOD_LMETA,
507	};
508		581
509	while (SDL_PollEvent (&ev))	582	while (SDL_PollEvent (&ev))
510	{	583	{
511	HV *hv = newHV ();	584	HV *hv = newHV ();
512	hv_store (hv, "type", 4, newSViv (ev.type), 0);	585	hv_store (hv, "type", 4, newSViv (ev.type), 0);
513		586
514	switch (ev.type)	587	switch (ev.type)
515	{	588	{
516	case SDL_KEYDOWN:	589	case SDL_KEYDOWN:
517	case SDL_KEYUP:	590	case SDL_KEYUP:
518
519	for (i = 0; i < sizeof (modkey) / (sizeof (int) * 2); i++)
520	if (modkey [i * 2] == ev.key.keysym.sym)
521	{
522	if (ev.type == SDL_KEYDOWN)
523	modifier |= modkey [i * 2 + 1];
524	else
525	modifier &= ~modkey [i * 2 + 1];
526	break;
527	}
528
529	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	591	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
530	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	592	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
531	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	593	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
532	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	594	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
533	break;	595	break;
…		…
536	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	598	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
537	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	599	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
538	break;	600	break;
539		601
540	case SDL_MOUSEMOTION:	602	case SDL_MOUSEMOTION:
541	hv_store (hv, "mod", 3, newSViv (modifier), 0);	603	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
542		604
543	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
544	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	606	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
545	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	607	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
546	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	608	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
547	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	609	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
548	break;	610	break;
549		611
550	case SDL_MOUSEBUTTONDOWN:	612	case SDL_MOUSEBUTTONDOWN:
551	case SDL_MOUSEBUTTONUP:	613	case SDL_MOUSEBUTTONUP:
552	hv_store (hv, "mod", 3, newSViv (modifier), 0);	614	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
553		615
554	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	616	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
555	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	617	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
556	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	618	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
557	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	619	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
562	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	624	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
563	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	625	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
564	break;	626	break;
565	}	627	}
566		628
567	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	629	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
568	}	630	}
569	}	631	}
570		632
571	int	633	int
572	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	634	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
585	CODE:	647	CODE:
586	#ifndef _WIN32	648	#ifndef _WIN32
587	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	649	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
588	#endif	650	#endif
589		651
590	char *
591	gl_vendor ()
592	CODE:
593	RETVAL = (char *)glGetString (GL_VENDOR);
594	OUTPUT:
595	RETVAL
596
597	char *
598	gl_version ()
599	CODE:
600	RETVAL = (char *)glGetString (GL_VERSION);
601	OUTPUT:
602	RETVAL
603
604	char *
605	gl_extensions ()
606	CODE:
607	RETVAL = (char *)glGetString (GL_EXTENSIONS);
608	OUTPUT:
609	RETVAL
610
611	void	652	void
612	add_font (char *file)	653	add_font (char *file)
613	CODE:	654	CODE:
614	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	655	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
615	#ifdef _WIN32
616	// cairo... sigh... requires win2000
617	AddFontResourceEx (file, FR_PRIVATE, 0);
618	#endif
619		656
620	void	657	void
621	load_image_inline (SV *image_)	658	load_image_inline (SV *image_)
622	ALIAS:	659	ALIAS:
623	load_image_file = 1	660	load_image_file = 1
…		…
665		702
666	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	703	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
667		704
668	assert (surface2->pitch == surface2->w * 4);	705	assert (surface2->pitch == surface2->w * 4);
669		706
		707	SDL_LockSurface (surface2);
670	EXTEND (SP, 5);	708	EXTEND (SP, 6);
671	PUSHs (sv_2mortal (newSViv (surface2->w)));	709	PUSHs (sv_2mortal (newSViv (surface2->w)));
672	PUSHs (sv_2mortal (newSViv (surface2->h)));	710	PUSHs (sv_2mortal (newSViv (surface2->h)));
673	SDL_LockSurface (surface2);
674	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	711	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
675	SDL_UnlockSurface (surface2);
676	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	712	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
677	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	713	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
678	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	714	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		715	SDL_UnlockSurface (surface2);
679		716
680	SDL_FreeSurface (surface);	717	SDL_FreeSurface (surface);
681	SDL_FreeSurface (surface2);	718	SDL_FreeSurface (surface2);
682	}	719	}
683		720
…		…
719	CODE:	756	CODE:
720	fprintf (stderr, "FATAL: %s\n", message);	757	fprintf (stderr, "FATAL: %s\n", message);
721	#ifdef _WIN32	758	#ifdef _WIN32
722	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	759	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
723	#endif	760	#endif
724	exit (1);	761	_exit (1);
725		762
		763	void
		764	_exit (int retval)
		765	CODE:
		766	_exit (retval);
		767
726	MODULE = CFClient PACKAGE = CFClient::Font	768	MODULE = CFPlus PACKAGE = CFPlus::Font
727		769
728	CFClient::Font	770	CFPlus::Font
729	new_from_file (SV *class, char *path, int id = 0)	771	new_from_file (SV *class, char *path, int id = 0)
730	CODE:	772	CODE:
731	{	773	{
732	int count;	774	int count;
733	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	775	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
736	}	778	}
737	OUTPUT:	779	OUTPUT:
738	RETVAL	780	RETVAL
739		781
740	void	782	void
741	DESTROY (CFClient::Font self)	783	DESTROY (CFPlus::Font self)
742	CODE:	784	CODE:
743	pango_font_description_free (self);	785	pango_font_description_free (self);
744		786
745	void	787	void
746	make_default (CFClient::Font self)	788	make_default (CFPlus::Font self)
747	CODE:	789	CODE:
748	default_font = self;	790	default_font = self;
749		791
750	MODULE = CFClient PACKAGE = CFClient::Layout	792	MODULE = CFPlus PACKAGE = CFPlus::Layout
751		793
752	CFClient::Layout	794	void
753	new (SV *class, int rgba = 0)	795	reset_glyph_cache ()
754	CODE:	796	CODE:
755	#if _WIN32	797	tc_clear ();
756	rgba = 0;//D	798
757	#endif	799	CFPlus::Layout
		800	new (SV *class)
		801	CODE:
758	New (0, RETVAL, 1, struct cf_layout);	802	New (0, RETVAL, 1, struct cf_layout);
759		803
760	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	804	RETVAL->pl = pango_layout_new (opengl_context);
761	RETVAL->rgba = rgba;
762	RETVAL->r = 1.;	805	RETVAL->r = 1.;
763	RETVAL->g = 1.;	806	RETVAL->g = 1.;
764	RETVAL->b = 1.;	807	RETVAL->b = 1.;
765	RETVAL->a = 1.;	808	RETVAL->a = 1.;
766	RETVAL->base_height = MIN_FONT_HEIGHT;	809	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
770	layout_update_font (RETVAL);	813	layout_update_font (RETVAL);
771	OUTPUT:	814	OUTPUT:
772	RETVAL	815	RETVAL
773		816
774	void	817	void
775	DESTROY (CFClient::Layout self)	818	DESTROY (CFPlus::Layout self)
776	CODE:	819	CODE:
777	g_object_unref (self->pl);	820	g_object_unref (self->pl);
778	Safefree (self);	821	Safefree (self);
779		822
780	int
781	is_rgba (CFClient::Layout self)
782	CODE:
783	RETVAL = self->rgba;
784	OUTPUT:
785	RETVAL
786
787	void	823	void
788	set_text (CFClient::Layout self, SV *text_)	824	set_text (CFPlus::Layout self, SV *text_)
789	CODE:	825	CODE:
790	{	826	{
791	STRLEN textlen;	827	STRLEN textlen;
792	char *text = SvPVutf8 (text_, textlen);	828	char *text = SvPVutf8 (text_, textlen);
793		829
794	pango_layout_set_text (self->pl, text, textlen);	830	pango_layout_set_text (self->pl, text, textlen);
795	}	831	}
796		832
797	void	833	void
798	set_markup (CFClient::Layout self, SV *text_)	834	set_markup (CFPlus::Layout self, SV *text_)
799	CODE:	835	CODE:
800	{	836	{
801	STRLEN textlen;	837	STRLEN textlen;
802	char *text = SvPVutf8 (text_, textlen);	838	char *text = SvPVutf8 (text_, textlen);
803		839
804	pango_layout_set_markup (self->pl, text, textlen);	840	pango_layout_set_markup (self->pl, text, textlen);
805	}	841	}
806		842
		843	void
		844	set_shapes (CFPlus::Layout self, ...)
		845	CODE:
		846	{
		847	PangoAttrList *attrs = 0;
		848	const char *text = pango_layout_get_text (self->pl);
		849	const char *pos = text;
		850	int arg = 4;
		851
		852	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		853	{
		854	PangoRectangle inkrect, rect;
		855	PangoAttribute *attr;
		856
		857	int x = SvIV (ST (arg - 3));
		858	int y = SvIV (ST (arg - 2));
		859	int w = SvIV (ST (arg - 1));
		860	int h = SvIV (ST (arg ));
		861
		862	inkrect.x = 0;
		863	inkrect.y = 0;
		864	inkrect.width = 0;
		865	inkrect.height = 0;
		866
		867	rect.x = x * PANGO_SCALE;
		868	rect.y = y * PANGO_SCALE;
		869	rect.width = w * PANGO_SCALE;
		870	rect.height = h * PANGO_SCALE;
		871
		872	if (!attrs)
		873	attrs = pango_layout_get_attributes (self->pl);
		874
		875	attr = pango_attr_shape_new (&inkrect, &rect);
		876	attr->start_index = pos - text;
		877	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		878	pango_attr_list_insert (attrs, attr);
		879
		880	arg += 4;
		881	pos += sizeof (OBJ_STR) - 1;
		882	}
		883
		884	if (attrs)
		885	pango_layout_set_attributes (self->pl, attrs);
		886	}
		887
		888	void
		889	get_shapes (CFPlus::Layout self)
		890	PPCODE:
		891	{
		892	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		893
		894	do
		895	{
		896	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		897
		898	if (run && shape_attr_p (run))
		899	{
		900	PangoRectangle extents;
		901	pango_layout_iter_get_run_extents (iter, 0, &extents);
		902
		903	EXTEND (SP, 2);
		904	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		905	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		906	}
		907	}
		908	while (pango_layout_iter_next_run (iter));
		909
		910	pango_layout_iter_free (iter);
		911	}
		912
		913	int
		914	has_wrapped (CFPlus::Layout self)
		915	CODE:
		916	{
		917	int lines = 1;
		918	const char *text = pango_layout_get_text (self->pl);
		919
		920	while (*text)
		921	lines += *text++ == '\n';
		922
		923	RETVAL = lines < pango_layout_get_line_count (self->pl);
		924	}
		925	OUTPUT:
		926	RETVAL
		927
807	SV *	928	SV *
808	get_text (CFClient::Layout self)	929	get_text (CFPlus::Layout self)
809	CODE:	930	CODE:
810	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	931	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
811	SvUTF8_on (RETVAL);	932	sv_utf8_decode (RETVAL);
812	OUTPUT:	933	OUTPUT:
813	RETVAL	934	RETVAL
814		935
815	void	936	void
816	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	937	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
817	CODE:	938	CODE:
818	self->r = r;	939	self->r = r;
819	self->g = g;	940	self->g = g;
820	self->b = b;	941	self->b = b;
821	self->a = a;	942	self->a = a;
822		943
823	void	944	void
824	set_font (CFClient::Layout self, CFClient::Font font = 0)	945	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
825	CODE:	946	CODE:
826	if (self->font != font)	947	if (self->font != font)
827	{	948	{
828	self->font = font;	949	self->font = font;
829	layout_update_font (self);	950	layout_update_font (self);
830	}	951	}
831		952
832	void	953	void
833	set_height (CFClient::Layout self, int base_height)	954	set_height (CFPlus::Layout self, int base_height)
834	CODE:	955	CODE:
835	if (self->base_height != base_height)	956	if (self->base_height != base_height)
836	{	957	{
837	self->base_height = base_height;	958	self->base_height = base_height;
838	layout_update_font (self);	959	layout_update_font (self);
839	}	960	}
840		961
841	void	962	void
842	set_width (CFClient::Layout self, int max_width = -1)	963	set_width (CFPlus::Layout self, int max_width = -1)
843	CODE:	964	CODE:
844	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	965	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
845		966
846	void	967	void
847	set_indent (CFClient::Layout self, int indent)	968	set_indent (CFPlus::Layout self, int indent)
848	CODE:	969	CODE:
849	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	970	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
850		971
851	void	972	void
852	set_spacing (CFClient::Layout self, int spacing)	973	set_spacing (CFPlus::Layout self, int spacing)
853	CODE:	974	CODE:
854	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	975	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
855		976
856	void	977	void
857	set_ellipsise (CFClient::Layout self, int ellipsise)	978	set_ellipsise (CFPlus::Layout self, int ellipsise)
858	CODE:	979	CODE:
859	pango_layout_set_ellipsize (self->pl,	980	pango_layout_set_ellipsize (self->pl,
860	ellipsise == 1 ? PANGO_ELLIPSIZE_START	981	ellipsise == 1 ? PANGO_ELLIPSIZE_START
861	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	982	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
862	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	983	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
863	: PANGO_ELLIPSIZE_NONE	984	: PANGO_ELLIPSIZE_NONE
864	);	985	);
865		986
866	void	987	void
867	set_single_paragraph_mode (CFClient::Layout self, int spm)	988	set_single_paragraph_mode (CFPlus::Layout self, int spm)
868	CODE:	989	CODE:
869	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	990	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
870		991
871	void	992	void
872	size (CFClient::Layout self)	993	size (CFPlus::Layout self)
873	PPCODE:	994	PPCODE:
874	{	995	{
875	int w, h;	996	int w, h;
876		997
877	layout_get_pixel_size (self, &w, &h);	998	layout_get_pixel_size (self, &w, &h);
…		…
880	PUSHs (sv_2mortal (newSViv (w)));	1001	PUSHs (sv_2mortal (newSViv (w)));
881	PUSHs (sv_2mortal (newSViv (h)));	1002	PUSHs (sv_2mortal (newSViv (h)));
882	}	1003	}
883		1004
884	int	1005	int
		1006	descent (CFPlus::Layout self)
		1007	CODE:
		1008	{
		1009	PangoRectangle rect;
		1010	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1011	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1012	RETVAL = PANGO_DESCENT (rect);
		1013	}
		1014	OUTPUT:
		1015	RETVAL
		1016
		1017	int
885	xy_to_index (CFClient::Layout self, int x, int y)	1018	xy_to_index (CFPlus::Layout self, int x, int y)
886	CODE:	1019	CODE:
887	{	1020	{
888	int index, trailing;	1021	int index, trailing;
889	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1022	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
890	RETVAL = index;	1023	RETVAL = index;
891	}	1024	}
892	OUTPUT:	1025	OUTPUT:
893	RETVAL	1026	RETVAL
894		1027
895	void	1028	void
896	cursor_pos (CFClient::Layout self, int index)	1029	cursor_pos (CFPlus::Layout self, int index)
897	PPCODE:	1030	PPCODE:
898	{	1031	{
899	PangoRectangle strong_pos;	1032	PangoRectangle strong_pos;
900	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1033	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
901		1034
…		…
904	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1037	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
905	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
906	}	1039	}
907		1040
908	void	1041	void
909	render (CFClient::Layout self)	1042	render (CFPlus::Layout self, float x, float y, int flags = 0)
910	PPCODE:	1043	PPCODE:
911	{	1044	pango_opengl_render_layout_subpixel (
912	SV *retval;	1045	self->pl,
913	int w, h;	1046	x * PANGO_SCALE, y * PANGO_SCALE,
		1047	self->r, self->g, self->b, self->a,
		1048	flags
		1049	);
914		1050
915	layout_get_pixel_size (self, &w, &h);	1051	MODULE = CFPlus PACKAGE = CFPlus::Texture
916		1052
917	if (self->rgba)	1053	void
		1054	pad2pot (SV *data_, SV *w_, SV *h_)
		1055	CODE:
		1056	{
		1057	int ow = SvIV (w_);
		1058	int oh = SvIV (h_);
		1059
		1060	if (ow && oh)
918	{	1061	{
919	cairo_surface_t *surface;	1062	int nw = minpot (ow);
920	cairo_t *cairo;	1063	int nh = minpot (oh);
921		1064
922	retval = newSV (w * h * 4);	1065	if (nw != ow || nh != oh)
923	SvPOK_only (retval);
924	SvCUR_set (retval, w * h * 4);
925
926	memset (SvPVX (retval), 0, w * h * 4);
927
928	surface = cairo_image_surface_create_for_data (
929	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
930	cairo = cairo_create (surface);
931	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
932
933	pango_cairo_show_layout (cairo, self->pl);
934
935	cairo_destroy (cairo);
936	cairo_surface_destroy (surface);
937
938	// what a mess, and its premultiplied, too :(
939	{	1066	{
940	uint32_t *p = (uint32_t *)SvPVX (retval);	1067	if (SvOK (data_))
941	uint32_t *e = p + w * h;
942
943	while (p < e)
944	{	1068	{
945	uint32_t rgba = *p;	1069	STRLEN datalen;
946	rgba = (rgba >> 24) | (rgba << 8);	1070	char *data = SvPVbyte (data_, datalen);
947	#if 0	1071	int bpp = datalen / (ow * oh);
948	#ifdef _WIN32	1072	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
949	{//D
950	uint8_t r = rgba >> 24;
951	uint8_t g = rgba >> 16;
952	uint8_t b = rgba >> 8;
953	uint8_t a = rgba >> 0;
954		1073
955	rgba = (rgba & 0xffffff00) | a;	1074	SvPOK_only (result_);
		1075	SvCUR_set (result_, nw * nh * bpp);
		1076
		1077	memset (SvPVX (result_), 0, nw * nh * bpp);
		1078	while (oh--)
		1079	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1080
		1081	sv_setsv (data_, result_);
956	}	1082	}
957	#endif	1083
958	#endif	1084	sv_setiv (w_, nw);
959	rgba = SDL_SwapBE32 (rgba);	1085	sv_setiv (h_, nh);
960	*p++ = rgba;
961	}	1086	}
962	}
963
964	EXTEND (SP, 5);
965	PUSHs (sv_2mortal (newSViv (w)));
966	PUSHs (sv_2mortal (newSViv (h)));
967	PUSHs (sv_2mortal (retval));
968	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
969	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
970	}	1087	}
971	else
972	{
973	FT_Bitmap bitmap;
974
975	retval = newSV (w * h);
976	SvPOK_only (retval);
977	SvCUR_set (retval, w * h);
978
979	bitmap.rows = h;
980	bitmap.width = w;
981	bitmap.pitch = w;
982	bitmap.buffer = (unsigned char*)SvPVX (retval);
983	bitmap.num_grays = 256;
984	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
985
986	memset (bitmap.buffer, 0, w * h);
987
988	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
989
990	EXTEND (SP, 5);
991	PUSHs (sv_2mortal (newSViv (w)));
992	PUSHs (sv_2mortal (newSViv (h)));
993	PUSHs (sv_2mortal (retval));
994	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
995	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
996	}
997	}	1088	}
998		1089
999	MODULE = CFClient PACKAGE = CFClient::Texture
1000
1001	void	1090	void
1002	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1091	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1003	PROTOTYPE: $$$;$$	1092	PROTOTYPE: $$$;$$
1004	ALIAS:	1093	ALIAS:
1005	draw_quad_alpha = 1	1094	draw_quad_alpha = 1
1006	draw_quad_alpha_premultiplied = 2	1095	draw_quad_alpha_premultiplied = 2
1007	CODE:	1096	CODE:
1008	{	1097	{
1009	HV *hv = (HV *)SvRV (self);	1098	HV *hv = (HV *)SvRV (self);
1010	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1099	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1011	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1100	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1012	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1101	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1013	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
1014		1102
1015	if (items < 5)	1103	if (items < 5)
1016	{	1104	{
1017	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1105	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1018	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1106	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1019	}	1107	}
1020		1108
1021	if (ix)	1109	if (ix)
1022	{	1110	{
1023	glEnable (GL_BLEND);	1111	glEnable (GL_BLEND);
		1112
		1113	if (ix == 2)
1024	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1114	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1115	else
		1116	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1117	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1118
1025	glEnable (GL_ALPHA_TEST);	1119	glEnable (GL_ALPHA_TEST);
1026	glAlphaFunc (GL_GREATER, 0.01f);	1120	glAlphaFunc (GL_GREATER, 0.01f);
1027	}	1121	}
1028		1122
1029	glBindTexture (GL_TEXTURE_2D, name);	1123	glBindTexture (GL_TEXTURE_2D, name);
1030
1031	if (wrap_mode)
1032	{
1033	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1034	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1035	}
1036		1124
1037	glBegin (GL_QUADS);	1125	glBegin (GL_QUADS);
1038	glTexCoord2f (0, 0); glVertex2f (x , y );	1126	glTexCoord2f (0, 0); glVertex2f (x , y );
1039	glTexCoord2f (0, t); glVertex2f (x , y + h);	1127	glTexCoord2f (0, t); glVertex2f (x , y + h);
1040	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1128	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1046	glDisable (GL_ALPHA_TEST);	1134	glDisable (GL_ALPHA_TEST);
1047	glDisable (GL_BLEND);	1135	glDisable (GL_BLEND);
1048	}	1136	}
1049	}	1137	}
1050		1138
1051	MODULE = CFClient PACKAGE = CFClient::Map	1139	MODULE = CFPlus PACKAGE = CFPlus::Map
1052		1140
1053	CFClient::Map	1141	CFPlus::Map
1054	new (SV *class, int map_width, int map_height)	1142	new (SV *class, int map_width, int map_height)
1055	CODE:	1143	CODE:
1056	New (0, RETVAL, 1, struct map);	1144	New (0, RETVAL, 1, struct map);
1057	RETVAL->x = 0;	1145	RETVAL->x = 0;
1058	RETVAL->y = 0;	1146	RETVAL->y = 0;
…		…
1068	RETVAL->row = 0;	1156	RETVAL->row = 0;
1069	OUTPUT:	1157	OUTPUT:
1070	RETVAL	1158	RETVAL
1071		1159
1072	void	1160	void
1073	DESTROY (CFClient::Map self)	1161	DESTROY (CFPlus::Map self)
1074	CODE:	1162	CODE:
1075	{	1163	{
1076	map_clear (self);	1164	map_clear (self);
1077	Safefree (self->face);	1165	Safefree (self->face);
		1166	Safefree (self->tex);
1078	Safefree (self);	1167	Safefree (self);
1079	}	1168	}
1080		1169
1081	void	1170	void
1082	clear (CFClient::Map self)	1171	clear (CFPlus::Map self)
1083	CODE:	1172	CODE:
1084	map_clear (self);	1173	map_clear (self);
1085		1174
1086	void	1175	void
1087	set_face (CFClient::Map self, int face, int texid)	1176	set_face (CFPlus::Map self, int face, int texid)
1088	CODE:	1177	CODE:
1089	{	1178	{
1090	while (self->faces <= face)	1179	while (self->faces <= face)
1091	{	1180	{
1092	Append (mapface, self->face, self->faces, self->faces);	1181	Append (mapface, self->face, self->faces, self->faces);
…		…
1095		1184
1096	self->face [face] = texid;	1185	self->face [face] = texid;
1097	}	1186	}
1098		1187
1099	void	1188	void
1100	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)	1189	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)
1101	CODE:	1190	CODE:
1102	{	1191	{
1103	while (self->texs <= texid)	1192	while (self->texs <= texid)
1104	{	1193	{
1105	Append (maptex, self->tex, self->texs, self->texs);	1194	Append (maptex, self->tex, self->texs, self->texs);
…		…
1117	tex->r = r;	1206	tex->r = r;
1118	tex->g = g;	1207	tex->g = g;
1119	tex->b = b;	1208	tex->b = b;
1120	tex->a = a;	1209	tex->a = a;
1121	}	1210	}
		1211
		1212	// somewhat hackish, but for textures that require it, it really
		1213	// improves the look, and most others don't suffer.
		1214	glBindTexture (GL_TEXTURE_2D, name);
		1215	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1216	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1217	// use uglier nearest interpolation because linear suffers
		1218	// from transparent color bleeding and ugly wrapping effects.
		1219	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1122	}	1220	}
1123		1221
1124	int	1222	int
1125	ox (CFClient::Map self)	1223	ox (CFPlus::Map self)
1126	ALIAS:	1224	ALIAS:
1127	oy = 1	1225	oy = 1
		1226	x = 2
		1227	y = 3
		1228	w = 4
		1229	h = 5
1128	CODE:	1230	CODE:
1129	switch (ix)	1231	switch (ix)
1130	{	1232	{
1131	case 0: RETVAL = self->ox; break;	1233	case 0: RETVAL = self->ox; break;
1132	case 1: RETVAL = self->oy; break;	1234	case 1: RETVAL = self->oy; break;
		1235	case 2: RETVAL = self->x; break;
		1236	case 3: RETVAL = self->y; break;
		1237	case 4: RETVAL = self->w; break;
		1238	case 5: RETVAL = self->h; break;
1133	}	1239	}
1134	OUTPUT:	1240	OUTPUT:
1135	RETVAL	1241	RETVAL
1136		1242
1137	void	1243	void
1138	scroll (CFClient::Map self, int dx, int dy)	1244	scroll (CFPlus::Map self, int dx, int dy)
1139	CODE:	1245	CODE:
1140	{	1246	{
1141	if (dx > 0)	1247	if (dx > 0)
1142	map_blank (self, self->x, self->y, dx - 1, self->h);	1248	map_blank (self, self->x, self->y, dx - 1, self->h);
1143	else if (dx < 0)	1249	else if (dx < 0)
…		…
1159	self->y += MAP_EXTEND_Y;	1265	self->y += MAP_EXTEND_Y;
1160	}	1266	}
1161	}	1267	}
1162		1268
1163	void	1269	void
1164	map1a_update (CFClient::Map self, SV *data_)	1270	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1165	CODE:	1271	CODE:
1166	{	1272	{
1167	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1273	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1168	uint8_t *data_end = (uint8_t *)SvEND (data_);	1274	uint8_t *data_end = (uint8_t *)SvEND (data_);
1169	mapcell *cell;	1275	mapcell *cell;
1170	int x, y, flags;	1276	int x, y, flags;
1171		1277
1172	while (data < data_end)	1278	while (data < data_end - 1)
1173	{	1279	{
1174	flags = (data [0] << 8) + data [1]; data += 2;	1280	flags = (data [0] << 8) + data [1]; data += 2;
1175		1281
1176	x = ((flags >> 10) & 63) + self->x;	1282	x = self->x + ((flags >> 10) & 63);
1177	y = ((flags >> 4) & 63) + self->y;	1283	y = self->y + ((flags >> 4) & 63);
1178		1284
1179	cell = map_get_cell (self, x, y);	1285	cell = map_get_cell (self, x, y);
1180		1286
1181	if (flags & 15)	1287	if (flags & 15)
1182	{	1288	{
1183	if (cell->darkness < 0)	1289	if (!cell->darkness)
1184	{	1290	{
1185	cell->darkness = 0;	1291	cell->darkness = 256;
1186	cell->face [0] = 0;	1292	cell->face [0] = 0;
1187	cell->face [1] = 0;	1293	cell->face [1] = 0;
1188	cell->face [2] = 0;	1294	cell->face [2] = 0;
1189	}	1295	}
1190		1296
1191	cell->darkness = flags & 8 ? *data++ : 255;
1192
1193	//TODO: don't trust server data to be in-range(!)	1297	//TODO: don't trust server data to be in-range(!)
		1298
		1299	if (flags & 8)
		1300	{
		1301	if (extmap)
		1302	{
		1303	uint8_t ext, cmd;
		1304
		1305	do
		1306	{
		1307	ext = *data++;
		1308	cmd = ext & 0x3f;
		1309
		1310	if (cmd < 4)
		1311	cell->darkness = 255 - ext * 64 + 1;
		1312	else if (cmd == 5) // health
		1313	{
		1314	cell->stat_width = 1;
		1315	cell->stat_hp = *data++;
		1316	}
		1317	else if (cmd == 6) // monster width
		1318	cell->stat_width = *data++ + 1;
		1319	else if (ext & 0x40) // unknown, multibyte => skip
		1320	data += *data + 1;
		1321	else
		1322	data++;
		1323	}
		1324	while (ext & 0x80);
		1325	}
		1326	else
		1327	cell->darkness = *data++ + 1;
		1328	}
1194		1329
1195	if (flags & 4)	1330	if (flags & 4)
1196	{	1331	{
1197	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1332	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1198	}	1333	}
…		…
1206	{	1341	{
1207	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1342	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1208	}	1343	}
1209	}	1344	}
1210	else	1345	else
		1346	{
1211	cell->darkness = -1;	1347	cell->darkness = 0;
		1348	cell->stat_hp = 0;
		1349	}
1212	}	1350	}
1213	}	1351	}
1214		1352
1215	SV *	1353	SV *
1216	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1354	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1217	CODE:	1355	CODE:
1218	{	1356	{
1219	int x1, x;	1357	int x1, x;
1220	int y1, y;	1358	int y1, y;
1221	int z;	1359	int z;
…		…
1271	}	1409	}
1272	OUTPUT:	1410	OUTPUT:
1273	RETVAL	1411	RETVAL
1274		1412
1275	void	1413	void
1276	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1414	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1277	PPCODE:	1415	CODE:
1278	{	1416	{
1279	int vx, vy;	1417	int vx, vy;
1280	int x, y, z;	1418	int x, y, z;
1281	int last_name;	1419	int last_name;
1282	mapface face;	1420	mapface face;
1283	int sw4 = (sw + 3) & ~3;
1284	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1285	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1286		1421
1287	memset (darkness, 255, sw4 * sh);
1288	SvPOK_only (darkness_sv);
1289	SvCUR_set (darkness_sv, sw4 * sh);
1290
1291	vx = self->x + (self->w - sw) / 2 - shift_x;	1422	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1292	vy = self->y + (self->h - sh) / 2 - shift_y;	1423	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1293		1424
1294	/*	1425	/*
1295	int vx = self->vx = self->w >= sw	1426	int vx = self->vx = self->w >= sw
1296	? self->x + (self->w - sw) / 2	1427	? self->x + (self->w - sw) / 2
1297	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1428	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1301	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1432	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1302	*/	1433	*/
1303		1434
1304	glColor4ub (255, 255, 255, 255);	1435	glColor4ub (255, 255, 255, 255);
1305		1436
		1437	glEnable (GL_BLEND);
1306	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1438	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1307	glEnable (GL_BLEND);
1308	glEnable (GL_TEXTURE_2D);	1439	glEnable (GL_TEXTURE_2D);
1309	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1440	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1310		1441
1311	glBegin (GL_QUADS);	1442	glBegin (GL_QUADS);
1312		1443
…		…
1321	for (x = 0; x < sw; x++)	1452	for (x = 0; x < sw; x++)
1322	if (row->c0 <= x + vx && x + vx < row->c1)	1453	if (row->c0 <= x + vx && x + vx < row->c1)
1323	{	1454	{
1324	mapcell *cell = row->col + (x + vx - row->c0);	1455	mapcell *cell = row->col + (x + vx - row->c0);
1325		1456
1326	darkness[y * sw4 + x] = cell->darkness < 0
1327	? 255 - FOW_DARKNESS
1328	: 255 - cell->darkness;
1329
1330	face = cell->face [z];	1457	face = cell->face [z];
1331		1458
1332	if (face)	1459	if (face && face < self->texs)
1333	{	1460	{
1334	maptex tex = self->tex [face];	1461	maptex tex = self->tex [face];
1335		1462
1336	int px = (x + 1) * 32 - tex.w;	1463	int px = (x + 1) * 32 - tex.w;
1337	int py = (y + 1) * 32 - tex.h;	1464	int py = (y + 1) * 32 - tex.h;
…		…
1355	glEnd ();	1482	glEnd ();
1356		1483
1357	glDisable (GL_TEXTURE_2D);	1484	glDisable (GL_TEXTURE_2D);
1358	glDisable (GL_BLEND);	1485	glDisable (GL_BLEND);
1359		1486
		1487	// top layer: overlays such as the health bar
		1488	for (y = 0; y < sh; y++)
		1489	if (0 <= y + vy && y + vy < self->rows)
		1490	{
		1491	maprow *row = self->row + (y + vy);
		1492
		1493	for (x = 0; x < sw; x++)
		1494	if (row->c0 <= x + vx && x + vx < row->c1)
		1495	{
		1496	mapcell *cell = row->col + (x + vx - row->c0);
		1497
		1498	int px = x * 32;
		1499	int py = y * 32;
		1500
		1501	if (cell->stat_hp)
		1502	{
		1503	int width = cell->stat_width * 32;
		1504	int thick = sh / 28 + 1 + cell->stat_width;
		1505
		1506	glColor3ub (0, 0, 0);
		1507	glRectf (px + 1, py - thick - 2,
		1508	px + width - 1, py);
		1509
		1510	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1511	glRectf (px + 2,
		1512	py - thick - 1,
		1513	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1514	}
		1515	}
		1516	}
		1517	}
		1518
		1519	void
		1520	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1521	CODE:
		1522	{
		1523	static float color[16][3] = {
		1524	{ 0.00F, 0.00F, 0.00F },
		1525	{ 1.00F, 1.00F, 1.00F },
		1526	{ 0.00F, 0.00F, 0.55F },
		1527	{ 1.00F, 0.00F, 0.00F },
		1528
		1529	{ 1.00F, 0.54F, 0.00F },
		1530	{ 0.11F, 0.56F, 1.00F },
		1531	{ 0.93F, 0.46F, 0.00F },
		1532	{ 0.18F, 0.54F, 0.34F },
		1533
		1534	{ 0.56F, 0.73F, 0.56F },
		1535	{ 0.80F, 0.80F, 0.80F },
		1536	{ 0.55F, 0.41F, 0.13F },
		1537	{ 0.99F, 0.77F, 0.26F },
		1538
		1539	{ 0.74F, 0.65F, 0.41F },
		1540
		1541	{ 0.00F, 1.00F, 1.00F },
		1542	{ 1.00F, 0.00F, 1.00F },
		1543	{ 1.00F, 1.00F, 0.00F },
		1544	};
		1545
		1546	int x, y;
		1547
		1548	glEnable (GL_TEXTURE_2D);
		1549	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1550	glEnable (GL_BLEND);
		1551	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1552	glBegin (GL_QUADS);
		1553
		1554	for (y = 0; y < h; y++)
		1555	for (x = 0; x < w; x++)
		1556	{
		1557	unsigned char m = data [x + y * w];
		1558
		1559	if (m)
		1560	{
		1561	float *c = color [m & 15];
		1562
		1563	float tx1 = m & 0x40 ? 0.5 : 0.;
		1564	float tx2 = tx1 + 0.5;
		1565
		1566	glColor4f (c[0], c[1], c[2], 0.75);
		1567	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1568	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1569	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1570	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1571	}
		1572	}
		1573
		1574	glEnd ();
		1575	glDisable (GL_BLEND);
		1576	glDisable (GL_TEXTURE_2D);
		1577	}
		1578
		1579	void
		1580	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1581	PPCODE:
		1582	{
		1583	int vx, vy;
		1584	int x, y;
		1585	int sw4 = (sw + 3) & ~3;
		1586	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1587	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1588
		1589	memset (darkness, 255, sw4 * sh);
		1590	SvPOK_only (darkness_sv);
		1591	SvCUR_set (darkness_sv, sw4 * sh);
		1592
		1593	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1594	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1595
		1596	for (y = 0; y < sh; y++)
		1597	if (0 <= y + vy && y + vy < self->rows)
		1598	{
		1599	maprow *row = self->row + (y + vy);
		1600
		1601	for (x = 0; x < sw; x++)
		1602	if (row->c0 <= x + vx && x + vx < row->c1)
		1603	{
		1604	mapcell *cell = row->col + (x + vx - row->c0);
		1605
		1606	darkness[y * sw4 + x] = cell->darkness
		1607	? 255 - (cell->darkness - 1)
		1608	: 255 - FOW_DARKNESS;
		1609	}
		1610	}
		1611
1360	EXTEND (SP, 3);	1612	EXTEND (SP, 3);
1361	PUSHs (sv_2mortal (newSViv (sw4)));	1613	PUSHs (sv_2mortal (newSViv (sw4)));
1362	PUSHs (sv_2mortal (newSViv (sh)));	1614	PUSHs (sv_2mortal (newSViv (sh)));
1363	PUSHs (darkness_sv);	1615	PUSHs (darkness_sv);
1364	}	1616	}
1365		1617
1366	SV *	1618	SV *
1367	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1619	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1368	CODE:	1620	CODE:
1369	{	1621	{
1370	int x, y, x1, y1;	1622	int x, y, x1, y1;
1371	SV *data_sv = newSV (w * h * 7 + 5);	1623	SV *data_sv = newSV (w * h * 7 + 5);
1372	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1624	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1434	}	1686	}
1435	OUTPUT:	1687	OUTPUT:
1436	RETVAL	1688	RETVAL
1437		1689
1438	void	1690	void
1439	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1691	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1440	PPCODE:	1692	PPCODE:
1441	{	1693	{
1442	int x, y, z;	1694	int x, y, z;
1443	int w, h;	1695	int w, h;
1444	int x1, y1;	1696	int x1, y1;
…		…
1476		1728
1477	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1729	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1478	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1730	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1479	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1731	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1480		1732
1481	if (cell->darkness <= 0)	1733	if (cell->darkness == 0)
1482	{	1734	{
1483	cell->darkness = -1;	1735	cell->darkness = 0;
1484		1736
1485	for (z = 0; z <= 2; z++)	1737	for (z = 0; z <= 2; z++)
1486	{	1738	{
1487	cell->face[z] = face[z];	1739	cell->face[z] = face[z];
1488		1740
…		…
1493	}	1745	}
1494	}	1746	}
1495	}	1747	}
1496	}	1748	}
1497		1749
1498	MODULE = CFClient PACKAGE = CFClient::MixChunk	1750	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1499		1751
1500	CFClient::MixChunk	1752	CFPlus::MixChunk
1501	new_from_file (SV *class, char *path)	1753	new_from_file (SV *class, char *path)
1502	CODE:	1754	CODE:
1503	RETVAL = Mix_LoadWAV (path);	1755	RETVAL = Mix_LoadWAV (path);
1504	OUTPUT:	1756	OUTPUT:
1505	RETVAL	1757	RETVAL
1506		1758
1507	void	1759	void
1508	DESTROY (CFClient::MixChunk self)	1760	DESTROY (CFPlus::MixChunk self)
1509	CODE:	1761	CODE:
1510	Mix_FreeChunk (self);	1762	Mix_FreeChunk (self);
1511		1763
1512	int	1764	int
1513	volume (CFClient::MixChunk self, int volume = -1)	1765	volume (CFPlus::MixChunk self, int volume = -1)
1514	CODE:	1766	CODE:
1515	RETVAL = Mix_VolumeChunk (self, volume);	1767	RETVAL = Mix_VolumeChunk (self, volume);
1516	OUTPUT:	1768	OUTPUT:
1517	RETVAL	1769	RETVAL
1518		1770
1519	int	1771	int
1520	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1772	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1521	CODE:	1773	CODE:
1522	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1774	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1523	OUTPUT:	1775	OUTPUT:
1524	RETVAL	1776	RETVAL
1525		1777
1526	MODULE = CFClient PACKAGE = CFClient::MixMusic	1778	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1527		1779
1528	int	1780	int
1529	volume (int volume = -1)	1781	volume (int volume = -1)
1530	CODE:	1782	CODE:
1531	RETVAL = Mix_VolumeMusic (volume);	1783	RETVAL = Mix_VolumeMusic (volume);
1532	OUTPUT:	1784	OUTPUT:
1533	RETVAL	1785	RETVAL
1534		1786
1535	CFClient::MixMusic	1787	CFPlus::MixMusic
1536	new_from_file (SV *class, char *path)	1788	new_from_file (SV *class, char *path)
1537	CODE:	1789	CODE:
1538	RETVAL = Mix_LoadMUS (path);	1790	RETVAL = Mix_LoadMUS (path);
1539	OUTPUT:	1791	OUTPUT:
1540	RETVAL	1792	RETVAL
1541		1793
1542	void	1794	void
1543	DESTROY (CFClient::MixMusic self)	1795	DESTROY (CFPlus::MixMusic self)
1544	CODE:	1796	CODE:
1545	Mix_FreeMusic (self);	1797	Mix_FreeMusic (self);
1546		1798
1547	int	1799	int
1548	play (CFClient::MixMusic self, int loops = -1)	1800	play (CFPlus::MixMusic self, int loops = -1)
1549	CODE:	1801	CODE:
1550	RETVAL = Mix_PlayMusic (self, loops);	1802	RETVAL = Mix_PlayMusic (self, loops);
1551	OUTPUT:	1803	OUTPUT:
1552	RETVAL	1804	RETVAL
1553		1805
1554	MODULE = CFClient PACKAGE = CFClient::OpenGL	1806	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1555		1807
1556	BOOT:	1808	BOOT:
1557	{	1809	{
1558	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1810	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1559	static const struct {	1811	static const struct {
1560	const char *name;	1812	const char *name;
1561	IV iv;	1813	IV iv;
1562	} *civ, const_iv[] = {	1814	} *civ, const_iv[] = {
1563	# define const_iv(name) { # name, (IV)name }	1815	# define const_iv(name) { # name, (IV)name }
…		…
1570	const_iv (GL_SCISSOR_TEST),	1822	const_iv (GL_SCISSOR_TEST),
1571	const_iv (GL_DEPTH_TEST),	1823	const_iv (GL_DEPTH_TEST),
1572	const_iv (GL_ALPHA_TEST),	1824	const_iv (GL_ALPHA_TEST),
1573	const_iv (GL_NORMALIZE),	1825	const_iv (GL_NORMALIZE),
1574	const_iv (GL_RESCALE_NORMAL),	1826	const_iv (GL_RESCALE_NORMAL),
		1827	const_iv (GL_FRONT),
		1828	const_iv (GL_BACK),
1575	const_iv (GL_AND),	1829	const_iv (GL_AND),
1576	const_iv (GL_ONE),	1830	const_iv (GL_ONE),
1577	const_iv (GL_ZERO),	1831	const_iv (GL_ZERO),
1578	const_iv (GL_SRC_ALPHA),	1832	const_iv (GL_SRC_ALPHA),
1579	const_iv (GL_SRC_ALPHA_SATURATE),	1833	const_iv (GL_DST_ALPHA),
1580	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1834	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1581	const_iv (GL_ONE_MINUS_DST_ALPHA),	1835	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1836	const_iv (GL_SRC_ALPHA_SATURATE),
1582	const_iv (GL_RGB),	1837	const_iv (GL_RGB),
1583	const_iv (GL_RGBA),	1838	const_iv (GL_RGBA),
		1839	const_iv (GL_RGBA4),
		1840	const_iv (GL_RGBA8),
		1841	const_iv (GL_RGB5_A1),
1584	const_iv (GL_UNSIGNED_BYTE),	1842	const_iv (GL_UNSIGNED_BYTE),
1585	const_iv (GL_UNSIGNED_SHORT),	1843	const_iv (GL_UNSIGNED_SHORT),
1586	const_iv (GL_UNSIGNED_INT),	1844	const_iv (GL_UNSIGNED_INT),
1587	const_iv (GL_ALPHA),	1845	const_iv (GL_ALPHA),
1588	const_iv (GL_INTENSITY),	1846	const_iv (GL_INTENSITY),
…		…
1597	const_iv (GL_TEXTURE_MAG_FILTER),	1855	const_iv (GL_TEXTURE_MAG_FILTER),
1598	const_iv (GL_TEXTURE_MIN_FILTER),	1856	const_iv (GL_TEXTURE_MIN_FILTER),
1599	const_iv (GL_TEXTURE_ENV_MODE),	1857	const_iv (GL_TEXTURE_ENV_MODE),
1600	const_iv (GL_TEXTURE_WRAP_S),	1858	const_iv (GL_TEXTURE_WRAP_S),
1601	const_iv (GL_TEXTURE_WRAP_T),	1859	const_iv (GL_TEXTURE_WRAP_T),
		1860	const_iv (GL_REPEAT),
1602	const_iv (GL_CLAMP),	1861	const_iv (GL_CLAMP),
1603	const_iv (GL_REPEAT),	1862	const_iv (GL_CLAMP_TO_EDGE),
1604	const_iv (GL_NEAREST),	1863	const_iv (GL_NEAREST),
1605	const_iv (GL_LINEAR),	1864	const_iv (GL_LINEAR),
1606	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1865	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1607	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1866	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1608	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1867	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1619	const_iv (GL_SEPARABLE_2D),	1878	const_iv (GL_SEPARABLE_2D),
1620	const_iv (GL_CONVOLUTION_2D),	1879	const_iv (GL_CONVOLUTION_2D),
1621	const_iv (GL_CONVOLUTION_BORDER_MODE),	1880	const_iv (GL_CONVOLUTION_BORDER_MODE),
1622	const_iv (GL_CONSTANT_BORDER),	1881	const_iv (GL_CONSTANT_BORDER),
1623	const_iv (GL_LINES),	1882	const_iv (GL_LINES),
		1883	const_iv (GL_LINE_STRIP),
1624	const_iv (GL_LINE_LOOP),	1884	const_iv (GL_LINE_LOOP),
1625	const_iv (GL_QUADS),	1885	const_iv (GL_QUADS),
1626	const_iv (GL_QUAD_STRIP),	1886	const_iv (GL_QUAD_STRIP),
1627	const_iv (GL_TRIANGLES),	1887	const_iv (GL_TRIANGLES),
1628	const_iv (GL_TRIANGLE_STRIP),	1888	const_iv (GL_TRIANGLE_STRIP),
…		…
1638		1898
1639	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1899	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1640	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1900	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1641	}	1901	}
1642		1902
		1903	char *
		1904	gl_vendor ()
		1905	CODE:
		1906	RETVAL = (char *)glGetString (GL_VENDOR);
		1907	OUTPUT:
		1908	RETVAL
		1909
		1910	char *
		1911	gl_version ()
		1912	CODE:
		1913	RETVAL = (char *)glGetString (GL_VERSION);
		1914	OUTPUT:
		1915	RETVAL
		1916
		1917	char *
		1918	gl_extensions ()
		1919	CODE:
		1920	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1921	OUTPUT:
		1922	RETVAL
		1923
1643	int glGetError ()	1924	int glGetError ()
		1925
		1926	void glFinish ()
1644		1927
1645	void glClear (int mask)	1928	void glClear (int mask)
1646		1929
1647	void glClearColor (float r, float g, float b, float a = 1.0)	1930	void glClearColor (float r, float g, float b, float a = 1.0)
1648	PROTOTYPE: @	1931	PROTOTYPE: @
…		…
1655		1938
1656	void glHint (int target, int mode)	1939	void glHint (int target, int mode)
1657		1940
1658	void glBlendFunc (int sfactor, int dfactor)	1941	void glBlendFunc (int sfactor, int dfactor)
1659		1942
		1943	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1944	CODE:
		1945	gl_BlendFuncSeparate (sa, da, saa, daa);
		1946
1660	void glDepthMask (int flag)	1947	void glDepthMask (int flag)
1661		1948
1662	void glLogicOp (int opcode)	1949	void glLogicOp (int opcode)
1663		1950
1664	void glColorMask (int red, int green, int blue, int alpha)	1951	void glColorMask (int red, int green, int blue, int alpha)
…		…
1668	void glPushMatrix ()	1955	void glPushMatrix ()
1669		1956
1670	void glPopMatrix ()	1957	void glPopMatrix ()
1671		1958
1672	void glLoadIdentity ()	1959	void glLoadIdentity ()
		1960
		1961	void glDrawBuffer (int buffer)
		1962
		1963	void glReadBuffer (int buffer)
1673		1964
1674	# near_ and far_ are due to microsofts buggy "c" compiler	1965	# near_ and far_ are due to microsofts buggy "c" compiler
1675	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1966	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1676		1967
1677	# near_ and far_ are due to microsofts buggy "c" compiler	1968	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1697		1988
1698	void glEnd ()	1989	void glEnd ()
1699		1990
1700	void glColor (float r, float g, float b, float a = 1.0)	1991	void glColor (float r, float g, float b, float a = 1.0)
1701	PROTOTYPE: @	1992	PROTOTYPE: @
		1993	ALIAS:
		1994	glColor_premultiply = 1
1702	CODE:	1995	CODE:
		1996	if (ix)
		1997	{
		1998	r *= a;
		1999	g *= a;
		2000	b *= a;
		2001	}
1703	// microsoft visual "c" rounds instead of truncating...	2002	// microsoft visual "c" rounds instead of truncating...
1704	glColor4ub (MIN ((int)(r * 255.f), 255),	2003	glColor4f (r, g, b, a);
1705	MIN ((int)(g * 255.f), 255),
1706	MIN ((int)(b * 255.f), 255),
1707	MIN ((int)(a * 255.f), 255));
1708		2004
1709	void glInterleavedArrays (int format, int stride, char *data)	2005	void glInterleavedArrays (int format, int stride, char *data)
1710		2006
1711	void glDrawElements (int mode, int count, int type, char *indices)	2007	void glDrawElements (int mode, int count, int type, char *indices)
1712		2008
…		…
1735		2031
1736	void glBindTexture (int target, int name)	2032	void glBindTexture (int target, int name)
1737		2033
1738	void glConvolutionParameter (int target, int pname, float params)	2034	void glConvolutionParameter (int target, int pname, float params)
1739	CODE:	2035	CODE:
1740	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2036	if (gl.ConvolutionParameterf)
		2037	gl.ConvolutionParameterf (target, pname, params);
1741		2038
1742	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2039	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1743	CODE:	2040	CODE:
1744	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2041	if (gl.ConvolutionFilter2D)
1745	(target, internalformat, width, height, format, type, data));	2042	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1746		2043
1747	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	2044	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1748	CODE:	2045	CODE:
1749	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2046	if (gl.SeparableFilter2D)
1750	(target, internalformat, width, height, format, type, row, column));	2047	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1751		2048
1752	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2049	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1753		2050
1754	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2051	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1755		2052
…		…
1788		2085
1789	void glEndList ()	2086	void glEndList ()
1790		2087
1791	void glCallList (int list)	2088	void glCallList (int list)
1792		2089
1793

Diff Legend

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