aboutsummaryrefslogtreecommitdiffstats
path: root/matchbox/mb-wm-comp-mgr-xrender.c
diff options
context:
space:
mode:
Diffstat (limited to 'matchbox/mb-wm-comp-mgr-xrender.c')
-rw-r--r--matchbox/mb-wm-comp-mgr-xrender.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/matchbox/mb-wm-comp-mgr-xrender.c b/matchbox/mb-wm-comp-mgr-xrender.c
index 50ec924..635f653 100644
--- a/matchbox/mb-wm-comp-mgr-xrender.c
+++ b/matchbox/mb-wm-comp-mgr-xrender.c
@@ -82,7 +82,7 @@ mb_wm_comp_mgr_xrender_client_init (MBWMObject *obj, va_list vap)
{
MBWMCompMgrClient *client = MB_WM_COMP_MGR_CLIENT (obj);
MBWMCompMgrDefaultClient *dclient = MB_WM_COMP_MGR_DEFAULT_CLIENT (obj);
- MBWindowManager *wm;
+ MBWMManager *wm;
MBWindowManagerClient *wm_client = client->wm_client;
if (!wm_client || !wm_client->wmref)
@@ -96,7 +96,7 @@ mb_wm_comp_mgr_xrender_client_destroy (MBWMObject* obj)
{
MBWMCompMgrClient * c = MB_WM_COMP_MGR_CLIENT (obj);
MBWMCompMgrDefaultClient * dc = MB_WM_COMP_MGR_DEFAULT_CLIENT (obj);
- MBWindowManager * wm = c->wm;
+ MBWMManager * wm = c->wm;
mb_wm_comp_mgr_client_hide (c);
@@ -161,12 +161,12 @@ mb_wm_comp_mgr_xrender_client_hide_real (MBWMCompMgrClient * client)
{
MBWMCompMgrDefaultClient * dclient = MB_WM_COMP_MGR_DEFAULT_CLIENT (client);
MBWindowManagerClient * wm_client = client->wm_client;
- MBWindowManager * wm = client->wm;
+ MBWMManager * wm = client->wm;
MBWMCompMgr * mgr = wm->comp_mgr;
MBWindowManagerClient * c;
Bool is_modal = mb_wm_client_is_modal (wm_client);
- if (is_modal && ((c = mb_wm_get_visible_main_client (wm)) != NULL))
+ if (is_modal && ((c = mb_wm_manager_manager_get_visible_main_window (wm)) != NULL))
{
XserverRegion extents;
/* We need to make sure the any lowlighting on a 'parent'
@@ -205,7 +205,7 @@ mb_wm_comp_mgr_xrender_client_show_real (MBWMCompMgrClient * client)
{
MBWMCompMgrDefaultClient * dclient = MB_WM_COMP_MGR_DEFAULT_CLIENT (client);
MBWindowManagerClient * wm_client = client->wm_client;
- MBWindowManager * wm = client->wm;
+ MBWMManager * wm = client->wm;
MBWMCompMgr * mgr = wm->comp_mgr;
XserverRegion region;
XRenderPictureAttributes pa;
@@ -408,7 +408,7 @@ mb_wm_comp_mgr_xrender_init (MBWMObject *obj, va_list vap)
{
MBWMCompMgr * mgr = MB_WM_COMP_MGR (obj);
MBWMCompMgrDefault * dmgr = MB_WM_COMP_MGR_DEFAULT (obj);
- MBWindowManager * wm = mgr->wm;
+ MBWMManager * wm = mgr->wm;
MBWMCompMgrDefaultPrivate * priv;
if (!wm)
@@ -585,7 +585,7 @@ mb_wm_comp_mgr_xrender_shadow_setup_part (MBWMCompMgr * mgr,
int width,
int height)
{
- MBWindowManager * wm = mgr->wm;
+ MBWMManager * wm = mgr->wm;
*ximage = XCreateImage (wm->xdpy, DefaultVisual(wm->xdpy, wm->xscreen),
8, ZPixmap, 0, 0,
@@ -610,7 +610,7 @@ mb_wm_comp_mgr_xrender_shadow_finalise_part (MBWMCompMgr * mgr,
int width,
int height)
{
- MBWindowManager * wm = mgr->wm;
+ MBWMManager * wm = mgr->wm;
GC gc = XCreateGC (wm->xdpy, pxm, 0, 0);
XPutImage (wm->xdpy, pxm, gc, ximage, 0, 0, 0, 0, width, height);
@@ -622,7 +622,7 @@ mb_wm_comp_mgr_xrender_shadow_finalise_part (MBWMCompMgr * mgr,
static void
mb_wm_comp_mgr_xrender_shadow_setup (MBWMCompMgr * mgr)
{
- MBWindowManager * wm = mgr->wm;
+ MBWMManager * wm = mgr->wm;
MBWMCompMgrDefaultPrivate * priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv;
XImage * ximage;
Pixmap pxm;
@@ -834,7 +834,7 @@ static Picture
mb_wm_comp_mgr_xrender_shadow_gaussian_make_picture (MBWMCompMgr * mgr,
int width, int height)
{
- MBWindowManager * wm = mgr->wm;
+ MBWMManager * wm = mgr->wm;
MBWMCompMgrDefaultPrivate * priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv;
Picture pic;
Pixmap pxm;
@@ -933,7 +933,7 @@ static XserverRegion
mb_wm_comp_mgr_xrender_client_extents (MBWMCompMgrClient *client)
{
MBWindowManagerClient *wm_client = client->wm_client;
- MBWindowManager *wm = client->wm;
+ MBWMManager *wm = client->wm;
MBWMCompMgr *mgr = wm->comp_mgr;
MBWMCompMgrDefaultPrivate *priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv;
MBGeometry geom;
@@ -979,7 +979,7 @@ mb_wm_comp_mgr_xrender_client_border_size (MBWMCompMgrClient * client,
int x, int y)
{
MBWindowManagerClient * wm_client = client->wm_client;
- MBWindowManager * wm = client->wm;
+ MBWMManager * wm = client->wm;
XserverRegion border;
border = XFixesCreateRegionFromWindow (wm->xdpy,
@@ -997,7 +997,7 @@ mb_wm_comp_mgr_xrender_client_window_region (MBWMCompMgrClient *client,
Window xwin, int x, int y)
{
MBWindowManagerClient * wm_client = client->wm_client;
- MBWindowManager * wm = client->wm;
+ MBWMManager * wm = client->wm;
XserverRegion region;
region =
@@ -1012,7 +1012,7 @@ mb_wm_comp_mgr_xrender_client_window_region (MBWMCompMgrClient *client,
static Visual*
mb_wm_comp_mgr_xrender_get_argb32_visual (MBWMCompMgr * mgr)
{
- MBWindowManager * wm = mgr->wm;
+ MBWMManager * wm = mgr->wm;
XVisualInfo * xvi;
XVisualInfo template;
int nvi;
@@ -1047,7 +1047,7 @@ mb_wm_comp_mgr_xrender_get_argb32_visual (MBWMCompMgr * mgr)
static void
mb_wm_comp_mgr_xrender_init_pictures (MBWMCompMgr *mgr)
{
- MBWindowManager * wm;
+ MBWMManager * wm;
Window rwin;
MBWMCompMgrDefaultPrivate * priv;
Pixmap transPixmap, blackPixmap, lowlightPixmap,
@@ -1161,7 +1161,7 @@ mb_wm_comp_mgr_xrender_init_pictures (MBWMCompMgr *mgr)
static void
mb_wm_comp_mgr_xrender_turn_off_real (MBWMCompMgr *mgr)
{
- MBWindowManager * wm;
+ MBWMManager * wm;
Window rwin;
MBWMCompMgrDefaultPrivate * priv;
GList * l;
@@ -1226,7 +1226,7 @@ mb_wm_comp_mgr_xrender_render_region (MBWMCompMgr *mgr, XserverRegion region);
static void
mb_wm_comp_mgr_xrender_turn_on_real (MBWMCompMgr *mgr)
{
- MBWindowManager * wm;
+ MBWMManager * wm;
Window rwin;
MBWMCompMgrDefaultPrivate * priv;
GList * l;
@@ -1277,7 +1277,7 @@ static void
mb_wm_comp_mgr_xrender_add_damage (MBWMCompMgr * mgr, XserverRegion damage)
{
MBWMCompMgrDefaultPrivate * priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv;
- MBWindowManager * wm = mgr->wm;
+ MBWMManager * wm = mgr->wm;
if (priv->all_damage)
{
@@ -1289,14 +1289,14 @@ mb_wm_comp_mgr_xrender_add_damage (MBWMCompMgr * mgr, XserverRegion damage)
else
priv->all_damage = damage;
- mb_wm_display_sync_queue (wm, MBWMSyncVisibility);
+ mb_wm_manager_display_sync_queue (wm, MBWMSyncVisibility);
}
static void
mb_wm_comp_mgr_xrender_client_repair_real (MBWMCompMgrClient * client)
{
MBWindowManagerClient * wm_client = client->wm_client;
- MBWindowManager * wm = client->wm;
+ MBWMManager * wm = client->wm;
MBWMCompMgr * mgr = wm->comp_mgr;
XserverRegion parts;
MBGeometry geom;
@@ -1318,7 +1318,7 @@ mb_wm_comp_mgr_xrender_client_configure_real (MBWMCompMgrClient * client)
{
MBWMCompMgrDefaultClient * dclient = MB_WM_COMP_MGR_DEFAULT_CLIENT (client);
MBWindowManagerClient * wm_client = client->wm_client;
- MBWindowManager * wm = client->wm;
+ MBWMManager * wm = client->wm;
MBWMCompMgr * mgr = wm->comp_mgr;
XserverRegion damage = None;
XserverRegion extents;
@@ -1351,10 +1351,10 @@ mb_wm_comp_mgr_xrender_handle_damage (XDamageNotifyEvent * de,
MBWMCompMgr * mgr)
{
MBWMCompMgrDefaultPrivate * priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv;
- MBWindowManager * wm = mgr->wm;
+ MBWMManager * wm = mgr->wm;
MBWindowManagerClient * c;
- c = mb_wm_managed_client_from_frame (wm, de->drawable);
+ c = mb_wm_manager_managed_window_from_frame (wm, de->drawable);
if (c && c->cm_client)
{
@@ -1388,7 +1388,7 @@ _render_a_client (MBWMCompMgrClient * client,
{
MBWMCompMgrDefaultClient * dclient = MB_WM_COMP_MGR_DEFAULT_CLIENT (client);
MBWindowManagerClient * wm_client = client->wm_client;
- MBWindowManager * wm = client->wm;
+ MBWMManager * wm = client->wm;
MBWMCompMgr * mgr = wm->comp_mgr;
MBWMCompMgrDefaultPrivate * priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv;
MBWMClientType ctype = MB_WM_CLIENT_CLIENT_TYPE (wm_client);
@@ -1508,7 +1508,7 @@ mb_wm_comp_mgr_xrender_render_real (MBWMCompMgr *mgr)
static void
mb_wm_comp_mgr_xrender_render_region (MBWMCompMgr *mgr, XserverRegion region)
{
- MBWindowManager * wm = mgr->wm;
+ MBWMManager * wm = mgr->wm;
MBWMCompMgrDefaultPrivate * priv = MB_WM_COMP_MGR_DEFAULT (mgr)->priv;
MBWindowManagerClient * wmc_top, * wmc_temp, * wmc_solid = NULL;
int lowlight = 0;
@@ -1535,7 +1535,7 @@ mb_wm_comp_mgr_xrender_render_region (MBWMCompMgr *mgr, XserverRegion region)
destroy_region = 1;
}
- wmc_top = mb_wm_get_visible_main_client (wm);
+ wmc_top = mb_wm_manager_manager_get_visible_main_window (wm);
if (wmc_top)
top_translucent =
@@ -1575,7 +1575,7 @@ mb_wm_comp_mgr_xrender_render_region (MBWMCompMgr *mgr, XserverRegion region)
if (type == MBWMClientTypeDialog && is_modal)
{
- MBWMModality modality = mb_wm_get_modality_type (wm);
+ MBWMModality modality = mb_wm_manager_get_modality_type (wm);
switch (modality)
{
case MBWMModalityNormal:
@@ -1826,7 +1826,7 @@ mb_wm_comp_mgr_xrender_render_region (MBWMCompMgr *mgr, XserverRegion region)
}
MBWMCompMgr *
-mb_wm_comp_mgr_xrender_new (MBWindowManager *wm)
+mb_wm_comp_mgr_xrender_new (MBWMManager *wm)
{
MBWMObject *mgr;
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-19 19:26:31 +0000