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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.56 by root, Thu Apr 20 09:13:31 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;
…		…
249	ev.type = SDL_USEREVENT;	267	ev.type = SDL_USEREVENT;
250	ev.code = 0;	268	ev.code = 0;
251	ev.data1 = 0;	269	ev.data1 = 0;
252	ev.data2 = 0;	270	ev.data2 = 0;
253		271
254	SDL_PushEvent (&ev);	272	SDL_PushEvent ((SDL_Event *)&ev);
255	}	273	}
256		274
257	MODULE = CFClient PACKAGE = CFClient	275	MODULE = CFClient PACKAGE = CFClient
258		276
259	PROTOTYPES: ENABLE	277	PROTOTYPES: ENABLE
…		…
439		457
440	while (SDL_PollEvent (&ev))	458	while (SDL_PollEvent (&ev))
441	{	459	{
442	HV *hv = newHV ();	460	HV *hv = newHV ();
443	hv_store (hv, "type", 4, newSViv (ev.type), 0);	461	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		462
444	switch (ev.type)	463	switch (ev.type)
445	{	464	{
446	case SDL_KEYDOWN:	465	case SDL_KEYDOWN:
447	case SDL_KEYUP:	466	case SDL_KEYUP:
448	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	467	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
468	case SDL_MOUSEBUTTONUP:	487	case SDL_MOUSEBUTTONUP:
469	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	488	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
470	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	489	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
471	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	490	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
472	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	491	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		492	break;
473	}	493	}
474		494
475	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	495	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
476	}	496	}
477	}	497	}
…		…
510		530
511	void	531	void
512	add_font (char *file)	532	add_font (char *file)
513	CODE:	533	CODE:
514	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	534	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
515
516	void
517	set_font (char *file)
518	CODE:
519	{
520	int count;
521	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
522	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
523	FcPatternDestroy (pattern);
524	pango_context_set_font_description (context, font);
525	}
526		535
527	void	536	void
528	load_image_inline (SV *image_)	537	load_image_inline (SV *image_)
529	ALIAS:	538	ALIAS:
530	load_image_file = 1	539	load_image_file = 1
…		…
612	PUSHs (sv_2mortal (newSViv (b / y)));	621	PUSHs (sv_2mortal (newSViv (b / y)));
613	PUSHs (sv_2mortal (newSViv (a / y)));	622	PUSHs (sv_2mortal (newSViv (a / y)));
614	}	623	}
615		624
616	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
617	fatal (char *message)	635	fatal (char *message)
618	CODE:	636	CODE:
619	#ifdef _WIN32	637	#ifdef _WIN32
620	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);
621	#else	639	#else
622	fprintf (stderr, "FATAL: %s\n", message);	640	fprintf (stderr, "FATAL: %s\n", message);
623	#endif	641	#endif
624	exit (1);	642	exit (1);
625		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
626	MODULE = CFClient PACKAGE = CFClient::Layout	668	MODULE = CFClient PACKAGE = CFClient::Layout
627		669
628	CFClient::Layout	670	CFClient::Layout
629	new (SV *class, int base_height = 10)	671	new (SV *class, int base_height = MIN_FONT_HEIGHT)
630	CODE:	672	CODE:
631	New (0, RETVAL, 1, struct cf_layout);	673	New (0, RETVAL, 1, struct cf_layout);
		674	RETVAL->pl = pango_layout_new (context);
632	RETVAL->base_height = base_height;	675	RETVAL->base_height = base_height;
633	RETVAL->pl = pango_layout_new (context);	676	RETVAL->font = 0;
634	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);
635	OUTPUT:	679	OUTPUT:
636	RETVAL	680	RETVAL
637		681
638	void	682	void
639	DESTROY (CFClient::Layout self)	683	DESTROY (CFClient::Layout self)
…		…
668	SvUTF8_on (RETVAL);	712	SvUTF8_on (RETVAL);
669	OUTPUT:	713	OUTPUT:
670	RETVAL	714	RETVAL
671		715
672	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
673	set_height (CFClient::Layout self, int base_height)	726	set_height (CFClient::Layout self, int base_height)
674	CODE:	727	CODE:
		728	if (self->base_height != base_height)
		729	{
675	self->base_height = base_height;	730	self->base_height = base_height;
		731	layout_update_font (self);
		732	}
