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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.102 by root, Sat Jun 3 23:47:46 2006 UTC vs.
Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
15		21
16	#include <SDL.h>	22	#include <SDL.h>
17	#include <SDL_endian.h>	23	#include <SDL_endian.h>
18	#include <SDL_image.h>	24	#include <SDL_image.h>
19	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
21		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
22	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
23		32
24	#include <pango/pango.h>	33	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		34
29	#ifndef _WIN32	35	#ifndef _WIN32
30	# include <sys/types.h>	36	# include <sys/types.h>
31	# include <sys/socket.h>	37	# include <sys/socket.h>
32	# include <netinet/in.h>	38	# include <netinet/in.h>
39	typedef signed char int8_t;	45	typedef signed char int8_t;
40	typedef signed short int16_t;	46	typedef signed short int16_t;
41	typedef signed int int32_t;	47	typedef signed int int32_t;
42	#endif	48	#endif
43		49
44	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		51
46	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
47		53
48	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
50		56
51	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
52		58
53	#define GL_CALL(type,func,args) \	59	#if 0
54	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	61	#else
56	static type fptr_; \	62	# define PARACHUTE 0
57	\	63	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		64
		65	static struct
		66	{
		67	#define GL_FUNC(ptr,name) ptr name;
		68	#include "glfunc.h"
		69	#undef GL_FUNC
		70	} gl;
		71
		72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		73	{
		74	if (gl.BlendFuncSeparate)
		75	gl.BlendFuncSeparate (sa, da, saa, daa);
		76	else if (gl.BlendFuncSeparateEXT)
		77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		78	else
		79	glBlendFunc (sa, da);
		80	}
		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
68	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
70		90
71	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
72		110
73	typedef struct cf_layout {	111	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
77	int base_height;	114	int base_height;
78	CFClient__Font font;	115	CFPlus__Font font;
79	} *CFClient__Layout;	116	} *CFPlus__Layout;
80		117
81	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
82	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
84		121
85	static void	122	static void
86	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
87	{	124	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	126	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	128	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	130	}
95		131
96	static void	132	static void
97	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
98	{	134	{
99	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
100	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
101	*/	137	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		142
107	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
108	}	144	}
109		145
110	static void	146	static void
111	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
112	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
114		153
115	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		156
118	w = (w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
119	}	162	}
120		163
121	typedef uint16_t mapface;	164	typedef uint16_t mapface;
122		165
123	typedef struct {	166	typedef struct {
…		…
146	int texs;	189	int texs;
147	maptex *tex;	190	maptex *tex;
148		191
149	int32_t rows;	192	int32_t rows;
150	maprow *row;	193	maprow *row;
151	} *CFClient__Map;	194	} *CFPlus__Map;
152		195
153	static char *	196	static char *
154	prepend (char *ptr, int sze, int inc)	197	prepend (char *ptr, int sze, int inc)
155	{	198	{
156	char *p;	199	char *p;
…		…
174		217
175	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	218	#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))	219	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		220
178	static maprow *	221	static maprow *
179	map_get_row (CFClient__Map self, int y)	222	map_get_row (CFPlus__Map self, int y)
180	{	223	{
181	if (0 > y)	224	if (0 > y)
182	{	225	{
183	int extend = - y + MAP_EXTEND_Y;	226	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	227	Prepend (maprow, self->row, self->rows, extend);
…		…
222		265
223	return row->col + (x - row->c0);	266	return row->col + (x - row->c0);
224	}	267	}
225		268
226	static mapcell *	269	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	270	map_get_cell (CFPlus__Map self, int x, int y)
228	{	271	{
229	return row_get_cell (map_get_row (self, y), x);	272	return row_get_cell (map_get_row (self, y), x);
230	}	273	}
231		274
232	static void	275	static void
233	map_clear (CFClient__Map self)	276	map_clear (CFPlus__Map self)
234	{	277	{
235	int r;	278	int r;
236		279
237	for (r = 0; r < self->rows; r++)	280	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	281	Safefree (self->row[r].col);
…		…
246	self->row = 0;	289	self->row = 0;
247	self->rows = 0;	290	self->rows = 0;
248	}	291	}
249		292
250	static void	293	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	294	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	295	{
253	int x, y;	296	int x, y;
254	maprow *row;	297	maprow *row;
255		298
256	for (y = y0; y < y0 + h; y++)	299	for (y = y0; y < y0 + h; y++)
…		…
296	ev.data2 = 0;	339	ev.data2 = 0;
297		340
298	SDL_PushEvent ((SDL_Event *)&ev);	341	SDL_PushEvent ((SDL_Event *)&ev);
299	}	342	}
300		343
		344	static unsigned int
		345	minpot (unsigned int n)
		346	{
		347	if (!n)
		348	return 0;
		349
		350	--n;
		351
		352	n \|= n >> 1;
		353	n \|= n >> 2;
		354	n \|= n >> 4;
		355	n \|= n >> 8;
		356	n \|= n >> 16;
		357
		358	return n + 1;
		359	}
		360
301	MODULE = CFClient PACKAGE = CFClient	361	MODULE = CFPlus PACKAGE = CFPlus
302		362
303	PROTOTYPES: ENABLE	363	PROTOTYPES: ENABLE
304		364
305	BOOT:	365	BOOT:
306	{	366	{
307	HV *stash = gv_stashpv ("CFClient", 1);	367	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	368	static const struct {
309	const char *name;	369	const char *name;
310	IV iv;	370	IV iv;
311	} *civ, const_iv[] = {	371	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	372	# define const_iv(name) { # name, (IV)name }
…		…
413		473
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	474	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	475	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	476	}
417		477
		478	int
		479	in_destruct ()
		480	CODE:
		481	RETVAL = PL_main_cv == Nullcv;
		482	OUTPUT:
		483	RETVAL
		484
		485	NV floor (NV x)
		486
		487	NV ceil (NV x)
		488
418	void	489	void
419	pango_init ()	490	pango_init ()
420	CODE:	491	CODE:
421	{	492	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	493	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	494	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);	495	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	}	496	}
430		497
431	int	498	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	499	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		500
434	void	501	void
435	SDL_Quit ()	502	SDL_Quit ()
436		503
437	void	504	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	511	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	513	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		514
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	515	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	516	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		517
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	518	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		522
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	523	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		524	#if SDL_VERSION_ATLEAST(1,2,10)
		525	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		526	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		527	#endif
457		528
458	SDL_EnableUNICODE (1);	529	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	530	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		531
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	532	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	550	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	551	CODE:
481	RETVAL = !!SDL_SetVideoMode (	552	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	553	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	554	);
		555	if (RETVAL)
		556	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	557	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		558	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		559	# include "glfunc.h"
		560	# undef GL_FUNC
		561	}
485	OUTPUT:	562	OUTPUT:
486	RETVAL	563	RETVAL
487		564
488	void	565	void
489	SDL_GL_SwapBuffers ()	566	SDL_GL_SwapBuffers ()
…		…
542	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	619	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	620	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544	break;	621	break;
545	}	622	}
546		623
547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	624	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548	}	625	}
549	}	626	}
550		627
551	int	628	int
552	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	629	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
568	#endif	645	#endif
569		646
570	void	647	void
571	add_font (char *file)	648	add_font (char *file)
572	CODE:	649	CODE:
573	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	650	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
574	#ifdef _WIN32
575	// cairo... sigh... requires win2000
576	AddFontResourceEx (file, FR_PRIVATE, 0);
577	#endif
578		651
579	void	652	void
580	load_image_inline (SV *image_)	653	load_image_inline (SV *image_)
581	ALIAS:	654	ALIAS:
582	load_image_file = 1	655	load_image_file = 1
…		…
624		697
625	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	698	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
626		699
627	assert (surface2->pitch == surface2->w * 4);	700	assert (surface2->pitch == surface2->w * 4);
628		701
		702	SDL_LockSurface (surface2);
