diff options
author | George Sapountzis <gsap7@yahoo.gr> | 2006-10-29 03:55:39 +0200 |
---|---|---|
committer | George Sapountzis <gsap7@yahoo.gr> | 2007-02-05 19:32:04 +0200 |
commit | 4dac7896549392f7378cad9620618cec28f41a16 (patch) | |
tree | 1750d279bed14625b40b4b4f2fb563409c8e149c /src/aticursor.c | |
parent | 23b12b9ff55224e8c3c45eb58ea5fbf2f747d82e (diff) |
Consolidate aticursor.c w/ atimach64cursor.c
Diffstat (limited to 'src/aticursor.c')
-rw-r--r-- | src/aticursor.c | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/src/aticursor.c b/src/aticursor.c deleted file mode 100644 index e2da78c..0000000 --- a/src/aticursor.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2001 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting documentation, and - * that the name of Marc Aurele La France not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. Marc Aurele La France makes no representations - * about the suitability of this software for any purpose. It is provided - * "as-is" without express or implied warranty. - * - * MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO - * EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR 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. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "aticursor.h" -#include "atimach64cursor.h" -#include "atistruct.h" - -#include "xf86.h" - -/* - * ATIInitializeCursor -- - * - * This function initialises the screen cursor. - */ -Bool -ATIInitializeCursor -( - ScreenPtr pScreen, - ATIPtr pATI -) -{ - /* Initialise software cursor */ - if (!miDCInitialize(pScreen, xf86GetPointerScreenFuncs())) - return FALSE; - - if (pATI->Cursor == ATI_CURSOR_SOFTWARE) - return TRUE; - - if (!(pATI->pCursorInfo = xf86CreateCursorInfoRec())) - return FALSE; - - if (!ATIMach64CursorInit(pATI->pCursorInfo)) - { - xf86DestroyCursorInfoRec(pATI->pCursorInfo); - pATI->pCursorInfo = NULL; - return FALSE; - } - - if (xf86InitCursor(pScreen, pATI->pCursorInfo)) - { - xf86SetSilkenMouse(pScreen); - return TRUE; - } - - xf86DestroyCursorInfoRec(pATI->pCursorInfo); - pATI->pCursorInfo = NULL; - return FALSE; -} |