[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.71 by root, Fri May 5 19:05: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;
…		…
249	SDL_UserEvent ev;	265	SDL_UserEvent ev;
250		266
251	ev.type = SDL_USEREVENT;	267	ev.type = SDL_USEREVENT;
252	ev.code = 0;	268	ev.code = 0;
253	ev.data1 = 0;	269	ev.data1 = 0;
		270	ev.data2 = 0;
		271
		272	SDL_PushEvent ((SDL_Event *)&ev);
		273	}
		274
		275	static void
		276	channel_finished (int channel)
		277	{
		278	SDL_UserEvent ev;
		279
		280	ev.type = SDL_USEREVENT;
		281	ev.code = 1;
		282	ev.data1 = channel;
254	ev.data2 = 0;	283	ev.data2 = 0;
255		284
256	SDL_PushEvent ((SDL_Event *)&ev);	285	SDL_PushEvent ((SDL_Event *)&ev);
257	}	286	}
258		287
…		…
441		470
442	while (SDL_PollEvent (&ev))	471	while (SDL_PollEvent (&ev))
443	{	472	{
444	HV *hv = newHV ();	473	HV *hv = newHV ();
445	hv_store (hv, "type", 4, newSViv (ev.type), 0);	474	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		475
446	switch (ev.type)	476	switch (ev.type)
447	{	477	{
448	case SDL_KEYDOWN:	478	case SDL_KEYDOWN:
449	case SDL_KEYUP:	479	case SDL_KEYUP:
450	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	480	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
470	case SDL_MOUSEBUTTONUP:	500	case SDL_MOUSEBUTTONUP:
471	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	501	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
472	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	502	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
473	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	503	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
474	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	504	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		505	break;
475	}	506	}
476		507
477	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	508	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
478	}	509	}
479	}	510	}
480		511
481	int	512	int
482	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	513	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
483	POSTCALL:	514	POSTCALL:
484	Mix_HookMusicFinished (music_finished);	515	Mix_HookMusicFinished (music_finished);
		516	Mix_ChannelFinished (channel_finished);
485		517
486	void	518	void
487	Mix_CloseAudio ()	519	Mix_CloseAudio ()
488		520
489	int	521	int
…		…
512		544
513	void	545	void
514	add_font (char *file)	546	add_font (char *file)
515	CODE:	547	CODE:
516	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	548	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		549
529	void	550	void
530	load_image_inline (SV *image_)	551	load_image_inline (SV *image_)
531	ALIAS:	552	ALIAS:
532	load_image_file = 1	553	load_image_file = 1
…		…
614	PUSHs (sv_2mortal (newSViv (b / y)));	635	PUSHs (sv_2mortal (newSViv (b / y)));
615	PUSHs (sv_2mortal (newSViv (a / y)));	636	PUSHs (sv_2mortal (newSViv (a / y)));
616	}	637	}
617		638
618	void	639	void
		640	error (char *message)
		641	CODE:
		642	#ifdef _WIN32
		643	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
		644	#else
		645	fprintf (stderr, "ERROR: %s\n", message);
		646	#endif
		647
		648	void
619	fatal (char *message)	649	fatal (char *message)
620	CODE:	650	CODE:
621	#ifdef _WIN32	651	#ifdef _WIN32
622	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	652	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
623	#else	653	#else
624	fprintf (stderr, "FATAL: %s\n", message);	654	fprintf (stderr, "FATAL: %s\n", message);
625	#endif	655	#endif
626	exit (1);	656	exit (1);
627		657
		658	MODULE = CFClient PACKAGE = CFClient::Font
		659
		660	CFClient::Font
		661	new_from_file (SV class, char path, int id = 0)
		662	CODE:
		663	{
		664	int count;
		665	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		666	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		667	FcPatternDestroy (pattern);
		668	}
		669	OUTPUT:
		670	RETVAL
		671
		672	void
		673	DESTROY (CFClient::Font self)
		674	CODE:
		675	pango_font_description_free (self);
		676
		677	void
		678	make_default (CFClient::Font self)
		679	CODE:
		680	default_font = self;
		681
628	MODULE = CFClient PACKAGE = CFClient::Layout	682	MODULE = CFClient PACKAGE = CFClient::Layout
629		683
630	CFClient::Layout	684	CFClient::Layout
631	new (SV *class, int base_height = 10)	685	new (SV *class, int base_height = MIN_FONT_HEIGHT)
632	CODE:	686	CODE:
633	New (0, RETVAL, 1, struct cf_layout);	687	New (0, RETVAL, 1, struct cf_layout);
		688	RETVAL->pl = pango_layout_new (context);
