[Swfdec-commits] 3 commits - swfdec/swfdec_text_field.c swfdec/swfdec_text_field_movie.c vivified/code

[Benjamin Otte]

 swfdec/swfdec_text_field.c       |    2 ++
 swfdec/swfdec_text_field_movie.c |   18 ++++++++++--------
 vivified/code/vivi_compiler.c    |    2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 871b03db230c12649f2a03a0303104cadbdb59ec
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Apr 2 22:47:33 2008 +0200

    eassign extents properly

diff --git a/swfdec/swfdec_text_field.c b/swfdec/swfdec_text_field.c
index 67ef8dd..19304ea 100644
--- a/swfdec/swfdec_text_field.c
+++ b/swfdec/swfdec_text_field.c
@@ -46,6 +46,8 @@ swfdec_text_field_create_movie (SwfdecGraphic *graphic, gsize *size)
   SwfdecTextFieldMovie *ret =
     g_object_new (SWFDEC_TYPE_TEXT_FIELD_MOVIE, NULL);
 
+  ret->extents = graphic->extents;
+
   ret->html = text->html;
   ret->editable = text->editable;
   ret->password = text->password;
commit afaf54d491496a317813e3d3185ee78397b4e7a8
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Apr 2 22:44:36 2008 +0200

    fix unsigned compiler warning

diff --git a/vivified/code/vivi_compiler.c b/vivified/code/vivi_compiler.c
index 760c14e..c8a9360 100644
--- a/vivified/code/vivi_compiler.c
+++ b/vivified/code/vivi_compiler.c
@@ -175,7 +175,7 @@ static const TokenDescription error_tokens[] = {
   { G_TOKEN_NONE, NULL }
 };
 
-#define FAIL(x) ((x) < 0 ? -x : x)
+#define FAIL(x) ((unsigned) ((x) < 0 ? -x : x))
 
 typedef int (*ParseStatementFunction) (GScanner *scanner, ViviCodeStatement **statement);
 typedef int (*ParseValueFunction) (GScanner *scanner, ViviCodeValue **value);
commit e319b3f6ae21ff7ab012949cfef2e4d4447ece21
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Apr 2 22:15:08 2008 +0200

    rework mouse handling
    
    We can even click links if selectable is FALSE. We just cannot select stuff.

diff --git a/swfdec/swfdec_text_field_movie.c b/swfdec/swfdec_text_field_movie.c
index 58d3ee9..0df3f47 100644
--- a/swfdec/swfdec_text_field_movie.c
+++ b/swfdec/swfdec_text_field_movie.c
@@ -46,7 +46,7 @@ static void
 swfdec_text_field_movie_update_extents (SwfdecMovie *movie,
     SwfdecRect *extents)
 {
-  SwfdecTextFieldMovie *text = SWFDEC_TEXT_FIELD_MOVIE (text);
+  SwfdecTextFieldMovie *text = SWFDEC_TEXT_FIELD_MOVIE (movie);
 
   swfdec_rect_union (extents, extents, &text->extents);
 }
@@ -1442,11 +1442,15 @@ swfdec_text_field_movie_mouse_press (SwfdecActor *actor, guint button)
   guint index_;
   gboolean direct, before;
 
-  g_return_if_fail (text->editable || text->selectable);
+  if (button != 0) {
+    SWFDEC_FIXME ("implement popup menus, scrollwheel and middle mouse paste");
+    return;
+  }
 
-  if (button != 0)
+  if (!text->selectable)
     return;
 
+
   swfdec_movie_get_mouse (SWFDEC_MOVIE (actor), &x, &y);
 
   direct = swfdec_text_field_movie_xy_to_index (text, x, y, &index_, &before);
@@ -1474,8 +1478,6 @@ swfdec_text_field_movie_mouse_move (SwfdecActor *actor, double x, double y)
   guint index_;
   gboolean direct, before;
 
-  g_return_if_fail (text->editable || text->selectable);
-
   if (!text->selectable)
     return;
 
@@ -1500,10 +1502,10 @@ swfdec_text_field_movie_mouse_release (SwfdecActor *actor, guint button)
   guint index_;
   gboolean direct, before;
 
-  g_return_if_fail (text->editable || text->selectable);
-
-  if (button != 0)
+  if (button != 0) {
+    SWFDEC_FIXME ("implement popup menus, scrollwheel and middle mouse paste");
     return;
+  }
 
   swfdec_movie_get_mouse (SWFDEC_MOVIE (text), &x, &y);