Techwizz/xboxdrv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed keys not getting pressed in --ui-axismap

Browse source
This commit is contained in:
Ingo Ruhnke 2011-06-03 04:09:58 +02:00
parent 39a6025efd
commit b55bf37bf5
3 changed files with 64 additions and 24 deletions

8
NEWS
View file

@ -1,3 +1,11 @@
xboxdrv 0.8.1 - (??/Jun/2011)
=============================
* fixed rumble messages getting delayed
* added support for an unlimited number shift keys
* fixed keys not getting pressed in --ui-axismap
xboxdrv 0.8.0 - (26/May/2011)
=============================

75
src/axisevent/key_axis_event_handler.cpp
View file

@ -116,37 +116,64 @@ KeyAxisEventHandler::init(UInput& uinput, int slot, bool extra_devices)
}
}
void
KeyAxisEventHandler::send_up(UInput& uinput, int value)
{
for(int i = 0; m_up_codes[i].is_valid(); ++i)
uinput.send_key(m_up_codes[i].get_device_id(), m_up_codes[i].code, value);
}
void
KeyAxisEventHandler::send_down(UInput& uinput, int value)
{
for(int i = 0; m_down_codes[i].is_valid(); ++i)
uinput.send_key(m_down_codes[i].get_device_id(), m_down_codes[i].code, value);
}
int
KeyAxisEventHandler::get_zone(int value) const
{
if (value >= m_threshold)
{
return +1;
}
else if (value <= -m_threshold)
{
return -1;
}
else
{
return 0;
}
}
void
KeyAxisEventHandler::send(UInput& uinput, int value)
{
if (::abs(m_old_value) < m_threshold &&
::abs(value) >= m_threshold)
{ // entering bigger then threshold zone
if (value < 0)
int old_zone = get_zone(m_old_value);
int zone = get_zone(value);
if (old_zone != zone)
{
// release the keys of the zone we leave
if (old_zone == -1)
{
for(int i = 0; m_down_codes[i].is_valid(); ++i)
uinput.send_key(m_down_codes[i].get_device_id(), m_down_codes[i].code, false);
for(int i = 0; m_up_codes[i].is_valid(); ++i)
uinput.send_key(m_up_codes[i].get_device_id(), m_up_codes[i].code, true);
send_down(uinput, false);
}
else // (value > 0)
{
for(int i = 0; m_down_codes[i].is_valid(); ++i)
uinput.send_key(m_down_codes[i].get_device_id(), m_down_codes[i].code, true);
for(int i = 0; m_up_codes[i].is_valid(); ++i)
uinput.send_key(m_up_codes[i].get_device_id(), m_up_codes[i].code, false);
else if (old_zone == +1)
{
send_up(uinput, false);
}
}
else if (::abs(m_old_value) >= m_threshold &&
::abs(value) < m_threshold)
{ // entering zero zone
for(int i = 0; m_down_codes[i].is_valid(); ++i)
uinput.send_key(m_down_codes[i].get_device_id(), m_down_codes[i].code, false);
for(int i = 0; m_up_codes[i].is_valid(); ++i)
uinput.send_key(m_up_codes[i].get_device_id(), m_up_codes[i].code, false);
// press the keys of the zone we enter
if (zone == +1)
{
send_up(uinput, true);
}
else if (zone == -1)
{
send_down(uinput, true);
}
}
m_old_value = value;

5
src/axisevent/key_axis_event_handler.hpp
View file

@ -35,6 +35,11 @@ public:
std::string str() const;
private:
void send_up(UInput& uinput, int value);
void send_down(UInput& uinput, int value);
int get_zone(int value) const;
private:
static const int MAX_MODIFIER = 4;