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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.119 by root, Sat Jun 17 15:07:52 2006 UTC vs.
Revision 1.149 by root, Sat Aug 19 04:03:15 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
15	#include <stdlib.h>	20	#include <stdlib.h>
16		21
18	#include <SDL_endian.h>	23	#include <SDL_endian.h>
19	#include <SDL_image.h>	24	#include <SDL_image.h>
20	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
22		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
23	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
24		32
25	#include <pango/pango.h>	33	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		34
30	#ifndef _WIN32	35	#ifndef _WIN32
31	# include <sys/types.h>	36	# include <sys/types.h>
32	# include <sys/socket.h>	37	# include <sys/socket.h>
33	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
40	typedef signed char int8_t;	45	typedef signed char int8_t;
41	typedef signed short int16_t;	46	typedef signed short int16_t;
42	typedef signed int int32_t;	47	typedef signed int int32_t;
43	#endif	48	#endif
44		49
45	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
46		51
47	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
48		53
49	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
51		56
52	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
53		64
54	static struct	65	static struct
55	{	66	{
56	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	68	#include "glfunc.h"
…		…
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	78	else
68	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
69	}	80	}
70		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
71	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
73		90
74	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
75		110
76	typedef struct cf_layout {	111	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
80	int base_height;	114	int base_height;
81	CFClient__Font font;	115	CFPlus__Font font;
82	} *CFClient__Layout;	116	} *CFPlus__Layout;
83		117
84	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
85	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
86	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
87		121
88	static void	122	static void
89	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
90	{	124	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	126	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	128	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	130	}
101		131
102	static void	132	static void
103	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
104	{	134	{
105	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
106	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
107	*/	137	*/
108	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
112		142
113	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
114	}	144	}
115		145
116	static void	146	static void
117	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
118	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
119	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
120		153
121	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123		156
124	w = (w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
125	}	162	}
126		163
127	typedef uint16_t mapface;	164	typedef uint16_t mapface;
128		165
129	typedef struct {	166	typedef struct {
…		…
132	float s, t;	169	float s, t;
133	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
134	} maptex;	171	} maptex;
135		172
136	typedef struct {	173	typedef struct {
137	int16_t darkness;	174	uint16_t darkness;
138	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_width, stat_hp;
139	} mapcell;	177	} mapcell;
140		178
141	typedef struct {	179	typedef struct {
142	int32_t c0, c1;	180	int32_t c0, c1;
143	mapcell *col;	181	mapcell *col;
…		…
152	int texs;	190	int texs;
153	maptex *tex;	191	maptex *tex;
154		192
155	int32_t rows;	193	int32_t rows;
156	maprow *row;	194	maprow *row;
157	} *CFClient__Map;	195	} *CFPlus__Map;
158		196
159	static char *	197	static char *
160	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
161	{	199	{
162	char *p;	200	char *p;
…		…
180		218
181	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	219	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183		221
184	static maprow *	222	static maprow *
185	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
186	{	224	{
187	if (0 > y)	225	if (0 > y)
188	{	226	{
189	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
228		266
229	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
230	}	268	}
231		269
232	static mapcell *	270	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
234	{	272	{
235	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
236	}	274	}
237		275
238	static void	276	static void
239	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
240	{	278	{
241	int r;	279	int r;
242		280
243	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
252	self->row = 0;	290	self->row = 0;
253	self->rows = 0;	291	self->rows = 0;
254	}	292	}
255		293
256	static void	294	static void
257	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	295	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258	{	296	{
259	int x, y;	297	int x, y;
260	maprow *row;	298	maprow *row;
		299	mapcell *cell;
261		300
262	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
263	if (y >= 0)	302	if (y >= 0)
264	{	303	{
265	if (y >= self->rows)	304	if (y >= self->rows)
…		…
271	if (x >= row->c0)	310	if (x >= row->c0)
272	{	311	{
273	if (x >= row->c1)	312	if (x >= row->c1)
274	break;	313	break;
275		314
276	row->col[x - row->c0].darkness = -1;	315	cell = row->col + x - row->c0;
		316
		317	cell->darkness = 0;
		318	cell->stat_hp = 0;
277	}	319	}
278	}	320	}
279	}	321	}
280		322
281	static void	323	static void
…		…
319	n \|= n >> 16;	361	n \|= n >> 16;
320		362
321	return n + 1;	363	return n + 1;
322	}	364	}
323		365
324	MODULE = CFClient PACKAGE = CFClient	366	MODULE = CFPlus PACKAGE = CFPlus
325		367
326	PROTOTYPES: ENABLE	368	PROTOTYPES: ENABLE
327		369
328	BOOT:	370	BOOT:
329	{	371	{
330	HV *stash = gv_stashpv ("CFClient", 1);	372	HV *stash = gv_stashpv ("CFPlus", 1);
331	static const struct {	373	static const struct {
332	const char *name;	374	const char *name;
333	IV iv;	375	IV iv;
334	} *civ, const_iv[] = {	376	} *civ, const_iv[] = {
335	# define const_iv(name) { # name, (IV)name }	377	# define const_iv(name) { # name, (IV)name }
…		…
436		478
437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	479	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	480	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439	}	481	}
440		482
		483	int
		484	in_destruct ()
		485	CODE:
		486	RETVAL = PL_main_cv == Nullcv;
		487	OUTPUT:
		488	RETVAL
		489
441	NV floor (NV x)	490	NV floor (NV x)
442		491
443	NV ceil (NV x)	492	NV ceil (NV x)
444		493
445	void	494	void
446	pango_init ()	495	pango_init ()
447	CODE:	496	CODE:
448	// delayed, so it can pick up new fonts added by AddFontResourceEx
449	{	497	{
450	{
451	ft2_fontmap = pango_ft2_font_map_new ();	498	opengl_fontmap = pango_opengl_font_map_new ();
452	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	499	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	500	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
454	}
455	{
456	cairo_font_options_t *fopt = cairo_font_options_create ();
457	cairo_fontmap = pango_cairo_font_map_get_default ();
458	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459	#ifdef _WIN32
460	// cairo looks like shit eaten twice on windows
461	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462	#else
463	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464	#endif
465	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
466	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
467	pango_cairo_context_set_font_options (cairo_context, fopt);
468	cairo_font_options_destroy (fopt);
469	}
470	}	501	}
471		502
472	int	503	int
473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	504	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
474		505
475	void	506	void
476	SDL_Quit ()	507	SDL_Quit ()
477		508
478	void	509	void
…		…
493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496		527
497	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	528	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		529	#if SDL_VERSION_ATLEAST(1,2,10)
		530	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		531	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		532	#endif
498		533
499	SDL_EnableUNICODE (1);	534	SDL_EnableUNICODE (1);
500	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	535	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501		536
502	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	537	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
589	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	624	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	625	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591	break;	626	break;
592	}	627	}
593		628
594	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	629	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595	}	630	}
596	}	631	}
597		632
598	int	633	int
599	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	634	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
615	#endif	650	#endif
616		651
617	void	652	void
618	add_font (char *file)	653	add_font (char *file)
619	CODE:	654	CODE:
620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	655	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621	#ifdef _WIN32
622	// cairo... sigh... requires win2000
623	AddFontResourceEx (file, FR_PRIVATE, 0);
624	#endif
625		656
626	void	657	void
627	load_image_inline (SV *image_)	658	load_image_inline (SV *image_)
628	ALIAS:	659	ALIAS:
629	load_image_file = 1	660	load_image_file = 1
…		…
671		702
672	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	703	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673		704
674	assert (surface2->pitch == surface2->w * 4);	705	assert (surface2->pitch == surface2->w * 4);
675		706
		707	SDL_LockSurface (surface2);
