[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.69 by root, Sun Apr 30 08:09:44 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	{
…		…
619	PUSHs (sv_2mortal (newSViv (b / y)));	619	PUSHs (sv_2mortal (newSViv (b / y)));
620	PUSHs (sv_2mortal (newSViv (a / y)));	620	PUSHs (sv_2mortal (newSViv (a / y)));
621	}	621	}
622		622
623	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
624	fatal (char *message)	633	fatal (char *message)
625	CODE:	634	CODE:
626	#ifdef _WIN32	635	#ifdef _WIN32
627	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);
628	#else	637	#else
629	fprintf (stderr, "FATAL: %s\n", message);	638	fprintf (stderr, "FATAL: %s\n", message);
630	#endif	639	#endif
631	exit (1);	640	exit (1);
632		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
633	MODULE = CFClient PACKAGE = CFClient::Layout	666	MODULE = CFClient PACKAGE = CFClient::Layout
634		667
635	CFClient::Layout	668	CFClient::Layout
636	new (SV *class, int base_height = 10)	669	new (SV *class, int base_height = MIN_FONT_HEIGHT)
637	CODE:	670	CODE:
638	New (0, RETVAL, 1, struct cf_layout);	671	New (0, RETVAL, 1, struct cf_layout);
		672	RETVAL->pl = pango_layout_new (context);
639	RETVAL->base_height = base_height;	673	RETVAL->base_height = base_height;
640	RETVAL->pl = pango_layout_new (context);	674	RETVAL->font = 0;
641	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);
642	OUTPUT:	677	OUTPUT:
643	RETVAL	678	RETVAL
644		679
645	void	680	void
646	DESTROY (CFClient::Layout self)	681	DESTROY (CFClient::Layout self)
…		…
675	SvUTF8_on (RETVAL);	710	SvUTF8_on (RETVAL);
676	OUTPUT:	711	OUTPUT:
677	RETVAL	712	RETVAL
678		713
679	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
680	set_height (CFClient::Layout self, int base_height)	724	set_height (CFClient::Layout self, int base_height)
681	CODE:	725	CODE:
		726	if (self->base_height != base_height)
		727	{
682	self->base_height = base_height;	728	self->base_height = base_height;
		729	layout_update_font (self);
		730	}
