nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed slit redrawing bug

Browse source
This commit is contained in:
fluxgen 2003-05-13 13:28:28 +00:00
parent 2afb87a4e4
commit 45e689d4a2
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Slit.cc
View file

@ -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.50 2003/05/11 19:01:09 fluxgen Exp $ // $Id: Slit.cc,v 1.51 2003/05/13 13:28:28 fluxgen Exp $
#include "Slit.hh" #include "Slit.hh"
@ -306,7 +306,7 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
attrib.colormap = screen().rootWindow().colormap(); attrib.colormap = screen().rootWindow().colormap();
attrib.override_redirect = True; attrib.override_redirect = True;
attrib.event_mask = SubstructureRedirectMask | ButtonPressMask | attrib.event_mask = SubstructureRedirectMask | ButtonPressMask |
EnterWindowMask | LeaveWindowMask; EnterWindowMask | LeaveWindowMask | ExposureMask;
frame.x = frame.y = 0; frame.x = frame.y = 0;
frame.width = frame.height = 1; frame.width = frame.height = 1;
@ -458,7 +458,7 @@ void Slit::addClient(Window w) {
// reactivate events for frame.window // reactivate events for frame.window
frame.window.setEventMask(SubstructureRedirectMask | frame.window.setEventMask(SubstructureRedirectMask |
ButtonPressMask | EnterWindowMask | LeaveWindowMask); ButtonPressMask | EnterWindowMask | LeaveWindowMask | ExposureMask);
// setup event for slit client window // setup event for slit client window
client->enableEvents(); client->enableEvents();
@ -524,7 +524,7 @@ void Slit::removeClient(SlitClient *client, bool remap, bool destroy) {
XChangeSaveSet(disp, client->window, SetModeDelete); XChangeSaveSet(disp, client->window, SetModeDelete);
// reactivate events to frame.window // reactivate events to frame.window
frame.window.setEventMask(SubstructureRedirectMask | ButtonPressMask | frame.window.setEventMask(SubstructureRedirectMask | ButtonPressMask |
EnterWindowMask | LeaveWindowMask); EnterWindowMask | LeaveWindowMask | ExposureMask);
XFlush(disp); XFlush(disp);
} }
@ -638,13 +638,17 @@ void Slit::reconfigure() {
Pixmap tmp = frame.pixmap; Pixmap tmp = frame.pixmap;
FbTk::ImageControl *image_ctrl = screen().getImageControl(); FbTk::ImageControl *image_ctrl = screen().getImageControl();
const FbTk::Texture &texture = m_slit_theme->texture(); const FbTk::Texture &texture = m_slit_theme->texture();
if (texture.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) { if (texture.type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID) &&
texture.pixmap().drawable() == 0) {
frame.pixmap = None; frame.pixmap = None;
frame.window.setBackgroundColor(texture.color()); frame.window.setBackgroundColor(texture.color());
} else { } else {
frame.pixmap = image_ctrl->renderImage(frame.width, frame.height, frame.pixmap = image_ctrl->renderImage(frame.width, frame.height,
texture); texture);
frame.window.setBackgroundPixmap(frame.pixmap); if (frame.pixmap == 0)
frame.window.setBackgroundColor(texture.color());
else
frame.window.setBackgroundPixmap(frame.pixmap);
} }
if (tmp) if (tmp)
@ -878,11 +882,11 @@ void Slit::reposition() {
} }
if (isHidden()) { if (isHidden()) {
frame.window.moveResize(frame.x_hidden, frame.window.moveResize(frame.x_hidden, frame.y_hidden,
frame.y_hidden, frame.width, frame.height); frame.width, frame.height);
} else { } else {
frame.window.moveResize(frame.x, frame.window.moveResize(frame.x, frame.y,
frame.y, frame.width, frame.height); frame.width, frame.height);
} }
} }
@ -1059,7 +1063,7 @@ void Slit::configureRequestEvent(XConfigureRequestEvent &event) {
reconfigure(); reconfigure();
} }
void Slit::exposeEvent(XExposeEvent &event) { void Slit::exposeEvent(XExposeEvent &ev) {
frame.window.clear(); frame.window.clear();
} }