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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC vs.
Revision 1.164 by root, Tue Nov 7 22:41:27 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>
		6	# include <wininet.h>
5	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
6	#endif	9	#endif
7		10
8	#include "EXTERN.h"	11	#include "EXTERN.h"
9	#include "perl.h"	12	#include "perl.h"
10	#include "XSUB.h"	13	#include "XSUB.h"
		14
		15	#ifdef _WIN32
		16	# undef pipe
		17	#endif
11		18
12	#include <math.h>	19	#include <math.h>
13	#include <string.h>	20	#include <string.h>
14	#include <stdio.h>	21	#include <stdio.h>
15	#include <stdlib.h>	22	#include <stdlib.h>
18	#include <SDL_endian.h>	25	#include <SDL_endian.h>
19	#include <SDL_image.h>	26	#include <SDL_image.h>
20	#include <SDL_mixer.h>	27	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	28	#include <SDL_opengl.h>
22		29
		30	#define PANGO_ENABLE_BACKEND
		31	#define G_DISABLE_CAST_CHECKS
		32
23	#include <glib/gmacros.h>	33	#include <glib/gmacros.h>
24		34
25	#include <pango/pango.h>	35	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		36
30	#ifndef _WIN32	37	#ifndef _WIN32
31	# include <sys/types.h>	38	# include <sys/types.h>
32	# include <sys/socket.h>	39	# include <sys/socket.h>
33	# include <netinet/in.h>	40	# include <netinet/in.h>
34	# include <netinet/tcp.h>	41	# include <netinet/tcp.h>
35	# include <inttypes.h>	42	# include <inttypes.h>
36	#else
37	typedef unsigned char uint8_t;
38	typedef unsigned short uint16_t;
39	typedef unsigned int uint32_t;
40	typedef signed char int8_t;
41	typedef signed short int16_t;
42	typedef signed int int32_t;
43	#endif	43	#endif
44		44
45	#include "glext.h"
46
47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	45	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48		46
49	#define FOW_DARKNESS 32	47	#define FOW_DARKNESS 32
50		48
51	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
52	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
53		51
54	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
		53
		54	#if 0
		55	# define PARACHUTE SDL_INIT_NOPARACHUTE
		56	#else
		57	# define PARACHUTE 0
		58	#endif
55		59
56	static struct	60	static struct
57	{	61	{
58	#define GL_FUNC(ptr,name) ptr name;	62	#define GL_FUNC(ptr,name) ptr name;
59	#include "glfunc.h"	63	#include "glfunc.h"
…		…
68	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	72	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69	else	73	else
70	glBlendFunc (sa, da);	74	glBlendFunc (sa, da);
71	}	75	}
72		76
		77	#include "texcache.c"
		78
		79	#include "pango-font.c"
		80	#include "pango-fontmap.c"
		81	#include "pango-render.c"
		82
73	typedef Mix_Chunk *CFClient__MixChunk;	83	typedef Mix_Chunk *CFPlus__MixChunk;
74	typedef Mix_Music *CFClient__MixMusic;	84	typedef Mix_Music *CFPlus__MixMusic;
75		85
76	typedef PangoFontDescription *CFClient__Font;	86	typedef PangoFontDescription *CFPlus__Font;
77		87
78	static int	88	static int
79	shape_attr_p (PangoLayoutRun *run)	89	shape_attr_p (PangoLayoutRun *run)
80	{	90	{
81	GSList *attrs = run->item->analysis.extra_attrs;	91	GSList *attrs = run->item->analysis.extra_attrs;
…		…
92		102
93	return 0;	103	return 0;
94	}	104	}
95		105
96	typedef struct cf_layout {	106	typedef struct cf_layout {
97	PangoLayout *pl; // either derived from a cairo or ft2 context	107	PangoLayout *pl;
98	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99	float r, g, b, a; // default color for rgba mode	108	float r, g, b, a; // default color for rgba mode
100	int base_height;	109	int base_height;
101	CFClient__Font font;	110	CFPlus__Font font;
102	} *CFClient__Layout;	111	} *CFPlus__Layout;
103		112
104	static CFClient__Font default_font;	113	static CFPlus__Font default_font;
105	static PangoContext ft2_context, cairo_context;	114	static PangoContext *opengl_context;
106	static PangoFontMap ft2_fontmap, cairo_fontmap;	115	static PangoFontMap *opengl_fontmap;
107		116
108	static void	117	static void
109	substitute_func (FcPattern *pattern, gpointer data)	118	substitute_func (FcPattern *pattern, gpointer data)
110	{	119	{
111	FcPatternAddBool (pattern, FC_HINTING, 1);	120	FcPatternAddBool (pattern, FC_HINTING, 1);
112	#ifdef FC_HINT_STYLE	121	#ifdef FC_HINT_STYLE
113	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	122	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114	#endif	123	#endif
115	#ifdef _WIN32
116	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117	#else
118	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	124	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119	#endif
120	}	125	}
121		126
122	static void	127	static void
123	layout_update_font (CFClient__Layout self)	128	layout_update_font (CFPlus__Layout self)
124	{	129	{
125	/* use a random scale factor to account for unknown descenders, 0.8 works	130	/* use a random scale factor to account for unknown descenders, 0.8 works
126	* reasonably well with bitstream vera	131	* reasonably well with bitstream vera
127	*/	132	*/
128	PangoFontDescription *font = self->font ? self->font : default_font;	133	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
132		137
133	pango_layout_set_font_description (self->pl, font);	138	pango_layout_set_font_description (self->pl, font);
134	}	139	}
135		140
136	static void	141	static void
137	layout_get_pixel_size (CFClient__Layout self, int w, int h)	142	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
138	{	143	{
		144	PangoRectangle rect;
		145
		146	// get_pixel_* wrongly rounds down
139	pango_layout_get_pixel_size (self->pl, w, h);	147	pango_layout_get_extents (self->pl, 0, &rect);
140		148
141	if (!w) w = 1;	149	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142	if (!h) h = 1;	150	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143		151
144	w = (w + 3) & ~3;	152	if (!rect.width) rect.width = 1;
		153	if (!rect.height) rect.height = 1;
		154
		155	*w = rect.width;
		156	*h = rect.height;
145	}	157	}
146		158
147	typedef uint16_t mapface;	159	typedef uint16_t mapface;
148		160
149	typedef struct {	161	typedef struct {
…		…
152	float s, t;	164	float s, t;
153	uint8_t r, g, b, a;	165	uint8_t r, g, b, a;
154	} maptex;	166	} maptex;
155		167
156	typedef struct {	168	typedef struct {
157	int16_t darkness;	169	uint32_t player;
158	mapface face[3];	170	mapface face[3];
		171	uint16_t darkness;
		172	uint8_t stat_width, stat_hp, flags;
159	} mapcell;	173	} mapcell;
160		174
161	typedef struct {	175	typedef struct {
162	int32_t c0, c1;	176	int32_t c0, c1;
163	mapcell *col;	177	mapcell *col;
…		…
172	int texs;	186	int texs;
173	maptex *tex;	187	maptex *tex;
174		188
175	int32_t rows;	189	int32_t rows;
176	maprow *row;	190	maprow *row;
177	} *CFClient__Map;	191	} *CFPlus__Map;
178		192
179	static char *	193	static char *
180	prepend (char *ptr, int sze, int inc)	194	prepend (char *ptr, int sze, int inc)
181	{	195	{
182	char *p;	196	char *p;
…		…
200		214
201	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	215	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
202	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	216	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
203		217
204	static maprow *	218	static maprow *
205	map_get_row (CFClient__Map self, int y)	219	map_get_row (CFPlus__Map self, int y)
206	{	220	{
207	if (0 > y)	221	if (0 > y)
208	{	222	{
209	int extend = - y + MAP_EXTEND_Y;	223	int extend = - y + MAP_EXTEND_Y;
210	Prepend (maprow, self->row, self->rows, extend);	224	Prepend (maprow, self->row, self->rows, extend);
…		…
248		262
249	return row->col + (x - row->c0);	263	return row->col + (x - row->c0);
250	}	264	}
251		265
252	static mapcell *	266	static mapcell *
253	map_get_cell (CFClient__Map self, int x, int y)	267	map_get_cell (CFPlus__Map self, int x, int y)
254	{	268	{
255	return row_get_cell (map_get_row (self, y), x);	269	return row_get_cell (map_get_row (self, y), x);
256	}	270	}
257		271
258	static void	272	static void
259	map_clear (CFClient__Map self)	273	map_clear (CFPlus__Map self)
260	{	274	{
261	int r;	275	int r;
262		276
263	for (r = 0; r < self->rows; r++)	277	for (r = 0; r < self->rows; r++)
264	Safefree (self->row[r].col);	278	Safefree (self->row[r].col);
…		…
272	self->row = 0;	286	self->row = 0;
273	self->rows = 0;	287	self->rows = 0;
274	}	288	}
275		289
276	static void	290	static void
277	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	291	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
278	{	292	{
279	int x, y;	293	int x, y;
280	maprow *row;	294	maprow *row;
		295	mapcell *cell;
281		296
282	for (y = y0; y < y0 + h; y++)	297	for (y = y0; y < y0 + h; y++)
283	if (y >= 0)	298	if (y >= 0)
284	{	299	{
285	if (y >= self->rows)	300	if (y >= self->rows)
…		…
291	if (x >= row->c0)	306	if (x >= row->c0)
292	{	307	{
293	if (x >= row->c1)	308	if (x >= row->c1)
294	break;	309	break;
295		310
296	row->col[x - row->c0].darkness = -1;	311	cell = row->col + x - row->c0;
		312
		313	cell->darkness = 0;
		314	cell->stat_hp = 0;
		315	cell->flags = 0;
		316	cell->player = 0;
297	}	317	}
298	}	318	}
299	}	319	}
300		320
301	static void	321	static void
…		…
339	n \|= n >> 16;	359	n \|= n >> 16;
340		360
341	return n + 1;	361	return n + 1;
342	}	362	}
343		363
344	MODULE = CFClient PACKAGE = CFClient	364	MODULE = CFPlus PACKAGE = CFPlus
345		365
346	PROTOTYPES: ENABLE	366	PROTOTYPES: ENABLE
347		367
348	BOOT:	368	BOOT:
349	{	369	{
350	HV *stash = gv_stashpv ("CFClient", 1);	370	HV *stash = gv_stashpv ("CFPlus", 1);
351	static const struct {	371	static const struct {
352	const char *name;	372	const char *name;
353	IV iv;	373	IV iv;
354	} *civ, const_iv[] = {	374	} *civ, const_iv[] = {
355	# define const_iv(name) { # name, (IV)name }	375	# define const_iv(name) { # name, (IV)name }
…		…
456		476
457	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	477	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	478	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
459	}	479	}
460		480
		481	int
		482	in_destruct ()
		483	CODE:
		484	RETVAL = PL_main_cv == Nullcv;
		485	OUTPUT:
		486	RETVAL
		487
461	NV floor (NV x)	488	NV floor (NV x)
462		489
463	NV ceil (NV x)	490	NV ceil (NV x)
464		491
465	void	492	void
466	pango_init ()	493	pango_init ()
467	CODE:	494	CODE:
468	// delayed, so it can pick up new fonts added by AddFontResourceEx
469	{	495	{
470	{
471	ft2_fontmap = pango_ft2_font_map_new ();	496	opengl_fontmap = pango_opengl_font_map_new ();
472	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	497	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
473	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	498	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474	}
475	{
476	cairo_font_options_t *fopt = cairo_font_options_create ();
477	cairo_fontmap = pango_cairo_font_map_get_default ();
478	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479	#ifdef _WIN32
480	// cairo looks like shit eaten twice on windows
481	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482	#else
483	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484	#endif
485	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487	pango_cairo_context_set_font_options (cairo_context, fopt);
488	cairo_font_options_destroy (fopt);
489	}
490	}	499	}
491		500
492	int	501	int
493	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	502	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
494		503
495	void	504	void
496	SDL_Quit ()	505	SDL_Quit ()
497		506
498	void	507	void
…		…
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516		525
517	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	526	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		527	#if SDL_VERSION_ATLEAST(1,2,10)
		528	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		529	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		530	#endif
518		531
519	SDL_EnableUNICODE (1);	532	SDL_EnableUNICODE (1);
520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	533	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521		534
522	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	535	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	622	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	623	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	624	break;
612	}	625	}
613		626
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	627	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	628	}
616	}	629	}
617		630
618	int	631	int
619	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	632	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
633	#ifndef _WIN32	646	#ifndef _WIN32
634	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	647	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
635	#endif	648	#endif
636		649
637	void	650	void
		651	win32_proxy_info ()
		652	PPCODE:
		653	{
		654	#ifdef _WIN32
		655	char buffer[2048];
		656	DWORD buflen;
		657
		658	EXTEND (SP, 3);
		659
		660	buflen = sizeof (buffer);
		661	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		662	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		663	{
		664	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		665
		666	buflen = sizeof (buffer);
		667	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		668	{
		669	PUSHs (newSVpv (buffer, 0));
		670
		671	buflen = sizeof (buffer);
		672	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		673	PUSHs (newSVpv (buffer, 0));
		674	}
		675	}
		676	#endif
		677	}
		678
		679	void
638	add_font (char *file)	680	add_font (char *file)
639	CODE:	681	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	682	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		683
646	void	684	void
647	load_image_inline (SV *image_)	685	load_image_inline (SV *image_)
648	ALIAS:	686	ALIAS:
649	load_image_file = 1	687	load_image_file = 1
…		…
691		729
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	730	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		731
694	assert (surface2->pitch == surface2->w * 4);	732	assert (surface2->pitch == surface2->w * 4);
695		733
		734	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	735	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	736	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	737	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	738	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701	SDL_UnlockSurface (surface2);
702	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	739	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	740	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	741	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		742	SDL_UnlockSurface (surface2);
705		743
706	SDL_FreeSurface (surface);	744	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	745	SDL_FreeSurface (surface2);
708	}	746	}
709		747
…		…
748	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	786	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
749	#endif	787	#endif
750	_exit (1);	788	_exit (1);
751		789
752	void	790	void
753	_exit (int retval)	791	_exit (int retval = 0)
754	CODE:	792	CODE:
		793	#ifdef WIN32
		794	ExitThread (retval); // unclean, please beam me up
		795	#else
755	_exit (retval);	796	_exit (retval);
		797	#endif
756		798
757	MODULE = CFClient PACKAGE = CFClient::Font	799	MODULE = CFPlus PACKAGE = CFPlus::Font
758		800
759	CFClient::Font	801	CFPlus::Font
760	new_from_file (SV class, char path, int id = 0)	802	new_from_file (SV class, char path, int id = 0)
761	CODE:	803	CODE:
762	{	804	{
763	int count;	805	int count;
764	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	806	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
767	}	809	}
768	OUTPUT:	810	OUTPUT:
769	RETVAL	811	RETVAL
770		812
771	void	813	void
772	DESTROY (CFClient::Font self)	814	DESTROY (CFPlus::Font self)
773	CODE:	815	CODE:
774	pango_font_description_free (self);	816	pango_font_description_free (self);
775		817
776	void	818	void
777	make_default (CFClient::Font self)	819	make_default (CFPlus::Font self)
778	CODE:	820	CODE:
779	default_font = self;	821	default_font = self;
780		822
781	MODULE = CFClient PACKAGE = CFClient::Layout	823	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		824
783	CFClient::Layout	825	void
784	new (SV *class, int rgba = 0)	826	reset_glyph_cache ()
		827	CODE:
		828	tc_clear ();
		829
		830	CFPlus::Layout
		831	new (SV *class)
785	CODE:	832	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	833	New (0, RETVAL, 1, struct cf_layout);
787		834
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	835	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	836	RETVAL->r = 1.;
791	RETVAL->g = 1.;	837	RETVAL->g = 1.;
792	RETVAL->b = 1.;	838	RETVAL->b = 1.;
793	RETVAL->a = 1.;	839	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	840	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	844	layout_update_font (RETVAL);
799	OUTPUT:	845	OUTPUT:
800	RETVAL	846	RETVAL
801		847
802	void	848	void
803	DESTROY (CFClient::Layout self)	849	DESTROY (CFPlus::Layout self)
804	CODE:	850	CODE:
805	g_object_unref (self->pl);	851	g_object_unref (self->pl);
806	Safefree (self);	852	Safefree (self);
807		853
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	854	void
816	set_text (CFClient::Layout self, SV *text_)	855	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	856	CODE:
818	{	857	{
819	STRLEN textlen;	858	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	859	char *text = SvPVutf8 (text_, textlen);
821		860
822	pango_layout_set_text (self->pl, text, textlen);	861	pango_layout_set_text (self->pl, text, textlen);
823	}	862	}
824		863
825	void	864	void
826	set_markup (CFClient::Layout self, SV *text_)	865	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	866	CODE:
828	{	867	{
829	STRLEN textlen;	868	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	869	char *text = SvPVutf8 (text_, textlen);
831		870
832	pango_layout_set_markup (self->pl, text, textlen);	871	pango_layout_set_markup (self->pl, text, textlen);
833	}	872	}
834		873
835	void	874	void
836	set_shapes (CFClient::Layout self, ...)	875	set_shapes (CFPlus::Layout self, ...)
837	CODE:	876	CODE:
838	{	877	{
839	PangoAttrList *attrs = 0;	878	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	879	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	880	const char *pos = text;
…		…
876	if (attrs)	915	if (attrs)
877	pango_layout_set_attributes (self->pl, attrs);	916	pango_layout_set_attributes (self->pl, attrs);
878	}	917	}
879		918
880	void	919	void
881	get_shapes (CFClient::Layout self)	920	get_shapes (CFPlus::Layout self)
882	PPCODE:	921	PPCODE:
883	{	922	{
884	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	923	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885		924
886	do	925	do
…		…
890	if (run && shape_attr_p (run))	929	if (run && shape_attr_p (run))
891	{	930	{
892	PangoRectangle extents;	931	PangoRectangle extents;
893	pango_layout_iter_get_run_extents (iter, 0, &extents);	932	pango_layout_iter_get_run_extents (iter, 0, &extents);
894		933
		934	EXTEND (SP, 2);
895	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	935	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	936	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897	}	937	}
898	}	938	}
899	while (pango_layout_iter_next_run (iter));	939	while (pango_layout_iter_next_run (iter));
900		940
901	pango_layout_iter_free (iter);	941	pango_layout_iter_free (iter);
902	}	942	}
903		943
904	int	944	int
905	has_wrapped (CFClient::Layout self)	945	has_wrapped (CFPlus::Layout self)
906	CODE:	946	CODE:
907	{	947	{
908	int lines = 1;	948	int lines = 1;
909	const char *text = pango_layout_get_text (self->pl);	949	const char *text = pango_layout_get_text (self->pl);
910		950
…		…
915	}	955	}
916	OUTPUT:	956	OUTPUT:
917	RETVAL	957	RETVAL
918		958
919	SV *	959	SV *
920	get_text (CFClient::Layout self)	960	get_text (CFPlus::Layout self)
921	CODE:	961	CODE:
922	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	962	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
923	sv_utf8_decode (RETVAL);	963	sv_utf8_decode (RETVAL);
924	OUTPUT:	964	OUTPUT:
925	RETVAL	965	RETVAL
926		966
927	void	967	void
928	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	968	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
929	CODE:	969	CODE:
930	self->r = r;	970	self->r = r;
931	self->g = g;	971	self->g = g;
932	self->b = b;	972	self->b = b;
933	self->a = a;	973	self->a = a;
934		974
935	void	975	void
936	set_font (CFClient::Layout self, CFClient::Font font = 0)	976	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
937	CODE:	977	CODE:
938	if (self->font != font)	978	if (self->font != font)
939	{	979	{
940	self->font = font;	980	self->font = font;
941	layout_update_font (self);	981	layout_update_font (self);
942	}	982	}
943		983
944	void	984	void
945	set_height (CFClient::Layout self, int base_height)	985	set_height (CFPlus::Layout self, int base_height)
946	CODE:	986	CODE:
947	if (self->base_height != base_height)	987	if (self->base_height != base_height)
948	{	988	{
949	self->base_height = base_height;	989	self->base_height = base_height;
950	layout_update_font (self);	990	layout_update_font (self);
951	}	991	}
952		992
953	void	993	void
954	set_width (CFClient::Layout self, int max_width = -1)	994	set_width (CFPlus::Layout self, int max_width = -1)
955	CODE:	995	CODE:
956	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	996	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
957		997
958	void	998	void
959	set_indent (CFClient::Layout self, int indent)	999	set_indent (CFPlus::Layout self, int indent)
960	CODE:	1000	CODE:
961	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1001	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962		1002
963	void	1003	void
964	set_spacing (CFClient::Layout self, int spacing)	1004	set_spacing (CFPlus::Layout self, int spacing)
965	CODE:	1005	CODE:
966	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1006	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967		1007
968	void	1008	void
969	set_ellipsise (CFClient::Layout self, int ellipsise)	1009	set_ellipsise (CFPlus::Layout self, int ellipsise)
970	CODE:	1010	CODE:
971	pango_layout_set_ellipsize (self->pl,	1011	pango_layout_set_ellipsize (self->pl,
972	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1012	ellipsise == 1 ? PANGO_ELLIPSIZE_START
973	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1013	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1014	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
975	: PANGO_ELLIPSIZE_NONE	1015	: PANGO_ELLIPSIZE_NONE
976	);	1016	);
977		1017
978	void	1018	void
979	set_single_paragraph_mode (CFClient::Layout self, int spm)	1019	set_single_paragraph_mode (CFPlus::Layout self, int spm)
980	CODE:	1020	CODE:
981	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1021	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982		1022
983	void	1023	void
984	size (CFClient::Layout self)	1024	size (CFPlus::Layout self)
985	PPCODE:	1025	PPCODE:
986	{	1026	{
987	int w, h;	1027	int w, h;
988		1028
989	layout_get_pixel_size (self, &w, &h);	1029	layout_get_pixel_size (self, &w, &h);
…		…
992	PUSHs (sv_2mortal (newSViv (w)));	1032	PUSHs (sv_2mortal (newSViv (w)));
993	PUSHs (sv_2mortal (newSViv (h)));	1033	PUSHs (sv_2mortal (newSViv (h)));
994	}	1034	}
995		1035
996	int	1036	int
997	descent (CFClient::Layout self)	1037	descent (CFPlus::Layout self)
998	CODE:	1038	CODE:
999	{	1039	{
1000	PangoRectangle rect;	1040	PangoRectangle rect;
1001	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1041	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002	pango_layout_line_get_pixel_extents (line, 0, &rect);	1042	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
1004	}	1044	}
1005	OUTPUT:	1045	OUTPUT:
1006	RETVAL	1046	RETVAL
1007		1047
1008	int	1048	int
1009	xy_to_index (CFClient::Layout self, int x, int y)	1049	xy_to_index (CFPlus::Layout self, int x, int y)
1010	CODE:	1050	CODE:
1011	{	1051	{
1012	int index, trailing;	1052	int index, trailing;
1013	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1053	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1014	RETVAL = index;	1054	RETVAL = index;
1015	}	1055	}
1016	OUTPUT:	1056	OUTPUT:
1017	RETVAL	1057	RETVAL
1018		1058
1019	void	1059	void
1020	cursor_pos (CFClient::Layout self, int index)	1060	cursor_pos (CFPlus::Layout self, int index)
1021	PPCODE:	1061	PPCODE:
1022	{	1062	{
1023	PangoRectangle strong_pos;	1063	PangoRectangle strong_pos;
1024	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1064	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1025		1065
…		…
1028	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1068	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1029	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1069	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1030	}	1070	}
1031		1071
1032	void	1072	void
1033	render (CFClient::Layout self)	1073	render (CFPlus::Layout self, float x, float y, int flags = 0)
1034	PPCODE:	1074	PPCODE:
1035	{	1075	pango_opengl_render_layout_subpixel (
1036	SV *retval;	1076	self->pl,
1037	int w, h;	1077	x * PANGO_SCALE, y * PANGO_SCALE,
1038		1078	self->r, self->g, self->b, self->a,
1039	layout_get_pixel_size (self, &w, &h);
1040
1041	if (self->rgba)
1042	{	1079	flags
1043	cairo_surface_t *surface;
1044	cairo_t *cairo;
1045
1046	retval = newSV (w * h * 4);
1047	SvPOK_only (retval);
1048	SvCUR_set (retval, w * h * 4);
1049
1050	memset (SvPVX (retval), 0, w * h * 4);
1051
1052	surface = cairo_image_surface_create_for_data (
1053	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
1054	cairo = cairo_create (surface);
1055	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1056
1057	pango_cairo_show_layout (cairo, self->pl);
1058
1059	cairo_destroy (cairo);
1060	cairo_surface_destroy (surface);
1061
1062	// what a mess, and its premultiplied, too :(
1063	{
1064	uint32_t p = (uint32_t )SvPVX (retval);
1065	uint32_t e = p + w h;
1066
1067	while (p < e)
1068	{
1069	uint32_t rgba = *p;
1070	rgba = (rgba >> 24) \| (rgba << 8);
1071	#if 0
1072	#ifdef _WIN32
1073	{//D
1074	uint8_t r = rgba >> 24;
1075	uint8_t g = rgba >> 16;
1076	uint8_t b = rgba >> 8;
1077	uint8_t a = rgba >> 0;
1078
1079	rgba = (rgba & 0xffffff00) \| a;
1080	}
1081	#endif
1082	#endif
1083	rgba = SDL_SwapBE32 (rgba);
1084	*p++ = rgba;
1085	}
1086	}
1087
1088	EXTEND (SP, 5);
1089	PUSHs (sv_2mortal (newSViv (w)));
1090	PUSHs (sv_2mortal (newSViv (h)));
1091	PUSHs (sv_2mortal (retval));
1092	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1093	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1094	}	1080	);
1095	else
1096	{
1097	FT_Bitmap bitmap;
1098		1081
1099	retval = newSV (w * h);
1100	SvPOK_only (retval);
1101	SvCUR_set (retval, w * h);
1102
1103	bitmap.rows = h;
1104	bitmap.width = w;
1105	bitmap.pitch = w;
1106	bitmap.buffer = (unsigned char*)SvPVX (retval);
1107	bitmap.num_grays = 256;
1108	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1109
1110	memset (bitmap.buffer, 0, w * h);
1111
1112	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1113
1114	EXTEND (SP, 5);
1115	PUSHs (sv_2mortal (newSViv (w)));
1116	PUSHs (sv_2mortal (newSViv (h)));
1117	PUSHs (sv_2mortal (retval));
1118	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1119	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1120	}
1121	}
1122
1123	MODULE = CFClient PACKAGE = CFClient::Texture	1082	MODULE = CFPlus PACKAGE = CFPlus::Texture
1124		1083
1125	void	1084	void
1126	pad2pot (SV data_, SV w_, SV *h_)	1085	pad2pot (SV data_, SV w_, SV *h_)
1127	CODE:	1086	CODE:
1128	{	1087	{
…		…
1206	glDisable (GL_ALPHA_TEST);	1165	glDisable (GL_ALPHA_TEST);
1207	glDisable (GL_BLEND);	1166	glDisable (GL_BLEND);
1208	}	1167	}
1209	}	1168	}
1210		1169
1211	MODULE = CFClient PACKAGE = CFClient::Map	1170	MODULE = CFPlus PACKAGE = CFPlus::Map
1212		1171
1213	CFClient::Map	1172	CFPlus::Map
1214	new (SV *class, int map_width, int map_height)	1173	new (SV *class)
1215	CODE:	1174	CODE:
1216	New (0, RETVAL, 1, struct map);	1175	New (0, RETVAL, 1, struct map);
1217	RETVAL->x = 0;	1176	RETVAL->x = 0;
1218	RETVAL->y = 0;	1177	RETVAL->y = 0;
1219	RETVAL->w = map_width;	1178	RETVAL->w = 0;
1220	RETVAL->h = map_height;	1179	RETVAL->h = 0;
1221	RETVAL->ox = 0;	1180	RETVAL->ox = 0;
1222	RETVAL->oy = 0;	1181	RETVAL->oy = 0;
1223	RETVAL->faces = 8192;	1182	RETVAL->faces = 8192;
1224	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1183	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1225	RETVAL->texs = 8192;	1184	RETVAL->texs = 8192;
…		…
1228	RETVAL->row = 0;	1187	RETVAL->row = 0;
1229	OUTPUT:	1188	OUTPUT:
1230	RETVAL	1189	RETVAL
1231		1190
1232	void	1191	void
1233	DESTROY (CFClient::Map self)	1192	DESTROY (CFPlus::Map self)
1234	CODE:	1193	CODE:
1235	{	1194	{
1236	map_clear (self);	1195	map_clear (self);
1237	Safefree (self->face);	1196	Safefree (self->face);
1238	Safefree (self->tex);	1197	Safefree (self->tex);
1239	Safefree (self);	1198	Safefree (self);
1240	}	1199	}
1241		1200
1242	void	1201	void
		1202	resize (CFPlus::Map self, int map_width, int map_height)
		1203	CODE:
		1204	self->w = map_width;
		1205	self->h = map_height;
		1206
		1207	void
