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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC vs.
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC

…		…
42	typedef signed int int32_t;	42	typedef signed int int32_t;
43	#endif	43	#endif
44		44
45	#include "glext.h"	45	#include "glext.h"
46		46
		47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
		48
47	#define FOW_DARKNESS 32	49	#define FOW_DARKNESS 32
48		50
49	#define MAP_EXTEND_X 32	51	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	52	#define MAP_EXTEND_Y 512
51		53
…		…
70		72
71	typedef Mix_Chunk *CFClient__MixChunk;	73	typedef Mix_Chunk *CFClient__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	74	typedef Mix_Music *CFClient__MixMusic;
73		75
74	typedef PangoFontDescription *CFClient__Font;	76	typedef PangoFontDescription *CFClient__Font;
		77
		78	static int
		79	shape_attr_p (PangoLayoutRun *run)
		80	{
		81	GSList *attrs = run->item->analysis.extra_attrs;
		82
		83	while (attrs)
		84	{
		85	PangoAttribute *attr = attrs->data;
		86
		87	if (attr->klass->type == PANGO_ATTR_SHAPE)
		88	return 1;
		89
		90	attrs = attrs->next;
		91	}
		92
		93	return 0;
		94	}
75		95
76	typedef struct cf_layout {	96	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	97	PangoLayout *pl; // either derived from a cairo or ft2 context
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)	98	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	99	float r, g, b, a; // default color for rgba mode
…		…
810	char *text = SvPVutf8 (text_, textlen);	830	char *text = SvPVutf8 (text_, textlen);
811		831
812	pango_layout_set_markup (self->pl, text, textlen);	832	pango_layout_set_markup (self->pl, text, textlen);
813	}	833	}
814		834
		835	void
		836	set_shapes (CFClient::Layout self, ...)
		837	CODE:
		838	{
		839	PangoAttrList *attrs = 0;
		840	const char *text = pango_layout_get_text (self->pl);
		841	const char *pos = text;
		842	int arg = 2;
		843
		844	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		845	{
		846	PangoRectangle rect;
		847	PangoAttribute *attr;
		848
		849	int w = SvIV (ST (arg - 1));
		850	int h = SvIV (ST (arg));
		851
		852	arg += 2;
		853
		854	rect.x = 0;
		855	rect.y = -h * PANGO_SCALE;
		856	rect.width = w * PANGO_SCALE;
		857	rect.height = h * PANGO_SCALE;
		858
		859	if (!attrs)
		860	attrs = pango_layout_get_attributes (self->pl);
		861
		862	attr = pango_attr_shape_new (&rect, &rect);
		863	attr->start_index = pos - text;
		864	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		865	pango_attr_list_insert (attrs, attr);
		866
		867	pos += sizeof (OBJ_STR) - 1;
		868	}
		869
		870	if (attrs)
		871	pango_layout_set_attributes (self->pl, attrs);
		872	}
		873
		874	void
		875	get_shapes (CFClient::Layout self)
		876	PPCODE:
		877	{
		878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		879
		880	do
		881	{
		882	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		883
		884	if (run && shape_attr_p (run))
		885	{
		886	PangoRectangle extents;
		887	pango_layout_iter_get_run_extents (iter, 0, &extents);
		888
		889	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		891	}
		892	}
		893	while (pango_layout_iter_next_run (iter));
		894
		895	pango_layout_iter_free (iter);
		896	}
		897
		898	int
		899	has_wrapped (CFClient::Layout self)
		900	CODE:
		901	{
		902	int lines = 1;
		903	const char *text = pango_layout_get_text (self->pl);
		904
		905	while (*text)
		906	lines += *text++ == '\n';
		907
		908	RETVAL = lines < pango_layout_get_line_count (self->pl);
		909	}
		910	OUTPUT:
		911	RETVAL
		912
