texthandles: Keep state internally to avoid X overhead

[~andy/gtk] / gtk / gtktextlayout.h

diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index 09ca01c5b0cec330e821f8f8f4c15f614e585a18..819aaf23692e196e8e1da55a8d872cd289f2ca09 100644 (file)
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -23,8 +23,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Original Tk license:
  *
@@ -109,7 +108,6 @@ typedef struct _GtkTextLineData GtkTextLineData;
 typedef struct _GtkTextLayout         GtkTextLayout;
 typedef struct _GtkTextLayoutClass    GtkTextLayoutClass;
 typedef struct _GtkTextLineDisplay    GtkTextLineDisplay;
-typedef struct _GtkTextCursorDisplay  GtkTextCursorDisplay;
 typedef struct _GtkTextAttrAppearance GtkTextAttrAppearance;
 
 struct _GtkTextLayout
@@ -225,19 +223,11 @@ struct _GtkTextAttrAppearance
   PangoAttribute attr;
   GtkTextAppearance appearance;
 };
-struct _GtkTextCursorDisplay
-{
-  gint x;
-  gint y;
-  gint height;
-  guint is_strong : 1;
-  guint is_weak : 1;
-};
 
 struct _GtkTextLineDisplay
 {
   PangoLayout *layout;
-  GSList *cursors;
+  GArray *cursors;      /* indexes of cursors in the PangoLayout */
 
   GtkTextDirection direction;
 
@@ -264,7 +254,7 @@ struct _GtkTextLineDisplay
   guint cursor_at_line_end : 1;
   guint size_only : 1;
 
-  gpointer padding1;
+  GdkRGBA *pg_bg_rgba;
 };
 
 #ifdef GTK_COMPILATION