629	EXTEND (SP, 5);	703	EXTEND (SP, 6);
630	PUSHs (sv_2mortal (newSViv (surface2->w)));	704	PUSHs (sv_2mortal (newSViv (surface2->w)));
631	PUSHs (sv_2mortal (newSViv (surface2->h)));	705	PUSHs (sv_2mortal (newSViv (surface2->h)));
632	SDL_LockSurface (surface2);
633	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	706	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)));	707	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
636	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	708	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
637	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	709	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		710	SDL_UnlockSurface (surface2);
638		711
639	SDL_FreeSurface (surface);	712	SDL_FreeSurface (surface);
640	SDL_FreeSurface (surface2);	713	SDL_FreeSurface (surface2);
641	}	714	}
642		715
…		…
678	CODE:	751	CODE:
679	fprintf (stderr, "FATAL: %s\n", message);	752	fprintf (stderr, "FATAL: %s\n", message);
680	#ifdef _WIN32	753	#ifdef _WIN32
681	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	754	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
682	#endif	755	#endif
683	exit (1);	756	_exit (1);
684		757
		758	void
		759	_exit (int retval)
		760	CODE:
		761	_exit (retval);
		762
685	MODULE = CFClient PACKAGE = CFClient::Font	763	MODULE = CFPlus PACKAGE = CFPlus::Font
686		764
687	CFClient::Font	765	CFPlus::Font
688	new_from_file (SV class, char path, int id = 0)	766	new_from_file (SV class, char path, int id = 0)
689	CODE:	767	CODE:
690	{	768	{
691	int count;	769	int count;
692	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	770	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
695	}	773	}
696	OUTPUT:	774	OUTPUT:
697	RETVAL	775	RETVAL
698		776
699	void	777	void
700	DESTROY (CFClient::Font self)	778	DESTROY (CFPlus::Font self)
701	CODE:	779	CODE:
702	pango_font_description_free (self);	780	pango_font_description_free (self);
703		781
704	void	782	void
705	make_default (CFClient::Font self)	783	make_default (CFPlus::Font self)
706	CODE:	784	CODE:
707	default_font = self;	785	default_font = self;
708		786
709	MODULE = CFClient PACKAGE = CFClient::Layout	787	MODULE = CFPlus PACKAGE = CFPlus::Layout
710		788
711	CFClient::Layout	789	void
712	new (SV *class, int rgba = 0)	790	reset_glyph_cache ()
713	CODE:	791	CODE:
714	#if _WIN32	792	tc_clear ();
715	//rgba = 0;//D make stext nicer, breaks TextView	793
716	#endif	794	CFPlus::Layout
		795	new (SV *class)
		796	CODE:
717	New (0, RETVAL, 1, struct cf_layout);	797	New (0, RETVAL, 1, struct cf_layout);
718		798
719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	799	RETVAL->pl = pango_layout_new (opengl_context);
720	RETVAL->rgba = rgba;
721	RETVAL->r = 1.;	800	RETVAL->r = 1.;
722	RETVAL->g = 1.;	801	RETVAL->g = 1.;
723	RETVAL->b = 1.;	802	RETVAL->b = 1.;
724	RETVAL->a = 1.;	803	RETVAL->a = 1.;
725	RETVAL->base_height = MIN_FONT_HEIGHT;	804	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
729	layout_update_font (RETVAL);	808	layout_update_font (RETVAL);
730	OUTPUT:	809	OUTPUT:
731	RETVAL	810	RETVAL
732		811
733	void	812	void
734	DESTROY (CFClient::Layout self)	813	DESTROY (CFPlus::Layout self)
735	CODE:	814	CODE:
736	g_object_unref (self->pl);	815	g_object_unref (self->pl);
737	Safefree (self);	816	Safefree (self);
738		817
739	int
740	is_rgba (CFClient::Layout self)
741	CODE:
742	RETVAL = self->rgba;
743	OUTPUT:
744	RETVAL
745
746	void	818	void
747	set_text (CFClient::Layout self, SV *text_)	819	set_text (CFPlus::Layout self, SV *text_)
748	CODE:	820	CODE:
749	{	821	{
750	STRLEN textlen;	822	STRLEN textlen;
751	char *text = SvPVutf8 (text_, textlen);	823	char *text = SvPVutf8 (text_, textlen);
752		824
753	pango_layout_set_text (self->pl, text, textlen);	825	pango_layout_set_text (self->pl, text, textlen);
754	}	826	}
755		827
756	void	828	void
757	set_markup (CFClient::Layout self, SV *text_)	829	set_markup (CFPlus::Layout self, SV *text_)
758	CODE:	830	CODE:
759	{	831	{
760	STRLEN textlen;	832	STRLEN textlen;
761	char *text = SvPVutf8 (text_, textlen);	833	char *text = SvPVutf8 (text_, textlen);
762		834
763	pango_layout_set_markup (self->pl, text, textlen);	835	pango_layout_set_markup (self->pl, text, textlen);
764	}	836	}
765		837
		838	void
		839	set_shapes (CFPlus::Layout self, ...)
		840	CODE:
		841	{
		842	PangoAttrList *attrs = 0;
		843	const char *text = pango_layout_get_text (self->pl);
		844	const char *pos = text;
		845	int arg = 4;
		846
		847	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		848	{
		849	PangoRectangle inkrect, rect;
		850	PangoAttribute *attr;
		851
		852	int x = SvIV (ST (arg - 3));
		853	int y = SvIV (ST (arg - 2));
		854	int w = SvIV (ST (arg - 1));
		855	int h = SvIV (ST (arg ));
		856
		857	inkrect.x = 0;
		858	inkrect.y = 0;
		859	inkrect.width = 0;
		860	inkrect.height = 0;
		861
		862	rect.x = x * PANGO_SCALE;
		863	rect.y = y * PANGO_SCALE;
		864	rect.width = w * PANGO_SCALE;
		865	rect.height = h * PANGO_SCALE;
		866
		867	if (!attrs)
		868	attrs = pango_layout_get_attributes (self->pl);
		869
		870	attr = pango_attr_shape_new (&inkrect, &rect);
		871	attr->start_index = pos - text;
		872	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		873	pango_attr_list_insert (attrs, attr);
		874
		875	arg += 4;
		876	pos += sizeof (OBJ_STR) - 1;
		877	}
		878
		879	if (attrs)
		880	pango_layout_set_attributes (self->pl, attrs);
		881	}
		882
		883	void
		884	get_shapes (CFPlus::Layout self)
		885	PPCODE:
		886	{
		887	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		888
		889	do
		890	{
		891	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		892
		893	if (run && shape_attr_p (run))
		894	{
		895	PangoRectangle extents;
		896	pango_layout_iter_get_run_extents (iter, 0, &extents);
		897
		898	EXTEND (SP, 2);
		899	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		900	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		901	}
		902	}
		903	while (pango_layout_iter_next_run (iter));
		904
		905	pango_layout_iter_free (iter);
		906	}
		907
		908	int
		909	has_wrapped (CFPlus::Layout self)
		910	CODE:
		911	{
		912	int lines = 1;
		913	const char *text = pango_layout_get_text (self->pl);
		914
		915	while (*text)
		916	lines += *text++ == '\n';
		917
		918	RETVAL = lines < pango_layout_get_line_count (self->pl);
		919	}
		920	OUTPUT:
		921	RETVAL
		922
766	SV *	923	SV *
767	get_text (CFClient::Layout self)	924	get_text (CFPlus::Layout self)
768	CODE:	925	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	926	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	927	sv_utf8_decode (RETVAL);
771	OUTPUT:	928	OUTPUT:
772	RETVAL	929	RETVAL
773		930
774	void	931	void
775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	932	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
776	CODE:	933	CODE:
777	self->r = r;	934	self->r = r;
778	self->g = g;	935	self->g = g;
779	self->b = b;	936	self->b = b;
780	self->a = a;	937	self->a = a;
781		938
782	void	939	void
783	set_font (CFClient::Layout self, CFClient::Font font = 0)	940	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
784	CODE:	941	CODE:
785	if (self->font != font)	942	if (self->font != font)
786	{	943	{
787	self->font = font;	944	self->font = font;
788	layout_update_font (self);	945	layout_update_font (self);
789	}	946	}
790		947
791	void	948	void
792	set_height (CFClient::Layout self, int base_height)	949	set_height (CFPlus::Layout self, int base_height)
793	CODE:	950	CODE:
794	if (self->base_height != base_height)	951	if (self->base_height != base_height)
795	{	952	{
796	self->base_height = base_height;	953	self->base_height = base_height;
797	layout_update_font (self);	954	layout_update_font (self);
798	}	955	}
799		956
800	void	957	void
801	set_width (CFClient::Layout self, int max_width = -1)	958	set_width (CFPlus::Layout self, int max_width = -1)
802	CODE:	959	CODE:
803	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	960	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804		961
805	void	962	void
806	set_indent (CFClient::Layout self, int indent)	963	set_indent (CFPlus::Layout self, int indent)
807	CODE:	964	CODE:
808	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	965	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
809		966
810	void	967	void
811	set_spacing (CFClient::Layout self, int spacing)	968	set_spacing (CFPlus::Layout self, int spacing)
812	CODE:	969	CODE:
813	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	970	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
814		971
815	void	972	void
816	set_ellipsise (CFClient::Layout self, int ellipsise)	973	set_ellipsise (CFPlus::Layout self, int ellipsise)
817	CODE:	974	CODE:
818	pango_layout_set_ellipsize (self->pl,	975	pango_layout_set_ellipsize (self->pl,
819	ellipsise == 1 ? PANGO_ELLIPSIZE_START	976	ellipsise == 1 ? PANGO_ELLIPSIZE_START
820	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	977	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
821	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	978	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
822	: PANGO_ELLIPSIZE_NONE	979	: PANGO_ELLIPSIZE_NONE
823	);	980	);
824		981
825	void	982	void
826	set_single_paragraph_mode (CFClient::Layout self, int spm)	983	set_single_paragraph_mode (CFPlus::Layout self, int spm)
827	CODE:	984	CODE:
828	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	985	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
829		986
830	void	987	void
831	size (CFClient::Layout self)	988	size (CFPlus::Layout self)
832	PPCODE:	989	PPCODE:
833	{	990	{
834	int w, h;	991	int w, h;
835		992
836	layout_get_pixel_size (self, &w, &h);	993	layout_get_pixel_size (self, &w, &h);
…		…
839	PUSHs (sv_2mortal (newSViv (w)));	996	PUSHs (sv_2mortal (newSViv (w)));
840	PUSHs (sv_2mortal (newSViv (h)));	997	PUSHs (sv_2mortal (newSViv (h)));
841	}	998	}
842		999
843	int	1000	int
		1001	descent (CFPlus::Layout self)
		1002	CODE:
		1003	{
		1004	PangoRectangle rect;
		1005	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1006	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1007	RETVAL = PANGO_DESCENT (rect);
		1008	}
		1009	OUTPUT:
		1010	RETVAL
		1011
		1012	int
