From 453645a6ea71e79951d95f9658f7a751e4a62338 Mon Sep 17 00:00:00 2001 From: Christian Beier Date: Thu, 11 Nov 2010 18:52:36 +0100 Subject: [PATCH] libvncserver cleanup: remove rfbKeyFrame remnants. --- libvncserver/rfbserver.c | 2 -- libvncserver/stats.c | 2 -- rfb/rfbproto.h | 14 -------------- 3 files changed, 18 deletions(-) diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c index b71daf8..d59b979 100644 --- a/libvncserver/rfbserver.c +++ b/libvncserver/rfbserver.c @@ -872,7 +872,6 @@ rfbSendSupportedMessages(rfbClientPtr cl) /*rfbSetBit(msgs.client2server, rfbSetServerInput); */ /*rfbSetBit(msgs.client2server, rfbSetSW); */ /*rfbSetBit(msgs.client2server, rfbTextChat); */ - /*rfbSetBit(msgs.client2server, rfbKeyFrameRequest); */ rfbSetBit(msgs.client2server, rfbPalmVNCSetScaleFactor); rfbSetBit(msgs.client2server, rfbXvp); @@ -881,7 +880,6 @@ rfbSendSupportedMessages(rfbClientPtr cl) rfbSetBit(msgs.server2client, rfbBell); rfbSetBit(msgs.server2client, rfbServerCutText); rfbSetBit(msgs.server2client, rfbResizeFrameBuffer); - /*rfbSetBit(msgs.server2client, rfbKeyFrameUpdate); */ rfbSetBit(msgs.server2client, rfbPalmVNCReSizeFrameBuffer); rfbSetBit(msgs.server2client, rfbXvp); diff --git a/libvncserver/stats.c b/libvncserver/stats.c index 1e6c9b1..6dab13b 100755 --- a/libvncserver/stats.c +++ b/libvncserver/stats.c @@ -51,7 +51,6 @@ char *messageNameServer2Client(uint32_t type, char *buf, int len) { case rfbBell: snprintf(buf, len, "Bell"); break; case rfbServerCutText: snprintf(buf, len, "ServerCutText"); break; case rfbResizeFrameBuffer: snprintf(buf, len, "ResizeFrameBuffer"); break; - case rfbKeyFrameUpdate: snprintf(buf, len, "KeyFrameUpdate"); break; case rfbFileTransfer: snprintf(buf, len, "FileTransfer"); break; case rfbTextChat: snprintf(buf, len, "TextChat"); break; case rfbPalmVNCReSizeFrameBuffer: snprintf(buf, len, "PalmVNCReSize"); break; @@ -77,7 +76,6 @@ char *messageNameClient2Server(uint32_t type, char *buf, int len) { case rfbSetServerInput: snprintf(buf, len, "SetServerInput"); break; case rfbSetSW: snprintf(buf, len, "SetSingleWindow"); break; case rfbTextChat: snprintf(buf, len, "TextChat"); break; - case rfbKeyFrameRequest: snprintf(buf, len, "KeyFrameRequest"); break; case rfbPalmVNCSetScaleFactor: snprintf(buf, len, "PalmVNCSetScale"); break; case rfbXvp: snprintf(buf, len, "XvpClientMessage"); break; default: diff --git a/rfb/rfbproto.h b/rfb/rfbproto.h index cb62fc5..6fe14bc 100644 --- a/rfb/rfbproto.h +++ b/rfb/rfbproto.h @@ -379,7 +379,6 @@ typedef struct { #define rfbServerCutText 3 /* Modif sf@2002 */ #define rfbResizeFrameBuffer 4 -#define rfbKeyFrameUpdate 5 #define rfbPalmVNCReSizeFrameBuffer 0xF /* client -> server */ @@ -402,7 +401,6 @@ typedef struct { /* Modif sf@2002 - TextChat - Bidirectionnal */ #define rfbTextChat 11 /* Modif cs@2005 */ -#define rfbKeyFrameRequest 12 /* PalmVNC 1.4 & 2.0 SetScale Factor message */ #define rfbPalmVNCSetScaleFactor 0xF /* Xvp message - bidirectional */ @@ -516,18 +514,6 @@ typedef struct { #define sz_rfbFramebufferUpdateMsg 4 -/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * KeyFrameUpdate - Acknowledgment of a key frame request, it tells the client - * that the next update received will be a key frame. - */ - -typedef struct { - uint8_t type; -} rfbKeyFrameUpdateMsg; - -#define sz_rfbKeyFrameUpdateMsg 1 - - /* * Each rectangle of pixel data consists of a header describing the position * and size of the rectangle and a type word describing the encoding of the