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

VNC: Discard previously queued updates if the client requesta a whole screen update

Browse Source
This commit is contained in:
Gregory Nutt 2016-04-21 09:47:26 -06:00
parent a9af194688
commit 98e4de73e2
5 changed files with 99 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/vnc/server/Kconfig
View File

@ -124,7 +124,12 @@ config VNCSERVER_KBDENCODE
include/nuttx/input/kbd_coded.h.
config VNCSERVER_INBUFFER_SIZE
int "Input buffer size
int "Input buffer size"
default 80
config VNCSERVER_UPDATE_DEBUG
bool "Detailed updater debug"
default n
depends on DEBUG_GRAPHICS
endif # VNCSERVER

3
graphics/vnc/server/vnc_raw.c
View File

@ -454,6 +454,9 @@ int vnc_raw(FAR struct vnc_session_s *session, FAR struct nxgl_rect_s *rect)
size -= nsent;
}
while (size > 0);
updvdbg("Sent {(%d, %d),(%d, %d)}\n",
x, y, x + updwidth -1, y + updheight - 1);
}
}
}

2
graphics/vnc/server/vnc_rre.c
View File

@ -291,6 +291,8 @@ int vnc_rre(FAR struct vnc_session_s *session, FAR struct nxgl_rect_s *rect)
}
DEBUGASSERT(nsent == nbytes);
updvdbg("Sent {(%d, %d),(%d, %d)}\n",
rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y);
return nbytes;
}

28
graphics/vnc/server/vnc_server.h
View File

@ -181,6 +181,34 @@
# define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
/* Debug */
#ifdef CONFIG_VNCSERVER_UPDATE_DEBUG
# ifdef CONFIG_CPP_HAVE_VARARGS
# define upddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define updlldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define updvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define updllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
# else
# define upddbg dbg
# define updlldbg lldbg
# define updvdbg vdbg
# define updllvdbg llvdbg
# endif
#else
# ifdef CONFIG_CPP_HAVE_VARARGS
# define upddbg(x...)
# define updlldbg(x...)
# define updvdbg(x...)
# define updllvdbg(x...)
# else
# define upddbg (void)
# define updlldbg (void)
# define updvdbg (void)
# define updllvdbg (void)
# endif
#endif
/****************************************************************************
* Public Types
****************************************************************************/

79
graphics/vnc/server/vnc_updater.c
View File

@ -47,6 +47,8 @@
#include <assert.h>
#include <errno.h>
#include <nuttx/semaphore.h>
#include "vnc_server.h"
/****************************************************************************
@ -63,6 +65,20 @@
static sem_t g_dbgsem = SEM_INITIALIZER(1);
#endif
/* A rectangle represent the entire local framebuffer */
static const struct nxgl_rect_s g_wholescreen =
{
{
0,
0
},
{
CONFIG_VNCSERVER_SCREENWIDTH - 1,
CONFIG_VNCSERVER_SCREENHEIGHT - 1
}
};
/****************************************************************************
* Private Functions
****************************************************************************/
@ -325,6 +341,10 @@ static FAR void *vnc_updater(FAR void *arg)
srcrect = vnc_remove_queue(session);
DEBUGASSERT(srcrect != NULL);
updvdbg("Dequeued {(%d, %d),(%d, %d)}\n",
srcrect->rect.pt1.x, srcrect->rect.pt1.y,
srcrect->rect.pt2.x, srcrect->rect.pt2.y);
/* Attempt to use RRE encoding */
ret = vnc_rre(session, &srcrect->rect);
@ -465,37 +485,58 @@ int vnc_update_rectangle(FAR struct vnc_session_s *session,
FAR const struct nxgl_rect_s *rect)
{
FAR struct vnc_fbupdate_s *update;
struct nxgl_rect_s intersection;
/* Make sure that the rectangle has a area */
/* Clip rectangle to the screen dimensions */
if (!nxgl_nullrect(rect))
nxgl_rectintersect(&intersection, rect, &g_wholescreen);
/* Make sure that the clipped rectangle has a area */
if (!nxgl_nullrect(&intersection))
{
/* Check for a whole screen update. The RealVNC client sends a lot
* of these (especially when it is confused)
*/
sched_lock();
if (memcmp(&intersection, &g_wholescreen, sizeof(struct nxgl_rect_s)) == 0)
{
FAR struct vnc_fbupdate_s *curr;
FAR struct vnc_fbupdate_s *next;
/* Yes.. discard all of the previously queued updates */
updvdbg("Whole screen update...\n");
curr = (FAR struct vnc_fbupdate_s *)session->updqueue.head;
sq_init(&session->updqueue);
sem_reset(&session->queuesem, 0);
for (; curr != NULL; curr = next)
{
next = curr->flink;
vnc_free_update(session, curr);
}
}
/* Allocate an update structure... waiting if necessary */
update = vnc_alloc_update(session);
DEBUGASSERT(update != NULL);
/* Clip and copy the rectangle into the update structure */
/* Copy the clipped rectangle into the update structure */
update->rect.pt1.x = MAX(rect->pt1.x, 0);
update->rect.pt1.y = MAX(rect->pt1.y, 0);
update->rect.pt2.x = MIN(rect->pt2.x, (CONFIG_VNCSERVER_SCREENWIDTH - 1));
update->rect.pt2.y = MIN(rect->pt2.y, (CONFIG_VNCSERVER_SCREENHEIGHT - 1));
nxgl_rectcopy(&update->rect, &intersection);
/* Make sure that the rectangle still has area after clipping */
/* Add the upate to the end of the update queue. */
if (nxgl_nullrect(rect))
{
/* No.. free the structure and ignore the update */
vnc_add_queue(session, update);
sched_unlock();
vnc_free_update(session, update);
}
else
{
/* Yes.. add the upate to the end of the update queue. */
vnc_add_queue(session, update);
}
updvdbg("Queued {(%d, %d),(%d, %d)}\n",
intersection.pt1.x, intersection.pt1.y,
intersection.pt2.x, intersection.pt2.y);
}
/* Since we ignore bad rectangles and wait for updata structures, there is