Bug #6619: Fix disappearing hardware cursor. (Colin Harrison)
This commit is contained in:
parent
ee71cb61f8
commit
4fd668940f
|
@ -12,6 +12,12 @@
|
||||||
Bug #6956: Fix crash when removing session leader before its children.
|
Bug #6956: Fix crash when removing session leader before its children.
|
||||||
(Rich Coe)
|
(Rich Coe)
|
||||||
|
|
||||||
|
* hw/xwin/wincursor.c:
|
||||||
|
* hw/xwin/winresource.h:
|
||||||
|
* hw/xwin/winwndproc.c:
|
||||||
|
* hw/xwin/XWin.rc:
|
||||||
|
Bug #6619: Fix disappearing hardware cursor. (Colin Harrison)
|
||||||
|
|
||||||
2006-06-01 Adam Jackson <ajax@freedesktop.org>
|
2006-06-01 Adam Jackson <ajax@freedesktop.org>
|
||||||
|
|
||||||
* hw/xfree86/common/xf86Init.c:
|
* hw/xfree86/common/xf86Init.c:
|
||||||
|
|
|
@ -94,7 +94,6 @@ BEGIN
|
||||||
POPUP "TRAYICON_MENU"
|
POPUP "TRAYICON_MENU"
|
||||||
BEGIN
|
BEGIN
|
||||||
MENUITEM "&Hide Root Window", ID_APP_HIDE_ROOT
|
MENUITEM "&Hide Root Window", ID_APP_HIDE_ROOT
|
||||||
MENUITEM "Show Cursor", ID_APP_SHOWCURSOR
|
|
||||||
MENUITEM "&About...", ID_APP_ABOUT
|
MENUITEM "&About...", ID_APP_ABOUT
|
||||||
MENUITEM SEPARATOR
|
MENUITEM SEPARATOR
|
||||||
MENUITEM "E&xit", ID_APP_EXIT
|
MENUITEM "E&xit", ID_APP_EXIT
|
||||||
|
|
|
@ -41,6 +41,8 @@
|
||||||
#include <mipointrst.h>
|
#include <mipointrst.h>
|
||||||
#include <servermd.h>
|
#include <servermd.h>
|
||||||
|
|
||||||
|
extern Bool g_fSoftwareCursor;
|
||||||
|
|
||||||
|
|
||||||
#ifndef MIN
|
#ifndef MIN
|
||||||
#define MIN(x,y) ((x)<(y)?(x):(y))
|
#define MIN(x,y) ((x)<(y)?(x):(y))
|
||||||
|
@ -438,8 +440,6 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
|
||||||
static Bool
|
static Bool
|
||||||
winRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
|
winRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
|
||||||
{
|
{
|
||||||
WIN_DEBUG_MSG("winRealizeCursor: cursor=%p\n", pCursor);
|
|
||||||
|
|
||||||
if(pCursor == NULL || pCursor->bits == NULL)
|
if(pCursor == NULL || pCursor->bits == NULL)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -456,7 +456,6 @@ winRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
|
||||||
static Bool
|
static Bool
|
||||||
winUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
|
winUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
|
||||||
{
|
{
|
||||||
WIN_DEBUG_MSG("winUnrealizeCursor: cursor=%p\n", pCursor);
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -508,7 +507,7 @@ winSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
|
||||||
{
|
{
|
||||||
if (pScreenPriv->cursor.visible)
|
if (pScreenPriv->cursor.visible)
|
||||||
{
|
{
|
||||||
if (!bInhibit)
|
if (!bInhibit && g_fSoftwareCursor)
|
||||||
ShowCursor (FALSE);
|
ShowCursor (FALSE);
|
||||||
pScreenPriv->cursor.visible = FALSE;
|
pScreenPriv->cursor.visible = FALSE;
|
||||||
}
|
}
|
||||||
|
@ -531,7 +530,7 @@ winSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
|
||||||
|
|
||||||
if (!pScreenPriv->cursor.visible)
|
if (!pScreenPriv->cursor.visible)
|
||||||
{
|
{
|
||||||
if (!bInhibit)
|
if (!bInhibit && g_fSoftwareCursor)
|
||||||
ShowCursor (TRUE);
|
ShowCursor (TRUE);
|
||||||
pScreenPriv->cursor.visible = TRUE;
|
pScreenPriv->cursor.visible = TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,6 @@
|
||||||
#define ID_APP_HIDE_ROOT 201
|
#define ID_APP_HIDE_ROOT 201
|
||||||
#define ID_APP_ALWAYS_ON_TOP 202
|
#define ID_APP_ALWAYS_ON_TOP 202
|
||||||
#define ID_APP_ABOUT 203
|
#define ID_APP_ABOUT 203
|
||||||
#define ID_APP_SHOWCURSOR 204
|
|
||||||
|
|
||||||
#define ID_ABOUT_UG 300
|
#define ID_ABOUT_UG 300
|
||||||
#define ID_ABOUT_FAQ 301
|
#define ID_ABOUT_FAQ 301
|
||||||
|
|
|
@ -1206,9 +1206,6 @@ winWindowProc (HWND hwnd, UINT message,
|
||||||
/* Display Exit dialog */
|
/* Display Exit dialog */
|
||||||
winDisplayExitDialog (s_pScreenPriv);
|
winDisplayExitDialog (s_pScreenPriv);
|
||||||
return 0;
|
return 0;
|
||||||
case ID_APP_SHOWCURSOR:
|
|
||||||
winDebug("ShowCursor: %d\n", ShowCursor(TRUE));
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
#ifdef XWIN_MULTIWINDOW
|
#ifdef XWIN_MULTIWINDOW
|
||||||
case ID_APP_HIDE_ROOT:
|
case ID_APP_HIDE_ROOT:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user