summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/Makefile.am14
-rw-r--r--client/application.cpp8
-rw-r--r--client/application.h2
-rw-r--r--client/canvas.h2
-rw-r--r--client/cursor_channel.cpp18
-rw-r--r--client/display_channel.cpp10
-rw-r--r--client/display_channel.h2
-rw-r--r--client/gui/gui.cpp4
-rw-r--r--client/gui/gui.h4
-rw-r--r--client/red_gl_canvas.h2
-rw-r--r--client/red_pixmap_gdi.h4
-rw-r--r--client/red_pixmap_sw.h (renamed from client/red_pixmap_cairo.h)10
-rw-r--r--client/red_sw_canvas.cpp (renamed from client/red_cairo_canvas.cpp)22
-rw-r--r--client/red_sw_canvas.h (renamed from client/red_cairo_canvas.h)8
-rw-r--r--client/screen.cpp6
-rw-r--r--client/sw_canvas.cpp (renamed from client/cairo_canvas.cpp)2
-rw-r--r--client/windows/red_pixmap_sw.cpp (renamed from client/windows/red_pixmap_cairo.cpp)8
-rw-r--r--client/windows/redc.vcproj12
-rw-r--r--client/x11/Makefile.am16
-rw-r--r--client/x11/red_pixmap_sw.cpp (renamed from client/x11/red_pixmap_cairo.cpp)12
20 files changed, 83 insertions, 83 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index 81ad6dbf..e1c31fd1 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -3,20 +3,20 @@ NULL =
SUBDIRS = $(red_target)
DIST_SUBDIRS = x11 #windows
-RED_COMMON_SRCS = \
+RED_COMMON_SRCS = \
application.cpp \
application.h \
audio_channels.h \
audio_devices.h \
cache.hpp \
- cairo_canvas.cpp \
+ sw_canvas.cpp \
pixman_utils.cpp \
lines.cpp \
canvas.cpp \
canvas.h \
canvas_utils.cpp \
- red_cairo_canvas.cpp \
- red_cairo_canvas.h \
+ red_sw_canvas.cpp \
+ red_sw_canvas.h \
client_net_socket.cpp \
client_net_socket.h \
cmd_line_parser.cpp \
@@ -66,7 +66,7 @@ RED_COMMON_SRCS = \
red_key.h \
red_peer.cpp \
red_peer.h \
- red_pixmap_cairo.h \
+ red_pixmap_sw.h \
red_pixmap_gl.h \
red_pixmap.h \
red_types.h \
@@ -82,8 +82,8 @@ RED_COMMON_SRCS = \
tunnel_channel.h \
hot_keys.cpp \
hot_keys.h \
- threads.cpp \
- threads.h \
+ threads.cpp \
+ threads.h \
utils.cpp \
utils.h \
$(NULL)
diff --git a/client/application.cpp b/client/application.cpp
index efada344..4eb8ac88 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -35,7 +35,7 @@
#include "red_gdi_canvas.h"
#endif
#include "platform.h"
-#include "cairo_canvas.h"
+#include "sw_canvas.h"
#include "gl_canvas.h"
#include "quic.h"
#include "mutex.h"
@@ -378,7 +378,7 @@ Application::Application()
#ifdef WIN32
_canvas_types[0] = CANVAS_OPTION_GDI;
#else
- _canvas_types[0] = CANVAS_OPTION_CAIRO;
+ _canvas_types[0] = CANVAS_OPTION_SW;
#endif
_host_auth_opt.type_flags = RedPeer::HostAuthOptions::HOST_AUTH_OP_NAME;
@@ -1793,7 +1793,7 @@ bool Application::set_canvas_option(CmdLineParser& parser, char *val, const char
typedef std::map< std::string, CanvasOption> CanvasNamesMap;
CanvasNamesMap canvas_types;
- canvas_types["cairo"] = CANVAS_OPTION_CAIRO;
+ canvas_types["sw"] = CANVAS_OPTION_SW;
#ifdef WIN32
canvas_types["gdi"] = CANVAS_OPTION_GDI;
#endif
@@ -2130,7 +2130,7 @@ void Application::init_globals()
SSL_library_init();
SSL_load_error_strings();
- cairo_canvas_init();
+ sw_canvas_init();
#ifdef USE_OGL
gl_canvas_init();
#endif
diff --git a/client/application.h b/client/application.h
index fda67535..1e48ab57 100644
--- a/client/application.h
+++ b/client/application.h
@@ -100,7 +100,7 @@ private:
enum CanvasOption {
CANVAS_OPTION_INVALID,
- CANVAS_OPTION_CAIRO,
+ CANVAS_OPTION_SW,
#ifdef WIN32
CANVAS_OPTION_GDI,
#endif
diff --git a/client/canvas.h b/client/canvas.h
index 82badc49..135783b0 100644
--- a/client/canvas.h
+++ b/client/canvas.h
@@ -32,7 +32,7 @@
enum CanvasType {
CANVAS_TYPE_INVALID,
- CANVAS_TYPE_CAIRO,
+ CANVAS_TYPE_SW,
CANVAS_TYPE_GL,
CANVAS_TYPE_GDI,
};
diff --git a/client/cursor_channel.cpp b/client/cursor_channel.cpp
index db020a06..402d69fd 100644
--- a/client/cursor_channel.cpp
+++ b/client/cursor_channel.cpp
@@ -24,7 +24,7 @@
#include "debug.h"
#include "utils.h"
#include "screen.h"
-#include "red_pixmap_cairo.h"
+#include "red_pixmap_sw.h"
#include "rect.h"
static inline uint8_t revers_bits(uint8_t byte)
@@ -111,8 +111,8 @@ void UnsupportedCursor::draw(RedDrawable& dest, int x, int y, const SpiceRect& a
}
AlphaCursor::AlphaCursor(const SpiceCursorHeader& header, const uint8_t* data)
- : _pixmap (new RedPixmapCairo(header.width, header.height,
- RedDrawable::ARGB32, true, NULL))
+ : _pixmap (new RedPixmapSw(header.width, header.height,
+ RedDrawable::ARGB32, true, NULL))
{
int stride = _pixmap->get_stride();
uint8_t* dest = _pixmap->get_data();
@@ -131,8 +131,8 @@ MonoCursor::MonoCursor(const SpiceCursorHeader& header, const uint8_t* data)
: _pixmap (NULL)
, _height (header.height)
{
- _pixmap.reset(new RedPixmapCairo(header.width, _height * 2, RedDrawable::A1,
- true, NULL));
+ _pixmap.reset(new RedPixmapSw(header.width, _height * 2, RedDrawable::A1,
+ true, NULL));
int dest_stride = _pixmap->get_stride();
uint8_t *dest_line = _pixmap->get_data();
@@ -175,12 +175,12 @@ private:
};
ColorCursor::ColorCursor(const SpiceCursorHeader& header)
- : _pixmap (new RedPixmapCairo(header.width, header.height,
- RedDrawable::ARGB32, true, NULL))
+ : _pixmap (new RedPixmapSw(header.width, header.height,
+ RedDrawable::ARGB32, true, NULL))
, _invers (NULL)
{
- _invers.reset(new RedPixmapCairo(header.width, header.height, RedDrawable::A1,
- true, NULL));
+ _invers.reset(new RedPixmapSw(header.width, header.height, RedDrawable::A1,
+ true, NULL));
}
void ColorCursor::init_pixels(const SpiceCursorHeader& header, const uint8_t* pixels,
diff --git a/client/display_channel.cpp b/client/display_channel.cpp
index 1a326cf9..bffd5399 100644
--- a/client/display_channel.cpp
+++ b/client/display_channel.cpp
@@ -31,7 +31,7 @@
#ifdef USE_OGL
#include "red_gl_canvas.h"
#endif
-#include "red_cairo_canvas.h"
+#include "red_sw_canvas.h"
#include "red_client.h"
#include "utils.h"
#include "debug.h"
@@ -1080,17 +1080,17 @@ void DisplayChannel::on_disconnect()
(*sync_event)->wait();
}
-bool DisplayChannel::create_cairo_canvas(int surface_id, int width, int height, uint32_t format)
+bool DisplayChannel::create_sw_canvas(int surface_id, int width, int height, uint32_t format)
{
try {
- CCanvas *canvas = new CCanvas(surface_id == 0, width, height, format,
+ SCanvas *canvas = new SCanvas(surface_id == 0, width, height, format,
screen()->get_window(),
_pixmap_cache, _palette_cache, _glz_window,
surfaces_mngr.get_surfaces());
surfaces_mngr.add_canvas(surface_id, canvas);
surfaces_mngr.add_surface(surface_id, canvas->get_internal_canvas());
if (surface_id == 0) {
- LOG_INFO("display %d: using cairo", get_id());
+ LOG_INFO("display %d: using sw", get_id());
}
} catch (...) {
return false;
@@ -1188,7 +1188,7 @@ void DisplayChannel::create_canvas(int surface_id, const std::vector<int>& canva
for (i = 0; i < canvas_types.size(); i++) {
- if (canvas_types[i] == CANVAS_OPTION_CAIRO && create_cairo_canvas(surface_id, width, height, format)) {
+ if (canvas_types[i] == CANVAS_OPTION_SW && create_sw_canvas(surface_id, width, height, format)) {
break;
}
#ifdef USE_OGL
diff --git a/client/display_channel.h b/client/display_channel.h
index e864bfc8..52b0cefd 100644
--- a/client/display_channel.h
+++ b/client/display_channel.h
@@ -133,7 +133,7 @@ protected:
private:
void set_draw_handlers();
void clear_draw_handlers();
- bool create_cairo_canvas(int surface_id, int width, int height, uint32_t format);
+ bool create_sw_canvas(int surface_id, int width, int height, uint32_t format);
#ifdef USE_OGL
bool create_ogl_canvas(int surface_id, int width, int height, uint32_t format, bool recreate,
RenderType rendertype);
diff --git a/client/gui/gui.cpp b/client/gui/gui.cpp
index 3e0f257b..9152ff1f 100644
--- a/client/gui/gui.cpp
+++ b/client/gui/gui.cpp
@@ -7,7 +7,7 @@
#include "screen.h"
#include "utils.h"
#include "debug.h"
-#include "red_pixmap_cairo.h"
+#include "red_pixmap_sw.h"
#include "resource_provider.h"
#include "CEGUISystem.h"
@@ -888,7 +888,7 @@ GUI::GUI(Application& app, Application::State state)
: ScreenLayer (SCREEN_LAYER_GUI, false)
, _app (app)
, _state (state)
- , _pixmap (new RedPixmapCairo(MAIN_GUI_WIDTH, MAIN_GUI_HEIGHT, RedDrawable::RGB32, true, 0))
+ , _pixmap (new RedPixmapSw(MAIN_GUI_WIDTH, MAIN_GUI_HEIGHT, RedDrawable::RGB32, true, 0))
, _renderer (new CEGUI::SoftRenderer(_pixmap->get_data(), MAIN_GUI_WIDTH, MAIN_GUI_HEIGHT,
_pixmap->get_stride()))
, _gui_system (new CEGUI::System(_renderer, new CEGUIResourceProvider()))
diff --git a/client/gui/gui.h b/client/gui/gui.h
index fd7e56ab..df41efe6 100644
--- a/client/gui/gui.h
+++ b/client/gui/gui.h
@@ -6,7 +6,7 @@
#include "inputs_handler.h"
#include "application.h"
-class RedPixmapCairo;
+class RedPixmapSw;
class GUI : public ScreenLayer, public KeyHandler {
public:
@@ -86,7 +86,7 @@ private:
private:
Application& _app;
Application::State _state;
- RedPixmapCairo* _pixmap;
+ RedPixmapSw* _pixmap;
CEGUI::SoftRenderer* _renderer;
CEGUI::System* _gui_system;
Dialog* _dialog;
diff --git a/client/red_gl_canvas.h b/client/red_gl_canvas.h
index dfe53d61..02609586 100644
--- a/client/red_gl_canvas.h
+++ b/client/red_gl_canvas.h
@@ -19,7 +19,7 @@
#define _H_GCANVAS
#include "canvas.h"
-#include "cairo_canvas.h"
+#include "sw_canvas.h"
#include "gl_canvas.h"
#include "red_pixmap_gl.h"
#include "red_window.h"
diff --git a/client/red_pixmap_gdi.h b/client/red_pixmap_gdi.h
index 524e6f31..bccce849 100644
--- a/client/red_pixmap_gdi.h
+++ b/client/red_pixmap_gdi.h
@@ -16,8 +16,8 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_RED_PIXMAP_CAIRO
-#define _H_RED_PIXMAP_CAIRO
+#ifndef _H_RED_PIXMAP_GDI
+#define _H_RED_PIXMAP_GDI
#include "red_pixmap.h"
diff --git a/client/red_pixmap_cairo.h b/client/red_pixmap_sw.h
index 7f285326..c6061358 100644
--- a/client/red_pixmap_cairo.h
+++ b/client/red_pixmap_sw.h
@@ -15,16 +15,16 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _H_RED_PIXMAP_CAIRO
-#define _H_RED_PIXMAP_CAIRO
+#ifndef _H_RED_PIXMAP_SW
+#define _H_RED_PIXMAP_SW
#include "red_pixmap.h"
#include "red_window.h"
-class RedPixmapCairo: public RedPixmap {
+class RedPixmapSw: public RedPixmap {
public:
- RedPixmapCairo(int width, int height, Format format, bool top_bottom, RedWindow *window);
- ~RedPixmapCairo();
+ RedPixmapSw(int width, int height, Format format, bool top_bottom, RedWindow *window);
+ ~RedPixmapSw();
};
#endif
diff --git a/client/red_cairo_canvas.cpp b/client/red_sw_canvas.cpp
index b795acff..05da4304 100644
--- a/client/red_cairo_canvas.cpp
+++ b/client/red_sw_canvas.cpp
@@ -19,13 +19,13 @@
#include "common.h"
#include <stdint.h>
#include "red_window.h"
-#include "red_cairo_canvas.h"
+#include "red_sw_canvas.h"
#include "utils.h"
#include "debug.h"
#include "region.h"
-#include "red_pixmap_cairo.h"
+#include "red_pixmap_sw.h"
-CCanvas::CCanvas(bool onscreen,
+SCanvas::SCanvas(bool onscreen,
int width, int height, uint32_t format, RedWindow *win,
PixmapCache& pixmap_cache, PaletteCache& palette_cache,
GlzDecoderWindow &glz_decoder_window, CSurfaces& csurfaces)
@@ -33,9 +33,9 @@ CCanvas::CCanvas(bool onscreen,
, _pixmap (0)
{
if (onscreen) {
- _pixmap = new RedPixmapCairo(width, height,
- RedDrawable::format_from_surface(format),
- true, win);
+ _pixmap = new RedPixmapSw(width, height,
+ RedDrawable::format_from_surface(format),
+ true, win);
_canvas = canvas_create_for_data(width, height, format,
_pixmap->get_data(),
_pixmap->get_stride(),
@@ -55,7 +55,7 @@ CCanvas::CCanvas(bool onscreen,
}
}
-CCanvas::~CCanvas()
+SCanvas::~SCanvas()
{
_canvas->ops->destroy(_canvas);
_canvas = NULL;
@@ -65,7 +65,7 @@ CCanvas::~CCanvas()
}
}
-void CCanvas::copy_pixels(const QRegion& region, RedDrawable& dest_dc)
+void SCanvas::copy_pixels(const QRegion& region, RedDrawable& dest_dc)
{
pixman_box32_t *rects;
int num_rects;
@@ -84,13 +84,13 @@ void CCanvas::copy_pixels(const QRegion& region, RedDrawable& dest_dc)
}
}
-void CCanvas::copy_pixels(const QRegion& region, RedDrawable* dest_dc, const PixmapHeader* pixmap)
+void SCanvas::copy_pixels(const QRegion& region, RedDrawable* dest_dc, const PixmapHeader* pixmap)
{
copy_pixels(region, *dest_dc);
}
-CanvasType CCanvas::get_pixmap_type()
+CanvasType SCanvas::get_pixmap_type()
{
- return CANVAS_TYPE_CAIRO;
+ return CANVAS_TYPE_SW;
}
diff --git a/client/red_cairo_canvas.h b/client/red_sw_canvas.h
index 9f4911bb..ebac7109 100644
--- a/client/red_cairo_canvas.h
+++ b/client/red_sw_canvas.h
@@ -20,17 +20,17 @@
#define _H_CCANVAS
#include "canvas.h"
-#include "cairo_canvas.h"
+#include "sw_canvas.h"
class RedPixmap;
-class CCanvas: public Canvas {
+class SCanvas: public Canvas {
public:
- CCanvas(bool onscreen,
+ SCanvas(bool onscreen,
int width, int height, uint32_t format, RedWindow *win,
PixmapCache& pixmap_cache, PaletteCache& palette_cache,
GlzDecoderWindow &glz_decoder_window, CSurfaces &csurfaces);
- virtual ~CCanvas();
+ virtual ~SCanvas();
virtual void thread_touch() {}
virtual void copy_pixels(const QRegion& region, RedDrawable* dc,
diff --git a/client/screen.cpp b/client/screen.cpp
index c2bd4e71..15679781 100644
--- a/client/screen.cpp
+++ b/client/screen.cpp
@@ -22,7 +22,7 @@
#include "utils.h"
#include "debug.h"
#include "monitor.h"
-#include "red_pixmap_cairo.h"
+#include "red_pixmap_sw.h"
#include "resource.h"
#include "icon.h"
@@ -171,8 +171,8 @@ void RedScreen::destroy_composit_area()
void RedScreen::create_composit_area()
{
destroy_composit_area();
- _composit_area = new RedPixmapCairo(_size.x, _size.y, _window.get_format(),
- false, &_window);
+ _composit_area = new RedPixmapSw(_size.x, _size.y, _window.get_format(),
+ false, &_window);
}
void RedScreen::adjust_window_rect(int x, int y)
diff --git a/client/cairo_canvas.cpp b/client/sw_canvas.cpp
index b2394858..33ec2726 100644
--- a/client/cairo_canvas.cpp
+++ b/client/sw_canvas.cpp
@@ -20,5 +20,5 @@
#define CANVAS_ERROR(format, ...) THROW(format, ## __VA_ARGS__)
-#include "../common/cairo_canvas.c"
+#include "../common/sw_canvas.c"
diff --git a/client/windows/red_pixmap_cairo.cpp b/client/windows/red_pixmap_sw.cpp
index 1c694db6..1a76530a 100644
--- a/client/windows/red_pixmap_cairo.cpp
+++ b/client/windows/red_pixmap_sw.cpp
@@ -17,7 +17,7 @@
*/
#include "common.h"
-#include "red_pixmap_cairo.h"
+#include "red_pixmap_sw.h"
#include "red_pixmap.h"
#include "debug.h"
#include "utils.h"
@@ -29,8 +29,8 @@ struct RedPixmap_p {
HBITMAP prev_bitmap;
};
-RedPixmapCairo::RedPixmapCairo(int width, int height, RedDrawable::Format format,
- bool top_bottom, RedWindow *win)
+RedPixmapSw::RedPixmapSw(int width, int height, RedDrawable::Format format,
+ bool top_bottom, RedWindow *win)
: RedPixmap(width, height, format, top_bottom)
{
DWORD *pixel_format;
@@ -98,7 +98,7 @@ RedPixmapCairo::RedPixmapCairo(int width, int height, RedDrawable::Format format
((RedPixmap_p*)get_opaque())->pixels_source_p.dc = dc.release();
}
-RedPixmapCairo::~RedPixmapCairo()
+RedPixmapSw::~RedPixmapSw()
{
HDC dc = ((RedPixmap_p*)get_opaque())->pixels_source_p.dc;
if (dc) {
diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj
index 29e0bfb8..d2540ce6 100644
--- a/client/windows/redc.vcproj
+++ b/client/windows/redc.vcproj
@@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".;..;..\..\common;..\..\..\spice-protocol;..\..\common\win;&quot;..\..\common\win\my_getopt-1.5&quot;;&quot;$(SPICE_LIBS)\include&quot;;&quot;$(SPICE_LIBS)\include\pixman-1&quot;;&quot;$(SPICE_LIBS)\include\CEGUI-0.6.2&quot;"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;CAIRO_CANVAS_ACCESS_TEST;CAIRO_CANVAS_CACHE;RED_DEBUG;CAIRO_CANVAS_NO_CHUNKS;_WIN32_WINNT=0x0500;LOG4CPLUS_STATIC;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;SW_CANVAS_ACCESS_TEST;SW_CANVAS_CACHE;RED_DEBUG;SW_CANVAS_NO_CHUNKS;_WIN32_WINNT=0x0500;LOG4CPLUS_STATIC;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=".;..;..\..\..\spice-protocol;..\..\common;..\..\common\win;&quot;..\..\common\win\my_getopt-1.5&quot;;&quot;$(SPICE_LIBS)\include&quot;;&quot;$(SPICE_LIBS)\include\pixman-1&quot;;&quot;$(SPICE_LIBS)\include\CEGUI-0.6.2&quot;"
- PreprocessorDefinitions="WIN32;_WINDOWS;CAIRO_CANVAS_ACCESS_TEST;CAIRO_CANVAS_CACHE;CAIRO_CANVAS_NO_CHUNKS;_WIN32_WINNT=0x0500;LOG4CPLUS_STATIC;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC"
+ PreprocessorDefinitions="WIN32;_WINDOWS;SW_CANVAS_ACCESS_TEST;SW_CANVAS_CACHE;SW_CANVAS_NO_CHUNKS;_WIN32_WINNT=0x0500;LOG4CPLUS_STATIC;USE_GLZ;PTW32_STATIC_LIB;CEGUI_STATIC"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
WarningLevel="3"
@@ -192,7 +192,7 @@
>
</File>
<File
- RelativePath="..\cairo_canvas.cpp"
+ RelativePath="..\sw_canvas.cpp"
>
</File>
<File
@@ -346,7 +346,7 @@
>
</File>
<File
- RelativePath="..\red_cairo_canvas.cpp"
+ RelativePath="..\red_sw_canvas.cpp"
>
</File>
<File
@@ -374,7 +374,7 @@
>
</File>
<File
- RelativePath=".\red_pixmap_cairo.cpp"
+ RelativePath=".\red_pixmap_sw.cpp"
>
</File>
<File
@@ -564,7 +564,7 @@
>
</File>
<File
- RelativePath="..\red_cairo_canvas.h"
+ RelativePath="..\red_sw_canvas.h"
>
</File>
<File
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index e5a3b773..904fb42b 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -6,9 +6,9 @@ CLIENT_DIR=$(top_srcdir)/client
SUBDIRS = images
INCLUDES = \
- -DCAIRO_CANVAS_ACCESS_TEST \
- -DCAIRO_CANVAS_CACHE \
- -DCAIRO_CANVAS_NO_CHUNKS \
+ -DSW_CANVAS_ACCESS_TEST \
+ -DSW_CANVAS_CACHE \
+ -DSW_CANVAS_NO_CHUNKS \
-DUSE_GLZ \
-DUSE_OGL \
-D__STDC_LIMIT_MACROS \
@@ -38,12 +38,12 @@ RED_COMMON_SRCS = \
$(CLIENT_DIR)/audio_channels.h \
$(CLIENT_DIR)/audio_devices.h \
$(CLIENT_DIR)/cache.hpp \
- $(CLIENT_DIR)/cairo_canvas.cpp \
+ $(CLIENT_DIR)/sw_canvas.cpp \
$(CLIENT_DIR)/canvas.cpp \
$(CLIENT_DIR)/canvas.h \
$(CLIENT_DIR)/canvas_utils.cpp \
- $(CLIENT_DIR)/red_cairo_canvas.cpp \
- $(CLIENT_DIR)/red_cairo_canvas.h \
+ $(CLIENT_DIR)/red_sw_canvas.cpp \
+ $(CLIENT_DIR)/red_sw_canvas.h \
$(CLIENT_DIR)/cmd_line_parser.cpp \
$(CLIENT_DIR)/cmd_line_parser.h \
$(CLIENT_DIR)/client_net_socket.cpp \
@@ -93,7 +93,7 @@ RED_COMMON_SRCS = \
$(CLIENT_DIR)/red_key.h \
$(CLIENT_DIR)/red_peer.cpp \
$(CLIENT_DIR)/red_peer.h \
- $(CLIENT_DIR)/red_pixmap_cairo.h \
+ $(CLIENT_DIR)/red_pixmap_sw.h \
$(CLIENT_DIR)/red_pixmap_gl.h \
$(CLIENT_DIR)/red_pixmap.h \
$(CLIENT_DIR)/red_types.h \
@@ -142,7 +142,7 @@ spicec_SOURCES = \
record.h \
red_drawable.cpp \
red_pixmap.cpp \
- red_pixmap_cairo.cpp \
+ red_pixmap_sw.cpp \
red_pixmap_gl.cpp \
red_window.cpp \
red_window_p.h \
diff --git a/client/x11/red_pixmap_cairo.cpp b/client/x11/red_pixmap_sw.cpp
index 863ed392..2b514b7f 100644
--- a/client/x11/red_pixmap_cairo.cpp
+++ b/client/x11/red_pixmap_sw.cpp
@@ -17,19 +17,19 @@
*/
#include "common.h"
-#include "red_pixmap_cairo.h"
+#include "red_pixmap_sw.h"
#include "debug.h"
#include "utils.h"
#include "pixels_source_p.h"
#include "x_platform.h"
-RedPixmapCairo::RedPixmapCairo(int width, int height, RedDrawable::Format format,
- bool top_bottom, RedWindow *win)
+RedPixmapSw::RedPixmapSw(int width, int height, RedDrawable::Format format,
+ bool top_bottom, RedWindow *win)
: RedPixmap(width, height, format, top_bottom)
{
ASSERT(format == RedDrawable::ARGB32 || format == RedDrawable::RGB32 ||
- format == RedDrawable::RGB16_555 || format == RedDrawable::RGB16_565 ||
- format == RedDrawable::A1);
+ format == RedDrawable::RGB16_555 || format == RedDrawable::RGB16_565 ||
+ format == RedDrawable::A1);
ASSERT(sizeof(RedDrawable_p) <= PIXELES_SOURCE_OPAQUE_SIZE);
pixman_image_t *pixman_image;
XImage *image;
@@ -73,7 +73,7 @@ RedPixmapCairo::RedPixmapCairo(int width, int height, RedDrawable::Format format
((PixelsSource_p*)get_opaque())->pixmap.format = format;
}
-RedPixmapCairo::~RedPixmapCairo()
+RedPixmapSw::~RedPixmapSw()
{
ASSERT(((PixelsSource_p*)get_opaque())->type == PIXELS_SOURCE_TYPE_PIXMAP);
generated by cgit (git 2.34.1) at 2024-06-08 18:42:35 +0000