From c47e29037996e734df08a28c5167c270c40ff32e Mon Sep 17 00:00:00 2001 From: Liang Chang Date: Sun, 17 Oct 2021 10:23:17 -0600 Subject: [PATCH] Remove DtXpm. --- cde/include/Dt/xpm.h | 90 ------------------------------ cde/lib/DtSvc/DtXpm/xpm.c | 105 ----------------------------------- cde/lib/DtSvc/Makefile.am | 3 +- cde/lib/DtSvc/libDtSvc.elist | 6 -- 4 files changed, 1 insertion(+), 203 deletions(-) delete mode 100644 cde/include/Dt/xpm.h delete mode 100644 cde/lib/DtSvc/DtXpm/xpm.c diff --git a/cde/include/Dt/xpm.h b/cde/include/Dt/xpm.h deleted file mode 100644 index 33bacf019..000000000 --- a/cde/include/Dt/xpm.h +++ /dev/null @@ -1,90 +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 - */ -/* $XConsortium: xpm.h /main/4 1996/02/19 16:42:00 lehors $ */ -/* - * (c) Copyright 1996 Digital Equipment Corporation. - * (c) Copyright 1996 Hewlett-Packard Company. - * (c) Copyright 1996 International Business Machines Corp. - * (c) Copyright 1996 Sun Microsystems, Inc. - * (c) Copyright 1996 Novell, Inc. - * (c) Copyright 1996 FUJITSU LIMITED. - * (c) Copyright 1996 Hitachi. - */ - -/*****************************************************************************\ -* * -* This is only a wrapper around the Xpm functions which now come as part of * -* Motif. This is provided for backward compatibility only and therefore only * -* supports symbols declared as private in the elist and none of the internal * -* ones. * -* * -\*****************************************************************************/ - -#ifndef xpm_h -#define xpm_h - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -extern int _DtXpmCreatePixmapFromData(Display *display, - Drawable d, - char **data, - Pixmap *pixmap_return, - Pixmap *shapemask_return, - XpmAttributes *attributes); - -extern int _DtXpmReadFileToPixmap(Display *display, - Drawable d, - char *filename, - Pixmap *pixmap_return, - Pixmap *shapemask_return, - XpmAttributes *attributes); - -extern int _DtXpmWriteFileFromPixmap(Display *display, - char *filename, - Pixmap pixmap, - Pixmap shapemask, - XpmAttributes *attributes); - -extern int _DtXpmReadFileToImage(Display *display, - char *filename, - XImage **image_return, - XImage **shapeimage_return, - XpmAttributes *attributes); - -extern int _DtXpmWriteFileFromImage(Display *display, - char *filename, - XImage *image, - XImage *shapeimage, - XpmAttributes *attributes); - -extern void _DtXpmFreeAttributes(XpmAttributes *attributes); - -#ifdef __cplusplus -} /* for C++ V2.0 */ -#endif - -#endif diff --git a/cde/lib/DtSvc/DtXpm/xpm.c b/cde/lib/DtSvc/DtXpm/xpm.c deleted file mode 100644 index 30bf477dd..000000000 --- a/cde/lib/DtSvc/DtXpm/xpm.c +++ /dev/null @@ -1,105 +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 - */ -/* $XConsortium: xpm.c /main/1 1996/02/19 16:41:55 lehors $ */ -/* - * (c) Copyright 1996 Digital Equipment Corporation. - * (c) Copyright 1996 Hewlett-Packard Company. - * (c) Copyright 1996 International Business Machines Corp. - * (c) Copyright 1996 Sun Microsystems, Inc. - * (c) Copyright 1996 Novell, Inc. - * (c) Copyright 1996 FUJITSU LIMITED. - * (c) Copyright 1996 Hitachi. - */ - -/*****************************************************************************\ -* * -* This is only a wrapper around the Xpm functions which now come as part of * -* Motif. This is provided for backward compatibility only and therefore only * -* supports symbols declared as private in the elist and none of the internal * -* ones. * -* * -\*****************************************************************************/ - -#include - -int _DtXpmCreatePixmapFromData(Display *display, - Drawable d, - char **data, - Pixmap *pixmap_return, - Pixmap *shapemask_return, - XpmAttributes *attributes) -{ - return XpmCreatePixmapFromData(display, d, data, - pixmap_return, shapemask_return, - attributes); -} - -int _DtXpmReadFileToPixmap(Display *display, - Drawable d, - char *filename, - Pixmap *pixmap_return, - Pixmap *shapemask_return, - XpmAttributes *attributes) -{ - return XpmReadFileToPixmap(display, d, filename, - pixmap_return, shapemask_return, - attributes); -} - -int _DtXpmWriteFileFromPixmap(Display *display, - char *filename, - Pixmap pixmap, - Pixmap shapemask, - XpmAttributes *attributes) -{ - return XpmWriteFileFromPixmap(display, filename, - pixmap, shapemask, - attributes); -} - -int _DtXpmReadFileToImage(Display *display, - char *filename, - XImage **image_return, - XImage **shapeimage_return, - XpmAttributes *attributes) -{ - return XpmReadFileToImage(display, filename, - image_return, shapeimage_return, - attributes); -} - -int _DtXpmWriteFileFromImage(Display *display, - char *filename, - XImage *image, - XImage *shapeimage, - XpmAttributes *attributes) -{ - return XpmWriteFileFromImage(display, filename, - image, shapeimage, - attributes); -} - -void _DtXpmFreeAttributes(XpmAttributes *attributes) -{ - XpmFreeAttributes(attributes); -} diff --git a/cde/lib/DtSvc/Makefile.am b/cde/lib/DtSvc/Makefile.am index bb9650c23..355e4cd06 100644 --- a/cde/lib/DtSvc/Makefile.am +++ b/cde/lib/DtSvc/Makefile.am @@ -136,5 +136,4 @@ libDtSvc_la_SOURCES = DtCodelibs/buf.C \ DtUtil2/UErrNoBMS.c \ DtUtil2/Utility.c \ DtUtil2/XlationSvc.c \ - DtUtil2/XmWrap.c \ - DtXpm/xpm.c + DtUtil2/XmWrap.c diff --git a/cde/lib/DtSvc/libDtSvc.elist b/cde/lib/DtSvc/libDtSvc.elist index e09c29498..719f3e7c8 100644 --- a/cde/lib/DtSvc/libDtSvc.elist +++ b/cde/lib/DtSvc/libDtSvc.elist @@ -278,12 +278,6 @@ private _DtWsmSelectionNameForScreen private _DtWsmSetBackdropSearchPath private _DtWsmSetDtWmHints private _DtWsmSetWorkspaceTitle -private _DtXpmCreatePixmapFromData -private _DtXpmFreeAttributes -private _DtXpmReadFileToImage -private _DtXpmReadFileToPixmap -private _DtXpmWriteFileFromImage -private _DtXpmWriteFileFromPixmap private _Dt_NextChar private _Dt_PrevChar private _Dt_isspace