vcs.maemo.org Git - oespirit1/blob - gtkhtml/gtkhtml_240_last_search_selected_area.diff

   1 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/gtkhtml.c gtkhtml-3.24.4/gtkhtml/gtkhtml.c
   2 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/gtkhtml.c gtkhtml-3.24.4/gtkhtml/gtkhtml.c
   3 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/gtkhtml.c gtkhtml-3.24.4/gtkhtml/gtkhtml.c
   4 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/gtkhtml.c gtkhtml-3.24.4/gtkhtml/gtkhtml.c
   5 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-06-25 11:09:14.970379010 +0200
   6 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-06-25 11:09:14.970379010 +0200
   7 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-06-25 11:09:14.970379010 +0200
   8 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-06-25 11:09:14.970379010 +0200
   9 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-06-25 11:05:48.745596648 +0200
  10 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-06-25 11:05:48.745596648 +0200
  11 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-06-25 11:05:48.745596648 +0200
  12 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.c    2007-06-25 11:05:48.745596648 +0200
  13 @@ -6099,10 +6099,16 @@
  14         g_return_if_fail (GTK_IS_HTML (html));
  15
  16         gtk_html_set_magnification (html, 1.0);
  17  }
  18
  19  void
  20 +gtk_html_get_selection_area (GtkHTML *html, gint *x, gint *y, gint *w, gint *h)
  21 +{
  22 +       html_engine_get_selection_area (html->engine, x, y, w, h);
  23 +}
  24 +
  25 +void
  26  gtk_html_set_allow_frameset (GtkHTML *html, gboolean allow)
  27  {
  28         g_return_if_fail (GTK_IS_HTML (html));
  29         g_return_if_fail (HTML_IS_ENGINE (html->engine));
  30 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/gtkhtml.h gtkhtml-3.24.4/gtkhtml/gtkhtml.h
  31 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/gtkhtml.h gtkhtml-3.24.4/gtkhtml/gtkhtml.h
  32 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/gtkhtml.h gtkhtml-3.24.4/gtkhtml/gtkhtml.h
  33 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/gtkhtml.h gtkhtml-3.24.4/gtkhtml/gtkhtml.h
  34 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.h    2007-06-25 11:09:14.977378731 +0200
  35 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.h    2007-06-25 11:09:14.977378731 +0200
  36 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.h    2007-06-25 11:09:14.977378731 +0200
  37 --- gtkhtml-3.24.4/gtkhtml/gtkhtml.h    2007-06-25 11:09:14.977378731 +0200
  38 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.h    2007-06-25 11:05:48.815593858 +0200
  39 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.h    2007-06-25 11:05:48.815593858 +0200
  40 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.h    2007-06-25 11:05:48.815593858 +0200
  41 +++ gtkhtml-3.24.4/gtkhtml/gtkhtml.h    2007-06-25 11:05:48.815593858 +0200
  42 @@ -344,9 +344,14 @@
  43                                                                    GtkHTMLSaveReceiverFn      receiver,
  44                                                                    gpointer                   data);
  45  GtkHTMLStream             *gtk_html_begin_content                 (GtkHTML                   *html,
  46                                                                    gchar                     *content_type);
  47  void                       gtk_html_drag_dest_set                 (GtkHTML                   *html);
  48 +void                   gtk_html_get_selection_area                (GtkHTML                   *html,
  49 +                                                                  gint *x,
  50 +                                                                  gint *y,
  51 +                                                                  gint *w,
  52 +                                                                  gint *h);
  53
  54  #endif
  55
  56  #endif /* _GTKHTML_H_ */
  57 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine-search.c gtkhtml-3.24.4/gtkhtml/htmlengine-search.c
  58 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine-search.c gtkhtml-3.24.4/gtkhtml/htmlengine-search.c
  59 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine-search.c gtkhtml-3.24.4/gtkhtml/htmlengine-search.c
  60 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine-search.c gtkhtml-3.24.4/gtkhtml/htmlengine-search.c
  61 --- gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-06-25 11:09:14.444399968 +0200
  62 --- gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-06-25 11:09:14.444399968 +0200
  63 --- gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-06-25 11:09:14.444399968 +0200
  64 --- gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-06-25 11:09:14.444399968 +0200
  65 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-06-25 11:05:48.056624103 +0200
  66 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-06-25 11:05:48.056624103 +0200
  67 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-06-25 11:05:48.056624103 +0200
  68 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.c  2007-06-25 11:05:48.056624103 +0200
  69 @@ -93,10 +93,15 @@
  70         ex += last->width;
  71         ey += last->descent;
  72         w = ex - x;
  73         h = ey - y;
  74
  75 +       e->search_area_x = x;
  76 +       e->search_area_y = y;
  77 +       e->search_area_w = w;
  78 +       e->search_area_h = h;
  79 +
  80         /* now calculate gtkhtml adustments */
  81         if (x <= ep->x_offset)
  82                 nx = x;
  83         else if (x + w > ep->x_offset + ep->width)
  84                 nx = x + w - ep->width;
  85 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine-search.h gtkhtml-3.24.4/gtkhtml/htmlengine-search.h
  86 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine-search.h gtkhtml-3.24.4/gtkhtml/htmlengine-search.h
  87 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine-search.h gtkhtml-3.24.4/gtkhtml/htmlengine-search.h
  88 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine-search.h gtkhtml-3.24.4/gtkhtml/htmlengine-search.h
  89 --- gtkhtml-3.24.4/gtkhtml/htmlengine-search.h  2007-01-03 16:19:57.000000000 +0100
  90 --- gtkhtml-3.24.4/gtkhtml/htmlengine-search.h  2007-01-03 16:19:57.000000000 +0100
  91 --- gtkhtml-3.24.4/gtkhtml/htmlengine-search.h  2007-01-03 16:19:57.000000000 +0100
  92 --- gtkhtml-3.24.4/gtkhtml/htmlengine-search.h  2007-01-03 16:19:57.000000000 +0100
  93 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.h  2007-06-25 11:05:48.106622111 +0200
  94 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.h  2007-06-25 11:05:48.106622111 +0200
  95 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.h  2007-06-25 11:05:48.106622111 +0200
  96 +++ gtkhtml-3.24.4/gtkhtml/htmlengine-search.h  2007-06-25 11:05:48.106622111 +0200
  97 @@ -30,5 +30,9 @@
  98                                                  gboolean forward);
  99  gboolean  html_engine_search_next               (HTMLEngine *e);
 100  gboolean  html_engine_search_incremental        (HTMLEngine *e,
 101                                                  const gchar *text,
 102                                                  gboolean forward);
 103 +
 104 +void      html_engine_search_get_selected_area  (HTMLEngine *e,
 105 +                                                gint *x, gint *y,
 106 +                                                gint *w, gint *h);
 107 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine.c gtkhtml-3.24.4/gtkhtml/htmlengine.c
 108 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine.c gtkhtml-3.24.4/gtkhtml/htmlengine.c
 109 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine.c gtkhtml-3.24.4/gtkhtml/htmlengine.c
 110 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine.c gtkhtml-3.24.4/gtkhtml/htmlengine.c
 111 --- gtkhtml-3.24.4/gtkhtml/htmlengine.c 2007-06-25 11:09:14.988378293 +0200
 112 --- gtkhtml-3.24.4/gtkhtml/htmlengine.c 2007-06-25 11:09:14.988378293 +0200
 113 --- gtkhtml-3.24.4/gtkhtml/htmlengine.c 2007-06-25 11:09:14.988378293 +0200
 114 --- gtkhtml-3.24.4/gtkhtml/htmlengine.c 2007-06-25 11:09:14.988378293 +0200
 115 +++ gtkhtml-3.24.4/gtkhtml/htmlengine.c 2007-06-25 11:05:47.689638728 +0200
 116 +++ gtkhtml-3.24.4/gtkhtml/htmlengine.c 2007-06-25 11:05:47.689638728 +0200
 117 +++ gtkhtml-3.24.4/gtkhtml/htmlengine.c 2007-06-25 11:05:47.689638728 +0200
 118 +++ gtkhtml-3.24.4/gtkhtml/htmlengine.c 2007-06-25 11:05:47.689638728 +0200
 119 @@ -6584,5 +6584,28 @@
 120                 html_object_change_set_down (e->clue, HTML_CHANGE_ALL);
 121                 html_engine_calc_size (e, FALSE);
 122                 html_engine_schedule_update (e);
 123         }
 124  }
 125 +
 126 +static void
 127 +add_iframe_off (HTMLEngine *e, gint *x, gint *y)
 128 +{
 129 +       g_assert (e);
 130 +       g_assert (e->widget);
 131 +
 132 +       if (e->widget->iframe_parent) {
 133 +               *x += e->widget->iframe_parent->allocation.x;
 134 +               *y += e->widget->iframe_parent->allocation.y;
 135 +       }
 136 +}
 137 +
 138 +void
 139 +html_engine_get_selection_area (HTMLEngine *e,
 140 +                               gint *x, gint *y,
 141 +                               gint *w, gint *h)
 142 +{
 143 +       *x = e->search_area_x;
 144 +       *y = e->search_area_y;
 145 +       *w = e->search_area_w;
 146 +       *h = e->search_area_h;
 147 +}
 148 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine.h gtkhtml-3.24.4/gtkhtml/htmlengine.h
 149 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine.h gtkhtml-3.24.4/gtkhtml/htmlengine.h
 150 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine.h gtkhtml-3.24.4/gtkhtml/htmlengine.h
 151 diff -r -U 5 gtkhtml-3.24.4/gtkhtml/htmlengine.h gtkhtml-3.24.4/gtkhtml/htmlengine.h
 152 --- gtkhtml-3.24.4/gtkhtml/htmlengine.h 2007-06-25 11:09:14.993378094 +0200
 153 --- gtkhtml-3.24.4/gtkhtml/htmlengine.h 2007-06-25 11:09:14.993378094 +0200
 154 --- gtkhtml-3.24.4/gtkhtml/htmlengine.h 2007-06-25 11:09:14.993378094 +0200
 155 --- gtkhtml-3.24.4/gtkhtml/htmlengine.h 2007-06-25 11:09:14.993378094 +0200
 156 +++ gtkhtml-3.24.4/gtkhtml/htmlengine.h 2007-06-25 11:05:47.727637213 +0200
 157 +++ gtkhtml-3.24.4/gtkhtml/htmlengine.h 2007-06-25 11:05:47.727637213 +0200
 158 +++ gtkhtml-3.24.4/gtkhtml/htmlengine.h 2007-06-25 11:05:47.727637213 +0200
 159 +++ gtkhtml-3.24.4/gtkhtml/htmlengine.h 2007-06-25 11:05:47.727637213 +0200
 160 @@ -265,10 +265,15 @@
 161
 162         gboolean expose;
 163         gboolean need_update;
 164
 165         HTMLObject *parser_clue;  /* the root of the currently parsed block */
 166 +
 167 +       gint search_area_x;
 168 +       gint search_area_y;
 169 +       gint search_area_w;
 170 +       gint search_area_h;
 171  };
 172
 173  /* must be forward referenced *sigh* */
 174  struct _HTMLEmbedded;
 175
 176 @@ -492,7 +497,10 @@
 177  void html_engine_opened_streams_decrement (HTMLEngine *e);
 178  void html_engine_opened_streams_set (HTMLEngine *e, int value);
 179
 180  void html_engine_refresh_fonts (HTMLEngine *e);
 181  void html_engine_set_link_visited (HTMLEngine *e, char *url, gboolean visited) ;
 182 +void html_engine_get_selection_area (HTMLEngine *e,
 183 +                                    gint *x, gint *y,
 184 +                                    gint *w, gint *h);
 185
 186  #endif /* _HTMLENGINE_H_ */