Made 80 column display a cc65 application attribute.

So far 80 column display was an attribute of a cc65 platform. Now each cc65 application can ask for 80 column display by defining WITH_80COL. Of course this is ignored by platforms incapable of 80 column display.

I see three types of application:

* Applications not benefitting from 80 column at all and in fact looking better with 40 column display. These are now using 40 column display. Examples: ethconfig, ipconfig

* Applications taking advantage of 80 column display if it is available without drawbacks. These stay as they were. Examples: Telnet server, web server, wget

* Applications needing 80 column display so urgently that it is likely desirable even if the display becomes harder to read. These come now in both flavors allowing the user to choose. Examples: IRC, web browser

Note: This change doesn't actually introduce any 80 column display with drawbacks. This if left to a subsequent change.

cpu/6502/README.md

@@ -66,9 +66,13 @@ high-level configuration macros may be set:
     - Default: 0
     - Purpose: Enable UDP support and initialize resolver process on startup.
 
+- WITH_80COL
+    - Default: 0
+    - Purpose: Enable 80 column screen.
+
 - WITH_GUI
     - Default: 0
-    - Purpose: Initialize the the CTK process on startup.
+    - Purpose: Initialize the CTK process on startup.
 
 - WITH_MOUSE
     - Default: 0

examples/irc-80col/Makefile

@@ -0,0 +1,8 @@
+CONTIKI_PROJECT = irc-client
+all: $(CONTIKI_PROJECT)
+
+APPS = irc
+
+CONTIKI = ../..
+CONTIKI_WITH_IPV4 = 1
+include $(CONTIKI)/Makefile.include

examples/irc-80col/Makefile.apple2enh.defines

@@ -0,0 +1 @@
+DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE,WITH_PFS

examples/irc-80col/Makefile.atarixl.defines

@@ -0,0 +1 @@
+DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE

examples/irc-80col/Makefile.c128.defines

@@ -0,0 +1 @@
+DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_PFS,MTU_SIZE=1000

examples/irc-80col/Makefile.c64.defines

@@ -0,0 +1 @@
+DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE,WITH_PFS

examples/irc-80col/Makefile.native.defines

@@ -0,0 +1 @@
+DEFINES = WITH_GUI

examples/irc-80col/Makefile.win32.defines

@@ -0,0 +1 @@
+DEFINES = WITH_GUI

examples/irc-80col/irc-client.c

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ */
+
+#include "contiki-net.h"
+#include "irc.h"
+
+/*---------------------------------------------------------------------------*/
+AUTOSTART_PROCESSES(&irc_process);
+/*---------------------------------------------------------------------------*/

examples/telnet-server/Makefile.apple2enh.defines

@@ -1 +1 @@
-DEFINES = CONNECTIONS=3,WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_REBOOT
+DEFINES = CONNECTIONS=3,WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_REBOOT

examples/telnet-server/Makefile.c128.defines

@@ -1 +1 @@
-DEFINES = WITH_LOGGING
+DEFINES = WITH_LOGGING,WITH_80COL

examples/webbrowser-80col/Makefile

@@ -0,0 +1,8 @@
+CONTIKI_PROJECT = webbrowser
+all: $(CONTIKI_PROJECT)
+
+APPS = webbrowser
+
+CONTIKI = ../..
+CONTIKI_WITH_IPV4 = 1
+include $(CONTIKI)/Makefile.include

examples/webbrowser-80col/Makefile.apple2enh.defines

@@ -0,0 +1 @@
+DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE,WITH_PFS

examples/webbrowser-80col/Makefile.atarixl.defines

@@ -0,0 +1 @@
+DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE

examples/webbrowser-80col/Makefile.c128.defines

@@ -0,0 +1 @@
+DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_PFS,MTU_SIZE=500

examples/webbrowser-80col/Makefile.c64.defines

@@ -0,0 +1 @@
+DEFINES = WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_GUI,WITH_MOUSE,WITH_PFS

examples/webbrowser-80col/Makefile.native.defines

@@ -0,0 +1 @@
+DEFINES = WITH_GUI

examples/webbrowser-80col/Makefile.win32.defines

@@ -0,0 +1 @@
+DEFINES = WITH_GUI

examples/webbrowser-80col/webbrowser.c

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2007, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ */
+
+#include "contiki-net.h"
+#include "www.h"
+
+/*---------------------------------------------------------------------------*/
+AUTOSTART_PROCESSES(&www_process);
+/*---------------------------------------------------------------------------*/

examples/webserver/Makefile.apple2enh.defines

@@ -1 +1 @@
-DEFINES = CONNECTIONS=4,WITH_LOGGING,WITH_BOOST
+DEFINES = CONNECTIONS=4,WITH_LOGGING,WITH_BOOST,WITH_80COL

examples/webserver/Makefile.c128.defines

@@ -1 +1 @@
-DEFINES = CONNECTIONS=4,WITH_LOGGING,WITH_BOOST,WITH_PFS
+DEFINES = CONNECTIONS=4,WITH_LOGGING,WITH_BOOST,WITH_80COL,WITH_PFS

examples/wget/Makefile.apple2enh.defines

@@ -1 +1 @@
-DEFINES = WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_ARGS
+DEFINES = WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_ARGS

examples/wget/Makefile.c128.defines

@@ -1 +1 @@
-DEFINES = WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_PFS,WITH_ARGS
+DEFINES = WITH_LOGGING,WITH_CLIENT,WITH_DNS,WITH_80COL,WITH_PFS,WITH_ARGS

platform/apple2enh/contiki-conf.h

@@ -42,23 +42,29 @@
 #define CTK_CONF_WIDGETUP_KEY     0x01  /* Ctrl-A */
 #define CTK_CONF_WIDGETDOWN_KEY   '\t'  /* Tab or Ctrl-I */
 
+#if WITH_80COL
 #define MOUSE_CONF_XTOC(x) ((x) * 2 / 7)
+#else
+#define MOUSE_CONF_XTOC(x) ((x) / 7)
+#endif
 #define MOUSE_CONF_YTOC(y) ((y) / 8)
 
-#define EMAIL_CONF_WIDTH  79
-#define EMAIL_CONF_HEIGHT 19
-#define EMAIL_CONF_ERASE   0
-
-#define FTP_CONF_WIDTH  38
-#define FTP_CONF_HEIGHT 21
-
+#if WITH_80COL
 #define IRC_CONF_WIDTH  80
+#else
+#define IRC_CONF_WIDTH  40
+#endif
 #define IRC_CONF_HEIGHT 23
 
 #ifndef TELNETD_CONF_MAX_IDLE_TIME
 #define TELNETD_CONF_MAX_IDLE_TIME 300
 #endif
 
+#if WITH_80COL
+#define WWW_CONF_WEBPAGE_WIDTH  80
+#else
+#define WWW_CONF_WEBPAGE_WIDTH  40
+#endif
 #define WWW_CONF_WEBPAGE_HEIGHT 19
 #define WWW_CONF_HISTORY_SIZE    4
 #define WWW_CONF_WGET_EXEC(url) exec("wget", url)

platform/apple2enh/contiki-main.c

@@ -83,7 +83,9 @@ main(void)
   rebootafterexit();
 #endif /* WITH_REBOOT */
 
+#if WITH_80COL
   videomode(VIDEOMODE_80COL);
+#endif /* WITH_80COL */
 
   process_init();
 

platform/atarixl/contiki-conf.h

@@ -50,13 +50,6 @@
 #define BORDERCOLOR COLOR_BLACK
 #define SCREENCOLOR COLOR_BLACK
 
-#define EMAIL_CONF_WIDTH  39
-#define EMAIL_CONF_HEIGHT 19
-#define EMAIL_CONF_ERASE   0
-
-#define FTP_CONF_WIDTH  18
-#define FTP_CONF_HEIGHT 21
-
 #define IRC_CONF_WIDTH  40
 #define IRC_CONF_HEIGHT 23
 

platform/c128/contiki-conf.h

@@ -42,7 +42,11 @@
 #define CTK_CONF_WIDGETUP_KEY     CH_F5
 #define CTK_CONF_WIDGETDOWN_KEY   CH_F7
 
+#if WITH_80COL
 #define MOUSE_CONF_XTOC(x) ((x) / 4)
+#else
+#define MOUSE_CONF_XTOC(x) ((x) / 8)
+#endif
 #define MOUSE_CONF_YTOC(y) ((y) / 8)
 
 #define BORDERCOLOR       COLOR_BLACK
@@ -55,20 +59,23 @@
 #define WIDGETCOLOR_FWIN  COLOR_WHITE
 #define WIDGETCOLOR_HLINK COLOR_CYAN
 
-#define EMAIL_CONF_WIDTH  79
-#define EMAIL_CONF_HEIGHT 20
-#define EMAIL_CONF_ERASE   0
-
-#define FTP_CONF_WIDTH  38
-#define FTP_CONF_HEIGHT 22
-
+#if WITH_80COL
 #define IRC_CONF_WIDTH  80
+#else
+#define IRC_CONF_WIDTH  40
+#endif
 #define IRC_CONF_HEIGHT 24
 
 #ifndef TELNETD_CONF_MAX_IDLE_TIME
 #define TELNETD_CONF_MAX_IDLE_TIME 300
 #endif
 
+#if WITH_80COL
+#define WWW_CONF_WEBPAGE_WIDTH     80
+#else
+#define WWW_CONF_WEBPAGE_WIDTH     40
+#endif
+#define WWW_CONF_WEBPAGE_HEIGHT    20
 #define WWW_CONF_HISTORY_SIZE       0
 #define WWW_CONF_FORMS              0
 #define WWW_CONF_PAGEATTRIB_SIZE 1500

platform/c128/contiki-main.c

@@ -79,7 +79,9 @@ main(void)
 
 #endif /* WITH_ARGS */
 
+#if WITH_80COL
   videomode(VIDEOMODE_80COL);
+#endif /* WITH_80COL */
 
   process_init();
 

platform/c64/contiki-conf.h

@@ -55,13 +55,6 @@
 #define WIDGETCOLOR_FWIN  COLOR_GRAY3
 #define WIDGETCOLOR_HLINK COLOR_CYAN
 
-#define EMAIL_CONF_WIDTH  39
-#define EMAIL_CONF_HEIGHT 20
-#define EMAIL_CONF_ERASE   0
-
-#define FTP_CONF_WIDTH  18
-#define FTP_CONF_HEIGHT 22
-
 #define IRC_CONF_WIDTH  40
 #define IRC_CONF_HEIGHT 24
 
@@ -70,6 +63,7 @@
 #endif
 
 #define WWW_CONF_WEBPAGE_WIDTH  40
+#define WWW_CONF_WEBPAGE_HEIGHT 20
 #define WWW_CONF_HISTORY_SIZE    4
 #define WWW_CONF_WGET_EXEC(url) exec("wget", url)