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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.84 by root, Wed May 17 15:18:57 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	3	# include <malloc.h>
		4	# include <windows.h>
3	# pragma warning(disable:4244)	5	# pragma warning(disable:4244)
4	#endif	6	#endif
5		7
6	#include "EXTERN.h"	8	#include "EXTERN.h"
7	#include "perl.h"	9	#include "perl.h"
8	#include "XSUB.h"	10	#include "XSUB.h"
9		11
		12	#include <math.h>
10	#include <string.h>	13	#include <string.h>
11	#include <stdio.h>	14	#include <stdio.h>
12		15
13	#include <SDL.h>	16	#include <SDL.h>
		17	#include <SDL_endian.h>
14	#include <SDL_image.h>	18	#include <SDL_image.h>
15	#include <SDL_mixer.h>	19	#include <SDL_mixer.h>
16	#include <SDL_opengl.h>	20	#include <SDL_opengl.h>
17		21
18	#include <glib/gmacros.h>	22	#include <glib/gmacros.h>
19		23
20	#include <pango/pango.h>	24	#include <pango/pango.h>
21	#include <pango/pangofc-fontmap.h>	25	#include <pango/pangofc-fontmap.h>
22	#include <pango/pangoft2.h>	26	#include <pango/pangoft2.h>
		27	#include <pango/pangocairo.h>
23		28
24	#ifndef _WIN32	29	#ifndef _WIN32
25	# include <sys/types.h>	30	# include <sys/types.h>
26	# include <sys/socket.h>	31	# include <sys/socket.h>
27	# include <netinet/in.h>	32	# include <netinet/in.h>
64	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
65		70
66	typedef PangoFontDescription *CFClient__Font;	71	typedef PangoFontDescription *CFClient__Font;
67		72
68	typedef struct cf_layout {	73	typedef struct cf_layout {
69	PangoLayout *pl;	74	PangoLayout *pl; // either derived from a cairo or ft2 context
		75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		76	float r, g, b, a; // default color for rgba mode
70	int base_height;	77	int base_height;
71	CFClient__Font font;	78	CFClient__Font font;
72	} *CFClient__Layout;	79	} *CFClient__Layout;
73		80
74	static CFClient__Font default_font;	81	static CFClient__Font default_font;
75	static PangoContext *context;	82	static PangoContext ft2_context, cairo_context;
76	static PangoFontMap *fontmap;	83	static PangoFontMap ft2_fontmap, cairo_fontmap;
77		84
78	static void	85	static void
79	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
80	{	87	{
81	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
		89	#ifdef _WIN32
		90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		91	#else
82	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		93	#endif
83	}	94	}
84		95
85	static void	96	static void
86	layout_update_font (CFClient__Layout self)	97	layout_update_font (CFClient__Layout self)
87	{	98	{
…		…
99	static void	110	static void
100	layout_get_pixel_size (CFClient__Layout self, int w, int h)	111	layout_get_pixel_size (CFClient__Layout self, int w, int h)
101	{	112	{
102	pango_layout_get_pixel_size (self->pl, w, h);	113	pango_layout_get_pixel_size (self->pl, w, h);
103		114
104	w = (w + 3) & ~3;
105	if (!w) w = 1;	115	if (!w) w = 1;
106	if (!h) h = 1;	116	if (!h) h = 1;
		117
		118	w = (w + 3) & ~3;
107	}	119	}
108		120
109	typedef uint16_t mapface;	121	typedef uint16_t mapface;
110		122
111	typedef struct {	123	typedef struct {
…		…
399	# undef const_iv	411	# undef const_iv
400	};	412	};
401		413
402	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
403	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		416	}
404		417
		418	void
		419	pango_init ()
		420	CODE:
		421	{
		422	// delayed, so it can pick up new fonts added by AddFontResourceEx
405	fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
406	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
407	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		426
		427	cairo_fontmap = pango_cairo_font_map_get_default ();
		428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
408	}	429	}
409		430
410	int	431	int
411	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
412		433
…		…
551		572
552	void	573	void
553	add_font (char *file)	574	add_font (char *file)
554	CODE:	575	CODE:
555	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	576	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		577	#ifdef _WIN32
		578	// cairo... sigh... requires win2000
		579	AddFontResourceEx (file, FR_PRIVATE, 0);
		580	#endif
556		581
557	void	582	void
558	load_image_inline (SV *image_)	583	load_image_inline (SV *image_)
559	ALIAS:	584	ALIAS:
560	load_image_file = 1	585	load_image_file = 1
…		…
687	default_font = self;	712	default_font = self;
688		713
689	MODULE = CFClient PACKAGE = CFClient::Layout	714	MODULE = CFClient PACKAGE = CFClient::Layout
690		715
691	CFClient::Layout	716	CFClient::Layout
692	new (SV *class, int base_height = MIN_FONT_HEIGHT)	717	new (SV *class, int rgba = 0)
693	CODE:	718	CODE:
694	New (0, RETVAL, 1, struct cf_layout);	719	New (0, RETVAL, 1, struct cf_layout);
695	RETVAL->pl = pango_layout_new (context);	720
696	RETVAL->base_height = base_height;	721	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		722	RETVAL->rgba = rgba;
		723	RETVAL->r = 1.;
		724	RETVAL->g = 1.;
		725	RETVAL->b = 1.;
		726	RETVAL->a = 1.;
		727	RETVAL->base_height = MIN_FONT_HEIGHT;
697	RETVAL->font = 0;	728	RETVAL->font = 0;
		729
698	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	730	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699	pango_layout_set_font_description (RETVAL->pl, default_font);	731	layout_update_font (RETVAL);
700	OUTPUT:	732	OUTPUT:
701	RETVAL	733	RETVAL
702		734
703	void	735	void
704	DESTROY (CFClient::Layout self)	736	DESTROY (CFClient::Layout self)
705	CODE:	737	CODE:
706	g_object_unref (self->pl);	738	g_object_unref (self->pl);
707	Safefree (self);	739	Safefree (self);
708		740
		741	int
		742	is_rgba (CFClient::Layout self)
		743	CODE:
		744	RETVAL = self->rgba;
		745	OUTPUT:
		746	RETVAL
		747
