[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.127 by root, Wed Jul 5 00:16:44 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	{
…		…
443	NV ceil (NV x)	470	NV ceil (NV x)
444		471
445	void	472	void
446	pango_init ()	473	pango_init ()
447	CODE:	474	CODE:
448	// delayed, so it can pick up new fonts added by AddFontResourceEx
449	{	475	{
450	{
451	ft2_fontmap = pango_ft2_font_map_new ();	476	opengl_fontmap = pango_opengl_font_map_new ();
452	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	477	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);	478	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	}	479	}
471		480
472	int	481	int
473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	482	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
474		483
475	void	484	void
476	SDL_Quit ()	485	SDL_Quit ()
477		486
478	void	487	void
…		…
616		625
617	void	626	void
618	add_font (char *file)	627	add_font (char *file)
619	CODE:	628	CODE:
620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	629	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
621	#ifdef _WIN32
622	// cairo... sigh... requires win2000
623	AddFontResourceEx (file, FR_PRIVATE, 0);
624	#endif
625		630
626	void	631	void
627	load_image_inline (SV *image_)	632	load_image_inline (SV *image_)
628	ALIAS:	633	ALIAS:
629	load_image_file = 1	634	load_image_file = 1
…		…
758	CODE:	763	CODE:
759	default_font = self;	764	default_font = self;
760		765
761	MODULE = CFClient PACKAGE = CFClient::Layout	766	MODULE = CFClient PACKAGE = CFClient::Layout
762		767
		768	void
		769	clear_font_cache ()
		770	CODE:
		771	tc_clear ();
		772
763	CFClient::Layout	773	CFClient::Layout
764	new (SV *class, int rgba = 0)	774	new (SV *class, int type = 0)
765	CODE:	775	CODE:
766	New (0, RETVAL, 1, struct cf_layout);	776	New (0, RETVAL, 1, struct cf_layout);
767		777
768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	778	RETVAL->pl = pango_layout_new (opengl_context);
769	RETVAL->rgba = rgba;
770	RETVAL->r = 1.;	779	RETVAL->r = 1.;
771	RETVAL->g = 1.;	780	RETVAL->g = 1.;
772	RETVAL->b = 1.;	781	RETVAL->b = 1.;
773	RETVAL->a = 1.;	782	RETVAL->a = 1.;
774	RETVAL->base_height = MIN_FONT_HEIGHT;	783	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
783	DESTROY (CFClient::Layout self)	792	DESTROY (CFClient::Layout self)
784	CODE:	793	CODE:
785	g_object_unref (self->pl);	794	g_object_unref (self->pl);
786	Safefree (self);	795	Safefree (self);
787		796
788	int
789	is_rgba (CFClient::Layout self)
790	CODE:
791	RETVAL = self->rgba;
792	OUTPUT:
793	RETVAL
794
795	void	797	void
796	set_text (CFClient::Layout self, SV *text_)	798	set_text (CFClient::Layout self, SV *text_)
797	CODE:	799	CODE:
798	{	800	{
799	STRLEN textlen;	801	STRLEN textlen;
…		…
809	STRLEN textlen;	811	STRLEN textlen;
810	char *text = SvPVutf8 (text_, textlen);	812	char *text = SvPVutf8 (text_, textlen);
811		813
812	pango_layout_set_markup (self->pl, text, textlen);	814	pango_layout_set_markup (self->pl, text, textlen);
813	}	815	}
		816
		817	void
		818	set_shapes (CFClient::Layout self, ...)
		819	CODE:
		820	{
		821	PangoAttrList *attrs = 0;
		822	const char *text = pango_layout_get_text (self->pl);
		823	const char *pos = text;
		824	int arg = 4;
		825
		826	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		827	{
		828	PangoRectangle inkrect, rect;
		829	PangoAttribute *attr;
		830
		831	int x = SvIV (ST (arg - 3));
		832	int y = SvIV (ST (arg - 2));
		833	int w = SvIV (ST (arg - 1));
		834	int h = SvIV (ST (arg ));
		835
		836	inkrect.x = 0;
		837	inkrect.y = 0;
		838	inkrect.width = 0;
		839	inkrect.height = 0;
		840
		841	rect.x = x * PANGO_SCALE;
		842	rect.y = y * PANGO_SCALE;
		843	rect.width = w * PANGO_SCALE;
		844	rect.height = h * PANGO_SCALE;
		845
		846	if (!attrs)
		847	attrs = pango_layout_get_attributes (self->pl);
		848
		849	attr = pango_attr_shape_new (&inkrect, &rect);
		850	attr->start_index = pos - text;
		851	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		852	pango_attr_list_insert (attrs, attr);
		853
		854	arg += 4;
		855	pos += sizeof (OBJ_STR) - 1;
		856	}
		857
		858	if (attrs)
		859	pango_layout_set_attributes (self->pl, attrs);
		860	}
		861
		862	void
		863	get_shapes (CFClient::Layout self)
		864	PPCODE:
		865	{
		866	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		867
		868	do
		869	{
		870	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		871
		872	if (run && shape_attr_p (run))
		873	{
		874	PangoRectangle extents;
		875	pango_layout_iter_get_run_extents (iter, 0, &extents);
		876
		877	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		878	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		879	}
		880	}
		881	while (pango_layout_iter_next_run (iter));
		882
		883	pango_layout_iter_free (iter);
		884	}
		885
		886	int
		887	has_wrapped (CFClient::Layout self)
		888	CODE:
		889	{
		890	int lines = 1;
		891	const char *text = pango_layout_get_text (self->pl);
		892
		893	while (*text)
		894	lines += *text++ == '\n';
		895
		896	RETVAL = lines < pango_layout_get_line_count (self->pl);
		897	}
		898	OUTPUT:
		899	RETVAL
814		900
815	SV *	901	SV *
816	get_text (CFClient::Layout self)	902	get_text (CFClient::Layout self)
817	CODE:	903	CODE:
818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	904	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
…		…
888	PUSHs (sv_2mortal (newSViv (w)));	974	PUSHs (sv_2mortal (newSViv (w)));
889	PUSHs (sv_2mortal (newSViv (h)));	975	PUSHs (sv_2mortal (newSViv (h)));
890	}	976	}
891		977
892	int	978	int
		979	descent (CFClient::Layout self)
		980	CODE:
		981	{
		982	PangoRectangle rect;
		983	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		984	pango_layout_line_get_pixel_extents (line, 0, &rect);
		985	RETVAL = PANGO_DESCENT (rect);
		986	}
		987	OUTPUT:
		988	RETVAL
		989
		990	int
