Skip to content

Commit

Permalink
msvc: Implement the mp_hal_xxx functions and enable mp-readline
Browse files Browse the repository at this point in the history
  • Loading branch information
stinos committed May 28, 2015
1 parent 451f58e commit 379a06c
Show file tree
Hide file tree
Showing 3 changed files with 193 additions and 4 deletions.
21 changes: 18 additions & 3 deletions windows/mpconfigport.h
Expand Up @@ -26,9 +26,10 @@

// options to control how Micro Python is built

// Linking with GNU readline causes binary to be licensed under GPL
#ifndef MICROPY_USE_READLINE
#define MICROPY_USE_READLINE (0)
// Linking with GNU readline (MICROPY_USE_READLINE == 2) causes binary to be licensed under GPL
#if !defined(MICROPY_USE_READLINE) && defined(_MSC_VER)
#define MICROPY_USE_READLINE (1)
#define MICROPY_USE_READLINE_HISTORY (1)
#endif

#define MICROPY_ALLOC_PATH_MAX (260) //see minwindef.h for msvc or limits.h for mingw
Expand Down Expand Up @@ -139,6 +140,14 @@ extern const struct _mp_obj_module_t mp_module_time;
{ MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&mp_module_time }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR__os), (mp_obj_t)&mp_module_os }, \

#if MICROPY_USE_READLINE == 1
#define MICROPY_PORT_ROOT_POINTERS \
char *readline_hist[50];
#endif

#define MICROPY_HAL_H "unix/unix_mphal.h"
#define MP_STATE_PORT MP_STATE_VM

// We need to provide a declaration/definition of alloca()
#include <malloc.h>

Expand Down Expand Up @@ -169,6 +178,7 @@ void msec_sleep(double msec);
#else
#define MP_SSIZE_MAX _I32_MAX
#endif
#define MICROPY_HAL_HAS_VT100 (0)


// CL specific definitions
Expand Down Expand Up @@ -198,4 +208,9 @@ void msec_sleep(double msec);
#include <stddef.h> //for NULL
#include <assert.h> //for assert


// Functions implemented in platform-specific code
void mp_hal_move_cursor_back(unsigned int pos);
void mp_hal_erase_line_from_cursor();

