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

fixed slit client die issue

Browse source
This commit is contained in:
fluxgen 2003-05-17 11:00:50 +00:00
parent 0933da772a
commit e55252b464
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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.54 2003/05/15 23:30:06 fluxgen Exp $ // $Id: Slit.cc,v 1.55 2003/05/17 11:00:50 fluxgen Exp $
#include "Slit.hh" #include "Slit.hh"
@ -334,7 +334,9 @@ Slit::Slit(BScreen &scr, FbTk::XLayer &layer, const char *filename)
reconfigure(); reconfigure();
} }
unsigned int Slit::s_eventmask = StructureNotifyMask | SubstructureNotifyMask |
SubstructureRedirectMask | ButtonPressMask |
EnterWindowMask | LeaveWindowMask | ExposureMask;
Slit::~Slit() { Slit::~Slit() {
if (frame.pixmap != 0) if (frame.pixmap != 0)
screen().imageControl().removeImage(frame.pixmap); screen().imageControl().removeImage(frame.pixmap);
@ -462,8 +464,7 @@ void Slit::addClient(Window w) {
XChangeSaveSet(disp, client->window, SetModeInsert); XChangeSaveSet(disp, client->window, SetModeInsert);
// reactivate events for frame.window // reactivate events for frame.window
frame.window.setEventMask(SubstructureRedirectMask | frame.window.setEventMask(s_eventmask);
ButtonPressMask | EnterWindowMask | LeaveWindowMask | ExposureMask);
// setup event for slit client window // setup event for slit client window
client->enableEvents(); client->enableEvents();
@ -528,8 +529,7 @@ void Slit::removeClient(SlitClient *client, bool remap, bool destroy) {
client->x, client->y); client->x, client->y);
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(s_eventmask);
EnterWindowMask | LeaveWindowMask | ExposureMask);
XFlush(disp); XFlush(disp);
} }

3
src/Slit.hh
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.hh,v 1.29 2003/05/15 11:17:27 fluxgen Exp $ /// $Id: Slit.hh,v 1.30 2003/05/17 11:00:50 fluxgen Exp $
#ifndef SLIT_HH #ifndef SLIT_HH
#define SLIT_HH #define SLIT_HH
@ -146,6 +146,7 @@ private:
std::auto_ptr<FbTk::XLayerItem> m_layeritem; std::auto_ptr<FbTk::XLayerItem> m_layeritem;
std::auto_ptr<SlitTheme> m_slit_theme; std::auto_ptr<SlitTheme> m_slit_theme;
std::auto_ptr<FbTk::Transparent> m_transp; std::auto_ptr<FbTk::Transparent> m_transp;
static unsigned int s_eventmask;
}; };