brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-09-27 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/clutter-event.c:
        * clutter/clutter-event.h:
        * clutter/clutter-main.c:
        Further event tweaks;
        - Ref the event actor source
        - Protect against off stage events (button releases)
        - Move more into ClutterEventAny
        - Add a click count to button event (as yet unused)
        - Minor cleanups

        * clutter/clutter-actor.c:
        Make scale x/y a property.

        * clutter/clutter-private.h:
        Remove _clutter_actor_apply_modelview*

        * clutter/eglx/clutter-backend-egl.c:
        Warning cleanup

        * clutter/eglx/clutter-stage-egl.c:
        * clutter/glx/clutter-stage-glx.c:
        * clutter/sdl/clutter-stage-sdl.c:
        Avoid setting viewport directly, but set sync flag.

        * clutter/pango/pangoclutter-render.c: (draw_glyph):
        Minor cleanups.

        * clutter/Makefile.am:
        * tests/Makefile.am:
        * tests/test-score.c
        * clutter/clutter.h:
        * clutter/clutter-score.h:
        * clutter/clutter-score.c:
        Add very initial (broken) ClutterScore implementation.
This commit is contained in:
Matthew Allum
2007-09-27 21:38:38 +00:00
parent bc7b1b3a16
commit 5ab0ed5a00
18 changed files with 833 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
clutter/pango/pangoclutter-render.c
View File

@ -58,7 +58,7 @@ typedef struct tc_slice {
int avail, y;
} tc_slice;
static int tc_generation;
static int tc_generation = 0;
static tc_slice slices[TC_HEIGHT / TC_ROUND];
static tc_texture *first_texture;
@ -339,11 +339,6 @@ draw_glyph (PangoRenderer *renderer_,
_pango_clutter_font_set_cache_glyph_data (font, glyph, g);
}
/*
if (renderer->curtex)
glEnd ();
*/
tc_get (&g->tex, bm.width, bm.height);
g->left = bm.left;
@ -365,8 +360,9 @@ draw_glyph (PangoRenderer *renderer_,
CGL_UNSIGNED_BYTE,
bm.bitmap);
glTexParameteri (CGL_TEXTURE_2D, GL_GENERATE_MIPMAP, FALSE);
renderer->curtex = g->tex.name;
/* glBegin (GL_QUADS); */
}
else CLUTTER_NOTE (PANGO, g_message ("cache succsess %i\n", glyph));
@ -380,15 +376,8 @@ draw_glyph (PangoRenderer *renderer_,
if (g->tex.name != renderer->curtex)
{
/*
if (renderer->curtex)
glEnd ();
*/
cogl_texture_bind (CGL_TEXTURE_2D, g->tex.name);
renderer->curtex = g->tex.name;
/* glBegin (GL_QUADS); */
}
cogl_texture_quad (x,