fbcompose - A compositing addon for fluxbox window manager.

 fbcompose(1) is an optional compositing addon for fluxbox window manager. It
 augments fluxbox with a number of graphical features. Most notably, fbcompose
 allows fluxbox to properly display applications that require compositing
 (docky, for example), adds support for true window transparency (as opposed to
 fluxbox's pseudo transparency) and provides a plugin framework to extend the
 compositor's functionality.

 As this is still a beta version of the compositor, the bugs are likely.

7 files changed, 50 insertions, 6 deletions

diff --git a/src/FbAtoms.cc b/src/FbAtoms.cc
index 409a99f..95a89a7 100644
--- a/src/FbAtoms.cc
+++ b/src/FbAtoms.cc
@@ -40,6 +40,8 @@ FbAtoms::FbAtoms() {
     motif_wm_hints = XInternAtom(dpy, "_MOTIF_WM_HINTS", False);
 
     blackbox_attributes = XInternAtom(dpy, "_BLACKBOX_ATTRIBUTES", False);
+    current_iconbar_item = XInternAtom(dpy, "_FLUXBOX_CURRENT_ICONBAR_ITEM", False);
+    resize_rect = XInternAtom(dpy, "_FLUXBOX_RECONFIGURE_RECT", False);
 
     s_singleton = this;
 }
diff --git a/src/FbAtoms.hh b/src/FbAtoms.hh
index 3ed52a5..09920f3 100644
--- a/src/FbAtoms.hh
+++ b/src/FbAtoms.hh
@@ -42,12 +42,16 @@ public:
     // these atoms are for normal app->WM interaction beyond the scope of the
     // ICCCM...
     Atom getFluxboxAttributesAtom() const { return blackbox_attributes; }
+    Atom getFluxboxCurrentIconbarItemAtom() const { return current_iconbar_item; }
+    Atom getFluxboxResizeRectAtom() const { return resize_rect; }
 
 private:
     FbAtoms();
 
     Atom blackbox_attributes;
+    Atom current_iconbar_item;
     Atom motif_wm_hints;
+    Atom resize_rect;
     Atom xa_wm_protocols;
     Atom xa_wm_state;
     Atom xa_wm_delete_window;
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 8362733..cf2d348 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -64,7 +64,7 @@ FbWindow::FbWindow(const FbWindow& the_copy):
     m_width(the_copy.width()), m_height(the_copy.height()),
     m_border_width(the_copy.borderWidth()),
     m_border_color(the_copy.borderColor()),
-    m_depth(the_copy.depth()), m_destroy(true),
+    m_depth(the_copy.depth()), m_destroy(the_copy.m_destroy),
     m_lastbg_color_set(false), m_lastbg_color(0), m_lastbg_pm(0),
     m_renderer(the_copy.m_renderer) {
     the_copy.m_window = 0;
@@ -413,7 +413,6 @@ void FbWindow::setNew(Window win) {
     m_window = win;
 
     if (m_window != 0) {
-        updateGeometry();
         XWindowAttributes attr;
         attr.screen = 0;
         //get screen number
@@ -622,16 +621,16 @@ bool FbWindow::updateGeometry() {
         return false;
 
     int old_x = m_x, old_y = m_y;
-    unsigned int old_width = m_width, old_height = m_height;
+    unsigned int old_border_width = m_border_width, old_width = m_width, old_height = m_height;
 
     Window root;
-    unsigned int border_width, depth;
+    unsigned int depth;
     if (XGetGeometry(display(), m_window, &root, &m_x, &m_y,
-                     &m_width, &m_height, &border_width, &depth))
+                     &m_width, &m_height, &m_border_width, &depth))
         m_depth = depth;
 
     return (old_x != m_x || old_y != m_y || old_width != m_width ||
-            old_height != m_height);
+            old_height != m_height || old_border_width != m_border_width);
 }
 
 void FbWindow::create(Window parent, int x, int y,
diff --git a/src/IconButton.cc b/src/IconButton.cc
index 7c70a63..6e7294e 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -24,7 +24,9 @@
 #include "IconbarTool.hh"
 #include "IconbarTheme.hh"
 
+#include "FbAtoms.hh"
 #include "Screen.hh"
+#include "Window.hh"
 
 #include "FbTk/App.hh"
 #include "FbTk/Command.hh"
@@ -36,6 +38,7 @@
 #include "config.h"
 #endif // HAVE_CONFIG_H
 
+#include <X11/Xatom.h>
 #include <X11/Xutil.h>
 #ifdef SHAPE
 #include <X11/extensions/shape.h>
@@ -86,11 +89,13 @@ void IconButton::exposeEvent(XExposeEvent &event) {
 
 void IconButton::enterNotifyEvent(XCrossingEvent &ev) {
     m_has_tooltip = true;
+    setCurrentIconbarItem(m_win.fbwindow()->clientWindow());
     showTooltip();
 }
 
 void IconButton::leaveNotifyEvent(XCrossingEvent &ev) {
     m_has_tooltip = false;
+    setCurrentIconbarItem(None);
     m_win.screen().hideTooltip();
 }
 
@@ -282,3 +287,7 @@ bool IconButton::setOrientation(FbTk::Orientation orient) {
     }
 }
 
+void IconButton::setCurrentIconbarItem(Window xid) {
+    m_win.screen().rootWindow().changeProperty(FbAtoms::instance()->getFluxboxCurrentIconbarItemAtom(),
+            XA_WINDOW, 32, PropModeReplace, reinterpret_cast<unsigned char*>(&xid), 1);
+}
diff --git a/src/IconButton.hh b/src/IconButton.hh
index 4f1587b..afb97bf 100644
--- a/src/IconButton.hh
+++ b/src/IconButton.hh
@@ -79,6 +79,8 @@ private:
     /// Called when client title changed.
     void clientTitleChanged();
 
+    void setCurrentIconbarItem(Window xid);
+
     Focusable &m_win;
     FbTk::FbWindow m_icon_window;
     FbTk::FbPixmap m_icon_pixmap;
diff --git a/src/Window.cc b/src/Window.cc
index a8e4534..f390fc5 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1882,6 +1882,16 @@ bool FluxboxWindow::getState() {
     return ret;
 }
 
+void FluxboxWindow::setReconfigureRectProperty(int x, int y, int width, int height) {
+    long data[4] = { x, y, width, height };
+    winClient().screen().rootWindow().changeProperty(FbAtoms::instance()->getFluxboxResizeRectAtom(),
+            XA_CARDINAL, 32, PropModeReplace, reinterpret_cast<unsigned char*>(data), 4);
+}
+
+void FluxboxWindow::clearReconfigureRectProperty() {
+    setReconfigureRectProperty(0, 0, 0, 0);
+}
+
 /**
    Show the window menu at pos x, y
 */
@@ -2579,6 +2589,10 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
                     m_last_resize_w - 1 + 2 * frame().window().borderWidth(),
                     m_last_resize_h - 1 + 2 * frame().window().borderWidth());
 
+            setReconfigureRectProperty(m_last_resize_x, m_last_resize_y,
+                    m_last_resize_w + 2 * frame().window().borderWidth() - 1,
+                    m_last_resize_h + 2 * frame().window().borderWidth() - 1);
+
         }
     } else if (m_attaching_tab != 0) {
         //
@@ -2596,6 +2610,8 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
                                dx, dy,
                                m_last_resize_w, m_last_resize_h);
 
