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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.69 by root, Sun Apr 30 08:09:44 2006 UTC vs.
Revision 1.82 by root, Mon May 15 00:15:08 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>
		5	# pragma warning(disable:4244)
3	#endif	6	#endif
4		7
5	#include "EXTERN.h"	8	#include "EXTERN.h"
6	#include "perl.h"	9	#include "perl.h"
7	#include "XSUB.h"	10	#include "XSUB.h"
8		11
		12	#include <math.h>
9	#include <string.h>	13	#include <string.h>
10	#include <stdio.h>	14	#include <stdio.h>
11		15
12	#include <SDL.h>	16	#include <SDL.h>
		17	#include <SDL_endian.h>
13	#include <SDL_image.h>	18	#include <SDL_image.h>
14	#include <SDL_mixer.h>	19	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	20	#include <SDL_opengl.h>
16		21
17	#include <glib/gmacros.h>	22	#include <glib/gmacros.h>
18		23
19	#include <pango/pango.h>	24	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>	25	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>	26	#include <pango/pangoft2.h>
		27	#include <pango/pangocairo.h>
22		28
23	#ifndef _WIN32	29	#ifndef _WIN32
24	# include <sys/types.h>	30	# include <sys/types.h>
25	# include <sys/socket.h>	31	# include <sys/socket.h>
26	# include <netinet/in.h>	32	# include <netinet/in.h>
63	typedef Mix_Music *CFClient__MixMusic;	69	typedef Mix_Music *CFClient__MixMusic;
64		70
65	typedef PangoFontDescription *CFClient__Font;	71	typedef PangoFontDescription *CFClient__Font;
66		72
67	typedef struct cf_layout {	73	typedef struct cf_layout {
68	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
69	int base_height;	77	int base_height;
70	CFClient__Font font;	78	CFClient__Font font;
71	} *CFClient__Layout;	79	} *CFClient__Layout;
72		80
73	static CFClient__Font default_font;	81	static CFClient__Font default_font;
74	static PangoContext *context;	82	static PangoContext ft2_context, cairo_context;
75	static PangoFontMap *fontmap;	83	static PangoFontMap ft2_fontmap, cairo_fontmap;
76		84
77	static void	85	static void
78	substitute_func (FcPattern *pattern, gpointer data)	86	substitute_func (FcPattern *pattern, gpointer data)
79	{	87	{
80	FcPatternAddBool (pattern, FC_HINTING , 1);	88	FcPatternAddBool (pattern, FC_HINTING , 1);
		89	#ifndef _WIN32
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	90	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		91	#endif
82	}	92	}
83		93
84	static void	94	static void
85	layout_update_font (CFClient__Layout self)	95	layout_update_font (CFClient__Layout self)
86	{	96	{
…		…
98	static void	108	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	109	layout_get_pixel_size (CFClient__Layout self, int w, int h)
100	{	110	{
101	pango_layout_get_pixel_size (self->pl, w, h);	111	pango_layout_get_pixel_size (self->pl, w, h);
102		112
103	w = (w + 3) & ~3;
104	if (!w) w = 1;	113	if (!w) w = 1;
105	if (!h) h = 1;	114	if (!h) h = 1;
		115
		116	w = (w + 3) & ~3;
106	}	117	}
107		118
108	typedef uint16_t mapface;	119	typedef uint16_t mapface;
109		120
110	typedef struct {	121	typedef struct {
…		…
258	}	269	}
259	}	270	}
260	}	271	}
261		272
262	static void	273	static void
263	music_finished ()	274	music_finished (void)
264	{	275	{
265	SDL_UserEvent ev;	276	SDL_UserEvent ev;
266		277
267	ev.type = SDL_USEREVENT;	278	ev.type = SDL_USEREVENT;
268	ev.code = 0;	279	ev.code = 0;
269	ev.data1 = 0;	280	ev.data1 = 0;
		281	ev.data2 = 0;
		282
		283	SDL_PushEvent ((SDL_Event *)&ev);
		284	}
		285
		286	static void
		287	channel_finished (int channel)
		288	{
		289	SDL_UserEvent ev;
		290
		291	ev.type = SDL_USEREVENT;
		292	ev.code = 1;
		293	ev.data1 = (void *)(long)channel;
270	ev.data2 = 0;	294	ev.data2 = 0;
271		295
272	SDL_PushEvent ((SDL_Event *)&ev);	296	SDL_PushEvent ((SDL_Event *)&ev);
273	}	297	}
274		298
…		…
385	# undef const_iv	409	# undef const_iv
386	};	410	};
387		411
388	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	412	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	413	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		414	}
390		415
		416	void
		417	pango_init ()
		418	CODE:
		419	{
		420	// delayed, so it can pick up new fonts added by AddFontResourceEx
391	fontmap = pango_ft2_font_map_new ();	421	ft2_fontmap = pango_ft2_font_map_new ();
392	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	422	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
393	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	423	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		424
		425	cairo_fontmap = pango_cairo_font_map_get_default ();
		426	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
394	}	427	}
395		428
396	int	429	int
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	430	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
398		431
…		…
457		490
458	while (SDL_PollEvent (&ev))	491	while (SDL_PollEvent (&ev))
459	{	492	{
460	HV *hv = newHV ();	493	HV *hv = newHV ();
461	hv_store (hv, "type", 4, newSViv (ev.type), 0);	494	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		495
462	switch (ev.type)	496	switch (ev.type)
463	{	497	{
464	case SDL_KEYDOWN:	498	case SDL_KEYDOWN:
465	case SDL_KEYUP:	499	case SDL_KEYUP:
466	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	500	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
486	case SDL_MOUSEBUTTONUP:	520	case SDL_MOUSEBUTTONUP:
487	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	521	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	522	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	523	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	524	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		525	break;
		526
		527	case SDL_USEREVENT:
		528	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		529	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		530	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		531	break;
491	}	532	}
492		533
493	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	534	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
494	}	535	}
495	}	536	}
496		537
497	int	538	int
498	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	539	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
499	POSTCALL:	540	POSTCALL:
500	Mix_HookMusicFinished (music_finished);	541	Mix_HookMusicFinished (music_finished);
		542	Mix_ChannelFinished (channel_finished);
