deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- Removed ctk_arch_isprint() definition as it is - nomen est omen - platform specific.

Browse source 
- Avoided compiler warnings.
- Rearranged headers.
This commit is contained in:
oliverschmidt 2007-04-15 13:14:40 +00:00
parent eec5ae40c9
commit 13cdcbe393
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
core/ctk/ctk-conio.c
View file

@ -29,19 +29,19 @@
* *
* This file is part of the "ctk" console GUI toolkit for cc65 * This file is part of the "ctk" console GUI toolkit for cc65
* *
* $Id: ctk-conio.c,v 1.2 2006/08/30 22:24:12 oliverschmidt Exp $ * $Id: ctk-conio.c,v 1.3 2007/04/15 13:14:40 oliverschmidt Exp $
* *
*/ */
#include <string.h>
#include <ctype.h>
#include <conio.h> #include <conio.h>
#include "contiki.h"
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "ctk-draw.h" #include "ctk-draw.h"
#include "contiki-conf.h"
#include <string.h>
#include <ctype.h>
#ifndef NULL #ifndef NULL
#define NULL (void *)0 #define NULL (void *)0
#endif /* NULL */ #endif /* NULL */
@ -211,7 +211,7 @@ draw_widget(struct ctk_widget *w,
} }
#endif /* CTK_CONF_ICON_TEXTMAPS */ #endif /* CTK_CONF_ICON_TEXTMAPS */
len = strlen(w->widget.icon.title); len = (unsigned char)strlen(w->widget.icon.title);
if(xpos + len >= sizex) { if(xpos + len >= sizex) {
xpos = sizex - len; xpos = sizex - len;
} }
@ -495,10 +495,10 @@ ctk_draw_menus(struct ctk_menus *menus)
/* Draw desktopmenu */ /* Draw desktopmenu */
if(wherex() + strlen(menus->desktopmenu->title) + 1 >= sizex) { if(wherex() + strlen(menus->desktopmenu->title) + 1 >= sizex) {
gotoxy(sizex - strlen(menus->desktopmenu->title) - 1, 0); gotoxy(sizex - (unsigned char)strlen(menus->desktopmenu->title) - 1, 0);
} else { } else {
cclear(sizex - wherex() - cclear(sizex - wherex() -
strlen(menus->desktopmenu->title) - 1); (unsigned char)strlen(menus->desktopmenu->title) - 1);
} }
draw_menu(menus->desktopmenu, menus->desktopmenu == menus->open); draw_menu(menus->desktopmenu, menus->desktopmenu == menus->open);
@ -517,8 +517,3 @@ ctk_draw_width(void)
return sizex; return sizex;
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
int
ctk_arch_isprint(char c)
{
return isprint(c);
}