m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Validate pasted strings.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1830 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2011-09-25 13:40:22 +00:00
parent 87b7c45da4
commit 242c73f4c3
1 changed files with 104 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/readline.c
View File

@ -85,7 +85,9 @@ void Insert_character(char * str, char letter, byte position)
str[position]='\0';
}
void Prepend_string(char* dest, char* src, int max)
int Prepend_string(char* dest, char* src, int max)
// Insert a string at the start of another. Up to MAX characters only
// Returns actual number of chars inserted
{
// Insert src before dest
int sized = strlen(dest);
@ -98,10 +100,37 @@ void Prepend_string(char* dest, char* src, int max)
memmove(dest+sizes, dest, sized);
memcpy(dest, src, sizes);
return sizes;
}
int Valid_character(int c)
int Valid_character(int c, int input_type)
// returns 0 = Not allowed
// returns 1 = Allowed
// returns 2 = Allowed only once at start of string (for - sign in numbers)
{
// On va regarder si l'utilisateur le droit de se servir de cette touche
switch(input_type)
{
case INPUT_TYPE_STRING :
if ((c>=' ' && c<= 255) || c=='\n')
return 1;
break;
case INPUT_TYPE_INTEGER :
if ( (c>='0') && (c<='9') )
return 1;
break;
case INPUT_TYPE_DECIMAL:
if ( (c>='0') && (c<='9') )
return 1;
else if (c=='-')
return 2;
else if (c=='.')
return 1;
break;
case INPUT_TYPE_FILENAME:
{
// On regarde si la touche est autorisée
// Sous Linux: Seul le / est strictement interdit, mais beaucoup
// d'autres poseront des problèmes au shell, alors on évite.
// Sous Windows : c'est moins grave car le fopen() échouerait de toutes façons.
@ -123,6 +152,24 @@ int Valid_character(int c)
return 0;
return 1;
}
case INPUT_TYPE_HEXA:
if ( (c>='0') && (c<='9') )
return 1;
else if ( (c>='A') && (c<='F') )
return 1;
else if ( (c>='a') && (c<='f') )
return 1;
break;
} // End du "switch(input_type)"
return 0;
}
void Cleanup_string(char* str, int input_type)
{
int pos = 0;
while(Valid_character(str[pos++], input_type));
str[--pos] = 0;
}
void Display_whole_string(word x_pos,word y_pos,char * str,byte position)
{
@ -243,7 +290,6 @@ byte Readline_ex(word x_pos,word y_pos,char * str,byte visible_size,byte max_siz
byte position;
byte size;
word input_key=0;
byte is_authorized;
word window_x=Window_pos_X;
word window_y=Window_pos_Y;
byte offset=0; // index du premier caractère affiché
@ -481,11 +527,9 @@ byte Readline_ex(word x_pos,word y_pos,char * str,byte visible_size,byte max_siz
{
char* data = getClipboard();
if (data == NULL) continue; // No clipboard data
Cleanup_string(data, input_type);
// Insert it at the cursor position
Prepend_string(str + position, data, max_size - position);
// TODO Update cursor position
// TODO This doesn't respect the "allowed chars" restriction
//strncat(str, data, max_size - size);
position += Prepend_string(str + position, data, max_size - position);
free(data);
goto affichage;
}
@ -586,43 +630,9 @@ byte Readline_ex(word x_pos,word y_pos,char * str,byte visible_size,byte max_siz
default :
if (size<max_size)
{
// On va regarder si l'utilisateur le droit de se servir de cette touche
is_authorized=0; // On commence par supposer qu'elle est interdite
switch(input_type)
{
case INPUT_TYPE_STRING :
if ((input_key>=' ' && input_key<= 255)||input_key=='\n')
is_authorized=1;
break;
case INPUT_TYPE_INTEGER :
if ( (input_key>='0') && (input_key<='9') )
is_authorized=1;
break;
case INPUT_TYPE_DECIMAL:
if ( (input_key>='0') && (input_key<='9') )
is_authorized=1;
else if (input_key=='-' && position==0 && str[0]!='-')
is_authorized=1;
else if (input_key=='.')
is_authorized=1;
break;
case INPUT_TYPE_FILENAME:
// On regarde si la touche est autorisée
if ( Valid_character(input_key))
is_authorized=1;
break;
case INPUT_TYPE_HEXA:
if ( (input_key>='0') && (input_key<='9') )
is_authorized=1;
else if ( (input_key>='A') && (input_key<='F') )
is_authorized=1;
else if ( (input_key>='a') && (input_key<='f') )
is_authorized=1;
break;
} // End du "switch(input_type)"
// Si la touche était autorisée...
if (is_authorized)
byte is_authorized = Valid_character(input_key, input_type);
if (is_authorized == 1 || (is_authorized == 2 && position == 0 && str[position] != '-'))
{
// ... alors on l'insère ...
Insert_character(str,input_key,position/*,size*/);