sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix backspace logic which was accidentally removed; Add some VT100 support

Browse Source
This commit is contained in:
Gregory Nutt 2014-11-07 09:06:00 -06:00
parent ba4bb1c71b
commit 25d3c0aaae
5 changed files with 579 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interpreters/bas/Kconfig
View File

@ -51,6 +51,10 @@ config INTERPRETER_BAS_STACKSIZE
---help---
Size of the stack allocated for the Basic interpreter main task
config INTERPREPTER_BAS_VT100
bool "VT100 terminal support"
default y
config INTERPRETER_BAS_USE_LR0
bool "LR0 parser"
default n

4
interpreters/bas/Makefile
View File

@ -43,6 +43,10 @@ ASRCS =
CSRCS = auto.c bas.c fs.c global.c main.c program.c str.c token.c value.c
CSRCS += var.c
ifeq ($(CONFIG_INTERPREPTER_BAS_VT100),y)
CSRCS += vt100.c
endif
DEPPATH = --dep-path .
VPATH = .

46
interpreters/bas/fs.c
View File

@ -78,6 +78,7 @@
#include <time.h>
#include <unistd.h>
#include "vt100.h"
#include "fs.h"
/****************************************************************************
@ -279,11 +280,33 @@ static int edit(int chn, int onl)
return -1;
}
if (ch == '\b')
{
if (f->inCapacity)
{
#ifdef CONFIG_INTERPREPTER_BAS_VT100
/* REVISIT: Use VT100 commands to erase */
#warning Missing Logic
#else
if ((f->inCapacity + 1) < sizeof(f->inBuf))
/* Could use vt100_clrtoeol */
#endif
/* Is the previous character in the buffer 2 character escape sequence? */
if (f->inBuf[f->inCapacity - 1] >= '\0' &&
f->inBuf[f->inCapacity - 1] < ' ')
{
/* Yes.. erase two characters */
FS_putChars(chn, "\b\b \b\b");
}
else
{
/* Yes.. erase one characters */
FS_putChars(chn, "\b \b");
}
--f->inCapacity;
}
}
else if ((f->inCapacity + 1) < sizeof(f->inBuf))
{
#ifdef CONFIG_EOL_IS_BOTH_CRLF
/* Ignore carriage returns that may accompany a CRLF sequence. */
@ -344,7 +367,6 @@ static int edit(int chn, int onl)
f->inBuf[f->inCapacity++] = ch;
}
}
#endif
}
while (ch != '\n');
@ -354,21 +376,23 @@ static int edit(int chn, int onl)
static int cls(int chn)
{
#ifdef CONFIG_INTERPREPTER_BAS_VT100
/* REVISIT: Use VT100 commands to clear the screen */
#warning Missing Logic
#endif
vt100_clrscreen(chn);
return 0;
#else
FS_errmsg = _("Clear screen operation not implemented");
return -1;
#endif
}
static int locate(int chn, int line, int column)
{
#ifdef CONFIG_INTERPREPTER_BAS_VT100
/* REVISIT: Use VT100 commands to set the cursor position */
#warning Missing Logic
#endif
vt100_setcursor(chn, line, column);
return 0;
#else
FS_errmsg = _("Set cursor position operation not implement");
return -1;
#endif
}
static int colour(int chn, int foreground, int background)

319
interpreters/bas/vt100.c Normal file
View File

