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.59 by root, Sun Apr 23 04:41:33 2006 UTC vs.
Revision 1.70 by root, Sun Apr 30 09:21: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 8 * PANGO_SCALE 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 }
46 61
47typedef Mix_Chunk *CFClient__MixChunk; 62typedef Mix_Chunk *CFClient__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 63typedef Mix_Music *CFClient__MixMusic;
49 64
50static PangoContext *context; 65typedef PangoFontDescription *CFClient__Font;
51static PangoFontMap *fontmap;
52 66
53typedef struct cf_layout { 67typedef struct cf_layout {
54 PangoLayout *pl; 68 PangoLayout *pl;
55 int base_height; 69 int base_height;
70 CFClient__Font font;
56} *CFClient__Layout; 71} *CFClient__Layout;
72
73static CFClient__Font default_font;
74static PangoContext *context;
75static PangoFontMap *fontmap;
57 76
58static void 77static void
59substitute_func (FcPattern *pattern, gpointer data) 78substitute_func (FcPattern *pattern, gpointer data)
60{ 79{
61 FcPatternAddBool (pattern, FC_HINTING , 1); 80 FcPatternAddBool (pattern, FC_HINTING , 1);
62 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 81 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
63} 82}
64 83
65static void 84static void
66layout_update (CFClient__Layout self) 85layout_update_font (CFClient__Layout self)
67{ 86{
68 /* 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
69 * reasonably well with bitstream vera 88 * reasonably well with bitstream vera
70 */ 89 */
71 PangoFontDescription *font = pango_layout_get_font_description (self->pl); 90 PangoFontDescription *font = self->font ? self->font : default_font;
72 91
73 int height = self->base_height * (PANGO_SCALE * 8 / 10);
74
75 if (height < MIN_FONT_HEIGHT)
76 height = MIN_FONT_HEIGHT;
77
78 if (pango_font_description_get_size (font) != height)
79 {
80 font = pango_font_description_copy (font);
81 pango_font_description_set_absolute_size (font, height); 92 pango_font_description_set_absolute_size (font,
93 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
94
82 pango_layout_set_font_description (self->pl, font); 95 pango_layout_set_font_description (self->pl, font);
83 }
84} 96}
85 97
86static void 98static void
87layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 99layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
88{ 100{
89 layout_update (self);
90
91 pango_layout_get_pixel_size (self->pl, w, h); 101 pango_layout_get_pixel_size (self->pl, w, h);
92 102
93 *w = (*w + 3) & ~3; 103 *w = (*w + 3) & ~3;
94 if (!*w) *w = 1; 104 if (!*w) *w = 1;
95 if (!*h) *h = 1; 105 if (!*h) *h = 1;
… …
447 457
448 while (SDL_PollEvent (&ev)) 458 while (SDL_PollEvent (&ev))
449 { 459 {
450 HV *hv = newHV (); 460 HV *hv = newHV ();
451 hv_store (hv, "type", 4, newSViv (ev.type), 0); 461 hv_store (hv, "type", 4, newSViv (ev.type), 0);
462
452 switch (ev.type) 463 switch (ev.type)
453 { 464 {
454 case SDL_KEYDOWN: 465 case SDL_KEYDOWN:
455 case SDL_KEYUP: 466 case SDL_KEYUP:
456 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 467 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
… …
476 case SDL_MOUSEBUTTONUP: 487 case SDL_MOUSEBUTTONUP:
477 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 488 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
478 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 489 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
479 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 490 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
480 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 491 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
492 break;
481 } 493 }
482 494
483 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 495 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
484 } 496 }
485} 497}
… …
518 530
519void 531void
520add_font (char *file) 532add_font (char *file)
521 CODE: 533 CODE:
522 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 534 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
523
524void
525set_font (char *file)
526 CODE:
527{
528 int count;
529 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
530 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
531 FcPatternDestroy (pattern);
532 pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
533 pango_context_set_font_description (context, font);
534}
535 535
536void 536void
537load_image_inline (SV *image_) 537load_image_inline (SV *image_)
538 ALIAS: 538 ALIAS:
539 load_image_file = 1 539 load_image_file = 1
… …
621 PUSHs (sv_2mortal (newSViv (b / y))); 621 PUSHs (sv_2mortal (newSViv (b / y)));
622 PUSHs (sv_2mortal (newSViv (a / y))); 622 PUSHs (sv_2mortal (newSViv (a / y)));
623} 623}
624 624
625void 625void
626error (char *message)
627 CODE:
628#ifdef _WIN32
629 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
630#else
631 fprintf (stderr, "ERROR: %s\n", message);
632#endif
633
634void
626fatal (char *message) 635fatal (char *message)
627 CODE: 636 CODE:
628#ifdef _WIN32 637#ifdef _WIN32
629 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 638 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
630#else 639#else
631 fprintf (stderr, "FATAL: %s\n", message); 640 fprintf (stderr, "FATAL: %s\n", message);
632#endif 641#endif
633 exit (1); 642 exit (1);
634 643
644MODULE = CFClient PACKAGE = CFClient::Font
645
646CFClient::Font
647new_from_file (SV *class, char *path, int id = 0)
648 CODE:
649{
650 int count;
651 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
652 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
653 FcPatternDestroy (pattern);
654}
655 OUTPUT:
656 RETVAL
657
658void
659DESTROY (CFClient::Font self)
660 CODE:
661 pango_font_description_free (self);
662
663void
664make_default (CFClient::Font self)
665 CODE:
666 default_font = self;
667
635MODULE = CFClient PACKAGE = CFClient::Layout 668MODULE = CFClient PACKAGE = CFClient::Layout
636 669
637CFClient::Layout 670CFClient::Layout
638new (SV *class, int base_height = 10) 671new (SV *class, int base_height = MIN_FONT_HEIGHT)
639 CODE: 672 CODE:
640 New (0, RETVAL, 1, struct cf_layout); 673 New (0, RETVAL, 1, struct cf_layout);
674 RETVAL->pl = pango_layout_new (context);
641 RETVAL->base_height = base_height; 675 RETVAL->base_height = base_height;
642 RETVAL->pl = pango_layout_new (context); 676 RETVAL->font = 0;
643 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 677 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
644 pango_layout_set_font_description (RETVAL->pl, 678 pango_layout_set_font_description (RETVAL->pl, default_font);
645 pango_font_description_copy (
646 pango_context_get_font_description (context)));
647 OUTPUT: 679 OUTPUT:
648 RETVAL 680 RETVAL
649 681
650void 682void
651DESTROY (CFClient::Layout self) 683DESTROY (CFClient::Layout self)
… …
680 SvUTF8_on (RETVAL); 712 SvUTF8_on (RETVAL);
681 OUTPUT: 713 OUTPUT:
682 RETVAL 714 RETVAL
683 715
684void 716void
717set_font (CFClient::Layout self, CFClient::Font font = 0)
718 CODE:
719 if (self->font != font)
720 {
721 self->font = font;
722 layout_update_font (self);
723 }
724
725void
685set_height (CFClient::Layout self, int base_height) 726set_height (CFClient::Layout self, int base_height)
686 CODE: 727 CODE:
728 if (self->base_height != base_height)
729 {
687 self->base_height = base_height; 730 self->base_height = base_height;
731 layout_update_font (self);
732 }
688 733
689void 734void
690set_width (CFClient::Layout self, int max_width = -1) 735set_width (CFClient::Layout self, int max_width = -1)
691 CODE: 736 CODE:
692 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 737 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
… …
695size (CFClient::Layout self) 740size (CFClient::Layout self)
696 PPCODE: 741 PPCODE:
697{ 742{
698 int w, h; 743 int w, h;
699 744
700 layout_update (self);
701 layout_get_pixel_size (self, &w, &h); 745 layout_get_pixel_size (self, &w, &h);
702 746
703 EXTEND (SP, 2); 747 EXTEND (SP, 2);
704 PUSHs (sv_2mortal (newSViv (w))); 748 PUSHs (sv_2mortal (newSViv (w)));
705 PUSHs (sv_2mortal (newSViv (h))); 749 PUSHs (sv_2mortal (newSViv (h)));
… …
708int 752int
709xy_to_index (CFClient::Layout self, int x, int y) 753xy_to_index (CFClient::Layout self, int x, int y)
710 CODE: 754 CODE:
711{ 755{
712 int index, trailing; 756 int index, trailing;
713
714 layout_update (self);
715 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 757 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
716
717 RETVAL = index; 758 RETVAL = index;
718} 759}
719 OUTPUT: 760 OUTPUT:
720 RETVAL 761 RETVAL
721 762
722void 763void
723cursor_pos (CFClient::Layout self, int index) 764cursor_pos (CFClient::Layout self, int index)
724 PPCODE: 765 PPCODE:
725{ 766{
726 PangoRectangle strong_pos; 767 PangoRectangle strong_pos;
727 layout_update (self);
728 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 768 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
729 769
730 EXTEND (SP, 3); 770 EXTEND (SP, 3);
731 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 771 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
732 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 772 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
… …
739{ 779{
740 SV *retval; 780 SV *retval;
741 int w, h; 781 int w, h;
742 FT_Bitmap bitmap; 782 FT_Bitmap bitmap;
743 783
744 layout_update (self);
745 layout_get_pixel_size (self, &w, &h); 784 layout_get_pixel_size (self, &w, &h);
746 785
747 retval = newSV (w * h); 786 retval = newSV (w * h);
748 SvPOK_only (retval); 787 SvPOK_only (retval);
749 SvCUR_set (retval, w * h); 788 SvCUR_set (retval, w * h);
… …
1311 } *civ, const_iv[] = { 1350 } *civ, const_iv[] = {
1312# define const_iv(name) { # name, (IV)name } 1351# define const_iv(name) { # name, (IV)name }
1313 const_iv (GL_COLOR_MATERIAL), 1352 const_iv (GL_COLOR_MATERIAL),
1314 const_iv (GL_SMOOTH), 1353 const_iv (GL_SMOOTH),
1315 const_iv (GL_FLAT), 1354 const_iv (GL_FLAT),
1355 const_iv (GL_DITHER),
1316 const_iv (GL_BLEND), 1356 const_iv (GL_BLEND),
1357 const_iv (GL_SCISSOR_TEST),
1317 const_iv (GL_AND), 1358 const_iv (GL_AND),
1359 const_iv (GL_ONE),
1360 const_iv (GL_ZERO),
1318 const_iv (GL_SRC_ALPHA), 1361 const_iv (GL_SRC_ALPHA),
1362 const_iv (GL_SRC_ALPHA_SATURATE),
1319 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1363 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1364 const_iv (GL_ONE_MINUS_DST_ALPHA),
1320 const_iv (GL_RGB), 1365 const_iv (GL_RGB),
1321 const_iv (GL_RGBA), 1366 const_iv (GL_RGBA),
1322 const_iv (GL_UNSIGNED_BYTE), 1367 const_iv (GL_UNSIGNED_BYTE),
1323 const_iv (GL_ALPHA4),
1324 const_iv (GL_ALPHA), 1368 const_iv (GL_ALPHA),
1325 const_iv (GL_FLOAT), 1369 const_iv (GL_FLOAT),
1326 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1370 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1327 const_iv (GL_COMPILE), 1371 const_iv (GL_COMPILE),
1328 const_iv (GL_TEXTURE_1D), 1372 const_iv (GL_TEXTURE_1D),
… …
1340 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1384 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1341 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1385 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1342 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1386 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1343 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1387 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1344 const_iv (GL_GENERATE_MIPMAP), 1388 const_iv (GL_GENERATE_MIPMAP),
1345 const_iv (GL_LINEAR),
1346 const_iv (GL_MODULATE), 1389 const_iv (GL_MODULATE),
1390 const_iv (GL_DECAL),
1347 const_iv (GL_REPLACE), 1391 const_iv (GL_REPLACE),
1348 const_iv (GL_COLOR_BUFFER_BIT), 1392 const_iv (GL_COLOR_BUFFER_BIT),
1349 const_iv (GL_PROJECTION), 1393 const_iv (GL_PROJECTION),
1350 const_iv (GL_MODELVIEW), 1394 const_iv (GL_MODELVIEW),
1351 const_iv (GL_COLOR_LOGIC_OP), 1395 const_iv (GL_COLOR_LOGIC_OP),
1396 const_iv (GL_SEPARABLE_2D),
1352 const_iv (GL_CONVOLUTION_2D), 1397 const_iv (GL_CONVOLUTION_2D),
1353 const_iv (GL_CONVOLUTION_BORDER_MODE), 1398 const_iv (GL_CONVOLUTION_BORDER_MODE),
1354 const_iv (GL_CONSTANT_BORDER), 1399 const_iv (GL_CONSTANT_BORDER),
1355 const_iv (GL_LINES), 1400 const_iv (GL_LINES),
1356 const_iv (GL_QUADS), 1401 const_iv (GL_QUADS),
… …
1381 1426
1382void glBlendFunc (int sfactor, int dfactor) 1427void glBlendFunc (int sfactor, int dfactor)
1383 1428
1384void glLogicOp (int opcode) 1429void glLogicOp (int opcode)
1385 1430
1431void glColorMask (int red, int green, int blue, int alpha)
1432
1386void glMatrixMode (int mode) 1433void glMatrixMode (int mode)
1387 1434
1388void glPushMatrix () 1435void glPushMatrix ()
1389 1436
1390void glPopMatrix () 1437void glPopMatrix ()
1391 1438
1392void glLoadIdentity () 1439void glLoadIdentity ()
1393 1440
1441# near and far are due to microsofts buggy c compiler
1394void glOrtho (double left, double right, double bottom, double top, double near, double far) 1442void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1395 1443
1396void glViewport (int x, int y, int width, int height) 1444void glViewport (int x, int y, int width, int height)
1445
1446void glScissor (int x, int y, int width, int height)
1397 1447
1398void glTranslate (float x, float y, float z = 0.) 1448void glTranslate (float x, float y, float z = 0.)
1399 CODE: 1449 CODE:
1400 glTranslatef (x, y, z); 1450 glTranslatef (x, y, z);
1401 1451
1402void glScale (float x, float y, float z) 1452void glScale (float x, float y, float z = 1.)
1403 CODE: 1453 CODE:
1404 glScalef (x, y, z); 1454 glScalef (x, y, z);
1405 1455
1406void glRotate (float angle, float x, float y, float z) 1456void glRotate (float angle, float x, float y, float z)
1407 CODE: 1457 CODE:
… …
1412void glEnd () 1462void glEnd ()
1413 1463
1414void glColor (float r, float g, float b, float a = 1.0) 1464void glColor (float r, float g, float b, float a = 1.0)
1415 PROTOTYPE: @ 1465 PROTOTYPE: @
1416 CODE: 1466 CODE:
1417 glColor4f (r, g, b, a); 1467 glColor4ub (r * 255., g * 255., b * 255., a * 255.);
1418 1468
1419void glVertex (float x, float y, float z = 0.) 1469void glVertex (float x, float y, float z = 0.)
1420 CODE: 1470 CODE:
1421 glVertex3f (x, y, z); 1471 glVertex3f (x, y, z);
1422 1472
… …
1434 1484
1435void glBindTexture (int target, int name) 1485void glBindTexture (int target, int name)
1436 1486
1437void glConvolutionParameter (int target, int pname, float params) 1487void glConvolutionParameter (int target, int pname, float params)
1438 CODE: 1488 CODE:
1439 glConvolutionParameterf (target, pname, params); 1489 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1440 1490
1441void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1491void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1492 CODE:
1493 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1494 (target, internalformat, width, height, format, type, data));
1495
1496void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1497 CODE:
1498 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1499 (target, internalformat, width, height, format, type, row, column));
1442 1500
1443void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1501void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1444 1502
1445void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1503void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1504
1505void glRasterPos (int x, int y)
1506 CODE:
1507 glRasterPos2i (x, y);
1508
1509void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1446 1510
1447int glGenTexture () 1511int glGenTexture ()
1448 CODE: 1512 CODE:
1449{ 1513{
1450 GLuint name; 1514 GLuint name;

Diff Legend

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