[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.98 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.134 by root, Fri Aug 4 16:49:58 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	{
113	pango_layout_get_pixel_size (self->pl, w, h);	149	pango_layout_get_pixel_size (self->pl, w, h);
114		150
115	if (!w) w = 1;	151	if (!w) w = 1;
116	if (!h) h = 1;	152	if (!h) h = 1;
…		…
146	int texs;	182	int texs;
147	maptex *tex;	183	maptex *tex;
148		184
149	int32_t rows;	185	int32_t rows;
150	maprow *row;	186	maprow *row;
151	} *CFClient__Map;	187	} *CFPlus__Map;
152		188
153	static char *	189	static char *
154	prepend (char *ptr, int sze, int inc)	190	prepend (char *ptr, int sze, int inc)
155	{	191	{
156	char *p;	192	char *p;
…		…
174		210
175	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	211	#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))	212	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		213
178	static maprow *	214	static maprow *
179	map_get_row (CFClient__Map self, int y)	215	map_get_row (CFPlus__Map self, int y)
180	{	216	{
181	if (0 > y)	217	if (0 > y)
182	{	218	{
183	int extend = - y + MAP_EXTEND_Y;	219	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	220	Prepend (maprow, self->row, self->rows, extend);
…		…
222		258
223	return row->col + (x - row->c0);	259	return row->col + (x - row->c0);
224	}	260	}
225		261
226	static mapcell *	262	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	263	map_get_cell (CFPlus__Map self, int x, int y)
228	{	264	{
229	return row_get_cell (map_get_row (self, y), x);	265	return row_get_cell (map_get_row (self, y), x);
230	}	266	}
231		267
232	static void	268	static void
233	map_clear (CFClient__Map self)	269	map_clear (CFPlus__Map self)
234	{	270	{
235	int r;	271	int r;
236		272
237	for (r = 0; r < self->rows; r++)	273	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	274	Safefree (self->row[r].col);
…		…
246	self->row = 0;	282	self->row = 0;
247	self->rows = 0;	283	self->rows = 0;
248	}	284	}
249		285
250	static void	286	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	287	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	288	{
253	int x, y;	289	int x, y;
254	maprow *row;	290	maprow *row;
255		291
256	for (y = y0; y < y0 + h; y++)	292	for (y = y0; y < y0 + h; y++)
…		…
296	ev.data2 = 0;	332	ev.data2 = 0;
297		333
298	SDL_PushEvent ((SDL_Event *)&ev);	334	SDL_PushEvent ((SDL_Event *)&ev);
299	}	335	}
300		336
		337	static unsigned int
		338	minpot (unsigned int n)
		339	{
		340	if (!n)
		341	return 0;
		342
		343	--n;
		344
		345	n \|= n >> 1;
		346	n \|= n >> 2;
		347	n \|= n >> 4;
		348	n \|= n >> 8;
		349	n \|= n >> 16;
		350
		351	return n + 1;
		352	}
		353
301	MODULE = CFClient PACKAGE = CFClient	354	MODULE = CFPlus PACKAGE = CFPlus
302		355
303	PROTOTYPES: ENABLE	356	PROTOTYPES: ENABLE
304		357
305	BOOT:	358	BOOT:
306	{	359	{
307	HV *stash = gv_stashpv ("CFClient", 1);	360	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	361	static const struct {
309	const char *name;	362	const char *name;
310	IV iv;	363	IV iv;
311	} *civ, const_iv[] = {	364	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	365	# define const_iv(name) { # name, (IV)name }
…		…
413		466
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	467	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	469	}
417		470
		471	int
		472	in_destruct ()
		473	CODE:
		474	RETVAL = PL_main_cv == Nullcv;
		475	OUTPUT:
		476	RETVAL
		477
		478	NV floor (NV x)
		479
		480	NV ceil (NV x)
		481
418	void	482	void
419	pango_init ()	483	pango_init ()
420	CODE:	484	CODE:
421	{	485	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	486	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	487	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);	488	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	}	489	}
430		490
431	int	491	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	492	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		493
434	void	494	void
435	SDL_Quit ()	495	SDL_Quit ()
436		496
437	void	497	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	504	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	505	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	506	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		507
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	508	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	509	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		510
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	511	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		515
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	516	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		517	#if SDL_VERSION_ATLEAST(1,2,10)
		518	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		519	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		520	#endif
457		521
458	SDL_EnableUNICODE (1);	522	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	523	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		524
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	525	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	543	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	544	CODE:
481	RETVAL = !!SDL_SetVideoMode (	545	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	546	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	547	);
		548	if (RETVAL)
		549	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	550	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		551	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		552	# include "glfunc.h"
		553	# undef GL_FUNC
		554	}
485	OUTPUT:	555	OUTPUT:
486	RETVAL	556	RETVAL
487		557
488	void	558	void
489	SDL_GL_SwapBuffers ()	559	SDL_GL_SwapBuffers ()
…		…
542	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	612	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	613	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544	break;	614	break;
545	}	615	}
546		616
547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	617	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548	}	618	}
549	}	619	}
550		620
551	int	621	int
552	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	622	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
568	#endif	638	#endif
569		639
570	void	640	void
571	add_font (char *file)	641	add_font (char *file)
572	CODE:	642	CODE:
573	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	643	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
574	#ifdef _WIN32
575	// cairo... sigh... requires win2000
576	AddFontResourceEx (file, FR_PRIVATE, 0);
577	#endif
578		644
579	void	645	void
580	load_image_inline (SV *image_)	646	load_image_inline (SV *image_)
581	ALIAS:	647	ALIAS:
582	load_image_file = 1	648	load_image_file = 1
…		…
624		690
625	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	691	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
626		692
627	assert (surface2->pitch == surface2->w * 4);	693	assert (surface2->pitch == surface2->w * 4);
628		694
		695	SDL_LockSurface (surface2);
