app: split tool event handling out into an own file

it was simply getting too hairy in the callbacks.c file.

app/display/Makefile.am

@@ -121,6 +121,8 @@ libappdisplay_a_sources = \
 	gimpdisplayshell-style.h		\
 	gimpdisplayshell-title.c		\
 	gimpdisplayshell-title.h		\
+	gimpdisplayshell-tool-events.c		\
+	gimpdisplayshell-tool-events.h		\
 	gimpdisplayshell-transform.c		\
 	gimpdisplayshell-transform.h		\
 	gimpimagewindow.c			\

app/display/gimpdisplayshell-callbacks.h

@@ -19,10 +19,6 @@
 #define __GIMP_DISPLAY_SHELL_CALLBACKS_H__
 
 
-gboolean   gimp_display_shell_events                  (GtkWidget        *widget,
-                                                       GdkEvent         *event,
-                                                       GimpDisplayShell *shell);
-
 void       gimp_display_shell_canvas_realize          (GtkWidget        *widget,
                                                        GimpDisplayShell *shell);
 void       gimp_display_shell_canvas_size_allocate    (GtkWidget        *widget,
@@ -34,16 +30,6 @@ gboolean   gimp_display_shell_canvas_expose           (GtkWidget        *widget,
 gboolean   gimp_display_shell_canvas_expose_after     (GtkWidget        *widget,
                                                        GdkEventExpose   *eevent,
                                                        GimpDisplayShell *shell);
-gboolean   gimp_display_shell_canvas_tool_events      (GtkWidget        *widget,
-                                                       GdkEvent         *event,
-                                                       GimpDisplayShell *shell);
-
-gboolean   gimp_display_shell_hruler_button_press     (GtkWidget        *widget,
-                                                       GdkEventButton   *bevent,
-                                                       GimpDisplayShell *shell);
-gboolean   gimp_display_shell_vruler_button_press     (GtkWidget        *widget,
-                                                       GdkEventButton   *bevent,
-                                                       GimpDisplayShell *shell);
 
 gboolean   gimp_display_shell_origin_button_press     (GtkWidget        *widget,
                                                        GdkEventButton   *bevent,

app/display/gimpdisplayshell-tool-events.h

@@ -0,0 +1,38 @@
+/* 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 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_DISPLAY_SHELL_TOOL_EVENTS_H__
+#define __GIMP_DISPLAY_SHELL_TOOL_EVENTS_H__
+
+
+gboolean   gimp_display_shell_events                  (GtkWidget        *widget,
+                                                       GdkEvent         *event,
+                                                       GimpDisplayShell *shell);
+
+gboolean   gimp_display_shell_canvas_tool_events      (GtkWidget        *widget,
+                                                       GdkEvent         *event,
+                                                       GimpDisplayShell *shell);
+
+gboolean   gimp_display_shell_hruler_button_press     (GtkWidget        *widget,
+                                                       GdkEventButton   *bevent,
+                                                       GimpDisplayShell *shell);
+gboolean   gimp_display_shell_vruler_button_press     (GtkWidget        *widget,
+                                                       GdkEventButton   *bevent,
+                                                       GimpDisplayShell *shell);
+
+
+#endif /* __GIMP_DISPLAY_SHELL_TOOL_EVENT_H__ */

app/display/gimpdisplayshell.c

@@ -71,6 +71,7 @@
 #include "gimpdisplayshell-scroll.h"
 #include "gimpdisplayshell-selection.h"
 #include "gimpdisplayshell-title.h"
+#include "gimpdisplayshell-tool-events.h"
 #include "gimpdisplayshell-transform.h"
 #include "gimpimagewindow.h"
 #include "gimpstatusbar.h"

app/display/gimpimagewindow.c

@@ -45,9 +45,9 @@
 #include "gimpdisplay-foreach.h"
 #include "gimpdisplayshell.h"
 #include "gimpdisplayshell-appearance.h"
-#include "gimpdisplayshell-callbacks.h"
 #include "gimpdisplayshell-close.h"
 #include "gimpdisplayshell-scroll.h"
+#include "gimpdisplayshell-tool-events.h"
 #include "gimpdisplayshell-transform.h"
 #include "gimpimagewindow.h"
 #include "gimpstatusbar.h"