I found a lot of redundant functions aping the _DtGetHourGlass function in
libDtSvc, so I am replacing them
Thank you for your time,
-Chase
From 9b127e0aa7e8d71b5034caf0947a2f9b5a9a014f Mon Sep 17 00:00:00 2001
From: Chase <nicetry...@protonmail.ch>
Date: Tue, 21 Jan 2020 17:11:19 -0600
Subject: [PATCH] Remove redundant hourglass functions
---
cde/include/Dt/HourGlass.h | 10 +-
cde/lib/DtSvc/DtUtil2/HourGlass.c | 94 ++---------
cde/programs/dthello/dthello.c | 144 +---------------
cde/programs/dthello/dthello.h | 2 -
cde/programs/dtlogin/dm.h | 2 -
cde/programs/dtlogin/util.c | 150 +----------------
.../dtprintinfo/libUI/MotifUI/MotifUI.C | 106 +-----------
cde/programs/dtwm/UI.c | 23 +--
cde/programs/dtwm/WmBitmap.h | 156 ------------------
cde/programs/dtwm/WmFeedback.c | 55 +-----
cde/programs/dtwm/WmIBitmap.h | 25 ---
cde/programs/dtwm/WmWinList.c | 9 +-
12 files changed, 36 insertions(+), 740 deletions(-)
delete mode 100644 cde/programs/dtwm/WmBitmap.h
diff --git a/cde/include/Dt/HourGlass.h b/cde/include/Dt/HourGlass.h
index f6ad47ef..c9ee713a 100644
--- a/cde/include/Dt/HourGlass.h
+++ b/cde/include/Dt/HourGlass.h
@@ -47,6 +47,10 @@
#ifndef _hourglass_h
#define _hourglass_h
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* _DtGetHourGlassCursor -
*
* Builds and returns the appropriate HourGlass cursor.
@@ -86,9 +90,9 @@ extern void _DtTurnOffHourGlass(
* to remove hourglass cursor from.
*/
+#ifdef __cplusplus
+}
+#endif
#endif /* _hourglass_h */
/* DON'T ADD ANYTHING AFTER THIS #endif */
-
-
-
diff --git a/cde/lib/DtSvc/DtUtil2/HourGlass.c b/cde/lib/DtSvc/DtUtil2/HourGlass.c
index c43fd6f5..937343b7 100644
--- a/cde/lib/DtSvc/DtUtil2/HourGlass.c
+++ b/cde/lib/DtSvc/DtUtil2/HourGlass.c
@@ -117,55 +117,10 @@
#include <X11/Intrinsic.h>
#include "DtSvcLock.h"
-#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};
-
+#include <X11/bitmaps/xm_hour16>
+#include <X11/bitmaps/xm_hour16m>
+#include <X11/bitmaps/xm_hour32>
+#include <X11/bitmaps/xm_hour32m>
/******** Public Function Declarations ********/
@@ -205,8 +160,8 @@ Cursor
_DtGetHourGlassCursor(
Display *dpy )
{
- unsigned char *bits;
- unsigned char *maskBits;
+ char *bits;
+ char *maskBits;
unsigned int width;
unsigned int height;
unsigned int xHotspot;
@@ -237,21 +192,21 @@ _DtGetHourGlassCursor(
if (useLargeCursors)
{
- width = time32_width;
- height = time32_height;
- bits = time32_bits;
- maskBits = time32m_bits;
- xHotspot = time32_x_hot;
- yHotspot = time32_y_hot;
+ width = hour32_width;
+ height = hour32_height;
+ bits = hour32_bits;
+ maskBits = hour32m_bits;
+ xHotspot = hour32_x_hot;
+ yHotspot = hour32_y_hot;
}
else
{
- width = time16_width;
- height = time16_height;
- bits = time16_bits;
- maskBits = time16m_bits;
- xHotspot = time16_x_hot;
- yHotspot = time16_y_hot;
+ width = hour16_width;
+ height = hour16_height;
+ bits = hour16_bits;
+ maskBits = hour16m_bits;
+ xHotspot = hour16_x_hot;
+ yHotspot = hour16_y_hot;
}
pixmap = XCreateBitmapFromData (dpy,
@@ -351,16 +306,3 @@ _DtTurnOffHourGlass(
XFlush(XtDisplay(w));
}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cde/programs/dthello/dthello.c b/cde/programs/dthello/dthello.c
index 7789e721..be50ec9b 100644
--- a/cde/programs/dthello/dthello.c
+++ b/cde/programs/dthello/dthello.c
@@ -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
/*****************************************************************************
*
diff --git a/cde/programs/dthello/dthello.h b/cde/programs/dthello/dthello.h
index bc475686..f4636830 100644
--- a/cde/programs/dthello/dthello.h
+++ b/cde/programs/dthello/dthello.h
@@ -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,
diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h
index 3e0f2499..b3a0b2dc 100644
--- a/cde/programs/dtlogin/dm.h
+++ b/cde/programs/dtlogin/dm.h
@@ -905,8 +905,6 @@ extern char * localHostname( void ) ;
/******************************* util.c **************************/
extern void CleanUpChild( void ) ;
-extern Cursor GetHourGlass(
- Display *dpy) ;
#if !defined (ENABLE_DYNAMIC_LANGLIST)
extern void MakeLangList( void ) ;
#endif
diff --git a/cde/programs/dtlogin/util.c b/cde/programs/dtlogin/util.c
index 60a54e98..84fb4437 100644
--- a/cde/programs/dtlogin/util.c
+++ b/cde/programs/dtlogin/util.c
@@ -381,154 +381,6 @@ parseEnv( char **e, char *string )
return (e);
}
-
-
-
-/*************************************<->*************************************
- *
- * 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)
-{
- char *bits;
- 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 = (char *)time32_bits;
- maskBits = (char *)time32m_bits;
- xHotspot = time32_x_hot;
- yHotspot = time32_y_hot;
- }
- else
- {
- width = time16_width;
- height = time16_height;
- bits = (char *)time16_bits;
- maskBits = (char *)time16m_bits;
- xHotspot = time16_x_hot;
- yHotspot = time16_y_hot;
- }
-
- pixmap = XCreateBitmapFromData (dpy,
- DefaultRootWindow(dpy), bits,
- width, height);
-
- maskPixmap = XCreateBitmapFromData (dpy,
- DefaultRootWindow(dpy), 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);
-}
-
-
-
-
/*************************************<->*************************************
*
* void SetHourGlassCursor
@@ -561,7 +413,7 @@ SetHourGlassCursor( Display *dpy, Window w )
XUndefineCursor(dpy, w);
- cursor = GetHourGlass(dpy);
+ cursor = _DtGetHourGlassCursor(dpy);
XDefineCursor(dpy, w, cursor);
XFreeCursor(dpy, cursor);
diff --git a/cde/programs/dtprintinfo/libUI/MotifUI/MotifUI.C b/cde/programs/dtprintinfo/libUI/MotifUI/MotifUI.C
index d4563f00..d15c5afb 100644
--- a/cde/programs/dtprintinfo/libUI/MotifUI/MotifUI.C
+++ b/cde/programs/dtprintinfo/libUI/MotifUI/MotifUI.C
@@ -47,6 +47,8 @@
#include <Dt/Help.h>
#endif
+#include <Dt/HourGlass.h>
+
#include <Xm/ToggleB.h>
#include <Xm/RowColumn.h>
#include <Xm/ScrolledW.h>
@@ -767,108 +769,6 @@ void MotifUI::GetPixmaps(Widget w,
n_pixmaps++;
}
-// Cursor Shape support
-
-#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 MotifUI::InitHourGlassCursor()
-{
- unsigned int width;
- unsigned int height;
- unsigned int xHotspot;
- unsigned int yHotspot;
- Pixmap pixmap;
- Pixmap maskPixmap;
- XColor xcolors[2];
- char * bits;
- char * maskBits;
- Cursor cursor = None;
-
- if (XQueryBestCursor(display, root, 32, 32, &width, &height))
- {
- if ((width >= 32) && (height >= 32))
- {
- width = time32_width;
- height = time32_height;
- bits = (char *)time32_bits;
- maskBits = (char *)time32m_bits;
- xHotspot = time32_x_hot;
- yHotspot = time32_y_hot;
- }
- else
- {
- width = time16_width;
- height = time16_height;
- bits = (char *)time16_bits;
- maskBits = (char *)time16m_bits;
- xHotspot = time16_x_hot;
- yHotspot = time16_y_hot;
- }
-
- pixmap = XCreateBitmapFromData(display, root, bits, width, height);
-
- maskPixmap = XCreateBitmapFromData(display, root, maskBits,
- width, height);
- xcolors[0].pixel = black;
- xcolors[1].pixel = white;
-
- XQueryColors(display,
- DefaultColormapOfScreen(DefaultScreenOfDisplay (display)),
- xcolors, 2);
- cursor = XCreatePixmapCursor(display, pixmap, maskPixmap,
- &(xcolors[0]), &(xcolors[1]), xHotspot, yHotspot);
- XFreePixmap(display, pixmap);
- XFreePixmap(display, maskPixmap);
- }
- return cursor;
-}
-
PointerCursor MotifUI::PointerShape()
{
return pointer_style;
@@ -906,7 +806,7 @@ void MotifUI::PointerShape(PointerCursor style)
break;
case HOUR_GLASS_CURSOR:
if (!hour_glass)
- hour_glass = InitHourGlassCursor();
+ hour_glass = _DtGetHourGlassCursor(display);
cursor = hour_glass;
break;
case IBEAM_CURSOR:
diff --git a/cde/programs/dtwm/UI.c b/cde/programs/dtwm/UI.c
index af6c7c40..88523c5c 100644
--- a/cde/programs/dtwm/UI.c
+++ b/cde/programs/dtwm/UI.c
@@ -66,8 +66,6 @@
#include <langinfo.h>
#include <stdint.h>
-#define MWM_NEED_TIME16
-#include "WmBitmap.h"
#include "WmHelp.h"
#include "DataBaseLoad.h"
@@ -394,7 +392,6 @@ Initialize (DtPanelShellWidget panel_shell)
Pixmap busy_pixmap;
Pixmap busy_pixmap_mask;
- XColor xcolors[2];
Pixel black_pixel = BlackPixelOfScreen (screen);
Pixel white_pixel = WhitePixelOfScreen (screen);
@@ -410,25 +407,7 @@ Initialize (DtPanelShellWidget panel_shell)
/* Create busy cursor. */
- xcolors[0].pixel = black_pixel;
- xcolors[1].pixel = white_pixel;
-
- XQueryColors (display, DefaultColormapOfScreen (screen), xcolors, 2);
- busy_pixmap =
- XCreateBitmapFromData (display, RootWindowOfScreen (screen),
- (char *)time16_bits, time16_width, time16_height);
- busy_pixmap_mask =
- XCreateBitmapFromData (display, RootWindowOfScreen (screen),
- (char *)time16m_bits, time16_width, time16_height);
-
- panel.busy_cursor =
- XCreatePixmapCursor (display, busy_pixmap, busy_pixmap_mask,
- &(xcolors[0]), &(xcolors[1]),
- time16_x_hot, time16_y_hot);
-
- XFreePixmap (display, busy_pixmap);
- XFreePixmap (display, busy_pixmap_mask);
-
+ _DtGetHourGlassCursor(display);
panel.resolution = (int) (intptr_t) panel.element_values[PANEL_RESOLUTION].parsed_value;
diff --git a/cde/programs/dtwm/WmBitmap.h b/cde/programs/dtwm/WmBitmap.h
deleted file mode 100644
index 69a7f56a..00000000
--- a/cde/programs/dtwm/WmBitmap.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * CDE - Common Desktop Environment
- *
- * Copyright (c) 1993-2012, The Open Group. All rights reserved.
- *
- * These libraries and programs are free software; you can
- * redistribute them and/or modify them under the terms of the GNU
- * Lesser General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * These libraries and programs are distributed in the hope that
- * they will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with these libraries and programs; if not, write
- * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110-1301 USA
- */
-/*
- * (c) Copyright 1989, 1990, 1991, 1992, 1993 OPEN SOFTWARE FOUNDATION, INC.
- * ALL RIGHTS RESERVED
-*/
-/*
- * Motif Release 1.2.3
-*/
-/*
- * (c) Copyright 1987, 1988, 1989, 1990 HEWLETT-PACKARD COMPANY */
-
-/*
- * Global Variables And Definitions:
- */
-
-/*
- * Define HOURGLASS cursor
- */
-
-#ifdef LARGECURSORS
-#ifdef INTEGRATION_TESTING
-#include "integCursor.h"
-#endif /* INTEGRATION_TESTING */
-
-#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};
-
-#endif /* LARGECURSORS */
-
-
-#ifdef MWM_NEED_TIME16
-#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};
-#endif /* MWM_NEED_TIME16 */
-
-
-
-/*
- * Define DO NOT ENTER cursor
- */
-
-#ifdef LARGECURSORS
-
-#define noenter32_width 32
-#define noenter32_height 32
-#define noenter32_x_hot 15
-#define noenter32_y_hot 15
-
-static unsigned char noenter32_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 0xfc, 0x3f, 0x00,
- 0x00, 0xff, 0xff, 0x00, 0x80, 0xff, 0xff, 0x01, 0xc0, 0xff, 0xff, 0x03,
- 0xe0, 0xff, 0xff, 0x07, 0xf0, 0xff, 0xff, 0x0f, 0xf8, 0xff, 0xff, 0x1f,
- 0xf8, 0xff, 0xff, 0x1f, 0xfc, 0xff, 0xff, 0x3f, 0xfc, 0xff, 0xff, 0x3f,
- 0xfc, 0xff, 0xff, 0x3f, 0x06, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x60,
- 0x06, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x60,
- 0x06, 0x00, 0x00, 0x60, 0xfc, 0xff, 0xff, 0x3f, 0xfc, 0xff, 0xff, 0x3f,
- 0xfc, 0xff, 0xff, 0x3f, 0xf8, 0xff, 0xff, 0x1f, 0xf8, 0xff, 0xff, 0x1f,
- 0xf0, 0xff, 0xff, 0x0f, 0xe0, 0xff, 0xff, 0x07, 0xc0, 0xff, 0xff, 0x03,
- 0x80, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0xfc, 0x3f, 0x00,
- 0x00, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00};
-
-static unsigned char noenter32m_bits[] = {
- 0x00, 0xe0, 0x07, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x00,
- 0x80, 0xff, 0xff, 0x01, 0xc0, 0xff, 0xff, 0x03, 0xe0, 0xff, 0xff, 0x07,
- 0xf0, 0xff, 0xff, 0x0f, 0xf8, 0xff, 0xff, 0x1f, 0xfc, 0xff, 0xff, 0x3f,
- 0xfc, 0xff, 0xff, 0x3f, 0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f,
- 0xfe, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xff, 0x7f,
- 0xfe, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0xff, 0x3f, 0xfc, 0xff, 0xff, 0x3f,
- 0xf8, 0xff, 0xff, 0x1f, 0xf0, 0xff, 0xff, 0x0f, 0xe0, 0xff, 0xff, 0x07,
- 0xc0, 0xff, 0xff, 0x03, 0x80, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x00,
- 0x00, 0xfc, 0x3f, 0x00, 0x00, 0xe0, 0x07, 0x00};
-
-#endif /* LARGECURSORS */
-
-#ifdef MWM_NEED_NOENTER16
-#define noenter16_width 16
-#define noenter16_height 16
-#define noenter16_x_hot 7
-#define noenter16_y_hot 7
-
-static unsigned char noenter16_bits[] = {
- 0x00, 0x00, 0xc0, 0x03, 0xf0, 0x0f, 0xf8, 0x1f, 0xfc, 0x3f, 0xfc, 0x3f,
- 0xfe, 0x7f, 0x02, 0x40, 0x02, 0x40, 0xfe, 0x7f, 0xfc, 0x3f, 0xfc, 0x3f,
- 0xf8, 0x1f, 0xf0, 0x0f, 0xc0, 0x03, 0x00, 0x00};
-
-static unsigned char noenter16m_bits[] = {
- 0xc0, 0x03, 0xf0, 0x0f, 0xf8, 0x1f, 0xfc, 0x3f, 0xfe, 0x7f, 0xfe, 0x7f,
- 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xfe, 0x7f,
- 0xfc, 0x3f, 0xf8, 0x1f, 0xf0, 0x0f, 0xc0, 0x03};
-
-#endif /* MWM_NEED_NOENTER16 */
diff --git a/cde/programs/dtwm/WmFeedback.c b/cde/programs/dtwm/WmFeedback.c
index 7d7df683..54f268f6 100644
--- a/cde/programs/dtwm/WmFeedback.c
+++ b/cde/programs/dtwm/WmFeedback.c
@@ -36,8 +36,6 @@
#include "WmGlobal.h"
#include "WmResNames.h"
-#define MWM_NEED_TIME16
-#include "WmBitmap.h"
#include "WmError.h"
#include <Xm/Xm.h>
#include <X11/Shell.h>
@@ -898,8 +896,6 @@ void ConfirmAction (WmScreenData *pSD, int nbr)
void ShowWaitState (Boolean flag)
{
- char *bits;
- char *maskBits;
unsigned int width;
unsigned int height;
unsigned int xHotspot;
@@ -908,56 +904,7 @@ void ShowWaitState (Boolean flag)
Pixmap maskPixmap;
XColor xcolors[2];
- if (!waitCursor)
- {
-#ifdef LARGECURSORS
- if (wmGD.useLargeCursors)
- {
- width = time32_width;
- height = time32_height;
- bits = (char *)time32_bits;
- maskBits = (char *)time32m_bits;
- xHotspot = time32_x_hot;
- yHotspot = time32_y_hot;
- }
- else
-#endif /* LARGECURSORS */
-
- {
- width = time16_width;
- height = time16_height;
- bits = (char *)time16_bits;
- maskBits = (char *)time16m_bits;
- xHotspot = time16_x_hot;
- yHotspot = time16_y_hot;
- }
-
- pixmap = XCreateBitmapFromData (DISPLAY,
- DefaultRootWindow(DISPLAY), bits,
- width, height);
-
- maskPixmap = XCreateBitmapFromData (DISPLAY,
- DefaultRootWindow(DISPLAY), maskBits,
- width, height);
-#ifdef INTEGRATION_TESTING_
- xcolors[1].pixel = BlackPixelOfScreen(DefaultScreenOfDisplay(DISPLAY));
- xcolors[0].pixel = WhitePixelOfScreen(DefaultScreenOfDisplay(DISPLAY));
-#else /* INTEGRATION_TESTING */
-
- xcolors[0].pixel = BlackPixelOfScreen(DefaultScreenOfDisplay(DISPLAY));
- xcolors[1].pixel = WhitePixelOfScreen(DefaultScreenOfDisplay(DISPLAY));
-
-#endif /* INTEGRATION_TESTING */
- XQueryColors (DISPLAY,
- DefaultColormapOfScreen(DefaultScreenOfDisplay
- (DISPLAY)),
- xcolors, 2);
- waitCursor = XCreatePixmapCursor (DISPLAY, pixmap, maskPixmap,
- &(xcolors[0]), &(xcolors[1]),
- xHotspot, yHotspot);
- XFreePixmap (DISPLAY, pixmap);
- XFreePixmap (DISPLAY, maskPixmap);
- }
+ _DtGetHourGlassCursor(DISPLAY);
if (flag)
{
diff --git a/cde/programs/dtwm/WmIBitmap.h b/cde/programs/dtwm/WmIBitmap.h
index 4978ba62..e3971966 100644
--- a/cde/programs/dtwm/WmIBitmap.h
+++ b/cde/programs/dtwm/WmIBitmap.h
@@ -296,29 +296,4 @@ static unsigned char bits6_bits[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
#endif /* DTWM_NEED_BACKBITS */
-/*
- *
- * Used to define the small hourglass and mask used to indicate
- * a front panel wait state.
- *
- */
-#ifdef DTWM_NEED_TIME16
-#define time16_x_hot 7
-#define time16_y_hot 7
-#define time16_width 14
-#define time16_height 15
-
-static unsigned char time16_bits[] = {
- 0x00, 0x00, 0xfe, 0x1f, 0xfe, 0x1f, 0x04, 0x0c, 0x54, 0x0d, 0xac, 0x0e,
- 0x58, 0x07, 0xb0, 0x03, 0x50, 0x03, 0x08, 0x06, 0x44, 0x0c, 0xa4, 0x0c,
- 0x54, 0x0d, 0xfe, 0x1f, 0xfe, 0x1f};
-
-#define time16m_width 14
-#define time16m_height 15
-static unsigned char time16m_bits[] = {
- 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0x06, 0x1c, 0xfe, 0x1f, 0xfe, 0x1f,
- 0xfc, 0x0f, 0xf8, 0x07, 0x5c, 0x07, 0x0e, 0x0e, 0x66, 0x0c, 0xf6, 0x1c,
- 0xfe, 0x1f, 0xff, 0x3f, 0xff, 0x3f};
-#endif /* DTWM_NEED_TIME16 */
-
/**************************** eof ***************************/
diff --git a/cde/programs/dtwm/WmWinList.c b/cde/programs/dtwm/WmWinList.c
index e6909c66..3269687a 100644
--- a/cde/programs/dtwm/WmWinList.c
+++ b/cde/programs/dtwm/WmWinList.c
@@ -40,10 +40,6 @@
#include "WmGlobal.h"
-#define MWM_NEED_NOENTER16
-#include "WmBitmap.h"
-
-
/*
* include extern functions
*/
@@ -57,7 +53,10 @@
#include "WmWinInfo.h"
#include "WmWrkspace.h"
-
+#include <X11/bitmaps/xm_noenter16>
+#include <X11/bitmaps/xm_noenter16m>
+#include <X11/bitmaps/xm_noenter32>
+#include <X11/bitmaps/xm_noenter32m>
/*
--
2.17.1
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