#endif
173 changes: 173 additions & 0 deletions windows/msvc/mphal.c
@@ -0,0 +1,173 @@
/*
* This file is part of the Micro Python project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2015 Damien P. George
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/


#include "py/mpstate.h"

#include MICROPY_HAL_H
#include <windows.h>

HANDLE std_in = NULL;
HANDLE con_out = NULL;
DWORD orig_mode;

void mp_hal_stdio_mode_raw(void) {
if (!std_in) {
std_in = GetStdHandle(STD_INPUT_HANDLE);
}
if (!con_out) {
con_out = CreateFile("CONOUT$", GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL, OPEN_EXISTING, 0, 0);
}
GetConsoleMode(std_in, &orig_mode);
DWORD mode = orig_mode;
mode &= ~ENABLE_ECHO_INPUT;
mode &= ~ENABLE_LINE_INPUT;
mode &= ~ENABLE_PROCESSED_INPUT;
SetConsoleMode(std_in, mode);
}

void mp_hal_stdio_mode_orig(void) {
assert(std_in);
SetConsoleMode(std_in, orig_mode);
}

void mp_hal_set_interrupt_char(char c) {
assert(std_in);
if (c == CHAR_CTRL_C) {
DWORD mode;
GetConsoleMode(std_in, &mode);
mode |= ENABLE_PROCESSED_INPUT;
SetConsoleMode(std_in, mode);
} else {
DWORD mode;
GetConsoleMode(std_in, &mode);
mode &= ~ENABLE_PROCESSED_INPUT;
SetConsoleMode(std_in, mode);
}
}

void mp_hal_move_cursor_back(uint pos) {
assert(con_out);
CONSOLE_SCREEN_BUFFER_INFO info;
GetConsoleScreenBufferInfo(con_out, &info);
info.dwCursorPosition.X -= (short)pos;
if (info.dwCursorPosition.X < 0) {
info.dwCursorPosition.X = 0;
}
SetConsoleCursorPosition(con_out, info.dwCursorPosition);
}

void mp_hal_erase_line_from_cursor() {
assert(con_out);
CONSOLE_SCREEN_BUFFER_INFO info;
GetConsoleScreenBufferInfo(con_out, &info);
const short len = info.dwSize.X - info.dwCursorPosition.X;
DWORD written;
FillConsoleOutputCharacter(con_out, ' ', len, info.dwCursorPosition, &written);
FillConsoleOutputAttribute(con_out, info.wAttributes, len, info.dwCursorPosition, &written);
}

typedef struct item_t {
WORD vkey;
const char *seq;
} item_t;

// map virtual key codes to VT100 escape sequences
STATIC item_t keyCodeMap[] = {
{VK_UP, "[A"},
{VK_DOWN, "[B"},
{VK_RIGHT, "[C"},
{VK_LEFT, "[D"},
{VK_HOME, "[H"},
{VK_END, "[F"},
{VK_DELETE, "[3~"},
{0, ""} //sentinel
};

STATIC const char *cur_esc_seq = NULL;

STATIC int esc_seq_process_vk(int vk) {
for (item_t *p = keyCodeMap; p->vkey != 0; ++p) {
if (p->vkey == vk) {
cur_esc_seq = p->seq;
return 27; // ESC, start of escape sequence
}
}
return 0; // nothing found
}

STATIC int esc_seq_chr() {
if (cur_esc_seq) {
const char c = *cur_esc_seq++;
if (c) {
return c;
}
cur_esc_seq = NULL;
}
return 0;
}

int mp_hal_stdin_rx_chr(void) {
// currently processing escape seq?
const int ret = esc_seq_chr();
if (ret) {
return ret;
}

// poll until key which we handle is pressed
DWORD num_read;
INPUT_RECORD rec;
for (;;) {
if (!ReadConsoleInput(std_in, &rec, 1, &num_read) || !num_read) {
return CHAR_CTRL_C; // EOF, ctrl-D
}
if (rec.EventType != KEY_EVENT || !rec.Event.KeyEvent.bKeyDown) { // only want key down events
continue;
}
const char c = rec.Event.KeyEvent.uChar.AsciiChar;
if (c) { // plain ascii char, return it
return c;
}
const int ret = esc_seq_process_vk(rec.Event.KeyEvent.wVirtualKeyCode);
if (ret) {
return ret;
}
}
}

void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
write(1, str, len);
}

void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
mp_hal_stdout_tx_strn(str, len);
}

void mp_hal_stdout_tx_str(const char *str) {
mp_hal_stdout_tx_strn(str, strlen(str));
}
3 changes: 2 additions & 1 deletion windows/msvc/sources.props
Expand Up @@ -4,9 +4,10 @@
<ItemGroup>
<ClCompile Include="$(PyBaseDir)py\*.c" />
<ClCompile Include="$(PyBaseDir)extmod\*.c" />
<ClCompile Include="$(PyBaseDir)unix\*.c" Exclude="$(PyBaseDir)unix\alloc.c;$(PyBaseDir)unix\modffi.c;$(PyBaseDir)unix\modsocket.c;$(PyBaseDir)unix\modtermios.c;$(PyBaseDir)unix\seg_helpers.c" />
<ClCompile Include="$(PyBaseDir)unix\*.c" Exclude="$(PyBaseDir)unix\alloc.c;$(PyBaseDir)unix\modffi.c;$(PyBaseDir)unix\modsocket.c;$(PyBaseDir)unix\modtermios.c;$(PyBaseDir)unix\seg_helpers.c;$(PyBaseDir)unix\unix_mphal.c" />
<ClCompile Include="$(PyBaseDir)windows\*.c" />
<ClCompile Include="$(PyBaseDir)windows\msvc\*.c" />
<ClCompile Include="$(PyBaseDir)lib\mp-readline\*.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(PyBaseDir)py\*.h" />
Expand Down

0 comments on commit 379a06c

Please sign in to comment.