procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-02 00:51:14 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

plugin, macos: Fix #12711, #12898

Browse source 
This fix does not cause the problems that the alternative fix caused (as detailed in #12898).
This commit is contained in:
Lukas Oberhuber 2025-02-15 16:28:01 +00:00 • committed by Lukas Oberhuber
parent ff5e3fdab6
commit 9042486dac
4 changed files with 60 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

75
app/plug-in/gimpplugin.c
View file

@ -43,6 +43,10 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#ifdef __APPLE__
#include <sys/ioctl.h>
#endif
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
#define STRICT
@ -95,26 +99,30 @@
#include "gimp-intl.h"
static void gimp_plug_in_finalize (GObject *object);
static void gimp_plug_in_finalize (GObject *object);
static gboolean gimp_plug_in_recv_message (GIOChannel *channel,
GIOCondition cond,
gpointer data);
static gboolean gimp_plug_in_write (GIOChannel *channel,
const guint8 *buf,
gulong count,
gpointer data);
static gboolean gimp_plug_in_flush (GIOChannel *channel,
gpointer data);
static gboolean gimp_plug_in_recv_message (GIOChannel *channel,
GIOCondition cond,
gpointer data);
static gboolean gimp_plug_in_write (GIOChannel *channel,
const guint8 *buf,
gulong count,
gpointer data);
static gboolean gimp_plug_in_flush (GIOChannel *channel,
gpointer data);
#if defined G_OS_WIN32 && defined WIN32_32BIT_DLL_FOLDER
static void gimp_plug_in_set_dll_directory (const gchar *path);
static void gimp_plug_in_set_dll_directory (const gchar *path);
#endif
#ifndef G_OS_WIN32
static void gimp_plug_in_close_waitpid (GPid pid,
gint status,
GimpPlugIn *plug_in);
static void gimp_plug_in_close_waitpid (GPid pid,
gint status,
GimpPlugIn *plug_in);
#endif
#ifdef __APPLE__
static guint gimp_plug_in_wire_count_bytes_ready (GIOChannel *channel);
#endif
@ -208,7 +216,7 @@ gimp_plug_in_recv_message (GIOChannel *channel,
* else reads will hang, and the app appear non-responsive.
*/
if (gimp_wire_count_bytes_ready (channel) < 4)
if (gimp_plug_in_wire_count_bytes_ready (channel) < 4)
return TRUE;
#endif
@ -407,6 +415,43 @@ gimp_plug_in_close_waitpid (GPid pid,
}
#endif
#ifdef __APPLE__
/* Returns the count of bytes in the channel.
* Bytes that can be read without blocking.
*
* Returns zero on an IO error.
* Also may return zero if the channel is empty.
*
* Requires channel is a pipe open for reading.
*
* This should only be used in extraordinary situations.
* It is only for UNIX-like platforms; might not be portable to MSWindows.
* It can also be used for debugging the protocol, to know message lengths.
*
* Used on MacOS for a seeming bug in IO events.
* Usually, on an IO event on condition G_IO_IN,
* you can assume the pipe is not empty and a read will not block.
*/
static guint
gimp_plug_in_wire_count_bytes_ready (GIOChannel *channel)
{
int err = 0;
guint result;
int fd;
fd = g_io_channel_unix_get_fd (channel);
err = ioctl (fd, FIONREAD, &result);
if (err < 0)
{
g_warning ("%s ioctl failed.", G_STRFUNC);
result = 0;
}
g_debug ("%s bytes ready: %d", G_STRFUNC, result);
return result;
}
#endif
/* public functions */

1
libgimpbase/gimpbase.def
View file

@ -273,7 +273,6 @@ EXPORTS
gimp_value_take_double_array
gimp_value_take_int32_array
gimp_wire_clear_error
gimp_wire_count_bytes_ready
gimp_wire_destroy
gimp_wire_error
gimp_wire_flush

36
libgimpbase/gimpwire.c
View file

@ -21,7 +21,6 @@
#include <string.h>
#include <glib-object.h>
#include <sys/ioctl.h>
#include <libgimpcolor/gimpcolortypes.h>
@ -311,41 +310,6 @@ gimp_wire_destroy (GimpWireMessage *msg)
(* handler->destroy_func) (msg);
}
/* Returns the count of bytes in the channel.
* Bytes that can be read without blocking.
*
* Returns zero on an IO error.
* Also may return zero if the channel is empty.
*
* Requires channel is a pipe open for reading.
*
* This should only be used in extraordinary situations.
* It is only for UNIX-like platforms; might not be portable to MSWindows.
* It can also be used for debugging the protocol, to know message lengths.
*
* Used on MacOS for a seeming bug in IO events.
* Usually, on an IO event on condition G_IO_IN,
* you can assume the pipe is not empty and a read will not block.
*/
guint
gimp_wire_count_bytes_ready (GIOChannel *channel)
{
int err = 0;
guint result;
int fd;
fd = g_io_channel_unix_get_fd (channel);
err = ioctl (fd, FIONREAD, &result);
if (err < 0)
{
g_warning ("%s ioctl failed.", G_STRFUNC);
result = 0;
}
g_debug ("%s bytes ready: %d", G_STRFUNC, result);
return result;
}
gboolean
_gimp_wire_read_int64 (GIOChannel *channel,
guint64 *data,

2
libgimpbase/gimpwire.h
View file

@ -80,8 +80,6 @@ gboolean gimp_wire_write_msg (GIOChannel *channel,
void gimp_wire_destroy (GimpWireMessage *msg);
guint gimp_wire_count_bytes_ready (GIOChannel *channel);
/* for internal use in libgimpbase */