|
|
@@ -72,7 +72,7 @@ XserverDesktop::XserverDesktop(int screenIndex_, |
|
|
|
std::list<network::SocketListener*> listeners_, |
|
|
|
const char* name, const rfb::PixelFormat &pf, |
|
|
|
int width, int height, |
|
|
|
void* fbptr, int stride) |
|
|
|
void* fbptr, int stride_) |
|
|
|
: screenIndex(screenIndex_), |
|
|
|
server(0), listeners(listeners_), |
|
|
|
shadowFramebuffer(NULL), |
|
|
@@ -81,7 +81,7 @@ XserverDesktop::XserverDesktop(int screenIndex_, |
|
|
|
format = pf; |
|
|
|
|
|
|
|
server = new VNCServerST(name, this); |
|
|
|
setFramebuffer(width, height, fbptr, stride); |
|
|
|
setFramebuffer(width, height, fbptr, stride_); |
|
|
|
|
|
|
|
for (std::list<SocketListener*>::iterator i = listeners.begin(); |
|
|
|
i != listeners.end(); |
|
|
@@ -196,10 +196,10 @@ void XserverDesktop::announceClipboard(bool available) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
void XserverDesktop::sendClipboardData(const char* data) |
|
|
|
void XserverDesktop::sendClipboardData(const char* data_) |
|
|
|
{ |
|
|
|
try { |
|
|
|
server->sendClipboardData(data); |
|
|
|
server->sendClipboardData(data_); |
|
|
|
} catch (rdr::Exception& e) { |
|
|
|
vlog.error("XserverDesktop::sendClipboardData: %s",e.str()); |
|
|
|
} |
|
|
@@ -503,11 +503,11 @@ void XserverDesktop::grabRegion(const rfb::Region& region) |
|
|
|
region.get_rects(&rects); |
|
|
|
for (i = rects.begin(); i != rects.end(); i++) { |
|
|
|
rdr::U8 *buffer; |
|
|
|
int stride; |
|
|
|
int bufStride; |
|
|
|
|
|
|
|
buffer = getBufferRW(*i, &stride); |
|
|
|
buffer = getBufferRW(*i, &bufStride); |
|
|
|
vncGetScreenImage(screenIndex, i->tl.x, i->tl.y, i->width(), i->height(), |
|
|
|
(char*)buffer, stride * format.bpp/8); |
|
|
|
(char*)buffer, bufStride * format.bpp/8); |
|
|
|
commitBufferRW(*i); |
|
|
|
} |
|
|
|
} |