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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.56 by root, Thu Apr 20 09:13:31 2006 UTC vs.
Revision 1.66 by root, Mon Apr 24 11:45:16 2006 UTC

…		…
33	typedef signed char int8_t;	33	typedef signed char int8_t;
34	typedef signed short int16_t;	34	typedef signed short int16_t;
35	typedef signed int int32_t;	35	typedef signed int int32_t;
36	#endif	36	#endif
37		37
		38	#include "glext.h"
		39
38	#define FOW_DARKNESS 32	40	#define FOW_DARKNESS 32
39		41
40	#define MAP_EXTEND_X 32	42	#define MAP_EXTEND_X 32
41	#define MAP_EXTEND_Y 512	43	#define MAP_EXTEND_Y 512
42		44
		45	#define MIN_FONT_HEIGHT 10
		46
		47	#define GL_CALL(type,func,args) \
		48	{ \
		49	static int init_; \
		50	static type fptr_; \
		51	\
		52	if (!init_) \
		53	{ \
		54	init_ = 1; \
		55	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
		56	} \
		57	\
		58	if (fptr_) \
		59	fptr_ args; \
		60	}
		61
43	typedef Mix_Chunk *CFClient__MixChunk;	62	typedef Mix_Chunk *CFClient__MixChunk;
44	typedef Mix_Music *CFClient__MixMusic;	63	typedef Mix_Music *CFClient__MixMusic;
45		64
46	static PangoContext *context;	65	typedef PangoFontDescription *CFClient__Font;
47	static PangoFontMap *fontmap;
48		66
49	typedef struct cf_layout {	67	typedef struct cf_layout {
50	PangoLayout *pl;	68	PangoLayout *pl;
51	int base_height;	69	int base_height;
		70	CFClient__Font font;
52	} *CFClient__Layout;	71	} *CFClient__Layout;
		72
		73	static CFClient__Font default_font;
		74	static PangoContext *context;
		75	static PangoFontMap *fontmap;
53		76
54	static void	77	static void
55	substitute_func (FcPattern *pattern, gpointer data)	78	substitute_func (FcPattern *pattern, gpointer data)
56	{	79	{
57	FcPatternAddBool (pattern, FC_HINTING , 1);	80	FcPatternAddBool (pattern, FC_HINTING , 1);
58	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
59	}	82	}
60		83
61	static void	84	static void
62	layout_update (CFClient__Layout self)	85	layout_update_font (CFClient__Layout self)
63	{	86	{
64	/* use a random scale factor to account for unknown descenders, 0.8 works	87	/* use a random scale factor to account for unknown descenders, 0.8 works
65	* reasonably well with bitstream vera	88	* reasonably well with bitstream vera
66	*/	89	*/
67	PangoFontDescription *font = pango_context_get_font_description (context);	90	PangoFontDescription *font = self->font ? self->font : default_font;
68		91
69	int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71	if (pango_font_description_get_size (font) != height)
72	{
73	pango_font_description_set_absolute_size (font, height);	92	pango_font_description_set_absolute_size (font,
74	pango_layout_context_changed (self->pl);	93	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75	}	94
		95	pango_layout_set_font_description (self->pl, font);
76	}	96	}
77		97
78	static void	98	static void
79	layout_get_pixel_size (CFClient__Layout self, int w, int h)	99	layout_get_pixel_size (CFClient__Layout self, int w, int h)
80	{	100	{
81	layout_update (self);
82
83	pango_layout_get_pixel_size (self->pl, w, h);	101	pango_layout_get_pixel_size (self->pl, w, h);
84		102
85	w = (w + 3) & ~3;	103	w = (w + 3) & ~3;
86	if (!w) w = 1;	104	if (!w) w = 1;
87	if (!h) h = 1;	105	if (!h) h = 1;
…		…
249	ev.type = SDL_USEREVENT;	267	ev.type = SDL_USEREVENT;
250	ev.code = 0;	268	ev.code = 0;
251	ev.data1 = 0;	269	ev.data1 = 0;
252	ev.data2 = 0;	270	ev.data2 = 0;
253		271
254	SDL_PushEvent (&ev);	272	SDL_PushEvent ((SDL_Event *)&ev);
255	}	273	}
256		274
257	MODULE = CFClient PACKAGE = CFClient	275	MODULE = CFClient PACKAGE = CFClient
258		276
259	PROTOTYPES: ENABLE	277	PROTOTYPES: ENABLE
…		…
512	add_font (char *file)	530	add_font (char *file)
513	CODE:	531	CODE:
514	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	532	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
515		533
516	void	534	void
517	set_font (char *file)
518	CODE:
519	{
520	int count;
521	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
522	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
523	FcPatternDestroy (pattern);
524	pango_context_set_font_description (context, font);
525	}
526
527	void
528	load_image_inline (SV *image_)	535	load_image_inline (SV *image_)
529	ALIAS:	536	ALIAS:
530	load_image_file = 1	537	load_image_file = 1
531	PPCODE:	538	PPCODE:
532	{	539	{
…		…
612	PUSHs (sv_2mortal (newSViv (b / y)));	619	PUSHs (sv_2mortal (newSViv (b / y)));
613	PUSHs (sv_2mortal (newSViv (a / y)));	620	PUSHs (sv_2mortal (newSViv (a / y)));
614	}	621	}
615		622
616	void	623	void
		624	error (char *message)
		625	CODE:
		626	#ifdef _WIN32
		627	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		628	#else
		629	fprintf (stderr, "ERROR: %s\n", message);
		630	#endif
		631
		632	void
617	fatal (char *message)	633	fatal (char *message)
618	CODE:	634	CODE:
619	#ifdef _WIN32	635	#ifdef _WIN32
620	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	636	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
621	#else	637	#else
622	fprintf (stderr, "FATAL: %s\n", message);	638	fprintf (stderr, "FATAL: %s\n", message);
623	#endif	639	#endif
624	exit (1);	640	exit (1);
625		641
		642	MODULE = CFClient PACKAGE = CFClient::Font
		643
		644	CFClient::Font
		645	new_from_file (SV class, char path)
		646	CODE:
		647	{
		648	int count;
		649	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);
		650	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		651	FcPatternDestroy (pattern);
		652	}
		653	OUTPUT:
		654	RETVAL
		655
		656	void
		657	DESTROY (CFClient::Font self)
		658	CODE:
		659	pango_font_description_free (self);
		660
		661	void
		662	make_default (CFClient::Font self)
		663	CODE:
		664	default_font = self;
		665
