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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/24 21:58:43

Modified files:
        .              : ChangeLog 
        server         : edit_text_character.cpp 

Log message:
                * server/edit_text_character.cpp: add a
                  PP_COMPATIBLE_DEVICE_FONT_HANDLING macro to mimic
                  limitation of proprietary player in handling textfields
                  using device fonts. See DeviceFonts wiki page for more
                  information. (The macro defaults to being defined)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3815&r2=1.3816
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.92&r2=1.93

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3815
retrieving revision 1.3816
diff -u -b -r1.3815 -r1.3816
--- ChangeLog   24 Jul 2007 20:53:01 -0000      1.3815
+++ ChangeLog   24 Jul 2007 21:58:43 -0000      1.3816
@@ -1,5 +1,13 @@
 2007-07-24 Sandro Santilli <address@hidden>
 
+       * server/edit_text_character.cpp: add a
+         PP_COMPATIBLE_DEVICE_FONT_HANDLING macro to mimic
+         limitation of proprietary player in handling textfields
+         using device fonts. See DeviceFonts wiki page for more
+         information. (The macro defaults to being defined)
+
+2007-07-24 Sandro Santilli <address@hidden>
+
        * server/asobj/SoundFfmpeg.h: Provide a constructor
          for proper initialization of members.
          YOU CAN NOT ASSUME POINTERS WILL BE INITIALIZED TO NULL.

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- server/edit_text_character.cpp      24 Jul 2007 19:51:27 -0000      1.92
+++ server/edit_text_character.cpp      24 Jul 2007 21:58:43 -0000      1.93
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.92 2007/07/24 19:51:27 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.93 2007/07/24 21:58:43 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -44,6 +44,11 @@
 // Text fields have a fixed 2 pixel padding for each side (regardless of 
border)
 #define PADDING_TWIPS 40.0f
 
+// Define the following macro to maintain compatibility with the proprietary
+// player when it comes to opacity of textfields using device fonts.
+// See 
http://gnashdev.org/wiki/index.php/DeviceFonts#Differences_with_proprietary_player_implementation
+#define PP_COMPATIBLE_DEVICE_FONT_HANDLING 1
+
 namespace gnash {
 
 // Forward declarations
@@ -1464,7 +1469,9 @@
 {
   cxform cf = character::get_world_cxform();
   
-  if ( 0 /* if using a device font (PP compatibility, TODO) */ ) {
+#ifdef PP_COMPATIBLE_DEVICE_FONT_HANDLING
+  if ( ! getEmbedFonts() ) /* if using a device font (PP compatibility) */ 
+  {
     // set alpha to default values to make the text field opaque
     cf.m_[3][0] = 1.0f;
     cf.m_[3][1] = 0.0f;
@@ -1473,6 +1480,7 @@
     // transform, so we should (or not) return an identity cxform
     // here. This has to be discussed...
   }
+#endif
   
   return cf;
 }