brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: always set the frame background to None

Browse Source 
This way the xserver never paints the frame background, even if
the client window is destroyed. This allows us to have clean
destroy window animation.

There is no problem with interactive resizing because applications
are using the XSync protocol, so we're not painting unless the
client has redrawn.

https://bugzilla.gnome.org/show_bug.cgi?id=734054
This commit is contained in:
Giovanni Campagna 2014-07-31 17:41:39 +02:00
parent 3a535b6722
commit d0f2c6be6d
5 changed files with 12 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/frame.c
View File

@ -151,7 +151,6 @@ meta_window_ensure_frame (MetaWindow *window)
* style and background. * style and background.
*/ */
meta_ui_update_frame_style (window->screen->ui, frame->xwindow); meta_ui_update_frame_style (window->screen->ui, frame->xwindow);
meta_ui_reset_frame_bg (window->screen->ui, frame->xwindow);
if (window->title) if (window->title)
meta_ui_set_frame_title (window->screen->ui, meta_ui_set_frame_title (window->screen->ui,
@ -372,15 +371,6 @@ meta_frame_sync_to_window (MetaFrame *frame,
frame->rect.x + frame->rect.width, frame->rect.x + frame->rect.width,
frame->rect.y + frame->rect.height); frame->rect.y + frame->rect.height);
/* set bg to none to avoid flicker */
if (need_resize)
{
meta_ui_unflicker_frame_bg (frame->window->screen->ui,
frame->xwindow,
frame->rect.width,
frame->rect.height);
}
meta_ui_move_resize_frame (frame->window->screen->ui, meta_ui_move_resize_frame (frame->window->screen->ui,
frame->xwindow, frame->xwindow,
frame->rect.x, frame->rect.x,
@ -390,9 +380,6 @@ meta_frame_sync_to_window (MetaFrame *frame,
if (need_resize) if (need_resize)
{ {
meta_ui_reset_frame_bg (frame->window->screen->ui,
frame->xwindow);
/* If we're interactively resizing the frame, repaint /* If we're interactively resizing the frame, repaint
* it immediately so we don't start to lag. * it immediately so we don't start to lag.
*/ */

102
src/ui/frames.c
View File

@ -65,9 +65,6 @@ static void meta_frames_paint (MetaFrames *frames,
MetaUIFrame *frame, MetaUIFrame *frame,
cairo_t *cr); cairo_t *cr);
static void meta_frames_set_window_background (MetaFrames *frames,
MetaUIFrame *frame);
static void meta_frames_calc_geometry (MetaFrames *frames, static void meta_frames_calc_geometry (MetaFrames *frames,
MetaUIFrame *frame, MetaUIFrame *frame,
MetaFrameGeometry *fgeom); MetaFrameGeometry *fgeom);
@ -300,12 +297,6 @@ queue_recalc_func (gpointer key, gpointer value, gpointer data)
frames = META_FRAMES (data); frames = META_FRAMES (data);
frame = value; frame = value;
/* If a resize occurs it will cause a redraw, but the
* resize may not actually be needed so we always redraw
* in case of color change.
*/
meta_frames_set_window_background (frames, frame);
invalidate_whole_window (frames, frame); invalidate_whole_window (frames, frame);
meta_core_queue_frame_resize (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), meta_core_queue_frame_resize (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
frame->xwindow); frame->xwindow);
@ -345,12 +336,6 @@ queue_draw_func (gpointer key, gpointer value, gpointer data)
frames = META_FRAMES (data); frames = META_FRAMES (data);
frame = value; frame = value;
/* If a resize occurs it will cause a redraw, but the
* resize may not actually be needed so we always redraw
* in case of color change.
*/
meta_frames_set_window_background (frames, frame);
invalidate_whole_window (frames, frame); invalidate_whole_window (frames, frame);
} }
@ -589,11 +574,6 @@ meta_frames_manage_window (MetaFrames *frames,
frame->shape_applied = FALSE; frame->shape_applied = FALSE;
frame->prelit_control = META_FRAME_CONTROL_NONE; frame->prelit_control = META_FRAME_CONTROL_NONE;
/* Don't set the window background yet; we need frame->xwindow to be
* registered with its MetaWindow, which happens after this function
* and meta_ui_create_frame_window() return to meta_window_ensure_frame().
*/
meta_core_grab_buttons (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), frame->xwindow); meta_core_grab_buttons (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), frame->xwindow);
g_hash_table_replace (frames->frames, &frame->xwindow, frame); g_hash_table_replace (frames->frames, &frame->xwindow, frame);
@ -723,42 +703,6 @@ meta_ui_frame_get_corner_radiuses (MetaFrames *frames,
*bottom_right = fgeom.bottom_right_corner_rounded_radius + sqrt(fgeom.bottom_right_corner_rounded_radius); *bottom_right = fgeom.bottom_right_corner_rounded_radius + sqrt(fgeom.bottom_right_corner_rounded_radius);
} }
void
meta_frames_reset_bg (MetaFrames *frames,
Window xwindow)
{
MetaUIFrame *frame;
frame = meta_frames_lookup_window (frames, xwindow);
meta_frames_set_window_background (frames, frame);
}
static void
set_background_none (Display *xdisplay,
Window xwindow)
{
XSetWindowAttributes attrs;
attrs.background_pixmap = None;
XChangeWindowAttributes (xdisplay, xwindow,
CWBackPixmap, &attrs);
}
void
meta_frames_unflicker_bg (MetaFrames *frames,
Window xwindow,
int target_width,
int target_height)
{
MetaUIFrame *frame;
frame = meta_frames_lookup_window (frames, xwindow);
g_return_if_fail (frame != NULL);
set_background_none (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), frame->xwindow);
}
/* The client rectangle surrounds client window; it subtracts both /* The client rectangle surrounds client window; it subtracts both
* the visible and invisible borders from the frame window's size. * the visible and invisible borders from the frame window's size.
*/ */
@ -1901,52 +1845,6 @@ meta_frames_paint (MetaFrames *frames,
mini_icon, icon); mini_icon, icon);
} }
static void
meta_frames_set_window_background (MetaFrames *frames,
MetaUIFrame *frame)
{
MetaFrameFlags flags;
MetaFrameType type;
MetaFrameStyle *style = NULL;
gboolean frame_exists;
meta_core_get (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), frame->xwindow,
META_CORE_WINDOW_HAS_FRAME, &frame_exists,
META_CORE_GET_FRAME_FLAGS, &flags,
META_CORE_GET_FRAME_TYPE, &type,
META_CORE_GET_END);
if (frame_exists)
{
style = meta_theme_get_frame_style (meta_theme_get_current (),
type, flags);
}
if (frame_exists && style->window_background_color != NULL)
{
GdkRGBA color;
GdkVisual *visual;
meta_color_spec_render (style->window_background_color,
frame->style,
&color);
/* Set A in ARGB to window_background_alpha, if we have ARGB */
visual = gtk_widget_get_visual (GTK_WIDGET (frames));
if (gdk_visual_get_depth (visual) == 32) /* we have ARGB */
{
color.alpha = style->window_background_alpha / 255.0;
}
gdk_window_set_background_rgba (frame->window, &color);
}
else
{
gtk_style_context_set_background (frame->style, frame->window);
}
}
static gboolean static gboolean
meta_frames_enter_notify_event (GtkWidget *widget, meta_frames_enter_notify_event (GtkWidget *widget,
GdkEventCrossing *event) GdkEventCrossing *event)

