update to xclipboard 1.1.0

This commit is contained in:
matthieu 2009-10-23 20:46:20 +00:00
parent 78d88d8014
commit 5f8169f66e
13 changed files with 4956 additions and 3013 deletions

View File

@ -1,31 +1,318 @@
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 96d1fe9241f6b68d52c9b3020dd926319d830558
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 14 22:37:17 2009 -0700
* configure.ac:
Update package version for X11R7 release.
xclipboard 1.1.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit f16c6dd23a132d037e513cd378b2a0e0417ebb8c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 13 19:58:31 2009 -0700
* configure.ac:
Update package version number for final X11R7 release candidate.
Enable #ifdef XKB code to call XkbStdBell() if libxkbfile is found
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 42432a7776c0cc94c6ec5360c1ab74f484328167
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 13 19:51:11 2009 -0700
* Makefile.am:
* configure.ac:
Change to use the app-defaults default dir configured in libXt.
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 458673cf5192f800621bcd2b371eb55be9b5ba50
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 1 14:54:21 2009 -0700
* Makefile.am:
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
Add README with pointers to mailing lists, bugzilla, & git
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit 7d5f24fd8182ac6650d4080f74237c8f3773acb4
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Jan 12 20:27:18 2009 -0200
* configure.ac:
Update package version number for X11R7 RC3 release.
Ansification and compile warning fixes.
This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck and most gcc 4.3 and sparse warnings.
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
commit e66bb8c9fb0678cb1086320f931d805491b747f7
Author: James Cloos <cloos@jhcloos.com>
Date: Wed Aug 20 10:32:49 2008 -0400
* configure.ac:
Update package version number for RC1 release.
xaw8 is gone, use xaw7
commit 9f85f47d7cf25fba98207cc8c0a64b2bfc494c14
Author: Stanislav Maslovski <stanislav.maslovski@gmail.com>
Date: Wed Jul 16 14:35:49 2008 -0400
Fix UTF-8 support.
* use XA_UTF8_STRING defined in <X11/Xmu/Atoms.h>.
* add "*international: true" to fallback resources like xedit does.
* get rid of a separate InsertClipboardUtf8() and rewrite InsertClipboard()
to support proper conversion from UTF-8 with fallbacks to CTEXT or STRING
in case of errors.
* add COMPOUND_TEXT to the list of supported targets and unify
the conversion code for UTF-8, CTEXT and STRING in ConvertSelection().
Use a proper default for target TEXT.
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit f7f9265623762bfa06cec5273de11d2ec55d4917
Author: Stanislav Maslovski <stanislav.maslovski@gmail.com>
Date: Fri Jul 11 09:37:45 2008 -0400
Add UTF-8 support.
While reading manuals on X selections, xt and xaw I have
added support of UTF-8 to xclipboard.
As is seen from the patch I use “UTF8_STRING” atom
in the negotiation of the selection type. There are
other possibilities and it seems that there is no
real standard on this, right? I have checked that
UTF8_STRING works with both GTK+ and QT apps.
In addition to the patch to enable correct display
of international texts in xaw widgets one has to define
*international: true
in ones XRM.
And enough rich set of bitmap fonts must be also installed.
From bug 16671.
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit aecddb8eae77fd36acdca88bb7080b875274d47c
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 16 14:17:52 2008 +0200
$(builddir) is the current directory
Apparently automake doesn't always export the builddir variable.
This fixes my previous commit.
commit 0013b5aa18798da38e7eb64b8bbb96f16268a474
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 20 19:12:08 2008 +0200
Fix build with builddir != srcdir
commit 4cd445822a3cc48cde7102cecacc54f6daabe25b
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 20 19:05:17 2008 +0200
Use AM_CFLAGS instead of {xclipboard,xcutsel}_CFLAGS and remove AM_PROG_CC_C_O
commit 6422151ddd39e50621df2ec4d5c9b52a189b378b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Mar 27 20:25:18 2008 -0700
Added missing AM_PROG_CC_C_O
commit 43c7eeef9be867511c2c4ee82aa05ffc925efa65
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Mar 27 20:07:36 2008 -0700
Build fix for file systems that are not case sensitive
commit 22d6a8b72a1e52c7554e50fd250519d5a79e2816
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:37:10 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
commit 8587904b2dd914fa0a52f1246cd09b50a252054d
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:51:16 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
commit c543ac48d51df1f3fc7a85daf962d632cf5be07d
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:24:40 2007 -0400
Rename .cvsignore to .gitignore
commit 9d2fff958be21935020a443b3fb56bd2d41cd789
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:29:48 2005 +0000
Update package version for X11R7 release.
commit 63db9d62f56a1429bdc6865337cea064e1c3e55c
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:22:42 2005 +0000
Stub COPYING files
commit 3c1e6ab769aaf446951641b560d31f45870c3520
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:05 2005 +0000
Update package version number for final X11R7 release candidate.
commit d1c1ebd46e0931bbffb10f3d8d06b18fc1233910
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 7 16:17:58 2005 +0000
Change to use the app-defaults default dir configured in libXt.
commit 0481b59715f074a1c105afee876cd62960e124a1
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:19 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
commit 1a7a14e9b097a3fae172d25fa654af72929b7890
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:18 2005 +0000
Update package version number for X11R7 RC3 release.
commit 21a312bea06be1dda2d64076a87d6ad1324e01d9
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:01:40 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
commit 0245cfa0e04fd73aae23db52f7c424d5c07644f6
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:34:58 2005 +0000
Another pass at .cvsignores for apps.
commit 75a9ef36c20f318b8da281febf584ce15c10ef35
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Nov 20 22:08:51 2005 +0000
Add/improve .cvsignore files for apps.
commit bbb7e9adb403e7896af68944941ca9229b4bfa3e
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:47:52 2005 +0000
Update package version number for RC1 release.
commit 1f5bb8da77add50c72b721d8d63e25d25f99b19e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 18 00:32:54 2005 +0000
Change default install dir for app-default files from
$(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match
the monolith & allow localization
commit 8b5c18ad03870baac75724ee8e674511548ca25d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 23:56:21 2005 +0000
Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
work better with BSD make
commit 19e2998cd3c424c25aa3780f12da517453428f83
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Oct 14 00:25:43 2005 +0000
Use sed to fill in variables in man page
commit c440a0452b998073b2dec8bf8278eca8136675be
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Aug 1 20:25:29 2005 +0000
Install man pages to section 1 instead of section m (Patch from Donnie
Berkholz)
commit 5578b4284a0dcfea32cea8dae3992fe509249f84
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:31 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
commit ed3b3927eccbcf03debd34572285176074bec03b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Jul 26 15:44:01 2005 +0000
Replace more GNU make-ism's with more portable macros
commit 9caece10b7a09796331f5e6c02696bfb212b2e11
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 20 19:31:51 2005 +0000
Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
configure cache, you cache it, and the cached value is probably wrong.
commit fdc0992af4020cb5230a64058281b6e5aed0d3a1
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Jul 17 20:11:02 2005 +0000
fix rules to work with non-GNU make and outside of $srcdir
commit e0a326f3bd7889da2352a1e534871a64b693545a
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 6 17:30:20 2005 +0000
Build system for xclipboard and xcutsel
commit 85a4962bf0afd349b3260f68fb29aa06b0117f57
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:54:39 2004 +0000
Merging XORG-CURRENT into trunk
commit 146e4cdd54a23384e879fc814ded63d0d790ba1f
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:35:00 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit 6269527e0703627ca9e0316c82c2159a1c7114f1
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:12:55 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 538cb471c6767c367fcd1955cf3eac8a8b043c31
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:36:16 2004 +0000
readding XFree86's cvs IDs
commit 52bd64ce38b07c7609434b72b35127b2324a0f73
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:23:58 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit 94abf1754b04b1e6382fe0287b1e7eb2ce6ffdf3
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:29:03 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit 63371815b3f48cb8d4793e6a520d2fc4350c5f1f
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:58 2003 +0000
XFree86 4.3.0.1
commit 729ceb19417c61603e659b2eb82d2e02fa388365
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 15:54:53 2003 +0000
R6.6 is the Xorg base-line

View File

@ -21,9 +21,10 @@
bin_PROGRAMS = xclipboard xcutsel
AM_CFLAGS = $(CWARNFLAGS) $(XCLIPBOARD_CFLAGS)
# xclipboard
xclipboard_CFLAGS = $(XCLIPBOARD_CFLAGS)
xclipboard_LDADD = $(XCLIPBOARD_LIBS)
xclipboard_SOURCES = \
@ -31,7 +32,6 @@ xclipboard_SOURCES = \
# xcutsel
xcutsel_CFLAGS = $(XCLIPBOARD_CFLAGS)
xcutsel_LDADD = $(XCLIPBOARD_LIBS)
xcutsel_SOURCES = \
@ -45,30 +45,20 @@ appman_PRE = \
# App default files (*.ad)
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
appdefaultdir = @appdefaultdir@
APPDEFAULTFILES = \
XClipboard
SUFFIXES = .ad
.ad:
cp $< $@
appdefault_DATA = $(APPDEFAULTFILES)
EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
CLEANFILES = $(APPDEFAULTFILES)
dist_appdefault_DATA = \
app-defaults/XClipboard
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
CLEANFILES += $(appman_DATA)
EXTRA_DIST = $(appman_PRE)
CLEANFILES = $(appman_DATA)
SED = sed
@ -89,7 +79,17 @@ MAN_SUBSTS = \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES += .$(APP_MAN_SUFFIX) .man
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog

View File

@ -59,11 +59,11 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = xclipboard$(EXEEXT) xcutsel$(EXEEXT)
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
compile config.guess config.sub depcomp install-sh missing \
mkinstalldirs
DIST_COMMON = README $(am__configure_deps) $(dist_appdefault_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
ChangeLog INSTALL NEWS config.guess config.sub depcomp \
install-sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@ -71,18 +71,18 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" \
"$(DESTDIR)$(appmandir)"
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
"$(DESTDIR)$(appdefaultdir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_xclipboard_OBJECTS = xclipboard-xclipboard.$(OBJEXT)
am_xclipboard_OBJECTS = xclipboard.$(OBJEXT)
xclipboard_OBJECTS = $(am_xclipboard_OBJECTS)
am__DEPENDENCIES_1 =
xclipboard_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_xcutsel_OBJECTS = xcutsel-xcutsel.$(OBJEXT)
am_xcutsel_OBJECTS = xcutsel.$(OBJEXT)
xcutsel_OBJECTS = $(am_xcutsel_OBJECTS)
xcutsel_DEPENDENCIES = $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
@ -100,9 +100,9 @@ am__vpath_adj = case $$p in \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
appdefaultDATA_INSTALL = $(INSTALL_DATA)
appmanDATA_INSTALL = $(INSTALL_DATA)
DATA = $(appdefault_DATA) $(appman_DATA)
dist_appdefaultDATA_INSTALL = $(INSTALL_DATA)
DATA = $(appman_DATA) $(dist_appdefault_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@ -115,7 +115,6 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
@ -133,7 +132,10 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@ -142,9 +144,11 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -173,16 +177,10 @@ PKG_CONFIG = @PKG_CONFIG@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
TMP_XAW_CFLAGS = @TMP_XAW_CFLAGS@
TMP_XAW_LIBS = @TMP_XAW_LIBS@
VERSION = @VERSION@
XAW_USE_XPRINT_FALSE = @XAW_USE_XPRINT_FALSE@
XAW_USE_XPRINT_TRUE = @XAW_USE_XPRINT_TRUE@
XCLIPBOARD_CFLAGS = @XCLIPBOARD_CFLAGS@
XCLIPBOARD_LIBS = @XCLIPBOARD_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
@ -190,8 +188,6 @@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
# App default files (*.ad)
appdefaultdir = @appdefaultdir@
bindir = @bindir@
build = @build@
@ -200,37 +196,44 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CFLAGS = $(CWARNFLAGS) $(XCLIPBOARD_CFLAGS)
# xclipboard
xclipboard_CFLAGS = $(XCLIPBOARD_CFLAGS)
xclipboard_LDADD = $(XCLIPBOARD_LIBS)
xclipboard_SOURCES = \
xclipboard.c
# xcutsel
xcutsel_CFLAGS = $(XCLIPBOARD_CFLAGS)
xcutsel_LDADD = $(XCLIPBOARD_LIBS)
xcutsel_SOURCES = \
xcutsel.c
@ -241,15 +244,16 @@ appman_PRE = \
xclipboard.man \
xcutsel.man
APPDEFAULTFILES = \
XClipboard
SUFFIXES = .ad .$(APP_MAN_SUFFIX) .man
appdefault_DATA = $(APPDEFAULTFILES)
EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) $(appman_PRE)
CLEANFILES = $(APPDEFAULTFILES) $(appman_DATA)
# App default files (*.ad)
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
dist_appdefault_DATA = \
app-defaults/XClipboard
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE) ChangeLog
CLEANFILES = $(appman_DATA)
SED = sed
# Strings to replace in man pages
@ -268,11 +272,13 @@ MAN_SUBSTS = \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
MAINTAINERCLEANFILES = ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .ad .$(APP_MAN_SUFFIX) .man .c .o .obj
.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj
am--refresh:
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@ -359,8 +365,8 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xclipboard-xclipboard.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcutsel-xcutsel.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xclipboard.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcutsel.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@ -375,52 +381,7 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
xclipboard-xclipboard.o: xclipboard.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xclipboard_CFLAGS) $(CFLAGS) -MT xclipboard-xclipboard.o -MD -MP -MF "$(DEPDIR)/xclipboard-xclipboard.Tpo" -c -o xclipboard-xclipboard.o `test -f 'xclipboard.c' || echo '$(srcdir)/'`xclipboard.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xclipboard-xclipboard.Tpo" "$(DEPDIR)/xclipboard-xclipboard.Po"; else rm -f "$(DEPDIR)/xclipboard-xclipboard.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xclipboard.c' object='xclipboard-xclipboard.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xclipboard_CFLAGS) $(CFLAGS) -c -o xclipboard-xclipboard.o `test -f 'xclipboard.c' || echo '$(srcdir)/'`xclipboard.c
xclipboard-xclipboard.obj: xclipboard.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xclipboard_CFLAGS) $(CFLAGS) -MT xclipboard-xclipboard.obj -MD -MP -MF "$(DEPDIR)/xclipboard-xclipboard.Tpo" -c -o xclipboard-xclipboard.obj `if test -f 'xclipboard.c'; then $(CYGPATH_W) 'xclipboard.c'; else $(CYGPATH_W) '$(srcdir)/xclipboard.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xclipboard-xclipboard.Tpo" "$(DEPDIR)/xclipboard-xclipboard.Po"; else rm -f "$(DEPDIR)/xclipboard-xclipboard.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xclipboard.c' object='xclipboard-xclipboard.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xclipboard_CFLAGS) $(CFLAGS) -c -o xclipboard-xclipboard.obj `if test -f 'xclipboard.c'; then $(CYGPATH_W) 'xclipboard.c'; else $(CYGPATH_W) '$(srcdir)/xclipboard.c'; fi`
xcutsel-xcutsel.o: xcutsel.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcutsel_CFLAGS) $(CFLAGS) -MT xcutsel-xcutsel.o -MD -MP -MF "$(DEPDIR)/xcutsel-xcutsel.Tpo" -c -o xcutsel-xcutsel.o `test -f 'xcutsel.c' || echo '$(srcdir)/'`xcutsel.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xcutsel-xcutsel.Tpo" "$(DEPDIR)/xcutsel-xcutsel.Po"; else rm -f "$(DEPDIR)/xcutsel-xcutsel.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xcutsel.c' object='xcutsel-xcutsel.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcutsel_CFLAGS) $(CFLAGS) -c -o xcutsel-xcutsel.o `test -f 'xcutsel.c' || echo '$(srcdir)/'`xcutsel.c
xcutsel-xcutsel.obj: xcutsel.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcutsel_CFLAGS) $(CFLAGS) -MT xcutsel-xcutsel.obj -MD -MP -MF "$(DEPDIR)/xcutsel-xcutsel.Tpo" -c -o xcutsel-xcutsel.obj `if test -f 'xcutsel.c'; then $(CYGPATH_W) 'xcutsel.c'; else $(CYGPATH_W) '$(srcdir)/xcutsel.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xcutsel-xcutsel.Tpo" "$(DEPDIR)/xcutsel-xcutsel.Po"; else rm -f "$(DEPDIR)/xcutsel-xcutsel.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xcutsel.c' object='xcutsel-xcutsel.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xcutsel_CFLAGS) $(CFLAGS) -c -o xcutsel-xcutsel.obj `if test -f 'xcutsel.c'; then $(CYGPATH_W) 'xcutsel.c'; else $(CYGPATH_W) '$(srcdir)/xcutsel.c'; fi`
uninstall-info-am:
install-appdefaultDATA: $(appdefault_DATA)
@$(NORMAL_INSTALL)
test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
@list='$(appdefault_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
$(appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
done
uninstall-appdefaultDATA:
@$(NORMAL_UNINSTALL)
@list='$(appdefault_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
done
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
@ -438,6 +399,23 @@ uninstall-appmanDATA:
echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
rm -f "$(DESTDIR)$(appmandir)/$$f"; \
done
install-dist_appdefaultDATA: $(dist_appdefault_DATA)
@$(NORMAL_INSTALL)
test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
@list='$(dist_appdefault_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
echo " $(dist_appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
$(dist_appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
done
uninstall-dist_appdefaultDATA:
@$(NORMAL_UNINSTALL)
@list='$(dist_appdefault_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@ -490,6 +468,7 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkdir_p) $(distdir)/app-defaults
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@ -516,6 +495,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@ -617,7 +599,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS) $(DATA) config.h
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" "$(DESTDIR)$(appmandir)"; do \
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(appdefaultdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@ -645,6 +627,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@ -666,7 +649,7 @@ info: info-am
info-am:
install-data-am: install-appdefaultDATA install-appmanDATA
install-data-am: install-appmanDATA install-dist_appdefaultDATA
install-exec-am: install-binPROGRAMS
@ -695,30 +678,35 @@ ps: ps-am
ps-am:
uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \
uninstall-binPROGRAMS uninstall-info-am
uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
uninstall-dist_appdefaultDATA uninstall-info-am
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-compile distclean-generic distclean-hdr \
dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
distclean distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-appdefaultDATA install-appmanDATA install-binPROGRAMS \
install-data install-data-am install-exec install-exec-am \
install-info install-info-am install-man install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-appdefaultDATA uninstall-appmanDATA \
uninstall-binPROGRAMS uninstall-info-am
install-appmanDATA install-binPROGRAMS install-data \
install-data-am install-dist_appdefaultDATA install-exec \
install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-appmanDATA \
uninstall-binPROGRAMS uninstall-dist_appdefaultDATA \
uninstall-info-am
.ad:
cp $< $@
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.PHONY: ChangeLog
ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -0,0 +1,28 @@
xclipboard is used to collect and display text selections that are
sent to the CLIPBOARD by other clients. It is typically used to save
CLIPBOARD selections for later use. It stores each CLIPBOARD
selection as a separate string, each of which can be selected.
All questions regarding this software should be directed at the
Xorg mailing list:
http://lists.freedesktop.org/mailman/listinfo/xorg
Please submit bug reports to the Xorg bugzilla:
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/app/xclipboard
http://cgit.freedesktop.org/xorg/app/xclipboard
For patch submission instructions, see:
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
For more information on the git code manager, see:
http://wiki.x.org/wiki/GitPage

View File

@ -995,72 +995,7 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
dnl copyright notice and this permission notice appear in supporting
dnl documentation.
dnl
dnl The above copyright notice and this permission notice shall be included
dnl in all copies or substantial portions of the Software.
dnl
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
dnl OTHER DEALINGS IN THE SOFTWARE.
dnl
dnl Except as contained in this notice, the name of the copyright holders shall
dnl not be used in advertising or otherwise to promote the sale, use or
dnl other dealings in this Software without prior written authorization
dnl from the copyright holders.
dnl
# XAW_CHECK_XPRINT_SUPPORT()
# --------------------------
# Adds --enable/disable-xprint and selects the appropriate version of the Xaw
# library. If neither --enable-xprint nor --disable-xprint are given,
# the presence of an Xaw with Xprint support will be auto detected
AC_DEFUN([XAW_CHECK_XPRINT_SUPPORT],[
AC_ARG_ENABLE(xprint, AC_HELP_STRING([--enable-xprint], [Enable XPrint support]),
[use_xprint=$enableval],[use_xprint=auto])
if test "x$use_xprint" = "xyes"; then
TMP_CHECK1=xaw8
TMP_CHECK2=
xaw_use_xprint=yes
elif test "x$use_xprint" = "xno"; then
TMP_CHECK1=xaw7
TMP_CHECK2=
xaw_use_xprint=no
else
TMP_CHECK1=xaw8
TMP_CHECK2=xaw7
xaw_use_xprint=yes
fi
PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK1, success=yes, success=no)
if [[ ! -z $TMP_CHECK2 ]] ; then
if test $success = no ; then
PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK2, success=yes, success=no)
xaw_use_xprint=no
fi
fi
if test "x$success" = "xyes"; then
$1_CFLAGS=$TMP_XAW_CFLAGS
$1_LIBS=$TMP_XAW_LIBS
AM_CONDITIONAL([XAW_USE_XPRINT], [test "x$xaw_use_xprint" = "xyes"])
else
AC_MSG_ERROR([No suitable version of Xaw found])
fi
])
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
dnl
@ -1097,27 +1032,24 @@ dnl of the copyright holder.
# your configure.ac with the minimum required version, such as:
# XORG_MACROS_VERSION(1.1)
#
# To force at least a version with this macro defined, also add:
# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
# To ensure that this macro is defined, also add:
# m4_ifndef([XORG_MACROS_VERSION],
# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
#
#
# See the "minimum version" comment for each macro you use to see what
# version you require.
AC_DEFUN([XORG_MACROS_VERSION],[
[XORG_MACROS_needed_version=$1
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
[XORG_MACROS_version=1.1.5
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
fi
if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
fi
AC_MSG_RESULT([yes, $XORG_MACROS_version])
m4_defun([XORG_MACROS_VERSION],[
m4_define([vers_have], [1.3.0])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
[m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
m4_if(m4_version_compare(vers_have, [$1]), -1,
[m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
m4_undefine([vers_have])
m4_undefine([maj_have])
m4_undefine([maj_needed])
]) # XORG_MACROS_VERSION
# XORG_PROG_RAWCPP()
@ -1142,6 +1074,10 @@ else
if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
RAWCPPFLAGS=-undef
AC_MSG_RESULT([yes])
# under Cygwin unix is still defined even with -undef
elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
RAWCPPFLAGS="-undef -ansi"
AC_MSG_RESULT([yes, with -ansi])
else
AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
fi
@ -1254,10 +1190,16 @@ AC_SUBST([ADMIN_MAN_DIR])
# Whether or not the necessary tools and files are found can be checked
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
AC_DEFUN([XORG_CHECK_LINUXDOC],[
XORG_SGML_PATH=$prefix/share/sgml
if test x$XORG_SGML_PATH = x ; then
XORG_SGML_PATH=$prefix/share/sgml
fi
HAVE_DEFS_ENT=
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
if test x"$cross_compiling" = x"yes" ; then
HAVE_DEFS_ENT=no
else
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
fi
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
@ -1306,7 +1248,9 @@ AC_SUBST(MAKE_HTML)
# indicates whether the necessary tools and files are found and, if set,
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
AC_DEFUN([XORG_CHECK_DOCBOOK],[
XORG_SGML_PATH=$prefix/share/sgml
if test x$XORG_SGML_PATH = x ; then
XORG_SGML_PATH=$prefix/share/sgml
fi
HAVE_DEFS_ENT=
BUILDTXTDOC=no
BUILDPDFDOC=no
@ -1372,7 +1316,7 @@ AC_SUBST(MAKE_HTML)
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
AC_ARG_ENABLE(malloc0returnsnull,
AC_HELP_STRING([--enable-malloc0returnsnull],
AS_HELP_STRING([--enable-malloc0returnsnull],
[malloc(0) returns NULL (default: auto)]),
[MALLOC_ZERO_RETURNS_NULL=$enableval],
[MALLOC_ZERO_RETURNS_NULL=auto])
@ -1424,7 +1368,7 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
AC_DEFUN([XORG_WITH_LINT],[
# Allow checking code with lint, sparse, etc.
AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
[Use a lint-style source code checker (default: disabled)])],
[use_lint=$withval], [use_lint=no])
if test "x$use_lint" = "xyes" ; then
@ -1465,7 +1409,7 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
AC_DEFUN([XORG_LINT_LIBRARY],[
AC_REQUIRE([XORG_WITH_LINT])
# Build lint "library" for more indepth checks of programs calling this library
AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
[Create lint library (default: disabled)])],
[make_lint_lib=$enableval], [make_lint_lib=no])
if test "x$make_lint_lib" != "xno" ; then
@ -1483,6 +1427,75 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
]) # XORG_LINT_LIBRARY
# XORG_CWARNFLAGS
# ---------------
# Minimum version: 1.2.0
#
# Defines CWARNFLAGS to enable C compiler warnings.
#
AC_DEFUN([XORG_CWARNFLAGS], [
AC_REQUIRE([AC_PROG_CC])
if test "x$GCC" = xyes ; then
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
-Wbad-function-cast"
case `$CC -dumpversion` in
3.4.* | 4.*)
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
;;
esac
else
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
if test "x$SUNCC" = "xyes"; then
CWARNFLAGS="-v"
fi
fi
AC_SUBST(CWARNFLAGS)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
]) # XORG_CWARNFLAGS
# XORG_STRICT_OPTION
# -----------------------
# Minimum version: 1.3.0
#
# Add configure option to enable strict compilation
AC_DEFUN([XORG_STRICT_OPTION], [
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_PROG_CC_C99])
AC_REQUIRE([XORG_CWARNFLAGS])
AC_ARG_ENABLE(strict-compilation,
AS_HELP_STRING([--enable-strict-compilation],
[Enable all warnings from compiler and make them errors (default: disabled)]),
[STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
if test "x$STRICT_COMPILE" = "xyes"; then
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
if test "x$GCC" = xyes ; then
STRICT_CFLAGS="-pedantic -Werror"
elif test "x$SUNCC" = "xyes"; then
STRICT_CFLAGS="-errwarn"
elif test "x$INTELCC" = "xyes"; then
STRICT_CFLAGS="-Werror"
fi
fi
CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
AC_SUBST([CWARNFLAGS])
]) # XORG_STRICT_OPTION
# XORG_DEFAULT_OPTIONS
# --------------------
# Minimum version: 1.3.0
#
# Defines default options for X.Org modules.
#
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
XORG_CWARNFLAGS
XORG_STRICT_OPTION
XORG_RELEASE_VERSION
XORG_CHANGELOG
XORG_MANPAGE_SECTIONS
]) # XORG_DEFAULT_OPTIONS
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@ -1517,7 +1530,7 @@ dnl
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
AC_HELP_STRING([--with-release-version=STRING],
AS_HELP_STRING([--with-release-version=STRING],
[Use release version string in package name]),
[RELEASE_VERSION="$withval"],
[RELEASE_VERSION=""])
@ -1529,14 +1542,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
[Major version of this package])
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
if test "x$PVM" = "x"; then
PVM="0"
fi
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
[$PVM],
[Minor version of this package])
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
if test "x$PVP" = "x"; then
PVP="0"
fi
@ -1545,3 +1558,20 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
[Patch version of this package])
])
# XORG_CHANGELOG()
# ----------------
# Minimum version: 1.2.0
#
# Defines the variable CHANGELOG_CMD as the command to generate
# ChangeLog from git.
#
# Arrange that distcleancheck ignores ChangeLog left over by distclean.
#
AC_DEFUN([XORG_CHANGELOG], [
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
echo 'git directory not found: installing possibly empty changelog.' >&2)"
AC_SUBST([CHANGELOG_CMD])
AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
]) # XORG_CHANGELOG

