a9cf8b5838
This commit does the following: * fix the keyboard logic (which now fully works), add support for vertical mouse wheel events ; * make the rendering a lot more efficient, by using RDP damage information to refresh only the relevant part of the buffer ; * fix two race conditions. wlfreerdp should not crash anymore now ; * fix shm_open() and shm_unlink() calls ; * improve the code style. Signed-off-by: Manuel Bachmann <tarnyko@tarnyko.net>
253 lines
5.4 KiB
C
253 lines
5.4 KiB
C
/**
|
|
* FreeRDP: A Remote Desktop Protocol Implementation
|
|
* Wayland Input
|
|
*
|
|
* Copyright 2014 Manuel Bachmann <tarnyko@tarnyko.net>
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <linux/input.h>
|
|
|
|
#include <freerdp/locale/keyboard.h>
|
|
|
|
#include "wlf_input.h"
|
|
|
|
static void wl_pointer_enter(void* data, struct wl_pointer* pointer, uint32_t serial, struct wl_surface* surface, wl_fixed_t sx_w, wl_fixed_t sy_w)
|
|
{
|
|
|
|
}
|
|
|
|
static void wl_pointer_leave(void* data, struct wl_pointer* pointer, uint32_t serial, struct wl_surface* surface)
|
|
{
|
|
|
|
}
|
|
|
|
static void wl_pointer_motion(void* data, struct wl_pointer* pointer, uint32_t time, wl_fixed_t sx_w, wl_fixed_t sy_w)
|
|
{
|
|
wlfInput* input_w = data;
|
|
rdpInput* input;
|
|
UINT16 x;
|
|
UINT16 y;
|
|
|
|
input = input_w->input;
|
|
|
|
x = (UINT16) wl_fixed_to_int(sx_w);
|
|
y = (UINT16) wl_fixed_to_int(sy_w);
|
|
|
|
input->MouseEvent(input, PTR_FLAGS_MOVE, x, y);
|
|
|
|
input_w->last_x = x;
|
|
input_w->last_y = y;
|
|
}
|
|
|
|
static void wl_pointer_button(void* data, struct wl_pointer* pointer, uint32_t serial, uint32_t time, uint32_t button, uint32_t state)
|
|
{
|
|
wlfInput* input_w = data;
|
|
rdpInput* input;
|
|
UINT16 x;
|
|
UINT16 y;
|
|
UINT16 flags;
|
|
|
|
input = input_w->input;
|
|
|
|
if (state == WL_POINTER_BUTTON_STATE_PRESSED)
|
|
flags = PTR_FLAGS_DOWN;
|
|
else
|
|
flags = 0;
|
|
|
|
switch (button)
|
|
{
|
|
case BTN_LEFT:
|
|
flags |= PTR_FLAGS_BUTTON1;
|
|
break;
|
|
case BTN_RIGHT:
|
|
flags |= PTR_FLAGS_BUTTON2;
|
|
break;
|
|
case BTN_MIDDLE:
|
|
flags |= PTR_FLAGS_BUTTON3;
|
|
break;
|
|
default:
|
|
return;
|
|
}
|
|
|
|
x = input_w->last_x;
|
|
y = input_w->last_y;
|
|
|
|
input->MouseEvent(input, flags, x, y);
|
|
}
|
|
|
|
static void wl_pointer_axis(void* data, struct wl_pointer* pointer, uint32_t time, uint32_t axis, wl_fixed_t value)
|
|
{
|
|
wlfInput* input_w = data;
|
|
rdpInput* input;
|
|
UINT16 flags;
|
|
int direction;
|
|
|
|
input = input_w->input;
|
|
|
|
flags = PTR_FLAGS_WHEEL;
|
|
|
|
if (axis == WL_POINTER_AXIS_VERTICAL_SCROLL)
|
|
{
|
|
direction = wl_fixed_to_int(value);
|
|
if (direction < 0)
|
|
flags |= 0x0078;
|
|
else
|
|
flags |= PTR_FLAGS_WHEEL_NEGATIVE | 0x0088;
|
|
}
|
|
|
|
input->MouseEvent(input, flags, 0, 0);
|
|
}
|
|
|
|
static const struct wl_pointer_listener wl_pointer_listener =
|
|
{
|
|
wl_pointer_enter,
|
|
wl_pointer_leave,
|
|
wl_pointer_motion,
|
|
wl_pointer_button,
|
|
wl_pointer_axis
|
|
};
|
|
|
|
static void wl_keyboard_keymap(void* data, struct wl_keyboard* keyboard, uint32_t format, int fd, uint32_t size)
|
|
{
|
|
|
|
}
|
|
|
|
static void wl_keyboard_enter(void* data, struct wl_keyboard* keyboard, uint32_t serial, struct wl_surface* surface, struct wl_array* keys)
|
|
{
|
|
wlfInput* input_w = data;
|
|
rdpInput* input;
|
|
UINT16 x;
|
|
UINT16 y;
|
|
|
|
input = input_w->input;
|
|
|
|
x = input_w->last_x;
|
|
y = input_w->last_y;
|
|
|
|
input->FocusInEvent(input, 0, x, y);
|
|
}
|
|
|
|
static void wl_keyboard_leave(void* data, struct wl_keyboard* keyboard, uint32_t serial, struct wl_surface* surface)
|
|
{
|
|
|
|
}
|
|
|
|
static void wl_keyboard_key(void* data, struct wl_keyboard* keyboard, uint32_t serial, uint32_t time, uint32_t key, uint32_t state)
|
|
{
|
|
wlfInput* input_w = data;
|
|
rdpInput* input;
|
|
BOOL key_down;
|
|
DWORD rdp_scancode;
|
|
|
|
input = input_w->input;
|
|
|
|
if (state == WL_KEYBOARD_KEY_STATE_PRESSED)
|
|
key_down = TRUE;
|
|
else
|
|
key_down = FALSE;
|
|
|
|
rdp_scancode = (DWORD) key;
|
|
|
|
if (rdp_scancode == RDP_SCANCODE_UNKNOWN)
|
|
return;
|
|
|
|
freerdp_input_send_keyboard_event_ex(input, key_down, rdp_scancode);
|
|
}
|
|
|
|
static void wl_keyboard_modifiers(void* data, struct wl_keyboard* keyboard, uint32_t serial, uint32_t mods_depr, uint32_t mods_latch, uint32_t mods_lock, uint32_t group)
|
|
{
|
|
|
|
}
|
|
|
|
static const struct wl_keyboard_listener wl_keyboard_listener =
|
|
{
|
|
wl_keyboard_keymap,
|
|
wl_keyboard_enter,
|
|
wl_keyboard_leave,
|
|
wl_keyboard_key,
|
|
wl_keyboard_modifiers
|
|
};
|
|
|
|
static void wl_seat_handle_capabilities(void* data, struct wl_seat* seat, enum wl_seat_capability capabilities)
|
|
{
|
|
wlfInput* input = data;
|
|
struct wl_pointer* pointer;
|
|
struct wl_keyboard* keyboard;
|
|
|
|
if (capabilities & WL_SEAT_CAPABILITY_POINTER)
|
|
{
|
|
pointer = wl_seat_get_pointer(seat);
|
|
|
|
input->pointer = pointer;
|
|
wl_pointer_add_listener(pointer, &wl_pointer_listener, input);
|
|
}
|
|
|
|
if (capabilities & WL_SEAT_CAPABILITY_KEYBOARD)
|
|
{
|
|
keyboard = wl_seat_get_keyboard(seat);
|
|
|
|
input->keyboard = keyboard;
|
|
wl_keyboard_add_listener(keyboard, &wl_keyboard_listener, input);
|
|
}
|
|
|
|
}
|
|
|
|
static const struct wl_seat_listener wl_seat_listener = {
|
|
wl_seat_handle_capabilities
|
|
};
|
|
|
|
|
|
wlfInput* wlf_CreateInput(wlfContext* wlfc)
|
|
{
|
|
wlfInput* input;
|
|
struct wl_seat* seat;
|
|
|
|
if (!wlfc->display)
|
|
return NULL;
|
|
if (!wlfc->display->seat)
|
|
return NULL;
|
|
seat = wlfc->display->seat;
|
|
|
|
input = (wlfInput*) calloc(1, sizeof(wlfInput));
|
|
|
|
if (input)
|
|
{
|
|
input->input = wlfc->context.input;
|
|
input->last_x = 0;
|
|
input->last_y = 0;
|
|
|
|
wl_seat_add_listener(seat, &wl_seat_listener, input);
|
|
}
|
|
|
|
return input;
|
|
}
|
|
|
|
void wlf_DestroyInput(wlfContext* wlfc, wlfInput* input)
|
|
{
|
|
if (input == NULL)
|
|
return;
|
|
|
|
if (wlfc->input == input)
|
|
wlfc->input = NULL;
|
|
|
|
if (input->pointer)
|
|
wl_pointer_release(input->pointer);
|
|
if (input->keyboard)
|
|
wl_keyboard_release(input->keyboard);
|
|
|
|
free(input);
|
|
}
|