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.69 by root, Sun Apr 30 08:09:44 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 = (PangoFontDescription *) 90 PangoFontDescription *font = self->font ? self->font : default_font;
72 pango_layout_get_font_description (self->pl);
73 91
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); 92 pango_font_description_set_absolute_size (font,
93 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
94
83 pango_layout_set_font_description (self->pl, font); 95 pango_layout_set_font_description (self->pl, font);
84 }
85} 96}
86 97
87static void 98static void
88layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 99layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
89{ 100{
90 layout_update (self);
91
92 pango_layout_get_pixel_size (self->pl, w, h); 101 pango_layout_get_pixel_size (self->pl, w, h);
93 102
94 *w = (*w + 3) & ~3; 103 *w = (*w + 3) & ~3;
95 if (!*w) *w = 1; 104 if (!*w) *w = 1;
96 if (!*h) *h = 1; 105 if (!*h) *h = 1;
… …
521add_font (char *file) 530add_font (char *file)
522 CODE: 531 CODE:
523 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 532 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
524 533
525void 534void
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
537void
538load_image_inline (SV *image_) 535load_image_inline (SV *image_)
539 ALIAS: 536 ALIAS:
540 load_image_file = 1 537 load_image_file = 1
541 PPCODE: 538 PPCODE:
542{ 539{
… …
622 PUSHs (sv_2mortal (newSViv (b / y))); 619 PUSHs (sv_2mortal (newSViv (b / y)));
623 PUSHs (sv_2mortal (newSViv (a / y))); 620 PUSHs (sv_2mortal (newSViv (a / y)));
624} 621}
625 622
626void 623void
624error (char *message)
625 CODE:
626#ifdef _WIN32
627 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
628#else
629 fprintf (stderr, "ERROR: %s\n", message);
630#endif
631
632void
627fatal (char *message) 633fatal (char *message)
628 CODE: 634 CODE:
629#ifdef _WIN32 635#ifdef _WIN32
630 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 636 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
631#else 637#else
632 fprintf (stderr, "FATAL: %s\n", message); 638 fprintf (stderr, "FATAL: %s\n", message);
633#endif 639#endif
634 exit (1); 640 exit (1);
635 641
642MODULE = CFClient PACKAGE = CFClient::Font
643
644CFClient::Font
645new_from_file (SV *class, char *path)
646 CODE:
647{
648 int count;
649 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count);
650 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
651 FcPatternDestroy (pattern);
652}
653 OUTPUT:
654 RETVAL
655
656void
657DESTROY (CFClient::Font self)
658 CODE:
659 pango_font_description_free (self);
660
661void
662make_default (CFClient::Font self)
663 CODE:
664 default_font = self;
665
636MODULE = CFClient PACKAGE = CFClient::Layout 666MODULE = CFClient PACKAGE = CFClient::Layout
637 667
638CFClient::Layout 668CFClient::Layout
639new (SV *class, int base_height = 10) 669new (SV *class, int base_height = MIN_FONT_HEIGHT)
640 CODE: 670 CODE:
641 New (0, RETVAL, 1, struct cf_layout); 671 New (0, RETVAL, 1, struct cf_layout);
672 RETVAL->pl = pango_layout_new (context);
642 RETVAL->base_height = base_height; 673 RETVAL->base_height = base_height;
643 RETVAL->pl = pango_layout_new (context); 674 RETVAL->font = 0;
644 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 675 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
645 pango_layout_set_font_description (RETVAL->pl, 676 pango_layout_set_font_description (RETVAL->pl, default_font);
646 pango_font_description_copy (
647 pango_context_get_font_description (context)));
648 OUTPUT: 677 OUTPUT:
649 RETVAL 678 RETVAL
650 679
651void 680void
652DESTROY (CFClient::Layout self) 681DESTROY (CFClient::Layout self)
… …
681 SvUTF8_on (RETVAL); 710 SvUTF8_on (RETVAL);
682 OUTPUT: 711 OUTPUT:
683 RETVAL 712 RETVAL
684 713
685void 714void
715set_font (CFClient::Layout self, CFClient::Font font = 0)
716 CODE:
717 if (self->font != font)
718 {
719 self->font = font;
720 layout_update_font (self);
721 }
722
723void
686set_height (CFClient::Layout self, int base_height) 724set_height (CFClient::Layout self, int base_height)
687 CODE: 725 CODE:
726 if (self->base_height != base_height)
727 {
688 self->base_height = base_height; 728 self->base_height = base_height;
729 layout_update_font (self);
730 }
689 731
690void 732void
691set_width (CFClient::Layout self, int max_width = -1) 733set_width (CFClient::Layout self, int max_width = -1)
692 CODE: 734 CODE:
693 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 735 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
… …
696size (CFClient::Layout self) 738size (CFClient::Layout self)
697 PPCODE: 739 PPCODE:
698{ 740{
699 int w, h; 741 int w, h;
700 742
701 layout_update (self);
702 layout_get_pixel_size (self, &w, &h); 743 layout_get_pixel_size (self, &w, &h);
703 744
704 EXTEND (SP, 2); 745 EXTEND (SP, 2);
705 PUSHs (sv_2mortal (newSViv (w))); 746 PUSHs (sv_2mortal (newSViv (w)));
706 PUSHs (sv_2mortal (newSViv (h))); 747 PUSHs (sv_2mortal (newSViv (h)));
… …
709int 750int
710xy_to_index (CFClient::Layout self, int x, int y) 751xy_to_index (CFClient::Layout self, int x, int y)
711 CODE: 752 CODE:
712{ 753{
713 int index, trailing; 754 int index, trailing;
714
715 layout_update (self);
716 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 755 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
717
718 RETVAL = index; 756 RETVAL = index;
719} 757}
720 OUTPUT: 758 OUTPUT:
721 RETVAL 759 RETVAL
722 760
723void 761void
724cursor_pos (CFClient::Layout self, int index) 762cursor_pos (CFClient::Layout self, int index)
725 PPCODE: 763 PPCODE:
726{ 764{
727 PangoRectangle strong_pos; 765 PangoRectangle strong_pos;
728 layout_update (self);
729 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 766 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
730 767
731 EXTEND (SP, 3); 768 EXTEND (SP, 3);
732 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 769 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
733 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 770 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
… …
740{ 777{
741 SV *retval; 778 SV *retval;
742 int w, h; 779 int w, h;
743 FT_Bitmap bitmap; 780 FT_Bitmap bitmap;
744 781
745 layout_update (self);
746 layout_get_pixel_size (self, &w, &h); 782 layout_get_pixel_size (self, &w, &h);
747 783
748 retval = newSV (w * h); 784 retval = newSV (w * h);
749 SvPOK_only (retval); 785 SvPOK_only (retval);
750 SvCUR_set (retval, w * h); 786 SvCUR_set (retval, w * h);
… …
1312 } *civ, const_iv[] = { 1348 } *civ, const_iv[] = {
1313# define const_iv(name) { # name, (IV)name } 1349# define const_iv(name) { # name, (IV)name }
1314 const_iv (GL_COLOR_MATERIAL), 1350 const_iv (GL_COLOR_MATERIAL),
1315 const_iv (GL_SMOOTH), 1351 const_iv (GL_SMOOTH),
1316 const_iv (GL_FLAT), 1352 const_iv (GL_FLAT),
1353 const_iv (GL_DITHER),
1317 const_iv (GL_BLEND), 1354 const_iv (GL_BLEND),
1355 const_iv (GL_SCISSOR_TEST),
1318 const_iv (GL_AND), 1356 const_iv (GL_AND),
1357 const_iv (GL_ONE),
1358 const_iv (GL_ZERO),
1319 const_iv (GL_SRC_ALPHA), 1359 const_iv (GL_SRC_ALPHA),
1360 const_iv (GL_SRC_ALPHA_SATURATE),
1320 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1361 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1362 const_iv (GL_ONE_MINUS_DST_ALPHA),
1321 const_iv (GL_RGB), 1363 const_iv (GL_RGB),
1322 const_iv (GL_RGBA), 1364 const_iv (GL_RGBA),
1323 const_iv (GL_UNSIGNED_BYTE), 1365 const_iv (GL_UNSIGNED_BYTE),
1324 const_iv (GL_ALPHA4),
1325 const_iv (GL_ALPHA), 1366 const_iv (GL_ALPHA),
1326 const_iv (GL_FLOAT), 1367 const_iv (GL_FLOAT),
1327 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1368 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1328 const_iv (GL_COMPILE), 1369 const_iv (GL_COMPILE),
1329 const_iv (GL_TEXTURE_1D), 1370 const_iv (GL_TEXTURE_1D),
… …
1341 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1382 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1342 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1383 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1343 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1384 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1344 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1385 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1345 const_iv (GL_GENERATE_MIPMAP), 1386 const_iv (GL_GENERATE_MIPMAP),
1346 const_iv (GL_LINEAR),
1347 const_iv (GL_MODULATE), 1387 const_iv (GL_MODULATE),
1388 const_iv (GL_DECAL),
1348 const_iv (GL_REPLACE), 1389 const_iv (GL_REPLACE),
1349 const_iv (GL_COLOR_BUFFER_BIT), 1390 const_iv (GL_COLOR_BUFFER_BIT),
1350 const_iv (GL_PROJECTION), 1391 const_iv (GL_PROJECTION),
1351 const_iv (GL_MODELVIEW), 1392 const_iv (GL_MODELVIEW),
1352 const_iv (GL_COLOR_LOGIC_OP), 1393 const_iv (GL_COLOR_LOGIC_OP),
1394 const_iv (GL_SEPARABLE_2D),
1353 const_iv (GL_CONVOLUTION_2D), 1395 const_iv (GL_CONVOLUTION_2D),
1354 const_iv (GL_CONVOLUTION_BORDER_MODE), 1396 const_iv (GL_CONVOLUTION_BORDER_MODE),
1355 const_iv (GL_CONSTANT_BORDER), 1397 const_iv (GL_CONSTANT_BORDER),
1356 const_iv (GL_LINES), 1398 const_iv (GL_LINES),
1357 const_iv (GL_QUADS), 1399 const_iv (GL_QUADS),
… …
1382 1424
1383void glBlendFunc (int sfactor, int dfactor) 1425void glBlendFunc (int sfactor, int dfactor)
1384 1426
1385void glLogicOp (int opcode) 1427void glLogicOp (int opcode)
1386 1428
1429void glColorMask (int red, int green, int blue, int alpha)
1430
1387void glMatrixMode (int mode) 1431void glMatrixMode (int mode)
1388 1432
1389void glPushMatrix () 1433void glPushMatrix ()
1390 1434
1391void glPopMatrix () 1435void glPopMatrix ()
1392 1436
1393void glLoadIdentity () 1437void glLoadIdentity ()
1394 1438
1439# near and far are due to microsofts buggy c compiler
1395void glOrtho (double left, double right, double bottom, double top, double near, double far) 1440void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1396 1441
1397void glViewport (int x, int y, int width, int height) 1442void glViewport (int x, int y, int width, int height)
1443
1444void glScissor (int x, int y, int width, int height)
1398 1445
1399void glTranslate (float x, float y, float z = 0.) 1446void glTranslate (float x, float y, float z = 0.)
1400 CODE: 1447 CODE:
1401 glTranslatef (x, y, z); 1448 glTranslatef (x, y, z);
1402 1449
1403void glScale (float x, float y, float z) 1450void glScale (float x, float y, float z = 1.)
1404 CODE: 1451 CODE:
1405 glScalef (x, y, z); 1452 glScalef (x, y, z);
1406 1453
1407void glRotate (float angle, float x, float y, float z) 1454void glRotate (float angle, float x, float y, float z)
1408 CODE: 1455 CODE:
… …
1435 1482
1436void glBindTexture (int target, int name) 1483void glBindTexture (int target, int name)
1437 1484
1438void glConvolutionParameter (int target, int pname, float params) 1485void glConvolutionParameter (int target, int pname, float params)
1439 CODE: 1486 CODE:
1440 glConvolutionParameterf (target, pname, params); 1487 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1441 1488
1442void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1489void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1490 CODE:
1491 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1492 (target, internalformat, width, height, format, type, data));
1493
1494void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1495 CODE:
1496 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,
1497 (target, internalformat, width, height, format, type, row, column));
1443 1498
1444void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1499void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1445 1500
1446void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1501void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1502
1503void glRasterPos (int x, int y)
1504 CODE:
1505 glRasterPos2i (x, y);
1506
1507void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1447 1508
1448int glGenTexture () 1509int glGenTexture ()
1449 CODE: 1510 CODE:
1450{ 1511{
1451 GLuint name; 1512 GLuint name;

Diff Legend

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