From b9e18184c687c48f82aa91a50f8da3a9eb6a4ff9 Mon Sep 17 00:00:00 2001 From: Erik Charlebois Date: Mon, 23 May 2011 15:29:14 -0400 Subject: [PATCH] Convert side mouse buttons to backward/forward --- basis/ui/backend/gtk/gtk.factor | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/basis/ui/backend/gtk/gtk.factor b/basis/ui/backend/gtk/gtk.factor index 5169d880cd..fba30fc15a 100644 --- a/basis/ui/backend/gtk/gtk.factor +++ b/basis/ui/backend/gtk/gtk.factor @@ -10,7 +10,7 @@ strings system threads ui ui.backend ui.backend.gtk.input-methods ui.backend.gtk.io ui.clipboards ui.event-loop ui.gadgets ui.gadgets.private ui.gadgets.worlds ui.gestures ui.pixel-formats ui.pixel-formats.private ui.private -vocabs.loader ; +vocabs.loader combinators prettyprint io ; IN: ui.backend.gtk SINGLETON: gtk-ui-backend @@ -167,15 +167,25 @@ CONSTANT: action-key-codes : on-leave ( win event user-data -- ? ) 3drop forget-rollover t ; -: on-button-press ( win event user-data -- ? ) - drop swap [ - mouse-event>gesture [ ] dip - ] dip window send-button-down t ; - -: on-button-release ( win event user-data -- ? ) - drop swap [ - mouse-event>gesture [ ] dip - ] dip window send-button-up t ; +:: on-button-press ( win event user-data -- ? ) + win window :> world + event mouse-event>gesture :> ( modifiers button loc ) + button { + { 8 [ ] } + { 9 [ ] } + [ modifiers swap loc world + send-button-down ] + } case t ; + +:: on-button-release ( win event user-data -- ? ) + win window :> world + event mouse-event>gesture :> ( modifiers button loc ) + button { + { 8 [ world left-action send-action ] } + { 9 [ world right-action send-action ] } + [ modifiers swap loc world + send-button-up ] + } case t ; : on-scroll ( win event user-data -- ? ) drop swap [ -- 2.34.1