7
src/ui/frames.h
View File

@ -138,13 +138,6 @@ void meta_frames_get_borders (MetaFrames *frames,
Window xwindow, Window xwindow,
MetaFrameBorders *borders); MetaFrameBorders *borders);
void meta_frames_reset_bg (MetaFrames *frames,
Window xwindow);
void meta_frames_unflicker_bg (MetaFrames *frames,
Window xwindow,
int target_width,
int target_height);
cairo_region_t *meta_frames_get_frame_bounds (MetaFrames *frames, cairo_region_t *meta_frames_get_frame_bounds (MetaFrames *frames,
Window xwindow, Window xwindow,
int window_width, int window_width,

29
src/ui/ui.c
View File

@ -331,6 +331,17 @@ meta_ui_get_frame_borders (MetaUI *ui,
borders); borders);
} }
static void
set_background_none (Display *xdisplay,
Window xwindow)
{
XSetWindowAttributes attrs;
attrs.background_pixmap = None;
XChangeWindowAttributes (xdisplay, xwindow,
CWBackPixmap, &attrs);
}
Window Window
meta_ui_create_frame_window (MetaUI *ui, meta_ui_create_frame_window (MetaUI *ui,
Display *xdisplay, Display *xdisplay,
@ -397,6 +408,7 @@ meta_ui_create_frame_window (MetaUI *ui,
&attrs, attributes_mask); &attrs, attributes_mask);
gdk_window_resize (window, width, height); gdk_window_resize (window, width, height);
set_background_none (xdisplay, GDK_WINDOW_XID (window));
meta_frames_manage_window (ui->frames, GDK_WINDOW_XID (window), window); meta_frames_manage_window (ui->frames, GDK_WINDOW_XID (window), window);
@ -449,16 +461,6 @@ meta_ui_unmap_frame (MetaUI *ui,
gdk_window_hide (window); gdk_window_hide (window);
} }
void
meta_ui_unflicker_frame_bg (MetaUI *ui,
Window xwindow,
int target_width,
int target_height)
{
meta_frames_unflicker_bg (ui->frames, xwindow,
target_width, target_height);
}
void void
meta_ui_update_frame_style (MetaUI *ui, meta_ui_update_frame_style (MetaUI *ui,
Window xwindow) Window xwindow)
@ -473,13 +475,6 @@ meta_ui_repaint_frame (MetaUI *ui,
meta_frames_repaint_frame (ui->frames, xwindow); meta_frames_repaint_frame (ui->frames, xwindow);
} }
void
meta_ui_reset_frame_bg (MetaUI *ui,
Window xwindow)
{
meta_frames_reset_bg (ui->frames, xwindow);
}
cairo_region_t * cairo_region_t *
meta_ui_get_frame_bounds (MetaUI *ui, meta_ui_get_frame_bounds (MetaUI *ui,
Window xwindow, Window xwindow,

7
src/ui/ui.h
View File

@ -88,13 +88,6 @@ void meta_ui_map_frame (MetaUI *ui,
void meta_ui_unmap_frame (MetaUI *ui, void meta_ui_unmap_frame (MetaUI *ui,
Window xwindow); Window xwindow);
void meta_ui_unflicker_frame_bg (MetaUI *ui,
Window xwindow,
int target_width,
int target_height);
void meta_ui_reset_frame_bg (MetaUI *ui,
Window xwindow);
cairo_region_t *meta_ui_get_frame_bounds (MetaUI *ui, cairo_region_t *meta_ui_get_frame_bounds (MetaUI *ui,
Window xwindow, Window xwindow,
int window_width, int window_width,