Changeset 8edec53 in mainline for uspace/srv/hid/display


Ignore:
Timestamp:
2021-10-25T17:51:10Z (4 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
91ece11b
Parents:
805a149
Message:

Support double-click

Needed to open Navigator entries using the mouse.

Location:
uspace/srv/hid/display
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hid/display/input.c

    r805a149 r8edec53  
    11/*
    2  * Copyright (c) 2019 Jiri Svoboda
     2 * Copyright (c) 2021 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    4949static errno_t ds_input_ev_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned);
    5050static errno_t ds_input_ev_button(input_t *, int, int);
     51static errno_t ds_input_ev_dclick(input_t *, int);
    5152
    5253static input_ev_ops_t ds_input_ev_ops = {
    … …  
    5657        .move = ds_input_ev_move,
    5758        .abs_move = ds_input_ev_abs_move,
    58         .button = ds_input_ev_button
     59        .button = ds_input_ev_button,
     60        .dclick = ds_input_ev_dclick
    5961};
    6062
    … …  
    131133
    132134        event.type = bpress ? PTD_PRESS : PTD_RELEASE;
     135        event.btn_num = bnum;
     136        event.dmove.x = 0;
     137        event.dmove.y = 0;
     138
     139        ds_display_lock(disp);
     140        rc = ds_display_post_ptd_event(disp, &event);
     141        ds_display_unlock(disp);
     142        return rc;
     143}
     144
     145static errno_t ds_input_ev_dclick(input_t *input, int bnum)
     146{
     147        ds_display_t *disp = (ds_display_t *) input->user;
     148        ptd_event_t event;
     149        errno_t rc;
     150
     151        event.type = PTD_DCLICK;
    133152        event.btn_num = bnum;
    134153        event.dmove.x = 0;

  • uspace/srv/hid/display/seat.c

    r805a149 r8edec53  
    362362        }
    363363
    364         if (event->type == PTD_PRESS || event->type == PTD_RELEASE) {
     364        if (event->type == PTD_PRESS || event->type == PTD_RELEASE ||
     365            event->type == PTD_DCLICK) {
    365366                pevent.pos_id = 0;
    366                 pevent.type = (event->type == PTD_PRESS) ?
    367                     POS_PRESS : POS_RELEASE;
     367                switch (event->type) {
     368                case PTD_PRESS:
     369                        pevent.type = POS_PRESS;
     370                        break;
     371                case PTD_RELEASE:
     372                        pevent.type = POS_RELEASE;
     373                        break;
     374                case PTD_DCLICK:
     375                        pevent.type = POS_DCLICK;
     376                        break;
     377                default:
     378                        assert(false);
     379                }
     380
    368381                pevent.btn_num = event->btn_num;
    369382                pevent.hpos = seat->pntpos.x;

  • uspace/srv/hid/display/types/display/ptd_event.h

    r805a149 r8edec53  
    11/*
    2  * Copyright (c) 2019 Jiri Svoboda
     2 * Copyright (c) 2021 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    4242        PTD_ABS_MOVE,
    4343        PTD_PRESS,
    44         PTD_RELEASE
     44        PTD_RELEASE,
     45        PTD_DCLICK
    4546} ptd_event_type_t;
    4647
Note: See TracChangeset for help on using the changeset viewer.