debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cde-next

Browse Source
This commit is contained in:
Jon Trulson
2018-08-01 19:18:17 -06:00
parent e2f1df0c8b 66db2259f7
commit f6d83dd5e3
347 changed files with 65952 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/programs/dtcm/dtcm/Imakefile
View File

@@ -113,9 +113,7 @@ ICONS = \
compose.mask.icon contract_xbm \
drag_mask_xbm drag_xbm \
expand_xbm icon_pixmap_xbm \
postup_xbm xm_error_xbm \
xm_information_xbm xm_question_xbm \
xm_warning_xbm
postup_xbm
ComplexProgramTarget_1($(PROG1),$(LOCAL_LIBRARIES),)
ComplexProgramTarget_2($(PROG2),$(TTY_LIBRARIES),)

30
cde/programs/dtcm/dtcm/misc.c
View File

@@ -62,10 +62,10 @@
#include "contract_xbm"
#include "expand_xbm"
#include "postup_xbm"
#include "xm_error_xbm"
#include "xm_information_xbm"
#include "xm_question_xbm"
#include "xm_warning_xbm"
#include <X11/bitmaps/xm_error>
#include <X11/bitmaps/xm_information>
#include <X11/bitmaps/xm_question>
#include <X11/bitmaps/xm_warning>
/*******************************************************************************
**
@@ -562,23 +562,23 @@ create_all_pixmaps(Props_pu *p, Widget w)
if (XmInstallImage(&pui, "postup_pixmap"))
p->postup_pixmap = XmGetPixmap(s, "postup_pixmap", fg, bg);
fill_pixmap(&eri, xm_error_xbm_width, xm_error_xbm_height,
xm_error_xbm_bits);
fill_pixmap(&eri, xm_error_width, xm_error_height,
xm_error_bits);
if (XmInstallImage(&eri, "err_pixmap"))
p->xm_error_pixmap = XmGetPixmap(s, "err_pixmap", fg, bg);
fill_pixmap(&ii, xm_information_xbm_width, xm_information_xbm_height,
xm_information_xbm_bits);
fill_pixmap(&ii, xm_information_width, xm_information_height,
xm_information_bits);
if (XmInstallImage(&ii, "info_pixmap"))
p->xm_info_pixmap = XmGetPixmap(s, "info_pixmap", fg, bg);
fill_pixmap(&qi, xm_question_xbm_width, xm_question_xbm_height,
xm_question_xbm_bits);
fill_pixmap(&qi, xm_question_width, xm_question_height,
xm_question_bits);
if (XmInstallImage(&qi, "q_pixmap"))
p->xm_question_pixmap = XmGetPixmap(s, "q_pixmap", fg, bg);
fill_pixmap(&wi, xm_warning_xbm_width, xm_warning_xbm_height,
xm_warning_xbm_bits);
fill_pixmap(&wi, xm_warning_width, xm_warning_height,
xm_warning_bits);
if (XmInstallImage(&wi, "w_pixmap"))
p->xm_warning_pixmap = XmGetPixmap(s, "w_pixmap", fg, bg);

9
cde/programs/dtcm/dtcm/xm_error_xbm
View File

@@ -1,9 +0,0 @@
/* $XConsortium: xm_error_xbm /main/2 1995/07/19 16:49:51 drk $ */
#define xm_error_xbm_width 20
#define xm_error_xbm_height 20
static unsigned char xm_error_xbm_bits[] = {
0x00, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0xf0, 0x3a, 0x00, 0x58, 0x55, 0x00,
0x2c, 0xa0, 0x00, 0x56, 0x40, 0x01, 0xaa, 0x80, 0x02, 0x46, 0x81, 0x01,
0x8a, 0x82, 0x02, 0x06, 0x85, 0x01, 0x0a, 0x8a, 0x02, 0x06, 0x94, 0x01,
0x0a, 0xe8, 0x02, 0x14, 0x50, 0x01, 0x28, 0xb0, 0x00, 0xd0, 0x5f, 0x00,
0xa0, 0x2a, 0x00, 0x40, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

8
cde/programs/dtcm/dtcm/xm_information_xbm
View File

@@ -1,8 +0,0 @@
/* $XConsortium: xm_information_xbm /main/2 1995/07/19 16:50:01 drk $ */
#define xm_information_xbm_width 11
#define xm_information_xbm_height 24
static unsigned char xm_information_xbm_bits[] = {
0x00, 0x00, 0x78, 0x00, 0x54, 0x00, 0x2c, 0x00, 0x54, 0x00, 0x28, 0x00,
0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x2a, 0x00, 0x5c, 0x00, 0x28, 0x00,
0x58, 0x00, 0x28, 0x00, 0x58, 0x00, 0x28, 0x00, 0x58, 0x00, 0x28, 0x00,
0x58, 0x00, 0xae, 0x01, 0x56, 0x01, 0xaa, 0x00, 0x00, 0x00, 0x00, 0x00};

10
cde/programs/dtcm/dtcm/xm_question_xbm
View File

@@ -1,10 +0,0 @@
/* $XConsortium: xm_question_xbm /main/2 1995/07/19 16:50:11 drk $ */
#define xm_question_xbm_width 22
#define xm_question_xbm_height 22
static unsigned char xm_question_xbm_bits[] = {
0xf0, 0x3f, 0x00, 0x58, 0x55, 0x00, 0xac, 0xaa, 0x00, 0xd6, 0x5f, 0x01,
0xea, 0xbf, 0x02, 0xf6, 0x7f, 0x01, 0xea, 0xba, 0x02, 0xf6, 0x7d, 0x05,
0xea, 0xba, 0x0a, 0x56, 0x7d, 0x15, 0xaa, 0xbe, 0x1e, 0x56, 0x5f, 0x01,
0xac, 0xaf, 0x02, 0x58, 0x57, 0x01, 0xb0, 0xaf, 0x00, 0x60, 0x55, 0x01,
0xa0, 0xaa, 0x00, 0x60, 0x17, 0x00, 0xa0, 0x2f, 0x00, 0x60, 0x17, 0x00,
0xb0, 0x2a, 0x00, 0x50, 0x55, 0x00};

8
cde/programs/dtcm/dtcm/xm_warning_xbm
View File

@@ -1,8 +0,0 @@
/* $XConsortium: xm_warning_xbm /main/2 1995/07/19 16:50:29 drk $ */
#define xm_warning_xbm_width 9
#define xm_warning_xbm_height 22
static unsigned char xm_warning_xbm_bits[] = {
0x00, 0x00, 0x18, 0x00, 0x2c, 0x00, 0x56, 0x00, 0x2a, 0x00, 0x56, 0x00,
0x2a, 0x00, 0x56, 0x00, 0x2c, 0x00, 0x14, 0x00, 0x2c, 0x00, 0x14, 0x00,
0x2c, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x14, 0x00,
0x2c, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00};