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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.68 by root, Tue Apr 25 11:48:30 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 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
45	typedef Mix_Chunk *CFClient__MixChunk;	62	typedef Mix_Chunk *CFClient__MixChunk;
46	typedef Mix_Music *CFClient__MixMusic;	63	typedef Mix_Music *CFClient__MixMusic;
47		64
48	static PangoContext *context;	65	typedef PangoFontDescription *CFClient__Font;
49	static PangoFontMap *fontmap;
50		66
51	typedef struct cf_layout {	67	typedef struct cf_layout {
52	PangoLayout *pl;	68	PangoLayout *pl;
53	int base_height;	69	int base_height;
		70	CFClient__Font font;
54	} *CFClient__Layout;	71	} *CFClient__Layout;
		72
		73	static CFClient__Font default_font;
		74	static PangoContext *context;
		75	static PangoFontMap *fontmap;
55		76
56	static void	77	static void
57	substitute_func (FcPattern *pattern, gpointer data)	78	substitute_func (FcPattern *pattern, gpointer data)
58	{	79	{
59	FcPatternAddBool (pattern, FC_HINTING , 1);	80	FcPatternAddBool (pattern, FC_HINTING , 1);
60	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
61	}	82	}
62		83
63	static void	84	static void
64	layout_update (CFClient__Layout self)	85	layout_update_font (CFClient__Layout self)
65	{	86	{
66	/* 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
67	* reasonably well with bitstream vera	88	* reasonably well with bitstream vera
68	*/	89	*/
69	PangoFontDescription *font = pango_context_get_font_description (context);	90	PangoFontDescription *font = self->font ? self->font : default_font;
70		91
71	int height = self->base_height * (PANGO_SCALE * 8 / 10);
72
73	if (pango_font_description_get_size (font) != height)
74	{
75	pango_font_description_set_absolute_size (font, height);	92	pango_font_description_set_absolute_size (font,
76	pango_layout_context_changed (self->pl);	93	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
77	}	94
		95	pango_layout_set_font_description (self->pl, font);
78	}	96	}
79		97
80	static void	98	static void
81	layout_get_pixel_size (CFClient__Layout self, int w, int h)	99	layout_get_pixel_size (CFClient__Layout self, int w, int h)
82	{	100	{
83	layout_update (self);
84
85	pango_layout_get_pixel_size (self->pl, w, h);	101	pango_layout_get_pixel_size (self->pl, w, h);
86		102
87	w = (w + 3) & ~3;	103	w = (w + 3) & ~3;
88	if (!w) w = 1;	104	if (!w) w = 1;
89	if (!h) h = 1;	105	if (!h) h = 1;
…		…
514	add_font (char *file)	530	add_font (char *file)
515	CODE:	531	CODE:
516	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	532	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
517		533
518	void	534	void
519	set_font (char *file)
520	CODE:
521	{
522	int count;
523	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
524	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
525	FcPatternDestroy (pattern);
526	pango_context_set_font_description (context, font);
527	}
528
529	void
530	load_image_inline (SV *image_)	535	load_image_inline (SV *image_)
531	ALIAS:	536	ALIAS:
532	load_image_file = 1	537	load_image_file = 1
533	PPCODE:	538	PPCODE:
534	{	539	{
…		…
614	PUSHs (sv_2mortal (newSViv (b / y)));	619	PUSHs (sv_2mortal (newSViv (b / y)));
615	PUSHs (sv_2mortal (newSViv (a / y)));	620	PUSHs (sv_2mortal (newSViv (a / y)));
616	}	621	}
617		622
618	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
619	fatal (char *message)	633	fatal (char *message)
620	CODE:	634	CODE:
621	#ifdef _WIN32	635	#ifdef _WIN32
622	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);
623	#else	637	#else
624	fprintf (stderr, "FATAL: %s\n", message);	638	fprintf (stderr, "FATAL: %s\n", message);
625	#endif	639	#endif
626	exit (1);	640	exit (1);
627		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
628	MODULE = CFClient PACKAGE = CFClient::Layout	666	MODULE = CFClient PACKAGE = CFClient::Layout
629		667
630	CFClient::Layout	668	CFClient::Layout
631	new (SV *class, int base_height = 10)	669	new (SV *class, int base_height = MIN_FONT_HEIGHT)
632	CODE:	670	CODE:
633	New (0, RETVAL, 1, struct cf_layout);	671	New (0, RETVAL, 1, struct cf_layout);
		672	RETVAL->pl = pango_layout_new (context);
634	RETVAL->base_height = base_height;	673	RETVAL->base_height = base_height;
635	RETVAL->pl = pango_layout_new (context);	674	RETVAL->font = 0;
636	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);
637	OUTPUT:	677	OUTPUT:
638	RETVAL	678	RETVAL
639		679
640	void	680	void
641	DESTROY (CFClient::Layout self)	681	DESTROY (CFClient::Layout self)
…		…
670	SvUTF8_on (RETVAL);	710	SvUTF8_on (RETVAL);
671	OUTPUT:	711	OUTPUT:
672	RETVAL	712	RETVAL
673		713
674	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
675	set_height (CFClient::Layout self, int base_height)	724	set_height (CFClient::Layout self, int base_height)
676	CODE:	725	CODE:
		726	if (self->base_height != base_height)
		727	{
677	self->base_height = base_height;	728	self->base_height = base_height;
		729	layout_update_font (self);
		730	}
678		731
679	void	732	void
680	set_width (CFClient::Layout self, int max_width = -1)	733	set_width (CFClient::Layout self, int max_width = -1)
681	CODE:	734	CODE:
682	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);
…		…
685	size (CFClient::Layout self)	738	size (CFClient::Layout self)
686	PPCODE:	739	PPCODE:
687	{	740	{
688	int w, h;	741	int w, h;
689		742
690	layout_update (self);
691	layout_get_pixel_size (self, &w, &h);	743	layout_get_pixel_size (self, &w, &h);
692		744
693	EXTEND (SP, 2);	745	EXTEND (SP, 2);
694	PUSHs (sv_2mortal (newSViv (w)));	746	PUSHs (sv_2mortal (newSViv (w)));
695	PUSHs (sv_2mortal (newSViv (h)));	747	PUSHs (sv_2mortal (newSViv (h)));
…		…
698	int	750	int
699	xy_to_index (CFClient::Layout self, int x, int y)	751	xy_to_index (CFClient::Layout self, int x, int y)
700	CODE:	752	CODE:
701	{	753	{
702	int index, trailing;	754	int index, trailing;
703
704	layout_update (self);
705	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);
706
707	RETVAL = index;	756	RETVAL = index;
708	}	757	}
709	OUTPUT:	758	OUTPUT:
710	RETVAL	759	RETVAL
711		760
712	void	761	void
713	cursor_pos (CFClient::Layout self, int index)	762	cursor_pos (CFClient::Layout self, int index)
714	PPCODE:	763	PPCODE:
715	{	764	{
716	PangoRectangle strong_pos;	765	PangoRectangle strong_pos;
717	layout_update (self);
718	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	766	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
719		767
720	EXTEND (SP, 3);	768	EXTEND (SP, 3);
721	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	769	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
722	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	770	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
729	{	777	{
730	SV *retval;	778	SV *retval;
731	int w, h;	779	int w, h;
732	FT_Bitmap bitmap;	780	FT_Bitmap bitmap;
733		781
734	layout_update (self);
735	layout_get_pixel_size (self, &w, &h);	782	layout_get_pixel_size (self, &w, &h);
736		783
737	retval = newSV (w * h);	784	retval = newSV (w * h);
738	SvPOK_only (retval);	785	SvPOK_only (retval);
739	SvCUR_set (retval, w * h);	786	SvCUR_set (retval, w * h);
…		…
1303	const_iv (GL_COLOR_MATERIAL),	1350	const_iv (GL_COLOR_MATERIAL),
1304	const_iv (GL_SMOOTH),	1351	const_iv (GL_SMOOTH),
1305	const_iv (GL_FLAT),	1352	const_iv (GL_FLAT),
1306	const_iv (GL_BLEND),	1353	const_iv (GL_BLEND),
1307	const_iv (GL_AND),	1354	const_iv (GL_AND),
		1355	const_iv (GL_ONE),
		1356	const_iv (GL_ZERO),
1308	const_iv (GL_SRC_ALPHA),	1357	const_iv (GL_SRC_ALPHA),
		1358	const_iv (GL_SRC_ALPHA_SATURATE),
1309	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1359	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1360	const_iv (GL_ONE_MINUS_DST_ALPHA),
1310	const_iv (GL_RGB),	1361	const_iv (GL_RGB),
1311	const_iv (GL_RGBA),	1362	const_iv (GL_RGBA),
1312	const_iv (GL_UNSIGNED_BYTE),	1363	const_iv (GL_UNSIGNED_BYTE),
1313	const_iv (GL_ALPHA4),
1314	const_iv (GL_ALPHA),	1364	const_iv (GL_ALPHA),
1315	const_iv (GL_FLOAT),	1365	const_iv (GL_FLOAT),
1316	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1366	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1317	const_iv (GL_COMPILE),	1367	const_iv (GL_COMPILE),
1318	const_iv (GL_TEXTURE_1D),	1368	const_iv (GL_TEXTURE_1D),
…		…
1330	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1380	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1331	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1381	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1332	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1382	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1333	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1383	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1334	const_iv (GL_GENERATE_MIPMAP),	1384	const_iv (GL_GENERATE_MIPMAP),
1335	const_iv (GL_LINEAR),
1336	const_iv (GL_MODULATE),	1385	const_iv (GL_MODULATE),
1337	const_iv (GL_REPLACE),	1386	const_iv (GL_REPLACE),
1338	const_iv (GL_COLOR_BUFFER_BIT),	1387	const_iv (GL_COLOR_BUFFER_BIT),
1339	const_iv (GL_PROJECTION),	1388	const_iv (GL_PROJECTION),
1340	const_iv (GL_MODELVIEW),	1389	const_iv (GL_MODELVIEW),
…		…
1371		1420
1372	void glBlendFunc (int sfactor, int dfactor)	1421	void glBlendFunc (int sfactor, int dfactor)
1373		1422
1374	void glLogicOp (int opcode)	1423	void glLogicOp (int opcode)
1375		1424
		1425	void glColorMask (int red, int green, int blue, int alpha)
		1426
1376	void glMatrixMode (int mode)	1427	void glMatrixMode (int mode)
1377		1428
1378	void glPushMatrix ()	1429	void glPushMatrix ()
1379		1430
1380	void glPopMatrix ()	1431	void glPopMatrix ()
1381		1432
1382	void glLoadIdentity ()	1433	void glLoadIdentity ()
1383		1434
		1435	# near and far are due to microsofts buggy c compiler
1384	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1436	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1385		1437
1386	void glViewport (int x, int y, int width, int height)	1438	void glViewport (int x, int y, int width, int height)
1387		1439
1388	void glTranslate (float x, float y, float z = 0.)	1440	void glTranslate (float x, float y, float z = 0.)
1389	CODE:	1441	CODE:
1390	glTranslatef (x, y, z);	1442	glTranslatef (x, y, z);
1391		1443
1392	void glScale (float x, float y, float z)	1444	void glScale (float x, float y, float z = 1.)
1393	CODE:	1445	CODE:
1394	glScalef (x, y, z);	1446	glScalef (x, y, z);
1395		1447
1396	void glRotate (float angle, float x, float y, float z)	1448	void glRotate (float angle, float x, float y, float z)
1397	CODE:	1449	CODE:
…		…
1424		1476
1425	void glBindTexture (int target, int name)	1477	void glBindTexture (int target, int name)
1426		1478
1427	void glConvolutionParameter (int target, int pname, float params)	1479	void glConvolutionParameter (int target, int pname, float params)
1428	CODE:	1480	CODE:
1429	glConvolutionParameterf (target, pname, params);	1481	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1430		1482
1431	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1483	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1484	CODE:
		1485	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1486	(target, internalformat, width, height, format, type, data));
1432		1487
1433	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1488	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1434		1489
1435	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1490	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1491
		1492	void glRasterPos (int x, int y)
		1493	CODE:
		1494	glRasterPos2i (x, y);
		1495
		1496	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1436		1497
1437	int glGenTexture ()	1498	int glGenTexture ()
1438	CODE:	1499	CODE:
1439	{	1500	{
1440	GLuint name;	1501	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC vs. Revision 1.68 by root, Tue Apr 25 11:48:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.57 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.68 by root, Tue Apr 25 11:48:30 2006 UTC