Map ('5') and allow mod5mask (altgr) as a modifier.

From Artturi Alm (though changed from 'm' to '5')
This commit is contained in:
okan 2020-02-03 16:38:02 +00:00
parent 5c4fe3d884
commit 363365145d
3 changed files with 13 additions and 18 deletions

View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: conf.c,v 1.249 2019/03/07 12:54:21 okan Exp $
* $OpenBSD: conf.c,v 1.250 2020/02/03 16:38:02 okan Exp $
*/
#include <sys/types.h>
@ -197,10 +197,11 @@ static const struct {
const char ch;
int mask;
} bind_mods[] = {
{ 'S', ShiftMask },
{ 'C', ControlMask },
{ 'M', Mod1Mask },
{ '4', Mod4Mask },
{ 'S', ShiftMask },
{ '5', Mod5Mask },
};
static const struct {
const char *key;

View File

@ -1,4 +1,4 @@
.\" $OpenBSD: cwmrc.5,v 1.73 2019/07/02 23:37:47 kn Exp $
.\" $OpenBSD: cwmrc.5,v 1.74 2020/02/03 16:38:02 okan Exp $
.\"
.\" Copyright (c) 2004,2005 Marius Aamodt Eriksen <marius@monkey.org>
.\"
@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd $Mdocdate: July 2 2019 $
.Dd $Mdocdate: February 3 2020 $
.Dt CWMRC 5
.Os
.Sh NAME
@ -84,6 +84,8 @@ Meta key.
Shift key.
.It Ic 4
Mod4 (windows) key.
.It Ic 5
Mod5 (AltGr) key.
.El
.Pp
The
@ -101,18 +103,10 @@ The modifier keys come first, followed by a
.Sq - ,
then the button number.
.Pp
The following modifiers are recognised:
.Pp
.Bl -tag -width Ds -offset indent -compact
.It Ic C
Control key.
.It Ic M
Meta key.
.It Ic S
Shift key.
.It Ic 4
Mod4 (windows) key.
.El
The same modifiers are recognised as for
.Ar key
in
.Nm bind-key .
.Pp
The following buttons are recognised:
.Pp

View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $OpenBSD: xevents.c,v 1.147 2019/04/29 19:02:21 tim Exp $
* $OpenBSD: xevents.c,v 1.148 2020/02/03 16:38:02 okan Exp $
*/
/*
@ -69,7 +69,7 @@ void (*xev_handlers[LASTEvent])(XEvent *) = {
};
static KeySym modkeys[] = { XK_Alt_L, XK_Alt_R, XK_Super_L, XK_Super_R,
XK_Control_L, XK_Control_R };
XK_Control_L, XK_Control_R, XK_ISO_Level3_Shift };
static void
xev_handle_maprequest(XEvent *ee)