[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.70 by root, Sun Apr 30 09:21:47 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;
…		…
441		457
442	while (SDL_PollEvent (&ev))	458	while (SDL_PollEvent (&ev))
443	{	459	{
444	HV *hv = newHV ();	460	HV *hv = newHV ();
445	hv_store (hv, "type", 4, newSViv (ev.type), 0);	461	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		462
446	switch (ev.type)	463	switch (ev.type)
447	{	464	{
448	case SDL_KEYDOWN:	465	case SDL_KEYDOWN:
449	case SDL_KEYUP:	466	case SDL_KEYUP:
450	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	467	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
470	case SDL_MOUSEBUTTONUP:	487	case SDL_MOUSEBUTTONUP:
471	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	488	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
472	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	489	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
473	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	490	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
474	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	491	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		492	break;
475	}	493	}
476		494
477	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	495	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
478	}	496	}
479	}	497	}
…		…
512		530
513	void	531	void
514	add_font (char *file)	532	add_font (char *file)
515	CODE:	533	CODE:
516	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	534	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
517
518	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		535
529	void	536	void
530	load_image_inline (SV *image_)	537	load_image_inline (SV *image_)
531	ALIAS:	538	ALIAS:
532	load_image_file = 1	539	load_image_file = 1
…		…
614	PUSHs (sv_2mortal (newSViv (b / y)));	621	PUSHs (sv_2mortal (newSViv (b / y)));
615	PUSHs (sv_2mortal (newSViv (a / y)));	622	PUSHs (sv_2mortal (newSViv (a / y)));
616	}	623	}
617		624
618	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
619	fatal (char *message)	635	fatal (char *message)
620	CODE:	636	CODE:
621	#ifdef _WIN32	637	#ifdef _WIN32
622	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);
623	#else	639	#else
624	fprintf (stderr, "FATAL: %s\n", message);	640	fprintf (stderr, "FATAL: %s\n", message);
625	#endif	641	#endif
626	exit (1);	642	exit (1);
627		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
628	MODULE = CFClient PACKAGE = CFClient::Layout	668	MODULE = CFClient PACKAGE = CFClient::Layout
629		669
630	CFClient::Layout	670	CFClient::Layout
631	new (SV *class, int base_height = 10)	671	new (SV *class, int base_height = MIN_FONT_HEIGHT)
632	CODE:	672	CODE:
633	New (0, RETVAL, 1, struct cf_layout);	673	New (0, RETVAL, 1, struct cf_layout);
		674	RETVAL->pl = pango_layout_new (context);
634	RETVAL->base_height = base_height;	675	RETVAL->base_height = base_height;
635	RETVAL->pl = pango_layout_new (context);	676	RETVAL->font = 0;
636	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);
637	OUTPUT:	679	OUTPUT:
638	RETVAL	680	RETVAL
639		681
640	void	682	void
641	DESTROY (CFClient::Layout self)	683	DESTROY (CFClient::Layout self)
…		…
670	SvUTF8_on (RETVAL);	712	SvUTF8_on (RETVAL);
671	OUTPUT:	713	OUTPUT:
672	RETVAL	714	RETVAL
673		715
674	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
675	set_height (CFClient::Layout self, int base_height)	726	set_height (CFClient::Layout self, int base_height)
676	CODE:	727	CODE:
		728	if (self->base_height != base_height)
		729	{
677	self->base_height = base_height;	730	self->base_height = base_height;
		731	layout_update_font (self);
		732	}
