Public_Skunkworks/kpmpgsmkii
Public_Skunkworks/kpmpgsmkii
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Keyboard event added.

Browse source
This commit is contained in:
Scott Duensing 2021-10-20 21:18:26 -05:00
parent 148a6b4f9f
commit 70f944d416
6 changed files with 93 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
client/src/gui/gui.c
View file

@ -42,6 +42,7 @@ static uint8_t _guiLastWidgetLeftEvent = MOUSE_EVENT_NONE;
static WidgetT *_guiFocused = NULL; static WidgetT *_guiFocused = NULL;
static void guiProcessKeyboardChildren(WidgetT *widget, uint8_t ascii, uint8_t scancode, uint8_t shift, uint8_t control, uint8_t alt);
static uint8_t guiProcessMouseChildren(WidgetT *widget, MouseT *mouse); static uint8_t guiProcessMouseChildren(WidgetT *widget, MouseT *mouse);
@ -358,6 +359,38 @@ static uint8_t guiProcessMouseChildren(WidgetT *widget, MouseT *mouse) {
} }
void guiProcessKeyboard(uint8_t ascii, uint8_t scancode, uint8_t shift, uint8_t control, uint8_t alt) {
// Does the focused widget want events? Check for global keyboard so it doesn't get double events.
if (_guiFocused) {
if (_guiFocused->keyboardEventMethod && !GUI_GET_FLAG(_guiFocused, WIDGET_FLAG_ALWAYS_RECEIVE_KEYBOARD_EVENTS)) {
_guiFocused->keyboardEventMethod(_guiFocused, ascii, scancode, shift, control, alt);
}
}
// Check everyone for global keyboard handling.
guiProcessKeyboardChildren((WidgetT *)_guiDesktop, ascii, scancode, shift, control, alt);
}
static void guiProcessKeyboardChildren(WidgetT *widget, uint8_t ascii, uint8_t scancode, uint8_t shift, uint8_t control, uint8_t alt) {
size_t len;
size_t x;
// Process children of this widget.
len = arrlenu(widget->children);
for (x=0; x<len; x++) {
guiProcessKeyboardChildren(widget->children[x], ascii, scancode, shift, control, alt);
}
// Does this widget want events? Check for global keyboard so it doesn't get double events.
if (widget) {
if (widget->keyboardEventMethod && GUI_GET_FLAG(widget, WIDGET_FLAG_ALWAYS_RECEIVE_KEYBOARD_EVENTS)) {
widget->keyboardEventMethod(widget, ascii, scancode, shift, control, alt);
}
}
}
WidgetT *guiRootGet(void) { WidgetT *guiRootGet(void) {
return (WidgetT *)_guiDesktop; return (WidgetT *)_guiDesktop;
} }

1
client/src/gui/gui.h
View file

@ -142,6 +142,7 @@ void guiFocusSet(WidgetT *widget);
void guiMousePositionOnWidgetGet(WidgetT *widget, MouseT *mouse, uint16_t *x, uint16_t *y); void guiMousePositionOnWidgetGet(WidgetT *widget, MouseT *mouse, uint16_t *x, uint16_t *y);
void guiPaint(WidgetT *widget); void guiPaint(WidgetT *widget);
void guiProcessMouse(MouseT *mouse); void guiProcessMouse(MouseT *mouse);
void guiProcessKeyboard(uint8_t ascii, uint8_t scancode, uint8_t shift, uint8_t control, uint8_t alt);
WidgetT *guiRootGet(void); WidgetT *guiRootGet(void);
void guiSetWidgetAndChildrenDirty(WidgetT *widget); void guiSetWidgetAndChildrenDirty(WidgetT *widget);
DesktopT *guiStartup(void); DesktopT *guiStartup(void);

33
client/src/gui/textbox.c
View file

