[ViewVC] Diff of: 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.156 by root, Thu Sep 21 14:47:51 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	uint32_t player;
132	mapface face[3];	175	mapface face[3];
		176	uint16_t darkness;
		177	uint8_t stat_width, stat_hp, flags;
133	} mapcell;	178	} mapcell;
134		179
135	typedef struct {	180	typedef struct {
136	int32_t c0, c1;	181	int32_t c0, c1;
137	mapcell *col;	182	mapcell *col;
…		…
146	int texs;	191	int texs;
147	maptex *tex;	192	maptex *tex;
148		193
149	int32_t rows;	194	int32_t rows;
150	maprow *row;	195	maprow *row;
151	} *CFClient__Map;	196	} *CFPlus__Map;
152		197
153	static char *	198	static char *
154	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
155	{	200	{
156	char *p;	201	char *p;
…		…
174		219
175	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#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))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		222
178	static maprow *	223	static maprow *
179	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
180	{	225	{
181	if (0 > y)	226	if (0 > y)
182	{	227	{
183	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
222		267
223	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
224	}	269	}
225		270
226	static mapcell *	271	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
228	{	273	{
229	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
230	}	275	}
231		276
232	static void	277	static void
233	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
234	{	279	{
235	int r;	280	int r;
236		281
237	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
246	self->row = 0;	291	self->row = 0;
247	self->rows = 0;	292	self->rows = 0;
248	}	293	}
249		294
250	static void	295	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	297	{
253	int x, y;	298	int x, y;
254	maprow *row;	299	maprow *row;
		300	mapcell *cell;
255		301
256	for (y = y0; y < y0 + h; y++)	302	for (y = y0; y < y0 + h; y++)
257	if (y >= 0)	303	if (y >= 0)
258	{	304	{
259	if (y >= self->rows)	305	if (y >= self->rows)
…		…
265	if (x >= row->c0)	311	if (x >= row->c0)
266	{	312	{
267	if (x >= row->c1)	313	if (x >= row->c1)
268	break;	314	break;
269		315
270	row->col[x - row->c0].darkness = -1;	316	cell = row->col + x - row->c0;
		317
		318	cell->darkness = 0;
		319	cell->stat_hp = 0;
		320	cell->flags = 0;
		321	cell->player = 0;
271	}	322	}
272	}	323	}
273	}	324	}
274		325
275	static void	326	static void
…		…
296	ev.data2 = 0;	347	ev.data2 = 0;
297		348
298	SDL_PushEvent ((SDL_Event *)&ev);	349	SDL_PushEvent ((SDL_Event *)&ev);
299	}	350	}
300		351
		352	static unsigned int
		353	minpot (unsigned int n)
		354	{
		355	if (!n)
		356	return 0;
		357
		358	--n;
		359
		360	n \|= n >> 1;
		361	n \|= n >> 2;
		362	n \|= n >> 4;
		363	n \|= n >> 8;
		364	n \|= n >> 16;
		365
		366	return n + 1;
		367	}
		368
301	MODULE = CFClient PACKAGE = CFClient	369	MODULE = CFPlus PACKAGE = CFPlus
302		370
303	PROTOTYPES: ENABLE	371	PROTOTYPES: ENABLE
304		372
305	BOOT:	373	BOOT:
306	{	374	{
307	HV *stash = gv_stashpv ("CFClient", 1);	375	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	376	static const struct {
309	const char *name;	377	const char *name;
310	IV iv;	378	IV iv;
311	} *civ, const_iv[] = {	379	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	380	# define const_iv(name) { # name, (IV)name }
…		…
413		481
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	482	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	483	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	484	}
417		485
		486	int
		487	in_destruct ()
		488	CODE:
		489	RETVAL = PL_main_cv == Nullcv;
		490	OUTPUT:
		491	RETVAL
		492
		493	NV floor (NV x)
		494
		495	NV ceil (NV x)
		496
418	void	497	void
419	pango_init ()	498	pango_init ()
420	CODE:	499	CODE:
421	{	500	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	501	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	502	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);	503	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	}	504	}
430		505
431	int	506	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	507	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		508
434	void	509	void
435	SDL_Quit ()	510	SDL_Quit ()
436		511
437	void	512	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	519	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	521	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		522
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	523	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	524	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		525
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		530
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	531	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		532	#if SDL_VERSION_ATLEAST(1,2,10)
		533	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		534	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		535	#endif
457		536
458	SDL_EnableUNICODE (1);	537	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	538	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		539
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	540	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	558	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	559	CODE:
481	RETVAL = !!SDL_SetVideoMode (	560	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	561	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	562	);
		563	if (RETVAL)
		564	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	565	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		566	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		567	# include "glfunc.h"
		568	# undef GL_FUNC
		569	}
485	OUTPUT:	570	OUTPUT:
486	RETVAL	571	RETVAL
487		572
488	void	573	void
489	SDL_GL_SwapBuffers ()	574	SDL_GL_SwapBuffers ()
		575
		576	char *
		577	SDL_GetKeyName (int sym)
490		578
491	void	579	void
492	SDL_PollEvent ()	580	SDL_PollEvent ()
493	PPCODE:	581	PPCODE:
494	{	582	{
495	SDL_Event ev;	583	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		584
509	while (SDL_PollEvent (&ev))	585	while (SDL_PollEvent (&ev))
510	{	586	{
511	HV *hv = newHV ();	587	HV *hv = newHV ();
512	hv_store (hv, "type", 4, newSViv (ev.type), 0);	588	hv_store (hv, "type", 4, newSViv (ev.type), 0);
513		589
514	switch (ev.type)	590	switch (ev.type)
515	{	591	{
516	case SDL_KEYDOWN:	592	case SDL_KEYDOWN:
517	case SDL_KEYUP:	593	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);	594	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
530	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	595	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
531	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	596	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
532	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	597	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
533	break;	598	break;
…		…
536	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	601	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
537	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	602	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
538	break;	603	break;
539		604
540	case SDL_MOUSEMOTION:	605	case SDL_MOUSEMOTION:
541	hv_store (hv, "mod", 3, newSViv (modifier), 0);	606	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
542		607
543	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	608	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
544	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	609	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
545	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	610	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
546	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	611	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
547	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	612	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
548	break;	613	break;
549		614
550	case SDL_MOUSEBUTTONDOWN:	615	case SDL_MOUSEBUTTONDOWN:
551	case SDL_MOUSEBUTTONUP:	616	case SDL_MOUSEBUTTONUP:
552	hv_store (hv, "mod", 3, newSViv (modifier), 0);	617	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
553		618
554	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	619	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
555	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	620	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
556	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	621	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
557	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	622	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
562	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	627	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
563	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	628	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
564	break;	629	break;
565	}	630	}
566		631
567	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	632	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
568	}	633	}
569	}	634	}
570		635
571	int	636	int
572	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	637	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
585	CODE:	650	CODE:
586	#ifndef _WIN32	651	#ifndef _WIN32
587	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	652	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
588	#endif	653	#endif
589		654
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	655	void
612	add_font (char *file)	656	add_font (char *file)
613	CODE:	657	CODE:
614	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	658	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
615	#ifdef _WIN32
616	// cairo... sigh... requires win2000
617	AddFontResourceEx (file, FR_PRIVATE, 0);
618	#endif
619		659
620	void	660	void
621	load_image_inline (SV *image_)	661	load_image_inline (SV *image_)
622	ALIAS:	662	ALIAS:
623	load_image_file = 1	663	load_image_file = 1
…		…
665		705
666	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	706	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
667		707
668	assert (surface2->pitch == surface2->w * 4);	708	assert (surface2->pitch == surface2->w * 4);
669		709
		710	SDL_LockSurface (surface2);