501		543
502	void	544	void
503	Mix_CloseAudio ()	545	Mix_CloseAudio ()
504		546
505	int	547	int
…		…
528		570
529	void	571	void
530	add_font (char *file)	572	add_font (char *file)
531	CODE:	573	CODE:
532	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	574	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		575	#ifdef _WIN32
		576	// cairo... sigh... requires win2000
		577	AddFontResourceEx (file, FR_PRIVATE, 0);
		578	#endif
533		579
534	void	580	void
535	load_image_inline (SV *image_)	581	load_image_inline (SV *image_)
536	ALIAS:	582	ALIAS:
537	load_image_file = 1	583	load_image_file = 1
…		…
640	exit (1);	686	exit (1);
641		687
642	MODULE = CFClient PACKAGE = CFClient::Font	688	MODULE = CFClient PACKAGE = CFClient::Font
643		689
644	CFClient::Font	690	CFClient::Font
645	new_from_file (SV class, char path)	691	new_from_file (SV class, char path, int id = 0)
646	CODE:	692	CODE:
647	{	693	{
648	int count;	694	int count;
649	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);	695	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
650	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	696	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
651	FcPatternDestroy (pattern);	697	FcPatternDestroy (pattern);
652	}	698	}
653	OUTPUT:	699	OUTPUT:
654	RETVAL	700	RETVAL
…		…
664	default_font = self;	710	default_font = self;
665		711
666	MODULE = CFClient PACKAGE = CFClient::Layout	712	MODULE = CFClient PACKAGE = CFClient::Layout
667		713
668	CFClient::Layout	714	CFClient::Layout
669	new (SV *class, int base_height = MIN_FONT_HEIGHT)	715	new (SV *class, int rgba = 0)
670	CODE:	716	CODE:
671	New (0, RETVAL, 1, struct cf_layout);	717	New (0, RETVAL, 1, struct cf_layout);
672	RETVAL->pl = pango_layout_new (context);	718
673	RETVAL->base_height = base_height;	719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		720	RETVAL->rgba = rgba;
		721	RETVAL->r = 1.;
		722	RETVAL->g = 1.;
		723	RETVAL->b = 1.;
		724	RETVAL->a = 1.;
		725	RETVAL->base_height = MIN_FONT_HEIGHT;
674	RETVAL->font = 0;	726	RETVAL->font = 0;
		727
