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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.10 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.22 by root, Wed Apr 12 20:06:36 2006 UTC

…		…
8	#include <SDL_opengl.h>	8	#include <SDL_opengl.h>
9		9
10	#include <pango/pango.h>	10	#include <pango/pango.h>
11	#include <pango/pangofc-fontmap.h>	11	#include <pango/pangofc-fontmap.h>
12	#include <pango/pangoft2.h>	12	#include <pango/pangoft2.h>
		13
		14	#include <sys/time.h>
		15	#include <sys/types.h>
		16	#include <unistd.h>
13		17
14	#include <sys/types.h>	18	#include <sys/types.h>
15	#include <sys/socket.h>	19	#include <sys/socket.h>
16	#include <netinet/in.h>	20	#include <netinet/in.h>
17	#include <netinet/tcp.h>	21	#include <netinet/tcp.h>
18		22
19	static PangoContext *context;	23	static PangoContext *context;
20	static PangoFontMap *fontmap;	24	static PangoFontMap *fontmap;
21		25
		26	typedef struct cf_layout {
		27	PangoLayout *pl;
		28	int base_height;
		29	} *CFClient__Layout;
		30
		31	static void
		32	substitute_func (FcPattern *pattern, gpointer data)
		33	{
		34	FcPatternAddBool (pattern, FC_HINTING , 1);
		35	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		36	}
		37
		38	static void
		39	layout_update (CFClient__Layout self)
		40	{
		41	/* use a random scale factor to account for unknown descenders, 0.8 works
		42	* reasonably well with bitstream vera
		43	*/
		44	PangoFontDescription *font = pango_context_get_font_description (context);
		45	pango_font_description_set_absolute_size (font, self->base_height * (PANGO_SCALE * 8 / 10));
		46	}
		47
		48	static void
		49	layout_get_pixel_size (CFClient__Layout self, int w, int h)
		50	{
		51	layout_update (self);
		52
		53	pango_layout_get_pixel_size (self->pl, w, h);
		54
		55	w = (w + 3) & ~3;
		56	if (!w) w = 1;
		57	if (!h) h = 1;
		58	}
		59
22	MODULE = Crossfire::Client PACKAGE = Crossfire::Client	60	MODULE = CFClient PACKAGE = CFClient
		61
		62	PROTOTYPES: ENABLE
23		63
24	BOOT:	64	BOOT:
25	{	65	{
26	fontmap = pango_ft2_font_map_new ();	66	fontmap = pango_ft2_font_map_new ();
		67	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
27	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	68	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
28	}	69	}
29		70
30	void	71	void
31	lowdelay (int fd, int val = 1)	72	lowdelay (int fd, int val = 1)
…		…
45	RETVAL = (char *)glGetString (GL_EXTENSIONS);	86	RETVAL = (char *)glGetString (GL_EXTENSIONS);
46	OUTPUT:	87	OUTPUT:
47	RETVAL	88	RETVAL
48		89
49	void	90	void
		91	add_font (char *file)
		92	CODE:
		93	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		94
		95	void
50	set_font (char *file)	96	set_font (char *file)
51	CODE:	97	CODE:
52	{	98	{
53	int count;	99	int count;
54	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);	100	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
55	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
56	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);	101	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
57	FcPatternDestroy (pattern);	102	FcPatternDestroy (pattern);
58	pango_context_set_font_description (context, font);	103	pango_context_set_font_description (context, font);
59	}	104	}
60		105
61	void	106	MODULE = CFClient PACKAGE = CFClient::Layout
62	font_render (SV *text_, int height = 10)	107
		108	CFClient::Layout
		109	new (SV *class, int base_height = 10)
63	PPCODE:	110	CODE:
		111	New (0, RETVAL, 1, struct cf_layout);
		112	RETVAL->base_height = base_height;
		113	RETVAL->pl = pango_layout_new (context);
		114	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		115	OUTPUT:
		116	RETVAL
		117
		118	void
		119	DESTROY (CFClient::Layout self)
		120	CODE:
		121	g_object_unref (self->pl);
		122	Safefree (self);
		123
		124	void
		125	set_markup (CFClient::Layout self, SV *text_)
		126	CODE:
64	{	127	{
65	STRLEN textlen;	128	STRLEN textlen;
66	char *text = SvPVutf8 (text_, textlen);	129	char *text = SvPVutf8 (text_, textlen);
		130
		131	pango_layout_set_markup (self->pl, text, textlen);
		132	}
		133
		134	void
		135	set_height (CFClient::Layout self, int base_height)
		136	CODE:
		137	self->base_height = base_height;
		138
		139	void
		140	set_width (CFClient::Layout self, int max_width = -1)
		141	CODE:
		142	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
		143
		144	void
		145	size (CFClient::Layout self)
		146	PPCODE:
		147	{
		148	int w, h;
		149
		150	layout_update (self);
		151	layout_get_pixel_size (self, &w, &h);
		152
		153	EXTEND (SP, 2);
		154	PUSHs (sv_2mortal (newSViv (w)));
		155	PUSHs (sv_2mortal (newSViv (h)));
		156	}
		157
		158	int
		159	xy_to_index (CFClient::Layout self, int x, int y)
		160	CODE:
		161	{
		162	int index, trailing;
		163
		164	layout_update (self);
		165	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
		166
		167	RETVAL = index;
		168	}
		169	OUTPUT:
		170	RETVAL
		171
		172	void
		173	cursor_pos (CFClient::Layout self, int index)
		174	PPCODE:
		175	{
		176	PangoRectangle strong_pos;
		177	layout_update (self);
		178	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
		179	EXTEND (SP, 3);
		180	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
		181	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
		182	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
		183	}
		184
		185	void
		186	render (CFClient::Layout self)
		187	PPCODE:
		188	{
67	SV *retval;	189	SV *retval;
68	int w, h;	190	int w, h;
69	FT_Bitmap bitmap;	191	FT_Bitmap bitmap;
70	PangoLayout *layout;
71	PangoFontDescription *font = pango_context_get_font_description (context);
72	pango_font_description_set_absolute_size (font, height * PANGO_SCALE);
73		192
74	layout = pango_layout_new (context);	193	layout_update (self);
75	pango_layout_set_markup (layout, text, textlen);
76	pango_layout_get_pixel_size (layout, &w, &h);	194	layout_get_pixel_size (self, &w, &h);
77
78	w = (w + 3) & ~3;
79	if (!w) w = 1;
80	if (!h) h = 1;
81		195
82	retval = newSV (w * h);	196	retval = newSV (w * h);
83	SvPOK_only (retval);	197	SvPOK_only (retval);
84	SvCUR_set (retval, w * h);	198	SvCUR_set (retval, w * h);
85		199
…		…
90	bitmap.num_grays = 256;	204	bitmap.num_grays = 256;
91	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	205	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
92		206
93	memset (bitmap.buffer, 0, w * h);	207	memset (bitmap.buffer, 0, w * h);
94		208
95	pango_ft2_render_layout (&bitmap, layout, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	209	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
96	g_object_unref (layout);
97		210
98	EXTEND (SP, 3);	211	EXTEND (SP, 3);
99	PUSHs (sv_2mortal (newSViv (w)));	212	PUSHs (sv_2mortal (newSViv (w)));
100	PUSHs (sv_2mortal (newSViv (h)));	213	PUSHs (sv_2mortal (newSViv (h)));
101	PUSHs (sv_2mortal (retval));	214	PUSHs (sv_2mortal (retval));
102	}	215	}
		216
		217	MODULE = CFClient PACKAGE = CFClient::Texture
		218
		219	void
		220	draw_quad (SV *self, double x, double y, double w = 0, double h = 0)
		221	PROTOTYPE: $$$;$$
		222	CODE:
		223	{
		224	HV hv = (HV )SvRV (self);
		225	double s = SvNV (*hv_fetch (hv, "s", 1, 1));
		226	double t = SvNV (*hv_fetch (hv, "t", 1, 1));
		227	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
		228
		229	if (items < 5)
		230	{
		231	w = SvNV (*hv_fetch (hv, "w", 1, 1));
		232	h = SvNV (*hv_fetch (hv, "h", 1, 1));
		233	}
		234
		235	glBindTexture (GL_TEXTURE_2D, name);
		236	glBegin (GL_QUADS);
		237	glTexCoord2d (0, 0); glVertex2d (x , y );
		238	glTexCoord2d (0, t); glVertex2d (x , y + h);
		239	glTexCoord2d (s, t); glVertex2d (x + w, y + h);
		240	glTexCoord2d (s, 0); glVertex2d (x + w, y );
		241	glEnd ();
		242	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.10 by root, Sun Apr 9 17:34:15 2006 UTC vs. Revision 1.22 by root, Wed Apr 12 20:06:36 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.10 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.22 by root, Wed Apr 12 20:06:36 2006 UTC