634	RETVAL->base_height = base_height;	689	RETVAL->base_height = base_height;
635	RETVAL->pl = pango_layout_new (context);	690	RETVAL->font = 0;
636	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	691	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		692	pango_layout_set_font_description (RETVAL->pl, default_font);
637	OUTPUT:	693	OUTPUT:
638	RETVAL	694	RETVAL
639		695
640	void	696	void
641	DESTROY (CFClient::Layout self)	697	DESTROY (CFClient::Layout self)
…		…
670	SvUTF8_on (RETVAL);	726	SvUTF8_on (RETVAL);
671	OUTPUT:	727	OUTPUT:
672	RETVAL	728	RETVAL
673		729
674	void	730	void
		731	set_font (CFClient::Layout self, CFClient::Font font = 0)
		732	CODE:
		733	if (self->font != font)
		734	{
		735	self->font = font;
		736	layout_update_font (self);
		737	}
		738
		739	void
675	set_height (CFClient::Layout self, int base_height)	740	set_height (CFClient::Layout self, int base_height)
676	CODE:	741	CODE:
		742	if (self->base_height != base_height)
		743	{
677	self->base_height = base_height;	744	self->base_height = base_height;
		745	layout_update_font (self);
		746	}
678		747
679	void	748	void
680	set_width (CFClient::Layout self, int max_width = -1)	749	set_width (CFClient::Layout self, int max_width = -1)
681	CODE:	750	CODE:
682	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	751	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
…		…
685	size (CFClient::Layout self)	754	size (CFClient::Layout self)
686	PPCODE:	755	PPCODE:
687	{	756	{
688	int w, h;	757	int w, h;
689		758
690	layout_update (self);
691	layout_get_pixel_size (self, &w, &h);	759	layout_get_pixel_size (self, &w, &h);
692		760
693	EXTEND (SP, 2);	761	EXTEND (SP, 2);
694	PUSHs (sv_2mortal (newSViv (w)));	762	PUSHs (sv_2mortal (newSViv (w)));
695	PUSHs (sv_2mortal (newSViv (h)));	763	PUSHs (sv_2mortal (newSViv (h)));
…		…
698	int	766	int
699	xy_to_index (CFClient::Layout self, int x, int y)	767	xy_to_index (CFClient::Layout self, int x, int y)
700	CODE:	768	CODE:
701	{	769	{
702	int index, trailing;	770	int index, trailing;
703
704	layout_update (self);
705	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	771	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
706
707	RETVAL = index;	772	RETVAL = index;
708	}	773	}
709	OUTPUT:	774	OUTPUT:
710	RETVAL	775	RETVAL
711		776
712	void	777	void
713	cursor_pos (CFClient::Layout self, int index)	778	cursor_pos (CFClient::Layout self, int index)
714	PPCODE:	779	PPCODE:
715	{	780	{
716	PangoRectangle strong_pos;	781	PangoRectangle strong_pos;
717	layout_update (self);
718	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	782	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
719		783
720	EXTEND (SP, 3);	784	EXTEND (SP, 3);
721	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	785	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
722	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	786	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
…		…
729	{	793	{
730	SV *retval;	794	SV *retval;
731	int w, h;	795	int w, h;
732	FT_Bitmap bitmap;	796	FT_Bitmap bitmap;
733		797
734	layout_update (self);
735	layout_get_pixel_size (self, &w, &h);	798	layout_get_pixel_size (self, &w, &h);
736		799
737	retval = newSV (w * h);	800	retval = newSV (w * h);
738	SvPOK_only (retval);	801	SvPOK_only (retval);
739	SvCUR_set (retval, w * h);	802	SvCUR_set (retval, w * h);
…		…
1301	} *civ, const_iv[] = {	1364	} *civ, const_iv[] = {
1302	# define const_iv(name) { # name, (IV)name }	1365	# define const_iv(name) { # name, (IV)name }
1303	const_iv (GL_COLOR_MATERIAL),	1366	const_iv (GL_COLOR_MATERIAL),
1304	const_iv (GL_SMOOTH),	1367	const_iv (GL_SMOOTH),
1305	const_iv (GL_FLAT),	1368	const_iv (GL_FLAT),
		1369	const_iv (GL_DITHER),
1306	const_iv (GL_BLEND),	1370	const_iv (GL_BLEND),
		1371	const_iv (GL_SCISSOR_TEST),
1307	const_iv (GL_AND),	1372	const_iv (GL_AND),
		1373	const_iv (GL_ONE),
		1374	const_iv (GL_ZERO),
1308	const_iv (GL_SRC_ALPHA),	1375	const_iv (GL_SRC_ALPHA),
		1376	const_iv (GL_SRC_ALPHA_SATURATE),
1309	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1377	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1378	const_iv (GL_ONE_MINUS_DST_ALPHA),
1310	const_iv (GL_RGB),	1379	const_iv (GL_RGB),
1311	const_iv (GL_RGBA),	1380	const_iv (GL_RGBA),
1312	const_iv (GL_UNSIGNED_BYTE),	1381	const_iv (GL_UNSIGNED_BYTE),
1313	const_iv (GL_ALPHA4),
1314	const_iv (GL_ALPHA),	1382	const_iv (GL_ALPHA),
1315	const_iv (GL_FLOAT),	1383	const_iv (GL_FLOAT),
1316	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1384	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1317	const_iv (GL_COMPILE),	1385	const_iv (GL_COMPILE),
1318	const_iv (GL_TEXTURE_1D),	1386	const_iv (GL_TEXTURE_1D),
…		…
1330	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1398	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1331	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1399	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1332	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1400	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1333	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1401	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1334	const_iv (GL_GENERATE_MIPMAP),	1402	const_iv (GL_GENERATE_MIPMAP),
1335	const_iv (GL_LINEAR),
1336	const_iv (GL_MODULATE),	1403	const_iv (GL_MODULATE),
		1404	const_iv (GL_DECAL),
1337	const_iv (GL_REPLACE),	1405	const_iv (GL_REPLACE),
1338	const_iv (GL_COLOR_BUFFER_BIT),	1406	const_iv (GL_COLOR_BUFFER_BIT),
1339	const_iv (GL_PROJECTION),	1407	const_iv (GL_PROJECTION),
1340	const_iv (GL_MODELVIEW),	1408	const_iv (GL_MODELVIEW),
1341	const_iv (GL_COLOR_LOGIC_OP),	1409	const_iv (GL_COLOR_LOGIC_OP),
		1410	const_iv (GL_SEPARABLE_2D),
1342	const_iv (GL_CONVOLUTION_2D),	1411	const_iv (GL_CONVOLUTION_2D),
1343	const_iv (GL_CONVOLUTION_BORDER_MODE),	1412	const_iv (GL_CONVOLUTION_BORDER_MODE),
1344	const_iv (GL_CONSTANT_BORDER),	1413	const_iv (GL_CONSTANT_BORDER),
1345	const_iv (GL_LINES),	1414	const_iv (GL_LINES),
1346	const_iv (GL_QUADS),	1415	const_iv (GL_QUADS),
…		…
1371		1440
1372	void glBlendFunc (int sfactor, int dfactor)	1441	void glBlendFunc (int sfactor, int dfactor)
1373		1442
1374	void glLogicOp (int opcode)	1443	void glLogicOp (int opcode)
1375		1444
		1445	void glColorMask (int red, int green, int blue, int alpha)
		1446
1376	void glMatrixMode (int mode)	1447	void glMatrixMode (int mode)
1377		1448
1378	void glPushMatrix ()	1449	void glPushMatrix ()
1379		1450
1380	void glPopMatrix ()	1451	void glPopMatrix ()
1381		1452
1382	void glLoadIdentity ()	1453	void glLoadIdentity ()
1383		1454
		1455	# 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)	1456	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1385		1457
1386	void glViewport (int x, int y, int width, int height)	1458	void glViewport (int x, int y, int width, int height)
		1459
		1460	void glScissor (int x, int y, int width, int height)
1387		1461
1388	void glTranslate (float x, float y, float z = 0.)	1462	void glTranslate (float x, float y, float z = 0.)
1389	CODE:	1463	CODE:
1390	glTranslatef (x, y, z);	1464	glTranslatef (x, y, z);
1391		1465
1392	void glScale (float x, float y, float z)	1466	void glScale (float x, float y, float z = 1.)
1393	CODE:	1467	CODE:
1394	glScalef (x, y, z);	1468	glScalef (x, y, z);
1395		1469
1396	void glRotate (float angle, float x, float y, float z)	1470	void glRotate (float angle, float x, float y, float z)
1397	CODE:	1471	CODE:
…		…
1402	void glEnd ()	1476	void glEnd ()
1403		1477
1404	void glColor (float r, float g, float b, float a = 1.0)	1478	void glColor (float r, float g, float b, float a = 1.0)
1405	PROTOTYPE: @	1479	PROTOTYPE: @
1406	CODE:	1480	CODE:
1407	glColor4f (r, g, b, a);	1481	glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1408		1482
1409	void glVertex (float x, float y, float z = 0.)	1483	void glVertex (float x, float y, float z = 0.)
1410	CODE:	1484	CODE:
1411	glVertex3f (x, y, z);	1485	glVertex3f (x, y, z);
1412		1486
…		…
1424		1498
1425	void glBindTexture (int target, int name)	1499	void glBindTexture (int target, int name)
1426		1500
1427	void glConvolutionParameter (int target, int pname, float params)	1501	void glConvolutionParameter (int target, int pname, float params)
1428	CODE:	1502	CODE:
1429	glConvolutionParameterf (target, pname, params);	1503	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1430		1504
1431	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1505	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		1506	CODE:
		1507	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
		1508	(target, internalformat, width, height, format, type, data));
		1509
		1510	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		1511	CODE:
		1512	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
		1513	(target, internalformat, width, height, format, type, row, column));
1432		1514
1433	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1515	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1434		1516
1435	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1517	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		1518
		1519	void glRasterPos (int x, int y)
		1520	CODE:
		1521	glRasterPos2i (x, y);
		1522
		1523	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1436		1524
1437	int glGenTexture ()	1525	int glGenTexture ()
1438	CODE:	1526	CODE:
1439	{	1527	{
1440	GLuint name;	1528	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.71 by root, Fri May 5 19:05: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.71 by root, Fri May 5 19:05:47 2006 UTC