2008-11-04 Sven Neumann <sven@sven> * configure.in: bumped minimum required version of GLib to 2.18.0. * INSTALL: document the updated dependency. * app/core/gimp.[ch]: introduced gimp_message_literal(), a variant of gimp_message() that takes a literal string. * app/errors.[ch]: removed format arguments from gimp_fatal_error() and gimp_terminate() and let them take a literal string instead. * app/tools/gimptool.[ch]: introduced gimp_tool_message_literal(), a variant of gimp_tool_message() that takes a literal string. * app/actions/documents-commands.c * app/actions/drawable-commands.c * app/actions/edit-commands.c * app/actions/error-console-commands.c * app/actions/file-commands.c * app/actions/gradients-commands.c * app/actions/image-commands.c * app/actions/layers-commands.c * app/actions/palettes-commands.c * app/actions/plug-in-commands.c * app/actions/select-commands.c * app/actions/vectors-commands.c * app/config/gimprc.c * app/core/gimp-modules.c * app/core/gimp-parasites.c * app/core/gimp-templates.c * app/core/gimp-units.c * app/core/gimpchannel.c * app/core/gimpcontainer-filter.c * app/core/gimpdrawable-bucket-fill.c * app/core/gimpimage-convert.c * app/core/gimpimage-merge.c * app/core/gimpimage.c * app/core/gimpimagefile.c * app/core/gimplayer-floating-sel.c * app/core/gimplayer.c * app/core/gimpselection.c * app/dialogs/convert-dialog.c * app/dialogs/dialogs.c * app/dialogs/palette-import-dialog.c * app/dialogs/preferences-dialog.c * app/dialogs/quit-dialog.c * app/dialogs/stroke-dialog.c * app/display/gimpdisplayshell-dnd.c * app/file/file-open.c * app/file/file-procedure.c * app/file/file-save.c * app/file/file-utils.c * app/gegl/gimpcurvesconfig.c * app/gegl/gimplevelsconfig.c * app/gui/gui-message.c * app/gui/gui.c * app/gui/session.c * app/paint/gimpbrushcore.c * app/paint/gimpclone.c * app/paint/gimpheal.c * app/paint/gimpperspectiveclone.c * app/paint/gimpsourcecore.c * app/pdb/gimppdb-utils.c * app/pdb/gimpprocedure.c * app/plug-in/gimpplugin-message.c * app/plug-in/gimpplugin.c * app/plug-in/gimppluginmanager-restore.c * app/plug-in/gimppluginprocedure.c * app/text/gimptextlayer.c * app/tools/gimp-tools.c * app/tools/gimpaligntool.c * app/tools/gimpblendtool.c * app/tools/gimpbrightnesscontrasttool.c * app/tools/gimpbucketfilltool.c * app/tools/gimpcolorbalancetool.c * app/tools/gimpcolorpickertool.c * app/tools/gimpcurvestool.c * app/tools/gimpdesaturatetool.c * app/tools/gimpeditselectiontool.c * app/tools/gimpforegroundselecttool.c * app/tools/gimpfreeselecttool.c * app/tools/gimpgegltool.c * app/tools/gimphuesaturationtool.c * app/tools/gimpimagemaptool-settings.c * app/tools/gimpiscissorstool.c * app/tools/gimplevelstool.c * app/tools/gimpmeasuretool.c * app/tools/gimppainttool.c * app/tools/gimpposterizetool.c * app/tools/gimpselectiontool.c * app/tools/gimpsourcetool.c * app/tools/gimpthresholdtool.c * app/tools/gimptransformtool.c * app/tools/gimpvectortool.c * app/widgets/gimpactionview.c * app/widgets/gimpcontrollerlist.c * app/widgets/gimpcontrollers.c * app/widgets/gimpdataeditor.c * app/widgets/gimpdevices.c * app/widgets/gimpdnd-xds.c * app/widgets/gimperrordialog.c * app/widgets/gimphelp.c * app/widgets/gimpitemtreeview.c * app/widgets/gimppdbdialog.c * app/widgets/gimpsettingsbox.c * app/widgets/gimpvectorstreeview.c * app/widgets/gimpwidgets-utils.c * app/xcf/xcf-load.c * tools/pdbgen/pdb/convert.pdb * tools/pdbgen/pdb/edit.pdb * tools/pdbgen/pdb/floating_sel.pdb * tools/pdbgen/pdb/image.pdb: use the _literal variants for g_set_error(), gimp_message() and gimp_tool_message(). * app/pdb/convert-cmds.c * app/pdb/edit-cmds.c * app/pdb/floating-sel-cmds.c * app/pdb/image-cmds.c: regenerated. svn path=/trunk/; revision=27548
363 lines
10 KiB
C
363 lines
10 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* 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 2 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, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpbase/gimpbase.h"
|
|
#include "libgimpconfig/gimpconfig.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION
|
|
#include "libgimpwidgets/gimpcontroller.h"
|
|
|
|
#include "widgets-types.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimplist.h"
|
|
|
|
#include "gimpcontrollerinfo.h"
|
|
#include "gimpcontrollers.h"
|
|
#include "gimpcontrollerkeyboard.h"
|
|
#include "gimpcontrollerwheel.h"
|
|
#include "gimpenumaction.h"
|
|
#include "gimpuimanager.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
#define GIMP_CONTROLLER_MANAGER_DATA_KEY "gimp-controller-manager"
|
|
|
|
|
|
typedef struct _GimpControllerManager GimpControllerManager;
|
|
|
|
struct _GimpControllerManager
|
|
{
|
|
GimpContainer *controllers;
|
|
GQuark event_mapped_id;
|
|
GimpController *wheel;
|
|
GimpController *keyboard;
|
|
GimpUIManager *ui_manager;
|
|
};
|
|
|
|
|
|
/* local function prototypes */
|
|
|
|
static GimpControllerManager * gimp_controller_manager_get (Gimp *gimp);
|
|
static void gimp_controller_manager_free (GimpControllerManager *manager);
|
|
|
|
static void gimp_controllers_add (GimpContainer *container,
|
|
GimpControllerInfo *info,
|
|
GimpControllerManager *manager);
|
|
static void gimp_controllers_remove (GimpContainer *container,
|
|
GimpControllerInfo *info,
|
|
GimpControllerManager *manager);
|
|
|
|
static gboolean gimp_controllers_event_mapped (GimpControllerInfo *info,
|
|
GimpController *controller,
|
|
const GimpControllerEvent *event,
|
|
const gchar *action_name,
|
|
GimpControllerManager *manager);
|
|
|
|
|
|
/* public functions */
|
|
|
|
void
|
|
gimp_controllers_init (Gimp *gimp)
|
|
{
|
|
GimpControllerManager *manager;
|
|
|
|
g_return_if_fail (GIMP_IS_GIMP (gimp));
|
|
g_return_if_fail (gimp_controller_manager_get (gimp) == NULL);
|
|
|
|
manager = g_slice_new0 (GimpControllerManager);
|
|
|
|
g_object_set_data_full (G_OBJECT (gimp),
|
|
GIMP_CONTROLLER_MANAGER_DATA_KEY, manager,
|
|
(GDestroyNotify) gimp_controller_manager_free);
|
|
|
|
manager->controllers = gimp_list_new (GIMP_TYPE_CONTROLLER_INFO, TRUE);
|
|
|
|
g_signal_connect (manager->controllers, "add",
|
|
G_CALLBACK (gimp_controllers_add),
|
|
manager);
|
|
g_signal_connect (manager->controllers, "remove",
|
|
G_CALLBACK (gimp_controllers_remove),
|
|
manager);
|
|
|
|
manager->event_mapped_id =
|
|
gimp_container_add_handler (manager->controllers, "event-mapped",
|
|
G_CALLBACK (gimp_controllers_event_mapped),
|
|
manager);
|
|
|
|
g_type_class_ref (GIMP_TYPE_CONTROLLER_WHEEL);
|
|
g_type_class_ref (GIMP_TYPE_CONTROLLER_KEYBOARD);
|
|
}
|
|
|
|
void
|
|
gimp_controllers_exit (Gimp *gimp)
|
|
{
|
|
g_return_if_fail (GIMP_IS_GIMP (gimp));
|
|
g_return_if_fail (gimp_controller_manager_get (gimp) != NULL);
|
|
|
|
g_object_set_data (G_OBJECT (gimp), GIMP_CONTROLLER_MANAGER_DATA_KEY, NULL);
|
|
|
|
g_type_class_unref (g_type_class_peek (GIMP_TYPE_CONTROLLER_WHEEL));
|
|
g_type_class_unref (g_type_class_peek (GIMP_TYPE_CONTROLLER_KEYBOARD));
|
|
}
|
|
|
|
void
|
|
gimp_controllers_restore (Gimp *gimp,
|
|
GimpUIManager *ui_manager)
|
|
{
|
|
GimpControllerManager *manager;
|
|
gchar *filename;
|
|
GError *error = NULL;
|
|
|
|
g_return_if_fail (GIMP_IS_GIMP (gimp));
|
|
g_return_if_fail (GIMP_IS_UI_MANAGER (ui_manager));
|
|
|
|
manager = gimp_controller_manager_get (gimp);
|
|
|
|
g_return_if_fail (manager != NULL);
|
|
g_return_if_fail (manager->ui_manager == NULL);
|
|
|
|
manager->ui_manager = g_object_ref (ui_manager);
|
|
|
|
filename = gimp_personal_rc_file ("controllerrc");
|
|
|
|
if (gimp->be_verbose)
|
|
g_print ("Parsing '%s'\n", gimp_filename_to_utf8 (filename));
|
|
|
|
if (! gimp_config_deserialize_file (GIMP_CONFIG (manager->controllers),
|
|
filename, NULL, &error))
|
|
{
|
|
if (error->code == GIMP_CONFIG_ERROR_OPEN_ENOENT)
|
|
{
|
|
g_clear_error (&error);
|
|
g_free (filename);
|
|
|
|
filename = g_build_filename (gimp_sysconf_directory (),
|
|
"controllerrc", NULL);
|
|
|
|
if (! gimp_config_deserialize_file (GIMP_CONFIG (manager->controllers),
|
|
filename, NULL, &error))
|
|
{
|
|
gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR,
|
|
error->message);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
|
|
}
|
|
|
|
g_clear_error (&error);
|
|
}
|
|
|
|
gimp_list_reverse (GIMP_LIST (manager->controllers));
|
|
|
|
g_free (filename);
|
|
}
|
|
|
|
void
|
|
gimp_controllers_save (Gimp *gimp)
|
|
{
|
|
const gchar *header =
|
|
"GIMP controllerrc\n"
|
|
"\n"
|
|
"This file will be entirely rewritten each time you exit.";
|
|
const gchar *footer =
|
|
"end of controllerrc";
|
|
|
|
GimpControllerManager *manager;
|
|
gchar *filename;
|
|
GError *error = NULL;
|
|
|
|
g_return_if_fail (GIMP_IS_GIMP (gimp));
|
|
|
|
manager = gimp_controller_manager_get (gimp);
|
|
|
|
g_return_if_fail (manager != NULL);
|
|
|
|
filename = gimp_personal_rc_file ("controllerrc");
|
|
|
|
if (gimp->be_verbose)
|
|
g_print ("Writing '%s'\n", gimp_filename_to_utf8 (filename));
|
|
|
|
if (! gimp_config_serialize_to_file (GIMP_CONFIG (manager->controllers),
|
|
filename,
|
|
header, footer, NULL,
|
|
&error))
|
|
{
|
|
gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
|
|
g_error_free (error);
|
|
}
|
|
|
|
g_free (filename);
|
|
}
|
|
|
|
GimpContainer *
|
|
gimp_controllers_get_list (Gimp *gimp)
|
|
{
|
|
GimpControllerManager *manager;
|
|
|
|
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
|
|
|
|
manager = gimp_controller_manager_get (gimp);
|
|
|
|
g_return_val_if_fail (manager != NULL, NULL);
|
|
|
|
return manager->controllers;
|
|
}
|
|
|
|
GimpUIManager *
|
|
gimp_controllers_get_ui_manager (Gimp *gimp)
|
|
{
|
|
GimpControllerManager *manager;
|
|
|
|
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
|
|
|
|
manager = gimp_controller_manager_get (gimp);
|
|
|
|
g_return_val_if_fail (manager != NULL, NULL);
|
|
|
|
return manager->ui_manager;
|
|
}
|
|
|
|
GimpController *
|
|
gimp_controllers_get_wheel (Gimp *gimp)
|
|
{
|
|
GimpControllerManager *manager;
|
|
|
|
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
|
|
|
|
manager = gimp_controller_manager_get (gimp);
|
|
|
|
g_return_val_if_fail (manager != NULL, NULL);
|
|
|
|
return manager->wheel;
|
|
}
|
|
|
|
GimpController *
|
|
gimp_controllers_get_keyboard (Gimp *gimp)
|
|
{
|
|
GimpControllerManager *manager;
|
|
|
|
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
|
|
|
|
manager = gimp_controller_manager_get (gimp);
|
|
|
|
g_return_val_if_fail (manager != NULL, NULL);
|
|
|
|
return manager->keyboard;
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static GimpControllerManager *
|
|
gimp_controller_manager_get (Gimp *gimp)
|
|
{
|
|
return g_object_get_data (G_OBJECT (gimp), GIMP_CONTROLLER_MANAGER_DATA_KEY);
|
|
}
|
|
|
|
static void
|
|
gimp_controller_manager_free (GimpControllerManager *manager)
|
|
{
|
|
gimp_container_remove_handler (manager->controllers,
|
|
manager->event_mapped_id);
|
|
|
|
g_object_unref (manager->controllers);
|
|
g_object_unref (manager->ui_manager);
|
|
|
|
g_slice_free (GimpControllerManager, manager);
|
|
}
|
|
|
|
static void
|
|
gimp_controllers_add (GimpContainer *container,
|
|
GimpControllerInfo *info,
|
|
GimpControllerManager *manager)
|
|
{
|
|
if (GIMP_IS_CONTROLLER_WHEEL (info->controller))
|
|
manager->wheel = info->controller;
|
|
else if (GIMP_IS_CONTROLLER_KEYBOARD (info->controller))
|
|
manager->keyboard = info->controller;
|
|
}
|
|
|
|
static void
|
|
gimp_controllers_remove (GimpContainer *container,
|
|
GimpControllerInfo *info,
|
|
GimpControllerManager *manager)
|
|
{
|
|
if (info->controller == manager->wheel)
|
|
manager->wheel = NULL;
|
|
else if (info->controller == manager->keyboard)
|
|
manager->keyboard = NULL;
|
|
}
|
|
|
|
static gboolean
|
|
gimp_controllers_event_mapped (GimpControllerInfo *info,
|
|
GimpController *controller,
|
|
const GimpControllerEvent *event,
|
|
const gchar *action_name,
|
|
GimpControllerManager *manager)
|
|
{
|
|
GtkUIManager *ui_manager = GTK_UI_MANAGER (manager->ui_manager);
|
|
GList *list;
|
|
|
|
for (list = gtk_ui_manager_get_action_groups (ui_manager);
|
|
list;
|
|
list = g_list_next (list))
|
|
{
|
|
GtkActionGroup *group = list->data;
|
|
GtkAction *action;
|
|
|
|
action = gtk_action_group_get_action (group, action_name);
|
|
|
|
if (action)
|
|
{
|
|
switch (event->type)
|
|
{
|
|
case GIMP_CONTROLLER_EVENT_VALUE:
|
|
if (G_VALUE_HOLDS_DOUBLE (&event->value.value) &&
|
|
GIMP_IS_ENUM_ACTION (action) &&
|
|
GIMP_ENUM_ACTION (action)->value_variable)
|
|
{
|
|
gdouble value = g_value_get_double (&event->value.value);
|
|
|
|
gimp_enum_action_selected (GIMP_ENUM_ACTION (action),
|
|
value * 1000);
|
|
|
|
break;
|
|
}
|
|
/* else fallthru */
|
|
|
|
case GIMP_CONTROLLER_EVENT_TRIGGER:
|
|
default:
|
|
gtk_action_activate (action);
|
|
break;
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
}
|
|
|
|
return FALSE;
|
|
}
|