Changeset 60ebe63 in mainline for uspace/srv/hid/console/console.c


Ignore:
Timestamp:
2022-11-08T21:20:23Z (17 months ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7bcd15f
Parents:
3a6d44b7
Message:

Store positioning device ID in position events

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hid/console/console.c

    r3a6d44b7 r60ebe63  
    11/*
    2  * Copyright (c) 2021 Jiri Svoboda
     2 * Copyright (c) 2022 Jiri Svoboda
    33 * Copyright (c) 2011 Martin Decky
    44 * All rights reserved.
     
    120120static errno_t input_ev_active(input_t *);
    121121static errno_t input_ev_deactive(input_t *);
    122 static errno_t input_ev_key(input_t *, kbd_event_type_t, keycode_t, keymod_t, char32_t);
    123 static errno_t input_ev_move(input_t *, int, int);
    124 static errno_t input_ev_abs_move(input_t *, unsigned, unsigned, unsigned, unsigned);
    125 static errno_t input_ev_button(input_t *, int, int);
    126 static errno_t input_ev_dclick(input_t *, int);
     122static errno_t input_ev_key(input_t *, unsigned, kbd_event_type_t, keycode_t,
     123    keymod_t, char32_t);
     124static errno_t input_ev_move(input_t *, unsigned, int, int);
     125static errno_t input_ev_abs_move(input_t *, unsigned, unsigned, unsigned,
     126    unsigned, unsigned);
     127static errno_t input_ev_button(input_t *, unsigned, int, int);
     128static errno_t input_ev_dclick(input_t *, unsigned, int);
    127129
    128130static input_ev_ops_t input_ev_ops = {
     
    357359}
    358360
    359 static errno_t input_ev_key(input_t *input, kbd_event_type_t type, keycode_t key,
    360     keymod_t mods, char32_t c)
     361static errno_t input_ev_key(input_t *input, unsigned kbd_id,
     362    kbd_event_type_t type, keycode_t key, keymod_t mods, char32_t c)
    361363{
    362364        cons_event_t event;
     
    369371                event.type = CEV_KEY;
    370372
     373                (void)kbd_id;
    371374                event.ev.key.type = type;
    372375                event.ev.key.key = key;
     
    417420}
    418421
    419 static errno_t input_ev_move(input_t *input, int dx, int dy)
    420 {
     422static errno_t input_ev_move(input_t *input, unsigned pos_id, int dx, int dy)
     423{
     424        (void) pos_id;
    421425        pointer_update(pointer_x + dx, pointer_y + dy);
    422426        return EOK;
    423427}
    424428
    425 static errno_t input_ev_abs_move(input_t *input, unsigned x, unsigned y,
    426     unsigned max_x, unsigned max_y)
    427 {
     429static errno_t input_ev_abs_move(input_t *input, unsigned pos_id, unsigned x,
     430    unsigned y, unsigned max_x, unsigned max_y)
     431{
     432        (void)pos_id;
    428433        pointer_update(mouse_scale_x * cols * x / max_x, mouse_scale_y * rows * y / max_y);
    429434        return EOK;
    430435}
    431436
    432 static errno_t input_ev_button(input_t *input, int bnum, int bpress)
     437static errno_t input_ev_button(input_t *input, unsigned pos_id, int bnum,
     438    int bpress)
    433439{
    434440        cons_event_t event;
     441
     442        (void)pos_id;
    435443
    436444        event.type = CEV_POS;
     
    444452}
    445453
    446 static errno_t input_ev_dclick(input_t *input, int bnum)
     454static errno_t input_ev_dclick(input_t *input, unsigned pos_id, int bnum)
    447455{
    448456        cons_event_t event;
     457
     458        (void)pos_id;
    449459
    450460        event.type = CEV_POS;
Note: See TracChangeset for help on using the changeset viewer.