629	EXTEND (SP, 5);	696	EXTEND (SP, 6);
630	PUSHs (sv_2mortal (newSViv (surface2->w)));	697	PUSHs (sv_2mortal (newSViv (surface2->w)));
631	PUSHs (sv_2mortal (newSViv (surface2->h)));	698	PUSHs (sv_2mortal (newSViv (surface2->h)));
632	SDL_LockSurface (surface2);
633	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	699	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
634	SDL_UnlockSurface (surface2);
635	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	700	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
636	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	701	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
637	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	702	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		703	SDL_UnlockSurface (surface2);
638		704
639	SDL_FreeSurface (surface);	705	SDL_FreeSurface (surface);
640	SDL_FreeSurface (surface2);	706	SDL_FreeSurface (surface2);
641	}	707	}
642		708
…		…
678	CODE:	744	CODE:
679	fprintf (stderr, "FATAL: %s\n", message);	745	fprintf (stderr, "FATAL: %s\n", message);
680	#ifdef _WIN32	746	#ifdef _WIN32
681	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	747	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
682	#endif	748	#endif
683	exit (1);	749	_exit (1);
684		750
		751	void
		752	_exit (int retval)
		753	CODE:
		754	_exit (retval);
		755
685	MODULE = CFClient PACKAGE = CFClient::Font	756	MODULE = CFPlus PACKAGE = CFPlus::Font
686		757
687	CFClient::Font	758	CFPlus::Font
688	new_from_file (SV class, char path, int id = 0)	759	new_from_file (SV class, char path, int id = 0)
689	CODE:	760	CODE:
690	{	761	{
691	int count;	762	int count;
692	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	763	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
695	}	766	}
696	OUTPUT:	767	OUTPUT:
697	RETVAL	768	RETVAL
698		769
699	void	770	void
700	DESTROY (CFClient::Font self)	771	DESTROY (CFPlus::Font self)
701	CODE:	772	CODE:
702	pango_font_description_free (self);	773	pango_font_description_free (self);
703		774
704	void	775	void
705	make_default (CFClient::Font self)	776	make_default (CFPlus::Font self)
706	CODE:	777	CODE:
707	default_font = self;	778	default_font = self;
708		779
709	MODULE = CFClient PACKAGE = CFClient::Layout	780	MODULE = CFPlus PACKAGE = CFPlus::Layout
710		781
711	CFClient::Layout	782	void
712	new (SV *class, int rgba = 0)	783	reset_glyph_cache ()
713	CODE:	784	CODE:
714	#if _WIN32	785	tc_clear ();
715	//rgba = 0;//D make stext nicer, breaks TextView	786
716	#endif	787	CFPlus::Layout
		788	new (SV *class)
		789	CODE:
717	New (0, RETVAL, 1, struct cf_layout);	790	New (0, RETVAL, 1, struct cf_layout);
718		791
719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	792	RETVAL->pl = pango_layout_new (opengl_context);
720	RETVAL->rgba = rgba;
721	RETVAL->r = 1.;	793	RETVAL->r = 1.;
722	RETVAL->g = 1.;	794	RETVAL->g = 1.;
723	RETVAL->b = 1.;	795	RETVAL->b = 1.;
724	RETVAL->a = 1.;	796	RETVAL->a = 1.;
725	RETVAL->base_height = MIN_FONT_HEIGHT;	797	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
729	layout_update_font (RETVAL);	801	layout_update_font (RETVAL);
730	OUTPUT:	802	OUTPUT:
731	RETVAL	803	RETVAL
732		804
733	void	805	void
734	DESTROY (CFClient::Layout self)	806	DESTROY (CFPlus::Layout self)
735	CODE:	807	CODE:
736	g_object_unref (self->pl);	808	g_object_unref (self->pl);
737	Safefree (self);	809	Safefree (self);
738		810
739	int
740	is_rgba (CFClient::Layout self)
741	CODE:
742	RETVAL = self->rgba;
743	OUTPUT:
744	RETVAL
745
746	void	811	void
747	set_text (CFClient::Layout self, SV *text_)	812	set_text (CFPlus::Layout self, SV *text_)
748	CODE:	813	CODE:
749	{	814	{
750	STRLEN textlen;	815	STRLEN textlen;
751	char *text = SvPVutf8 (text_, textlen);	816	char *text = SvPVutf8 (text_, textlen);
752		817
753	pango_layout_set_text (self->pl, text, textlen);	818	pango_layout_set_text (self->pl, text, textlen);
754	}	819	}
755		820
756	void	821	void
757	set_markup (CFClient::Layout self, SV *text_)	822	set_markup (CFPlus::Layout self, SV *text_)
758	CODE:	823	CODE:
759	{	824	{
760	STRLEN textlen;	825	STRLEN textlen;
761	char *text = SvPVutf8 (text_, textlen);	826	char *text = SvPVutf8 (text_, textlen);
762		827
763	pango_layout_set_markup (self->pl, text, textlen);	828	pango_layout_set_markup (self->pl, text, textlen);
764	}	829	}
765		830
		831	void
		832	set_shapes (CFPlus::Layout self, ...)
		833	CODE:
		834	{
		835	PangoAttrList *attrs = 0;
		836	const char *text = pango_layout_get_text (self->pl);
		837	const char *pos = text;
		838	int arg = 4;
		839
		840	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		841	{
		842	PangoRectangle inkrect, rect;
		843	PangoAttribute *attr;
		844
		845	int x = SvIV (ST (arg - 3));
		846	int y = SvIV (ST (arg - 2));
		847	int w = SvIV (ST (arg - 1));
		848	int h = SvIV (ST (arg ));
		849
		850	inkrect.x = 0;
		851	inkrect.y = 0;
		852	inkrect.width = 0;
		853	inkrect.height = 0;
		854
		855	rect.x = x * PANGO_SCALE;
		856	rect.y = y * PANGO_SCALE;
		857	rect.width = w * PANGO_SCALE;
		858	rect.height = h * PANGO_SCALE;
		859
		860	if (!attrs)
		861	attrs = pango_layout_get_attributes (self->pl);
		862
		863	attr = pango_attr_shape_new (&inkrect, &rect);
		864	attr->start_index = pos - text;
		865	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		866	pango_attr_list_insert (attrs, attr);
		867
		868	arg += 4;
		869	pos += sizeof (OBJ_STR) - 1;
		870	}
		871
		872	if (attrs)
		873	pango_layout_set_attributes (self->pl, attrs);
		874	}
		875
		876	void
		877	get_shapes (CFPlus::Layout self)
		878	PPCODE:
		879	{
		880	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		881
		882	do
		883	{
		884	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		885
		886	if (run && shape_attr_p (run))
		887	{
		888	PangoRectangle extents;
		889	pango_layout_iter_get_run_extents (iter, 0, &extents);
		890
		891	EXTEND (SP, 2);
		892	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		893	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		894	}
		895	}
		896	while (pango_layout_iter_next_run (iter));
		897
		898	pango_layout_iter_free (iter);
		899	}
		900
		901	int
		902	has_wrapped (CFPlus::Layout self)
		903	CODE:
		904	{
		905	int lines = 1;
		906	const char *text = pango_layout_get_text (self->pl);
		907
		908	while (*text)
		909	lines += *text++ == '\n';
		910
		911	RETVAL = lines < pango_layout_get_line_count (self->pl);
		912	}
		913	OUTPUT:
		914	RETVAL
		915