709	void	748	void
710	set_text (CFClient::Layout self, SV *text_)	749	set_text (CFClient::Layout self, SV *text_)
711	CODE:	750	CODE:
712	{	751	{
713	STRLEN textlen;	752	STRLEN textlen;
…		…
731	CODE:	770	CODE:
732	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	771	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
733	SvUTF8_on (RETVAL);	772	SvUTF8_on (RETVAL);
734	OUTPUT:	773	OUTPUT:
735	RETVAL	774	RETVAL
		775
		776	void
		777	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		778	CODE:
		779	self->r = r;
		780	self->g = g;
		781	self->b = b;
		782	self->a = a;
736		783
737	void	784	void
738	set_font (CFClient::Layout self, CFClient::Font font = 0)	785	set_font (CFClient::Layout self, CFClient::Font font = 0)
739	CODE:	786	CODE:
740	if (self->font != font)	787	if (self->font != font)
…		…
756	set_width (CFClient::Layout self, int max_width = -1)	803	set_width (CFClient::Layout self, int max_width = -1)
757	CODE:	804	CODE:
758	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	805	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
759		806
760	void	807	void
		808	set_indent (CFClient::Layout self, int indent)
		809	CODE:
		810	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		811
		812	void
		813	set_spacing (CFClient::Layout self, int spacing)
		814	CODE:
		815	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		816
		817	void
		818	set_ellipsise (CFClient::Layout self, int ellipsise)
		819	CODE:
		820	pango_layout_set_ellipsize (self->pl,
		821	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		822	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		823	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		824	: PANGO_ELLIPSIZE_NONE
		825	);
		826
		827	void
		828	set_single_paragraph_mode (CFClient::Layout self, int spm)
		829	CODE:
		830	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		831
		832	void
761	size (CFClient::Layout self)	833	size (CFClient::Layout self)
762	PPCODE:	834	PPCODE:
763	{	835	{
764	int w, h;	836	int w, h;
765		837
…		…
798	render (CFClient::Layout self)	870	render (CFClient::Layout self)
799	PPCODE:	871	PPCODE:
800	{	872	{
801	SV *retval;	873	SV *retval;
802	int w, h;	874	int w, h;
803	FT_Bitmap bitmap;
804		875
805	layout_get_pixel_size (self, &w, &h);	876	layout_get_pixel_size (self, &w, &h);
806		877
		878	if (self->rgba)
		879	{
		880	cairo_surface_t *surface;
		881	cairo_t *cairo;
		882
		883	retval = newSV (w * h * 4);
		884	SvPOK_only (retval);
		885	SvCUR_set (retval, w * h * 4);
		886
		887	memset (SvPVX (retval), 0, w * h * 4);
		888
		889	surface = cairo_image_surface_create_for_data (
		890	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		891	cairo = cairo_create (surface);
		892	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		893
		894	pango_cairo_show_layout (cairo, self->pl);
		895
		896	cairo_destroy (cairo);
		897	cairo_surface_destroy (surface);
		898
		899	// what a mess, and its premultiplied, too :(
		900	{
		901	uint32_t p = (uint32_t )SvPVX (retval);
		902	uint32_t e = p + w h;
		903
		904	while (p < e)
		905	{
		906	uint32_t rgba = *p;
		907	rgba = (rgba >> 24) \| (rgba << 8);
		908	rgba = SDL_SwapBE32 (rgba);
		909	*p++ = rgba;
		910	}
		911	}
		912
		913	EXTEND (SP, 5);
		914	PUSHs (sv_2mortal (newSViv (w)));
		915	PUSHs (sv_2mortal (newSViv (h)));
		916	PUSHs (sv_2mortal (retval));
		917	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		918	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		919	}
		920	else
		921	{
		922	FT_Bitmap bitmap;
		923
807	retval = newSV (w * h);	924	retval = newSV (w * h);
808	SvPOK_only (retval);	925	SvPOK_only (retval);
809	SvCUR_set (retval, w * h);	926	SvCUR_set (retval, w * h);
810		927
811	bitmap.rows = h;	928	bitmap.rows = h;
812	bitmap.width = w;	929	bitmap.width = w;
813	bitmap.pitch = w;	930	bitmap.pitch = w;
814	bitmap.buffer = (unsigned char*)SvPVX (retval);	931	bitmap.buffer = (unsigned char*)SvPVX (retval);
815	bitmap.num_grays = 256;	932	bitmap.num_grays = 256;
816	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	933	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
817		934
818	memset (bitmap.buffer, 0, w * h);	935	memset (bitmap.buffer, 0, w * h);
819		936
820	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	937	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
821		938
822	EXTEND (SP, 3);	939	EXTEND (SP, 5);
823	PUSHs (sv_2mortal (newSViv (w)));	940	PUSHs (sv_2mortal (newSViv (w)));
824	PUSHs (sv_2mortal (newSViv (h)));	941	PUSHs (sv_2mortal (newSViv (h)));
825	PUSHs (sv_2mortal (retval));	942	PUSHs (sv_2mortal (retval));
		943	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		944	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		945	}
826	}	946	}
827		947
828	MODULE = CFClient PACKAGE = CFClient::Texture	948	MODULE = CFClient PACKAGE = CFClient::Texture
829		949
830	void	950	void
831	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	951	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
832	PROTOTYPE: $$$;$$	952	PROTOTYPE: $$$;$$
		953	ALIAS:
		954	draw_quad_alpha = 1
		955	draw_quad_alpha_premultiplied = 2
833	CODE:	956	CODE:
834	{	957	{
835	HV hv = (HV )SvRV (self);	958	HV hv = (HV )SvRV (self);
836	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	959	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	960	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
842	{	965	{
843	w = SvNV (*hv_fetch (hv, "w", 1, 1));	966	w = SvNV (*hv_fetch (hv, "w", 1, 1));
844	h = SvNV (*hv_fetch (hv, "h", 1, 1));	967	h = SvNV (*hv_fetch (hv, "h", 1, 1));
845	}	968	}
846		969
		970	if (ix)
		971	{
		972	glEnable (GL_BLEND);
		973	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		974	}
		975
847	glBindTexture (GL_TEXTURE_2D, name);	976	glBindTexture (GL_TEXTURE_2D, name);
		977
848	if (wrap_mode) {	978	if (wrap_mode)
		979	{
849	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	980	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
850	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
851	}	982	}
		983
852	glBegin (GL_QUADS);	984	glBegin (GL_QUADS);
853	glTexCoord2f (0, 0); glVertex2f (x , y );	985	glTexCoord2f (0, 0); glVertex2f (x , y );
854	glTexCoord2f (0, t); glVertex2f (x , y + h);	986	glTexCoord2f (0, t); glVertex2f (x , y + h);
855	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	987	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856	glTexCoord2f (s, 0); glVertex2f (x + w, y );	988	glTexCoord2f (s, 0); glVertex2f (x + w, y );
857	glEnd ();	989	glEnd ();
		990
		991	if (ix)
		992	glDisable (GL_BLEND);
858	}	993	}
859		994
860	MODULE = CFClient PACKAGE = CFClient::Map	995	MODULE = CFClient PACKAGE = CFClient::Map
861		996
862	CFClient::Map	997	CFClient::Map
…		…
1385	const_iv (GL_ONE_MINUS_DST_ALPHA),	1520	const_iv (GL_ONE_MINUS_DST_ALPHA),
1386	const_iv (GL_RGB),	1521	const_iv (GL_RGB),
1387	const_iv (GL_RGBA),	1522	const_iv (GL_RGBA),
1388	const_iv (GL_UNSIGNED_BYTE),	1523	const_iv (GL_UNSIGNED_BYTE),
1389	const_iv (GL_ALPHA),	1524	const_iv (GL_ALPHA),
		1525	const_iv (GL_LUMINANCE),
1390	const_iv (GL_FLOAT),	1526	const_iv (GL_FLOAT),
1391	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1527	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392	const_iv (GL_COMPILE),	1528	const_iv (GL_COMPILE),
1393	const_iv (GL_TEXTURE_1D),	1529	const_iv (GL_TEXTURE_1D),
1394	const_iv (GL_TEXTURE_2D),	1530	const_iv (GL_TEXTURE_2D),
…		…
1483	void glEnd ()	1619	void glEnd ()
1484		1620
1485	void glColor (float r, float g, float b, float a = 1.0)	1621	void glColor (float r, float g, float b, float a = 1.0)
1486	PROTOTYPE: @	1622	PROTOTYPE: @
1487	CODE:	1623	CODE:
1488	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1624	glColor4ub (MIN ((int)(r * 255.f), 255),
		1625	MIN ((int)(g * 255.f), 255),
		1626	MIN ((int)(b * 255.f), 255),
		1627	MIN ((int)(a * 255.f), 255));
1489		1628
1490	void glVertex (float x, float y, float z = 0.)	1629	void glVertex (float x, float y, float z = 0.)
1491	CODE:	1630	CODE:
1492	glVertex3f (x, y, z);	1631	glVertex3f (x, y, z);
1493		1632

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs. Revision 1.84 by root, Wed May 17 15:18:57 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.84 by root, Wed May 17 15:18:57 2006 UTC