init frame window in frame struct
This commit is contained in:
parent
28c32c087a
commit
93ffd19686
2 changed files with 13 additions and 23 deletions
27
src/Slit.cc
27
src/Slit.cc
|
@ -22,7 +22,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
// $Id: Slit.cc,v 1.100 2004/09/11 13:31:36 fluxgen Exp $
|
// $Id: Slit.cc,v 1.101 2004/09/11 18:58:27 fluxgen Exp $
|
||||||
|
|
||||||
#include "Slit.hh"
|
#include "Slit.hh"
|
||||||
|
|
||||||
|
@ -251,6 +251,7 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
|
||||||
m_clientlist_menu(scr.menuTheme(),
|
m_clientlist_menu(scr.menuTheme(),
|
||||||
scr.imageControl(),
|
scr.imageControl(),
|
||||||
*scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
|
*scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
|
||||||
|
frame(scr.rootWindow()),
|
||||||
//For KDE dock applets
|
//For KDE dock applets
|
||||||
m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(),
|
m_kwm1_dockwindow(XInternAtom(FbTk::App::instance()->display(),
|
||||||
"KWM_DOCKWINDOW", False)), //KDE v1.x
|
"KWM_DOCKWINDOW", False)), //KDE v1.x
|
||||||
|
@ -292,33 +293,15 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
|
||||||
FbTk::RefCount<FbTk::Command> toggle_hidden(new FbTk::SimpleCommand<Slit>(*this, &Slit::toggleHidden));
|
FbTk::RefCount<FbTk::Command> toggle_hidden(new FbTk::SimpleCommand<Slit>(*this, &Slit::toggleHidden));
|
||||||
m_timer.setCommand(toggle_hidden);
|
m_timer.setCommand(toggle_hidden);
|
||||||
|
|
||||||
// create main window
|
|
||||||
XSetWindowAttributes attrib;
|
|
||||||
unsigned long create_mask = CWBackPixmap | CWBackPixel | CWBorderPixel |
|
|
||||||
CWColormap | CWOverrideRedirect | CWEventMask;
|
|
||||||
attrib.background_pixmap = None;
|
|
||||||
attrib.background_pixel = attrib.border_pixel = theme().borderColor().pixel();
|
|
||||||
attrib.colormap = screen().rootWindow().colormap();
|
|
||||||
attrib.override_redirect = True;
|
|
||||||
attrib.event_mask = s_eventmask;
|
|
||||||
|
|
||||||
frame.x = frame.y = 0;
|
|
||||||
frame.width = frame.height = 1;
|
|
||||||
Display *disp = FbTk::App::instance()->display();
|
|
||||||
frame.window =
|
|
||||||
XCreateWindow(disp, screen().rootWindow().window(), frame.x, frame.y,
|
|
||||||
frame.width, frame.height, theme().borderWidth(),
|
|
||||||
screen().rootWindow().depth(), InputOutput, screen().rootWindow().visual(),
|
|
||||||
create_mask, &attrib);
|
|
||||||
|
|
||||||
FbTk::EventManager::instance()->add(*this, frame.window);
|
FbTk::EventManager::instance()->add(*this, frame.window);
|
||||||
|
|
||||||
frame.window.setAlpha(*m_rc_alpha);
|
frame.window.setAlpha(*m_rc_alpha);
|
||||||
m_layeritem.reset(new FbTk::XLayerItem(frame.window, layer));
|
m_layeritem.reset(new FbTk::XLayerItem(frame.window, layer));
|
||||||
m_layermenu.reset(new LayerMenu<Slit>(scr.menuTheme(),
|
m_layermenu.reset(new LayerMenu<Slit>(scr.menuTheme(),
|
||||||
scr.imageControl(),
|
scr.imageControl(),
|
||||||
*scr.layerManager().
|
*scr.layerManager().
|
||||||
getLayer(Fluxbox::instance()->getMenuLayer()),
|
getLayer(Fluxbox::instance()->getMenuLayer()),
|
||||||
this,
|
this,
|
||||||
true));
|
true));
|
||||||
moveToLayer((*m_rc_layernum).getNum());
|
moveToLayer((*m_rc_layernum).getNum());
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
/// $Id: Slit.hh,v 1.41 2004/06/07 11:46:04 rathnor Exp $
|
/// $Id: Slit.hh,v 1.42 2004/09/11 18:58:27 fluxgen Exp $
|
||||||
|
|
||||||
#ifndef SLIT_HH
|
#ifndef SLIT_HH
|
||||||
#define SLIT_HH
|
#define SLIT_HH
|
||||||
|
@ -140,6 +140,13 @@ private:
|
||||||
std::string m_filename;
|
std::string m_filename;
|
||||||
|
|
||||||
struct frame {
|
struct frame {
|
||||||
|
frame(const FbTk::FbWindow &parent):
|
||||||
|
window(parent, 0, 0, 10, 10,
|
||||||
|
SubstructureRedirectMask | ButtonPressMask |
|
||||||
|
EnterWindowMask | LeaveWindowMask | ExposureMask,
|
||||||
|
true), // override redirect
|
||||||
|
x(0), y(0), x_hidden(0), y_hidden(0),
|
||||||
|
width(10), height(10) {}
|
||||||
Pixmap pixmap;
|
Pixmap pixmap;
|
||||||
FbTk::FbWindow window;
|
FbTk::FbWindow window;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue