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.64 by root, Mon Apr 24 08:11:31 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{
… …
630#else 628#else
631 fprintf (stderr, "FATAL: %s\n", message); 629 fprintf (stderr, "FATAL: %s\n", message);
632#endif 630#endif
633 exit (1); 631 exit (1);
634 632
633MODULE = CFClient PACKAGE = CFClient::Font
634
635CFClient::Font
636new_from_file (SV *class, char *path)
637 CODE:
638{
639 int count;
640 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count);
641 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
642 FcPatternDestroy (pattern);
643}
644 OUTPUT:
645 RETVAL
646
647void
648DESTROY (CFClient::Font self)
649 CODE:
650 pango_font_description_free (self);
651
652void
653make_default (CFClient::Font self)
654 CODE:
655 default_font = self;
656
635MODULE = CFClient PACKAGE = CFClient::Layout 657MODULE = CFClient PACKAGE = CFClient::Layout
636 658
637CFClient::Layout 659CFClient::Layout
638new (SV *class, int base_height = 10) 660new (SV *class, int base_height = MIN_FONT_HEIGHT)
639 CODE: 661 CODE:
640 New (0, RETVAL, 1, struct cf_layout); 662 New (0, RETVAL, 1, struct cf_layout);
663 RETVAL->pl = pango_layout_new (context);
641 RETVAL->base_height = base_height; 664 RETVAL->base_height = base_height;
642 RETVAL->pl = pango_layout_new (context); 665 RETVAL->font = 0;
643 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 666 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
644 pango_layout_set_font_description (RETVAL->pl, 667 pango_layout_set_font_description (RETVAL->pl, default_font);
645 pango_font_description_copy (
646 pango_context_get_font_description (context)));
647 OUTPUT: 668 OUTPUT:
648 RETVAL 669 RETVAL
649 670
650void 671void
651DESTROY (CFClient::Layout self) 672DESTROY (CFClient::Layout self)
… …
680 SvUTF8_on (RETVAL); 701 SvUTF8_on (RETVAL);
681 OUTPUT: 702 OUTPUT:
682 RETVAL 703 RETVAL
683 704
684void 705void
706set_font (CFClient::Layout self, CFClient::Font font = 0)
707 CODE:
708 if (self->font != font)
709 {
710 self->font = font;
711 layout_update_font (self);
712 }
713
714void
685set_height (CFClient::Layout self, int base_height) 715set_height (CFClient::Layout self, int base_height)
686 CODE: 716 CODE:
717 if (self->base_height != base_height)
718 {
687 self->base_height = base_height; 719 self->base_height = base_height;
720 layout_update_font (self);
721 }
688 722
689void 723void
690set_width (CFClient::Layout self, int max_width = -1) 724set_width (CFClient::Layout self, int max_width = -1)
691 CODE: 725 CODE:
692 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 726 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
… …
695size (CFClient::Layout self) 729size (CFClient::Layout self)
696 PPCODE: 730 PPCODE:
697{ 731{
698 int w, h; 732 int w, h;
699 733
700 layout_update (self);
701 layout_get_pixel_size (self, &w, &h); 734 layout_get_pixel_size (self, &w, &h);
702 735
703 EXTEND (SP, 2); 736 EXTEND (SP, 2);
704 PUSHs (sv_2mortal (newSViv (w))); 737 PUSHs (sv_2mortal (newSViv (w)));
705 PUSHs (sv_2mortal (newSViv (h))); 738 PUSHs (sv_2mortal (newSViv (h)));
… …
708int 741int
709xy_to_index (CFClient::Layout self, int x, int y) 742xy_to_index (CFClient::Layout self, int x, int y)
710 CODE: 743 CODE:
711{ 744{
712 int index, trailing; 745 int index, trailing;
713
714 layout_update (self);
715 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 746 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
716
717 RETVAL = index; 747 RETVAL = index;
718} 748}
719 OUTPUT: 749 OUTPUT:
720 RETVAL 750 RETVAL
721 751
722void 752void
723cursor_pos (CFClient::Layout self, int index) 753cursor_pos (CFClient::Layout self, int index)
724 PPCODE: 754 PPCODE:
725{ 755{
726 PangoRectangle strong_pos; 756 PangoRectangle strong_pos;
727 layout_update (self);
728 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 757 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
729 758
730 EXTEND (SP, 3); 759 EXTEND (SP, 3);
731 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 760 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
732 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 761 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
… …
739{ 768{
740 SV *retval; 769 SV *retval;
741 int w, h; 770 int w, h;
742 FT_Bitmap bitmap; 771 FT_Bitmap bitmap;
743 772
744 layout_update (self);
745 layout_get_pixel_size (self, &w, &h); 773 layout_get_pixel_size (self, &w, &h);
746 774
747 retval = newSV (w * h); 775 retval = newSV (w * h);
748 SvPOK_only (retval); 776 SvPOK_only (retval);
749 SvCUR_set (retval, w * h); 777 SvCUR_set (retval, w * h);
… …
1389 1417
1390void glPopMatrix () 1418void glPopMatrix ()
1391 1419
1392void glLoadIdentity () 1420void glLoadIdentity ()
1393 1421
1422# near and far are due to microsofts buggy c compiler
1394void glOrtho (double left, double right, double bottom, double top, double near, double far) 1423void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1395 1424
1396void glViewport (int x, int y, int width, int height) 1425void glViewport (int x, int y, int width, int height)
1397 1426
1398void glTranslate (float x, float y, float z = 0.) 1427void glTranslate (float x, float y, float z = 0.)
1399 CODE: 1428 CODE:
1400 glTranslatef (x, y, z); 1429 glTranslatef (x, y, z);
1401 1430
1402void glScale (float x, float y, float z) 1431void glScale (float x, float y, float z = 1.)
1403 CODE: 1432 CODE:
1404 glScalef (x, y, z); 1433 glScalef (x, y, z);
1405 1434
1406void glRotate (float angle, float x, float y, float z) 1435void glRotate (float angle, float x, float y, float z)
1407 CODE: 1436 CODE:
… …
1434 1463
1435void glBindTexture (int target, int name) 1464void glBindTexture (int target, int name)
1436 1465
1437void glConvolutionParameter (int target, int pname, float params) 1466void glConvolutionParameter (int target, int pname, float params)
1438 CODE: 1467 CODE:
1439 glConvolutionParameterf (target, pname, params); 1468 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1440 1469
1441void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1470void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1471 CODE:
1472 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1473 (target, internalformat, width, height, format, type, data));
1442 1474
1443void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1475void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1444 1476
1445void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1477void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1446 1478

Diff Legend

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