compositor: rename border_size to frame_region

1 files changed, 32 insertions, 23 deletions

diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
index 8d69fe81..cc0bb43d 100644
--- a/src/compositor/compositor-xrender.c
+++ b/src/compositor/compositor-xrender.c
@@ -174,7 +174,8 @@ typedef struct _MetaCompWindow
   MetaShadowType shadow_type;
   Picture shadow_pict;
 
-  XserverRegion border_size;
+  XserverRegion frame_region;
+
   XserverRegion window_size;
   XserverRegion extents;
 
@@ -1108,24 +1109,30 @@ win_extents (MetaCompWindow *cw)
 }
 
 static XserverRegion
-border_size (MetaCompWindow *cw)
+get_frame_region (MetaCompWindow *cw)
 {
-  MetaScreen *screen = cw->screen;
-  MetaDisplay *display = meta_screen_get_display (screen);
-  Display *xdisplay = meta_display_get_xdisplay (display);
-  XserverRegion border;
+  MetaScreen *screen;
+  MetaDisplay *display;
+  Display *xdisplay;
+  XserverRegion frame_region;
+
+  screen = cw->screen;
+  display = meta_screen_get_display (screen);
+  xdisplay = meta_display_get_xdisplay (display);
 
   meta_error_trap_push (display);
-  border = XFixesCreateRegionFromWindow (xdisplay, cw->id,
-                                         WindowRegionBounding);
+  frame_region = XFixesCreateRegionFromWindow (xdisplay, cw->id,
+                                               WindowRegionBounding);
+
   meta_error_trap_pop (display, FALSE);
+  if (frame_region == None)
+    return None;
 
-  g_return_val_if_fail (border != None, None);
-  XFixesTranslateRegion (xdisplay, border,
+  XFixesTranslateRegion (xdisplay, frame_region,
                          cw->attrs.x + cw->attrs.border_width,
                          cw->attrs.y + cw->attrs.border_width);
 
-  return border;
+  return frame_region;
 }
 
 static XserverRegion
@@ -1146,7 +1153,7 @@ window_size (MetaCompWindow *cw)
         visible = cairo_region_to_xserver_region (xdisplay, visible_region);
     }
 
-  border = border_size (cw);
+  border = get_frame_region (cw);
 
   if (visible != None)
     {
@@ -1332,10 +1339,10 @@ paint_windows (MetaScreen   *screen,
          then we need to recreate the extents of the window */
       if (info->clip_changed)
         {
-          if (cw->border_size)
+          if (cw->frame_region)
             {
-              XFixesDestroyRegion (xdisplay, cw->border_size);
-              cw->border_size = None;
+              XFixesDestroyRegion (xdisplay, cw->frame_region);
+              cw->frame_region = None;
             }
 
           if (cw->window_size)
@@ -1353,8 +1360,8 @@ paint_windows (MetaScreen   *screen,
 #endif
         }
 
-      if (cw->border_size == None)
-        cw->border_size = border_size (cw);
+      if (cw->frame_region == None)
+        cw->frame_region = get_frame_region (cw);
 
       if (cw->window_size == None)
         cw->window_size = window_size (cw);
@@ -1384,7 +1391,7 @@ paint_windows (MetaScreen   *screen,
             }
 
           XFixesSubtractRegion (xdisplay, paint_region,
-                                paint_region, cw->border_size);
+                                paint_region, cw->frame_region);
         }
 
       if (!cw->border_clip)
@@ -1439,7 +1446,7 @@ paint_windows (MetaScreen   *screen,
             }
 
           XFixesIntersectRegion (xdisplay, cw->border_clip, cw->border_clip,
-                                 cw->border_size);
+                                 cw->frame_region);
           XFixesSetPictureClipRegion (xdisplay, root_buffer, 0, 0,
                                       cw->border_clip);
           if (cw->mode == WINDOW_ARGB)
@@ -1698,10 +1705,10 @@ free_win (MetaCompWindow *cw,
       cw->shadow_pict = None;
     }
 
-  if (cw->border_size)
+  if (cw->frame_region)
     {
-      XFixesDestroyRegion (xdisplay, cw->border_size);
-      cw->border_size = None;
+      XFixesDestroyRegion (xdisplay, cw->frame_region);
+      cw->frame_region = None;
     }
 
   if (cw->window_size)
@@ -1977,7 +1984,9 @@ add_win (MetaScreen *screen,
 
   cw->alpha_pict = None;
   cw->shadow_pict = None;
-  cw->border_size = None;
+
+  cw->frame_region = None;
+
   cw->window_size = None;
   cw->extents = None;
   cw->shadow = None;