commit 81c744e0ca1641ee5e4b0204da476d57de5243bb
author oliverschmidt <oliverschmidt> dim. févr. 06 21:13:59 2005 +0000
committer oliverschmidt <oliverschmidt> dim. févr. 06 21:13:59 2005 +0000
tree a16fe4df935a9831b6c8c5ff8ad2226e24cc7dda
parent e7851abe3502b89f83959edffefdd0bce97d1a32

Fixed minor rendering issue and removed compiler warnings.

contiki-win32/ctk/ctk-console.c

diff --git a/contiki-win32/ctk/ctk-console.c b/contiki-win32/ctk/ctk-console.c
index 5467cbe..ae24d4e 100644
--- a/contiki-win32/ctk/ctk-console.c
+++ b/contiki-win32/ctk/ctk-console.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: ctk-console.c,v 1.5 2005/01/29 23:11:09 oliverschmidt Exp $
+ * $Id: ctk-console.c,v 1.6 2005/02/06 21:13:59 oliverschmidt Exp $
  *
  */
 
@@ -72,7 +72,7 @@
   screensize(&width, &height);
 
   GetConsoleScreenBufferInfo(stdouthandle, &consoleinfo);
-  saved_color = consoleinfo.wAttributes;
+  saved_color = (unsigned char)consoleinfo.wAttributes;
 
   GetConsoleTitle(saved_title, sizeof(saved_title));
   SetConsoleTitle("Contiki");
@@ -120,9 +120,9 @@
 static void
 setcolor(void)
 {
-  SetConsoleTextAttribute(stdouthandle, reversed? (color & 0x0F) << 4 |
-						  (color & 0xF0) >> 4
-					        : color);
+  SetConsoleTextAttribute(stdouthandle, (WORD)(reversed? (color & 0x0F) << 4 |
+							 (color & 0xF0) >> 4
+						       : color));
 }
 /*-----------------------------------------------------------------------------------*/
 unsigned char
@@ -131,7 +131,7 @@
   CONSOLE_SCREEN_BUFFER_INFO consoleinfo;
 
   GetConsoleScreenBufferInfo(stdouthandle, &consoleinfo);
-  return consoleinfo.dwCursorPosition.X;
+  return (unsigned char)consoleinfo.dwCursorPosition.X;
 }
 /*-----------------------------------------------------------------------------------*/
 unsigned char
@@ -140,7 +140,7 @@
   CONSOLE_SCREEN_BUFFER_INFO consoleinfo;
 
   GetConsoleScreenBufferInfo(stdouthandle, &consoleinfo);
-  return consoleinfo.dwCursorPosition.Y;
+  return (unsigned char)consoleinfo.dwCursorPosition.Y;
 }
 /*-----------------------------------------------------------------------------------*/
 void
@@ -164,7 +164,8 @@
 void
 cclear(unsigned char length)
 {
-  int i;
+  unsigned char i;
+
   for(i = 0; i < length; ++i) {
     putch(' ');
   }  
@@ -173,7 +174,8 @@
 void
 chline(unsigned char length)
 {
-  int i;
+  unsigned char i;
+
   for(i = 0; i < length; ++i) {
     putch(0xC4);
   }
@@ -182,10 +184,13 @@
 void
 cvline(unsigned char length)
 {
-  int i;
+  unsigned char i, x, y;
+
+  x = wherex();
+  y = wherey();
+
   for(i = 0; i < length; ++i) {
-    putch(0xB3);
-    gotoxy(wherex() - 1, wherey() + 1);
+    cputcxy(x, (unsigned char)(y + i), (char)0xB3);
   }
 }
 /*-----------------------------------------------------------------------------------*/