670	EXTEND (SP, 5);	711	EXTEND (SP, 6);
671	PUSHs (sv_2mortal (newSViv (surface2->w)));	712	PUSHs (sv_2mortal (newSViv (surface2->w)));
672	PUSHs (sv_2mortal (newSViv (surface2->h)));	713	PUSHs (sv_2mortal (newSViv (surface2->h)));
673	SDL_LockSurface (surface2);
674	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	714	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)));	715	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
677	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	716	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
678	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	717	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		718	SDL_UnlockSurface (surface2);
679		719
680	SDL_FreeSurface (surface);	720	SDL_FreeSurface (surface);
681	SDL_FreeSurface (surface2);	721	SDL_FreeSurface (surface2);
682	}	722	}
683		723
…		…
719	CODE:	759	CODE:
720	fprintf (stderr, "FATAL: %s\n", message);	760	fprintf (stderr, "FATAL: %s\n", message);
721	#ifdef _WIN32	761	#ifdef _WIN32
722	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	762	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
723	#endif	763	#endif
724	exit (1);	764	_exit (1);
725		765
		766	void
		767	_exit (int retval)
		768	CODE:
		769	_exit (retval);
		770
726	MODULE = CFClient PACKAGE = CFClient::Font	771	MODULE = CFPlus PACKAGE = CFPlus::Font
727		772
728	CFClient::Font	773	CFPlus::Font
729	new_from_file (SV class, char path, int id = 0)	774	new_from_file (SV class, char path, int id = 0)
730	CODE:	775	CODE:
731	{	776	{
732	int count;	777	int count;
733	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	778	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
736	}	781	}
737	OUTPUT:	782	OUTPUT:
738	RETVAL	783	RETVAL
739		784
740	void	785	void
741	DESTROY (CFClient::Font self)	786	DESTROY (CFPlus::Font self)
742	CODE:	787	CODE:
743	pango_font_description_free (self);	788	pango_font_description_free (self);
744		789
745	void	790	void
746	make_default (CFClient::Font self)	791	make_default (CFPlus::Font self)
747	CODE:	792	CODE:
748	default_font = self;	793	default_font = self;
749		794
750	MODULE = CFClient PACKAGE = CFClient::Layout	795	MODULE = CFPlus PACKAGE = CFPlus::Layout
751		796
752	CFClient::Layout	797	void
753	new (SV *class, int rgba = 0)	798	reset_glyph_cache ()
754	CODE:	799	CODE:
755	#if _WIN32	800	tc_clear ();
756	rgba = 0;//D	801
757	#endif	802	CFPlus::Layout
		803	new (SV *class)
		804	CODE:
758	New (0, RETVAL, 1, struct cf_layout);	805	New (0, RETVAL, 1, struct cf_layout);
759		806
760	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	807	RETVAL->pl = pango_layout_new (opengl_context);
761	RETVAL->rgba = rgba;
762	RETVAL->r = 1.;	808	RETVAL->r = 1.;
763	RETVAL->g = 1.;	809	RETVAL->g = 1.;
764	RETVAL->b = 1.;	810	RETVAL->b = 1.;
765	RETVAL->a = 1.;	811	RETVAL->a = 1.;
766	RETVAL->base_height = MIN_FONT_HEIGHT;	812	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
770	layout_update_font (RETVAL);	816	layout_update_font (RETVAL);
771	OUTPUT:	817	OUTPUT:
772	RETVAL	818	RETVAL
773		819
774	void	820	void
775	DESTROY (CFClient::Layout self)	821	DESTROY (CFPlus::Layout self)
776	CODE:	822	CODE:
777	g_object_unref (self->pl);	823	g_object_unref (self->pl);
778	Safefree (self);	824	Safefree (self);
779		825
780	int
781	is_rgba (CFClient::Layout self)
782	CODE:
783	RETVAL = self->rgba;
784	OUTPUT:
785	RETVAL
786
787	void	826	void
788	set_text (CFClient::Layout self, SV *text_)	827	set_text (CFPlus::Layout self, SV *text_)
789	CODE:	828	CODE:
790	{	829	{
791	STRLEN textlen;	830	STRLEN textlen;
792	char *text = SvPVutf8 (text_, textlen);	831	char *text = SvPVutf8 (text_, textlen);
793		832
794	pango_layout_set_text (self->pl, text, textlen);	833	pango_layout_set_text (self->pl, text, textlen);
795	}	834	}
796		835
797	void	836	void
798	set_markup (CFClient::Layout self, SV *text_)	837	set_markup (CFPlus::Layout self, SV *text_)
799	CODE:	838	CODE:
800	{	839	{
801	STRLEN textlen;	840	STRLEN textlen;
802	char *text = SvPVutf8 (text_, textlen);	841	char *text = SvPVutf8 (text_, textlen);
803		842
804	pango_layout_set_markup (self->pl, text, textlen);	843	pango_layout_set_markup (self->pl, text, textlen);
805	}	844	}
806		845
		846	void
		847	set_shapes (CFPlus::Layout self, ...)
		848	CODE:
		849	{
		850	PangoAttrList *attrs = 0;
		851	const char *text = pango_layout_get_text (self->pl);
		852	const char *pos = text;
		853	int arg = 4;
		854
		855	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		856	{
		857	PangoRectangle inkrect, rect;
		858	PangoAttribute *attr;
		859
		860	int x = SvIV (ST (arg - 3));
		861	int y = SvIV (ST (arg - 2));
		862	int w = SvIV (ST (arg - 1));
		863	int h = SvIV (ST (arg ));
		864
		865	inkrect.x = 0;
		866	inkrect.y = 0;
		867	inkrect.width = 0;
		868	inkrect.height = 0;
		869
		870	rect.x = x * PANGO_SCALE;
		871	rect.y = y * PANGO_SCALE;
		872	rect.width = w * PANGO_SCALE;
		873	rect.height = h * PANGO_SCALE;
		874
		875	if (!attrs)
		876	attrs = pango_layout_get_attributes (self->pl);
		877
		878	attr = pango_attr_shape_new (&inkrect, &rect);
		879	attr->start_index = pos - text;
		880	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		881	pango_attr_list_insert (attrs, attr);
		882
		883	arg += 4;
		884	pos += sizeof (OBJ_STR) - 1;
		885	}
		886
		887	if (attrs)
		888	pango_layout_set_attributes (self->pl, attrs);
		889	}
		890
		891	void
		892	get_shapes (CFPlus::Layout self)
		893	PPCODE:
		894	{
		895	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		896
		897	do
		898	{
		899	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		900
		901	if (run && shape_attr_p (run))
		902	{
		903	PangoRectangle extents;
		904	pango_layout_iter_get_run_extents (iter, 0, &extents);
		905
		906	EXTEND (SP, 2);
		907	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		908	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		909	}
		910	}
		911	while (pango_layout_iter_next_run (iter));
		912
		913	pango_layout_iter_free (iter);
		914	}
		915
		916	int
		917	has_wrapped (CFPlus::Layout self)
		918	CODE:
		919	{
		920	int lines = 1;
		921	const char *text = pango_layout_get_text (self->pl);
		922
		923	while (*text)
		924	lines += *text++ == '\n';
		925
		926	RETVAL = lines < pango_layout_get_line_count (self->pl);
		927	}
		928	OUTPUT:
		929	RETVAL
		930
807	SV *	931	SV *
808	get_text (CFClient::Layout self)	932	get_text (CFPlus::Layout self)
809	CODE:	933	CODE:
810	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	934	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
811	SvUTF8_on (RETVAL);	935	sv_utf8_decode (RETVAL);
812	OUTPUT:	936	OUTPUT:
813	RETVAL	937	RETVAL
814		938
815	void	939	void
816	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	940	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
817	CODE:	941	CODE:
818	self->r = r;	942	self->r = r;
819	self->g = g;	943	self->g = g;
820	self->b = b;	944	self->b = b;
821	self->a = a;	945	self->a = a;
822		946
823	void	947	void
824	set_font (CFClient::Layout self, CFClient::Font font = 0)	948	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
825	CODE:	949	CODE:
826	if (self->font != font)	950	if (self->font != font)
827	{	951	{
828	self->font = font;	952	self->font = font;
829	layout_update_font (self);	953	layout_update_font (self);
830	}	954	}
831		955
832	void	956	void
833	set_height (CFClient::Layout self, int base_height)	957	set_height (CFPlus::Layout self, int base_height)
834	CODE:	958	CODE:
835	if (self->base_height != base_height)	959	if (self->base_height != base_height)
836	{	960	{
837	self->base_height = base_height;	961	self->base_height = base_height;
838	layout_update_font (self);	962	layout_update_font (self);
839	}	963	}
840		964
841	void	965	void
842	set_width (CFClient::Layout self, int max_width = -1)	966	set_width (CFPlus::Layout self, int max_width = -1)
843	CODE:	967	CODE:
844	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	968	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
845		969
846	void	970	void
847	set_indent (CFClient::Layout self, int indent)	971	set_indent (CFPlus::Layout self, int indent)
848	CODE:	972	CODE:
849	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	973	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
850		974
851	void	975	void
852	set_spacing (CFClient::Layout self, int spacing)	976	set_spacing (CFPlus::Layout self, int spacing)
853	CODE:	977	CODE:
854	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	978	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
855		979
856	void	980	void
857	set_ellipsise (CFClient::Layout self, int ellipsise)	981	set_ellipsise (CFPlus::Layout self, int ellipsise)
858	CODE:	982	CODE:
859	pango_layout_set_ellipsize (self->pl,	983	pango_layout_set_ellipsize (self->pl,
860	ellipsise == 1 ? PANGO_ELLIPSIZE_START	984	ellipsise == 1 ? PANGO_ELLIPSIZE_START
861	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	985	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
862	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	986	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
863	: PANGO_ELLIPSIZE_NONE	987	: PANGO_ELLIPSIZE_NONE
864	);	988	);
865		989
866	void	990	void
867	set_single_paragraph_mode (CFClient::Layout self, int spm)	991	set_single_paragraph_mode (CFPlus::Layout self, int spm)
868	CODE:	992	CODE:
869	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	993	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
870		994
871	void	995	void
872	size (CFClient::Layout self)	996	size (CFPlus::Layout self)
873	PPCODE:	997	PPCODE:
874	{	998	{
875	int w, h;	999	int w, h;
876		1000
877	layout_get_pixel_size (self, &w, &h);	1001	layout_get_pixel_size (self, &w, &h);
…		…
880	PUSHs (sv_2mortal (newSViv (w)));	1004	PUSHs (sv_2mortal (newSViv (w)));
881	PUSHs (sv_2mortal (newSViv (h)));	1005	PUSHs (sv_2mortal (newSViv (h)));
882	}	1006	}
883		1007
884	int	1008	int
		1009	descent (CFPlus::Layout self)
		1010	CODE:
		1011	{
		1012	PangoRectangle rect;
		1013	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1014	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1015	RETVAL = PANGO_DESCENT (rect);
		1016	}
		1017	OUTPUT:
		1018	RETVAL
		1019
		1020	int
