Add a cut-and-pasted version of GtkViewport

The cutted-and-pasted version doesn't have
gdk_window_process_updates(). See
https://bugzilla.gnome.org/show_bug.cgi?id=626046

5 files changed, 1305 insertions, 360 deletions

diff --git a/Makefile.am b/Makefile.am
index b2253ea..55b1b8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ siv_LDADD = $(DEPENDENCIES_LIBS)
 siv_SOURCES =	\
         siv.c \
         siv.h \
+	sivviewport.c \
         window.c
 
 dist_pkgdata_DATA = siv.glade
diff --git a/siv.glade b/siv.glade
index 6eb160b..7b3db2b 100644
--- a/siv.glade
+++ b/siv.glade
@@ -1,357 +1,259 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0"?>
 <glade-interface>
-
-<widget class="GtkWindow" id="main_window">
-  <property name="title" translatable="yes">window1</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkMenuBar" id="menubar1">
-	  <property name="visible">True</property>
-	  <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
-	  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="menuitem1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_File</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="menuitem1_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="menu_open">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-open</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_open1_activate" last_modification_time="Sat, 08 Mar 2008 14:22:13 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="menu_close">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-close</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_quit1_activate" last_modification_time="Sat, 08 Mar 2008 14:22:13 GMT"/>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="view1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_View</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="view1_menu">
-
-		  <child>
-		    <widget class="GtkCheckMenuItem" id="menu_toolbar">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Toolbar</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">True</property>
-		      <signal name="activate" handler="on_toolbar2_activate" last_modification_time="Wed, 15 Apr 2009 19:23:02 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckMenuItem" id="menu_status_bar">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Status _Bar</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">False</property>
-		      <signal name="activate" handler="on_status_bar1_activate" last_modification_time="Fri, 03 Jul 2009 05:30:58 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator3">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkRadioMenuItem" id="menu_white">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_White Background</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">False</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkRadioMenuItem" id="menu_checkerboard">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Checkerboard Background</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">False</property>
-		      <property name="group">menu_white</property>
-		      <signal name="activate" handler="on_check_pattern_activate" last_modification_time="Sat, 08 Mar 2008 14:28:25 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkRadioMenuItem" id="menu_no">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_No Background</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">True</property>
-		      <property name="group">menu_white</property>
-		      <signal name="activate" handler="on_background_activate" last_modification_time="Sat, 08 Mar 2008 14:28:25 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator1">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckMenuItem" id="menu_smooth_image">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Smooth Image</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">False</property>
-		      <signal name="activate" handler="on_smooth_image1_activate" last_modification_time="Sat, 08 Mar 2008 14:30:30 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator2">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="menu_zoom_in">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Zoom _In</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_menu_zoom_in_activate" last_modification_time="Sat, 08 Mar 2008 14:28:25 GMT"/>
-		      <accelerator key="plus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image2">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-zoom-in</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="menu_zoom_out">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Zoom _Out</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_menu_zoom_out_activate" last_modification_time="Sat, 08 Mar 2008 14:28:25 GMT"/>
-		      <accelerator key="minus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image3">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-zoom-out</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="menu_zoom_normal">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-zoom-100</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_menu_zoom_normal_activate" last_modification_time="Sat, 08 Mar 2008 15:18:13 GMT"/>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="menuitem4">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Help</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="menuitem4_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="menu_about">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-about</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_about1_activate" last_modification_time="Sat, 08 Mar 2008 14:22:13 GMT"/>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkToolbar" id="toolbar">
-	  <property name="visible">True</property>
-	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-	  <property name="tooltips">True</property>
-	  <property name="show_arrow">True</property>
-
-	  <child>
-	    <widget class="GtkToolButton" id="zoom_in">
-	      <property name="visible">True</property>
-	      <property name="stock_id">gtk-zoom-in</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkToolButton" id="zoom_out">
-	      <property name="visible">True</property>
-	      <property name="stock_id">gtk-zoom-out</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
-	      <property name="visible">True</property>
-	      <property name="draw">True</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkToolButton" id="zoom_normal">
-	      <property name="visible">True</property>
-	      <property name="stock_id">gtk-zoom-100</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkScrolledWindow" id="scrolled_window">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	  <property name="shadow_type">GTK_SHADOW_NONE</property>
-	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	  <child>
-	    <widget class="GtkViewport" id="viewport1">
-	      <property name="visible">True</property>
-	      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-	      <child>
-		<widget class="GtkDrawingArea" id="drawing_area">
-		  <property name="visible">True</property>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkStatusbar" id="status_bar">
-	  <property name="visible">True</property>
-	  <property name="has_resize_grip">True</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <widget class="GtkWindow" id="main_window">
+    <property name="title" translatable="yes">window1</property>
+    <child>
+      <widget class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <widget class="GtkMenuBar" id="menubar1">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkMenuItem" id="menuitem1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_File</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="menuitem1_menu">
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menu_open">
+                        <property name="label">gtk-open</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_open1_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menu_close">
+                        <property name="label">gtk-close</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_quit1_activate"/>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="view1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_View</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="view1_menu">
+                    <child>
+                      <widget class="GtkCheckMenuItem" id="menu_toolbar">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Toolbar</property>
+                        <property name="use_underline">True</property>
+                        <property name="active">True</property>
+                        <signal name="activate" handler="on_toolbar2_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckMenuItem" id="menu_status_bar">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Status _Bar</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_status_bar1_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separator3">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkRadioMenuItem" id="menu_white">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_White Background</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkRadioMenuItem" id="menu_checkerboard">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Checkerboard Background</property>
+                        <property name="use_underline">True</property>
+                        <property name="group">menu_white</property>
+                        <signal name="activate" handler="on_check_pattern_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkRadioMenuItem" id="menu_no">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_No Background</property>
+                        <property name="use_underline">True</property>
+                        <property name="active">True</property>
+                        <property name="group">menu_white</property>
+                        <signal name="activate" handler="on_background_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separator1">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckMenuItem" id="menu_smooth_image">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Smooth Image</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_smooth_image1_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separator2">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menu_zoom_in">
+                        <property name="label">gtk-zoom-in</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_menu_zoom_in_activate"/>
+                        <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menu_zoom_out">
+                        <property name="label">gtk-zoom-out</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_menu_zoom_out_activate"/>
+                        <accelerator key="minus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menu_zoom_normal">
+                        <property name="label">gtk-zoom-100</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_menu_zoom_normal_activate"/>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="menuitem4">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Help</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="menuitem4_menu">
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menu_about">
+                        <property name="label">gtk-about</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_about1_activate"/>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkToolbar" id="toolbar">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkToolButton" id="zoom_in">
+                <property name="visible">True</property>
+                <property name="is_important">True</property>
+                <property name="stock_id">gtk-zoom-in</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkToolButton" id="zoom_out">
+                <property name="visible">True</property>
+                <property name="is_important">True</property>
+                <property name="stock_id">gtk-zoom-out</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkToolButton" id="zoom_normal">
+                <property name="visible">True</property>
+                <property name="is_important">True</property>
+                <property name="stock_id">gtk-zoom-100</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkScrolledWindow" id="scrolled_window">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <child>
+              <placeholder/>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkStatusbar" id="status_bar">
+            <property name="visible">True</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>
diff --git a/sivviewport.c b/sivviewport.c
new file mode 100644
index 0000000..7387752
--- /dev/null
+++ b/sivviewport.c
@@ -0,0 +1,929 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#include "config.h"
+#include "sivviewport.h"
+
+#define P_(x) x
+#define I_(x) x
+
+#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+
+#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+
+static void
+siv_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
+				 GValue       *return_value,
+				 guint         n_param_values,
+				 const GValue *param_values,
+				 gpointer      invocation_hint,
+				 gpointer      marshal_data)
+{
+  typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer     data1,
+                                                    gpointer     arg_1,
+                                                    gpointer     arg_2,
+                                                    gpointer     data2);
+  register GMarshalFunc_VOID__OBJECT_OBJECT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+
+  g_return_if_fail (n_param_values == 3);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+  callback (data1,
+            g_marshal_value_peek_object (param_values + 1),
+            g_marshal_value_peek_object (param_values + 2),
+            data2);
+}
+
+/**
+ * SECTION:gtkviewport
+ * @Short_description: An adapter which makes widgets scrollable
+ * @Title: SivViewport
+ * @See_also:#GtkScrolledWindow, #GtkAdjustment
+ *
+ * The #SivViewport widget acts as an adaptor class, implementing
+ * scrollability for child widgets that lack their own scrolling
+ * capabilities. Use #SivViewport to scroll child widgets such as
+ * #GtkTable, #GtkBox, and so on.
+ *
+ * If a widget has native scrolling abilities, such as #GtkTextView,
+ * #GtkTreeView or #GtkIconview, it can be added to a #GtkScrolledWindow
+ * with gtk_container_add(). If a widget does not, you must first add the
+ * widget to a #SivViewport, then add the viewport to the scrolled window.
+ * The convenience function gtk_scrolled_window_add_with_viewport() does
+ * exactly this, so you can ignore the presence of the viewport.
+ */
+
+enum {
+  PROP_0,
+  PROP_HADJUSTMENT,
+  PROP_VADJUSTMENT,
+  PROP_SHADOW_TYPE
+};
+
+
+static void siv_viewport_finalize                 (GObject          *object);
+static void siv_viewport_destroy                  (GtkObject        *object);
+static void siv_viewport_set_property             (GObject         *object,
+						   guint            prop_id,
+						   const GValue    *value,
+						   GParamSpec      *pspec);
+static void siv_viewport_get_property             (GObject         *object,
+						   guint            prop_id,
+						   GValue          *value,
+						   GParamSpec      *pspec);
+static void siv_viewport_set_scroll_adjustments	  (SivViewport	    *viewport,
+						   GtkAdjustment    *hadjustment,
+						   GtkAdjustment    *vadjustment);
+static void siv_viewport_realize                  (GtkWidget        *widget);
+static void siv_viewport_unrealize                (GtkWidget        *widget);
+static void siv_viewport_paint                    (GtkWidget        *widget,
+						   GdkRectangle     *area);
+static gint siv_viewport_expose                   (GtkWidget        *widget,
+						   GdkEventExpose   *event);
+static void siv_viewport_add                      (GtkContainer     *container,
+						   GtkWidget        *widget);
+static void siv_viewport_size_request             (GtkWidget        *widget,
+						   GtkRequisition   *requisition);
+static void siv_viewport_size_allocate            (GtkWidget        *widget,
+						   GtkAllocation    *allocation);
+static void siv_viewport_adjustment_value_changed (GtkAdjustment    *adjustment,
+						   gpointer          data);
+static void siv_viewport_style_set                (GtkWidget *widget,
+			                           GtkStyle  *previous_style);
+
+G_DEFINE_TYPE (SivViewport, siv_viewport, GTK_TYPE_BIN)
+
+static void
+siv_viewport_class_init (SivViewportClass *class)
+{
+  GtkObjectClass *object_class;
+  GObjectClass   *gobject_class;
+  GtkWidgetClass *widget_class;
+  GtkContainerClass *container_class;
+
+  object_class = (GtkObjectClass*) class;
+  gobject_class = G_OBJECT_CLASS (class);
+  widget_class = (GtkWidgetClass*) class;
+  container_class = (GtkContainerClass*) class;
+
+  gobject_class->finalize = siv_viewport_finalize;
+  gobject_class->set_property = siv_viewport_set_property;
+  gobject_class->get_property = siv_viewport_get_property;
+  object_class->destroy = siv_viewport_destroy;
+  
+  widget_class->realize = siv_viewport_realize;
+  widget_class->unrealize = siv_viewport_unrealize;
+  widget_class->expose_event = siv_viewport_expose;
+  widget_class->size_request = siv_viewport_size_request;
+  widget_class->size_allocate = siv_viewport_size_allocate;
+  widget_class->style_set = siv_viewport_style_set;
+  
+  container_class->add = siv_viewport_add;
+
+  class->set_scroll_adjustments = siv_viewport_set_scroll_adjustments;
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_HADJUSTMENT,
+                                   g_param_spec_object ("hadjustment",
+							P_("Horizontal adjustment"),
+							P_("The GtkAdjustment that determines the values of the horizontal position for this viewport"),
+                                                        GTK_TYPE_ADJUSTMENT,
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_VADJUSTMENT,
+                                   g_param_spec_object ("vadjustment",
+							P_("Vertical adjustment"),
+							P_("The GtkAdjustment that determines the values of the vertical position for this viewport"),
+                                                        GTK_TYPE_ADJUSTMENT,
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_SHADOW_TYPE,
+                                   g_param_spec_enum ("shadow-type",
+						      P_("Shadow type"),
+						      P_("Determines how the shadowed box around the viewport is drawn"),
+						      GTK_TYPE_SHADOW_TYPE,
+						      GTK_SHADOW_IN,
+						      GTK_PARAM_READWRITE));
+
+  /**
+   * SivViewport::set-scroll-adjustments
+   * @horizontal: the horizontal #GtkAdjustment
+   * @vertical: the vertical #GtkAdjustment
+   *
+   * Set the scroll adjustments for the viewport. Usually scrolled containers
+   * like #GtkScrolledWindow will emit this signal to connect two instances
+   * of #GtkScrollbar to the scroll directions of the #SivViewport.
+   */
+  widget_class->set_scroll_adjustments_signal =
+    g_signal_new (I_("set-scroll-adjustments"),
+		  G_OBJECT_CLASS_TYPE (gobject_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET (SivViewportClass, set_scroll_adjustments),
+		  NULL, NULL,
+		  siv_marshal_VOID__OBJECT_OBJECT,
+		  G_TYPE_NONE, 2,
+		  GTK_TYPE_ADJUSTMENT,
+		  GTK_TYPE_ADJUSTMENT);
+}
+
+static void
+siv_viewport_set_property (GObject         *object,
+			   guint            prop_id,
+			   const GValue    *value,
+			   GParamSpec      *pspec)
+{
+  SivViewport *viewport;
+
+  viewport = SIV_VIEWPORT (object);
+
+  switch (prop_id)
+    {
+    case PROP_HADJUSTMENT:
+      siv_viewport_set_hadjustment (viewport, g_value_get_object (value));
+      break;
+    case PROP_VADJUSTMENT:
+      siv_viewport_set_vadjustment (viewport, g_value_get_object (value));
+      break;
+    case PROP_SHADOW_TYPE:
+      siv_viewport_set_shadow_type (viewport, g_value_get_enum (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+siv_viewport_get_property (GObject         *object,
+			   guint            prop_id,
+			   GValue          *value,
+			   GParamSpec      *pspec)
+{
+  SivViewport *viewport;
+
+  viewport = SIV_VIEWPORT (object);
+
+  switch (prop_id)
+    {
+    case PROP_HADJUSTMENT:
+      g_value_set_object (value, viewport->hadjustment);
+      break;
+    case PROP_VADJUSTMENT:
+      g_value_set_object (value, viewport->vadjustment);
+      break;
+    case PROP_SHADOW_TYPE:
+      g_value_set_enum (value, viewport->shadow_type);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+siv_viewport_init (SivViewport *viewport)
+{
+  gtk_widget_set_has_window (GTK_WIDGET (viewport), TRUE);
+
+  gtk_widget_set_redraw_on_allocate (GTK_WIDGET (viewport), FALSE);
+  gtk_container_set_resize_mode (GTK_CONTAINER (viewport), GTK_RESIZE_QUEUE);
+  
+  viewport->shadow_type = GTK_SHADOW_IN;
+  viewport->view_window = NULL;
+  viewport->bin_window = NULL;
+  viewport->hadjustment = NULL;
+  viewport->vadjustment = NULL;
+}
+
+/**
+ * siv_viewport_new:
+ * @hadjustment: horizontal adjustment.
+ * @vadjustment: vertical adjustment.
+ * @returns: a new #SivViewport.
+ *
+ * Creates a new #SivViewport with the given adjustments.
+ *
+ **/
+GtkWidget*
+siv_viewport_new (GtkAdjustment *hadjustment,
+		  GtkAdjustment *vadjustment)
+{
+  GtkWidget *viewport;
+
+  viewport = g_object_new (SIV_TYPE_VIEWPORT,
+			     "hadjustment", hadjustment,
+			     "vadjustment", vadjustment,
+			     NULL);
+
+  return viewport;
+}
+
+#define ADJUSTMENT_POINTER(viewport, orientation)         \
+  (((orientation) == GTK_ORIENTATION_HORIZONTAL) ?        \
+     &(viewport)->hadjustment : &(viewport)->vadjustment)
+
+static void
+viewport_disconnect_adjustment (SivViewport    *viewport,
+				GtkOrientation  orientation)
+{
+  GtkAdjustment **adjustmentp = ADJUSTMENT_POINTER (viewport, orientation);
+
+  if (*adjustmentp)
+    {
+      g_signal_handlers_disconnect_by_func (*adjustmentp,
+					    siv_viewport_adjustment_value_changed,
+					    viewport);
+      g_object_unref (*adjustmentp);
+      *adjustmentp = NULL;
+    }
+}
+
+static void
+siv_viewport_finalize (GObject *object)
+{
+  SivViewport *viewport = SIV_VIEWPORT (object);
+
+  viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL);
+  viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_VERTICAL);
+
+  G_OBJECT_CLASS (siv_viewport_parent_class)->finalize (object);
+}
+
+static void
+siv_viewport_destroy (GtkObject *object)
+{
+  SivViewport *viewport = SIV_VIEWPORT (object);
+
+  viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL);
+  viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_VERTICAL);
+
+  GTK_OBJECT_CLASS (siv_viewport_parent_class)->destroy (object);
+}
+
+/**
+ * siv_viewport_get_hadjustment:
+ * @viewport: a #SivViewport.
+ * 
+ * Returns the horizontal adjustment of the viewport.
+ *
+ * Return value: the horizontal adjustment of @viewport.
+ **/
+GtkAdjustment*
+siv_viewport_get_hadjustment (SivViewport *viewport)
+{
+  g_return_val_if_fail (SIV_IS_VIEWPORT (viewport), NULL);
+
+  if (!viewport->hadjustment)
+    siv_viewport_set_hadjustment (viewport, NULL);
+
+  return viewport->hadjustment;
+}
+
+/**
+ * siv_viewport_get_vadjustment:
+ * @viewport: a #SivViewport.
+ * 
+ * Returns the vertical adjustment of the viewport.
+ *
+ * Return value: the vertical adjustment of @viewport.
+ **/
+GtkAdjustment*
+siv_viewport_get_vadjustment (SivViewport *viewport)
+{
+  g_return_val_if_fail (SIV_IS_VIEWPORT (viewport), NULL);
+
+  if (!viewport->vadjustment)
+    siv_viewport_set_vadjustment (viewport, NULL);
+
+  return viewport->vadjustment;
+}
+
+static void
+viewport_get_view_allocation (SivViewport   *viewport,
+			      GtkAllocation *view_allocation)
+{
+  GtkWidget *widget = GTK_WIDGET (viewport);
+  GtkAllocation *allocation = &widget->allocation;
+  gint border_width = GTK_CONTAINER (viewport)->border_width;
+  
+  view_allocation->x = 0;
+  view_allocation->y = 0;
+
+  if (viewport->shadow_type != GTK_SHADOW_NONE)
+    {
+      view_allocation->x = widget->style->xthickness;
+      view_allocation->y = widget->style->ythickness;
+    }
+
+  view_allocation->width = MAX (1, allocation->width - view_allocation->x * 2 - border_width * 2);
+  view_allocation->height = MAX (1, allocation->height - view_allocation->y * 2 - border_width * 2);
+}
+
+static void
+viewport_reclamp_adjustment (GtkAdjustment *adjustment,
+			     gboolean      *value_changed)
+{
+  gdouble value = adjustment->value;
+  
+  value = CLAMP (value, 0, adjustment->upper - adjustment->page_size);
+  if (value != adjustment->value)
+    {
+      adjustment->value = value;
+      if (value_changed)
+	*value_changed = TRUE;
+    }
+  else if (value_changed)
+    *value_changed = FALSE;
+}
+
+static void
+viewport_set_hadjustment_values (SivViewport *viewport,
+				 gboolean    *value_changed)
+{
+  GtkBin *bin = GTK_BIN (viewport);
+  GtkAllocation view_allocation;
+  GtkAdjustment *hadjustment = siv_viewport_get_hadjustment (viewport);
+  gdouble old_page_size;
+  gdouble old_upper;
+  gdouble old_value;
+  
+  viewport_get_view_allocation (viewport, &view_allocation);  
+
+  old_page_size = hadjustment->page_size;
+  old_upper = hadjustment->upper;
+  old_value = hadjustment->value;
+  hadjustment->page_size = view_allocation.width;
+  hadjustment->step_increment = view_allocation.width * 0.1;
+  hadjustment->page_increment = view_allocation.width * 0.9;
+  
+  hadjustment->lower = 0;
+
+  if (bin->child && gtk_widget_get_visible (bin->child))
+    {
+      GtkRequisition child_requisition;
+      
+      gtk_widget_get_child_requisition (bin->child, &child_requisition);
+      hadjustment->upper = MAX (child_requisition.width, view_allocation.width);
+    }
+  else
+    hadjustment->upper = view_allocation.width;
+
+  if (gtk_widget_get_direction (GTK_WIDGET (viewport)) == GTK_TEXT_DIR_RTL) 
+    {
+      gdouble dist = old_upper - (old_value + old_page_size);
+      hadjustment->value = hadjustment->upper - dist - hadjustment->page_size;
+      viewport_reclamp_adjustment (hadjustment, value_changed);
+      *value_changed = (old_value != hadjustment->value);
+    }
+  else
+    viewport_reclamp_adjustment (hadjustment, value_changed);
+}
+
+static void
+viewport_set_vadjustment_values (SivViewport *viewport,
+				 gboolean    *value_changed)
+{
+  GtkBin *bin = GTK_BIN (viewport);
+  GtkAllocation view_allocation;
+  GtkAdjustment *vadjustment = siv_viewport_get_vadjustment (viewport);
+
+  viewport_get_view_allocation (viewport, &view_allocation);  
+
+  vadjustment->page_size = view_allocation.height;
+  vadjustment->step_increment = view_allocation.height * 0.1;
+  vadjustment->page_increment = view_allocation.height * 0.9;
+  
+  vadjustment->lower = 0;
+
+  if (bin->child && gtk_widget_get_visible (bin->child))
+    {
+      GtkRequisition child_requisition;
+      
+      gtk_widget_get_child_requisition (bin->child, &child_requisition);
+      vadjustment->upper = MAX (child_requisition.height, view_allocation.height);
+    }
+  else
+    vadjustment->upper = view_allocation.height;
+
+  viewport_reclamp_adjustment (vadjustment, value_changed);
+}
+
+static void
+viewport_set_adjustment (SivViewport    *viewport,
+			 GtkOrientation  orientation,
+			 GtkAdjustment  *adjustment)
+{
+  GtkAdjustment **adjustmentp = ADJUSTMENT_POINTER (viewport, orientation);
+  gboolean value_changed;
+
+  if (adjustment && adjustment == *adjustmentp)
+    return;
+
+  if (!adjustment)
+    adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0,
+						     0.0, 0.0, 0.0));
+  viewport_disconnect_adjustment (viewport, orientation);
+  *adjustmentp = adjustment;
+  g_object_ref_sink (adjustment);
+
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    viewport_set_hadjustment_values (viewport, &value_changed);
+  else
+    viewport_set_vadjustment_values (viewport, &value_changed);
+
+  g_signal_connect (adjustment, "value-changed",
+		    G_CALLBACK (siv_viewport_adjustment_value_changed),
+		    viewport);
+
+  gtk_adjustment_changed (adjustment);
+  
+  if (value_changed)
+    gtk_adjustment_value_changed (adjustment);
+  else
+    siv_viewport_adjustment_value_changed (adjustment, viewport);
+}
+
+/**
+ * siv_viewport_set_hadjustment:
+ * @viewport: a #SivViewport.
+ * @adjustment: (allow-none): a #GtkAdjustment.
+ *
+ * Sets the horizontal adjustment of the viewport.
+ **/
+void
+siv_viewport_set_hadjustment (SivViewport   *viewport,
+			      GtkAdjustment *adjustment)
+{
+  g_return_if_fail (SIV_IS_VIEWPORT (viewport));
+  if (adjustment)
+    g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
+
+  viewport_set_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL, adjustment);
+
+  g_object_notify (G_OBJECT (viewport), "hadjustment");
+}
+
+/**
+ * siv_viewport_set_vadjustment:
+ * @viewport: a #SivViewport.
+ * @adjustment: (allow-none): a #GtkAdjustment.
+ *
+ * Sets the vertical adjustment of the viewport.
+ **/
+void
+siv_viewport_set_vadjustment (SivViewport   *viewport,
+			      GtkAdjustment *adjustment)
+{
+  g_return_if_fail (SIV_IS_VIEWPORT (viewport));
+  if (adjustment)
+    g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
+
+  viewport_set_adjustment (viewport, GTK_ORIENTATION_VERTICAL, adjustment);
+
+  g_object_notify (G_OBJECT (viewport), "vadjustment");
+}
+
+static void
+siv_viewport_set_scroll_adjustments (SivViewport      *viewport,
+				     GtkAdjustment    *hadjustment,
+				     GtkAdjustment    *vadjustment)
+{
+  siv_viewport_set_hadjustment (viewport, hadjustment);
+  siv_viewport_set_vadjustment (viewport, vadjustment);
+}
+
+/** 
+ * siv_viewport_set_shadow_type:
+ * @viewport: a #SivViewport.
+ * @type: the new shadow type.
+ *
+ * Sets the shadow type of the viewport.
+ **/ 
+void
+siv_viewport_set_shadow_type (SivViewport   *viewport,
+			      GtkShadowType  type)
+{
+  g_return_if_fail (SIV_IS_VIEWPORT (viewport));
+
+  if ((GtkShadowType) viewport->shadow_type != type)
+    {
+      viewport->shadow_type = type;
+
+      if (gtk_widget_get_visible (GTK_WIDGET (viewport)))
+	{
+	  gtk_widget_size_allocate (GTK_WIDGET (viewport), &(GTK_WIDGET (viewport)->allocation));
+	  gtk_widget_queue_draw (GTK_WIDGET (viewport));
+	}
+
+      g_object_notify (G_OBJECT (viewport), "shadow-type");
+    }
+}
+
+/**
+ * siv_viewport_get_shadow_type:
+ * @viewport: a #SivViewport
+ *
+ * Gets the shadow type of the #SivViewport. See
+ * siv_viewport_set_shadow_type().
+ 
+ * Return value: the shadow type 
+ **/
+GtkShadowType
+siv_viewport_get_shadow_type (SivViewport *viewport)
+{
+  g_return_val_if_fail (SIV_IS_VIEWPORT (viewport), GTK_SHADOW_NONE);
+
+  return viewport->shadow_type;
+}
+
+/**
+ * siv_viewport_get_bin_window:
+ * @viewport: a #SivViewport
+ *
+ * Gets the bin window of the #SivViewport.
+ *
+ * Return value: a #GdkWindow
+ *
+ * Since: 2.20
+ **/
+GdkWindow*
+siv_viewport_get_bin_window (SivViewport *viewport)
+{
+  g_return_val_if_fail (SIV_IS_VIEWPORT (viewport), NULL);
+
+  return viewport->bin_window;
+}
+
+/**
+ * siv_viewport_get_view_window:
+ * @viewport: a #SivViewport
+ *
+ * Gets the view window of the #SivViewport.
+ *
+ * Return value: (transfer none): a #GdkWindow
+ *
+ * Since: 2.22
+ **/
+GdkWindow*
+siv_viewport_get_view_window (SivViewport *viewport)
+{
+  g_return_val_if_fail (SIV_IS_VIEWPORT (viewport), NULL);
+
+  return viewport->view_window;
+}
+
+static void
+siv_viewport_realize (GtkWidget *widget)
+{
+  SivViewport *viewport = SIV_VIEWPORT (widget);
+  GtkBin *bin = GTK_BIN (widget);
+  GtkAdjustment *hadjustment = siv_viewport_get_hadjustment (viewport);
+  GtkAdjustment *vadjustment = siv_viewport_get_vadjustment (viewport);
+  gint border_width = GTK_CONTAINER (widget)->border_width;
+  
+  GtkAllocation view_allocation;
+  GdkWindowAttr attributes;
+  gint attributes_mask;
+  gint event_mask;
+
+  gtk_widget_set_realized (widget, TRUE);
+
+  attributes.x = widget->allocation.x + border_width;
+  attributes.y = widget->allocation.y + border_width;
+  attributes.width = widget->allocation.width - border_width * 2;
+  attributes.height = widget->allocation.height - border_width * 2;
+  attributes.window_type = GDK_WINDOW_CHILD;
+  attributes.wclass = GDK_INPUT_OUTPUT;
+  attributes.visual = gtk_widget_get_visual (widget);
+  attributes.colormap = gtk_widget_get_colormap (widget);
+
+  event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
+  /* We select on button_press_mask so that button 4-5 scrolls are trapped.
+   */
+  attributes.event_mask = event_mask | GDK_BUTTON_PRESS_MASK;
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+
+  widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
+				   &attributes, attributes_mask);
+  gdk_window_set_user_data (widget->window, viewport);
+
+  viewport_get_view_allocation (viewport, &view_allocation);
+  
+  attributes.x = view_allocation.x;
+  attributes.y = view_allocation.y;
+  attributes.width = view_allocation.width;
+  attributes.height = view_allocation.height;
+  attributes.event_mask = 0;
+
+  viewport->view_window = gdk_window_new (widget->window, &attributes, attributes_mask);
+  gdk_window_set_user_data (viewport->view_window, viewport);
+
+  gdk_window_set_back_pixmap (viewport->view_window, NULL, FALSE);
+  
+  attributes.x = - hadjustment->value;
+  attributes.y = - vadjustment->value;
+  attributes.width = hadjustment->upper;
+  attributes.height = vadjustment->upper;
+  
+  attributes.event_mask = event_mask;
+
+  viewport->bin_window = gdk_window_new (viewport->view_window, &attributes, attributes_mask);
+  gdk_window_set_user_data (viewport->bin_window, viewport);
+
+  if (bin->child)
+    gtk_widget_set_parent_window (bin->child, viewport->bin_window);
+
+  widget->style = gtk_style_attach (widget->style, widget->window);
+  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+  gtk_style_set_background (widget->style, viewport->bin_window, GTK_STATE_NORMAL);
+
+  /* Call paint here to allow a theme to set the background without flashing
+   */
+  gtk_paint_flat_box(widget->style, viewport->bin_window, GTK_STATE_NORMAL,
+		     GTK_SHADOW_NONE,
+		     NULL, widget, "viewportbin",
+		     0, 0, -1, -1);
+   
+  gdk_window_show (viewport->bin_window);
+  gdk_window_show (viewport->view_window);
+}
+
+static void
+siv_viewport_unrealize (GtkWidget *widget)
+{
+  SivViewport *viewport = SIV_VIEWPORT (widget);
+
+  gdk_window_set_user_data (viewport->view_window, NULL);
+  gdk_window_destroy (viewport->view_window);
+  viewport->view_window = NULL;
+
+  gdk_window_set_user_data (viewport->bin_window, NULL);
+  gdk_window_destroy (viewport->bin_window);
+  viewport->bin_window = NULL;
+
+  GTK_WIDGET_CLASS (siv_viewport_parent_class)->unrealize (widget);
+}
+
+static void
+siv_viewport_paint (GtkWidget    *widget,
+		    GdkRectangle *area)
+{
+  if (gtk_widget_is_drawable (widget))
+    {
+      SivViewport *viewport = SIV_VIEWPORT (widget);
+
+      gtk_paint_shadow (widget->style, widget->window,
+			GTK_STATE_NORMAL, viewport->shadow_type,
+			area, widget, "viewport",
+			0, 0, -1, -1);
+    }
+}
+
+static gint
+siv_viewport_expose (GtkWidget      *widget,
+		     GdkEventExpose *event)
+{
+  SivViewport *viewport;
+
+  if (gtk_widget_is_drawable (widget))
+    {
+      viewport = SIV_VIEWPORT (widget);
+
+      if (event->window == widget->window)
+	siv_viewport_paint (widget, &event->area);
+      else if (event->window == viewport->bin_window)
+	{
+	  gtk_paint_flat_box(widget->style, viewport->bin_window, 
+			     GTK_STATE_NORMAL, GTK_SHADOW_NONE,
+			     &event->area, widget, "viewportbin",
+			     0, 0, -1, -1);
+
+	  GTK_WIDGET_CLASS (siv_viewport_parent_class)->expose_event (widget, event);
+	}
+    }
+
+  return FALSE;
+}
+
+static void
+siv_viewport_add (GtkContainer *container,
+		  GtkWidget    *child)
+{
+  GtkBin *bin = GTK_BIN (container);
+
+  g_return_if_fail (bin->child == NULL);
+
+  gtk_widget_set_parent_window (child, SIV_VIEWPORT (bin)->bin_window);
+
+  GTK_CONTAINER_CLASS (siv_viewport_parent_class)->add (container, child);
+}
+
+static void
+siv_viewport_size_request (GtkWidget      *widget,
+			   GtkRequisition *requisition)
+{
+  GtkBin *bin = GTK_BIN (widget);
+  GtkRequisition child_requisition;
+
+  requisition->width = GTK_CONTAINER (widget)->border_width;
+
+  requisition->height = GTK_CONTAINER (widget)->border_width;
+
+  if (SIV_VIEWPORT (widget)->shadow_type != GTK_SHADOW_NONE)
+    {
+      requisition->width += 2 * widget->style->xthickness;
+      requisition->height += 2 * widget->style->ythickness;
+    }
+
+  if (bin->child && gtk_widget_get_visible (bin->child))
+    {
+      gtk_widget_size_request (bin->child, &child_requisition);
+      requisition->width += child_requisition.width;
+      requisition->height += child_requisition.height;
+    }
+}
+
+static void
+siv_viewport_size_allocate (GtkWidget     *widget,
+			    GtkAllocation *allocation)
+{
+  SivViewport *viewport = SIV_VIEWPORT (widget);
+  GtkBin *bin = GTK_BIN (widget);
+  gint border_width = GTK_CONTAINER (widget)->border_width;
+  gboolean hadjustment_value_changed, vadjustment_value_changed;
+  GtkAdjustment *hadjustment = siv_viewport_get_hadjustment (viewport);
+  GtkAdjustment *vadjustment = siv_viewport_get_vadjustment (viewport);
+  GtkAllocation child_allocation;
+
+  /* If our size changed, and we have a shadow, queue a redraw on widget->window to
+   * redraw the shadow correctly.
+   */
+  if (gtk_widget_get_mapped (widget) &&
+      viewport->shadow_type != GTK_SHADOW_NONE &&
+      (widget->allocation.width != allocation->width ||
+       widget->allocation.height != allocation->height))
+    gdk_window_invalidate_rect (widget->window, NULL, FALSE);
+  
+  widget->allocation = *allocation;
+  
+  viewport_set_hadjustment_values (viewport, &hadjustment_value_changed);
+  viewport_set_vadjustment_values (viewport, &vadjustment_value_changed);
+  
+  child_allocation.x = 0;
+  child_allocation.y = 0;
+  child_allocation.width = hadjustment->upper;
+  child_allocation.height = vadjustment->upper;
+  if (gtk_widget_get_realized (widget))
+    {
+      GtkAllocation view_allocation;
+      gdk_window_move_resize (widget->window,
+			      allocation->x + border_width,
+			      allocation->y + border_width,
+			      allocation->width - border_width * 2,
+			      allocation->height - border_width * 2);
+      
+      viewport_get_view_allocation (viewport, &view_allocation);
+      gdk_window_move_resize (viewport->view_window,
+			      view_allocation.x,
+			      view_allocation.y,
+			      view_allocation.width,
+			      view_allocation.height);
+      gdk_window_move_resize (viewport->bin_window,
+                              - hadjustment->value,
+                              - vadjustment->value,
+                              child_allocation.width,
+                              child_allocation.height);
+    }
+  if (bin->child && gtk_widget_get_visible (bin->child))
+    gtk_widget_size_allocate (bin->child, &child_allocation);
+
+  gtk_adjustment_changed (hadjustment);
+  gtk_adjustment_changed (vadjustment);
+  if (hadjustment_value_changed)
+    gtk_adjustment_value_changed (hadjustment);
+  if (vadjustment_value_changed)
+    gtk_adjustment_value_changed (vadjustment);
+}
+
+static void
+siv_viewport_adjustment_value_changed (GtkAdjustment *adjustment,
+				       gpointer       data)
+{
+  SivViewport *viewport = SIV_VIEWPORT (data);
+  GtkBin *bin = GTK_BIN (data);
+
+  if (bin->child && gtk_widget_get_visible (bin->child) &&
+      gtk_widget_get_realized (GTK_WIDGET (viewport)))
+    {
+      GtkAdjustment *hadjustment = siv_viewport_get_hadjustment (viewport);
+      GtkAdjustment *vadjustment = siv_viewport_get_vadjustment (viewport);
+      gint old_x, old_y;
+      gint new_x, new_y;
+
+      gdk_window_get_position (viewport->bin_window, &old_x, &old_y);
+      new_x = - hadjustment->value;
+      new_y = - vadjustment->value;
+
+      if (new_x != old_x || new_y != old_y)
+	{
+	  gdk_window_move (viewport->bin_window, new_x, new_y);
+#if 0
+	  gdk_window_process_updates (viewport->bin_window, TRUE);
+#endif
+	}
+    }
+}
+
+static void
+siv_viewport_style_set (GtkWidget *widget,
+			GtkStyle  *previous_style)
+{
+   if (gtk_widget_get_realized (widget) &&
+       gtk_widget_get_has_window (widget))
+     {
+	SivViewport *viewport = SIV_VIEWPORT (widget);
+
+	gtk_style_set_background (widget->style, viewport->bin_window, GTK_STATE_NORMAL);
+	gtk_style_set_background (widget->style, widget->window, widget->state);
+     }
+}
diff --git a/sivviewport.h b/sivviewport.h
new file mode 100644
index 0000000..32d6f1a
--- /dev/null
+++ b/sivviewport.h
@@ -0,0 +1,93 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#ifndef __SIV_VIEWPORT_H__
+#define __SIV_VIEWPORT_H__
+
+
+#include <gtk/gtkadjustment.h>
+#include <gtk/gtkbin.h>
+
+
+G_BEGIN_DECLS
+
+
+#define SIV_TYPE_VIEWPORT            (siv_viewport_get_type ())
+#define SIV_VIEWPORT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIV_TYPE_VIEWPORT, SivViewport))
+#define SIV_VIEWPORT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SIV_TYPE_VIEWPORT, SivViewportClass))
+#define SIV_IS_VIEWPORT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIV_TYPE_VIEWPORT))
+#define SIV_IS_VIEWPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SIV_TYPE_VIEWPORT))
+#define SIV_VIEWPORT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), SIV_TYPE_VIEWPORT, SivViewportClass))
+
+
+typedef struct _SivViewport       SivViewport;
+typedef struct _SivViewportClass  SivViewportClass;
+
+struct _SivViewport
+{
+  GtkBin bin;
+
+  GtkShadowType GSEAL (shadow_type);
+  GdkWindow *GSEAL (view_window);
+  GdkWindow *GSEAL (bin_window);
+  GtkAdjustment *GSEAL (hadjustment);
+  GtkAdjustment *GSEAL (vadjustment);
+};
+
+struct _SivViewportClass
+{
+  GtkBinClass parent_class;
+
+  void	(*set_scroll_adjustments)	(SivViewport	*viewport,
+					 GtkAdjustment	*hadjustment,
+					 GtkAdjustment	*vadjustment);
+};
+
+
+GType          siv_viewport_get_type        (void) G_GNUC_CONST;
+GtkWidget*     siv_viewport_new             (GtkAdjustment *hadjustment,
+					     GtkAdjustment *vadjustment);
+GtkAdjustment* siv_viewport_get_hadjustment (SivViewport   *viewport);
+GtkAdjustment* siv_viewport_get_vadjustment (SivViewport   *viewport);
+void           siv_viewport_set_hadjustment (SivViewport   *viewport,
+					     GtkAdjustment *adjustment);
+void           siv_viewport_set_vadjustment (SivViewport   *viewport,
+					     GtkAdjustment *adjustment);
+void           siv_viewport_set_shadow_type (SivViewport   *viewport,
+					     GtkShadowType  type);
+GtkShadowType  siv_viewport_get_shadow_type (SivViewport   *viewport);
+GdkWindow*     siv_viewport_get_bin_window  (SivViewport   *viewport);
+GdkWindow*     siv_viewport_get_view_window (SivViewport   *viewport);
+
+
+G_END_DECLS
+
+
+#endif /* __SIV_VIEWPORT_H__ */
diff --git a/window.c b/window.c
index 6069480..591c921 100644
--- a/window.c
+++ b/window.c
@@ -6,6 +6,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include "siv.h"
+#include "sivviewport.h"
 
 #define MIN_ZOOM	-80
 #define MAX_ZOOM	 65
