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.80 by root, Sun May 14 22:58:24 2006 UTC vs.
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC

… …
84 84
85static void 85static void
86substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
87{ 87{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
89 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
90} 94}
91 95
92static void 96static void
93layout_update_font (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
94{ 98{
… …
437 SDL_Rect **m; 441 SDL_Rect **m;
438 442
439 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
440 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
441 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
442 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);
443 450
444 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
445 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
447 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
448 455
449 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452 457
453 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
454 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
455 460
456 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
665} 670}
666 671
667void 672void
668error (char *message) 673error (char *message)
669 CODE: 674 CODE:
675 fprintf (stderr, "ERROR: %s\n", message);
670#ifdef _WIN32 676#ifdef _WIN32
671 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 677 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
672#else
673 fprintf (stderr, "ERROR: %s\n", message);
674#endif 678#endif
675 679
676void 680void
677fatal (char *message) 681fatal (char *message)
678 CODE: 682 CODE:
683 fprintf (stderr, "FATAL: %s\n", message);
679#ifdef _WIN32 684#ifdef _WIN32
680 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
681#else
682 fprintf (stderr, "FATAL: %s\n", message);
683#endif 686#endif
684 exit (1); 687 exit (1);
685 688
686MODULE = CFClient PACKAGE = CFClient::Font 689MODULE = CFClient PACKAGE = CFClient::Font
687 690
… …
710MODULE = CFClient PACKAGE = CFClient::Layout 713MODULE = CFClient PACKAGE = CFClient::Layout
711 714
712CFClient::Layout 715CFClient::Layout
713new (SV *class, int rgba = 0) 716new (SV *class, int rgba = 0)
714 CODE: 717 CODE:
718#if _WIN32
719 rgba = 0;//D
720#endif
715 New (0, RETVAL, 1, struct cf_layout); 721 New (0, RETVAL, 1, struct cf_layout);
716 722
717 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 723 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
718 RETVAL->rgba = rgba; 724 RETVAL->rgba = rgba;
719 RETVAL->r = 1.; 725 RETVAL->r = 1.;
… …
799set_width (CFClient::Layout self, int max_width = -1) 805set_width (CFClient::Layout self, int max_width = -1)
800 CODE: 806 CODE:
801 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 807 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
802 808
803void 809void
810set_indent (CFClient::Layout self, int indent)
811 CODE:
812 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
813
814void
815set_spacing (CFClient::Layout self, int spacing)
816 CODE:
817 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
818
819void
820set_ellipsise (CFClient::Layout self, int ellipsise)
821 CODE:
822 pango_layout_set_ellipsize (self->pl,
823 ellipsise == 1 ? PANGO_ELLIPSIZE_START
824 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
825 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
826 : PANGO_ELLIPSIZE_NONE
827 );
828
829void
830set_single_paragraph_mode (CFClient::Layout self, int spm)
831 CODE:
832 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
833
834void
804size (CFClient::Layout self) 835size (CFClient::Layout self)
805 PPCODE: 836 PPCODE:
806{ 837{
807 int w, h; 838 int w, h;
808 839
… …
874 905
875 while (p < e) 906 while (p < e)
876 { 907 {
877 uint32_t rgba = *p; 908 uint32_t rgba = *p;
878 rgba = (rgba >> 24) | (rgba << 8); 909 rgba = (rgba >> 24) | (rgba << 8);
910#if 0
911#ifdef _WIN32
912 {//D
913 uint8_t r = rgba >> 24;
914 uint8_t g = rgba >> 16;
915 uint8_t b = rgba >> 8;
916 uint8_t a = rgba >> 0;
917
918 rgba = (rgba & 0xffffff00) | a;
919 }
920#endif
921#endif
879 rgba = SDL_SwapBE32 (rgba); 922 rgba = SDL_SwapBE32 (rgba);
880 *p++ = rgba; 923 *p++ = rgba;
881 } 924 }
882 } 925 }
883 926
… …
940 983
941 if (ix) 984 if (ix)
942 { 985 {
943 glEnable (GL_BLEND); 986 glEnable (GL_BLEND);
944 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 987 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
988 glEnable (GL_ALPHA_TEST);
989 glAlphaFunc (GL_GREATER, 0.01f);
945 } 990 }
946 991
947 glBindTexture (GL_TEXTURE_2D, name); 992 glBindTexture (GL_TEXTURE_2D, name);
948 993
949 if (wrap_mode) 994 if (wrap_mode)
… …
958 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1003 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
959 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1004 glTexCoord2f (s, 0); glVertex2f (x + w, y );
960 glEnd (); 1005 glEnd ();
961 1006
962 if (ix) 1007 if (ix)
1008 {
1009 glDisable (GL_ALPHA_TEST);
963 glDisable (GL_BLEND); 1010 glDisable (GL_BLEND);
1011 }
964} 1012}
965 1013
966MODULE = CFClient PACKAGE = CFClient::Map 1014MODULE = CFClient PACKAGE = CFClient::Map
967 1015
968CFClient::Map 1016CFClient::Map
… …
1491 const_iv (GL_ONE_MINUS_DST_ALPHA), 1539 const_iv (GL_ONE_MINUS_DST_ALPHA),
1492 const_iv (GL_RGB), 1540 const_iv (GL_RGB),
1493 const_iv (GL_RGBA), 1541 const_iv (GL_RGBA),
1494 const_iv (GL_UNSIGNED_BYTE), 1542 const_iv (GL_UNSIGNED_BYTE),
1495 const_iv (GL_ALPHA), 1543 const_iv (GL_ALPHA),
1544 const_iv (GL_INTENSITY),
1496 const_iv (GL_LUMINANCE), 1545 const_iv (GL_LUMINANCE),
1546 const_iv (GL_LUMINANCE_ALPHA),
1497 const_iv (GL_FLOAT), 1547 const_iv (GL_FLOAT),
1498 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1548 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1499 const_iv (GL_COMPILE), 1549 const_iv (GL_COMPILE),
1500 const_iv (GL_TEXTURE_1D), 1550 const_iv (GL_TEXTURE_1D),
1501 const_iv (GL_TEXTURE_2D), 1551 const_iv (GL_TEXTURE_2D),
… …
1590void glEnd () 1640void glEnd ()
1591 1641
1592void glColor (float r, float g, float b, float a = 1.0) 1642void glColor (float r, float g, float b, float a = 1.0)
1593 PROTOTYPE: @ 1643 PROTOTYPE: @
1594 CODE: 1644 CODE:
1595 glColor4ub (MIN ((int)r * 256., 255), 1645 glColor4ub (MIN ((int)(r * 255.f), 255),
1596 MIN ((int)g * 256., 255), 1646 MIN ((int)(g * 255.f), 255),
1597 MIN ((int)b * 256., 255), 1647 MIN ((int)(b * 255.f), 255),
1598 MIN ((int)a * 256., 255)); 1648 MIN ((int)(a * 255.f), 255));
1599 1649
1600void glVertex (float x, float y, float z = 0.) 1650void glVertex (float x, float y, float z = 0.)
1601 CODE: 1651 CODE:
1602 glVertex3f (x, y, z); 1652 glVertex3f (x, y, z);
1603 1653

Diff Legend

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