815	SV *	913	SV *
816	get_text (CFClient::Layout self)	914	get_text (CFClient::Layout self)
817	CODE:	915	CODE:
818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	916	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819	sv_utf8_decode (RETVAL);	917	sv_utf8_decode (RETVAL);
…		…
1233		1331
1234	while (data < data_end)	1332	while (data < data_end)
1235	{	1333	{
1236	flags = (data [0] << 8) + data [1]; data += 2;	1334	flags = (data [0] << 8) + data [1]; data += 2;
1237		1335
1238	x = ((flags >> 10) & 63) + self->x;	1336	x = self->x + ((flags >> 10) & 63);
1239	y = ((flags >> 4) & 63) + self->y;	1337	y = self->y + ((flags >> 4) & 63);
1240		1338
1241	cell = map_get_cell (self, x, y);	1339	cell = map_get_cell (self, x, y);
1242		1340
1243	if (flags & 15)	1341	if (flags & 15)
1244	{	1342	{
…		…
1341	int vx, vy;	1439	int vx, vy;
1342	int x, y, z;	1440	int x, y, z;
1343	int last_name;	1441	int last_name;
1344	mapface face;	1442	mapface face;
1345		1443
1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1444	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1445	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1348		1446
1349	/*	1447	/*
1350	int vx = self->vx = self->w >= sw	1448	int vx = self->vx = self->w >= sw
1351	? self->x + (self->w - sw) / 2	1449	? self->x + (self->w - sw) / 2
1352	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1450	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1356	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1454	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1357	*/	1455	*/
1358		1456
1359	glColor4ub (255, 255, 255, 255);	1457	glColor4ub (255, 255, 255, 255);
1360		1458
		1459	glEnable (GL_BLEND);
1361	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1460	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1362	glEnable (GL_BLEND);
1363	glEnable (GL_TEXTURE_2D);	1461	glEnable (GL_TEXTURE_2D);
1364	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1462	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1365		1463
1366	glBegin (GL_QUADS);	1464	glBegin (GL_QUADS);
1367		1465
…		…
1405		1503
1406	glEnd ();	1504	glEnd ();
1407		1505
1408	glDisable (GL_TEXTURE_2D);	1506	glDisable (GL_TEXTURE_2D);
1409	glDisable (GL_BLEND);	1507	glDisable (GL_BLEND);
		1508	}
		1509
		1510	void
		1511	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1512	CODE:
		1513	{
		1514	static float color[16][3] = {
		1515	{ 0.00, 0.00, 0.00 },
		1516	{ 1.00, 1.00, 1.00 },
		1517	{ 0.00, 0.00, 0.55 },
		1518	{ 1.00, 0.00, 0.00 },
		1519
		1520	{ 1.00, 0.54, 0.00 },
		1521	{ 0.11, 0.56, 1.00 },
		1522	{ 0.93, 0.46, 0.00 },
		1523	{ 0.18, 0.54, 0.34 },
		1524
		1525	{ 0.56, 0.73, 0.56 },
		1526	{ 0.80, 0.80, 0.80 },
		1527	{ 0.55, 0.41, 0.13 },
		1528	{ 0.99, 0.77, 0.26 },
		1529
		1530	{ 0.74, 0.65, 0.41 },
		1531
		1532	{ 0.00, 1.00, 1.00 },
		1533	{ 1.00, 0.00, 1.00 },
		1534	{ 1.00, 1.00, 0.00 },
		1535	};
		1536
		1537	int x, y;
		1538
		1539	glEnable (GL_TEXTURE_2D);
		1540	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1541	glEnable (GL_BLEND);
		1542	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1543	glBegin (GL_QUADS);
		1544
		1545	for (y = 0; y < h; y++)
		1546	for (x = 0; x < w; x++)
		1547	{
		1548	unsigned char m = data [x + y * w];
		1549
		1550	if (m)
		1551	{
		1552	float *c = color [m & 15];
		1553
		1554	float tx1 = m & 0x40 ? 0.5 : 0.;
		1555	float tx2 = tx1 + 0.5;
		1556
		1557	glColor4f (c[0], c[1], c[2], 0.75);
		1558	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1559	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1560	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1561	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1562	}
		1563	}
		1564
		1565	glEnd ();
		1566	glDisable (GL_BLEND);
		1567	glDisable (GL_TEXTURE_2D);
1410	}	1568	}
1411		1569
1412	void	1570	void
1413	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1571	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1414	PPCODE:	1572	PPCODE:
…		…
1655	const_iv (GL_SCISSOR_TEST),	1813	const_iv (GL_SCISSOR_TEST),
1656	const_iv (GL_DEPTH_TEST),	1814	const_iv (GL_DEPTH_TEST),
1657	const_iv (GL_ALPHA_TEST),	1815	const_iv (GL_ALPHA_TEST),
1658	const_iv (GL_NORMALIZE),	1816	const_iv (GL_NORMALIZE),
1659	const_iv (GL_RESCALE_NORMAL),	1817	const_iv (GL_RESCALE_NORMAL),
		1818	const_iv (GL_FRONT),
		1819	const_iv (GL_BACK),
1660	const_iv (GL_AND),	1820	const_iv (GL_AND),
1661	const_iv (GL_ONE),	1821	const_iv (GL_ONE),
1662	const_iv (GL_ZERO),	1822	const_iv (GL_ZERO),
1663	const_iv (GL_SRC_ALPHA),	1823	const_iv (GL_SRC_ALPHA),
1664	const_iv (GL_DST_ALPHA),	1824	const_iv (GL_DST_ALPHA),
…		…
1786		1946
1787	void glPopMatrix ()	1947	void glPopMatrix ()
1788		1948
1789	void glLoadIdentity ()	1949	void glLoadIdentity ()
1790		1950
		1951	void glDrawBuffer (int buffer)
		1952
		1953	void glReadBuffer (int buffer)
		1954
1791	# near_ and far_ are due to microsofts buggy "c" compiler	1955	# near_ and far_ are due to microsofts buggy "c" compiler
1792	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1956	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1793		1957
1794	# near_ and far_ are due to microsofts buggy "c" compiler	1958	# near_ and far_ are due to microsofts buggy "c" compiler
1795	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1959	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC vs. Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC vs.
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC