pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(parser): Support default button index for actions

Browse Source 
Defining an action without a button index caused a segfault since
the parser was treating it as the close of a previously opened action
block. This makes the parser use button LEFT as a fallback.

Also ensure that an action block has been opened before
attempting to close the block.

Fixes jaagr/lemonbuddy#104
This commit is contained in:
Michael Carlberg 2016-10-17 05:55:03 +02:00
parent 3d30aba0e9
commit de0c3eb46a
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/components/parser.hpp
View File

@ -3,7 +3,6 @@
#include <fastdelegate/fastdelegate.hpp> #include <fastdelegate/fastdelegate.hpp>
#include "common.hpp" #include "common.hpp"
#include "components/logger.hpp"
#include "components/types.hpp" #include "components/types.hpp"
#include "components/signals.hpp" #include "components/signals.hpp"
#include "utils/math.hpp" #include "utils/math.hpp"
@ -130,13 +129,19 @@ class parser {
break; break;
case 'A': case 'A':
if (isdigit(data[0])) { if (isdigit(data[0]) || data[0] == ':') {
value = parse_action_cmd(data); value = parse_action_cmd(data);
mousebtn btn = parse_action_btn(data);
m_actions.push_back(static_cast<int>(btn));
if (!g_signals::parser::action_block_open.empty()) if (!g_signals::parser::action_block_open.empty())
g_signals::parser::action_block_open.emit(parse_action_btn(data), value); g_signals::parser::action_block_open.emit(btn, value);
m_actions.push_back(data[0] - '0');
value += "0::"; // make sure we strip the correct length (btn+wrapping colons) // make sure we strip the correct length (btn+wrapping colons)
} else { if (data[0] != ':')
value += "0";
value += "::";
} else if (!m_actions.empty()) {
if (!g_signals::parser::action_block_close.empty()) if (!g_signals::parser::action_block_close.empty())
g_signals::parser::action_block_close.emit(parse_action_btn(data)); g_signals::parser::action_block_close.emit(parse_action_btn(data));
m_actions.pop_back(); m_actions.pop_back();
@ -221,7 +226,9 @@ class parser {
} // }}} } // }}}
mousebtn parse_action_btn(string data) { // {{{ mousebtn parse_action_btn(string data) { // {{{
if (isdigit(data[0])) if (data[0] == ':')
return mousebtn::LEFT;
else if (isdigit(data[0]))
return static_cast<mousebtn>(data[0] - '0'); return static_cast<mousebtn>(data[0] - '0');
else if (!m_actions.empty()) else if (!m_actions.empty())
return static_cast<mousebtn>(m_actions.back()); return static_cast<mousebtn>(m_actions.back());