summary refs log tree commit diff
path: root/pkgs/applications/misc/mlterm
diff options
context:
space:
mode:
authorRam Kromberg <ramkromberg@mail.com>2016-10-05 09:54:40 +0300
committerRam Kromberg <ramkromberg@mail.com>2016-10-17 20:15:41 +0300
commit9c7309272f7b8f97c2077c5a5cb3c8f69ab0f614 (patch)
treea3e71e6bfc1603011d66fb6259d388c9d2590d3a /pkgs/applications/misc/mlterm
parent42cc06c2dfc7aa30d3d7fbda5ce8bb5e818224c0 (diff)
downloadnixlib-9c7309272f7b8f97c2077c5a5cb3c8f69ab0f614.tar
nixlib-9c7309272f7b8f97c2077c5a5cb3c8f69ab0f614.tar.gz
nixlib-9c7309272f7b8f97c2077c5a5cb3c8f69ab0f614.tar.bz2
nixlib-9c7309272f7b8f97c2077c5a5cb3c8f69ab0f614.tar.lz
nixlib-9c7309272f7b8f97c2077c5a5cb3c8f69ab0f614.tar.xz
nixlib-9c7309272f7b8f97c2077c5a5cb3c8f69ab0f614.tar.zst
nixlib-9c7309272f7b8f97c2077c5a5cb3c8f69ab0f614.zip
mlterm: fix mouse keybinding with numlock
Diffstat (limited to 'pkgs/applications/misc/mlterm')
-rw-r--r--pkgs/applications/misc/mlterm/default.nix4
-rw-r--r--pkgs/applications/misc/mlterm/x_shortcut.c.patch26
2 files changed, 29 insertions, 1 deletions
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 9fa112375c52..9da087d49692 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -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;
diff --git a/pkgs/applications/misc/mlterm/x_shortcut.c.patch b/pkgs/applications/misc/mlterm/x_shortcut.c.patch
new file mode 100644
index 000000000000..f0f929b79650
--- /dev/null
+++ b/pkgs/applications/misc/mlterm/x_shortcut.c.patch
@@ -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 &&