summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsabetts <sabetts>2005-01-30 17:12:55 +0000
committersabetts <sabetts>2005-01-30 17:12:55 +0000
commit756a2c5e7ece7a8deb19fd680172f6a842e1f165 (patch)
tree35c33af078adce659092d6f11ef34bccb5edbcb7
parentfee7a3ae27a66f2cbaca17944978bbff30e60089 (diff)
downloadratpoison-756a2c5e7ece7a8deb19fd680172f6a842e1f165.zip
(cmd_escape): when the escape key doesn't have a
modifier give the meta key a modifier.
-rw-r--r--ChangeLog5
-rw-r--r--src/actions.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a1728d..97a0f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-30 Shawn Betts <katia_dilkina@verizon.net>
+
+ * src/actions.c (cmd_escape): when the escape key doesn't have a
+ modifier give the meta key a modifier.
+
2005-01-22 Shawn Betts <katia_dilkina@verizon.net>
* src/actions.h (argtype): add arg_RAW
diff --git a/src/actions.c b/src/actions.c
index 387865e..df8a4b5 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -2578,7 +2578,10 @@ cmd_escape (int interactive, struct cmdarg **args)
if (action != NULL && !strcmp (action->data, "meta"))
{
action->key = key->sym;
- action->state = 0;
+ if (key->state != 0)
+ action->state = 0;
+ else
+ action-state = RP_CONTROL_MASK;
}
/* Remove the grab on the current prefix key */