isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only update on damage events.

Browse Source 
Fri Jan 13 16:37:26 2006  Søren Sandmann  <sandmann@redhat.com>

	* src/compositor.c (update): Only update on damage events.
This commit is contained in:
Søren Sandmann 2006-01-13 21:38:56 +00:00 committed by Søren Sandmann Pedersen
parent f9d11c0be6
commit efe25a80ed
2 changed files with 62 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Jan 13 16:37:26 2006 Søren Sandmann <sandmann@redhat.com>
* src/compositor.c (update): Only update on damage events.
2006-01-13 Elijah Newren <newren gmail com> 2006-01-13 Elijah Newren <newren gmail com>
Patch from Damien Carbery. Fixes #326746. Patch from Damien Carbery. Fixes #326746.

113
src/compositor.c
View File

@ -55,6 +55,7 @@ typedef struct
/* top of stack is first in list */ /* top of stack is first in list */
GList *compositor_windows; GList *compositor_windows;
WsWindow *glw; WsWindow *glw;
int idle_id;
} ScreenInfo; } ScreenInfo;
struct MetaCompositor struct MetaCompositor
@ -542,6 +543,59 @@ wavy (double time,
m++; m++;
} }
static gboolean
update (gpointer data)
{
MetaScreen *screen = data;
ScreenInfo *scr_info = screen->compositor_data;
WsWindow *gl_window = scr_info->glw;
glMatrixMode (GL_MODELVIEW);
glLoadIdentity ();
gluOrtho2D (0, 1.0, 0.0, 1.0);
ws_window_raise (gl_window);
glClearColor (0.0, 0.5, 0.5, 0.0);
glClear (GL_COLOR_BUFFER_BIT);
glColor4f (1.0, 0.0, 0.0, 1.0);
glDisable (GL_TEXTURE_2D);
glBegin (GL_QUADS);
glVertex2f (0.2, 0.2);
glVertex2f (0.2, 0.4);
glVertex2f (0.4, 0.4);
glVertex2f (0.4, 0.2);
glEnd ();
glEnable (GL_TEXTURE_2D);
draw_windows (screen, scr_info->compositor_windows);
/* FIXME: we should probably grab the server around the raise/swap */
ws_window_gl_swap_buffers (gl_window);
scr_info->idle_id = 0;
return FALSE;
}
static void
do_repaint (DrawableNode *node, gpointer data)
{
MetaScreen *screen = data;
ScreenInfo *scr_info = screen->compositor_data;
g_print ("do repaint\n");
if (!scr_info->idle_id)
scr_info->idle_id = g_idle_add (update, screen);
}
/* This is called when metacity does its XQueryTree() on startup /* This is called when metacity does its XQueryTree() on startup
* and when a new window is mapped. * and when a new window is mapped.
*/ */
@ -587,6 +641,8 @@ meta_compositor_add_window (MetaCompositor *compositor,
{ {
node = drawable_node_new (drawable); node = drawable_node_new (drawable);
drawable_node_set_damage_func (node, do_repaint, screen);
#if 0 #if 0
drawable_node_set_deformation_func (node, wavy, NULL); drawable_node_set_deformation_func (node, wavy, NULL);
#endif #endif
@ -640,54 +696,6 @@ meta_compositor_remove_window (MetaCompositor *compositor,
#endif /* HAVE_COMPOSITE_EXTENSIONS */ #endif /* HAVE_COMPOSITE_EXTENSIONS */
} }
typedef struct Info
{
MetaScreen *screen;
WsWindow *window;
} Info;
static gboolean
update (gpointer data)
{
Info *info = data;
MetaScreen *screen = info->screen;
ScreenInfo *scr_info = screen->compositor_data;
WsWindow *gl_window = info->window;
glMatrixMode (GL_MODELVIEW);
glLoadIdentity ();
gluOrtho2D (0, 1.0, 0.0, 1.0);
ws_window_raise (gl_window);
glClearColor (0.0, 0.5, 0.5, 0.0);
glClear (GL_COLOR_BUFFER_BIT);
glColor4f (1.0, 0.0, 0.0, 1.0);
glDisable (GL_TEXTURE_2D);
glBegin (GL_QUADS);
glVertex2f (0.2, 0.2);
glVertex2f (0.2, 0.4);
glVertex2f (0.4, 0.4);
glVertex2f (0.4, 0.2);
glEnd ();
glEnable (GL_TEXTURE_2D);
draw_windows (screen, scr_info->compositor_windows);
/* FIXME: we should probably grab the server around the raise/swap */
ws_window_gl_swap_buffers (gl_window);
return TRUE;
}
void void
meta_compositor_manage_screen (MetaCompositor *compositor, meta_compositor_manage_screen (MetaCompositor *compositor,
MetaScreen *screen) MetaScreen *screen)
@ -698,11 +706,11 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
WsScreen *ws_screen = WsScreen *ws_screen =
ws_screen_get_from_number (compositor->ws, screen->number); ws_screen_get_from_number (compositor->ws, screen->number);
WsWindow *root = ws_screen_get_root_window (ws_screen); WsWindow *root = ws_screen_get_root_window (ws_screen);
Info *info;
WsRegion *region; WsRegion *region;
scr_info->glw = ws_window_new_gl (root); scr_info->glw = ws_window_new_gl (root);
scr_info->compositor_windows = NULL; scr_info->compositor_windows = NULL;
scr_info->idle_id = 0;
g_print ("setting compositor_data for screen %p to %p\n", screen, scr_info); g_print ("setting compositor_data for screen %p to %p\n", screen, scr_info);
screen->compositor_data = scr_info; screen->compositor_data = scr_info;
@ -723,12 +731,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
ws_sync (compositor->ws); ws_sync (compositor->ws);
info = g_new (Info, 1); g_idle_add (update, screen);
info->window = scr_info->glw;
info->screen = screen;
g_idle_add (update,
info);
#endif #endif
} }