From b4cb8766d374785648d996d2d809a9c4f3fb9e6e Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Mon, 13 Jun 2011 13:24:29 +0000 Subject: [PATCH] Optimised drawing routines for Win32, based on the old Windows viewer. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4494 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- vncviewer/CMakeLists.txt | 4 +- vncviewer/Viewport.h | 2 +- vncviewer/Win32PixelBuffer.cxx | 96 ++++++++++++++++++++++++++++++++++ vncviewer/Win32PixelBuffer.h | 36 +++++++++++++ 4 files changed, 136 insertions(+), 2 deletions(-) create mode 100644 vncviewer/Win32PixelBuffer.cxx create mode 100644 vncviewer/Win32PixelBuffer.h diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt index faa1f755..12cd8aee 100644 --- a/vncviewer/CMakeLists.txt +++ b/vncviewer/CMakeLists.txt @@ -21,7 +21,9 @@ if(APPLE) set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} cocoa.mm) endif() -if((NOT APPLE) AND (NOT WIN32)) +if(WIN32) + set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} Win32PixelBuffer.cxx) +elseif(NOT APPLE) set(VNCVIEWER_SOURCES ${VNCVIEWER_SOURCES} X11PixelBuffer.cxx) endif() diff --git a/vncviewer/Viewport.h b/vncviewer/Viewport.h index 2613b6dd..19b95a30 100644 --- a/vncviewer/Viewport.h +++ b/vncviewer/Viewport.h @@ -34,7 +34,7 @@ #include #if defined(WIN32) -#include "PlatformPixelBuffer.h" +#include "Win32PixelBuffer.h" #elif defined(__APPLE__) #include "PlatformPixelBuffer.h" #else diff --git a/vncviewer/Win32PixelBuffer.cxx b/vncviewer/Win32PixelBuffer.cxx new file mode 100644 index 00000000..e9f0e980 --- /dev/null +++ b/vncviewer/Win32PixelBuffer.cxx @@ -0,0 +1,96 @@ +/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved. + * Copyright 2011 Pierre Ossman for Cendio AB + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +#include +#include + +#include + +#include + +#include +#include + +#include "Win32PixelBuffer.h" + +using namespace rfb; + +static rfb::LogWriter vlog("PlatformPixelBuffer"); + +struct BitmapInfo { + BITMAPINFOHEADER bmiHeader; + union { + struct { + DWORD red; + DWORD green; + DWORD blue; + } mask; + RGBQUAD color[256]; + }; +}; + +PlatformPixelBuffer::PlatformPixelBuffer(int width, int height) : + FullFramePixelBuffer(rfb::PixelFormat(32, 24, false, true, + 255, 255, 255, 16, 8, 0), + width, height, NULL, NULL), + bitmap(NULL) +{ + BITMAPINFOHEADER bih; + + memset(&bih, 0, sizeof(bih)); + + bih.biSize = sizeof(BITMAPINFOHEADER); + bih.biBitCount = getPF().bpp; + bih.biSizeImage = (getPF().bpp / 8) * width * height; + bih.biPlanes = 1; + bih.biWidth = width; + bih.biHeight = -height; // Negative to get top-down + bih.biCompression = BI_RGB; + + bitmap = CreateDIBSection(NULL, (BITMAPINFO*)&bih, + DIB_RGB_COLORS, (void**)&data, NULL, 0); + if (!bitmap) { + int err = GetLastError(); + throw rdr::SystemException("unable to create DIB section", err); + } +} + + +PlatformPixelBuffer::~PlatformPixelBuffer() +{ + DeleteObject(bitmap); +} + + +void PlatformPixelBuffer::draw(int src_x, int src_y, int x, int y, int w, int h) +{ + HDC dc; + + dc = CreateCompatibleDC(fl_gc); + if (!dc) + throw rdr::SystemException("CreateCompatibleDC failed", GetLastError()); + + if (!SelectObject(dc, bitmap)) + throw rdr::SystemException("SelectObject failed", GetLastError()); + + if (!BitBlt(fl_gc, x, y, w, h, dc, src_x, src_y, SRCCOPY)) + throw rdr::SystemException("BitBlt failed", GetLastError()); + + DeleteDC(dc); +} diff --git a/vncviewer/Win32PixelBuffer.h b/vncviewer/Win32PixelBuffer.h new file mode 100644 index 00000000..ae2b71ac --- /dev/null +++ b/vncviewer/Win32PixelBuffer.h @@ -0,0 +1,36 @@ +/* Copyright 2011 Pierre Ossman for Cendio AB + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +#ifndef __WIN32PIXELBUFFER_H__ +#define __WIN32PIXELBUFFER_H__ + +#include + +class PlatformPixelBuffer: public rfb::FullFramePixelBuffer { +public: + PlatformPixelBuffer(int width, int height); + ~PlatformPixelBuffer(); + + void draw(int src_x, int src_y, int x, int y, int w, int h); + +protected: + HBITMAP bitmap; +}; + + +#endif -- 2.39.5