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.57 by root, Fri Apr 21 07:09:10 2006 UTC vs.
Revision 1.65 by root, Mon Apr 24 08:22:21 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 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 }
61
45typedef Mix_Chunk *CFClient__MixChunk; 62typedef Mix_Chunk *CFClient__MixChunk;
46typedef Mix_Music *CFClient__MixMusic; 63typedef Mix_Music *CFClient__MixMusic;
47 64
48static PangoContext *context; 65typedef PangoFontDescription *CFClient__Font;
49static PangoFontMap *fontmap;
50 66
51typedef struct cf_layout { 67typedef struct cf_layout {
52 PangoLayout *pl; 68 PangoLayout *pl;
53 int base_height; 69 int base_height;
70 CFClient__Font font;
54} *CFClient__Layout; 71} *CFClient__Layout;
72
73static CFClient__Font default_font;
74static PangoContext *context;
75static PangoFontMap *fontmap;
55 76
56static void 77static void
57substitute_func (FcPattern *pattern, gpointer data) 78substitute_func (FcPattern *pattern, gpointer data)
58{ 79{
59 FcPatternAddBool (pattern, FC_HINTING , 1); 80 FcPatternAddBool (pattern, FC_HINTING , 1);
60 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 81 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
61} 82}
62 83
63static void 84static void
64layout_update (CFClient__Layout self) 85layout_update_font (CFClient__Layout self)
65{ 86{
66 /* 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
67 * reasonably well with bitstream vera 88 * reasonably well with bitstream vera
68 */ 89 */
69 PangoFontDescription *font = pango_context_get_font_description (context); 90 PangoFontDescription *font = self->font ? self->font : default_font;
70 91
71 int height = self->base_height * (PANGO_SCALE * 8 / 10);
72
73 if (pango_font_description_get_size (font) != height)
74 {
75 pango_font_description_set_absolute_size (font, height); 92 pango_font_description_set_absolute_size (font,
76 pango_layout_context_changed (self->pl); 93 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
77 } 94
95 pango_layout_set_font_description (self->pl, font);
78} 96}
79 97
80static void 98static void
81layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 99layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
82{ 100{
83 layout_update (self);
84
85 pango_layout_get_pixel_size (self->pl, w, h); 101 pango_layout_get_pixel_size (self->pl, w, h);
86 102
87 *w = (*w + 3) & ~3; 103 *w = (*w + 3) & ~3;
88 if (!*w) *w = 1; 104 if (!*w) *w = 1;
89 if (!*h) *h = 1; 105 if (!*h) *h = 1;
… …
514add_font (char *file) 530add_font (char *file)
515 CODE: 531 CODE:
516 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 532 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
517 533
518void 534void
519set_font (char *file)
520 CODE:
521{
522 int count;
523 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
524 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
525 FcPatternDestroy (pattern);
526 pango_context_set_font_description (context, font);
527}
528
529void
530load_image_inline (SV *image_) 535load_image_inline (SV *image_)
531 ALIAS: 536 ALIAS:
532 load_image_file = 1 537 load_image_file = 1
533 PPCODE: 538 PPCODE:
534{ 539{
… …
623#else 628#else
624 fprintf (stderr, "FATAL: %s\n", message); 629 fprintf (stderr, "FATAL: %s\n", message);
625#endif 630#endif
626 exit (1); 631 exit (1);
627 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
628MODULE = CFClient PACKAGE = CFClient::Layout 657MODULE = CFClient PACKAGE = CFClient::Layout
629 658
630CFClient::Layout 659CFClient::Layout
631new (SV *class, int base_height = 10) 660new (SV *class, int base_height = MIN_FONT_HEIGHT)
632 CODE: 661 CODE:
633 New (0, RETVAL, 1, struct cf_layout); 662 New (0, RETVAL, 1, struct cf_layout);
663 RETVAL->pl = pango_layout_new (context);
634 RETVAL->base_height = base_height; 664 RETVAL->base_height = base_height;
635 RETVAL->pl = pango_layout_new (context); 665 RETVAL->font = 0;
636 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 666 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
667 pango_layout_set_font_description (RETVAL->pl, default_font);
637 OUTPUT: 668 OUTPUT:
638 RETVAL 669 RETVAL
639 670
640void 671void
641DESTROY (CFClient::Layout self) 672DESTROY (CFClient::Layout self)
… …
670 SvUTF8_on (RETVAL); 701 SvUTF8_on (RETVAL);
671 OUTPUT: 702 OUTPUT:
672 RETVAL 703 RETVAL
673 704
674void 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
675set_height (CFClient::Layout self, int base_height) 715set_height (CFClient::Layout self, int base_height)
676 CODE: 716 CODE:
717 if (self->base_height != base_height)
718 {
677 self->base_height = base_height; 719 self->base_height = base_height;
720 layout_update_font (self);
721 }
678 722
679void 723void
680set_width (CFClient::Layout self, int max_width = -1) 724set_width (CFClient::Layout self, int max_width = -1)
681 CODE: 725 CODE:
682 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);
… …
685size (CFClient::Layout self) 729size (CFClient::Layout self)
686 PPCODE: 730 PPCODE:
687{ 731{
688 int w, h; 732 int w, h;
689 733
690 layout_update (self);
691 layout_get_pixel_size (self, &w, &h); 734 layout_get_pixel_size (self, &w, &h);
692 735
693 EXTEND (SP, 2); 736 EXTEND (SP, 2);
694 PUSHs (sv_2mortal (newSViv (w))); 737 PUSHs (sv_2mortal (newSViv (w)));
695 PUSHs (sv_2mortal (newSViv (h))); 738 PUSHs (sv_2mortal (newSViv (h)));
… …
698int 741int
699xy_to_index (CFClient::Layout self, int x, int y) 742xy_to_index (CFClient::Layout self, int x, int y)
700 CODE: 743 CODE:
701{ 744{
702 int index, trailing; 745 int index, trailing;
703
704 layout_update (self);
705 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);
706
707 RETVAL = index; 747 RETVAL = index;
708} 748}
709 OUTPUT: 749 OUTPUT:
710 RETVAL 750 RETVAL
711 751
712void 752void
713cursor_pos (CFClient::Layout self, int index) 753cursor_pos (CFClient::Layout self, int index)
714 PPCODE: 754 PPCODE:
715{ 755{
716 PangoRectangle strong_pos; 756 PangoRectangle strong_pos;
717 layout_update (self);
718 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 757 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
719 758
720 EXTEND (SP, 3); 759 EXTEND (SP, 3);
721 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 760 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
722 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 761 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
… …
729{ 768{
730 SV *retval; 769 SV *retval;
731 int w, h; 770 int w, h;
732 FT_Bitmap bitmap; 771 FT_Bitmap bitmap;
733 772
734 layout_update (self);
735 layout_get_pixel_size (self, &w, &h); 773 layout_get_pixel_size (self, &w, &h);
736 774
737 retval = newSV (w * h); 775 retval = newSV (w * h);
738 SvPOK_only (retval); 776 SvPOK_only (retval);
739 SvCUR_set (retval, w * h); 777 SvCUR_set (retval, w * h);
… …
1308 const_iv (GL_SRC_ALPHA), 1346 const_iv (GL_SRC_ALPHA),
1309 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1347 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1310 const_iv (GL_RGB), 1348 const_iv (GL_RGB),
1311 const_iv (GL_RGBA), 1349 const_iv (GL_RGBA),
1312 const_iv (GL_UNSIGNED_BYTE), 1350 const_iv (GL_UNSIGNED_BYTE),
1313 const_iv (GL_ALPHA4),
1314 const_iv (GL_ALPHA), 1351 const_iv (GL_ALPHA),
1315 const_iv (GL_FLOAT), 1352 const_iv (GL_FLOAT),
1316 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1353 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1317 const_iv (GL_COMPILE), 1354 const_iv (GL_COMPILE),
1318 const_iv (GL_TEXTURE_1D), 1355 const_iv (GL_TEXTURE_1D),
… …
1379 1416
1380void glPopMatrix () 1417void glPopMatrix ()
1381 1418
1382void glLoadIdentity () 1419void glLoadIdentity ()
1383 1420
1421# near and far are due to microsofts buggy c compiler
1384void glOrtho (double left, double right, double bottom, double top, double near, double far) 1422void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1385 1423
1386void glViewport (int x, int y, int width, int height) 1424void glViewport (int x, int y, int width, int height)
1387 1425
1388void glTranslate (float x, float y, float z = 0.) 1426void glTranslate (float x, float y, float z = 0.)
1389 CODE: 1427 CODE:
1390 glTranslatef (x, y, z); 1428 glTranslatef (x, y, z);
1391 1429
1392void glScale (float x, float y, float z) 1430void glScale (float x, float y, float z = 1.)
1393 CODE: 1431 CODE:
1394 glScalef (x, y, z); 1432 glScalef (x, y, z);
1395 1433
1396void glRotate (float angle, float x, float y, float z) 1434void glRotate (float angle, float x, float y, float z)
1397 CODE: 1435 CODE:
… …
1424 1462
1425void glBindTexture (int target, int name) 1463void glBindTexture (int target, int name)
1426 1464
1427void glConvolutionParameter (int target, int pname, float params) 1465void glConvolutionParameter (int target, int pname, float params)
1428 CODE: 1466 CODE:
1429 glConvolutionParameterf (target, pname, params); 1467 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1430 1468
1431void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1469void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1470 CODE:
1471 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,
1472 (target, internalformat, width, height, format, type, data));
1432 1473
1433void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1474void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1434 1475
1435void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1476void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1436 1477

Diff Legend

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