@@ -645,23 +645,23 @@ namespace cage
645
645
{
646
646
using T = std::decay_t <decltype (a)>;
647
647
if constexpr (std::is_same_v<T, KeyboardMatcher>)
648
- return Stringizer () + " key " + a.key + " " + (uint32 )a.requiredFlags + " " + (uint32)~ a.forbiddenFlags ;
648
+ return Stringizer () + " key " + a.key + " " + (sint32 )a.requiredFlags + " " + (sint32) a.forbiddenFlags ;
649
649
if constexpr (std::is_same_v<T, ModifiersMatcher>)
650
- return Stringizer () + " mods " + (uint32 )a.requiredFlags + " " + (uint32)~ a.forbiddenFlags ;
650
+ return Stringizer () + " mods " + (sint32 )a.requiredFlags + " " + (sint32) a.forbiddenFlags ;
651
651
if constexpr (std::is_same_v<T, MouseMatcher>)
652
- return Stringizer () + " mouse " + (uint32 )a.button + " " + (uint32 )a.requiredFlags + " " + (uint32)~ a.forbiddenFlags ;
652
+ return Stringizer () + " mouse " + (sint32 )a.button + " " + (sint32 )a.requiredFlags + " " + (sint32) a.forbiddenFlags ;
653
653
if constexpr (std::is_same_v<T, WheelMatcher>)
654
- return Stringizer () + " wheel " + a.direction + " " + (uint32 )a.requiredFlags + " " + (uint32)~ a.forbiddenFlags ;
654
+ return Stringizer () + " wheel " + a.direction + " " + (sint32 )a.requiredFlags + " " + (sint32) a.forbiddenFlags ;
655
655
return " " ;
656
656
},
657
657
mt);
658
658
}
659
659
660
660
MatcherBase baseFromString (String &s)
661
661
{
662
- const uint32 r = toUint32 (split (s));
663
- const uint32 f = toUint32 (split (s));
664
- return MatcherBase{ (ModifiersFlags)r, ~ (ModifiersFlags)f };
662
+ const sint32 r = toSint32 (split (s));
663
+ const sint32 f = toSint32 (split (s));
664
+ return MatcherBase{ (ModifiersFlags)r, (ModifiersFlags)f };
665
665
}
666
666
667
667
Matcher fromString (const String &str)
@@ -681,12 +681,12 @@ namespace cage
681
681
}
682
682
else if (type == " mouse" )
683
683
{
684
- const uint32 b = toUint32 (split (s));
684
+ const sint32 b = toSint32 (split (s));
685
685
return MouseMatcher{ baseFromString (s), (MouseButtonsFlags)b };
686
686
}
687
687
else if (type == " wheel" )
688
688
{
689
- const sint32 d = toUint32 (split (s));
689
+ const sint32 d = toSint32 (split (s));
690
690
return WheelMatcher{ baseFromString (s), d };
691
691
}
692
692
else
0 commit comments