author Ehsan Akhgari <>
Wed, 01 Jun 2011 16:18:15 -0400
changeset 70259 749feb2a61a4c09a62a5dd513e4d445e0168e72a
parent 62486 be64c2d2b30690f1333ca7afc009035b6d6dc9cf
child 85454 98768291cee95712410e1ca285693f8aaa32c253
permissions -rw-r--r--
Back out bug 10209 and bug 656875 (its regression fix) from Aurora because the work on this bug has not been finished yet

/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 * vim: sw=2 ts=8 et :
/* ***** BEGIN LICENSE BLOCK *****
 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
 * The contents of this file are subject to the Mozilla Public License Version
 * 1.1 (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at:
 * Software distributed under the License is distributed on an "AS IS" basis,
 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 * for the specific language governing rights and limitations under the
 * License.
 * The Original Code is Mozilla Code.
 * The Initial Developer of the Original Code is
 *   The Mozilla Foundation
 * Portions created by the Initial Developer are Copyright (C) 2010
 * the Initial Developer. All Rights Reserved.
 * Contributor(s):
 * Alternatively, the contents of this file may be used under the terms of
 * either the GNU General Public License Version 2 or later (the "GPL"), or
 * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 * in which case the provisions of the GPL or the LGPL are applicable instead
 * of those above. If you wish to allow use of your version of this file only
 * under the terms of either the GPL or the LGPL, and not to allow others to
 * use your version of this file under the terms of the MPL, indicate your
 * decision by deleting the provisions above and replace them with the notice
 * and other provisions required by the GPL or the LGPL. If you do not delete
 * the provisions above, a recipient may use your version of this file under
 * the terms of any one of the MPL, the GPL or the LGPL.
 * ***** END LICENSE BLOCK ***** */

#include "X11Util.h"

namespace mozilla {

ScopedXErrorHandler::ErrorEvent* ScopedXErrorHandler::sXErrorPtr;

ScopedXErrorHandler::ErrorHandler(Display *, XErrorEvent *ev)
    // only record the error if no error was previously recorded.
    // this means that in case of multiple errors, it's the first error that we report.
    if (!sXErrorPtr->mError.error_code)
      sXErrorPtr->mError = *ev;
    return 0;

    // let sXErrorPtr point to this object's mXError object, but don't reset this mXError object!
    // think of the case of nested ScopedXErrorHandler's.
    mOldXErrorPtr = sXErrorPtr;
    sXErrorPtr = &mXError;
    mOldErrorHandler = XSetErrorHandler(ErrorHandler);

    sXErrorPtr = mOldXErrorPtr;

ScopedXErrorHandler::SyncAndGetError(Display *dpy, XErrorEvent *ev)
    XSync(dpy, False);
    return GetError(ev);

ScopedXErrorHandler::GetError(XErrorEvent *ev)
    bool retval = mXError.mError.error_code != 0;
    if (ev)
        *ev = mXError.mError;
    mXError = ErrorEvent(); // reset
    return retval;

} // namespace mozilla