diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-16 16:38:11 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-06-18 14:41:47 +1000 |
| commit | a30fef9956b296f59ea18a9ee38d0abafeb15a4e (patch) | |
| tree | ea0fc578946cf668ef0f1f7b8196c915f0e93b19 /dix/getevents.c | |
| parent | 17f9723f488d0470e3879c6b0dfdba61544cdd7b (diff) | |
input: Add labels to buttons and valuators - ABI_XINPUT_VERSION 7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix/getevents.c')
| -rw-r--r-- | dix/getevents.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/getevents.c b/dix/getevents.c index 9b1908cbb..7c018c14d 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -214,7 +214,7 @@ CreateClassesChangedEvent(EventList* event, { dce->buttons.num_buttons = slave->button->numButtons; for (i = 0; i < dce->buttons.num_buttons; i++) - dce->buttons.names[i] = 0; /* FIXME */ + dce->buttons.names[i] = slave->button->labels[i]; } if (slave->valuator) { @@ -226,7 +226,7 @@ CreateClassesChangedEvent(EventList* event, dce->valuators[i].resolution = slave->valuator->axes[i].resolution; /* This should, eventually, be a per-axis mode */ dce->valuators[i].mode = slave->valuator->mode; - dce->valuators[i].name = 0; /* FIXME: */ + dce->valuators[i].name = slave->valuator->axes[i].label; } } if (slave->key) |