Remove redundant hourglass functions
This commit is contained in:
Chase
@@ -601,7 +601,7 @@ main (int argc, char **argv)
|
||||
#else /* AUTO_TOP */
|
||||
xwa.event_mask = ExposureMask;
|
||||
#endif /* AUTO_TOP */
|
||||
xwa.cursor = GetHourGlass (dpy);
|
||||
xwa.cursor = _DtGetHourGlassCursor(dpy);
|
||||
|
||||
XChangeWindowAttributes (dpy, welcome, mask, &xwa);
|
||||
|
||||
@@ -981,148 +981,6 @@ CatchAlarm ( int sig)
|
||||
}
|
||||
|
||||
|
||||
/*************************************<->*************************************
|
||||
*
|
||||
* Cursor GetHourGlass ()
|
||||
*
|
||||
*
|
||||
* Description:
|
||||
* -----------
|
||||
* Builds and returns the appropriate Hourglass cursor
|
||||
*
|
||||
*
|
||||
* Inputs:
|
||||
* ------
|
||||
* dpy = display
|
||||
*
|
||||
* Outputs:
|
||||
* -------
|
||||
* Return = cursor.
|
||||
*
|
||||
* Comments:
|
||||
* --------
|
||||
* None. (None doesn't count as a comment)
|
||||
*
|
||||
*************************************<->***********************************/
|
||||
|
||||
#define time32_width 32
|
||||
#define time32_height 32
|
||||
#define time32_x_hot 15
|
||||
#define time32_y_hot 15
|
||||
static unsigned char time32_bits[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f,
|
||||
0x8c, 0x00, 0x00, 0x31, 0x4c, 0x00, 0x00, 0x32, 0x4c, 0x00, 0x00, 0x32,
|
||||
0x4c, 0x00, 0x00, 0x32, 0x4c, 0x00, 0x00, 0x32, 0x4c, 0x00, 0x00, 0x32,
|
||||
0x8c, 0x00, 0x00, 0x31, 0x0c, 0x7f, 0xfe, 0x30, 0x0c, 0xfe, 0x7f, 0x30,
|
||||
0x0c, 0xfc, 0x3f, 0x30, 0x0c, 0xf8, 0x1f, 0x30, 0x0c, 0xe0, 0x07, 0x30,
|
||||
0x0c, 0x80, 0x01, 0x30, 0x0c, 0x80, 0x01, 0x30, 0x0c, 0x60, 0x06, 0x30,
|
||||
0x0c, 0x18, 0x18, 0x30, 0x0c, 0x04, 0x20, 0x30, 0x0c, 0x02, 0x40, 0x30,
|
||||
0x0c, 0x01, 0x80, 0x30, 0x8c, 0x00, 0x00, 0x31, 0x4c, 0x80, 0x01, 0x32,
|
||||
0x4c, 0xc0, 0x03, 0x32, 0x4c, 0xf0, 0x1f, 0x32, 0x4c, 0xff, 0xff, 0x32,
|
||||
0xcc, 0xff, 0xff, 0x33, 0x8c, 0xff, 0xff, 0x31, 0xfe, 0xff, 0xff, 0x7f,
|
||||
0xfe, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00};
|
||||
|
||||
#define time32m_width 32
|
||||
#define time32m_height 32
|
||||
static unsigned char time32m_bits[] = {
|
||||
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
|
||||
0xcf, 0x00, 0x00, 0xf3, 0x6e, 0x00, 0x00, 0x76, 0x6e, 0x00, 0x00, 0x76,
|
||||
0x6e, 0x00, 0x00, 0x76, 0x6e, 0x00, 0x00, 0x76, 0x6e, 0x00, 0x00, 0x76,
|
||||
0xce, 0x00, 0x00, 0x73, 0x8e, 0x7f, 0xfe, 0x71, 0x0e, 0xff, 0xff, 0x70,
|
||||
0x0e, 0xfe, 0x7f, 0x70, 0x0e, 0xfc, 0x3f, 0x70, 0x0e, 0xf8, 0x1f, 0x70,
|
||||
0x0e, 0xe0, 0x07, 0x70, 0x0e, 0xe0, 0x07, 0x70, 0x0e, 0x78, 0x1e, 0x70,
|
||||
0x0e, 0x1c, 0x38, 0x70, 0x0e, 0x06, 0x60, 0x70, 0x0e, 0x03, 0xc0, 0x70,
|
||||
0x8e, 0x01, 0x80, 0x71, 0xce, 0x00, 0x00, 0x73, 0x6e, 0x80, 0x01, 0x76,
|
||||
0x6e, 0xc0, 0x03, 0x76, 0x6e, 0xf0, 0x1f, 0x76, 0x6e, 0xff, 0xff, 0x76,
|
||||
0xee, 0xff, 0xff, 0x77, 0xcf, 0xff, 0xff, 0xf3, 0xff, 0xff, 0xff, 0xff,
|
||||
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
|
||||
|
||||
|
||||
#define time16_x_hot 7
|
||||
#define time16_y_hot 7
|
||||
#define time16_width 16
|
||||
#define time16_height 16
|
||||
static unsigned char time16_bits[] = {
|
||||
0x00, 0x00, 0xfe, 0x7f, 0x14, 0x28, 0x14, 0x28, 0x14, 0x28, 0x24, 0x24,
|
||||
0x44, 0x22, 0x84, 0x21, 0x84, 0x21, 0x44, 0x22, 0x24, 0x24, 0x14, 0x28,
|
||||
0x94, 0x29, 0xd4, 0x2b, 0xfe, 0x7f, 0x00, 0x00};
|
||||
|
||||
#define time16m_width 16
|
||||
#define time16m_height 16
|
||||
static unsigned char time16m_bits[] = {
|
||||
0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f,
|
||||
0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x7f,
|
||||
0xfe, 0x7f, 0xfe, 0x7f, 0xff, 0xff, 0xff, 0xff};
|
||||
|
||||
|
||||
Cursor GetHourGlass (Display *dpy)
|
||||
{
|
||||
unsigned char *bits;
|
||||
unsigned char *maskBits;
|
||||
unsigned int width;
|
||||
unsigned int height;
|
||||
unsigned int xHotspot;
|
||||
unsigned int yHotspot;
|
||||
Pixmap pixmap;
|
||||
Pixmap maskPixmap;
|
||||
XColor xcolors[2];
|
||||
unsigned int cWidth;
|
||||
unsigned int cHeight;
|
||||
int useLargeCursors = 0;
|
||||
Cursor waitCursor;
|
||||
|
||||
if (XQueryBestCursor (dpy, DefaultRootWindow(dpy),
|
||||
32, 32, &cWidth, &cHeight))
|
||||
{
|
||||
if ((cWidth >= 32) && (cHeight >= 32))
|
||||
{
|
||||
useLargeCursors = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (useLargeCursors)
|
||||
{
|
||||
width = time32_width;
|
||||
height = time32_height;
|
||||
bits = time32_bits;
|
||||
maskBits = time32m_bits;
|
||||
xHotspot = time32_x_hot;
|
||||
yHotspot = time32_y_hot;
|
||||
}
|
||||
else
|
||||
{
|
||||
width = time16_width;
|
||||
height = time16_height;
|
||||
bits = time16_bits;
|
||||
maskBits = time16m_bits;
|
||||
xHotspot = time16_x_hot;
|
||||
yHotspot = time16_y_hot;
|
||||
}
|
||||
|
||||
pixmap = XCreateBitmapFromData (dpy,
|
||||
DefaultRootWindow(dpy), (char *)bits,
|
||||
width, height);
|
||||
|
||||
maskPixmap = XCreateBitmapFromData (dpy,
|
||||
DefaultRootWindow(dpy), (char *)maskBits,
|
||||
width, height);
|
||||
|
||||
xcolors[0].pixel = BlackPixelOfScreen(DefaultScreenOfDisplay(dpy));
|
||||
xcolors[1].pixel = WhitePixelOfScreen(DefaultScreenOfDisplay(dpy));
|
||||
|
||||
XQueryColors (dpy,
|
||||
DefaultColormapOfScreen(DefaultScreenOfDisplay
|
||||
(dpy)), xcolors, 2);
|
||||
|
||||
waitCursor = XCreatePixmapCursor (dpy, pixmap, maskPixmap,
|
||||
&(xcolors[0]), &(xcolors[1]),
|
||||
xHotspot, yHotspot);
|
||||
XFreePixmap (dpy, pixmap);
|
||||
XFreePixmap (dpy, maskPixmap);
|
||||
|
||||
return (waitCursor);
|
||||
}
|
||||
|
||||
#ifndef NO_MESSAGE_CATALOG
|
||||
/*****************************************************************************
|
||||
*
|
||||
|
||||
@@ -141,8 +141,6 @@ extern void SeparateTextLines(
|
||||
unsigned char *pchIn) ;
|
||||
extern void CatchAlarm(
|
||||
int sig) ;
|
||||
extern Cursor GetHourGlass(
|
||||
Display *dpy) ;
|
||||
extern void VhGetResources(
|
||||
Display *dpy,
|
||||
char *name,
|
||||
|
||||
Reference in New Issue
Block a user