external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

dticon: use libXpm directly.

Browse source
This commit is contained in:
Liang Chang 2021-10-17 08:43:45 -06:00 • committed by Jon Trulson
parent 6a0990615d
commit b2ff2704cf
4 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cde/programs/dticon/externals.h
View file

@ -29,7 +29,7 @@
* Novell, Inc.
**********************************************************************/
#include <Xm/Xm.h>
#include <Dt/xpm.h>
#include <X11/xpm.h>
#include "constants.h"
extern char *black_string;

10
cde/programs/dticon/fileIO.c
View file

@ -326,7 +326,7 @@ Read_File(
/*** try to read the XPM/XBM file, in the order ***/
/*** specified by the 'first' format. ***/
if (first == FORMAT_XPM) {
status = _DtXpmReadFileToPixmap(dpy, tablet_win,
status = XpmReadFileToPixmap(dpy, tablet_win,
fname, &pix_ret, &shape_ret, &xpm_ReadAttribs);
#ifdef DEBUG
@ -335,7 +335,7 @@ Read_File(
XDestroyImage(debug_image);
if (debug_shape)
XDestroyImage(debug_shape);
debug_status = _DtXpmReadFileToImage(dpy, fname,
debug_status = XpmReadFileToImage(dpy, fname,
&debug_image, &debug_shape, &xpm_ReadAttribs);
}
#endif
@ -361,7 +361,7 @@ Read_File(
status = XReadBitmapFile(dpy, tablet_win, fname,
&width_ret, &height_ret, &pix_ret, &x_hot, &y_hot);
if (status != BitmapSuccess) {
status = _DtXpmReadFileToPixmap(dpy, tablet_win,
status = XpmReadFileToPixmap(dpy, tablet_win,
fname, &pix_ret, &shape_ret, &xpm_ReadAttribs);
if (status != XpmSuccess) {
#ifdef DEBUG
@ -515,11 +515,11 @@ Write_File(
if (debug)
Dump_AttribStruct(&xpm_WriteAttribs);
#endif
status = _DtXpmWriteFileFromPixmap(dpy, fname, color_icon, 0,
status = XpmWriteFileFromPixmap(dpy, fname, color_icon, 0,
&xpm_WriteAttribs);
/*******
status = _DtXpmWriteFileFromPixmap(dpy, fname, color_icon, NULL, NULL);
status = XpmWriteFileFromPixmap(dpy, fname, color_icon, NULL, NULL);
********/
if (status != XpmSuccess) {
#ifdef DEBUG

2
cde/programs/dticon/globals.c
View file

@ -29,7 +29,7 @@
* Novell, Inc.
**********************************************************************/
#include <Xm/Xm.h>
#include <Dt/xpm.h>
#include <X11/xpm.h>
#include "constants.h"
char *black_string="black";

28
cde/programs/dticon/utils.c
View file

@ -241,46 +241,46 @@ Create_Gfx_Labels(
xpm_ReadAttribs.colorsymbols = colorSymbols;
xpm_ReadAttribs.numsymbols = NUM_PENS;
status = _DtXpmCreatePixmapFromData(dpy, root, Circle, &circlePix, &mask,
status = XpmCreatePixmapFromData(dpy, root, Circle, &circlePix, &mask,
&xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,2, "Cannot initialize button icon for circle"));
status = _DtXpmCreatePixmapFromData(dpy, root, CircleSolid, &circleSolidPix,
status = XpmCreatePixmapFromData(dpy, root, CircleSolid, &circleSolidPix,
&mask, &xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,4, "Cannot initialize button icon for solid circle"));
status = _DtXpmCreatePixmapFromData(dpy, root, Connected, &polylinePix, &mask,
status = XpmCreatePixmapFromData(dpy, root, Connected, &polylinePix, &mask,
&xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,6, "Cannot initialize button icon for polyline"));
status = _DtXpmCreatePixmapFromData(dpy, root, ConnectedClosed, &polygonPix,
status = XpmCreatePixmapFromData(dpy, root, ConnectedClosed, &polygonPix,
&mask, &xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,8, "Cannot initialize button icon for polygon"));
status = _DtXpmCreatePixmapFromData(dpy, root, ConnecClosedSolid,
status = XpmCreatePixmapFromData(dpy, root, ConnecClosedSolid,
&polygonSolidPix, &mask, &xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,10, "Cannot initialize button icon for solid polygon"));
status = _DtXpmCreatePixmapFromData(dpy, root, Ellipse, &ellipsePix, &mask,
status = XpmCreatePixmapFromData(dpy, root, Ellipse, &ellipsePix, &mask,
&xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,12, "Cannot initialize button icon for ellipse"));
status = _DtXpmCreatePixmapFromData(dpy, root, EllipseSolid, &ellipseSolidPix,
status = XpmCreatePixmapFromData(dpy, root, EllipseSolid, &ellipseSolidPix,
&mask, &xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,14, "Cannot initialize button icon for solid ellipse"));
status = _DtXpmCreatePixmapFromData(dpy, root, Eraser, &eraserPix, &mask,
status = XpmCreatePixmapFromData(dpy, root, Eraser, &eraserPix, &mask,
&xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,16, "Cannot initialize button icon for eraser"));
status = _DtXpmCreatePixmapFromData(dpy, root, Line, &linePix, &mask,
status = XpmCreatePixmapFromData(dpy, root, Line, &linePix, &mask,
&xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,18, "Cannot initialize button icon for line"));
status = _DtXpmCreatePixmapFromData(dpy, root, PaintBucket, &floodPix, &mask,
status = XpmCreatePixmapFromData(dpy, root, PaintBucket, &floodPix, &mask,
&xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,20, "Cannot initialize button icon for flood"));
status = _DtXpmCreatePixmapFromData(dpy, root, Pencil, &pointPix, &mask,
status = XpmCreatePixmapFromData(dpy, root, Pencil, &pointPix, &mask,
&xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,22, "Cannot initialize button icon for point"));
status = _DtXpmCreatePixmapFromData(dpy, root, Rectangle, &rectPix, &mask,
status = XpmCreatePixmapFromData(dpy, root, Rectangle, &rectPix, &mask,
&xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,24, "Cannot initialize button icon for rectangle"));
status = _DtXpmCreatePixmapFromData(dpy, root, RectangleSolid, &rectSolidPix,
status = XpmCreatePixmapFromData(dpy, root, RectangleSolid, &rectSolidPix,
&mask, &xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,26, "Cannot initialize button icon for solid rectangle"));
status = _DtXpmCreatePixmapFromData(dpy, root, SelectArea, &selectPix, &mask,
status = XpmCreatePixmapFromData(dpy, root, SelectArea, &selectPix, &mask,
&xpm_ReadAttribs);
if (status != XpmSuccess) Abort(GETSTR(10,28, "Cannot initialize button icon for select"));