Skip to content

W
wine-winehq
Commit 56af064e authored by Chris Morgan's avatar Chris Morgan Committed by Alexandre Julliard
Browse files
Options

Implemented the IDC_HAND cursor.

parent eb6500fb
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 10 deletions
graphics/x11drv/oembitmap.c
View file @ 56af064e
...@@ -186,6 +186,7 @@ static char **OBM_Icons_Data[OIC_LAST-OIC_FIRST+1] = ...@@ -186,6 +186,7 @@ static char **OBM_Icons_Data[OIC_LAST-OIC_FIRST+1] =
#include "bitmaps/ocr_sizens" #include "bitmaps/ocr_sizens"
#include "bitmaps/ocr_bummer" #include "bitmaps/ocr_bummer"
#include "bitmaps/ocr_dragobject" #include "bitmaps/ocr_dragobject"
#include "bitmaps/ocr_hand"
/*#include "bitmaps/ocr_sizeall"*/ /*#include "bitmaps/ocr_sizeall"*/
/*#include "bitmaps/ocr_icocur"*/ /*#include "bitmaps/ocr_icocur"*/
#include "bitmaps/ocr_no" #include "bitmaps/ocr_no"
...@@ -206,18 +207,14 @@ static char **OBM_Icons_Data[OIC_LAST-OIC_FIRST+1] = ...@@ -206,18 +207,14 @@ static char **OBM_Icons_Data[OIC_LAST-OIC_FIRST+1] =
#define OCR_BASE2 (OCR_BASE1 + OCR_LAST1 - OCR_FIRST1 + 1) #define OCR_BASE2 (OCR_BASE1 + OCR_LAST1 - OCR_FIRST1 + 1)
#define OCR_FIRST3 OCR_NO #define OCR_FIRST3 OCR_NO
#define OCR_LAST3 OCR_NO #define OCR_LAST3 OCR_APPSTARTING
#define OCR_BASE3 (OCR_BASE2 + OCR_LAST2 - OCR_FIRST2 + 1) #define OCR_BASE3 (OCR_BASE2 + OCR_LAST2 - OCR_FIRST2 + 1)
#define OCR_FIRST4 OCR_APPSTARTING #define OCR_FIRST4 OCR_HELP
#define OCR_LAST4 OCR_APPSTARTING #define OCR_LAST4 OCR_HELP
#define OCR_BASE4 (OCR_BASE3 + OCR_LAST3 - OCR_FIRST3 + 1) #define OCR_BASE4 (OCR_BASE3 + OCR_LAST3 - OCR_FIRST3 + 1)
#define OCR_FIRST5 OCR_HELP #define NB_CURSORS (OCR_BASE4 + OCR_LAST4 - OCR_FIRST4 + 1)
#define OCR_LAST5 OCR_HELP
#define OCR_BASE5 (OCR_BASE4 + OCR_LAST4 - OCR_FIRST4 + 1)
#define NB_CURSORS (OCR_BASE5 + OCR_LAST5 - OCR_FIRST5 + 1)
static char **OBM_Cursors_Data[NB_CURSORS] = static char **OBM_Cursors_Data[NB_CURSORS] =
{ {
ocr_bummer, /* OCR_BUMMER */ ocr_bummer, /* OCR_BUMMER */
...@@ -238,6 +235,7 @@ static char **OBM_Cursors_Data[NB_CURSORS] = ...@@ -238,6 +235,7 @@ static char **OBM_Cursors_Data[NB_CURSORS] =
ocr_icocur /* OCR_ICOCUR */ ocr_icocur /* OCR_ICOCUR */
#endif #endif
ocr_no, /* OCR_NO */ ocr_no, /* OCR_NO */
ocr_hand, /* OCR_HAND */
ocr_appstarting, /* OCR_APPSTARTING */ ocr_appstarting, /* OCR_APPSTARTING */
ocr_help /* OCR_HELP */ ocr_help /* OCR_HELP */
}; };
...@@ -475,8 +473,6 @@ static HGLOBAL16 OBM_LoadCursorIcon( WORD id, BOOL fCursor ) ...@@ -475,8 +473,6 @@ static HGLOBAL16 OBM_LoadCursorIcon( WORD id, BOOL fCursor )
id = OCR_BASE3 + id - OCR_FIRST3; id = OCR_BASE3 + id - OCR_FIRST3;
else if ((id >= OCR_FIRST4) && (id <= OCR_LAST4)) else if ((id >= OCR_FIRST4) && (id <= OCR_LAST4))
id = OCR_BASE4 + id - OCR_FIRST4; id = OCR_BASE4 + id - OCR_FIRST4;
else if ((id >= OCR_FIRST5) && (id <= OCR_LAST5))
id = OCR_BASE5 + id - OCR_FIRST5;
else return 0; else return 0;
if (OBM_Cursors[id]) return OBM_Cursors[id]; if (OBM_Cursors[id]) return OBM_Cursors[id];
} }
......
include/bitmaps/ocr_hand 0 → 100644
View file @ 56af064e
/* XPM */
static char * ocr_hand[] = {
"32 32 3 1 7 5",
" s black c black",
". s None c None",
"X s white c white",
"...... .......................",
"..... XXX ......................",
"..... XXX ......................",
"..... XXX ......................",
"..... XXX ......................",
"..... XXX ....................",
"..... XXX XX .................",
"..... XXX XX XX ...............",
"..... XXX XX XX X ..............",
". . XXX XX XX XX .............",
". XX XXXXXXXXXXXX .............",
". XXX XXXXXXXXXXXX .............",
".. XX XXXXXXXXXXXX .............",
"... X XXXXXXXXXXXX .............",
"... XXXXXXXXXXXXXX .............",
".... XXXXXXXXXXXXX .............",
".... XXXXXXXXXXXX ..............",
"..... XXXXXXXXXXX ..............",
"..... XXXXXXXXXXX ..............",
"...... XXXXXXXXX ...............",
"...... XXXXXXXXX ...............",
"...... ...............",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................"};
include/winuser.h
View file @ 56af064e
...@@ -318,6 +318,7 @@ typedef struct ...@@ -318,6 +318,7 @@ typedef struct
#define OCR_SIZEALL 32646 #define OCR_SIZEALL 32646
#define OCR_ICOCUR 32647 #define OCR_ICOCUR 32647
#define OCR_NO 32648 #define OCR_NO 32648
#define OCR_HAND 32649
#define OCR_APPSTARTING 32650 #define OCR_APPSTARTING 32650
#define OCR_HELP 32651 /* only defined in wine */ #define OCR_HELP 32651 /* only defined in wine */
...@@ -2139,6 +2140,9 @@ typedef struct ...@@ -2139,6 +2140,9 @@ typedef struct
#define IDC_NOA MAKEINTRESOURCEA(32648) #define IDC_NOA MAKEINTRESOURCEA(32648)
#define IDC_NOW MAKEINTRESOURCEW(32648) #define IDC_NOW MAKEINTRESOURCEW(32648)
#define IDC_NO WINELIB_NAME_AW(IDC_NO) #define IDC_NO WINELIB_NAME_AW(IDC_NO)
#define IDC_HANDA MAKEINTRESOURCEA(32649)
#define IDC_HANDW MAKEINTRESOURCEW(32649)
#define IDC_HAND WINELIB_NAME_AW(IDC_HAND)
#define IDC_APPSTARTINGA MAKEINTRESOURCEA(32650) #define IDC_APPSTARTINGA MAKEINTRESOURCEA(32650)
#define IDC_APPSTARTINGW MAKEINTRESOURCEW(32650) #define IDC_APPSTARTINGW MAKEINTRESOURCEW(32650)
#define IDC_APPSTARTING WINELIB_NAME_AW(IDC_APPSTARTING) #define IDC_APPSTARTING WINELIB_NAME_AW(IDC_APPSTARTING)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment