qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/cwm/conf.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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> #include <sys/types.h>
@ -197,10 +197,11 @@ static const struct {
const char ch; const char ch;
int mask; int mask;
} bind_mods[] = { } bind_mods[] = {
{ 'S', ShiftMask },
{ 'C', ControlMask }, { 'C', ControlMask },
{ 'M', Mod1Mask }, { 'M', Mod1Mask },
{ '4', Mod4Mask }, { '4', Mod4Mask },
{ 'S', ShiftMask }, { '5', Mod5Mask },
}; };
static const struct { static const struct {
const char *key; const char *key;

22
app/cwm/cwmrc.5
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> .\" 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 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" .\"
.Dd $Mdocdate: July 2 2019 $ .Dd $Mdocdate: February 3 2020 $
.Dt CWMRC 5 .Dt CWMRC 5
.Os .Os
.Sh NAME .Sh NAME
@ -84,6 +84,8 @@ Meta key.
Shift key. Shift key.
.It Ic 4 .It Ic 4
Mod4 (windows) key. Mod4 (windows) key.
.It Ic 5
Mod5 (AltGr) key.
.El .El
.Pp .Pp
The The
@ -101,18 +103,10 @@ The modifier keys come first, followed by a
.Sq - , .Sq - ,
then the button number. then the button number.
.Pp .Pp
The following modifiers are recognised: The same modifiers are recognised as for
.Pp .Ar key
.Bl -tag -width Ds -offset indent -compact in
.It Ic C .Nm bind-key .
Control key.
.It Ic M
Meta key.
.It Ic S
Shift key.
.It Ic 4
Mod4 (windows) key.
.El
.Pp .Pp
The following buttons are recognised: The following buttons are recognised:
.Pp .Pp

4
app/cwm/xevents.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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, 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 static void
xev_handle_maprequest(XEvent *ee) xev_handle_maprequest(XEvent *ee)