Some experimental code to handle sync counter notifications on a window.

Fri May  5 12:50:58 2006  Søren Sandmann  <sandmann@redhat.com>

	* src/c-window.c (has_counter): Some experimental code to handle
	sync counter notifications on a window.

	* src/c-screen.c (meta_comp_screen_add_window): Pass a MetaDisplay
This commit is contained in:
Søren Sandmann 2006-05-05 16:52:05 +00:00 committed by Søren Sandmann Pedersen
parent b62dd8d130
commit 5750974d5d
4 changed files with 150 additions and 5 deletions

View File

@ -1,3 +1,10 @@
Fri May 5 12:50:58 2006 Søren Sandmann <sandmann@redhat.com>
* src/c-window.c (has_counter): Some experimental code to handle
sync counter notifications on a window.
* src/c-screen.c (meta_comp_screen_add_window): Pass a MetaDisplay
2006-04-25 Elijah Newren <newren gmail com> 2006-04-25 Elijah Newren <newren gmail com>
Clear _NET_WM_VISIBLE_NAME (and the ICON_ equivalent) when no Clear _NET_WM_VISIBLE_NAME (and the ICON_ equivalent) when no

View File

@ -526,7 +526,7 @@ meta_comp_screen_add_window (MetaCompScreen *info,
goto out; goto out;
} }
comp_window = meta_comp_window_new (drawable); comp_window = meta_comp_window_new (info->meta_screen->display, drawable);
g_hash_table_insert (info->windows_by_xid, (gpointer)WS_RESOURCE_XID (drawable), comp_window); g_hash_table_insert (info->windows_by_xid, (gpointer)WS_RESOURCE_XID (drawable), comp_window);
@ -534,7 +534,12 @@ meta_comp_screen_add_window (MetaCompScreen *info,
out: out:
if (comp_window) if (comp_window)
meta_comp_window_refresh_attrs (comp_window); {
/* This function is called both when windows are created and when they
* are mapped, so for now we have this silly function.
*/
meta_comp_window_refresh_attrs (comp_window);
}
ws_display_end_error_trap (info->display); ws_display_end_error_trap (info->display);

View File

@ -34,15 +34,19 @@
struct _MetaCompWindow struct _MetaCompWindow
{ {
MetaDisplay *display;
WsDrawable *drawable; WsDrawable *drawable;
WsPixmap *pixmap;
CmNode *node; CmNode *node;
gboolean updates; gboolean updates;
WsSyncAlarm *alarm;
WsRectangle size; WsRectangle size;
}; };
MetaCompWindow * MetaCompWindow *
meta_comp_window_new (WsDrawable *drawable) meta_comp_window_new (MetaDisplay *display,
WsDrawable *drawable)
{ {
MetaCompWindow *window; MetaCompWindow *window;
WsRectangle geometry; WsRectangle geometry;
@ -51,6 +55,7 @@ meta_comp_window_new (WsDrawable *drawable)
window = g_new0 (MetaCompWindow, 1); window = g_new0 (MetaCompWindow, 1);
window->display = display;
window->drawable = g_object_ref (drawable); window->drawable = g_object_ref (drawable);
window->node = CM_NODE (cm_drawable_node_new (drawable, &geometry)); window->node = CM_NODE (cm_drawable_node_new (drawable, &geometry));
window->updates = TRUE; window->updates = TRUE;
@ -123,6 +128,128 @@ has_type (WsWindow *window, const char *check_type)
return result; return result;
} }
static MetaWindow *
find_meta_window (MetaCompWindow *comp_window)
{
Window xwindow = WS_RESOURCE_XID (comp_window->drawable);
MetaWindow *window =
meta_display_lookup_x_window (comp_window->display, xwindow);
return window;
}
static Window
find_app_window (MetaCompWindow *comp_window)
{
Window xwindow = WS_RESOURCE_XID (comp_window->drawable);
MetaWindow *meta_window =
meta_display_lookup_x_window (comp_window->display, xwindow);
if (meta_window)
return meta_window->xwindow;
else
return xwindow;
}
static WsPixmap *
take_snapshot (WsDrawable *drawable)
{
WsDisplay *display = WS_RESOURCE (drawable)->display;
WsRectangle geometry;
WsPixmap *pixmap;
ws_display_begin_error_trap (display);
ws_drawable_query_geometry (drawable, &geometry);
pixmap = ws_pixmap_new (drawable, geometry.width, geometry.height);
ws_drawable_copy_area (drawable, 0, 0, geometry.width, geometry.height,
WS_DRAWABLE (pixmap), 0, 0,
NULL);
ws_display_end_error_trap (display);
return pixmap;
}
static void
on_alarm (WsSyncAlarm *alarm,
WsAlarmNotifyEvent *event,
MetaCompWindow *window)
{
g_print ("received alarm\n");
if (window->pixmap)
g_object_unref (window->pixmap);
window->pixmap = take_snapshot (window->drawable);
ws_sync_alarm_set (window->alarm, event->counter_value + 2);
ws_sync_counter_change (event->counter, 1);
}
static gboolean
has_counter (MetaCompWindow *comp_window)
{
Window xwindow = find_app_window (comp_window);
WsDisplay *display = WS_RESOURCE (comp_window->drawable)->display;
WsWindow *window = ws_window_lookup (display, xwindow);
WsSyncCounter *counter;
ws_display_init_sync (display);
counter = ws_window_get_property_sync_counter (
window, "_NET_WM_FINISH_FRAME_COUNTER");
if (counter)
{
WsSyncAlarm *alarm;
gint64 value = ws_sync_counter_query_value (counter);
g_print ("counter value %lld\n", ws_sync_counter_query_value (counter));
alarm = ws_sync_alarm_new (display, counter);
g_signal_connect (alarm, "alarm_notify_event",
G_CALLBACK (on_alarm), comp_window);
if (value % 2 == 1)
{
ws_sync_alarm_set (alarm, value + 2);
g_print ("wait for %lld\n", value + 2);
g_print ("increasing counter\n");
ws_sync_counter_change (counter, 1);
g_print ("counter value %lld\n", ws_sync_counter_query_value (counter));
}
else
{
g_print ("wait for %lld\n", value + 1);
ws_sync_alarm_set (alarm, value + 1);
}
comp_window->alarm = alarm;
}
#if 0
if (counter)
{
g_print ("found counter %lx on %lx\n",
WS_RESOURCE_XID (counter),
WS_RESOURCE_XID (window));
}
else
{
g_print ("no counter found for %lx\n", WS_RESOURCE_XID (window));
}
#endif
return TRUE;
}
void void
meta_comp_window_refresh_attrs (MetaCompWindow *comp_window) meta_comp_window_refresh_attrs (MetaCompWindow *comp_window)
{ {
@ -139,6 +266,10 @@ meta_comp_window_refresh_attrs (MetaCompWindow *comp_window)
cm_drawable_node_unset_patch (CM_DRAWABLE_NODE (node)); cm_drawable_node_unset_patch (CM_DRAWABLE_NODE (node));
find_meta_window (comp_window);
has_counter (comp_window);
if (has_type (window, "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU")) if (has_type (window, "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU"))
{ {
alpha = 0.3; alpha = 0.3;

View File

@ -18,10 +18,12 @@
*/ */
#include <cm/node.h> #include <cm/node.h>
#include "display.h"
typedef struct _MetaCompWindow MetaCompWindow; typedef struct _MetaCompWindow MetaCompWindow;
MetaCompWindow *meta_comp_window_new (WsDrawable *drawable); MetaCompWindow *meta_comp_window_new (MetaDisplay *display,
WsDrawable *drawable);
CmNode *meta_comp_window_get_node (MetaCompWindow *window); CmNode *meta_comp_window_get_node (MetaCompWindow *window);
void meta_comp_window_free (MetaCompWindow *window); void meta_comp_window_free (MetaCompWindow *window);
void meta_comp_window_set_size (MetaCompWindow *window, void meta_comp_window_set_size (MetaCompWindow *window,