844	xy_to_index (CFClient::Layout self, int x, int y)	1013	xy_to_index (CFPlus::Layout self, int x, int y)
845	CODE:	1014	CODE:
846	{	1015	{
847	int index, trailing;	1016	int index, trailing;
848	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1017	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
849	RETVAL = index;	1018	RETVAL = index;
850	}	1019	}
851	OUTPUT:	1020	OUTPUT:
852	RETVAL	1021	RETVAL
853		1022
854	void	1023	void
855	cursor_pos (CFClient::Layout self, int index)	1024	cursor_pos (CFPlus::Layout self, int index)
856	PPCODE:	1025	PPCODE:
857	{	1026	{
858	PangoRectangle strong_pos;	1027	PangoRectangle strong_pos;
859	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1028	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
860		1029
…		…
863	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1032	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
864	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
865	}	1034	}
866		1035
867	void	1036	void
868	render (CFClient::Layout self)	1037	render (CFPlus::Layout self, float x, float y, int flags = 0)
869	PPCODE:	1038	PPCODE:
870	{	1039	pango_opengl_render_layout_subpixel (
871	SV *retval;	1040	self->pl,
872	int w, h;	1041	x * PANGO_SCALE, y * PANGO_SCALE,
		1042	self->r, self->g, self->b, self->a,
		1043	flags
		1044	);
873		1045
874	layout_get_pixel_size (self, &w, &h);	1046	MODULE = CFPlus PACKAGE = CFPlus::Texture
875		1047
876	if (self->rgba)	1048	void
		1049	pad2pot (SV data_, SV w_, SV *h_)
		1050	CODE:
		1051	{
		1052	int ow = SvIV (w_);
		1053	int oh = SvIV (h_);
		1054
		1055	if (ow && oh)
877	{	1056	{
878	cairo_surface_t *surface;	1057	int nw = minpot (ow);
879	cairo_t *cairo;	1058	int nh = minpot (oh);
880		1059
881	retval = newSV (w * h * 4);	1060	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	{	1061	{
899	uint32_t p = (uint32_t )SvPVX (retval);	1062	if (SvOK (data_))
900	uint32_t e = p + w h;
901
902	while (p < e)
903	{	1063	{
904	uint32_t rgba = *p;	1064	STRLEN datalen;
905	rgba = (rgba >> 24) \| (rgba << 8);	1065	char *data = SvPVbyte (data_, datalen);
906	#if 0	1066	int bpp = datalen / (ow * oh);
907	#ifdef _WIN32	1067	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		1068
914	rgba = (rgba & 0xffffff00) \| a;	1069	SvPOK_only (result_);
		1070	SvCUR_set (result_, nw * nh * bpp);
		1071
		1072	memset (SvPVX (result_), 0, nw * nh * bpp);
		1073	while (oh--)
		1074	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1075
		1076	sv_setsv (data_, result_);
915	}	1077	}
916	#endif	1078
917	#endif	1079	sv_setiv (w_, nw);
918	rgba = SDL_SwapBE32 (rgba);	1080	sv_setiv (h_, nh);
919	*p++ = rgba;
920	}	1081	}
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	}	1082	}
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	}	1083	}
957		1084
958	MODULE = CFClient PACKAGE = CFClient::Texture
959
960	void	1085	void
961	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1086	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
962	PROTOTYPE: $$$;$$	1087	PROTOTYPE: $$$;$$
963	ALIAS:	1088	ALIAS:
964	draw_quad_alpha = 1	1089	draw_quad_alpha = 1
965	draw_quad_alpha_premultiplied = 2	1090	draw_quad_alpha_premultiplied = 2
966	CODE:	1091	CODE:
…		…
977	}	1102	}
978		1103
979	if (ix)	1104	if (ix)
980	{	1105	{
981	glEnable (GL_BLEND);	1106	glEnable (GL_BLEND);
		1107
		1108	if (ix == 2)
982	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1109	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1110	else
		1111	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1112	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1113
983	glEnable (GL_ALPHA_TEST);	1114	glEnable (GL_ALPHA_TEST);
984	glAlphaFunc (GL_GREATER, 0.01f);	1115	glAlphaFunc (GL_GREATER, 0.01f);
985	}	1116	}
986		1117
987	glBindTexture (GL_TEXTURE_2D, name);	1118	glBindTexture (GL_TEXTURE_2D, name);
…		…
998	glDisable (GL_ALPHA_TEST);	1129	glDisable (GL_ALPHA_TEST);
999	glDisable (GL_BLEND);	1130	glDisable (GL_BLEND);
1000	}	1131	}
1001	}	1132	}
1002		1133
1003	MODULE = CFClient PACKAGE = CFClient::Map	1134	MODULE = CFPlus PACKAGE = CFPlus::Map
1004		1135
1005	CFClient::Map	1136	CFPlus::Map
1006	new (SV *class, int map_width, int map_height)	1137	new (SV *class, int map_width, int map_height)
1007	CODE:	1138	CODE:
1008	New (0, RETVAL, 1, struct map);	1139	New (0, RETVAL, 1, struct map);
1009	RETVAL->x = 0;	1140	RETVAL->x = 0;
1010	RETVAL->y = 0;	1141	RETVAL->y = 0;
…		…
1020	RETVAL->row = 0;	1151	RETVAL->row = 0;
1021	OUTPUT:	1152	OUTPUT:
1022	RETVAL	1153	RETVAL
1023		1154
1024	void	1155	void
1025	DESTROY (CFClient::Map self)	1156	DESTROY (CFPlus::Map self)
1026	CODE:	1157	CODE:
1027	{	1158	{
1028	map_clear (self);	1159	map_clear (self);
1029	Safefree (self->face);	1160	Safefree (self->face);
		1161	Safefree (self->tex);
1030	Safefree (self);	1162	Safefree (self);
1031	}	1163	}
1032		1164
1033	void	1165	void
1034	clear (CFClient::Map self)	1166	clear (CFPlus::Map self)
1035	CODE:	1167	CODE:
1036	map_clear (self);	1168	map_clear (self);
1037		1169
1038	void	1170	void
1039	set_face (CFClient::Map self, int face, int texid)	1171	set_face (CFPlus::Map self, int face, int texid)
1040	CODE:	1172	CODE:
1041	{	1173	{
1042	while (self->faces <= face)	1174	while (self->faces <= face)
1043	{	1175	{
1044	Append (mapface, self->face, self->faces, self->faces);	1176	Append (mapface, self->face, self->faces, self->faces);
…		…
1047		1179
1048	self->face [face] = texid;	1180	self->face [face] = texid;
1049	}	1181	}
1050		1182
1051	void	1183	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)	1184	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:	1185	CODE:
1054	{	1186	{
1055	while (self->texs <= texid)	1187	while (self->texs <= texid)
1056	{	1188	{
1057	Append (maptex, self->tex, self->texs, self->texs);	1189	Append (maptex, self->tex, self->texs, self->texs);
…		…
1081	// from transparent color bleeding and ugly wrapping effects.	1213	// from transparent color bleeding and ugly wrapping effects.
1082	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1214	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1083	}	1215	}
1084		1216
1085	int	1217	int
1086	ox (CFClient::Map self)	1218	ox (CFPlus::Map self)
1087	ALIAS:	1219	ALIAS:
1088	oy = 1	1220	oy = 1
1089	x = 2	1221	x = 2
1090	y = 3	1222	y = 3
1091	w = 4	1223	w = 4
…		…
1102	}	1234	}
1103	OUTPUT:	1235	OUTPUT:
1104	RETVAL	1236	RETVAL
1105		1237
1106	void	1238	void
1107	scroll (CFClient::Map self, int dx, int dy)	1239	scroll (CFPlus::Map self, int dx, int dy)
1108	CODE:	1240	CODE:
1109	{	1241	{
1110	if (dx > 0)	1242	if (dx > 0)
1111	map_blank (self, self->x, self->y, dx - 1, self->h);	1243	map_blank (self, self->x, self->y, dx - 1, self->h);
1112	else if (dx < 0)	1244	else if (dx < 0)
…		…
1128	self->y += MAP_EXTEND_Y;	1260	self->y += MAP_EXTEND_Y;
1129	}	1261	}
1130	}	1262	}
1131		1263
1132	void	1264	void
1133	map1a_update (CFClient::Map self, SV *data_)	1265	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1134	CODE:	1266	CODE:
1135	{	1267	{
1136	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1268	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1137	uint8_t data_end = (uint8_t )SvEND (data_);	1269	uint8_t data_end = (uint8_t )SvEND (data_);
1138	mapcell *cell;	1270	mapcell *cell;
…		…
1140		1272
1141	while (data < data_end)	1273	while (data < data_end)
1142	{	1274	{
1143	flags = (data [0] << 8) + data [1]; data += 2;	1275	flags = (data [0] << 8) + data [1]; data += 2;
1144		1276
1145	x = ((flags >> 10) & 63) + self->x;	1277	x = self->x + ((flags >> 10) & 63);
1146	y = ((flags >> 4) & 63) + self->y;	1278	y = self->y + ((flags >> 4) & 63);
1147		1279
1148	cell = map_get_cell (self, x, y);	1280	cell = map_get_cell (self, x, y);
1149		1281
1150	if (flags & 15)	1282	if (flags & 15)
1151	{	1283	{
…		…
1155	cell->face [0] = 0;	1287	cell->face [0] = 0;
1156	cell->face [1] = 0;	1288	cell->face [1] = 0;
1157	cell->face [2] = 0;	1289	cell->face [2] = 0;
1158	}	1290	}
1159		1291
		1292	if (flags & 8)
		1293	{
		1294	fprintf (stderr, "oi\n");//D
		1295	if (extmap)
		1296	{
		1297	uint8_t ext, cmd;
		1298
		1299	do
		1300	{
		1301
		1302	ext = *data++;
		1303	cmd = ext & 0x7f;
		1304
		1305	fprintf (stderr, "extcmd = %x\n", ext);//D
		1306
		1307	if (ext < 4)
		1308	cell->darkness = 255 - ext * 64;
		1309	}
		1310	while (cmd & 0x80);
		1311	}
		1312	else
1160	cell->darkness = flags & 8 ? *data++ : 255;	1313	cell->darkness = flags & 8 ? *data++ : 255;
		1314	}
1161		1315
1162	//TODO: don't trust server data to be in-range(!)	1316	//TODO: don't trust server data to be in-range(!)
1163		1317
1164	if (flags & 4)	1318	if (flags & 4)
1165	{	1319	{
…		…
1180	cell->darkness = -1;	1334	cell->darkness = -1;
1181	}	1335	}
1182	}	1336	}
1183		1337
1184	SV *	1338	SV *
1185	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1339	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1186	CODE:	1340	CODE:
1187	{	1341	{
1188	int x1, x;	1342	int x1, x;
1189	int y1, y;	1343	int y1, y;
1190	int z;	1344	int z;
…		…
1240	}	1394	}
1241	OUTPUT:	1395	OUTPUT:
1242	RETVAL	1396	RETVAL
1243		1397
1244	void	1398	void
1245	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1399	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1246	PPCODE:	1400	CODE:
1247	{	1401	{
1248	int vx, vy;	1402	int vx, vy;
1249	int x, y, z;	1403	int x, y, z;
1250	int last_name;	1404	int last_name;
1251	mapface face;	1405	mapface face;
1252	int sw4 = (sw + 3) & ~3;
1253	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1254	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1255		1406
1256	memset (darkness, 255, sw4 * sh);
1257	SvPOK_only (darkness_sv);
1258	SvCUR_set (darkness_sv, sw4 * sh);
1259
1260	vx = self->x + (self->w - sw) / 2 - shift_x;	1407	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1261	vy = self->y + (self->h - sh) / 2 - shift_y;	1408	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1262		1409
1263	/*	1410	/*
1264	int vx = self->vx = self->w >= sw	1411	int vx = self->vx = self->w >= sw
1265	? self->x + (self->w - sw) / 2	1412	? self->x + (self->w - sw) / 2
1266	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1413	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1270	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1417	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1271	*/	1418	*/
1272		1419
1273	glColor4ub (255, 255, 255, 255);	1420	glColor4ub (255, 255, 255, 255);
1274		1421
		1422	glEnable (GL_BLEND);
1275	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1423	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1276	glEnable (GL_BLEND);
1277	glEnable (GL_TEXTURE_2D);	1424	glEnable (GL_TEXTURE_2D);
1278	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1425	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1279		1426
1280	glBegin (GL_QUADS);	1427	glBegin (GL_QUADS);
1281		1428
…		…
1289		1436
1290	for (x = 0; x < sw; x++)	1437	for (x = 0; x < sw; x++)
1291	if (row->c0 <= x + vx && x + vx < row->c1)	1438	if (row->c0 <= x + vx && x + vx < row->c1)
1292	{	1439	{
1293	mapcell *cell = row->col + (x + vx - row->c0);	1440	mapcell *cell = row->col + (x + vx - row->c0);
1294
1295	darkness[y * sw4 + x] = cell->darkness < 0
1296	? 255 - FOW_DARKNESS
1297	: 255 - cell->darkness;
1298		1441
1299	face = cell->face [z];	1442	face = cell->face [z];
1300		1443
1301	if (face)	1444	if (face)
1302	{	1445	{
…		…
1323		1466
1324	glEnd ();	1467	glEnd ();
1325		1468
1326	glDisable (GL_TEXTURE_2D);	1469	glDisable (GL_TEXTURE_2D);
1327	glDisable (GL_BLEND);	1470	glDisable (GL_BLEND);
		1471	}
		1472
		1473	void
		1474	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1475	CODE:
		1476	{
		1477	static float color[16][3] = {
		1478	{ 0.00F, 0.00F, 0.00F },
		1479	{ 1.00F, 1.00F, 1.00F },
		1480	{ 0.00F, 0.00F, 0.55F },
		1481	{ 1.00F, 0.00F, 0.00F },
		1482
		1483	{ 1.00F, 0.54F, 0.00F },
		1484	{ 0.11F, 0.56F, 1.00F },
		1485	{ 0.93F, 0.46F, 0.00F },
		1486	{ 0.18F, 0.54F, 0.34F },
		1487
		1488	{ 0.56F, 0.73F, 0.56F },
		1489	{ 0.80F, 0.80F, 0.80F },
		1490	{ 0.55F, 0.41F, 0.13F },
		1491	{ 0.99F, 0.77F, 0.26F },
		1492
		1493	{ 0.74F, 0.65F, 0.41F },
		1494
		1495	{ 0.00F, 1.00F, 1.00F },
		1496	{ 1.00F, 0.00F, 1.00F },
		1497	{ 1.00F, 1.00F, 0.00F },
		1498	};
		1499
		1500	int x, y;
		1501
		1502	glEnable (GL_TEXTURE_2D);
		1503	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1504	glEnable (GL_BLEND);
		1505	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1506	glBegin (GL_QUADS);
		1507
		1508	for (y = 0; y < h; y++)
		1509	for (x = 0; x < w; x++)
		1510	{
		1511	unsigned char m = data [x + y * w];
		1512
		1513	if (m)
		1514	{
		1515	float *c = color [m & 15];
		1516
		1517	float tx1 = m & 0x40 ? 0.5 : 0.;
		1518	float tx2 = tx1 + 0.5;
		1519
		1520	glColor4f (c[0], c[1], c[2], 0.75);
		1521	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1522	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1523	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1524	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1525	}
		1526	}
		1527
		1528	glEnd ();
		1529	glDisable (GL_BLEND);
		1530	glDisable (GL_TEXTURE_2D);
		1531	}
		1532
		1533	void
		1534	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1535	PPCODE:
		1536	{
		1537	int vx, vy;
		1538	int x, y;
		1539	int sw4 = (sw + 3) & ~3;
		1540	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1541	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1542
		1543	memset (darkness, 255, sw4 * sh);
		1544	SvPOK_only (darkness_sv);
		1545	SvCUR_set (darkness_sv, sw4 * sh);
		1546
		1547	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1548	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1549
		1550	for (y = 0; y < sh; y++)
		1551	if (0 <= y + vy && y + vy < self->rows)
		1552	{
		1553	maprow *row = self->row + (y + vy);
		1554
		1555	for (x = 0; x < sw; x++)
		1556	if (row->c0 <= x + vx && x + vx < row->c1)
		1557	{
		1558	mapcell *cell = row->col + (x + vx - row->c0);
		1559
		1560	darkness[y * sw4 + x] = cell->darkness < 0
		1561	? 255 - FOW_DARKNESS
		1562	: 255 - cell->darkness;
		1563	}
		1564	}
1328		1565
1329	EXTEND (SP, 3);	1566	EXTEND (SP, 3);
1330	PUSHs (sv_2mortal (newSViv (sw4)));	1567	PUSHs (sv_2mortal (newSViv (sw4)));
1331	PUSHs (sv_2mortal (newSViv (sh)));	1568	PUSHs (sv_2mortal (newSViv (sh)));
1332	PUSHs (darkness_sv);	1569	PUSHs (darkness_sv);
1333	}	1570	}
1334		1571
1335	SV *	1572	SV *
1336	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1573	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1337	CODE:	1574	CODE:
1338	{	1575	{
1339	int x, y, x1, y1;	1576	int x, y, x1, y1;
1340	SV data_sv = newSV (w h * 7 + 5);	1577	SV data_sv = newSV (w h * 7 + 5);
1341	uint8_t data = (uint8_t )SvPVX (data_sv);	1578	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1403	}	1640	}
1404	OUTPUT:	1641	OUTPUT:
1405	RETVAL	1642	RETVAL
1406		1643
1407	void	1644	void
1408	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1645	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1409	PPCODE:	1646	PPCODE:
1410	{	1647	{
1411	int x, y, z;	1648	int x, y, z;
1412	int w, h;	1649	int w, h;
1413	int x1, y1;	1650	int x1, y1;
…		…
1462	}	1699	}
1463	}	1700	}
1464	}	1701	}
1465	}	1702	}
1466		1703
1467	MODULE = CFClient PACKAGE = CFClient::MixChunk	1704	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1468		1705
1469	CFClient::MixChunk	1706	CFPlus::MixChunk
1470	new_from_file (SV class, char path)	1707	new_from_file (SV class, char path)
1471	CODE:	1708	CODE:
1472	RETVAL = Mix_LoadWAV (path);	1709	RETVAL = Mix_LoadWAV (path);
1473	OUTPUT:	1710	OUTPUT:
1474	RETVAL	1711	RETVAL
1475		1712
1476	void	1713	void
1477	DESTROY (CFClient::MixChunk self)	1714	DESTROY (CFPlus::MixChunk self)
1478	CODE:	1715	CODE:
1479	Mix_FreeChunk (self);	1716	Mix_FreeChunk (self);
1480		1717
1481	int	1718	int
1482	volume (CFClient::MixChunk self, int volume = -1)	1719	volume (CFPlus::MixChunk self, int volume = -1)
1483	CODE:	1720	CODE:
1484	RETVAL = Mix_VolumeChunk (self, volume);	1721	RETVAL = Mix_VolumeChunk (self, volume);
1485	OUTPUT:	1722	OUTPUT:
1486	RETVAL	1723	RETVAL
1487		1724
1488	int	1725	int
1489	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1726	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1490	CODE:	1727	CODE:
1491	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1728	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1492	OUTPUT:	1729	OUTPUT:
1493	RETVAL	1730	RETVAL
1494		1731
1495	MODULE = CFClient PACKAGE = CFClient::MixMusic	1732	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1496		1733
1497	int	1734	int
1498	volume (int volume = -1)	1735	volume (int volume = -1)
1499	CODE:	1736	CODE:
1500	RETVAL = Mix_VolumeMusic (volume);	1737	RETVAL = Mix_VolumeMusic (volume);
1501	OUTPUT:	1738	OUTPUT:
1502	RETVAL	1739	RETVAL
1503		1740
1504	CFClient::MixMusic	1741	CFPlus::MixMusic
1505	new_from_file (SV class, char path)	1742	new_from_file (SV class, char path)
1506	CODE:	1743	CODE:
1507	RETVAL = Mix_LoadMUS (path);	1744	RETVAL = Mix_LoadMUS (path);
1508	OUTPUT:	1745	OUTPUT:
1509	RETVAL	1746	RETVAL
1510		1747
1511	void	1748	void
1512	DESTROY (CFClient::MixMusic self)	1749	DESTROY (CFPlus::MixMusic self)
1513	CODE:	1750	CODE:
1514	Mix_FreeMusic (self);	1751	Mix_FreeMusic (self);
1515		1752
1516	int	1753	int
1517	play (CFClient::MixMusic self, int loops = -1)	1754	play (CFPlus::MixMusic self, int loops = -1)
1518	CODE:	1755	CODE:
1519	RETVAL = Mix_PlayMusic (self, loops);	1756	RETVAL = Mix_PlayMusic (self, loops);
1520	OUTPUT:	1757	OUTPUT:
1521	RETVAL	1758	RETVAL
1522		1759
1523	MODULE = CFClient PACKAGE = CFClient::OpenGL	1760	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1524		1761
1525	BOOT:	1762	BOOT:
1526	{	1763	{
1527	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1764	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1528	static const struct {	1765	static const struct {
1529	const char *name;	1766	const char *name;
1530	IV iv;	1767	IV iv;
1531	} *civ, const_iv[] = {	1768	} *civ, const_iv[] = {
1532	# define const_iv(name) { # name, (IV)name }	1769	# define const_iv(name) { # name, (IV)name }
…		…
1539	const_iv (GL_SCISSOR_TEST),	1776	const_iv (GL_SCISSOR_TEST),
1540	const_iv (GL_DEPTH_TEST),	1777	const_iv (GL_DEPTH_TEST),
1541	const_iv (GL_ALPHA_TEST),	1778	const_iv (GL_ALPHA_TEST),
1542	const_iv (GL_NORMALIZE),	1779	const_iv (GL_NORMALIZE),
1543	const_iv (GL_RESCALE_NORMAL),	1780	const_iv (GL_RESCALE_NORMAL),
		1781	const_iv (GL_FRONT),
		1782	const_iv (GL_BACK),
1544	const_iv (GL_AND),	1783	const_iv (GL_AND),
1545	const_iv (GL_ONE),	1784	const_iv (GL_ONE),
1546	const_iv (GL_ZERO),	1785	const_iv (GL_ZERO),
1547	const_iv (GL_SRC_ALPHA),	1786	const_iv (GL_SRC_ALPHA),
1548	const_iv (GL_SRC_ALPHA_SATURATE),	1787	const_iv (GL_DST_ALPHA),
1549	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1788	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1550	const_iv (GL_ONE_MINUS_DST_ALPHA),	1789	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1790	const_iv (GL_SRC_ALPHA_SATURATE),
1551	const_iv (GL_RGB),	1791	const_iv (GL_RGB),
1552	const_iv (GL_RGBA),	1792	const_iv (GL_RGBA),
		1793	const_iv (GL_RGBA4),
		1794	const_iv (GL_RGBA8),
		1795	const_iv (GL_RGB5_A1),
1553	const_iv (GL_UNSIGNED_BYTE),	1796	const_iv (GL_UNSIGNED_BYTE),
1554	const_iv (GL_UNSIGNED_SHORT),	1797	const_iv (GL_UNSIGNED_SHORT),
1555	const_iv (GL_UNSIGNED_INT),	1798	const_iv (GL_UNSIGNED_INT),
1556	const_iv (GL_ALPHA),	1799	const_iv (GL_ALPHA),
1557	const_iv (GL_INTENSITY),	1800	const_iv (GL_INTENSITY),
…		…
1589	const_iv (GL_SEPARABLE_2D),	1832	const_iv (GL_SEPARABLE_2D),
1590	const_iv (GL_CONVOLUTION_2D),	1833	const_iv (GL_CONVOLUTION_2D),
1591	const_iv (GL_CONVOLUTION_BORDER_MODE),	1834	const_iv (GL_CONVOLUTION_BORDER_MODE),
1592	const_iv (GL_CONSTANT_BORDER),	1835	const_iv (GL_CONSTANT_BORDER),
1593	const_iv (GL_LINES),	1836	const_iv (GL_LINES),
		1837	const_iv (GL_LINE_STRIP),
1594	const_iv (GL_LINE_LOOP),	1838	const_iv (GL_LINE_LOOP),
1595	const_iv (GL_QUADS),	1839	const_iv (GL_QUADS),
1596	const_iv (GL_QUAD_STRIP),	1840	const_iv (GL_QUAD_STRIP),
1597	const_iv (GL_TRIANGLES),	1841	const_iv (GL_TRIANGLES),
1598	const_iv (GL_TRIANGLE_STRIP),	1842	const_iv (GL_TRIANGLE_STRIP),
…		…
1631	OUTPUT:	1875	OUTPUT:
1632	RETVAL	1876	RETVAL
1633		1877
1634	int glGetError ()	1878	int glGetError ()
1635		1879
		1880	void glFinish ()
		1881
1636	void glClear (int mask)	1882	void glClear (int mask)
1637		1883
1638	void glClearColor (float r, float g, float b, float a = 1.0)	1884	void glClearColor (float r, float g, float b, float a = 1.0)
1639	PROTOTYPE: @	1885	PROTOTYPE: @
1640		1886
…		…
1646		1892
1647	void glHint (int target, int mode)	1893	void glHint (int target, int mode)
1648		1894
1649	void glBlendFunc (int sfactor, int dfactor)	1895	void glBlendFunc (int sfactor, int dfactor)
1650		1896
		1897	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1898	CODE:
		1899	gl_BlendFuncSeparate (sa, da, saa, daa);
		1900
1651	void glDepthMask (int flag)	1901	void glDepthMask (int flag)
1652		1902
1653	void glLogicOp (int opcode)	1903	void glLogicOp (int opcode)
1654		1904
1655	void glColorMask (int red, int green, int blue, int alpha)	1905	void glColorMask (int red, int green, int blue, int alpha)
…		…
1659	void glPushMatrix ()	1909	void glPushMatrix ()
1660		1910
1661	void glPopMatrix ()	1911	void glPopMatrix ()
1662		1912
1663	void glLoadIdentity ()	1913	void glLoadIdentity ()
		1914
		1915	void glDrawBuffer (int buffer)
		1916
		1917	void glReadBuffer (int buffer)
1664		1918
1665	# near_ and far_ are due to microsofts buggy "c" compiler	1919	# near_ and far_ are due to microsofts buggy "c" compiler
1666	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1920	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1667		1921
1668	# near_ and far_ are due to microsofts buggy "c" compiler	1922	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1688		1942
1689	void glEnd ()	1943	void glEnd ()
1690		1944
1691	void glColor (float r, float g, float b, float a = 1.0)	1945	void glColor (float r, float g, float b, float a = 1.0)
1692	PROTOTYPE: @	1946	PROTOTYPE: @
		1947	ALIAS:
		1948	glColor_premultiply = 1
1693	CODE:	1949	CODE:
		1950	if (ix)
		1951	{
		1952	r *= a;
		1953	g *= a;
		1954	b *= a;
		1955	}
1694	// microsoft visual "c" rounds instead of truncating...	1956	// microsoft visual "c" rounds instead of truncating...
1695	glColor4ub (MIN ((int)(r * 256.f), 255),	1957	glColor4f (r, g, b, a);
1696	MIN ((int)(g * 256.f), 255),
1697	MIN ((int)(b * 256.f), 255),
1698	MIN ((int)(a * 256.f), 255));
1699		1958
1700	void glInterleavedArrays (int format, int stride, char *data)	1959	void glInterleavedArrays (int format, int stride, char *data)
1701		1960
1702	void glDrawElements (int mode, int count, int type, char *indices)	1961	void glDrawElements (int mode, int count, int type, char *indices)
1703		1962
…		…
1726		1985
1727	void glBindTexture (int target, int name)	1986	void glBindTexture (int target, int name)
1728		1987
1729	void glConvolutionParameter (int target, int pname, float params)	1988	void glConvolutionParameter (int target, int pname, float params)
1730	CODE:	1989	CODE:
1731	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1990	if (gl.ConvolutionParameterf)
		1991	gl.ConvolutionParameterf (target, pname, params);
1732		1992
1733	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1993	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1734	CODE:	1994	CODE:
1735	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1995	if (gl.ConvolutionFilter2D)
1736	(target, internalformat, width, height, format, type, data));	1996	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1737		1997
1738	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1998	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1739	CODE:	1999	CODE:
1740	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2000	if (gl.SeparableFilter2D)
1741	(target, internalformat, width, height, format, type, row, column));	2001	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1742		2002
1743	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2003	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1744		2004
1745	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2005	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1746		2006
…		…
1779		2039
1780	void glEndList ()	2040	void glEndList ()
1781		2041
1782	void glCallList (int list)	2042	void glCallList (int list)
1783		2043
1784

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.102 by root, Sat Jun 3 23:47:46 2006 UTC vs. Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.102 by root, Sat Jun 3 23:47:46 2006 UTC vs.
Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC