X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fframe.cc;h=4e77d10636271fdad42f11fab7bc045f19ba83e7;hb=6682d070c391f8c09d561dde67e49733a2377681;hp=027b7afc96877e097d275fc78135732c1754cfd2;hpb=c88451f0c1e2586a5a06babb69b060bf808c9148;p=chaz%2Fopenbox

diff --git a/src/frame.cc b/src/frame.cc
index 027b7afc..4e77d106 100644
--- a/src/frame.cc
+++ b/src/frame.cc
@@ -9,7 +9,7 @@ extern "C" {
 }
 
 #include "frame.hh"
-#include "client.hh"
+#include "config.hh"
 #include "openbox.hh"
 #include "otk/display.hh"
 #include "otk/surface.hh"
@@ -58,7 +58,8 @@ Frame::Frame(Client *client)
     _desk_press(false),
     _iconify_press(false),
     _icon_press(false),
-    _close_press(false)
+    _close_press(false),
+    _press_button(0)
 {
   assert(client);
 
@@ -99,7 +100,8 @@ Frame::Frame(Client *client)
 
   applyStyle(*otk::RenderStyle::style(_client->screen()));
 
-  _layout = "NDITMC";
+  _layout = "ITMC";
+  python_get_string("titlebar_layout", &_layout);
 
   // register all of the windows with the event dispatcher
   Window *w = allWindows();
@@ -156,6 +158,60 @@ void Frame::hide()
   }
 }
 
+void Frame::buttonPressHandler(const XButtonEvent &e)
+{
+  if (_press_button) return;
+  _press_button = e.button;
+  
+  if (e.window == _max) {
+    _max_press = true;
+    renderMax();
+  }
+  if (e.window == _close) {
+    _close_press = true;
+    renderClose();
+  }
+  if (e.window == _desk) {
+    _desk_press = true;
+    renderDesk();
+  }
+  if (e.window == _iconify) {
+    _iconify_press = true;
+    renderIconify();
+  }
+  if (e.window == _icon) {
+    _icon_press = true;
+    renderIcon();
+  }
+}
+
+void Frame::buttonReleaseHandler(const XButtonEvent &e)
+{
+  if (e.button != _press_button) return;
+  _press_button = 0;
+
+  if (e.window == _max) {
+    _max_press = false;
+    renderMax();
+  }
+  if (e.window == _close) {
+    _close_press = false;
+    renderClose();
+  }
+  if (e.window == _desk) {
+    _desk_press = false;
+    renderDesk();
+  }
+  if (e.window == _iconify) {
+    _iconify_press = false;
+    renderIconify();
+  }
+  if (e.window == _icon) {
+    _icon_press = false;
+    renderIcon();
+  }
+}
+
 MouseContext::MC Frame::mouseContext(Window win) const
 {
   if (win == _frame)  return MouseContext::Frame;
@@ -247,8 +303,12 @@ static void render(int screen, const otk::Size &size, Window win,
                    const otk::RenderTexture &texture, bool freedata=true)
 {
   otk::Surface *s = new otk::Surface(screen, size);
-  otk::display->renderControl(screen)->drawBackground(*s, texture);
-  XSetWindowBackgroundPixmap(**otk::display, win, s->pixmap());
+  if (texture.parentRelative())
+    XSetWindowBackgroundPixmap(**otk::display, win, ParentRelative);
+  else {
+    otk::display->renderControl(screen)->drawBackground(*s, texture);
+    XSetWindowBackgroundPixmap(**otk::display, win, s->pixmap());
+  }
   XClearWindow(**otk::display, win);
   if (*surface) delete *surface;
   if (freedata) s->freePixelData();
@@ -257,10 +317,10 @@ static void render(int screen, const otk::Size &size, Window win,
 
 void Frame::adjustSize()
 {
-  Client::DecorationFlags decorations = _client->decorations();
+  _decorations = _client->decorations();
   const otk::RenderStyle *style = otk::RenderStyle::style(_client->screen());
 
-  if (decorations & Client::Decor_Border) {
+  if (_decorations & Client::Decor_Border) {
     geom.bwidth = style->frameBorderWidth();
     geom.cbwidth = style->clientBorderWidth();
   } else {
@@ -281,7 +341,7 @@ void Frame::adjustSize()
   
   // position/size and map/unmap all the windows
 
-  if (decorations & Client::Decor_Titlebar) {
+  if (_decorations & Client::Decor_Titlebar) {
     XMoveResizeWindow(**otk::display, _title, -geom.bwidth, -geom.bwidth,
                       geom.width, geom.title_height());
     _innersize.top += geom.title_height() + geom.bwidth;
@@ -289,10 +349,15 @@ void Frame::adjustSize()
 
     // layout the title bar elements
     layoutTitle();
-  } else
+  } else {
     XUnmapWindow(**otk::display, _title);
+    // make all the titlebar stuff not render
+    _decorations &= ~(Client::Decor_Icon | Client::Decor_Iconify |
+                      Client::Decor_Maximize | Client::Decor_Close |
+                      Client::Decor_AllDesktops);
+  }
 
-  if (decorations & Client::Decor_Handle) {
+  if (_decorations & Client::Decor_Handle) {
     geom.handle_y = _innersize.top + _client->area().height() + geom.cbwidth;
     XMoveResizeWindow(**otk::display, _handle, -geom.bwidth, geom.handle_y,
                       geom.width, geom.handle_height);
@@ -330,7 +395,7 @@ void Frame::adjustSize()
   // render all the elements
   int screen = _client->screen();
   bool focus = _client->focused();
-  if (decorations & Client::Decor_Titlebar) {
+  if (_decorations & Client::Decor_Titlebar) {
     render(screen, otk::Size(geom.width, geom.title_height()), _title,
            &_title_sur, *(focus ? style->titlebarFocusBackground() :
                           style->titlebarUnfocusBackground()), false);
@@ -343,14 +408,19 @@ void Frame::adjustSize()
     renderClose();
   }
 
-  if (decorations & Client::Decor_Handle) {
+  if (_decorations & Client::Decor_Handle) {
     render(screen, otk::Size(geom.width, geom.handle_height), _handle,
            &_handle_sur, *(focus ? style->handleFocusBackground() :
                            style->handleUnfocusBackground()));
     render(screen, otk::Size(geom.grip_width(), geom.handle_height), _lgrip,
            &_grip_sur, *(focus ? style->gripFocusBackground() :
                          style->gripUnfocusBackground()));
-    XSetWindowBackgroundPixmap(**otk::display, _rgrip, _grip_sur->pixmap());
+    if ((focus ? style->gripFocusBackground() :
+         style->gripUnfocusBackground())->parentRelative())
+      XSetWindowBackgroundPixmap(**otk::display, _rgrip, ParentRelative);
+    else {
+      XSetWindowBackgroundPixmap(**otk::display, _rgrip, _grip_sur->pixmap());
+    }
     XClearWindow(**otk::display, _rgrip);
   }
 
@@ -371,43 +441,57 @@ void Frame::renderLabel()
   otk::Surface *s = new otk::Surface(_client->screen(),
                                      otk::Size(geom.label_width,
                                                geom.label_height()));
-  control->drawBackground(*s, *(_client->focused() ?
-                                style->labelFocusBackground() :
-                                style->labelUnfocusBackground()));
+  const otk::RenderTexture *tx = (_client->focused() ?
+                                  style->labelFocusBackground() :
+                                  style->labelUnfocusBackground());
+  if (tx->parentRelative()) {
+    otk::pixel32 *dest = s->pixelData(), *src;
+    int w = _title_sur->size().width();
+  
+    src = _title_sur->pixelData() + w * geom.bevel + geom.title_x;
+    
+    // get the background under the label
+    int xd = s->size().width();
+    int yd = s->size().height();
+    for (int y = 0; y < yd; ++y, src += w - xd)
+      for (int x = 0; x < xd; ++x, ++dest, ++src)
+        *dest = *src;
+    control->drawImage(*s, 0, 0, 0); // no image but draw the new background
+  } else
+    control->drawBackground(*s, *tx);
 
   otk::ustring t = _client->title(); // the actual text to draw
   int x = geom.bevel;                // x coord for the text
 
-  if (x * 2 > geom.label_width) return; // no room at all
-
-  // find a string that will fit inside the area for text
-  otk::ustring::size_type text_len = t.size();
-  int length;
-  int maxsize = geom.label_width - geom.bevel * 2;
+  if (x * 2 < geom.label_width) {
+    // find a string that will fit inside the area for text
+    otk::ustring::size_type text_len = t.size();
+    int length;
+    int maxsize = geom.label_width - geom.bevel * 2;
       
-  do {
-    t.resize(text_len);
-    length = font->measureString(t);  // this returns an unsigned, so check < 0
-    if (length < 0) length = maxsize; // if the string's that long just adjust
-  } while (length > maxsize && text_len-- > 0);
-
-  if (text_len <= 0) return; // won't fit anything
-
-  // justify the text
-  switch (style->labelTextJustify()) {
-  case otk::RenderStyle::RightBottomJustify:
-    x += maxsize - length;
-    break;
-  case otk::RenderStyle::CenterJustify:
-    x += (maxsize - length) / 2;
-    break;
-  case otk::RenderStyle::LeftTopJustify:
-    break;
-  }
+    do {
+      t.resize(text_len);
+      length = font->measureString(t);// this returns an unsigned, so check < 0
+      if (length < 0) length = maxsize;// if the string's that long just adjust
+    } while (length > maxsize && text_len-- > 0);
+
+    // justify the text
+    switch (style->labelTextJustify()) {
+    case otk::RenderStyle::RightBottomJustify:
+      x += maxsize - length;
+      break;
+    case otk::RenderStyle::CenterJustify:
+      x += (maxsize - length) / 2;
+      break;
+    case otk::RenderStyle::LeftTopJustify:
+      break;
+    }
  
-  control->drawString(*s, *font, x, 0,
-                      *(_client->focused() ? style->textFocusColor() :
-                        style->textUnfocusColor()), t);
+    if (text_len > 0)
+      control->drawString(*s, *font, x, 0,
+                          *(_client->focused() ? style->textFocusColor() :
+                            style->textUnfocusColor()), t);
+  }
 
   XSetWindowBackgroundPixmap(**otk::display, _label, s->pixmap());
   XClearWindow(**otk::display, _label);
@@ -418,7 +502,8 @@ void Frame::renderLabel()
 
 static void renderButton(int screen, bool focus, bool press, Window win,
                          otk::Surface **sur, int butsize,
-                         const otk::PixmapMask *mask)
+                         const otk::PixmapMask *mask, int xoffset, int yoffset,
+                         otk::Surface *bgsurface)
 {
   const otk::RenderStyle *style = otk::RenderStyle::style(screen);
   const otk::RenderControl *control = otk::display->renderControl(screen);
@@ -434,45 +519,69 @@ static void renderButton(int screen, bool focus, bool press, Window win,
   const otk::RenderColor *maskcolor = (focus ?
                                        style->buttonFocusColor() :
                                        style->buttonUnfocusColor());
-  control->drawBackground(*s, *tx);
+  if (tx->parentRelative()) {
+    otk::pixel32 *dest = s->pixelData(), *src;
+    int w = bgsurface->size().width();
+  
+    src = bgsurface->pixelData() + w * yoffset + xoffset;
+    
+    // get the background under the button
+    for (int y = 0; y < butsize; ++y, src += w - butsize)
+      for (int x = 0; x < butsize; ++x, ++dest, ++src)
+        *dest = *src;
+    control->drawImage(*s, 0, 0, 0); // no image but draw the new background
+  } else
+    control->drawBackground(*s, *tx);
   control->drawMask(*s, *maskcolor, *mask);
 
   XSetWindowBackgroundPixmap(**otk::display, win, s->pixmap());
   XClearWindow(**otk::display, win);
   if (*sur) delete *sur;
+  s->freePixelData();
   *sur = s;
 }
 
 void Frame::renderMax()
 {
-  renderButton(_client->screen(), _client->focused(), _max_press, _max,
+  if (!(_decorations & Client::Decor_Maximize)) return;
+  bool press = _max_press || _client->maxVert() || _client->maxHorz();
+  renderButton(_client->screen(), _client->focused(), press, _max,
                &_max_sur, geom.button_size,
-               otk::RenderStyle::style(_client->screen())->maximizeMask());
+               otk::RenderStyle::style(_client->screen())->maximizeMask(),
+               geom.max_x, (geom.bevel + 1), _title_sur);
 }
 
 void Frame::renderDesk()
 {
-  renderButton(_client->screen(), _client->focused(), _desk_press, _desk,
+  if (!(_decorations & Client::Decor_AllDesktops)) return;
+  bool press = _desk_press || _client->desktop() == 0xffffffff;
+  renderButton(_client->screen(), _client->focused(), press, _desk,
                &_desk_sur, geom.button_size,
-               otk::RenderStyle::style(_client->screen())->alldesktopsMask());
+               otk::RenderStyle::style(_client->screen())->alldesktopsMask(),
+               geom.desktop_x, (geom.bevel + 1), _title_sur);
 }
 
 void Frame::renderIconify()
 {
+  if (!(_decorations & Client::Decor_Iconify)) return;
   renderButton(_client->screen(), _client->focused(), _iconify_press, _iconify,
                &_iconify_sur, geom.button_size,
-               otk::RenderStyle::style(_client->screen())->iconifyMask());
+               otk::RenderStyle::style(_client->screen())->iconifyMask(),
+               geom.iconify_x, (geom.bevel + 1), _title_sur);
 }
 
 void Frame::renderClose()
 {
+  if (!(_decorations & Client::Decor_Close)) return;
   renderButton(_client->screen(), _client->focused(), _close_press, _close,
                &_close_sur, geom.button_size,
-               otk::RenderStyle::style(_client->screen())->closeMask());
+               otk::RenderStyle::style(_client->screen())->closeMask(),
+               geom.close_x, (geom.bevel + 1), _title_sur);
 }
 
 void Frame::renderIcon()
 {
+  if (!(_decorations & Client::Decor_Icon)) return;
   const int screen = _client->screen();
   const otk::RenderControl *control = otk::display->renderControl(screen);
 
@@ -487,7 +596,15 @@ void Frame::renderIcon()
   for (int y = 0; y < geom.button_size; ++y, src += w - geom.button_size)
     for (int x = 0; x < geom.button_size; ++x, ++dest, ++src)
       *dest = *src;
-  control->drawImage(*s, 0, 0, 0);
+  // draw the icon over it
+  const Icon *icon = _client->icon(otk::Size(geom.button_size,
+                                             geom.button_size));
+  control->drawImage(*s, icon->w, icon->h, icon->data);
+  if (!icon->data) {
+    Pixmap p = _client->pixmapIcon(), m = _client->pixmapIconMask();
+    if (p != None)
+      control->drawImage(*s, p, m);
+  }
 
   XSetWindowBackgroundPixmap(**otk::display, _icon, s->pixmap());
   XClearWindow(**otk::display, _icon);
@@ -497,69 +614,128 @@ void Frame::renderIcon()
 
 void Frame::layoutTitle()
 {
-  geom.label_width = geom.width - geom.bevel * 2 -
-    (geom.button_size + geom.bevel) * (_layout.size() - 1);
+  // figure out whats being shown, and the width of the label
+  geom.label_width = geom.width - geom.bevel * 2;
+  bool n, d, i, t, m ,c;
+  n = d = i = t = m = c = false;
+  for (const char *l = _layout.c_str(); *l; ++l) {
+    switch (*l) {
+    case 'n':
+    case 'N':
+      if (!(_decorations & Client::Decor_Icon)) break;
+      n = true;
+      geom.label_width -= geom.button_size + geom.bevel;
+      break;
+    case 'd':
+    case 'D':
+      if (!(_decorations & Client::Decor_AllDesktops)) break;
+      d = true;
+      geom.label_width -= geom.button_size + geom.bevel;
+      break;
+    case 'i':
+    case 'I':
+      if (!(_decorations & Client::Decor_Iconify)) break;
+      i = true;
+      geom.label_width -= geom.button_size + geom.bevel;
+      break;
+    case 't':
+    case 'T':
+      t = true;
+      break;
+    case 'm':
+    case 'M':
+      if (!(_decorations & Client::Decor_Maximize)) break;
+      m = true;
+      geom.label_width -= geom.button_size + geom.bevel;
+      break;
+    case 'c':
+    case 'C':
+      if (!(_decorations & Client::Decor_Close)) break;
+      c = true;
+      geom.label_width -= geom.button_size + geom.bevel;
+      break;
+    }
+  }
   if (geom.label_width < 1) geom.label_width = 1;
 
   XResizeWindow(**otk::display, _label, geom.label_width, geom.font_height);
   
+  if (!n) {
+    _decorations &= ~Client::Decor_Icon;
+    XUnmapWindow(**otk::display, _icon);
+  }
+  if (!d) {
+    _decorations &= ~Client::Decor_AllDesktops;
+    XUnmapWindow(**otk::display, _desk);
+  }
+  if (!i) {
+    _decorations &= ~Client::Decor_Iconify;
+    XUnmapWindow(**otk::display, _iconify);
+  }
+  if (!t)
+    XUnmapWindow(**otk::display, _label);
+  if (!m) {
+    _decorations &= ~Client::Decor_Maximize;
+    XUnmapWindow(**otk::display, _max);
+  }
+  if (!c) {
+    _decorations &= ~Client::Decor_Close;
+    XUnmapWindow(**otk::display, _close);
+  }
+
   int x = geom.bevel;
-  bool n, d, i, l, m ,c;
-  n = d = i = l = m = c = false;
   for (const char *lc = _layout.c_str(); *lc; ++lc) {
     switch (*lc) {
     case 'n':
     case 'N':
+      if (!n) break;
       geom.icon_x = x;
       XMapWindow(**otk::display, _icon);
       XMoveWindow(**otk::display, _icon, x, geom.bevel + 1);
-      n = true;
-      x += geom.button_size;
+      x += geom.button_size + geom.bevel;
       break;
     case 'd':
     case 'D':
+      if (!d) break;
+      geom.desktop_x = x;
       XMapWindow(**otk::display, _desk);
       XMoveWindow(**otk::display, _desk, x, geom.bevel + 1);
-      d = true;
-      x += geom.button_size;
+      x += geom.button_size + geom.bevel;
       break;
     case 'i':
     case 'I':
+      if (!i) break;
+      geom.iconify_x = x;
       XMapWindow(**otk::display, _iconify);
       XMoveWindow(**otk::display, _iconify, x, geom.bevel + 1);
-      i = true;
-      x += geom.button_size;
+      x += geom.button_size + geom.bevel;
       break;
     case 't':
     case 'T':
+      if (!t) break;
+      geom.title_x = x;
       XMapWindow(**otk::display, _label);
       XMoveWindow(**otk::display, _label, x, geom.bevel);
-      l = true;
-      x += geom.label_width;
+      x += geom.label_width + geom.bevel;
       break;
     case 'm':
     case 'M':
+      if (!m) break;
+      geom.max_x = x;
       XMapWindow(**otk::display, _max);
       XMoveWindow(**otk::display, _max, x, geom.bevel + 1);
-      m = true;
-      x += geom.button_size;
+      x += geom.button_size + geom.bevel;
       break;
     case 'c':
     case 'C':
+      if (!c) break;
+      geom.close_x = x;
       XMapWindow(**otk::display, _close);
       XMoveWindow(**otk::display, _close, x, geom.bevel + 1);
-      c = true;
-      x += geom.button_size;
+      x += geom.button_size + geom.bevel;
       break;
     }
-    x += geom.bevel;
   }
-  if (!n) XUnmapWindow(**otk::display, _icon);
-  if (!d) XUnmapWindow(**otk::display, _desk);
-  if (!i) XUnmapWindow(**otk::display, _iconify);
-  if (!l) XUnmapWindow(**otk::display, _label);
-  if (!m) XUnmapWindow(**otk::display, _max);
-  if (!c) XUnmapWindow(**otk::display, _close);
 }
 
 void Frame::adjustPosition()
@@ -576,8 +752,6 @@ void Frame::adjustPosition()
 void Frame::adjustShape()
 {
 #ifdef SHAPE
-  Client::DecorationFlags decorations = _client->decorations();
-  
   if (!_client->shaped()) {
     // clear the shape on the frame window
     XShapeCombineMask(**otk::display, _frame, ShapeBounding,
@@ -594,7 +768,7 @@ void Frame::adjustShape()
     int num = 0;
     XRectangle xrect[2];
 
-    if (decorations & Client::Decor_Titlebar) {
+    if (_decorations & Client::Decor_Titlebar) {
       xrect[0].x = -geom.bevel;
       xrect[0].y = -geom.bevel;
       xrect[0].width = geom.width + geom.bwidth * 2;
@@ -602,7 +776,7 @@ void Frame::adjustShape()
       ++num;
     }
 
-    if (decorations & Client::Decor_Handle) {
+    if (_decorations & Client::Decor_Handle) {
       xrect[1].x = -geom.bevel;
       xrect[1].y = geom.handle_y;
       xrect[1].width = geom.width + geom.bwidth * 2;
@@ -617,13 +791,16 @@ void Frame::adjustShape()
 #endif // SHAPE
 }
 
-
 void Frame::adjustState()
 {
-// XXX  _button_alldesk.update();
-// XXX  _button_max.update();
+  renderDesk();
+  renderMax();
 }
 
+void Frame::adjustIcon()
+{
+  renderIcon();
+}
 
 void Frame::grabClient()
 {
@@ -641,7 +818,9 @@ void Frame::grabClient()
     _client->ignore_unmaps += 2;
 
   // select the event mask on the client's parent (to receive config/map req's)
-  XSelectInput(**otk::display, _plate, SubstructureRedirectMask);
+  // the ButtonPress is to catch clicks on the client border
+  XSelectInput(**otk::display, _plate, (SubstructureRedirectMask |
+                                        ButtonPressMask));
 
   // map the client so it maps when the frame does
   XMapWindow(**otk::display, _client->window());