andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug #6619: Fix disappearing hardware cursor. (Colin Harrison)

Browse Source
This commit is contained in:
Daniel Stone 2006-06-03 10:58:37 +00:00
parent ee71cb61f8
commit 4fd668940f
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -12,6 +12,12 @@
Bug #6956: Fix crash when removing session leader before its children.
(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>
* hw/xfree86/common/xf86Init.c:

1
hw/xwin/XWin.rc
View File

@ -94,7 +94,6 @@ BEGIN
POPUP "TRAYICON_MENU"
BEGIN
MENUITEM "&Hide Root Window", ID_APP_HIDE_ROOT
MENUITEM "Show Cursor", ID_APP_SHOWCURSOR
MENUITEM "&About...", ID_APP_ABOUT
MENUITEM SEPARATOR
MENUITEM "E&xit", ID_APP_EXIT

9
hw/xwin/wincursor.c
View File

@ -41,6 +41,8 @@
#include <mipointrst.h>
#include <servermd.h>
extern Bool g_fSoftwareCursor;
#ifndef MIN
#define MIN(x,y) ((x)<(y)?(x):(y))
@ -438,8 +440,6 @@ winLoadCursor (ScreenPtr pScreen, CursorPtr pCursor, int screen)
static Bool
winRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
{
WIN_DEBUG_MSG("winRealizeCursor: cursor=%p\n", pCursor);
if(pCursor == NULL || pCursor->bits == NULL)
return FALSE;
@ -456,7 +456,6 @@ winRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
static Bool
winUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
{
WIN_DEBUG_MSG("winUnrealizeCursor: cursor=%p\n", pCursor);
return TRUE;
}
@ -508,7 +507,7 @@ winSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
{
if (pScreenPriv->cursor.visible)
{
if (!bInhibit)
if (!bInhibit && g_fSoftwareCursor)
ShowCursor (FALSE);
pScreenPriv->cursor.visible = FALSE;
}
@ -531,7 +530,7 @@ winSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
if (!pScreenPriv->cursor.visible)
{
if (!bInhibit)
if (!bInhibit && g_fSoftwareCursor)
ShowCursor (TRUE);
pScreenPriv->cursor.visible = TRUE;
}

1
hw/xwin/winresource.h
View File

@ -46,7 +46,6 @@
#define ID_APP_HIDE_ROOT 201
#define ID_APP_ALWAYS_ON_TOP 202
#define ID_APP_ABOUT 203
#define ID_APP_SHOWCURSOR 204
#define ID_ABOUT_UG 300
#define ID_ABOUT_FAQ 301

3
hw/xwin/winwndproc.c
View File

@ -1206,9 +1206,6 @@ winWindowProc (HWND hwnd, UINT message,
/* Display Exit dialog */
winDisplayExitDialog (s_pScreenPriv);
return 0;
case ID_APP_SHOWCURSOR:
winDebug("ShowCursor: %d\n", ShowCursor(TRUE));
return 0;
#ifdef XWIN_MULTIWINDOW
case ID_APP_HIDE_ROOT: