commit f42b7bc8aed22eef8f1d3d257d6143b5ebdc9535
author oliverschmidt <oliverschmidt> dim. juin 27 15:04:01 2004 +0000
committer oliverschmidt <oliverschmidt> dim. juin 27 15:04:01 2004 +0000
tree a44d9a2c890844a31e602c00e4451d1b75747b38
parent b9dbe8b37cf8a0d898d897a9621903598cb188cb

Changed desktop window to draw desktop icons non-focused when another window is open.

contiki/ctk/ctk-conio.c

diff --git a/contiki/ctk/ctk-conio.c b/contiki/ctk/ctk-conio.c
index 1944ade..e92da82 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.9 2004/06/06 05:52:21 adamdunkels Exp $
+ * $Id: ctk-conio.c,v 1.10 2004/06/27 15:04:01 oliverschmidt Exp $
  *
  */
 
@@ -195,7 +195,7 @@
     break;
   case CTK_WIDGET_ICON:
     if(ypos >= clipy1 && ypos < clipy2) {
-      if(focus & 1) {
+      if(wfocus != 0) {
 	revers(1);
       } else {
 	revers(0);

contiki/ctk/ctk.c

diff --git a/contiki/ctk/ctk.c b/contiki/ctk/ctk.c
index 3e33b0b..baed927 100644
--- a/contiki/ctk/ctk.c
+++ b/contiki/ctk/ctk.c
@@ -43,7 +43,7 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk.c,v 1.37 2004/06/14 22:11:01 oliverschmidt Exp $
+ * $Id: ctk.c,v 1.38 2004/06/27 15:04:01 oliverschmidt Exp $
  *
  */
 
@@ -574,7 +574,7 @@
   /* Draw widgets in root window */
   for(widget = desktop_window.active;
       widget != NULL; widget = widget->next) {
-    ctk_draw_widget(widget, CTK_FOCUS_WINDOW, clipy1, clipy2);
+    ctk_draw_widget(widget, windows != NULL? 0: CTK_FOCUS_WINDOW, clipy1, clipy2);
   }
   
   /* Draw windows */