isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-24 08:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

2007-07-21 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/clutter-event.c:
        Correct  clutter_event_get_state () return type. Fixes #398

        * clutter/glx/clutter-stage-glx.c:
        Disable use XFixes cursor visibility funcs. Appears to have issues
        on feisty X Server at least. Fallback should work generally better.

        Fix non offscreen clutter_stage_snapshot to also rotate read pixel
        data to correct orientation.
This commit is contained in:
Matthew Allum 2007-07-21 16:48:11 +00:00
parent 097c177824
commit 9157740741
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2007-07-21 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-event.c:
Correct clutter_event_get_state () return type. Fixes #398
* clutter/glx/clutter-stage-glx.c:
Disable use XFixes cursor visibility funcs. Appears to have issues
on feisty X Server at least. Fallback should work generally better.
Fix non offscreen clutter_stage_snapshot to also rotate read pixel
data to correct orientation.
2007-07-12 Matthew Allum <mallum@openedhand.com> 2007-07-12 Matthew Allum <mallum@openedhand.com>
* clutter/eglnative/clutter-event-egl.c: (clutter_event_dispatch): * clutter/eglnative/clutter-event-egl.c: (clutter_event_dispatch):

2
clutter/clutter-event.c
View File

@ -106,7 +106,7 @@ clutter_event_get_time (ClutterEvent *event)
* *
* Since: 0.4 * Since: 0.4
*/ */
guint32 ClutterModifierType
clutter_event_get_state (ClutterEvent *event) clutter_event_get_state (ClutterEvent *event)
{ {
g_return_val_if_fail (event != NULL, 0); g_return_val_if_fail (event != NULL, 0);

14
clutter/glx/clutter-stage-glx.c
View File

@ -427,7 +427,9 @@ clutter_stage_glx_set_cursor_visible (ClutterStage *stage,
if (show_cursor) if (show_cursor)
{ {
#ifdef HAVE_XFIXES #if 0 /* HAVE_XFIXES - borked on fiesty at least so disabled until further
* investigation.
*/
XFixesShowCursor (stage_glx->xdpy, stage_glx->xwin); XFixesShowCursor (stage_glx->xdpy, stage_glx->xwin);
#else #else
XUndefineCursor (stage_glx->xdpy, stage_glx->xwin); XUndefineCursor (stage_glx->xdpy, stage_glx->xwin);
@ -435,7 +437,7 @@ clutter_stage_glx_set_cursor_visible (ClutterStage *stage,
} }
else else
{ {
#ifdef HAVE_XFIXES #if 0 /* HAVE_XFIXES - borked */
XFixesHideCursor (stage_glx->xdpy, stage_glx->xwin); XFixesHideCursor (stage_glx->xdpy, stage_glx->xwin);
#else #else
XColor col; XColor col;
@ -540,7 +542,7 @@ clutter_stage_glx_draw_to_pixbuf (ClutterStage *stage,
} }
else else
{ {
GdkPixbuf *tmp = NULL; GdkPixbuf *tmp = NULL, *tmp2 = NULL;
gint stride; gint stride;
stride = ((width * 4 + 3) &~ 3); stride = ((width * 4 + 3) &~ 3);
@ -561,9 +563,11 @@ clutter_stage_glx_draw_to_pixbuf (ClutterStage *stage,
snapshot_pixbuf_free, snapshot_pixbuf_free,
NULL); NULL);
pixb = gdk_pixbuf_flip (tmp, TRUE); tmp2 = gdk_pixbuf_flip (tmp, TRUE);
g_object_unref (tmp); g_object_unref (tmp);
pixb = gdk_pixbuf_rotate_simple (tmp2, GDK_PIXBUF_ROTATE_UPSIDEDOWN);
g_object_unref (tmp2);
} }
return pixb; return pixb;