mirror of
https://github.com/lxsang/antd-wvnc-plugin.git
synced 2024-12-26 20:08:22 +01:00
performance improvemnt
This commit is contained in:
lxsang
parent
63028a15e5
commit
e9b715337e
1
Makefile
1
Makefile
@ -12,6 +12,7 @@ DEP =
|
||||
WEB_BUILD_PATH = /home/mrsang/myws/antd-web-apps/apps/assets/scripts
|
||||
ifeq ($(UNAME_S),Darwin)
|
||||
DEP= -I/usr/local/opt/jpeg-turbo/include -L/usr/local/opt/jpeg-turbo/lib
|
||||
WEB_BUILD_PATH= /Users/mrsang/Documents/workspace/antd-web-apps/apps/assets/scripts
|
||||
endif
|
||||
|
||||
PLUGINLIBS = libantd.$(EXT) -lvncclient -lpthread -lz -ljpeg# -lsqlite3
|
||||
|
||||
@ -1,242 +0,0 @@
|
||||
/**
|
||||
* @example SDLvncviewer.c
|
||||
*/
|
||||
|
||||
#include <SDL2/SDL.h>
|
||||
#include <signal.h>
|
||||
#include <rfb/rfbclient.h>
|
||||
|
||||
static int enableResizable = 1, viewOnly, listenLoop, buttonMask;
|
||||
int sdlFlags;
|
||||
SDL_Texture *sdlTexture;
|
||||
SDL_Renderer *sdlRenderer;
|
||||
SDL_Window *sdlWindow;
|
||||
|
||||
|
||||
static rfbBool resize(rfbClient* client) {
|
||||
int width=client->width,height=client->height,
|
||||
depth=client->format.bitsPerPixel;
|
||||
|
||||
if (enableResizable)
|
||||
sdlFlags |= SDL_WINDOW_RESIZABLE;
|
||||
|
||||
client->updateRect.x = client->updateRect.y = 0;
|
||||
client->updateRect.w = width; client->updateRect.h = height;
|
||||
|
||||
/* (re)create the surface used as the client's framebuffer */
|
||||
SDL_FreeSurface(rfbClientGetClientData(client, SDL_Init));
|
||||
SDL_Surface* sdl=SDL_CreateRGBSurface(0,
|
||||
width,
|
||||
height,
|
||||
depth,
|
||||
0,0,0,0);
|
||||
if(!sdl)
|
||||
rfbClientErr("resize: error creating surface: %s\n", SDL_GetError());
|
||||
|
||||
rfbClientSetClientData(client, SDL_Init, sdl);
|
||||
client->width = sdl->pitch / (depth / 8);
|
||||
client->frameBuffer=sdl->pixels;
|
||||
|
||||
client->format.bitsPerPixel=depth;
|
||||
client->format.redShift=sdl->format->Rshift;
|
||||
client->format.greenShift=sdl->format->Gshift;
|
||||
client->format.blueShift=sdl->format->Bshift;
|
||||
client->format.redMax=sdl->format->Rmask>>client->format.redShift;
|
||||
client->format.greenMax=sdl->format->Gmask>>client->format.greenShift;
|
||||
client->format.blueMax=sdl->format->Bmask>>client->format.blueShift;
|
||||
SetFormatAndEncodings(client);
|
||||
|
||||
/* create or resize the window */
|
||||
if(!sdlWindow) {
|
||||
sdlWindow = SDL_CreateWindow(client->desktopName,
|
||||
SDL_WINDOWPOS_UNDEFINED,
|
||||
SDL_WINDOWPOS_UNDEFINED,
|
||||
width,
|
||||
height,
|
||||
sdlFlags);
|
||||
if(!sdlWindow)
|
||||
rfbClientErr("resize: error creating window: %s\n", SDL_GetError());
|
||||
} else {
|
||||
SDL_SetWindowSize(sdlWindow, width, height);
|
||||
}
|
||||
|
||||
/* create the renderer if it does not already exist */
|
||||
if(!sdlRenderer) {
|
||||
sdlRenderer = SDL_CreateRenderer(sdlWindow, -1, 0);
|
||||
if(!sdlRenderer)
|
||||
rfbClientErr("resize: error creating renderer: %s\n", SDL_GetError());
|
||||
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); /* make the scaled rendering look smoother. */
|
||||
}
|
||||
SDL_RenderSetLogicalSize(sdlRenderer, width, height); /* this is a departure from the SDL1.2-based version, but more in the sense of a VNC viewer in keeeping aspect ratio */
|
||||
|
||||
/* (re)create the texture that sits in between the surface->pixels and the renderer */
|
||||
if(sdlTexture)
|
||||
SDL_DestroyTexture(sdlTexture);
|
||||
sdlTexture = SDL_CreateTexture(sdlRenderer,
|
||||
SDL_PIXELFORMAT_ARGB8888,
|
||||
SDL_TEXTUREACCESS_STREAMING,
|
||||
width, height);
|
||||
if(!sdlTexture)
|
||||
rfbClientErr("resize: error creating texture: %s\n", SDL_GetError());
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void update(rfbClient* cl,int x,int y,int w,int h) {
|
||||
SDL_Surface *sdl = rfbClientGetClientData(cl, SDL_Init);
|
||||
/* update texture from surface->pixels */
|
||||
SDL_Rect r = {x,y,w,h};
|
||||
if(SDL_UpdateTexture(sdlTexture, &r, sdl->pixels + y*sdl->pitch + x*4, sdl->pitch) < 0)
|
||||
rfbClientErr("update: failed to update texture: %s\n", SDL_GetError());
|
||||
/* copy texture to renderer and show */
|
||||
if(SDL_RenderClear(sdlRenderer) < 0)
|
||||
rfbClientErr("update: failed to clear renderer: %s\n", SDL_GetError());
|
||||
if(SDL_RenderCopy(sdlRenderer, sdlTexture, NULL, NULL) < 0)
|
||||
rfbClientErr("update: failed to copy texture to renderer: %s\n", SDL_GetError());
|
||||
SDL_RenderPresent(sdlRenderer);
|
||||
}
|
||||
|
||||
|
||||
static void cleanup(rfbClient* cl)
|
||||
{
|
||||
/*
|
||||
just in case we're running in listenLoop:
|
||||
close viewer window by restarting SDL video subsystem
|
||||
*/
|
||||
SDL_QuitSubSystem(SDL_INIT_VIDEO);
|
||||
SDL_InitSubSystem(SDL_INIT_VIDEO);
|
||||
if(cl)
|
||||
rfbClientCleanup(cl);
|
||||
}
|
||||
|
||||
|
||||
static rfbBool handleSDLEvent(rfbClient *cl, SDL_Event *e)
|
||||
{
|
||||
switch(e->type) {
|
||||
case SDL_QUIT:
|
||||
if(listenLoop)
|
||||
{
|
||||
cleanup(cl);
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
rfbClientCleanup(cl);
|
||||
exit(0);
|
||||
}
|
||||
default:
|
||||
rfbClientLog("ignore SDL event: 0x%x\n", e->type);
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
/*
|
||||
static void got_selection(rfbClient *cl, const char *text, int len)
|
||||
{
|
||||
rfbClientLog("received clipboard text '%s'\n", text);
|
||||
if(SDL_SetClipboardText(text) != 0)
|
||||
rfbClientErr("could not set received clipboard text: %s\n", SDL_GetError());
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
static rfbCredential* get_credential(rfbClient* cl, int credentialType){
|
||||
rfbCredential *c = malloc(sizeof(rfbCredential));
|
||||
c->userCredential.username = malloc(RFB_BUF_SIZE);
|
||||
c->userCredential.password = malloc(RFB_BUF_SIZE);
|
||||
|
||||
if(credentialType != rfbCredentialTypeUser) {
|
||||
rfbClientErr("something else than username and password required for authentication\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
rfbClientLog("username and password required for authentication!\n");
|
||||
printf("user: ");
|
||||
fgets(c->userCredential.username, RFB_BUF_SIZE, stdin);
|
||||
printf("pass: ");
|
||||
fgets(c->userCredential.password, RFB_BUF_SIZE, stdin);
|
||||
|
||||
/* remove trailing newlines */
|
||||
c->userCredential.username[strcspn(c->userCredential.username, "\n")] = 0;
|
||||
c->userCredential.password[strcspn(c->userCredential.password, "\n")] = 0;
|
||||
|
||||
return c;
|
||||
}
|
||||
|
||||
|
||||
int main(int argc,char** argv) {
|
||||
rfbClient* cl;
|
||||
int i, j;
|
||||
SDL_Event e;
|
||||
|
||||
for (i = 1, j = 1; i < argc; i++)
|
||||
if (!strcmp(argv[i], "-viewonly"))
|
||||
viewOnly = 1;
|
||||
else if (!strcmp(argv[i], "-resizable"))
|
||||
enableResizable = 1;
|
||||
else if (!strcmp(argv[i], "-no-resizable"))
|
||||
enableResizable = 0;
|
||||
else if (!strcmp(argv[i], "-listen")) {
|
||||
listenLoop = 1;
|
||||
argv[i] = "-listennofork";
|
||||
++j;
|
||||
}
|
||||
else {
|
||||
if (i != j)
|
||||
argv[j] = argv[i];
|
||||
j++;
|
||||
}
|
||||
argc = j;
|
||||
|
||||
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
|
||||
atexit(SDL_Quit);
|
||||
signal(SIGINT, exit);
|
||||
|
||||
do {
|
||||
/* 16-bit: cl=rfbGetClient(5,3,2); */
|
||||
cl=rfbGetClient(8,3,4);
|
||||
cl->MallocFrameBuffer=resize;
|
||||
cl->canHandleNewFBSize = TRUE;
|
||||
cl->GotFrameBufferUpdate=update;
|
||||
//cl->HandleKeyboardLedState=kbd_leds;
|
||||
//cl->HandleTextChat=text_chat;
|
||||
//cl->GotXCutText = got_selection;
|
||||
cl->GetCredential = get_credential;
|
||||
cl->listenPort = LISTEN_PORT_OFFSET;
|
||||
cl->listen6Port = LISTEN_PORT_OFFSET;
|
||||
if(!rfbInitClient(cl,&argc,argv))
|
||||
{
|
||||
cl = NULL; /* rfbInitClient has already freed the client struct */
|
||||
cleanup(cl);
|
||||
break;
|
||||
}
|
||||
|
||||
while(1) {
|
||||
if(SDL_PollEvent(&e)) {
|
||||
/*
|
||||
handleSDLEvent() return 0 if user requested window close.
|
||||
In this case, handleSDLEvent() will have called cleanup().
|
||||
*/
|
||||
if(!handleSDLEvent(cl, &e))
|
||||
break;
|
||||
}
|
||||
else {
|
||||
i=WaitForMessage(cl,500);
|
||||
if(i<0)
|
||||
{
|
||||
cleanup(cl);
|
||||
break;
|
||||
}
|
||||
if(i)
|
||||
if(!HandleRFBServerMessage(cl))
|
||||
{
|
||||
cleanup(cl);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
while(listenLoop);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -11,7 +11,6 @@
|
||||
* to web assembly to be used on the browser
|
||||
*/
|
||||
|
||||
/*alloc a new frame buffer*/
|
||||
typedef struct{
|
||||
uint8_t r;
|
||||
uint8_t g;
|
||||
|
||||
@ -30,5 +30,10 @@ tar xvzf zlib-1.2.11.tar.gz -C ./zlib --strip-components=1
|
||||
rm zlib-1.2.11.tar.gz
|
||||
cd zlib
|
||||
emconfigure ./configure
|
||||
os=`uname -s`
|
||||
if [ "$os" = "Darwin" ]; then
|
||||
sed -i -e 's/AR=libtool/AR=emar/g' Makefile
|
||||
sed -i -e 's/ARFLAGS=-o/ARFLAGS=rc/g' Makefile
|
||||
fi
|
||||
# TODO modify make file using sed if macos
|
||||
emmake make
|
||||
12
wvnc.c
12
wvnc.c
@ -31,7 +31,7 @@ typedef struct
|
||||
uint8_t bbp;
|
||||
uint8_t flag;
|
||||
uint8_t quality;
|
||||
int rate;
|
||||
//int rate;
|
||||
} wvnc_user_data_t;
|
||||
|
||||
typedef struct
|
||||
@ -432,7 +432,7 @@ void open_session(void *data, const char *addr)
|
||||
LOG("client.flag: %d\n", user_data->flag );
|
||||
LOG("client.JPEG.quality: %d\n", user_data->quality );
|
||||
LOG("Server: %s\n", addr);
|
||||
LOG("Rate is %d\n", user_data->rate);
|
||||
//LOG("Rate is %d\n", user_data->rate);
|
||||
if (!rfbInitClient(user_data->vncl, &argc, argv))
|
||||
{
|
||||
user_data->vncl = NULL; /* rfbInitClient has already freed the client struct */
|
||||
@ -450,7 +450,7 @@ void open_session(void *data, const char *addr)
|
||||
}
|
||||
process(user_data, 0);
|
||||
//LOG("ENd process \n");
|
||||
int status = WaitForMessage(user_data->vncl, user_data->rate); //500
|
||||
int status = WaitForMessage(user_data->vncl, 500); //500
|
||||
if (status < 0)
|
||||
{
|
||||
if (user_data->vncl)
|
||||
@ -508,8 +508,8 @@ void *consume_client(void *ptr, wvnc_cmd_t header)
|
||||
user_data->bbp = header.data[0];
|
||||
user_data->flag = header.data[1];
|
||||
user_data->quality = header.data[2];
|
||||
user_data->rate = (header.data[3] | (header.data[4] << 8))*1000;
|
||||
open_session(user_data, (char *)(header.data + 5));
|
||||
//user_data->rate = (header.data[3] | (header.data[4] << 8))*1000;
|
||||
open_session(user_data, (char *)(header.data + 3));
|
||||
break;
|
||||
case 0x02: //client enter a vnc password
|
||||
if (!header.data)
|
||||
@ -531,7 +531,7 @@ void *consume_client(void *ptr, wvnc_cmd_t header)
|
||||
break;
|
||||
case 0x06: // key board event
|
||||
//LOG("Key is %c\n", header.data[0]);
|
||||
SendKeyEvent(user_data->vncl, header.data[0], header.data[1]?TRUE:FALSE);
|
||||
SendKeyEvent(user_data->vncl, header.data[0] | (header.data[1] << 8), header.data[2]?TRUE:FALSE);
|
||||
break;
|
||||
default:
|
||||
return vnc_fatal(user_data, "Unknown client command");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user