sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vncserver: Support pointer driver

Browse Source 
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
This commit is contained in:
Huang Qi 2022-02-24 17:57:15 +08:00 committed by Xiang Xiao
parent 2e9fa4586b
commit 4945c49c61
5 changed files with 209 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/video/vnc/Kconfig
View File

@ -139,6 +139,22 @@ config VNCSERVER_KBDENCODE
Use a special encoding of keyboard characters as defined in
include/nuttx/input/kbd_coded.h.
config VNCSERVER_TOUCH
bool "Enable touch input"
default n
select INPUT
select INPUT_TOUCHSCREEN
---help---
Use touchscreen based input driver
config VNCSERVER_TOUCH_DEVNAME
string "Touch input device name prefix"
default "/dev/input"
depends on VNCSERVER_TOUCH
---help---
Touch device name prefix, final devi name is /dev/inputX by default,
X is display number
config VNCSERVER_INBUFFER_SIZE
int "Input buffer size"
default 80

4
drivers/video/vnc/Make.defs
View File

@ -23,6 +23,10 @@ ifeq ($(CONFIG_VNCSERVER),y)
CSRCS += vnc_server.c vnc_negotiate.c vnc_updater.c vnc_receiver.c
CSRCS += vnc_raw.c vnc_rre.c vnc_color.c vnc_fbdev.c vnc_keymap.c
ifeq ($(CONFIG_VNCSERVER_TOUCH),y)
CSRCS += vnc_touch.c
endif
DEPPATH += --dep-path video/vnc
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)video$(DELIM)vnc}
VPATH += :video/vnc

58
drivers/video/vnc/vnc_fbdev.c
View File

@ -25,6 +25,7 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
@ -50,6 +51,7 @@
#include <nuttx/kthread.h>
#include <nuttx/video/fb.h>
#include <nuttx/video/vnc.h>
#include <nuttx/input/touchscreen.h>
#include "vnc_server.h"
@ -598,15 +600,48 @@ static inline int vnc_wait_start(int display)
int up_fbinitialize(int display)
{
int ret;
FAR struct vnc_session_s *session;
#ifdef CONFIG_VNCSERVER_TOUCH
char devname[NAME_MAX];
#endif
DEBUGASSERT(display >= 0 && display < RFB_MAX_DISPLAYS);
/* Save the input callout function information in the session structure. */
session = g_vnc_sessions[display];
#ifdef CONFIG_VNCSERVER_TOUCH
ret = snprintf(devname, NAME_MAX, CONFIG_VNCSERVER_TOUCH_DEVNAME "%d",
display);
if (ret < 0)
{
gerr("ERROR: Format vnc touch driver path failed.\n");
return ret;
}
ret = vnc_touch_register(devname, session);
if (ret < 0)
{
gerr("ERROR: Initial vnc touch driver failed.\n");
return ret;
}
session->mouseout = vnc_touch_event;
#endif
session->arg = session;
/* Start the VNC server kernel thread. */
ret = vnc_start_server(display);
if (ret < 0)
{
gerr("ERROR: vnc_start_server() failed: %d\n", ret);
#ifdef CONFIG_VNCSERVER_TOUCH
vnc_touch_unregister(session, devname);
#endif
return ret;
}
@ -795,9 +830,11 @@ FAR struct fb_vtable_s *up_fbgetvplane(int display, int vplane)
void up_fbuninitialize(int display)
{
#if 0 /* Do nothing */
FAR struct vnc_session_s *session;
FAR struct vnc_fbinfo_s *fbinfo;
#ifdef CONFIG_VNCSERVER_TOUCH
int ret;
char devname[NAME_MAX];
#endif
DEBUGASSERT(display >= 0 && display < RFB_MAX_DISPLAYS);
session = g_vnc_sessions[display];
@ -806,10 +843,17 @@ void up_fbuninitialize(int display)
if (session != NULL)
{
fbinfo = &g_fbinfo[display];
#warning Missing logic
UNUSED(session);
UNUSED(fbinfo);
}
#ifdef CONFIG_VNCSERVER_TOUCH
ret = snprintf(devname, NAME_MAX, CONFIG_VNCSERVER_TOUCH_DEVNAME "%d",
display);
if (ret < 0)
{
gerr("ERROR: Format vnc touch driver path failed.\n");
return;
}
vnc_touch_unregister(session, devname);
#endif
}
}

