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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.55 by root, Thu Apr 20 08:11:56 2006 UTC vs.
Revision 1.67 by root, Tue Apr 25 11:18:48 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;
…		…
237	break;	255	break;
238		256
239	row->col[x - row->c0].darkness = -1;	257	row->col[x - row->c0].darkness = -1;
240	}	258	}
241	}	259	}
		260	}
		261
		262	static void
		263	music_finished ()
		264	{
		265	SDL_UserEvent ev;
		266
		267	ev.type = SDL_USEREVENT;
		268	ev.code = 0;
		269	ev.data1 = 0;
		270	ev.data2 = 0;
		271
		272	SDL_PushEvent ((SDL_Event *)&ev);
242	}	273	}
243		274
244	MODULE = CFClient PACKAGE = CFClient	275	MODULE = CFClient PACKAGE = CFClient
245		276
246	PROTOTYPES: ENABLE	277	PROTOTYPES: ENABLE
…		…
375	SDL_Rect **m;	406	SDL_Rect **m;
376		407
377	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	408	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
378	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	409	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
379	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	410	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
380	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	411	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 0);
381		412
382	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	413	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
383	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	414	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
384	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	415	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
385	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	416	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
463	}	494	}
464	}	495	}
465		496
466	int	497	int
467	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	498	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
		499	POSTCALL:
		500	Mix_HookMusicFinished (music_finished);
468		501
469	void	502	void
470	Mix_CloseAudio ()	503	Mix_CloseAudio ()
471		504
472	int	505	int
…		…
495		528
496	void	529	void
497	add_font (char *file)	530	add_font (char *file)
498	CODE:	531	CODE:
499	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	532	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
500
501	void
502	set_font (char *file)
503	CODE:
504	{
505	int count;
506	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
507	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
508	FcPatternDestroy (pattern);
509	pango_context_set_font_description (context, font);
510	}
511		533
512	void	534	void
513	load_image_inline (SV *image_)	535	load_image_inline (SV *image_)
514	ALIAS:	536	ALIAS:
515	load_image_file = 1	537	load_image_file = 1
…		…
597	PUSHs (sv_2mortal (newSViv (b / y)));	619	PUSHs (sv_2mortal (newSViv (b / y)));
598	PUSHs (sv_2mortal (newSViv (a / y)));	620	PUSHs (sv_2mortal (newSViv (a / y)));
599	}	621	}
600		622
601	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
602	fatal (char *message)	633	fatal (char *message)
603	CODE:	634	CODE:
604	#ifdef _WIN32	635	#ifdef _WIN32
605	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);
606	#else	637	#else
607	fprintf (stderr, "FATAL: %s\n", message);	638	fprintf (stderr, "FATAL: %s\n", message);
608	#endif	639	#endif
609	exit (1);	640	exit (1);
610		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
611	MODULE = CFClient PACKAGE = CFClient::Layout	666	MODULE = CFClient PACKAGE = CFClient::Layout
612		667
613	CFClient::Layout	668	CFClient::Layout
614	new (SV *class, int base_height = 10)	669	new (SV *class, int base_height = MIN_FONT_HEIGHT)
615	CODE:	670	CODE:
616	New (0, RETVAL, 1, struct cf_layout);	671	New (0, RETVAL, 1, struct cf_layout);
		672	RETVAL->pl = pango_layout_new (context);
617	RETVAL->base_height = base_height;	673	RETVAL->base_height = base_height;
618	RETVAL->pl = pango_layout_new (context);	674	RETVAL->font = 0;
619	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);
620	OUTPUT:	677	OUTPUT:
621	RETVAL	678	RETVAL
622		679
623	void	680	void
624	DESTROY (CFClient::Layout self)	681	DESTROY (CFClient::Layout self)
…		…
653	SvUTF8_on (RETVAL);	710	SvUTF8_on (RETVAL);
654	OUTPUT:	711	OUTPUT:
655	RETVAL	712	RETVAL
656		713
657	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
658	set_height (CFClient::Layout self, int base_height)	724	set_height (CFClient::Layout self, int base_height)
659	CODE:	725	CODE:
		726	if (self->base_height != base_height)
		727	{
660	self->base_height = base_height;	728	self->base_height = base_height;
		729	layout_update_font (self);
		730	}