@@ -13,6 +14,7 @@
 struct SivWindow
 {
     GladeXML *		xml;
+    GtkWidget *		drawing_area;
     char *		filename;
     GdkPixbuf *		original;
 
@@ -39,7 +41,12 @@ struct SivWindow
 static void *
 get_widget (SivWindow *window, const char *name)
 {
-    void *result = glade_xml_get_widget (window->xml, name);
+    void *result;
+
+    if (strcmp (name, "drawing_area") == 0)
+	result = window->drawing_area;
+    else
+	result = glade_xml_get_widget (window->xml, name);
 
     if (!result)
 	g_error ("Could not find widget %s\n", name);
@@ -314,8 +321,9 @@ set_status_bar (SivWindow *window)
 	width = gdk_pixbuf_get_width (window->original);
 	height = gdk_pixbuf_get_height (window->original);
 
-	text = g_strdup_printf ("   %d x %d    %.0f %%",
-				width, height, 100 * get_scale (window));
+#define TIMES "\303\227"
+	text = g_strdup_printf ("   %d "TIMES" %d    %d%%",
+				width, height, (int)(100 * get_scale (window) + 0.5));
 
 	gtk_statusbar_push (bar, 0, text);
 
@@ -928,7 +936,7 @@ on_about (GtkWidget *widget, gpointer data)
 
     gtk_show_about_dialog (get_widget (window, "main_window"),
 			   "program-name", APPLICATION_NAME,
-			   "copyright", "Copyright 2008, 2009, S"OSLASH"ren Sandmann",
+			   "copyright", "Copyright 2008, 2009, 2010, S"OSLASH"ren Sandmann",
 			   "logo-icon-name", "siv",
 			   "version", PACKAGE_VERSION,
 			   NULL);
@@ -980,7 +988,7 @@ connect_signals (SivWindow *window)
     for (i = 0; i < G_N_ELEMENTS (connections); ++i)
     {
 	const Info *info = &connections[i];
-	GtkWidget *widget = glade_xml_get_widget (window->xml, info->widget);
+	GtkWidget *widget = get_widget (window, info->widget);
 	if (widget)
 	    g_signal_connect (widget, info->signal, info->callback, window);
 	else
@@ -1148,10 +1156,22 @@ SivWindow *
 window_new (App *app)
 {
     SivWindow *window = g_new0 (SivWindow, 1);
+    GtkWidget *scrolled_window, *viewport;
 
     window->xml = glade_xml_new (GLADE_FILE, NULL, NULL);
     window->app = app;
 
+    scrolled_window = get_widget (window, "scrolled_window");
+
+    viewport = siv_viewport_new (NULL, NULL);
+    window->drawing_area = gtk_drawing_area_new ();
+    
+    gtk_container_add (GTK_CONTAINER (scrolled_window), viewport);
+    gtk_container_add (GTK_CONTAINER (viewport), window->drawing_area);
+
+    gtk_widget_show (viewport);
+    gtk_widget_show (window->drawing_area);
+    
     gtk_widget_add_events (get_widget (window, "drawing_area"),
 			   GDK_SCROLL_MASK |
 			   GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);