@ -23,6 +23,7 @@
static void textboxFocusEvent(WidgetT *widget, uint8_t focused); static void textboxFocusEvent(WidgetT *widget, uint8_t focused);
static void textboxMouseEvent(WidgetT *widget, MouseT *mouse, uint16_t x, uint16_t y, uint8_t event); static void textboxMouseEvent(WidgetT *widget, MouseT *mouse, uint16_t x, uint16_t y, uint8_t event);
static void textboxKeyboardEvent(WidgetT *widget, uint8_t ascii, uint8_t scancode, uint8_t shift, uint8_t control, uint8_t alt);
static void textboxPaint(WidgetT *widget); static void textboxPaint(WidgetT *widget);
@ -49,19 +50,20 @@ char *textboxGetValue(TextboxT *textbox) {
WidgetT *textboxInit(WidgetT *widget, uint16_t x, uint16_t y, uint16_t w, char *title) { WidgetT *textboxInit(WidgetT *widget, uint16_t x, uint16_t y, uint16_t w, char *title) {
TextboxT *t = (TextboxT *)widget; TextboxT *t = (TextboxT *)widget;
t->base.magic = MAGIC_TEXTBOX; t->base.magic = MAGIC_TEXTBOX;
t->base.x = x; t->base.x = x;
t->base.y = y; t->base.y = y;
t->base.w = w; t->base.w = w;
t->base.h = fontHeightGet(_guiFont) + 4 + (_guiMetric[METRIC_TEXTBOX_VERTICAL_PADDING] * 2); t->base.h = fontHeightGet(_guiFont) + 4 + (_guiMetric[METRIC_TEXTBOX_VERTICAL_PADDING] * 2);
t->base.delMethod = textboxDel; t->base.delMethod = textboxDel;
t->base.focusMethod = textboxFocusEvent; t->base.focusMethod = textboxFocusEvent;
t->base.paintMethod = textboxPaint; t->base.keyboardEventMethod = textboxKeyboardEvent;
t->base.mouseEventMethod = textboxMouseEvent; t->base.paintMethod = textboxPaint;
t->title = NULL; t->base.mouseEventMethod = textboxMouseEvent;
t->maxLength = 256; t->title = NULL;
t->value = (char *)malloc(t->maxLength); t->maxLength = 256;
t->caret = 0; t->value = (char *)malloc(t->maxLength);
t->caret = 0;
if (!t->value) return NULL; if (!t->value) return NULL;
t->value[0] = 0; t->value[0] = 0;
@ -73,6 +75,11 @@ WidgetT *textboxInit(WidgetT *widget, uint16_t x, uint16_t y, uint16_t w, char *
} }
static void textboxKeyboardEvent(WidgetT *widget, uint8_t ascii, uint8_t scancode, uint8_t shift, uint8_t control, uint8_t alt) {
}
static void textboxMouseEvent(WidgetT *widget, MouseT *mouse, uint16_t x, uint16_t y, uint8_t event) { static void textboxMouseEvent(WidgetT *widget, MouseT *mouse, uint16_t x, uint16_t y, uint8_t event) {
TextboxT *t = (TextboxT *)widget; TextboxT *t = (TextboxT *)widget;

33
client/src/gui/widget.c
View file

@ -32,22 +32,23 @@ uint16_t widgetGetWidth(WidgetT *widget) {
WidgetT *widgetInit(WidgetT *widget) { WidgetT *widgetInit(WidgetT *widget) {
widget->magic = MAGIC_UNKNOWN; widget->magic = MAGIC_UNKNOWN;
widget->flags = 0; widget->flags = 0;
widget->x = 0; widget->x = 0;
widget->y = 0; widget->y = 0;
widget->w = 0; widget->w = 0;
widget->h = 0; widget->h = 0;
widget->marginX = 0; widget->marginX = 0;
widget->marginY = 0; widget->marginY = 0;
widget->surface = NULL; widget->surface = NULL;
widget->children = NULL; widget->children = NULL;
widget->parent = NULL; widget->parent = NULL;
widget->delMethod = NULL; widget->delMethod = NULL;
widget->focusMethod = NULL; widget->focusMethod = NULL;
widget->paintMethod = NULL; widget->keyboardEventMethod = NULL;
widget->mouseEventMethod = NULL; widget->paintMethod = NULL;
widget->userData = NULL; widget->mouseEventMethod = NULL;
widget->userData = NULL;
GUI_SET_FLAG(widget, WIDGET_FLAG_DIRTY); GUI_SET_FLAG(widget, WIDGET_FLAG_DIRTY);

39
client/src/gui/widget.h
View file

@ -28,7 +28,8 @@
enum WidgetE { enum WidgetE {
WIDGET_FLAG_DIRTY = 0, WIDGET_FLAG_DIRTY = 0,
WIDGET_FLAG_ACTIVE, WIDGET_FLAG_ACTIVE,
WIDGET_FLAG_OWNS_SURFACE WIDGET_FLAG_OWNS_SURFACE,
WIDGET_FLAG_ALWAYS_RECEIVE_KEYBOARD_EVENTS
}; };
@ -39,28 +40,30 @@ typedef struct WindowS WindowT;
typedef void (*widgetCallback)(struct WidgetS *widget); typedef void (*widgetCallback)(struct WidgetS *widget);
typedef void (*widgetDelMethod)(struct WidgetS **widget); typedef void (*widgetDelMethod)(struct WidgetS **widget);
typedef void (*widgetFocusMethod)(struct WidgetS *widget, uint8_t focused); typedef void (*widgetFocusMethod)(struct WidgetS *widget, uint8_t focused);
typedef void (*widgetKeyboardEventMethod)(struct WidgetS *widget, uint8_t ascii, uint8_t scancode, uint8_t shift, uint8_t control, uint8_t alt);
typedef void (*widgetPaintMethod)(struct WidgetS *widget); typedef void (*widgetPaintMethod)(struct WidgetS *widget);
typedef void (*widgetMouseEventMethod)(struct WidgetS *widget, MouseT *mouse, uint16_t x, uint16_t y, uint8_t event); typedef void (*widgetMouseEventMethod)(struct WidgetS *widget, MouseT *mouse, uint16_t x, uint16_t y, uint8_t event);
typedef struct WidgetS { typedef struct WidgetS {
uint8_t magic; // Widget identifier constant uint8_t magic; // Widget identifier constant
uint8_t flags; // See above enum uint8_t flags; // See above enum
SurfaceT *surface; // Pointer to compositable surface or NULL SurfaceT *surface; // Pointer to compositable surface or NULL
WindowT *window; // The window holding this widget or NULL WindowT *window; // The window holding this widget or NULL
int16_t x; // Position of widget on parent int16_t x; // Position of widget on parent
int16_t y; // Position of widget on parent int16_t y; // Position of widget on parent
uint16_t w; // Width of widget uint16_t w; // Width of widget
uint16_t h; // Height of widget uint16_t h; // Height of widget
uint16_t marginX; // Pixels to skip when placing child widgets uint16_t marginX; // Pixels to skip when placing child widgets
uint16_t marginY; // Pixels to skip when placing child widgets uint16_t marginY; // Pixels to skip when placing child widgets
WidgetT **children; // List of children WidgetT **children; // List of children
WidgetT *parent; // Parent of this widget WidgetT *parent; // Parent of this widget
widgetDelMethod delMethod; // Delete method widgetDelMethod delMethod; // Delete method
widgetFocusMethod focusMethod; // Focus changed method widgetFocusMethod focusMethod; // Focus changed method
widgetPaintMethod paintMethod; // Paint method widgetKeyboardEventMethod keyboardEventMethod; // Keyboard event handler
widgetMouseEventMethod mouseEventMethod; // Mouse event handler widgetPaintMethod paintMethod; // Paint method
void *userData; // Anything the user wants to store widgetMouseEventMethod mouseEventMethod; // Mouse event handler
void *userData; // Anything the user wants to store
} WidgetT; } WidgetT;

1
client/src/main.c
View file

@ -128,6 +128,7 @@ void test(void *data) {
mouse = mouseRead(); mouse = mouseRead();
if (keyHit()) { if (keyHit()) {
key = keyASCII(); key = keyASCII();
guiProcessKeyboard(keyASCII(), keyScanCode(), keyShift(), keyControl(), keyAlt());
} else { } else {
key = 0; key = 0;
} }