View File

@ -1,142 +0,0 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
scriptversion=2005-05-14.22
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
case $1 in
'')
echo "$0: No command. Try \`$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
Wrapper for compilers which do not understand `-c -o'.
Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
right script to run: please start by reading the file `INSTALL'.
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "compile $scriptversion"
exit $?
;;
esac
ofile=
cfile=
eat=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as `compile cc -o foo foo.c'.
# So we strip `-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
ofile=$2
;;
*)
set x "$@" -o "$2"
shift
;;
esac
;;
*.c)
cfile=$1
set x "$@" "$1"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -z "$ofile" || test -z "$cfile"; then
# If no `-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
# `.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
"$@"
ret=$?
if test -f "$cofile"; then
mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

View File

@ -1,5 +1,32 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Name of package */
#undef PACKAGE
@ -27,5 +54,11 @@
/* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION
/* Define to use libxkbfile calls like XKBStdBell() */
#undef XKB

6696
app/xclipboard/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -22,25 +22,41 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(xclipboard,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xclipboard)
AC_INIT(xclipboard, [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xclipboard)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
XAW_CHECK_XPRINT_SUPPORT(XCLIPBOARD)
PKG_CHECK_EXISTS([xkbfile], [XKBPKG="xkbfile"], [XKBPKG=""])
if test x$XKBPKG = xxkbfile ; then
AC_DEFINE([XKB], [1], [Define to use libxkbfile calls like XKBStdBell()])
fi
PKG_CHECK_MODULES(XCLIPBOARD, [xaw7 xmu xt x11 ${XKBPKG}])
AC_SUBST(XCLIPBOARD_CFLAGS)
AC_SUBST(XCLIPBOARD_LIBS)
PKG_CHECK_MODULES(APPDEFS, xt)
appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
AC_ARG_WITH(appdefaultdir,
AC_HELP_STRING([--with-appdefaultdir=<pathname>],
[specify directory for app-defaults files (default is autodetected)]),
[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
AC_SUBST(appdefaultdir)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
XORG_CHANGELOG
AC_OUTPUT([Makefile])

View File

@ -1,158 +0,0 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
scriptversion=2005-06-29.22
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Public domain.
#
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
errstatus=0
dirmode=
usage="\
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
Create each directory DIR (with mode MODE, if specified), including all
leading file name components.
Report bugs to <bug-automake@gnu.org>."
# process command line arguments
while test $# -gt 0 ; do
case $1 in
-h | --help | --h*) # -h for help
echo "$usage"
exit $?
;;
-m) # -m PERM arg
shift
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
dirmode=$1
shift
;;
--version)
echo "$0 $scriptversion"
exit $?
;;
--) # stop option processing
shift
break
;;
-*) # unknown option
echo "$usage" 1>&2
exit 1
;;
*) # first non-opt arg
break
;;
esac
done
for file
do
if test -d "$file"; then
shift
else
break
fi
done
case $# in
0) exit 0 ;;
esac
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
# mkdir -p a/c at the same time, both will detect that a is missing,
# one will create a, then the other will try to create a and die with
# a "File exists" error. This is a problem when calling mkinstalldirs
# from a parallel make. We use --version in the probe to restrict
# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
'')
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
echo "mkdir -p -- $*"
exec mkdir -p -- "$@"
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
# directories to create, and then abort because `.' already
# exists.
test -d ./-p && rmdir ./-p
test -d ./--version && rmdir ./--version
fi
;;
*)
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
test ! -d ./--version; then
echo "mkdir -m $dirmode -p -- $*"
exec mkdir -m "$dirmode" -p -- "$@"
else
# Clean up after NextStep and OpenStep mkdir.
for d in ./-m ./-p ./--version "./$dirmode";
do
test -d $d && rmdir $d
done
fi
;;
esac
for file
do
case $file in
/*) pathcomp=/ ;;
*) pathcomp= ;;
esac
oIFS=$IFS
IFS=/
set fnord $file
shift
IFS=$oIFS
for d
do
test "x$d" = x && continue
pathcomp=$pathcomp$d
case $pathcomp in
-*) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp"
mkdir "$pathcomp" || lasterr=$?
if test ! -d "$pathcomp"; then
errstatus=$lasterr
else
if test ! -z "$dirmode"; then
echo "chmod $dirmode $pathcomp"
lasterr=
chmod "$dirmode" "$pathcomp" || lasterr=$?
if test ! -z "$lasterr"; then
errstatus=$lasterr
fi
fi
fi
fi
pathcomp=$pathcomp/
done
done
exit $errstatus
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:

View File

@ -27,6 +27,7 @@ in this Software without prior written authorization from The Open Group.
* Author: Ralph Swick, DEC/Project Athena
* Updated for R4: Chris D. Peterson, MIT X Consortium.
* Reauthored by: Keith Packard, MIT X Consortium.
* UTF-8 and CTEXT support: Stanislav Maslovski <stanislav.maslovski@gmail.com>
*/
/* $XFree86: xc/programs/xclipboard/xclipboard.c,v 1.8tsi Exp $ */
@ -74,6 +75,11 @@ static Atom wm_protocols;
static void EraseTextWidget ( void );
static void NewCurrentClipContents ( char *data, int len );
static String fallback_resources[] = {
"*international: true",
NULL
};
static long
TextLength(Widget w)
{
@ -130,7 +136,7 @@ NewClip(Widget w, ClipPtr old)
newClip = (ClipPtr) malloc (sizeof (ClipRec));
if (!newClip)
return newClip;
newClip->clip = 0;
newClip->clip = NULL;
newClip->avail = 0;
newClip->prev = old;
newClip->next = NULL;
@ -425,7 +431,7 @@ EraseTextWidget(void)
}
XtActionsRec xclipboard_actions[] = {
static XtActionsRec xclipboard_actions[] = {
{ "NewClip", NewCurrentClip },
{ "NextClip", NextCurrentClip },
{ "PrevClip", PrevCurrentClip },
@ -456,25 +462,70 @@ InsertClipboard(Widget w, XtPointer client_data, Atom *selection,
Atom *type, XtPointer value, unsigned long *length,
int *format)
{
if (*type != XT_CONVERT_FAIL)
NewCurrentClipContents ((char *) value, *length);
else
Display *d = XtDisplay(w);
Atom target = (Atom)client_data;
Boolean convert_failed = (*type == XT_CONVERT_FAIL);
if (!convert_failed)
{
Arg arg;
XtSetArg (arg, XtNlabel, "CLIPBOARD selection conversion failed");
XtSetValues (failDialog, &arg, 1);
CenterWidgetOnWidget (failDialogShell, text);
XtPopup (failDialogShell, XtGrabNone);
char **list;
int i, ret, count;
XTextProperty prop;
prop.value = value;
prop.nitems = *length;
prop.format = *format;
prop.encoding = *type;
ret = XmbTextPropertyToTextList(d, &prop, &list, &count);
if (ret >= Success)
{
/* manuals say something about multiple strings in a disjoint
text selection (?), it should be harmless to get them all */
for (i = 0; i < count; i++)
NewCurrentClipContents(list[i], strlen(list[i]));
XFreeStringList(list);
} else
convert_failed = True;
XFree(value);
}
if (convert_failed) {
/* if UTF8_STRING failed try COMPOUND_TEXT */
if (target == XA_UTF8_STRING(d))
{
XtGetSelectionValue(w, *selection, XA_COMPOUND_TEXT(d),
InsertClipboard,
(XtPointer)(XA_COMPOUND_TEXT(d)),
CurrentTime);
return;
}
/* if COMPOUND_TEXT failed try STRING */
else if (target == XA_COMPOUND_TEXT(d))
{
XtGetSelectionValue(w, *selection, XA_STRING,
InsertClipboard,
NULL,
CurrentTime);
return;
}
/* all conversions failed */
else
{
Arg arg;
XtSetArg (arg, XtNlabel, "CLIPBOARD selection conversion failed");
XtSetValues (failDialog, &arg, 1);
CenterWidgetOnWidget (failDialogShell, text);
XtPopup (failDialogShell, XtGrabNone);
#ifdef XKB
XkbStdBell( XtDisplay(w), XtWindow(w), 0, XkbBI_MinorError );
XkbStdBell (d, XtWindow(w), 0, XkbBI_MinorError);
#else
XBell( XtDisplay(w), 0 );
XBell (d, 0);
#endif
}
}
XtOwnSelection(top, ClipboardAtom, CurrentTime,
ConvertSelection, LoseSelection, NULL);
XFree(value);
}
static Boolean
@ -493,10 +544,12 @@ ConvertSelection(Widget w, Atom *selection, Atom *target,
XmuConvertStandardSelection(w, req->time, selection, target, type,
(XPointer*)&std_targets, &std_length,
format);
*value = XtMalloc(sizeof(Atom)*(std_length + 5));
*value = XtMalloc(sizeof(Atom)*(std_length + 7));
targetP = *(Atom**)value;
*targetP++ = XA_STRING;
*targetP++ = XA_TEXT(d);
*targetP++ = XA_UTF8_STRING(d);
*targetP++ = XA_COMPOUND_TEXT(d);
*targetP++ = XA_LENGTH(d);
*targetP++ = XA_LIST_LENGTH(d);
*targetP++ = XA_CHARACTER_POSITION(d);
@ -541,19 +594,38 @@ ConvertSelection(Widget w, Atom *selection, Atom *target,
}
if (*target == XA_STRING ||
*target == XA_TEXT(d) ||
*target == XA_COMPOUND_TEXT(d))
*target == XA_TEXT(d) ||
*target == XA_UTF8_STRING(d) ||
*target == XA_COMPOUND_TEXT(d))
{
if (*target == XA_COMPOUND_TEXT(d))
*type = *target;
else
*type = XA_STRING;
*length = TextLength (text);
*value = _XawTextGetSTRING((TextWidget) text, 0, *length);
*format = 8;
return True;
Arg args[1];
Widget source;
XTextProperty prop;
int ret, style = XStdICCTextStyle; /* a safe default for TEXT */
char *data;
source = XawTextGetSource (text);
XtSetArg (args[0], XtNstring, &data);
XtGetValues (source, args, 1);
if (*target == XA_UTF8_STRING(d))
style = XUTF8StringStyle;
else if (*target == XA_COMPOUND_TEXT(d))
style = XCompoundTextStyle;
else if (*target == XA_STRING)
style = XStringStyle;
ret = XmbTextListToTextProperty (d, &data, 1, style, &prop);
if (ret >= Success) {
*length = prop.nitems;
*value = prop.value;
*type = prop.encoding;
*format = prop.format;
return True;
} else
return False;
}
if (XmuConvertStandardSelection(w, req->time, selection, target, type,
(XPointer *) value, length, format))
return True;
@ -564,8 +636,9 @@ ConvertSelection(Widget w, Atom *selection, Atom *target,
static void
LoseSelection(Widget w, Atom *selection)
{
XtGetSelectionValue(w, *selection, XA_STRING, InsertClipboard,
NULL, CurrentTime);
Display *d = XtDisplay(w);
XtGetSelectionValue(w, *selection, XA_UTF8_STRING(d), InsertClipboard,
(XtPointer)(XA_UTF8_STRING(d)), CurrentTime);
}
/*ARGSUSED*/
@ -592,7 +665,7 @@ static ResourceData userOptions;
#define Offset(field) XtOffsetOf(ResourceData, field)
XtResource resources[] = {
static XtResource resources[] = {
{"wrap", "Wrap", XtRBoolean, sizeof(Boolean),
Offset(wrap), XtRImmediate, (XtPointer)False}
};
@ -610,7 +683,7 @@ main(int argc, char *argv[])
XtSetLanguageProc(NULL, NULL, NULL);
top = XtAppInitialize( &xtcontext, "XClipboard", table, XtNumber(table),
&argc, argv, NULL, NULL, 0);
&argc, argv, fallback_resources, NULL, 0);
XtGetApplicationResources(top, (XtPointer)&userOptions, resources,
XtNumber(resources), NULL, 0);

View File

@ -62,7 +62,7 @@ typedef struct {
int length;
} OptionsRec;
OptionsRec options;
static OptionsRec options;
#define Offset(field) XtOffsetOf(OptionsRec, field)