diff --git a/vncviewer/Surface.cxx b/vncviewer/Surface.cxx
new file mode 100644
index 0000000..fbd4143
--- /dev/null
+++ b/vncviewer/Surface.cxx
@@ -0,0 +1,39 @@
+/* Copyright 2016 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 <FL/Fl_RGB_Image.H>
+
+#include "Surface.h"
+
+Surface::Surface(int width, int height) :
+  w(width), h(height)
+{
+  alloc();
+}
+
+Surface::Surface(const Fl_RGB_Image* image) :
+  w(image->w()), h(image->h())
+{
+  alloc();
+  update(image);
+}
+
+Surface::~Surface()
+{
+  dealloc();
+}