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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.120 by root, Sun Jun 18 19:13:19 2006 UTC vs.
Revision 1.129 by root, Wed Jul 12 17:20:04 2006 UTC

…		…
18	#include <SDL_endian.h>	18	#include <SDL_endian.h>
19	#include <SDL_image.h>	19	#include <SDL_image.h>
20	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	21	#include <SDL_opengl.h>
22		22
		23	#define PANGO_ENABLE_BACKEND
		24	#define G_DISABLE_CAST_CHECKS
		25
23	#include <glib/gmacros.h>	26	#include <glib/gmacros.h>
24		27
25	#include <pango/pango.h>	28	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		29
30	#ifndef _WIN32	30	#ifndef _WIN32
31	# include <sys/types.h>	31	# include <sys/types.h>
32	# include <sys/socket.h>	32	# include <sys/socket.h>
33	# include <netinet/in.h>	33	# include <netinet/in.h>
…		…
42	typedef signed int int32_t;	42	typedef signed int int32_t;
43	#endif	43	#endif
44		44
45	#include "glext.h"	45	#include "glext.h"
46		46
		47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
		48
47	#define FOW_DARKNESS 32	49	#define FOW_DARKNESS 32
48		50
49	#define MAP_EXTEND_X 32	51	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	52	#define MAP_EXTEND_Y 512
51		53
52	#define MIN_FONT_HEIGHT 10	54	#define MIN_FONT_HEIGHT 10
		55
		56	#if 0
		57	# define PARACHUTE SDL_INIT_NOPARACHUTE
		58	#else
		59	# define PARACHUTE 0
		60	#endif
53		61
54	static struct	62	static struct
55	{	63	{
56	#define GL_FUNC(ptr,name) ptr name;	64	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	65	#include "glfunc.h"
…		…
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	74	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	75	else
68	glBlendFunc (sa, da);	76	glBlendFunc (sa, da);
69	}	77	}
70		78
		79	#include "texcache.c"
		80
		81	#include "pango-font.c"
		82	#include "pango-fontmap.c"
		83	#include "pango-render.c"
		84
71	typedef Mix_Chunk *CFClient__MixChunk;	85	typedef Mix_Chunk *CFClient__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	86	typedef Mix_Music *CFClient__MixMusic;
73		87
74	typedef PangoFontDescription *CFClient__Font;	88	typedef PangoFontDescription *CFClient__Font;
75		89
		90	static int
		91	shape_attr_p (PangoLayoutRun *run)
		92	{
		93	GSList *attrs = run->item->analysis.extra_attrs;
		94
		95	while (attrs)
		96	{
		97	PangoAttribute *attr = attrs->data;
		98
		99	if (attr->klass->type == PANGO_ATTR_SHAPE)
		100	return 1;
		101
		102	attrs = attrs->next;
		103	}
		104
		105	return 0;
		106	}
		107
76	typedef struct cf_layout {	108	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	109	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	110	float r, g, b, a; // default color for rgba mode
80	int base_height;	111	int base_height;
81	CFClient__Font font;	112	CFClient__Font font;
82	} *CFClient__Layout;	113	} *CFClient__Layout;
83		114
84	static CFClient__Font default_font;	115	static CFClient__Font default_font;
85	static PangoContext ft2_context, cairo_context;	116	static PangoContext *opengl_context;
86	static PangoFontMap ft2_fontmap, cairo_fontmap;	117	static PangoFontMap *opengl_fontmap;
87		118
88	static void	119	static void
89	substitute_func (FcPattern *pattern, gpointer data)	120	substitute_func (FcPattern *pattern, gpointer data)
90	{	121	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	122	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	123	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	124	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	125	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	126	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	127	}
101		128
102	static void	129	static void
103	layout_update_font (CFClient__Layout self)	130	layout_update_font (CFClient__Layout self)
104	{	131	{
…		…
436		463
437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	464	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	465	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439	}	466	}
440		467
		468	int
		469	in_destruct ()
		470	CODE:
		471	RETVAL = PL_main_cv == Nullcv;
		472	OUTPUT:
		473	RETVAL
		474
441	NV floor (NV x)	475	NV floor (NV x)
442		476
443	NV ceil (NV x)	477	NV ceil (NV x)
444		478
445	void	479	void
446	pango_init ()	480	pango_init ()
447	CODE:	481	CODE:
448	// delayed, so it can pick up new fonts added by AddFontResourceEx
449	{	482	{
450	{
451	ft2_fontmap = pango_ft2_font_map_new ();	483	opengl_fontmap = pango_opengl_font_map_new ();
452	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	484	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);	485	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	}	486	}
471		487
472	int	488	int
473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	489	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
474		490
475	void	491	void
476	SDL_Quit ()	492	SDL_Quit ()
477		493
478	void	494	void
…		…
615	#endif	631	#endif
616		632
617	void	633	void
618	add_font (char *file)	634	add_font (char *file)
619	CODE:	635	CODE:
620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	636	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621	#ifdef _WIN32
622	// cairo... sigh... requires win2000
623	AddFontResourceEx (file, FR_PRIVATE, 0);
624	#endif
625		637
626	void	638	void
627	load_image_inline (SV *image_)	639	load_image_inline (SV *image_)
628	ALIAS:	640	ALIAS:
629	load_image_file = 1	641	load_image_file = 1
…		…
671		683
672	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	684	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673		685
674	assert (surface2->pitch == surface2->w * 4);	686	assert (surface2->pitch == surface2->w * 4);
675		687
		688	SDL_LockSurface (surface2);
676	EXTEND (SP, 5);	689	EXTEND (SP, 6);
677	PUSHs (sv_2mortal (newSViv (surface2->w)));	690	PUSHs (sv_2mortal (newSViv (surface2->w)));
678	PUSHs (sv_2mortal (newSViv (surface2->h)));	691	PUSHs (sv_2mortal (newSViv (surface2->h)));
679	SDL_LockSurface (surface2);
680	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	692	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)));	693	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
683	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	694	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	695	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		696	SDL_UnlockSurface (surface2);
685		697
686	SDL_FreeSurface (surface);	698	SDL_FreeSurface (surface);
687	SDL_FreeSurface (surface2);	699	SDL_FreeSurface (surface2);
688	}	700	}
689		701
…		…
758	CODE:	770	CODE:
759	default_font = self;	771	default_font = self;
760		772
761	MODULE = CFClient PACKAGE = CFClient::Layout	773	MODULE = CFClient PACKAGE = CFClient::Layout
762		774
		775	void
		776	reset_glyph_cache ()
		777	CODE:
		778	tc_clear ();
		779
763	CFClient::Layout	780	CFClient::Layout
764	new (SV *class, int rgba = 0)	781	new (SV *class)
765	CODE:	782	CODE:
766	New (0, RETVAL, 1, struct cf_layout);	783	New (0, RETVAL, 1, struct cf_layout);
767		784
768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	785	RETVAL->pl = pango_layout_new (opengl_context);
769	RETVAL->rgba = rgba;
770	RETVAL->r = 1.;	786	RETVAL->r = 1.;
771	RETVAL->g = 1.;	787	RETVAL->g = 1.;
772	RETVAL->b = 1.;	788	RETVAL->b = 1.;
773	RETVAL->a = 1.;	789	RETVAL->a = 1.;
774	RETVAL->base_height = MIN_FONT_HEIGHT;	790	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
783	DESTROY (CFClient::Layout self)	799	DESTROY (CFClient::Layout self)
784	CODE:	800	CODE:
785	g_object_unref (self->pl);	801	g_object_unref (self->pl);
786	Safefree (self);	802	Safefree (self);
787		803
788	int
789	is_rgba (CFClient::Layout self)
790	CODE:
791	RETVAL = self->rgba;
792	OUTPUT:
793	RETVAL
794
795	void	804	void
796	set_text (CFClient::Layout self, SV *text_)	805	set_text (CFClient::Layout self, SV *text_)
797	CODE:	806	CODE:
798	{	807	{
799	STRLEN textlen;	808	STRLEN textlen;
…		…
809	STRLEN textlen;	818	STRLEN textlen;
810	char *text = SvPVutf8 (text_, textlen);	819	char *text = SvPVutf8 (text_, textlen);
811		820
812	pango_layout_set_markup (self->pl, text, textlen);	821	pango_layout_set_markup (self->pl, text, textlen);
813	}	822	}
		823
		824	void
		825	set_shapes (CFClient::Layout self, ...)
		826	CODE:
		827	{
		828	PangoAttrList *attrs = 0;
		829	const char *text = pango_layout_get_text (self->pl);
		830	const char *pos = text;
		831	int arg = 4;
		832
		833	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		834	{
		835	PangoRectangle inkrect, rect;
		836	PangoAttribute *attr;
		837
		838	int x = SvIV (ST (arg - 3));
		839	int y = SvIV (ST (arg - 2));
		840	int w = SvIV (ST (arg - 1));
		841	int h = SvIV (ST (arg ));
		842
		843	inkrect.x = 0;
		844	inkrect.y = 0;
		845	inkrect.width = 0;
		846	inkrect.height = 0;
		847
		848	rect.x = x * PANGO_SCALE;
		849	rect.y = y * PANGO_SCALE;
		850	rect.width = w * PANGO_SCALE;
		851	rect.height = h * PANGO_SCALE;
		852
		853	if (!attrs)
		854	attrs = pango_layout_get_attributes (self->pl);
		855
		856	attr = pango_attr_shape_new (&inkrect, &rect);
		857	attr->start_index = pos - text;
		858	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		859	pango_attr_list_insert (attrs, attr);
		860
		861	arg += 4;
		862	pos += sizeof (OBJ_STR) - 1;
		863	}
		864
		865	if (attrs)
		866	pango_layout_set_attributes (self->pl, attrs);
		867	}
		868
		869	void
		870	get_shapes (CFClient::Layout self)
		871	PPCODE:
		872	{
		873	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		874
		875	do
		876	{
		877	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		878
		879	if (run && shape_attr_p (run))
		880	{
		881	PangoRectangle extents;
		882	pango_layout_iter_get_run_extents (iter, 0, &extents);
		883
		884	EXTEND (SP, 2);
		885	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		886	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		887	}
		888	}
		889	while (pango_layout_iter_next_run (iter));
		890
		891	pango_layout_iter_free (iter);
		892	}
		893
		894	int
		895	has_wrapped (CFClient::Layout self)
		896	CODE:
		897	{
		898	int lines = 1;
		899	const char *text = pango_layout_get_text (self->pl);
		900
		901	while (*text)
		902	lines += *text++ == '\n';
		903
		904	RETVAL = lines < pango_layout_get_line_count (self->pl);
		905	}
		906	OUTPUT:
		907	RETVAL
814		908
815	SV *	909	SV *
816	get_text (CFClient::Layout self)	910	get_text (CFClient::Layout self)
817	CODE:	911	CODE:
818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	912	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
…		…
888	PUSHs (sv_2mortal (newSViv (w)));	982	PUSHs (sv_2mortal (newSViv (w)));
889	PUSHs (sv_2mortal (newSViv (h)));	983	PUSHs (sv_2mortal (newSViv (h)));
890	}	984	}
891		985
892	int	986	int
		987	descent (CFClient::Layout self)
		988	CODE:
		989	{
		990	PangoRectangle rect;
		991	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		992	pango_layout_line_get_pixel_extents (line, 0, &rect);
		993	RETVAL = PANGO_DESCENT (rect);
		994	}
		995	OUTPUT:
		996	RETVAL
		997
		998	int