676		733
677	void	734	void
678	set_width (CFClient::Layout self, int max_width = -1)	735	set_width (CFClient::Layout self, int max_width = -1)
679	CODE:	736	CODE:
680	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);
…		…
683	size (CFClient::Layout self)	740	size (CFClient::Layout self)
684	PPCODE:	741	PPCODE:
685	{	742	{
686	int w, h;	743	int w, h;
687		744
688	layout_update (self);
689	layout_get_pixel_size (self, &w, &h);	745	layout_get_pixel_size (self, &w, &h);
690		746
691	EXTEND (SP, 2);	747	EXTEND (SP, 2);
692	PUSHs (sv_2mortal (newSViv (w)));	748	PUSHs (sv_2mortal (newSViv (w)));
693	PUSHs (sv_2mortal (newSViv (h)));	749	PUSHs (sv_2mortal (newSViv (h)));
…		…
696	int	752	int
697	xy_to_index (CFClient::Layout self, int x, int y)	753	xy_to_index (CFClient::Layout self, int x, int y)
698	CODE:	754	CODE:
699	{	755	{
700	int index, trailing;	756	int index, trailing;
701
702	layout_update (self);
703	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);
704
705	RETVAL = index;	758	RETVAL = index;
706	}	759	}
707	OUTPUT:	760	OUTPUT:
708	RETVAL	761	RETVAL
709		762
710	void	763	void
711	cursor_pos (CFClient::Layout self, int index)	764	cursor_pos (CFClient::Layout self, int index)
712	PPCODE:	765	PPCODE:
713	{	766	{
714	PangoRectangle strong_pos;	767	PangoRectangle strong_pos;
715	layout_update (self);
716	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	768	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
717		769
718	EXTEND (SP, 3);	770	EXTEND (SP, 3);
719	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	771	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
720	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	772	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
727	{	779	{
728	SV *retval;	780	SV *retval;
729	int w, h;	781	int w, h;
730	FT_Bitmap bitmap;	782	FT_Bitmap bitmap;
731		783
732	layout_update (self);
733	layout_get_pixel_size (self, &w, &h);	784	layout_get_pixel_size (self, &w, &h);
734		785
735	retval = newSV (w * h);	786	retval = newSV (w * h);
736	SvPOK_only (retval);	787	SvPOK_only (retval);
737	SvCUR_set (retval, w * h);	788	SvCUR_set (retval, w * h);
…		…
1299	} *civ, const_iv[] = {	1350	} *civ, const_iv[] = {
1300	# define const_iv(name) { # name, (IV)name }	1351	# define const_iv(name) { # name, (IV)name }
1301	const_iv (GL_COLOR_MATERIAL),	1352	const_iv (GL_COLOR_MATERIAL),
1302	const_iv (GL_SMOOTH),	1353	const_iv (GL_SMOOTH),
1303	const_iv (GL_FLAT),	1354	const_iv (GL_FLAT),
		1355	const_iv (GL_DITHER),
1304	const_iv (GL_BLEND),	1356	const_iv (GL_BLEND),
		1357	const_iv (GL_SCISSOR_TEST),
1305	const_iv (GL_AND),	1358	const_iv (GL_AND),
		1359	const_iv (GL_ONE),
		1360	const_iv (GL_ZERO),
1306	const_iv (GL_SRC_ALPHA),	1361	const_iv (GL_SRC_ALPHA),
		1362	const_iv (GL_SRC_ALPHA_SATURATE),
1307	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1363	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1364	const_iv (GL_ONE_MINUS_DST_ALPHA),
1308	const_iv (GL_RGB),	1365	const_iv (GL_RGB),
1309	const_iv (GL_RGBA),	1366	const_iv (GL_RGBA),
1310	const_iv (GL_UNSIGNED_BYTE),	1367	const_iv (GL_UNSIGNED_BYTE),
1311	const_iv (GL_ALPHA4),
1312	const_iv (GL_ALPHA),	1368	const_iv (GL_ALPHA),
1313	const_iv (GL_FLOAT),	1369	const_iv (GL_FLOAT),
1314	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1370	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1315	const_iv (GL_COMPILE),	1371	const_iv (GL_COMPILE),
1316	const_iv (GL_TEXTURE_1D),	1372	const_iv (GL_TEXTURE_1D),
…		…
1323	const_iv (GL_TEXTURE_WRAP_T),	1379	const_iv (GL_TEXTURE_WRAP_T),
1324	const_iv (GL_CLAMP),	1380	const_iv (GL_CLAMP),
1325	const_iv (GL_REPEAT),	1381	const_iv (GL_REPEAT),
1326	const_iv (GL_NEAREST),	1382	const_iv (GL_NEAREST),
1327	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),
1328	const_iv (GL_MODULATE),	1389	const_iv (GL_MODULATE),
		1390	const_iv (GL_DECAL),
1329	const_iv (GL_REPLACE),	1391	const_iv (GL_REPLACE),
1330	const_iv (GL_COLOR_BUFFER_BIT),	1392	const_iv (GL_COLOR_BUFFER_BIT),
1331	const_iv (GL_PROJECTION),	1393	const_iv (GL_PROJECTION),
1332	const_iv (GL_MODELVIEW),	1394	const_iv (GL_MODELVIEW),
1333	const_iv (GL_COLOR_LOGIC_OP),	1395	const_iv (GL_COLOR_LOGIC_OP),
		1396	const_iv (GL_SEPARABLE_2D),
1334	const_iv (GL_CONVOLUTION_2D),	1397	const_iv (GL_CONVOLUTION_2D),
1335	const_iv (GL_CONVOLUTION_BORDER_MODE),	1398	const_iv (GL_CONVOLUTION_BORDER_MODE),
1336	const_iv (GL_CONSTANT_BORDER),	1399	const_iv (GL_CONSTANT_BORDER),
1337	const_iv (GL_LINES),	1400	const_iv (GL_LINES),
1338	const_iv (GL_QUADS),	1401	const_iv (GL_QUADS),
…		…
1363		1426
1364	void glBlendFunc (int sfactor, int dfactor)	1427	void glBlendFunc (int sfactor, int dfactor)
1365		1428
1366	void glLogicOp (int opcode)	1429	void glLogicOp (int opcode)
1367		1430
		1431	void glColorMask (int red, int green, int blue, int alpha)
		1432
1368	void glMatrixMode (int mode)	1433	void glMatrixMode (int mode)
1369		1434
1370	void glPushMatrix ()	1435	void glPushMatrix ()
1371		1436
1372	void glPopMatrix ()	1437	void glPopMatrix ()
1373		1438
1374	void glLoadIdentity ()	1439	void glLoadIdentity ()
1375		1440
		1441	# near and far are due to microsofts buggy c compiler
1376	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_)
1377		1443
1378	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)
1379		1447
1380	void glTranslate (float x, float y, float z = 0.)	1448	void glTranslate (float x, float y, float z = 0.)
1381	CODE:	1449	CODE:
1382	glTranslatef (x, y, z);	1450	glTranslatef (x, y, z);
1383		1451
1384	void glScale (float x, float y, float z)	1452	void glScale (float x, float y, float z = 1.)
1385	CODE:	1453	CODE:
1386	glScalef (x, y, z);	1454	glScalef (x, y, z);
1387		1455
1388	void glRotate (float angle, float x, float y, float z)	1456	void glRotate (float angle, float x, float y, float z)
1389	CODE:	1457	CODE:
…		…
1394	void glEnd ()	1462	void glEnd ()
1395		1463
1396	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)
1397	PROTOTYPE: @	1465	PROTOTYPE: @
1398	CODE:	1466	CODE:
1399	glColor4f (r, g, b, a);	1467	glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1400		1468
1401	void glVertex (float x, float y, float z = 0.)	1469	void glVertex (float x, float y, float z = 0.)
1402	CODE:	1470	CODE:
1403	glVertex3f (x, y, z);	1471	glVertex3f (x, y, z);
1404		1472
…		…
1416		1484
1417	void glBindTexture (int target, int name)	1485	void glBindTexture (int target, int name)
1418		1486
1419	void glConvolutionParameter (int target, int pname, float params)	1487	void glConvolutionParameter (int target, int pname, float params)
1420	CODE:	1488	CODE:
1421	glConvolutionParameterf (target, pname, params);	1489	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1422		1490
1423	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));
1424		1500
1425	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)
1426		1502
1427	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)
1428		1510
1429	int glGenTexture ()	1511	int glGenTexture ()
1430	CODE:	1512	CODE:
1431	{	1513	{
1432	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.56 by root, Thu Apr 20 09:13:31 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.56 by root, Thu Apr 20 09:13:31 2006 UTC vs.
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC