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.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.86 by root, Fri May 19 16:43:56 2006 UTC

… …
7 7
8#include "EXTERN.h" 8#include "EXTERN.h"
9#include "perl.h" 9#include "perl.h"
10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h>
12#include <string.h> 13#include <string.h>
13#include <stdio.h> 14#include <stdio.h>
14 15
15#include <SDL.h> 16#include <SDL.h>
16#include <SDL_endian.h> 17#include <SDL_endian.h>
… …
83 84
84static void 85static void
85substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
86{ 87{
87 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
88 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
89} 94}
90 95
91static void 96static void
92layout_update_font (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
93{ 98{
… …
436 SDL_Rect **m; 441 SDL_Rect **m;
437 442
438 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
439 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
440 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
441 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);
447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
442 450
443 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
444 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
445 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
447 455
448 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
449 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
450 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
451 457
452 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
453 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
454 460
455 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
664} 670}
665 671
666void 672void
667error (char *message) 673error (char *message)
668 CODE: 674 CODE:
675 fprintf (stderr, "ERROR: %s\n", message);
669#ifdef _WIN32 676#ifdef _WIN32
670 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 677 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
671#else
672 fprintf (stderr, "ERROR: %s\n", message);
673#endif 678#endif
674 679
675void 680void
676fatal (char *message) 681fatal (char *message)
677 CODE: 682 CODE:
683 fprintf (stderr, "FATAL: %s\n", message);
678#ifdef _WIN32 684#ifdef _WIN32
679 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
680#else
681 fprintf (stderr, "FATAL: %s\n", message);
682#endif 686#endif
683 exit (1); 687 exit (1);
684 688
685MODULE = CFClient PACKAGE = CFClient::Font 689MODULE = CFClient PACKAGE = CFClient::Font
686 690
… …
796 800
797void 801void
798set_width (CFClient::Layout self, int max_width = -1) 802set_width (CFClient::Layout self, int max_width = -1)
799 CODE: 803 CODE:
800 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 804 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
805
806void
807set_indent (CFClient::Layout self, int indent)
808 CODE:
809 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
810
811void
812set_spacing (CFClient::Layout self, int spacing)
813 CODE:
814 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
815
816void
817set_ellipsise (CFClient::Layout self, int ellipsise)
818 CODE:
819 pango_layout_set_ellipsize (self->pl,
820 ellipsise == 1 ? PANGO_ELLIPSIZE_START
821 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
822 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
823 : PANGO_ELLIPSIZE_NONE
824 );
825
826void
827set_single_paragraph_mode (CFClient::Layout self, int spm)
828 CODE:
829 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
801 830
802void 831void
803size (CFClient::Layout self) 832size (CFClient::Layout self)
804 PPCODE: 833 PPCODE:
805{ 834{
… …
939 968
940 if (ix) 969 if (ix)
941 { 970 {
942 glEnable (GL_BLEND); 971 glEnable (GL_BLEND);
943 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 972 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
973 glEnable (GL_ALPHA_TEST);
974 glAlphaFunc (GL_GREATER, 0.01f);
944 } 975 }
945 976
946 glBindTexture (GL_TEXTURE_2D, name); 977 glBindTexture (GL_TEXTURE_2D, name);
947 978
948 if (wrap_mode) 979 if (wrap_mode)
… …
957 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 988 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
958 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 989 glTexCoord2f (s, 0); glVertex2f (x + w, y );
959 glEnd (); 990 glEnd ();
960 991
961 if (ix) 992 if (ix)
993 {
994 glDisable (GL_ALPHA_TEST);
962 glDisable (GL_BLEND); 995 glDisable (GL_BLEND);
996 }
963} 997}
964 998
965MODULE = CFClient PACKAGE = CFClient::Map 999MODULE = CFClient PACKAGE = CFClient::Map
966 1000
967CFClient::Map 1001CFClient::Map
… …
1490 const_iv (GL_ONE_MINUS_DST_ALPHA), 1524 const_iv (GL_ONE_MINUS_DST_ALPHA),
1491 const_iv (GL_RGB), 1525 const_iv (GL_RGB),
1492 const_iv (GL_RGBA), 1526 const_iv (GL_RGBA),
1493 const_iv (GL_UNSIGNED_BYTE), 1527 const_iv (GL_UNSIGNED_BYTE),
1494 const_iv (GL_ALPHA), 1528 const_iv (GL_ALPHA),
1529 const_iv (GL_INTENSITY),
1495 const_iv (GL_LUMINANCE), 1530 const_iv (GL_LUMINANCE),
1531 const_iv (GL_LUMINANCE_ALPHA),
1496 const_iv (GL_FLOAT), 1532 const_iv (GL_FLOAT),
1497 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1533 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1498 const_iv (GL_COMPILE), 1534 const_iv (GL_COMPILE),
1499 const_iv (GL_TEXTURE_1D), 1535 const_iv (GL_TEXTURE_1D),
1500 const_iv (GL_TEXTURE_2D), 1536 const_iv (GL_TEXTURE_2D),
… …
1589void glEnd () 1625void glEnd ()
1590 1626
1591void glColor (float r, float g, float b, float a = 1.0) 1627void glColor (float r, float g, float b, float a = 1.0)
1592 PROTOTYPE: @ 1628 PROTOTYPE: @
1593 CODE: 1629 CODE:
1594 // 255.999 is close enough to correctness (256 and clamp) 1630 glColor4ub (MIN ((int)(r * 255.f), 255),
1595 glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999); 1631 MIN ((int)(g * 255.f), 255),
1632 MIN ((int)(b * 255.f), 255),
1633 MIN ((int)(a * 255.f), 255));
1596 1634
1597void glVertex (float x, float y, float z = 0.) 1635void glVertex (float x, float y, float z = 0.)
1598 CODE: 1636 CODE:
1599 glVertex3f (x, y, z); 1637 glVertex3f (x, y, z);
1600 1638

Diff Legend

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