From a2de94e91e1c0e7775c97745ae11d14e5c5f5659 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 7 Jan 2003 19:24:38 +0000 Subject: [PATCH] in synch mode, chew up 100% cpu, cuz we cant select on the display's fd --- otk/display.cc | 4 ++-- otk/eventdispatcher.cc | 14 +++++++------- otk/otk_wrap.cc | 10 ++++++++-- otk/timerqueuemanager.cc | 22 ++++++++++++---------- otk/timerqueuemanager.hh | 7 ++++--- src/openbox.cc | 2 +- 6 files changed, 34 insertions(+), 25 deletions(-) diff --git a/otk/display.cc b/otk/display.cc index 6fc6117c..32674be9 100644 --- a/otk/display.cc +++ b/otk/display.cc @@ -65,8 +65,8 @@ int OBDisplay::xerrorHandler(Display *d, XErrorEvent *e) { XGetErrorText(d, e->error_code, errtxt, 128); printf("X Error: %s\n", errtxt); - if (e->error_code != BadWindow) - abort(); +// if (e->error_code != BadWindow) +// abort(); } #else (void)d; diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc index 36802f16..57613961 100644 --- a/otk/eventdispatcher.cc +++ b/otk/eventdispatcher.cc @@ -104,14 +104,14 @@ void OtkEventDispatcher::dispatchEvents(void) if (e.xfocus.detail == NotifyNonlinear) { focus = e.xfocus.window; unfocus = None; - //printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus); + printf("FocusIn focus=%lx unfocus=%lx\n", focus, unfocus); } } else if (e.type == FocusOut) { // any other types are not ones we're interested in if (e.xfocus.detail == NotifyNonlinear) { unfocus = e.xfocus.window; focus = None; - //printf("FocusOut focus=%lx unfocus=%lx\n", focus, unfocus); + printf("FocusOut focus=%lx unfocus=%lx\n", focus, unfocus); } // madly compress all crossing events } else if (e.type == EnterNotify) { @@ -120,14 +120,14 @@ void OtkEventDispatcher::dispatchEvents(void) // any other types are not ones we're interested in enter = e.xcrossing.window; enter_root = e.xcrossing.root; - //printf("Enter enter=%lx leave=%lx\n", enter, leave); + printf("Enter enter=%lx leave=%lx\n", enter, leave); } } else if (e.type == LeaveNotify) { // any other types are not ones we're interested in if (e.xcrossing.mode == NotifyNormal) { leave = e.xcrossing.window; leave_root = e.xcrossing.root; - //printf("Leave enter=%lx leave=%lx\n", enter, leave); + printf("Leave enter=%lx leave=%lx\n", enter, leave); } } else { // normal events @@ -137,7 +137,7 @@ void OtkEventDispatcher::dispatchEvents(void) if (unfocus != None) { // the last focus event was an FocusOut, so where the hell is the focus at? - //printf("UNFOCUSING: %lx\n", unfocus); + printf("UNFOCUSING: %lx\n", unfocus); _focus_e.xfocus.type = FocusOut; _focus_e.xfocus.window = unfocus; dispatch(_focus_e.xfocus.window, _focus_e); @@ -146,13 +146,13 @@ void OtkEventDispatcher::dispatchEvents(void) } else if (focus != None && focus != _focus) { // the last focus event was a FocusIn, so unfocus what used to be focus and // focus this new target - //printf("FOCUSING: %lx\n", focus); + printf("FOCUSING: %lx\n", focus); _focus_e.xfocus.type = FocusIn; _focus_e.xfocus.window = focus; dispatch(_focus_e.xfocus.window, _focus_e); if (_focus != None) { - //printf("UNFOCUSING: %lx\n", _focus); + printf("UNFOCUSING: %lx\n", _focus); _focus_e.xfocus.type = FocusOut; _focus_e.xfocus.window = _focus; dispatch(_focus_e.xfocus.window, _focus_e); diff --git a/otk/otk_wrap.cc b/otk/otk_wrap.cc index 8acf2c99..57a87fa6 100644 --- a/otk/otk_wrap.cc +++ b/otk/otk_wrap.cc @@ -12501,11 +12501,17 @@ static PyObject *_wrap_delete_OBTimerQueueManager(PyObject *self, PyObject *args static PyObject *_wrap_OBTimerQueueManager_fire(PyObject *self, PyObject *args) { PyObject *resultobj; otk::OBTimerQueueManager *arg1 = (otk::OBTimerQueueManager *) 0 ; + bool arg2 = (bool) true ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"O:OBTimerQueueManager_fire",&obj0)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"O|O:OBTimerQueueManager_fire",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OBTimerQueueManager,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - (arg1)->fire(); + if (obj1) { + arg2 = (bool) PyInt_AsLong(obj1); + if (PyErr_Occurred()) SWIG_fail; + } + (arg1)->fire(arg2); Py_INCREF(Py_None); resultobj = Py_None; return resultobj; diff --git a/otk/timerqueuemanager.cc b/otk/timerqueuemanager.cc index a37fe94d..79335154 100644 --- a/otk/timerqueuemanager.cc +++ b/otk/timerqueuemanager.cc @@ -9,7 +9,7 @@ namespace otk { -void OBTimerQueueManager::fire() +void OBTimerQueueManager::fire(bool wait) { fd_set rfds; timeval now, tm, *timeout = (timeval *) 0; @@ -19,17 +19,19 @@ void OBTimerQueueManager::fire() FD_ZERO(&rfds); FD_SET(xfd, &rfds); // break on any x events - if (! timerList.empty()) { - const OBTimer* const timer = timerList.top(); - - gettimeofday(&now, 0); - tm = timer->remainingTime(now); - - timeout = &tm; + if (wait) { + if (! timerList.empty()) { + const OBTimer* const timer = timerList.top(); + + gettimeofday(&now, 0); + tm = timer->remainingTime(now); + + timeout = &tm; + } + + select(xfd + 1, &rfds, 0, 0, timeout); } - select(xfd + 1, &rfds, 0, 0, timeout); - // check for timer timeout gettimeofday(&now, 0); diff --git a/otk/timerqueuemanager.hh b/otk/timerqueuemanager.hh index 48e15e5b..af81ecfe 100644 --- a/otk/timerqueuemanager.hh +++ b/otk/timerqueuemanager.hh @@ -22,11 +22,12 @@ public: //! Destroys the OBTimerQueueManager virtual ~OBTimerQueueManager() {} - //! Will wait for and fire the next timer in the queue. + //! Fire the next timer in the queue. /*! - The function will stop waiting if an event is received from the X server. + @param wait If true, this function will wait for the next timer, breaking + on any events from the X server. */ - virtual void fire(); + virtual void fire(bool wait = true); //! Adds a new timer to the queue /*! diff --git a/src/openbox.cc b/src/openbox.cc index 4e098cb8..dda52848 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -306,7 +306,7 @@ void Openbox::showHelp() void Openbox::eventLoop() { while (!_shutdown) { - _timermanager.fire(); + _timermanager.fire(!_sync); // wait if not in sync mode dispatchEvents(); // from OtkEventDispatcher XFlush(otk::OBDisplay::display); // flush here before we go wait for timers } -- 2.45.2