summaryrefslogtreecommitdiffstats
path: root/gui/objects.hpp
diff options
context:
space:
mode:
authorthat <github@that.at>2015-02-01 19:48:19 +0100
committerthat <github@that.at>2015-02-01 19:48:19 +0100
commit1a7ba9751f90c653da1b37d96134e584b6779046 (patch)
tree92ba42da37d13ee69b66419a56ff2d91e8b16a02 /gui/objects.hpp
parentgui: fix potential invalid memory access (diff)
downloadandroid_bootable_recovery-1a7ba9751f90c653da1b37d96134e584b6779046.tar
android_bootable_recovery-1a7ba9751f90c653da1b37d96134e584b6779046.tar.gz
android_bootable_recovery-1a7ba9751f90c653da1b37d96134e584b6779046.tar.bz2
android_bootable_recovery-1a7ba9751f90c653da1b37d96134e584b6779046.tar.lz
android_bootable_recovery-1a7ba9751f90c653da1b37d96134e584b6779046.tar.xz
android_bootable_recovery-1a7ba9751f90c653da1b37d96134e584b6779046.tar.zst
android_bootable_recovery-1a7ba9751f90c653da1b37d96134e584b6779046.zip
Diffstat (limited to '')
-rw-r--r--gui/objects.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/gui/objects.hpp b/gui/objects.hpp
index 1d20c2abe..3e335615e 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -899,9 +899,10 @@ protected:
{
unsigned char key;
unsigned char longpresskey;
- unsigned int end_x;
- unsigned int layout;
+ int end_x;
+ int layout;
};
+ int ParseKey(const char* keyinfo, keyboard_key_class& key, int& Xindex, int keyWidth, bool longpress);
struct capslock_tracking_struct
{
int capslock;
@@ -914,9 +915,8 @@ protected:
struct capslock_tracking_struct caps_tracking[MAX_KEYBOARD_LAYOUTS];
bool mRendered;
std::string mVariable;
- unsigned int cursorLocation;
- unsigned int currentLayout;
- unsigned int row_heights[MAX_KEYBOARD_LAYOUTS][MAX_KEYBOARD_ROWS];
+ int currentLayout;
+ int row_heights[MAX_KEYBOARD_LAYOUTS][MAX_KEYBOARD_ROWS];
unsigned int KeyboardWidth, KeyboardHeight;
int rowY, colX, highlightRenderCount, hasHighlight, hasCapsHighlight;
GUIAction* mAction;