683		731
684	void	732	void
685	set_width (CFClient::Layout self, int max_width = -1)	733	set_width (CFClient::Layout self, int max_width = -1)
686	CODE:	734	CODE:
687	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);
…		…
690	size (CFClient::Layout self)	738	size (CFClient::Layout self)
691	PPCODE:	739	PPCODE:
692	{	740	{
693	int w, h;	741	int w, h;
694		742
695	layout_update (self);
696	layout_get_pixel_size (self, &w, &h);	743	layout_get_pixel_size (self, &w, &h);
697		744
698	EXTEND (SP, 2);	745	EXTEND (SP, 2);
699	PUSHs (sv_2mortal (newSViv (w)));	746	PUSHs (sv_2mortal (newSViv (w)));
700	PUSHs (sv_2mortal (newSViv (h)));	747	PUSHs (sv_2mortal (newSViv (h)));
…		…
703	int	750	int
704	xy_to_index (CFClient::Layout self, int x, int y)	751	xy_to_index (CFClient::Layout self, int x, int y)
705	CODE:	752	CODE:
706	{	753	{
707	int index, trailing;	754	int index, trailing;
708
709	layout_update (self);
710	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);
711
712	RETVAL = index;	756	RETVAL = index;
713	}	757	}
714	OUTPUT:	758	OUTPUT:
715	RETVAL	759	RETVAL
716		760
717	void	761	void
718	cursor_pos (CFClient::Layout self, int index)	762	cursor_pos (CFClient::Layout self, int index)
719	PPCODE:	763	PPCODE:
720	{	764	{
721	PangoRectangle strong_pos;	765	PangoRectangle strong_pos;
722	layout_update (self);
723	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	766	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
724		767
725	EXTEND (SP, 3);	768	EXTEND (SP, 3);
726	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	769	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
727	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	770	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
734	{	777	{
735	SV *retval;	778	SV *retval;
736	int w, h;	779	int w, h;
737	FT_Bitmap bitmap;	780	FT_Bitmap bitmap;
738		781
739	layout_update (self);
740	layout_get_pixel_size (self, &w, &h);	782	layout_get_pixel_size (self, &w, &h);
741		783
742	retval = newSV (w * h);	784	retval = newSV (w * h);
743	SvPOK_only (retval);	785	SvPOK_only (retval);
744	SvCUR_set (retval, w * h);	786	SvCUR_set (retval, w * h);
…		…
1306	} *civ, const_iv[] = {	1348	} *civ, const_iv[] = {
1307	# define const_iv(name) { # name, (IV)name }	1349	# define const_iv(name) { # name, (IV)name }
1308	const_iv (GL_COLOR_MATERIAL),	1350	const_iv (GL_COLOR_MATERIAL),
1309	const_iv (GL_SMOOTH),	1351	const_iv (GL_SMOOTH),
1310	const_iv (GL_FLAT),	1352	const_iv (GL_FLAT),
		1353	const_iv (GL_DITHER),
1311	const_iv (GL_BLEND),	1354	const_iv (GL_BLEND),
		1355	const_iv (GL_SCISSOR_TEST),
1312	const_iv (GL_AND),	1356	const_iv (GL_AND),
		1357	const_iv (GL_ONE),
		1358	const_iv (GL_ZERO),
1313	const_iv (GL_SRC_ALPHA),	1359	const_iv (GL_SRC_ALPHA),
		1360	const_iv (GL_SRC_ALPHA_SATURATE),
1314	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1361	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1362	const_iv (GL_ONE_MINUS_DST_ALPHA),
1315	const_iv (GL_RGB),	1363	const_iv (GL_RGB),
1316	const_iv (GL_RGBA),	1364	const_iv (GL_RGBA),
1317	const_iv (GL_UNSIGNED_BYTE),	1365	const_iv (GL_UNSIGNED_BYTE),
1318	const_iv (GL_ALPHA4),
1319	const_iv (GL_ALPHA),	1366	const_iv (GL_ALPHA),
1320	const_iv (GL_FLOAT),	1367	const_iv (GL_FLOAT),
1321	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1368	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1322	const_iv (GL_COMPILE),	1369	const_iv (GL_COMPILE),
1323	const_iv (GL_TEXTURE_1D),	1370	const_iv (GL_TEXTURE_1D),
…		…
1335	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1382	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1336	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1383	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1337	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1384	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1338	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1385	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1339	const_iv (GL_GENERATE_MIPMAP),	1386	const_iv (GL_GENERATE_MIPMAP),
1340	const_iv (GL_LINEAR),
1341	const_iv (GL_MODULATE),	1387	const_iv (GL_MODULATE),
		1388	const_iv (GL_DECAL),
1342	const_iv (GL_REPLACE),	1389	const_iv (GL_REPLACE),
1343	const_iv (GL_COLOR_BUFFER_BIT),	1390	const_iv (GL_COLOR_BUFFER_BIT),
1344	const_iv (GL_PROJECTION),	1391	const_iv (GL_PROJECTION),
1345	const_iv (GL_MODELVIEW),	1392	const_iv (GL_MODELVIEW),
1346	const_iv (GL_COLOR_LOGIC_OP),	1393	const_iv (GL_COLOR_LOGIC_OP),
		1394	const_iv (GL_SEPARABLE_2D),
1347	const_iv (GL_CONVOLUTION_2D),	1395	const_iv (GL_CONVOLUTION_2D),
1348	const_iv (GL_CONVOLUTION_BORDER_MODE),	1396	const_iv (GL_CONVOLUTION_BORDER_MODE),
1349	const_iv (GL_CONSTANT_BORDER),	1397	const_iv (GL_CONSTANT_BORDER),
1350	const_iv (GL_LINES),	1398	const_iv (GL_LINES),
1351	const_iv (GL_QUADS),	1399	const_iv (GL_QUADS),
…		…
1376		1424
1377	void glBlendFunc (int sfactor, int dfactor)	1425	void glBlendFunc (int sfactor, int dfactor)
1378		1426
1379	void glLogicOp (int opcode)	1427	void glLogicOp (int opcode)
1380		1428
		1429	void glColorMask (int red, int green, int blue, int alpha)
		1430
1381	void glMatrixMode (int mode)	1431	void glMatrixMode (int mode)
1382		1432
1383	void glPushMatrix ()	1433	void glPushMatrix ()
1384		1434
1385	void glPopMatrix ()	1435	void glPopMatrix ()
1386		1436
1387	void glLoadIdentity ()	1437	void glLoadIdentity ()
1388		1438
		1439	# 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)	1440	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1390		1441
1391	void glViewport (int x, int y, int width, int height)	1442	void glViewport (int x, int y, int width, int height)
		1443
		1444	void glScissor (int x, int y, int width, int height)
1392		1445
1393	void glTranslate (float x, float y, float z = 0.)	1446	void glTranslate (float x, float y, float z = 0.)
1394	CODE:	1447	CODE:
1395	glTranslatef (x, y, z);	1448	glTranslatef (x, y, z);
1396		1449
1397	void glScale (float x, float y, float z)	1450	void glScale (float x, float y, float z = 1.)
1398	CODE:	1451	CODE:
1399	glScalef (x, y, z);	1452	glScalef (x, y, z);
1400		1453
1401	void glRotate (float angle, float x, float y, float z)	1454	void glRotate (float angle, float x, float y, float z)
1402	CODE:	1455	CODE:
…		…
1429		1482
1430	void glBindTexture (int target, int name)	1483	void glBindTexture (int target, int name)
1431		1484
1432	void glConvolutionParameter (int target, int pname, float params)	1485	void glConvolutionParameter (int target, int pname, float params)
1433	CODE:	1486	CODE:
1434	glConvolutionParameterf (target, pname, params);	1487	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1435		1488
1436	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1489	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1490	CODE:
		1491	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1492	(target, internalformat, width, height, format, type, data));
		1493
		1494	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1495	CODE:
		1496	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1497	(target, internalformat, width, height, format, type, row, column));
1437		1498
1438	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1499	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1439		1500
1440	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1501	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1502
		1503	void glRasterPos (int x, int y)
		1504	CODE:
		1505	glRasterPos2i (x, y);
		1506
		1507	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1441		1508
1442	int glGenTexture ()	1509	int glGenTexture ()
1443	CODE:	1510	CODE:
1444	{	1511	{
1445	GLuint name;	1512	GLuint name;

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.69 by root, Sun Apr 30 08:09:44 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.69 by root, Sun Apr 30 08:09:44 2006 UTC