summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-10-25 17:16:09 +0200
committerinfirit <[email protected]>2014-10-25 17:16:40 +0200
commitf814451acc48aec6d2fa1c217468f74e57a84340 (patch)
tree9932641b62f8cd7ab01b8c89345fbe22d895330b
parent1bd64c3b7eca544f0722cb4c3ee7aa0ca5dd5ec4 (diff)
downloadmarco-f814451acc48aec6d2fa1c217468f74e57a84340.tar.bz2
marco-f814451acc48aec6d2fa1c217468f74e57a84340.tar.xz
Revert the new atom changes as they also got reverted later by metacity
Revert "Rename new ATOM from bc8eb8bd2f943b69c87eb7c9e154928f1dd861bb" This reverts commit 1bd64c3b7eca544f0722cb4c3ee7aa0ca5dd5ec4. Revert "compositor-xrender: add new atom - METACITY_WINDOW_HAVE_SHADOW" This reverts commit bc8eb8bd2f943b69c87eb7c9e154928f1dd861bb.
-rw-r--r--src/compositor/compositor-xrender.c57
1 files changed, 1 insertions, 56 deletions
diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
index e616e304..68898257 100644
--- a/src/compositor/compositor-xrender.c
+++ b/src/compositor/compositor-xrender.c
@@ -131,8 +131,6 @@ typedef struct _MetaCompositorXRender
Atom atom_net_wm_window_type_dropdown_menu;
Atom atom_net_wm_window_type_tooltip;
- Atom atom_marco_window_have_shadow;
-
#ifdef USE_IDLE_REPAINT
guint repaint_id;
#endif
@@ -209,7 +207,6 @@ typedef struct _MetaCompWindow
Picture picture;
Picture alpha_pict;
- gboolean have_shadow;
gboolean needs_shadow;
MetaShadowType shadow_type;
Picture shadow_pict;
@@ -903,9 +900,6 @@ window_has_shadow (MetaCompWindow *cw)
if (info == NULL || info->have_shadows == FALSE)
return FALSE;
- if (cw->have_shadow == FALSE)
- return FALSE;
-
/* Always put a shadow around windows with a frame - This should override
the restriction about not putting a shadow around shaped windows
as the frame might be the reason the window is shaped */
@@ -1896,8 +1890,6 @@ add_win (MetaScreen *screen,
cw->border_clip = None;
- cw->have_shadow = TRUE;
-
determine_mode (display, screen, cw);
cw->needs_shadow = window_has_shadow (cw);
@@ -2263,51 +2255,6 @@ process_property_notify (MetaCompositorXRender *compositor,
}
}
- /* Check for have_shadow changing */
- if (event->atom == compositor->atom_marco_window_have_shadow)
- {
- MetaCompWindow *cw = find_window_in_display (display, event->window);
- gulong value;
-
- if (!cw)
- {
- /* Applications can set this for their toplevel windows, so
- * this must be propagated to the window managed by the compositor
- */
- cw = find_window_for_child_window_in_display (display, event->window);
- }
-
- if (!cw)
- return;
-
- if (meta_prop_get_cardinal (display, event->window,
- compositor->atom_marco_window_have_shadow,
- &value) == FALSE)
- value = 1;
-
- cw->have_shadow = (gboolean) value;
-
- determine_mode (display, cw->screen, cw);
- cw->needs_shadow = window_has_shadow (cw);
-
- if (cw->shadow)
- {
- XRenderFreePicture (xdisplay, cw->shadow);
- cw->shadow = None;
- }
-
- if (cw->extents)
- XFixesDestroyRegion (xdisplay, cw->extents);
- cw->extents = win_extents (cw);
-
- cw->damaged = TRUE;
-#ifdef USE_IDLE_REPAINT
- add_repair (display);
-#endif
-
- return;
- }
-
/* Check for the opacity changing */
if (event->atom == compositor->atom_net_wm_window_opacity)
{
@@ -3136,8 +3083,7 @@ meta_compositor_xrender_new (MetaDisplay *display)
"_NET_WM_WINDOW_TYPE_SPLASH",
"_NET_WM_WINDOW_TYPE_TOOLBAR",
"_NET_WM_WINDOW_TYPE_DROPDOWN_MENU",
- "_NET_WM_WINDOW_TYPE_TOOLTIP",
- "MARCO_WINDOW_HAVE_SHADOW",
+ "_NET_WM_WINDOW_TYPE_TOOLTIP"
};
Atom atoms[G_N_ELEMENTS(atom_names)];
MetaCompositorXRender *xrc;
@@ -3170,7 +3116,6 @@ meta_compositor_xrender_new (MetaDisplay *display)
xrc->atom_net_wm_window_type_toolbar = atoms[12];
xrc->atom_net_wm_window_type_dropdown_menu = atoms[13];
xrc->atom_net_wm_window_type_tooltip = atoms[14];
- xrc->atom_marco_window_have_shadow = atoms[15];
xrc->show_redraw = FALSE;
xrc->debug = FALSE;