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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs.
Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC

…		…
40	#define FOW_DARKNESS 32	40	#define FOW_DARKNESS 32
41		41
42	#define MAP_EXTEND_X 32	42	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	43	#define MAP_EXTEND_Y 512
44		44
45	#define MIN_FONT_HEIGHT 8 * PANGO_SCALE	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	}
46		61
47	typedef Mix_Chunk *CFClient__MixChunk;	62	typedef Mix_Chunk *CFClient__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	63	typedef Mix_Music *CFClient__MixMusic;
49		64
50	static PangoContext *context;	65	typedef PangoFontDescription *CFClient__Font;
51	static PangoFontMap *fontmap;
52		66
53	typedef struct cf_layout {	67	typedef struct cf_layout {
54	PangoLayout *pl;	68	PangoLayout *pl;
55	int base_height;	69	int base_height;
		70	CFClient__Font font;
56	} *CFClient__Layout;	71	} *CFClient__Layout;
		72
		73	static CFClient__Font default_font;
		74	static PangoContext *context;
		75	static PangoFontMap *fontmap;
57		76
58	static void	77	static void
59	substitute_func (FcPattern *pattern, gpointer data)	78	substitute_func (FcPattern *pattern, gpointer data)
60	{	79	{
61	FcPatternAddBool (pattern, FC_HINTING , 1);	80	FcPatternAddBool (pattern, FC_HINTING , 1);
62	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
63	}	82	}
64		83
65	static void	84	static void
66	layout_update (CFClient__Layout self)	85	layout_update_font (CFClient__Layout self)
67	{	86	{
68	/* 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
69	* reasonably well with bitstream vera	88	* reasonably well with bitstream vera
70	*/	89	*/
71	PangoFontDescription *font = pango_context_get_font_description (context);	90	PangoFontDescription *font = self->font ? self->font : default_font;
72		91
73	int height = self->base_height * (PANGO_SCALE * 8 / 10);
74
75	if (height < MIN_FONT_HEIGHT)
76	height = MIN_FONT_HEIGHT;
77
78	if (pango_font_description_get_size (font) != height)
79	{
80	pango_font_description_set_absolute_size (font, height);	92	pango_font_description_set_absolute_size (font,
81	pango_layout_context_changed (self->pl);	93	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
82	}	94
		95	pango_layout_set_font_description (self->pl, font);
83	}	96	}
84		97
85	static void	98	static void
86	layout_get_pixel_size (CFClient__Layout self, int w, int h)	99	layout_get_pixel_size (CFClient__Layout self, int w, int h)
87	{	100	{
88	layout_update (self);
89
90	pango_layout_get_pixel_size (self->pl, w, h);	101	pango_layout_get_pixel_size (self->pl, w, h);
91		102
92	w = (w + 3) & ~3;	103	w = (w + 3) & ~3;
93	if (!w) w = 1;	104	if (!w) w = 1;
94	if (!h) h = 1;	105	if (!h) h = 1;
…		…
519	add_font (char *file)	530	add_font (char *file)
520	CODE:	531	CODE:
521	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	532	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
522		533
523	void	534	void
524	set_font (char *file)
525	CODE:
526	{
527	int count;
528	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
529	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
530	FcPatternDestroy (pattern);
531	pango_context_set_font_description (context, font);
532	}
533
534	void
535	load_image_inline (SV *image_)	535	load_image_inline (SV *image_)
536	ALIAS:	536	ALIAS:
537	load_image_file = 1	537	load_image_file = 1
538	PPCODE:	538	PPCODE:
539	{	539	{
…		…
628	#else	628	#else
629	fprintf (stderr, "FATAL: %s\n", message);	629	fprintf (stderr, "FATAL: %s\n", message);
630	#endif	630	#endif
631	exit (1);	631	exit (1);
632		632
		633	MODULE = CFClient PACKAGE = CFClient::Font
		634
		635	CFClient::Font
		636	new_from_file (SV class, char path)
		637	CODE:
		638	{
		639	int count;
		640	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, 0, 0, &count);
		641	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		642	FcPatternDestroy (pattern);
		643	}
		644	OUTPUT:
		645	RETVAL
		646
		647	void
		648	DESTROY (CFClient::Font self)
		649	CODE:
		650	pango_font_description_free (self);
		651
		652	void
		653	make_default (CFClient::Font self)
		654	CODE:
		655	default_font = self;
		656
633	MODULE = CFClient PACKAGE = CFClient::Layout	657	MODULE = CFClient PACKAGE = CFClient::Layout
634		658
635	CFClient::Layout	659	CFClient::Layout
636	new (SV *class, int base_height = 10)	660	new (SV *class, int base_height = MIN_FONT_HEIGHT)
637	CODE:	661	CODE:
638	New (0, RETVAL, 1, struct cf_layout);	662	New (0, RETVAL, 1, struct cf_layout);
		663	RETVAL->pl = pango_layout_new (context);
639	RETVAL->base_height = base_height;	664	RETVAL->base_height = base_height;
640	RETVAL->pl = pango_layout_new (context);	665	RETVAL->font = 0;
641	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	666	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		667	pango_layout_set_font_description (RETVAL->pl, default_font);
642	OUTPUT:	668	OUTPUT:
643	RETVAL	669	RETVAL
644		670
645	void	671	void
646	DESTROY (CFClient::Layout self)	672	DESTROY (CFClient::Layout self)
…		…
675	SvUTF8_on (RETVAL);	701	SvUTF8_on (RETVAL);
676	OUTPUT:	702	OUTPUT:
677	RETVAL	703	RETVAL
678		704
679	void	705	void
		706	set_font (CFClient::Layout self, CFClient::Font font = 0)
		707	CODE:
		708	if (self->font != font)
		709	{
		710	self->font = font;
		711	layout_update_font (self);
		712	}
		713
		714	void
680	set_height (CFClient::Layout self, int base_height)	715	set_height (CFClient::Layout self, int base_height)
681	CODE:	716	CODE:
		717	if (self->base_height != base_height)
		718	{
682	self->base_height = base_height;	719	self->base_height = base_height;
		720	layout_update_font (self);
		721	}
683		722
684	void	723	void
685	set_width (CFClient::Layout self, int max_width = -1)	724	set_width (CFClient::Layout self, int max_width = -1)
686	CODE:	725	CODE:
687	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	726	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
…		…
690	size (CFClient::Layout self)	729	size (CFClient::Layout self)
691	PPCODE:	730	PPCODE:
692	{	731	{
693	int w, h;	732	int w, h;
694		733
695	layout_update (self);
696	layout_get_pixel_size (self, &w, &h);	734	layout_get_pixel_size (self, &w, &h);
697		735
698	EXTEND (SP, 2);	736	EXTEND (SP, 2);
699	PUSHs (sv_2mortal (newSViv (w)));	737	PUSHs (sv_2mortal (newSViv (w)));
700	PUSHs (sv_2mortal (newSViv (h)));	738	PUSHs (sv_2mortal (newSViv (h)));
…		…
703	int	741	int
704	xy_to_index (CFClient::Layout self, int x, int y)	742	xy_to_index (CFClient::Layout self, int x, int y)
705	CODE:	743	CODE:
706	{	744	{
707	int index, trailing;	745	int index, trailing;
708
709	layout_update (self);
710	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	746	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
711
712	RETVAL = index;	747	RETVAL = index;
713	}	748	}
714	OUTPUT:	749	OUTPUT:
715	RETVAL	750	RETVAL
716		751
717	void	752	void
718	cursor_pos (CFClient::Layout self, int index)	753	cursor_pos (CFClient::Layout self, int index)
719	PPCODE:	754	PPCODE:
720	{	755	{
721	PangoRectangle strong_pos;	756	PangoRectangle strong_pos;
722	layout_update (self);
723	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	757	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
724		758
725	EXTEND (SP, 3);	759	EXTEND (SP, 3);
726	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	760	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
727	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	761	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
734	{	768	{
735	SV *retval;	769	SV *retval;
736	int w, h;	770	int w, h;
737	FT_Bitmap bitmap;	771	FT_Bitmap bitmap;
738		772
739	layout_update (self);
740	layout_get_pixel_size (self, &w, &h);	773	layout_get_pixel_size (self, &w, &h);
741		774
742	retval = newSV (w * h);	775	retval = newSV (w * h);
743	SvPOK_only (retval);	776	SvPOK_only (retval);
744	SvCUR_set (retval, w * h);	777	SvCUR_set (retval, w * h);
…		…
1384		1417
1385	void glPopMatrix ()	1418	void glPopMatrix ()
1386		1419
1387	void glLoadIdentity ()	1420	void glLoadIdentity ()
1388		1421
		1422	# near and far are due to microsofts buggy c compiler
1389	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1423	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1390		1424
1391	void glViewport (int x, int y, int width, int height)	1425	void glViewport (int x, int y, int width, int height)
1392		1426
1393	void glTranslate (float x, float y, float z = 0.)	1427	void glTranslate (float x, float y, float z = 0.)
1394	CODE:	1428	CODE:
1395	glTranslatef (x, y, z);	1429	glTranslatef (x, y, z);
1396		1430
1397	void glScale (float x, float y, float z)	1431	void glScale (float x, float y, float z = 1.)
1398	CODE:	1432	CODE:
1399	glScalef (x, y, z);	1433	glScalef (x, y, z);
1400		1434
1401	void glRotate (float angle, float x, float y, float z)	1435	void glRotate (float angle, float x, float y, float z)
1402	CODE:	1436	CODE:
…		…
1429		1463
1430	void glBindTexture (int target, int name)	1464	void glBindTexture (int target, int name)
1431		1465
1432	void glConvolutionParameter (int target, int pname, float params)	1466	void glConvolutionParameter (int target, int pname, float params)
1433	CODE:	1467	CODE:
1434	glConvolutionParameterf (target, pname, params);	1468	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1435		1469
1436	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1470	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1471	CODE:
		1472	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1473	(target, internalformat, width, height, format, type, data));
1437		1474
1438	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1475	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1439		1476
1440	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1477	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1441		1478

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs. Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.58 by root, Sun Apr 23 00:57:38 2006 UTC vs.
Revision 1.64 by root, Mon Apr 24 08:11:31 2006 UTC