mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-09-20 05:12:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

mobile/ebitenmobileview: Implement InputChars on Android / ebitenmobile

Browse Source 
Updates #237
This commit is contained in:
Hajime Hoshi 2020-02-23 00:42:52 +09:00
parent 0ea5e65c92
commit de52eb75e4
6 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ebitenmobile/gobind.go
View File

@ -383,7 +383,7 @@ public class EbitenView extends ViewGroup {
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
Ebitenmobileview.onKeyDownOnAndroid(keyCode); Ebitenmobileview.onKeyDownOnAndroid(keyCode, event.getUnicodeChar());
return true; return true;
} }

2
cmd/ebitenmobile/gobind.src.go
View File

File diff suppressed because one or more lines are too long

10
internal/uidriver/mobile/input.go
View File

@ -29,6 +29,7 @@ type Input struct {
cursorX int cursorX int
cursorY int cursorY int
keys map[driver.Key]struct{} keys map[driver.Key]struct{}
runes []rune
touches map[int]pos touches map[int]pos
ui *UserInterface ui *UserInterface
} }
@ -95,7 +96,7 @@ func (i *Input) TouchPosition(id int) (x, y int) {
} }
func (i *Input) RuneBuffer() []rune { func (i *Input) RuneBuffer() []rune {
return nil return i.runes
} }
func (i *Input) IsKeyPressed(key driver.Key) bool { func (i *Input) IsKeyPressed(key driver.Key) bool {
@ -117,7 +118,7 @@ func (i *Input) IsMouseButtonPressed(key driver.MouseButton) bool {
return false return false
} }
func (i *Input) update(keys map[driver.Key]struct{}, touches []*Touch) { func (i *Input) update(keys map[driver.Key]struct{}, runes []rune, touches []*Touch) {
i.ui.m.Lock() i.ui.m.Lock()
defer i.ui.m.Unlock() defer i.ui.m.Unlock()
@ -126,6 +127,9 @@ func (i *Input) update(keys map[driver.Key]struct{}, touches []*Touch) {
i.keys[k] = struct{}{} i.keys[k] = struct{}{}
} }
i.runes = make([]rune, len(runes))
copy(i.runes, runes)
i.touches = map[int]pos{} i.touches = map[int]pos{}
for _, t := range touches { for _, t := range touches {
i.touches[t.ID] = pos{ i.touches[t.ID] = pos{
@ -136,5 +140,5 @@ func (i *Input) update(keys map[driver.Key]struct{}, touches []*Touch) {
} }
func (i *Input) ResetForFrame() { func (i *Input) ResetForFrame() {
// Do nothing i.runes = nil
} }

6
internal/uidriver/mobile/ui.go
View File

@ -221,7 +221,7 @@ func (u *UserInterface) appMain(a app.App) {
for _, t := range touches { for _, t := range touches {
ts = append(ts, t) ts = append(ts, t)
} }
u.input.update(keys, ts) u.input.update(keys, nil, ts)
} }
} }
} }
@ -443,6 +443,6 @@ type Touch struct {
Y int Y int
} }
func (u *UserInterface) UpdateInput(keys map[driver.Key]struct{}, touches []*Touch) { func (u *UserInterface) UpdateInput(keys map[driver.Key]struct{}, runes []rune, touches []*Touch) {
u.input.update(keys, touches) u.input.update(keys, runes, touches)
} }

3
mobile/ebitenmobileview/input.go
View File

@ -28,6 +28,7 @@ type position struct {
var ( var (
keys = map[driver.Key]struct{}{} keys = map[driver.Key]struct{}{}
runes []rune
touches = map[int]position{} touches = map[int]position{}
) )
@ -40,5 +41,5 @@ func updateInput() {
Y: position.y, Y: position.y,
}) })
} }
mobile.Get().UpdateInput(keys, ts) mobile.Get().UpdateInput(keys, runes, ts)
} }

5
mobile/ebitenmobileview/input_android.go
View File

@ -31,12 +31,15 @@ func UpdateTouchesOnIOS(phase int, ptr int64, x, y int) {
panic("ebitenmobileview: updateTouchesOnIOSImpl must not be called on Android") panic("ebitenmobileview: updateTouchesOnIOSImpl must not be called on Android")
} }
func OnKeyDownOnAndroid(keyCode int) { func OnKeyDownOnAndroid(keyCode int, unicodeChar int) {
key, ok := androidKeyToDriverKey[keyCode] key, ok := androidKeyToDriverKey[keyCode]
if !ok { if !ok {
return return
} }
keys[key] = struct{}{} keys[key] = struct{}{}
if unicodeChar != 0 {
runes = []rune{rune(unicodeChar)}
}
updateInput() updateInput()
} }