676	EXTEND (SP, 5);	708	EXTEND (SP, 6);
677	PUSHs (sv_2mortal (newSViv (surface2->w)));	709	PUSHs (sv_2mortal (newSViv (surface2->w)));
678	PUSHs (sv_2mortal (newSViv (surface2->h)));	710	PUSHs (sv_2mortal (newSViv (surface2->h)));
679	SDL_LockSurface (surface2);
680	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	711	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
681	SDL_UnlockSurface (surface2);
682	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	712	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
683	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	713	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	714	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		715	SDL_UnlockSurface (surface2);
685		716
686	SDL_FreeSurface (surface);	717	SDL_FreeSurface (surface);
687	SDL_FreeSurface (surface2);	718	SDL_FreeSurface (surface2);
688	}	719	}
689		720
…		…
732	void	763	void
733	_exit (int retval)	764	_exit (int retval)
734	CODE:	765	CODE:
735	_exit (retval);	766	_exit (retval);
736		767
737	MODULE = CFClient PACKAGE = CFClient::Font	768	MODULE = CFPlus PACKAGE = CFPlus::Font
738		769
739	CFClient::Font	770	CFPlus::Font
740	new_from_file (SV class, char path, int id = 0)	771	new_from_file (SV class, char path, int id = 0)
741	CODE:	772	CODE:
742	{	773	{
743	int count;	774	int count;
744	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	775	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
747	}	778	}
748	OUTPUT:	779	OUTPUT:
749	RETVAL	780	RETVAL
750		781
751	void	782	void
752	DESTROY (CFClient::Font self)	783	DESTROY (CFPlus::Font self)
753	CODE:	784	CODE:
754	pango_font_description_free (self);	785	pango_font_description_free (self);
755		786
756	void	787	void
757	make_default (CFClient::Font self)	788	make_default (CFPlus::Font self)
758	CODE:	789	CODE:
759	default_font = self;	790	default_font = self;
760		791
761	MODULE = CFClient PACKAGE = CFClient::Layout	792	MODULE = CFPlus PACKAGE = CFPlus::Layout
762		793
763	CFClient::Layout	794	void
764	new (SV *class, int rgba = 0)	795	reset_glyph_cache ()
		796	CODE:
		797	tc_clear ();
		798
		799	CFPlus::Layout
		800	new (SV *class)