@ -0,0 +1,319 @@
/****************************************************************************
* apps/interpreters/bas/vt100.c
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* 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 NuttX 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 COPYRIGHT HOLDERS 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
* COPYRIGHT OWNER 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.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <sys/stat.h>
#include <stdio.h>
#include <nuttx/vt100.h>
#include "fs.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Private Data
****************************************************************************/
/* VT100 escape sequences */
#if 0 /* Not used */
static const char g_cursoron[] = VT100_CURSORON;
static const char g_cursoroff[] = VT100_CURSOROFF;
static const char g_cursorhome[] = VT100_CURSORHOME;
static const char g_erasetoeol[] = VT100_CLEAREOL;
#endif
static const char g_clrscreen[] = VT100_CLEARSCREEN;
#if 0 /* Not used */
static const char g_index[] = VT100_INDEX;
static const char g_revindex[] = VT100_REVINDEX;
static const char g_attriboff[] = VT100_MODESOFF;
static const char g_boldon[] = VT100_BOLD;
static const char g_reverseon[] = VT100_REVERSE;
static const char g_blinkon[] = VT100_BLINK;
static const char g_boldoff[] = VT100_BOLDOFF;
static const char g_reverseoff[] = VT100_REVERSEOFF;
static const char g_blinkoff[] = VT100_BLINKOFF;
#endif
static const char g_fmtcursorpos[] = VT100_FMT_CURSORPOS;
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Name: vt100_write
*
* Description:
* Write a sequence of bytes to the channel device
*
****************************************************************************/
static void vt100_write(int chn, FAR const char *buffer, size_t buflen)
{
for (; buflen > 0; buflen--)
{
FS_putChar(chn, *buffer++);
}
}
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: vt100_blinkon
*
* Description:
* Enable the blinking attribute at the current cursor location
*
****************************************************************************/
#if 0 /* Not used */
void vt100_blinkon(int chn)
{
/* Send the VT100 BLINKON command */
vt100_write(chn, g_blinkon, sizeof(g_blinkon));
}
#endif
/****************************************************************************
* Name: vt100_boldon
*
* Description:
* Enable the blinking attribute at the current cursor location
*
****************************************************************************/
#if 0 /* Not used */
void vt100_boldon(int chn)
{
/* Send the VT100 BOLDON command */
vt100_write(chn, g_boldon, sizeof(g_boldon));
}
#endif
/****************************************************************************
* Name: vt100_reverseon
*
* Description:
* Enable the blinking attribute at the current cursor location
*
****************************************************************************/
#if 0 /* Not used */
void vt100_reverseon(int chn)
{
/* Send the VT100 REVERSON command */
vt100_write(chn, g_reverseon, sizeof(g_reverseon));
}
#endif
/****************************************************************************
* Name:
*
* Description:
* Disable all previously selected attributes.
*
****************************************************************************/
#if 0 /* Not used */
void vt100_attriboff(int chn)
{
/* Send the VT100 ATTRIBOFF command */
vt100_write(chn, g_attriboff, sizeof(g_attriboff));
}
#endif
/****************************************************************************
* Name: vt100_cursoron
*
* Description:
* Turn on the cursor
*
****************************************************************************/
#if 0 /* Not used */
void vt100_cursoron(int chn)
{
/* Send the VT100 CURSORON command */
vt100_write(chn, g_cursoron, sizeof(g_cursoron));
}
#endif
/****************************************************************************
* Name: vt100_cursoroff
*
* Description:
* Turn off the cursor
*
****************************************************************************/
#if 0 /* Not used */
void vt100_cursoroff(int chn)
{
/* Send the VT100 CURSOROFF command */
vt100_write(chn, g_cursoroff, sizeof(g_cursoroff));
}
#endif
/****************************************************************************
* Name: vt100_cursorhome
*
* Description:
* Move the current cursor to the upper left hand corner of the display
*
****************************************************************************/
#if 0 /* Not used */
void vt100_cursorhome(int chn)
{
/* Send the VT100 CURSORHOME command */
vt100_write(chn, g_cursorhome, sizeof(g_cursorhome));
}
#endif
/****************************************************************************
* Name: vt100_setcursor
*
* Description:
* Move the current cursor position to position (row,col)
*
****************************************************************************/
void vt100_setcursor(int chn, uint16_t row, uint16_t column)
{
char buffer[16];
int len;
/* Format the cursor position command. The origin is (1,1). */
len = snprintf(buffer, 16, g_fmtcursorpos, row + 1, column + 1);
/* Send the VT100 CURSORPOS command */
vt100_write(chn, buffer, len);
}
/****************************************************************************
* Name: vt100_clrtoeol
*
* Description:
* Clear the display from the current cursor position to the end of the
* current line.
*
****************************************************************************/
#if 0 /* Not used */
void vt100_clrtoeol(int chn)
{
/* Send the VT100 ERASETOEOL command */
vt100_write(chn, g_erasetoeol, sizeof(g_erasetoeol));
}
#endif
/****************************************************************************
* Name: vt100_clrscreen
*
* Description:
* Clear the entire display
*
****************************************************************************/
void vt100_clrscreen(int chn)
{
/* Send the VT100 CLRSCREEN command */
vt100_write(chn, g_clrscreen, sizeof(g_clrscreen));
}
/****************************************************************************
* Name: vt100_scrollup
*
* Description:
* Scroll the display up 'nlines' by sending the VT100 INDEX command.
*
****************************************************************************/
#if 0 /* Not used */
void vt100_scrollup(int chn, uint16_t nlines)
{
/* Scroll for the specified number of lines */
for (; nlines; nlines--)
{
/* Send the VT100 INDEX command */
vt100_write(chn, g_index, sizeof(g_index));
}
}
#endif
/****************************************************************************
* Name: vt100_scrolldown
*
* Description:
* Scroll the display down 'nlines' by sending the VT100 REVINDEX command.
*
****************************************************************************/
#if 0 /* Not used */
void vt100_scrolldown(int chn, uint16_t nlines)
{
/* Scroll for the specified number of lines */
for (; nlines; nlines--)
{
/* Send the VT100 REVINDEX command */
vt100_write(chn, g_revindex, sizeof(g_revindex));
}
#endif

217
interpreters/bas/vt100.h Normal file
View File

@ -0,0 +1,217 @@
/****************************************************************************
* apps/interpreters/bas/vt100.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* 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 NuttX 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 COPYRIGHT HOLDERS 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
* COPYRIGHT OWNER 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.
*
****************************************************************************/
#ifndef __APPS_INTERPRETERS_BAS_VT100_H
#define __APPS_INTERPRETERS_BAS_VT100_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdint.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Public Types
****************************************************************************/
/****************************************************************************
* Public Data
****************************************************************************/
#ifdef __cplusplus
#define EXTERN extern "C"
extern "C"
{
#else
#define EXTERN extern
#endif
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
/****************************************************************************
* Name: vt100_blinkon
*
* Description:
* Enable the blinking attribute at the current cursor location
*
****************************************************************************/
#if 0 /* Not used */
void vt100_blinkon(int chn);
#endif
/****************************************************************************
* Name: vt100_boldon
*
* Description:
* Enable the blinking attribute at the current cursor location
*
****************************************************************************/
#if 0 /* Not used */
void vt100_boldon(int chn);
#endif
/****************************************************************************
* Name: vt100_reverseon
*
* Description:
* Enable the blinking attribute at the current cursor location
*
****************************************************************************/
#if 0 /* Not used */
void vt100_reverseon(int chn);
#endif
/****************************************************************************
* Name:
*
* Description:
* Disable all previously selected attributes.
*
****************************************************************************/
#if 0 /* Not used */
void vt100_attriboff(int chn);
#endif
/****************************************************************************
* Name: vt100_cursoron
*
* Description:
* Turn on the cursor
*
****************************************************************************/
#if 0 /* Not used */
void vt100_cursoron(int chn);
#endif
/****************************************************************************
* Name: vt100_cursoroff
*
* Description:
* Turn off the cursor
*
****************************************************************************/
#if 0 /* Not used */
void vt100_cursoroff(int chn);
#endif
/****************************************************************************
* Name: vt100_cursorhome
*
* Description:
* Move the current cursor to the upper left hand corner of the display
*
****************************************************************************/
#if 0 /* Not used */
void vt100_cursorhome(int chn);
#endif
/****************************************************************************
* Name: vt100_setcursor
*
* Description:
* Move the current cursor position to position (row,col)
*
****************************************************************************/
void vt100_setcursor(int chn, uint16_t row, uint16_t column);
/****************************************************************************
* Name: vt100_clrtoeol
*
* Description:
* Clear the display from the current cursor position to the end of the
* current line.
*
****************************************************************************/
#if 0 /* Not used */
void vt100_clrtoeol(int chn);
#endif
/****************************************************************************
* Name: vt100_clrscreen
*
* Description:
* Clear the entire display
*
****************************************************************************/
void vt100_clrscreen(int chn);
/****************************************************************************
* Name: vt100_scrollup
*
* Description:
* Scroll the display up 'nlines' by sending the VT100 INDEX command.
*
****************************************************************************/
#if 0 /* Not used */
void vt100_scrollup(int chn, uint16_t nlines);
#endif
/****************************************************************************
* Name: vt100_scrolldown
*
* Description:
* Scroll the display down 'nlines' by sending the VT100 REVINDEX command.
*
****************************************************************************/
#if 0 /* Not used */
void vt100_scrolldown(int chn, uint16_t nlines);
#endif
#undef EXTERN
#ifdef __cplusplus
}
#endif
#endif /* __APPS_INTERPRETERS_BAS_VT100_H */