Browse Source

* Do not build the raw output in kernel mode.

* Fix cucul_utf32_to_cp437() call in the VGA output.
tags/v0.99.beta14
Sam Hocevar sam 18 years ago
parent
commit
383fb90110
3 changed files with 6 additions and 3 deletions
  1. +2
    -0
      caca/caca.c
  2. +3
    -2
      caca/driver_raw.c
  3. +1
    -1
      caca/driver_vga.c

+ 2
- 0
caca/caca.c View File

@@ -158,7 +158,9 @@ static int caca_select_driver(caca_display_t *dp)
#if defined(USE_GL) #if defined(USE_GL)
if(!strcasecmp(var, "gl")) return gl_install(dp); if(!strcasecmp(var, "gl")) return gl_install(dp);
#endif #endif
#if !defined(__KERNEL__)
if(!strcasecmp(var, "raw")) return raw_install(dp); if(!strcasecmp(var, "raw")) return raw_install(dp);
#endif
#if defined(USE_SLANG) #if defined(USE_SLANG)
if(!strcasecmp(var, "slang")) return slang_install(dp); if(!strcasecmp(var, "slang")) return slang_install(dp);
#endif #endif


+ 3
- 2
caca/driver_raw.c View File

@@ -19,8 +19,8 @@
#include "common.h" #include "common.h"


#if !defined(__KERNEL__) #if !defined(__KERNEL__)
# include <stdio.h>
#endif
#include <stdio.h>


#include "caca.h" #include "caca.h"
#include "caca_internals.h" #include "caca_internals.h"
@@ -95,3 +95,4 @@ int raw_install(caca_display_t *dp)
return 0; return 0;
} }


#endif /* !__KERNEL__ */

+ 1
- 1
caca/driver_vga.c View File

@@ -121,7 +121,7 @@ static void vga_display(caca_display_t *dp)


for(n = dp->cv->height * dp->cv->width; n--; ) for(n = dp->cv->height * dp->cv->width; n--; )
{ {
*screen++ = _cucul_utf32_to_cp437(*chars++);
*screen++ = cucul_utf32_to_cp437(*chars++);
*screen++ = _cucul_argb32_to_ansi8(*attr++); *screen++ = _cucul_argb32_to_ansi8(*attr++);
} }
} }


Loading…
Cancel
Save