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

initiate cursors and changed to FbTk EventHandler with SignalEvent

Browse source
This commit is contained in:
fluxgen 2002-08-17 22:14:00 +00:00
parent 6664591b56
commit 033a6dc462
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/fluxbox.cc
View file

@ -22,7 +22,8 @@
// 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: fluxbox.cc,v 1.69 2002/08/16 11:09:25 fluxgen Exp $ // $Id: fluxbox.cc,v 1.70 2002/08/17 22:14:00 fluxgen Exp $
#include "fluxbox.hh" #include "fluxbox.hh"
@ -38,7 +39,6 @@
#include "StringUtil.hh" #include "StringUtil.hh"
#include "Resource.hh" #include "Resource.hh"
#include "XrmDatabaseHelper.hh" #include "XrmDatabaseHelper.hh"
#ifdef SLIT #ifdef SLIT
#include "Slit.hh" #include "Slit.hh"
#endif // SLIT #endif // SLIT
@ -52,12 +52,13 @@
#include "../config.h" #include "../config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
// X headers
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/Xresource.h> #include <X11/Xresource.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/cursorfont.h>
#ifdef SHAPE #ifdef SHAPE
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
#endif // SHAPE #endif // SHAPE
@ -389,6 +390,11 @@ key(0)
throw static_cast<int>(3); throw static_cast<int>(3);
} }
//setup cursor bitmaps
cursor.session = XCreateFontCursor(getXDisplay(), XC_left_ptr);
cursor.move = XCreateFontCursor(getXDisplay(), XC_fleur);
cursor.ll_angle = XCreateFontCursor(getXDisplay(), XC_ll_angle);
cursor.lr_angle = XCreateFontCursor(getXDisplay(), XC_lr_angle);
XSynchronize(getXDisplay(), False); XSynchronize(getXDisplay(), False);
XSync(getXDisplay(), False); XSync(getXDisplay(), False);
@ -525,7 +531,7 @@ void Fluxbox::setupConfigFiles() {
} }
} }
void Fluxbox::process_event(XEvent *e) { void Fluxbox::handleEvent(XEvent * const e) {
if ((masked == e->xany.window) && masked_window && if ((masked == e->xany.window) && masked_window &&
(e->type == MotionNotify)) { (e->type == MotionNotify)) {
@ -1570,11 +1576,11 @@ bool Fluxbox::checkNETWMAtoms(XClientMessageEvent &ce) {
} }
#endif //!NEWWMSPEC #endif //!NEWWMSPEC
void Fluxbox::handleSignal(int sig) { void Fluxbox::handleEvent(SignalEvent * const sig) {
I18n *i18n = I18n::instance(); I18n *i18n = I18n::instance();
static int re_enter = 0; static int re_enter = 0;
switch (sig) { switch (sig->signum) {
case SIGCHLD: // we don't want the child process to kill us case SIGCHLD: // we don't want the child process to kill us
waitpid(-1, 0, WNOHANG | WUNTRACED); waitpid(-1, 0, WNOHANG | WUNTRACED);
break; break;