uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Fix function SendKeyboardEvent name conflict in single file build

Browse source
This commit is contained in:
Oleg Gerasimov 2016-08-13 21:40:51 +03:00
parent 09c5c31303
commit 026379bafd
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gwin/gwin_keyboard.c
View file

@ -114,7 +114,7 @@ static int NumKeyRows(const char **keyset) {
return len; return len;
} }
static void SendKeyboardEventToListener(GSourceListener *psl, GKeyboardObject *gk) { static void _SendKeyboardEventToListener(GSourceListener *psl, GKeyboardObject *gk) {
GEventKeyboard *pe; GEventKeyboard *pe;
const GVSpecialKey *skey; const GVSpecialKey *skey;
unsigned i; unsigned i;
@ -157,18 +157,18 @@ static void SendKeyboardEventToListener(GSourceListener *psl, GKeyboardObject *g
geventSendEvent(psl); geventSendEvent(psl);
} }
static void SendKeyboardEvent(GKeyboardObject *gk) { static void _SendKeyboardEvent(GKeyboardObject *gk) {
GSourceListener *psl; GSourceListener *psl;
// Send to the "All Keyboards" source listeners // Send to the "All Keyboards" source listeners
psl = 0; psl = 0;
while ((psl = geventGetSourceListener(AllKeyboards, psl))) while ((psl = geventGetSourceListener(AllKeyboards, psl)))
SendKeyboardEventToListener(psl, gk); _SendKeyboardEventToListener(psl, gk);
// Send to the keyboard specific source listeners // Send to the keyboard specific source listeners
psl = 0; psl = 0;
while ((psl = geventGetSourceListener((GSourceHandle)gk, psl))) while ((psl = geventGetSourceListener((GSourceHandle)gk, psl)))
SendKeyboardEventToListener(psl, gk); _SendKeyboardEventToListener(psl, gk);
} }
@ -257,7 +257,7 @@ static void SendKeyboardEvent(GKeyboardObject *gk) {
// Send the key if required // Send the key if required
if (skey->sendkey && skey->sendkey[0]) if (skey->sendkey && skey->sendkey[0])
SendKeyboardEvent(gk); _SendKeyboardEvent(gk);
// Update the display // Update the display
_gwinUpdate((GHandle)gw); _gwinUpdate((GHandle)gw);
@ -274,7 +274,7 @@ static void SendKeyboardEvent(GKeyboardObject *gk) {
} }
// Send the key // Send the key
SendKeyboardEvent(gk); _SendKeyboardEvent(gk);
// Update the display // Update the display
_gwinUpdate((GHandle)gw); _gwinUpdate((GHandle)gw);