* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
-#include "gtk.h"
+/*
+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
+ * file for a list of people on the GTK+ Team. See the ChangeLog
+ * files for a list of changes. These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#undef GTK_DISABLE_DEPRECATED
+
+#include "config.h"
+#include <stdio.h>
+#include "gtk/gtk.h"
/* Backing pixmap for drawing area */
/* Information about cursor */
-static gint need_cursor = FALSE;
static gint cursor_proximity = TRUE;
static gdouble cursor_x;
static gdouble cursor_y;
/* Unique ID of current device */
-static guint32 current_device = GDK_CORE_POINTER;
-
-/* Check to see if we need to draw a cursor for current device */
-static void
-check_cursor ()
-{
- GList *tmp_list;
-
- /* gdk_input_list_devices returns an internal list, so we shouldn't
- free it afterwards */
- tmp_list = gdk_input_list_devices();
-
- while (tmp_list)
- {
- GdkDeviceInfo *info = (GdkDeviceInfo *)tmp_list->data;
-
- if (info->deviceid == current_device)
- {
- need_cursor = !info->has_cursor;
- break;
- }
-
- tmp_list = tmp_list->next;
- }
-}
+static GdkDevice *current_device;
/* Erase the old cursor, and/or draw a new one, if necessary */
static void
update_cursor (GtkWidget *widget, gdouble x, gdouble y)
{
static gint cursor_present = 0;
- gint state = need_cursor && cursor_proximity;
+ gint state = !current_device->has_cursor && cursor_proximity;
if (pixmap != NULL)
{
if (cursor_present && (cursor_present != state ||
x != cursor_x || y != cursor_y))
{
- gdk_draw_pixmap(widget->window,
- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
- pixmap,
- cursor_x - 5, cursor_y - 5,
- cursor_x - 5, cursor_y - 5,
- 10, 10);
+ gdk_draw_drawable (widget->window,
+ widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+ pixmap,
+ cursor_x - 5, cursor_y - 5,
+ cursor_x - 5, cursor_y - 5,
+ 10, 10);
}
cursor_present = state;
configure_event (GtkWidget *widget, GdkEventConfigure *event)
{
if (pixmap)
- gdk_pixmap_unref (pixmap);
+ g_object_unref (pixmap);
pixmap = gdk_pixmap_new(widget->window,
widget->allocation.width,
widget->allocation.height,
static gint
expose_event (GtkWidget *widget, GdkEventExpose *event)
{
- gdk_draw_pixmap(widget->window,
- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
- pixmap,
- event->area.x, event->area.y,
- event->area.x, event->area.y,
- event->area.width, event->area.height);
+ gdk_draw_drawable (widget->window,
+ widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+ pixmap,
+ event->area.x, event->area.y,
+ event->area.x, event->area.y,
+ event->area.width, event->area.height);
return FALSE;
}
gdk_draw_rectangle (pixmap, gc, TRUE,
update_rect.x, update_rect.y,
update_rect.width, update_rect.height);
- gtk_widget_draw (widget, &update_rect);
+ gtk_widget_queue_draw_area (widget,
+ update_rect.x, update_rect.y,
+ update_rect.width, update_rect.height);
+ gdk_window_process_updates (widget->window, TRUE);
}
static guint32 motion_time;
-static gint
-button_press_event (GtkWidget *widget, GdkEventButton *event)
+static void
+print_axes (GdkDevice *device, gdouble *axes)
{
- if (event->deviceid != current_device)
+ int i;
+
+ if (axes)
{
- current_device = event->deviceid;
- check_cursor ();
+ g_print ("%s ", device->name);
+
+ for (i=0; i<device->num_axes; i++)
+ g_print ("%g ", axes[i]);
+
+ g_print ("\n");
}
+}
+static gint
+button_press_event (GtkWidget *widget, GdkEventButton *event)
+{
+ current_device = event->device;
cursor_proximity = TRUE;
if (event->button == 1 && pixmap != NULL)
{
- draw_brush (widget, event->source, event->x, event->y,
- event->pressure);
+ gdouble pressure = 0.5;
+
+ print_axes (event->device, event->axes);
+ gdk_event_get_axis ((GdkEvent *)event, GDK_AXIS_PRESSURE, &pressure);
+ draw_brush (widget, event->device->source, event->x, event->y, pressure);
+
motion_time = event->time;
}
static gint
motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
{
- GdkTimeCoord *coords;
- int nevents;
+ GdkTimeCoord **events;
+ int n_events;
int i;
- if (event->deviceid != current_device)
- {
- current_device = event->deviceid;
- check_cursor ();
- }
-
+ current_device = event->device;
cursor_proximity = TRUE;
if (event->state & GDK_BUTTON1_MASK && pixmap != NULL)
{
- coords = gdk_input_motion_events (event->window, event->deviceid,
- motion_time, event->time,
- &nevents);
- motion_time = event->time;
- if (coords)
+ if (gdk_device_get_history (event->device, event->window,
+ motion_time, event->time,
+ &events, &n_events))
{
- for (i=0; i<nevents; i++)
- draw_brush (widget, event->source, coords[i].x, coords[i].y,
- coords[i].pressure);
- g_free (coords);
+ for (i=0; i<n_events; i++)
+ {
+ double x = 0, y = 0, pressure = 0.5;
+
+ gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_X, &x);
+ gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_Y, &y);
+ gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_PRESSURE, &pressure);
+ draw_brush (widget, event->device->source, x, y, pressure);
+
+ print_axes (event->device, events[i]->axes);
+ }
+ gdk_device_free_history (events, n_events);
}
else
{
- if (event->is_hint)
- gdk_input_window_get_pointer (event->window, event->deviceid,
- NULL, NULL, NULL, NULL, NULL, NULL);
- draw_brush (widget, event->source, event->x, event->y,
- event->pressure);
+ double pressure = 0.5;
+
+ gdk_event_get_axis ((GdkEvent *)event, GDK_AXIS_PRESSURE, &pressure);
+
+ draw_brush (widget, event->device->source, event->x, event->y, pressure);
}
- }
- else
- {
- gdk_input_window_get_pointer (event->window, event->deviceid,
- &event->x, &event->y,
- NULL, NULL, NULL, NULL);
+ motion_time = event->time;
}
+ if (event->is_hint)
+ gdk_device_get_state (event->device, event->window, NULL, NULL);
+
+ print_axes (event->device, event->axes);
update_cursor (widget, event->x, event->y);
return TRUE;
}
void
-create_input_dialog ()
+create_input_dialog (void)
{
static GtkWidget *inputd = NULL;
if (!inputd)
{
- inputd = gtk_input_dialog_new();
-
- gtk_signal_connect (GTK_OBJECT(inputd), "destroy",
- (GtkSignalFunc)input_dialog_destroy, &inputd);
- gtk_signal_connect_object (GTK_OBJECT(GTK_INPUT_DIALOG(inputd)->close_button),
- "clicked",
- (GtkSignalFunc)gtk_widget_hide,
- GTK_OBJECT(inputd));
- gtk_widget_hide ( GTK_INPUT_DIALOG(inputd)->save_button);
-
- gtk_signal_connect (GTK_OBJECT(inputd), "enable_device",
- (GtkSignalFunc)check_cursor, NULL);
+ inputd = gtk_input_dialog_new ();
+
+ g_signal_connect (inputd, "destroy",
+ G_CALLBACK (input_dialog_destroy), &inputd);
+ g_signal_connect_swapped (GTK_INPUT_DIALOG (inputd)->close_button,
+ "clicked",
+ G_CALLBACK (gtk_widget_hide),
+ inputd);
+ gtk_widget_hide (GTK_INPUT_DIALOG (inputd)->save_button);
+
gtk_widget_show (inputd);
}
else
{
- if (!GTK_WIDGET_MAPPED(inputd))
+ if (!gtk_widget_get_mapped(inputd))
gtk_widget_show(inputd);
else
gdk_window_raise(inputd->window);
}
void
-quit ()
+quit (void)
{
- gtk_exit (0);
+ gtk_main_quit ();
}
int
gtk_init (&argc, &argv);
+ current_device = gdk_device_get_core_pointer ();
+
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name (window, "Test Input");
gtk_container_add (GTK_CONTAINER (window), vbox);
gtk_widget_show (vbox);
- gtk_signal_connect (GTK_OBJECT (window), "destroy",
- GTK_SIGNAL_FUNC (quit), NULL);
+ g_signal_connect (window, "destroy",
+ G_CALLBACK (quit), NULL);
/* Create the drawing area */
drawing_area = gtk_drawing_area_new ();
- gtk_drawing_area_size (GTK_DRAWING_AREA (drawing_area), 200, 200);
+ gtk_widget_set_size_request (drawing_area, 200, 200);
gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE, 0);
gtk_widget_show (drawing_area);
/* Signals used to handle backing pixmap */
- gtk_signal_connect (GTK_OBJECT (drawing_area), "expose_event",
- (GtkSignalFunc) expose_event, NULL);
- gtk_signal_connect (GTK_OBJECT(drawing_area),"configure_event",
- (GtkSignalFunc) configure_event, NULL);
+ g_signal_connect (drawing_area, "expose_event",
+ G_CALLBACK (expose_event), NULL);
+ g_signal_connect (drawing_area, "configure_event",
+ G_CALLBACK (configure_event), NULL);
/* Event signals */
- gtk_signal_connect (GTK_OBJECT (drawing_area), "motion_notify_event",
- (GtkSignalFunc) motion_notify_event, NULL);
- gtk_signal_connect (GTK_OBJECT (drawing_area), "button_press_event",
- (GtkSignalFunc) button_press_event, NULL);
- gtk_signal_connect (GTK_OBJECT (drawing_area), "key_press_event",
- (GtkSignalFunc) key_press_event, NULL);
+ g_signal_connect (drawing_area, "motion_notify_event",
+ G_CALLBACK (motion_notify_event), NULL);
+ g_signal_connect (drawing_area, "button_press_event",
+ G_CALLBACK (button_press_event), NULL);
+ g_signal_connect (drawing_area, "key_press_event",
+ G_CALLBACK (key_press_event), NULL);
- gtk_signal_connect (GTK_OBJECT (drawing_area), "leave_notify_event",
- (GtkSignalFunc) leave_notify_event, NULL);
- gtk_signal_connect (GTK_OBJECT (drawing_area), "proximity_out_event",
- (GtkSignalFunc) proximity_out_event, NULL);
+ g_signal_connect (drawing_area, "leave_notify_event",
+ G_CALLBACK (leave_notify_event), NULL);
+ g_signal_connect (drawing_area, "proximity_out_event",
+ G_CALLBACK (proximity_out_event), NULL);
gtk_widget_set_events (drawing_area, GDK_EXPOSURE_MASK
| GDK_LEAVE_NOTIFY_MASK
events for the drawing area */
gtk_widget_set_extension_events (drawing_area, GDK_EXTENSION_EVENTS_ALL);
+ gtk_widget_set_can_focus (drawing_area, TRUE);
gtk_widget_grab_focus (drawing_area);
/* .. And create some buttons */
button = gtk_button_new_with_label ("Input Dialog");
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
- GTK_SIGNAL_FUNC (create_input_dialog), NULL);
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (create_input_dialog), NULL);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Quit");
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
- GTK_SIGNAL_FUNC (gtk_widget_destroy),
- GTK_OBJECT (window));
+ g_signal_connect_swapped (button, "clicked",
+ G_CALLBACK (gtk_widget_destroy),
+ window);
gtk_widget_show (button);
gtk_widget_show (window);
projects / ~andy / gtk / blobdiff