Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix KeyboardEvent.Repeat never set. #605

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Fix KeyboardEvent.Repeat never set. #605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions sdl/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,10 @@ const (
CONTROLLERDEVICEADDED EventType = C.SDL_CONTROLLERDEVICEADDED // controller connected
CONTROLLERDEVICEREMOVED EventType = C.SDL_CONTROLLERDEVICEREMOVED // controller disconnected
CONTROLLERDEVICEREMAPPED EventType = C.SDL_CONTROLLERDEVICEREMAPPED // controller mapping updated
CONTROLLERTOUCHPADDOWN EventType = C.SDL_CONTROLLERTOUCHPADDOWN // Game controller touchpad was touched
CONTROLLERTOUCHPADMOTION EventType = C.SDL_CONTROLLERTOUCHPADMOTION // Game controller touchpad finger was moved
CONTROLLERTOUCHPADUP EventType = C.SDL_CONTROLLERTOUCHPADUP // Game controller touchpad finger was lifted
CONTROLLERSENSORUPDATE EventType = C.SDL_CONTROLLERSENSORUPDATE // Game controller sensor was updated
CONTROLLERTOUCHPADDOWN EventType = C.SDL_CONTROLLERTOUCHPADDOWN // Game controller touchpad was touched
CONTROLLERTOUCHPADMOTION EventType = C.SDL_CONTROLLERTOUCHPADMOTION // Game controller touchpad finger was moved
CONTROLLERTOUCHPADUP EventType = C.SDL_CONTROLLERTOUCHPADUP // Game controller touchpad finger was lifted
CONTROLLERSENSORUPDATE EventType = C.SDL_CONTROLLERSENSORUPDATE // Game controller sensor was updated

// Touch events
FINGERDOWN EventType = C.SDL_FINGERDOWN // user has touched input device
Expand Down Expand Up @@ -780,9 +780,9 @@ type ControllerSensorEvent struct {
Type EventType // SDL_CONTROLLERSENSORUPDATE
Timestamp uint32 // In milliseconds, populated using SDL_GetTicks()
Which JoystickID // The joystick instance id
Sensor int32 // The type of the sensor, one of the values of SensorType
Sensor int32 // The type of the sensor, one of the values of SensorType
Data [3]float32 // Up to 3 values from the sensor - additional values can be queried using SDL_SensorGetData()
TimestampUs uint64 // The timestamp of the sensor reading in microseconds, if the hardware provides this information.
TimestampUs uint64 // The timestamp of the sensor reading in microseconds, if the hardware provides this information.
}
type cControllerSensorEvent C.ControllerSensorEvent

Expand Down Expand Up @@ -917,7 +917,7 @@ type SensorEvent struct {
Timestamp uint32 // In milliseconds, populated using SDL_GetTicks()
Which int32 // The instance ID of the sensor
Data [6]float32 // Up to 6 values from the sensor - additional values can be queried using SDL_SensorGetData()
TimestampUs uint64 // The timestamp of the sensor reading in microseconds, if the hardware provides this information.
TimestampUs uint64 // The timestamp of the sensor reading in microseconds, if the hardware provides this information.
}
type cSensorEvent C.SensorEvent

Expand Down Expand Up @@ -1166,6 +1166,7 @@ func goEvent(cevent *CEvent) Event {
Timestamp: uint32(e.timestamp),
WindowID: uint32(e.windowID),
State: ButtonState(e.state),
Repeat: uint8(e.repeat),
Keysym: Keysym{
Mod: Keymod(e.keysym.mod),
Sym: Keycode(e.keysym.sym),
Expand Down Expand Up @@ -1321,13 +1322,13 @@ func goEvent(cevent *CEvent) Event {
Type: EventType(e._type),
Timestamp: uint32(e.timestamp),
Which: JoystickID(e.which),
Sensor: int32(e.sensor),
Sensor: int32(e.sensor),
Data: [3]float32{
float32(e.data[0]),
float32(e.data[1]),
float32(e.data[2]),
},
TimestampUs: uint64(e.timestamp_us),
TimestampUs: uint64(e.timestamp_us),
}
case AUDIODEVICEADDED, AUDIODEVICEREMOVED:
e := (*cAudioDeviceEvent)(unsafe.Pointer(cevent))
Expand Down Expand Up @@ -1403,7 +1404,7 @@ func goEvent(cevent *CEvent) Event {
float32(e.data[4]),
float32(e.data[5]),
},
TimestampUs: uint64(e.timestamp_us),
TimestampUs: uint64(e.timestamp_us),
}
case RENDER_TARGETS_RESET, RENDER_DEVICE_RESET:
// This is a CommonEvent as it doesn't currently (sdl-v2.0.22) have any additional fields
Expand Down
Loading