]> git.sur5r.net Git - glabels/blobdiff - src/view-box.c
Object dragging enhancement
[glabels] / src / view-box.c
index bcb76931512cfc6efb3ba04b44e6c69cf3f88308..408d68c907539e3dabcd243d14a17e3ccbb60623 100644 (file)
 
 #include "view-box.h"
 
-#include <glib/gi18n.h>
-#include <glib.h>
+#include <gdk-pixbuf/gdk-pixdata.h>
 
-#include "color.h"
-#include "object-editor.h"
-#include "stock.h"
-
-#include "pixmaps/cursor_box.xbm"
-#include "pixmaps/cursor_box_mask.xbm"
+#include "label-box.h"
+#include "cursors/cursor_pixdata.h"
 
 #include "debug.h"
 
 /* Private macros and constants.                          */
 /*========================================================*/
 
+#define X_HOTSPOT 7
+#define Y_HOTSPOT 7
+
 
 /*========================================================*/
 /* Private types.                                         */
 /*========================================================*/
 
-struct _glViewBoxPrivate {
-};
-
 
 /*========================================================*/
 /* Private globals.                                       */
@@ -57,321 +52,6 @@ struct _glViewBoxPrivate {
 /* Private function prototypes.                           */
 /*========================================================*/
 
-static void       gl_view_box_finalize              (GObject          *object);
-
-static GtkWidget *construct_properties_editor       (glViewObject     *view_object);
-
-static void       update_object_from_editor_cb      (glObjectEditor   *editor,
-                                                    glLabelObject    *object);
-
-static void       update_editor_from_object_cb      (glLabelObject    *object,
-                                                    glObjectEditor   *editor);
-
-static void       update_editor_from_move_cb        (glLabelObject    *object,
-                                                    gdouble           dx,
-                                                    gdouble           dy,
-                                                    glObjectEditor   *editor);
-
-static gboolean   object_at                         (glViewObject     *view_object,
-                                                     cairo_t          *cr,
-                                                     gdouble           x,
-                                                     gdouble           y);
-
-
-/*****************************************************************************/
-/* Boilerplate object stuff.                                                 */
-/*****************************************************************************/
-G_DEFINE_TYPE (glViewBox, gl_view_box, GL_TYPE_VIEW_OBJECT);
-
-
-static void
-gl_view_box_class_init (glViewBoxClass *class)
-{
-       GObjectClass      *object_class      = G_OBJECT_CLASS (class);
-       glViewObjectClass *view_object_class = GL_VIEW_OBJECT_CLASS (class);
-
-       gl_debug (DEBUG_VIEW, "START");
-
-       gl_view_box_parent_class = g_type_class_peek_parent (class);
-
-       object_class->finalize = gl_view_box_finalize;
-
-       view_object_class->construct_editor = construct_properties_editor;
-       view_object_class->object_at        = object_at;
-
-       gl_debug (DEBUG_VIEW, "END");
-}
-
-
-static void
-gl_view_box_init (glViewBox *view_box)
-{
-       gl_debug (DEBUG_VIEW, "START");
-
-       view_box->priv = g_new0 (glViewBoxPrivate, 1);
-
-       gl_debug (DEBUG_VIEW, "END");
-}
-
-
-static void
-gl_view_box_finalize (GObject *object)
-{
-        glViewBox *view_box = GL_VIEW_BOX (object);
-
-       gl_debug (DEBUG_VIEW, "START");
-
-       g_return_if_fail (object && GL_IS_VIEW_BOX (object));
-
-        g_free (view_box->priv);
-
-       G_OBJECT_CLASS (gl_view_box_parent_class)->finalize (object);
-
-       gl_debug (DEBUG_VIEW, "END");
-}
-
-
-/*****************************************************************************/
-/* NEW box object view.                                                      */
-/*****************************************************************************/
-glViewObject *
-gl_view_box_new (glLabelBox *object,
-                glView     *view)
-{
-       glViewBox         *view_box;
-
-       gl_debug (DEBUG_VIEW, "START");
-
-       g_return_val_if_fail (object && GL_IS_LABEL_BOX (object), NULL);
-       g_return_val_if_fail (view && GL_IS_VIEW (view), NULL);
-       
-       view_box = g_object_new (gl_view_box_get_type(), NULL);
-
-       gl_view_object_set_object (GL_VIEW_OBJECT(view_box),
-                                  GL_LABEL_OBJECT(object),
-                                  GL_VIEW_OBJECT_HANDLES_BOX);
-       gl_view_object_set_view (GL_VIEW_OBJECT(view_box), view);
-
-       gl_debug (DEBUG_VIEW, "END");
-
-       return GL_VIEW_OBJECT (view_box);
-}
-
-
-/*****************************************************************************/
-/* Create a properties dialog for a box object.                              */
-/*****************************************************************************/
-static GtkWidget *
-construct_properties_editor (glViewObject *view_object)
-{
-       GtkWidget          *editor;
-       glViewBox          *view_box = (glViewBox *)view_object;
-       glLabelObject      *object;
-
-       gl_debug (DEBUG_VIEW, "START");
-
-       object = gl_view_object_get_object (GL_VIEW_OBJECT(view_box));
-
-       /* Build editor. */
-       editor = gl_object_editor_new (GL_STOCK_BOX, _("Box object properties"),
-                                       object->parent,
-                                      GL_OBJECT_EDITOR_SHADOW_PAGE,
-                                      GL_OBJECT_EDITOR_POSITION_PAGE,
-                                      GL_OBJECT_EDITOR_SIZE_PAGE,
-                                      GL_OBJECT_EDITOR_FILL_PAGE,
-                                      GL_OBJECT_EDITOR_LINE_PAGE,
-                                      0);
-       
-       /* Update */
-       update_editor_from_object_cb (object, GL_OBJECT_EDITOR(editor));
-       update_editor_from_move_cb (object, 0, 0, GL_OBJECT_EDITOR(editor));
-
-       /* Connect signals. */
-       g_signal_connect (G_OBJECT (editor), "changed",
-                         G_CALLBACK(update_object_from_editor_cb), object);
-       g_signal_connect (G_OBJECT (object), "changed",
-                         G_CALLBACK (update_editor_from_object_cb), editor);
-       g_signal_connect (G_OBJECT (object), "moved",
-                         G_CALLBACK (update_editor_from_move_cb), editor);
-
-       gl_debug (DEBUG_VIEW, "END");
-
-       return editor;
-}
-
-
-/*---------------------------------------------------------------------------*/
-/* PRIVATE.  editor "changed" callback.                                      */
-/*---------------------------------------------------------------------------*/
-static void
-update_object_from_editor_cb (glObjectEditor *editor,
-                             glLabelObject  *object)
-{
-       gdouble            x, y, w, h;
-       glColorNode       *line_color_node;
-       gdouble            line_width;
-       glColorNode       *fill_color_node;
-       gboolean           shadow_state;
-       gdouble            shadow_x, shadow_y;
-       glColorNode       *shadow_color_node;
-       gdouble            shadow_opacity;
-       
-
-       gl_debug (DEBUG_VIEW, "START");
-
-       g_signal_handlers_block_by_func (G_OBJECT(object),
-                                        update_editor_from_object_cb,
-                                        editor);
-       g_signal_handlers_block_by_func (G_OBJECT(object),
-                                        update_editor_from_move_cb,
-                                        editor);
-
-       gl_object_editor_get_position (editor, &x, &y);
-       gl_label_object_set_position (object, x, y);
-
-       gl_object_editor_get_size (editor, &w, &h);
-       gl_label_object_set_size (object, w, h);
-
-       fill_color_node = gl_object_editor_get_fill_color (editor);
-       gl_label_object_set_fill_color (object, fill_color_node);
-       gl_color_node_free (&fill_color_node);
-
-       line_color_node = gl_object_editor_get_line_color (editor);
-       gl_label_object_set_line_color (object, line_color_node);
-       gl_color_node_free (&line_color_node);
-
-       line_width = gl_object_editor_get_line_width (editor);
-       gl_label_object_set_line_width (object, line_width);
-
-       shadow_state = gl_object_editor_get_shadow_state (editor);
-       gl_label_object_set_shadow_state (object, shadow_state);
-
-       gl_object_editor_get_shadow_offset (editor, &shadow_x, &shadow_y);
-       gl_label_object_set_shadow_offset (object, shadow_x, shadow_y);
-
-       shadow_color_node = gl_object_editor_get_shadow_color (editor);
-       gl_label_object_set_shadow_color (object, shadow_color_node);
-       gl_color_node_free (&shadow_color_node);
-
-       shadow_opacity = gl_object_editor_get_shadow_opacity (editor);
-       gl_label_object_set_shadow_opacity (object, shadow_opacity);
-
-       g_signal_handlers_unblock_by_func (G_OBJECT(object),
-                                          update_editor_from_object_cb,
-                                          editor);
-       g_signal_handlers_unblock_by_func (G_OBJECT(object),
-                                          update_editor_from_move_cb,
-                                          editor);
-
-       gl_debug (DEBUG_VIEW, "END");
-}
-
-
-/*---------------------------------------------------------------------------*/
-/* PRIVATE. label object "changed" callback.                                 */
-/*---------------------------------------------------------------------------*/
-static void
-update_editor_from_object_cb (glLabelObject  *object,
-                             glObjectEditor *editor)
-{
-       gdouble            w, h;
-       glColorNode       *line_color_node;
-       gdouble            line_width;
-       glColorNode       *fill_color_node;
-       gboolean           shadow_state;
-       gdouble            shadow_x, shadow_y;
-       glColorNode       *shadow_color_node;
-       gdouble            shadow_opacity;
-       glMerge           *merge;
-
-       gl_debug (DEBUG_VIEW, "START");
-
-       gl_label_object_get_size (object, &w, &h);
-       gl_object_editor_set_size (editor, w, h);
-       merge = gl_label_get_merge (GL_LABEL(object->parent));
-       
-       fill_color_node = gl_label_object_get_fill_color (GL_LABEL_OBJECT(object));
-       gl_object_editor_set_fill_color (editor, (merge != NULL), fill_color_node);
-       gl_color_node_free (&fill_color_node);
-
-       line_color_node = gl_label_object_get_line_color (GL_LABEL_OBJECT(object));
-       gl_object_editor_set_line_color (editor, (merge != NULL), line_color_node);
-       gl_color_node_free (&line_color_node);
-
-       line_width = gl_label_object_get_line_width (GL_LABEL_OBJECT(object));
-       gl_object_editor_set_line_width (editor, line_width);
-
-       shadow_state = gl_label_object_get_shadow_state (object);
-       gl_object_editor_set_shadow_state (editor, shadow_state);
-
-       gl_label_object_get_shadow_offset (object, &shadow_x, &shadow_y);
-       gl_object_editor_set_shadow_offset (editor, shadow_x, shadow_y);
-
-       shadow_color_node = gl_label_object_get_shadow_color (object);
-       gl_object_editor_set_shadow_color (editor, (merge != NULL), shadow_color_node);
-       gl_color_node_free (&shadow_color_node);
-
-       shadow_opacity = gl_label_object_get_shadow_opacity (object);
-       gl_object_editor_set_shadow_opacity (editor, shadow_opacity);
-
-       gl_debug (DEBUG_VIEW, "END");
-}
-
-
-/*---------------------------------------------------------------------------*/
-/* PRIVATE. label object "moved" callback.                                   */
-/*---------------------------------------------------------------------------*/
-static void
-update_editor_from_move_cb (glLabelObject    *object,
-                           gdouble           dx,
-                           gdouble           dy,
-                           glObjectEditor   *editor)
-{
-       gdouble            x, y;
-
-       gl_debug (DEBUG_VIEW, "START");
-
-       gl_label_object_get_position (object, &x, &y);
-       gl_object_editor_set_position (editor, x, y);
-
-       gl_debug (DEBUG_VIEW, "END");
-}
-
-
-/*****************************************************************************/
-/* Is object at (x,y)?                                                       */
-/*****************************************************************************/
-static gboolean
-object_at (glViewObject  *view_object,
-           cairo_t       *cr,
-           gdouble        x,
-           gdouble        y)
-{
-       glLabelObject    *object;
-        gdouble           w, h;
-        gdouble           line_width;
-
-        object = gl_view_object_get_object (view_object);
-
-        gl_label_object_get_size (object, &w, &h);
-
-        cairo_rectangle (cr, 0.0, 0.0, w, h);
-
-        if (cairo_in_fill (cr, x, y))
-        {
-                return TRUE;
-        }
-
-        line_width = gl_label_object_get_line_width (object);
-        cairo_set_line_width (cr, line_width);
-        if (cairo_in_stroke (cr, x, y))
-        {
-                return TRUE;
-        }
-
-        return FALSE;
-}
-
 
 /*****************************************************************************/
 /* Return apropos cursor for create object mode.                             */
@@ -380,23 +60,13 @@ GdkCursor *
 gl_view_box_get_create_cursor (void)
 {
        GdkCursor       *cursor = NULL;
-       GdkPixmap       *pixmap_data, *pixmap_mask;
-       GdkColor         fg = { 0, 0, 0, 0 };
-       GdkColor         bg = { 0, 65535, 65535, 65535 };
+       GdkPixbuf       *pixbuf;
 
        gl_debug (DEBUG_VIEW, "START");
 
-        pixmap_data = gdk_bitmap_create_from_data (NULL,
-                                                   (gchar *)cursor_box_bits,
-                                                   cursor_box_width,
-                                                   cursor_box_height);
-        pixmap_mask = gdk_bitmap_create_from_data (NULL,
-                                                   (gchar *)cursor_box_mask_bits,
-                                                   cursor_box_mask_width,
-                                                   cursor_box_mask_height);
-        cursor = gdk_cursor_new_from_pixmap (pixmap_data, pixmap_mask, &fg,
-                                             &bg, cursor_box_x_hot,
-                                             cursor_box_y_hot);
+        pixbuf = gdk_pixbuf_from_pixdata (&cursor_box_pixdata, FALSE, NULL);
+        cursor = gdk_cursor_new_from_pixbuf (gdk_display_get_default (), pixbuf, X_HOTSPOT, Y_HOTSPOT);
+        g_object_unref (pixbuf);
 
        gl_debug (DEBUG_VIEW, "END");
 
@@ -408,33 +78,18 @@ gl_view_box_get_create_cursor (void)
 /* Object creation handler: button press event.                              */
 /*****************************************************************************/
 void
-gl_view_box_create_button_press_event   (glView *view,
-                                         gdouble x,
-                                         gdouble y)
+gl_view_box_create_button_press_event (glView *view,
+                                       gdouble x,
+                                       gdouble y)
 {
        GObject             *object;
-       glColorNode         *fill_color_node;
-       glColorNode         *line_color_node;
-
-        gl_view_unselect_all (view);
-
-        fill_color_node = gl_color_node_new_default ();
-        line_color_node = gl_color_node_new_default ();
-               
-        object = gl_label_box_new (view->label);
-        gl_label_object_set_position (GL_LABEL_OBJECT(object), x, y);
-        gl_label_object_set_size (GL_LABEL_OBJECT(object), 0.0, 0.0);
-        line_color_node->color = gl_color_set_opacity (gl_view_get_default_line_color(view), 0.5);
-        fill_color_node->color = gl_color_set_opacity (gl_view_get_default_fill_color(view), 0.5);
-        gl_label_object_set_line_width (GL_LABEL_OBJECT(object),
-                                        gl_view_get_default_line_width(view));
-        gl_label_object_set_line_color (GL_LABEL_OBJECT(object),
-                                        line_color_node);
-        gl_label_object_set_fill_color (GL_LABEL_OBJECT(object),
-                                        fill_color_node);
-
-        gl_color_node_free (&fill_color_node);
-        gl_color_node_free (&line_color_node);
+
+        gl_label_unselect_all (view->label);
+
+        object = gl_label_box_new (view->label, TRUE);
+
+        gl_label_object_set_position (GL_LABEL_OBJECT(object), x, y, FALSE);
+        gl_label_object_set_size (GL_LABEL_OBJECT(object), 0.0, 0.0, FALSE);
                        
         view->create_object = GL_LABEL_OBJECT (object);
         view->create_x0 = x;
@@ -446,17 +101,28 @@ gl_view_box_create_button_press_event   (glView *view,
 /* Object creation handler: motion event.                                    */
 /*****************************************************************************/
 void
-gl_view_box_create_motion_event         (glView *view,
-                                         gdouble x,
-                                         gdouble y)
+gl_view_box_create_motion_event (glView  *view,
+                                 gdouble  x,
+                                 gdouble  y,
+                                 gboolean square)
 {
-        gdouble w, h;
-
-        gl_label_object_set_position (GL_LABEL_OBJECT(view->create_object),
-                                      MIN (x, view->create_x0), MIN (y, view->create_y0));
-        w = MAX (x, view->create_x0) - MIN (x, view->create_x0);
-        h = MAX (y, view->create_y0) - MIN (y, view->create_y0);
-        gl_label_object_set_size (GL_LABEL_OBJECT(view->create_object), w, h);
+       gdouble w, h;
+
+       w = ABS (x - view->create_x0);
+       h = ABS (y - view->create_y0);
+       if (square)
+               if (w < h) {
+                       h = w;
+                       y = (y < view->create_y0 ? view->create_y0 - h : view->create_y0 + h);
+               } else {
+                       w = h;
+                       x = (x < view->create_x0 ? view->create_x0 - w : view->create_x0 + w);
+               }
+
+       gl_label_object_set_position (GL_LABEL_OBJECT(view->create_object),
+                                     MIN (x, view->create_x0), MIN (y, view->create_y0),
+                                     FALSE);
+       gl_label_object_set_size (GL_LABEL_OBJECT(view->create_object), w, h, FALSE);
 }
 
 
@@ -464,32 +130,17 @@ gl_view_box_create_motion_event         (glView *view,
 /* Object creation handler: button relesase event.                           */
 /*****************************************************************************/
 void
-gl_view_box_create_button_release_event (glView *view,
-                                         gdouble x,
-                                         gdouble y)
+gl_view_box_create_button_release_event (glView  *view,
+                                         gdouble  x,
+                                         gdouble  y,
+                                         gboolean square)
 {
-       glColorNode         *fill_color_node;
-       glColorNode         *line_color_node;
-        gdouble              w, h;
-
-        fill_color_node = gl_color_node_new_default ();
-        line_color_node = gl_color_node_new_default ();
-               
-        if ((view->create_x0 == x) && (view->create_y0 == y)) {
-                x = view->create_x0 + 36.0;
-                y = view->create_y0 + 36.0;
-        }
-        gl_label_object_set_position (GL_LABEL_OBJECT(view->create_object),
-                                      MIN (x, view->create_x0), MIN (y, view->create_y0));
-        w = MAX (x, view->create_x0) - MIN (x, view->create_x0);
-        h = MAX (y, view->create_y0) - MIN (y, view->create_y0);
-        gl_label_object_set_size (GL_LABEL_OBJECT(view->create_object), w, h);
-        line_color_node->color = gl_view_get_default_line_color(view);
-        gl_label_object_set_line_color (GL_LABEL_OBJECT(view->create_object), line_color_node);
-        fill_color_node->color = gl_view_get_default_fill_color(view);
-        gl_label_object_set_fill_color (GL_LABEL_OBJECT(view->create_object), fill_color_node);
-        gl_color_node_free (&fill_color_node);
-        gl_color_node_free (&line_color_node);
+       if ((view->create_x0 == x) && (view->create_y0 == y)) {
+               x = view->create_x0 + 36.0;
+               y = view->create_y0 + 36.0;
+       }
+
+       gl_view_box_create_motion_event (view, x, y, square);
 }