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.66 by root, Mon Apr 24 11:45:16 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;
… …
520add_font (char *file) 530add_font (char *file)
521 CODE: 531 CODE:
522 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 532 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
523 533
524void 534void
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
536void
537load_image_inline (SV *image_) 535load_image_inline (SV *image_)
538 ALIAS: 536 ALIAS:
539 load_image_file = 1 537 load_image_file = 1
540 PPCODE: 538 PPCODE:
541{ 539{
… …
621 PUSHs (sv_2mortal (newSViv (b / y))); 619 PUSHs (sv_2mortal (newSViv (b / y)));
622 PUSHs (sv_2mortal (newSViv (a / y))); 620 PUSHs (sv_2mortal (newSViv (a / y)));
623} 621}
624 622
625void 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
626fatal (char *message) 633fatal (char *message)
627 CODE: 634 CODE:
628#ifdef _WIN32 635#ifdef _WIN32
629 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);
630#else 637#else
631 fprintf (stderr, "FATAL: %s\n", message); 638 fprintf (stderr, "FATAL: %s\n", message);
632#endif 639#endif
633 exit (1); 640 exit (1);
634 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
635MODULE = CFClient PACKAGE = CFClient::Layout 666MODULE = CFClient PACKAGE = CFClient::Layout
636 667
637CFClient::Layout 668CFClient::Layout
638new (SV *class, int base_height = 10) 669new (SV *class, int base_height = MIN_FONT_HEIGHT)
639 CODE: 670 CODE:
640 New (0, RETVAL, 1, struct cf_layout); 671 New (0, RETVAL, 1, struct cf_layout);
672 RETVAL->pl = pango_layout_new (context);
641 RETVAL->base_height = base_height; 673 RETVAL->base_height = base_height;
642 RETVAL->pl = pango_layout_new (context); 674 RETVAL->font = 0;
643 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 675 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
644 pango_layout_set_font_description (RETVAL->pl, 676 pango_layout_set_font_description (RETVAL->pl, default_font);
645 pango_font_description_copy (
646 pango_context_get_font_description (context)));
647 OUTPUT: 677 OUTPUT:
648 RETVAL 678 RETVAL
649 679
650void 680void
651DESTROY (CFClient::Layout self) 681DESTROY (CFClient::Layout self)
… …
680 SvUTF8_on (RETVAL); 710 SvUTF8_on (RETVAL);
681 OUTPUT: 711 OUTPUT:
682 RETVAL 712 RETVAL
683 713
684void 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
685set_height (CFClient::Layout self, int base_height) 724set_height (CFClient::Layout self, int base_height)
686 CODE: 725 CODE:
726 if (self->base_height != base_height)
727 {
687 self->base_height = base_height; 728 self->base_height = base_height;
729 layout_update_font (self);
730 }
688 731
689void 732void
690set_width (CFClient::Layout self, int max_width = -1) 733set_width (CFClient::Layout self, int max_width = -1)
691 CODE: 734 CODE:
692 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);
… …
695size (CFClient::Layout self) 738size (CFClient::Layout self)
696 PPCODE: 739 PPCODE:
697{ 740{
698 int w, h; 741 int w, h;
699 742
700 layout_update (self);
701 layout_get_pixel_size (self, &w, &h); 743 layout_get_pixel_size (self, &w, &h);
702 744
703 EXTEND (SP, 2); 745 EXTEND (SP, 2);
704 PUSHs (sv_2mortal (newSViv (w))); 746 PUSHs (sv_2mortal (newSViv (w)));
705 PUSHs (sv_2mortal (newSViv (h))); 747 PUSHs (sv_2mortal (newSViv (h)));
… …
708int 750int
709xy_to_index (CFClient::Layout self, int x, int y) 751xy_to_index (CFClient::Layout self, int x, int y)
710 CODE: 752 CODE:
711{ 753{
712 int index, trailing; 754 int index, trailing;
713
714 layout_update (self);
715 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);
716
717 RETVAL = index; 756 RETVAL = index;
718} 757}
719 OUTPUT: 758 OUTPUT:
720 RETVAL 759 RETVAL
721 760
722void 761void
723cursor_pos (CFClient::Layout self, int index) 762cursor_pos (CFClient::Layout self, int index)
724 PPCODE: 763 PPCODE:
725{ 764{
726 PangoRectangle strong_pos; 765 PangoRectangle strong_pos;
727 layout_update (self);
728 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 766 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
729 767
730 EXTEND (SP, 3); 768 EXTEND (SP, 3);
731 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 769 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
732 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 770 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
… …
739{ 777{
740 SV *retval; 778 SV *retval;
741 int w, h; 779 int w, h;
742 FT_Bitmap bitmap; 780 FT_Bitmap bitmap;
743 781
744 layout_update (self);
745 layout_get_pixel_size (self, &w, &h); 782 layout_get_pixel_size (self, &w, &h);
746 783
747 retval = newSV (w * h); 784 retval = newSV (w * h);
748 SvPOK_only (retval); 785 SvPOK_only (retval);
749 SvCUR_set (retval, w * h); 786 SvCUR_set (retval, w * h);
… …
1318 const_iv (GL_SRC_ALPHA), 1355 const_iv (GL_SRC_ALPHA),
1319 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1356 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1320 const_iv (GL_RGB), 1357 const_iv (GL_RGB),
1321 const_iv (GL_RGBA), 1358 const_iv (GL_RGBA),
1322 const_iv (GL_UNSIGNED_BYTE), 1359 const_iv (GL_UNSIGNED_BYTE),
1323 const_iv (GL_ALPHA4),
1324 const_iv (GL_ALPHA), 1360 const_iv (GL_ALPHA),
1325 const_iv (GL_FLOAT), 1361 const_iv (GL_FLOAT),
1326 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1362 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1327 const_iv (GL_COMPILE), 1363 const_iv (GL_COMPILE),
1328 const_iv (GL_TEXTURE_1D), 1364 const_iv (GL_TEXTURE_1D),
… …
1389 1425
1390void glPopMatrix () 1426void glPopMatrix ()
1391 1427
1392void glLoadIdentity () 1428void glLoadIdentity ()
1393 1429
1430# near and far are due to microsofts buggy c compiler
1394void glOrtho (double left, double right, double bottom, double top, double near, double far) 1431void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1395 1432
1396void glViewport (int x, int y, int width, int height) 1433void glViewport (int x, int y, int width, int height)
1397 1434
1398void glTranslate (float x, float y, float z = 0.) 1435void glTranslate (float x, float y, float z = 0.)
1399 CODE: 1436 CODE:
1400 glTranslatef (x, y, z); 1437 glTranslatef (x, y, z);
1401 1438
1402void glScale (float x, float y, float z) 1439void glScale (float x, float y, float z = 1.)
1403 CODE: 1440 CODE:
1404 glScalef (x, y, z); 1441 glScalef (x, y, z);
1405 1442
1406void glRotate (float angle, float x, float y, float z) 1443void glRotate (float angle, float x, float y, float z)
1407 CODE: 1444 CODE:
… …
1434 1471
1435void glBindTexture (int target, int name) 1472void glBindTexture (int target, int name)
1436 1473
1437void glConvolutionParameter (int target, int pname, float params) 1474void glConvolutionParameter (int target, int pname, float params)
1438 CODE: 1475 CODE:
1439 glConvolutionParameterf (target, pname, params); 1476 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1440 1477
1441void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1478void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1479 CODE:
1480 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1481 (target, internalformat, width, height, format, type, data));
1442 1482
1443void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1483void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1444 1484
1445void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1485void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1446 1486

Diff Legend

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