626	MODULE = CFClient PACKAGE = CFClient::Layout	666	MODULE = CFClient PACKAGE = CFClient::Layout
627		667
628	CFClient::Layout	668	CFClient::Layout
629	new (SV *class, int base_height = 10)	669	new (SV *class, int base_height = MIN_FONT_HEIGHT)
630	CODE:	670	CODE:
631	New (0, RETVAL, 1, struct cf_layout);	671	New (0, RETVAL, 1, struct cf_layout);
		672	RETVAL->pl = pango_layout_new (context);
632	RETVAL->base_height = base_height;	673	RETVAL->base_height = base_height;
633	RETVAL->pl = pango_layout_new (context);	674	RETVAL->font = 0;
634	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	675	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		676	pango_layout_set_font_description (RETVAL->pl, default_font);
635	OUTPUT:	677	OUTPUT:
636	RETVAL	678	RETVAL
637		679
638	void	680	void
639	DESTROY (CFClient::Layout self)	681	DESTROY (CFClient::Layout self)
…		…
668	SvUTF8_on (RETVAL);	710	SvUTF8_on (RETVAL);
669	OUTPUT:	711	OUTPUT:
670	RETVAL	712	RETVAL
671		713
672	void	714	void
		715	set_font (CFClient::Layout self, CFClient::Font font = 0)
		716	CODE:
		717	if (self->font != font)
		718	{
		719	self->font = font;
		720	layout_update_font (self);
		721	}
		722
		723	void
673	set_height (CFClient::Layout self, int base_height)	724	set_height (CFClient::Layout self, int base_height)
674	CODE:	725	CODE:
		726	if (self->base_height != base_height)
		727	{
675	self->base_height = base_height;	728	self->base_height = base_height;
		729	layout_update_font (self);
		730	}
