ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support repeat. Swap up&down. Also some cleanup

This commit is contained in:
Stefan `Sec` Zehl 2011-08-02 23:34:47 +02:00
parent 691fa7d09b
commit e25e591287
1 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
firmware/basic/stringin.c
View File

@ -1,8 +1,9 @@
#include <string.h>
#include "basic/basic.h" #include "basic/basic.h"
#include "lcd/render.h" #include "lcd/render.h"
#include "lcd/display.h" #include "lcd/display.h"
#include "lcd/allfonts.h" #include "lcd/print.h"
#define CHARWIDTH 12 #define CHARWIDTH 12
#define CHARSPACE 0x20 #define CHARSPACE 0x20
@ -23,19 +24,23 @@ void inputInit(char p[],char s[], uint8_t l, uint8_t as, uint8_t ae) {
s_input.pos = 0; s_input.pos = 0;
s_input.dcursor = 0; s_input.dcursor = 0;
s_input.done = false; s_input.done = false;
s[l-1]=0;
for(int i=strlen(s);i<(l-1);i++)
s[i]=0;
} }
void inputMove() { void inputMove() {
char *cur = s_input.line+s_input.pos+s_input.dcursor; char *cur = s_input.line+s_input.pos+s_input.dcursor;
char key = getInput(); switch(getInputWaitRepeat()){
if (key == BTN_LEFT) { case BTN_LEFT:
if (s_input.dcursor >0) { if (s_input.dcursor >0) {
s_input.dcursor --; s_input.dcursor --;
} else if (s_input.pos > 0) { } else if (s_input.pos > 0) {
s_input.pos --; s_input.pos --;
} }
} else if (key == BTN_RIGHT) { break;
case BTN_RIGHT:
if (s_input.dcursor <RESX/CHARWIDTH-1 && s_input.pos + s_input.dcursor < s_input.maxlength) { if (s_input.dcursor <RESX/CHARWIDTH-1 && s_input.pos + s_input.dcursor < s_input.maxlength) {
if (*cur == 0) { if (*cur == 0) {
*cur = CHARSPACE; *cur = CHARSPACE;
@ -47,7 +52,8 @@ void inputMove() {
*cur = CHARSPACE; *cur = CHARSPACE;
} }
} }
} else if (key == BTN_DOWN) { break;
case BTN_UP:
if (*cur <= s_input.asciistart) { if (*cur <= s_input.asciistart) {
*cur = s_input.asciiend; *cur = s_input.asciiend;
} else if (*cur > s_input.asciiend) { } else if (*cur > s_input.asciiend) {
@ -55,7 +61,8 @@ void inputMove() {
} else { } else {
*cur = *cur - 1; *cur = *cur - 1;
} }
} else if (key == BTN_UP) { break;
case BTN_DOWN:
if (*cur >= s_input.asciiend) { if (*cur >= s_input.asciiend) {
*cur = s_input.asciistart; *cur = s_input.asciistart;
} else if (*cur < s_input.asciistart) { } else if (*cur < s_input.asciistart) {
@ -63,16 +70,19 @@ void inputMove() {
} else { } else {
*cur = *cur + 1; *cur = *cur + 1;
} }
} else if (key == (BTN_ENTER)) { break;
case BTN_ENTER:
s_input.done = true; s_input.done = true;
// getInputWaitRelease();
break;
} }
} }
void inputDraw() { void inputDraw() {
lcdFill(0); char tmp[2]= {0,0};
lcdClear();
DoString(0,0,s_input.prompt); DoString(0,0,s_input.prompt);
for (int dx = 0; dx<= RESX/CHARWIDTH && s_input.pos+dx<s_input.maxlength; dx++){ for (int dx = 0; dx<= RESX/CHARWIDTH && s_input.pos+dx<s_input.maxlength; dx++){
char tmp[1];
tmp[0] = s_input.line[s_input.pos+dx]; tmp[0] = s_input.line[s_input.pos+dx];
DoString(dx*CHARWIDTH, 30,tmp); DoString(dx*CHARWIDTH, 30,tmp);
} }
@ -93,13 +103,12 @@ void inputClean() {
} }
void input(char prompt[], char line[], uint8_t asciistart, uint8_t asciiend, uint8_t maxlength){ void input(char prompt[], char line[], uint8_t asciistart, uint8_t asciiend, uint8_t maxlength){
font=&Font_7x8; setSystemFont();
inputInit(prompt, line, maxlength, asciistart, asciiend); inputInit(prompt, line, maxlength, asciistart, asciiend);
lcdFill(0);
while (!s_input.done) { while (!s_input.done) {
inputDraw();
lcdDisplay(); lcdDisplay();
inputMove(); inputMove();
inputDraw();
} }
inputClean(); inputClean();
return; return;