678		733
679	void	734	void
680	set_width (CFClient::Layout self, int max_width = -1)	735	set_width (CFClient::Layout self, int max_width = -1)
681	CODE:	736	CODE:
682	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);
…		…
685	size (CFClient::Layout self)	740	size (CFClient::Layout self)
686	PPCODE:	741	PPCODE:
687	{	742	{
688	int w, h;	743	int w, h;
689		744
690	layout_update (self);
691	layout_get_pixel_size (self, &w, &h);	745	layout_get_pixel_size (self, &w, &h);
692		746
693	EXTEND (SP, 2);	747	EXTEND (SP, 2);
694	PUSHs (sv_2mortal (newSViv (w)));	748	PUSHs (sv_2mortal (newSViv (w)));
695	PUSHs (sv_2mortal (newSViv (h)));	749	PUSHs (sv_2mortal (newSViv (h)));
…		…
698	int	752	int
699	xy_to_index (CFClient::Layout self, int x, int y)	753	xy_to_index (CFClient::Layout self, int x, int y)
700	CODE:	754	CODE:
701	{	755	{
702	int index, trailing;	756	int index, trailing;
703
704	layout_update (self);
705	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);
706
707	RETVAL = index;	758	RETVAL = index;
708	}	759	}
709	OUTPUT:	760	OUTPUT:
710	RETVAL	761	RETVAL
711		762
712	void	763	void
713	cursor_pos (CFClient::Layout self, int index)	764	cursor_pos (CFClient::Layout self, int index)
714	PPCODE:	765	PPCODE:
715	{	766	{
716	PangoRectangle strong_pos;	767	PangoRectangle strong_pos;
717	layout_update (self);
718	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	768	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
719		769
720	EXTEND (SP, 3);	770	EXTEND (SP, 3);
721	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	771	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
722	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	772	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
729	{	779	{
730	SV *retval;	780	SV *retval;
731	int w, h;	781	int w, h;
732	FT_Bitmap bitmap;	782	FT_Bitmap bitmap;
733		783
734	layout_update (self);
735	layout_get_pixel_size (self, &w, &h);	784	layout_get_pixel_size (self, &w, &h);
736		785
737	retval = newSV (w * h);	786	retval = newSV (w * h);
738	SvPOK_only (retval);	787	SvPOK_only (retval);
739	SvCUR_set (retval, w * h);	788	SvCUR_set (retval, w * h);
…		…
1301	} *civ, const_iv[] = {	1350	} *civ, const_iv[] = {
1302	# define const_iv(name) { # name, (IV)name }	1351	# define const_iv(name) { # name, (IV)name }
1303	const_iv (GL_COLOR_MATERIAL),	1352	const_iv (GL_COLOR_MATERIAL),
1304	const_iv (GL_SMOOTH),	1353	const_iv (GL_SMOOTH),
1305	const_iv (GL_FLAT),	1354	const_iv (GL_FLAT),
		1355	const_iv (GL_DITHER),
1306	const_iv (GL_BLEND),	1356	const_iv (GL_BLEND),
		1357	const_iv (GL_SCISSOR_TEST),
1307	const_iv (GL_AND),	1358	const_iv (GL_AND),
		1359	const_iv (GL_ONE),
		1360	const_iv (GL_ZERO),
1308	const_iv (GL_SRC_ALPHA),	1361	const_iv (GL_SRC_ALPHA),
		1362	const_iv (GL_SRC_ALPHA_SATURATE),
1309	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1363	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1364	const_iv (GL_ONE_MINUS_DST_ALPHA),
1310	const_iv (GL_RGB),	1365	const_iv (GL_RGB),
1311	const_iv (GL_RGBA),	1366	const_iv (GL_RGBA),
1312	const_iv (GL_UNSIGNED_BYTE),	1367	const_iv (GL_UNSIGNED_BYTE),
1313	const_iv (GL_ALPHA4),
1314	const_iv (GL_ALPHA),	1368	const_iv (GL_ALPHA),
1315	const_iv (GL_FLOAT),	1369	const_iv (GL_FLOAT),
1316	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1370	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1317	const_iv (GL_COMPILE),	1371	const_iv (GL_COMPILE),
1318	const_iv (GL_TEXTURE_1D),	1372	const_iv (GL_TEXTURE_1D),
…		…
1330	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1384	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1331	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1385	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1332	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1386	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1333	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1387	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1334	const_iv (GL_GENERATE_MIPMAP),	1388	const_iv (GL_GENERATE_MIPMAP),
1335	const_iv (GL_LINEAR),
1336	const_iv (GL_MODULATE),	1389	const_iv (GL_MODULATE),
		1390	const_iv (GL_DECAL),
1337	const_iv (GL_REPLACE),	1391	const_iv (GL_REPLACE),
1338	const_iv (GL_COLOR_BUFFER_BIT),	1392	const_iv (GL_COLOR_BUFFER_BIT),
1339	const_iv (GL_PROJECTION),	1393	const_iv (GL_PROJECTION),
1340	const_iv (GL_MODELVIEW),	1394	const_iv (GL_MODELVIEW),
1341	const_iv (GL_COLOR_LOGIC_OP),	1395	const_iv (GL_COLOR_LOGIC_OP),
		1396	const_iv (GL_SEPARABLE_2D),
1342	const_iv (GL_CONVOLUTION_2D),	1397	const_iv (GL_CONVOLUTION_2D),
1343	const_iv (GL_CONVOLUTION_BORDER_MODE),	1398	const_iv (GL_CONVOLUTION_BORDER_MODE),
1344	const_iv (GL_CONSTANT_BORDER),	1399	const_iv (GL_CONSTANT_BORDER),
1345	const_iv (GL_LINES),	1400	const_iv (GL_LINES),
1346	const_iv (GL_QUADS),	1401	const_iv (GL_QUADS),
…		…
1371		1426
1372	void glBlendFunc (int sfactor, int dfactor)	1427	void glBlendFunc (int sfactor, int dfactor)
1373		1428
1374	void glLogicOp (int opcode)	1429	void glLogicOp (int opcode)
1375		1430
		1431	void glColorMask (int red, int green, int blue, int alpha)
		1432
1376	void glMatrixMode (int mode)	1433	void glMatrixMode (int mode)
1377		1434
1378	void glPushMatrix ()	1435	void glPushMatrix ()
1379		1436
1380	void glPopMatrix ()	1437	void glPopMatrix ()
1381		1438
1382	void glLoadIdentity ()	1439	void glLoadIdentity ()
1383		1440
		1441	# 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)	1442	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1385		1443
1386	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)
1387		1447
1388	void glTranslate (float x, float y, float z = 0.)	1448	void glTranslate (float x, float y, float z = 0.)
1389	CODE:	1449	CODE:
1390	glTranslatef (x, y, z);	1450	glTranslatef (x, y, z);
1391		1451
1392	void glScale (float x, float y, float z)	1452	void glScale (float x, float y, float z = 1.)
1393	CODE:	1453	CODE:
1394	glScalef (x, y, z);	1454	glScalef (x, y, z);
1395		1455
1396	void glRotate (float angle, float x, float y, float z)	1456	void glRotate (float angle, float x, float y, float z)
1397	CODE:	1457	CODE:
…		…
1402	void glEnd ()	1462	void glEnd ()
1403		1463
1404	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)
1405	PROTOTYPE: @	1465	PROTOTYPE: @
1406	CODE:	1466	CODE:
1407	glColor4f (r, g, b, a);	1467	glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1408		1468
1409	void glVertex (float x, float y, float z = 0.)	1469	void glVertex (float x, float y, float z = 0.)
1410	CODE:	1470	CODE:
1411	glVertex3f (x, y, z);	1471	glVertex3f (x, y, z);
1412		1472
…		…
1424		1484
1425	void glBindTexture (int target, int name)	1485	void glBindTexture (int target, int name)
1426		1486
1427	void glConvolutionParameter (int target, int pname, float params)	1487	void glConvolutionParameter (int target, int pname, float params)
1428	CODE:	1488	CODE:
1429	glConvolutionParameterf (target, pname, params);	1489	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1430		1490
1431	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));
1432		1500
1433	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)
1434		1502
1435	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)
1436		1510
1437	int glGenTexture ()	1511	int glGenTexture ()
1438	CODE:	1512	CODE:
1439	{	1513	{
1440	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.57 by root, Fri Apr 21 07:09:10 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.57 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC