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

better error msg

Browse source
This commit is contained in:
fluxgen 2003-05-07 11:43:03 +00:00
parent 3aea45175d
commit 10211d5fec
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/BaseDisplay.cc
View file

@ -22,7 +22,7 @@
// 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: BaseDisplay.cc,v 1.27 2003/04/28 00:39:34 fluxgen Exp $ // $Id: BaseDisplay.cc,v 1.28 2003/05/07 11:43:03 fluxgen Exp $
@ -134,12 +134,15 @@ BaseDisplay::BaseDisplay(const char *app_name, const char *dpy_name):FbTk::App(d
I18n *i18n = I18n::instance(); I18n *i18n = I18n::instance();
if (display() == 0) { if (display() == 0) {
throw string( throw string("Can not connect to X server."
i18n-> "Make sure you started X before you start Fluxbox and"
getMessage( "that you do not have any other window manager running at the same time.");
FBNLS::BaseDisplaySet, FBNLS::BaseDisplayXConnectFail, /*
"BaseDisplay::BaseDisplay: connection to X server failed.")); i18n->
getMessage(
FBNLS::BaseDisplaySet, FBNLS::BaseDisplayXConnectFail,
"BaseDisplay::BaseDisplay: connection to X server failed."));
*/
} else if (fcntl(ConnectionNumber(display()), F_SETFD, 1) == -1) { } else if (fcntl(ConnectionNumber(display()), F_SETFD, 1) == -1) {
throw string( throw string(
i18n-> i18n->
@ -366,9 +369,9 @@ unsigned int ScreenInfo::getCurrHead(void) const {
return 0; return 0;
} }
//----------- getHeadWidth ------------ /**
// Returns the width of head @return the width of head
//------------------------------------- */
unsigned int ScreenInfo::getHeadWidth(unsigned int head) const { unsigned int ScreenInfo::getHeadWidth(unsigned int head) const {
if (hasXinerama()) { if (hasXinerama()) {
@ -386,9 +389,9 @@ unsigned int ScreenInfo::getHeadWidth(unsigned int head) const {
} }
//----------- getHeadHeight ------------ /**
// Returns the heigt of head @return the heigt of head
//-------------------------------------- */
unsigned int ScreenInfo::getHeadHeight(unsigned int head) const { unsigned int ScreenInfo::getHeadHeight(unsigned int head) const {
if (hasXinerama()) { if (hasXinerama()) {
@ -406,9 +409,9 @@ unsigned int ScreenInfo::getHeadHeight(unsigned int head) const {
} }
//----------- getHeadX ----------------- /**
// Returns the X start of head nr head @return the X start of head nr head
//-------------------------------------- */
int ScreenInfo::getHeadX(unsigned int head) const { int ScreenInfo::getHeadX(unsigned int head) const {
if (hasXinerama()) { if (hasXinerama()) {
if ((signed) head >= xineramaNumHeads) { if ((signed) head >= xineramaNumHeads) {
@ -424,9 +427,9 @@ int ScreenInfo::getHeadX(unsigned int head) const {
return 0; return 0;
} }
//----------- getHeadY ----------------- /**
// Returns the Y start of head @return the Y start of head
//-------------------------------------- */
int ScreenInfo::getHeadY(unsigned int head) const { int ScreenInfo::getHeadY(unsigned int head) const {
if (hasXinerama()) { if (hasXinerama()) {
if ((signed) head >= xineramaNumHeads) { if ((signed) head >= xineramaNumHeads) {