893	xy_to_index (CFClient::Layout self, int x, int y)	999	xy_to_index (CFClient::Layout self, int x, int y)
894	CODE:	1000	CODE:
895	{	1001	{
896	int index, trailing;	1002	int index, trailing;
897	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1003	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
…		…
912	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1018	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1019	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914	}	1020	}
915		1021
916	void	1022	void
917	render (CFClient::Layout self)	1023	render (CFClient::Layout self, float x, float y)
918	PPCODE:	1024	PPCODE:
919	{	1025	pango_opengl_render_layout_subpixel (
920	SV *retval;	1026	self->pl,
921	int w, h;	1027	x * PANGO_SCALE, y * PANGO_SCALE,
922		1028	self->r, self->g, self->b, self->a
923	layout_get_pixel_size (self, &w, &h);
924
925	if (self->rgba)
926	{	1029	);
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	}
979	else
980	{
981	FT_Bitmap bitmap;
982
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		1030
1007	MODULE = CFClient PACKAGE = CFClient::Texture	1031	MODULE = CFClient PACKAGE = CFClient::Texture
1008		1032
1009	void	1033	void
1010	pad2pot (SV data_, SV w_, SV *h_)	1034	pad2pot (SV data_, SV w_, SV *h_)
…		…
1412	void	1436	void
1413	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1437	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414	CODE:	1438	CODE:
1415	{	1439	{
1416	static float color[16][3] = {	1440	static float color[16][3] = {
1417	{ 0.00, 0.00, 0.00 },	1441	{ 0.00F, 0.00F, 0.00F },
1418	{ 1.00, 1.00, 1.00 },	1442	{ 1.00F, 1.00F, 1.00F },
1419	{ 0.00, 0.00, 0.55 },	1443	{ 0.00F, 0.00F, 0.55F },
1420	{ 1.00, 0.00, 0.00 },	1444	{ 1.00F, 0.00F, 0.00F },
1421		1445
1422	{ 1.00, 0.54, 0.00 },	1446	{ 1.00F, 0.54F, 0.00F },
1423	{ 0.11, 0.56, 1.00 },	1447	{ 0.11F, 0.56F, 1.00F },
1424	{ 0.93, 0.46, 0.00 },	1448	{ 0.93F, 0.46F, 0.00F },
1425	{ 0.18, 0.54, 0.34 },	1449	{ 0.18F, 0.54F, 0.34F },
1426		1450
1427	{ 0.56, 0.73, 0.56 },	1451	{ 0.56F, 0.73F, 0.56F },
1428	{ 0.80, 0.80, 0.80 },	1452	{ 0.80F, 0.80F, 0.80F },
1429	{ 0.55, 0.41, 0.13 },	1453	{ 0.55F, 0.41F, 0.13F },
1430	{ 0.99, 0.77, 0.26 },	1454	{ 0.99F, 0.77F, 0.26F },
1431		1455
1432	{ 0.74, 0.65, 0.41 },	1456	{ 0.74F, 0.65F, 0.41F },
1433		1457
1434	{ 0.00, 1.00, 1.00 },	1458	{ 0.00F, 1.00F, 1.00F },
1435	{ 1.00, 0.00, 1.00 },	1459	{ 1.00F, 0.00F, 1.00F },
1436	{ 1.00, 1.00, 0.00 },	1460	{ 1.00F, 1.00F, 0.00F },
1437	};	1461	};
1438		1462
1439	int x, y;	1463	int x, y;
1440		1464
1441	glEnable (GL_TEXTURE_2D);	1465	glEnable (GL_TEXTURE_2D);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.120 by root, Sun Jun 18 19:13:19 2006 UTC vs. Revision 1.129 by root, Wed Jul 12 17:20:04 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.120 by root, Sun Jun 18 19:13:19 2006 UTC vs.
Revision 1.129 by root, Wed Jul 12 17:20:04 2006 UTC