summaryrefslogtreecommitdiff
path: root/src/frame.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c63
1 files changed, 4 insertions, 59 deletions
diff --git a/src/frame.c b/src/frame.c
index b381c858..76e62966 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -38,60 +38,6 @@
EnterWindowMask | LeaveWindowMask | \
FocusChangeMask | \
ColormapChangeMask)
-static Visual*
-find_argb_visual (MetaDisplay *display,
- int scr)
-{
-#ifdef HAVE_RENDER
- XVisualInfo *xvi;
- XVisualInfo template;
- int nvi;
- int i;
- XRenderPictFormat *format;
- Visual *visual;
-
- if (!META_DISPLAY_HAS_RENDER (display))
- return NULL;
-
- template.screen = scr;
- template.depth = 32;
- template.class = TrueColor;
- xvi = XGetVisualInfo (display->xdisplay,
- VisualScreenMask |
- VisualDepthMask |
- VisualClassMask,
- &template,
- &nvi);
- if (!xvi)
- return NULL;
-
- visual = NULL;
-
- for (i = 0; i < nvi; i++)
- {
- format = XRenderFindVisualFormat (display->xdisplay, xvi[i].visual);
- if (format->type == PictTypeDirect && format->direct.alphaMask)
- {
- visual = xvi[i].visual;
- break;
- }
- }
-
- XFree (xvi);
-
- if (visual)
- meta_topic (META_DEBUG_COMPOSITOR,
- "Found ARGB visual 0x%lx\n",
- (long) visual->visualid);
- else
- meta_topic (META_DEBUG_COMPOSITOR,
- "No ARGB visual found\n");
-
- return visual;
-#else /* RENDER */
- return NULL;
-#endif /* !RENDER */
-}
void
meta_window_ensure_frame (MetaWindow *window)
@@ -102,7 +48,7 @@ meta_window_ensure_frame (MetaWindow *window)
if (window->frame)
return;
-
+
/* See comment below for why this is required. */
meta_display_grab (window->display);
@@ -142,14 +88,13 @@ meta_window_ensure_frame (MetaWindow *window)
*/
/* Special case for depth 32 windows (assumed to be ARGB),
- * we use the window's visual
+ * we use the window's visual. Otherwise we just use the system visual.
*/
if (window->depth == 32)
visual = window->xvisual;
else
- visual = find_argb_visual(window->display,
- window->screen->number);
-
+ visual = NULL;
+
frame->xwindow = meta_ui_create_frame_window (window->screen->ui,
window->display->xdisplay,
visual,