Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -ur synergy-1.6.3-final/src/gui/src/CommandProcess.h synergy-1.6.3-final_/src/gui/src/CommandProcess.h
- --- synergy-1.6.3-final/src/gui/src/CommandProcess.h 2015-01-05 16:32:58.000000000 +0300
- +++ synergy-1.6.3-final_/src/gui/src/CommandProcess.h 2015-10-24 19:26:32.528391860 +0300
- @@ -109,23 +109,25 @@
- // check for hotkey events
- Event::Type type = event.getType();
- - if (type == m_events->forIPrimaryScreen().hotKeyDown()) {
- + if (type == 9 || type == m_events->forIPrimaryScreen().hotKeyDown()) {
- status = kActivate;
- }
- - else if (type == m_events->forIPrimaryScreen().hotKeyUp()) {
- + else if (type == 10 || type == m_events->forIPrimaryScreen().hotKeyUp()) {
- status = kDeactivate;
- }
- else {
- - return kNoMatch;
- + status = kNoMatch;
- }
- // check if it's our hotkey
- IPrimaryScreen::HotKeyInfo* kinfo =
- reinterpret_cast<IPlatformScreen::HotKeyInfo*>(event.getData());
- - if (kinfo->m_id != m_id) {
- + if (kinfo->m_id != m_id && !(m_id == 1 && kinfo->m_id == 61204)) {
- + LOG((CLOG_DEBUG1 "kinfo->m_id != m_id (%d != %d)", kinfo->m_id, m_id));
- return kNoMatch;
- }
- + LOG((CLOG_DEBUG1 "event_type %d matches %d", type, status));
- return status;
- }
- @@ -797,6 +801,7 @@
- switch (m_condition->match(event)) {
- default:
- // not handled
- + LOG((CLOG_DEBUG2 "not handled"));
- return false;
- case kActivate:
- @@ -1079,12 +1084,16 @@
- // let each rule try to match the event until one does
- for (RuleList::iterator rule = m_ruleList.begin();
- rule != m_ruleList.end(); ++rule) {
- + LOG((CLOG_DEBUG2 "rule %s enabled = %d", rule->format().c_str(), rule->enabled));
- if (rule->handleEvent(myEvent)) {
- // handled
- + LOG((CLOG_DEBUG2 "rule %s maches", rule->format().c_str()));
- return;
- }
- }
- + LOG((CLOG_DEBUG2 "no rule maches"));
- +
- // not handled so pass through
- m_events->addEvent(myEvent);
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement