1.1 --- a/epoc32/include/mw/touchlogicalfeedback.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/touchlogicalfeedback.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,10 +1,10 @@
     1.4  /*
     1.5 -* Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiary(-ies).
     1.6 +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
     1.7  * All rights reserved.
     1.8  * This component and the accompanying materials are made available
     1.9 -* under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
    1.10 +* under the terms of "Eclipse Public License v1.0"
    1.11  * which accompanies this distribution, and is available
    1.12 -* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.13 +* at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.14  *
    1.15  * Initial Contributors:
    1.16  * Nokia Corporation - initial contribution.
    1.17 @@ -12,30 +12,27 @@
    1.18  * Contributors:
    1.19  *
    1.20  * Description:  Logical feedback type enumeration. 
    1.21 +* Part of:      Tactile Feedback.
    1.22  *
    1.23  */
    1.24  
    1.25  
    1.26 -#ifndef T_TOUCHLOGICALFEEDBACK_H
    1.27 -#define T_TOUCHLOGICALFEEDBACK_H
    1.28 -
    1.29 -
    1.30 +#ifndef TOUCHLOGICALFEEDBACK_H
    1.31 +#define TOUCHLOGICALFEEDBACK_H
    1.32  
    1.33  #include <e32std.h>
    1.34  
    1.35 -
    1.36  /**  
    1.37   *  Pointer event types, that can be used when registering
    1.38 - *  areas to registry. Currently only stylus down event 
    1.39 - *  is supported (this means that there will be feedback 
    1.40 - *  whenever stylus down event is received on registered
    1.41 - *  area, no matter what happens _after_ stylus down event).
    1.42 + *  areas to registry. 
    1.43   */
    1.44  enum TTouchEventType
    1.45      {
    1.46 -    ETouchEventStylusDown
    1.47 +    ETouchEventStylusDown,
    1.48 +    ETouchEventStylusUp,
    1.49 +    ETouchEventStylusPressDown,
    1.50 +    ETouchEventStylusPressUp
    1.51      };
    1.52 -
    1.53      
    1.54  /**  
    1.55   *  Logical feedback types, that can be used when producing direct
    1.56 @@ -62,13 +59,58 @@
    1.57   *                            feedback on every new selected character).
    1.58   *                            Also used for scrolling and dragging.
    1.59   *
    1.60 + *  Different UI components have specific feedback types, which should be 
    1.61 + *  used to maintain similar feedback behaviour in components of same type.
    1.62 + *
    1.63   */
    1.64  enum TTouchLogicalFeedback
    1.65      {
    1.66 -    ETouchFeedbackNone,
    1.67 -    ETouchFeedbackBasic,   
    1.68 -    ETouchFeedbackSensitive
    1.69 +    ETouchFeedbackNone = 0,
    1.70 +    ETouchFeedbackBasic,
    1.71 +    ETouchFeedbackSensitive,
    1.72 +    // New types for S60 5.2:
    1.73 +    ETouchFeedbackBasicButton = 0x100,    
    1.74 +    ETouchFeedbackSensitiveButton,
    1.75 +    ETouchFeedbackList,
    1.76 +    ETouchFeedbackSensitiveList,
    1.77 +    ETouchFeedbackBoundaryList,    
    1.78 +    ETouchFeedbackSlider,
    1.79 +    ETouchFeedbackEdit,
    1.80 +    ETouchFeedbackLineSelection,
    1.81 +    ETouchFeedbackBlankSelection,
    1.82 +    ETouchFeedbackTextSelection,
    1.83 +    ETouchFeedbackEmptyLineSelection,
    1.84 +    ETouchFeedbackTab,
    1.85 +    ETouchFeedbackPopUp,
    1.86 +    ETouchFeedbackIncreasingPopUp,
    1.87 +    ETouchFeedbackDecreasingPopUp,
    1.88 +    ETouchFeedbackFlick,
    1.89 +    ETouchFeedbackCheckbox,
    1.90 +    ETouchFeedbackSensitiveInput,
    1.91 +    ETouchFeedbackCharacterInputButton,
    1.92 +    ETouchFeedbackMultiTouchRecognized
    1.93 +    };
    1.94 +    
    1.95 +/**  
    1.96 + *  Logical feedback types for producing continuous feedback.
    1.97 + *
    1.98 + */
    1.99 +enum TTouchContinuousFeedback
   1.100 +    {
   1.101 +    ETouchContinuousSmooth = 0x300, // For generic continuous feedback for custom controls
   1.102 +    ETouchContinuousSlider,
   1.103 +    ETouchContinuousInput,
   1.104 +    ETouchContinuousFlick
   1.105 +    };
   1.106 +    
   1.107 +/**  
   1.108 + *  Physical feedback types as bitmask.
   1.109 + *
   1.110 + */  
   1.111 +enum TTouchFeedbackType
   1.112 +    {
   1.113 +    ETouchFeedbackAudio = 0x01,
   1.114 +    ETouchFeedbackVibra = 0x02
   1.115      };
   1.116  
   1.117 -
   1.118 -#endif // T_TOUCHLOGICALFEEDBACK_H
   1.119 +#endif // TOUCHLOGICALFEEDBACK_H