[libview] Port to rendering-cleanup-next

[evince.git] / libview / ev-view.c

diff --git a/libview/ev-view.c b/libview/ev-view.c
index 85cf501edb7d8cff505d096d55a02a0d47015e71..1582f18c311cc6e08628081a0d295fc116c061ca 100644 (file)
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -32,6 +32,7 @@
 #include "ev-document-forms.h"
 #include "ev-document-images.h"
 #include "ev-document-links.h"
 #include "ev-document-forms.h"
 #include "ev-document-images.h"
 #include "ev-document-links.h"

+#include "ev-document-layers.h"

 #include "ev-document-misc.h"
 #include "ev-pixbuf-cache.h"
 #include "ev-page-cache.h"
 #include "ev-document-misc.h"
 #include "ev-pixbuf-cache.h"
 #include "ev-page-cache.h"


@@ -47,6 +48,7 @@
 #define EV_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass))
 #define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW))
 #define EV_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EV_TYPE_VIEW, EvViewClass))
 #define EV_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass))
 #define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW))
 #define EV_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EV_TYPE_VIEW, EvViewClass))

+#include <../gnome-games/libgames-support/games-debug.h>

 
 enum {
        SIGNAL_BINDING_ACTIVATED,
 
 enum {
        SIGNAL_BINDING_ACTIVATED,


@@ -56,6 +58,7 @@ enum {
        SIGNAL_SELECTION_CHANGED,
        SIGNAL_SYNC_SOURCE,
        SIGNAL_ANNOT_ADDED,
        SIGNAL_SELECTION_CHANGED,
        SIGNAL_SYNC_SOURCE,
        SIGNAL_ANNOT_ADDED,

+       SIGNAL_LAYERS_CHANGED,

        N_SIGNALS
 };
 
        N_SIGNALS
 };
 


@@ -155,8 +158,15 @@ static void       ev_view_size_allocate                      (GtkWidget
 static void       ev_view_realize                            (GtkWidget          *widget);
 static gboolean   ev_view_scroll_event                       (GtkWidget          *widget,
                                                              GdkEventScroll     *event);
 static void       ev_view_realize                            (GtkWidget          *widget);
 static gboolean   ev_view_scroll_event                       (GtkWidget          *widget,
                                                              GdkEventScroll     *event);

+#if GTK_CHECK_VERSION (2, 90, 8)
+static gboolean   ev_view_draw                               (GtkWidget          *widget,
+                                                              cairo_t            *cr,
+                                                              int                 draw_width,
+                                                              int                 draw_height);
+#else

 static gboolean   ev_view_expose_event                       (GtkWidget          *widget,
                                                              GdkEventExpose     *event);
 static gboolean   ev_view_expose_event                       (GtkWidget          *widget,
                                                              GdkEventExpose     *event);

+#endif

 static gboolean   ev_view_popup_menu                         (GtkWidget         *widget);
 static gboolean   ev_view_button_press_event                 (GtkWidget          *widget,
                                                              GdkEventButton     *event);
 static gboolean   ev_view_popup_menu                         (GtkWidget         *widget);
 static gboolean   ev_view_button_press_event                 (GtkWidget          *widget,
                                                              GdkEventButton     *event);


@@ -176,10 +186,13 @@ static AtkObject *ev_view_get_accessible                     (GtkWidget *widget)
 
 /*** Drawing ***/
 static void       highlight_find_results                     (EvView             *view,
 
 /*** Drawing ***/
 static void       highlight_find_results                     (EvView             *view,

+                                                              cairo_t            *cr,

                                                              int                 page);
 static void       highlight_forward_search_results           (EvView             *view,
                                                              int                 page);
 static void       highlight_forward_search_results           (EvView             *view,

+                                                              cairo_t            *cr,

                                                              int                 page);
 static void       focus_annotation                           (EvView             *view,
                                                              int                 page);
 static void       focus_annotation                           (EvView             *view,

+                                                              cairo_t            *cr,

                                                              int                 page,
                                                              GdkRectangle       *clip);
 static void       draw_one_page                              (EvView             *view,
                                                              int                 page,
                                                              GdkRectangle       *clip);
 static void       draw_one_page                              (EvView             *view,


@@ -789,7 +802,7 @@ add_scroll_binding_keypad (GtkBindingSet  *binding_set,
                           GtkScrollType   scroll,
                           gboolean        horizontal)
 {
                           GtkScrollType   scroll,
                           gboolean        horizontal)
 {

-  guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left;
+  guint keypad_keyval = keyval - GDK_KEY_Left + GDK_KEY_KP_Left;

 
   gtk_binding_entry_add_signal (binding_set, keyval, modifiers,
                                 "binding_activated", 2,
 
   gtk_binding_entry_add_signal (binding_set, keyval, modifiers,
                                 "binding_activated", 2,


@@ -1738,6 +1751,38 @@ ev_view_handle_link (EvView *view, EvLink *link)
                        ev_view_goto_dest (view, dest);
                }
                        break;
                        ev_view_goto_dest (view, dest);
                }
                        break;

+               case EV_LINK_ACTION_TYPE_LAYERS_STATE: {
+                       GList            *show, *hide, *toggle;
+                       GList            *l;
+                       EvDocumentLayers *document_layers;
+
+                       document_layers = EV_DOCUMENT_LAYERS (view->document);
+
+                       show = ev_link_action_get_show_list (action);
+                       for (l = show; l; l = g_list_next (l)) {
+                               ev_document_layers_show_layer (document_layers, EV_LAYER (l->data));
+                       }
+
+                       hide = ev_link_action_get_hide_list (action);
+                       for (l = hide; l; l = g_list_next (l)) {
+                               ev_document_layers_hide_layer (document_layers, EV_LAYER (l->data));
+                       }
+
+                       toggle = ev_link_action_get_toggle_list (action);
+                       for (l = toggle; l; l = g_list_next (l)) {
+                               EvLayer *layer = EV_LAYER (l->data);
+
+                               if (ev_document_layers_layer_is_visible (document_layers, layer)) {
+                                       ev_document_layers_hide_layer (document_layers, layer);
+                               } else {
+                                       ev_document_layers_show_layer (document_layers, layer);
+                               }
+                       }
+
+                       g_signal_emit (view, signals[SIGNAL_LAYERS_CHANGED], 0);
+                       ev_view_reload_page (view, view->current_page, NULL);
+               }
+                       break;

                case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
                case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
                case EV_LINK_ACTION_TYPE_LAUNCH:
                case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
                case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
                case EV_LINK_ACTION_TYPE_LAUNCH:


@@ -3306,14 +3351,28 @@ find_selection_for_page (EvView *view,
        return NULL;
 }
 
        return NULL;
 }
 

+#if GTK_CHECK_VERSION (2, 90, 8)
+static gboolean
+ev_view_draw (GtkWidget *widget,
+              cairo_t   *cr,
+              int        draw_width G_GNUC_UNUSED,
+              int        draw_height G_GNUC_UNUSED)
+#else

 static gboolean
 ev_view_expose_event (GtkWidget      *widget,
                      GdkEventExpose *event)
 static gboolean
 ev_view_expose_event (GtkWidget      *widget,
                      GdkEventExpose *event)

+#endif

 {
        EvView    *view = EV_VIEW (widget);
 {
        EvView    *view = EV_VIEW (widget);

-       GdkWindow *bin_window;
-       cairo_t   *cr;

        gint       i;
        gint       i;

+#if GTK_CHECK_VERSION (2, 90, 8)
+        cairo_rectangle_int_t clip_rect;
+        GdkRectangle *area = &clip_rect;
+#else
+        GdkWindow *bin_window;
+        cairo_t   *cr;
+        GdkRectangle *area = &event->area;
+#endif

 
        if (view->loading) {
                show_loading_window (view);
 
        if (view->loading) {
                show_loading_window (view);


@@ -3325,8 +3384,13 @@ ev_view_expose_event (GtkWidget      *widget,
        if (view->document == NULL)
                return FALSE;
 
        if (view->document == NULL)
                return FALSE;
 

-       bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view));
+#if GTK_CHECK_VERSION (2, 90, 8)
+        if (!gdk_cairo_get_clip_rectangle (cr, &clip_rect))
+                return FALSE;
+#else
+        bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view));

        cr = gdk_cairo_create (bin_window);
        cr = gdk_cairo_create (bin_window);

+#endif

 
        for (i = view->start_page; i >= 0 && i <= view->end_page; i++) {
                GdkRectangle page_area;
 
        for (i = view->start_page; i >= 0 && i <= view->end_page; i++) {
                GdkRectangle page_area;


@@ -3339,22 +3403,31 @@ ev_view_expose_event (GtkWidget      *widget,
                page_area.x -= view->scroll_x;
                page_area.y -= view->scroll_y;
 
                page_area.x -= view->scroll_x;
                page_area.y -= view->scroll_y;
 

-               draw_one_page (view, i, cr, &page_area, &border, &(event->area), &page_ready);
+               draw_one_page (view, i, cr, &page_area, &border, area, &page_ready);

 
                if (page_ready && view->find_pages && view->highlight_find_results)
 
                if (page_ready && view->find_pages && view->highlight_find_results)

-                       highlight_find_results (view, i);
+                       highlight_find_results (view, cr, i);

                if (page_ready && EV_IS_DOCUMENT_ANNOTATIONS (view->document))
                        show_annotation_windows (view, i);
                if (page_ready && view->focus_annotation)
                if (page_ready && EV_IS_DOCUMENT_ANNOTATIONS (view->document))
                        show_annotation_windows (view, i);
                if (page_ready && view->focus_annotation)

-                       focus_annotation (view, i, &event->area);
+#if GTK_CHECK_VERSION (2, 90, 8)
+                        focus_annotation (view, cr, i, &clip_rect);
+#else
+                       focus_annotation (view, cr, i, &event->area);
+#endif

                if (page_ready && view->synctex_result)
                if (page_ready && view->synctex_result)

-                       highlight_forward_search_results (view, i);
+                       highlight_forward_search_results (view, cr, i);

        }
 
        }
 

+#if GTK_CHECK_VERSION (2, 90, 8)
+        if (GTK_WIDGET_CLASS (ev_view_parent_class)->draw)
+                GTK_WIDGET_CLASS (ev_view_parent_class)->draw (widget, cr, draw_width, draw_height);
+#else

        cairo_destroy (cr);
 
        if (GTK_WIDGET_CLASS (ev_view_parent_class)->expose_event)
                (* GTK_WIDGET_CLASS (ev_view_parent_class)->expose_event) (widget, event);
        cairo_destroy (cr);
 
        if (GTK_WIDGET_CLASS (ev_view_parent_class)->expose_event)
                (* GTK_WIDGET_CLASS (ev_view_parent_class)->expose_event) (widget, event);

+#endif

 
        return FALSE;
 }
 
        return FALSE;
 }


@@ -3479,10 +3552,13 @@ ev_view_query_tooltip (GtkWidget  *widget,
                get_link_area (view, x, y, link, &link_area);
                gtk_tooltip_set_text (tooltip, text);
                gtk_tooltip_set_tip_area (tooltip, &link_area);
                get_link_area (view, x, y, link, &link_area);
                gtk_tooltip_set_text (tooltip, text);
                gtk_tooltip_set_tip_area (tooltip, &link_area);

+               g_free (text);
+
+               return TRUE;

        }
        g_free (text);
 
        }
        g_free (text);
 

-       return TRUE;
+       return FALSE;

 }
 
 static void
 }
 
 static void


@@ -4166,22 +4242,21 @@ ev_view_style_set (GtkWidget *widget,
 
 static void
 draw_rubberband (EvView             *view,
 
 static void
 draw_rubberband (EvView             *view,

-                GdkWindow          *window,
+                cairo_t            *cr,

                 const GdkRectangle *rect,
                 gdouble             alpha)
 {
        GtkStyle *style;
                 const GdkRectangle *rect,
                 gdouble             alpha)
 {
        GtkStyle *style;

-       GdkColor *fill_color_gdk;
+        const GdkColor *fill_color_gdk;

        gdouble   r, g, b;
        gdouble   r, g, b;

-       cairo_t  *cr;

 
        style = gtk_widget_get_style (GTK_WIDGET (view));
 
        style = gtk_widget_get_style (GTK_WIDGET (view));

-       fill_color_gdk = gdk_color_copy (&style->base[GTK_STATE_SELECTED]);
+       fill_color_gdk = &style->base[GTK_STATE_SELECTED];

        r = fill_color_gdk->red / 65535.;
        g = fill_color_gdk->green / 65535.;
        b = fill_color_gdk->blue / 65535.;
 
        r = fill_color_gdk->red / 65535.;
        g = fill_color_gdk->green / 65535.;
        b = fill_color_gdk->blue / 65535.;
 

-       cr = gdk_cairo_create (window);
+        cairo_save (cr);

 
        cairo_set_source_rgba (cr, r, g, b, alpha);
        cairo_rectangle (cr,
 
        cairo_set_source_rgba (cr, r, g, b, alpha);
        cairo_rectangle (cr,


@@ -4194,20 +4269,16 @@ draw_rubberband (EvView             *view,
        cairo_set_source_rgb (cr, r, g, b);
        cairo_stroke (cr);
 
        cairo_set_source_rgb (cr, r, g, b);
        cairo_stroke (cr);
 

-       cairo_destroy (cr);
-
-       gdk_color_free (fill_color_gdk);
+       cairo_restore (cr);

 }
 
 
 static void
 }
 
 
 static void

-highlight_find_results (EvView *view, int page)
+highlight_find_results (EvView *view,
+                        cairo_t *cr,
+                        int page)

 {
        gint       i, n_results = 0;
 {
        gint       i, n_results = 0;

-       GdkWindow *bin_window;
-
-       bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view));
-

        n_results = ev_view_find_get_n_results (view, page);
 
        for (i = 0; i < n_results; i++) {
        n_results = ev_view_find_get_n_results (view, page);
 
        for (i = 0; i < n_results; i++) {


@@ -4223,36 +4294,36 @@ highlight_find_results (EvView *view, int page)
 
                rectangle = ev_view_find_get_result (view, page, i);
                doc_rect_to_view_rect (view, page, rectangle, &view_rectangle);
 
                rectangle = ev_view_find_get_result (view, page, i);
                doc_rect_to_view_rect (view, page, rectangle, &view_rectangle);

-               draw_rubberband (view, bin_window, &view_rectangle, alpha);
+               draw_rubberband (view, cr, &view_rectangle, alpha);

         }
 }
 
 static void
         }
 }
 
 static void

-highlight_forward_search_results (EvView *view, int page)
+highlight_forward_search_results (EvView *view,
+                                  cairo_t *cr,
+                                  int page)

 {
 {

-       GdkWindow   *bin_window;

        GdkRectangle rect;
        GdkRectangle rect;

-       cairo_t     *cr;

        EvMapping   *mapping = view->synctex_result;
 
        if (GPOINTER_TO_INT (mapping->data) != page)
                return;
 
        EvMapping   *mapping = view->synctex_result;
 
        if (GPOINTER_TO_INT (mapping->data) != page)
                return;
 

-       bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view));

        doc_rect_to_view_rect (view, page, &mapping->area, &rect);
 
        doc_rect_to_view_rect (view, page, &mapping->area, &rect);
 

-       cr = gdk_cairo_create (bin_window);
+        cairo_save (cr);

        cairo_set_source_rgb (cr, 1., 0., 0.);
        cairo_rectangle (cr,
                         rect.x - view->scroll_x,
                         rect.y - view->scroll_y,
                         rect.width, rect.height);
        cairo_stroke (cr);
        cairo_set_source_rgb (cr, 1., 0., 0.);
        cairo_rectangle (cr,
                         rect.x - view->scroll_x,
                         rect.y - view->scroll_y,
                         rect.width, rect.height);
        cairo_stroke (cr);

-       cairo_destroy (cr);
+       cairo_restore (cr);

 }
 
 static void
 focus_annotation (EvView       *view,
 }
 
 static void
 focus_annotation (EvView       *view,

+                  cairo_t      *cr,

                  gint          page,
                  GdkRectangle *clip)
 {
                  gint          page,
                  GdkRectangle *clip)
 {


@@ -4265,6 +4336,15 @@ focus_annotation (EvView       *view,
                return;
 
        doc_rect_to_view_rect (view, page, &mapping->area, &rect);
                return;
 
        doc_rect_to_view_rect (view, page, &mapping->area, &rect);

+#if GTK_CHECK_VERSION (2, 90, 8)
+        gtk_paint_focus (gtk_widget_get_style (widget),
+                         cr,
+                         gtk_widget_get_state (widget),
+                         widget, NULL,
+                         rect.x - view->scroll_x,
+                         rect.y - view->scroll_y,
+                         rect.width + 1, rect.height + 1);
+#else

        gtk_paint_focus (gtk_widget_get_style (widget),
                         gtk_layout_get_bin_window (GTK_LAYOUT (view)),
                         gtk_widget_get_state (widget),
        gtk_paint_focus (gtk_widget_get_style (widget),
                         gtk_layout_get_bin_window (GTK_LAYOUT (view)),
                         gtk_widget_get_state (widget),


@@ -4272,6 +4352,7 @@ focus_annotation (EvView       *view,
                         rect.x - view->scroll_x,
                         rect.y - view->scroll_y,
                         rect.width + 1, rect.height + 1);
                         rect.x - view->scroll_x,
                         rect.y - view->scroll_y,
                         rect.width + 1, rect.height + 1);

+#endif

 }
 
 static void
 }
 
 static void


@@ -4595,7 +4676,11 @@ ev_view_class_init (EvViewClass *class)
 
        object_class->finalize = ev_view_finalize;
 
 
        object_class->finalize = ev_view_finalize;
 

+#if GTK_CHECK_VERSION (2, 90, 8)
+        widget_class->draw = ev_view_draw;
+#else

        widget_class->expose_event = ev_view_expose_event;
        widget_class->expose_event = ev_view_expose_event;

+#endif

        widget_class->button_press_event = ev_view_button_press_event;
        widget_class->motion_notify_event = ev_view_motion_notify_event;
        widget_class->button_release_event = ev_view_button_release_event;
        widget_class->button_press_event = ev_view_button_press_event;
        widget_class->motion_notify_event = ev_view_motion_notify_event;
        widget_class->button_release_event = ev_view_button_release_event;


@@ -4678,24 +4763,32 @@ ev_view_class_init (EvViewClass *class)
                         g_cclosure_marshal_VOID__OBJECT,
                         G_TYPE_NONE, 1,
                         EV_TYPE_ANNOTATION);
                         g_cclosure_marshal_VOID__OBJECT,
                         G_TYPE_NONE, 1,
                         EV_TYPE_ANNOTATION);

+       signals[SIGNAL_LAYERS_CHANGED] = g_signal_new ("layers-changed",
+                        G_TYPE_FROM_CLASS (object_class),
+                        G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                        G_STRUCT_OFFSET (EvViewClass, layers_changed),
+                        NULL, NULL,
+                        g_cclosure_marshal_VOID__VOID,
+                        G_TYPE_NONE, 0,
+                        G_TYPE_NONE);

 
        binding_set = gtk_binding_set_by_class (class);
 
 
        binding_set = gtk_binding_set_by_class (class);
 

-       add_scroll_binding_keypad (binding_set, GDK_Left,  0, GTK_SCROLL_STEP_BACKWARD, TRUE);
-       add_scroll_binding_keypad (binding_set, GDK_Right, 0, GTK_SCROLL_STEP_FORWARD,  TRUE);
-       add_scroll_binding_keypad (binding_set, GDK_Left,  GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, TRUE);
-       add_scroll_binding_keypad (binding_set, GDK_Right, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP,  TRUE);
-       add_scroll_binding_keypad (binding_set, GDK_Up,    0, GTK_SCROLL_STEP_BACKWARD, FALSE);
-       add_scroll_binding_keypad (binding_set, GDK_Down,  0, GTK_SCROLL_STEP_FORWARD,  FALSE);
-       add_scroll_binding_keypad (binding_set, GDK_Up,    GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, FALSE);
-       add_scroll_binding_keypad (binding_set, GDK_Down,  GDK_MOD1_MASK, GTK_SCROLL_STEP_UP,  FALSE);
-       gtk_binding_entry_add_signal (binding_set, GDK_H, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Left,  0, GTK_SCROLL_STEP_BACKWARD, TRUE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Right, 0, GTK_SCROLL_STEP_FORWARD,  TRUE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Left,  GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, TRUE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Right, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP,  TRUE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Up,    0, GTK_SCROLL_STEP_BACKWARD, FALSE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Down,  0, GTK_SCROLL_STEP_FORWARD,  FALSE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Up,    GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, FALSE);
+        add_scroll_binding_keypad (binding_set, GDK_KEY_Down,  GDK_MOD1_MASK, GTK_SCROLL_STEP_UP,  FALSE);
+        gtk_binding_entry_add_signal (binding_set, GDK_KEY_H, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,

                                      GTK_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, TRUE);
                                      GTK_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, TRUE);

-       gtk_binding_entry_add_signal (binding_set, GDK_J, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
+       gtk_binding_entry_add_signal (binding_set, GDK_KEY_J, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,

                                      GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, FALSE);
                                      GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, FALSE);

-       gtk_binding_entry_add_signal (binding_set, GDK_K, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
+       gtk_binding_entry_add_signal (binding_set, GDK_KEY_K, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,

                                      GTK_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, FALSE);
                                      GTK_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, FALSE);

-       gtk_binding_entry_add_signal (binding_set, GDK_L, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
+       gtk_binding_entry_add_signal (binding_set, GDK_KEY_L, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,

                                      GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, TRUE);
        
 }
                                      GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, TRUE);
        
 }