* Lesser General Public License for more details.
*
* 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include "config.h"
#include <stdio.h>
#include "gtk/gtk.h"
+#include <math.h>
-/* Backing pixmap for drawing area */
+/* Backing surface for drawing area */
-static GdkPixmap *pixmap = NULL;
+static cairo_surface_t *surface = NULL;
/* Information about cursor */
update_cursor (GtkWidget *widget, gdouble x, gdouble y)
{
static gint cursor_present = 0;
- gint state = !current_device->has_cursor && cursor_proximity;
+ gint state = !gdk_device_get_has_cursor (current_device) && cursor_proximity;
- if (pixmap != NULL)
+ x = floor (x);
+ y = floor (y);
+
+ if (surface != NULL)
{
+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
+
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);
+ cairo_set_source_surface (cr, surface, 0, 0);
+ cairo_rectangle (cr, cursor_x - 5, cursor_y - 5, 10, 10);
+ cairo_fill (cr);
}
cursor_present = state;
if (cursor_present)
{
- gdk_draw_rectangle (widget->window,
- widget->style->black_gc,
- TRUE,
- cursor_x - 5, cursor_y -5,
- 10, 10);
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ cairo_rectangle (cr,
+ cursor_x - 5, cursor_y -5,
+ 10, 10);
+ cairo_fill (cr);
}
+
+ cairo_destroy (cr);
}
}
-/* Create a new backing pixmap of the appropriate size */
+/* Create a new backing surface of the appropriate size */
static gint
configure_event (GtkWidget *widget, GdkEventConfigure *event)
{
- if (pixmap)
- gdk_pixmap_unref (pixmap);
- pixmap = gdk_pixmap_new(widget->window,
- widget->allocation.width,
- widget->allocation.height,
- -1);
- gdk_draw_rectangle (pixmap,
- widget->style->white_gc,
- TRUE,
- 0, 0,
- widget->allocation.width,
- widget->allocation.height);
+ GtkAllocation allocation;
+ cairo_t *cr;
+
+ if (surface)
+ cairo_surface_destroy (surface);
+
+ gtk_widget_get_allocation (widget, &allocation);
+
+ surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget),
+ CAIRO_CONTENT_COLOR,
+ allocation.width,
+ allocation.height);
+ cr = cairo_create (surface);
+
+ cairo_set_source_rgb (cr, 1, 1, 1);
+ cairo_paint (cr);
+
+ cairo_destroy (cr);
return TRUE;
}
-/* Refill the screen from the backing pixmap */
-static gint
-expose_event (GtkWidget *widget, GdkEventExpose *event)
+/* Refill the screen from the backing surface */
+static gboolean
+draw (GtkWidget *widget, cairo_t *cr)
{
- 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);
+ cairo_set_source_surface (cr, surface, 0, 0);
+ cairo_paint (cr);
return FALSE;
}
draw_brush (GtkWidget *widget, GdkInputSource source,
gdouble x, gdouble y, gdouble pressure)
{
- GdkGC *gc;
+ GdkRGBA color;
GdkRectangle update_rect;
+ cairo_t *cr;
+
+ color.alpha = 1.0;
switch (source)
{
case GDK_SOURCE_MOUSE:
- gc = widget->style->dark_gc[GTK_WIDGET_STATE (widget)];
+ color.red = color.green = 0.0;
+ color.blue = 1.0;
break;
case GDK_SOURCE_PEN:
- gc = widget->style->black_gc;
+ color.red = color.green = color.blue = 0.0;
break;
case GDK_SOURCE_ERASER:
- gc = widget->style->white_gc;
+ color.red = color.green = color.blue = 1.0;
break;
default:
- gc = widget->style->light_gc[GTK_WIDGET_STATE (widget)];
+ color.red = color.blue = 0.0;
+ color.green = 1.0;
}
update_rect.x = x - 10 * pressure;
update_rect.y = y - 10 * pressure;
update_rect.width = 20 * pressure;
update_rect.height = 20 * pressure;
- gdk_draw_rectangle (pixmap, gc, TRUE,
- update_rect.x, update_rect.y,
- update_rect.width, update_rect.height);
- gtk_widget_draw (widget, &update_rect);
+
+ cr = cairo_create (surface);
+ gdk_cairo_set_source_rgba (cr, &color);
+ gdk_cairo_rectangle (cr, &update_rect);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+
+ gtk_widget_queue_draw_area (widget,
+ update_rect.x, update_rect.y,
+ update_rect.width, update_rect.height);
+ gdk_window_process_updates (gtk_widget_get_window (widget), TRUE);
}
static guint32 motion_time;
if (axes)
{
- g_print ("%s ", device->name);
-
- for (i=0; i<device->num_axes; i++)
+ g_print ("%s ", gdk_device_get_name (device));
+
+ for (i = 0; i < gdk_device_get_n_axes (device); i++)
g_print ("%g ", axes[i]);
g_print ("\n");
current_device = event->device;
cursor_proximity = TRUE;
- if (event->button == 1 && pixmap != NULL)
+ if (event->button == GDK_BUTTON_PRIMARY &&
+ surface != NULL)
{
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);
-
+ draw_brush (widget, gdk_device_get_source (event->device),
+ event->x, event->y, pressure);
+
motion_time = event->time;
}
motion_notify_event (GtkWidget *widget, GdkEventMotion *event)
{
GdkTimeCoord **events;
- int n_events;
+ gint n_events;
int i;
current_device = event->device;
cursor_proximity = TRUE;
- if (event->state & GDK_BUTTON1_MASK && pixmap != NULL)
+ if (event->state & GDK_BUTTON1_MASK && surface != NULL)
{
if (gdk_device_get_history (event->device, event->window,
motion_time, event->time,
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);
+ draw_brush (widget, gdk_device_get_source (event->device),
+ x, y, pressure);
print_axes (event->device, events[i]->axes);
}
gdk_event_get_axis ((GdkEvent *)event, GDK_AXIS_PRESSURE, &pressure);
- draw_brush (widget, event->device->source, event->x, event->y, pressure);
+ draw_brush (widget, gdk_device_get_source (event->device),
+ event->x, event->y, pressure);
}
motion_time = event->time;
}
return TRUE;
}
-void
-input_dialog_destroy (GtkWidget *w, gpointer data)
-{
- *((GtkWidget **)data) = NULL;
-}
-
-void
-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_widget_show (inputd);
- }
- else
- {
- if (!GTK_WIDGET_MAPPED(inputd))
- gtk_widget_show(inputd);
- else
- gdk_window_raise(inputd->window);
- }
-}
-
void
quit (void)
{
- gtk_exit (0);
+ gtk_main_quit ();
}
int
main (int argc, char *argv[])
{
+ GdkDeviceManager *device_manager;
+ GList *devices, *d;
+ GdkEventMask event_mask;
GtkWidget *window;
GtkWidget *drawing_area;
GtkWidget *vbox;
gtk_init (&argc, &argv);
- current_device = gdk_device_get_core_pointer ();
+ device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
+ current_device = gdk_device_manager_get_client_pointer (device_manager);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name (window, "Test Input");
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
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 */
+ /* Signals used to handle backing surface */
- 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, "draw",
+ G_CALLBACK (draw), 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);
-
- 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);
-
- gtk_widget_set_events (drawing_area, GDK_EXPOSURE_MASK
- | GDK_LEAVE_NOTIFY_MASK
- | GDK_BUTTON_PRESS_MASK
- | GDK_KEY_PRESS_MASK
- | GDK_POINTER_MOTION_MASK
- | GDK_POINTER_MOTION_HINT_MASK
- | GDK_PROXIMITY_OUT_MASK);
-
- /* The following call enables tracking and processing of extension
- events for the drawing area */
- gtk_widget_set_extension_events (drawing_area, GDK_EXTENSION_EVENTS_ALL);
-
- GTK_WIDGET_SET_FLAGS (drawing_area, GTK_CAN_FOCUS);
- gtk_widget_grab_focus (drawing_area);
+ 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);
- /* .. And create some buttons */
- button = gtk_button_new_with_label ("Input Dialog");
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ 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_signal_connect (GTK_OBJECT (button), "clicked",
- GTK_SIGNAL_FUNC (create_input_dialog), NULL);
- gtk_widget_show (button);
+ event_mask = GDK_EXPOSURE_MASK |
+ GDK_LEAVE_NOTIFY_MASK |
+ GDK_BUTTON_PRESS_MASK |
+ GDK_KEY_PRESS_MASK |
+ GDK_POINTER_MOTION_MASK |
+ GDK_POINTER_MOTION_HINT_MASK |
+ GDK_PROXIMITY_OUT_MASK;
+
+ gtk_widget_set_events (drawing_area, event_mask);
+
+ devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING);
+ for (d = devices; d; d = d->next)
+ {
+ GdkDevice *device;
+
+ device = d->data;
+ gtk_widget_set_device_events (drawing_area, device, event_mask);
+ gdk_device_set_mode (device, GDK_MODE_SCREEN);
+ }
+
+ g_list_free (devices);
+
+ gtk_widget_set_can_focus (drawing_area, TRUE);
+ gtk_widget_grab_focus (drawing_area);
+
+ /* .. And create some buttons */
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