44
drivers/video/vnc/vnc_server.h
View File

@ -34,6 +34,7 @@
#include <nuttx/video/fb.h>
#include <nuttx/video/rfb.h>
#include <nuttx/video/vnc.h>
#include <nuttx/input/touchscreen.h>
#include <nuttx/net/net.h>
#include <nuttx/semaphore.h>
@ -222,6 +223,10 @@ struct vnc_session_s
vnc_mouseout_t mouseout; /* Callout when keyboard input is received */
FAR void *arg; /* Argument that accompanies the callouts */
#ifdef CONFIG_VNCSERVER_TOUCH
FAR struct touch_lowerhalf_s touch; /* Touch driver instance */
#endif
/* Updater information */
pthread_t updater; /* Updater thread ID */
@ -503,6 +508,45 @@ int vnc_raw(FAR struct vnc_session_s *session, FAR struct fb_area_s *rect);
void vnc_key_map(FAR struct vnc_session_s *session, uint16_t keysym,
bool keydown);
#ifdef CONFIG_VNCSERVER_TOUCH
/****************************************************************************
* Name: vnc_touch_register
*
* Description:
* Register touch device to fetch touch event from VNC client.
*
* Returned Value:
* Driver instance
*
****************************************************************************/
int vnc_touch_register(FAR const char *devpath,
FAR struct vnc_session_s *session);
/****************************************************************************
* Name: vnc_touch_register
*
* Description:
* Unregister touch device.
*
****************************************************************************/
void vnc_touch_unregister(FAR struct vnc_session_s *session,
FAR const char *devpath);
/****************************************************************************
* Name: vnc_touch_event
*
* Description:
* Report a touch event from vnc client.
*
****************************************************************************/
int vnc_touch_event(FAR void *arg, int16_t x, int16_t y, uint8_t buttons);
#endif
/****************************************************************************
* Name: vnc_convert_rgbNN
*

94
drivers/video/vnc/vnc_touch.c Normal file
View File

@ -0,0 +1,94 @@
/****************************************************************************
* drivers/video/vnc/vnc_touch.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you 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.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <assert.h>
#include <nuttx/input/touchscreen.h>
#include <nuttx/input/mouse.h>
#include "vnc_server.h"
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: vnc_touch_register
****************************************************************************/
int vnc_touch_register(FAR const char *devpath,
FAR struct vnc_session_s *session)
{
int ret;
ret = touch_register(&session->touch, devpath, 1);
if (ret < 0)
{
return ret;
}
return OK;
}
/****************************************************************************
* Name: vnc_touch_register
****************************************************************************/
void vnc_touch_unregister(FAR struct vnc_session_s *session,
FAR const char *devpath)
{
touch_unregister(&session->touch, devpath);
}
/****************************************************************************
* Name: vnc_touch_event
****************************************************************************/
int vnc_touch_event(FAR void *arg, int16_t x, int16_t y, uint8_t buttons)
{
struct touch_sample_s sample;
FAR struct vnc_session_s *session = arg;
DEBUGASSERT(session);
sample.npoints = 1;
sample.point[0].x = x;
sample.point[0].y = y;
sample.point[0].flags = TOUCH_ID_VALID | TOUCH_POS_VALID;
if ((buttons & MOUSE_BUTTON_1) != 0)
{
sample.point[0].flags |= TOUCH_DOWN;
}
else
{
sample.point[0].flags |= TOUCH_UP;
}
touch_event(session->touch.priv, &sample);
return OK;
}