676		731
677	void	732	void
678	set_width (CFClient::Layout self, int max_width = -1)	733	set_width (CFClient::Layout self, int max_width = -1)
679	CODE:	734	CODE:
680	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	735	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
…		…
683	size (CFClient::Layout self)	738	size (CFClient::Layout self)
684	PPCODE:	739	PPCODE:
685	{	740	{
686	int w, h;	741	int w, h;
687		742
688	layout_update (self);
689	layout_get_pixel_size (self, &w, &h);	743	layout_get_pixel_size (self, &w, &h);
690		744
691	EXTEND (SP, 2);	745	EXTEND (SP, 2);
692	PUSHs (sv_2mortal (newSViv (w)));	746	PUSHs (sv_2mortal (newSViv (w)));
693	PUSHs (sv_2mortal (newSViv (h)));	747	PUSHs (sv_2mortal (newSViv (h)));
…		…
696	int	750	int
697	xy_to_index (CFClient::Layout self, int x, int y)	751	xy_to_index (CFClient::Layout self, int x, int y)
698	CODE:	752	CODE:
699	{	753	{
700	int index, trailing;	754	int index, trailing;
701
702	layout_update (self);
703	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	755	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
704
705	RETVAL = index;	756	RETVAL = index;
706	}	757	}
707	OUTPUT:	758	OUTPUT:
708	RETVAL	759	RETVAL
709		760
710	void	761	void
711	cursor_pos (CFClient::Layout self, int index)	762	cursor_pos (CFClient::Layout self, int index)
712	PPCODE:	763	PPCODE:
713	{	764	{
714	PangoRectangle strong_pos;	765	PangoRectangle strong_pos;
715	layout_update (self);
716	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	766	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
717		767
718	EXTEND (SP, 3);	768	EXTEND (SP, 3);
719	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	769	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
720	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	770	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
727	{	777	{
728	SV *retval;	778	SV *retval;
729	int w, h;	779	int w, h;
730	FT_Bitmap bitmap;	780	FT_Bitmap bitmap;
731		781
732	layout_update (self);
733	layout_get_pixel_size (self, &w, &h);	782	layout_get_pixel_size (self, &w, &h);
734		783
735	retval = newSV (w * h);	784	retval = newSV (w * h);
736	SvPOK_only (retval);	785	SvPOK_only (retval);
737	SvCUR_set (retval, w * h);	786	SvCUR_set (retval, w * h);
…		…
1306	const_iv (GL_SRC_ALPHA),	1355	const_iv (GL_SRC_ALPHA),
1307	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1356	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1308	const_iv (GL_RGB),	1357	const_iv (GL_RGB),
1309	const_iv (GL_RGBA),	1358	const_iv (GL_RGBA),
1310	const_iv (GL_UNSIGNED_BYTE),	1359	const_iv (GL_UNSIGNED_BYTE),
1311	const_iv (GL_ALPHA4),
1312	const_iv (GL_ALPHA),	1360	const_iv (GL_ALPHA),
1313	const_iv (GL_FLOAT),	1361	const_iv (GL_FLOAT),
1314	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1362	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1315	const_iv (GL_COMPILE),	1363	const_iv (GL_COMPILE),
1316	const_iv (GL_TEXTURE_1D),	1364	const_iv (GL_TEXTURE_1D),
…		…
1322	const_iv (GL_TEXTURE_WRAP_S),	1370	const_iv (GL_TEXTURE_WRAP_S),
1323	const_iv (GL_TEXTURE_WRAP_T),	1371	const_iv (GL_TEXTURE_WRAP_T),
1324	const_iv (GL_CLAMP),	1372	const_iv (GL_CLAMP),
1325	const_iv (GL_REPEAT),	1373	const_iv (GL_REPEAT),
1326	const_iv (GL_NEAREST),	1374	const_iv (GL_NEAREST),
		1375	const_iv (GL_LINEAR),
		1376	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1377	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1378	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1379	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1380	const_iv (GL_GENERATE_MIPMAP),
1327	const_iv (GL_LINEAR),	1381	const_iv (GL_LINEAR),
1328	const_iv (GL_MODULATE),	1382	const_iv (GL_MODULATE),
1329	const_iv (GL_REPLACE),	1383	const_iv (GL_REPLACE),
1330	const_iv (GL_COLOR_BUFFER_BIT),	1384	const_iv (GL_COLOR_BUFFER_BIT),
1331	const_iv (GL_PROJECTION),	1385	const_iv (GL_PROJECTION),
…		…
1371		1425
1372	void glPopMatrix ()	1426	void glPopMatrix ()
1373		1427
1374	void glLoadIdentity ()	1428	void glLoadIdentity ()
1375		1429
		1430	# near and far are due to microsofts buggy c compiler
1376	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1431	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1377		1432
1378	void glViewport (int x, int y, int width, int height)	1433	void glViewport (int x, int y, int width, int height)
1379		1434
1380	void glTranslate (float x, float y, float z = 0.)	1435	void glTranslate (float x, float y, float z = 0.)
1381	CODE:	1436	CODE:
1382	glTranslatef (x, y, z);	1437	glTranslatef (x, y, z);
1383		1438
1384	void glScale (float x, float y, float z)	1439	void glScale (float x, float y, float z = 1.)
1385	CODE:	1440	CODE:
1386	glScalef (x, y, z);	1441	glScalef (x, y, z);
1387		1442
1388	void glRotate (float angle, float x, float y, float z)	1443	void glRotate (float angle, float x, float y, float z)
1389	CODE:	1444	CODE:
…		…
1416		1471
1417	void glBindTexture (int target, int name)	1472	void glBindTexture (int target, int name)
1418		1473
1419	void glConvolutionParameter (int target, int pname, float params)	1474	void glConvolutionParameter (int target, int pname, float params)
1420	CODE:	1475	CODE:
1421	glConvolutionParameterf (target, pname, params);	1476	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1422		1477
1423	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1478	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1479	CODE:
		1480	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1481	(target, internalformat, width, height, format, type, data));
1424		1482
1425	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1483	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1426		1484
1427	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1485	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1428		1486

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.56 by root, Thu Apr 20 09:13:31 2006 UTC vs. Revision 1.66 by root, Mon Apr 24 11:45:16 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.56 by root, Thu Apr 20 09:13:31 2006 UTC vs.
Revision 1.66 by root, Mon Apr 24 11:45:16 2006 UTC