[gtk/wip/otte/bitset: 2/2] Add GtkBitset
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/bitset: 2/2] Add GtkBitset
- Date: Wed, 10 Jun 2020 06:45:53 +0000 (UTC)
commit b25f46d3398e46b7f0ddfd8bcb45580e20aee542
Author: Benjamin Otte <otte redhat com>
Date: Wed Jun 10 08:14:02 2020 +0200
Add GtkBitset
gtk/gtk.h | 1 +
gtk/gtkbitset.c | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
gtk/gtkbitset.h | 101 +++++++++++++++++++++++++++
gtk/gtktypes.h | 1 +
gtk/meson.build | 2 +
5 files changed, 311 insertions(+)
---
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 055957d5e9..03879a0dc8 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -47,6 +47,7 @@
#include <gtk/gtkaspectframe.h>
#include <gtk/gtkassistant.h>
#include <gtk/gtkbinlayout.h>
+#include <gtk/gtkbitset.h>
#include <gtk/gtkborder.h>
#include <gtk/gtkboxlayout.h>
#include <gtk/gtkbox.h>
diff --git a/gtk/gtkbitset.c b/gtk/gtkbitset.c
new file mode 100644
index 0000000000..5c20438e38
--- /dev/null
+++ b/gtk/gtkbitset.c
@@ -0,0 +1,206 @@
+/*
+ * Copyright © 2020 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte gnome org>
+ */
+
+#include "config.h"
+
+#include "gtkbitset.h"
+
+#include "roaring.c"
+
+/**
+ * GtkBitset: (ref-func gtk_bitset_ref) (unref-func gtk_bitset_unref)
+ *
+ * The `GtkBitset` structure contains only private data.
+ */
+struct _GtkBitset
+{
+ gint ref_count;
+ roaring_bitmap_t roaring;
+};
+
+
+G_DEFINE_BOXED_TYPE (GtkBitset, gtk_bitset,
+ gtk_bitset_ref,
+ gtk_bitset_unref)
+
+/**
+ * gtk_bitset_ref:
+ * @self: (allow-none): a #GtkBitset
+ *
+ * Acquires a reference on the given #GtkBitset.
+ *
+ * Returns: (transfer none): the #GtkBitset with an additional reference
+ */
+GtkBitset *
+gtk_bitset_ref (GtkBitset *self)
+{
+ g_return_val_if_fail (self != NULL, NULL);
+
+ self->ref_count += 1;
+
+ return self;
+}
+
+/**
+ * gtk_bitset_unref:
+ * @self: (allow-none): a #GtkBitset
+ *
+ * Releases a reference on the given #GtkBitset.
+ *
+ * If the reference was the last, the resources associated to the @self are
+ * freed.
+ */
+void
+gtk_bitset_unref (GtkBitset *self)
+{
+ g_return_if_fail (self == NULL);
+ g_return_if_fail (self->ref_count > 1);
+
+ self->ref_count -= 1;
+ if (self->ref_count > 0)
+ return;
+
+ ra_clear (&self->roaring.high_low_container);
+ g_slice_free (GtkBitset, self);
+}
+
+/**
+ * gtk_bitset_contains:
+ * @self: a #GtkBitset
+ * @value: the value to check
+ *
+ * Checks if the given @value has been added to @bitset
+ *
+ * Returns: %TRUE if @self contains @value
+ **/
+gboolean
+gtk_bitset_contains (GtkBitset *self,
+ guint value)
+{
+ g_return_val_if_fail (self != NULL, FALSE);
+
+ return roaring_bitmap_contains (&self->roaring, value);
+}
+
+/**
+ * gtk_bitset_is_empty:
+ * @self: a #GtkBitset
+ *
+ * Check if no value is contained in bitset.
+ *
+ * Returns: %TRUE if @self is empty
+ **/
+gboolean
+gtk_bitset_is_empty (GtkBitset *self)
+{
+ g_return_val_if_fail (self != NULL, TRUE);
+
+ return roaring_bitmap_is_empty (&self->roaring);
+}
+
+/**
+ * gtk_bitset_new_empty:
+ *
+ * Creates a new empty bitset.
+ *
+ * Returns: A new empty bitset.
+ **/
+GtkBitset *
+gtk_bitset_new_empty (void)
+{
+ GtkBitset *self;
+
+ self = g_slice_new0 (GtkBitset);
+
+ self->ref_count = 1;
+
+ ra_init (&self->roaring.high_low_container);
+
+ return self;
+}
+
+/**
+ * gtk_bitset_add:
+ * @self: a #GtkBitset
+ * @value: value to add
+ *
+ * Adds @value to @self if it wasn't part of it before.
+ *
+ * Returns: %TRUE if @value was not part of @self and @self
+ * was changed.
+ **/
+gboolean
+gtk_bitset_add (GtkBitset *self,
+ guint value)
+{
+ g_return_val_if_fail (self != NULL, FALSE);
+
+ return roaring_bitmap_add_checked (&self->roaring, value);
+}
+
+/**
+ * gtk_bitset_remove:
+ * @self: a #GtkBitset
+ * @value: value to add
+ *
+ * Adds @value to @self if it wasn't part of it before.
+ *
+ * Returns: %TRUE if @value was part of @self and @self
+ * was changed.
+ **/
+gboolean
+gtk_bitset_remove (GtkBitset *self,
+ guint value)
+{
+ g_return_val_if_fail (self != NULL, FALSE);
+
+ return roaring_bitmap_remove_checked (&self->roaring, value);
+}
+
+#if 0
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_add_range (GtkBitset *self,
+ guint start,
+ guint n_items);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_remove_range (GtkBitset *self,
+ guint start,
+ guint n_items);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_add_range_closed (GtkBitset *self,
+ guint first,
+ guint last);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_remove_range_closed (GtkBitset *self,
+ guint first,
+ guint last);
+
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_union (GtkBitset *self,
+ const GtkBitset *other);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_intersect (GtkBitset *self,
+ const GtkBitset *other);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_subtract (GtkBitset *self,
+ const GtkBitset *other);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_difference (GtkBitset *self,
+ const GtkBitset *other);
+#endif
diff --git a/gtk/gtkbitset.h b/gtk/gtkbitset.h
new file mode 100644
index 0000000000..764fdcf150
--- /dev/null
+++ b/gtk/gtkbitset.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright © 2020 Benjamin Otte
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Benjamin Otte <otte gnome org>
+ */
+
+
+#ifndef __GTK_BITSET_H__
+#define __GTK_BITSET_H__
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/gtktypes.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_BITSET (gtk_bitset_get_type ())
+
+GDK_AVAILABLE_IN_ALL
+GType gtk_bitset_get_type (void) G_GNUC_CONST;
+
+GDK_AVAILABLE_IN_ALL
+GtkBitset * gtk_bitset_ref (GtkBitset *self);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_unref (GtkBitset *self);
+
+GDK_AVAILABLE_IN_ALL
+gboolean gtk_bitset_contains (GtkBitset *self,
+ guint value);
+GDK_AVAILABLE_IN_ALL
+gboolean gtk_bitset_is_empty (GtkBitset *self);
+
+GDK_AVAILABLE_IN_ALL
+GtkBitset * gtk_bitset_new_empty (void);
+
+GDK_AVAILABLE_IN_ALL
+gboolean gtk_bitset_add (GtkBitset *self,
+ guint value);
+GDK_AVAILABLE_IN_ALL
+gboolean gtk_bitset_remove (GtkBitset *self,
+ guint value);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_add_range (GtkBitset *self,
+ guint start,
+ guint n_items);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_remove_range (GtkBitset *self,
+ guint start,
+ guint n_items);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_add_range_closed (GtkBitset *self,
+ guint first,
+ guint last);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_remove_range_closed (GtkBitset *self,
+ guint first,
+ guint last);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_add_rectangle (GtkBitset *self,
+ guint start,
+ guint width,
+ guint height,
+ guint stride);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_remove_rectangle (GtkBitset *self,
+ guint start,
+ guint width,
+ guint height,
+ guint stride);
+
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_union (GtkBitset *self,
+ const GtkBitset *other);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_intersect (GtkBitset *self,
+ const GtkBitset *other);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_subtract (GtkBitset *self,
+ const GtkBitset *other);
+GDK_AVAILABLE_IN_ALL
+void gtk_bitset_difference (GtkBitset *self,
+ const GtkBitset *other);
+
+G_END_DECLS
+
+#endif /* __GTK_BITSET_H__ */
diff --git a/gtk/gtktypes.h b/gtk/gtktypes.h
index f8e68a0e07..9c3f4fe2ed 100644
--- a/gtk/gtktypes.h
+++ b/gtk/gtktypes.h
@@ -34,6 +34,7 @@
G_BEGIN_DECLS
typedef struct _GtkAdjustment GtkAdjustment;
+typedef struct _GtkBitset GtkBitset;
typedef struct _GtkBuilder GtkBuilder;
typedef struct _GtkBuilderScope GtkBuilderScope;
typedef struct _GtkClipboard GtkClipboard;
diff --git a/gtk/meson.build b/gtk/meson.build
index 4f02dbc4c7..9e0bc4e229 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -164,6 +164,7 @@ gtk_public_sources = files([
'gtkaspectframe.c',
'gtkassistant.c',
'gtkbinlayout.c',
+ 'gtkbitset.c',
'gtkborder.c',
'gtkboxlayout.c',
'gtkbox.c',
@@ -448,6 +449,7 @@ gtk_public_headers = files([
'gtkaspectframe.h',
'gtkassistant.h',
'gtkbinlayout.h',
+ 'gtkbitset.h',
'gtkborder.h',
'gtkbox.h',
'gtkboxlayout.h',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
