ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs.
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# include <malloc.h> 2# include <malloc.h>
3# pragma warning(disable:4244)
3#endif 4#endif
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
… …
40#define FOW_DARKNESS 32 41#define FOW_DARKNESS 32
41 42
42#define MAP_EXTEND_X 32 43#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 44#define MAP_EXTEND_Y 512
44 45
45#define MIN_FONT_HEIGHT 8 * PANGO_SCALE 46#define MIN_FONT_HEIGHT 10
47
48#define GL_CALL(type,func,args) \
49 { \
50 static int init_; \
51 static type fptr_; \
52 \
53 if (!init_) \
54 { \
55 init_ = 1; \
56 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
57 } \
58 \
59 if (fptr_) \
60 fptr_ args; \
61 }
46 62
47typedef Mix_Chunk *CFClient__MixChunk; 63typedef Mix_Chunk *CFClient__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 64typedef Mix_Music *CFClient__MixMusic;
49 65
50static PangoContext *context; 66typedef PangoFontDescription *CFClient__Font;
51static PangoFontMap *fontmap;
52 67
53typedef struct cf_layout { 68typedef struct cf_layout {
54 PangoLayout *pl; 69 PangoLayout *pl;
55 int base_height; 70 int base_height;
71 CFClient__Font font;
56} *CFClient__Layout; 72} *CFClient__Layout;
73
74static CFClient__Font default_font;
75static PangoContext *context;
76static PangoFontMap *fontmap;
57 77
58static void 78static void
59substitute_func (FcPattern *pattern, gpointer data) 79substitute_func (FcPattern *pattern, gpointer data)
60{ 80{
61 FcPatternAddBool (pattern, FC_HINTING , 1); 81 FcPatternAddBool (pattern, FC_HINTING , 1);
62 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 82 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
63} 83}
64 84
65static void 85static void
66layout_update (CFClient__Layout self) 86layout_update_font (CFClient__Layout self)
67{ 87{
68 /* use a random scale factor to account for unknown descenders, 0.8 works 88 /* use a random scale factor to account for unknown descenders, 0.8 works
69 * reasonably well with bitstream vera 89 * reasonably well with bitstream vera
70 */ 90 */
71 PangoFontDescription *font = (PangoFontDescription *) 91 PangoFontDescription *font = self->font ? self->font : default_font;
72 pango_layout_get_font_description (self->pl);
73 92
74 int height = self->base_height * (PANGO_SCALE * 8 / 10);
75
76 if (height < MIN_FONT_HEIGHT)
77 height = MIN_FONT_HEIGHT;
78
79 if (pango_font_description_get_size (font) != height)
80 {
81 font = pango_font_description_copy (font);
82 pango_font_description_set_absolute_size (font, height); 93 pango_font_description_set_absolute_size (font,
94 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
95
83 pango_layout_set_font_description (self->pl, font); 96 pango_layout_set_font_description (self->pl, font);
84 }
85} 97}
86 98
87static void 99static void
88layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 100layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
89{ 101{
90 layout_update (self);
91
92 pango_layout_get_pixel_size (self->pl, w, h); 102 pango_layout_get_pixel_size (self->pl, w, h);
93 103
94 *w = (*w + 3) & ~3; 104 *w = (*w + 3) & ~3;
95 if (!*w) *w = 1; 105 if (!*w) *w = 1;
96 if (!*h) *h = 1; 106 if (!*h) *h = 1;
… …
249 } 259 }
250 } 260 }
251} 261}
252 262
253static void 263static void
254music_finished () 264music_finished (void)
255{ 265{
256 SDL_UserEvent ev; 266 SDL_UserEvent ev;
257 267
258 ev.type = SDL_USEREVENT; 268 ev.type = SDL_USEREVENT;
259 ev.code = 0; 269 ev.code = 0;
260 ev.data1 = 0; 270 ev.data1 = 0;
271 ev.data2 = 0;
272
273 SDL_PushEvent ((SDL_Event *)&ev);
274}
275
276static void
277channel_finished (int channel)
278{
279 SDL_UserEvent ev;
280
281 ev.type = SDL_USEREVENT;
282 ev.code = 1;
283 ev.data1 = (void *)(long)channel;
261 ev.data2 = 0; 284 ev.data2 = 0;
262 285
263 SDL_PushEvent ((SDL_Event *)&ev); 286 SDL_PushEvent ((SDL_Event *)&ev);
264} 287}
265 288
… …
448 471
449 while (SDL_PollEvent (&ev)) 472 while (SDL_PollEvent (&ev))
450 { 473 {
451 HV *hv = newHV (); 474 HV *hv = newHV ();
452 hv_store (hv, "type", 4, newSViv (ev.type), 0); 475 hv_store (hv, "type", 4, newSViv (ev.type), 0);
476
453 switch (ev.type) 477 switch (ev.type)
454 { 478 {
455 case SDL_KEYDOWN: 479 case SDL_KEYDOWN:
456 case SDL_KEYUP: 480 case SDL_KEYUP:
457 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 481 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
… …
477 case SDL_MOUSEBUTTONUP: 501 case SDL_MOUSEBUTTONUP:
478 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 502 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
479 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 503 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
480 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 504 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
481 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 505 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
506 break;
507
508 case SDL_USEREVENT:
509 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
510 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
511 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
512 break;
482 } 513 }
483 514
484 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 515 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
485 } 516 }
486} 517}
487 518
488int 519int
489Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 520Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
490 POSTCALL: 521 POSTCALL:
491 Mix_HookMusicFinished (music_finished); 522 Mix_HookMusicFinished (music_finished);
523 Mix_ChannelFinished (channel_finished);
492 524
493void 525void
494Mix_CloseAudio () 526Mix_CloseAudio ()
495 527
496int 528int
… …
519 551
520void 552void
521add_font (char *file) 553add_font (char *file)
522 CODE: 554 CODE:
523 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 555 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
524
525void
526set_font (char *file)
527 CODE:
528{
529 int count;
530 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
531 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
532 FcPatternDestroy (pattern);
533 pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
534 pango_context_set_font_description (context, font);
535}
536 556
537void 557void
538load_image_inline (SV *image_) 558load_image_inline (SV *image_)
539 ALIAS: 559 ALIAS:
540 load_image_file = 1 560 load_image_file = 1
… …
622 PUSHs (sv_2mortal (newSViv (b / y))); 642 PUSHs (sv_2mortal (newSViv (b / y)));
623 PUSHs (sv_2mortal (newSViv (a / y))); 643 PUSHs (sv_2mortal (newSViv (a / y)));
624} 644}
625 645
626void 646void
647error (char *message)
648 CODE:
649#ifdef _WIN32
650 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
651#else
652 fprintf (stderr, "ERROR: %s\n", message);
653#endif
654
655void
627fatal (char *message) 656fatal (char *message)
628 CODE: 657 CODE:
629#ifdef _WIN32 658#ifdef _WIN32
630 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 659 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
631#else 660#else
632 fprintf (stderr, "FATAL: %s\n", message); 661 fprintf (stderr, "FATAL: %s\n", message);
633#endif 662#endif
634 exit (1); 663 exit (1);
635 664
665MODULE = CFClient PACKAGE = CFClient::Font
666
667CFClient::Font
668new_from_file (SV *class, char *path, int id = 0)
669 CODE:
670{
671 int count;
672 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
673 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
674 FcPatternDestroy (pattern);
675}
676 OUTPUT:
677 RETVAL
678
679void
680DESTROY (CFClient::Font self)
681 CODE:
682 pango_font_description_free (self);
683
684void
685make_default (CFClient::Font self)
686 CODE:
687 default_font = self;
688
636MODULE = CFClient PACKAGE = CFClient::Layout 689MODULE = CFClient PACKAGE = CFClient::Layout
637 690
638CFClient::Layout 691CFClient::Layout
639new (SV *class, int base_height = 10) 692new (SV *class, int base_height = MIN_FONT_HEIGHT)
640 CODE: 693 CODE:
641 New (0, RETVAL, 1, struct cf_layout); 694 New (0, RETVAL, 1, struct cf_layout);
695 RETVAL->pl = pango_layout_new (context);
642 RETVAL->base_height = base_height; 696 RETVAL->base_height = base_height;
643 RETVAL->pl = pango_layout_new (context); 697 RETVAL->font = 0;
644 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 698 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
645 pango_layout_set_font_description (RETVAL->pl, 699 pango_layout_set_font_description (RETVAL->pl, default_font);
646 pango_font_description_copy (
647 pango_context_get_font_description (context)));
648 OUTPUT: 700 OUTPUT:
649 RETVAL 701 RETVAL
650 702
651void 703void
652DESTROY (CFClient::Layout self) 704DESTROY (CFClient::Layout self)
… …
681 SvUTF8_on (RETVAL); 733 SvUTF8_on (RETVAL);
682 OUTPUT: 734 OUTPUT:
683 RETVAL 735 RETVAL
684 736
685void 737void
738set_font (CFClient::Layout self, CFClient::Font font = 0)
739 CODE:
740 if (self->font != font)
741 {
742 self->font = font;
743 layout_update_font (self);
744 }
745
746void
686set_height (CFClient::Layout self, int base_height) 747set_height (CFClient::Layout self, int base_height)
687 CODE: 748 CODE:
749 if (self->base_height != base_height)
750 {
688 self->base_height = base_height; 751 self->base_height = base_height;
752 layout_update_font (self);
753 }
689 754
690void 755void
691set_width (CFClient::Layout self, int max_width = -1) 756set_width (CFClient::Layout self, int max_width = -1)
692 CODE: 757 CODE:
693 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 758 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
… …
696size (CFClient::Layout self) 761size (CFClient::Layout self)
697 PPCODE: 762 PPCODE:
698{ 763{
699 int w, h; 764 int w, h;
700 765
701 layout_update (self);
702 layout_get_pixel_size (self, &w, &h); 766 layout_get_pixel_size (self, &w, &h);
703 767
704 EXTEND (SP, 2); 768 EXTEND (SP, 2);
705 PUSHs (sv_2mortal (newSViv (w))); 769 PUSHs (sv_2mortal (newSViv (w)));
706 PUSHs (sv_2mortal (newSViv (h))); 770 PUSHs (sv_2mortal (newSViv (h)));
… …
709int 773int
710xy_to_index (CFClient::Layout self, int x, int y) 774xy_to_index (CFClient::Layout self, int x, int y)
711 CODE: 775 CODE:
712{ 776{
713 int index, trailing; 777 int index, trailing;
714
715 layout_update (self);
716 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 778 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
717
718 RETVAL = index; 779 RETVAL = index;
719} 780}
720 OUTPUT: 781 OUTPUT:
721 RETVAL 782 RETVAL
722 783
723void 784void
724cursor_pos (CFClient::Layout self, int index) 785cursor_pos (CFClient::Layout self, int index)
725 PPCODE: 786 PPCODE:
726{ 787{
727 PangoRectangle strong_pos; 788 PangoRectangle strong_pos;
728 layout_update (self);
729 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 789 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
730 790
731 EXTEND (SP, 3); 791 EXTEND (SP, 3);
732 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 792 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
733 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 793 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
… …
740{ 800{
741 SV *retval; 801 SV *retval;
742 int w, h; 802 int w, h;
743 FT_Bitmap bitmap; 803 FT_Bitmap bitmap;
744 804
745 layout_update (self);
746 layout_get_pixel_size (self, &w, &h); 805 layout_get_pixel_size (self, &w, &h);
747 806
748 retval = newSV (w * h); 807 retval = newSV (w * h);
749 SvPOK_only (retval); 808 SvPOK_only (retval);
750 SvCUR_set (retval, w * h); 809 SvCUR_set (retval, w * h);
… …
1312 } *civ, const_iv[] = { 1371 } *civ, const_iv[] = {
1313# define const_iv(name) { # name, (IV)name } 1372# define const_iv(name) { # name, (IV)name }
1314 const_iv (GL_COLOR_MATERIAL), 1373 const_iv (GL_COLOR_MATERIAL),
1315 const_iv (GL_SMOOTH), 1374 const_iv (GL_SMOOTH),
1316 const_iv (GL_FLAT), 1375 const_iv (GL_FLAT),
1376 const_iv (GL_DITHER),
1317 const_iv (GL_BLEND), 1377 const_iv (GL_BLEND),
1378 const_iv (GL_SCISSOR_TEST),
1318 const_iv (GL_AND), 1379 const_iv (GL_AND),
1380 const_iv (GL_ONE),
1381 const_iv (GL_ZERO),
1319 const_iv (GL_SRC_ALPHA), 1382 const_iv (GL_SRC_ALPHA),
1383 const_iv (GL_SRC_ALPHA_SATURATE),
1320 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1384 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1385 const_iv (GL_ONE_MINUS_DST_ALPHA),
1321 const_iv (GL_RGB), 1386 const_iv (GL_RGB),
1322 const_iv (GL_RGBA), 1387 const_iv (GL_RGBA),
1323 const_iv (GL_UNSIGNED_BYTE), 1388 const_iv (GL_UNSIGNED_BYTE),
1324 const_iv (GL_ALPHA4),
1325 const_iv (GL_ALPHA), 1389 const_iv (GL_ALPHA),
1326 const_iv (GL_FLOAT), 1390 const_iv (GL_FLOAT),
1327 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1391 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1328 const_iv (GL_COMPILE), 1392 const_iv (GL_COMPILE),
1329 const_iv (GL_TEXTURE_1D), 1393 const_iv (GL_TEXTURE_1D),
… …
1341 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1405 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1342 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1406 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1343 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1407 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1344 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1408 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1345 const_iv (GL_GENERATE_MIPMAP), 1409 const_iv (GL_GENERATE_MIPMAP),
1346 const_iv (GL_LINEAR),
1347 const_iv (GL_MODULATE), 1410 const_iv (GL_MODULATE),
1411 const_iv (GL_DECAL),
1348 const_iv (GL_REPLACE), 1412 const_iv (GL_REPLACE),
1349 const_iv (GL_COLOR_BUFFER_BIT), 1413 const_iv (GL_COLOR_BUFFER_BIT),
1350 const_iv (GL_PROJECTION), 1414 const_iv (GL_PROJECTION),
1351 const_iv (GL_MODELVIEW), 1415 const_iv (GL_MODELVIEW),
1352 const_iv (GL_COLOR_LOGIC_OP), 1416 const_iv (GL_COLOR_LOGIC_OP),
1417 const_iv (GL_SEPARABLE_2D),
1353 const_iv (GL_CONVOLUTION_2D), 1418 const_iv (GL_CONVOLUTION_2D),
1354 const_iv (GL_CONVOLUTION_BORDER_MODE), 1419 const_iv (GL_CONVOLUTION_BORDER_MODE),
1355 const_iv (GL_CONSTANT_BORDER), 1420 const_iv (GL_CONSTANT_BORDER),
1356 const_iv (GL_LINES), 1421 const_iv (GL_LINES),
1357 const_iv (GL_QUADS), 1422 const_iv (GL_QUADS),
… …
1382 1447
1383void glBlendFunc (int sfactor, int dfactor) 1448void glBlendFunc (int sfactor, int dfactor)
1384 1449
1385void glLogicOp (int opcode) 1450void glLogicOp (int opcode)
1386 1451
1452void glColorMask (int red, int green, int blue, int alpha)
1453
1387void glMatrixMode (int mode) 1454void glMatrixMode (int mode)
1388 1455
1389void glPushMatrix () 1456void glPushMatrix ()
1390 1457
1391void glPopMatrix () 1458void glPopMatrix ()
1392 1459
1393void glLoadIdentity () 1460void glLoadIdentity ()
1394 1461
1462# near and far are due to microsofts buggy c compiler
1395void glOrtho (double left, double right, double bottom, double top, double near, double far) 1463void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1396 1464
1397void glViewport (int x, int y, int width, int height) 1465void glViewport (int x, int y, int width, int height)
1466
1467void glScissor (int x, int y, int width, int height)
1398 1468
1399void glTranslate (float x, float y, float z = 0.) 1469void glTranslate (float x, float y, float z = 0.)
1400 CODE: 1470 CODE:
1401 glTranslatef (x, y, z); 1471 glTranslatef (x, y, z);
1402 1472
1403void glScale (float x, float y, float z) 1473void glScale (float x, float y, float z = 1.)
1404 CODE: 1474 CODE:
1405 glScalef (x, y, z); 1475 glScalef (x, y, z);
1406 1476
1407void glRotate (float angle, float x, float y, float z) 1477void glRotate (float angle, float x, float y, float z)
1408 CODE: 1478 CODE:
… …
1413void glEnd () 1483void glEnd ()
1414 1484
1415void glColor (float r, float g, float b, float a = 1.0) 1485void glColor (float r, float g, float b, float a = 1.0)
1416 PROTOTYPE: @ 1486 PROTOTYPE: @
1417 CODE: 1487 CODE:
1418 glColor4f (r, g, b, a); 1488 glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1419 1489
1420void glVertex (float x, float y, float z = 0.) 1490void glVertex (float x, float y, float z = 0.)
1421 CODE: 1491 CODE:
1422 glVertex3f (x, y, z); 1492 glVertex3f (x, y, z);
1423 1493
… …
1435 1505
1436void glBindTexture (int target, int name) 1506void glBindTexture (int target, int name)
1437 1507
1438void glConvolutionParameter (int target, int pname, float params) 1508void glConvolutionParameter (int target, int pname, float params)
1439 CODE: 1509 CODE:
1440 glConvolutionParameterf (target, pname, params); 1510 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1441 1511
1442void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1512void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1513 CODE:
1514 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1515 (target, internalformat, width, height, format, type, data));
1516
1517void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1518 CODE:
1519 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1520 (target, internalformat, width, height, format, type, row, column));
1443 1521
1444void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1522void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1445 1523
1446void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1524void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1525
1526void glRasterPos (int x, int y)
1527 CODE:
1528 glRasterPos2i (x, y);
1529
1530void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1447 1531
1448int glGenTexture () 1532int glGenTexture ()
1449 CODE: 1533 CODE:
1450{ 1534{
1451 GLuint name; 1535 GLuint name;

Diff Legend

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