aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-06-12 14:32:08 (GMT)
committerfluxgen <fluxgen>2003-06-12 14:32:08 (GMT)
commita08c3e7126f3346883f2db717670fc12f20142ed (patch)
tree305f13774e5cb6ff60866626a39baeffa83ac053
parentfa254cccd4f35b787dc1d75004d4d5a0a6b38105 (diff)
downloadfluxbox-a08c3e7126f3346883f2db717670fc12f20142ed.zip
fluxbox-a08c3e7126f3346883f2db717670fc12f20142ed.tar.bz2
moved cursor to FbWinFrameTheme and setting pid of fluxbox on root window here instead of in BScreen
-rw-r--r--src/fluxbox.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 7b87980..f84c513 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,11 +22,11 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.156 2003/06/11 14:53:54 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.157 2003/06/12 14:32:08 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
29#include "i18n.hh" 29#include "I18n.hh"
30#include "Screen.hh" 30#include "Screen.hh"
31#include "Toolbar.hh" 31#include "Toolbar.hh"
32#include "Window.hh" 32#include "Window.hh"
@@ -71,7 +71,7 @@
71#include <X11/Xresource.h> 71#include <X11/Xresource.h>
72#include <X11/Xatom.h> 72#include <X11/Xatom.h>
73#include <X11/keysym.h> 73#include <X11/keysym.h>
74#include <X11/cursorfont.h> 74
75// X extensions 75// X extensions
76#ifdef SHAPE 76#ifdef SHAPE
77#include <X11/extensions/shape.h> 77#include <X11/extensions/shape.h>
@@ -95,10 +95,6 @@
95#include <sys/param.h> 95#include <sys/param.h>
96#endif // HAVE_SYS_PARAM_H 96#endif // HAVE_SYS_PARAM_H
97 97
98#ifndef MAXPATHLEN
99#define MAXPATHLEN 255
100#endif // MAXPATHLEN
101
102#ifdef HAVE_SYS_SELECT_H 98#ifdef HAVE_SYS_SELECT_H
103#include <sys/select.h> 99#include <sys/select.h>
104#endif // HAVE_SYS_SELECT_H 100#endif // HAVE_SYS_SELECT_H
@@ -447,11 +443,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
447 sigh.registerHandler(SIGUSR2, this); 443 sigh.registerHandler(SIGUSR2, this);
448 444
449 Display *disp = FbTk::App::instance()->display(); 445 Display *disp = FbTk::App::instance()->display();
450 //setup cursor bitmaps
451 cursor.session = XCreateFontCursor(disp, XC_left_ptr);
452 cursor.move = XCreateFontCursor(disp, XC_fleur);
453 cursor.ll_angle = XCreateFontCursor(disp, XC_ll_angle);
454 cursor.lr_angle = XCreateFontCursor(disp, XC_lr_angle);
455 446
456 s_singleton = this; 447 s_singleton = this;
457 m_have_shape = false; 448 m_have_shape = false;
@@ -510,6 +501,15 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
510 delete screen; 501 delete screen;
511 continue; 502 continue;
512 } 503 }
504
505#ifdef HAVE_GETPID
506 pid_t bpid = getpid();
507
508 screen->rootWindow().changeProperty(getFluxboxPidAtom(), XA_CARDINAL,
509 sizeof(pid_t) * 8, PropModeReplace,
510 (unsigned char *) &bpid, 1);
511#endif // HAVE_GETPID
512
513#ifdef HAVE_RANDR 513#ifdef HAVE_RANDR
514 // setup RANDR for this screens root window 514 // setup RANDR for this screens root window
515 // we need to determine if we should use old randr select input function or not 515 // we need to determine if we should use old randr select input function or not