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.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.88 by root, Fri May 19 23:18:40 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#ifndef _WIN32 89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
90 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
91#endif 93#endif
92} 94}
93 95
94static void 96static void
… …
441 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
442 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
443 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
445 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
447 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
450 455
451 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
452 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
453 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
454 457
455 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
456 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
457 460
458 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
466 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 469 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
467 470
468 ++m; 471 ++m;
469 } 472 }
470} 473}
474
475char *
476SDL_GetError ()
471 477
472int 478int
473SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
474 CODE: 480 CODE:
475 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
… …
667} 673}
668 674
669void 675void
670error (char *message) 676error (char *message)
671 CODE: 677 CODE:
678 fprintf (stderr, "ERROR: %s\n", message);
672#ifdef _WIN32 679#ifdef _WIN32
673 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 680 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
674#else
675 fprintf (stderr, "ERROR: %s\n", message);
676#endif 681#endif
677 682
678void 683void
679fatal (char *message) 684fatal (char *message)
680 CODE: 685 CODE:
686 fprintf (stderr, "FATAL: %s\n", message);
681#ifdef _WIN32 687#ifdef _WIN32
682 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 688 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
683#else
684 fprintf (stderr, "FATAL: %s\n", message);
685#endif 689#endif
686 exit (1); 690 exit (1);
687 691
688MODULE = CFClient PACKAGE = CFClient::Font 692MODULE = CFClient PACKAGE = CFClient::Font
689 693
… …
712MODULE = CFClient PACKAGE = CFClient::Layout 716MODULE = CFClient PACKAGE = CFClient::Layout
713 717
714CFClient::Layout 718CFClient::Layout
715new (SV *class, int rgba = 0) 719new (SV *class, int rgba = 0)
716 CODE: 720 CODE:
721#if _WIN32
722 rgba = 0;//D
723#endif
717 New (0, RETVAL, 1, struct cf_layout); 724 New (0, RETVAL, 1, struct cf_layout);
718 725
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720 RETVAL->rgba = rgba; 727 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 728 RETVAL->r = 1.;
… …
801set_width (CFClient::Layout self, int max_width = -1) 808set_width (CFClient::Layout self, int max_width = -1)
802 CODE: 809 CODE:
803 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 810 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804 811
805void 812void
813set_indent (CFClient::Layout self, int indent)
814 CODE:
815 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
816
817void
818set_spacing (CFClient::Layout self, int spacing)
819 CODE:
820 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
821
822void
823set_ellipsise (CFClient::Layout self, int ellipsise)
824 CODE:
825 pango_layout_set_ellipsize (self->pl,
826 ellipsise == 1 ? PANGO_ELLIPSIZE_START
827 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
828 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
829 : PANGO_ELLIPSIZE_NONE
830 );
831
832void
833set_single_paragraph_mode (CFClient::Layout self, int spm)
834 CODE:
835 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
836
837void
806size (CFClient::Layout self) 838size (CFClient::Layout self)
807 PPCODE: 839 PPCODE:
808{ 840{
809 int w, h; 841 int w, h;
810 842
… …
876 908
877 while (p < e) 909 while (p < e)
878 { 910 {
879 uint32_t rgba = *p; 911 uint32_t rgba = *p;
880 rgba = (rgba >> 24) | (rgba << 8); 912 rgba = (rgba >> 24) | (rgba << 8);
913#if 0
914#ifdef _WIN32
915 {//D
916 uint8_t r = rgba >> 24;
917 uint8_t g = rgba >> 16;
918 uint8_t b = rgba >> 8;
919 uint8_t a = rgba >> 0;
920
921 rgba = (rgba & 0xffffff00) | a;
922 }
923#endif
924#endif
881 rgba = SDL_SwapBE32 (rgba); 925 rgba = SDL_SwapBE32 (rgba);
882 *p++ = rgba; 926 *p++ = rgba;
883 } 927 }
884 } 928 }
885 929
… …
942 986
943 if (ix) 987 if (ix)
944 { 988 {
945 glEnable (GL_BLEND); 989 glEnable (GL_BLEND);
946 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 990 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
991 glEnable (GL_ALPHA_TEST);
992 glAlphaFunc (GL_GREATER, 0.01f);
947 } 993 }
948 994
949 glBindTexture (GL_TEXTURE_2D, name); 995 glBindTexture (GL_TEXTURE_2D, name);
950 996
951 if (wrap_mode) 997 if (wrap_mode)
… …
960 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
961 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1007 glTexCoord2f (s, 0); glVertex2f (x + w, y );
962 glEnd (); 1008 glEnd ();
963 1009
964 if (ix) 1010 if (ix)
1011 {
1012 glDisable (GL_ALPHA_TEST);
965 glDisable (GL_BLEND); 1013 glDisable (GL_BLEND);
1014 }
966} 1015}
967 1016
968MODULE = CFClient PACKAGE = CFClient::Map 1017MODULE = CFClient PACKAGE = CFClient::Map
969 1018
970CFClient::Map 1019CFClient::Map
… …
1493 const_iv (GL_ONE_MINUS_DST_ALPHA), 1542 const_iv (GL_ONE_MINUS_DST_ALPHA),
1494 const_iv (GL_RGB), 1543 const_iv (GL_RGB),
1495 const_iv (GL_RGBA), 1544 const_iv (GL_RGBA),
1496 const_iv (GL_UNSIGNED_BYTE), 1545 const_iv (GL_UNSIGNED_BYTE),
1497 const_iv (GL_ALPHA), 1546 const_iv (GL_ALPHA),
1547 const_iv (GL_INTENSITY),
1498 const_iv (GL_LUMINANCE), 1548 const_iv (GL_LUMINANCE),
1549 const_iv (GL_LUMINANCE_ALPHA),
1499 const_iv (GL_FLOAT), 1550 const_iv (GL_FLOAT),
1500 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1551 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1501 const_iv (GL_COMPILE), 1552 const_iv (GL_COMPILE),
1502 const_iv (GL_TEXTURE_1D), 1553 const_iv (GL_TEXTURE_1D),
1503 const_iv (GL_TEXTURE_2D), 1554 const_iv (GL_TEXTURE_2D),

Diff Legend

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