Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • postmarketOS/osk-sdl
1 result
Show changes
Commits on Source (2)
  • Johannes Marbach's avatar
    Replace printf with SDL_Log variants (MR 108) · 7941343c
    Johannes Marbach authored and Clayton Craft's avatar Clayton Craft committed 
    All usages of printf were migrated to SDL_Log functions. This allows
the log verbosity to be controlled centrally and the -v flag is only
used once for setting the global priority threshold.

Closes: #107
    7941343c
  • Johannes Marbach's avatar
    Make keyboard more accessible (MR #105) · f595754f
    Johannes Marbach authored and Clayton Craft's avatar Clayton Craft committed 
    This makes the following things configurable via the config:

* keyboard background
* keyboard font size
* keycap text color
* keycap background (letters, return, other)
* text input background

Color selections were tweaked from the previous defaults to offer
more contrast, taking inspiration from common color patterns on
iOS and Android keyboards.

Hex string parsing was moved into the config class since it is
now required in a lot more places.

Closes: #96
    f595754f
Hide whitespace changes
Inline Side-by-side
osk.conf
View file @ f595754f
......@@ -3,11 +3,18 @@
wallpaper = #000000
keyboard-background = #333333;
keyboard-background = #0E0E12
keyboard-map = us
keyboard-font = /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf
keyboard-font-size = 24
key-foreground = #FFFFFF
key-background-letter = #5A606A
key-background-return = #003C00
key-background-other = #32363E
key-radius = 0
inputbox-background = #32363E
inputbox-radius = 0
animations = true
src/config.cpp
View file @ f595754f
......@@ -18,32 +18,45 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <SDL2/SDL.h>
#include <fstream>
#include <iostream>
#include <map>
#include <sstream>
#include <string>
argb parseHexString(const std::string &hex)
{
argb result = { 255, 0, 0, 0 };
if (sscanf(hex.c_str(), "#%02hhx%02hhx%02hhx", &result.r, &result.g, &result.b) != 3) {
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Could not parse color code %s", hex.c_str());
exit(EXIT_FAILURE);
}
return result;
}
bool Config::Read(const std::string &path)
{
std::ifstream is(path, std::ifstream::binary);
if (!is) {
fprintf(stderr, "Could not open config file: %s\n", path.c_str());
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Could not open config file: %s", path.c_str());
return false;
}
if (!Config::Parse(is)) {
fprintf(stderr, "Could not parse config file: %s\n", path.c_str());
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Could not parse config file: %s", path.c_str());
return false;
}
auto it = Config::options.find("wallpaper");
if (it != Config::options.end()) {
Config::wallpaper = Config::options["wallpaper"];
std::string hex = Config::options["wallpaper"];
Config::wallpaper = parseHexString(hex);
}
it = Config::options.find("keyboard-background");
if (it != Config::options.end()) {
Config::keyboardBackground = Config::options["keyboard-background"];
std::string hex = Config::options["keyboard-background"];
Config::keyboardBackground = parseHexString(hex);
}
it = Config::options.find("keyboard-font");
......@@ -51,16 +64,51 @@ bool Config::Read(const std::string &path)
Config::keyboardFont = Config::options["keyboard-font"];
}
it = Config::options.find("keyboard-font-size");
if (it != Config::options.end()) {
Config::keyboardFontSize = std::stoi(Config::options["keyboard-font-size"]);
}
it = Config::options.find("keyboard-map");
if (it != Config::options.end()) {
Config::keyboardMap = Config::options["keyboard-map"];
}
it = Config::options.find("key-foreground");
if (it != Config::options.end()) {
std::string hex = Config::options["key-foreground"];
Config::keyForeground = parseHexString(hex);
}
it = Config::options.find("key-background-letter");
if (it != Config::options.end()) {
std::string hex = Config::options["key-background-letter"];
Config::keyBackgroundLetter = parseHexString(hex);
}
it = Config::options.find("key-background-return");
if (it != Config::options.end()) {
std::string hex = Config::options["key-background-return"];
Config::keyBackgroundReturn = parseHexString(hex);
}
it = Config::options.find("key-background-other");
if (it != Config::options.end()) {
std::string hex = Config::options["key-background-other"];
Config::keyBackgroundOther = parseHexString(hex);
}
it = Config::options.find("key-radius");
if (it != Config::options.end()) {
Config::keyRadius = Config::options["key-radius"];
}
it = Config::options.find("inputbox-background");
if (it != Config::options.end()) {
std::string hex = Config::options["inputbox-background"];
Config::inputBoxBackground = parseHexString(hex);
}
it = Config::options.find("inputbox-radius");
if (it != Config::options.end()) {
Config::inputBoxRadius = Config::options["inputbox-radius"];
......@@ -95,7 +143,7 @@ bool Config::Parse(std::istream &file)
}
if (error) {
fprintf(stderr, "Syntax error on line %d\n", lineno);
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Syntax error on line %d", lineno);
return false;
} else {
Config::options[id] = val;
......
src/config.h
View file @ f595754f
......@@ -22,14 +22,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <map>
#include <string>
struct argb {
unsigned char a;
unsigned char r;
unsigned char g;
unsigned char b;
};
/**
Convert color hex string into ARGB
@hex 6-character hex string with leading #
@return ARGB structure to write the extracted values into
*/
argb parseHexString(const std::string &hex);
class Config {
public:
std::string keyboardBackground = "#333333";
std::string wallpaper = "#FF9900";
argb wallpaper = parseHexString("#000000");
argb keyboardBackground = parseHexString("#0E0E12");
std::string keyboardFont = "DejaVu";
int keyboardFontSize = 24;
std::string keyboardMap = "us";
std::string inputBoxRadius = "0";
argb keyForeground = parseHexString("#FFFFFF");
argb keyBackgroundLetter = parseHexString("#5A606A");
argb keyBackgroundReturn = parseHexString("#003C00");
argb keyBackgroundOther = parseHexString("#32363E");
std::string keyRadius = "0";
argb inputBoxBackground = parseHexString("#32363E");
std::string inputBoxRadius = "0";
bool animations = true;
/**
......
src/keyboard.cpp
View file @ f595754f
......@@ -36,7 +36,7 @@ int Keyboard::init(SDL_Renderer *renderer)
loadKeymap();
int keyLong = std::strtol(config->keyRadius.c_str(), nullptr, 10);
if (keyLong >= BEZIER_RESOLUTION || static_cast<double>(keyLong) > (keyboardHeight / 5.0) / 1.5) {
fprintf(stderr, "key-radius must be below %d and %f, it is %d\n",
SDL_LogWarn(SDL_LOG_CATEGORY_VIDEO, "key-radius must be below %d and %f, it is %d",
BEZIER_RESOLUTION, (keyboardHeight / 5.0) / 1.5, keyLong);
keyRadius = 0;
} else {
......@@ -45,12 +45,12 @@ int Keyboard::init(SDL_Renderer *renderer)
for (auto &layer : keyboard) {
layer.surface = makeKeyboard(&layer);
if (!layer.surface) {
fprintf(stderr, "ERROR: Unable to generate keyboard surface\n");
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Unable to generate keyboard surface");
return 1;
}
layer.texture = SDL_CreateTextureFromSurface(renderer, layer.surface);
if (!layer.texture) {
fprintf(stderr, "ERROR: Unable to generate keyboard texture\n");
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Unable to generate keyboard texture");
return 1;
}
}
......@@ -68,14 +68,6 @@ void Keyboard::setTargetPosition(float p)
targetPosition = p;
}
void Keyboard::setKeyboardColor(uint8_t a, uint8_t r, uint8_t g, uint8_t b)
{
keyboardColor.a = a;
keyboardColor.r = r;
keyboardColor.g = g;
keyboardColor.b = b;
}
void Keyboard::updateAnimations()
{
const int animStep = 20; // 20ms -> 50 FPS
......@@ -133,7 +125,7 @@ void Keyboard::draw(SDL_Renderer *renderer, int screenHeight)
srcRect.w = keyboardWidth;
srcRect.h = keyboardRect.h;
SDL_SetRenderDrawColor(renderer, keyboardColor.r, keyboardColor.g, keyboardColor.b, keyboardColor.a);
SDL_SetRenderDrawColor(renderer, config->keyboardBackground.r, config->keyboardBackground.g, config->keyboardBackground.b, config->keyboardBackground.a);
for (const auto &layer : keyboard) {
if (layer.layerNum == activeLayer) {
......@@ -150,10 +142,10 @@ bool Keyboard::isInSlideAnimation() const
void Keyboard::drawRow(SDL_Surface *surface, std::vector<touchArea> &keyVector, int x, int y, int width, int height,
const std::vector<std::string> &keys, int padding, TTF_Font *font) const
{
auto keyBackground = SDL_MapRGB(surface->format, 15, 15, 15);
SDL_Color textColor = { 255, 255, 255, 0 };
auto keyBackground = SDL_MapRGB(surface->format, config->keyBackgroundLetter.r, config->keyBackgroundLetter.g, config->keyBackgroundLetter.b);
SDL_Color textColor = { config->keyForeground.r, config->keyForeground.g, config->keyForeground.b, config->keyForeground.a };
auto background = SDL_MapRGB(surface->format, keyboardColor.r, keyboardColor.g, keyboardColor.b);
auto background = SDL_MapRGB(surface->format, config->keyboardBackground.r, config->keyboardBackground.g, config->keyboardBackground.b);
int i = 0;
for (const auto &keyCap : keys) {
SDL_Rect keyRect;
......@@ -182,10 +174,10 @@ void Keyboard::drawRow(SDL_Surface *surface, std::vector<touchArea> &keyVector,
}
void Keyboard::drawKey(SDL_Surface *surface, std::vector<touchArea> &keyVector, int x, int y, int width, int height,
char *cap, const char *key, int padding, TTF_Font *font) const
char *cap, const char *key, int padding, TTF_Font *font, argb background) const
{
auto keyBackground = SDL_MapRGB(surface->format, 15, 15, 15);
SDL_Color textColor = { 255, 255, 255, 0 };
auto keyBackground = SDL_MapRGB(surface->format, background.r, background.g, background.b);
SDL_Color textColor = { config->keyForeground.r, config->keyForeground.g, config->keyForeground.b, config->keyForeground.a };
SDL_Rect keyRect;
keyRect.x = x + padding;
......@@ -230,24 +222,24 @@ SDL_Surface *Keyboard::makeKeyboard(KeyboardLayer *layer) const
bmask, amask);
if (surface == nullptr) {
fprintf(stderr, "CreateRGBSurface failed: %s\n", SDL_GetError());
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "CreateRGBSurface failed: %s", SDL_GetError());
return nullptr;
}
SDL_FillRect(surface, nullptr,
SDL_MapRGB(surface->format, keyboardColor.r, keyboardColor.g, keyboardColor.b));
SDL_MapRGB(surface->format, config->keyboardBackground.r, config->keyboardBackground.g, config->keyboardBackground.b));
int rowCount = layer->rows.size();
int rowHeight = keyboardHeight / (rowCount + 1);
if (TTF_Init() == -1) {
printf("TTF_Init: %s\n", TTF_GetError());
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "TTF_Init: %s", TTF_GetError());
return nullptr;
}
TTF_Font *font = TTF_OpenFont(config->keyboardFont.c_str(), 24);
TTF_Font *font = TTF_OpenFont(config->keyboardFont.c_str(), config->keyboardFontSize);
if (!font) {
printf("TTF_OpenFont: %s\n", TTF_GetError());
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "TTF_OpenFont: %s", TTF_GetError());
return nullptr;
}
......@@ -274,29 +266,29 @@ SDL_Surface *Keyboard::makeKeyboard(KeyboardLayer *layer) const
if (layer->layerNum < 2) {
char nums[] = "123";
drawKey(surface, layer->keyVector, colw, y, colw * 3, rowHeight,
nums, KEYCAP_NUMBERS, keyboardWidth / 100, font);
nums, KEYCAP_NUMBERS, keyboardWidth / 100, font, config->keyBackgroundOther);
} else {
char abc[] = "abc";
drawKey(surface, layer->keyVector, colw, y, colw * 3, rowHeight,
abc, KEYCAP_ABC, keyboardWidth / 100, font);
abc, KEYCAP_ABC, keyboardWidth / 100, font, config->keyBackgroundOther);
}
/* Shift-key that transforms into "123" or "=\<" depending on layer: */
if (layer->layerNum == 2) {
char symb[] = "=\\<";
drawKey(surface, layer->keyVector, 0, y - rowHeight,
sidebuttonsWidth, rowHeight,
symb, KEYCAP_SYMBOLS, keyboardWidth / 100, font);
symb, KEYCAP_SYMBOLS, keyboardWidth / 100, font, config->keyBackgroundOther);
} else if (layer->layerNum == 3) {
char nums[] = "123";
drawKey(surface, layer->keyVector, 0, y - rowHeight,
sidebuttonsWidth, rowHeight,
nums, KEYCAP_NUMBERS, keyboardWidth / 100, font);
nums, KEYCAP_NUMBERS, keyboardWidth / 100, font, config->keyBackgroundOther);
} else {
char shift[64] = "";
memcpy(shift, KEYCAP_SHIFT, strlen(KEYCAP_SHIFT) + 1);
drawKey(surface, layer->keyVector, 0, y - rowHeight,
sidebuttonsWidth, rowHeight,
shift, KEYCAP_SHIFT, keyboardWidth / 100, font);
shift, KEYCAP_SHIFT, keyboardWidth / 100, font, config->keyBackgroundOther);
}
/* Backspace key that is larger-sized (hence also drawn separately) */
{
......@@ -305,20 +297,20 @@ SDL_Surface *Keyboard::makeKeyboard(KeyboardLayer *layer) const
strlen(KEYCAP_BACKSPACE) + 1);
drawKey(surface, layer->keyVector, keyboardWidth / 20 + colw * 16,
y - rowHeight, sidebuttonsWidth, rowHeight,
bcksp, KEYCAP_BACKSPACE, keyboardWidth / 100, font);
bcksp, KEYCAP_BACKSPACE, keyboardWidth / 100, font, config->keyBackgroundOther);
}
char space[] = " ";
drawKey(surface, layer->keyVector, colw * 5, y, colw * 8, rowHeight,
space, KEYCAP_SPACE, keyboardWidth / 100, font);
space, KEYCAP_SPACE, keyboardWidth / 100, font, config->keyBackgroundLetter);
char period[] = ".";
drawKey(surface, layer->keyVector, colw * 13, y, colw * 2, rowHeight,
period, KEYCAP_PERIOD, keyboardWidth / 100, font);
period, KEYCAP_PERIOD, keyboardWidth / 100, font, config->keyBackgroundOther);
char enter[] = "OK";
drawKey(surface, layer->keyVector, colw * 15, y, colw * 5, rowHeight,
enter, KEYCAP_RETURN, keyboardWidth / 100, font);
enter, KEYCAP_RETURN, keyboardWidth / 100, font, config->keyBackgroundReturn);
return surface;
}
......@@ -331,7 +323,7 @@ void Keyboard::setActiveLayer(int layerNum)
return;
}
}
fprintf(stderr, "Unknown layer number: %i\n", layerNum);
SDL_LogWarn(SDL_LOG_CATEGORY_ERROR, "Unknown layer number: %i", layerNum);
}
/*
......
src/keyboard.h
View file @ f595754f
......@@ -51,13 +51,6 @@ struct rgb {
unsigned char b;
};
struct argb {
unsigned char a;
unsigned char r;
unsigned char g;
unsigned char b;
};
struct KeyboardLayer {
SDL_Surface *surface = nullptr;
SDL_Texture *texture = nullptr;
......@@ -85,14 +78,6 @@ public:
@return String with value of key at the given coordinates
*/
std::string getCharForCoordinates(int x, int y);
/**
Set keyboard color
@param a Alpha value
@param r Red value
@param g Green value
@param b Blue value
*/
void setKeyboardColor(uint8_t a, uint8_t r, uint8_t g, uint8_t b);
/**
Get position of keyboard
@return Position as a value between 0 and 1 (0% and 100%)
......@@ -141,7 +126,6 @@ public:
bool isInSlideAnimation() const;
private:
argb keyboardColor = { 0, 0, 0, 0 };
int keyRadius = 0;
float position;
float targetPosition;
......@@ -187,9 +171,10 @@ private:
@param key Key text
@param padding Spacing to reserve around the key
@param font Font to use for key character
@param background Background color for the keycap
*/
void drawKey(SDL_Surface *surface, std::vector<touchArea> &keyVector, int x, int y,
int width, int height, char *cap, const char *key, int padding, TTF_Font *font) const;
int width, int height, char *cap, const char *key, int padding, TTF_Font *font, argb background) const;
/**
Prepare new keyboard
@param layer Keyboard layer to use
......
src/luksdevice.cpp
View file @ f595754f
......@@ -40,7 +40,7 @@ int LuksDevice::unlock(void *luksDev)
// Initialize crypt device
ret = crypt_init(&cd, lcd->devicePath.c_str());
if (ret < 0) {
printf("crypt_init() failed for %s.\n", lcd->devicePath.c_str());
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "crypt_init() failed for %s.", lcd->devicePath.c_str());
lcd->running = false;
return ret;
}
......@@ -48,7 +48,7 @@ int LuksDevice::unlock(void *luksDev)
// Load header
ret = crypt_load(cd, nullptr, nullptr);
if (ret < 0) {
printf("crypt_load() failed on device %s.\n", crypt_get_device_name(cd));
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "crypt_load() failed on device %s.", crypt_get_device_name(cd));
crypt_free(cd);
lcd->running = false;
return ret;
......@@ -62,12 +62,12 @@ int LuksDevice::unlock(void *luksDev)
// Enable TRIM support
CRYPT_ACTIVATE_ALLOW_DISCARDS);
if (ret < 0) {
printf("crypt_activate_by_passphrase failed on device. Errno %i\n", ret);
SDL_Log("crypt_activate_by_passphrase failed on device. Errno %i", ret);
crypt_free(cd);
lcd->running = false;
return ret;
}
printf("Successfully unlocked device %s\n", lcd->devicePath.c_str());
SDL_Log("Successfully unlocked device %s", lcd->devicePath.c_str());
crypt_free(cd);
lcd->locked = false;
lcd->running = false;
......
src/main.cpp
View file @ f595754f
......@@ -55,23 +55,24 @@ int main(int argc, char **args)
.type = EVENT_RENDER
};
SDL_LogSetAllPriority(SDL_LOG_PRIORITY_ERROR);
SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
if (fetchOpts(argc, args, &opts)) {
exit(EXIT_FAILURE);
}
if (opts.verbose) {
SDL_LogSetAllPriority(SDL_LOG_PRIORITY_INFO);
}
if (!config.Read(opts.confPath)) {
fprintf(stderr, "No valid config file specified, use -c [path]\n");
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "No valid config file specified, use -c [path]");
exit(EXIT_FAILURE);
}
LuksDevice luksDev(opts.luksDevName, opts.luksDevPath);
if (opts.verbose) {
SDL_LogSetAllPriority(SDL_LOG_PRIORITY_INFO);
} else {
SDL_LogSetAllPriority(SDL_LOG_PRIORITY_ERROR);
}
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS | SDL_INIT_TIMER) < 0) {
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "SDL_Init failed: %s", SDL_GetError());
atexit(SDL_Quit);
......@@ -105,7 +106,7 @@ int main(int argc, char **args)
display = SDL_CreateWindow("OSK SDL", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, WIDTH, HEIGHT,
windowFlags);
if (display == nullptr) {
fprintf(stderr, "ERROR: Could not create window/display: %s\n", SDL_GetError());
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Could not create window/display: %s", SDL_GetError());
atexit(SDL_Quit);
exit(EXIT_FAILURE);
}
......@@ -113,7 +114,7 @@ int main(int argc, char **args)
renderer = SDL_CreateRenderer(display, -1, 0);
if (renderer == nullptr) {
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "ERROR: Could not create renderer: %s\n", SDL_GetError());
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Could not create renderer: %s", SDL_GetError());
atexit(SDL_Quit);
exit(EXIT_FAILURE);
}
......@@ -127,33 +128,36 @@ int main(int argc, char **args)
int inputHeight = WIDTH / 10;
if (SDL_SetRenderDrawColor(renderer, 255, 128, 0, SDL_ALPHA_OPAQUE) != 0) {
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "ERROR: Could not set background color: %s\n", SDL_GetError());
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Could not set background color: %s", SDL_GetError());
atexit(SDL_Quit);
exit(EXIT_FAILURE);
}
if (SDL_RenderFillRect(renderer, nullptr) != 0) {
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "ERROR: Could not fill background color: %s\n", SDL_GetError());
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Could not fill background color: %s", SDL_GetError());
atexit(SDL_Quit);
exit(EXIT_FAILURE);
}
// Initialize virtual keyboard
Keyboard keyboard(0, 1, WIDTH, keyboardHeight, &config);
keyboard.setKeyboardColor(0, 30, 30, 30);
if (keyboard.init(renderer)) {
fprintf(stderr, "ERROR: Failed to initialize keyboard!\n");
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Failed to initialize keyboard!");
atexit(SDL_Quit);
exit(EXIT_FAILURE);
}
// Initialize tooltip for password error
Tooltip tooltip(static_cast<int>(WIDTH * 0.9), inputHeight, &config);
tooltip.init(renderer, ErrorText);
if (tooltip.init(renderer, ErrorText)) {
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Failed to initialize tooltip!");
atexit(SDL_Quit);
exit(EXIT_FAILURE);
}
// Disable mouse cursor if not in testmode
if (SDL_ShowCursor(opts.testMode) < 0) {
fprintf(stderr, "Setting cursor visibility failed: %s\n", SDL_GetError());
SDL_LogWarn(SDL_LOG_CATEGORY_VIDEO, "Setting cursor visibility failed: %s", SDL_GetError());
// Not stopping here, this is a pretty recoverable error.
}
......@@ -166,21 +170,12 @@ int main(int argc, char **args)
std::string tapped;
int inputBoxRadius = std::strtol(config.inputBoxRadius.c_str(), nullptr, 10);
if (inputBoxRadius >= BEZIER_RESOLUTION || inputBoxRadius > inputHeight / 1.5) {
fprintf(stderr, "inputbox-radius must be below %d and %f, it is %d\n", BEZIER_RESOLUTION,
SDL_LogWarn(SDL_LOG_CATEGORY_VIDEO, "inputbox-radius must be below %d and %f, it is %d", BEZIER_RESOLUTION,
inputHeight / 1.5, inputBoxRadius);
inputBoxRadius = 0;
}
argb wallpaperColor {};
wallpaperColor.a = 255;
if (sscanf(config.wallpaper.c_str(), "#%02hhx%02hhx%02hhx", &wallpaperColor.r, &wallpaperColor.g,
&wallpaperColor.b)
!= 3) {
fprintf(stderr, "Could not parse color code %s\n", config.wallpaper.c_str());
//to avoid akward colors just remove the radius
inputBoxRadius = 0;
}
argb inputBoxColor = argb { 255, 30, 30, 30 };
argb inputBoxColor = config.inputBoxBackground;
SDL_Surface *inputBox = make_input_box(static_cast<int>(WIDTH * 0.9), inputHeight, &inputBoxColor, inputBoxRadius);
SDL_Texture *inputBoxTexture = SDL_CreateTextureFromSurface(renderer, inputBox);
......@@ -194,7 +189,7 @@ int main(int argc, char **args)
};
if (inputBoxTexture == nullptr) {
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "ERROR: Could not create input box texture: %s\n",
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Could not create input box texture: %s",
SDL_GetError());
atexit(SDL_Quit);
exit(EXIT_FAILURE);
......@@ -252,9 +247,7 @@ int main(int argc, char **args)
// x and y values are normalized!
auto xTouch = static_cast<unsigned>(event.tfinger.x * WIDTH);
auto yTouch = static_cast<unsigned>(event.tfinger.y * HEIGHT);
if (opts.verbose) {
printf("xTouch: %u\tyTouch: %u\n", xTouch, yTouch);
}
SDL_LogInfo(SDL_LOG_CATEGORY_VIDEO, "xTouch: %u\tyTouch: %u", xTouch, yTouch);
auto offsetYTouch = yTouch - static_cast<int>(HEIGHT - (keyboard.getHeight() * keyboard.getPosition()));
tapped = keyboard.getCharForCoordinates(xTouch, offsetYTouch);
if (!luksDev.unlockRunning()) {
......@@ -268,9 +261,7 @@ int main(int argc, char **args)
showPasswordError = false;
auto xMouse = event.button.x;
auto yMouse = event.button.y;
if (opts.verbose) {
printf("xMouse: %u\tyMouse: %u\n", xMouse, yMouse);
}
SDL_LogInfo(SDL_LOG_CATEGORY_VIDEO, "xMouse: %u\tyMouse: %u", xMouse, yMouse);
auto offsetYMouse = yMouse - static_cast<int>(HEIGHT - (keyboard.getHeight() * keyboard.getPosition()));
tapped = keyboard.getCharForCoordinates(xMouse, offsetYMouse);
if (!luksDev.unlockRunning()) {
......@@ -291,16 +282,14 @@ int main(int argc, char **args)
prev_text_ticks = cur_ticks;
if (!luksDev.unlockRunning()) {
passphrase.emplace_back(event.text.text);
if (opts.verbose) {
printf("Phys Keyboard Key Entered %s\n", event.text.text);
}
SDL_LogInfo(SDL_LOG_CATEGORY_INPUT, "Phys Keyboard Key Entered %s", event.text.text);
}
}
SDL_PushEvent(&renderEvent);
break; // SDL_TEXTINPUT
}
case SDL_QUIT:
printf("Quit requested, quitting.\n");
SDL_Log("Quit requested, quitting.");
exit(0);
break; // SDL_QUIT
} // switch event.type
......@@ -377,8 +366,7 @@ QUIT:
if (opts.keyscript) {
std::string pass = strVector2str(passphrase);
printf("%s", pass.c_str());
fflush(stdout);
SDL_LogInfo(SDL_LOG_CATEGORY_INPUT, "%s", pass.c_str());
}
return 0;
}
src/tooltip.cpp
View file @ f595754f
......@@ -46,12 +46,12 @@ int Tooltip::init(SDL_Renderer *renderer, const std::string &text)
surface = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 32, rmask, gmask,
bmask, amask);
if (surface == nullptr) {
fprintf(stderr, "CreateRGBSurface failed: %s\n", SDL_GetError());
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "CreateRGBSurface failed: %s", SDL_GetError());
return -1;
}
SDL_FillRect(surface, nullptr, SDL_MapRGB(surface->format, 30, 30, 30));
TTF_Font *font = TTF_OpenFont(config->keyboardFont.c_str(), 24);
TTF_Font *font = TTF_OpenFont(config->keyboardFont.c_str(), config->keyboardFontSize);
SDL_Surface *textSurface;
SDL_Color textColor = { 255, 255, 255, 0 };
textSurface = TTF_RenderText_Blended(font, text.c_str(), textColor);
......
src/util.cpp
View file @ f595754f
......@@ -48,16 +48,16 @@ int fetchOpts(int argc, char **args, Opts *opts)
opts->verbose = true;
break;
default:
fprintf(stdout, "Usage: osk-sdl [-t] [-k] [-d /dev/sda] [-n device_name] "
"[-c /etc/osk.conf] -v\n");
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Usage: osk-sdl [-t] [-k] [-d /dev/sda] [-n device_name] "
"[-c /etc/osk.conf] -v");
return 1;
}
if (opts->luksDevPath.empty()) {
fprintf(stderr, "No device path specified, use -d [path] or -t\n");
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "No device path specified, use -d [path] or -t");
return 1;
}
if (opts->luksDevName.empty()) {
fprintf(stderr, "No device name specified, use -n [name] or -t\n");
SDL_LogError(SDL_LOG_CATEGORY_ERROR, "No device name specified, use -n [name] or -t");
return 1;
}
if (opts->confPath.empty()) {
......@@ -98,19 +98,7 @@ SDL_Surface *make_wallpaper(Config *config, int width, int height)
#endif
surface = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 32, rmask, gmask, bmask, amask);
if (config->wallpaper[0] == '#') {
unsigned char r, g, b;
if (sscanf(config->wallpaper.c_str(), "#%02hhx%02hhx%02hhx", &r, &g, &b) != 3) {
fprintf(stderr, "Could not parse color code %s\n", config->wallpaper.c_str());
exit(EXIT_FAILURE);
}
SDL_FillRect(surface, nullptr, SDL_MapRGB(surface->format, r, g, b));
} else {
// Implement image loading
fprintf(stderr, "Image loading not supported yet\n");
exit(EXIT_FAILURE);
}
SDL_FillRect(surface, nullptr, SDL_MapRGB(surface->format, config->wallpaper.r, config->wallpaper.g, config->wallpaper.b));
return surface;
}
......