661		731
662	void	732	void
663	set_width (CFClient::Layout self, int max_width = -1)	733	set_width (CFClient::Layout self, int max_width = -1)
664	CODE:	734	CODE:
665	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);
…		…
668	size (CFClient::Layout self)	738	size (CFClient::Layout self)
669	PPCODE:	739	PPCODE:
670	{	740	{
671	int w, h;	741	int w, h;
672		742
673	layout_update (self);
674	layout_get_pixel_size (self, &w, &h);	743	layout_get_pixel_size (self, &w, &h);
675		744
676	EXTEND (SP, 2);	745	EXTEND (SP, 2);
677	PUSHs (sv_2mortal (newSViv (w)));	746	PUSHs (sv_2mortal (newSViv (w)));
678	PUSHs (sv_2mortal (newSViv (h)));	747	PUSHs (sv_2mortal (newSViv (h)));
…		…
681	int	750	int
682	xy_to_index (CFClient::Layout self, int x, int y)	751	xy_to_index (CFClient::Layout self, int x, int y)
683	CODE:	752	CODE:
684	{	753	{
685	int index, trailing;	754	int index, trailing;
686
687	layout_update (self);
688	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);
689
690	RETVAL = index;	756	RETVAL = index;
691	}	757	}
692	OUTPUT:	758	OUTPUT:
693	RETVAL	759	RETVAL
694		760
695	void	761	void
696	cursor_pos (CFClient::Layout self, int index)	762	cursor_pos (CFClient::Layout self, int index)
697	PPCODE:	763	PPCODE:
698	{	764	{
699	PangoRectangle strong_pos;	765	PangoRectangle strong_pos;
700	layout_update (self);
701	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	766	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702		767
703	EXTEND (SP, 3);	768	EXTEND (SP, 3);
704	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	769	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	770	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
712	{	777	{
713	SV *retval;	778	SV *retval;
714	int w, h;	779	int w, h;
715	FT_Bitmap bitmap;	780	FT_Bitmap bitmap;
716		781
717	layout_update (self);
718	layout_get_pixel_size (self, &w, &h);	782	layout_get_pixel_size (self, &w, &h);
719		783
720	retval = newSV (w * h);	784	retval = newSV (w * h);
721	SvPOK_only (retval);	785	SvPOK_only (retval);
722	SvCUR_set (retval, w * h);	786	SvCUR_set (retval, w * h);
…		…
1286	const_iv (GL_COLOR_MATERIAL),	1350	const_iv (GL_COLOR_MATERIAL),
1287	const_iv (GL_SMOOTH),	1351	const_iv (GL_SMOOTH),
1288	const_iv (GL_FLAT),	1352	const_iv (GL_FLAT),
1289	const_iv (GL_BLEND),	1353	const_iv (GL_BLEND),
1290	const_iv (GL_AND),	1354	const_iv (GL_AND),
		1355	const_iv (GL_ONE),
		1356	const_iv (GL_ZERO),
1291	const_iv (GL_SRC_ALPHA),	1357	const_iv (GL_SRC_ALPHA),
		1358	const_iv (GL_SRC_ALPHA_SATURATE),
1292	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1359	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1360	const_iv (GL_ONE_MINUS_DST_ALPHA),
1293	const_iv (GL_RGB),	1361	const_iv (GL_RGB),
1294	const_iv (GL_RGBA),	1362	const_iv (GL_RGBA),
1295	const_iv (GL_UNSIGNED_BYTE),	1363	const_iv (GL_UNSIGNED_BYTE),
1296	const_iv (GL_ALPHA4),
1297	const_iv (GL_ALPHA),	1364	const_iv (GL_ALPHA),
1298	const_iv (GL_FLOAT),	1365	const_iv (GL_FLOAT),
1299	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1366	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300	const_iv (GL_COMPILE),	1367	const_iv (GL_COMPILE),
1301	const_iv (GL_TEXTURE_1D),	1368	const_iv (GL_TEXTURE_1D),
…		…
1308	const_iv (GL_TEXTURE_WRAP_T),	1375	const_iv (GL_TEXTURE_WRAP_T),
1309	const_iv (GL_CLAMP),	1376	const_iv (GL_CLAMP),
1310	const_iv (GL_REPEAT),	1377	const_iv (GL_REPEAT),
1311	const_iv (GL_NEAREST),	1378	const_iv (GL_NEAREST),
1312	const_iv (GL_LINEAR),	1379	const_iv (GL_LINEAR),
		1380	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1381	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1382	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1383	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1384	const_iv (GL_GENERATE_MIPMAP),
1313	const_iv (GL_MODULATE),	1385	const_iv (GL_MODULATE),
1314	const_iv (GL_REPLACE),	1386	const_iv (GL_REPLACE),
1315	const_iv (GL_COLOR_BUFFER_BIT),	1387	const_iv (GL_COLOR_BUFFER_BIT),
1316	const_iv (GL_PROJECTION),	1388	const_iv (GL_PROJECTION),
1317	const_iv (GL_MODELVIEW),	1389	const_iv (GL_MODELVIEW),
…		…
1356		1428
1357	void glPopMatrix ()	1429	void glPopMatrix ()
1358		1430
1359	void glLoadIdentity ()	1431	void glLoadIdentity ()
1360		1432
		1433	# near and far are due to microsofts buggy c compiler
1361	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1434	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1362		1435
1363	void glViewport (int x, int y, int width, int height)	1436	void glViewport (int x, int y, int width, int height)
1364		1437
1365	void glTranslate (float x, float y, float z = 0.)	1438	void glTranslate (float x, float y, float z = 0.)
1366	CODE:	1439	CODE:
1367	glTranslatef (x, y, z);	1440	glTranslatef (x, y, z);
1368		1441
1369	void glScale (float x, float y, float z)	1442	void glScale (float x, float y, float z = 1.)
1370	CODE:	1443	CODE:
1371	glScalef (x, y, z);	1444	glScalef (x, y, z);
1372		1445
1373	void glRotate (float angle, float x, float y, float z)	1446	void glRotate (float angle, float x, float y, float z)
1374	CODE:	1447	CODE:
…		…
1401		1474
1402	void glBindTexture (int target, int name)	1475	void glBindTexture (int target, int name)
1403		1476
1404	void glConvolutionParameter (int target, int pname, float params)	1477	void glConvolutionParameter (int target, int pname, float params)
1405	CODE:	1478	CODE:
1406	glConvolutionParameterf (target, pname, params);	1479	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1407		1480
1408	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1481	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1482	CODE:
		1483	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1484	(target, internalformat, width, height, format, type, data));
1409		1485
1410	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1486	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1411		1487
1412	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1488	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1413		1489

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.55 by root, Thu Apr 20 08:11:56 2006 UTC vs. Revision 1.67 by root, Tue Apr 25 11:18:48 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.55 by root, Thu Apr 20 08:11:56 2006 UTC vs.
Revision 1.67 by root, Tue Apr 25 11:18:48 2006 UTC