adjust for some api extensions in render2

diff --git a/openbox/frame.c b/openbox/frame.c
index a5c1de3bd6c5c2d97d97b782021689f3c45178cf..7f82a413299a39e14d62e504b0b427af9b93096c 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -68,7 +68,8 @@ Frame *frame_new()
     fd = &self->framedecor[0];
     fd->obwin.type = Window_Decoration;
     fd->surface = RrSurfaceNewChild(RR_SURFACE_PLANAR, self->surface, 1);
-    RrPlanarSet(fd->surface, RR_PLANAR_HORIZONTAL, &sec, &pri);
+    RrPlanarSet(fd->surface, RR_PLANAR_HORIZONTAL, RR_RAISED_OUTER, &sec, &pri,
+                0, NULL);
     RrTextureSetText(fd->surface, 0, foont, RR_LEFT,
                      "OPENBOX SUCKS because of me.");
     fd->window = RrSurfaceWindow(fd->surface);
@@ -84,7 +85,8 @@ Frame *frame_new()
     fd = &self->framedecor[1];
     fd->obwin.type = Window_Decoration;
     fd->surface = RrSurfaceNewChild(RR_SURFACE_PLANAR, self->surface, 0);
-    RrPlanarSet(fd->surface, RR_PLANAR_HORIZONTAL, &pri, &sec);
+    RrPlanarSet(fd->surface, RR_PLANAR_HORIZONTAL, RR_RAISED_OUTER, &sec, &pri,
+                0, NULL);
     fd->window = RrSurfaceWindow(fd->surface);
     XSelectInput(ob_display, fd->window, ELEMENT_EVENTMASK);
     fd->anchor = Decor_Bottom;

diff --git a/openbox/popup.c b/openbox/popup.c
index 505afe32514cdf9cb4d5fab66384c4c9b38a13f4..6ce937b999779687fd0672aa68ad8dc709958400 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -62,14 +62,17 @@ Popup *popup_new(gboolean hasicon)
     */
     RrColorSet(&pri, 1, 0, 0, 0);
     RrColorSet(&sec, 0, 1, 0, 0);
-    RrPlanarSet(self->s_bg, RR_PLANAR_VERTICAL, &pri, &sec);
+    RrPlanarSet(self->s_bg, RR_PLANAR_VERTICAL, RR_SUNKEN_INNER, &pri, &sec,
+                1, &pri);
     RrColorSet(&pri, 0, 0.5, 0, 0.7);
     RrColorSet(&sec, 0.5, 0, 0.5, 0.7);
-    RrPlanarSet(self->s_text, RR_PLANAR_HORIZONTAL, &pri, &sec);
+    RrPlanarSet(self->s_text, RR_PLANAR_HORIZONTAL, RR_BEVEL_NONE, &pri, &sec,
+                0, NULL);
     if (self->s_icon) {
         RrColorSet(&pri, 0, 0, 1, 0.7);
         RrColorSet(&sec, 0.5, 0.5, 0, 0.7);
-        RrPlanarSet(self->s_icon, RR_PLANAR_HORIZONTAL, &pri, &sec);
+        RrPlanarSet(self->s_icon, RR_PLANAR_HORIZONTAL, RR_BEVEL_NONE, &pri,
+                    &sec, 0, NULL);
     }
 
     return self;