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

removed bexec and fixed indent

Browse source
This commit is contained in:
fluxgen 2003-01-09 21:55:58 +00:00
parent d019be5bf5
commit a4d46a4cac
1 changed files with 271 additions and 283 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/BaseDisplay.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
// $Id: BaseDisplay.cc,v 1.25 2002/12/02 20:02:56 fluxgen Exp $
// $Id: BaseDisplay.cc,v 1.26 2003/01/09 21:55:58 fluxgen Exp $
@ -91,8 +91,9 @@ using namespace std;
static Bool internal_error = False;
static Window last_bad_window = None;
#ifdef DEBUG
static int handleXErrors(Display *d, XErrorEvent *e) {
#ifdef DEBUG
char errtxt[128];
XGetErrorText(d, e->error_code, errtxt, 128);
@ -104,9 +105,7 @@ static int handleXErrors(Display *d, XErrorEvent *e) {
BaseDisplay::instance()->getApplicationName(), errtxt, e->error_code,
e->request_code, e->minor_code, e->resourceid);
#else // !DEBUG
static int handleXErrors(Display *, XErrorEvent *e) {
#endif // DEBUG
#endif // !DEBUG
if (e->error_code == BadWindow)
last_bad_window = e->resourceid;
@ -117,17 +116,6 @@ static int handleXErrors(Display *d, XErrorEvent *e) {
return(False);
}
// convenience functions
#ifndef __EMX__
void bexec(const char *command, char *displaystring) {
if (! fork()) {
setsid();
putenv(displaystring);
execl("/bin/sh", "/bin/sh", "-c", command, 0);
exit(0);
}
}
#endif // !__EMX__
BaseDisplay *BaseDisplay::s_singleton = 0;
@ -222,7 +210,7 @@ static int handleXErrors(Display *d, XErrorEvent *e) {
handleEvent(&e);
}
} else {
BTimer::updateTimers(ConnectionNumber(display())); //handle all timers
FbTk::Timer::updateTimers(ConnectionNumber(display())); //handle all timers
}
}
}
@ -323,11 +311,11 @@ static int handleXErrors(Display *d, XErrorEvent *e) {
#ifdef XINERAMA
//---------------- getHead ---------------
// Searches for the head at the coordinates
// x,y. If it fails or Xinerama isn't
// activated it'll return head nr 0
//-----------------------------------------
/**
Searches for the head at the coordinates
x,y. If it fails or Xinerama isn't
activated it'll return head nr 0
*/
unsigned int ScreenInfo::getHead(int x, int y) const {
// is Xinerama extensions enabled?
@ -356,11 +344,11 @@ static int handleXErrors(Display *d, XErrorEvent *e) {
return 0;
}
//------------- getCurrHead --------------
// Searches for the head that the pointer
// currently is on, if it isn't found
// the first one is returned
//----------------------------------------
/**
Searches for the head that the pointer
currently is on, if it isn't found
the first one is returned
*/
unsigned int ScreenInfo::getCurrHead(void) const {
// is Xinerama extensions enabled?