Improve interface by removing display screen and render instance

diff --git a/Makefile.am b/Makefile.am
index 75fd8cc9101279420ad814687788ae8396f736a6..850438a127d32d580fc90c04b20d69ca380d9542 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,8 +27,8 @@ check_PROGRAMS = \
 lib_LTLIBRARIES = \
        render/libobrender.la \
        obt/libobt.la \
-       engines/libconcept.la \
        engines/libdefault.la
+#      engines/libconcept.la \
 #      engines/libconcept2.la \
 #      engines/libminimal.la
 
@@ -70,6 +70,7 @@ render_libobrender_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
+       -no-undefined \
        -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
 render_libobrender_la_LIBADD = \
        obt/libobt.la \
@@ -105,12 +106,14 @@ engines_libdefault_la_CPPFLAGS = \
        $(XML_CFLAGS) \
        $(PANGO_CFLAGS) \
        $(XFT_CFLAGS) \
-       -DG_LOG_DOMAIN=\"ObRender\" \
+       -DG_LOG_DOMAIN=\"ObDefault\" \
        -DDEFAULT_THEME=\"$(theme)\"
 engines_libdefault_la_LDFLAGS = \
+       -no-undefined \
        -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
 engines_libdefault_la_LIBADD = \
        render/libobrender.la \
+       obt/libobt.la \
        $(X_LIBS) \
        $(PANGO_LIBS) \
        $(XFT_LIBS) \
@@ -118,24 +121,6 @@ engines_libdefault_la_LIBADD = \
        $(XML_LIBS)
 engines_libdefault_la_SOURCES = \
        gettext.h \
-       render/color.h \
-       render/color.c \
-       render/font.h \
-       render/font.c \
-       render/geom.h \
-       render/gradient.h \
-       render/gradient.c \
-       render/icon.h \
-       render/image.h \
-       render/image.c \
-       render/instance.h \
-       render/instance.c \
-       render/mask.h \
-       render/mask.c \
-       render/render.h \
-       render/render.c \
-       openbox/engine_interface.h \
-       openbox/engine_interface.c \
        engines/default/config.h \
        engines/default/config.c \
        engines/default/render.h \
@@ -189,53 +174,53 @@ engines_libdefault_la_SOURCES = \
 #    engines/minimal/frame_minimal_plugin.c
 
 ## frame_concept ##
-engines_libconcept_la_CPPFLAGS = \
-       $(X_CFLAGS) \
-       $(GLIB_CFLAGS) \
-       $(XML_CFLAGS) \
-       $(PANGO_CFLAGS) \
-       $(XFT_CFLAGS) \
-       $(IMLIB2_CFLAGS) \
-       $(GDK_PIXBUF_CFLAGS) \
-       $(GDK_PIXBUF_XLIB_CFLAGS) \
-       -DG_LOG_DOMAIN=\"ObRender\" \
-       -DDEFAULT_THEME=\"$(theme)\"
-engines_libconcept_la_LDFLAGS = \
-       -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
-engines_libconcept_la_LIBADD = \
-       render/libobrender.la \
-       $(X_LIBS) \
-       $(PANGO_LIBS) \
-       $(XFT_LIBS) \
-       $(GLIB_LIBS) \
-       $(IMLIB2_LIBS) \
-       $(GDK_PIXBUF_LIBS) \
-       $(GDK_PIXBUF_XLIB_LIBS) \
-       $(XML_LIBS)
-engines_libconcept_la_SOURCES = \
-       gettext.h \
-       render/color.h \
-       render/color.c \
-       render/font.h \
-       render/font.c \
-       render/geom.h \
-       render/gradient.h \
-       render/gradient.c \
-       render/icon.h \
-       render/image.h \
-       render/image.c \
-       render/instance.h \
-       render/instance.c \
-       render/mask.h \
-       render/mask.c \
-       render/render.h \
-       render/render.c \
-       openbox/engine_interface.h \
-       openbox/engine_interface.c \
-       engines/concept/config.h \
-       engines/concept/config.c \
-       engines/concept/plugin.h \
-       engines/concept/plugin.c
+#engines_libconcept_la_CPPFLAGS = \
+#      $(X_CFLAGS) \
+#      $(GLIB_CFLAGS) \
+#      $(XML_CFLAGS) \
+#      $(PANGO_CFLAGS) \
+#      $(XFT_CFLAGS) \
+#      $(IMLIB2_CFLAGS) \
+#      $(GDK_PIXBUF_CFLAGS) \
+#      $(GDK_PIXBUF_XLIB_CFLAGS) \
+#      -DG_LOG_DOMAIN=\"ObRender\" \
+#      -DDEFAULT_THEME=\"$(theme)\"
+#engines_libconcept_la_LDFLAGS = \
+#      -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
+#engines_libconcept_la_LIBADD = \
+#      render/libobrender.la \
+#      $(X_LIBS) \
+#      $(PANGO_LIBS) \
+#      $(XFT_LIBS) \
+#      $(GLIB_LIBS) \
+#      $(IMLIB2_LIBS) \
+#      $(GDK_PIXBUF_LIBS) \
+#      $(GDK_PIXBUF_XLIB_LIBS) \
+#      $(XML_LIBS)
+#engines_libconcept_la_SOURCES = \
+#      gettext.h \
+#      render/color.h \
+#      render/color.c \
+#      render/font.h \
+#      render/font.c \
+#      render/geom.h \
+#      render/gradient.h \
+#      render/gradient.c \
+#      render/icon.h \
+#      render/image.h \
+#      render/image.c \
+#      render/instance.h \
+#      render/instance.c \
+#      render/mask.h \
+#      render/mask.c \
+#      render/render.h \
+#      render/render.c \
+#      openbox/engine_interface.h \
+#      openbox/engine_interface.c \
+#      engines/concept/config.h \
+#      engines/concept/config.c \
+#      engines/concept/plugin.h \
+#      engines/concept/plugin.c
 
 ## obt ##
 
@@ -252,6 +237,7 @@ obt_libobt_la_CPPFLAGS = \
        -DDATADIR=\"$(datadir)\" \
        -DCONFIGDIR=\"$(configdir)\"
 obt_libobt_la_LDFLAGS = \
+       -no-undefined \
        -version-info $(OBT_CURRENT):$(OBT_REVISION):$(OBT_AGE)
 obt_libobt_la_LIBADD = \
        $(XINERAMA_LIBS) \

diff --git a/engines/default/config.c b/engines/default/config.c
index 893f8c21d2456fd5105f65939f9549ecdfc1d682..6cbd6f6954921d2853200676f8f01a78befe70d4 100644 (file)
--- a/engines/default/config.c
+++ b/engines/default/config.c
@@ -18,20 +18,12 @@
  */
 
 #include "config.h"
+
 #include "plugin.h"
 
 #include "render/render.h"
-#include "render/color.h"
-#include "render/font.h"
 #include "render/mask.h"
 #include "render/icon.h"
-#include "obt/parse.h"
-
-#include <X11/Xlib.h>
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
 
 static XrmDatabase loaddb(const gchar *name, gchar **path);
 static gboolean read_int(XrmDatabase db, const gchar *rname, gint *value);
