commit 7b9025dcd8f38d59a26eaa52631c62d7f5b33834
author oliverschmidt <oliverschmidt> ven. mars 18 01:08:35 2005 +0000
committer oliverschmidt <oliverschmidt> ven. mars 18 01:08:35 2005 +0000
tree 4ef910e6a958cb308b09cabbc8c3dbec9ead580e
parent 30d048a158582842259abde027eea04f446c6201

Fixed window border drawing code for CTK_CONF_WINDOWMOVE being 0.

contiki/ctk/ctk-conio-service.c

diff --git a/contiki/ctk/ctk-conio-service.c b/contiki/ctk/ctk-conio-service.c
index af2bccb..494fbf5 100644
--- a/contiki/ctk/ctk-conio-service.c
+++ b/contiki/ctk/ctk-conio-service.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk-conio-service.c,v 1.6 2005/03/15 15:51:17 oliverschmidt Exp $
+ * $Id: ctk-conio-service.c,v 1.7 2005/03/18 01:08:35 oliverschmidt Exp $
  *
  */
 
@@ -363,7 +363,7 @@
 
     if(y >= clipy1) {
       cputcxy(x, y, CH_ULCORNER);
-      gotoxy(wherex() + window->titlelen + 2, wherey());
+      gotoxy(wherex() + window->titlelen + CTK_CONF_WINDOWMOVE * 2, wherey());
       chline(window->w - (wherex() - x) - 2);
       cputcxy(x2, y, CH_URCORNER);
     }

contiki/ctk/ctk-conio.c

diff --git a/contiki/ctk/ctk-conio.c b/contiki/ctk/ctk-conio.c
index 8106ee5..8f5048f 100644
--- a/contiki/ctk/ctk-conio.c
+++ b/contiki/ctk/ctk-conio.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk-conio.c,v 1.18 2005/03/15 15:51:17 oliverschmidt Exp $
+ * $Id: ctk-conio.c,v 1.19 2005/03/18 01:08:35 oliverschmidt Exp $
  *
  */
 
@@ -364,7 +364,7 @@
 
     if(y >= clipy1) {
       cputcxy(x, y, CH_ULCORNER);
-      gotoxy(wherex() + window->titlelen + 2, wherey());
+      gotoxy(wherex() + window->titlelen + CTK_CONF_WINDOWMOVE * 2, wherey());
       chline(window->w - (wherex() - x) - 2);
       cputcxy(x2, y, CH_URCORNER);
     }

contiki/ctk/ctk-term.c

diff --git a/contiki/ctk/ctk-term.c b/contiki/ctk/ctk-term.c
index 82a2ac1..3dbd4cd 100644
--- a/contiki/ctk/ctk-term.c
+++ b/contiki/ctk/ctk-term.c
@@ -722,7 +722,7 @@
 
     if(y >= clipy1) {
       cputcxy(x, y, CH_ULCORNER);
-      for(i = wherex() + window->titlelen + 2; i < x2; ++i) {
+      for(i = wherex() + window->titlelen + CTK_CONF_WINDOWMOVE * 2; i < x2; ++i) {
 	cputcxy(i, y, CH_TITLEBAR);
       }
       cputcxy(x2, y, CH_URCORNER);

contiki/ctk/ctk-vncserver.c

diff --git a/contiki/ctk/ctk-vncserver.c b/contiki/ctk/ctk-vncserver.c
index e75099a..22c68fc 100644
--- a/contiki/ctk/ctk-vncserver.c
+++ b/contiki/ctk/ctk-vncserver.c
@@ -41,7 +41,7 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk-vncserver.c,v 1.13 2005/03/15 16:07:35 oliverschmidt Exp $
+ * $Id: ctk-vncserver.c,v 1.14 2005/03/18 01:08:35 oliverschmidt Exp $
  *
  */
 
@@ -699,7 +699,7 @@
 
     if(y >= clipy1) {
       cputcxy(x, y, CH_ULCORNER);
-      for(i = wherex() + window->titlelen + 2; i < x2; ++i) {
+      for(i = wherex() + window->titlelen + CTK_CONF_WINDOWMOVE * 2; i < x2; ++i) {
 	cputcxy(i, y, CH_TITLEBAR);
       }
       cputcxy(x2, y, CH_URCORNER);