885	xy_to_index (CFClient::Layout self, int x, int y)	1021	xy_to_index (CFPlus::Layout self, int x, int y)
886	CODE:	1022	CODE:
887	{	1023	{
888	int index, trailing;	1024	int index, trailing;
889	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1025	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
890	RETVAL = index;	1026	RETVAL = index;
891	}	1027	}
892	OUTPUT:	1028	OUTPUT:
893	RETVAL	1029	RETVAL
894		1030
895	void	1031	void
896	cursor_pos (CFClient::Layout self, int index)	1032	cursor_pos (CFPlus::Layout self, int index)
897	PPCODE:	1033	PPCODE:
898	{	1034	{
899	PangoRectangle strong_pos;	1035	PangoRectangle strong_pos;
900	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1036	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
901		1037
…		…
904	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
905	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1041	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
906	}	1042	}
907		1043
908	void	1044	void
909	render (CFClient::Layout self)	1045	render (CFPlus::Layout self, float x, float y, int flags = 0)
910	PPCODE:	1046	PPCODE:
911	{	1047	pango_opengl_render_layout_subpixel (
912	SV *retval;	1048	self->pl,
913	int w, h;	1049	x * PANGO_SCALE, y * PANGO_SCALE,
		1050	self->r, self->g, self->b, self->a,
		1051	flags
		1052	);
914		1053
915	layout_get_pixel_size (self, &w, &h);	1054	MODULE = CFPlus PACKAGE = CFPlus::Texture
916		1055
917	if (self->rgba)	1056	void
		1057	pad2pot (SV data_, SV w_, SV *h_)
		1058	CODE:
		1059	{
		1060	int ow = SvIV (w_);
		1061	int oh = SvIV (h_);
		1062
		1063	if (ow && oh)
918	{	1064	{
919	cairo_surface_t *surface;	1065	int nw = minpot (ow);
920	cairo_t *cairo;	1066	int nh = minpot (oh);
921		1067
922	retval = newSV (w * h * 4);	1068	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	{	1069	{
940	uint32_t p = (uint32_t )SvPVX (retval);	1070	if (SvOK (data_))
941	uint32_t e = p + w h;
942
943	while (p < e)
944	{	1071	{
945	uint32_t rgba = *p;	1072	STRLEN datalen;
946	rgba = (rgba >> 24) \| (rgba << 8);	1073	char *data = SvPVbyte (data_, datalen);
947	#if 0	1074	int bpp = datalen / (ow * oh);
948	#ifdef _WIN32	1075	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		1076
955	rgba = (rgba & 0xffffff00) \| a;	1077	SvPOK_only (result_);
		1078	SvCUR_set (result_, nw * nh * bpp);
		1079
		1080	memset (SvPVX (result_), 0, nw * nh * bpp);
		1081	while (oh--)
		1082	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1083
		1084	sv_setsv (data_, result_);
956	}	1085	}
957	#endif	1086
958	#endif	1087	sv_setiv (w_, nw);
959	rgba = SDL_SwapBE32 (rgba);	1088	sv_setiv (h_, nh);
960	*p++ = rgba;
961	}	1089	}
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	}	1090	}
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	}	1091	}
998		1092
999	MODULE = CFClient PACKAGE = CFClient::Texture
1000
1001	void	1093	void
1002	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1094	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1003	PROTOTYPE: $$$;$$	1095	PROTOTYPE: $$$;$$
1004	ALIAS:	1096	ALIAS:
1005	draw_quad_alpha = 1	1097	draw_quad_alpha = 1
1006	draw_quad_alpha_premultiplied = 2	1098	draw_quad_alpha_premultiplied = 2
1007	CODE:	1099	CODE:
1008	{	1100	{
1009	HV hv = (HV )SvRV (self);	1101	HV hv = (HV )SvRV (self);
1010	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1102	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1011	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1103	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1012	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1104	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1013	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
1014		1105
1015	if (items < 5)	1106	if (items < 5)
1016	{	1107	{
1017	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1108	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1018	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1109	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1019	}	1110	}
1020		1111
1021	if (ix)	1112	if (ix)
1022	{	1113	{
1023	glEnable (GL_BLEND);	1114	glEnable (GL_BLEND);
		1115
		1116	if (ix == 2)
1024	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1117	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1118	else
		1119	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1120	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1121
1025	glEnable (GL_ALPHA_TEST);	1122	glEnable (GL_ALPHA_TEST);
1026	glAlphaFunc (GL_GREATER, 0.01f);	1123	glAlphaFunc (GL_GREATER, 0.01f);
1027	}	1124	}
1028		1125
1029	glBindTexture (GL_TEXTURE_2D, name);	1126	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		1127
1037	glBegin (GL_QUADS);	1128	glBegin (GL_QUADS);
1038	glTexCoord2f (0, 0); glVertex2f (x , y );	1129	glTexCoord2f (0, 0); glVertex2f (x , y );
1039	glTexCoord2f (0, t); glVertex2f (x , y + h);	1130	glTexCoord2f (0, t); glVertex2f (x , y + h);
1040	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1131	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1046	glDisable (GL_ALPHA_TEST);	1137	glDisable (GL_ALPHA_TEST);
1047	glDisable (GL_BLEND);	1138	glDisable (GL_BLEND);
1048	}	1139	}
1049	}	1140	}
1050		1141
1051	MODULE = CFClient PACKAGE = CFClient::Map	1142	MODULE = CFPlus PACKAGE = CFPlus::Map
1052		1143
1053	CFClient::Map	1144	CFPlus::Map
1054	new (SV *class, int map_width, int map_height)	1145	new (SV *class, int map_width, int map_height)
1055	CODE:	1146	CODE:
1056	New (0, RETVAL, 1, struct map);	1147	New (0, RETVAL, 1, struct map);
1057	RETVAL->x = 0;	1148	RETVAL->x = 0;
1058	RETVAL->y = 0;	1149	RETVAL->y = 0;
…		…
1068	RETVAL->row = 0;	1159	RETVAL->row = 0;
1069	OUTPUT:	1160	OUTPUT:
1070	RETVAL	1161	RETVAL
1071		1162
1072	void	1163	void
1073	DESTROY (CFClient::Map self)	1164	DESTROY (CFPlus::Map self)
1074	CODE:	1165	CODE:
1075	{	1166	{
1076	map_clear (self);	1167	map_clear (self);
1077	Safefree (self->face);	1168	Safefree (self->face);
		1169	Safefree (self->tex);
1078	Safefree (self);	1170	Safefree (self);
1079	}	1171	}
1080		1172
1081	void	1173	void
1082	clear (CFClient::Map self)	1174	clear (CFPlus::Map self)
1083	CODE:	1175	CODE:
1084	map_clear (self);	1176	map_clear (self);
1085		1177
1086	void	1178	void
1087	set_face (CFClient::Map self, int face, int texid)	1179	set_face (CFPlus::Map self, int face, int texid)
1088	CODE:	1180	CODE:
1089	{	1181	{
1090	while (self->faces <= face)	1182	while (self->faces <= face)
1091	{	1183	{
1092	Append (mapface, self->face, self->faces, self->faces);	1184	Append (mapface, self->face, self->faces, self->faces);
…		…
1095		1187
1096	self->face [face] = texid;	1188	self->face [face] = texid;
1097	}	1189	}
1098		1190
1099	void	1191	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)	1192	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:	1193	CODE:
1102	{	1194	{
1103	while (self->texs <= texid)	1195	while (self->texs <= texid)
1104	{	1196	{
1105	Append (maptex, self->tex, self->texs, self->texs);	1197	Append (maptex, self->tex, self->texs, self->texs);
…		…
1117	tex->r = r;	1209	tex->r = r;
1118	tex->g = g;	1210	tex->g = g;
1119	tex->b = b;	1211	tex->b = b;
1120	tex->a = a;	1212	tex->a = a;
1121	}	1213	}
		1214
		1215	// somewhat hackish, but for textures that require it, it really
		1216	// improves the look, and most others don't suffer.
		1217	glBindTexture (GL_TEXTURE_2D, name);
		1218	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1219	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1220	// use uglier nearest interpolation because linear suffers
		1221	// from transparent color bleeding and ugly wrapping effects.
		1222	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1122	}	1223	}
1123		1224
1124	int	1225	int
1125	ox (CFClient::Map self)	1226	ox (CFPlus::Map self)
1126	ALIAS:	1227	ALIAS:
1127	oy = 1	1228	oy = 1
		1229	x = 2
		1230	y = 3
		1231	w = 4
		1232	h = 5
1128	CODE:	1233	CODE:
1129	switch (ix)	1234	switch (ix)
1130	{	1235	{
1131	case 0: RETVAL = self->ox; break;	1236	case 0: RETVAL = self->ox; break;
1132	case 1: RETVAL = self->oy; break;	1237	case 1: RETVAL = self->oy; break;
		1238	case 2: RETVAL = self->x; break;
		1239	case 3: RETVAL = self->y; break;
		1240	case 4: RETVAL = self->w; break;
		1241	case 5: RETVAL = self->h; break;
1133	}	1242	}
1134	OUTPUT:	1243	OUTPUT:
1135	RETVAL	1244	RETVAL
1136		1245
1137	void	1246	void
1138	scroll (CFClient::Map self, int dx, int dy)	1247	scroll (CFPlus::Map self, int dx, int dy)
1139	CODE:	1248	CODE:
1140	{	1249	{
1141	if (dx > 0)	1250	if (dx > 0)
1142	map_blank (self, self->x, self->y, dx - 1, self->h);	1251	map_blank (self, self->x, self->y, dx, self->h);
1143	else if (dx < 0)	1252	else if (dx < 0)
1144	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1253	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1145		1254
1146	if (dy > 0)	1255	if (dy > 0)
1147	map_blank (self, self->x, self->y, self->w, dy - 1);	1256	map_blank (self, self->x, self->y, self->w, dy);
1148	else if (dy < 0)	1257	else if (dy < 0)
1149	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1258	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1150		1259
1151	self->ox += dx; self->x += dx;	1260	self->ox += dx; self->x += dx;
1152	self->oy += dy; self->y += dy;	1261	self->oy += dy; self->y += dy;
1153		1262
1154	while (self->y < 0)	1263	while (self->y < 0)
…		…
1159	self->y += MAP_EXTEND_Y;	1268	self->y += MAP_EXTEND_Y;
1160	}	1269	}
1161	}	1270	}
1162		1271
1163	void	1272	void
1164	map1a_update (CFClient::Map self, SV *data_)	1273	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1165	CODE:	1274	CODE:
1166	{	1275	{
1167	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1276	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1168	uint8_t data_end = (uint8_t )SvEND (data_);	1277	uint8_t data_end = (uint8_t )SvEND (data_);
1169	mapcell *cell;	1278	mapcell *cell;
1170	int x, y, flags;	1279	int x, y, flags;
1171		1280
1172	while (data < data_end)	1281	while (data < data_end - 1)
1173	{	1282	{
1174	flags = (data [0] << 8) + data [1]; data += 2;	1283	flags = (data [0] << 8) + data [1]; data += 2;
1175		1284
1176	x = ((flags >> 10) & 63) + self->x;	1285	x = self->x + ((flags >> 10) & 63);
1177	y = ((flags >> 4) & 63) + self->y;	1286	y = self->y + ((flags >> 4) & 63);
1178		1287
1179	cell = map_get_cell (self, x, y);	1288	cell = map_get_cell (self, x, y);
1180		1289
1181	if (flags & 15)	1290	if (flags & 15)
1182	{	1291	{
1183	if (cell->darkness < 0)	1292	if (!cell->darkness)
1184	{	1293	{
		1294	memset (cell, 0, sizeof (*cell));
1185	cell->darkness = 0;	1295	cell->darkness = 256;
1186	cell->face [0] = 0;
1187	cell->face [1] = 0;
1188	cell->face [2] = 0;
1189	}	1296	}
1190		1297
1191	cell->darkness = flags & 8 ? *data++ : 255;
1192
1193	//TODO: don't trust server data to be in-range(!)	1298	//TODO: don't trust server data to be in-range(!)
		1299
		1300	if (flags & 8)
		1301	{
		1302	if (extmap)
		1303	{
		1304	uint8_t ext, cmd;
		1305
		1306	do
		1307	{
		1308	ext = *data++;
		1309	cmd = ext & 0x3f;
		1310
		1311	if (cmd < 4)
		1312	cell->darkness = 255 - ext * 64 + 1;
		1313	else if (cmd == 5) // health
		1314	{
		1315	cell->stat_width = 1;
		1316	cell->stat_hp = *data++;
		1317	}
		1318	else if (cmd == 6) // monster width
		1319	cell->stat_width = *data++ + 1;
		1320	else if (cmd == 0x47) // monster width
		1321	{
		1322	if (*data == 4)
		1323	; // decode player tag
		1324
		1325	data += *data + 1;
		1326	}
		1327	else if (cmd == 8) // cell flags
		1328	cell->flags = *data++;
		1329	else if (ext & 0x40) // unknown, multibyte => skip
		1330	data += *data + 1;
		1331	else
		1332	data++;
		1333	}
		1334	while (ext & 0x80);
		1335	}
		1336	else
		1337	cell->darkness = *data++ + 1;
		1338	}
1194		1339
1195	if (flags & 4)	1340	if (flags & 4)
1196	{	1341	{
1197	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1342	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1198	}	1343	}
…		…
1206	{	1351	{
1207	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1352	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1208	}	1353	}
1209	}	1354	}
1210	else	1355	else
1211	cell->darkness = -1;	1356	cell->darkness = 0;
1212	}	1357	}
1213	}	1358	}
1214		1359
1215	SV *	1360	SV *
1216	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1361	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1217	CODE:	1362	CODE:
1218	{	1363	{
1219	int x1, x;	1364	int x1, x;
1220	int y1, y;	1365	int y1, y;
1221	int z;	1366	int z;
…		…
1271	}	1416	}
1272	OUTPUT:	1417	OUTPUT:
1273	RETVAL	1418	RETVAL
1274		1419
1275	void	1420	void
1276	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1421	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1277	PPCODE:	1422	CODE:
1278	{	1423	{
1279	int vx, vy;	1424	int vx, vy;
1280	int x, y, z;	1425	int x, y, z;
1281	int last_name;	1426	int last_name;
1282	mapface face;	1427	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		1428
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;	1429	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1292	vy = self->y + (self->h - sh) / 2 - shift_y;	1430	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1293		1431
1294	/*	1432	/*
1295	int vx = self->vx = self->w >= sw	1433	int vx = self->vx = self->w >= sw
1296	? self->x + (self->w - sw) / 2	1434	? self->x + (self->w - sw) / 2
1297	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1435	: 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));	1439	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1302	*/	1440	*/
1303		1441
1304	glColor4ub (255, 255, 255, 255);	1442	glColor4ub (255, 255, 255, 255);
1305		1443
		1444	glEnable (GL_BLEND);
1306	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1445	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1307	glEnable (GL_BLEND);
1308	glEnable (GL_TEXTURE_2D);	1446	glEnable (GL_TEXTURE_2D);
1309	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1447	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1310		1448
1311	glBegin (GL_QUADS);	1449	glBegin (GL_QUADS);
1312		1450
…		…
1321	for (x = 0; x < sw; x++)	1459	for (x = 0; x < sw; x++)
1322	if (row->c0 <= x + vx && x + vx < row->c1)	1460	if (row->c0 <= x + vx && x + vx < row->c1)
1323	{	1461	{
1324	mapcell *cell = row->col + (x + vx - row->c0);	1462	mapcell *cell = row->col + (x + vx - row->c0);
1325		1463
1326	darkness[y * sw4 + x] = cell->darkness < 0
1327	? 255 - FOW_DARKNESS
1328	: 255 - cell->darkness;
1329
1330	face = cell->face [z];	1464	face = cell->face [z];
1331		1465
1332	if (face)	1466	if (face && face < self->texs)
1333	{	1467	{
1334	maptex tex = self->tex [face];	1468	maptex tex = self->tex [face];
1335
1336	int px = (x + 1) * 32 - tex.w;	1469	int px = (x + 1) * 32 - tex.w;
1337	int py = (y + 1) * 32 - tex.h;	1470	int py = (y + 1) * 32 - tex.h;
1338		1471
1339	if (last_name != tex.name)	1472	if (last_name != tex.name)
1340	{	1473	{
1341	glEnd ();	1474	glEnd ();
1342	last_name = tex.name;
1343	glBindTexture (GL_TEXTURE_2D, last_name);	1475	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1344	glBegin (GL_QUADS);	1476	glBegin (GL_QUADS);
1345	}	1477	}
1346		1478
1347	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1479	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1348	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1480	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1349	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1481	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1350	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1482	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1351	}	1483	}
		1484
		1485	if (cell->flags && z == 2)
		1486	{
		1487	if (cell->flags & 1)
		1488	{
		1489	maptex tex = self->tex [1];
		1490	int px = (x + 1) * 32 - tex.w + 2;
		1491	int py = (y + 1) * 32 - tex.h - 6;
		1492
		1493	glEnd ();
		1494	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1495	glBegin (GL_QUADS);
		1496
		1497	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1498	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1499	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1500	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1501	}
		1502	}
1352	}	1503	}
1353	}	1504	}
1354		1505
1355	glEnd ();	1506	glEnd ();
1356		1507
1357	glDisable (GL_TEXTURE_2D);	1508	glDisable (GL_TEXTURE_2D);
1358	glDisable (GL_BLEND);	1509	glDisable (GL_BLEND);
		1510
		1511	// top layer: overlays such as the health bar
		1512	for (y = 0; y < sh; y++)
		1513	if (0 <= y + vy && y + vy < self->rows)
		1514	{
		1515	maprow *row = self->row + (y + vy);
		1516
		1517	for (x = 0; x < sw; x++)
		1518	if (row->c0 <= x + vx && x + vx < row->c1)
		1519	{
		1520	mapcell *cell = row->col + (x + vx - row->c0);
		1521
		1522	int px = x * 32;
		1523	int py = y * 32;
		1524
		1525	if (cell->stat_hp)
		1526	{
		1527	int width = cell->stat_width * 32;
		1528	int thick = sh / 28 + 1 + cell->stat_width;
		1529
		1530	glColor3ub (0, 0, 0);
		1531	glRectf (px + 1, py - thick - 2,
		1532	px + width - 1, py);
		1533
		1534	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1535	glRectf (px + 2,
		1536	py - thick - 1,
		1537	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1538	}
		1539	}
		1540	}
		1541	}
		1542
		1543	void
		1544	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1545	CODE:
		1546	{
		1547	static float color[16][3] = {
		1548	{ 0.00F, 0.00F, 0.00F },
		1549	{ 1.00F, 1.00F, 1.00F },
		1550	{ 0.00F, 0.00F, 0.55F },
		1551	{ 1.00F, 0.00F, 0.00F },
		1552
		1553	{ 1.00F, 0.54F, 0.00F },
		1554	{ 0.11F, 0.56F, 1.00F },
		1555	{ 0.93F, 0.46F, 0.00F },
		1556	{ 0.18F, 0.54F, 0.34F },
		1557
		1558	{ 0.56F, 0.73F, 0.56F },
		1559	{ 0.80F, 0.80F, 0.80F },
		1560	{ 0.55F, 0.41F, 0.13F },
		1561	{ 0.99F, 0.77F, 0.26F },
		1562
		1563	{ 0.74F, 0.65F, 0.41F },
		1564
		1565	{ 0.00F, 1.00F, 1.00F },
		1566	{ 1.00F, 0.00F, 1.00F },
		1567	{ 1.00F, 1.00F, 0.00F },
		1568	};
		1569
		1570	int x, y;
		1571
		1572	glEnable (GL_TEXTURE_2D);
		1573	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1574	glEnable (GL_BLEND);
		1575	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1576	glBegin (GL_QUADS);
		1577
		1578	for (y = 0; y < h; y++)
		1579	for (x = 0; x < w; x++)
		1580	{
		1581	unsigned char m = data [x + y * w];
		1582
		1583	if (m)
		1584	{
		1585	float *c = color [m & 15];
		1586
		1587	float tx1 = m & 0x40 ? 0.5 : 0.;
		1588	float tx2 = tx1 + 0.5;
		1589
		1590	glColor4f (c[0], c[1], c[2], 0.75);
		1591	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1592	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1593	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1594	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1595	}
		1596	}
		1597
		1598	glEnd ();
		1599	glDisable (GL_BLEND);
		1600	glDisable (GL_TEXTURE_2D);
		1601	}
		1602
		1603	void
		1604	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1605	PPCODE:
		1606	{
		1607	int vx, vy;
		1608	int x, y;
		1609	int sw4 = (sw + 3) & ~3;
		1610	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1611	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1612
		1613	memset (darkness, 255, sw4 * sh);
		1614	SvPOK_only (darkness_sv);
		1615	SvCUR_set (darkness_sv, sw4 * sh);
		1616
		1617	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1618	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1619
		1620	for (y = 0; y < sh; y++)
		1621	if (0 <= y + vy && y + vy < self->rows)
		1622	{
		1623	maprow *row = self->row + (y + vy);
		1624
		1625	for (x = 0; x < sw; x++)
		1626	if (row->c0 <= x + vx && x + vx < row->c1)
		1627	{
		1628	mapcell *cell = row->col + (x + vx - row->c0);
		1629
		1630	darkness[y * sw4 + x] = cell->darkness
		1631	? 255 - (cell->darkness - 1)
		1632	: 255 - FOW_DARKNESS;
		1633	}
		1634	}
1359		1635
1360	EXTEND (SP, 3);	1636	EXTEND (SP, 3);
1361	PUSHs (sv_2mortal (newSViv (sw4)));	1637	PUSHs (sv_2mortal (newSViv (sw4)));
1362	PUSHs (sv_2mortal (newSViv (sh)));	1638	PUSHs (sv_2mortal (newSViv (sh)));
1363	PUSHs (darkness_sv);	1639	PUSHs (darkness_sv);
1364	}	1640	}
1365		1641
1366	SV *	1642	SV *
1367	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1643	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1368	CODE:	1644	CODE:
1369	{	1645	{
1370	int x, y, x1, y1;	1646	int x, y, x1, y1;
1371	SV data_sv = newSV (w h * 7 + 5);	1647	SV data_sv = newSV (w h * 7 + 5);
1372	uint8_t data = (uint8_t )SvPVX (data_sv);	1648	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1434	}	1710	}
1435	OUTPUT:	1711	OUTPUT:
1436	RETVAL	1712	RETVAL
1437		1713
1438	void	1714	void
1439	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1715	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1440	PPCODE:	1716	PPCODE:
1441	{	1717	{
1442	int x, y, z;	1718	int x, y, z;
1443	int w, h;	1719	int w, h;
1444	int x1, y1;	1720	int x1, y1;
…		…
1476		1752
1477	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1753	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1478	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1754	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1479	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1755	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1480		1756
1481	if (cell->darkness <= 0)	1757	if (cell->darkness == 0)
1482	{	1758	{
1483	cell->darkness = -1;	1759	cell->darkness = 0;
1484		1760
1485	for (z = 0; z <= 2; z++)	1761	for (z = 0; z <= 2; z++)
1486	{	1762	{
1487	cell->face[z] = face[z];	1763	cell->face[z] = face[z];
1488		1764
…		…
1493	}	1769	}
1494	}	1770	}
1495	}	1771	}
1496	}	1772	}
1497		1773
1498	MODULE = CFClient PACKAGE = CFClient::MixChunk	1774	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1499		1775
1500	CFClient::MixChunk	1776	CFPlus::MixChunk
1501	new_from_file (SV class, char path)	1777	new_from_file (SV class, char path)
1502	CODE:	1778	CODE:
1503	RETVAL = Mix_LoadWAV (path);	1779	RETVAL = Mix_LoadWAV (path);
1504	OUTPUT:	1780	OUTPUT:
1505	RETVAL	1781	RETVAL
1506		1782
1507	void	1783	void
1508	DESTROY (CFClient::MixChunk self)	1784	DESTROY (CFPlus::MixChunk self)
1509	CODE:	1785	CODE:
1510	Mix_FreeChunk (self);	1786	Mix_FreeChunk (self);
1511		1787
1512	int	1788	int
1513	volume (CFClient::MixChunk self, int volume = -1)	1789	volume (CFPlus::MixChunk self, int volume = -1)
1514	CODE:	1790	CODE:
1515	RETVAL = Mix_VolumeChunk (self, volume);	1791	RETVAL = Mix_VolumeChunk (self, volume);
1516	OUTPUT:	1792	OUTPUT:
1517	RETVAL	1793	RETVAL
1518		1794
1519	int	1795	int
1520	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1796	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1521	CODE:	1797	CODE:
1522	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1798	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1523	OUTPUT:	1799	OUTPUT:
1524	RETVAL	1800	RETVAL
1525		1801
1526	MODULE = CFClient PACKAGE = CFClient::MixMusic	1802	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1527		1803
1528	int	1804	int
1529	volume (int volume = -1)	1805	volume (int volume = -1)
1530	CODE:	1806	CODE:
1531	RETVAL = Mix_VolumeMusic (volume);	1807	RETVAL = Mix_VolumeMusic (volume);
1532	OUTPUT:	1808	OUTPUT:
1533	RETVAL	1809	RETVAL
1534		1810
1535	CFClient::MixMusic	1811	CFPlus::MixMusic
1536	new_from_file (SV class, char path)	1812	new_from_file (SV class, char path)
1537	CODE:	1813	CODE:
1538	RETVAL = Mix_LoadMUS (path);	1814	RETVAL = Mix_LoadMUS (path);
1539	OUTPUT:	1815	OUTPUT:
1540	RETVAL	1816	RETVAL
1541		1817
1542	void	1818	void
1543	DESTROY (CFClient::MixMusic self)	1819	DESTROY (CFPlus::MixMusic self)
1544	CODE:	1820	CODE:
1545	Mix_FreeMusic (self);	1821	Mix_FreeMusic (self);
1546		1822
1547	int	1823	int
1548	play (CFClient::MixMusic self, int loops = -1)	1824	play (CFPlus::MixMusic self, int loops = -1)
1549	CODE:	1825	CODE:
1550	RETVAL = Mix_PlayMusic (self, loops);	1826	RETVAL = Mix_PlayMusic (self, loops);
1551	OUTPUT:	1827	OUTPUT:
1552	RETVAL	1828	RETVAL
1553		1829
1554	MODULE = CFClient PACKAGE = CFClient::OpenGL	1830	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1555		1831
1556	BOOT:	1832	BOOT:
1557	{	1833	{
1558	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1834	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1559	static const struct {	1835	static const struct {
1560	const char *name;	1836	const char *name;
1561	IV iv;	1837	IV iv;
1562	} *civ, const_iv[] = {	1838	} *civ, const_iv[] = {
1563	# define const_iv(name) { # name, (IV)name }	1839	# define const_iv(name) { # name, (IV)name }
…		…
1570	const_iv (GL_SCISSOR_TEST),	1846	const_iv (GL_SCISSOR_TEST),
1571	const_iv (GL_DEPTH_TEST),	1847	const_iv (GL_DEPTH_TEST),
1572	const_iv (GL_ALPHA_TEST),	1848	const_iv (GL_ALPHA_TEST),
1573	const_iv (GL_NORMALIZE),	1849	const_iv (GL_NORMALIZE),
1574	const_iv (GL_RESCALE_NORMAL),	1850	const_iv (GL_RESCALE_NORMAL),
		1851	const_iv (GL_FRONT),
		1852	const_iv (GL_BACK),
1575	const_iv (GL_AND),	1853	const_iv (GL_AND),
1576	const_iv (GL_ONE),	1854	const_iv (GL_ONE),
1577	const_iv (GL_ZERO),	1855	const_iv (GL_ZERO),
1578	const_iv (GL_SRC_ALPHA),	1856	const_iv (GL_SRC_ALPHA),
1579	const_iv (GL_SRC_ALPHA_SATURATE),	1857	const_iv (GL_DST_ALPHA),
1580	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1858	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1581	const_iv (GL_ONE_MINUS_DST_ALPHA),	1859	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1860	const_iv (GL_SRC_ALPHA_SATURATE),
1582	const_iv (GL_RGB),	1861	const_iv (GL_RGB),
1583	const_iv (GL_RGBA),	1862	const_iv (GL_RGBA),
		1863	const_iv (GL_RGBA4),
		1864	const_iv (GL_RGBA8),
		1865	const_iv (GL_RGB5_A1),
1584	const_iv (GL_UNSIGNED_BYTE),	1866	const_iv (GL_UNSIGNED_BYTE),
1585	const_iv (GL_UNSIGNED_SHORT),	1867	const_iv (GL_UNSIGNED_SHORT),
1586	const_iv (GL_UNSIGNED_INT),	1868	const_iv (GL_UNSIGNED_INT),
1587	const_iv (GL_ALPHA),	1869	const_iv (GL_ALPHA),
1588	const_iv (GL_INTENSITY),	1870	const_iv (GL_INTENSITY),
…		…
1597	const_iv (GL_TEXTURE_MAG_FILTER),	1879	const_iv (GL_TEXTURE_MAG_FILTER),
1598	const_iv (GL_TEXTURE_MIN_FILTER),	1880	const_iv (GL_TEXTURE_MIN_FILTER),
1599	const_iv (GL_TEXTURE_ENV_MODE),	1881	const_iv (GL_TEXTURE_ENV_MODE),
1600	const_iv (GL_TEXTURE_WRAP_S),	1882	const_iv (GL_TEXTURE_WRAP_S),
1601	const_iv (GL_TEXTURE_WRAP_T),	1883	const_iv (GL_TEXTURE_WRAP_T),
		1884	const_iv (GL_REPEAT),
1602	const_iv (GL_CLAMP),	1885	const_iv (GL_CLAMP),
1603	const_iv (GL_REPEAT),	1886	const_iv (GL_CLAMP_TO_EDGE),
1604	const_iv (GL_NEAREST),	1887	const_iv (GL_NEAREST),
1605	const_iv (GL_LINEAR),	1888	const_iv (GL_LINEAR),
1606	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1889	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1607	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1890	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1608	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1891	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1619	const_iv (GL_SEPARABLE_2D),	1902	const_iv (GL_SEPARABLE_2D),
1620	const_iv (GL_CONVOLUTION_2D),	1903	const_iv (GL_CONVOLUTION_2D),
1621	const_iv (GL_CONVOLUTION_BORDER_MODE),	1904	const_iv (GL_CONVOLUTION_BORDER_MODE),
1622	const_iv (GL_CONSTANT_BORDER),	1905	const_iv (GL_CONSTANT_BORDER),
1623	const_iv (GL_LINES),	1906	const_iv (GL_LINES),
		1907	const_iv (GL_LINE_STRIP),
1624	const_iv (GL_LINE_LOOP),	1908	const_iv (GL_LINE_LOOP),
1625	const_iv (GL_QUADS),	1909	const_iv (GL_QUADS),
1626	const_iv (GL_QUAD_STRIP),	1910	const_iv (GL_QUAD_STRIP),
1627	const_iv (GL_TRIANGLES),	1911	const_iv (GL_TRIANGLES),
1628	const_iv (GL_TRIANGLE_STRIP),	1912	const_iv (GL_TRIANGLE_STRIP),
…		…
1638		1922
1639	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1923	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1640	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1924	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1641	}	1925	}
1642		1926
		1927	char *
		1928	gl_vendor ()
		1929	CODE:
		1930	RETVAL = (char *)glGetString (GL_VENDOR);
		1931	OUTPUT:
		1932	RETVAL
		1933
		1934	char *
		1935	gl_version ()
		1936	CODE:
		1937	RETVAL = (char *)glGetString (GL_VERSION);
		1938	OUTPUT:
		1939	RETVAL
		1940
		1941	char *
		1942	gl_extensions ()
		1943	CODE:
		1944	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1945	OUTPUT:
		1946	RETVAL
		1947
1643	int glGetError ()	1948	int glGetError ()
		1949
		1950	void glFinish ()
1644		1951
1645	void glClear (int mask)	1952	void glClear (int mask)
1646		1953
1647	void glClearColor (float r, float g, float b, float a = 1.0)	1954	void glClearColor (float r, float g, float b, float a = 1.0)
1648	PROTOTYPE: @	1955	PROTOTYPE: @
…		…
1655		1962
1656	void glHint (int target, int mode)	1963	void glHint (int target, int mode)
1657		1964
1658	void glBlendFunc (int sfactor, int dfactor)	1965	void glBlendFunc (int sfactor, int dfactor)
1659		1966
		1967	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1968	CODE:
		1969	gl_BlendFuncSeparate (sa, da, saa, daa);
		1970
1660	void glDepthMask (int flag)	1971	void glDepthMask (int flag)
1661		1972
1662	void glLogicOp (int opcode)	1973	void glLogicOp (int opcode)
1663		1974
1664	void glColorMask (int red, int green, int blue, int alpha)	1975	void glColorMask (int red, int green, int blue, int alpha)
…		…
1668	void glPushMatrix ()	1979	void glPushMatrix ()
1669		1980
1670	void glPopMatrix ()	1981	void glPopMatrix ()
1671		1982
1672	void glLoadIdentity ()	1983	void glLoadIdentity ()
		1984
		1985	void glDrawBuffer (int buffer)
		1986
		1987	void glReadBuffer (int buffer)
1673		1988
1674	# near_ and far_ are due to microsofts buggy "c" compiler	1989	# 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_)	1990	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1676		1991
1677	# near_ and far_ are due to microsofts buggy "c" compiler	1992	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1697		2012
1698	void glEnd ()	2013	void glEnd ()
1699		2014
1700	void glColor (float r, float g, float b, float a = 1.0)	2015	void glColor (float r, float g, float b, float a = 1.0)
1701	PROTOTYPE: @	2016	PROTOTYPE: @
		2017	ALIAS:
		2018	glColor_premultiply = 1
1702	CODE:	2019	CODE:
		2020	if (ix)
		2021	{
		2022	r *= a;
		2023	g *= a;
		2024	b *= a;
		2025	}
1703	// microsoft visual "c" rounds instead of truncating...	2026	// microsoft visual "c" rounds instead of truncating...
1704	glColor4ub (MIN ((int)(r * 255.f), 255),	2027	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		2028
1709	void glInterleavedArrays (int format, int stride, char *data)	2029	void glInterleavedArrays (int format, int stride, char *data)
1710		2030
1711	void glDrawElements (int mode, int count, int type, char *indices)	2031	void glDrawElements (int mode, int count, int type, char *indices)
1712		2032
…		…
1735		2055
1736	void glBindTexture (int target, int name)	2056	void glBindTexture (int target, int name)
1737		2057
1738	void glConvolutionParameter (int target, int pname, float params)	2058	void glConvolutionParameter (int target, int pname, float params)
1739	CODE:	2059	CODE:
1740	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2060	if (gl.ConvolutionParameterf)
		2061	gl.ConvolutionParameterf (target, pname, params);
1741		2062
1742	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2063	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1743	CODE:	2064	CODE:
1744	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2065	if (gl.ConvolutionFilter2D)
1745	(target, internalformat, width, height, format, type, data));	2066	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1746		2067
1747	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2068	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1748	CODE:	2069	CODE:
1749	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2070	if (gl.SeparableFilter2D)
1750	(target, internalformat, width, height, format, type, row, column));	2071	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1751		2072
1752	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2073	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1753		2074
1754	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2075	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1755		2076
…		…
1788		2109
1789	void glEndList ()	2110	void glEndList ()
1790		2111
1791	void glCallList (int list)	2112	void glCallList (int list)
1792		2113
1793

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.93 by root, Tue May 23 18:54:37 2006 UTC vs. Revision 1.156 by root, Thu Sep 21 14:47:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.156 by root, Thu Sep 21 14:47:51 2006 UTC