Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f47aa343 authored by LuK1337's avatar LuK1337
Browse files

fixup! input: touchscreen: Expose every possible gesture 

Change-Id: I6fddcc9daf6c2b3e72a5b46e46467b4671aa65bc
parent 9bb19348

drivers/input/oneplus_touchscreen/touchpanel_common.h

+2 −7
Original line number Diff line number Diff line
@@ -65,15 +65,10 @@ 
#define KEY_DOUBLE_TAP              KEY_WAKEUP

#define KEY_GESTURE_CIRCLE          250

#define KEY_GESTURE_TWO_SWIPE       251

#define KEY_GESTURE_UP_ARROW        252

#define KEY_GESTURE_DOWN_ARROW        252

#define KEY_GESTURE_LEFT_ARROW      253

#define KEY_GESTURE_RIGHT_ARROW     254

#define KEY_GESTURE_DOWN_ARROW      255

#define KEY_GESTURE_SWIPE_LEFT      KEY_F5

#define KEY_GESTURE_SWIPE_DOWN      KEY_F6

#define KEY_GESTURE_SWIPE_RIGHT     KEY_F7

#define KEY_GESTURE_SWIPE_UP        KEY_F8

#define KEY_GESTURE_SINGLE_TAP      KEY_F9

#define KEY_GESTURE_SINGLE_TAP      255



#define BIT0 (0x1 << 0)

#define BIT1 (0x1 << 1)

drivers/input/oneplus_touchscreen/touchpanel_common_driver.c

+6 −46
Original line number Diff line number Diff line
@@ -79,15 +79,10 @@ int pointy[2] = {0, 0}; 


uint8_t DouTap_enable = 0;				 // double tap

uint8_t UpVee_enable  = 0;				 // V

uint8_t DownVee_enable  = 0;			 // ^

uint8_t LeftVee_enable = 0; 			 // >

uint8_t RightVee_enable = 0;			 // <

uint8_t Circle_enable = 0;				 // O

uint8_t DouSwip_enable = 0; 			 // ||

uint8_t Left2RightSwip_enable = 0;		 // -->

uint8_t Right2LeftSwip_enable = 0;		 // <--

uint8_t Up2DownSwip_enable = 0;			 // |v

uint8_t Down2UpSwip_enable = 0;			 // |^

uint8_t Mgestrue_enable = 0;			 // M

uint8_t Wgestrue_enable = 0;			 // W

uint8_t Sgestrue_enable = 0;			 // S
@@ -403,19 +398,15 @@ static void tp_gesture_handle(struct touchpanel_data *ts) 
			break;

		case UpVee:

			enabled = UpVee_enable;

			key = KEY_GESTURE_UP_ARROW;

			break;

		case DownVee:

			enabled = DownVee_enable;

			key = KEY_GESTURE_DOWN_ARROW;

			break;

		case LeftVee:

			enabled = LeftVee_enable;

			key = KEY_GESTURE_LEFT_ARROW;

			key = KEY_GESTURE_RIGHT_ARROW;

			break;

		case RightVee:

			enabled = RightVee_enable;

			key = KEY_GESTURE_RIGHT_ARROW;

			key = KEY_GESTURE_LEFT_ARROW;

			break;

		case Circle:

			enabled = Circle_enable;
@@ -425,22 +416,6 @@ static void tp_gesture_handle(struct touchpanel_data *ts) 
			enabled = DouSwip_enable;

			key = KEY_GESTURE_TWO_SWIPE;

			break;

		case Left2RightSwip:

			enabled = Left2RightSwip_enable;

			key = KEY_GESTURE_SWIPE_LEFT;

			break;

		case Right2LeftSwip:

			enabled = Right2LeftSwip_enable;

			key = KEY_GESTURE_SWIPE_RIGHT;

			break;

		case Up2DownSwip:

			enabled = Up2DownSwip_enable;

			key = KEY_GESTURE_SWIPE_UP;

			break;

		case Down2UpSwip:

			enabled = Down2UpSwip_enable;

			key = KEY_GESTURE_SWIPE_DOWN;

			break;

		case Mgestrue:

			enabled = Mgestrue_enable;

			key = KEY_GESTURE_M;