675	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	728	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
676	pango_layout_set_font_description (RETVAL->pl, default_font);	729	layout_update_font (RETVAL);
677	OUTPUT:	730	OUTPUT:
678	RETVAL	731	RETVAL
679		732
680	void	733	void
681	DESTROY (CFClient::Layout self)	734	DESTROY (CFClient::Layout self)
682	CODE:	735	CODE:
683	g_object_unref (self->pl);	736	g_object_unref (self->pl);
684	Safefree (self);	737	Safefree (self);
685		738
		739	int
		740	is_rgba (CFClient::Layout self)
		741	CODE:
		742	RETVAL = self->rgba;
		743	OUTPUT:
		744	RETVAL
		745
686	void	746	void
687	set_text (CFClient::Layout self, SV *text_)	747	set_text (CFClient::Layout self, SV *text_)
688	CODE:	748	CODE:
689	{	749	{
690	STRLEN textlen;	750	STRLEN textlen;
…		…
708	CODE:	768	CODE:
709	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
710	SvUTF8_on (RETVAL);	770	SvUTF8_on (RETVAL);
711	OUTPUT:	771	OUTPUT:
712	RETVAL	772	RETVAL
		773
		774	void
		775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		776	CODE:
		777	self->r = r;
		778	self->g = g;
		779	self->b = b;
		780	self->a = a;
713		781
714	void	782	void
715	set_font (CFClient::Layout self, CFClient::Font font = 0)	783	set_font (CFClient::Layout self, CFClient::Font font = 0)
716	CODE:	784	CODE:
717	if (self->font != font)	785	if (self->font != font)
…		…
775	render (CFClient::Layout self)	843	render (CFClient::Layout self)
776	PPCODE:	844	PPCODE:
777	{	845	{
778	SV *retval;	846	SV *retval;
779	int w, h;	847	int w, h;
780	FT_Bitmap bitmap;
781		848
782	layout_get_pixel_size (self, &w, &h);	849	layout_get_pixel_size (self, &w, &h);
783		850
		851	if (self->rgba)
		852	{
		853	cairo_surface_t *surface;
		854	cairo_t *cairo;
		855
		856	retval = newSV (w * h * 4);
		857	SvPOK_only (retval);
		858	SvCUR_set (retval, w * h * 4);
		859
		860	memset (SvPVX (retval), 0, w * h * 4);
		861
		862	surface = cairo_image_surface_create_for_data (
		863	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		864	cairo = cairo_create (surface);
		865	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		866
		867	pango_cairo_show_layout (cairo, self->pl);
		868
		869	cairo_destroy (cairo);
		870	cairo_surface_destroy (surface);
		871
		872	// what a mess, and its premultiplied, too :(
		873	{
		874	uint32_t p = (uint32_t )SvPVX (retval);
		875	uint32_t e = p + w h;
		876
		877	while (p < e)
		878	{
		879	uint32_t rgba = *p;
		880	rgba = (rgba >> 24) \| (rgba << 8);
		881	rgba = SDL_SwapBE32 (rgba);
		882	*p++ = rgba;
		883	}
		884	}
		885
		886	EXTEND (SP, 5);
		887	PUSHs (sv_2mortal (newSViv (w)));
		888	PUSHs (sv_2mortal (newSViv (h)));
		889	PUSHs (sv_2mortal (retval));
		890	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		891	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		892	}
		893	else
		894	{
		895	FT_Bitmap bitmap;
		896
784	retval = newSV (w * h);	897	retval = newSV (w * h);
785	SvPOK_only (retval);	898	SvPOK_only (retval);
786	SvCUR_set (retval, w * h);	899	SvCUR_set (retval, w * h);
787		900
788	bitmap.rows = h;	901	bitmap.rows = h;
789	bitmap.width = w;	902	bitmap.width = w;
790	bitmap.pitch = w;	903	bitmap.pitch = w;
791	bitmap.buffer = (unsigned char*)SvPVX (retval);	904	bitmap.buffer = (unsigned char*)SvPVX (retval);
792	bitmap.num_grays = 256;	905	bitmap.num_grays = 256;
793	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	906	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
794		907
795	memset (bitmap.buffer, 0, w * h);	908	memset (bitmap.buffer, 0, w * h);
796		909
797	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	910	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
798		911
799	EXTEND (SP, 3);	912	EXTEND (SP, 5);
800	PUSHs (sv_2mortal (newSViv (w)));	913	PUSHs (sv_2mortal (newSViv (w)));
801	PUSHs (sv_2mortal (newSViv (h)));	914	PUSHs (sv_2mortal (newSViv (h)));
802	PUSHs (sv_2mortal (retval));	915	PUSHs (sv_2mortal (retval));
		916	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		917	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		918	}
803	}	919	}
804		920
805	MODULE = CFClient PACKAGE = CFClient::Texture	921	MODULE = CFClient PACKAGE = CFClient::Texture
806		922
807	void	923	void
808	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	924	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
809	PROTOTYPE: $$$;$$	925	PROTOTYPE: $$$;$$
		926	ALIAS:
		927	draw_quad_alpha = 1
		928	draw_quad_alpha_premultiplied = 2
810	CODE:	929	CODE:
811	{	930	{
812	HV hv = (HV )SvRV (self);	931	HV hv = (HV )SvRV (self);
813	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	932	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
814	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	933	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
819	{	938	{
820	w = SvNV (*hv_fetch (hv, "w", 1, 1));	939	w = SvNV (*hv_fetch (hv, "w", 1, 1));
821	h = SvNV (*hv_fetch (hv, "h", 1, 1));	940	h = SvNV (*hv_fetch (hv, "h", 1, 1));
822	}	941	}
823		942
		943	if (ix)
		944	{
		945	glEnable (GL_BLEND);
		946	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		947	}
		948
824	glBindTexture (GL_TEXTURE_2D, name);	949	glBindTexture (GL_TEXTURE_2D, name);
		950
825	if (wrap_mode) {	951	if (wrap_mode)
		952	{
826	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	953	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
827	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	954	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
828	}	955	}
		956
829	glBegin (GL_QUADS);	957	glBegin (GL_QUADS);
830	glTexCoord2f (0, 0); glVertex2f (x , y );	958	glTexCoord2f (0, 0); glVertex2f (x , y );
831	glTexCoord2f (0, t); glVertex2f (x , y + h);	959	glTexCoord2f (0, t); glVertex2f (x , y + h);
832	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	960	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
833	glTexCoord2f (s, 0); glVertex2f (x + w, y );	961	glTexCoord2f (s, 0); glVertex2f (x + w, y );
834	glEnd ();	962	glEnd ();
		963
		964	if (ix)
		965	glDisable (GL_BLEND);
835	}	966	}
836		967
837	MODULE = CFClient PACKAGE = CFClient::Map	968	MODULE = CFClient PACKAGE = CFClient::Map
838		969
839	CFClient::Map	970	CFClient::Map
…		…
1362	const_iv (GL_ONE_MINUS_DST_ALPHA),	1493	const_iv (GL_ONE_MINUS_DST_ALPHA),
1363	const_iv (GL_RGB),	1494	const_iv (GL_RGB),
1364	const_iv (GL_RGBA),	1495	const_iv (GL_RGBA),
1365	const_iv (GL_UNSIGNED_BYTE),	1496	const_iv (GL_UNSIGNED_BYTE),
1366	const_iv (GL_ALPHA),	1497	const_iv (GL_ALPHA),
		1498	const_iv (GL_LUMINANCE),
1367	const_iv (GL_FLOAT),	1499	const_iv (GL_FLOAT),
1368	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1500	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1369	const_iv (GL_COMPILE),	1501	const_iv (GL_COMPILE),
1370	const_iv (GL_TEXTURE_1D),	1502	const_iv (GL_TEXTURE_1D),
1371	const_iv (GL_TEXTURE_2D),	1503	const_iv (GL_TEXTURE_2D),
…		…
1460	void glEnd ()	1592	void glEnd ()
1461		1593
1462	void glColor (float r, float g, float b, float a = 1.0)	1594	void glColor (float r, float g, float b, float a = 1.0)
1463	PROTOTYPE: @	1595	PROTOTYPE: @
1464	CODE:	1596	CODE:
1465	glColor4f (r, g, b, a);	1597	glColor4ub (MIN ((int)(r * 255.f), 255),
		1598	MIN ((int)(g * 255.f), 255),
		1599	MIN ((int)(b * 255.f), 255),
		1600	MIN ((int)(a * 255.f), 255));
1466		1601
1467	void glVertex (float x, float y, float z = 0.)	1602	void glVertex (float x, float y, float z = 0.)
1468	CODE:	1603	CODE:
1469	glVertex3f (x, y, z);	1604	glVertex3f (x, y, z);
1470		1605

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.69 by root, Sun Apr 30 08:09:44 2006 UTC vs. Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.69 by root, Sun Apr 30 08:09:44 2006 UTC vs.
Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC