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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.13 by root, Tue Apr 11 12:27:51 2006 UTC vs.
Revision 1.18 by root, Tue Apr 11 19:31:17 2006 UTC

…		…
17	#include <netinet/tcp.h>	17	#include <netinet/tcp.h>
18		18
19	static PangoContext *context;	19	static PangoContext *context;
20	static PangoFontMap *fontmap;	20	static PangoFontMap *fontmap;
21		21
		22	typedef struct cf_layout {
		23	PangoLayout *pl;
		24	int base_height;
		25	} *CFClient__Layout;
		26
		27	static void
		28	layout_update (CFClient__Layout self)
		29	{
		30	PangoFontDescription *font = pango_context_get_font_description (context);
		31	pango_font_description_set_absolute_size (font, self->base_height * PANGO_SCALE);
		32	}
		33
		34	static void
		35	layout_get_pixel_size (CFClient__Layout self, int w, int h)
		36	{
		37	PangoFontDescription *font = pango_context_get_font_description (context);
		38	pango_font_description_set_absolute_size (font, self->base_height * PANGO_SCALE);
		39
		40	pango_layout_get_pixel_size (self->pl, w, h);
		41
		42	w = (w + 3) & ~3;
		43	if (!w) w = 1;
		44	if (!h) h = 1;
		45	}
		46
22	MODULE = Crossfire::Client PACKAGE = Crossfire::Client	47	MODULE = CFClient PACKAGE = CFClient
23		48
24	PROTOTYPES: ENABLE	49	PROTOTYPES: ENABLE
25		50
26	BOOT:	51	BOOT:
27	{	52	{
…		…
62	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);	87	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
63	FcPatternDestroy (pattern);	88	FcPatternDestroy (pattern);
64	pango_context_set_font_description (context, font);	89	pango_context_set_font_description (context, font);
65	}	90	}
66		91
67	MODULE = Crossfire::Client PACKAGE = Crossfire::Client	92	MODULE = CFClient PACKAGE = CFClient::Layout
68		93
69	void	94	CFClient::Layout
70	font_render (SV *text_, int height = 10)	95	new (SV *class, int base_height = 10)
71	PPCODE:	96	CODE:
		97	New (0, RETVAL, 1, struct cf_layout);
		98	RETVAL->base_height = base_height;
		99	RETVAL->pl = pango_layout_new (context);
		100	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		101	OUTPUT:
		102	RETVAL
		103
		104	void
		105	DESTROY (CFClient::Layout self)
		106	CODE:
		107	g_object_unref (self->pl);
		108	Safefree (self);
		109
		110	void
		111	set_markup (CFClient::Layout self, SV *text_)
		112	CODE:
72	{	113	{
73	STRLEN textlen;	114	STRLEN textlen;
74	char *text = SvPVutf8 (text_, textlen);	115	char *text = SvPVutf8 (text_, textlen);
		116
		117	pango_layout_set_markup (self->pl, text, textlen);
		118	}
		119
		120	void
		121	set_height (CFClient::Layout self, int base_height)
		122	CODE:
		123	self->base_height = base_height;
		124
		125	void
		126	set_width (CFClient::Layout self, int max_width = -1)
		127	CODE:
		128	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
		129
		130	void
		131	size (CFClient::Layout self)
		132	PPCODE:
		133	{
		134	int w, h;
		135
		136	layout_update (self);
		137	layout_get_pixel_size (self, &w, &h);
		138
		139	EXTEND (SP, 2);
		140	PUSHs (sv_2mortal (newSViv (w)));
		141	PUSHs (sv_2mortal (newSViv (h)));
		142	}
		143
		144	int
		145	xy_to_index (CFClient::Layout self, int x, int y)
		146	CODE:
		147	{
		148	int index, trailing;
		149
		150	layout_update (self);
		151	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
		152
		153	RETVAL = index;
		154	}
		155	OUTPUT:
		156	RETVAL
		157
		158	void
		159	cursor_pos (CFClient::Layout self, int index)
		160	PPCODE:
		161	{
		162	PangoRectangle strong_pos;
		163	layout_update (self);
		164	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
		165	EXTEND (SP, 3);
		166	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
		167	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
		168	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
		169	}
		170
		171	void
		172	render (CFClient::Layout self)
		173	PPCODE:
		174	{
75	SV *retval;	175	SV *retval;
76	int w, h;	176	int w, h;
77	FT_Bitmap bitmap;	177	FT_Bitmap bitmap;
78	PangoLayout *layout;
79	PangoFontDescription *font = pango_context_get_font_description (context);
80	pango_font_description_set_absolute_size (font, height * PANGO_SCALE);
81		178
82	layout = pango_layout_new (context);	179	layout_update (self);
83	pango_layout_set_markup (layout, text, textlen);
84	pango_layout_get_pixel_size (layout, &w, &h);	180	layout_get_pixel_size (self, &w, &h);
85
86	w = (w + 3) & ~3;
87	if (!w) w = 1;
88	if (!h) h = 1;
89		181
90	retval = newSV (w * h);	182	retval = newSV (w * h);
91	SvPOK_only (retval);	183	SvPOK_only (retval);
92	SvCUR_set (retval, w * h);	184	SvCUR_set (retval, w * h);
93		185
…		…
98	bitmap.num_grays = 256;	190	bitmap.num_grays = 256;
99	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	191	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
100		192
101	memset (bitmap.buffer, 0, w * h);	193	memset (bitmap.buffer, 0, w * h);
102		194
103	pango_ft2_render_layout (&bitmap, layout, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	195	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
104	g_object_unref (layout);
105		196
106	EXTEND (SP, 3);	197	EXTEND (SP, 3);
107	PUSHs (sv_2mortal (newSViv (w)));	198	PUSHs (sv_2mortal (newSViv (w)));
108	PUSHs (sv_2mortal (newSViv (h)));	199	PUSHs (sv_2mortal (newSViv (h)));
109	PUSHs (sv_2mortal (retval));	200	PUSHs (sv_2mortal (retval));
110	}	201	}
111		202
112	MODULE = Crossfire::Client PACKAGE = Crossfire::Client::Texture	203	MODULE = CFClient PACKAGE = CFClient::Texture
113		204
114	void	205	void
115	draw_quad (SV *self, double x, double y, double w = 0, double h = 0)	206	draw_quad (SV *self, double x, double y, double w = 0, double h = 0)
116	PROTOTYPE: $$$;$$	207	PROTOTYPE: $$$;$$
117	CODE:	208	CODE:
…		…
121	double t = SvNV (*hv_fetch (hv, "t", 1, 1));	212	double t = SvNV (*hv_fetch (hv, "t", 1, 1));
122	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	213	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
123		214
124	if (items < 5)	215	if (items < 5)
125	{	216	{
126	w = SvNV (*hv_fetch (hv, "width", 5, 1));	217	w = SvNV (*hv_fetch (hv, "w", 1, 1));
127	h = SvNV (*hv_fetch (hv, "height", 6, 1));	218	h = SvNV (*hv_fetch (hv, "h", 1, 1));
128	}	219	}
129		220
130	glBindTexture (GL_TEXTURE_2D, name);	221	glBindTexture (GL_TEXTURE_2D, name);
131	glBegin (GL_QUADS);	222	glBegin (GL_QUADS);
132	glTexCoord2d (0, 0); glVertex2d (x , y );	223	glTexCoord2d (0, 0); glVertex2d (x , y );

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.13 by root, Tue Apr 11 12:27:51 2006 UTC vs. Revision 1.18 by root, Tue Apr 11 19:31:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.13 by root, Tue Apr 11 12:27:51 2006 UTC vs.
Revision 1.18 by root, Tue Apr 11 19:31:17 2006 UTC