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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC vs.
Revision 1.163 by root, Wed Oct 18 12:53:45 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;
842	int arg = 2;	881	int arg = 4;
843		882
844	while (arg < items && (pos = strstr (pos, OBJ_STR)))	883	while (arg < items && (pos = strstr (pos, OBJ_STR)))
845	{	884	{
846	PangoRectangle rect;	885	PangoRectangle inkrect, rect;
847	PangoAttribute *attr;	886	PangoAttribute *attr;
848		887
		888	int x = SvIV (ST (arg - 3));
		889	int y = SvIV (ST (arg - 2));
849	int w = SvIV (ST (arg - 1));	890	int w = SvIV (ST (arg - 1));
850	int h = SvIV (ST (arg));	891	int h = SvIV (ST (arg ));
851		892
852	arg += 2;
853
854	rect.x = 0;	893	inkrect.x = 0;
		894	inkrect.y = 0;
		895	inkrect.width = 0;
		896	inkrect.height = 0;
		897
		898	rect.x = x * PANGO_SCALE;
855	rect.y = -h * PANGO_SCALE;	899	rect.y = y * PANGO_SCALE;
856	rect.width = w * PANGO_SCALE;	900	rect.width = w * PANGO_SCALE;
857	rect.height = h * PANGO_SCALE;	901	rect.height = h * PANGO_SCALE;
858		902
859	if (!attrs)	903	if (!attrs)
860	attrs = pango_layout_get_attributes (self->pl);	904	attrs = pango_layout_get_attributes (self->pl);
861		905
862	attr = pango_attr_shape_new (&rect, &rect);	906	attr = pango_attr_shape_new (&inkrect, &rect);
863	attr->start_index = pos - text;	907	attr->start_index = pos - text;
864	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;	908	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
865	pango_attr_list_insert (attrs, attr);	909	pango_attr_list_insert (attrs, attr);
866		910
		911	arg += 4;
867	pos += sizeof (OBJ_STR) - 1;	912	pos += sizeof (OBJ_STR) - 1;
868	}	913	}
869		914
870	if (attrs)	915	if (attrs)
871	pango_layout_set_attributes (self->pl, attrs);	916	pango_layout_set_attributes (self->pl, attrs);
872	}	917	}
873		918
874	void	919	void
875	get_shapes (CFClient::Layout self)	920	get_shapes (CFPlus::Layout self)
876	PPCODE:	921	PPCODE:
877	{	922	{
878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	923	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879		924
880	do	925	do
…		…
884	if (run && shape_attr_p (run))	929	if (run && shape_attr_p (run))
885	{	930	{
886	PangoRectangle extents;	931	PangoRectangle extents;
887	pango_layout_iter_get_run_extents (iter, 0, &extents);	932	pango_layout_iter_get_run_extents (iter, 0, &extents);
888		933
		934	EXTEND (SP, 2);
889	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	935	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	936	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
891	}	937	}
892	}	938	}
893	while (pango_layout_iter_next_run (iter));	939	while (pango_layout_iter_next_run (iter));
894		940
895	pango_layout_iter_free (iter);	941	pango_layout_iter_free (iter);
896	}	942	}
897		943
898	int	944	int
899	has_wrapped (CFClient::Layout self)	945	has_wrapped (CFPlus::Layout self)
900	CODE:	946	CODE:
901	{	947	{
902	int lines = 1;	948	int lines = 1;
903	const char *text = pango_layout_get_text (self->pl);	949	const char *text = pango_layout_get_text (self->pl);
904		950
…		…
909	}	955	}
910	OUTPUT:	956	OUTPUT:
911	RETVAL	957	RETVAL
912		958
913	SV *	959	SV *
914	get_text (CFClient::Layout self)	960	get_text (CFPlus::Layout self)
915	CODE:	961	CODE:
916	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	962	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
917	sv_utf8_decode (RETVAL);	963	sv_utf8_decode (RETVAL);
918	OUTPUT:	964	OUTPUT:
919	RETVAL	965	RETVAL
920		966
921	void	967	void
922	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.)
923	CODE:	969	CODE:
924	self->r = r;	970	self->r = r;
925	self->g = g;	971	self->g = g;
926	self->b = b;	972	self->b = b;
927	self->a = a;	973	self->a = a;
928		974
929	void	975	void
930	set_font (CFClient::Layout self, CFClient::Font font = 0)	976	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
931	CODE:	977	CODE:
932	if (self->font != font)	978	if (self->font != font)
933	{	979	{
934	self->font = font;	980	self->font = font;
935	layout_update_font (self);	981	layout_update_font (self);
936	}	982	}
937		983
938	void	984	void
939	set_height (CFClient::Layout self, int base_height)	985	set_height (CFPlus::Layout self, int base_height)
940	CODE:	986	CODE:
941	if (self->base_height != base_height)	987	if (self->base_height != base_height)
942	{	988	{
943	self->base_height = base_height;	989	self->base_height = base_height;
944	layout_update_font (self);	990	layout_update_font (self);
945	}	991	}
946		992
947	void	993	void
948	set_width (CFClient::Layout self, int max_width = -1)	994	set_width (CFPlus::Layout self, int max_width = -1)
949	CODE:	995	CODE:
950	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);
951		997
952	void	998	void
953	set_indent (CFClient::Layout self, int indent)	999	set_indent (CFPlus::Layout self, int indent)
954	CODE:	1000	CODE:
955	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1001	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
956		1002
957	void	1003	void
958	set_spacing (CFClient::Layout self, int spacing)	1004	set_spacing (CFPlus::Layout self, int spacing)
959	CODE:	1005	CODE:
960	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1006	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
961		1007
962	void	1008	void
963	set_ellipsise (CFClient::Layout self, int ellipsise)	1009	set_ellipsise (CFPlus::Layout self, int ellipsise)
964	CODE:	1010	CODE:
965	pango_layout_set_ellipsize (self->pl,	1011	pango_layout_set_ellipsize (self->pl,
966	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1012	ellipsise == 1 ? PANGO_ELLIPSIZE_START
967	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1013	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
968	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1014	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
969	: PANGO_ELLIPSIZE_NONE	1015	: PANGO_ELLIPSIZE_NONE
970	);	1016	);
971		1017
972	void	1018	void
973	set_single_paragraph_mode (CFClient::Layout self, int spm)	1019	set_single_paragraph_mode (CFPlus::Layout self, int spm)
974	CODE:	1020	CODE:
975	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1021	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
976		1022
977	void	1023	void
978	size (CFClient::Layout self)	1024	size (CFPlus::Layout self)
979	PPCODE:	1025	PPCODE:
980	{	1026	{
981	int w, h;	1027	int w, h;
982		1028
983	layout_get_pixel_size (self, &w, &h);	1029	layout_get_pixel_size (self, &w, &h);
…		…
986	PUSHs (sv_2mortal (newSViv (w)));	1032	PUSHs (sv_2mortal (newSViv (w)));
987	PUSHs (sv_2mortal (newSViv (h)));	1033	PUSHs (sv_2mortal (newSViv (h)));
988	}	1034	}
989		1035
990	int	1036	int
		1037	descent (CFPlus::Layout self)
		1038	CODE:
		1039	{
		1040	PangoRectangle rect;
		1041	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1042	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1043	RETVAL = PANGO_DESCENT (rect);
		1044	}
		1045	OUTPUT:
		1046	RETVAL
		1047
		1048	int
