2008-09-19 Emmanuele Bassi <ebassi@linux.intel.com>

* clutter/x11/clutter-backend-x11.c: Properly document the
	usage of clutter_x11_set_display().

	* clutter/x11/clutter-x11.h: clutter_x11_set_display() is
	public API and should be declared in the header we install.
This commit is contained in:
Emmanuele Bassi 2008-09-19 10:28:51 +00:00
parent 50a248764c
commit 57bc2313d0
3 changed files with 24 additions and 15 deletions

View File

@ -1,3 +1,11 @@
2008-09-19 Emmanuele Bassi <ebassi@linux.intel.com>
* clutter/x11/clutter-backend-x11.c: Properly document the
usage of clutter_x11_set_display().
* clutter/x11/clutter-x11.h: clutter_x11_set_display() is
public API and should be declared in the header we install.
2008-09-18 Neil Roberts <neil@linux.intel.com> 2008-09-18 Neil Roberts <neil@linux.intel.com>
Bug 1048 - SIGFPE in cogl_texture_set_region() with nvidia Bug 1048 - SIGFPE in cogl_texture_set_region() with nvidia

View File

@ -411,8 +411,14 @@ clutter_x11_get_default_display (void)
* clutter_x11_set_display: * clutter_x11_set_display:
* @xdpy: pointer to a X display connection. * @xdpy: pointer to a X display connection.
* *
* Sets the display connection clutter should use; must be called * Sets the display connection Clutter should use; must be called
* before clutter_init(). * before clutter_init(), clutter_init_with_args() or other functions
* pertaining Clutter's initialization process.
*
* If you are parsing the command line arguments by retrieving Clutter's
* #GOptionGroup with clutter_get_option_group() and calling
* g_option_context_parse() yourself, you should also call
* clutter_x11_set_display() before g_option_context_parse().
* *
* Since: 0.8 * Since: 0.8
*/ */

View File

@ -118,26 +118,21 @@ void clutter_x11_remove_filter (ClutterX11FilterFunc func,
ClutterX11FilterReturn clutter_x11_handle_event (XEvent *xevent); ClutterX11FilterReturn clutter_x11_handle_event (XEvent *xevent);
void clutter_x11_disable_event_retrieval (void); void clutter_x11_set_display (Display *xdpy);
void clutter_x11_disable_event_retrieval (void);
gboolean clutter_x11_has_event_retrieval (void); gboolean clutter_x11_has_event_retrieval (void);
ClutterStage *clutter_x11_get_stage_from_window (Window win); ClutterStage *clutter_x11_get_stage_from_window (Window win);
GSList* GSList* clutter_x11_get_input_devices (void);
clutter_x11_get_input_devices (void);
ClutterX11InputDeviceType ClutterX11InputDeviceType clutter_x11_get_input_device_type (ClutterX11XInputDevice *device);
clutter_x11_get_input_device_type (ClutterX11XInputDevice *device);
void void clutter_x11_enable_xinput (void);
clutter_x11_enable_xinput (); gboolean clutter_x11_has_xinput (void);
gboolean gboolean clutter_x11_has_composite_extension (void);
clutter_x11_has_xinput (void);
gboolean
clutter_x11_has_composite_extension (void);
G_END_DECLS G_END_DECLS