766	SV *	916	SV *
767	get_text (CFClient::Layout self)	917	get_text (CFPlus::Layout self)
768	CODE:	918	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	919	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	920	sv_utf8_decode (RETVAL);
771	OUTPUT:	921	OUTPUT:
772	RETVAL	922	RETVAL
773		923
774	void	924	void
775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	925	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
776	CODE:	926	CODE:
777	self->r = r;	927	self->r = r;
778	self->g = g;	928	self->g = g;
779	self->b = b;	929	self->b = b;
780	self->a = a;	930	self->a = a;
781		931
782	void	932	void
783	set_font (CFClient::Layout self, CFClient::Font font = 0)	933	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
784	CODE:	934	CODE:
785	if (self->font != font)	935	if (self->font != font)
786	{	936	{
787	self->font = font;	937	self->font = font;
788	layout_update_font (self);	938	layout_update_font (self);
789	}	939	}
790		940
791	void	941	void
792	set_height (CFClient::Layout self, int base_height)	942	set_height (CFPlus::Layout self, int base_height)
793	CODE:	943	CODE:
794	if (self->base_height != base_height)	944	if (self->base_height != base_height)
795	{	945	{
796	self->base_height = base_height;	946	self->base_height = base_height;
797	layout_update_font (self);	947	layout_update_font (self);
798	}	948	}
799		949
800	void	950	void
801	set_width (CFClient::Layout self, int max_width = -1)	951	set_width (CFPlus::Layout self, int max_width = -1)
802	CODE:	952	CODE:
803	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	953	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804		954
805	void	955	void
806	set_indent (CFClient::Layout self, int indent)	956	set_indent (CFPlus::Layout self, int indent)
807	CODE:	957	CODE:
808	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	958	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
809		959
810	void	960	void
811	set_spacing (CFClient::Layout self, int spacing)	961	set_spacing (CFPlus::Layout self, int spacing)
812	CODE:	962	CODE:
813	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	963	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
814		964
815	void	965	void
816	set_ellipsise (CFClient::Layout self, int ellipsise)	966	set_ellipsise (CFPlus::Layout self, int ellipsise)
817	CODE:	967	CODE:
818	pango_layout_set_ellipsize (self->pl,	968	pango_layout_set_ellipsize (self->pl,
819	ellipsise == 1 ? PANGO_ELLIPSIZE_START	969	ellipsise == 1 ? PANGO_ELLIPSIZE_START
820	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	970	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
821	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	971	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
822	: PANGO_ELLIPSIZE_NONE	972	: PANGO_ELLIPSIZE_NONE
823	);	973	);
824		974
825	void	975	void
826	set_single_paragraph_mode (CFClient::Layout self, int spm)	976	set_single_paragraph_mode (CFPlus::Layout self, int spm)
827	CODE:	977	CODE:
828	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	978	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
829		979
830	void	980	void
831	size (CFClient::Layout self)	981	size (CFPlus::Layout self)
832	PPCODE:	982	PPCODE:
833	{	983	{
834	int w, h;	984	int w, h;
835		985
836	layout_get_pixel_size (self, &w, &h);	986	layout_get_pixel_size (self, &w, &h);
…		…
839	PUSHs (sv_2mortal (newSViv (w)));	989	PUSHs (sv_2mortal (newSViv (w)));
840	PUSHs (sv_2mortal (newSViv (h)));	990	PUSHs (sv_2mortal (newSViv (h)));
841	}	991	}
842		992
843	int	993	int
		994	descent (CFPlus::Layout self)
		995	CODE:
		996	{
		997	PangoRectangle rect;
		998	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		999	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1000	RETVAL = PANGO_DESCENT (rect);
		1001	}
		1002	OUTPUT:
		1003	RETVAL
		1004
		1005	int
844	xy_to_index (CFClient::Layout self, int x, int y)	1006	xy_to_index (CFPlus::Layout self, int x, int y)
845	CODE:	1007	CODE:
846	{	1008	{
847	int index, trailing;	1009	int index, trailing;
848	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1010	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
849	RETVAL = index;	1011	RETVAL = index;
850	}	1012	}
851	OUTPUT:	1013	OUTPUT:
852	RETVAL	1014	RETVAL
853		1015
854	void	1016	void
855	cursor_pos (CFClient::Layout self, int index)	1017	cursor_pos (CFPlus::Layout self, int index)
856	PPCODE:	1018	PPCODE:
857	{	1019	{
858	PangoRectangle strong_pos;	1020	PangoRectangle strong_pos;
859	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1021	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
860		1022
…		…
863	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1025	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
864	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1026	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
865	}	1027	}
866		1028
867	void	1029	void
868	render (CFClient::Layout self)	1030	render (CFPlus::Layout self, float x, float y)
869	PPCODE:	1031	PPCODE:
870	{	1032	pango_opengl_render_layout_subpixel (
871	SV *retval;	1033	self->pl,
872	int w, h;	1034	x * PANGO_SCALE, y * PANGO_SCALE,
		1035	self->r, self->g, self->b, self->a
		1036	);
873		1037
874	layout_get_pixel_size (self, &w, &h);	1038	MODULE = CFPlus PACKAGE = CFPlus::Texture
875		1039
876	if (self->rgba)	1040	void
		1041	pad2pot (SV data_, SV w_, SV *h_)
		1042	CODE:
		1043	{
		1044	int ow = SvIV (w_);
		1045	int oh = SvIV (h_);
		1046
		1047	if (ow && oh)
877	{	1048	{
878	cairo_surface_t *surface;	1049	int nw = minpot (ow);
879	cairo_t *cairo;	1050	int nh = minpot (oh);
880		1051
881	retval = newSV (w * h * 4);	1052	if (nw != ow \|\| nh != oh)
882	SvPOK_only (retval);
883	SvCUR_set (retval, w * h * 4);
884
885	memset (SvPVX (retval), 0, w * h * 4);
886
887	surface = cairo_image_surface_create_for_data (
888	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
889	cairo = cairo_create (surface);
890	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
891
892	pango_cairo_show_layout (cairo, self->pl);
893
894	cairo_destroy (cairo);
895	cairo_surface_destroy (surface);
896
897	// what a mess, and its premultiplied, too :(
898	{	1053	{
899	uint32_t p = (uint32_t )SvPVX (retval);	1054	if (SvOK (data_))
900	uint32_t e = p + w h;
901
902	while (p < e)
903	{	1055	{
904	uint32_t rgba = *p;	1056	STRLEN datalen;
905	rgba = (rgba >> 24) \| (rgba << 8);	1057	char *data = SvPVbyte (data_, datalen);
906	#if 0	1058	int bpp = datalen / (ow * oh);
907	#ifdef _WIN32	1059	SV result_ = sv_2mortal (newSV (nw nh * bpp));
908	{//D
909	uint8_t r = rgba >> 24;
910	uint8_t g = rgba >> 16;
911	uint8_t b = rgba >> 8;
912	uint8_t a = rgba >> 0;
913		1060
914	rgba = (rgba & 0xffffff00) \| a;	1061	SvPOK_only (result_);
		1062	SvCUR_set (result_, nw * nh * bpp);
		1063
		1064	memset (SvPVX (result_), 0, nw * nh * bpp);
		1065	while (oh--)
		1066	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1067
		1068	sv_setsv (data_, result_);
915	}	1069	}
916	#endif	1070
917	#endif	1071	sv_setiv (w_, nw);
918	rgba = SDL_SwapBE32 (rgba);	1072	sv_setiv (h_, nh);
919	*p++ = rgba;
920	}	1073	}
921	}
922
923	EXTEND (SP, 5);
924	PUSHs (sv_2mortal (newSViv (w)));
925	PUSHs (sv_2mortal (newSViv (h)));
926	PUSHs (sv_2mortal (retval));
927	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
928	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
929	}	1074	}
930	else
931	{
932	FT_Bitmap bitmap;
933
934	retval = newSV (w * h);
935	SvPOK_only (retval);
936	SvCUR_set (retval, w * h);
937
938	bitmap.rows = h;
939	bitmap.width = w;
940	bitmap.pitch = w;
941	bitmap.buffer = (unsigned char*)SvPVX (retval);
942	bitmap.num_grays = 256;
943	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
944
945	memset (bitmap.buffer, 0, w * h);
946
947	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
948
949	EXTEND (SP, 5);
950	PUSHs (sv_2mortal (newSViv (w)));
951	PUSHs (sv_2mortal (newSViv (h)));
952	PUSHs (sv_2mortal (retval));
953	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
954	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
955	}
956	}	1075	}
957		1076
958	MODULE = CFClient PACKAGE = CFClient::Texture
959
960	void	1077	void
961	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1078	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
962	PROTOTYPE: $$$;$$	1079	PROTOTYPE: $$$;$$
963	ALIAS:	1080	ALIAS:
964	draw_quad_alpha = 1	1081	draw_quad_alpha = 1
965	draw_quad_alpha_premultiplied = 2	1082	draw_quad_alpha_premultiplied = 2
966	CODE:	1083	CODE:
…		…
977	}	1094	}
978		1095
979	if (ix)	1096	if (ix)
980	{	1097	{
981	glEnable (GL_BLEND);	1098	glEnable (GL_BLEND);
		1099
		1100	if (ix == 2)
982	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1101	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1102	else
		1103	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1104	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1105
983	glEnable (GL_ALPHA_TEST);	1106	glEnable (GL_ALPHA_TEST);
984	glAlphaFunc (GL_GREATER, 0.01f);	1107	glAlphaFunc (GL_GREATER, 0.01f);
985	}	1108	}
986		1109
987	glBindTexture (GL_TEXTURE_2D, name);	1110	glBindTexture (GL_TEXTURE_2D, name);
…		…
998	glDisable (GL_ALPHA_TEST);	1121	glDisable (GL_ALPHA_TEST);
999	glDisable (GL_BLEND);	1122	glDisable (GL_BLEND);
1000	}	1123	}
1001	}	1124	}
1002		1125
1003	MODULE = CFClient PACKAGE = CFClient::Map	1126	MODULE = CFPlus PACKAGE = CFPlus::Map
1004		1127
1005	CFClient::Map	1128	CFPlus::Map
1006	new (SV *class, int map_width, int map_height)	1129	new (SV *class, int map_width, int map_height)
1007	CODE:	1130	CODE:
1008	New (0, RETVAL, 1, struct map);	1131	New (0, RETVAL, 1, struct map);
1009	RETVAL->x = 0;	1132	RETVAL->x = 0;
1010	RETVAL->y = 0;	1133	RETVAL->y = 0;
…		…
1020	RETVAL->row = 0;	1143	RETVAL->row = 0;
1021	OUTPUT:	1144	OUTPUT:
1022	RETVAL	1145	RETVAL
1023		1146
1024	void	1147	void
1025	DESTROY (CFClient::Map self)	1148	DESTROY (CFPlus::Map self)
1026	CODE:	1149	CODE:
1027	{	1150	{
1028	map_clear (self);	1151	map_clear (self);
1029	Safefree (self->face);	1152	Safefree (self->face);
		1153	Safefree (self->tex);
1030	Safefree (self);	1154	Safefree (self);
1031	}	1155	}
1032		1156
1033	void	1157	void
1034	clear (CFClient::Map self)	1158	clear (CFPlus::Map self)
1035	CODE:	1159	CODE:
1036	map_clear (self);	1160	map_clear (self);
1037		1161
1038	void	1162	void
1039	set_face (CFClient::Map self, int face, int texid)	1163	set_face (CFPlus::Map self, int face, int texid)
1040	CODE:	1164	CODE:
1041	{	1165	{
1042	while (self->faces <= face)	1166	while (self->faces <= face)
1043	{	1167	{
1044	Append (mapface, self->face, self->faces, self->faces);	1168	Append (mapface, self->face, self->faces, self->faces);
…		…
1047		1171
1048	self->face [face] = texid;	1172	self->face [face] = texid;
1049	}	1173	}
1050		1174
1051	void	1175	void
1052	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)	1176	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)
1053	CODE:	1177	CODE:
1054	{	1178	{
1055	while (self->texs <= texid)	1179	while (self->texs <= texid)
1056	{	1180	{
1057	Append (maptex, self->tex, self->texs, self->texs);	1181	Append (maptex, self->tex, self->texs, self->texs);
…		…
1073	}	1197	}
1074		1198
1075	// somewhat hackish, but for textures that require it, it really	1199	// somewhat hackish, but for textures that require it, it really
1076	// improves the look, and most others don't suffer.	1200	// improves the look, and most others don't suffer.
1077	glBindTexture (GL_TEXTURE_2D, name);	1201	glBindTexture (GL_TEXTURE_2D, name);
1078	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1202	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1079	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1203	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1204	// use uglier nearest interpolation because linear suffers
		1205	// from transparent color bleeding and ugly wrapping effects.
		1206	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1080	}	1207	}
1081		1208
1082	int	1209	int
1083	ox (CFClient::Map self)	1210	ox (CFPlus::Map self)
1084	ALIAS:	1211	ALIAS:
1085	oy = 1	1212	oy = 1
		1213	x = 2
		1214	y = 3
		1215	w = 4
		1216	h = 5
1086	CODE:	1217	CODE:
1087	switch (ix)	1218	switch (ix)
1088	{	1219	{
1089	case 0: RETVAL = self->ox; break;	1220	case 0: RETVAL = self->ox; break;
1090	case 1: RETVAL = self->oy; break;	1221	case 1: RETVAL = self->oy; break;
		1222	case 2: RETVAL = self->x; break;
		1223	case 3: RETVAL = self->y; break;
		1224	case 4: RETVAL = self->w; break;
		1225	case 5: RETVAL = self->h; break;
1091	}	1226	}
1092	OUTPUT:	1227	OUTPUT:
1093	RETVAL	1228	RETVAL
1094		1229
1095	void	1230	void
1096	scroll (CFClient::Map self, int dx, int dy)	1231	scroll (CFPlus::Map self, int dx, int dy)
1097	CODE:	1232	CODE:
1098	{	1233	{
1099	if (dx > 0)	1234	if (dx > 0)
1100	map_blank (self, self->x, self->y, dx - 1, self->h);	1235	map_blank (self, self->x, self->y, dx - 1, self->h);
1101	else if (dx < 0)	1236	else if (dx < 0)
…		…
1117	self->y += MAP_EXTEND_Y;	1252	self->y += MAP_EXTEND_Y;
1118	}	1253	}
1119	}	1254	}
1120		1255
1121	void	1256	void
1122	map1a_update (CFClient::Map self, SV *data_)	1257	map1a_update (CFPlus::Map self, SV *data_)
1123	CODE:	1258	CODE:
1124	{	1259	{
1125	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1260	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1126	uint8_t data_end = (uint8_t )SvEND (data_);	1261	uint8_t data_end = (uint8_t )SvEND (data_);
1127	mapcell *cell;	1262	mapcell *cell;
…		…
1129		1264
1130	while (data < data_end)	1265	while (data < data_end)
1131	{	1266	{
1132	flags = (data [0] << 8) + data [1]; data += 2;	1267	flags = (data [0] << 8) + data [1]; data += 2;
1133		1268
1134	x = ((flags >> 10) & 63) + self->x;	1269	x = self->x + ((flags >> 10) & 63);
1135	y = ((flags >> 4) & 63) + self->y;	1270	y = self->y + ((flags >> 4) & 63);
1136		1271
1137	cell = map_get_cell (self, x, y);	1272	cell = map_get_cell (self, x, y);
1138		1273
1139	if (flags & 15)	1274	if (flags & 15)
1140	{	1275	{
…		…
1169	cell->darkness = -1;	1304	cell->darkness = -1;
1170	}	1305	}
1171	}	1306	}
1172		1307
1173	SV *	1308	SV *
1174	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1309	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1175	CODE:	1310	CODE:
1176	{	1311	{
1177	int x1, x;	1312	int x1, x;
1178	int y1, y;	1313	int y1, y;
1179	int z;	1314	int z;
…		…
1229	}	1364	}
1230	OUTPUT:	1365	OUTPUT:
1231	RETVAL	1366	RETVAL
1232		1367
1233	void	1368	void
1234	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1369	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1235	PPCODE:	1370	CODE:
1236	{	1371	{
1237	int vx, vy;	1372	int vx, vy;
1238	int x, y, z;	1373	int x, y, z;
1239	int last_name;	1374	int last_name;
1240	mapface face;	1375	mapface face;
1241	int sw4 = (sw + 3) & ~3;
1242	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1243	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1244		1376
1245	memset (darkness, 255, sw4 * sh);
1246	SvPOK_only (darkness_sv);
1247	SvCUR_set (darkness_sv, sw4 * sh);
1248
1249	vx = self->x + (self->w - sw) / 2 - shift_x;	1377	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1250	vy = self->y + (self->h - sh) / 2 - shift_y;	1378	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1251		1379
1252	/*	1380	/*
1253	int vx = self->vx = self->w >= sw	1381	int vx = self->vx = self->w >= sw
1254	? self->x + (self->w - sw) / 2	1382	? self->x + (self->w - sw) / 2
1255	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1383	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1259	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1387	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1260	*/	1388	*/
1261		1389
1262	glColor4ub (255, 255, 255, 255);	1390	glColor4ub (255, 255, 255, 255);
1263		1391
		1392	glEnable (GL_BLEND);
1264	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1393	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1265	glEnable (GL_BLEND);
1266	glEnable (GL_TEXTURE_2D);	1394	glEnable (GL_TEXTURE_2D);
1267	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1395	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1268		1396
1269	glBegin (GL_QUADS);	1397	glBegin (GL_QUADS);
1270		1398
…		…
1278		1406
1279	for (x = 0; x < sw; x++)	1407	for (x = 0; x < sw; x++)
1280	if (row->c0 <= x + vx && x + vx < row->c1)	1408	if (row->c0 <= x + vx && x + vx < row->c1)
1281	{	1409	{
1282	mapcell *cell = row->col + (x + vx - row->c0);	1410	mapcell *cell = row->col + (x + vx - row->c0);
1283
1284	darkness[y * sw4 + x] = cell->darkness < 0
1285	? 255 - FOW_DARKNESS
1286	: 255 - cell->darkness;
1287		1411
1288	face = cell->face [z];	1412	face = cell->face [z];
1289		1413
1290	if (face)	1414	if (face)
1291	{	1415	{
…		…
1312		1436
1313	glEnd ();	1437	glEnd ();
1314		1438
1315	glDisable (GL_TEXTURE_2D);	1439	glDisable (GL_TEXTURE_2D);
1316	glDisable (GL_BLEND);	1440	glDisable (GL_BLEND);
		1441	}
		1442
		1443	void
		1444	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1445	CODE:
		1446	{
		1447	static float color[16][3] = {
		1448	{ 0.00F, 0.00F, 0.00F },
		1449	{ 1.00F, 1.00F, 1.00F },
		1450	{ 0.00F, 0.00F, 0.55F },
		1451	{ 1.00F, 0.00F, 0.00F },
		1452
		1453	{ 1.00F, 0.54F, 0.00F },
		1454	{ 0.11F, 0.56F, 1.00F },
		1455	{ 0.93F, 0.46F, 0.00F },
		1456	{ 0.18F, 0.54F, 0.34F },
		1457
		1458	{ 0.56F, 0.73F, 0.56F },
		1459	{ 0.80F, 0.80F, 0.80F },
		1460	{ 0.55F, 0.41F, 0.13F },
		1461	{ 0.99F, 0.77F, 0.26F },
		1462
		1463	{ 0.74F, 0.65F, 0.41F },
		1464
		1465	{ 0.00F, 1.00F, 1.00F },
		1466	{ 1.00F, 0.00F, 1.00F },
		1467	{ 1.00F, 1.00F, 0.00F },
		1468	};
		1469
		1470	int x, y;
		1471
		1472	glEnable (GL_TEXTURE_2D);
		1473	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1474	glEnable (GL_BLEND);
		1475	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1476	glBegin (GL_QUADS);
		1477
		1478	for (y = 0; y < h; y++)
		1479	for (x = 0; x < w; x++)
		1480	{
		1481	unsigned char m = data [x + y * w];
		1482
		1483	if (m)
		1484	{
		1485	float *c = color [m & 15];
		1486
		1487	float tx1 = m & 0x40 ? 0.5 : 0.;
		1488	float tx2 = tx1 + 0.5;
		1489
		1490	glColor4f (c[0], c[1], c[2], 0.75);
		1491	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1492	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1493	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1494	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1495	}
		1496	}
		1497
		1498	glEnd ();
		1499	glDisable (GL_BLEND);
		1500	glDisable (GL_TEXTURE_2D);
		1501	}
		1502
		1503	void
		1504	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1505	PPCODE:
		1506	{
		1507	int vx, vy;
		1508	int x, y;
		1509	int sw4 = (sw + 3) & ~3;
		1510	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1511	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1512
		1513	memset (darkness, 255, sw4 * sh);
		1514	SvPOK_only (darkness_sv);
		1515	SvCUR_set (darkness_sv, sw4 * sh);
		1516
		1517	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1518	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1519
		1520	for (y = 0; y < sh; y++)
		1521	if (0 <= y + vy && y + vy < self->rows)
		1522	{
		1523	maprow *row = self->row + (y + vy);
		1524
		1525	for (x = 0; x < sw; x++)
		1526	if (row->c0 <= x + vx && x + vx < row->c1)
		1527	{
		1528	mapcell *cell = row->col + (x + vx - row->c0);
		1529
		1530	darkness[y * sw4 + x] = cell->darkness < 0
		1531	? 255 - FOW_DARKNESS
		1532	: 255 - cell->darkness;
		1533	}
		1534	}
1317		1535
1318	EXTEND (SP, 3);	1536	EXTEND (SP, 3);
1319	PUSHs (sv_2mortal (newSViv (sw4)));	1537	PUSHs (sv_2mortal (newSViv (sw4)));
1320	PUSHs (sv_2mortal (newSViv (sh)));	1538	PUSHs (sv_2mortal (newSViv (sh)));
1321	PUSHs (darkness_sv);	1539	PUSHs (darkness_sv);
1322	}	1540	}
1323		1541
1324	SV *	1542	SV *
1325	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1543	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1326	CODE:	1544	CODE:
1327	{	1545	{
1328	int x, y, x1, y1;	1546	int x, y, x1, y1;
1329	SV data_sv = newSV (w h * 7 + 5);	1547	SV data_sv = newSV (w h * 7 + 5);
1330	uint8_t data = (uint8_t )SvPVX (data_sv);	1548	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1392	}	1610	}
1393	OUTPUT:	1611	OUTPUT:
1394	RETVAL	1612	RETVAL
1395		1613
1396	void	1614	void
1397	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1615	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1398	PPCODE:	1616	PPCODE:
1399	{	1617	{
1400	int x, y, z;	1618	int x, y, z;
1401	int w, h;	1619	int w, h;
1402	int x1, y1;	1620	int x1, y1;
…		…
1451	}	1669	}
1452	}	1670	}
1453	}	1671	}
1454	}	1672	}
1455		1673
1456	MODULE = CFClient PACKAGE = CFClient::MixChunk	1674	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1457		1675
1458	CFClient::MixChunk	1676	CFPlus::MixChunk
1459	new_from_file (SV class, char path)	1677	new_from_file (SV class, char path)
1460	CODE:	1678	CODE:
1461	RETVAL = Mix_LoadWAV (path);	1679	RETVAL = Mix_LoadWAV (path);
1462	OUTPUT:	1680	OUTPUT:
1463	RETVAL	1681	RETVAL
1464		1682
1465	void	1683	void
1466	DESTROY (CFClient::MixChunk self)	1684	DESTROY (CFPlus::MixChunk self)
1467	CODE:	1685	CODE:
1468	Mix_FreeChunk (self);	1686	Mix_FreeChunk (self);
1469		1687
1470	int	1688	int
1471	volume (CFClient::MixChunk self, int volume = -1)	1689	volume (CFPlus::MixChunk self, int volume = -1)
1472	CODE:	1690	CODE:
1473	RETVAL = Mix_VolumeChunk (self, volume);	1691	RETVAL = Mix_VolumeChunk (self, volume);
1474	OUTPUT:	1692	OUTPUT:
1475	RETVAL	1693	RETVAL
1476		1694
1477	int	1695	int
1478	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1696	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1479	CODE:	1697	CODE:
1480	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1698	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1481	OUTPUT:	1699	OUTPUT:
1482	RETVAL	1700	RETVAL
1483		1701
1484	MODULE = CFClient PACKAGE = CFClient::MixMusic	1702	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1485		1703
1486	int	1704	int
1487	volume (int volume = -1)	1705	volume (int volume = -1)
1488	CODE:	1706	CODE:
1489	RETVAL = Mix_VolumeMusic (volume);	1707	RETVAL = Mix_VolumeMusic (volume);
1490	OUTPUT:	1708	OUTPUT:
1491	RETVAL	1709	RETVAL
1492		1710
1493	CFClient::MixMusic	1711	CFPlus::MixMusic
1494	new_from_file (SV class, char path)	1712	new_from_file (SV class, char path)
1495	CODE:	1713	CODE:
1496	RETVAL = Mix_LoadMUS (path);	1714	RETVAL = Mix_LoadMUS (path);
1497	OUTPUT:	1715	OUTPUT:
1498	RETVAL	1716	RETVAL
1499		1717
1500	void	1718	void
1501	DESTROY (CFClient::MixMusic self)	1719	DESTROY (CFPlus::MixMusic self)
1502	CODE:	1720	CODE:
1503	Mix_FreeMusic (self);	1721	Mix_FreeMusic (self);
1504		1722
1505	int	1723	int
1506	play (CFClient::MixMusic self, int loops = -1)	1724	play (CFPlus::MixMusic self, int loops = -1)
1507	CODE:	1725	CODE:
1508	RETVAL = Mix_PlayMusic (self, loops);	1726	RETVAL = Mix_PlayMusic (self, loops);
1509	OUTPUT:	1727	OUTPUT:
1510	RETVAL	1728	RETVAL
1511		1729
1512	MODULE = CFClient PACKAGE = CFClient::OpenGL	1730	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1513		1731
1514	BOOT:	1732	BOOT:
1515	{	1733	{
1516	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1734	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1517	static const struct {	1735	static const struct {
1518	const char *name;	1736	const char *name;
1519	IV iv;	1737	IV iv;
1520	} *civ, const_iv[] = {	1738	} *civ, const_iv[] = {
1521	# define const_iv(name) { # name, (IV)name }	1739	# define const_iv(name) { # name, (IV)name }
…		…
1528	const_iv (GL_SCISSOR_TEST),	1746	const_iv (GL_SCISSOR_TEST),
1529	const_iv (GL_DEPTH_TEST),	1747	const_iv (GL_DEPTH_TEST),
1530	const_iv (GL_ALPHA_TEST),	1748	const_iv (GL_ALPHA_TEST),
1531	const_iv (GL_NORMALIZE),	1749	const_iv (GL_NORMALIZE),
1532	const_iv (GL_RESCALE_NORMAL),	1750	const_iv (GL_RESCALE_NORMAL),
		1751	const_iv (GL_FRONT),
		1752	const_iv (GL_BACK),
1533	const_iv (GL_AND),	1753	const_iv (GL_AND),
1534	const_iv (GL_ONE),	1754	const_iv (GL_ONE),
1535	const_iv (GL_ZERO),	1755	const_iv (GL_ZERO),
1536	const_iv (GL_SRC_ALPHA),	1756	const_iv (GL_SRC_ALPHA),
1537	const_iv (GL_SRC_ALPHA_SATURATE),	1757	const_iv (GL_DST_ALPHA),
1538	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1758	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539	const_iv (GL_ONE_MINUS_DST_ALPHA),	1759	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1760	const_iv (GL_SRC_ALPHA_SATURATE),
1540	const_iv (GL_RGB),	1761	const_iv (GL_RGB),
1541	const_iv (GL_RGBA),	1762	const_iv (GL_RGBA),
		1763	const_iv (GL_RGBA4),
		1764	const_iv (GL_RGBA8),
		1765	const_iv (GL_RGB5_A1),
1542	const_iv (GL_UNSIGNED_BYTE),	1766	const_iv (GL_UNSIGNED_BYTE),
1543	const_iv (GL_UNSIGNED_SHORT),	1767	const_iv (GL_UNSIGNED_SHORT),
1544	const_iv (GL_UNSIGNED_INT),	1768	const_iv (GL_UNSIGNED_INT),
1545	const_iv (GL_ALPHA),	1769	const_iv (GL_ALPHA),
1546	const_iv (GL_INTENSITY),	1770	const_iv (GL_INTENSITY),
…		…
1620	OUTPUT:	1844	OUTPUT:
1621	RETVAL	1845	RETVAL
1622		1846
1623	int glGetError ()	1847	int glGetError ()
1624		1848
		1849	void glFinish ()
		1850
1625	void glClear (int mask)	1851	void glClear (int mask)
1626		1852
1627	void glClearColor (float r, float g, float b, float a = 1.0)	1853	void glClearColor (float r, float g, float b, float a = 1.0)
1628	PROTOTYPE: @	1854	PROTOTYPE: @
1629		1855
…		…
1635		1861
1636	void glHint (int target, int mode)	1862	void glHint (int target, int mode)
1637		1863
1638	void glBlendFunc (int sfactor, int dfactor)	1864	void glBlendFunc (int sfactor, int dfactor)
1639		1865
		1866	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1867	CODE:
		1868	gl_BlendFuncSeparate (sa, da, saa, daa);
		1869
1640	void glDepthMask (int flag)	1870	void glDepthMask (int flag)
1641		1871
1642	void glLogicOp (int opcode)	1872	void glLogicOp (int opcode)
1643		1873
1644	void glColorMask (int red, int green, int blue, int alpha)	1874	void glColorMask (int red, int green, int blue, int alpha)
…		…
1648	void glPushMatrix ()	1878	void glPushMatrix ()
1649		1879
1650	void glPopMatrix ()	1880	void glPopMatrix ()
1651		1881
1652	void glLoadIdentity ()	1882	void glLoadIdentity ()
		1883
		1884	void glDrawBuffer (int buffer)
		1885
		1886	void glReadBuffer (int buffer)
1653		1887
1654	# near_ and far_ are due to microsofts buggy "c" compiler	1888	# near_ and far_ are due to microsofts buggy "c" compiler
1655	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1889	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656		1890
1657	# near_ and far_ are due to microsofts buggy "c" compiler	1891	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1677		1911
1678	void glEnd ()	1912	void glEnd ()
1679		1913
1680	void glColor (float r, float g, float b, float a = 1.0)	1914	void glColor (float r, float g, float b, float a = 1.0)
1681	PROTOTYPE: @	1915	PROTOTYPE: @
		1916	ALIAS:
		1917	glColor_premultiply = 1
1682	CODE:	1918	CODE:
		1919	if (ix)
		1920	{
		1921	r *= a;
		1922	g *= a;
		1923	b *= a;
		1924	}
1683	// microsoft visual "c" rounds instead of truncating...	1925	// microsoft visual "c" rounds instead of truncating...
1684	glColor4ub (MIN ((int)(r * 255.f), 255),	1926	glColor4f (r, g, b, a);
1685	MIN ((int)(g * 255.f), 255),
1686	MIN ((int)(b * 255.f), 255),
1687	MIN ((int)(a * 255.f), 255));
1688		1927
1689	void glInterleavedArrays (int format, int stride, char *data)	1928	void glInterleavedArrays (int format, int stride, char *data)
1690		1929
1691	void glDrawElements (int mode, int count, int type, char *indices)	1930	void glDrawElements (int mode, int count, int type, char *indices)
1692		1931
…		…
1715		1954
1716	void glBindTexture (int target, int name)	1955	void glBindTexture (int target, int name)
1717		1956
1718	void glConvolutionParameter (int target, int pname, float params)	1957	void glConvolutionParameter (int target, int pname, float params)
1719	CODE:	1958	CODE:
1720	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1959	if (gl.ConvolutionParameterf)
		1960	gl.ConvolutionParameterf (target, pname, params);
1721		1961
1722	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1962	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723	CODE:	1963	CODE:
1724	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1964	if (gl.ConvolutionFilter2D)
1725	(target, internalformat, width, height, format, type, data));	1965	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726		1966
1727	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1967	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1728	CODE:	1968	CODE:
1729	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1969	if (gl.SeparableFilter2D)
1730	(target, internalformat, width, height, format, type, row, column));	1970	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731		1971
1732	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1972	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733		1973
1734	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1974	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735		1975

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.98 by root, Mon May 29 02:01:56 2006 UTC vs. Revision 1.134 by root, Fri Aug 4 16:49:58 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.98 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.134 by root, Fri Aug 4 16:49:58 2006 UTC