Browse Source

* Ugly workaround in OpenGL driver for IA64 platform, unicode still does not work, thought.

tags/v0.99.beta14
Jean-Yves Lamoureux jylam 18 years ago
parent
commit
8448ac75ab
2 changed files with 8 additions and 8 deletions
  1. +6
    -6
      caca/driver_gl.c
  2. +2
    -2
      cucul/font.c

+ 6
- 6
caca/driver_gl.c View File

@@ -254,19 +254,19 @@ static void gl_display(caca_display_t *dp)
uint16_t fg; uint16_t fg;
int i, b; int i, b;


for(b = 0, i = 0; dp->drv.p->blocks[i + 1]; i += 2)
for(b = 0, i = 0; (dp->drv.p->blocks[i + 1]); i += 2)
{ {
if(cv < dp->drv.p->blocks[i])
break;
if(cv < (dp->drv.p->blocks[i]&0xFFFFFFFF))
break;


if(cv >= dp->drv.p->blocks[i + 1])
if(cv >= (dp->drv.p->blocks[i + 1]))
{ {
b += dp->drv.p->blocks[i + 1] - dp->drv.p->blocks[i];
b += (dp->drv.p->blocks[i + 1]) - (dp->drv.p->blocks[i]);
continue; continue;
} }


glBindTexture(GL_TEXTURE_2D, glBindTexture(GL_TEXTURE_2D,
dp->drv.p->txid[b + cv - dp->drv.p->blocks[i]]);
dp->drv.p->txid[b + cv - (dp->drv.p->blocks[i]&0xFFFFFFFF)]);


fg = _cucul_argb32_to_rgb12fg(*attr); fg = _cucul_argb32_to_rgb12fg(*attr);
glColor3b(((fg & 0xf00) >> 8) * 8, glColor3b(((fg & 0xf00) >> 8) * 8,


+ 2
- 2
cucul/font.c View File

@@ -432,9 +432,9 @@ int cucul_render_canvas(cucul_canvas_t *cv, cucul_font_t *f,
b = f->header.blocks; b = f->header.blocks;
break; break;
} }

if(ch < f->block_list[b].stop)
if(ch < f->block_list[b].stop) {
break; break;
}
} }


/* Glyph not in font? Skip it. */ /* Glyph not in font? Skip it. */


Loading…
Cancel
Save