support more complex monitor layouts with move/focus actions using left|right|up|down

Conflicts:
	config.h
This commit is contained in:
Sean Pringle
2016-06-30 09:45:21 +10:00
parent 0e0fa13f32
commit d7de4ff112
6 changed files with 86 additions and 13 deletions

View File

@@ -411,7 +411,7 @@ configure()
if (strcmp(regex_matches[3], "spot3") == 0) num = SPOT3;
}
else
if (0 == strcmp(regex_matches[2], "action_move_direction") || 0 == strcmp(regex_matches[2], "action_focus_direction"))
if (0 == strcmp(regex_matches[2], "action_move_direction") || 0 == strcmp(regex_matches[2], "action_focus_direction") || 0 == strcmp(regex_matches[2], "action_move_monitor") || 0 == strcmp(regex_matches[2], "action_focus_monitor"))
{
if (strcmp(regex_matches[3], "left" ) == 0) num = LEFT;
if (strcmp(regex_matches[3], "right") == 0) num = RIGHT;
@@ -424,7 +424,7 @@ configure()
data = regex_matches[3];
}
else
if (0 == strcmp(regex_matches[2], "action_raise_nth") || 0 == strcmp(regex_matches[2], "action_move_monitor") || 0 == strcmp(regex_matches[2], "action_focus_monitor"))
if (0 == strcmp(regex_matches[2], "action_raise_nth"))
{
num = strtol(regex_matches[3], NULL, 10);
}