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.54 by root, Wed Apr 19 23:37:48 2006 UTC vs.
Revision 1.69 by root, Sun Apr 30 08:09:44 2006 UTC

33 typedef signed char int8_t; 33 typedef signed char int8_t;
34 typedef signed short int16_t; 34 typedef signed short int16_t;
35 typedef signed int int32_t; 35 typedef signed int int32_t;
36#endif 36#endif
37 37
38#include "glext.h"
39
38#define FOW_DARKNESS 32 40#define FOW_DARKNESS 32
39 41
40#define MAP_EXTEND_X 32 42#define MAP_EXTEND_X 32
41#define MAP_EXTEND_Y 512 43#define MAP_EXTEND_Y 512
42 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
43typedef Mix_Chunk *CFClient__MixChunk; 62typedef Mix_Chunk *CFClient__MixChunk;
44typedef Mix_Music *CFClient__MixMusic; 63typedef Mix_Music *CFClient__MixMusic;
45 64
46static PangoContext *context; 65typedef PangoFontDescription *CFClient__Font;
47static PangoFontMap *fontmap;
48 66
49typedef struct cf_layout { 67typedef struct cf_layout {
50 PangoLayout *pl; 68 PangoLayout *pl;
51 int base_height; 69 int base_height;
70 CFClient__Font font;
52} *CFClient__Layout; 71} *CFClient__Layout;
72
73static CFClient__Font default_font;
74static PangoContext *context;
75static PangoFontMap *fontmap;
53 76
54static void 77static void
55substitute_func (FcPattern *pattern, gpointer data) 78substitute_func (FcPattern *pattern, gpointer data)
56{ 79{
57 FcPatternAddBool (pattern, FC_HINTING , 1); 80 FcPatternAddBool (pattern, FC_HINTING , 1);
58 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 81 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
59} 82}
60 83
61static void 84static void
62layout_update (CFClient__Layout self) 85layout_update_font (CFClient__Layout self)
63{ 86{
64 /* 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
65 * reasonably well with bitstream vera 88 * reasonably well with bitstream vera
66 */ 89 */
67 PangoFontDescription *font = pango_context_get_font_description (context); 90 PangoFontDescription *font = self->font ? self->font : default_font;
68 91
69 int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71 if (pango_font_description_get_size (font) != height)
72 {
73 pango_font_description_set_absolute_size (font, height); 92 pango_font_description_set_absolute_size (font,
74 pango_layout_context_changed (self->pl); 93 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75 } 94
95 pango_layout_set_font_description (self->pl, font);
76} 96}
77 97
78static void 98static void
79layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 99layout_get_pixel_size (CFClient__Layout self, int *w, int *h)
80{ 100{
81 layout_update (self);
82
83 pango_layout_get_pixel_size (self->pl, w, h); 101 pango_layout_get_pixel_size (self->pl, w, h);
84 102
85 *w = (*w + 3) & ~3; 103 *w = (*w + 3) & ~3;
86 if (!*w) *w = 1; 104 if (!*w) *w = 1;
87 if (!*h) *h = 1; 105 if (!*h) *h = 1;
237 break; 255 break;
238 256
239 row->col[x - row->c0].darkness = -1; 257 row->col[x - row->c0].darkness = -1;
240 } 258 }
241 } 259 }
260}
261
262static void
263music_finished ()
264{
265 SDL_UserEvent ev;
266
267 ev.type = SDL_USEREVENT;
268 ev.code = 0;
269 ev.data1 = 0;
270 ev.data2 = 0;
271
272 SDL_PushEvent ((SDL_Event *)&ev);
242} 273}
243 274
244MODULE = CFClient PACKAGE = CFClient 275MODULE = CFClient PACKAGE = CFClient
245 276
246PROTOTYPES: ENABLE 277PROTOTYPES: ENABLE
463 } 494 }
464} 495}
465 496
466int 497int
467Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 498Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
499 POSTCALL:
500 Mix_HookMusicFinished (music_finished);
468 501
469void 502void
470Mix_CloseAudio () 503Mix_CloseAudio ()
471 504
472int 505int
495 528
496void 529void
497add_font (char *file) 530add_font (char *file)
498 CODE: 531 CODE:
499 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 532 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
500
501void
502set_font (char *file)
503 CODE:
504{
505 int count;
506 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
507 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
508 FcPatternDestroy (pattern);
509 pango_context_set_font_description (context, font);
510}
511 533
512void 534void
513load_image_inline (SV *image_) 535load_image_inline (SV *image_)
514 ALIAS: 536 ALIAS:
515 load_image_file = 1 537 load_image_file = 1
597 PUSHs (sv_2mortal (newSViv (b / y))); 619 PUSHs (sv_2mortal (newSViv (b / y)));
598 PUSHs (sv_2mortal (newSViv (a / y))); 620 PUSHs (sv_2mortal (newSViv (a / y)));
599} 621}
600 622
601void 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
602fatal (char *message) 633fatal (char *message)
603 CODE: 634 CODE:
604#ifdef _WIN32 635#ifdef _WIN32
605 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);
606#else 637#else
607 fprintf (stderr, "FATAL: %s\n", message); 638 fprintf (stderr, "FATAL: %s\n", message);
608#endif 639#endif
609 exit (1); 640 exit (1);
610 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
611MODULE = CFClient PACKAGE = CFClient::Layout 666MODULE = CFClient PACKAGE = CFClient::Layout
612 667
613CFClient::Layout 668CFClient::Layout
614new (SV *class, int base_height = 10) 669new (SV *class, int base_height = MIN_FONT_HEIGHT)
615 CODE: 670 CODE:
616 New (0, RETVAL, 1, struct cf_layout); 671 New (0, RETVAL, 1, struct cf_layout);
672 RETVAL->pl = pango_layout_new (context);
617 RETVAL->base_height = base_height; 673 RETVAL->base_height = base_height;
618 RETVAL->pl = pango_layout_new (context); 674 RETVAL->font = 0;
619 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 675 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
676 pango_layout_set_font_description (RETVAL->pl, default_font);
620 OUTPUT: 677 OUTPUT:
621 RETVAL 678 RETVAL
622 679
623void 680void
624DESTROY (CFClient::Layout self) 681DESTROY (CFClient::Layout self)
653 SvUTF8_on (RETVAL); 710 SvUTF8_on (RETVAL);
654 OUTPUT: 711 OUTPUT:
655 RETVAL 712 RETVAL
656 713
657void 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
658set_height (CFClient::Layout self, int base_height) 724set_height (CFClient::Layout self, int base_height)
659 CODE: 725 CODE:
726 if (self->base_height != base_height)
727 {
660 self->base_height = base_height; 728 self->base_height = base_height;
729 layout_update_font (self);
730 }
661 731
662void 732void
663set_width (CFClient::Layout self, int max_width = -1) 733set_width (CFClient::Layout self, int max_width = -1)
664 CODE: 734 CODE:
665 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);
668size (CFClient::Layout self) 738size (CFClient::Layout self)
669 PPCODE: 739 PPCODE:
670{ 740{
671 int w, h; 741 int w, h;
672 742
673 layout_update (self);
674 layout_get_pixel_size (self, &w, &h); 743 layout_get_pixel_size (self, &w, &h);
675 744
676 EXTEND (SP, 2); 745 EXTEND (SP, 2);
677 PUSHs (sv_2mortal (newSViv (w))); 746 PUSHs (sv_2mortal (newSViv (w)));
678 PUSHs (sv_2mortal (newSViv (h))); 747 PUSHs (sv_2mortal (newSViv (h)));
681int 750int
682xy_to_index (CFClient::Layout self, int x, int y) 751xy_to_index (CFClient::Layout self, int x, int y)
683 CODE: 752 CODE:
684{ 753{
685 int index, trailing; 754 int index, trailing;
686
687 layout_update (self);
688 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);
689
690 RETVAL = index; 756 RETVAL = index;
691} 757}
692 OUTPUT: 758 OUTPUT:
693 RETVAL 759 RETVAL
694 760
695void 761void
696cursor_pos (CFClient::Layout self, int index) 762cursor_pos (CFClient::Layout self, int index)
697 PPCODE: 763 PPCODE:
698{ 764{
699 PangoRectangle strong_pos; 765 PangoRectangle strong_pos;
700 layout_update (self);
701 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 766 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702 767
703 EXTEND (SP, 3); 768 EXTEND (SP, 3);
704 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 769 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 770 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
712{ 777{
713 SV *retval; 778 SV *retval;
714 int w, h; 779 int w, h;
715 FT_Bitmap bitmap; 780 FT_Bitmap bitmap;
716 781
717 layout_update (self);
718 layout_get_pixel_size (self, &w, &h); 782 layout_get_pixel_size (self, &w, &h);
719 783
720 retval = newSV (w * h); 784 retval = newSV (w * h);
721 SvPOK_only (retval); 785 SvPOK_only (retval);
722 SvCUR_set (retval, w * h); 786 SvCUR_set (retval, w * h);
933 cell->darkness = -1; 997 cell->darkness = -1;
934 } 998 }
935} 999}
936 1000
937SV * 1001SV *
938mapmap (CFClient::Map self, int w, int h) 1002mapmap (CFClient::Map self, int x0, int y0, int w, int h)
939 CODE: 1003 CODE:
940{ 1004{
941 int x0, x1, x; 1005 int x1, x;
942 int y0, y1, y; 1006 int y1, y;
943 int z; 1007 int z;
944 SV *map_sv = newSV (w * h * sizeof (uint32_t)); 1008 SV *map_sv = newSV (w * h * sizeof (uint32_t));
945 uint32_t *map = (uint32_t *)SvPVX (map_sv); 1009 uint32_t *map = (uint32_t *)SvPVX (map_sv);
946 1010
947 SvPOK_only (map_sv); 1011 SvPOK_only (map_sv);
948 SvCUR_set (map_sv, w * h * sizeof (uint32_t)); 1012 SvCUR_set (map_sv, w * h * sizeof (uint32_t));
949 1013
950 x0 = self->x - w / 2; x1 = x0 + w; 1014 x0 += self->x; x1 = x0 + w;
951 y0 = self->y - h / 2; y1 = y0 + h; 1015 y0 += self->y; y1 = y0 + h;
952 1016
953 for (y = y0; y < y1; y++) 1017 for (y = y0; y < y1; y++)
954 { 1018 {
955 maprow *row = 0 <= y && y < self->rows 1019 maprow *row = 0 <= y && y < self->rows
956 ? self->row + y 1020 ? self->row + y
1096 *data++ = 0; /* version 0 format */ 1160 *data++ = 0; /* version 0 format */
1097 *data++ = w >> 8; *data++ = w; 1161 *data++ = w >> 8; *data++ = w;
1098 *data++ = h >> 8; *data++ = h; 1162 *data++ = h >> 8; *data++ = h;
1099 1163
1100 // we need to do this 'cause we don't keep an absolute coord system for rows 1164 // we need to do this 'cause we don't keep an absolute coord system for rows
1101 // TODO: treat rows as we treat 1165 // TODO: treat rows as we treat columns
1102 map_get_row (self, y0 + self->y - self->oy);//D 1166 map_get_row (self, y0 + self->y - self->oy);//D
1103 map_get_row (self, y0 + self->y - self->oy + h - 1);//D 1167 map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1104 1168
1105 x0 += self->x - self->ox; 1169 x0 += self->x - self->ox;
1106 y0 += self->y - self->oy; 1170 y0 += self->y - self->oy;
1170 1234
1171 w = *data++ << 8; w |= *data++; 1235 w = *data++ << 8; w |= *data++;
1172 h = *data++ << 8; h |= *data++; 1236 h = *data++ << 8; h |= *data++;
1173 1237
1174 // we need to do this 'cause we don't keep an absolute coord system for rows 1238 // we need to do this 'cause we don't keep an absolute coord system for rows
1175 // TODO: treat rows as we treat 1239 // TODO: treat rows as we treat columns
1176 map_get_row (self, y0 + self->y - self->oy);//D 1240 map_get_row (self, y0 + self->y - self->oy);//D
1177 map_get_row (self, y0 + self->y - self->oy + h - 1);//D 1241 map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1178 1242
1179 x0 += self->x - self->ox; 1243 x0 += self->x - self->ox;
1180 y0 += self->y - self->oy; 1244 y0 += self->y - self->oy;
1284 } *civ, const_iv[] = { 1348 } *civ, const_iv[] = {
1285# define const_iv(name) { # name, (IV)name } 1349# define const_iv(name) { # name, (IV)name }
1286 const_iv (GL_COLOR_MATERIAL), 1350 const_iv (GL_COLOR_MATERIAL),
1287 const_iv (GL_SMOOTH), 1351 const_iv (GL_SMOOTH),
1288 const_iv (GL_FLAT), 1352 const_iv (GL_FLAT),
1353 const_iv (GL_DITHER),
1289 const_iv (GL_BLEND), 1354 const_iv (GL_BLEND),
1355 const_iv (GL_SCISSOR_TEST),
1290 const_iv (GL_AND), 1356 const_iv (GL_AND),
1357 const_iv (GL_ONE),
1358 const_iv (GL_ZERO),
1291 const_iv (GL_SRC_ALPHA), 1359 const_iv (GL_SRC_ALPHA),
1360 const_iv (GL_SRC_ALPHA_SATURATE),
1292 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1361 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1362 const_iv (GL_ONE_MINUS_DST_ALPHA),
1293 const_iv (GL_RGB), 1363 const_iv (GL_RGB),
1294 const_iv (GL_RGBA), 1364 const_iv (GL_RGBA),
1295 const_iv (GL_UNSIGNED_BYTE), 1365 const_iv (GL_UNSIGNED_BYTE),
1296 const_iv (GL_ALPHA4),
1297 const_iv (GL_ALPHA), 1366 const_iv (GL_ALPHA),
1298 const_iv (GL_FLOAT), 1367 const_iv (GL_FLOAT),
1299 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1368 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300 const_iv (GL_COMPILE), 1369 const_iv (GL_COMPILE),
1301 const_iv (GL_TEXTURE_1D), 1370 const_iv (GL_TEXTURE_1D),
1308 const_iv (GL_TEXTURE_WRAP_T), 1377 const_iv (GL_TEXTURE_WRAP_T),
1309 const_iv (GL_CLAMP), 1378 const_iv (GL_CLAMP),
1310 const_iv (GL_REPEAT), 1379 const_iv (GL_REPEAT),
1311 const_iv (GL_NEAREST), 1380 const_iv (GL_NEAREST),
1312 const_iv (GL_LINEAR), 1381 const_iv (GL_LINEAR),
1382 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1383 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1384 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1385 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1386 const_iv (GL_GENERATE_MIPMAP),
1313 const_iv (GL_MODULATE), 1387 const_iv (GL_MODULATE),
1388 const_iv (GL_DECAL),
1314 const_iv (GL_REPLACE), 1389 const_iv (GL_REPLACE),
1315 const_iv (GL_COLOR_BUFFER_BIT), 1390 const_iv (GL_COLOR_BUFFER_BIT),
1316 const_iv (GL_PROJECTION), 1391 const_iv (GL_PROJECTION),
1317 const_iv (GL_MODELVIEW), 1392 const_iv (GL_MODELVIEW),
1318 const_iv (GL_COLOR_LOGIC_OP), 1393 const_iv (GL_COLOR_LOGIC_OP),
1394 const_iv (GL_SEPARABLE_2D),
1319 const_iv (GL_CONVOLUTION_2D), 1395 const_iv (GL_CONVOLUTION_2D),
1320 const_iv (GL_CONVOLUTION_BORDER_MODE), 1396 const_iv (GL_CONVOLUTION_BORDER_MODE),
1321 const_iv (GL_CONSTANT_BORDER), 1397 const_iv (GL_CONSTANT_BORDER),
1322 const_iv (GL_LINES), 1398 const_iv (GL_LINES),
1323 const_iv (GL_QUADS), 1399 const_iv (GL_QUADS),
1400 const_iv (GL_LINE_LOOP),
1324 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1401 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1325 const_iv (GL_FASTEST), 1402 const_iv (GL_FASTEST),
1326# undef const_iv 1403# undef const_iv
1327 }; 1404 };
1328 1405
1347 1424
1348void glBlendFunc (int sfactor, int dfactor) 1425void glBlendFunc (int sfactor, int dfactor)
1349 1426
1350void glLogicOp (int opcode) 1427void glLogicOp (int opcode)
1351 1428
1429void glColorMask (int red, int green, int blue, int alpha)
1430
1352void glMatrixMode (int mode) 1431void glMatrixMode (int mode)
1353 1432
1354void glPushMatrix () 1433void glPushMatrix ()
1355 1434
1356void glPopMatrix () 1435void glPopMatrix ()
1357 1436
1358void glLoadIdentity () 1437void glLoadIdentity ()
1359 1438
1439# near and far are due to microsofts buggy c compiler
1360void 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_)
1361 1441
1362void 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)
1363 1445
1364void glTranslate (float x, float y, float z = 0.) 1446void glTranslate (float x, float y, float z = 0.)
1365 CODE: 1447 CODE:
1366 glTranslatef (x, y, z); 1448 glTranslatef (x, y, z);
1367 1449
1368void glScale (float x, float y, float z) 1450void glScale (float x, float y, float z = 1.)
1369 CODE: 1451 CODE:
1370 glScalef (x, y, z); 1452 glScalef (x, y, z);
1371 1453
1372void glRotate (float angle, float x, float y, float z) 1454void glRotate (float angle, float x, float y, float z)
1373 CODE: 1455 CODE:
1400 1482
1401void glBindTexture (int target, int name) 1483void glBindTexture (int target, int name)
1402 1484
1403void glConvolutionParameter (int target, int pname, float params) 1485void glConvolutionParameter (int target, int pname, float params)
1404 CODE: 1486 CODE:
1405 glConvolutionParameterf (target, pname, params); 1487 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));
1406 1488
1407void 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));
1408 1498
1409void 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)
1410 1500
1411void 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)
1412 1508
1413int glGenTexture () 1509int glGenTexture ()
1414 CODE: 1510 CODE:
1415{ 1511{
1416 GLuint name; 1512 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines