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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

…		…
48	#endif	48	#endif
49		49
50	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
51	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
52		52
53	#include <glib/gmacros.h>	53	#include <glib.h>
54		54
55	#include <pango/pango.h>	55	#include <pango/pango.h>
56		56
57	#ifndef PANGO_VERSION_CHECK	57	#ifndef PANGO_VERSION_CHECK
58	# define PANGO_VERSION_CHECK(a,b,c) 0	58	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
184	{	184	{
185	GSList *attrs = run->item->analysis.extra_attrs;	185	GSList *attrs = run->item->analysis.extra_attrs;
186		186
187	while (attrs)	187	while (attrs)
188	{	188	{
189	PangoAttribute *attr = attrs->data;	189	PangoAttribute attr = (PangoAttribute )attrs->data;
190		190
191	if (attr->klass->type == PANGO_ATTR_SHAPE)	191	if (attr->klass->type == PANGO_ATTR_SHAPE)
192	return 1;	192	return 1;
193		193
194	attrs = attrs->next;	194	attrs = attrs->next;
…		…
212	static void	212	static void
213	substitute_func (FcPattern *pattern, gpointer data)	213	substitute_func (FcPattern *pattern, gpointer data)
214	{	214	{
215	FcPatternAddBool (pattern, FC_HINTING, 1);	215	FcPatternAddBool (pattern, FC_HINTING, 1);
216	#ifdef FC_HINT_STYLE	216	#ifdef FC_HINT_STYLE
217	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	217	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
218	#endif	218	#endif
219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
220	}	220	}
221		221
222	static void	222	static void
…		…
577		577
578	return mod;	578	return mod;
579	}	579	}
580		580
581	static void	581	static void
582	deliantra_main ()	582	deliantra_main (SV *real_main)
583	{	583	{
584	char *argv[] = { 0 };	584	dSP;
585	call_argv ("DC::Main::main", G_DISCARD \| G_VOID, argv);	585
		586	PUSHMARK (SP);
		587	call_sv (real_main, G_DISCARD \| G_VOID);
586	}	588	}
587		589
588	#ifdef __MACOSX__	590	#ifdef __MACOSX__
		591	static SV *real_main;
		592
589	/* to due surprising braindamage on the side of SDL design, we	593	/* to due surprising braindamage on the side of SDL design, we
590	* do some mind-boggling hack here: SDL requires a custom main()	594	* do some mind-boggling hack here: SDL requires a custom main()
591	* on OS X, so... we provide one and call the original main(), which,	595	* on OS X, so... we provide one and call the original main(), which,
592	* due to shared library magic, calls -lSDLmain's main, not perl's main,	596	* due to shared library magic, calls -lSDLmain's main, not perl's main,
593	* and which calls our main (== SDL_main) back.	597	* and which calls our main (== SDL_main) back.
594	*/	598	*/
595	extern C_LINKAGE int	599	extern C_LINKAGE int
596	main (int argc, char *argv[])	600	main (int argc, char *argv[])
597	{	601	{
598	deliantra_main ();	602	deliantra_main (real_main);
599	}	603	}
600		604
601	#undef main	605	#undef main
602		606
603	extern C_LINKAGE int main (int argc, char *argv[]);	607	extern C_LINKAGE int main (int argc, char *argv[]);
604		608
605	static void	609	static void
606	SDL_braino (void)	610	SDL_main_hack (SV *real_main_)
607	{	611	{
		612	real_main = real_main_;
		613
608	char *argv[] = { "deliantra client", 0 };	614	char *argv[] = { "deliantra client", 0 };
609	(main) (1, argv);	615	(main) (1, argv);
610	}	616	}
611	#else	617	#else
612	static void	618	static void
613	SDL_braino (void)	619	SDL_main_hack (SV *real_main)
614	{	620	{
615	deliantra_main ();	621	deliantra_main (real_main);
616	}	622	}
617	#endif	623	#endif
618		624
619	MODULE = Deliantra::Client PACKAGE = DC	625	MODULE = Deliantra::Client PACKAGE = DC
620		626
…		…
871	#endif	877	#endif
872	}	878	}
873		879
874	char *SDL_GetError ()	880	char *SDL_GetError ()
875		881
876	void SDL_braino ()	882	void SDL_main_hack (SV *real_main)
		883	PROTOTYPE: &
877		884
878	int SDL_Init (U32 flags)	885	int SDL_Init (U32 flags)
879		886
880	int SDL_InitSubSystem (U32 flags)	887	int SDL_InitSubSystem (U32 flags)
881		888
882	void SDL_QuitSubSystem (U32 flags)	889	void SDL_QuitSubSystem (U32 flags)
883		890
884	void SDL_Quit ()	891	void SDL_Quit ()
885		892
886	int SDL_GL_SetAttribute (int attr, int value)	893	int SDL_GL_SetAttribute (int attr, int value)
		894	C_ARGS: (SDL_GLattr)attr, value
