isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

cursor-renderer: Rewrite HW cursors to be cleaner

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-22 15:39:09 -04:00
parent 93600d6166
commit a1ba480c8a
2 changed files with 68 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
src/backends/meta-cursor-renderer.c
View File

@ -54,21 +54,26 @@ typedef struct _MetaCursorRendererPrivate MetaCursorRendererPrivate;
G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRenderer, meta_cursor_renderer, G_TYPE_OBJECT); G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRenderer, meta_cursor_renderer, G_TYPE_OBJECT);
static void static void
set_crtc_has_hw_cursor (MetaCursorRenderer *renderer, set_crtc_cursor (MetaCursorRenderer *renderer,
MetaCRTC *crtc, MetaCRTC *crtc,
gboolean has) MetaCursorReference *cursor,
gboolean force)
{ {
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer); MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
if (has) if (crtc->cursor == cursor && !force)
return;
crtc->cursor = cursor;
if (cursor)
{ {
MetaCursorReference *displayed_cursor = priv->displayed_cursor;
struct gbm_bo *bo; struct gbm_bo *bo;
union gbm_bo_handle handle; union gbm_bo_handle handle;
int width, height; int width, height;
int hot_x, hot_y; int hot_x, hot_y;
bo = meta_cursor_reference_get_gbm_bo (displayed_cursor, &hot_x, &hot_y); bo = meta_cursor_reference_get_gbm_bo (cursor, &hot_x, &hot_y);
handle = gbm_bo_get_handle (bo); handle = gbm_bo_get_handle (bo);
width = gbm_bo_get_width (bo); width = gbm_bo_get_width (bo);
@ -76,12 +81,48 @@ set_crtc_has_hw_cursor (MetaCursorRenderer *renderer,
drmModeSetCursor2 (priv->drm_fd, crtc->crtc_id, handle.u32, drmModeSetCursor2 (priv->drm_fd, crtc->crtc_id, handle.u32,
width, height, hot_x, hot_y); width, height, hot_x, hot_y);
crtc->has_hw_cursor = TRUE;
} }
else else
{ {
drmModeSetCursor2 (priv->drm_fd, crtc->crtc_id, 0, 0, 0, 0, 0); drmModeSetCursor2 (priv->drm_fd, crtc->crtc_id, 0, 0, 0, 0, 0);
crtc->has_hw_cursor = FALSE; }
}
static void
update_hw_cursor (MetaCursorRenderer *renderer,
gboolean force)
{
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
MetaRectangle *cursor_rect = &priv->current_rect;
MetaMonitorManager *monitors;
MetaCRTC *crtcs;
unsigned int i, n_crtcs;
monitors = meta_monitor_manager_get ();
meta_monitor_manager_get_resources (monitors, NULL, NULL, &crtcs, &n_crtcs, NULL, NULL);
for (i = 0; i < n_crtcs; i++)
{
gboolean crtc_should_have_cursor;
MetaCursorReference *cursor;
MetaRectangle *crtc_rect;
crtc_rect = &crtcs[i].rect;
crtc_should_have_cursor = (priv->has_hw_cursor && meta_rectangle_overlap (cursor_rect, crtc_rect));
if (crtc_should_have_cursor)
cursor = priv->displayed_cursor;
else
cursor = NULL;
set_crtc_cursor (renderer, &crtcs[i], cursor, force);
if (cursor)
{
drmModeMoveCursor (priv->drm_fd, crtcs[i].crtc_id,
cursor_rect->x - crtc_rect->x,
cursor_rect->y - crtc_rect->y);
}
} }
} }
@ -89,27 +130,8 @@ static void
on_monitors_changed (MetaMonitorManager *monitors, on_monitors_changed (MetaMonitorManager *monitors,
MetaCursorRenderer *renderer) MetaCursorRenderer *renderer)
{ {
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer); /* Our tracking is all messed up, so force an update. */
MetaCRTC *crtcs; update_hw_cursor (renderer, TRUE);
unsigned int i, n_crtcs;
if (!priv->has_hw_cursor)
return;
/* Go through the new list of monitors, find out where the cursor is */
meta_monitor_manager_get_resources (monitors, NULL, NULL, &crtcs, &n_crtcs, NULL, NULL);
for (i = 0; i < n_crtcs; i++)
{
MetaRectangle *rect = &crtcs[i].rect;
gboolean has;
has = meta_rectangle_overlap (&priv->current_rect, rect);
/* Need to do it unconditionally here, our tracking is
wrong because we reloaded the CRTCs */
set_crtc_has_hw_cursor (renderer, &crtcs[i], has);
}
} }
static void static void
@ -153,73 +175,6 @@ meta_cursor_renderer_init (MetaCursorRenderer *renderer)
#endif #endif
} }
static gboolean
should_have_hw_cursor (MetaCursorRenderer *renderer)
{
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
if (priv->displayed_cursor)
return (meta_cursor_reference_get_gbm_bo (priv->displayed_cursor, NULL, NULL) != NULL);
else
return FALSE;
}
static void
update_hw_cursor (MetaCursorRenderer *renderer)
{
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
MetaMonitorManager *monitors;
MetaCRTC *crtcs;
unsigned int i, n_crtcs;
gboolean enabled;
enabled = should_have_hw_cursor (renderer);
priv->has_hw_cursor = enabled;
monitors = meta_monitor_manager_get ();
meta_monitor_manager_get_resources (monitors, NULL, NULL, &crtcs, &n_crtcs, NULL, NULL);
for (i = 0; i < n_crtcs; i++)
{
MetaRectangle *rect = &crtcs[i].rect;
gboolean has;
has = enabled && meta_rectangle_overlap (&priv->current_rect, rect);
if (has || crtcs[i].has_hw_cursor)
set_crtc_has_hw_cursor (renderer, &crtcs[i], has);
}
}
static void
move_hw_cursor (MetaCursorRenderer *renderer)
{
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
MetaMonitorManager *monitors;
MetaCRTC *crtcs;
unsigned int i, n_crtcs;
monitors = meta_monitor_manager_get ();
meta_monitor_manager_get_resources (monitors, NULL, NULL, &crtcs, &n_crtcs, NULL, NULL);
g_assert (priv->has_hw_cursor);
for (i = 0; i < n_crtcs; i++)
{
MetaRectangle *rect = &crtcs[i].rect;
gboolean has;
has = meta_rectangle_overlap (&priv->current_rect, rect);
if (has != crtcs[i].has_hw_cursor)
set_crtc_has_hw_cursor (renderer, &crtcs[i], has);
if (has)
drmModeMoveCursor (priv->drm_fd, crtcs[i].crtc_id,
priv->current_rect.x - rect->x,
priv->current_rect.y - rect->y);
}
}
static void static void
queue_redraw (MetaCursorRenderer *renderer) queue_redraw (MetaCursorRenderer *renderer)
{ {
@ -242,6 +197,17 @@ queue_redraw (MetaCursorRenderer *renderer)
&priv->current_rect); &priv->current_rect);
} }
static gboolean
should_have_hw_cursor (MetaCursorRenderer *renderer)
{
MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
if (priv->displayed_cursor)
return (meta_cursor_reference_get_gbm_bo (priv->displayed_cursor, NULL, NULL) != NULL);
else
return FALSE;
}
static void static void
update_cursor (MetaCursorRenderer *renderer) update_cursor (MetaCursorRenderer *renderer)
{ {
@ -269,11 +235,10 @@ update_cursor (MetaCursorRenderer *renderer)
if (meta_is_wayland_compositor ()) if (meta_is_wayland_compositor ())
{ {
update_hw_cursor (renderer); priv->has_hw_cursor = should_have_hw_cursor (renderer);
update_hw_cursor (renderer, FALSE);
if (priv->has_hw_cursor) if (!priv->has_hw_cursor)
move_hw_cursor (renderer);
else
queue_redraw (renderer); queue_redraw (renderer);
} }
} }
@ -316,7 +281,7 @@ meta_cursor_renderer_force_update (MetaCursorRenderer *renderer)
{ {
g_assert (meta_is_wayland_compositor ()); g_assert (meta_is_wayland_compositor ());
update_hw_cursor (renderer); update_hw_cursor (renderer, TRUE);
} }
struct gbm_device * struct gbm_device *

4
src/backends/meta-monitor-manager.h
View File

@ -46,6 +46,7 @@
#include "meta-display-config-shared.h" #include "meta-display-config-shared.h"
#include "meta-dbus-display-config.h" #include "meta-dbus-display-config.h"
#include "meta-cursor.h"
typedef struct _MetaMonitorManagerClass MetaMonitorManagerClass; typedef struct _MetaMonitorManagerClass MetaMonitorManagerClass;
typedef struct _MetaMonitorManager MetaMonitorManager; typedef struct _MetaMonitorManager MetaMonitorManager;
@ -123,8 +124,7 @@ struct _MetaCRTC
/* Used when changing configuration */ /* Used when changing configuration */
gboolean is_dirty; gboolean is_dirty;
/* Updated by MetaCursorTracker */ MetaCursorReference *cursor;
gboolean has_hw_cursor;
}; };
struct _MetaMonitorMode struct _MetaMonitorMode