JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19613 from RamKromberg/fix/mlterm

Browse Source 
mlterm: fix mouse keybinding with numlock
This commit is contained in:
Graham Christensen 2016-10-22 07:20:14 -04:00 committed by GitHub
commit ef12f4eab1
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/mlterm/default.nix
View File

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
harfbuzz fribidi m17n_lib openssl libssh2
];
patches = [ ./x_shortcut.c.patch ]; #fixes numlock in 3.7.2. should be safe to remove by 3.7.3 since it's already in the trunk: https://bitbucket.org/arakiken/mlterm/commits/4820d42c7abfe1760a5ea35492c83be469c642b3
#bad configure.ac and Makefile.in everywhere
preConfigure = ''
sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \
@ -91,7 +93,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
homepage = https://sourceforge.net/projects/mlterm/;
homepage = http://mlterm.sourceforge.net/;
license = licenses.bsd2;
maintainers = with maintainers; [ vrthra ramkromberg ];
platforms = with platforms; linux;

26
pkgs/applications/misc/mlterm/x_shortcut.c.patch Normal file
View File

@ -0,0 +1,26 @@
--- mlterm-3.7.2/xwindow/x_shortcut.c
+++ mlterm-3.7.2/xwindow/x_shortcut.c
@@ -292,6 +292,11 @@
/* ingoring except these masks */
state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
+ if( state & button_mask)
+ {
+ state &= ~Mod2Mask ; /* XXX NumLock */
+ }
+
if( shortcut->map[func].ksym == ksym &&
shortcut->map[func].state ==
( state |
@@ -318,6 +323,11 @@
/* ingoring except these masks */
state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ;
+ if( state & button_mask)
+ {
+ state &= ~Mod2Mask ; /* XXX NumLock */
+ }
+
for( count = 0 ; count < shortcut->str_map_size ; count ++)
{
if( shortcut->str_map[count].ksym == ksym &&