765	CODE:	801	CODE:
766	New (0, RETVAL, 1, struct cf_layout);	802	New (0, RETVAL, 1, struct cf_layout);
767		803
768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	804	RETVAL->pl = pango_layout_new (opengl_context);
769	RETVAL->rgba = rgba;
770	RETVAL->r = 1.;	805	RETVAL->r = 1.;
771	RETVAL->g = 1.;	806	RETVAL->g = 1.;
772	RETVAL->b = 1.;	807	RETVAL->b = 1.;
773	RETVAL->a = 1.;	808	RETVAL->a = 1.;
774	RETVAL->base_height = MIN_FONT_HEIGHT;	809	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
778	layout_update_font (RETVAL);	813	layout_update_font (RETVAL);
779	OUTPUT:	814	OUTPUT:
780	RETVAL	815	RETVAL
781		816
782	void	817	void
783	DESTROY (CFClient::Layout self)	818	DESTROY (CFPlus::Layout self)
784	CODE:	819	CODE:
785	g_object_unref (self->pl);	820	g_object_unref (self->pl);
786	Safefree (self);	821	Safefree (self);
787		822
788	int
789	is_rgba (CFClient::Layout self)
790	CODE:
791	RETVAL = self->rgba;
792	OUTPUT:
793	RETVAL
794
795	void	823	void
796	set_text (CFClient::Layout self, SV *text_)	824	set_text (CFPlus::Layout self, SV *text_)
797	CODE:	825	CODE:
798	{	826	{
799	STRLEN textlen;	827	STRLEN textlen;
800	char *text = SvPVutf8 (text_, textlen);	828	char *text = SvPVutf8 (text_, textlen);
801		829
802	pango_layout_set_text (self->pl, text, textlen);	830	pango_layout_set_text (self->pl, text, textlen);
803	}	831	}
804		832
805	void	833	void
806	set_markup (CFClient::Layout self, SV *text_)	834	set_markup (CFPlus::Layout self, SV *text_)
807	CODE:	835	CODE:
808	{	836	{
809	STRLEN textlen;	837	STRLEN textlen;
810	char *text = SvPVutf8 (text_, textlen);	838	char *text = SvPVutf8 (text_, textlen);
811		839
812	pango_layout_set_markup (self->pl, text, textlen);	840	pango_layout_set_markup (self->pl, text, textlen);
813	}	841	}
814		842
		843	void
		844	set_shapes (CFPlus::Layout self, ...)
		845	CODE:
		846	{
		847	PangoAttrList *attrs = 0;
		848	const char *text = pango_layout_get_text (self->pl);
		849	const char *pos = text;
		850	int arg = 4;
		851
		852	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		853	{
		854	PangoRectangle inkrect, rect;
		855	PangoAttribute *attr;
		856
		857	int x = SvIV (ST (arg - 3));
		858	int y = SvIV (ST (arg - 2));
		859	int w = SvIV (ST (arg - 1));
		860	int h = SvIV (ST (arg ));
		861
		862	inkrect.x = 0;
		863	inkrect.y = 0;
		864	inkrect.width = 0;
		865	inkrect.height = 0;
		866
		867	rect.x = x * PANGO_SCALE;
		868	rect.y = y * PANGO_SCALE;
		869	rect.width = w * PANGO_SCALE;
		870	rect.height = h * PANGO_SCALE;
		871
		872	if (!attrs)
		873	attrs = pango_layout_get_attributes (self->pl);
		874
		875	attr = pango_attr_shape_new (&inkrect, &rect);
		876	attr->start_index = pos - text;
		877	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		878	pango_attr_list_insert (attrs, attr);
		879
		880	arg += 4;
		881	pos += sizeof (OBJ_STR) - 1;
		882	}
		883
		884	if (attrs)
		885	pango_layout_set_attributes (self->pl, attrs);
		886	}
		887
		888	void
		889	get_shapes (CFPlus::Layout self)
		890	PPCODE:
		891	{
		892	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		893
		894	do
		895	{
		896	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		897
		898	if (run && shape_attr_p (run))
		899	{
		900	PangoRectangle extents;
		901	pango_layout_iter_get_run_extents (iter, 0, &extents);
		902
		903	EXTEND (SP, 2);
		904	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		905	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		906	}
		907	}
		908	while (pango_layout_iter_next_run (iter));
		909
		910	pango_layout_iter_free (iter);
		911	}
		912
		913	int
		914	has_wrapped (CFPlus::Layout self)
		915	CODE:
		916	{
		917	int lines = 1;
		918	const char *text = pango_layout_get_text (self->pl);
		919
		920	while (*text)
		921	lines += *text++ == '\n';
		922
		923	RETVAL = lines < pango_layout_get_line_count (self->pl);
		924	}
		925	OUTPUT:
		926	RETVAL
		927
815	SV *	928	SV *
816	get_text (CFClient::Layout self)	929	get_text (CFPlus::Layout self)
817	CODE:	930	CODE:
818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	931	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819	sv_utf8_decode (RETVAL);	932	sv_utf8_decode (RETVAL);
820	OUTPUT:	933	OUTPUT:
821	RETVAL	934	RETVAL
822		935
823	void	936	void
824	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	937	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
825	CODE:	938	CODE:
826	self->r = r;	939	self->r = r;
827	self->g = g;	940	self->g = g;
828	self->b = b;	941	self->b = b;
829	self->a = a;	942	self->a = a;
830		943
831	void	944	void
832	set_font (CFClient::Layout self, CFClient::Font font = 0)	945	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833	CODE:	946	CODE:
834	if (self->font != font)	947	if (self->font != font)
835	{	948	{
836	self->font = font;	949	self->font = font;
837	layout_update_font (self);	950	layout_update_font (self);
838	}	951	}
839		952
840	void	953	void
841	set_height (CFClient::Layout self, int base_height)	954	set_height (CFPlus::Layout self, int base_height)
842	CODE:	955	CODE:
843	if (self->base_height != base_height)	956	if (self->base_height != base_height)
844	{	957	{
845	self->base_height = base_height;	958	self->base_height = base_height;
846	layout_update_font (self);	959	layout_update_font (self);
847	}	960	}
848		961
849	void	962	void
850	set_width (CFClient::Layout self, int max_width = -1)	963	set_width (CFPlus::Layout self, int max_width = -1)
851	CODE:	964	CODE:
852	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	965	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
853		966
854	void	967	void
855	set_indent (CFClient::Layout self, int indent)	968	set_indent (CFPlus::Layout self, int indent)
856	CODE:	969	CODE:
857	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	970	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858		971
859	void	972	void
860	set_spacing (CFClient::Layout self, int spacing)	973	set_spacing (CFPlus::Layout self, int spacing)
861	CODE:	974	CODE:
862	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	975	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863		976
864	void	977	void
865	set_ellipsise (CFClient::Layout self, int ellipsise)	978	set_ellipsise (CFPlus::Layout self, int ellipsise)
866	CODE:	979	CODE:
867	pango_layout_set_ellipsize (self->pl,	980	pango_layout_set_ellipsize (self->pl,
868	ellipsise == 1 ? PANGO_ELLIPSIZE_START	981	ellipsise == 1 ? PANGO_ELLIPSIZE_START
869	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	982	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	983	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
871	: PANGO_ELLIPSIZE_NONE	984	: PANGO_ELLIPSIZE_NONE
872	);	985	);
873		986
874	void	987	void
875	set_single_paragraph_mode (CFClient::Layout self, int spm)	988	set_single_paragraph_mode (CFPlus::Layout self, int spm)
876	CODE:	989	CODE:
877	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	990	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878		991
879	void	992	void
880	size (CFClient::Layout self)	993	size (CFPlus::Layout self)
881	PPCODE:	994	PPCODE:
882	{	995	{
883	int w, h;	996	int w, h;
884		997
885	layout_get_pixel_size (self, &w, &h);	998	layout_get_pixel_size (self, &w, &h);
…		…
888	PUSHs (sv_2mortal (newSViv (w)));	1001	PUSHs (sv_2mortal (newSViv (w)));
889	PUSHs (sv_2mortal (newSViv (h)));	1002	PUSHs (sv_2mortal (newSViv (h)));
890	}	1003	}
891		1004
892	int	1005	int
		1006	descent (CFPlus::Layout self)
		1007	CODE:
		1008	{
		1009	PangoRectangle rect;
		1010	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1011	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1012	RETVAL = PANGO_DESCENT (rect);
		1013	}
		1014	OUTPUT:
		1015	RETVAL
		1016
		1017	int
