dany/wf-osk
1
0
Fork 0
mirror of https://github.com/WayfireWM/wf-osk.git synced 2025-04-05 12:56:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

use nicer unicode symbols for some buttons

Browse Source
This commit is contained in:
Ilia Bozhinov 2019-03-02 15:28:14 +01:00
parent 7d84731f59
commit cd66092ce4
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/layouts.tpp
View File

@ -10,7 +10,7 @@ std::vector<std::vector<Key>> default_keys = {
{KEY_I, "i", 1}, {KEY_I, "i", 1},
{KEY_O, "o", 1}, {KEY_O, "o", 1},
{KEY_P, "p", 1}, {KEY_P, "p", 1},
{KEY_BACKSPACE, "<--", 2} {KEY_BACKSPACE, "⌫", 2}
}, },
{ {
{0, " ", 0.5}, {0, " ", 0.5},
@ -23,7 +23,7 @@ std::vector<std::vector<Key>> default_keys = {
{KEY_J, "j", 1}, {KEY_J, "j", 1},
{KEY_K, "k", 1}, {KEY_K, "k", 1},
{KEY_L, "l", 1}, {KEY_L, "l", 1},
{KEY_ENTER, "enter", 2} {KEY_ENTER, "↵", 2}
}, },
{ {
{ABC_TOGGLE, "ABC", 1}, {ABC_TOGGLE, "ABC", 1},
@ -40,10 +40,10 @@ std::vector<std::vector<Key>> default_keys = {
{ {
{NUM_TOGGLE, "123?", 1.5}, {NUM_TOGGLE, "123?", 1.5},
{KEY_SPACE, "_", 9.5}, {KEY_SPACE, "_", 9.5},
{KEY_LEFT, "<", 0.5}, {KEY_LEFT, "←", 0.5},
{KEY_RIGHT, ">", 0.5}, {KEY_RIGHT, "→", 0.5},
{KEY_UP, "/\\", 0.5}, {KEY_UP, "↑", 0.5},
{KEY_DOWN, "\\/", 0.5} {KEY_DOWN, "↓", 0.5}
} }
}; };
@ -52,12 +52,7 @@ for (auto& row : shift_keys)
{ {
for (auto& key : row) for (auto& key : row)
{ {
for (auto& c : key.text) key.text = key.text.uppercase();
{
if (std::isalpha(c))
c = std::toupper(c);
}
if (key.code < USE_SHIFT) if (key.code < USE_SHIFT)
key.code |= USE_SHIFT; key.code |= USE_SHIFT;
@ -80,7 +75,7 @@ std::vector<std::vector<Key>> numeric_keys = {
{KEY_0, "0", 1}, {KEY_0, "0", 1},
{KEY_MINUS, "-", 1}, {KEY_MINUS, "-", 1},
{KEY_EQUAL, "=", 1}, {KEY_EQUAL, "=", 1},
{KEY_BACKSPACE, "<--", 2} {KEY_BACKSPACE, "⌫", 2}
}, },
{ {
{KEY_1 | USE_SHIFT, "!", 1}, {KEY_1 | USE_SHIFT, "!", 1},
@ -95,7 +90,7 @@ std::vector<std::vector<Key>> numeric_keys = {
{KEY_0 | USE_SHIFT, ")", 1}, {KEY_0 | USE_SHIFT, ")", 1},
{KEY_SEMICOLON, ";", 1}, {KEY_SEMICOLON, ";", 1},
{KEY_SEMICOLON | USE_SHIFT, ":", 1}, {KEY_SEMICOLON | USE_SHIFT, ":", 1},
{KEY_ENTER, "ent", 1} {KEY_ENTER, "↵", 1}
}, },
{ {
{KEY_LEFTBRACE, "[", 1}, {KEY_LEFTBRACE, "[", 1},

2
src/osk.hpp
View File

@ -18,7 +18,7 @@ namespace wf
struct Key struct Key
{ {
uint32_t code; uint32_t code;
std::string text; Glib::ustring text;
double width; double width;
}; };