On Wed, Jul 21, 2010 at 10:43 PM, Peter Hutterer <[email protected]> wrote: > The number of apps supporting scroll wheel zoom events is higher than the > ones supporting ctrl +/-. And the ctrl key can be assumed on the same key > for most keyboards, leaving us with a more stable zoom gesture than the > previous approach of hardcoding the position of +/-. > > Suggested-by: Ping Cheng <[email protected]> > Signed-off-by: Peter Hutterer <[email protected]>
Acked-by: Ping Cheng <[email protected]> Thank you Peter for working on the patch. Ping > --- > src/wcmTouchFilter.c | 18 +++++++++--------- > 1 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/src/wcmTouchFilter.c b/src/wcmTouchFilter.c > index 7d3f860..0c066cb 100644 > --- a/src/wcmTouchFilter.c > +++ b/src/wcmTouchFilter.c > @@ -428,7 +428,7 @@ static void wcmFingerZoom(WacomDevicePtr priv) > WacomChannelPtr secondChannel = common->wcmChannel + 1; > WacomDeviceState ds[2] = { firstChannel->valid.states[0], > secondChannel->valid.states[0] }; > - int count, key; > + int count, button; > int dist = touchDistance(common->wcmGestureState[0], > common->wcmGestureState[1]); > > @@ -467,22 +467,22 @@ static void wcmFingerZoom(WacomDevicePtr priv) > return; > } > > - /* zooming? > - FIXME: this hardcodes the positions of ctrl, + and - to the ones on > - the us keyboard layout. Tough luck. The alternative is to run > - through the XKB table and figure out where +/- are hiding. Good > - luck. > + /* zooming? Send ctrl + scroll up/down event. > + FIXME: this hardcodes the positions of ctrl and assumes that ctrl is > + actually a modifier. Tough luck. The alternative is to run through > + the XKB table and figure out where the key for the ctrl modifier is > + hiding. Good luck. > Gesture support is not supposed to be in the driver... > */ > - key = (dist > 0) ? 21 /*XK_plus*/ : 20 /*XK_minus*/; > + button = (dist > 0) ? 4 : 5; > > count -= common->wcmGestureParameters.wcmGestureUsed; > common->wcmGestureParameters.wcmGestureUsed += count; > while (count--) > { > wcmEmitKeycode (priv->local->dev, 37 /*XK_Control_L*/, 1); > - wcmEmitKeycode (priv->local->dev, key, 1); > - wcmEmitKeycode (priv->local->dev, key, 0); > + wcmSendButtonClick (priv, button, 1); > + wcmSendButtonClick (priv, button, 0); > wcmEmitKeycode (priv->local->dev, 37 /*XK_Control_L*/, 0); > } > } > -- > 1.7.1 > ------------------------------------------------------------------------------ This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
