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

license and handleEvent fix

Browse source
This commit is contained in:
fluxgen 2002-08-18 09:47:03 +00:00
parent 866d68d87f
commit 9ad48cd5ac
2 changed files with 58 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
util/bsetroot.cc
View file

@ -1,6 +1,29 @@
// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// Copyright (c) 1997 - 2000 Brad Hughes <bhughes at trolltech.com>
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// $Id: bsetroot.cc,v 1.8 2002/08/18 09:47:03 fluxgen Exp $
#include "bsetroot.hh" #include "bsetroot.hh"
#include "../src/i18n.hh" #include "../src/i18n.hh"
#include "../src/Image.hh"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "../config.h" # include "../config.h"
@ -81,7 +104,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
usage(); usage();
} }
if ((mod + sol + grd) != True) { if ((mod + sol + grd) != true) {
fprintf(stderr, fprintf(stderr,
I18n::instance()-> I18n::instance()->
getMessage( getMessage(
@ -107,7 +130,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
} }
bsetroot::~bsetroot(void) { bsetroot::~bsetroot() {
XKillClient(display, AllTemporary); XKillClient(display, AllTemporary);
if (pixmaps) { // should always be true if (pixmaps) { // should always be true
@ -181,7 +204,7 @@ void bsetroot::setRootAtoms(Pixmap pixmap, int screen) {
//-------------- solid -------------------- //-------------- solid --------------------
// draws pixmaps with a single color // draws pixmaps with a single color
//----------------------------------------- //-----------------------------------------
void bsetroot::solid(void) { void bsetroot::solid() {
register int screen = 0; register int screen = 0;
pixmaps = new Pixmap[getNumberOfScreens()]; pixmaps = new Pixmap[getNumberOfScreens()];

40
util/bsetroot.hh
View file

@ -1,22 +1,48 @@
// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// Copyright (c) 1997 - 2000 Brad Hughes <bhughes at trolltech.com>
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// $Id: bsetroot.hh,v 1.4 2002/08/18 09:47:03 fluxgen Exp $
#ifndef BSETROOT_HH #ifndef BSETROOT_HH
#define BSETROOT_HH #define BSETROOT_HH
#include "../src/BaseDisplay.hh" #include "../src/BaseDisplay.hh"
#include "../src/Image.hh"
class BImageControl;
class bsetroot : public BaseDisplay { class bsetroot : public BaseDisplay {
public: public:
bsetroot(int, char **, char * = 0); bsetroot(int argc, char **argv, char * dpy_name= 0);
~bsetroot(void); ~bsetroot();
inline virtual Bool handleSignal(int) { return False; } inline virtual bool handleSignal(int num) { return False; }
void gradient(void); void gradient();
void modula(int, int); void modula(int, int);
void solid(void); void solid();
void usage(int = 0); void usage(int = 0);
void setRootAtoms(Pixmap pixmap, int screen); void setRootAtoms(Pixmap pixmap, int screen);
protected:
void handleEvent(XEvent *xe) { }
private: private:
BImageControl **img_ctrl; BImageControl **img_ctrl;
Pixmap *pixmaps; Pixmap *pixmaps;
@ -24,8 +50,6 @@ private:
char *fore, *back, *grad; char *fore, *back, *grad;
Display *display; Display *display;
int num_screens; int num_screens;
protected:
inline virtual void process_event(XEvent *) { }
}; };