893	xy_to_index (CFClient::Layout self, int x, int y)	991	xy_to_index (CFClient::Layout self, int x, int y)
894	CODE:	992	CODE:
895	{	993	{
896	int index, trailing;	994	int index, trailing;
897	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	995	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)));	1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914	}	1012	}
915		1013
916	void	1014	void
917	render (CFClient::Layout self)	1015	render (CFClient::Layout self, float x, float y)
918	PPCODE:	1016	PPCODE:
919	{	1017	pango_opengl_render_layout_subpixel (
920	SV *retval;	1018	self->pl,
921	int w, h;	1019	x * PANGO_SCALE, y * PANGO_SCALE,
922		1020	self->r, self->g, self->b, self->a
923	layout_get_pixel_size (self, &w, &h);
924
925	if (self->rgba)
926	{	1021	);
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		1022
1007	MODULE = CFClient PACKAGE = CFClient::Texture	1023	MODULE = CFClient PACKAGE = CFClient::Texture
1008		1024
1009	void	1025	void
1010	pad2pot (SV data_, SV w_, SV *h_)	1026	pad2pot (SV data_, SV w_, SV *h_)
…		…
1233		1249
1234	while (data < data_end)	1250	while (data < data_end)
1235	{	1251	{
1236	flags = (data [0] << 8) + data [1]; data += 2;	1252	flags = (data [0] << 8) + data [1]; data += 2;
1237		1253
1238	x = ((flags >> 10) & 63) + self->x;	1254	x = self->x + ((flags >> 10) & 63);
1239	y = ((flags >> 4) & 63) + self->y;	1255	y = self->y + ((flags >> 4) & 63);
1240		1256
1241	cell = map_get_cell (self, x, y);	1257	cell = map_get_cell (self, x, y);
1242		1258
1243	if (flags & 15)	1259	if (flags & 15)
1244	{	1260	{
…		…
1341	int vx, vy;	1357	int vx, vy;
1342	int x, y, z;	1358	int x, y, z;
1343	int last_name;	1359	int last_name;
1344	mapface face;	1360	mapface face;
1345		1361
1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1362	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1363	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1348		1364
1349	/*	1365	/*
1350	int vx = self->vx = self->w >= sw	1366	int vx = self->vx = self->w >= sw
1351	? self->x + (self->w - sw) / 2	1367	? self->x + (self->w - sw) / 2
1352	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1368	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1412	void	1428	void
1413	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1429	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414	CODE:	1430	CODE:
1415	{	1431	{
1416	static float color[16][3] = {	1432	static float color[16][3] = {
1417	{ 0.00, 0.00, 0.00 },	1433	{ 0.00F, 0.00F, 0.00F },
1418	{ 1.00, 1.00, 1.00 },	1434	{ 1.00F, 1.00F, 1.00F },
1419	{ 0.00, 0.00, 0.55 },	1435	{ 0.00F, 0.00F, 0.55F },
1420	{ 1.00, 0.00, 0.00 },	1436	{ 1.00F, 0.00F, 0.00F },
1421		1437
1422	{ 1.00, 0.54, 0.00 },	1438	{ 1.00F, 0.54F, 0.00F },
1423	{ 0.11, 0.56, 1.00 },	1439	{ 0.11F, 0.56F, 1.00F },
1424	{ 0.93, 0.46, 0.00 },	1440	{ 0.93F, 0.46F, 0.00F },
1425	{ 0.18, 0.54, 0.34 },	1441	{ 0.18F, 0.54F, 0.34F },
1426		1442
1427	{ 0.56, 0.73, 0.56 },	1443	{ 0.56F, 0.73F, 0.56F },
1428	{ 0.80, 0.80, 0.80 },	1444	{ 0.80F, 0.80F, 0.80F },
1429	{ 0.55, 0.41, 0.13 },	1445	{ 0.55F, 0.41F, 0.13F },
1430	{ 0.99, 0.77, 0.26 },	1446	{ 0.99F, 0.77F, 0.26F },
1431		1447
1432	{ 0.74, 0.65, 0.41 },	1448	{ 0.74F, 0.65F, 0.41F },
1433		1449
1434	{ 0.00, 1.00, 1.00 },	1450	{ 0.00F, 1.00F, 1.00F },
1435	{ 1.00, 0.00, 1.00 },	1451	{ 1.00F, 0.00F, 1.00F },
1436	{ 1.00, 1.00, 0.00 },	1452	{ 1.00F, 1.00F, 0.00F },
1437	};	1453	};
1438		1454
1439	int x, y;	1455	int x, y;
1440		1456
1441	glEnable (GL_TEXTURE_2D);	1457	glEnable (GL_TEXTURE_2D);

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.127 by root, Wed Jul 5 00:16:44 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.127 by root, Wed Jul 5 00:16:44 2006 UTC