887		895
888	int SDL_GL_GetAttribute (int attr)	896	int SDL_GL_GetAttribute (int attr)
889	CODE:	897	CODE:
890	if (SDL_GL_GetAttribute (attr, &RETVAL))	898	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
891	XSRETURN_UNDEF;	899	XSRETURN_UNDEF;
892	OUTPUT:	900	OUTPUT:
893	RETVAL	901	RETVAL
894		902
895	void	903	void
…		…
950	);	958	);
951		959
952	if (RETVAL)	960	if (RETVAL)
953	{	961	{
954	av_clear (texture_av);	962	av_clear (texture_av);
955
956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
957	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	963	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
958	#include "glfunc.h"	964	#include "glfunc.h"
959	#undef GL_FUNC	965	#undef GL_FUNC
960
961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;	966	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;	967	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
963	}	968	}
964	}	969	}
965	OUTPUT:	970	OUTPUT:
966	RETVAL	971	RETVAL
967		972
968	void	973	void
		974	SDL_WM_SetCaption (const char title, const char icon)
		975
		976	void
969	SDL_GL_SwapBuffers ()	977	SDL_GL_SwapBuffers ()
970		978
971	char *	979	char *
972	SDL_GetKeyName (int sym)	980	SDL_GetKeyName (int sym)
		981	C_ARGS: (SDLKey)sym
973		982
974	int	983	int
975	SDL_GetAppState ()	984	SDL_GetAppState ()
976		985
977	int	986	int
978	SDL_GetModState ()	987	SDL_GetModState ()
979		988
		989	int
		990	SDL_WaitEvent ()
		991	C_ARGS: 0
		992
980	void	993	void
		994	SDL_PumpEvents ()
		995
		996	void
