--- deliantra/Deliantra-Client/Client.xs 2006/04/10 22:16:33 1.12 +++ deliantra/Deliantra-Client/Client.xs 2006/04/13 00:25:28 1.28 @@ -3,8 +3,10 @@ #include "XSUB.h" #include +#include #include +#include #include #include @@ -16,16 +18,73 @@ #include #include +#include + static PangoContext *context; static PangoFontMap *fontmap; -MODULE = Crossfire::Client PACKAGE = Crossfire::Client +typedef struct cf_layout { + PangoLayout *pl; + int base_height; +} *CFClient__Layout; + +static void +substitute_func (FcPattern *pattern, gpointer data) +{ + FcPatternAddBool (pattern, FC_HINTING , 1); + FcPatternAddBool (pattern, FC_AUTOHINT, 1); +} + +static void +layout_update (CFClient__Layout self) +{ + /* use a random scale factor to account for unknown descenders, 0.8 works + * reasonably well with bitstream vera + */ + PangoFontDescription *font = pango_context_get_font_description (context); + pango_font_description_set_absolute_size (font, self->base_height * (PANGO_SCALE * 8 / 10)); +} + +static void +layout_get_pixel_size (CFClient__Layout self, int *w, int *h) +{ + layout_update (self); + + pango_layout_get_pixel_size (self->pl, w, h); + + *w = (*w + 3) & ~3; + if (!*w) *w = 1; + if (!*h) *h = 1; +} + +typedef struct { + uint16_t face[3]; + uint8_t darkness; + uint8_t padding; +} mapcell; + +typedef struct { + uint32_t cols; + mapcell *col; +} maprow; + +typedef struct map { + int x, y, w, h; + int faces; + GLint *face; + + uint32_t rows; + maprow *row; +} *CFClient__Map; + +MODULE = CFClient PACKAGE = CFClient PROTOTYPES: ENABLE BOOT: { fontmap = pango_ft2_font_map_new (); + pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap); } @@ -49,37 +108,175 @@ RETVAL void +add_font (char *file) + CODE: + FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ + +void set_font (char *file) CODE: { int count; FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count); - FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0); FcPatternDestroy (pattern); pango_context_set_font_description (context, font); } void -font_render (SV *text_, int height = 10) +load_image_inline (SV *image_) + ALIAS: + load_image_file = 1 PPCODE: { + STRLEN image_len; + char *image = (char *)SvPVbyte (image_, image_len); + SDL_Surface *surface, *surface2; + SDL_PixelFormat fmt; + SDL_RWops *rw = ix + ? SDL_RWFromFile (image, "r") + : SDL_RWFromConstMem (image, image_len); + + if (!rw) + croak ("load_image: unable to open file"); + + surface = IMG_Load_RW (rw, 1); + if (!surface) + croak ("load_image: unable to read file"); + + fmt.palette = NULL; + fmt.BitsPerPixel = 32; + fmt.BytesPerPixel = 4; + fmt.Rmask = 0x000000ff; + fmt.Gmask = 0x0000ff00; + fmt.Bmask = 0x00ff0000; + fmt.Amask = 0xff000000; + fmt.Rloss = 0; + fmt.Gloss = 0; + fmt.Bloss = 0; + fmt.Aloss = 0; + fmt.Rshift = 0; + fmt.Gshift = 8; + fmt.Bshift = 16; + fmt.Ashift = 24; + fmt.colorkey = 0; + fmt.alpha = 0; + + surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); + + EXTEND (SP, 5); + PUSHs (sv_2mortal (newSViv (surface2->w))); + PUSHs (sv_2mortal (newSViv (surface2->h))); + SDL_LockSurface (surface2); + PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); + SDL_UnlockSurface (surface2); + PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); + PUSHs (sv_2mortal (newSViv (GL_RGBA))); + PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_INT_8_8_8_8_REV))); + + SDL_FreeSurface (surface); + SDL_FreeSurface (surface2); +} + +void +fatal (char *message) + CODE: +#ifdef WIN32 + MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); +#else + fprintf (stderr, "%s\n", message); +#endif + exit (1); + +MODULE = CFClient PACKAGE = CFClient::Layout + +CFClient::Layout +new (SV *class, int base_height = 10) + CODE: + New (0, RETVAL, 1, struct cf_layout); + RETVAL->base_height = base_height; + RETVAL->pl = pango_layout_new (context); + pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); + OUTPUT: + RETVAL + +void +DESTROY (CFClient::Layout self) + CODE: + g_object_unref (self->pl); + Safefree (self); + +void +set_markup (CFClient::Layout self, SV *text_) + CODE: +{ STRLEN textlen; char *text = SvPVutf8 (text_, textlen); + + pango_layout_set_markup (self->pl, text, textlen); +} + +void +set_height (CFClient::Layout self, int base_height) + CODE: + self->base_height = base_height; + +void +set_width (CFClient::Layout self, int max_width = -1) + CODE: + pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); + +void +size (CFClient::Layout self) + PPCODE: +{ + int w, h; + + layout_update (self); + layout_get_pixel_size (self, &w, &h); + + EXTEND (SP, 2); + PUSHs (sv_2mortal (newSViv (w))); + PUSHs (sv_2mortal (newSViv (h))); +} + +int +xy_to_index (CFClient::Layout self, int x, int y) + CODE: +{ + int index, trailing; + + layout_update (self); + pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); + + RETVAL = index; +} + OUTPUT: + RETVAL + +void +cursor_pos (CFClient::Layout self, int index) + PPCODE: +{ + PangoRectangle strong_pos; + layout_update (self); + pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); + EXTEND (SP, 3); + PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); + PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); + PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); +} + +void +render (CFClient::Layout self) + PPCODE: +{ SV *retval; int w, h; FT_Bitmap bitmap; - PangoLayout *layout; - PangoFontDescription *font = pango_context_get_font_description (context); - pango_font_description_set_absolute_size (font, height * PANGO_SCALE); - - layout = pango_layout_new (context); - pango_layout_set_markup (layout, text, textlen); - pango_layout_get_pixel_size (layout, &w, &h); - - w = (w + 3) & ~3; - if (!w) w = 1; - if (!h) h = 1; + + layout_update (self); + layout_get_pixel_size (self, &w, &h); retval = newSV (w * h); SvPOK_only (retval); @@ -94,8 +291,7 @@ memset (bitmap.buffer, 0, w * h); - pango_ft2_render_layout (&bitmap, layout, 0 * PANGO_SCALE, 0 * PANGO_SCALE); - g_object_unref (layout); + pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); EXTEND (SP, 3); PUSHs (sv_2mortal (newSViv (w))); @@ -103,7 +299,7 @@ PUSHs (sv_2mortal (retval)); } -MODULE = Crossfire::Client PACKAGE = Crossfire::Client::Texture +MODULE = CFClient PACKAGE = CFClient::Texture void draw_quad (SV *self, double x, double y, double w = 0, double h = 0) @@ -117,8 +313,8 @@ if (items < 5) { - w = SvNV (*hv_fetch (hv, "width", 5, 1)); - h = SvNV (*hv_fetch (hv, "height", 6, 1)); + w = SvNV (*hv_fetch (hv, "w", 1, 1)); + h = SvNV (*hv_fetch (hv, "h", 1, 1)); } glBindTexture (GL_TEXTURE_2D, name); @@ -129,3 +325,42 @@ glTexCoord2d (s, 0); glVertex2d (x + w, y ); glEnd (); } + +MODULE = CFClient PACKAGE = CFClient::Map + +CFClient::Map +new (SV *class, int map_width, int map_height) + CODE: + New (0, RETVAL, 1, struct map); + RETVAL->x = 0; + RETVAL->y = 0; + RETVAL->w = map_width; + RETVAL->h = map_height; + RETVAL->faces = 0; + RETVAL->face = 0; + + RETVAL->rows = 0; + RETVAL->row = 0; + OUTPUT: + RETVAL + +void +DESTROY (CFClient::Map self) + CODE: +{ + int r, c; + + Safefree (self->face); + for (r = 0; r < self->rows; r++) + { + maprow *row = self->row + r; + if (!row) + continue; + + Safefree (row->col); + } + + Safefree (self->row); + Safefree (self); +} +