893	xy_to_index (CFClient::Layout self, int x, int y)	1018	xy_to_index (CFPlus::Layout self, int x, int y)
894	CODE:	1019	CODE:
895	{	1020	{
896	int index, trailing;	1021	int index, trailing;
897	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1022	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
898	RETVAL = index;	1023	RETVAL = index;
899	}	1024	}
900	OUTPUT:	1025	OUTPUT:
901	RETVAL	1026	RETVAL
902		1027
903	void	1028	void
904	cursor_pos (CFClient::Layout self, int index)	1029	cursor_pos (CFPlus::Layout self, int index)
905	PPCODE:	1030	PPCODE:
906	{	1031	{
907	PangoRectangle strong_pos;	1032	PangoRectangle strong_pos;
908	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1033	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909		1034
…		…
912	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1037	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914	}	1039	}
915		1040
916	void	1041	void
917	render (CFClient::Layout self)	1042	render (CFPlus::Layout self, float x, float y, int flags = 0)
918	PPCODE:	1043	PPCODE:
919	{	1044	pango_opengl_render_layout_subpixel (
920	SV *retval;	1045	self->pl,
921	int w, h;	1046	x * PANGO_SCALE, y * PANGO_SCALE,
922		1047	self->r, self->g, self->b, self->a,
923	layout_get_pixel_size (self, &w, &h);
924
925	if (self->rgba)
926	{	1048	flags
927	cairo_surface_t *surface;
928	cairo_t *cairo;
929
930	retval = newSV (w * h * 4);
931	SvPOK_only (retval);
932	SvCUR_set (retval, w * h * 4);
933
934	memset (SvPVX (retval), 0, w * h * 4);
935
936	surface = cairo_image_surface_create_for_data (
937	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
938	cairo = cairo_create (surface);
939	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
940
941	pango_cairo_show_layout (cairo, self->pl);
942
943	cairo_destroy (cairo);
944	cairo_surface_destroy (surface);
945
946	// what a mess, and its premultiplied, too :(
947	{
948	uint32_t p = (uint32_t )SvPVX (retval);
949	uint32_t e = p + w h;
950
951	while (p < e)
952	{
953	uint32_t rgba = *p;
954	rgba = (rgba >> 24) \| (rgba << 8);
955	#if 0
956	#ifdef _WIN32
957	{//D
958	uint8_t r = rgba >> 24;
959	uint8_t g = rgba >> 16;
960	uint8_t b = rgba >> 8;
961	uint8_t a = rgba >> 0;
962
963	rgba = (rgba & 0xffffff00) \| a;
964	}
965	#endif
966	#endif
967	rgba = SDL_SwapBE32 (rgba);
968	*p++ = rgba;
969	}
970	}
971
972	EXTEND (SP, 5);
973	PUSHs (sv_2mortal (newSViv (w)));
974	PUSHs (sv_2mortal (newSViv (h)));
975	PUSHs (sv_2mortal (retval));
976	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
977	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
978	}	1049	);
979	else
980	{
981	FT_Bitmap bitmap;
982		1050
983	retval = newSV (w * h);
984	SvPOK_only (retval);
985	SvCUR_set (retval, w * h);
986
987	bitmap.rows = h;
988	bitmap.width = w;
989	bitmap.pitch = w;
990	bitmap.buffer = (unsigned char*)SvPVX (retval);
991	bitmap.num_grays = 256;
992	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
993
994	memset (bitmap.buffer, 0, w * h);
995
996	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
997
998	EXTEND (SP, 5);
999	PUSHs (sv_2mortal (newSViv (w)));
1000	PUSHs (sv_2mortal (newSViv (h)));
1001	PUSHs (sv_2mortal (retval));
1002	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1003	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1004	}
1005	}
1006
1007	MODULE = CFClient PACKAGE = CFClient::Texture	1051	MODULE = CFPlus PACKAGE = CFPlus::Texture
1008		1052
1009	void	1053	void
1010	pad2pot (SV data_, SV w_, SV *h_)	1054	pad2pot (SV data_, SV w_, SV *h_)
1011	CODE:	1055	CODE:
1012	{	1056	{
…		…
1090	glDisable (GL_ALPHA_TEST);	1134	glDisable (GL_ALPHA_TEST);
1091	glDisable (GL_BLEND);	1135	glDisable (GL_BLEND);
1092	}	1136	}
1093	}	1137	}
1094		1138
1095	MODULE = CFClient PACKAGE = CFClient::Map	1139	MODULE = CFPlus PACKAGE = CFPlus::Map
1096		1140
1097	CFClient::Map	1141	CFPlus::Map
1098	new (SV *class, int map_width, int map_height)	1142	new (SV *class, int map_width, int map_height)
1099	CODE:	1143	CODE:
1100	New (0, RETVAL, 1, struct map);	1144	New (0, RETVAL, 1, struct map);
1101	RETVAL->x = 0;	1145	RETVAL->x = 0;
1102	RETVAL->y = 0;	1146	RETVAL->y = 0;
…		…
1112	RETVAL->row = 0;	1156	RETVAL->row = 0;
1113	OUTPUT:	1157	OUTPUT:
1114	RETVAL	1158	RETVAL
1115		1159
1116	void	1160	void
1117	DESTROY (CFClient::Map self)	1161	DESTROY (CFPlus::Map self)
1118	CODE:	1162	CODE:
1119	{	1163	{
1120	map_clear (self);	1164	map_clear (self);
1121	Safefree (self->face);	1165	Safefree (self->face);
1122	Safefree (self->tex);	1166	Safefree (self->tex);
1123	Safefree (self);	1167	Safefree (self);
1124	}	1168	}
1125		1169
1126	void	1170	void
1127	clear (CFClient::Map self)	1171	clear (CFPlus::Map self)
1128	CODE:	1172	CODE:
1129	map_clear (self);	1173	map_clear (self);
1130		1174
1131	void	1175	void
1132	set_face (CFClient::Map self, int face, int texid)	1176	set_face (CFPlus::Map self, int face, int texid)
1133	CODE:	1177	CODE:
1134	{	1178	{
1135	while (self->faces <= face)	1179	while (self->faces <= face)
1136	{	1180	{
1137	Append (mapface, self->face, self->faces, self->faces);	1181	Append (mapface, self->face, self->faces, self->faces);
…		…
1140		1184
1141	self->face [face] = texid;	1185	self->face [face] = texid;
1142	}	1186	}
1143		1187
1144	void	1188	void
1145	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)	1189	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)
1146	CODE:	1190	CODE:
1147	{	1191	{
1148	while (self->texs <= texid)	1192	while (self->texs <= texid)
1149	{	1193	{
1150	Append (maptex, self->tex, self->texs, self->texs);	1194	Append (maptex, self->tex, self->texs, self->texs);
…		…
1174	// from transparent color bleeding and ugly wrapping effects.	1218	// from transparent color bleeding and ugly wrapping effects.
1175	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1219	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176	}	1220	}
1177		1221
1178	int	1222	int
1179	ox (CFClient::Map self)	1223	ox (CFPlus::Map self)
1180	ALIAS:	1224	ALIAS:
1181	oy = 1	1225	oy = 1
1182	x = 2	1226	x = 2
1183	y = 3	1227	y = 3
1184	w = 4	1228	w = 4
…		…
1195	}	1239	}
1196	OUTPUT:	1240	OUTPUT:
1197	RETVAL	1241	RETVAL
1198		1242
1199	void	1243	void
1200	scroll (CFClient::Map self, int dx, int dy)	1244	scroll (CFPlus::Map self, int dx, int dy)
1201	CODE:	1245	CODE:
1202	{	1246	{
1203	if (dx > 0)	1247	if (dx > 0)
1204	map_blank (self, self->x, self->y, dx - 1, self->h);	1248	map_blank (self, self->x, self->y, dx - 1, self->h);
1205	else if (dx < 0)	1249	else if (dx < 0)
…		…
1221	self->y += MAP_EXTEND_Y;	1265	self->y += MAP_EXTEND_Y;
1222	}	1266	}
1223	}	1267	}
1224		1268
1225	void	1269	void
1226	map1a_update (CFClient::Map self, SV *data_)	1270	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1227	CODE:	1271	CODE:
1228	{	1272	{
1229	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1273	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1230	uint8_t data_end = (uint8_t )SvEND (data_);	1274	uint8_t data_end = (uint8_t )SvEND (data_);
1231	mapcell *cell;	1275	mapcell *cell;
…		…
1233		1277
1234	while (data < data_end)	1278	while (data < data_end)
1235	{	1279	{
1236	flags = (data [0] << 8) + data [1]; data += 2;	1280	flags = (data [0] << 8) + data [1]; data += 2;
1237		1281
1238	x = ((flags >> 10) & 63) + self->x;	1282	x = self->x + ((flags >> 10) & 63);
1239	y = ((flags >> 4) & 63) + self->y;	1283	y = self->y + ((flags >> 4) & 63);
1240		1284
1241	cell = map_get_cell (self, x, y);	1285	cell = map_get_cell (self, x, y);
1242		1286
1243	if (flags & 15)	1287	if (flags & 15)
1244	{	1288	{
1245	if (cell->darkness < 0)	1289	if (!cell->darkness)
1246	{	1290	{
1247	cell->darkness = 0;	1291	cell->darkness = 256;
1248	cell->face [0] = 0;	1292	cell->face [0] = 0;
1249	cell->face [1] = 0;	1293	cell->face [1] = 0;
1250	cell->face [2] = 0;	1294	cell->face [2] = 0;
1251	}	1295	}
1252		1296
1253	cell->darkness = flags & 8 ? *data++ : 255;
1254
1255	//TODO: don't trust server data to be in-range(!)	1297	//TODO: don't trust server data to be in-range(!)
		1298
		1299	if (flags & 8)
		1300	{
		1301	if (extmap)
		1302	{
		1303	uint8_t ext, cmd;
		1304
		1305	do
		1306	{
		1307	ext = *data++;
		1308	cmd = ext & 0x3f;
		1309
		1310	if (cmd < 4)
		1311	cell->darkness = 255 - ext * 64 + 1;
		1312	else if (cmd == 5) // health
		1313	{
		1314	cell->stat_width = 1;
		1315	cell->stat_hp = *data++;
		1316	}
		1317	else if (cmd == 6) // monster width
		1318	cell->stat_width = *data++ + 1;
		1319	else if (ext & 0x40) // unknown, multibyte => skip
		1320	data += *data + 1;
		1321	else
		1322	data++;
		1323	}
		1324	while (ext & 0x80);
		1325	}
		1326	else
		1327	cell->darkness = *data++ + 1;
		1328	}
1256		1329
1257	if (flags & 4)	1330	if (flags & 4)
1258	{	1331	{
1259	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1332	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1260	}	1333	}
…		…
1268	{	1341	{
1269	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1342	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1270	}	1343	}
1271	}	1344	}
1272	else	1345	else
		1346	{
1273	cell->darkness = -1;	1347	cell->darkness = 0;
		1348	cell->stat_hp = 0;
		1349	}
1274	}	1350	}
1275	}	1351	}
1276		1352
1277	SV *	1353	SV *
1278	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1354	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1279	CODE:	1355	CODE:
1280	{	1356	{
1281	int x1, x;	1357	int x1, x;
1282	int y1, y;	1358	int y1, y;
1283	int z;	1359	int z;
…		…
1333	}	1409	}
1334	OUTPUT:	1410	OUTPUT:
1335	RETVAL	1411	RETVAL
1336		1412
1337	void	1413	void
1338	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1414	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1339	CODE:	1415	CODE:
1340	{	1416	{
1341	int vx, vy;	1417	int vx, vy;
1342	int x, y, z;	1418	int x, y, z;
1343	int last_name;	1419	int last_name;
1344	mapface face;	1420	mapface face;
1345		1421
1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1422	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1423	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1348		1424
1349	/*	1425	/*
1350	int vx = self->vx = self->w >= sw	1426	int vx = self->vx = self->w >= sw
1351	? self->x + (self->w - sw) / 2	1427	? self->x + (self->w - sw) / 2
1352	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1428	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1378	{	1454	{
1379	mapcell *cell = row->col + (x + vx - row->c0);	1455	mapcell *cell = row->col + (x + vx - row->c0);
1380		1456
1381	face = cell->face [z];	1457	face = cell->face [z];
1382		1458
1383	if (face)	1459	if (face && face < self->texs)
1384	{	1460	{
1385	maptex tex = self->tex [face];	1461	maptex tex = self->tex [face];
1386		1462
1387	int px = (x + 1) * 32 - tex.w;	1463	int px = (x + 1) * 32 - tex.w;
1388	int py = (y + 1) * 32 - tex.h;	1464	int py = (y + 1) * 32 - tex.h;
…		…
1404	}	1480	}
1405		1481
1406	glEnd ();	1482	glEnd ();
1407		1483
1408	glDisable (GL_TEXTURE_2D);	1484	glDisable (GL_TEXTURE_2D);
		1485
		1486	// top layer: overlays such as the health bar
		1487	for (y = 0; y < sh; y++)
		1488	if (0 <= y + vy && y + vy < self->rows)
		1489	{
		1490	maprow *row = self->row + (y + vy);
		1491
		1492	for (x = 0; x < sw; x++)
		1493	if (row->c0 <= x + vx && x + vx < row->c1)
		1494	{
		1495	mapcell *cell = row->col + (x + vx - row->c0);
		1496
		1497	int px = x * 32;
		1498	int py = y * 32;
		1499
		1500	if (cell->stat_hp)
		1501	{
		1502	int width = cell->stat_width * 32;
		1503	int thick = sh / 28 + 1 + cell->stat_width;
		1504
		1505	glColor4ub (0, 0, 0, 223);
		1506	glRectf (px + 1, py,
		1507	px + width - 1, py + thick + 2);
		1508
		1509	glColor4ub (cell->stat_hp, 255 - cell->stat_hp, 0, 223);
		1510	glRectf (px + 2,
		1511	py + 1,
		1512	px + width - 2 - cell->stat_hp * (width - 4) / 255, py + thick + 1);
		1513	}
		1514	}
		1515	}
		1516
1409	glDisable (GL_BLEND);	1517	glDisable (GL_BLEND);
1410	}	1518	}
1411		1519
1412	void	1520	void
1413	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1521	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414	CODE:	1522	CODE:
1415	{	1523	{
1416	static float color[16][3] = {	1524	static float color[16][3] = {
1417	{ 0.00, 0.00, 0.00 },	1525	{ 0.00F, 0.00F, 0.00F },
1418	{ 1.00, 1.00, 1.00 },	1526	{ 1.00F, 1.00F, 1.00F },
1419	{ 0.00, 0.00, 0.55 },	1527	{ 0.00F, 0.00F, 0.55F },
1420	{ 1.00, 0.00, 0.00 },	1528	{ 1.00F, 0.00F, 0.00F },
1421		1529
1422	{ 1.00, 0.54, 0.00 },	1530	{ 1.00F, 0.54F, 0.00F },
1423	{ 0.11, 0.56, 1.00 },	1531	{ 0.11F, 0.56F, 1.00F },
1424	{ 0.93, 0.46, 0.00 },	1532	{ 0.93F, 0.46F, 0.00F },
1425	{ 0.18, 0.54, 0.34 },	1533	{ 0.18F, 0.54F, 0.34F },
1426		1534
1427	{ 0.56, 0.73, 0.56 },	1535	{ 0.56F, 0.73F, 0.56F },
1428	{ 0.80, 0.80, 0.80 },	1536	{ 0.80F, 0.80F, 0.80F },
1429	{ 0.55, 0.41, 0.13 },	1537	{ 0.55F, 0.41F, 0.13F },
1430	{ 0.99, 0.77, 0.26 },	1538	{ 0.99F, 0.77F, 0.26F },
1431		1539
1432	{ 0.74, 0.65, 0.41 },	1540	{ 0.74F, 0.65F, 0.41F },
1433		1541
1434	{ 0.00, 1.00, 1.00 },	1542	{ 0.00F, 1.00F, 1.00F },
1435	{ 1.00, 0.00, 1.00 },	1543	{ 1.00F, 0.00F, 1.00F },
1436	{ 1.00, 1.00, 0.00 },	1544	{ 1.00F, 1.00F, 0.00F },
1437	};	1545	};
1438		1546
1439	int x, y;	1547	int x, y;
1440		1548
1441	glEnable (GL_TEXTURE_2D);	1549	glEnable (GL_TEXTURE_2D);
…		…
1468	glDisable (GL_BLEND);	1576	glDisable (GL_BLEND);
1469	glDisable (GL_TEXTURE_2D);	1577	glDisable (GL_TEXTURE_2D);
1470	}	1578	}
1471		1579
1472	void	1580	void
1473	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1581	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1474	PPCODE:	1582	PPCODE:
1475	{	1583	{
1476	int vx, vy;	1584	int vx, vy;
1477	int x, y;	1585	int x, y;
1478	int sw4 = (sw + 3) & ~3;	1586	int sw4 = (sw + 3) & ~3;
…		…
1494	for (x = 0; x < sw; x++)	1602	for (x = 0; x < sw; x++)
1495	if (row->c0 <= x + vx && x + vx < row->c1)	1603	if (row->c0 <= x + vx && x + vx < row->c1)
1496	{	1604	{
1497	mapcell *cell = row->col + (x + vx - row->c0);	1605	mapcell *cell = row->col + (x + vx - row->c0);
1498		1606
1499	darkness[y * sw4 + x] = cell->darkness < 0	1607	darkness[y * sw4 + x] = cell->darkness
		1608	? 255 - (cell->darkness - 1)
1500	? 255 - FOW_DARKNESS	1609	: 255 - FOW_DARKNESS;
1501	: 255 - cell->darkness;
1502	}	1610	}
1503	}	1611	}
1504		1612
1505	EXTEND (SP, 3);	1613	EXTEND (SP, 3);
1506	PUSHs (sv_2mortal (newSViv (sw4)));	1614	PUSHs (sv_2mortal (newSViv (sw4)));
1507	PUSHs (sv_2mortal (newSViv (sh)));	1615	PUSHs (sv_2mortal (newSViv (sh)));
1508	PUSHs (darkness_sv);	1616	PUSHs (darkness_sv);
1509	}	1617	}
1510		1618
1511	SV *	1619	SV *
1512	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1620	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1513	CODE:	1621	CODE:
1514	{	1622	{
1515	int x, y, x1, y1;	1623	int x, y, x1, y1;
1516	SV data_sv = newSV (w h * 7 + 5);	1624	SV data_sv = newSV (w h * 7 + 5);
1517	uint8_t data = (uint8_t )SvPVX (data_sv);	1625	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1579	}	1687	}
1580	OUTPUT:	1688	OUTPUT:
1581	RETVAL	1689	RETVAL
1582		1690
1583	void	1691	void
1584	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1692	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1585	PPCODE:	1693	PPCODE:
1586	{	1694	{
1587	int x, y, z;	1695	int x, y, z;
1588	int w, h;	1696	int w, h;
1589	int x1, y1;	1697	int x1, y1;
…		…
1621		1729
1622	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1730	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1623	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1731	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1624	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1732	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1625		1733
1626	if (cell->darkness <= 0)	1734	if (cell->darkness == 0)
1627	{	1735	{
1628	cell->darkness = -1;	1736	cell->darkness = 0;
1629		1737
1630	for (z = 0; z <= 2; z++)	1738	for (z = 0; z <= 2; z++)
1631	{	1739	{
1632	cell->face[z] = face[z];	1740	cell->face[z] = face[z];
1633		1741
…		…
1638	}	1746	}
1639	}	1747	}
1640	}	1748	}
1641	}	1749	}
1642		1750
1643	MODULE = CFClient PACKAGE = CFClient::MixChunk	1751	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1644		1752
1645	CFClient::MixChunk	1753	CFPlus::MixChunk
1646	new_from_file (SV class, char path)	1754	new_from_file (SV class, char path)
1647	CODE:	1755	CODE:
1648	RETVAL = Mix_LoadWAV (path);	1756	RETVAL = Mix_LoadWAV (path);
1649	OUTPUT:	1757	OUTPUT:
1650	RETVAL	1758	RETVAL
1651		1759
1652	void	1760	void
1653	DESTROY (CFClient::MixChunk self)	1761	DESTROY (CFPlus::MixChunk self)
1654	CODE:	1762	CODE:
1655	Mix_FreeChunk (self);	1763	Mix_FreeChunk (self);
1656		1764
1657	int	1765	int
1658	volume (CFClient::MixChunk self, int volume = -1)	1766	volume (CFPlus::MixChunk self, int volume = -1)
1659	CODE:	1767	CODE:
1660	RETVAL = Mix_VolumeChunk (self, volume);	1768	RETVAL = Mix_VolumeChunk (self, volume);
1661	OUTPUT:	1769	OUTPUT:
1662	RETVAL	1770	RETVAL
1663		1771
1664	int	1772	int
1665	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1773	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1666	CODE:	1774	CODE:
1667	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1775	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1668	OUTPUT:	1776	OUTPUT:
1669	RETVAL	1777	RETVAL
1670		1778
1671	MODULE = CFClient PACKAGE = CFClient::MixMusic	1779	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1672		1780
1673	int	1781	int
1674	volume (int volume = -1)	1782	volume (int volume = -1)
1675	CODE:	1783	CODE:
1676	RETVAL = Mix_VolumeMusic (volume);	1784	RETVAL = Mix_VolumeMusic (volume);
1677	OUTPUT:	1785	OUTPUT:
1678	RETVAL	1786	RETVAL
1679		1787
1680	CFClient::MixMusic	1788	CFPlus::MixMusic
1681	new_from_file (SV class, char path)	1789	new_from_file (SV class, char path)
1682	CODE:	1790	CODE:
1683	RETVAL = Mix_LoadMUS (path);	1791	RETVAL = Mix_LoadMUS (path);
1684	OUTPUT:	1792	OUTPUT:
1685	RETVAL	1793	RETVAL
1686		1794
1687	void	1795	void
1688	DESTROY (CFClient::MixMusic self)	1796	DESTROY (CFPlus::MixMusic self)
1689	CODE:	1797	CODE:
1690	Mix_FreeMusic (self);	1798	Mix_FreeMusic (self);
1691		1799
1692	int	1800	int
1693	play (CFClient::MixMusic self, int loops = -1)	1801	play (CFPlus::MixMusic self, int loops = -1)
1694	CODE:	1802	CODE:
1695	RETVAL = Mix_PlayMusic (self, loops);	1803	RETVAL = Mix_PlayMusic (self, loops);
1696	OUTPUT:	1804	OUTPUT:
1697	RETVAL	1805	RETVAL
1698		1806
1699	MODULE = CFClient PACKAGE = CFClient::OpenGL	1807	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1700		1808
1701	BOOT:	1809	BOOT:
1702	{	1810	{
1703	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1811	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1704	static const struct {	1812	static const struct {
1705	const char *name;	1813	const char *name;
1706	IV iv;	1814	IV iv;
1707	} *civ, const_iv[] = {	1815	} *civ, const_iv[] = {
1708	# define const_iv(name) { # name, (IV)name }	1816	# define const_iv(name) { # name, (IV)name }
…		…
1771	const_iv (GL_SEPARABLE_2D),	1879	const_iv (GL_SEPARABLE_2D),
1772	const_iv (GL_CONVOLUTION_2D),	1880	const_iv (GL_CONVOLUTION_2D),
1773	const_iv (GL_CONVOLUTION_BORDER_MODE),	1881	const_iv (GL_CONVOLUTION_BORDER_MODE),
1774	const_iv (GL_CONSTANT_BORDER),	1882	const_iv (GL_CONSTANT_BORDER),
1775	const_iv (GL_LINES),	1883	const_iv (GL_LINES),
		1884	const_iv (GL_LINE_STRIP),
1776	const_iv (GL_LINE_LOOP),	1885	const_iv (GL_LINE_LOOP),
1777	const_iv (GL_QUADS),	1886	const_iv (GL_QUADS),
1778	const_iv (GL_QUAD_STRIP),	1887	const_iv (GL_QUAD_STRIP),
1779	const_iv (GL_TRIANGLES),	1888	const_iv (GL_TRIANGLES),
1780	const_iv (GL_TRIANGLE_STRIP),	1889	const_iv (GL_TRIANGLE_STRIP),
…		…
1890	r *= a;	1999	r *= a;
1891	g *= a;	2000	g *= a;
1892	b *= a;	2001	b *= a;
1893	}	2002	}
1894	// microsoft visual "c" rounds instead of truncating...	2003	// microsoft visual "c" rounds instead of truncating...
1895	glColor4ub (MIN ((int)(r * 256.f), 255),	2004	glColor4f (r, g, b, a);
1896	MIN ((int)(g * 256.f), 255),
1897	MIN ((int)(b * 256.f), 255),
1898	MIN ((int)(a * 256.f), 255));
1899		2005
1900	void glInterleavedArrays (int format, int stride, char *data)	2006	void glInterleavedArrays (int format, int stride, char *data)
1901		2007
1902	void glDrawElements (int mode, int count, int type, char *indices)	2008	void glDrawElements (int mode, int count, int type, char *indices)
1903		2009
…		…
1980		2086
1981	void glEndList ()	2087	void glEndList ()
1982		2088
1983	void glCallList (int list)	2089	void glCallList (int list)
1984		2090
1985

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.119 by root, Sat Jun 17 15:07:52 2006 UTC vs. Revision 1.149 by root, Sat Aug 19 04:03:15 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.119 by root, Sat Jun 17 15:07:52 2006 UTC vs.
Revision 1.149 by root, Sat Aug 19 04:03:15 2006 UTC