981	poll_events ()	997	peep_events ()
982	PPCODE:	998	PPCODE:
983	{	999	{
984	SDL_Event ev;	1000	SDL_Event ev;
985		1001
986	SDL_PumpEvents ();	1002	SDL_PumpEvents ();
…		…
1140	RETVAL	1156	RETVAL
1141		1157
1142	void	1158	void
1143	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)	1159	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
1144		1160
		1161	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1145	void	1162	void
1146	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_MP3 \| MIX_INIT_OGG)	1163	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1147		1164
1148	void	1165	void
1149	load_image_inline (SV *image_)	1166	load_image_inline (SV *image_)
1150	ALIAS:	1167	ALIAS:
1151	load_image_file = 1	1168	load_image_file = 1
…		…
1197		1214
1198	SDL_LockSurface (surface2);	1215	SDL_LockSurface (surface2);
1199	EXTEND (SP, 6);	1216	EXTEND (SP, 6);
1200	PUSHs (sv_2mortal (newSViv (surface2->w)));	1217	PUSHs (sv_2mortal (newSViv (surface2->w)));
1201	PUSHs (sv_2mortal (newSViv (surface2->h)));	1218	PUSHs (sv_2mortal (newSViv (surface2->h)));
1202	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1219	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1203	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1220	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1204	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1221	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1205	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1222	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1206	SDL_UnlockSurface (surface2);	1223	SDL_UnlockSurface (surface2);
1207		1224
…		…
1279	MODULE = Deliantra::Client PACKAGE = DC::Font	1296	MODULE = Deliantra::Client PACKAGE = DC::Font
1280		1297
1281	PROTOTYPES: DISABLE	1298	PROTOTYPES: DISABLE
1282		1299
1283	DC::Font	1300	DC::Font
1284	new_from_file (SV class, char path, int id = 0)	1301	new_from_file (SV klass, char path, int id = 0)
1285	CODE:	1302	CODE:
1286	{	1303	{
1287	int count;	1304	int count;
1288	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1305	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1289	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1306	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1318	PROTOTYPE:	1335	PROTOTYPE:
1319	CODE:	1336	CODE:
1320	tc_restore ();	1337	tc_restore ();
1321		1338
1322	DC::Layout	1339	DC::Layout
1323	new (SV *class)	1340	new (SV *klass)
1324	CODE:	1341	CODE:
1325	New (0, RETVAL, 1, struct cf_layout);	1342	New (0, RETVAL, 1, struct cf_layout);
1326		1343
1327	RETVAL->pl = pango_layout_new (opengl_context);	1344	RETVAL->pl = pango_layout_new (opengl_context);
1328	RETVAL->r = 1.;	1345	RETVAL->r = 1.;
…		…
1477		1494
1478	void	1495	void
1479	set_height (DC::Layout self, int base_height)	1496	set_height (DC::Layout self, int base_height)
1480	CODE:	1497	CODE:
1481	if (self->base_height != base_height)	1498	if (self->base_height != base_height)
1482	{	1499	{
1483	self->base_height = base_height;	1500	self->base_height = base_height;
1484	layout_update_font (self);	1501	layout_update_font (self);
1485	}	1502	}
1486		1503
1487	void	1504	void
…		…
1851	MODULE = Deliantra::Client PACKAGE = DC::Map	1868	MODULE = Deliantra::Client PACKAGE = DC::Map
1852		1869
1853	PROTOTYPES: DISABLE	1870	PROTOTYPES: DISABLE
1854		1871
1855	DC::Map	1872	DC::Map
1856	new (SV *class)	1873	new (SV *klass)
1857	CODE:	1874	CODE:
1858	New (0, RETVAL, 1, struct map);	1875	New (0, RETVAL, 1, struct map);
1859	RETVAL->x = 0;	1876	RETVAL->x = 0;
1860	RETVAL->y = 0;	1877	RETVAL->y = 0;
1861	RETVAL->w = 0;	1878	RETVAL->w = 0;
…		…
2017	self->y += MAP_EXTEND_Y;	2034	self->y += MAP_EXTEND_Y;
2018	}	2035	}
2019	}	2036	}
2020		2037
2021	SV *	2038	SV *
2022	map1a_update (DC::Map self, SV *data_, int extmap)	2039	map1a_update (DC::Map self, SV *data_)
2023	CODE:	2040	CODE:
2024	{	2041	{
2025	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2042	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
2026	uint8_t data_end = (uint8_t )SvEND (data_);	2043	uint8_t data_end = (uint8_t )SvEND (data_);
2027	mapcell *cell;	2044	mapcell *cell;
…		…
2048		2065
2049	//TODO: don't trust server data to be in-range(!)	2066	//TODO: don't trust server data to be in-range(!)
2050		2067
2051	if (flags & 8)	2068	if (flags & 8)
2052	{	2069	{
		2070	uint8_t ext, cmd;
		2071
2053	if (extmap)	2072	do
2054	{	2073	{
2055	uint8_t ext, cmd;	2074	ext = *data++;
		2075	cmd = ext & 0x7f;
2056		2076
2057	do	2077	if (cmd < 4)
		2078	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2079	else if (cmd == 5) // health
2058	{	2080	{
2059	ext = *data++;
2060	cmd = ext & 0x7f;
2061
2062	if (cmd < 4)
2063	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2064	else if (cmd == 5) // health
2065	{
2066	cell->stat_width = 1;	2081	cell->stat_width = 1;
2067	cell->stat_hp = *data++;	2082	cell->stat_hp = *data++;
2068	}
2069	else if (cmd == 6) // monster width
2070	cell->stat_width = *data++ + 1;
2071	else if (cmd == 0x47)
2072	{
2073	if (*data == 1) cell->player = data [1];
2074	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2075	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2076	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2077
2078	data += *data + 1;
2079	}
2080	else if (cmd == 8) // cell flags
2081	cell->flags = *data++;
2082	else if (ext & 0x40) // unknown, multibyte => skip
2083	data += *data + 1;
2084	else
2085	data++;
2086	}	2083	}
2087	while (ext & 0x80);	2084	else if (cmd == 6) // monster width
		2085	cell->stat_width = *data++ + 1;
		2086	else if (cmd == 0x47)
		2087	{
		2088	if (*data == 1) cell->player = data [1];
		2089	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2090	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2091	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2092
		2093	data += *data + 1;
		2094	}
		2095	else if (cmd == 8) // cell flags
		2096	cell->flags = *data++;
		2097	else if (ext & 0x40) // unknown, multibyte => skip
		2098	data += *data + 1;
		2099	else
		2100	data++;
2088	}	2101	}
2089	else	2102	while (ext & 0x80);
2090	cell->darkness = *data++ + 1;
2091	}	2103	}
2092		2104
2093	for (z = 0; z <= 2; ++z)	2105	for (z = 0; z <= 2; ++z)
2094	if (flags & (4 >> z))	2106	if (flags & (4 >> z))
2095	{	2107	{
…		…
2732	STRLEN len;	2744	STRLEN len;
2733	uint8_t data, end;	2745	uint8_t data, end;
2734		2746
2735	len = SvLEN (data_sv);	2747	len = SvLEN (data_sv);
2736	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2748	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2737	data = SvPVbyte_nolen (data_sv);	2749	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2738	end = data + len + 8;	2750	end = data + len + 8;
2739		2751
2740	if (len < 5)	2752	if (len < 5)
2741	XSRETURN_EMPTY;	2753	XSRETURN_EMPTY;
2742		2754
…		…
2803	}	2815	}
2804		2816
2805	MODULE = Deliantra::Client PACKAGE = DC::RW	2817	MODULE = Deliantra::Client PACKAGE = DC::RW
2806		2818
2807	DC::RW	2819	DC::RW
2808	new (SV class, SV data_sv)	2820	new (SV klass, SV data_sv)
2809	CODE:	2821	CODE:
2810	{	2822	{
2811	STRLEN datalen;	2823	STRLEN datalen;
2812	char *data = SvPVbyte (data_sv, datalen);	2824	char *data = SvPVbyte (data_sv, datalen);
2813		2825
…		…
2815	}	2827	}
2816	OUTPUT:	2828	OUTPUT:
2817	RETVAL	2829	RETVAL
2818		2830
2819	DC::RW	2831	DC::RW
2820	new_from_file (SV class, const char path, const char *mode = "rb")	2832	new_from_file (SV klass, const char path, const char *mode = "rb")
2821	CODE:	2833	CODE:
2822	RETVAL = SDL_RWFromFile (path, mode);	2834	RETVAL = SDL_RWFromFile (path, mode);
2823	OUTPUT:	2835	OUTPUT:
2824	RETVAL	2836	RETVAL
2825		2837
…		…
2934	#else	2946	#else
2935	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));	2947	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2936	#endif	2948	#endif
2937		2949
2938	DC::MixChunk	2950	DC::MixChunk
2939	new (SV *class, DC::RW rwops)	2951	new (SV *klass, DC::RW rwops)
2940	CODE:	2952	CODE:
2941	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2953	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2942	OUTPUT:	2954	OUTPUT:
2943	RETVAL	2955	RETVAL
2944		2956
…		…
3014	RETVAL = Mix_PlayingMusic ();	3026	RETVAL = Mix_PlayingMusic ();
3015	OUTPUT:	3027	OUTPUT:
3016	RETVAL	3028	RETVAL
3017		3029
3018	DC::MixMusic	3030	DC::MixMusic
3019	new (SV *class, DC::RW rwops)	3031	new (SV *klass, DC::RW rwops)
3020	CODE:	3032	CODE:
3021	RETVAL = Mix_LoadMUS_RW (rwops);	3033	RETVAL = Mix_LoadMUS_RW (rwops);
3022	OUTPUT:	3034	OUTPUT:
3023	RETVAL	3035	RETVAL
3024		3036
…		…
3177	gl.BlendFuncSeparateEXT = 0;	3189	gl.BlendFuncSeparateEXT = 0;
3178		3190
3179	void	3191	void
3180	apple_nvidia_bug (int enable)	3192	apple_nvidia_bug (int enable)
3181		3193
3182	char *	3194	const char *
3183	gl_vendor ()	3195	gl_vendor ()
3184	CODE:	3196	CODE:
3185	RETVAL = (char *)glGetString (GL_VENDOR);	3197	RETVAL = (const char *)glGetString (GL_VENDOR);
3186	OUTPUT:	3198	OUTPUT:
3187	RETVAL	3199	RETVAL
3188		3200
3189	char *	3201	const char *
3190	gl_version ()	3202	gl_version ()
3191	CODE:	3203	CODE:
3192	RETVAL = (char *)glGetString (GL_VERSION);	3204	RETVAL = (const char *)glGetString (GL_VERSION);
3193	OUTPUT:	3205	OUTPUT:
3194	RETVAL	3206	RETVAL
3195		3207
3196	char *	3208	const char *
3197	gl_extensions ()	3209	gl_extensions ()
3198	CODE:	3210	CODE:
3199	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3211	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3200	OUTPUT:	3212	OUTPUT:
3201	RETVAL	3213	RETVAL
3202		3214
3203	const char *glGetString (GLenum pname)	3215	const char *glGetString (GLenum pname)
		3216	CODE:
		3217	RETVAL = (const char *)glGetString (pname);
		3218	OUTPUT:
		3219	RETVAL
3204		3220
3205	GLint glGetInteger (GLenum pname)	3221	GLint glGetInteger (GLenum pname)
3206	CODE:	3222	CODE:
3207	glGetIntegerv (pname, &RETVAL);	3223	glGetIntegerv (pname, &RETVAL);
3208	OUTPUT:	3224	OUTPUT:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC vs. Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC