Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...
[synfig.git] / synfig-studio / tags / stable / src / gtkmm / renderer_guides.cpp
index f13746b..c1f5d9f 100644 (file)
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
-/*!    \file template.cpp
+/* === S Y N F I G ========================================================= */
+/*!    \file renderer_guides.cpp
 **     \brief Template File
 **
-**     $Id: renderer_guides.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**     $Id$
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
 #include "workarea.h"
 #include <ETL/misc>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -52,7 +55,7 @@ using namespace studio;
 Renderer_Guides::Renderer_Guides():
        dragging(false)
 {
-       
+
 }
 
 Renderer_Guides::~Renderer_Guides()
@@ -80,14 +83,14 @@ Renderer_Guides::get_guide_list_y()
 bool
 Renderer_Guides::event_vfunc(GdkEvent* event)
 {
-       sinfg::Point mouse_pos;
-    float bezier_click_pos;
-       const float radius((abs(get_pw())+abs(get_ph()))*4);
+       synfig::Point mouse_pos;
+       // float bezier_click_pos;
+       // const float radius((abs(get_pw())+abs(get_ph()))*4);
        int button_pressed(0);
        float pressure(0);
        bool is_mouse(false);
        Gdk::ModifierType modifier(Gdk::ModifierType(0));
-       
+
        // Handle input stuff
        if(
                event->any.type==GDK_MOTION_NOTIFY ||
@@ -108,8 +111,8 @@ Renderer_Guides::event_vfunc(GdkEvent* event)
                        device=event->button.device;
                        modifier=Gdk::ModifierType(event->button.state);
                }
-                       
-               // Make sure we recognise the device
+
+               // Make sure we recognize the device
                /*if(curr_input_device)
                {
                        if(curr_input_device!=device)
@@ -118,21 +121,21 @@ Renderer_Guides::event_vfunc(GdkEvent* event)
                                curr_input_device=device;
                                signal_input_device_changed()(curr_input_device);
                        }
-               }               
+               }
                else*/ if(device)
                {
                        //curr_input_device=device;
                        //signal_input_device_changed()(curr_input_device);
-               }                       
+               }
 
                //assert(curr_input_device);
-               
+
                // Calculate the position of the
                // input device in canvas coordinates
                // and the buttons
                if(!event->button.axes)
                {
-                       mouse_pos=sinfg::Point(screen_to_comp_coords(sinfg::Point(event->button.x,event->button.y)));
+                       mouse_pos=synfig::Point(screen_to_comp_coords(synfig::Point(event->button.x,event->button.y)));
                        button_pressed=event->button.button;
                        pressure=1.0f;
                        is_mouse=true;
@@ -147,29 +150,29 @@ Renderer_Guides::event_vfunc(GdkEvent* event)
                                return false;
 
                        pressure=event->button.axes[2];
-                       //sinfg::info("pressure=%f",pressure);
+                       //synfig::info("pressure=%f",pressure);
                        pressure-=0.04f;
                        pressure/=1.0f-0.04f;
-                       
-                       
+
+
                        assert(!isnan(pressure));
-                       
-                       mouse_pos=sinfg::Point(screen_to_comp_coords(sinfg::Point(x,y)));
-                       
+
+                       mouse_pos=synfig::Point(screen_to_comp_coords(synfig::Point(x,y)));
+
                        button_pressed=event->button.button;
-                       
+
                        if(button_pressed==1 && pressure<0 && (event->any.type!=GDK_BUTTON_RELEASE && event->any.type!=GDK_BUTTON_PRESS))
                                button_pressed=0;
                        if(pressure<0)
                                pressure=0;
 
                        //if(event->any.type==GDK_BUTTON_PRESS && button_pressed)
-                       //      sinfg::info("Button pressed on input device = %d",event->button.button);
-                       
+                       //      synfig::info("Button pressed on input device = %d",event->button.button);
+
                        //if(event->button.axes[2]>0.1)
                        //      button_pressed=1;
                        //else
-                       //      button_pressed=0;                               
+                       //      button_pressed=0;
                }
        }
        switch(event->type)
@@ -183,56 +186,56 @@ Renderer_Guides::event_vfunc(GdkEvent* event)
        default:
                break;
        }
-       
+
        return false;
 }
 
 void
 Renderer_Guides::render_vfunc(
        const Glib::RefPtr<Gdk::Drawable>& drawable,
-       const Gdk::Rectangle& expose_area
+       const Gdk::Rectangle& /*expose_area*/
 )
 {
        assert(get_work_area());
        if(!get_work_area())
                return;
-       
-       const sinfg::RendDesc &rend_desc(get_work_area()->get_canvas()->rend_desc());
-       
-       const sinfg::Vector focus_point(get_work_area()->get_focus_point());
+
+       // const synfig::RendDesc &rend_desc(get_work_area()->get_canvas()->rend_desc());
+
+       const synfig::Vector focus_point(get_work_area()->get_focus_point());
 
        //std::vector< std::pair<Glib::RefPtr<Gdk::Pixbuf>,int> >& tile_book(get_tile_book());
-       
+
        int drawable_w,drawable_h;
        drawable->get_size(drawable_w,drawable_h);
-       
+
        // Calculate the window coordinates of the top-left
        // corner of the canvas.
-       const sinfg::Vector::value_type
-               x(focus_point[0]/get_pw()+drawable_w/2-get_w()/2),
-               y(focus_point[1]/get_ph()+drawable_h/2-get_h()/2);
-
-       /*const sinfg::Vector::value_type window_startx(window_tl[0]);
-       const sinfg::Vector::value_type window_endx(window_br[0]);
-       const sinfg::Vector::value_type window_starty(window_tl[1]);
-       const sinfg::Vector::value_type window_endy(window_br[1]);
+       // const synfig::Vector::value_type
+       //      x(focus_point[0]/get_pw()+drawable_w/2-get_w()/2),
+       //      y(focus_point[1]/get_ph()+drawable_h/2-get_h()/2);
+
+       /*const synfig::Vector::value_type window_startx(window_tl[0]);
+       const synfig::Vector::value_type window_endx(window_br[0]);
+       const synfig::Vector::value_type window_starty(window_tl[1]);
+       const synfig::Vector::value_type window_endy(window_br[1]);
        */
-       const int
-               tile_w(get_work_area()->get_tile_w()),
-               tile_h(get_work_area()->get_tile_h());
-
-       const int
-               w(get_w()),
-               h(get_h());
-       
+       // const int
+       //      tile_w(get_work_area()->get_tile_w()),
+       //      tile_h(get_work_area()->get_tile_h());
+
+       // const int
+       //      w(get_w()),
+       //      h(get_h());
+
        Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(drawable));
-       
-       //const sinfg::Vector grid_size(get_grid_size());
 
-       const sinfg::Vector::value_type window_startx(get_work_area()->get_window_tl()[0]);
-       const sinfg::Vector::value_type window_endx(get_work_area()->get_window_br()[0]);
-       const sinfg::Vector::value_type window_starty(get_work_area()->get_window_tl()[1]);
-       const sinfg::Vector::value_type window_endy(get_work_area()->get_window_br()[1]);
+       //const synfig::Vector grid_size(get_grid_size());
+
+       const synfig::Vector::value_type window_startx(get_work_area()->get_window_tl()[0]);
+       // const synfig::Vector::value_type window_endx(get_work_area()->get_window_br()[0]);
+       const synfig::Vector::value_type window_starty(get_work_area()->get_window_tl()[1]);
+       // const synfig::Vector::value_type window_endy(get_work_area()->get_window_br()[1]);
        const float pw(get_pw()),ph(get_ph());
 
        // Draw out the guides
@@ -240,19 +243,19 @@ Renderer_Guides::render_vfunc(
                gc->set_function(Gdk::COPY);
                gc->set_rgb_fg_color(Gdk::Color("#9f9fff"));
                gc->set_line_attributes(1,Gdk::LINE_ON_OFF_DASH,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
-               
+
                Duckmatic::GuideList::const_iterator iter;
-               
+
                // vertical
                for(iter=get_guide_list_x().begin();iter!=get_guide_list_x().end();++iter)
                {
                        const float x((*iter-window_startx)/pw);
-                       
+
                        if(iter==get_work_area()->curr_guide)
                                gc->set_rgb_fg_color(Gdk::Color("#ff6f6f"));
                        else
                                gc->set_rgb_fg_color(Gdk::Color("#6f6fff"));
-                               
+
                        drawable->draw_line(gc,
                                round_to_int(x),
                                0,