From 0a3400298877830ee09f9c38b53fbf51965811e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Tue, 21 Jun 2016 23:37:20 +0200 Subject: [PATCH] ui.gestures: fix the cocoa ui backend which i broke by moving the modifier word --- basis/ui/backend/x11/keys/keys.factor | 7 +------ basis/ui/gestures/gestures.factor | 10 +++++++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/basis/ui/backend/x11/keys/keys.factor b/basis/ui/backend/x11/keys/keys.factor index 183b410460..5184a32384 100644 --- a/basis/ui/backend/x11/keys/keys.factor +++ b/basis/ui/backend/x11/keys/keys.factor @@ -1,7 +1,6 @@ ! Copyright (C) 2016 Björn Lindqvist ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays assocs columns kernel literals math sequences -sets ui.gestures x11.keysymdef ; +USING: accessors assocs kernel literals ui.gestures x11.keysymdef ; IN: ui.backend.x11.keys CONSTANT: modifiers @@ -63,9 +62,5 @@ CONSTANT: codes : code>sym ( code -- name/code/f action? ) dup codes at* [ nip dup t and ] when ; -: modifier ( mod modifiers -- seq ) - [ second swap bitand 0 > ] with filter - 0 members [ f ] [ >array ] if-empty ; - : event-modifiers ( event -- seq ) state>> modifiers modifier ; diff --git a/basis/ui/gestures/gestures.factor b/basis/ui/gestures/gestures.factor index 6c8b3049c5..833f642236 100644 --- a/basis/ui/gestures/gestures.factor +++ b/basis/ui/gestures/gestures.factor @@ -1,9 +1,9 @@ ! Copyright (C) 2005, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays ascii assocs boxes calendar classes +USING: accessors arrays ascii assocs boxes calendar classes columns combinators combinators.short-circuit deques fry kernel make math -math.order math.parser math.vectors namespaces sequences system timers -ui.gadgets ui.gadgets.private words ; +math.order math.parser math.vectors namespaces sequences sets system +timers ui.gadgets ui.gadgets.private words ; IN: ui.gestures : get-gesture-handler ( gesture gadget -- quot ) @@ -233,6 +233,10 @@ SYMBOL: drag-timer focus<< ] if ; +: modifier ( mod modifiers -- seq ) + [ second swap bitand 0 > ] with filter + 0 members [ f ] [ >array ] if-empty ; + : drag-loc ( -- loc ) hand-loc get-global hand-click-loc get-global v- ;