aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2015-09-10 14:18:56 -0400
committerDrew DeVault <sir@cmpwn.com>2015-09-10 14:18:56 -0400
commitf5343adae4d631e4cdade7869b4d73fc97b4ac5f (patch)
tree7c12a435bf56e4ebfcae689ce46280eeeb330346 /include
parent6388241abb7e2e66e716fc128e658d3d3419442a (diff)
parentaaa0923bc4fe4ffda114482a9b8023c90c26c8dc (diff)
Merge pull request #177 from taiyu-len/master
cmd status + workspace ws output op
Diffstat (limited to 'include')
-rw-r--r--include/commands.h15
-rw-r--r--include/config.h1
2 files changed, 8 insertions, 8 deletions
diff --git a/include/commands.h b/include/commands.h
index 0a38ce43..5c87be51 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -5,17 +5,16 @@
struct cmd_handler {
char *command;
- bool (*handle)(int argc, char **argv);
- enum {
- CMD_COMPOSITOR_READY,
- CMD_KEYBIND,
- CMD_ANYTIME
- } config_type;
+ enum cmd_status {
+ CMD_SUCCESS,
+ CMD_FAILURE,
+ CMD_DEFER,
+ } (*handle)(int argc, char **argv);
};
-bool handle_command(char *command);
+enum cmd_status handle_command(char *command);
// Handles commands during config
-bool config_command(char *command);
+enum cmd_status config_command(char *command);
void remove_view_from_scratchpad();
diff --git a/include/config.h b/include/config.h
index 4070c9ef..676218c8 100644
--- a/include/config.h
+++ b/include/config.h
@@ -52,6 +52,7 @@ struct sway_config {
bool active;
bool failed;
bool reloading;
+ bool reading;
bool auto_back_and_forth;
int gaps_inner;