[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.70 by root, Sun Apr 30 09:21:47 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
…		…
426		457
427	while (SDL_PollEvent (&ev))	458	while (SDL_PollEvent (&ev))
428	{	459	{
429	HV *hv = newHV ();	460	HV *hv = newHV ();
430	hv_store (hv, "type", 4, newSViv (ev.type), 0);	461	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		462
431	switch (ev.type)	463	switch (ev.type)
432	{	464	{
433	case SDL_KEYDOWN:	465	case SDL_KEYDOWN:
434	case SDL_KEYUP:	466	case SDL_KEYUP:
435	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	467	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
455	case SDL_MOUSEBUTTONUP:	487	case SDL_MOUSEBUTTONUP:
456	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	488	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
457	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	489	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
458	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	490	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
459	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	491	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		492	break;
460	}	493	}
461		494
462	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	495	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
463	}	496	}
464	}	497	}
465		498
466	int	499	int
467	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	500	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
		501	POSTCALL:
		502	Mix_HookMusicFinished (music_finished);
468		503
469	void	504	void
470	Mix_CloseAudio ()	505	Mix_CloseAudio ()
471		506
472	int	507	int
…		…
495		530
496	void	531	void
497	add_font (char *file)	532	add_font (char *file)
498	CODE:	533	CODE:
499	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	534	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		535
512	void	536	void
513	load_image_inline (SV *image_)	537	load_image_inline (SV *image_)
514	ALIAS:	538	ALIAS:
515	load_image_file = 1	539	load_image_file = 1
…		…
597	PUSHs (sv_2mortal (newSViv (b / y)));	621	PUSHs (sv_2mortal (newSViv (b / y)));
598	PUSHs (sv_2mortal (newSViv (a / y)));	622	PUSHs (sv_2mortal (newSViv (a / y)));
599	}	623	}
600		624
601	void	625	void
		626	error (char *message)
		627	CODE:
		628	#ifdef _WIN32
		629	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		630	#else
		631	fprintf (stderr, "ERROR: %s\n", message);
		632	#endif
		633
		634	void
602	fatal (char *message)	635	fatal (char *message)
603	CODE:	636	CODE:
604	#ifdef _WIN32	637	#ifdef _WIN32
605	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	638	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
606	#else	639	#else
607	fprintf (stderr, "FATAL: %s\n", message);	640	fprintf (stderr, "FATAL: %s\n", message);
608	#endif	641	#endif
609	exit (1);	642	exit (1);
610		643
		644	MODULE = CFClient PACKAGE = CFClient::Font
		645
		646	CFClient::Font
		647	new_from_file (SV class, char path, int id = 0)
		648	CODE:
		649	{
		650	int count;
		651	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		652	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		653	FcPatternDestroy (pattern);
		654	}
		655	OUTPUT:
		656	RETVAL
		657
		658	void
		659	DESTROY (CFClient::Font self)
		660	CODE:
		661	pango_font_description_free (self);
		662
		663	void
		664	make_default (CFClient::Font self)
		665	CODE:
		666	default_font = self;
		667
611	MODULE = CFClient PACKAGE = CFClient::Layout	668	MODULE = CFClient PACKAGE = CFClient::Layout
612		669
613	CFClient::Layout	670	CFClient::Layout
614	new (SV *class, int base_height = 10)	671	new (SV *class, int base_height = MIN_FONT_HEIGHT)
615	CODE:	672	CODE:
616	New (0, RETVAL, 1, struct cf_layout);	673	New (0, RETVAL, 1, struct cf_layout);
		674	RETVAL->pl = pango_layout_new (context);
617	RETVAL->base_height = base_height;	675	RETVAL->base_height = base_height;
618	RETVAL->pl = pango_layout_new (context);	676	RETVAL->font = 0;
619	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	677	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		678	pango_layout_set_font_description (RETVAL->pl, default_font);
620	OUTPUT:	679	OUTPUT:
621	RETVAL	680	RETVAL
622		681
623	void	682	void
624	DESTROY (CFClient::Layout self)	683	DESTROY (CFClient::Layout self)
…		…
653	SvUTF8_on (RETVAL);	712	SvUTF8_on (RETVAL);
654	OUTPUT:	713	OUTPUT:
655	RETVAL	714	RETVAL
656		715
657	void	716	void
		717	set_font (CFClient::Layout self, CFClient::Font font = 0)
		718	CODE:
		719	if (self->font != font)
		720	{
		721	self->font = font;
		722	layout_update_font (self);
		723	}
		724
		725	void
658	set_height (CFClient::Layout self, int base_height)	726	set_height (CFClient::Layout self, int base_height)
659	CODE:	727	CODE:
		728	if (self->base_height != base_height)
		729	{
660	self->base_height = base_height;	730	self->base_height = base_height;
		731	layout_update_font (self);
		732	}
661		733
662	void	734	void
663	set_width (CFClient::Layout self, int max_width = -1)	735	set_width (CFClient::Layout self, int max_width = -1)
664	CODE:	736	CODE:
665	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	737	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
…		…
668	size (CFClient::Layout self)	740	size (CFClient::Layout self)
669	PPCODE:	741	PPCODE:
670	{	742	{
671	int w, h;	743	int w, h;
672		744
673	layout_update (self);
674	layout_get_pixel_size (self, &w, &h);	745	layout_get_pixel_size (self, &w, &h);
675		746
676	EXTEND (SP, 2);	747	EXTEND (SP, 2);
677	PUSHs (sv_2mortal (newSViv (w)));	748	PUSHs (sv_2mortal (newSViv (w)));
678	PUSHs (sv_2mortal (newSViv (h)));	749	PUSHs (sv_2mortal (newSViv (h)));
…		…
681	int	752	int
682	xy_to_index (CFClient::Layout self, int x, int y)	753	xy_to_index (CFClient::Layout self, int x, int y)
683	CODE:	754	CODE:
684	{	755	{
685	int index, trailing;	756	int index, trailing;
686
687	layout_update (self);
688	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	757	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
689
690	RETVAL = index;	758	RETVAL = index;
691	}	759	}
692	OUTPUT:	760	OUTPUT:
693	RETVAL	761	RETVAL
694		762
695	void	763	void
696	cursor_pos (CFClient::Layout self, int index)	764	cursor_pos (CFClient::Layout self, int index)
697	PPCODE:	765	PPCODE:
698	{	766	{
699	PangoRectangle strong_pos;	767	PangoRectangle strong_pos;
700	layout_update (self);
701	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	768	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702		769
703	EXTEND (SP, 3);	770	EXTEND (SP, 3);
704	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	771	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	772	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
712	{	779	{
713	SV *retval;	780	SV *retval;
714	int w, h;	781	int w, h;
715	FT_Bitmap bitmap;	782	FT_Bitmap bitmap;
716		783
717	layout_update (self);
718	layout_get_pixel_size (self, &w, &h);	784	layout_get_pixel_size (self, &w, &h);
719		785
720	retval = newSV (w * h);	786	retval = newSV (w * h);
721	SvPOK_only (retval);	787	SvPOK_only (retval);
722	SvCUR_set (retval, w * h);	788	SvCUR_set (retval, w * h);
…		…
1284	} *civ, const_iv[] = {	1350	} *civ, const_iv[] = {
1285	# define const_iv(name) { # name, (IV)name }	1351	# define const_iv(name) { # name, (IV)name }
1286	const_iv (GL_COLOR_MATERIAL),	1352	const_iv (GL_COLOR_MATERIAL),
1287	const_iv (GL_SMOOTH),	1353	const_iv (GL_SMOOTH),
1288	const_iv (GL_FLAT),	1354	const_iv (GL_FLAT),
		1355	const_iv (GL_DITHER),
1289	const_iv (GL_BLEND),	1356	const_iv (GL_BLEND),
		1357	const_iv (GL_SCISSOR_TEST),
1290	const_iv (GL_AND),	1358	const_iv (GL_AND),
		1359	const_iv (GL_ONE),
		1360	const_iv (GL_ZERO),
1291	const_iv (GL_SRC_ALPHA),	1361	const_iv (GL_SRC_ALPHA),
		1362	const_iv (GL_SRC_ALPHA_SATURATE),
1292	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1363	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1364	const_iv (GL_ONE_MINUS_DST_ALPHA),
1293	const_iv (GL_RGB),	1365	const_iv (GL_RGB),
1294	const_iv (GL_RGBA),	1366	const_iv (GL_RGBA),
1295	const_iv (GL_UNSIGNED_BYTE),	1367	const_iv (GL_UNSIGNED_BYTE),
1296	const_iv (GL_ALPHA4),
1297	const_iv (GL_ALPHA),	1368	const_iv (GL_ALPHA),
1298	const_iv (GL_FLOAT),	1369	const_iv (GL_FLOAT),
1299	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1370	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300	const_iv (GL_COMPILE),	1371	const_iv (GL_COMPILE),
1301	const_iv (GL_TEXTURE_1D),	1372	const_iv (GL_TEXTURE_1D),
…		…
1308	const_iv (GL_TEXTURE_WRAP_T),	1379	const_iv (GL_TEXTURE_WRAP_T),
1309	const_iv (GL_CLAMP),	1380	const_iv (GL_CLAMP),
1310	const_iv (GL_REPEAT),	1381	const_iv (GL_REPEAT),
1311	const_iv (GL_NEAREST),	1382	const_iv (GL_NEAREST),
1312	const_iv (GL_LINEAR),	1383	const_iv (GL_LINEAR),
		1384	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1385	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1386	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1387	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1388	const_iv (GL_GENERATE_MIPMAP),
1313	const_iv (GL_MODULATE),	1389	const_iv (GL_MODULATE),
		1390	const_iv (GL_DECAL),
1314	const_iv (GL_REPLACE),	1391	const_iv (GL_REPLACE),
1315	const_iv (GL_COLOR_BUFFER_BIT),	1392	const_iv (GL_COLOR_BUFFER_BIT),
1316	const_iv (GL_PROJECTION),	1393	const_iv (GL_PROJECTION),
1317	const_iv (GL_MODELVIEW),	1394	const_iv (GL_MODELVIEW),
1318	const_iv (GL_COLOR_LOGIC_OP),	1395	const_iv (GL_COLOR_LOGIC_OP),
		1396	const_iv (GL_SEPARABLE_2D),
1319	const_iv (GL_CONVOLUTION_2D),	1397	const_iv (GL_CONVOLUTION_2D),
1320	const_iv (GL_CONVOLUTION_BORDER_MODE),	1398	const_iv (GL_CONVOLUTION_BORDER_MODE),
1321	const_iv (GL_CONSTANT_BORDER),	1399	const_iv (GL_CONSTANT_BORDER),
1322	const_iv (GL_LINES),	1400	const_iv (GL_LINES),
1323	const_iv (GL_QUADS),	1401	const_iv (GL_QUADS),
…		…
1348		1426
1349	void glBlendFunc (int sfactor, int dfactor)	1427	void glBlendFunc (int sfactor, int dfactor)
1350		1428
1351	void glLogicOp (int opcode)	1429	void glLogicOp (int opcode)
1352		1430
		1431	void glColorMask (int red, int green, int blue, int alpha)
		1432
1353	void glMatrixMode (int mode)	1433	void glMatrixMode (int mode)
1354		1434
1355	void glPushMatrix ()	1435	void glPushMatrix ()
1356		1436
1357	void glPopMatrix ()	1437	void glPopMatrix ()
1358		1438
1359	void glLoadIdentity ()	1439	void glLoadIdentity ()
1360		1440
		1441	# 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)	1442	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1362		1443
1363	void glViewport (int x, int y, int width, int height)	1444	void glViewport (int x, int y, int width, int height)
		1445
		1446	void glScissor (int x, int y, int width, int height)
1364		1447
1365	void glTranslate (float x, float y, float z = 0.)	1448	void glTranslate (float x, float y, float z = 0.)
1366	CODE:	1449	CODE:
1367	glTranslatef (x, y, z);	1450	glTranslatef (x, y, z);
1368		1451
1369	void glScale (float x, float y, float z)	1452	void glScale (float x, float y, float z = 1.)
1370	CODE:	1453	CODE:
1371	glScalef (x, y, z);	1454	glScalef (x, y, z);
1372		1455
1373	void glRotate (float angle, float x, float y, float z)	1456	void glRotate (float angle, float x, float y, float z)
1374	CODE:	1457	CODE:
…		…
1379	void glEnd ()	1462	void glEnd ()
1380		1463
1381	void glColor (float r, float g, float b, float a = 1.0)	1464	void glColor (float r, float g, float b, float a = 1.0)
1382	PROTOTYPE: @	1465	PROTOTYPE: @
1383	CODE:	1466	CODE:
1384	glColor4f (r, g, b, a);	1467	glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1385		1468
1386	void glVertex (float x, float y, float z = 0.)	1469	void glVertex (float x, float y, float z = 0.)
1387	CODE:	1470	CODE:
1388	glVertex3f (x, y, z);	1471	glVertex3f (x, y, z);
1389		1472
…		…
1401		1484
1402	void glBindTexture (int target, int name)	1485	void glBindTexture (int target, int name)
1403		1486
1404	void glConvolutionParameter (int target, int pname, float params)	1487	void glConvolutionParameter (int target, int pname, float params)
1405	CODE:	1488	CODE:
1406	glConvolutionParameterf (target, pname, params);	1489	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1407		1490
1408	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1491	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1492	CODE:
		1493	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1494	(target, internalformat, width, height, format, type, data));
		1495
		1496	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1497	CODE:
		1498	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1499	(target, internalformat, width, height, format, type, row, column));
1409		1500
1410	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1501	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1411		1502
1412	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1503	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1504
		1505	void glRasterPos (int x, int y)
		1506	CODE:
		1507	glRasterPos2i (x, y);
		1508
		1509	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1413		1510
1414	int glGenTexture ()	1511	int glGenTexture ()
1415	CODE:	1512	CODE:
1416	{	1513	{
1417	GLuint name;	1514	GLuint name;

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.70 by root, Sun Apr 30 09:21:47 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.70 by root, Sun Apr 30 09:21:47 2006 UTC