1243	clear (CFClient::Map self)	1208	clear (CFPlus::Map self)
1244	CODE:	1209	CODE:
1245	map_clear (self);	1210	map_clear (self);
1246		1211
1247	void	1212	void
1248	set_face (CFClient::Map self, int face, int texid)	1213	set_face (CFPlus::Map self, int face, int texid)
1249	CODE:	1214	CODE:
1250	{	1215	{
1251	while (self->faces <= face)	1216	while (self->faces <= face)
1252	{	1217	{
1253	Append (mapface, self->face, self->faces, self->faces);	1218	Append (mapface, self->face, self->faces, self->faces);
…		…
1256		1221
1257	self->face [face] = texid;	1222	self->face [face] = texid;
1258	}	1223	}
1259		1224
1260	void	1225	void
1261	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)	1226	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)
1262	CODE:	1227	CODE:
1263	{	1228	{
1264	while (self->texs <= texid)	1229	while (self->texs <= texid)
1265	{	1230	{
1266	Append (maptex, self->tex, self->texs, self->texs);	1231	Append (maptex, self->tex, self->texs, self->texs);
…		…
1290	// from transparent color bleeding and ugly wrapping effects.	1255	// from transparent color bleeding and ugly wrapping effects.
1291	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1256	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1292	}	1257	}
1293		1258
1294	int	1259	int
1295	ox (CFClient::Map self)	1260	ox (CFPlus::Map self)
1296	ALIAS:	1261	ALIAS:
1297	oy = 1	1262	oy = 1
1298	x = 2	1263	x = 2
1299	y = 3	1264	y = 3
1300	w = 4	1265	w = 4
…		…
1311	}	1276	}
1312	OUTPUT:	1277	OUTPUT:
1313	RETVAL	1278	RETVAL
1314		1279
1315	void	1280	void
1316	scroll (CFClient::Map self, int dx, int dy)	1281	scroll (CFPlus::Map self, int dx, int dy)
1317	CODE:	1282	CODE:
1318	{	1283	{
1319	if (dx > 0)	1284	if (dx > 0)
1320	map_blank (self, self->x, self->y, dx - 1, self->h);	1285	map_blank (self, self->x, self->y, dx, self->h);
1321	else if (dx < 0)	1286	else if (dx < 0)
1322	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1287	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1323		1288
1324	if (dy > 0)	1289	if (dy > 0)
1325	map_blank (self, self->x, self->y, self->w, dy - 1);	1290	map_blank (self, self->x, self->y, self->w, dy);
1326	else if (dy < 0)	1291	else if (dy < 0)
1327	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1292	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1328		1293
1329	self->ox += dx; self->x += dx;	1294	self->ox += dx; self->x += dx;
1330	self->oy += dy; self->y += dy;	1295	self->oy += dy; self->y += dy;
1331		1296
1332	while (self->y < 0)	1297	while (self->y < 0)
…		…
1337	self->y += MAP_EXTEND_Y;	1302	self->y += MAP_EXTEND_Y;
1338	}	1303	}
1339	}	1304	}
1340		1305
1341	void	1306	void
1342	map1a_update (CFClient::Map self, SV *data_)	1307	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1343	CODE:	1308	CODE:
1344	{	1309	{
1345	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1310	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1346	uint8_t data_end = (uint8_t )SvEND (data_);	1311	uint8_t data_end = (uint8_t )SvEND (data_);
1347	mapcell *cell;	1312	mapcell *cell;
1348	int x, y, flags;	1313	int x, y, flags;
1349		1314
1350	while (data < data_end)	1315	while (data < data_end - 1)
1351	{	1316	{
1352	flags = (data [0] << 8) + data [1]; data += 2;	1317	flags = (data [0] << 8) + data [1]; data += 2;
1353		1318
1354	x = self->x + ((flags >> 10) & 63);	1319	x = self->x + ((flags >> 10) & 63);
1355	y = self->y + ((flags >> 4) & 63);	1320	y = self->y + ((flags >> 4) & 63);
1356		1321
1357	cell = map_get_cell (self, x, y);	1322	cell = map_get_cell (self, x, y);
1358		1323
1359	if (flags & 15)	1324	if (flags & 15)
1360	{	1325	{
1361	if (cell->darkness < 0)	1326	if (!cell->darkness)
1362	{	1327	{
		1328	memset (cell, 0, sizeof (*cell));
1363	cell->darkness = 0;	1329	cell->darkness = 256;
1364	cell->face [0] = 0;
1365	cell->face [1] = 0;
1366	cell->face [2] = 0;
1367	}	1330	}
1368		1331
1369	cell->darkness = flags & 8 ? *data++ : 255;
1370
1371	//TODO: don't trust server data to be in-range(!)	1332	//TODO: don't trust server data to be in-range(!)
		1333
		1334	if (flags & 8)
		1335	{
		1336	if (extmap)
		1337	{
		1338	uint8_t ext, cmd;
		1339
		1340	do
		1341	{
		1342	ext = *data++;
		1343	cmd = ext & 0x3f;
		1344
		1345	if (cmd < 4)
		1346	cell->darkness = 255 - ext * 64 + 1;
		1347	else if (cmd == 5) // health
		1348	{
		1349	cell->stat_width = 1;
		1350	cell->stat_hp = *data++;
		1351	}
		1352	else if (cmd == 6) // monster width
		1353	cell->stat_width = *data++ + 1;
		1354	else if (cmd == 0x47) // monster width
		1355	{
		1356	if (*data == 4)
		1357	; // decode player tag
		1358
		1359	data += *data + 1;
		1360	}
		1361	else if (cmd == 8) // cell flags
		1362	cell->flags = *data++;
		1363	else if (ext & 0x40) // unknown, multibyte => skip
		1364	data += *data + 1;
		1365	else
		1366	data++;
		1367	}
		1368	while (ext & 0x80);
		1369	}
		1370	else
		1371	cell->darkness = *data++ + 1;
		1372	}
1372		1373
1373	if (flags & 4)	1374	if (flags & 4)
1374	{	1375	{
1375	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1376	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1376	}	1377	}
…		…
1384	{	1385	{
1385	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1386	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1386	}	1387	}
1387	}	1388	}
1388	else	1389	else
1389	cell->darkness = -1;	1390	cell->darkness = 0;
1390	}	1391	}
1391	}	1392	}
1392		1393
1393	SV *	1394	SV *
1394	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1395	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1395	CODE:	1396	CODE:
1396	{	1397	{
1397	int x1, x;	1398	int x1, x;
1398	int y1, y;	1399	int y1, y;
1399	int z;	1400	int z;
…		…
1449	}	1450	}
1450	OUTPUT:	1451	OUTPUT:
1451	RETVAL	1452	RETVAL
1452		1453
1453	void	1454	void
1454	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1455	draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1455	CODE:	1456	CODE:
1456	{	1457	{
1457	int vx, vy;
1458	int x, y, z;	1458	int x, y, z;
1459	int last_name;	1459	int last_name;
1460	mapface face;	1460	mapface face;
1461
1462	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1463	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1464
1465	/*
1466	int vx = self->vx = self->w >= sw
1467	? self->x + (self->w - sw) / 2
1468	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1469
1470	int vy = self->vy = self->h >= sh
1471	? self->y + (self->h - sh) / 2
1472	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1473	*/
1474		1461
1475	glColor4ub (255, 255, 255, 255);	1462	glColor4ub (255, 255, 255, 255);
1476		1463
1477	glEnable (GL_BLEND);	1464	glEnable (GL_BLEND);
1478	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1465	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1481		1468
1482	glBegin (GL_QUADS);	1469	glBegin (GL_QUADS);
1483		1470
1484	last_name = 0;	1471	last_name = 0;
1485		1472
		1473	mx += self->x;
		1474	my += self->y;
		1475
1486	for (z = 0; z < 3; z++)	1476	for (z = 0; z < 3; z++)
1487	for (y = 0; y < sh; y++)	1477	for (y = 0; y < sh; y++)
1488	if (0 <= y + vy && y + vy < self->rows)	1478	if (0 <= y + my && y + my < self->rows)
1489	{	1479	{
1490	maprow *row = self->row + (y + vy);	1480	maprow *row = self->row + (y + my);
1491		1481
1492	for (x = 0; x < sw; x++)	1482	for (x = 0; x < sw; x++)
1493	if (row->c0 <= x + vx && x + vx < row->c1)	1483	if (row->c0 <= x + mx && x + mx < row->c1)
1494	{	1484	{
1495	mapcell *cell = row->col + (x + vx - row->c0);	1485	mapcell *cell = row->col + (x + mx - row->c0);
1496		1486
1497	face = cell->face [z];	1487	face = cell->face [z];
1498		1488
1499	if (face)	1489	if (face && face < self->texs)
1500	{	1490	{
1501	maptex tex = self->tex [face];	1491	maptex tex = self->tex [face];
1502
1503	int px = (x + 1) * 32 - tex.w;	1492	int px = (x + 1) * 32 - tex.w;
1504	int py = (y + 1) * 32 - tex.h;	1493	int py = (y + 1) * 32 - tex.h;
1505		1494
1506	if (last_name != tex.name)	1495	if (last_name != tex.name)
1507	{	1496	{
1508	glEnd ();	1497	glEnd ();
1509	last_name = tex.name;
1510	glBindTexture (GL_TEXTURE_2D, last_name);	1498	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1511	glBegin (GL_QUADS);	1499	glBegin (GL_QUADS);
1512	}	1500	}
1513		1501
1514	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1502	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1515	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1503	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1516	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1504	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1517	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1505	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1518	}	1506	}
		1507
		1508	if (cell->flags && z == 2)
		1509	{
		1510	if (cell->flags & 1)
		1511	{
		1512	maptex tex = self->tex [1];
		1513	int px = (x + 1) * 32 - tex.w + 2;
		1514	int py = (y + 1) * 32 - tex.h - 6;
		1515
		1516	glEnd ();
		1517	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1518	glBegin (GL_QUADS);
		1519
		1520	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1521	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1522	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1523	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1524	}
		1525	}
1519	}	1526	}
1520	}	1527	}
1521		1528
1522	glEnd ();	1529	glEnd ();
1523		1530
1524	glDisable (GL_TEXTURE_2D);	1531	glDisable (GL_TEXTURE_2D);
1525	glDisable (GL_BLEND);	1532	glDisable (GL_BLEND);
1526	}
1527		1533
		1534	// top layer: overlays such as the health bar
		1535	for (y = 0; y < sh; y++)
		1536	if (0 <= y + my && y + my < self->rows)
		1537	{
		1538	maprow *row = self->row + (y + my);
		1539
		1540	for (x = 0; x < sw; x++)
		1541	if (row->c0 <= x + mx && x + mx < row->c1)
		1542	{
		1543	mapcell *cell = row->col + (x + mx - row->c0);
		1544
		1545	int px = x * 32;
		1546	int py = y * 32;
		1547
		1548	if (cell->stat_hp)
		1549	{
		1550	int width = cell->stat_width * 32;
		1551	int thick = sh / 28 + 1 + cell->stat_width;
		1552
		1553	glColor3ub (0, 0, 0);
		1554	glRectf (px + 1, py - thick - 2,
		1555	px + width - 1, py);
		1556
		1557	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1558	glRectf (px + 2,
		1559	py - thick - 1,
		1560	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1561	}
		1562	}
		1563	}
		1564	}
		1565
1528	void	1566	void
1529	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1567	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530	CODE:	1568	CODE:
1531	{	1569	{
1532	static float color[16][3] = {	1570	static float color[16][3] = {
1533	{ 0.00F, 0.00F, 0.00F },	1571	{ 0.00F, 0.00F, 0.00F },
1534	{ 1.00F, 1.00F, 1.00F },	1572	{ 1.00F, 1.00F, 1.00F },
…		…
1584	glDisable (GL_BLEND);	1622	glDisable (GL_BLEND);
1585	glDisable (GL_TEXTURE_2D);	1623	glDisable (GL_TEXTURE_2D);
1586	}	1624	}
1587		1625
1588	void	1626	void
1589	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1627	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1590	PPCODE:	1628	PPCODE:
1591	{	1629	{
1592	int vx, vy;
1593	int x, y;	1630	int x, y;
1594	int sw4 = (sw + 3) & ~3;	1631	int sw4 = (sw + 3) & ~3;
1595	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1632	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1596	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1633	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1597		1634
1598	memset (darkness, 255, sw4 * sh);	1635	memset (darkness, 255, sw4 * sh);
1599	SvPOK_only (darkness_sv);	1636	SvPOK_only (darkness_sv);
1600	SvCUR_set (darkness_sv, sw4 * sh);	1637	SvCUR_set (darkness_sv, sw4 * sh);
1601		1638
1602	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1639	mx += self->x;
1603	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1640	my += self->y;
1604		1641
1605	for (y = 0; y < sh; y++)	1642	for (y = 0; y < sh; y++)
1606	if (0 <= y + vy && y + vy < self->rows)	1643	if (0 <= y + my && y + my < self->rows)
1607	{	1644	{
1608	maprow *row = self->row + (y + vy);	1645	maprow *row = self->row + (y + my);
1609		1646
1610	for (x = 0; x < sw; x++)	1647	for (x = 0; x < sw; x++)
1611	if (row->c0 <= x + vx && x + vx < row->c1)	1648	if (row->c0 <= x + mx && x + mx < row->c1)
1612	{	1649	{
1613	mapcell *cell = row->col + (x + vx - row->c0);	1650	mapcell *cell = row->col + (x + mx - row->c0);
1614		1651
1615	darkness[y * sw4 + x] = cell->darkness < 0	1652	darkness[y * sw4 + x] = cell->darkness
		1653	? 255 - (cell->darkness - 1)
1616	? 255 - FOW_DARKNESS	1654	: 255 - FOW_DARKNESS;
1617	: 255 - cell->darkness;
1618	}	1655	}
1619	}	1656	}
1620		1657
1621	EXTEND (SP, 3);	1658	EXTEND (SP, 3);
1622	PUSHs (sv_2mortal (newSViv (sw4)));	1659	PUSHs (sv_2mortal (newSViv (sw4)));
1623	PUSHs (sv_2mortal (newSViv (sh)));	1660	PUSHs (sv_2mortal (newSViv (sh)));
1624	PUSHs (darkness_sv);	1661	PUSHs (darkness_sv);
1625	}	1662	}
1626		1663
1627	SV *	1664	SV *
1628	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1665	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1629	CODE:	1666	CODE:
1630	{	1667	{
1631	int x, y, x1, y1;	1668	int x, y, x1, y1;
1632	SV data_sv = newSV (w h * 7 + 5);	1669	SV data_sv = newSV (w h * 7 + 5);
1633	uint8_t data = (uint8_t )SvPVX (data_sv);	1670	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1695	}	1732	}
1696	OUTPUT:	1733	OUTPUT:
1697	RETVAL	1734	RETVAL
1698		1735
1699	void	1736	void
1700	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1737	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1701	PPCODE:	1738	PPCODE:
1702	{	1739	{
1703	int x, y, z;	1740	int x, y, z;
1704	int w, h;	1741	int w, h;
1705	int x1, y1;	1742	int x1, y1;
…		…
1737		1774
1738	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1775	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1739	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1776	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1740	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1777	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1741		1778
1742	if (cell->darkness <= 0)	1779	if (cell->darkness == 0)
1743	{	1780	{
1744	cell->darkness = -1;	1781	cell->darkness = 0;
1745		1782
1746	for (z = 0; z <= 2; z++)	1783	for (z = 0; z <= 2; z++)
1747	{	1784	{
1748	cell->face[z] = face[z];	1785	cell->face[z] = face[z];
1749		1786
…		…
1754	}	1791	}
1755	}	1792	}
1756	}	1793	}
1757	}	1794	}
1758		1795
1759	MODULE = CFClient PACKAGE = CFClient::MixChunk	1796	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1760		1797
1761	CFClient::MixChunk	1798	CFPlus::MixChunk
1762	new_from_file (SV class, char path)	1799	new_from_file (SV class, char path)
1763	CODE:	1800	CODE:
1764	RETVAL = Mix_LoadWAV (path);	1801	RETVAL = Mix_LoadWAV (path);
1765	OUTPUT:	1802	OUTPUT:
1766	RETVAL	1803	RETVAL
1767		1804
1768	void	1805	void
1769	DESTROY (CFClient::MixChunk self)	1806	DESTROY (CFPlus::MixChunk self)
1770	CODE:	1807	CODE:
1771	Mix_FreeChunk (self);	1808	Mix_FreeChunk (self);
1772		1809
1773	int	1810	int
1774	volume (CFClient::MixChunk self, int volume = -1)	1811	volume (CFPlus::MixChunk self, int volume = -1)
1775	CODE:	1812	CODE:
1776	RETVAL = Mix_VolumeChunk (self, volume);	1813	RETVAL = Mix_VolumeChunk (self, volume);
1777	OUTPUT:	1814	OUTPUT:
1778	RETVAL	1815	RETVAL
1779		1816
1780	int	1817	int
1781	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1818	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1782	CODE:	1819	CODE:
1783	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1820	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1784	OUTPUT:	1821	OUTPUT:
1785	RETVAL	1822	RETVAL
1786		1823
1787	MODULE = CFClient PACKAGE = CFClient::MixMusic	1824	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1788		1825
1789	int	1826	int
1790	volume (int volume = -1)	1827	volume (int volume = -1)
1791	CODE:	1828	CODE:
1792	RETVAL = Mix_VolumeMusic (volume);	1829	RETVAL = Mix_VolumeMusic (volume);
1793	OUTPUT:	1830	OUTPUT:
1794	RETVAL	1831	RETVAL
1795		1832
1796	CFClient::MixMusic	1833	CFPlus::MixMusic
1797	new_from_file (SV class, char path)	1834	new_from_file (SV class, char path)
1798	CODE:	1835	CODE:
1799	RETVAL = Mix_LoadMUS (path);	1836	RETVAL = Mix_LoadMUS (path);
1800	OUTPUT:	1837	OUTPUT:
1801	RETVAL	1838	RETVAL
1802		1839
1803	void	1840	void
1804	DESTROY (CFClient::MixMusic self)	1841	DESTROY (CFPlus::MixMusic self)
1805	CODE:	1842	CODE:
1806	Mix_FreeMusic (self);	1843	Mix_FreeMusic (self);
1807		1844
1808	int	1845	int
1809	play (CFClient::MixMusic self, int loops = -1)	1846	play (CFPlus::MixMusic self, int loops = -1)
1810	CODE:	1847	CODE:
1811	RETVAL = Mix_PlayMusic (self, loops);	1848	RETVAL = Mix_PlayMusic (self, loops);
1812	OUTPUT:	1849	OUTPUT:
1813	RETVAL	1850	RETVAL
1814		1851
1815	MODULE = CFClient PACKAGE = CFClient::OpenGL	1852	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1816		1853
1817	BOOT:	1854	BOOT:
1818	{	1855	{
1819	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1856	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1820	static const struct {	1857	static const struct {
1821	const char *name;	1858	const char *name;
1822	IV iv;	1859	IV iv;
1823	} *civ, const_iv[] = {	1860	} *civ, const_iv[] = {
1824	# define const_iv(name) { # name, (IV)name }	1861	# define const_iv(name) { # name, (IV)name }
…		…
1887	const_iv (GL_SEPARABLE_2D),	1924	const_iv (GL_SEPARABLE_2D),
1888	const_iv (GL_CONVOLUTION_2D),	1925	const_iv (GL_CONVOLUTION_2D),
1889	const_iv (GL_CONVOLUTION_BORDER_MODE),	1926	const_iv (GL_CONVOLUTION_BORDER_MODE),
1890	const_iv (GL_CONSTANT_BORDER),	1927	const_iv (GL_CONSTANT_BORDER),
1891	const_iv (GL_LINES),	1928	const_iv (GL_LINES),
		1929	const_iv (GL_LINE_STRIP),
1892	const_iv (GL_LINE_LOOP),	1930	const_iv (GL_LINE_LOOP),
1893	const_iv (GL_QUADS),	1931	const_iv (GL_QUADS),
1894	const_iv (GL_QUAD_STRIP),	1932	const_iv (GL_QUAD_STRIP),
1895	const_iv (GL_TRIANGLES),	1933	const_iv (GL_TRIANGLES),
1896	const_iv (GL_TRIANGLE_STRIP),	1934	const_iv (GL_TRIANGLE_STRIP),
…		…
2006	r *= a;	2044	r *= a;
2007	g *= a;	2045	g *= a;
2008	b *= a;	2046	b *= a;
2009	}	2047	}
2010	// microsoft visual "c" rounds instead of truncating...	2048	// microsoft visual "c" rounds instead of truncating...
2011	glColor4ub (MIN ((int)(r * 256.f), 255),	2049	glColor4f (r, g, b, a);
2012	MIN ((int)(g * 256.f), 255),
2013	MIN ((int)(b * 256.f), 255),
2014	MIN ((int)(a * 256.f), 255));
2015		2050
2016	void glInterleavedArrays (int format, int stride, char *data)	2051	void glInterleavedArrays (int format, int stride, char *data)
2017		2052
2018	void glDrawElements (int mode, int count, int type, char *indices)	2053	void glDrawElements (int mode, int count, int type, char *indices)
2019		2054
…		…
2096		2131
2097	void glEndList ()	2132	void glEndList ()
2098		2133
2099	void glCallList (int list)	2134	void glCallList (int list)
2100		2135
2101

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC vs. Revision 1.164 by root, Tue Nov 7 22:41:27 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC vs.
Revision 1.164 by root, Tue Nov 7 22:41:27 2006 UTC