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

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.133 by root, Sun Jul 30 13:16:44 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.133 by root, Sun Jul 30 13:16:44 2006 UTC