991	xy_to_index (CFClient::Layout self, int x, int y)	1049	xy_to_index (CFPlus::Layout self, int x, int y)
992	CODE:	1050	CODE:
993	{	1051	{
994	int index, trailing;	1052	int index, trailing;
995	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);
996	RETVAL = index;	1054	RETVAL = index;
997	}	1055	}
998	OUTPUT:	1056	OUTPUT:
999	RETVAL	1057	RETVAL
1000		1058
1001	void	1059	void
1002	cursor_pos (CFClient::Layout self, int index)	1060	cursor_pos (CFPlus::Layout self, int index)
1003	PPCODE:	1061	PPCODE:
1004	{	1062	{
1005	PangoRectangle strong_pos;	1063	PangoRectangle strong_pos;
1006	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1064	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007		1065
…		…
1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1068	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1069	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012	}	1070	}
1013		1071
1014	void	1072	void
1015	render (CFClient::Layout self)	1073	render (CFPlus::Layout self, float x, float y, int flags = 0)
1016	PPCODE:	1074	PPCODE:
1017	{	1075	pango_opengl_render_layout_subpixel (
1018	SV *retval;	1076	self->pl,
1019	int w, h;	1077	x * PANGO_SCALE, y * PANGO_SCALE,
1020		1078	self->r, self->g, self->b, self->a,
1021	layout_get_pixel_size (self, &w, &h);
1022
1023	if (self->rgba)
1024	{	1079	flags
1025	cairo_surface_t *surface;
1026	cairo_t *cairo;
1027
1028	retval = newSV (w * h * 4);
1029	SvPOK_only (retval);
1030	SvCUR_set (retval, w * h * 4);
1031
1032	memset (SvPVX (retval), 0, w * h * 4);
1033
1034	surface = cairo_image_surface_create_for_data (
1035	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
1036	cairo = cairo_create (surface);
1037	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1038
1039	pango_cairo_show_layout (cairo, self->pl);
1040
1041	cairo_destroy (cairo);
1042	cairo_surface_destroy (surface);
1043
1044	// what a mess, and its premultiplied, too :(
1045	{
1046	uint32_t p = (uint32_t )SvPVX (retval);
1047	uint32_t e = p + w h;
1048
1049	while (p < e)
1050	{
1051	uint32_t rgba = *p;
1052	rgba = (rgba >> 24) \| (rgba << 8);
1053	#if 0
1054	#ifdef _WIN32
1055	{//D
1056	uint8_t r = rgba >> 24;
1057	uint8_t g = rgba >> 16;
1058	uint8_t b = rgba >> 8;
1059	uint8_t a = rgba >> 0;
1060
1061	rgba = (rgba & 0xffffff00) \| a;
1062	}
1063	#endif
1064	#endif
1065	rgba = SDL_SwapBE32 (rgba);
1066	*p++ = rgba;
1067	}
1068	}
1069
1070	EXTEND (SP, 5);
1071	PUSHs (sv_2mortal (newSViv (w)));
1072	PUSHs (sv_2mortal (newSViv (h)));
1073	PUSHs (sv_2mortal (retval));
1074	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1075	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076	}	1080	);
1077	else
1078	{
1079	FT_Bitmap bitmap;
1080		1081
1081	retval = newSV (w * h);
1082	SvPOK_only (retval);
1083	SvCUR_set (retval, w * h);
1084
1085	bitmap.rows = h;
1086	bitmap.width = w;
1087	bitmap.pitch = w;
1088	bitmap.buffer = (unsigned char*)SvPVX (retval);
1089	bitmap.num_grays = 256;
1090	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1091
1092	memset (bitmap.buffer, 0, w * h);
1093
1094	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1095
1096	EXTEND (SP, 5);
1097	PUSHs (sv_2mortal (newSViv (w)));
1098	PUSHs (sv_2mortal (newSViv (h)));
1099	PUSHs (sv_2mortal (retval));
1100	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1101	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1102	}
1103	}
1104
1105	MODULE = CFClient PACKAGE = CFClient::Texture	1082	MODULE = CFPlus PACKAGE = CFPlus::Texture
1106		1083
1107	void	1084	void
1108	pad2pot (SV data_, SV w_, SV *h_)	1085	pad2pot (SV data_, SV w_, SV *h_)
1109	CODE:	1086	CODE:
1110	{	1087	{
…		…
1188	glDisable (GL_ALPHA_TEST);	1165	glDisable (GL_ALPHA_TEST);
1189	glDisable (GL_BLEND);	1166	glDisable (GL_BLEND);
1190	}	1167	}
1191	}	1168	}
1192		1169
1193	MODULE = CFClient PACKAGE = CFClient::Map	1170	MODULE = CFPlus PACKAGE = CFPlus::Map
1194		1171
1195	CFClient::Map	1172	CFPlus::Map
1196	new (SV *class, int map_width, int map_height)	1173	new (SV *class, int map_width, int map_height)
1197	CODE:	1174	CODE:
1198	New (0, RETVAL, 1, struct map);	1175	New (0, RETVAL, 1, struct map);
1199	RETVAL->x = 0;	1176	RETVAL->x = 0;
1200	RETVAL->y = 0;	1177	RETVAL->y = 0;
…		…
1210	RETVAL->row = 0;	1187	RETVAL->row = 0;
1211	OUTPUT:	1188	OUTPUT:
1212	RETVAL	1189	RETVAL
1213		1190
1214	void	1191	void
1215	DESTROY (CFClient::Map self)	1192	DESTROY (CFPlus::Map self)
1216	CODE:	1193	CODE:
1217	{	1194	{
1218	map_clear (self);	1195	map_clear (self);
1219	Safefree (self->face);	1196	Safefree (self->face);
1220	Safefree (self->tex);	1197	Safefree (self->tex);
1221	Safefree (self);	1198	Safefree (self);
1222	}	1199	}
1223		1200
1224	void	1201	void
1225	clear (CFClient::Map self)	1202	clear (CFPlus::Map self)
1226	CODE:	1203	CODE:
1227	map_clear (self);	1204	map_clear (self);
1228		1205
1229	void	1206	void
1230	set_face (CFClient::Map self, int face, int texid)	1207	set_face (CFPlus::Map self, int face, int texid)
1231	CODE:	1208	CODE:
1232	{	1209	{
1233	while (self->faces <= face)	1210	while (self->faces <= face)
1234	{	1211	{
1235	Append (mapface, self->face, self->faces, self->faces);	1212	Append (mapface, self->face, self->faces, self->faces);
…		…
1238		1215
1239	self->face [face] = texid;	1216	self->face [face] = texid;
1240	}	1217	}
1241		1218
1242	void	1219	void
1243	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)	1220	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)
1244	CODE:	1221	CODE:
1245	{	1222	{
1246	while (self->texs <= texid)	1223	while (self->texs <= texid)
1247	{	1224	{
1248	Append (maptex, self->tex, self->texs, self->texs);	1225	Append (maptex, self->tex, self->texs, self->texs);
…		…
1272	// from transparent color bleeding and ugly wrapping effects.	1249	// from transparent color bleeding and ugly wrapping effects.
1273	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1250	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1274	}	1251	}
1275		1252
1276	int	1253	int
1277	ox (CFClient::Map self)	1254	ox (CFPlus::Map self)
1278	ALIAS:	1255	ALIAS:
1279	oy = 1	1256	oy = 1
1280	x = 2	1257	x = 2
1281	y = 3	1258	y = 3
1282	w = 4	1259	w = 4
…		…
1293	}	1270	}
1294	OUTPUT:	1271	OUTPUT:
1295	RETVAL	1272	RETVAL
1296		1273
1297	void	1274	void
1298	scroll (CFClient::Map self, int dx, int dy)	1275	scroll (CFPlus::Map self, int dx, int dy)
1299	CODE:	1276	CODE:
1300	{	1277	{
1301	if (dx > 0)	1278	if (dx > 0)
1302	map_blank (self, self->x, self->y, dx - 1, self->h);	1279	map_blank (self, self->x, self->y, dx, self->h);
1303	else if (dx < 0)	1280	else if (dx < 0)
1304	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1281	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1305		1282
1306	if (dy > 0)	1283	if (dy > 0)
1307	map_blank (self, self->x, self->y, self->w, dy - 1);	1284	map_blank (self, self->x, self->y, self->w, dy);
1308	else if (dy < 0)	1285	else if (dy < 0)
1309	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1286	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1310		1287
1311	self->ox += dx; self->x += dx;	1288	self->ox += dx; self->x += dx;
1312	self->oy += dy; self->y += dy;	1289	self->oy += dy; self->y += dy;
1313		1290
1314	while (self->y < 0)	1291	while (self->y < 0)
…		…
1319	self->y += MAP_EXTEND_Y;	1296	self->y += MAP_EXTEND_Y;
1320	}	1297	}
1321	}	1298	}
1322		1299
1323	void	1300	void
1324	map1a_update (CFClient::Map self, SV *data_)	1301	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1325	CODE:	1302	CODE:
1326	{	1303	{
1327	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1304	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1328	uint8_t data_end = (uint8_t )SvEND (data_);	1305	uint8_t data_end = (uint8_t )SvEND (data_);
1329	mapcell *cell;	1306	mapcell *cell;
1330	int x, y, flags;	1307	int x, y, flags;
1331		1308
1332	while (data < data_end)	1309	while (data < data_end - 1)
1333	{	1310	{
1334	flags = (data [0] << 8) + data [1]; data += 2;	1311	flags = (data [0] << 8) + data [1]; data += 2;
1335		1312
1336	x = self->x + ((flags >> 10) & 63);	1313	x = self->x + ((flags >> 10) & 63);
1337	y = self->y + ((flags >> 4) & 63);	1314	y = self->y + ((flags >> 4) & 63);
1338		1315
1339	cell = map_get_cell (self, x, y);	1316	cell = map_get_cell (self, x, y);
1340		1317
1341	if (flags & 15)	1318	if (flags & 15)
1342	{	1319	{
1343	if (cell->darkness < 0)	1320	if (!cell->darkness)
1344	{	1321	{
		1322	memset (cell, 0, sizeof (*cell));
1345	cell->darkness = 0;	1323	cell->darkness = 256;
1346	cell->face [0] = 0;
1347	cell->face [1] = 0;
1348	cell->face [2] = 0;
1349	}	1324	}
1350		1325
1351	cell->darkness = flags & 8 ? *data++ : 255;
1352
1353	//TODO: don't trust server data to be in-range(!)	1326	//TODO: don't trust server data to be in-range(!)
		1327
		1328	if (flags & 8)
		1329	{
		1330	if (extmap)
		1331	{
		1332	uint8_t ext, cmd;
		1333
		1334	do
		1335	{
		1336	ext = *data++;
		1337	cmd = ext & 0x3f;
		1338
		1339	if (cmd < 4)
		1340	cell->darkness = 255 - ext * 64 + 1;
		1341	else if (cmd == 5) // health
		1342	{
		1343	cell->stat_width = 1;
		1344	cell->stat_hp = *data++;
		1345	}
		1346	else if (cmd == 6) // monster width
		1347	cell->stat_width = *data++ + 1;
		1348	else if (cmd == 0x47) // monster width
		1349	{
		1350	if (*data == 4)
		1351	; // decode player tag
		1352
		1353	data += *data + 1;
		1354	}
		1355	else if (cmd == 8) // cell flags
		1356	cell->flags = *data++;
		1357	else if (ext & 0x40) // unknown, multibyte => skip
		1358	data += *data + 1;
		1359	else
		1360	data++;
		1361	}
		1362	while (ext & 0x80);
		1363	}
		1364	else
		1365	cell->darkness = *data++ + 1;
		1366	}
1354		1367
1355	if (flags & 4)	1368	if (flags & 4)
1356	{	1369	{
1357	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1370	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1358	}	1371	}
…		…
1366	{	1379	{
1367	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1380	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1368	}	1381	}
1369	}	1382	}
1370	else	1383	else
1371	cell->darkness = -1;	1384	cell->darkness = 0;
1372	}	1385	}
1373	}	1386	}
1374		1387
1375	SV *	1388	SV *
1376	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1389	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1377	CODE:	1390	CODE:
1378	{	1391	{
1379	int x1, x;	1392	int x1, x;
1380	int y1, y;	1393	int y1, y;
1381	int z;	1394	int z;
…		…
1431	}	1444	}
1432	OUTPUT:	1445	OUTPUT:
1433	RETVAL	1446	RETVAL
1434		1447
1435	void	1448	void
1436	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1449	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1437	CODE:	1450	CODE:
1438	{	1451	{
1439	int vx, vy;	1452	int vx, vy;
1440	int x, y, z;	1453	int x, y, z;
1441	int last_name;	1454	int last_name;
1442	mapface face;	1455	mapface face;
1443		1456
1444	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1457	vx = self->x + ((self->w - sw) >> 1) - shift_x;
1445	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1458	vy = self->y + ((self->h - sh) >> 1) - shift_y;
1446		1459
1447	/*	1460	/*
1448	int vx = self->vx = self->w >= sw	1461	int vx = self->vx = self->w >= sw
1449	? self->x + (self->w - sw) / 2	1462	? self->x + (self->w - sw) / 2
1450	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1463	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1476	{	1489	{
1477	mapcell *cell = row->col + (x + vx - row->c0);	1490	mapcell *cell = row->col + (x + vx - row->c0);
1478		1491
1479	face = cell->face [z];	1492	face = cell->face [z];
1480		1493
1481	if (face)	1494	if (face && face < self->texs)
1482	{	1495	{
1483	maptex tex = self->tex [face];	1496	maptex tex = self->tex [face];
1484
1485	int px = (x + 1) * 32 - tex.w;	1497	int px = (x + 1) * 32 - tex.w;
1486	int py = (y + 1) * 32 - tex.h;	1498	int py = (y + 1) * 32 - tex.h;
1487		1499
1488	if (last_name != tex.name)	1500	if (last_name != tex.name)
1489	{	1501	{
1490	glEnd ();	1502	glEnd ();
1491	last_name = tex.name;
1492	glBindTexture (GL_TEXTURE_2D, last_name);	1503	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1493	glBegin (GL_QUADS);	1504	glBegin (GL_QUADS);
1494	}	1505	}
1495		1506
1496	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1507	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1497	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1508	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1498	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1509	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1499	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1510	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1500	}	1511	}
		1512
		1513	if (cell->flags && z == 2)
		1514	{
		1515	if (cell->flags & 1)
		1516	{
		1517	maptex tex = self->tex [1];
		1518	int px = (x + 1) * 32 - tex.w + 2;
		1519	int py = (y + 1) * 32 - tex.h - 6;
		1520
		1521	glEnd ();
		1522	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1523	glBegin (GL_QUADS);
		1524
		1525	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1526	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1527	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1528	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1529	}
		1530	}
1501	}	1531	}
1502	}	1532	}
1503		1533
1504	glEnd ();	1534	glEnd ();
1505		1535
1506	glDisable (GL_TEXTURE_2D);	1536	glDisable (GL_TEXTURE_2D);
1507	glDisable (GL_BLEND);	1537	glDisable (GL_BLEND);
1508	}
1509		1538
		1539	// top layer: overlays such as the health bar
		1540	for (y = 0; y < sh; y++)
		1541	if (0 <= y + vy && y + vy < self->rows)
		1542	{
		1543	maprow *row = self->row + (y + vy);
		1544
		1545	for (x = 0; x < sw; x++)
		1546	if (row->c0 <= x + vx && x + vx < row->c1)
		1547	{
		1548	mapcell *cell = row->col + (x + vx - row->c0);
		1549
		1550	int px = x * 32;
		1551	int py = y * 32;
		1552
		1553	if (cell->stat_hp)
		1554	{
		1555	int width = cell->stat_width * 32;
		1556	int thick = sh / 28 + 1 + cell->stat_width;
		1557
		1558	glColor3ub (0, 0, 0);
		1559	glRectf (px + 1, py - thick - 2,
		1560	px + width - 1, py);
		1561
		1562	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1563	glRectf (px + 2,
		1564	py - thick - 1,
		1565	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1566	}
		1567	}
		1568	}
		1569	}
		1570
1510	void	1571	void
1511	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1572	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1512	CODE:	1573	CODE:
1513	{	1574	{
1514	static float color[16][3] = {	1575	static float color[16][3] = {
1515	{ 0.00, 0.00, 0.00 },	1576	{ 0.00F, 0.00F, 0.00F },
1516	{ 1.00, 1.00, 1.00 },	1577	{ 1.00F, 1.00F, 1.00F },
1517	{ 0.00, 0.00, 0.55 },	1578	{ 0.00F, 0.00F, 0.55F },
1518	{ 1.00, 0.00, 0.00 },	1579	{ 1.00F, 0.00F, 0.00F },
1519		1580
1520	{ 1.00, 0.54, 0.00 },	1581	{ 1.00F, 0.54F, 0.00F },
1521	{ 0.11, 0.56, 1.00 },	1582	{ 0.11F, 0.56F, 1.00F },
1522	{ 0.93, 0.46, 0.00 },	1583	{ 0.93F, 0.46F, 0.00F },
1523	{ 0.18, 0.54, 0.34 },	1584	{ 0.18F, 0.54F, 0.34F },
1524		1585
1525	{ 0.56, 0.73, 0.56 },	1586	{ 0.56F, 0.73F, 0.56F },
1526	{ 0.80, 0.80, 0.80 },	1587	{ 0.80F, 0.80F, 0.80F },
1527	{ 0.55, 0.41, 0.13 },	1588	{ 0.55F, 0.41F, 0.13F },
1528	{ 0.99, 0.77, 0.26 },	1589	{ 0.99F, 0.77F, 0.26F },
1529		1590
1530	{ 0.74, 0.65, 0.41 },	1591	{ 0.74F, 0.65F, 0.41F },
1531		1592
1532	{ 0.00, 1.00, 1.00 },	1593	{ 0.00F, 1.00F, 1.00F },
1533	{ 1.00, 0.00, 1.00 },	1594	{ 1.00F, 0.00F, 1.00F },
1534	{ 1.00, 1.00, 0.00 },	1595	{ 1.00F, 1.00F, 0.00F },
1535	};	1596	};
1536		1597
1537	int x, y;	1598	int x, y;
1538		1599
1539	glEnable (GL_TEXTURE_2D);	1600	glEnable (GL_TEXTURE_2D);
…		…
1566	glDisable (GL_BLEND);	1627	glDisable (GL_BLEND);
1567	glDisable (GL_TEXTURE_2D);	1628	glDisable (GL_TEXTURE_2D);
1568	}	1629	}
1569		1630
1570	void	1631	void
1571	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1632	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1572	PPCODE:	1633	PPCODE:
1573	{	1634	{
1574	int vx, vy;	1635	int vx, vy;
1575	int x, y;	1636	int x, y;
1576	int sw4 = (sw + 3) & ~3;	1637	int sw4 = (sw + 3) & ~3;
…		…
1592	for (x = 0; x < sw; x++)	1653	for (x = 0; x < sw; x++)
1593	if (row->c0 <= x + vx && x + vx < row->c1)	1654	if (row->c0 <= x + vx && x + vx < row->c1)
1594	{	1655	{
1595	mapcell *cell = row->col + (x + vx - row->c0);	1656	mapcell *cell = row->col + (x + vx - row->c0);
1596		1657
1597	darkness[y * sw4 + x] = cell->darkness < 0	1658	darkness[y * sw4 + x] = cell->darkness
		1659	? 255 - (cell->darkness - 1)
1598	? 255 - FOW_DARKNESS	1660	: 255 - FOW_DARKNESS;
1599	: 255 - cell->darkness;
1600	}	1661	}
1601	}	1662	}
1602		1663
1603	EXTEND (SP, 3);	1664	EXTEND (SP, 3);
1604	PUSHs (sv_2mortal (newSViv (sw4)));	1665	PUSHs (sv_2mortal (newSViv (sw4)));
1605	PUSHs (sv_2mortal (newSViv (sh)));	1666	PUSHs (sv_2mortal (newSViv (sh)));
1606	PUSHs (darkness_sv);	1667	PUSHs (darkness_sv);
1607	}	1668	}
1608		1669
1609	SV *	1670	SV *
1610	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1671	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1611	CODE:	1672	CODE:
1612	{	1673	{
1613	int x, y, x1, y1;	1674	int x, y, x1, y1;
1614	SV data_sv = newSV (w h * 7 + 5);	1675	SV data_sv = newSV (w h * 7 + 5);
1615	uint8_t data = (uint8_t )SvPVX (data_sv);	1676	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1677	}	1738	}
1678	OUTPUT:	1739	OUTPUT:
1679	RETVAL	1740	RETVAL
1680		1741
1681	void	1742	void
1682	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1743	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1683	PPCODE:	1744	PPCODE:
1684	{	1745	{
1685	int x, y, z;	1746	int x, y, z;
1686	int w, h;	1747	int w, h;
1687	int x1, y1;	1748	int x1, y1;
…		…
1719		1780
1720	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1781	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1721	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1782	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1722	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1783	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1723		1784
1724	if (cell->darkness <= 0)	1785	if (cell->darkness == 0)
1725	{	1786	{
1726	cell->darkness = -1;	1787	cell->darkness = 0;
1727		1788
1728	for (z = 0; z <= 2; z++)	1789	for (z = 0; z <= 2; z++)
1729	{	1790	{
1730	cell->face[z] = face[z];	1791	cell->face[z] = face[z];
1731		1792
…		…
1736	}	1797	}
1737	}	1798	}
1738	}	1799	}
1739	}	1800	}
1740		1801
1741	MODULE = CFClient PACKAGE = CFClient::MixChunk	1802	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1742		1803
1743	CFClient::MixChunk	1804	CFPlus::MixChunk
1744	new_from_file (SV class, char path)	1805	new_from_file (SV class, char path)
1745	CODE:	1806	CODE:
1746	RETVAL = Mix_LoadWAV (path);	1807	RETVAL = Mix_LoadWAV (path);
1747	OUTPUT:	1808	OUTPUT:
1748	RETVAL	1809	RETVAL
1749		1810
1750	void	1811	void
1751	DESTROY (CFClient::MixChunk self)	1812	DESTROY (CFPlus::MixChunk self)
1752	CODE:	1813	CODE:
1753	Mix_FreeChunk (self);	1814	Mix_FreeChunk (self);
1754		1815
1755	int	1816	int
1756	volume (CFClient::MixChunk self, int volume = -1)	1817	volume (CFPlus::MixChunk self, int volume = -1)
1757	CODE:	1818	CODE:
1758	RETVAL = Mix_VolumeChunk (self, volume);	1819	RETVAL = Mix_VolumeChunk (self, volume);
1759	OUTPUT:	1820	OUTPUT:
1760	RETVAL	1821	RETVAL
1761		1822
1762	int	1823	int
1763	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1824	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1764	CODE:	1825	CODE:
1765	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1826	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1766	OUTPUT:	1827	OUTPUT:
1767	RETVAL	1828	RETVAL
1768		1829
1769	MODULE = CFClient PACKAGE = CFClient::MixMusic	1830	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1770		1831
1771	int	1832	int
1772	volume (int volume = -1)	1833	volume (int volume = -1)
1773	CODE:	1834	CODE:
1774	RETVAL = Mix_VolumeMusic (volume);	1835	RETVAL = Mix_VolumeMusic (volume);
1775	OUTPUT:	1836	OUTPUT:
1776	RETVAL	1837	RETVAL
1777		1838
1778	CFClient::MixMusic	1839	CFPlus::MixMusic
1779	new_from_file (SV class, char path)	1840	new_from_file (SV class, char path)
1780	CODE:	1841	CODE:
1781	RETVAL = Mix_LoadMUS (path);	1842	RETVAL = Mix_LoadMUS (path);
1782	OUTPUT:	1843	OUTPUT:
1783	RETVAL	1844	RETVAL
1784		1845
1785	void	1846	void
1786	DESTROY (CFClient::MixMusic self)	1847	DESTROY (CFPlus::MixMusic self)
1787	CODE:	1848	CODE:
1788	Mix_FreeMusic (self);	1849	Mix_FreeMusic (self);
1789		1850
1790	int	1851	int
1791	play (CFClient::MixMusic self, int loops = -1)	1852	play (CFPlus::MixMusic self, int loops = -1)
1792	CODE:	1853	CODE:
1793	RETVAL = Mix_PlayMusic (self, loops);	1854	RETVAL = Mix_PlayMusic (self, loops);
1794	OUTPUT:	1855	OUTPUT:
1795	RETVAL	1856	RETVAL
1796		1857
1797	MODULE = CFClient PACKAGE = CFClient::OpenGL	1858	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1798		1859
1799	BOOT:	1860	BOOT:
1800	{	1861	{
1801	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1862	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1802	static const struct {	1863	static const struct {
1803	const char *name;	1864	const char *name;
1804	IV iv;	1865	IV iv;
1805	} *civ, const_iv[] = {	1866	} *civ, const_iv[] = {
1806	# define const_iv(name) { # name, (IV)name }	1867	# define const_iv(name) { # name, (IV)name }
…		…
1869	const_iv (GL_SEPARABLE_2D),	1930	const_iv (GL_SEPARABLE_2D),
1870	const_iv (GL_CONVOLUTION_2D),	1931	const_iv (GL_CONVOLUTION_2D),
1871	const_iv (GL_CONVOLUTION_BORDER_MODE),	1932	const_iv (GL_CONVOLUTION_BORDER_MODE),
1872	const_iv (GL_CONSTANT_BORDER),	1933	const_iv (GL_CONSTANT_BORDER),
1873	const_iv (GL_LINES),	1934	const_iv (GL_LINES),
		1935	const_iv (GL_LINE_STRIP),
1874	const_iv (GL_LINE_LOOP),	1936	const_iv (GL_LINE_LOOP),
1875	const_iv (GL_QUADS),	1937	const_iv (GL_QUADS),
1876	const_iv (GL_QUAD_STRIP),	1938	const_iv (GL_QUAD_STRIP),
1877	const_iv (GL_TRIANGLES),	1939	const_iv (GL_TRIANGLES),
1878	const_iv (GL_TRIANGLE_STRIP),	1940	const_iv (GL_TRIANGLE_STRIP),
…		…
1988	r *= a;	2050	r *= a;
1989	g *= a;	2051	g *= a;
1990	b *= a;	2052	b *= a;
1991	}	2053	}
1992	// microsoft visual "c" rounds instead of truncating...	2054	// microsoft visual "c" rounds instead of truncating...
1993	glColor4ub (MIN ((int)(r * 256.f), 255),	2055	glColor4f (r, g, b, a);
1994	MIN ((int)(g * 256.f), 255),
1995	MIN ((int)(b * 256.f), 255),
1996	MIN ((int)(a * 256.f), 255));
1997		2056
1998	void glInterleavedArrays (int format, int stride, char *data)	2057	void glInterleavedArrays (int format, int stride, char *data)
1999		2058
2000	void glDrawElements (int mode, int count, int type, char *indices)	2059	void glDrawElements (int mode, int count, int type, char *indices)
2001		2060
…		…
2078		2137
2079	void glEndList ()	2138	void glEndList ()
2080		2139
2081	void glCallList (int list)	2140	void glCallList (int list)
2082		2141
2083

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC vs. Revision 1.163 by root, Wed Oct 18 12:53:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC vs.
Revision 1.163 by root, Wed Oct 18 12:53:45 2006 UTC