src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this --- 1,7 ---- /* ! * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this
*** 166,183 **** int dest_x = p.x; int dest_y = p.y; if (dest_x >= 0 && dest_y >= 0) { XWindowAttributes wattr = new XWindowAttributes(); try { ! XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(), window, wattr.pData); ! XToolkit.RESTORE_XERROR_HANDLER(); ! if (status == 0 || ! (XToolkit.saved_error != null && ! XToolkit.saved_error.get_error_code() != XConstants.Success)) { continue; } if (wattr.get_map_state() != XConstants.IsUnmapped && dest_x < wattr.get_width() --- 166,183 ---- int dest_x = p.x; int dest_y = p.y; if (dest_x >= 0 && dest_y >= 0) { XWindowAttributes wattr = new XWindowAttributes(); try { ! XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(), window, wattr.pData); ! XErrorHandlerUtil.RESTORE_XERROR_HANDLER(); ! if ((status == 0) || ! ((XErrorHandlerUtil.saved_error != null) && ! (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) { continue; } if (wattr.get_map_state() != XConstants.IsUnmapped && dest_x < wattr.get_width()
*** 220,254 **** try { long root = 0; long event_mask = 0; XWindowAttributes wattr = new XWindowAttributes(); try { ! XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(), embedder, wattr.pData); ! XToolkit.RESTORE_XERROR_HANDLER(); ! if (status == 0 || ! (XToolkit.saved_error != null && ! XToolkit.saved_error.get_error_code() != XConstants.Success)) { throw new XException("XGetWindowAttributes failed"); } event_mask = wattr.get_your_event_mask(); root = wattr.get_root(); } finally { wattr.dispose(); } if ((event_mask & XConstants.PropertyChangeMask) == 0) { ! XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); XlibWrapper.XSelectInput(XToolkit.getDisplay(), embedder, event_mask | XConstants.PropertyChangeMask); ! XToolkit.RESTORE_XERROR_HANDLER(); ! if (XToolkit.saved_error != null && ! XToolkit.saved_error.get_error_code() != XConstants.Success) { throw new XException("XSelectInput failed"); } } return new EmbeddedDropSiteEntry(root, event_mask, embedderProtocols); --- 220,254 ---- try { long root = 0; long event_mask = 0; XWindowAttributes wattr = new XWindowAttributes(); try { ! XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); int status = XlibWrapper.XGetWindowAttributes(XToolkit.getDisplay(), embedder, wattr.pData); ! XErrorHandlerUtil.RESTORE_XERROR_HANDLER(); ! if ((status == 0) || ! ((XErrorHandlerUtil.saved_error != null) && ! (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success))) { throw new XException("XGetWindowAttributes failed"); } event_mask = wattr.get_your_event_mask(); root = wattr.get_root(); } finally { wattr.dispose(); } if ((event_mask & XConstants.PropertyChangeMask) == 0) { ! XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); XlibWrapper.XSelectInput(XToolkit.getDisplay(), embedder, event_mask | XConstants.PropertyChangeMask); ! XErrorHandlerUtil.RESTORE_XERROR_HANDLER(); ! if ((XErrorHandlerUtil.saved_error != null) && ! (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) { throw new XException("XSelectInput failed"); } } return new EmbeddedDropSiteEntry(root, event_mask, embedderProtocols);
*** 392,408 **** long event_mask = entry.getEventMask(); /* Restore the original event mask for the embedder. */ if ((event_mask & XConstants.PropertyChangeMask) == 0) { ! XToolkit.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); XlibWrapper.XSelectInput(XToolkit.getDisplay(), embedder, event_mask); ! XToolkit.RESTORE_XERROR_HANDLER(); ! if (XToolkit.saved_error != null && ! XToolkit.saved_error.get_error_code() != XConstants.Success) { throw new XException("XSelectInput failed"); } } } finally { XlibWrapper.XUngrabServer(XToolkit.getDisplay()); --- 392,408 ---- long event_mask = entry.getEventMask(); /* Restore the original event mask for the embedder. */ if ((event_mask & XConstants.PropertyChangeMask) == 0) { ! XErrorHandlerUtil.WITH_XERROR_HANDLER(XErrorHandler.IgnoreBadWindowHandler.getInstance()); XlibWrapper.XSelectInput(XToolkit.getDisplay(), embedder, event_mask); ! XErrorHandlerUtil.RESTORE_XERROR_HANDLER(); ! if ((XErrorHandlerUtil.saved_error != null) && ! (XErrorHandlerUtil.saved_error.get_error_code() != XConstants.Success)) { throw new XException("XSelectInput failed"); } } } finally { XlibWrapper.XUngrabServer(XToolkit.getDisplay());