Added gl_view_raise_fg() to keep foreground objects on top.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@60 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/src/view-highlight.c b/glabels2/src/view-highlight.c
index 64a4df802bcd2087023a394da22dfbabc4a53450..af2e69bb18f53ce9696675e8b2d36c6716bc1b7b 100644 (file)
--- a/glabels2/src/view-highlight.c
+++ b/glabels2/src/view-highlight.c
@@ -314,6 +314,7 @@ highlight_resizable_box  (glViewObject *view_object,
                                    NULL);
 
        g_object_set_data (G_OBJECT (highlight), "object", object);
+       g_object_set_data (G_OBJECT (highlight), "view",   view);
 
        g_object_set_data (G_OBJECT (highlight), "outline", outline);
 
@@ -346,7 +347,9 @@ highlight_resizable_box  (glViewObject *view_object,
        g_signal_connect (G_OBJECT (outline), "event",
                          G_CALLBACK (passthrough_event_handler), view_object);
 
+       /* send to top, then lower below all items that form the foregound */
        gnome_canvas_item_raise_to_top (highlight);
+       gl_view_raise_fg (view);
 
        gl_debug (DEBUG_VIEW, "END");
 
@@ -420,6 +423,7 @@ highlight_resizable_line (glViewObject *view_object)
                                    NULL);
 
        g_object_set_data (G_OBJECT (highlight), "object", object);
+       g_object_set_data (G_OBJECT (highlight), "view",   view);
 
        g_object_set_data (G_OBJECT (highlight), "outline", outline);
 
@@ -436,7 +440,9 @@ highlight_resizable_line (glViewObject *view_object)
 
        gnome_canvas_points_free (points);
 
+       /* send to top, then lower below all items that form the foregound */
        gnome_canvas_item_raise_to_top (highlight);
+       gl_view_raise_fg (view);
 
        gl_debug (DEBUG_VIEW, "END");
 
@@ -484,14 +490,17 @@ highlight_simple         (glViewObject *view_object)
                                       NULL);
 
 
-       g_object_set_data (G_OBJECT (highlight), "outline", outline);
-
        g_object_set_data (G_OBJECT (highlight), "object", object);
+       g_object_set_data (G_OBJECT (highlight), "view",   view);
+
+       g_object_set_data (G_OBJECT (highlight), "outline", outline);
 
        g_signal_connect (G_OBJECT (highlight), "event",
                          G_CALLBACK (passthrough_event_handler), view_object);
 
+       /* send to top, then lower below all items that form the foregound */
        gnome_canvas_item_raise_to_top (highlight);
+       gl_view_raise_fg (view);
 
        gl_debug (DEBUG_VIEW, "END");
 
@@ -506,6 +515,7 @@ update_resizable_box  (GnomeCanvasItem *highlight,
                       glViewHighlightStyle style)
 {
        glLabelObject *object;
+       glView *view;
        gdouble w, h;
        GnomeCanvasItem *outline;               /* Outline around item */
        GnomeCanvasItem *tl, *tr, *bl, *br;     /* Handles at four corners */
@@ -518,6 +528,8 @@ update_resizable_box  (GnomeCanvasItem *highlight,
        object = g_object_get_data (G_OBJECT (highlight), "object");
        gl_label_object_get_size (object, &w, &h);
 
+       view = g_object_get_data (G_OBJECT (highlight), "view");
+
        outline = g_object_get_data (G_OBJECT (highlight), "outline");
 
        tl = g_object_get_data (G_OBJECT (highlight), "tl");
@@ -592,7 +604,9 @@ update_resizable_box  (GnomeCanvasItem *highlight,
                               "y2", h + 1.0,
                               NULL);
 
+       /* send to top, then lower below all items that form the foregound */
        gnome_canvas_item_raise_to_top (highlight);
+       gl_view_raise_fg (view);
 
        gl_debug (DEBUG_VIEW, "END");
 }
@@ -604,6 +618,7 @@ static void
 update_resizable_line (GnomeCanvasItem *highlight)
 {
        glLabelObject *object;
+       glView *view;
        gdouble dx, dy;
        GnomeCanvasPoints *points;
        GnomeCanvasItem *outline;       /* Outline around item */
@@ -616,6 +631,8 @@ update_resizable_line (GnomeCanvasItem *highlight)
        object = g_object_get_data (G_OBJECT (highlight), "object");
        gl_label_object_get_size (object, &dx, &dy);
 
+       view = g_object_get_data (G_OBJECT (highlight), "view");
+
        points = gnome_canvas_points_new (2);
 
        outline = g_object_get_data (G_OBJECT (highlight), "outline");
@@ -645,7 +662,9 @@ update_resizable_line (GnomeCanvasItem *highlight)
 
        gnome_canvas_points_free (points);
 
+       /* send to top, then lower below all items that form the foregound */
        gnome_canvas_item_raise_to_top (highlight);
+       gl_view_raise_fg (view);
 
        gl_debug (DEBUG_VIEW, "END");
 }
@@ -657,6 +676,7 @@ static void
 update_simple (GnomeCanvasItem *highlight)
 {
        glLabelObject *object;
+       glView *view;
        gdouble w, h;
        GnomeCanvasItem *outline;               /* Outline around item */
 
@@ -667,6 +687,8 @@ update_simple (GnomeCanvasItem *highlight)
        object = g_object_get_data (G_OBJECT (highlight), "object");
        gl_label_object_get_size (object, &w, &h);
 
+       view = g_object_get_data (G_OBJECT (highlight), "view");
+
        outline = g_object_get_data (G_OBJECT (highlight), "outline");
 
        gnome_canvas_item_set (outline,
@@ -674,7 +696,9 @@ update_simple (GnomeCanvasItem *highlight)
                               "y2", h + 0.5,
                               NULL);
 
+       /* send to top, then lower below all items that form the foregound */
        gnome_canvas_item_raise_to_top (highlight);
+       gl_view_raise_fg (view);
 
        gl_debug (DEBUG_VIEW, "END");
 }

diff --git a/glabels2/src/view-object.c b/glabels2/src/view-object.c
index 449f0317ed8336fbf4ff24a0c8053c860989a52d..b6dfa1c53b559394d29df5ae6befb2d5fb925574 100644 (file)
--- a/glabels2/src/view-object.c
+++ b/glabels2/src/view-object.c
@@ -210,14 +210,12 @@ gl_view_object_set_object     (glViewObject         *view_object,
                                       "y", y,
                                       NULL);
 
-       /* lower it below all items that form the foregound */
-       gnome_canvas_item_lower (view_object->private->group,
-                                view_object->private->view->n_fg_items);
-
        /* Create appropriate selection highlight canvas item. */
        view_object->private->highlight =
                gl_view_highlight_new (view_object, style);
 
+       gl_view_raise_fg (view_object->private->view);
+
        view_object->private->menu = GTK_WIDGET(new_menu (view_object));
 
        g_signal_connect (G_OBJECT (object), "moved",
@@ -362,6 +360,8 @@ gl_view_object_show_highlight     (glViewObject *view_object)
        gnome_canvas_item_show (view_object->private->highlight);
        gnome_canvas_item_raise_to_top (view_object->private->highlight);
 
+       gl_view_raise_fg (view_object->private->view);
+
        gl_debug (DEBUG_VIEW, "END");
 }
 
@@ -485,12 +485,13 @@ raise_object_cb (GtkWidget * widget,
 
        gl_debug (DEBUG_VIEW, "START");
 
+       /* send to top */
        gnome_canvas_item_raise_to_top (view_object->private->group);
+
+       /* send highlight to top */
        gnome_canvas_item_raise_to_top (view_object->private->highlight);
 
-       /* lower it below all items that form the foregound */
-       gnome_canvas_item_lower (view_object->private->group,
-                                view_object->private->view->n_fg_items);
+       gl_view_raise_fg (view_object->private->view);
 
        gl_debug (DEBUG_VIEW, "END");
 }

diff --git a/glabels2/src/view.c b/glabels2/src/view.c
index 8b7a1131d2fbeb1e8f70d49f027e089d819c4f78..b6b5d5f6817139f0b192badfe5c65e03205deff9 100644 (file)
--- a/glabels2/src/view.c
+++ b/glabels2/src/view.c
@@ -53,7 +53,8 @@ static GtkContainerClass *parent_class;
 static GdkAtom clipboard_atom = GDK_NONE;
 
 #define HOME_SCALE 2.0
-static gdouble scales[] = { 8.0, 6.0, 4.0, 3.0,
+static gdouble scales[] = {
+       8.0, 6.0, 4.0, 3.0,
        2.0,
        1.5, 1.0, 0.5, 0.25,
        0.0
@@ -63,64 +64,72 @@ static gdouble scales[] = { 8.0, 6.0, 4.0, 3.0,
 /* Local function prototypes                 */
 /*===========================================*/
 
-static void gl_view_class_init (glViewClass *class);
-static void gl_view_init       (glView * view);
-static void gl_view_finalize   (GObject * object);
+static void      gl_view_class_init          (glViewClass *class);
+static void      gl_view_init                (glView *view);
+static void      gl_view_finalize            (GObject *object);
 
 static void      gl_view_construct           (glView *view);
 static GtkWidget *gl_view_construct_canvas   (glView *view);
 static void      gl_view_construct_selection (glView *view);
 
-static gdouble get_apropriate_scale (gdouble w, gdouble h);
+static gdouble   get_apropriate_scale        (gdouble w, gdouble h);
 
-static void draw_rect_bg         (glView * view);
-static void draw_rounded_rect_bg (glView * view);
-static void draw_round_bg        (glView * view);
-static void draw_cd_bg           (glView * view);
+static void      draw_rect_bg_fg             (glView *view);
+static void      draw_rounded_rect_bg_fg     (glView *view);
+static void      draw_round_bg_fg            (glView *view);
+static void      draw_cd_bg_fg               (glView *view);
 
-static int canvas_event            (GnomeCanvas * canvas,
-                                   GdkEvent * event,
-                                   glView *view);
-static int canvas_event_arrow_mode (GnomeCanvas * canvas,
-                                   GdkEvent * event, glView *view);
+static int       canvas_event                (GnomeCanvas *canvas,
+                                             GdkEvent    *event,
+                                             glView      *view);
+static int       canvas_event_arrow_mode     (GnomeCanvas *canvas,
+                                             GdkEvent    *event,
+                                             glView      *view);
 
-static void         select_region           (glView * view,
+static void      select_region              (glView *view,
                                             gdouble x1,
                                             gdouble y1,
                                             gdouble x2,
                                             gdouble y2);
-static void         select_object           (glViewObject *view_object);
-static void         unselect_object         (glViewObject *view_object);
-static gboolean     object_at               (glView * view,
+static void      select_object              (glViewObject *view_object);
+static void      unselect_object            (glViewObject *view_object);
+static gboolean  object_at                  (glView *view,
                                             gdouble x, gdouble y);
-static gboolean     object_selected         (glViewObject *view_object);
-static gboolean     multiple_items_selected (glView * view);
+static gboolean  object_selected            (glViewObject *view_object);
+static gboolean  multiple_items_selected    (glView *view);
 
-static int item_event_arrow_mode (GnomeCanvasItem * item,
-                                 GdkEvent * event,
-                                 glViewObject *view_object);
+static int       item_event_arrow_mode      (GnomeCanvasItem *item,
+                                            GdkEvent        *event,
+                                            glViewObject    *view_object);
 
-static GtkWidget *new_selection_menu (glView * view);
+static GtkWidget *new_selection_menu        (glView *view);
 
-static void popup_selection_menu (glView *view,
-                                 glViewObject *view_object, GdkEvent *event);
+static void      popup_selection_menu       (glView       *view,
+                                            glViewObject *view_object,
+                                            GdkEvent     *event);
 
-static void move_selected_items (glView * view, gdouble dx, gdouble dy);
-static void move_item (GnomeCanvasItem * item, gdouble dx, gdouble dy);
+static void      move_selected_items        (glView *view,
+                                            gdouble dx, gdouble dy);
+static void      move_item                  (GnomeCanvasItem *item,
+                                            gdouble dx, gdouble dy);
 
-static void raise_selection_cb (GtkWidget * widget, glView * view);
-static void lower_selection_cb (GtkWidget * widget, glView * view);
+static void      raise_selection_cb         (GtkWidget *widget, glView *view);
+static void      lower_selection_cb         (GtkWidget *widget, glView *view);
 
-static void selection_clear_cb (GtkWidget * widget,
-                               GdkEventSelection * event, gpointer data);
+static void      selection_clear_cb         (GtkWidget         *widget,
+                                            GdkEventSelection *event,
+                                            gpointer          data);
 
-static void selection_get_cb (GtkWidget * widget,
-                             GtkSelectionData * selection_data, guint info,
-                             guint time, gpointer data);
+static void      selection_get_cb           (GtkWidget         *widget,
+                                            GtkSelectionData  *selection_data,
+                                            guint             info,
+                                            guint             time,
+                                            gpointer          data);
 
-static void selection_received_cb (GtkWidget * widget,
-                                  GtkSelectionData * selection_data,
-                                  guint time, gpointer data);
+static void      selection_received_cb      (GtkWidget         *widget,
+                                            GtkSelectionData  *selection_data,
+                                            guint             time,
+                                            gpointer          data);
 \f
 /****************************************************************************/
 /* Boilerplate Object stuff.                                                */
@@ -152,7 +161,7 @@ gl_view_get_type (void)
 }
 
 static void
-gl_view_class_init (glViewClass * class)
+gl_view_class_init (glViewClass *class)
 {
        GObjectClass *object_class = (GObjectClass *) class;
 
@@ -166,7 +175,7 @@ gl_view_class_init (glViewClass * class)
 }
 
 static void
-gl_view_init (glView * view)
+gl_view_init (glView *view)
 {
        gl_debug (DEBUG_VIEW, "START");
 
@@ -176,7 +185,7 @@ gl_view_init (glView * view)
 }
 
 static void
-gl_view_finalize (GObject * object)
+gl_view_finalize (GObject *object)
 {
        glView *view;
 
@@ -193,7 +202,7 @@ gl_view_finalize (GObject * object)
 }
 
 GtkWidget *
-gl_view_new (glLabel * label)
+gl_view_new (glLabel *label)
 {
        glView *view = g_object_new (gl_view_get_type (), NULL);
 
@@ -212,7 +221,7 @@ gl_view_new (glLabel * label)
 /* PRIVATE.  Construct composite widget.                                     */
 /*---------------------------------------------------------------------------*/
 static void
-gl_view_construct (glView * view)
+gl_view_construct (glView *view)
 {
        GtkWidget *wvbox, *wscroll;
 
@@ -244,7 +253,7 @@ gl_view_construct (glView * view)
 /* PRIVATE.  Create canvas w/ a background in the shape of the label/card.   */
 /*---------------------------------------------------------------------------*/
 static GtkWidget *
-gl_view_construct_canvas (glView * view)
+gl_view_construct_canvas (glView *view)
 {
        gdouble scale;
        glLabel *label = view->label;
@@ -290,25 +299,27 @@ gl_view_construct_canvas (glView * view)
        case GL_TEMPLATE_STYLE_RECT:
                if (label_template->label_round == 0.0) {
                        /* Square corners. */
-                       draw_rect_bg (view);
+                       draw_rect_bg_fg (view);
                } else {
                        /* Rounded corners. */
-                       draw_rounded_rect_bg (view);
+                       draw_rounded_rect_bg_fg (view);
                }
                break;
 
        case GL_TEMPLATE_STYLE_ROUND:
-               draw_round_bg (view);
+               draw_round_bg_fg (view);
                break;
 
        case GL_TEMPLATE_STYLE_CD:
-               draw_cd_bg (view);
+               draw_cd_bg_fg (view);
                break;
 
        default:
                g_warning ("Unknown template label style");
                break;
        }
+       gl_debug (DEBUG_VIEW, "n_bg_items = %d, n_fg_items = %d",
+                 view->n_bg_items, view->n_fg_items);
 
        g_signal_connect (G_OBJECT (view->canvas), "event",
                          G_CALLBACK (canvas_event), view);
@@ -350,7 +361,7 @@ gl_view_construct_canvas (glView * view)
 /* PRIVATE.  Create selection targets.                                       */
 /*---------------------------------------------------------------------------*/
 static void
-gl_view_construct_selection (glView * view)
+gl_view_construct_selection (glView *view)
 {
        gl_debug (DEBUG_VIEW, "START");
 
@@ -414,7 +425,7 @@ get_apropriate_scale (gdouble w, gdouble h)
 /* PRIVATE.  Draw simple recangular background.                              */
 /*---------------------------------------------------------------------------*/
 static void
-draw_rect_bg (glView * view)
+draw_rect_bg_fg (glView *view)
 {
        glLabel *label = view->label;
        glTemplate *template;
@@ -481,7 +492,7 @@ draw_rect_bg (glView * view)
 /* PRIVATE.  Draw rounded recangular background.                             */
 /*---------------------------------------------------------------------------*/
 static void
-draw_rounded_rect_bg (glView * view)
+draw_rounded_rect_bg_fg (glView *view)
 {
        glLabel *label = view->label;
        GnomeCanvasPoints *label_points, *margin_points;
@@ -622,7 +633,7 @@ draw_rounded_rect_bg (glView * view)
 /* PRIVATE.  Draw round background.                                          */
 /*---------------------------------------------------------------------------*/
 static void
-draw_round_bg (glView * view)
+draw_round_bg_fg (glView *view)
 {
        glLabel *label = view->label;
        glTemplate *template;
@@ -692,7 +703,7 @@ draw_round_bg (glView * view)
 /* PRIVATE.  Draw CD style background, circular w/ concentric hole.          */
 /*---------------------------------------------------------------------------*/
 static void
-draw_cd_bg (glView * view)
+draw_cd_bg_fg (glView *view)
 {
        glLabel *label = view->label;
        glTemplate *template;
@@ -796,11 +807,23 @@ draw_cd_bg (glView * view)
        gl_debug (DEBUG_VIEW, "END");
 }
 
+/*****************************************************************************/
+/* Raise foreground items to top.                                            */
+/*****************************************************************************/
+void gl_view_raise_fg (glView *view)
+{
+       GList *p;
+
+       for (p = view->fg_item_list; p != NULL; p = p->next) {
+               gnome_canvas_item_raise_to_top (GNOME_CANVAS_ITEM(p->data));
+       }
+}
+
 /*****************************************************************************/
 /* Set arrow mode.                                                           */
 /*****************************************************************************/
 void
-gl_view_arrow_mode (glView * view)
+gl_view_arrow_mode (glView *view)
 {
        static GdkCursor *cursor = NULL;
 
@@ -823,7 +846,7 @@ gl_view_arrow_mode (glView * view)
 /* Set create text object mode.                                              */
 /*****************************************************************************/
 void
-gl_view_object_create_mode (glView * view,
+gl_view_object_create_mode (glView            *view,
                            glLabelObjectType type)
 {
        GdkCursor *cursor;
@@ -881,7 +904,7 @@ gl_view_select_object (glView *view, glViewObject *view_object)
 /* Select all items.                                                         */
 /*****************************************************************************/
 void
-gl_view_select_all (glView * view)
+gl_view_select_all (glView *view)
 {
        GList *p;
 
@@ -902,7 +925,7 @@ gl_view_select_all (glView * view)
 /* Remove all selections                                                     */
 /*****************************************************************************/
 void
-gl_view_unselect_all (glView * view)
+gl_view_unselect_all (glView *view)
 {
        GList *p, *p_next;
 
@@ -922,7 +945,7 @@ gl_view_unselect_all (glView * view)
 /* "Cut" selected items and place in clipboard selections.                   */
 /*****************************************************************************/
 void
-gl_view_cut (glView * view)
+gl_view_cut (glView *view)
 {
        gl_debug (DEBUG_VIEW, "START");
 
@@ -938,7 +961,7 @@ gl_view_cut (glView * view)
 /* "Copy" selected items to clipboard selections.                            */
 /*****************************************************************************/
 void
-gl_view_copy (glView * view)
+gl_view_copy (glView *view)
 {
        GList *p;
        glViewObject *view_object;
@@ -1008,7 +1031,7 @@ gl_view_copy (glView * view)
 /* "Paste" from private clipboard selection.                                 */
 /*****************************************************************************/
 void
-gl_view_paste (glView * view)
+gl_view_paste (glView *view)
 {
        gl_debug (DEBUG_VIEW, "START");
 
@@ -1237,7 +1260,7 @@ canvas_event_arrow_mode (GnomeCanvas *canvas,
 /* PRIVATE.  Select all objects within given rectangular region.             */
 /*---------------------------------------------------------------------------*/
 static void
-select_region (glView * view,
+select_region (glView  *view,
               gdouble x1,
               gdouble y1,
               gdouble x2,
@@ -1280,7 +1303,7 @@ select_region (glView * view,
 static void
 select_object (glViewObject *view_object)
 {
-       glView * view;
+       glView *view;
 
        gl_debug (DEBUG_VIEW, "START");
 
@@ -1304,7 +1327,7 @@ select_object (glViewObject *view_object)
 static void
 unselect_object (glViewObject *view_object)
 {
-       glView * view;
+       glView *view;
 
        gl_debug (DEBUG_VIEW, "START");
 
@@ -1324,7 +1347,7 @@ unselect_object (glViewObject *view_object)
 /* PRIVATE. Return object at (x,y).                                          */
 /*---------------------------------------------------------------------------*/
 static gboolean
-object_at (glView * view,
+object_at (glView  *view,
           gdouble x,
           gdouble y)
 {
@@ -1371,7 +1394,7 @@ object_selected (glViewObject *view_object)
 /* PRIVATE.  Are there multiple objects in our current selection?            */
 /*---------------------------------------------------------------------------*/
 static gboolean
-multiple_items_selected (glView * view)
+multiple_items_selected (glView *view)
 {
        gl_debug (DEBUG_VIEW, "");
 
@@ -1554,7 +1577,7 @@ item_event_arrow_mode (GnomeCanvasItem *item,
 /* PRIVATE.  create menu for multiple selections.                            */
 /*---------------------------------------------------------------------------*/
 GtkWidget *
-new_selection_menu (glView * view)
+new_selection_menu (glView *view)
 {
        GtkWidget *menu, *menuitem;
 
@@ -1632,7 +1655,7 @@ popup_selection_menu (glView       *view,
 /* Delete selected objects.                                                  */
 /*---------------------------------------------------------------------------*/
 void
-gl_view_delete_selection (glView * view)
+gl_view_delete_selection (glView *view)
 {
        GList *p, *p_next;
 
@@ -1652,8 +1675,8 @@ gl_view_delete_selection (glView * view)
 /* PRIVATE.  raise item to front callback.                                   */
 /*---------------------------------------------------------------------------*/
 static void
-raise_selection_cb (GtkWidget * widget,
-                   glView * view)
+raise_selection_cb (GtkWidget *widget,
+                   glView    *view)
 {
        GList *p;
 
@@ -1672,8 +1695,8 @@ raise_selection_cb (GtkWidget * widget,
 /* PRIVATE.  lower item to back callback.                                    */
 /*---------------------------------------------------------------------------*/
 static void
-lower_selection_cb (GtkWidget * widget,
-                   glView * view)
+lower_selection_cb (GtkWidget *widget,
+                   glView    *view)
 {
        GList *p;
 
@@ -1692,7 +1715,7 @@ lower_selection_cb (GtkWidget * widget,
 /* PRIVATE.  move selected items                                             */
 /*---------------------------------------------------------------------------*/
 static void
-move_selected_items (glView * view,
+move_selected_items (glView  *view,
                     gdouble dx,
                     gdouble dy)
 {
@@ -1717,9 +1740,9 @@ move_selected_items (glView * view,
 /* PRIVATE.  Handle "selection-clear" signal.                                */
 /*---------------------------------------------------------------------------*/
 static void
-selection_clear_cb (GtkWidget * widget,
-                   GdkEventSelection * event,
-                   gpointer data)
+selection_clear_cb (GtkWidget         *widget,
+                   GdkEventSelection *event,
+                   gpointer          data)
 {
        glView *view = GL_VIEW (data);
 
@@ -1738,11 +1761,11 @@ selection_clear_cb (GtkWidget * widget,
 /* PRIVATE.  Handle "selection-get" signal.                                  */
 /*---------------------------------------------------------------------------*/
 static void
-selection_get_cb (GtkWidget * widget,
-                 GtkSelectionData * selection_data,
-                 guint info,
-                 guint time,
-                 gpointer data)
+selection_get_cb (GtkWidget        *widget,
+                 GtkSelectionData *selection_data,
+                 guint            info,
+                 guint            time,
+                 gpointer         data)
 {
        glView *view = GL_VIEW (data);
        gchar *buffer;
@@ -1769,10 +1792,10 @@ selection_get_cb (GtkWidget * widget,
 /* PRIVATE.  Handle "selection-received" signal.  (Result of Paste)          */
 /*---------------------------------------------------------------------------*/
 static void
-selection_received_cb (GtkWidget * widget,
-                      GtkSelectionData * selection_data,
-                      guint time,
-                      gpointer data)
+selection_received_cb (GtkWidget        *widget,
+                      GtkSelectionData *selection_data,
+                      guint            time,
+                      gpointer         data)
 {
        glView *view = GL_VIEW (data);
        glLabel *label = NULL;
@@ -1837,7 +1860,7 @@ selection_received_cb (GtkWidget * widget,
 /* Zoom in one "notch"                                                       */
 /*****************************************************************************/
 void
-gl_view_zoom_in (glView * view)
+gl_view_zoom_in (glView *view)
 {
        gint i, i_min;
        gdouble dist, dist_min;
@@ -1868,7 +1891,7 @@ gl_view_zoom_in (glView * view)
 /* Zoom out one "notch"                                                      */
 /*****************************************************************************/
 void
-gl_view_zoom_out (glView * view)
+gl_view_zoom_out (glView *view)
 {
        gint i, i_min;
        gdouble dist, dist_min;
@@ -1903,8 +1926,8 @@ gl_view_zoom_out (glView * view)
 /* Set current zoom factor to explicit value.                                */
 /*****************************************************************************/
 void
-gl_view_set_zoom (glView * view,
-                    gdouble scale)
+gl_view_set_zoom (glView  *view,
+                 gdouble scale)
 {
        gl_debug (DEBUG_VIEW, "START");
 
@@ -1922,7 +1945,7 @@ gl_view_set_zoom (glView * view,
 /* Get current zoom factor.                                                  */
 /*****************************************************************************/
 gdouble
-gl_view_get_zoom (glView * view)
+gl_view_get_zoom (glView *view)
 {
        gl_debug (DEBUG_VIEW, "");
 

diff --git a/glabels2/src/view.h b/glabels2/src/view.h
index 18777f44479af441c3243b47f0fd7e6086910971..1b3647ae09cc190d5a02dc2cd1046602d6324eb6 100644 (file)
--- a/glabels2/src/view.h
+++ b/glabels2/src/view.h
@@ -33,10 +33,10 @@ typedef enum {
        GL_VIEW_STATE_OBJECT_CREATE
 } glViewState;
 
-#define GL_TYPE_VIEW (gl_view_get_type ())
-#define GL_VIEW(obj) (GTK_CHECK_CAST((obj), GL_TYPE_VIEW, glView ))
-#define GL_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_VIEW, glViewClass))
-#define GL_IS_VIEW(obj) (GTK_CHECK_TYPE ((obj), GL_TYPE_VIEW))
+#define GL_TYPE_VIEW            (gl_view_get_type ())
+#define GL_VIEW(obj)            (GTK_CHECK_CAST((obj), GL_TYPE_VIEW, glView ))
+#define GL_VIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GL_TYPE_VIEW, glViewClass))
+#define GL_IS_VIEW(obj)         (GTK_CHECK_TYPE ((obj), GL_TYPE_VIEW))
 #define GL_IS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GL_TYPE_VIEW))
 
 typedef struct _glView glView;
@@ -45,59 +45,62 @@ typedef struct _glViewClass glViewClass;
 #include "view-object.h"
 
 struct _glView {
-       GtkVBox parent_widget;
+       GtkVBox           parent_widget;
 
-       glLabel *label;
+       glLabel           *label;
 
-       GtkWidget *canvas;
-       gdouble scale;
-       gint n_bg_items;
-       GList *bg_item_list;
-       gint n_fg_items;
-       GList *fg_item_list;
+       GtkWidget         *canvas;
+       gdouble           scale;
+       gint              n_bg_items;
+       GList             *bg_item_list;
+       gint              n_fg_items;
+       GList             *fg_item_list;
 
-       glViewState state;
+       glViewState       state;
        glLabelObjectType create_type;
 
-       GList *object_list;
-       GList *selected_object_list;
+       GList             *object_list;
+       GList             *selected_object_list;
 
-       gint have_selection;
-       glLabel *selection_data;
-       GtkWidget *invisible;
+       gint              have_selection;
+       glLabel           *selection_data;
+       GtkWidget         *invisible;
 
-       GtkWidget *menu;
+       GtkWidget         *menu;
 };
 
 struct _glViewClass {
-       GtkVBoxClass parent_class;
+       GtkVBoxClass      parent_class;
 };
 
-extern guint gl_view_get_type (void);
+extern guint     gl_view_get_type           (void);
 
-extern GtkWidget *gl_view_new (glLabel * label);
+extern GtkWidget *gl_view_new               (glLabel *label);
 
-extern void gl_view_arrow_mode (glView * view);
-extern void gl_view_object_create_mode (glView * view,
-                                       glLabelObjectType type);
+extern void      gl_view_raise_fg           (glView *view);
 
-extern void gl_view_select_object (glView *view, glViewObject *view_object);
-extern void gl_view_select_all (glView *view);
-extern void gl_view_unselect_all (glView *view);
-extern void gl_view_delete_selection (glView *view);
+extern void      gl_view_arrow_mode         (glView *view);
+extern void      gl_view_object_create_mode (glView *view,
+                                            glLabelObjectType type);
 
+extern void      gl_view_select_object      (glView *view,
+                                            glViewObject *view_object);
+extern void      gl_view_select_all         (glView *view);
+extern void      gl_view_unselect_all       (glView *view);
+extern void      gl_view_delete_selection   (glView *view);
 
-extern int gl_view_item_event_handler (GnomeCanvasItem * item,
-                                      GdkEvent * event,
-                                      glViewObject *view_object);
 
-extern void gl_view_cut (glView * view);
-extern void gl_view_copy (glView * view);
-extern void gl_view_paste (glView * view);
+extern int       gl_view_item_event_handler (GnomeCanvasItem *item,
+                                            GdkEvent        *event,
+                                            glViewObject    *view_object);
 
-extern void gl_view_zoom_in (glView * view);
-extern void gl_view_zoom_out (glView * view);
-extern void gl_view_set_zoom (glView * view, gdouble scale);
-extern gdouble gl_view_get_zoom (glView * view);
+extern void      gl_view_cut                (glView *view);
+extern void      gl_view_copy               (glView *view);
+extern void      gl_view_paste              (glView *view);
+
+extern void      gl_view_zoom_in            (glView *view);
+extern void      gl_view_zoom_out           (glView *view);
+extern void      gl_view_set_zoom           (glView *view, gdouble scale);
+extern gdouble   gl_view_get_zoom           (glView *view);
 
 #endif