@@ -56,9 +48,6 @@ gint load_theme_config(const RrInstance *inst, const gchar *name,
     ObFrameThemeConfig * theme = &theme_config;
     gboolean userdef;
 
-    //theme = g_new0(ObFrameTheme, 1);
-
-    theme->inst = inst;
     theme->name = g_strdup(name ? name : DEFAULT_THEME);
 
     theme->a_disabled_focused_max = RrAppearanceNew(inst, 1);

diff --git a/engines/default/config.h b/engines/default/config.h
index 560160478384f166bd92ea69acd65b0f2ebaec91..9f0e9a4d2aa30ba3f2fa3879536f0f4176212b20 100644 (file)
--- a/engines/default/config.h
+++ b/engines/default/config.h
@@ -20,14 +20,11 @@
 #define FRAME_DEFAULT_CONFIG_H_
 
 #include <X11/Xresource.h>
-#include "render/render.h"
 
-G_BEGIN_DECLS
+#include "render/render.h"
 
 struct _ObFrameThemeConfig
 {
-    const RrInstance *inst;
-
     /* style settings - fonts */
     RrFont *win_font_focused;
     RrFont *win_font_unfocused;
@@ -238,6 +235,7 @@ struct _ObFrameThemeConfig
 
 typedef struct _ObFrameThemeConfig ObFrameThemeConfig;
 
+G_BEGIN_DECLS
 /*! The font values are all optional. If a NULL is used for any of them, then
  the default font will be used. */
 gint load_theme_config(const RrInstance *inst, const gchar *name,

diff --git a/engines/default/plugin.c b/engines/default/plugin.c
index 4d2e622732d520beab7e82518d1de430830d689b..794e3733cadf23b59bdad2222d7a5e6bdd2f0212 100644 (file)
--- a/engines/default/plugin.c
+++ b/engines/default/plugin.c
@@ -17,20 +17,19 @@
  See the COPYING file for a copy of the GNU General Public License.
  */
 
-#include "openbox/client.h"
-#include "openbox/openbox.h"
+#include "plugin.h"
+#include "render.h"
+
+/* Needed for the _() function */
+#include <gettext.h>
+
 #include "obt/prop.h"
-#include "openbox/grab.h"
-#include "openbox/config.h"
-#include "obt/mainloop.h"
-#include "openbox/focus_cycle.h"
-#include "openbox/focus_cycle_indicator.h"
-#include "openbox/moveresize.h"
 #include "openbox/screen.h"
-#include "render/theme.h"
 
-#include "plugin.h"
-#include "render.h"
+/* Needed for the grab_server */
+#include "openbox/grab.h"
+
+#include <X11/extensions/shape.h>
 
 typedef enum
 {
@@ -53,12 +52,16 @@ typedef enum
 
 #define FRAME_HANDLE_Y(f) (f->size.top + f->client_area.height + f->cbwidth_b)
 
+Display * obp_display;
+gint obp_screen;
+RrInstance *ob_rr_inst;
+
 Window createWindow(Window parent, Visual *visual, gulong mask,
         XSetWindowAttributes *attrib)
 {
-    return XCreateWindow(plugin.ob_display, parent, 0, 0, 1, 1, 0, (visual ? 32
-            : RrDepth(plugin.ob_rr_inst)), InputOutput, (visual ? visual
-            : RrVisual(plugin.ob_rr_inst)), mask, attrib);
+    return XCreateWindow(obp_display, parent, 0, 0, 1, 1, 0, (visual ? 32
+            : RrDepth(ob_rr_inst)), InputOutput, (visual ? visual
+            : RrVisual(ob_rr_inst)), mask, attrib);
 
 }
 
@@ -69,10 +72,10 @@ Visual *check_32bit_client(ObClient *c)
 
     /* we're already running at 32 bit depth, yay. we don't need to use their
      visual */
-    if (RrDepth(plugin.ob_rr_inst) == 32)
+    if (RrDepth(ob_rr_inst) == 32)
         return NULL;
 
-    ret = XGetWindowAttributes(plugin.ob_display, c->window, &wattrib);
+    ret = XGetWindowAttributes(obp_display, c->window, &wattrib);
     g_assert(ret != BadDrawable);
     g_assert(ret != BadWindow);
 
@@ -84,8 +87,11 @@ Visual *check_32bit_client(ObClient *c)
 /* Not used */
 gint init(Display * display, gint screen)
 {
-    plugin.ob_display = display;
-    plugin.ob_screen = screen;
+    ob_rr_inst = RrInstanceNew(display, screen);
+    if (ob_rr_inst == NULL)
+        ob_exit_with_error(_("Failed to initialize the obrender library."));
+    obp_display = display;
+    obp_screen = screen;
 }
 
 gpointer frame_new(struct _ObClient * client)
@@ -108,14 +114,14 @@ gpointer frame_new(struct _ObClient * client)
         mask |= CWColormap | CWBackPixel | CWBorderPixel;
         /* create a colormap with the visual */
         OBDEFAULTFRAME(self)->colormap = attrib.colormap = XCreateColormap(
-                plugin.ob_display, RootWindow(plugin.ob_display,
-                        plugin.ob_screen), visual, AllocNone);
-        attrib.background_pixel = BlackPixel(plugin.ob_display,
-                plugin.ob_screen);
-        attrib.border_pixel = BlackPixel(plugin.ob_display, plugin.ob_screen);
+                obp_display, RootWindow(obp_display,
+                        obp_screen), visual, AllocNone);
+        attrib.background_pixel = BlackPixel(obp_display,
+                obp_screen);
+        attrib.border_pixel = BlackPixel(obp_display, obp_screen);
     }
     self->window = createWindow(
-            RootWindow(plugin.ob_display, plugin.ob_screen), visual, mask,
+            RootWindow(obp_display, obp_screen), visual, mask,
             &attrib);
 
     /* create the visible decor windows */
@@ -124,7 +130,7 @@ gpointer frame_new(struct _ObClient * client)
     if (visual) {
         /* client has a 32-bit visual */
         mask |= CWColormap | CWBackPixel | CWBorderPixel;
-        attrib.colormap = RrColormap(plugin.ob_rr_inst);
+        attrib.colormap = RrColormap(ob_rr_inst);
     }
 
     self->backback = createWindow(self->window, NULL, mask, &attrib);
@@ -187,9 +193,9 @@ gpointer frame_new(struct _ObClient * client)
     self->focused = FALSE;
 
     /* the other stuff is shown based on decor settings */
-    XMapWindow(plugin.ob_display, self->label);
-    XMapWindow(plugin.ob_display, self->backback);
-    XMapWindow(plugin.ob_display, self->backfront);
+    XMapWindow(obp_display, self->label);
+    XMapWindow(obp_display, self->backback);
+    XMapWindow(obp_display, self->backfront);
 
     self->hover_flag = OB_BUTTON_NONE;
     self->press_flag = OB_BUTTON_NONE;
@@ -203,25 +209,25 @@ void set_theme_statics(gpointer _self)
 {
     ObDefaultFrame * self = (ObDefaultFrame *) _self;
     /* set colors/appearance/sizes for stuff that doesn't change */
-    XResizeWindow(plugin.ob_display, self->max, theme_config.button_size,
+    XResizeWindow(obp_display, self->max, theme_config.button_size,
             theme_config.button_size);
-    XResizeWindow(plugin.ob_display, self->iconify, theme_config.button_size,
+    XResizeWindow(obp_display, self->iconify, theme_config.button_size,
             theme_config.button_size);
-    XResizeWindow(plugin.ob_display, self->icon, theme_config.button_size + 2,
+    XResizeWindow(obp_display, self->icon, theme_config.button_size + 2,
             theme_config.button_size + 2);
-    XResizeWindow(plugin.ob_display, self->close, theme_config.button_size,
+    XResizeWindow(obp_display, self->close, theme_config.button_size,
             theme_config.button_size);
-    XResizeWindow(plugin.ob_display, self->desk, theme_config.button_size,
+    XResizeWindow(obp_display, self->desk, theme_config.button_size,
             theme_config.button_size);
-    XResizeWindow(plugin.ob_display, self->shade, theme_config.button_size,
+    XResizeWindow(obp_display, self->shade, theme_config.button_size,
             theme_config.button_size);
-    XResizeWindow(plugin.ob_display, self->tltresize, theme_config.grip_width,
+    XResizeWindow(obp_display, self->tltresize, theme_config.grip_width,
             theme_config.paddingy + 1);
-    XResizeWindow(plugin.ob_display, self->trtresize, theme_config.grip_width,
+    XResizeWindow(obp_display, self->trtresize, theme_config.grip_width,
             theme_config.paddingy + 1);
-    XResizeWindow(plugin.ob_display, self->tllresize,
+    XResizeWindow(obp_display, self->tllresize,
             theme_config.paddingx + 1, theme_config.title_height);
-    XResizeWindow(plugin.ob_display, self->trrresize,
+    XResizeWindow(obp_display, self->trrresize,
             theme_config.paddingx + 1, theme_config.title_height);
 
     /* set up the dynamic appearances */
@@ -250,9 +256,9 @@ void free_theme_statics(gpointer _self)
 void frame_free(gpointer self)
 {
     free_theme_statics(OBDEFAULTFRAME(self));
-    XDestroyWindow(plugin.ob_display, OBDEFAULTFRAME(self)->window);
+    XDestroyWindow(obp_display, OBDEFAULTFRAME(self)->window);
     if (OBDEFAULTFRAME(self)->colormap)
-        XFreeColormap(plugin.ob_display, OBDEFAULTFRAME(self)->colormap);
+        XFreeColormap(obp_display, OBDEFAULTFRAME(self)->colormap);
     
     g_free(OBDEFAULTFRAME(self)->stitle);
     g_free(self);
@@ -268,8 +274,8 @@ void frame_show(gpointer _self)
          the client gets its MapNotify, i.e. to make sure the client is
          _visible_ when it gets MapNotify. */
         grab_server(TRUE);
-        XMapWindow(plugin.ob_display, self->client->window);
-        XMapWindow(plugin.ob_display, self->window);
+        XMapWindow(obp_display, self->client->window);
+        XMapWindow(obp_display, self->window);
         grab_server(FALSE);
     }
 }
@@ -279,10 +285,10 @@ gint frame_hide(gpointer self)
     if (OBDEFAULTFRAME(self)->visible) {
         OBDEFAULTFRAME(self)->visible = FALSE;
         if (!frame_iconify_animating(self))
-            XUnmapWindow(plugin.ob_display, OBDEFAULTFRAME(self)->window);
+            XUnmapWindow(obp_display, OBDEFAULTFRAME(self)->window);
         /* we unmap the client itself so that we can get MapRequest
          events, and because the ICCCM tells us to! */
-        XUnmapWindow(plugin.ob_display, OBDEFAULTFRAME(self)->client->window);
+        XUnmapWindow(obp_display, OBDEFAULTFRAME(self)->client->window);
         return 1;
     }
     else {
@@ -306,7 +312,7 @@ void frame_adjust_shape(gpointer _self)
     if (!self->client->shaped)
     {
         /* clear the shape on the frame window */
-        XShapeCombineMask(plugin.ob_display, self->window, ShapeBounding,
+        XShapeCombineMask(obp_display, self->window, ShapeBounding,
                 self->size.left,
                 self->size.top,
                 None, ShapeSet);
@@ -314,7 +320,7 @@ void frame_adjust_shape(gpointer _self)
     else
     {
         /* make the frame's shape match the clients */
-        XShapeCombineShape(plugin.ob_display, self->window, ShapeBounding,
+        XShapeCombineShape(obp_display, self->window, ShapeBounding,
                 self->size.left,
                 self->size.top,
                 self->client->window,
@@ -341,7 +347,7 @@ void frame_adjust_shape(gpointer _self)
             ++num;
         }
 
-        XShapeCombineRectangles(plugin.ob_display, self->window,
+        XShapeCombineRectangles(obp_display, self->window,
                 ShapeBounding, 0, 0, xrect, num,
                 ShapeUnion, Unsorted);
     }
@@ -357,7 +363,7 @@ void frame_grab(gpointer _self, GHashTable * window_map)
      */
 
     /* reparent the client to the frame */
-    XReparentWindow(plugin.ob_display, self->client->window, self->window, 0, 0);
+    XReparentWindow(obp_display, self->client->window, self->window, 0, 0);
 
     /*
      When reparenting the client window, it is usually not mapped yet, since
@@ -370,7 +376,7 @@ void frame_grab(gpointer _self, GHashTable * window_map)
 
     /* select the event mask on the client's parent (to receive config/map
      req's) the ButtonPress is to catch clicks on the client border */
-    XSelectInput(plugin.ob_display, self->window, FRAME_EVENTMASK);
+    XSelectInput(obp_display, self->window, FRAME_EVENTMASK);
 
     /* set all the windows for the frame in the window_map */
     g_hash_table_insert(window_map, &self->window, self->client);
@@ -427,7 +433,7 @@ void frame_ungrab(gpointer _self, GHashTable * window_map)
             frame_animate_iconify, self, FALSE);
 
     /* check if the app has already reparented its window away */
-    while (XCheckTypedWindowEvent(plugin.ob_display, self->client->window,
+    while (XCheckTypedWindowEvent(obp_display, self->client->window,
             ReparentNotify, &ev)) {
         /* This check makes sure we don't catch our own reparent action to
          our frame window. This doesn't count as the app reparenting itself
@@ -438,7 +444,7 @@ void frame_ungrab(gpointer _self, GHashTable * window_map)
          */
         if (ev.xreparent.parent != self->window) {
             reparent = FALSE;
-            XPutBackEvent(plugin.ob_display, &ev);
+            XPutBackEvent(obp_display, &ev);
             break;
         }
     }
@@ -446,8 +452,8 @@ void frame_ungrab(gpointer _self, GHashTable * window_map)
     if (reparent) {
         /* according to the ICCCM - if the client doesn't reparent itself,
          then we will reparent the window to root for them */
-        XReparentWindow(plugin.ob_display, self->client->window, RootWindow(
-                plugin.ob_display, plugin.ob_screen), self->client_area.x,
+        XReparentWindow(obp_display, self->client->window, RootWindow(
+                obp_display, obp_screen), self->client_area.x,
                 self->client_area.y);
     }
 
@@ -741,7 +747,7 @@ void frame_begin_iconify_animation(gpointer _self, gboolean iconifying)
 
         /* show it during the animation even if it is not "visible" */
         if (!self->visible)
-            XMapWindow(plugin.ob_display, self->window);
+            XMapWindow(obp_display, self->window);
     }
 }
 
@@ -753,7 +759,7 @@ void frame_end_iconify_animation(gpointer _self)
         return;
 
     if (!self->visible)
-        XUnmapWindow(plugin.ob_display, self->window);
+        XUnmapWindow(obp_display, self->window);
     else {
         /* Send a ConfigureNotify when the animation is done, this fixes
          KDE's pager showing the window in the wrong place.  since the
@@ -766,11 +772,11 @@ void frame_end_iconify_animation(gpointer _self)
     /* we're not animating any more ! */
     self->iconify_animation_going = 0;
 
-    XMoveResizeWindow(plugin.ob_display, self->window, self->area.x,
+    XMoveResizeWindow(obp_display, self->window, self->area.x,
             self->area.y, self->area.width, self->area.height);
     /* we delay re-rendering until after we're done animating */
     frame_update_skin(self);
-    XFlush(plugin.ob_display);
+    XFlush(obp_display);
 }
 
 gboolean frame_iconify_animating(gpointer _self)
@@ -860,81 +866,81 @@ void frame_update_layout(gpointer _self, gboolean is_resize, gboolean is_fake)
         gint innercornerheight = theme_config.grip_width - self->size.bottom;
 
         if (self->cbwidth_l) {
-            XMoveResizeWindow(plugin.ob_display, self->innerleft,
+            XMoveResizeWindow(obp_display, self->innerleft,
                     self->size.left - self->cbwidth_l, self->size.top,
                     self->cbwidth_l, self->client_area.height);
 
-            XMapWindow(plugin.ob_display, self->innerleft);
+            XMapWindow(obp_display, self->innerleft);
         }
         else
-            XUnmapWindow(plugin.ob_display, self->innerleft);
+            XUnmapWindow(obp_display, self->innerleft);
 
         if (self->cbwidth_l && innercornerheight > 0) {
-            XMoveResizeWindow(plugin.ob_display, self->innerbll, 0,
+            XMoveResizeWindow(obp_display, self->innerbll, 0,
                     self->client_area.height - (theme_config.grip_width
                             - self->size.bottom), self->cbwidth_l,
                     theme_config.grip_width - self->size.bottom);
 
-            XMapWindow(plugin.ob_display, self->innerbll);
+            XMapWindow(obp_display, self->innerbll);
         }
         else
-            XUnmapWindow(plugin.ob_display, self->innerbll);
+            XUnmapWindow(obp_display, self->innerbll);
 
         if (self->cbwidth_r) {
-            XMoveResizeWindow(plugin.ob_display, self->innerright,
+            XMoveResizeWindow(obp_display, self->innerright,
                     self->size.left + self->client_area.width, self->size.top,
                     self->cbwidth_r, self->client_area.height);
 
-            XMapWindow(plugin.ob_display, self->innerright);
+            XMapWindow(obp_display, self->innerright);
         }
         else
-            XUnmapWindow(plugin.ob_display, self->innerright);
+            XUnmapWindow(obp_display, self->innerright);
 
         if (self->cbwidth_r && innercornerheight > 0) {
-            XMoveResizeWindow(plugin.ob_display, self->innerbrr, 0,
+            XMoveResizeWindow(obp_display, self->innerbrr, 0,
                     self->client_area.height - (theme_config.grip_width
                             - self->size.bottom), self->cbwidth_r,
                     theme_config.grip_width - self->size.bottom);
 
-            XMapWindow(plugin.ob_display, self->innerbrr);
+            XMapWindow(obp_display, self->innerbrr);
         }
         else
-            XUnmapWindow(plugin.ob_display, self->innerbrr);
+            XUnmapWindow(obp_display, self->innerbrr);
 
         if (self->cbwidth_t) {
-            XMoveResizeWindow(plugin.ob_display, self->innertop,
+            XMoveResizeWindow(obp_display, self->innertop,
                     self->size.left - self->cbwidth_l, self->size.top
                             - self->cbwidth_t, self->client_area.width
                             + self->cbwidth_l + self->cbwidth_r,
                     self->cbwidth_t);
 
-            XMapWindow(plugin.ob_display, self->innertop);
+            XMapWindow(obp_display, self->innertop);
         }
         else
-            XUnmapWindow(plugin.ob_display, self->innertop);
+            XUnmapWindow(obp_display, self->innertop);
 
         if (self->cbwidth_b) {
-            XMoveResizeWindow(plugin.ob_display, self->innerbottom,
+            XMoveResizeWindow(obp_display, self->innerbottom,
                     self->size.left - self->cbwidth_l, self->size.top
                             + self->client_area.height, self->client_area.width
                             + self->cbwidth_l + self->cbwidth_r,
                     self->cbwidth_b);
 
-            XMoveResizeWindow(plugin.ob_display, self->innerblb, 0, 0,
+            XMoveResizeWindow(obp_display, self->innerblb, 0, 0,
                     theme_config.grip_width + self->bwidth, self->cbwidth_b);
-            XMoveResizeWindow(plugin.ob_display, self->innerbrb,
+            XMoveResizeWindow(obp_display, self->innerbrb,
                     self->client_area.width + self->cbwidth_l + self->cbwidth_r
                             - (theme_config.grip_width + self->bwidth), 0,
                     theme_config.grip_width + self->bwidth, self->cbwidth_b);
 
-            XMapWindow(plugin.ob_display, self->innerbottom);
-            XMapWindow(plugin.ob_display, self->innerblb);
-            XMapWindow(plugin.ob_display, self->innerbrb);
+            XMapWindow(obp_display, self->innerbottom);
+            XMapWindow(obp_display, self->innerblb);
+            XMapWindow(obp_display, self->innerbrb);
         }
         else {
-            XUnmapWindow(plugin.ob_display, self->innerbottom);
-            XUnmapWindow(plugin.ob_display, self->innerblb);
-            XUnmapWindow(plugin.ob_display, self->innerbrb);
+            XUnmapWindow(obp_display, self->innerbottom);
+            XUnmapWindow(obp_display, self->innerblb);
+            XUnmapWindow(obp_display, self->innerbrb);
         }
 
         if (self->bwidth) {
@@ -943,95 +949,95 @@ void frame_update_layout(gpointer _self, gboolean is_resize, gboolean is_fake)
             /* height of titleleft and titleright */
             titlesides = (!self->max_horz ? theme_config.grip_width : 0);
 
-            XMoveResizeWindow(plugin.ob_display, self->titletop,
+            XMoveResizeWindow(obp_display, self->titletop,
                     theme_config.grip_width + self->bwidth, 0,
                     /* width + bwidth*2 - bwidth*2 - grips*2 */
                     self->width - theme_config.grip_width * 2, self->bwidth);
-            XMoveResizeWindow(plugin.ob_display, self->titletopleft, 0, 0,
+            XMoveResizeWindow(obp_display, self->titletopleft, 0, 0,
                     theme_config.grip_width + self->bwidth, self->bwidth);
-            XMoveResizeWindow(plugin.ob_display, self->titletopright,
+            XMoveResizeWindow(obp_display, self->titletopright,
                     self->client_area.width + self->size.left
                             + self->size.right - theme_config.grip_width
                             - self->bwidth, 0, theme_config.grip_width
                             + self->bwidth, self->bwidth);
 
             if (titlesides > 0) {
-                XMoveResizeWindow(plugin.ob_display, self->titleleft, 0,
+                XMoveResizeWindow(obp_display, self->titleleft, 0,
                         self->bwidth, self->bwidth, titlesides);
-                XMoveResizeWindow(plugin.ob_display, self->titleright,
+                XMoveResizeWindow(obp_display, self->titleright,
                         self->client_area.width + self->size.left
                                 + self->size.right - self->bwidth,
                         self->bwidth, self->bwidth, titlesides);
 
-                XMapWindow(plugin.ob_display, self->titleleft);
-                XMapWindow(plugin.ob_display, self->titleright);
+                XMapWindow(obp_display, self->titleleft);
+                XMapWindow(obp_display, self->titleright);
             }
             else {
-                XUnmapWindow(plugin.ob_display, self->titleleft);
-                XUnmapWindow(plugin.ob_display, self->titleright);
+                XUnmapWindow(obp_display, self->titleleft);
+                XUnmapWindow(obp_display, self->titleright);
             }
 
-            XMapWindow(plugin.ob_display, self->titletop);
-            XMapWindow(plugin.ob_display, self->titletopleft);
-            XMapWindow(plugin.ob_display, self->titletopright);
+            XMapWindow(obp_display, self->titletop);
+            XMapWindow(obp_display, self->titletopleft);
+            XMapWindow(obp_display, self->titletopright);
 
             if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
-                XMoveResizeWindow(plugin.ob_display, self->titlebottom,
+                XMoveResizeWindow(obp_display, self->titlebottom,
                         (self->max_horz ? 0 : self->bwidth),
                         theme_config.title_height + self->bwidth, self->width,
                         self->bwidth);
 
-                XMapWindow(plugin.ob_display, self->titlebottom);
+                XMapWindow(obp_display, self->titlebottom);
             }
             else
-                XUnmapWindow(plugin.ob_display, self->titlebottom);
+                XUnmapWindow(obp_display, self->titlebottom);
         }
         else {
-            XUnmapWindow(plugin.ob_display, self->titlebottom);
+            XUnmapWindow(obp_display, self->titlebottom);
 
-            XUnmapWindow(plugin.ob_display, self->titletop);
-            XUnmapWindow(plugin.ob_display, self->titletopleft);
-            XUnmapWindow(plugin.ob_display, self->titletopright);
-            XUnmapWindow(plugin.ob_display, self->titleleft);
-            XUnmapWindow(plugin.ob_display, self->titleright);
+            XUnmapWindow(obp_display, self->titletop);
+            XUnmapWindow(obp_display, self->titletopleft);
+            XUnmapWindow(obp_display, self->titletopright);
+            XUnmapWindow(obp_display, self->titleleft);
+            XUnmapWindow(obp_display, self->titleright);
         }
 
         if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
-            XMoveResizeWindow(plugin.ob_display, self->title,
+            XMoveResizeWindow(obp_display, self->title,
                     (self->max_horz ? 0 : self->bwidth), self->bwidth,
                     self->width, theme_config.title_height);
 
-            XMapWindow(plugin.ob_display, self->title);
+            XMapWindow(obp_display, self->title);
 
             if (self->decorations & OB_FRAME_DECOR_GRIPS) {
-                XMoveResizeWindow(plugin.ob_display, self->topresize,
+                XMoveResizeWindow(obp_display, self->topresize,
                         theme_config.grip_width, 0, self->width
                                 - theme_config.grip_width *2,
                         theme_config.paddingy + 1);
 
-                XMoveWindow(plugin.ob_display, self->tltresize, 0, 0);
-                XMoveWindow(plugin.ob_display, self->tllresize, 0, 0);
-                XMoveWindow(plugin.ob_display, self->trtresize, self->width
+                XMoveWindow(obp_display, self->tltresize, 0, 0);
+                XMoveWindow(obp_display, self->tllresize, 0, 0);
+                XMoveWindow(obp_display, self->trtresize, self->width
                         - theme_config.grip_width, 0);
-                XMoveWindow(plugin.ob_display, self->trrresize, self->width
+                XMoveWindow(obp_display, self->trrresize, self->width
                         - theme_config.paddingx - 1, 0);
 
-                XMapWindow(plugin.ob_display, self->topresize);
-                XMapWindow(plugin.ob_display, self->tltresize);
-                XMapWindow(plugin.ob_display, self->tllresize);
-                XMapWindow(plugin.ob_display, self->trtresize);
-                XMapWindow(plugin.ob_display, self->trrresize);
+                XMapWindow(obp_display, self->topresize);
+                XMapWindow(obp_display, self->tltresize);
+                XMapWindow(obp_display, self->tllresize);
+                XMapWindow(obp_display, self->trtresize);
+                XMapWindow(obp_display, self->trrresize);
             }
             else {
-                XUnmapWindow(plugin.ob_display, self->topresize);
-                XUnmapWindow(plugin.ob_display, self->tltresize);
-                XUnmapWindow(plugin.ob_display, self->tllresize);
-                XUnmapWindow(plugin.ob_display, self->trtresize);
-                XUnmapWindow(plugin.ob_display, self->trrresize);
+                XUnmapWindow(obp_display, self->topresize);
+                XUnmapWindow(obp_display, self->tltresize);
+                XUnmapWindow(obp_display, self->tllresize);
+                XUnmapWindow(obp_display, self->trtresize);
+                XUnmapWindow(obp_display, self->trrresize);
             }
         }
         else
-            XUnmapWindow(plugin.ob_display, self->title);
+            XUnmapWindow(obp_display, self->title);
     }
 
     if ((self->decorations & OB_FRAME_DECOR_TITLEBAR))
@@ -1042,7 +1048,7 @@ void frame_update_layout(gpointer _self, gboolean is_resize, gboolean is_fake)
         gint sidebwidth = self->max_horz ? 0 : self->bwidth;
 
         if (self->bwidth && self->size.bottom) {
-            XMoveResizeWindow(plugin.ob_display, self->handlebottom,
+            XMoveResizeWindow(obp_display, self->handlebottom,
                     theme_config.grip_width + self->bwidth + sidebwidth,
                     self->size.top + self->client_area.height
                             + self->size.bottom - self->bwidth, self->width
@@ -1050,7 +1056,7 @@ void frame_update_layout(gpointer _self, gboolean is_resize, gboolean is_fake)
                     self->bwidth);
 
             if (sidebwidth) {
-                XMoveResizeWindow(plugin.ob_display, self->lgripleft, 0,
+                XMoveResizeWindow(obp_display, self->lgripleft, 0,
                         self->size.top + self->client_area.height
                                 + self->size.bottom
                                 - (!self->max_horz ? theme_config.grip_width
@@ -1058,7 +1064,7 @@ void frame_update_layout(gpointer _self, gboolean is_resize, gboolean is_fake)
                         self->bwidth,
                         (!self->max_horz ? theme_config.grip_width
                                 : self->size.bottom - self->cbwidth_b));
-                XMoveResizeWindow(plugin.ob_display, self->rgripright,
+                XMoveResizeWindow(obp_display, self->rgripright,
                         self->size.left + self->client_area.width
                                 + self->size.right - self->bwidth,
                         self->size.top + self->client_area.height
@@ -1069,19 +1075,19 @@ void frame_update_layout(gpointer _self, gboolean is_resize, gboolean is_fake)
                         (!self->max_horz ? theme_config.grip_width
                                 : self->size.bottom - self->cbwidth_b));
 
-                XMapWindow(plugin.ob_display, self->lgripleft);
-                XMapWindow(plugin.ob_display, self->rgripright);
+                XMapWindow(obp_display, self->lgripleft);
+                XMapWindow(obp_display, self->rgripright);
             }
             else {
-                XUnmapWindow(plugin.ob_display, self->lgripleft);
-                XUnmapWindow(plugin.ob_display, self->rgripright);
+                XUnmapWindow(obp_display, self->lgripleft);
+                XUnmapWindow(obp_display, self->rgripright);
             }
 
-            XMoveResizeWindow(plugin.ob_display, self->lgripbottom, sidebwidth,
+            XMoveResizeWindow(obp_display, self->lgripbottom, sidebwidth,
                     self->size.top + self->client_area.height
                             + self->size.bottom - self->bwidth,
                     theme_config.grip_width + self->bwidth, self->bwidth);
-            XMoveResizeWindow(plugin.ob_display, self->rgripbottom,
+            XMoveResizeWindow(obp_display, self->rgripbottom,
                     self->size.left + self->client_area.width
                             + self->size.right - self->bwidth - sidebwidth
                             - theme_config.grip_width, self->size.top
@@ -1089,132 +1095,132 @@ void frame_update_layout(gpointer _self, gboolean is_resize, gboolean is_fake)
                             - self->bwidth, theme_config.grip_width
                             + self->bwidth, self->bwidth);
 
-            XMapWindow(plugin.ob_display, self->handlebottom);
-            XMapWindow(plugin.ob_display, self->lgripbottom);
-            XMapWindow(plugin.ob_display, self->rgripbottom);
+            XMapWindow(obp_display, self->handlebottom);
+            XMapWindow(obp_display, self->lgripbottom);
+            XMapWindow(obp_display, self->rgripbottom);
 
             if (self->decorations & OB_FRAME_DECOR_HANDLE
                     && theme_config.handle_height > 0) {
-                XMoveResizeWindow(plugin.ob_display, self->handletop,
+                XMoveResizeWindow(obp_display, self->handletop,
                         theme_config.grip_width + self->bwidth + sidebwidth, 
                         FRAME_HANDLE_Y(self), self->width - (theme_config.grip_width
                                 + sidebwidth) * 2, self->bwidth);
-                XMapWindow(plugin.ob_display, self->handletop);
+                XMapWindow(obp_display, self->handletop);
 
                 if (self->decorations & OB_FRAME_DECOR_GRIPS) {
-                    XMoveResizeWindow(plugin.ob_display, self->handleleft,
+                    XMoveResizeWindow(obp_display, self->handleleft,
                             theme_config.grip_width, 0, self->bwidth,
                             theme_config.handle_height);
-                    XMoveResizeWindow(plugin.ob_display, self->handleright,
+                    XMoveResizeWindow(obp_display, self->handleright,
                             self->width - theme_config.grip_width
                                     - self->bwidth, 0, self->bwidth,
                             theme_config.handle_height);
 
-                    XMoveResizeWindow(plugin.ob_display, self->lgriptop,
+                    XMoveResizeWindow(obp_display, self->lgriptop,
                             sidebwidth, 
                             FRAME_HANDLE_Y(self), theme_config.grip_width
                                     + self->bwidth, self->bwidth);
-                    XMoveResizeWindow(plugin.ob_display, self->rgriptop,
+                    XMoveResizeWindow(obp_display, self->rgriptop,
                             self->size.left + self->client_area.width
                                     + self->size.right - self->bwidth
                                     - sidebwidth - theme_config.grip_width, 
                             FRAME_HANDLE_Y(self), theme_config.grip_width
                                     + self->bwidth, self->bwidth);
 
-                    XMapWindow(plugin.ob_display, self->handleleft);
-                    XMapWindow(plugin.ob_display, self->handleright);
-                    XMapWindow(plugin.ob_display, self->lgriptop);
-                    XMapWindow(plugin.ob_display, self->rgriptop);
+                    XMapWindow(obp_display, self->handleleft);
+                    XMapWindow(obp_display, self->handleright);
+                    XMapWindow(obp_display, self->lgriptop);
+                    XMapWindow(obp_display, self->rgriptop);
                 }
                 else {
-                    XUnmapWindow(plugin.ob_display, self->handleleft);
-                    XUnmapWindow(plugin.ob_display, self->handleright);
-                    XUnmapWindow(plugin.ob_display, self->lgriptop);
-                    XUnmapWindow(plugin.ob_display, self->rgriptop);
+                    XUnmapWindow(obp_display, self->handleleft);
+                    XUnmapWindow(obp_display, self->handleright);
+                    XUnmapWindow(obp_display, self->lgriptop);
+                    XUnmapWindow(obp_display, self->rgriptop);
                 }
             }
             else {
-                XUnmapWindow(plugin.ob_display, self->handleleft);
-                XUnmapWindow(plugin.ob_display, self->handleright);
-                XUnmapWindow(plugin.ob_display, self->lgriptop);
-                XUnmapWindow(plugin.ob_display, self->rgriptop);
+                XUnmapWindow(obp_display, self->handleleft);
+                XUnmapWindow(obp_display, self->handleright);
+                XUnmapWindow(obp_display, self->lgriptop);
+                XUnmapWindow(obp_display, self->rgriptop);
 
-                XUnmapWindow(plugin.ob_display, self->handletop);
+                XUnmapWindow(obp_display, self->handletop);
             }
         }
         else {
-            XUnmapWindow(plugin.ob_display, self->handleleft);
-            XUnmapWindow(plugin.ob_display, self->handleright);
-            XUnmapWindow(plugin.ob_display, self->lgriptop);
-            XUnmapWindow(plugin.ob_display, self->rgriptop);
-
-            XUnmapWindow(plugin.ob_display, self->handletop);
-
-            XUnmapWindow(plugin.ob_display, self->handlebottom);
-            XUnmapWindow(plugin.ob_display, self->lgripleft);
-            XUnmapWindow(plugin.ob_display, self->rgripright);
-            XUnmapWindow(plugin.ob_display, self->lgripbottom);
-            XUnmapWindow(plugin.ob_display, self->rgripbottom);
+            XUnmapWindow(obp_display, self->handleleft);
+            XUnmapWindow(obp_display, self->handleright);
+            XUnmapWindow(obp_display, self->lgriptop);
+            XUnmapWindow(obp_display, self->rgriptop);
+
+            XUnmapWindow(obp_display, self->handletop);
+
+            XUnmapWindow(obp_display, self->handlebottom);
+            XUnmapWindow(obp_display, self->lgripleft);
+            XUnmapWindow(obp_display, self->rgripright);
+            XUnmapWindow(obp_display, self->lgripbottom);
+            XUnmapWindow(obp_display, self->rgripbottom);
         }
 
         if (self->decorations & OB_FRAME_DECOR_HANDLE
                 && theme_config.handle_height > 0) {
-            XMoveResizeWindow(plugin.ob_display, self->handle, sidebwidth, 
+            XMoveResizeWindow(obp_display, self->handle, sidebwidth, 
             FRAME_HANDLE_Y(self) + self->bwidth, self->width,
                     theme_config.handle_height);
-            XMapWindow(plugin.ob_display, self->handle);
+            XMapWindow(obp_display, self->handle);
 
             if (self->decorations & OB_FRAME_DECOR_GRIPS) {
-                XMoveResizeWindow(plugin.ob_display, self->lgrip, 0, 0,
+                XMoveResizeWindow(obp_display, self->lgrip, 0, 0,
                         theme_config.grip_width, theme_config.handle_height);
-                XMoveResizeWindow(plugin.ob_display, self->rgrip, self->width
+                XMoveResizeWindow(obp_display, self->rgrip, self->width
                         - theme_config.grip_width, 0, theme_config.grip_width,
                         theme_config.handle_height);
 
-                XMapWindow(plugin.ob_display, self->lgrip);
-                XMapWindow(plugin.ob_display, self->rgrip);
+                XMapWindow(obp_display, self->lgrip);
+                XMapWindow(obp_display, self->rgrip);
             }
             else {
-                XUnmapWindow(plugin.ob_display, self->lgrip);
-                XUnmapWindow(plugin.ob_display, self->rgrip);
+                XUnmapWindow(obp_display, self->lgrip);
+                XUnmapWindow(obp_display, self->rgrip);
             }
         }
         else {
-            XUnmapWindow(plugin.ob_display, self->lgrip);
-            XUnmapWindow(plugin.ob_display, self->rgrip);
+            XUnmapWindow(obp_display, self->lgrip);
+            XUnmapWindow(obp_display, self->rgrip);
 
-            XUnmapWindow(plugin.ob_display, self->handle);
+            XUnmapWindow(obp_display, self->handle);
         }
 
         if (self->bwidth && !self->max_horz && (self->client_area.height
                 + self->size.top + self->size.bottom) > theme_config.grip_width
                 * 2) {
-            XMoveResizeWindow(plugin.ob_display, self->left, 0, self->bwidth
+            XMoveResizeWindow(obp_display, self->left, 0, self->bwidth
                     + theme_config.grip_width, self->bwidth,
                     self->client_area.height + self->size.top
                             + self->size.bottom - theme_config.grip_width * 2);
 
-            XMapWindow(plugin.ob_display, self->left);
+            XMapWindow(obp_display, self->left);
         }
         else
-            XUnmapWindow(plugin.ob_display, self->left);
+            XUnmapWindow(obp_display, self->left);
 
         if (self->bwidth && !self->max_horz && (self->client_area.height
                 + self->size.top + self->size.bottom) > theme_config.grip_width
                 * 2) {
-            XMoveResizeWindow(plugin.ob_display, self->right,
+            XMoveResizeWindow(obp_display, self->right,
                     self->client_area.width + self->cbwidth_l + self->cbwidth_r
                             + self->bwidth, self->bwidth
                             + theme_config.grip_width, self->bwidth,
                     self->client_area.height + self->size.top
                             + self->size.bottom - theme_config.grip_width * 2);
 
-            XMapWindow(plugin.ob_display, self->right);
+            XMapWindow(obp_display, self->right);
         }
         else
-            XUnmapWindow(plugin.ob_display, self->right);
+            XUnmapWindow(obp_display, self->right);
 
-        XMoveResizeWindow(plugin.ob_display, self->backback, self->size.left,
+        XMoveResizeWindow(obp_display, self->backback, self->size.left,
                 self->size.top, self->client_area.width,
                 self->client_area.height);
     }
@@ -1241,7 +1247,7 @@ void frame_update_layout(gpointer _self, gboolean is_resize, gboolean is_fake)
              but don't do this during an iconify animation. it will be
              reflected afterwards.
              */
-            XMoveResizeWindow(plugin.ob_display, self->window, self->area.x,
+            XMoveResizeWindow(obp_display, self->window, self->area.x,
                     self->area.y, self->area.width, self->area.height);
 
         /* when the client has StaticGravity, it likes to move around.
@@ -1249,7 +1255,7 @@ void frame_update_layout(gpointer _self, gboolean is_resize, gboolean is_fake)
          this also needs to be run when the frame's decorations sizes change!
          */
         if (!is_resize)
-            XMoveResizeWindow(plugin.ob_display, self->client->window,
+            XMoveResizeWindow(obp_display, self->client->window,
                     self->size.left, self->size.top, self->client_area.width,
                     self->client_area.height);
 
@@ -1277,7 +1283,7 @@ void frame_update_layout(gpointer _self, gboolean is_resize, gboolean is_fake)
             focus_cycle_draw_indicator(self->client);
     }
     if (is_resize && (self->decorations & OB_FRAME_DECOR_TITLEBAR))
-        XResizeWindow(plugin.ob_display, self->label, self->label_width,
+        XResizeWindow(obp_display, self->label, self->label_width,
                 theme_config.label_height);
 }
 
@@ -1416,8 +1422,8 @@ gboolean frame_animate_iconify(gpointer p)
     if (time == 0)
         frame_end_iconify_animation(self);
     else {
-        XMoveResizeWindow(plugin.ob_display, self->window, x, y, w, h);
-        XFlush(plugin.ob_display);
+        XMoveResizeWindow(obp_display, self->window, x, y, w, h);
+        XFlush(obp_display);
     }
 
     return time > 0; /* repeat until we're out of time */
@@ -1438,71 +1444,71 @@ void frame_adjust_cursors(gpointer _self)
         /* these ones turn off when max vert, and some when shaded */
         a.cursor = ob_cursor(r && topbot && !sh ? OB_CURSOR_NORTH
                 : OB_CURSOR_NONE);
-        XChangeWindowAttributes(plugin.ob_display, self->topresize, CWCursor,
+        XChangeWindowAttributes(obp_display, self->topresize, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->titletop, CWCursor, &a);
+        XChangeWindowAttributes(obp_display, self->titletop, CWCursor, &a);
         a.cursor = ob_cursor(r && topbot ? OB_CURSOR_SOUTH : OB_CURSOR_NONE);
-        XChangeWindowAttributes(plugin.ob_display, self->handle, CWCursor, &a);
-        XChangeWindowAttributes(plugin.ob_display, self->handletop, CWCursor,
+        XChangeWindowAttributes(obp_display, self->handle, CWCursor, &a);
+        XChangeWindowAttributes(obp_display, self->handletop, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->handlebottom,
+        XChangeWindowAttributes(obp_display, self->handlebottom,
                 CWCursor, &a);
-        XChangeWindowAttributes(plugin.ob_display, self->innerbottom, CWCursor,
+        XChangeWindowAttributes(obp_display, self->innerbottom, CWCursor,
                 &a);
 
         /* these ones change when shaded */
         a.cursor = ob_cursor(r ? (sh ? OB_CURSOR_WEST : OB_CURSOR_NORTHWEST)
                 : OB_CURSOR_NONE);
-        XChangeWindowAttributes(plugin.ob_display, self->titleleft, CWCursor,
+        XChangeWindowAttributes(obp_display, self->titleleft, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->tltresize, CWCursor,
+        XChangeWindowAttributes(obp_display, self->tltresize, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->tllresize, CWCursor,
+        XChangeWindowAttributes(obp_display, self->tllresize, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->titletopleft,
+        XChangeWindowAttributes(obp_display, self->titletopleft,
                 CWCursor, &a);
         a.cursor = ob_cursor(r ? (sh ? OB_CURSOR_EAST : OB_CURSOR_NORTHEAST)
                 : OB_CURSOR_NONE);
-        XChangeWindowAttributes(plugin.ob_display, self->titleright, CWCursor,
+        XChangeWindowAttributes(obp_display, self->titleright, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->trtresize, CWCursor,
+        XChangeWindowAttributes(obp_display, self->trtresize, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->trrresize, CWCursor,
+        XChangeWindowAttributes(obp_display, self->trrresize, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->titletopright,
+        XChangeWindowAttributes(obp_display, self->titletopright,
                 CWCursor, &a);
 
         /* these ones are pretty static */
         a.cursor = ob_cursor(r ? OB_CURSOR_WEST : OB_CURSOR_NONE);
-        XChangeWindowAttributes(plugin.ob_display, self->left, CWCursor, &a);
-        XChangeWindowAttributes(plugin.ob_display, self->innerleft, CWCursor,
+        XChangeWindowAttributes(obp_display, self->left, CWCursor, &a);
+        XChangeWindowAttributes(obp_display, self->innerleft, CWCursor,
                 &a);
         a.cursor = ob_cursor(r ? OB_CURSOR_EAST : OB_CURSOR_NONE);
-        XChangeWindowAttributes(plugin.ob_display, self->right, CWCursor, &a);
-        XChangeWindowAttributes(plugin.ob_display, self->innerright, CWCursor,
+        XChangeWindowAttributes(obp_display, self->right, CWCursor, &a);
+        XChangeWindowAttributes(obp_display, self->innerright, CWCursor,
                 &a);
         a.cursor = ob_cursor(r ? OB_CURSOR_SOUTHWEST : OB_CURSOR_NONE);
-        XChangeWindowAttributes(plugin.ob_display, self->lgrip, CWCursor, &a);
-        XChangeWindowAttributes(plugin.ob_display, self->handleleft, CWCursor,
+        XChangeWindowAttributes(obp_display, self->lgrip, CWCursor, &a);
+        XChangeWindowAttributes(obp_display, self->handleleft, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->lgripleft, CWCursor,
+        XChangeWindowAttributes(obp_display, self->lgripleft, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->lgriptop, CWCursor, &a);
-        XChangeWindowAttributes(plugin.ob_display, self->lgripbottom, CWCursor,
+        XChangeWindowAttributes(obp_display, self->lgriptop, CWCursor, &a);
+        XChangeWindowAttributes(obp_display, self->lgripbottom, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->innerbll, CWCursor, &a);
-        XChangeWindowAttributes(plugin.ob_display, self->innerblb, CWCursor, &a);
+        XChangeWindowAttributes(obp_display, self->innerbll, CWCursor, &a);
+        XChangeWindowAttributes(obp_display, self->innerblb, CWCursor, &a);
         a.cursor = ob_cursor(r ? OB_CURSOR_SOUTHEAST : OB_CURSOR_NONE);
-        XChangeWindowAttributes(plugin.ob_display, self->rgrip, CWCursor, &a);
-        XChangeWindowAttributes(plugin.ob_display, self->handleright, CWCursor,
+        XChangeWindowAttributes(obp_display, self->rgrip, CWCursor, &a);
+        XChangeWindowAttributes(obp_display, self->handleright, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->rgripright, CWCursor,
+        XChangeWindowAttributes(obp_display, self->rgripright, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->rgriptop, CWCursor, &a);
-        XChangeWindowAttributes(plugin.ob_display, self->rgripbottom, CWCursor,
+        XChangeWindowAttributes(obp_display, self->rgriptop, CWCursor, &a);
+        XChangeWindowAttributes(obp_display, self->rgripbottom, CWCursor,
                 &a);
-        XChangeWindowAttributes(plugin.ob_display, self->innerbrr, CWCursor, &a);
-        XChangeWindowAttributes(plugin.ob_display, self->innerbrb, CWCursor, &a);
+        XChangeWindowAttributes(obp_display, self->innerbrr, CWCursor, &a);
+        XChangeWindowAttributes(obp_display, self->innerbrb, CWCursor, &a);
     }
 }
 
@@ -1510,7 +1516,7 @@ void frame_adjust_client_area(gpointer _self)
 {
     ObDefaultFrame * self = (ObDefaultFrame *) _self;
     /* adjust the window which is there to prevent flashing on unmap */
-    XMoveResizeWindow(plugin.ob_display, self->backfront, 0, 0,
+    XMoveResizeWindow(obp_display, self->backfront, 0, 0,
             self->client_area.width, self->client_area.height);
 }
 
@@ -1527,7 +1533,7 @@ void frame_adjust_focus(gpointer _self, gboolean hilite)
     self->focused = hilite;
     self->need_render = TRUE;
     frame_update_skin(self);
-    XFlush(plugin.ob_display);
+    XFlush(obp_display);
 }
 
 void frame_adjust_title(gpointer _self)
@@ -1730,61 +1736,61 @@ void layout_title(ObDefaultFrame * self)
 
     /* position and map the elements */
     if (self->icon_on) {
-        XMapWindow(plugin.ob_display, self->icon);
-        XMoveWindow(plugin.ob_display, self->icon, self->icon_x,
+        XMapWindow(obp_display, self->icon);
+        XMoveWindow(obp_display, self->icon, self->icon_x,
                 theme_config.paddingy);
     }
     else
-        XUnmapWindow(plugin.ob_display, self->icon);
+        XUnmapWindow(obp_display, self->icon);
 
     if (self->desk_on) {
-        XMapWindow(plugin.ob_display, self->desk);
-        XMoveWindow(plugin.ob_display, self->desk, self->desk_x,
+        XMapWindow(obp_display, self->desk);
+        XMoveWindow(obp_display, self->desk, self->desk_x,
                 theme_config.paddingy + 1);
     }
     else
-        XUnmapWindow(plugin.ob_display, self->desk);
+        XUnmapWindow(obp_display, self->desk);
 
     if (self->shade_on) {
-        XMapWindow(plugin.ob_display, self->shade);
-        XMoveWindow(plugin.ob_display, self->shade, self->shade_x,
+        XMapWindow(obp_display, self->shade);
+        XMoveWindow(obp_display, self->shade, self->shade_x,
                 theme_config.paddingy + 1);
     }
     else
-        XUnmapWindow(plugin.ob_display, self->shade);
+        XUnmapWindow(obp_display, self->shade);
 
     if (self->iconify_on) {
-        XMapWindow(plugin.ob_display, self->iconify);
-        XMoveWindow(plugin.ob_display, self->iconify, self->iconify_x,
+        XMapWindow(obp_display, self->iconify);
+        XMoveWindow(obp_display, self->iconify, self->iconify_x,
                 theme_config.paddingy + 1);
     }
     else
-        XUnmapWindow(plugin.ob_display, self->iconify);
+        XUnmapWindow(obp_display, self->iconify);
 
     if (self->max_on) {
-        XMapWindow(plugin.ob_display, self->max);
-        XMoveWindow(plugin.ob_display, self->max, self->max_x,
+        XMapWindow(obp_display, self->max);
+        XMoveWindow(obp_display, self->max, self->max_x,
                 theme_config.paddingy + 1);
     }
     else
-        XUnmapWindow(plugin.ob_display, self->max);
+        XUnmapWindow(obp_display, self->max);
 
     if (self->close_on) {
-        XMapWindow(plugin.ob_display, self->close);
-        XMoveWindow(plugin.ob_display, self->close, self->close_x,
+        XMapWindow(obp_display, self->close);
+        XMoveWindow(obp_display, self->close, self->close_x,
                 theme_config.paddingy + 1);
     }
     else
-        XUnmapWindow(plugin.ob_display, self->close);
+        XUnmapWindow(obp_display, self->close);
 
     if (self->label_on) {
         self->label_width = MAX(1, self->label_width); /* no lower than 1 */
-        XMapWindow(plugin.ob_display, self->label);
-        XMoveWindow(plugin.ob_display, self->label, self->label_x,
+        XMapWindow(obp_display, self->label);
+        XMoveWindow(obp_display, self->label, self->label_x,
                 theme_config.paddingy);
     }
     else
-        XUnmapWindow(plugin.ob_display, self->label);
+        XUnmapWindow(obp_display, self->label);
 }
 
 void trigger_none (gpointer self) {}
@@ -1852,9 +1858,10 @@ void frame_trigger(gpointer self, ObFrameTrigger trigger_name)
     }
 }
 
-ObFramePlugin plugin = { 0, //gpointer handler;
-        "libdefault.la", //gchar * filename;
-        "Default", //gchar * name;
+ObFramePlugin plugin = {
+        0, /* gpointer handler */
+        "libdefault.la", /* gchar * filename */
+        "Default", /* gchar * name */
         init, //gint (*init) (Display * display, gint screen);
         0, /* */
         frame_new, //gpointer (*frame_new) (struct _ObClient *c);
@@ -1904,9 +1911,9 @@ ObFramePlugin plugin = { 0, //gpointer handler;
         load_theme_config, /* */
 
         /* This fields are fill by openbox. */
-        0, //Display * ob_display;
-        0, //gint ob_screen;
-        0, //RrInstance *ob_rr_inst;
+        //0, //Display * ob_display;
+        //0, //gint ob_screen;
+        //0, //RrInstance *ob_rr_inst;
         0, //gboolean config_theme_keepborder;
         0, //struct _ObClient *focus_cycle_target;
         0, //gchar *config_title_layout;

diff --git a/engines/default/plugin.h b/engines/default/plugin.h
index 024ec812088ab8ef99018016ae74bde0838bb36f..cb12379a76918b36f985570e4f53cc720a30861f 100644 (file)
--- a/engines/default/plugin.h
+++ b/engines/default/plugin.h
@@ -184,14 +184,11 @@ void frame_adjust_focus(gpointer self, gboolean hilite);
 void frame_adjust_title(gpointer self);
 void frame_adjust_icon(gpointer self);
 
-static gulong frame_animate_iconify_time_left(gpointer _self,
+gulong frame_animate_iconify_time_left(gpointer _self,
         const GTimeVal *now);
 
 ObFrameContext frame_context(gpointer, Window win, gint x, gint y);
-//void frame_client_gravity(gpointer self, gint *x, gint *y);
-//void frame_frame_gravity(gpointer self, gint *x, gint *y);
-//void frame_rect_to_frame(gpointer self, Rect *r);
-//void frame_rect_to_client(gpointer self, Rect *r);
+
 void frame_flash_start(gpointer self);
 void frame_flash_stop(gpointer self);
 void frame_begin_iconify_animation(gpointer self, gboolean iconifying);
@@ -225,7 +222,11 @@ void frame_adjust_cursors(gpointer self);
 void frame_trigger(gpointer, ObFrameTrigger);
 
 /* Global for renderframe.c only */
+extern Display * obp_display;
+extern gint obp_screen;
 extern ObFramePlugin plugin;
 #define OBDEFAULTFRAME(x) ((ObDefaultFrame *)(x))
 
+ObFramePlugin * get_info();
+
 #endif /*FRAME_DEFAULT_PLUGIN_H_*/

diff --git a/engines/default/render.c b/engines/default/render.c
index 8846bd84d1e4290eea9222df93523c17d5d0105c..78d0857fb93875cae7c661f6be106916c8bcf6c4 100644 (file)
--- a/engines/default/render.c
+++ b/engines/default/render.c
@@ -17,14 +17,11 @@
  See the COPYING file for a copy of the GNU General Public License.
  */
 #include "render.h"
+
 #include "plugin.h"
 
-#include "openbox/engine_interface.h"
-#include "openbox/client.h"
 #include "openbox/screen.h"
 
-#include "render/theme.h"
-
 static void framerender_label(ObDefaultFrame *self, RrAppearance *a);
 static void framerender_icon(ObDefaultFrame *self, RrAppearance *a);
 static void framerender_max(ObDefaultFrame *self, RrAppearance *a);
@@ -47,67 +44,67 @@ void frame_update_skin(gpointer _self)
         px = (self->focused ? RrColorPixel(theme_config.cb_focused_color)
                 : RrColorPixel(theme_config.cb_unfocused_color));
 
-        XSetWindowBackground(plugin.ob_display, self->backback, px);
-        XClearWindow(plugin.ob_display, self->backback);
-        XSetWindowBackground(plugin.ob_display, self->innerleft, px);
-        XClearWindow(plugin.ob_display, self->innerleft);
-        XSetWindowBackground(plugin.ob_display, self->innertop, px);
-        XClearWindow(plugin.ob_display, self->innertop);
-        XSetWindowBackground(plugin.ob_display, self->innerright, px);
-        XClearWindow(plugin.ob_display, self->innerright);
-        XSetWindowBackground(plugin.ob_display, self->innerbottom, px);
-        XClearWindow(plugin.ob_display, self->innerbottom);
-        XSetWindowBackground(plugin.ob_display, self->innerbll, px);
-        XClearWindow(plugin.ob_display, self->innerbll);
-        XSetWindowBackground(plugin.ob_display, self->innerbrr, px);
-        XClearWindow(plugin.ob_display, self->innerbrr);
-        XSetWindowBackground(plugin.ob_display, self->innerblb, px);
-        XClearWindow(plugin.ob_display, self->innerblb);
-        XSetWindowBackground(plugin.ob_display, self->innerbrb, px);
-        XClearWindow(plugin.ob_display, self->innerbrb);
+        XSetWindowBackground(obp_display, self->backback, px);
+        XClearWindow(obp_display, self->backback);
+        XSetWindowBackground(obp_display, self->innerleft, px);
+        XClearWindow(obp_display, self->innerleft);
+        XSetWindowBackground(obp_display, self->innertop, px);
+        XClearWindow(obp_display, self->innertop);
+        XSetWindowBackground(obp_display, self->innerright, px);
+        XClearWindow(obp_display, self->innerright);
+        XSetWindowBackground(obp_display, self->innerbottom, px);
+        XClearWindow(obp_display, self->innerbottom);
+        XSetWindowBackground(obp_display, self->innerbll, px);
+        XClearWindow(obp_display, self->innerbll);
+        XSetWindowBackground(obp_display, self->innerbrr, px);
+        XClearWindow(obp_display, self->innerbrr);
+        XSetWindowBackground(obp_display, self->innerblb, px);
+        XClearWindow(obp_display, self->innerblb);
+        XSetWindowBackground(obp_display, self->innerbrb, px);
+        XClearWindow(obp_display, self->innerbrb);
 
         px
                 = (self->focused ? RrColorPixel(theme_config.frame_focused_border_color)
                         : RrColorPixel(theme_config.frame_unfocused_border_color));
 
-        XSetWindowBackground(plugin.ob_display, self->left, px);
-        XClearWindow(plugin.ob_display, self->left);
-        XSetWindowBackground(plugin.ob_display, self->right, px);
-        XClearWindow(plugin.ob_display, self->right);
-
-        XSetWindowBackground(plugin.ob_display, self->titleleft, px);
-        XClearWindow(plugin.ob_display, self->titleleft);
-        XSetWindowBackground(plugin.ob_display, self->titletop, px);
-        XClearWindow(plugin.ob_display, self->titletop);
-        XSetWindowBackground(plugin.ob_display, self->titletopleft, px);
-        XClearWindow(plugin.ob_display, self->titletopleft);
-        XSetWindowBackground(plugin.ob_display, self->titletopright, px);
-        XClearWindow(plugin.ob_display, self->titletopright);
-        XSetWindowBackground(plugin.ob_display, self->titleright, px);
-        XClearWindow(plugin.ob_display, self->titleright);
-
-        XSetWindowBackground(plugin.ob_display, self->handleleft, px);
-        XClearWindow(plugin.ob_display, self->handleleft);
-        XSetWindowBackground(plugin.ob_display, self->handletop, px);
-        XClearWindow(plugin.ob_display, self->handletop);
-        XSetWindowBackground(plugin.ob_display, self->handleright, px);
-        XClearWindow(plugin.ob_display, self->handleright);
-        XSetWindowBackground(plugin.ob_display, self->handlebottom, px);
-        XClearWindow(plugin.ob_display, self->handlebottom);
-
-        XSetWindowBackground(plugin.ob_display, self->lgripleft, px);
-        XClearWindow(plugin.ob_display, self->lgripleft);
-        XSetWindowBackground(plugin.ob_display, self->lgriptop, px);
-        XClearWindow(plugin.ob_display, self->lgriptop);
-        XSetWindowBackground(plugin.ob_display, self->lgripbottom, px);
-        XClearWindow(plugin.ob_display, self->lgripbottom);
-
-        XSetWindowBackground(plugin.ob_display, self->rgripright, px);
-        XClearWindow(plugin.ob_display, self->rgripright);
-        XSetWindowBackground(plugin.ob_display, self->rgriptop, px);
-        XClearWindow(plugin.ob_display, self->rgriptop);
-        XSetWindowBackground(plugin.ob_display, self->rgripbottom, px);
-        XClearWindow(plugin.ob_display, self->rgripbottom);
+        XSetWindowBackground(obp_display, self->left, px);
+        XClearWindow(obp_display, self->left);
+        XSetWindowBackground(obp_display, self->right, px);
+        XClearWindow(obp_display, self->right);
+
+        XSetWindowBackground(obp_display, self->titleleft, px);
+        XClearWindow(obp_display, self->titleleft);
+        XSetWindowBackground(obp_display, self->titletop, px);
+        XClearWindow(obp_display, self->titletop);
+        XSetWindowBackground(obp_display, self->titletopleft, px);
+        XClearWindow(obp_display, self->titletopleft);
+        XSetWindowBackground(obp_display, self->titletopright, px);
+        XClearWindow(obp_display, self->titletopright);
+        XSetWindowBackground(obp_display, self->titleright, px);
+        XClearWindow(obp_display, self->titleright);
+
+        XSetWindowBackground(obp_display, self->handleleft, px);
+        XClearWindow(obp_display, self->handleleft);
+        XSetWindowBackground(obp_display, self->handletop, px);
+        XClearWindow(obp_display, self->handletop);
+        XSetWindowBackground(obp_display, self->handleright, px);
+        XClearWindow(obp_display, self->handleright);
+        XSetWindowBackground(obp_display, self->handlebottom, px);
+        XClearWindow(obp_display, self->handlebottom);
+
+        XSetWindowBackground(obp_display, self->lgripleft, px);
+        XClearWindow(obp_display, self->lgripleft);
+        XSetWindowBackground(obp_display, self->lgriptop, px);
+        XClearWindow(obp_display, self->lgriptop);
+        XSetWindowBackground(obp_display, self->lgripbottom, px);
+        XClearWindow(obp_display, self->lgripbottom);
+
+        XSetWindowBackground(obp_display, self->rgripright, px);
+        XClearWindow(obp_display, self->rgripright);
+        XSetWindowBackground(obp_display, self->rgriptop, px);
+        XClearWindow(obp_display, self->rgriptop);
+        XSetWindowBackground(obp_display, self->rgripbottom, px);
+        XClearWindow(obp_display, self->rgripbottom);
 
         /* don't use the separator color for shaded windows */
         if (!self->shaded)
@@ -115,8 +112,8 @@ void frame_update_skin(gpointer _self)
                     = (self->focused ? RrColorPixel(theme_config.title_separator_focused_color)
                             : RrColorPixel(theme_config.title_separator_unfocused_color));
 
-        XSetWindowBackground(plugin.ob_display, self->titlebottom, px);
-        XClearWindow(plugin.ob_display, self->titlebottom);
+        XSetWindowBackground(obp_display, self->titlebottom, px);
+        XClearWindow(obp_display, self->titlebottom);
     }
 
     if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
@@ -313,7 +310,7 @@ void frame_update_skin(gpointer _self)
         }
     }
 
-    XFlush(plugin.ob_display);
+    XFlush(obp_display);
 }
 
 static void framerender_label(ObDefaultFrame *self, RrAppearance *a)

diff --git a/openbox/engine_interface.c b/openbox/engine_interface.c
index b271762cd23240d683bf80a61b7123dc5f961207..3f8348f249f9841e147ee35489b7ba9d1efe4452 100644 (file)
--- a/openbox/engine_interface.c
+++ b/openbox/engine_interface.c
@@ -87,9 +87,10 @@ ObFramePlugin * init_frame_plugin(const gchar *name, gboolean allow_fallback,
 
 void update_frame_plugin(ObFramePlugin * self)
 {
-    self->ob_display = obt_display;
-    self->ob_screen = ob_screen;
-    self->ob_rr_inst = ob_rr_inst;
+    self->init (obt_display, ob_screen);
+    //self->ob_display = obt_display;
+    //self->ob_screen = ob_screen;
+    //self->ob_rr_inst = ob_rr_inst;
     self->config_theme_keepborder = config_theme_keepborder;
     self->config_title_layout = config_title_layout;
     self->ob_main_loop = ob_main_loop;
@@ -101,7 +102,7 @@ ObFramePlugin * load_frame_plugin(const gchar * filename)
     gpointer func;
 
     if (!(module = g_module_open(filename, G_MODULE_BIND_LOCAL))) {
-        ob_debug_type(OB_DEBUG_SM, "Failed to load plugin (%s): %s\n",
+        ob_debug ("Failed to load plugin (%s): %s\n",
                 filename, g_module_error());
         exit(1);
     }

diff --git a/openbox/engine_interface.h b/openbox/engine_interface.h
index b0ffd4a18df7e4023cae226f192e84592f36100d..2968ebdf1419ee163ca1bfa386ef253a99042081 100644 (file)
--- a/openbox/engine_interface.h
+++ b/openbox/engine_interface.h
@@ -196,9 +196,9 @@ struct _ObFramePlugin
             RrFont *menu_item_font, RrFont *osd_font);
 
     /* Filled by openbox-core */
-    Display * ob_display;
-    gint ob_screen;
-    RrInstance *ob_rr_inst;
+    //Display * ob_display;
+    //gint ob_screen;
+    //RrInstance *ob_rr_inst;
     // Not more needed
     //struct _RrTheme * ob_rr_theme;
     gboolean config_theme_keepborder;

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 55be9d79aea1ae4debc9e83d04a86c78fcc28ffd..018dff210befa9001bc737199264d68a564f59a2 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -382,7 +382,7 @@ gint main(gint argc, gchar **argv)
     if (render_plugin)
     {
     //RrThemeFree(render_plugin->ob_rr_theme);
-    RrInstanceFree(render_plugin->ob_rr_inst);
+    //RrInstanceFree(render_plugin->ob_rr_inst);
     }
     session_shutdown(being_replaced);