anna/joyful
1
0
Fork 0
Code Pull requests Releases Activity Actions

Debugging rule processing.

Browse source
This commit is contained in:
Anna Rose Wiggins 2025-07-03 13:47:54 -04:00
parent cc37904fad
commit 8fafe3d27c
3 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmd/joyful/main.go
View file

@ -63,6 +63,7 @@ func main() {
// Initialize rules
rules := config.BuildRules(pDevices, getVirtualDevices(vBuffers))
logger.Logf("Created %d mapping rules.", len(rules))
// Listen for events and map them forever
mapEvents(vBuffers, pDevices, rules)
@ -75,7 +76,7 @@ type ChannelEvent struct {
func mapEvents(vBuffers map[string]*virtualdevice.EventBuffer, pDevices map[string]*evdev.InputDevice, rules []mappingrules.MappingRule) {
// start listening for events on all devices
eventChannel := make(chan *ChannelEvent, 1000)
eventChannel := make(chan ChannelEvent, 1000)
for _, device := range pDevices {
go eventWatcher(device, eventChannel)
}
@ -95,8 +96,13 @@ func mapEvents(vBuffers map[string]*virtualdevice.EventBuffer, pDevices map[stri
buffer.SendEvents()
}
// TODO: event types are a little weird, because EvCode constants are reused across
// types, but button presses can apparently come across as multiple types.
// This isn't a big problem right now, but when we want to support relative axes
// and/or keyboards, this could get hairy.
case evdev.EV_KEY:
case evdev.EV_ABS:
case evdev.EV_MSC:
// We have a matchable event type. Check all the events
for _, rule := range rules {
outputEvent := rule.MatchEvent(wrapper.Device, wrapper.Event, &mode)
@ -106,17 +112,19 @@ func mapEvents(vBuffers map[string]*virtualdevice.EventBuffer, pDevices map[stri
vBuffers[rule.OutputName()].AddEvent(outputEvent)
}
default:
logger.Logf("DEBUG: Unprocessed event: %d %d %d", wrapper.Event.Type, wrapper.Event.Code, wrapper.Event.Value)
}
}
}
func eventWatcher(device *evdev.InputDevice, channel chan *ChannelEvent) {
func eventWatcher(device *evdev.InputDevice, channel chan<- ChannelEvent) {
for {
event, err := device.ReadOne()
if err != nil {
logger.LogError(err, "Error while reading event")
continue
}
channel <- &ChannelEvent{Device: device, Event: event}
channel <- ChannelEvent{Device: device, Event: event}
}
}

6
internal/config/rules.go
View file

@ -29,8 +29,6 @@ func (parser *ConfigParser) BuildRules(pDevs map[string]*evdev.InputDevice, vDev
continue
}
logger.Logf("DEBUG: Modes for rule '%s': %v", baseParams.Name, baseParams.Modes)
switch strings.ToLower(ruleConfig.Type) {
case RuleTypeSimple:
newRule, err = makeSimpleRule(ruleConfig, pDevs, baseParams)
@ -41,7 +39,7 @@ func (parser *ConfigParser) BuildRules(pDevs map[string]*evdev.InputDevice, vDev
}
if err != nil {
logger.LogError(err, "")
logger.LogError(err, "failed to build rule")
continue
}
@ -167,7 +165,7 @@ func verifyModes(ruleConfig RuleConfig, modes []string) []string {
verifiedModes = append(verifiedModes, configMode)
}
if len(verifiedModes) == 0 {
verifiedModes = []string{"main"}
verifiedModes = []string{"*"}
}
return verifiedModes

7
internal/mappingrules/matching.go
View file

@ -12,6 +12,9 @@ func (rule *MappingRuleBase) OutputName() string {
}
func (rule *MappingRuleBase) modeCheck(mode *string) bool {
if len(rule.Modes) == 1 && rule.Modes[0] == "*" {
return true
}
return slices.Contains(rule.Modes, *mode)
}
@ -51,6 +54,10 @@ func (rule *SimpleMappingRule) MatchEvent(device *evdev.InputDevice, event *evde
return nil
}
if event.Type == evdev.EV_KEY {
logger.Logf("DEBUG: mode check passed for rule '%s'. Mode '%s' modes '%v'", rule.Name, *mode, rule.Modes)
}
if device != rule.Input.Device ||
event.Code != rule.Input.Code {
return nil