[Gnash-commit] gnash ChangeLog server/edit_text_character.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/26 13:57:37

Modified files:
        .              : ChangeLog 
        server         : edit_text_character.cpp 

Log message:
        Patch by dolphinling <address@hidden>:
        
                * server/edit_text_character.cpp: code cleanups.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1771&r2=1.1772
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1771
retrieving revision 1.1772
diff -u -b -r1.1771 -r1.1772
--- ChangeLog   26 Nov 2006 01:21:35 -0000      1.1771
+++ ChangeLog   26 Nov 2006 13:57:36 -0000      1.1772
@@ -1,3 +1,8 @@
+2006-11-26 dolphinling <address@hidden>
+
+       * server/edit_text_character.cpp:
+         code cleanups.
+
 2006-11-26 Markus Gothe <address@hidden>
 
        * server/rect.h DSOEXPORT expand_to_transformed_rect().

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/edit_text_character.cpp      24 Nov 2006 09:04:24 -0000      1.32
+++ server/edit_text_character.cpp      26 Nov 2006 13:57:36 -0000      1.33
@@ -3,7 +3,7 @@
 // This source code has been donated to the Public Domain.  Do
 // whatever you want with it.
 
-/* $Id: edit_text_character.cpp,v 1.32 2006/11/24 09:04:24 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.33 2006/11/26 13:57:36 strk Exp $ */
 
 #include "utf8.h"
 #include "log.h"
@@ -57,7 +57,8 @@
        on_event(event_id::KILLFOCUS);
 }
 
-void edit_text_character::show_cursor()
+void
+edit_text_character::show_cursor()
 {
        uint16_t x = static_cast<uint16_t>(m_xcursor);
        uint16_t y = static_cast<uint16_t>(m_ycursor);
@@ -70,7 +71,6 @@
        box[3] = y + h;
        
        render::draw_line_strip(box, 2, rgba(0,0,0,255));       // draw line
-
 }
 
 void
@@ -147,19 +147,20 @@
 }
 
 
-       void edit_text_character::get_invalidated_bounds(rect* bounds, bool 
force) {
-       
+void
+edit_text_character::get_invalidated_bounds(rect* bounds, bool force)
+{
     if (!force && !m_invalidated) return; // no need to redraw
     
     bounds->expand_to_rect(m_old_invalidated_bounds);  
        
     bounds->expand_to_transformed_rect(get_world_matrix(), 
       m_def->get_bound());            
-         
-  }
+}
 
 
-bool edit_text_character::on_event(const event_id& id)
+bool
+edit_text_character::on_event(const event_id& id)
 {
        if (m_def->get_readonly() == true)
        {
@@ -311,7 +312,6 @@
        }
 
        format_text();
-       
 }
 
 const char*
@@ -592,7 +592,8 @@
                {
                        log_error("error: substituting font!  font '%s' has no 
glyphs, using font '%s'\n",
                                  fontlib::get_font_name(_font),
-                                 fontlib::get_font_name(newfont));
+                                 fontlib::get_font_name(newfont)
+                       );
 
                        _font = newfont;
                }
@@ -732,7 +733,8 @@
                                          "into your SWF file!\n",
                                            __PRETTY_FUNCTION__,
                                            code,
-                                           _font->get_name());
+                                           _font->get_name()
+                               );
                        }
 
                        // Drop through and use index == -1; this will display
@@ -755,7 +757,8 @@
                        if ( ! m_def->do_word_wrap() )
                        {
                                static bool warned=false;
-                               if ( ! warned ) {
+                               if ( ! warned )
+                               {
                                log_warning("FIXME: implement no word wrap");
                                warned=true;
                                }
@@ -831,7 +834,6 @@
 
        m_xcursor += static_cast<int>(extra_space);
        m_ycursor -= m_def->get_font_height() + (_font->get_leading() - 
_font->get_descent()) * scale;
-
 }
 
 void
@@ -839,7 +841,8 @@
 {
 //#define DEBUG_DYNTEXT_VARIABLES 1
 
-       if ( _text_variable_registered ) {
+       if ( _text_variable_registered )
+       {
 #ifdef DEBUG_DYNTEXT_VARIABLES
        log_msg(" registerTextVariable() no-op call (alread registered)");
 #endif
@@ -902,14 +905,14 @@
        if ( sprite->get_member(tu_stringi(varname), &val) )
        {
 #ifdef DEBUG_DYNTEXT_VARIABLES
-log_msg("target sprite (%p) does have a member named %s", (void*)sprite, 
varname);
+               log_msg("target sprite (%p) does have a member named %s", 
(void*)sprite, varname);
 #endif
                set_text_value(val.to_string());
        }
 #ifdef DEBUG_DYNTEXT_VARIABLES
        else
        {
-log_msg("target sprite (%p) does NOT have a member named %s (no problem, we'll 
add it)", (void*)sprite, varname);
+               log_msg("target sprite (%p) does NOT have a member named %s (no 
problem, we'll add it)", (void*)sprite, varname);
        }
 #endif