Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add number status mode in STYLE_ALL_BOARD type keyboard #65

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+203 −3
Open

Add number status mode in STYLE_ALL_BOARD type keyboard #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 102 additions & 2 deletions GuiLite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,8 @@ class c_dialog : public c_wnd
typedef enum
{
STATUS_UPPERCASE,
STATUS_LOWERCASE
STATUS_LOWERCASE,
STATUS_NUMBER,
}KEYBOARD_STATUS;
typedef enum
{
Expand All @@ -1878,6 +1879,46 @@ extern WND_TREE g_number_board_children[];
class c_keyboard: public c_wnd
{
public:
virtual char convert_char2num(char id)
{
char num = id;
switch (id)
{
case 'Q':
num = '1';
break;
case 'W':
num = '2';
break;
case 'E':
num = '3';
break;
case 'R':
num = '4';
break;
case 'T':
num = '5';
break;
case 'Y':
num = '6';
break;
case 'U':
num = '7';
break;
case 'I':
num = '8';
break;
case 'O':
num = '9';
break;
case 'P':
num = '0';
break;
default:
break;
}
return num;
}
virtual int connect(c_wnd *user, unsigned short resource_id, KEYBOARD_STYLE style)
{
c_rect user_rect;
Expand Down Expand Up @@ -1943,6 +1984,9 @@ class c_keyboard: public c_wnd
case 0x7F:
on_del_clicked(id, param);
break;
case 0x90:
on_num_switch_clicked(id, param);
break;
default:
on_char_clicked(id, param);
break;
Expand All @@ -1964,6 +2008,10 @@ class c_keyboard: public c_wnd
{
id += 0x20;
}
else if (STATUS_NUMBER == m_cap_status)
{
id = convert_char2num(id);
}
goto InputChar;
}
ASSERT(false);
Expand All @@ -1985,6 +2033,11 @@ class c_keyboard: public c_wnd
m_cap_status = (m_cap_status == STATUS_LOWERCASE) ? STATUS_UPPERCASE : STATUS_LOWERCASE;
show_window();
}
void on_num_switch_clicked(int id, int param)
{
m_cap_status = (m_cap_status == STATUS_NUMBER) ? STATUS_UPPERCASE : STATUS_NUMBER;
show_window();
}
void on_enter_clicked(int id, int param)
{
memset(m_str, 0, sizeof(m_str));
Expand All @@ -2004,6 +2057,46 @@ class c_keyboard: public c_wnd
class c_keyboard_button : public c_button
{
protected:
virtual char convert_char2num(unsigned short id)
{
char num = 0;
switch(id)
{
case 'Q':
num = '1';
break;
case 'W':
num = '2';
break;
case 'E':
num = '3';
break;
case 'R':
num = '4';
break;
case 'T':
num = '5';
break;
case 'Y':
num = '6';
break;
case 'U':
num = '7';
break;
case 'I':
num = '8';
break;
case 'O':
num = '9';
break;
case 'P':
num = '0';
break;
default:
break;
}
return num;
}
virtual void on_paint()
{
c_rect rect;
Expand Down Expand Up @@ -2055,7 +2148,14 @@ class c_keyboard_button : public c_button
char letter[] = { 0, 0 };
if (m_id >= 'A' && m_id <= 'Z')
{
letter[0] = (((c_keyboard*)m_parent)->get_cap_status() == STATUS_UPPERCASE) ? m_id : (m_id + 0x20);
if (((c_keyboard*)m_parent)->get_cap_status() == STATUS_NUMBER)
{
letter[0] = convert_char2num(m_id);
}
else
{
letter[0] = (((c_keyboard*)m_parent)->get_cap_status() == STATUS_UPPERCASE) ? m_id : (m_id + 0x20);
}
}
else if (m_id >= '0' && m_id <= '9')
{
Expand Down
102 changes: 101 additions & 1 deletion src/widgets/keyboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ typedef enum
{
STATUS_UPPERCASE,
STATUS_LOWERCASE
STATUS_NUMBER,
}KEYBOARD_STATUS;

typedef enum
Expand All @@ -57,6 +58,46 @@ extern WND_TREE g_number_board_children[];
class c_keyboard: public c_wnd
{
public:
virtual char convert_char2num(char id)
{
char num = id;
switch (id)
{
case 'Q':
num = '1';
break;
case 'W':
num = '2';
break;
case 'E':
num = '3';
break;
case 'R':
num = '4';
break;
case 'T':
num = '5';
break;
case 'Y':
num = '6';
break;
case 'U':
num = '7';
break;
case 'I':
num = '8';
break;
case 'O':
num = '9';
break;
case 'P':
num = '0';
break;
default:
break;
}
return num;
}
virtual int connect(c_wnd *user, unsigned short resource_id, KEYBOARD_STYLE style)
{
c_rect user_rect;
Expand Down Expand Up @@ -124,6 +165,9 @@ class c_keyboard: public c_wnd
case 0x7F:
on_del_clicked(id, param);
break;
case 0x90:
on_num_switch_clicked(id, param);
break;
default:
on_char_clicked(id, param);
break;
Expand All @@ -146,6 +190,10 @@ class c_keyboard: public c_wnd
{
id += 0x20;
}
else if (STATUS_NUMBER == m_cap_status)
{
id = convert_char2num(id);
}
goto InputChar;
}
ASSERT(false);
Expand All @@ -167,6 +215,11 @@ class c_keyboard: public c_wnd
m_cap_status = (m_cap_status == STATUS_LOWERCASE) ? STATUS_UPPERCASE : STATUS_LOWERCASE;
show_window();
}
void on_num_switch_clicked(int id, int param)
{
m_cap_status = (m_cap_status == STATUS_NUMBER) ? STATUS_UPPERCASE : STATUS_NUMBER;
show_window();
}
void on_enter_clicked(int id, int param)
{
memset(m_str, 0, sizeof(m_str));
Expand All @@ -187,6 +240,46 @@ class c_keyboard: public c_wnd
class c_keyboard_button : public c_button
{
protected:
virtual char convert_char2num(unsigned short id)
{
char num = id;
switch(id)
{
case 'Q':
num = '1';
break;
case 'W':
num = '2';
break;
case 'E':
num = '3';
break;
case 'R':
num = '4';
break;
case 'T':
num = '5';
break;
case 'Y':
num = '6';
break;
case 'U':
num = '7';
break;
case 'I':
num = '8';
break;
case 'O':
num = '9';
break;
case 'P':
num = '0';
break;
default:
break;
}
return num;
}
virtual void on_paint()
{
c_rect rect;
Expand Down Expand Up @@ -240,7 +333,14 @@ class c_keyboard_button : public c_button
char letter[] = { 0, 0 };
if (m_id >= 'A' && m_id <= 'Z')
{
letter[0] = (((c_keyboard*)m_parent)->get_cap_status() == STATUS_UPPERCASE) ? m_id : (m_id + 0x20);
if (((c_keyboard*)m_parent)->get_cap_status() == STATUS_NUMBER)
{
letter[0] = convert_char2num(m_id);
}
else
{
letter[0] = (((c_keyboard*)m_parent)->get_cap_status() == STATUS_UPPERCASE) ? m_id : (m_id + 0x20);
}
}
else if (m_id >= '0' && m_id <= '9')
{
Expand Down