Remove redundant hourglass functions
This commit is contained in:
Chase
@@ -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;
|
||||
|
||||
|
||||
@@ -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 */
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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 ***************************/
|
||||
|
||||
@@ -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>
|
||||
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user