fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-06 05:48:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not adjust workarea if ative windowmanger is used

Browse source
This commit is contained in:
Alexander Gottwald 2004-10-01 11:28:16 +00:00
parent 451557e0ab
commit d9f6de16de
2 changed files with 164 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
hw/xfree86/os-support/solaris/solaris-sparcv8plus.S Normal file
View file

@ -0,0 +1,144 @@
/* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons
* to whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
* HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
* INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Except as contained in this notice, the name of a copyright holder
* shall not be used in advertising or otherwise to promote the sale, use
* or other dealings in this Software without prior written authorization
* of the copyright holder.
*/
#ifdef INLINE_ASM
#define FUNCTION_START(f,n) .inline f,n
#define FUNCTION_END(f) .end
#else
#define _ASM
#include <sys/asm_linkage.h>
#define FUNCTION_START(f,n) ENTRY(f)
#define FUNCTION_END(f) SET_SIZE(f)
#endif
/* Converted from common/compiler.h gcc inline format to Sun cc inline
* format by Kenjiro Tsuji
*
* The value 0x88 means ASI_PRIMARY_LITTLE.
* The store or load to/from the address space will be done
* as little-endian. In the original xrog code, the value
* is defined as the macro ASI_PL.
*
* In the original xorg code, "membar #StoreStore|#StoreLoad"
* is directly implemented as an instruction "0x8143e00a".
*
*/
FUNCTION_START(outb, 0)
stba %o1, [%o0] 0x88
membar #StoreStore|#StoreLoad
FUNCTION_END(outb)
FUNCTION_START(outw, 0)
stha %o1, [%o0] 0x88
membar #StoreStore|#StoreLoad
FUNCTION_END(outw)
FUNCTION_START(outl, 0)
sta %o1, [%o0] 0x88
membar #StoreStore|#StoreLoad
FUNCTION_END(outl)
FUNCTION_START(inb, 0)
lduba [%o0] 0x88, %o0
FUNCTION_END(inb)
FUNCTION_START(inw, 0)
lduha [%o0] 0x88, %o0
FUNCTION_END(inw)
FUNCTION_START(inl, 0)
lda [%o0] 0x88, %o0
FUNCTION_END(inl)
FUNCTION_START(xf86ReadMmio8, 0)
lduba [%o0 + %o1] 0x88, %o0
FUNCTION_END(xf86ReadMmio8)
FUNCTION_START(xf86ReadMmio16Be, 0)
lduh [%o0 + %o1], %o0
FUNCTION_END(xf86ReadMmio16Be)
FUNCTION_START(xf86ReadMmio16Le, 0)
lduha [%o0 + %o1] 0x88, %o0
FUNCTION_END(xf86ReadMmio16Le)
FUNCTION_START(xf86ReadMmio32Be, 0)
ld [%o0 + %o1], %o0
FUNCTION_END(xf86ReadMmio32Be)
FUNCTION_START(xf86ReadMmio32Le, 0)
lda [%o0 + %o1] 0x88, %o0
FUNCTION_END(xf86ReadMmio32Le)
FUNCTION_START(xf86WriteMmio8, 0)
stba %o2, [%o0 + %o1] 0x88
membar #StoreStore|#StoreLoad
FUNCTION_END(xf86WriteMmio8)
FUNCTION_START(xf86WriteMmio16Be, 0)
sth %o2, [%o0 + %o1]
membar #StoreStore|#StoreLoad
FUNCTION_END(xf86WriteMmio16Be)
FUNCTION_START(xf86WriteMmio16Le, 0)
stha %o2, [%o0 + %o1] 0x88
membar #StoreStore|#StoreLoad
FUNCTION_END(xf86WriteMmio16Le)
FUNCTION_START(xf86WriteMmio32Be, 0)
st %o2, [%o0 + %o1]
membar #StoreStore|#StoreLoad
FUNCTION_END(xf86WriteMmio32Be)
FUNCTION_START(xf86WriteMmio32Le, 0)
sta %o2, [%o0 + %o1] 0x88
membar #StoreStore|#StoreLoad
FUNCTION_END(xf86WriteMmio32Le)
FUNCTION_START(xf86WriteMmio8NB, 0)
add %o0, %o1, %o0
stba %o2, [%o0] 0x88
FUNCTION_END(xf86WriteMmio8NB)
FUNCTION_START(xf86WriteMmio16BeNB, 0)
sth %o2, [%o0 + %o1]
FUNCTION_END(xf86WriteMmio16BeNB)
FUNCTION_START(xf86WriteMmio16LeNB, 0)
stha %o2, [%o0 + %o1] 0x88
FUNCTION_END(xf86WriteMmio16LeNB)
FUNCTION_START(xf86WriteMmio32BeNB, 0)
st %o2, [%o0 + %o1]
FUNCTION_END(xf86WriteMmio32BeNB)
FUNCTION_START(xf86WriteMmio32LeNB, 0)
sta %o2, [%o0 + %o1] 0x88
FUNCTION_END(xf86WriteMmio32LeNB)

30
hw/xwin/wincreatewnd.c
View file

@ -271,20 +271,30 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen)
/* We cannot have scrollbars if we do not have a window border */
pScreenInfo->fScrollbars = FALSE;
}
if (TRUE
#ifdef XWIN_MULTIWINDOWEXTWM
&& !pScreenInfo->fMWExtWM
#endif
#ifdef XWIN_MULTIWINDOW
&& !pScreenInfo->fMultiWindow
#endif
)
{
/* Trim window width to fit work area */
if (iWidth > (rcWorkArea.right - rcWorkArea.left))
iWidth = rcWorkArea.right - rcWorkArea.left;
/* Trim window width to fit work area */
if (iWidth > (rcWorkArea.right - rcWorkArea.left))
iWidth = rcWorkArea.right - rcWorkArea.left;
/* Trim window height to fit work area */
if (iHeight >= (rcWorkArea.bottom - rcWorkArea.top))
iHeight = rcWorkArea.bottom - rcWorkArea.top;
/* Trim window height to fit work area */
if (iHeight >= (rcWorkArea.bottom - rcWorkArea.top))
iHeight = rcWorkArea.bottom - rcWorkArea.top;
#if CYGDEBUG
winDebug ("winCreateBoundingWindowWindowed - Adjusted width: %d "\
"height: %d\n",
iWidth, iHeight);
winDebug ("winCreateBoundingWindowWindowed - Adjusted width: %d "\
"height: %d\n",
iWidth, iHeight);
#endif
}
/* Set display and screen-specific tooltip text */
if (g_pszQueryHost != NULL)