@@ -2230,15 +2205,10 @@ static DEVICE_ATTR(tp_fw_update, 0644, sec_update_fw_show, sec_update_fw_store); 


GESTURE_ATTR(single_tap, SingleTap_enable);

GESTURE_ATTR(double_tap, DouTap_enable);

GESTURE_ATTR(up_arrow, UpVee_enable);

GESTURE_ATTR(down_arrow, DownVee_enable);

GESTURE_ATTR(left_arrow, LeftVee_enable);

GESTURE_ATTR(right_arrow, RightVee_enable);

GESTURE_ATTR(down_arrow, UpVee_enable);

GESTURE_ATTR(left_arrow, RightVee_enable);

GESTURE_ATTR(right_arrow, LeftVee_enable);

GESTURE_ATTR(double_swipe, DouSwip_enable);

GESTURE_ATTR(up_swipe, Up2DownSwip_enable);

GESTURE_ATTR(down_swipe, Down2UpSwip_enable);

GESTURE_ATTR(left_swipe, Left2RightSwip_enable);

GESTURE_ATTR(right_swipe, Right2LeftSwip_enable);

GESTURE_ATTR(letter_o, Circle_enable);

GESTURE_ATTR(letter_w, Wgestrue_enable);

GESTURE_ATTR(letter_m, Mgestrue_enable);
@@ -2310,15 +2280,10 @@ static int init_touchpanel_proc(struct touchpanel_data *ts) 
    if (ts->black_gesture_support) {

        CREATE_GESTURE_NODE(single_tap);

        CREATE_GESTURE_NODE(double_tap);

        CREATE_GESTURE_NODE(up_arrow);

        CREATE_GESTURE_NODE(down_arrow);

        CREATE_GESTURE_NODE(left_arrow);

        CREATE_GESTURE_NODE(right_arrow);

        CREATE_GESTURE_NODE(double_swipe);

        CREATE_GESTURE_NODE(up_swipe);

        CREATE_GESTURE_NODE(down_swipe);

        CREATE_GESTURE_NODE(left_swipe);

        CREATE_GESTURE_NODE(right_swipe);

        CREATE_GESTURE_NODE(letter_o);

        CREATE_GESTURE_NODE(letter_w);

        CREATE_GESTURE_NODE(letter_m);
@@ -3746,14 +3711,9 @@ static int init_input_device(struct touchpanel_data *ts) 
        set_bit(KEY_DOUBLE_TAP, ts->input_dev->keybit);

        set_bit(KEY_GESTURE_CIRCLE, ts->input_dev->keybit);

        set_bit(KEY_GESTURE_TWO_SWIPE, ts->input_dev->keybit);

        set_bit(KEY_GESTURE_UP_ARROW, ts->input_dev->keybit);

        set_bit(KEY_GESTURE_DOWN_ARROW, ts->input_dev->keybit);

        set_bit(KEY_GESTURE_LEFT_ARROW, ts->input_dev->keybit);

        set_bit(KEY_GESTURE_RIGHT_ARROW, ts->input_dev->keybit);

        set_bit(KEY_GESTURE_DOWN_ARROW, ts->input_dev->keybit);

        set_bit(KEY_GESTURE_SWIPE_LEFT, ts->input_dev->keybit);

        set_bit(KEY_GESTURE_SWIPE_DOWN, ts->input_dev->keybit);

        set_bit(KEY_GESTURE_SWIPE_RIGHT, ts->input_dev->keybit);

        set_bit(KEY_GESTURE_SWIPE_UP, ts->input_dev->keybit);

        set_bit(KEY_GESTURE_SINGLE_TAP, ts->input_dev->keybit);

    }