2006-05-29 04:59:36 -04:00
|
|
|
/*
|
|
|
|
* Clutter.
|
|
|
|
*
|
|
|
|
* An OpenGL based 'interactive canvas' library.
|
|
|
|
*
|
|
|
|
* Authored By Matthew Allum <mallum@openedhand.com>
|
|
|
|
*
|
|
|
|
* Copyright (C) 2006 OpenedHand
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* 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
|
|
|
|
* 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.
|
|
|
|
*/
|
2006-06-21 18:34:25 -04:00
|
|
|
|
2006-12-12 15:20:04 -05:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
2007-03-22 14:21:59 -04:00
|
|
|
#include "clutter-keysyms-table.h"
|
2006-05-29 04:59:36 -04:00
|
|
|
#include "clutter-event.h"
|
2007-03-22 14:21:59 -04:00
|
|
|
#include "clutter-private.h"
|
|
|
|
#include "clutter-debug.h"
|
|
|
|
|
2007-06-07 11:28:59 -04:00
|
|
|
/**
|
|
|
|
* SECTION:clutter-event
|
|
|
|
* @short_description: User and window system events
|
|
|
|
*
|
|
|
|
* Windowing events handled by Clutter.
|
|
|
|
*/
|
|
|
|
|
2007-05-09 19:31:08 -04:00
|
|
|
/* multiple button click detection */
|
2007-08-21 11:48:44 -04:00
|
|
|
static guint32 button_click_time[2] = { 0, 0 };
|
|
|
|
static guint32 button_number[2] = { -1, -1 };
|
|
|
|
static gint button_x[2] = { 0, 0 };
|
|
|
|
static gint button_y[2] = { 0, 0 };
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2006-12-12 15:20:04 -05:00
|
|
|
/**
|
|
|
|
* clutter_event_type:
|
|
|
|
* @event: a #ClutterEvent
|
|
|
|
*
|
|
|
|
* Retrieves the type of the event.
|
|
|
|
*
|
|
|
|
* Return value: a #ClutterEventType
|
|
|
|
*/
|
2006-05-29 04:59:36 -04:00
|
|
|
ClutterEventType
|
|
|
|
clutter_event_type (ClutterEvent *event)
|
|
|
|
{
|
2007-03-22 14:21:59 -04:00
|
|
|
g_return_val_if_fail (event != NULL, CLUTTER_NOTHING);
|
|
|
|
|
2006-05-29 04:59:36 -04:00
|
|
|
return event->type;
|
|
|
|
}
|
|
|
|
|
2006-12-12 15:20:04 -05:00
|
|
|
/**
|
2007-03-22 14:21:59 -04:00
|
|
|
* clutter_event_get_time:
|
|
|
|
* @event: a #ClutterEvent
|
2006-12-12 15:20:04 -05:00
|
|
|
*
|
|
|
|
* Retrieves the time of the event.
|
|
|
|
*
|
2007-03-22 14:21:59 -04:00
|
|
|
* Return value: the time of the event, or %CLUTTER_CURRENT_TIME
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
2006-12-12 15:20:04 -05:00
|
|
|
*/
|
2006-05-29 04:59:36 -04:00
|
|
|
guint32
|
2007-03-22 14:21:59 -04:00
|
|
|
clutter_event_get_time (ClutterEvent *event)
|
2006-05-29 04:59:36 -04:00
|
|
|
{
|
2007-03-22 14:21:59 -04:00
|
|
|
g_return_val_if_fail (event != NULL, CLUTTER_CURRENT_TIME);
|
|
|
|
|
|
|
|
switch (event->type)
|
|
|
|
{
|
|
|
|
case CLUTTER_KEY_PRESS:
|
|
|
|
case CLUTTER_KEY_RELEASE:
|
|
|
|
return event->key.time;
|
|
|
|
case CLUTTER_BUTTON_PRESS:
|
|
|
|
case CLUTTER_2BUTTON_PRESS:
|
|
|
|
case CLUTTER_BUTTON_RELEASE:
|
|
|
|
return event->button.time;
|
|
|
|
case CLUTTER_MOTION:
|
|
|
|
return event->motion.time;
|
|
|
|
case CLUTTER_SCROLL:
|
|
|
|
return event->scroll.time;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return CLUTTER_CURRENT_TIME;
|
2006-05-29 04:59:36 -04:00
|
|
|
}
|
|
|
|
|
2006-12-12 15:20:04 -05:00
|
|
|
/**
|
2007-03-22 14:21:59 -04:00
|
|
|
* clutter_event_get_state:
|
|
|
|
* @event: a #ClutterEvent
|
|
|
|
*
|
|
|
|
* Retrieves the modifier state of the event.
|
2006-12-12 15:20:04 -05:00
|
|
|
*
|
2007-07-01 12:44:24 -04:00
|
|
|
* Return value: the modifier state parameter, or 0
|
2006-12-12 15:20:04 -05:00
|
|
|
*
|
2007-03-22 14:21:59 -04:00
|
|
|
* Since: 0.4
|
2006-12-12 15:20:04 -05:00
|
|
|
*/
|
2007-07-21 12:48:11 -04:00
|
|
|
ClutterModifierType
|
2007-03-22 14:21:59 -04:00
|
|
|
clutter_event_get_state (ClutterEvent *event)
|
2006-05-29 04:59:36 -04:00
|
|
|
{
|
2007-03-22 14:21:59 -04:00
|
|
|
g_return_val_if_fail (event != NULL, 0);
|
|
|
|
|
|
|
|
switch (event->type)
|
|
|
|
{
|
|
|
|
case CLUTTER_KEY_PRESS:
|
|
|
|
case CLUTTER_KEY_RELEASE:
|
|
|
|
return event->key.modifier_state;
|
|
|
|
case CLUTTER_BUTTON_PRESS:
|
|
|
|
case CLUTTER_2BUTTON_PRESS:
|
|
|
|
case CLUTTER_BUTTON_RELEASE:
|
|
|
|
return event->button.modifier_state;
|
|
|
|
case CLUTTER_MOTION:
|
|
|
|
return event->motion.modifier_state;
|
|
|
|
case CLUTTER_SCROLL:
|
|
|
|
return event->scroll.modifier_state;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2006-05-29 04:59:36 -04:00
|
|
|
}
|
|
|
|
|
2006-12-12 15:20:04 -05:00
|
|
|
/**
|
2007-03-22 14:21:59 -04:00
|
|
|
* clutter_event_get_coords:
|
|
|
|
* @event: a #ClutterEvent
|
|
|
|
* @x: return location for the X coordinate
|
|
|
|
* @y: return location for the Y coordinate
|
2006-12-12 15:20:04 -05:00
|
|
|
*
|
2007-03-22 14:21:59 -04:00
|
|
|
* Retrieves the coordinates of @event and puts them into @x and @y.
|
2006-12-12 15:20:04 -05:00
|
|
|
*
|
2007-03-22 14:21:59 -04:00
|
|
|
* Since: 0.4
|
2006-12-12 15:20:04 -05:00
|
|
|
*/
|
2007-03-22 14:21:59 -04:00
|
|
|
void
|
|
|
|
clutter_event_get_coords (ClutterEvent *event,
|
|
|
|
gint *x,
|
|
|
|
gint *y)
|
2006-05-29 04:59:36 -04:00
|
|
|
{
|
2007-03-22 14:21:59 -04:00
|
|
|
gint event_x, event_y;
|
|
|
|
|
|
|
|
g_return_if_fail (event != NULL);
|
|
|
|
|
|
|
|
event_x = event_y = 0;
|
|
|
|
|
|
|
|
switch (event->type)
|
|
|
|
{
|
2007-08-21 11:48:51 -04:00
|
|
|
case CLUTTER_NOTHING:
|
2007-03-22 14:21:59 -04:00
|
|
|
case CLUTTER_KEY_PRESS:
|
|
|
|
case CLUTTER_KEY_RELEASE:
|
2007-08-21 11:48:51 -04:00
|
|
|
case CLUTTER_STAGE_STATE:
|
|
|
|
case CLUTTER_DESTROY_NOTIFY:
|
|
|
|
case CLUTTER_CLIENT_MESSAGE:
|
|
|
|
case CLUTTER_DELETE:
|
2007-03-22 14:21:59 -04:00
|
|
|
break;
|
|
|
|
case CLUTTER_BUTTON_PRESS:
|
|
|
|
case CLUTTER_2BUTTON_PRESS:
|
2007-08-21 11:48:51 -04:00
|
|
|
case CLUTTER_3BUTTON_PRESS:
|
2007-03-22 14:21:59 -04:00
|
|
|
case CLUTTER_BUTTON_RELEASE:
|
|
|
|
event_x = event->button.x;
|
|
|
|
event_y = event->button.y;
|
|
|
|
break;
|
|
|
|
case CLUTTER_MOTION:
|
|
|
|
event_x = event->motion.x;
|
|
|
|
event_y = event->motion.y;
|
|
|
|
break;
|
|
|
|
case CLUTTER_SCROLL:
|
|
|
|
event_x = event->scroll.x;
|
|
|
|
event_y = event->scroll.y;
|
|
|
|
break;
|
|
|
|
}
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2007-03-22 14:21:59 -04:00
|
|
|
if (x)
|
|
|
|
*x = event_x;
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2007-03-22 14:21:59 -04:00
|
|
|
if (y)
|
|
|
|
*y = event_y;
|
2006-05-29 04:59:36 -04:00
|
|
|
}
|
|
|
|
|
2007-08-13 16:48:01 -04:00
|
|
|
/**
|
|
|
|
* clutter_event_get_source:
|
|
|
|
* @event: a #ClutterEvent
|
|
|
|
*
|
|
|
|
* Retrieves the source #ClutterActor the event originated from, or
|
|
|
|
* NULL if the event has no source.
|
|
|
|
*
|
|
|
|
* Since: 0.6
|
|
|
|
*/
|
|
|
|
ClutterActor*
|
|
|
|
clutter_event_get_source (ClutterEvent *event)
|
|
|
|
{
|
|
|
|
ClutterActor *res = NULL;
|
|
|
|
gint event_x, event_y;
|
|
|
|
|
|
|
|
g_return_val_if_fail (event != NULL, NULL);
|
|
|
|
|
|
|
|
event_x = event_y = 0;
|
|
|
|
|
|
|
|
switch (event->type)
|
|
|
|
{
|
|
|
|
case CLUTTER_KEY_PRESS:
|
|
|
|
case CLUTTER_KEY_RELEASE:
|
|
|
|
res = event->key.source;
|
|
|
|
break;
|
|
|
|
case CLUTTER_BUTTON_PRESS:
|
|
|
|
case CLUTTER_2BUTTON_PRESS:
|
|
|
|
case CLUTTER_BUTTON_RELEASE:
|
|
|
|
res = event->button.source;
|
|
|
|
break;
|
|
|
|
case CLUTTER_MOTION:
|
|
|
|
res = event->motion.source;
|
|
|
|
break;
|
|
|
|
case CLUTTER_SCROLL:
|
|
|
|
res = event->scroll.source;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2006-06-22 10:31:19 -04:00
|
|
|
/**
|
2007-03-22 14:21:59 -04:00
|
|
|
* clutter_button_event_button:
|
|
|
|
* @buttev: a #ClutterButtonEvent
|
2006-06-22 10:31:19 -04:00
|
|
|
*
|
2007-03-22 14:21:59 -04:00
|
|
|
* Retrieve the button number of the event.
|
2006-06-22 10:31:19 -04:00
|
|
|
*
|
2007-03-22 14:21:59 -04:00
|
|
|
* Return value: the button number.
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
2006-06-22 10:31:19 -04:00
|
|
|
*/
|
2006-05-29 04:59:36 -04:00
|
|
|
guint32
|
2007-03-22 14:21:59 -04:00
|
|
|
clutter_button_event_button (ClutterButtonEvent *buttev)
|
2006-05-29 04:59:36 -04:00
|
|
|
{
|
2007-03-22 14:21:59 -04:00
|
|
|
g_return_val_if_fail (buttev != NULL, 0);
|
2006-05-29 04:59:36 -04:00
|
|
|
|
2007-03-22 14:21:59 -04:00
|
|
|
return buttev->button;
|
2006-05-29 04:59:36 -04:00
|
|
|
}
|
|
|
|
|
2007-03-22 14:21:59 -04:00
|
|
|
/* keys */
|
|
|
|
|
2006-06-22 10:31:19 -04:00
|
|
|
/**
|
|
|
|
* clutter_key_event_symbol:
|
|
|
|
* @keyev: A #ClutterKeyEvent
|
|
|
|
*
|
|
|
|
* Retrieves the value of the key that caused @keyev.
|
|
|
|
*
|
|
|
|
* Return value: The keysym representing the key
|
|
|
|
*/
|
2006-05-29 04:59:36 -04:00
|
|
|
guint
|
|
|
|
clutter_key_event_symbol (ClutterKeyEvent *keyev)
|
|
|
|
{
|
2007-03-22 14:21:59 -04:00
|
|
|
g_return_val_if_fail (keyev != NULL, 0);
|
|
|
|
|
2006-05-29 04:59:36 -04:00
|
|
|
return keyev->keyval;
|
|
|
|
}
|
|
|
|
|
2006-06-22 10:31:19 -04:00
|
|
|
/**
|
|
|
|
* clutter_key_event_code:
|
|
|
|
* @keyev: A #ClutterKeyEvent
|
|
|
|
*
|
|
|
|
* Retrieves the keycode of the key that caused @keyev.
|
|
|
|
*
|
|
|
|
* Return value: The keycode representing the key
|
|
|
|
*/
|
2006-05-29 04:59:36 -04:00
|
|
|
guint16
|
|
|
|
clutter_key_event_code (ClutterKeyEvent *keyev)
|
|
|
|
{
|
2007-03-22 14:21:59 -04:00
|
|
|
g_return_val_if_fail (keyev != NULL, 0);
|
|
|
|
|
2006-05-29 04:59:36 -04:00
|
|
|
return keyev->hardware_keycode;
|
|
|
|
}
|
|
|
|
|
2006-06-22 10:31:19 -04:00
|
|
|
/**
|
|
|
|
* clutter_key_event_unicode:
|
|
|
|
* @keyev: A #ClutterKeyEvent
|
|
|
|
*
|
|
|
|
* Retrieves the unicode value for the key that caused @keyev.
|
|
|
|
*
|
|
|
|
* Return value: The unicode value representing the key
|
|
|
|
*/
|
2006-05-29 04:59:36 -04:00
|
|
|
guint32
|
|
|
|
clutter_key_event_unicode (ClutterKeyEvent *keyev)
|
|
|
|
{
|
2007-03-22 14:21:59 -04:00
|
|
|
g_return_val_if_fail (keyev != NULL, 0);
|
2007-06-11 05:02:28 -04:00
|
|
|
|
2007-06-19 05:10:37 -04:00
|
|
|
return clutter_keysym_to_unicode (keyev->keyval);
|
2006-05-29 04:59:36 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_keysym_to_unicode:
|
|
|
|
* @keyval: a clutter key symbol
|
|
|
|
*
|
2007-06-11 05:02:28 -04:00
|
|
|
* Convert from a Clutter key symbol to the corresponding ISO10646 (Unicode)
|
2006-05-29 04:59:36 -04:00
|
|
|
* character.
|
|
|
|
*
|
|
|
|
* Return value: the corresponding unicode character, or 0 if there
|
|
|
|
* is no corresponding character.
|
|
|
|
**/
|
|
|
|
guint32
|
|
|
|
clutter_keysym_to_unicode (guint keyval)
|
|
|
|
{
|
|
|
|
int min = 0;
|
|
|
|
int max = G_N_ELEMENTS (clutter_keysym_to_unicode_tab) - 1;
|
|
|
|
int mid;
|
|
|
|
|
|
|
|
/* First check for Latin-1 characters (1:1 mapping) */
|
|
|
|
if ((keyval >= 0x0020 && keyval <= 0x007e) ||
|
|
|
|
(keyval >= 0x00a0 && keyval <= 0x00ff))
|
|
|
|
return keyval;
|
|
|
|
|
|
|
|
/* Also check for directly encoded 24-bit UCS characters:
|
|
|
|
*/
|
|
|
|
if ((keyval & 0xff000000) == 0x01000000)
|
|
|
|
return keyval & 0x00ffffff;
|
|
|
|
|
|
|
|
/* binary search in table */
|
|
|
|
while (max >= min) {
|
|
|
|
mid = (min + max) / 2;
|
|
|
|
if (clutter_keysym_to_unicode_tab[mid].keysym < keyval)
|
|
|
|
min = mid + 1;
|
|
|
|
else if (clutter_keysym_to_unicode_tab[mid].keysym > keyval)
|
|
|
|
max = mid - 1;
|
|
|
|
else {
|
|
|
|
/* found it */
|
|
|
|
return clutter_keysym_to_unicode_tab[mid].ucs;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* No matching Unicode value found */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-03-22 14:21:59 -04:00
|
|
|
GType
|
|
|
|
clutter_event_get_type (void)
|
|
|
|
{
|
|
|
|
static GType our_type = 0;
|
|
|
|
|
|
|
|
if (!our_type)
|
|
|
|
our_type = g_boxed_type_register_static ("ClutterEvent",
|
|
|
|
(GBoxedCopyFunc) clutter_event_copy,
|
|
|
|
(GBoxedFreeFunc) clutter_event_free);
|
|
|
|
return our_type;
|
|
|
|
}
|
|
|
|
|
2006-06-22 09:44:47 -04:00
|
|
|
/**
|
|
|
|
* clutter_event_new:
|
|
|
|
* @type: The type of event.
|
|
|
|
*
|
|
|
|
* Creates a new #ClutterEvent of the specified type.
|
|
|
|
*
|
2006-06-22 09:50:39 -04:00
|
|
|
* Return value: A newly allocated #ClutterEvent.
|
2006-06-22 09:44:47 -04:00
|
|
|
*/
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
ClutterEvent *
|
|
|
|
clutter_event_new (ClutterEventType type)
|
|
|
|
{
|
|
|
|
ClutterEvent *new_event;
|
|
|
|
|
2007-08-23 08:47:25 -04:00
|
|
|
new_event = g_slice_new0 (ClutterEvent);
|
2007-03-22 14:21:59 -04:00
|
|
|
new_event->type = new_event->any.type = type;
|
|
|
|
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
return new_event;
|
|
|
|
}
|
|
|
|
|
2006-06-22 09:44:47 -04:00
|
|
|
/**
|
|
|
|
* clutter_event_copy:
|
|
|
|
* @event: A #ClutterEvent.
|
|
|
|
*
|
|
|
|
* Copies @event.
|
|
|
|
*
|
|
|
|
* Return value: A newly allocated #ClutterEvent
|
|
|
|
*/
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
ClutterEvent *
|
|
|
|
clutter_event_copy (ClutterEvent *event)
|
|
|
|
{
|
|
|
|
ClutterEvent *new_event;
|
|
|
|
|
|
|
|
g_return_val_if_fail (event != NULL, NULL);
|
|
|
|
|
2007-03-22 14:21:59 -04:00
|
|
|
new_event = clutter_event_new (CLUTTER_NOTHING);
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
*new_event = *event;
|
|
|
|
|
|
|
|
return new_event;
|
|
|
|
}
|
|
|
|
|
2006-06-22 09:44:47 -04:00
|
|
|
/**
|
|
|
|
* clutter_event_free:
|
|
|
|
* @event: A #ClutterEvent.
|
|
|
|
*
|
|
|
|
* Frees all resources used by @event.
|
|
|
|
*/
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
void
|
|
|
|
clutter_event_free (ClutterEvent *event)
|
|
|
|
{
|
2007-03-22 14:21:59 -04:00
|
|
|
if (G_LIKELY (event))
|
|
|
|
{
|
2007-09-27 17:38:38 -04:00
|
|
|
ClutterActor *source = NULL;
|
|
|
|
|
|
|
|
source = clutter_event_get_source (event);
|
|
|
|
if (source)
|
|
|
|
g_object_unref (source);
|
2007-08-23 08:47:25 -04:00
|
|
|
g_slice_free (ClutterEvent, event);
|
2007-03-22 14:21:59 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* clutter_event_get:
|
|
|
|
*
|
2007-07-25 18:09:53 -04:00
|
|
|
* Pops an event off the event queue. Applications should not need to call
|
|
|
|
* this.
|
2007-03-22 14:21:59 -04:00
|
|
|
*
|
2007-07-25 18:09:53 -04:00
|
|
|
* Return value: A #ClutterEvent or NULL if queue empty
|
2007-03-22 14:21:59 -04:00
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
2007-08-21 11:48:13 -04:00
|
|
|
ClutterEvent *
|
2007-03-22 14:21:59 -04:00
|
|
|
clutter_event_get (void)
|
|
|
|
{
|
|
|
|
ClutterMainContext *context = clutter_context_get_default ();
|
2007-08-21 11:48:13 -04:00
|
|
|
|
|
|
|
if (!context->events_queue)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (g_queue_is_empty (context->events_queue))
|
|
|
|
return NULL;
|
|
|
|
|
2007-08-23 08:47:25 -04:00
|
|
|
return g_queue_pop_tail (context->events_queue);
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
}
|
|
|
|
|
2007-03-22 14:21:59 -04:00
|
|
|
/**
|
|
|
|
* clutter_event_peek:
|
|
|
|
*
|
2007-07-25 18:09:53 -04:00
|
|
|
* Returns a pointer to the first event from the event queue but
|
|
|
|
* does not remove it.
|
2007-03-22 14:21:59 -04:00
|
|
|
*
|
2007-07-25 18:09:53 -04:00
|
|
|
* Return value: A #ClutterEvent or NULL if queue empty.
|
2007-03-22 14:21:59 -04:00
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
|
|
|
ClutterEvent *
|
|
|
|
clutter_event_peek (void)
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
{
|
2007-03-22 14:21:59 -04:00
|
|
|
ClutterMainContext *context = clutter_context_get_default ();
|
2007-05-09 19:31:08 -04:00
|
|
|
|
2007-08-23 08:47:25 -04:00
|
|
|
g_return_val_if_fail (context != NULL, NULL);
|
|
|
|
|
|
|
|
if (context->events_queue == NULL)
|
2007-08-21 11:48:13 -04:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (g_queue_is_empty (context->events_queue))
|
2007-05-09 19:31:08 -04:00
|
|
|
return NULL;
|
|
|
|
|
2007-08-23 08:47:25 -04:00
|
|
|
return g_queue_peek_tail (context->events_queue);
|
2007-03-22 14:21:59 -04:00
|
|
|
}
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
|
2007-03-22 14:21:59 -04:00
|
|
|
/**
|
|
|
|
* clutter_event_put:
|
|
|
|
* @event: a #ClutterEvent
|
|
|
|
*
|
2007-07-25 18:09:53 -04:00
|
|
|
* Puts a copy of the event on the back on the event queue.
|
2007-03-22 14:21:59 -04:00
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
clutter_event_put (ClutterEvent *event)
|
|
|
|
{
|
|
|
|
ClutterMainContext *context = clutter_context_get_default ();
|
|
|
|
|
2007-08-23 08:47:25 -04:00
|
|
|
/* FIXME: check queue is valid */
|
|
|
|
g_return_if_fail (context != NULL);
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2007-05-09 19:31:08 -04:00
|
|
|
g_queue_push_head (context->events_queue, clutter_event_copy (event));
|
2007-03-22 14:21:59 -04:00
|
|
|
}
|
|
|
|
|
2007-07-25 18:09:53 -04:00
|
|
|
/**
|
|
|
|
* clutter_events_pending:
|
|
|
|
*
|
|
|
|
* Checks if events are pending in the event queue.
|
|
|
|
*
|
|
|
|
* Return value: TRUE if there are pending events, FALSE otherwise.
|
|
|
|
*
|
|
|
|
* Since: 0.4
|
|
|
|
*/
|
2007-03-22 14:21:59 -04:00
|
|
|
gboolean
|
2007-05-09 19:31:08 -04:00
|
|
|
clutter_events_pending (void)
|
2007-03-22 14:21:59 -04:00
|
|
|
{
|
2007-05-09 19:31:08 -04:00
|
|
|
ClutterMainContext *context = clutter_context_get_default ();
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2007-05-09 19:31:08 -04:00
|
|
|
g_return_val_if_fail (context != NULL, FALSE);
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2007-05-09 19:31:08 -04:00
|
|
|
if (!context->events_queue)
|
|
|
|
return FALSE;
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2007-08-23 08:47:25 -04:00
|
|
|
return g_queue_is_empty (context->events_queue) == FALSE;
|
2007-03-22 14:21:59 -04:00
|
|
|
}
|
|
|
|
|
2007-05-09 19:31:08 -04:00
|
|
|
/* Backend helpers (private) */
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2007-05-09 19:31:08 -04:00
|
|
|
static void
|
|
|
|
synthesize_click (ClutterBackend *backend,
|
|
|
|
ClutterEvent *event,
|
|
|
|
gint n_clicks)
|
2007-03-22 14:21:59 -04:00
|
|
|
{
|
|
|
|
ClutterEvent temp_event;
|
|
|
|
|
|
|
|
temp_event = *event;
|
|
|
|
temp_event.type = (n_clicks == 2) ? CLUTTER_2BUTTON_PRESS
|
|
|
|
: CLUTTER_3BUTTON_PRESS;
|
|
|
|
|
2007-05-09 19:31:08 -04:00
|
|
|
clutter_event_put (&temp_event);
|
2007-03-22 14:21:59 -04:00
|
|
|
}
|
|
|
|
|
2007-05-09 19:31:08 -04:00
|
|
|
/* post process a button to synthesize double clicks etc */
|
2007-03-22 14:21:59 -04:00
|
|
|
void
|
|
|
|
_clutter_event_button_generate (ClutterBackend *backend,
|
|
|
|
ClutterEvent *event)
|
|
|
|
{
|
2007-05-09 19:31:08 -04:00
|
|
|
guint double_click_time, double_click_distance;
|
|
|
|
|
|
|
|
double_click_distance = clutter_backend_get_double_click_distance (backend);
|
|
|
|
double_click_time = clutter_backend_get_double_click_time (backend);
|
|
|
|
|
|
|
|
if ((event->button.time < (button_click_time[1] + 2 * double_click_time))
|
|
|
|
&& (event->button.button == button_number[1])
|
|
|
|
&& (ABS (event->button.x - button_x[1]) <= double_click_distance)
|
|
|
|
&& (ABS (event->button.y - button_y[1]) <= double_click_distance))
|
2007-03-22 14:21:59 -04:00
|
|
|
{
|
2007-05-09 19:31:08 -04:00
|
|
|
synthesize_click (backend, event, 3);
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2007-05-09 19:31:08 -04:00
|
|
|
button_click_time[1] = 0;
|
|
|
|
button_click_time[0] = 0;
|
|
|
|
button_number[1] = -1;
|
|
|
|
button_number[0] = -1;
|
|
|
|
button_x[0] = button_x[1] = 0;
|
|
|
|
button_y[0] = button_y[1] = 0;
|
2007-03-22 14:21:59 -04:00
|
|
|
}
|
2007-08-23 08:47:25 -04:00
|
|
|
else if ((event->button.time < (button_click_time[0] + double_click_time)) &&
|
|
|
|
(event->button.button == button_number[0]) &&
|
|
|
|
(ABS (event->button.x - button_x[0]) <= double_click_distance) &&
|
|
|
|
(ABS (event->button.y - button_y[0]) <= double_click_distance))
|
2007-03-22 14:21:59 -04:00
|
|
|
{
|
2007-05-09 19:31:08 -04:00
|
|
|
synthesize_click (backend, event, 2);
|
2007-03-22 14:21:59 -04:00
|
|
|
|
2007-05-09 19:31:08 -04:00
|
|
|
button_click_time[1] = button_click_time[0];
|
|
|
|
button_click_time[0] = event->button.time;
|
|
|
|
button_number[1] = button_number[0];
|
|
|
|
button_number[0] = event->button.button;
|
|
|
|
button_x[1] = button_x[0];
|
|
|
|
button_x[0] = event->button.x;
|
|
|
|
button_y[1] = button_y[0];
|
|
|
|
button_y[0] = event->button.y;
|
2007-03-22 14:21:59 -04:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-05-09 19:31:08 -04:00
|
|
|
button_click_time[1] = 0;
|
|
|
|
button_click_time[0] = event->button.time;
|
|
|
|
button_number[1] = -1;
|
|
|
|
button_number[0] = event->button.button;
|
|
|
|
button_x[1] = 0;
|
|
|
|
button_x[0] = event->button.x;
|
|
|
|
button_y[1] = 0;
|
|
|
|
button_y[0] = event->button.y;
|
2007-03-22 14:21:59 -04:00
|
|
|
}
|
2006-06-05 Emmanuele Bassi <ebassi@openedhand.com>
* clutter-color.h:
* clutter-color.c: Reimplement ClutterColor as a boxed type;
add convenience API for color handling, like: add, subtract,
shade, HSL color-space conversion, packing and unpacking.
* clutter-private.h: Update ClutterMainContext, and export the
main context pointer here.
* clutter-rectangle.h:
* clutter-rectangle.c: Update the color-related code; make
clutter_rectangle_new() and empty constructor and provide
clutter_rectangle_new_with_color(); provide color setter
and getter API.
* clutter-label.h:
* clutter-label.c: Rename the "font" property to "font-name";
update the color-related code to the new ClutterColor object;
rename clutter_label_new() to clutter_label_new_with_text(),
and add setters and getters for the properties.
* clutter-marshal.list: Add VOID:OBJECT and VOID:BOXED marshallers
generators.
* clutter-stage.h:
* clutter-stage.c: Rework the API: provide a default constructor
for a singleton object, named clutter_stage_get_default(), which
supercedes the clutter_stage() function in clutter-main; provide
new events: button-press-event, button-release-event,
key-press-event and key-release-event; update the color-related
code;
(clutter_stage_snapshot): Allow negative width and height when
taking a snapshot (meaning: use full width/height).
(clutter_stage_get_element_at_pos): Rename clutter_stage_pick().
* clutter-element.c (clutter_element_paint): Clean up the
stage and color related code.
* clutter-event.h:
* clutter-event.c: Add generic ClutterAnyEvent type; add
clutter_event_new(), clutter_event_copy() and clutter_event_free();
make ClutterEvent a boxed type.
* clutter-main.h:
* clutter-main.c: Remove clutter_stage(); add clutter_main_quit(),
for cleanly quitting from clutter_main(); add multiple mainloops
support; allocate the ClutterCntx instead of adding it to the
stack; re-work the ClutterEvent dispatching.
* clutter-group.c (clutter_group_add), (clutter_group_remove): Keep
a reference on the element when added to a ClutterGroup.
* examples/rects.py
* examples/test.c:
* examples/test-text.c:
* examples/video-cube.c:
* examples/super-oh.c:
* examples/test-video.c: Update.
2006-06-05 09:38:31 -04:00
|
|
|
}
|