From 0be7a74e6400a31514b4204334faf5a367eff913 Mon Sep 17 00:00:00 2001
From: "Niklas.Waern" <ceninan@gmail.com>
Date: Sat, 22 May 2010 01:36:04 +0200
Subject: [PATCH] x11.xinput2.ffi: make XI*Mask less ugly

---
 basis/x11/xinput2/ffi/ffi.factor | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/basis/x11/xinput2/ffi/ffi.factor b/basis/x11/xinput2/ffi/ffi.factor
index 65ed73106a..c2a03b6201 100644
--- a/basis/x11/xinput2/ffi/ffi.factor
+++ b/basis/x11/xinput2/ffi/ffi.factor
@@ -13,22 +13,24 @@ LIBRARY: xinput2
 ! *********
 ! * XI2.h *
 ! *********
+<PRIVATE
+: mask-index   ( event -- n ) -3 shift ;
+: bitmask ( event -- n ) 7 bitand 2^ ;
+PRIVATE>
+
 :: XISetMask ( mask event -- )
-    event -3 shift    :> index
-    event 7 bitand 2^ :> bit-mask
-    bit-mask index mask nth bitor
+    event mask-index :> index
+    event bitmask index mask nth bitor
     index mask set-nth ; inline
 
 :: XIClearMask ( mask event -- )
-    event -3 shift           :> index
-    event 7 bitand 2^ bitnot :> bit-mask
-    bit-mask index mask nth bitand
+    event mask-index :> index
+    event bitmask bitnot index mask nth bitand
     index mask set-nth ; inline
 
 :: XIMaskIsSet ( mask event -- n )
-    event -3 shift    :> index
-    event 7 bitand 2^ :> bit-mask
-    bit-mask index mask nth bitand ;
+    event mask-index :> index
+    event bitmask index mask nth bitand ;
 
 : XIMaskLen ( event -- n ) 7 + -3 shift ;