+        setReconfigureRectProperty(dx, dy, m_last_resize_w, m_last_resize_h);
+
         // change remembered position of rectangle
         m_last_move_x = dx;
         m_last_move_y = dy;
@@ -3096,6 +3112,10 @@ void FluxboxWindow::startResizing(int x, int y, ReferenceCorner dir) {
                        m_last_resize_x, m_last_resize_y,
                        m_last_resize_w - 1 + 2 * frame().window().borderWidth(),
                        m_last_resize_h - 1 + 2 * frame().window().borderWidth());
+
+    setReconfigureRectProperty(m_last_resize_x, m_last_resize_y,
+            m_last_resize_w + 2 * frame().window().borderWidth() - 1,
+            m_last_resize_h + 2 * frame().window().borderWidth() - 1);
 }
 
 void FluxboxWindow::stopResizing(bool interrupted) {
@@ -3116,6 +3136,7 @@ void FluxboxWindow::stopResizing(bool interrupted) {
     }
 
     ungrabPointer(CurrentTime);
+    clearReconfigureRectProperty();
 }
 
 WinClient* FluxboxWindow::winClientOfLabelButtonWindow(Window window) {
@@ -3172,6 +3193,8 @@ void FluxboxWindow::startTabbing(const XButtonEvent &be) {
                            m_last_resize_w, m_last_resize_h);
 
     menu().hide();
+
+    setReconfigureRectProperty(m_last_move_x, m_last_move_y, m_last_resize_w, m_last_resize_h);
 }
 
 void FluxboxWindow::attachTo(int x, int y, bool interrupted) {
@@ -3182,6 +3205,8 @@ void FluxboxWindow::attachTo(int x, int y, bool interrupted) {
                            m_last_move_x, m_last_move_y,
                            m_last_resize_w, m_last_resize_h);
 
+    clearReconfigureRectProperty();
+
     ungrabPointer(CurrentTime);
 
     Fluxbox::instance()->ungrab();
diff --git a/src/Window.hh b/src/Window.hh
index 6117d48..a826378 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -499,6 +499,9 @@ private:
     void setFullscreenLayer();
     void attachWorkAreaSig();
 
+    void setReconfigureRectProperty(int x, int y, int width, int height);
+    void clearReconfigureRectProperty();
+
     // modifies left and top if snap is necessary
     void doSnapping(int &left, int &top);
     // user_w/h return the values that should be shown to the user