Commit 4cc92ebd authored by Ell's avatar Ell

app: add GimpUncancelableWaitable

GimpUncancelableWaitable is a simple proxy object for another
GimpWaitable object, implementing only the GimpWaitable interface.
Its main purpose is to mask away the cancelability of an object
implementing both GimpWaitable and GimpCancelable.
parent 46a80811
......@@ -129,6 +129,7 @@ AM_LDFLAGS = \
-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \
-Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy \
-Wl,-u,$(SYMPREFIX)gimp_parallel_init \
-Wl,-u,$(SYMPREFIX)gimp_uncancelable_waitable_new \
-Wl,-u,$(SYMPREFIX)gimp_tool_cursors_get_resource
gimpconsoleldadd = \
......
......@@ -441,6 +441,8 @@ libappcore_a_sources = \
gimptoolpreset-save.h \
gimptreehandler.c \
gimptreehandler.h \
gimpuncancelablewaitable.c \
gimpuncancelablewaitable.h \
gimpunit.c \
gimpunit.h \
gimpundo.c \
......
......@@ -194,6 +194,7 @@ typedef struct _GimpSettings GimpSettings;
typedef struct _GimpSubProgress GimpSubProgress;
typedef struct _GimpTag GimpTag;
typedef struct _GimpTreeHandler GimpTreeHandler;
typedef struct _GimpUncancelableWaitable GimpUncancelableWaitable;
/* interfaces */
......
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpuncancelablewaitable.c
* Copyright (C) 2018 Ell
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
#include "gimpuncancelablewaitable.h"
#include "gimpwaitable.h"
struct _GimpUncancelableWaitablePrivate
{
GimpWaitable *waitable;
};
/* local function prototypes */
static void gimp_uncancelable_waitable_waitable_iface_init (GimpWaitableInterface *iface);
static void gimp_uncancelable_waitable_finalize (GObject *object);
static void gimp_uncancelable_waitable_wait (GimpWaitable *waitable);
static gboolean gimp_uncancelable_waitable_try_wait (GimpWaitable *waitable);
static gboolean gimp_uncancelable_waitable_wait_until (GimpWaitable *waitable,
gint64 end_time);
G_DEFINE_TYPE_WITH_CODE (GimpUncancelableWaitable, gimp_uncancelable_waitable, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (GIMP_TYPE_WAITABLE,
gimp_uncancelable_waitable_waitable_iface_init))
#define parent_class gimp_uncancelable_waitable_parent_class
/* private functions */
static void
gimp_uncancelable_waitable_class_init (GimpUncancelableWaitableClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = gimp_uncancelable_waitable_finalize;
}
static void
gimp_uncancelable_waitable_waitable_iface_init (GimpWaitableInterface *iface)
{
iface->wait = gimp_uncancelable_waitable_wait;
iface->try_wait = gimp_uncancelable_waitable_try_wait;
iface->wait_until = gimp_uncancelable_waitable_wait_until;
}
static void
gimp_uncancelable_waitable_init (GimpUncancelableWaitable *uncancelable_waitable)
{
}
static void
gimp_uncancelable_waitable_finalize (GObject *object)
{
GimpUncancelableWaitable *uncancelable_waitable =
GIMP_UNCANCELABLE_WAITABLE (object);
g_clear_object (&uncancelable_waitable->waitable);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
gimp_uncancelable_waitable_wait (GimpWaitable *waitable)
{
GimpUncancelableWaitable *uncancelable_waitable =
GIMP_UNCANCELABLE_WAITABLE (waitable);
if (uncancelable_waitable->waitable)
gimp_waitable_wait (uncancelable_waitable->waitable);
}
static gboolean
gimp_uncancelable_waitable_try_wait (GimpWaitable *waitable)
{
GimpUncancelableWaitable *uncancelable_waitable =
GIMP_UNCANCELABLE_WAITABLE (waitable);
if (uncancelable_waitable->waitable)
return gimp_waitable_try_wait (uncancelable_waitable->waitable);
else
return TRUE;
}
static gboolean
gimp_uncancelable_waitable_wait_until (GimpWaitable *waitable,
gint64 end_time)
{
GimpUncancelableWaitable *uncancelable_waitable =
GIMP_UNCANCELABLE_WAITABLE (waitable);
if (uncancelable_waitable->waitable)
return gimp_waitable_wait_until (uncancelable_waitable->waitable, end_time);
else
return TRUE;
}
/* public functions */
GimpWaitable *
gimp_uncancelable_waitable_new (GimpWaitable *waitable)
{
GimpUncancelableWaitable *uncancelable_waitable;
g_return_val_if_fail (GIMP_IS_WAITABLE (waitable), NULL);
uncancelable_waitable = g_object_new (GIMP_TYPE_UNCANCELABLE_WAITABLE, NULL);
uncancelable_waitable->waitable = g_object_ref (waitable);
return GIMP_WAITABLE (uncancelable_waitable);
}
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpuncancelablewaitable.h
* Copyright (C) 2018 Ell
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GIMP_UNCANCELABLE_WAITABLE_H__
#define __GIMP_UNCANCELABLE_WAITABLE_H__
#define GIMP_TYPE_UNCANCELABLE_WAITABLE (gimp_uncancelable_waitable_get_type ())
#define GIMP_UNCANCELABLE_WAITABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_UNCANCELABLE_WAITABLE, GimpUncancelableWaitable))
#define GIMP_UNCANCELABLE_WAITABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_UNCANCELABLE_WAITABLE, GimpUncancelableWaitableClass))
#define GIMP_IS_UNCANCELABLE_WAITABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_UNCANCELABLE_WAITABLE))
#define GIMP_IS_UNCANCELABLE_WAITABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_UNCANCELABLE_WAITABLE))
#define GIMP_UNCANCELABLE_WAITABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_UNCANCELABLE_WAITABLE, GimpUncancelableWaitableClass))
typedef struct _GimpUncancelableWaitablePrivate GimpUncancelableWaitablePrivate;
typedef struct _GimpUncancelableWaitableClass GimpUncancelableWaitableClass;
struct _GimpUncancelableWaitable
{
GObject parent_instance;
GimpWaitable *waitable;
};
struct _GimpUncancelableWaitableClass
{
GObjectClass parent_class;
};
GType gimp_uncancelable_waitable_get_type (void) G_GNUC_CONST;
GimpWaitable * gimp_uncancelable_waitable_new (GimpWaitable *waitable);
#endif /* __GIMP_UNCANCELABLE_WAITABLE_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment