adjusted defaults (disabled buttons by default so we dont confuse users with something they dont expect)

http-comm
Ondřej Hruška 7 years ago
parent ccbb1886af
commit 5ff9d17850
  1. 2
      front-end
  2. 8
      user/screen.c
  3. 20
      user/screen.h

@ -1 +1 @@
Subproject commit 810782a7f299272b9ebfe0ae3c5087bc0fe9c59d Subproject commit a78db7632754694ddd9ab841f84dfef6ad09313c

@ -184,10 +184,10 @@ terminal_restore_defaults(void)
termconf->config_version = TERMCONF_VERSION; termconf->config_version = TERMCONF_VERSION;
termconf->display_cooldown_ms = SCR_DEF_DISPLAY_COOLDOWN_MS; termconf->display_cooldown_ms = SCR_DEF_DISPLAY_COOLDOWN_MS;
termconf->loopback = false; termconf->loopback = false;
termconf->show_buttons = true; termconf->show_buttons = SCR_DEF_SHOW_BUTTONS;
termconf->show_config_links = true; termconf->show_config_links = SCR_DEF_SHOW_MENU;
termconf->cursor_shape = CURSOR_BLOCK_BL; termconf->cursor_shape = SCR_DEF_CURSOR_SHAPE;
termconf->crlf_mode = false; termconf->crlf_mode = SCR_DEF_CRLF;
} }
/** /**

@ -37,27 +37,24 @@
// Size designed for the terminal config structure // Size designed for the terminal config structure
// Must be constant to avoid corrupting user config after upgrade // Must be constant to avoid corrupting user config after upgrade
#define TERMCONF_SIZE 300 #define TERMCONF_SIZE 300
#define TERMCONF_VERSION 4
#define TERM_BTN_LEN 10 #define TERM_BTN_LEN 10
#define TERM_BTN_MSG_LEN 10 #define TERM_BTN_MSG_LEN 10
#define TERM_TITLE_LEN 64 #define TERM_TITLE_LEN 64
#define TERM_BTN_COUNT 5 #define TERM_BTN_COUNT 5
#define SCR_DEF_DISPLAY_TOUT_MS 10 #define SCR_DEF_DISPLAY_TOUT_MS 12
#define SCR_DEF_DISPLAY_COOLDOWN_MS 30 #define SCR_DEF_DISPLAY_COOLDOWN_MS 35
#define SCR_DEF_PARSER_TOUT_MS 10 #define SCR_DEF_PARSER_TOUT_MS 10
#define SCR_DEF_FN_ALT_MODE true // true - SS3 codes, easier to parse & for xterm compatibility #define SCR_DEF_FN_ALT_MODE true // true - SS3 codes, easier to parse & for xterm compatibility
#define SCR_DEF_WIDTH 26 #define SCR_DEF_WIDTH 80
#define SCR_DEF_HEIGHT 10 #define SCR_DEF_HEIGHT 25
#define SCR_DEF_TITLE "ESPTerm" #define SCR_DEF_TITLE "ESPTerm"
/** Maximum screen size (determines size of the static data array) */ /** Maximum screen size (determines size of the static data array) */
#define MAX_SCREEN_SIZE (80*25) #define MAX_SCREEN_SIZE (80*25)
#define TERMCONF_VERSION 4
// --- Persistent Settings ---
enum CursorShape { enum CursorShape {
CURSOR_BLOCK_BL = 0, CURSOR_BLOCK_BL = 0,
CURSOR_DEFAULT = 1, // this is translated to a user configured style CURSOR_DEFAULT = 1, // this is translated to a user configured style
@ -68,6 +65,13 @@ enum CursorShape {
CURSOR_BAR = 6, CURSOR_BAR = 6,
}; };
#define SCR_DEF_SHOW_BUTTONS 0
#define SCR_DEF_SHOW_MENU 1
#define SCR_DEF_CURSOR_SHAPE CURSOR_BLOCK_BL
#define SCR_DEF_CRLF 0
// --- Persistent Settings ---
#define CURSOR_BLINKS(shape) ((shape)==CURSOR_BLOCK_BL||(shape)==CURSOR_UNDERLINE_BL||(shape)==CURSOR_BAR_BL) #define CURSOR_BLINKS(shape) ((shape)==CURSOR_BLOCK_BL||(shape)==CURSOR_UNDERLINE_BL||(shape)==CURSOR_BAR_BL)
typedef struct { typedef struct {

Loading…
Cancel
Save