Permalink
Browse files

pulled all of rxvt-unicode-9.06 source in, I will need to compile rx…

…vt to compare outputs
  • Loading branch information...
1 parent 15d05ae commit de882d27d08fd860c8998d4224aecfdbfb33ad3a Patrick Mullen committed Aug 10, 2009
Showing with 1,536 additions and 10,860 deletions.
  1. +0 −5 Changes
  2. +4 −4 Makefile
  3. +0 −1 README.FAQ
  4. +22 −22 config.h
  5. +38 −26 config.status
  6. +17 −147 src/Makefile
  7. +1,451 −10,644 src/background.C
  8. BIN src/background.o
  9. +0 −3 src/command.C
  10. BIN src/keyboard.o
  11. +4 −8 src/rxvt.h
View
5 Changes
@@ -19,11 +19,6 @@ WISH: load system-wide config file even if we don't have one
WISH: look into XAddConnectionWatch, does anybody need that?
DUMB: support tex fonts
-TODO: exg-- patch
-TODO: selection_beg/end should set screen, or so
- - urxvt did not compile without frills enabled
- (analysed by Matthew Rosewarne).
-
9.06 Sat Nov 8 17:47:18 CET 2008
- NOTICE: this release updates terminfo/termcap.
- updates libev to 3.48.
View
8 Makefile
@@ -15,10 +15,10 @@ man3dir = ${prefix}/share/man/man3
man3ext = 3
man7dir = ${prefix}/share/man/man7
man7ext = 7
-PERL =
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = /usr/bin/install -c -m 755
-INSTALL_DATA = /usr/bin/install -c -m 644
+PERL = /opt/local/bin/perl
+INSTALL = /opt/local/bin/ginstall -c
+INSTALL_PROGRAM = /opt/local/bin/ginstall -c -m 755
+INSTALL_DATA = /opt/local/bin/ginstall -c -m 644
VERNAME = rxvt-unicode-$(VERSION)
View
1 README.FAQ
@@ -5,7 +5,6 @@ RXVT-UNICODE/URXVT FREQUENTLY ASKED QUESTIONS
"#rxvt-unicode" has some rxvt-unicode enthusiasts that might be
interested in learning about new and exciting problems (but not FAQs :).
-
I use Gentoo, and I have a problem...
There are three big problems with Gentoo Linux: first of all, most if
not all Gentoo systems are completely broken (missing or mismatched
View
44 config.h
@@ -12,19 +12,19 @@
/* #undef EIGHT_BIT_CONTROLS */
/* Define if you want to automatically compose combining characters */
-/* #undef ENABLE_COMBINING */
+#define ENABLE_COMBINING 1
/* Define if you want handling for rarely used but handy features */
-/* #undef ENABLE_FRILLS */
+#define ENABLE_FRILLS 1
/* Define if you can embed a perl interpreter */
-/* #undef ENABLE_PERL */
+#define ENABLE_PERL 1
/* Define if you want bold and italic support */
-/* #undef ENABLE_STYLES */
+#define ENABLE_STYLES 1
/* Define if you want your background to use the parent window background */
-/* #undef ENABLE_TRANSPARENCY */
+#define ENABLE_TRANSPARENCY 1
/* Define if you want european extended codesets */
#define ENCODING_EU 1
@@ -259,7 +259,7 @@
#define HAVE_WCHAR_H 1
/* Define to 1 if you have the <X11/Xft/Xft.h> header file. */
-/* #undef HAVE_X11_XFT_XFT_H */
+#define HAVE_X11_XFT_XFT_H 1
/* Define if you have XPointer typedef */
#define HAVE_XPOINTER 1
@@ -280,37 +280,37 @@
/* #undef LASTLOG_FILE */
/* Define if you want to have lastlog support when utmp/utmpx is enabled */
-/* #undef LASTLOG_SUPPORT */
+#define LASTLOG_SUPPORT 1
/* Define to have CTRL cause wheel events to accelerate scrolling. Release
CTRL to halt scrolling */
-/* #undef MOUSE_SLIP_WHEELING */
+#define MOUSE_SLIP_WHEELING 1
/* Define to use wheel events (button4 and button5) to scroll */
-/* #undef MOUSE_WHEEL */
+#define MOUSE_WHEEL 1
/* Support NeXT style scrollbars */
-/* #undef NEXT_SCROLLBAR */
+#define NEXT_SCROLLBAR 1
/* Define if you don't want support for the backspace key */
-#define NO_BACKSPACE_KEY 1
+/* #undef NO_BACKSPACE_KEY */
/* Define if you don't want support for the (non-keypad) delete key */
-#define NO_DELETE_KEY 1
+/* #undef NO_DELETE_KEY */
/* Define if you don't want any resources read */
-#define NO_RESOURCES 1
+/* #undef NO_RESOURCES */
/* Define for continual scrolling when you keep the scrollbar button pressed
*/
-#define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
+/* #undef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
/* Disable the secondary screen. Many programs use the secondary screen as
their workplace */
-#define NO_SECONDARY_SCREEN 1
+/* #undef NO_SECONDARY_SCREEN */
/* Define if you want faded colors when focus is lost */
-/* #undef OFF_FOCUS_FADING */
+#define OFF_FOCUS_FADING 1
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
@@ -331,7 +331,7 @@
#define PLAIN_SCROLLBAR 1
/* Define if you want hide the pointer while typing */
-/* #undef POINTER_BLANK */
+#define POINTER_BLANK 1
/* Resource class */
#define RESCLASS "URxvt"
@@ -346,14 +346,14 @@
#define RXVTNAME "urxvt"
/* Support Rxvt original style scrollbars */
-/* #undef RXVT_SCROLLBAR */
+#define RXVT_SCROLLBAR 1
/* Set TERMINFO value to the value given by configure */
/* #undef RXVT_TERMINFO */
/* Define to allow scrolling when the selection moves to the top or bottom of
the screen */
-/* #undef SELECTION_SCROLLING */
+#define SELECTION_SCROLLING 1
/* Define to use "smart" resize behavior */
/* #undef SMART_RESIZE */
@@ -378,7 +378,7 @@
/* Define if you want to have XIM (X Input Method) protocol support - required
for multibyte characters input */
-/* #undef USE_XIM */
+#define USE_XIM 1
/* Define location of utmpx */
#define UTMPX_FILE "/var/run/utmpx"
@@ -396,10 +396,10 @@
#define WTMP_FILE "/var/log/wtmp"
/* Define if you want to have wtmp support when utmp/utmpx is enabled */
-/* #undef WTMP_SUPPORT */
+#define WTMP_SUPPORT 1
/* Define to enable xft support */
-/* #undef XFT */
+#define XFT 1
/* Define if your XIMCallback specifies XIC as first type. */
/* #undef XIMCB_PROTO_BROKEN */
View
64 config.status
@@ -331,15 +331,15 @@ Report bugs to <bug-autoconf@gnu.org>."
ac_cs_version="\
config.status
configured by ./configure, generated by GNU Autoconf 2.61,
- with options \"'--disable-backspace-key' '--disable-swapscreen' '--disable-resources' '--disable-delete-key' '--disable-xft' '--disable-font-styles' '--disable-xim' '--disable-combining' '--disable-fallback--disable-utmp' '--disable-wtmp' '--disable-lastlog' '--disable-afterimage' '--disable-transparency' '--disable-fading' '--disable-rxvt-scroll' '--disable-next-scroll' '--disable-frills' '--disable-keepscrolling' '--disable-selectionscrolling' '--disable-mousewheel' '--disable-slipwheeling' '--disable-pointer-blank' '--disable-perl'\"
+ with options \"\"
Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-ac_pwd='/Users/patrickmullen/temp/downloads/rxvt/urxvt-my-conf'
+ac_pwd='/Users/patrickmullen/temp/downloads/linux/rxvt-unicode-9.06'
srcdir='.'
-INSTALL='/usr/bin/install -c'
+INSTALL='/opt/local/bin/ginstall -c'
# If no file are specified by the user, then we need to provide default
# value. By we need to know if files were specified by the user.
ac_need_defaults=:
@@ -405,10 +405,10 @@ if $ac_cs_silent; then
fi
if $ac_cs_recheck; then
- echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--disable-backspace-key' '--disable-swapscreen' '--disable-resources' '--disable-delete-key' '--disable-xft' '--disable-font-styles' '--disable-xim' '--disable-combining' '--disable-fallback--disable-utmp' '--disable-wtmp' '--disable-lastlog' '--disable-afterimage' '--disable-transparency' '--disable-fading' '--disable-rxvt-scroll' '--disable-next-scroll' '--disable-frills' '--disable-keepscrolling' '--disable-selectionscrolling' '--disable-mousewheel' '--disable-slipwheeling' '--disable-pointer-blank' '--disable-perl' $ac_configure_extra_args " --no-create --no-recursion" >&6
+ echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " $ac_configure_extra_args " --no-create --no-recursion" >&6
CONFIG_SHELL=/bin/sh
export CONFIG_SHELL
- exec /bin/sh "./configure" '--disable-backspace-key' '--disable-swapscreen' '--disable-resources' '--disable-delete-key' '--disable-xft' '--disable-font-styles' '--disable-xim' '--disable-combining' '--disable-fallback--disable-utmp' '--disable-wtmp' '--disable-lastlog' '--disable-afterimage' '--disable-transparency' '--disable-fading' '--disable-rxvt-scroll' '--disable-next-scroll' '--disable-frills' '--disable-keepscrolling' '--disable-selectionscrolling' '--disable-mousewheel' '--disable-slipwheeling' '--disable-pointer-blank' '--disable-perl' $ac_configure_extra_args --no-create --no-recursion
+ exec /bin/sh "./configure" $ac_configure_extra_args --no-create --no-recursion
fi
exec 5>>config.log
@@ -522,20 +522,20 @@ s,@LIBS@,|#_!!_#|-lm -lsupc++,g
s,@build_alias@,|#_!!_#|,g
s,@host_alias@,|#_!!_#|,g
s,@target_alias@,|#_!!_#|,g
-s,@build@,|#_!!_#|i386-apple-darwin9.5.0,g
+s,@build@,|#_!!_#|i386-apple-darwin9.7.0,g
s,@build_cpu@,|#_!!_#|i386,g
s,@build_vendor@,|#_!!_#|apple,g
-s,@build_os@,|#_!!_#|darwin9.5.0,g
-s,@host@,|#_!!_#|i386-apple-darwin9.5.0,g
+s,@build_os@,|#_!!_#|darwin9.7.0,g
+s,@host@,|#_!!_#|i386-apple-darwin9.7.0,g
s,@host_cpu@,|#_!!_#|i386,g
s,@host_vendor@,|#_!!_#|apple,g
-s,@host_os@,|#_!!_#|darwin9.5.0,g
+s,@host_os@,|#_!!_#|darwin9.7.0,g
s,@VERSION@,|#_!!_#|9.06,g
s,@DATE@,|#_!!_#|2008-06-15,g
s,@CC@,|#_!!_#|gcc,g
s,@CFLAGS@,|#_!!_#|-g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs,g
s,@LDFLAGS@,|#_!!_#|,g
-s,@CPPFLAGS@,|#_!!_#|,g
+s,@CPPFLAGS@,|#_!!_#| -DXTHREADS -I/opt/local/include -I/usr/X11/include -I/opt/local/include/freetype2 ,g
s,@ac_ct_CC@,|#_!!_#|gcc,g
s,@EXEEXT@,|#_!!_#|,g
s,@OBJEXT@,|#_!!_#|o,g
@@ -555,17 +555,17 @@ s,@TIC@,|#_!!_#|/opt/local/bin/tic,g
s,@XMKMF@,|#_!!_#|,g
s,@X_CFLAGS@,|#_!!_#| -I/usr/X11/include,g
s,@X_PRE_LIBS@,|#_!!_#| -lSM -lICE,g
-s,@X_LIBS@,|#_!!_#| -L/usr/X11/lib -R/usr/X11/lib,g
+s,@X_LIBS@,|#_!!_#|-Wl\,-framework\,CoreServices -Wl\,-framework\,ApplicationServices -L/opt/local/lib -L/usr/X11/lib -lXft -lXrender -lX11 -lfontconfig -lexpat -lfreetype -lz -L/usr/X11/lib -R/usr/X11/lib,g
s,@X_EXTRA_LIBS@,|#_!!_#|,g
-s,@afterimage_config@,|#_!!_#|,g
-s,@PKG_CONFIG@,|#_!!_#|,g
+s,@afterimage_config@,|#_!!_#|no,g
+s,@PKG_CONFIG@,|#_!!_#|/opt/local/bin/pkg-config,g
s,@XFT_CONFIG@,|#_!!_#|,g
-s,@PERL@,|#_!!_#|,g
-s,@PERLLIB@,|#_!!_#|,g
-s,@PERLFLAGS@,|#_!!_#|,g
-s,@PERLPRIVLIBEXP@,|#_!!_#|,g
-s,@IF_PERL@,|#_!!_#|#,g
-s,@PERL_O@,|#_!!_#|,g
+s,@PERL@,|#_!!_#|/opt/local/bin/perl,g
+s,@PERLLIB@,|#_!!_#| -L/opt/local/lib -L/usr/local/lib /opt/local/lib/perl5/5.8.8/darwin-2level/auto/DynaLoader/DynaLoader.a -L/opt/local/lib/perl5/5.8.8/darwin-2level/CORE -lperl -ldl -lm -lutil -lc,g
+s,@PERLFLAGS@,|#_!!_#| -I/opt/local/include -fno-common -DPERL_DARWIN -no-cpp-precomp -fno-strict-aliasing -pipe -Wdeclaration-after-statement -I/usr/local/include -I/opt/local/include -I/opt/local/lib/perl5/5.8.8/darwin-2level/CORE ,g
+s,@PERLPRIVLIBEXP@,|#_!!_#|/opt/local/lib/perl5/5.8.8,g
+s,@IF_PERL@,|#_!!_#|,g
+s,@PERL_O@,|#_!!_#|rxvtperl.o,g
s,@AFTERIMAGE_CFLAGS@,|#_!!_#|,g
s,@AFTERIMAGE_LIBS@,|#_!!_#|,g
s,@LIBOBJS@,|#_!!_#|,g
@@ -827,14 +827,10 @@ s,^\([ #]*\)[^ ]*\([ ]*PACKAGE_VERSION\)[ (].*,\1define\2 "" ,
s,^\([ #]*\)[^ ]*\([ ]*PACKAGE_STRING\)[ (].*,\1define\2 "" ,
s,^\([ #]*\)[^ ]*\([ ]*PACKAGE_BUGREPORT\)[ (].*,\1define\2 "" ,
s,^\([ #]*\)[^ ]*\([ ]*_GNU_SOURCE\)[ (].*,\1define\2 1 ,
-s,^\([ #]*\)[^ ]*\([ ]*NO_BACKSPACE_KEY\)[ (].*,\1define\2 1 ,
-s,^\([ #]*\)[^ ]*\([ ]*NO_DELETE_KEY\)[ (].*,\1define\2 1 ,
-s,^\([ #]*\)[^ ]*\([ ]*NO_RESOURCES\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*RESFALLBACK\)[ (].*,\1define\2 "Rxvt" ,
s,^\([ #]*\)[^ ]*\([ ]*RESNAME\)[ (].*,\1define\2 "urxvt" ,
s,^\([ #]*\)[^ ]*\([ ]*RESCLASS\)[ (].*,\1define\2 "URxvt" ,
s,^\([ #]*\)[^ ]*\([ ]*RXVTNAME\)[ (].*,\1define\2 "urxvt" ,
-s,^\([ #]*\)[^ ]*\([ ]*NO_SECONDARY_SCREEN\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*STDC_HEADERS\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_SYS_TYPES_H\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_SYS_STAT_H\)[ (].*,\1define\2 1 ,
@@ -862,6 +858,8 @@ s,^\([ #]*\)[^ ]*\([ ]*HAVE_XPOINTER\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*XLIB_ILLEGAL_ACCESS\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_UNSETENV\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*UTMP_SUPPORT\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*WTMP_SUPPORT\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*LASTLOG_SUPPORT\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_UTMP_H\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_STRUCT_UTMP\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_UTMP_HOST\)[ (].*,\1define\2 1 ,
@@ -870,6 +868,8 @@ s,^\([ #]*\)[^ ]*\([ ]*HAVE_STRUCT_UTMPX\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_UTMPX_HOST\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_STRUCT_LASTLOG\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_STRUCT_LASTLOGX\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*UTMP_FILE\)[ (].*,\1define\2 "/var/run/utmp" ,
+s,^\([ #]*\)[^ ]*\([ ]*UTMPX_FILE\)[ (].*,\1define\2 "/var/run/utmpx" ,
CEOF
sed -f "$tmp/defines.sed" $ac_file_inputs >"$tmp/out1"
# First, check the format of the line:
@@ -878,9 +878,8 @@ CEOF
/^[ ]*#[ ]*define[ ][ ]*[_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ][_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]*[( ]/b def
b
:def
-s,^\([ #]*\)[^ ]*\([ ]*UTMP_FILE\)[ (].*,\1define\2 "/var/run/utmp" ,
-s,^\([ #]*\)[^ ]*\([ ]*UTMPX_FILE\)[ (].*,\1define\2 "/var/run/utmpx" ,
s,^\([ #]*\)[^ ]*\([ ]*WTMP_FILE\)[ (].*,\1define\2 "/var/log/wtmp" ,
+s,^\([ #]*\)[^ ]*\([ ]*USE_XIM\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_XSETLOCALE\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_SETLOCALE\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_NL_LANGINFO\)[ (].*,\1define\2 1 ,
@@ -895,18 +894,31 @@ s,^\([ #]*\)[^ ]*\([ ]*HAVE_SETREUID\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*HAVE_DEV_PTMX\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*CLONE_DEVICE\)[ (].*,\1define\2 "/dev/ptmx" ,
s,^\([ #]*\)[^ ]*\([ ]*UNIX98_PTY\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*HAVE_X11_XFT_XFT_H\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*XFT\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*ENABLE_STYLES\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*ISO_14755\)[ (].*,\1define\2 1 ,
-s,^\([ #]*\)[^ ]*\([ ]*NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*OFF_FOCUS_FADING\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*ENABLE_TRANSPARENCY\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*SELECTION_SCROLLING\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*ENABLE_FRILLS\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*MOUSE_WHEEL\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*MOUSE_SLIP_WHEELING\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*PLAIN_SCROLLBAR\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*RXVT_SCROLLBAR\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*NEXT_SCROLLBAR\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*XTERM_SCROLLBAR\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*POINTER_BLANK\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*TEXT_BLINK\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*ENABLE_COMBINING\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*ENCODING_EU\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*ENCODING_VN\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*ENCODING_JP\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*ENCODING_JP_EXT\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*ENCODING_KR\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*ENCODING_ZH\)[ (].*,\1define\2 1 ,
s,^\([ #]*\)[^ ]*\([ ]*ENCODING_ZH_EXT\)[ (].*,\1define\2 1 ,
+s,^\([ #]*\)[^ ]*\([ ]*ENABLE_PERL\)[ (].*,\1define\2 1 ,
s/ $//
s,^[ #]*u.*,/* & */,
CEOF
View
164 src/Makefile
@@ -9,26 +9,21 @@ libdir = ${exec_prefix}/lib
includedir = ${prefix}/include
CC = gcc
CXX = g++
-CPP = cpp -CC
-CPP = gcc -E -CC
-
-PERL =
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = /usr/bin/install -c -m 755
-INSTALL_DATA = /usr/bin/install -c -m 644
+CPP = gcc -E
+PERL = /opt/local/bin/perl
+INSTALL = /opt/local/bin/ginstall -c
+INSTALL_PROGRAM = /opt/local/bin/ginstall -c -m 755
+INSTALL_DATA = /opt/local/bin/ginstall -c -m 644
CXXFLAGS = -g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs -w
-CPPFLAGS =
+CPPFLAGS = -DXTHREADS -I/opt/local/include -I/usr/X11/include -I/opt/local/include/freetype2
LDFLAGS =
DEFS = -DHAVE_CONFIG_H
LIBS = -lm -lsupc++
XINC = -I/usr/X11/include
-XLIB = -L/usr/X11/lib -R/usr/X11/lib -lX11
+XLIB = -Wl,-framework,CoreServices -Wl,-framework,ApplicationServices -L/opt/local/lib -L/usr/X11/lib -lXft -lXrender -lX11 -lfontconfig -lexpat -lfreetype -lz -L/usr/X11/lib -R/usr/X11/lib -lX11
COMPILE = $(CXX) -I.. -I$(srcdir) -I. -I$(srcdir)/../libev $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(DEBUG) $(XINC)
LINK = gcc $(LDFLAGS)
-PREPROCESS = $(CPP) -I.. -I$(srcdir) -I. -I$(srcdir)/../libev $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(DEBUG) $(XINC)
-
-
srcdir = .
@@ -42,13 +37,7 @@ COMMON = \
ptytty.o proxy.o screen.o scrollbar.o scrollbar-next.o scrollbar-rxvt.o \
scrollbar-xterm.o scrollbar-plain.o xdefaults.o encoding.o \
rxvttoolkit.o rxvtutil.o keyboard.o \
- fdpass.o ev_cpp.o
-COMMON_EXP = \
- background.CE command.CE rxvtfont.CE init.CE logging.CE main.CE misc.CE \
- ptytty.CE proxy.CE screen.CE scrollbar.CE scrollbar-next.CE scrollbar-rxvt.CE \
- scrollbar-xterm.CE scrollbar-plain.CE xdefaults.CE encoding.CE \
- rxvttoolkit.CE rxvtutil.CE keyboard.CE \
- fdpass.CE ev_cpp.CE
+ fdpass.o ev_cpp.o rxvtperl.o
COMMON_DAEMON = rxvtdaemon.o
@@ -68,21 +57,15 @@ RXVTD_BINNAME=$(DESTDIR)$(bindir)/$(RXVT_BASENAME)d$(EXEEXT)
.C.o:
$(COMPILE) -c $<
-.SUFFIXES: .C .c .CE
-.C.CE:
- $(PREPROCESS) -o $<_exp.C $<
-
#-------------------------------------------------------------------------
all: allbin
-exp: $(COMMON_EXP)
-
rxvt: rxvt.o $(COMMON)
- $(LINK) -o $@ rxvt.o $(COMMON) $(LIBS) $(XLIB)
+ $(LINK) -o $@ rxvt.o $(COMMON) $(LIBS) $(XLIB) -L/opt/local/lib -L/usr/local/lib /opt/local/lib/perl5/5.8.8/darwin-2level/auto/DynaLoader/DynaLoader.a -L/opt/local/lib/perl5/5.8.8/darwin-2level/CORE -lperl -ldl -lm -lutil -lc
rxvtd: rxvtd.o $(COMMON) $(COMMON_DAEMON)
- $(LINK) -o $@ rxvtd.o $(COMMON) $(COMMON_DAEMON) $(LIBS) $(XLIB)
+ $(LINK) -o $@ rxvtd.o $(COMMON) $(COMMON_DAEMON) $(LIBS) $(XLIB) -L/opt/local/lib -L/usr/local/lib /opt/local/lib/perl5/5.8.8/darwin-2level/auto/DynaLoader/DynaLoader.a -L/opt/local/lib/perl5/5.8.8/darwin-2level/CORE -lperl -ldl -lm -lutil -lc
rxvtc: rxvtc.o $(COMMON_DAEMON) fdpass.o ev_cpp.o
$(LINK) -o $@ rxvtc.o $(COMMON_DAEMON) fdpass.o ev_cpp.o $(LIBS)
@@ -114,11 +97,11 @@ realclean: distclean
cleandir: realclean
install-perl:
-# $(INSTALL) -d $(DESTDIR)$(libdir)
-# $(INSTALL) -d $(DESTDIR)$(libdir)/urxvt
-# $(INSTALL) -d $(DESTDIR)$(libdir)/urxvt/perl
-# $(INSTALL_DATA) $(srcdir)/urxvt.pm $(DESTDIR)$(libdir)/urxvt/urxvt.pm
-# for ext in $(srcdir)/perl/*; do test -f "$$ext" && $(INSTALL_DATA) "$$ext" $(DESTDIR)$(libdir)/urxvt/perl/"`basename "$$ext"`"; done
+ $(INSTALL) -d $(DESTDIR)$(libdir)
+ $(INSTALL) -d $(DESTDIR)$(libdir)/urxvt
+ $(INSTALL) -d $(DESTDIR)$(libdir)/urxvt/perl
+ $(INSTALL_DATA) $(srcdir)/urxvt.pm $(DESTDIR)$(libdir)/urxvt/urxvt.pm
+ for ext in $(srcdir)/perl/*; do test -f "$$ext" && $(INSTALL_DATA) "$$ext" $(DESTDIR)$(libdir)/urxvt/perl/"`basename "$$ext"`"; done
install-bin: allbin
$(INSTALL) -d $(DESTDIR)$(bindir)
@@ -132,10 +115,10 @@ perlxsi.c: Makefile
$(PERL) -MExtUtils::Embed -e xsinit -- -std urxvt
rxvtperl.C: rxvtperl.xs iom_perl.h iom_perl.xs typemap typemap.iom
- PERL="$(PERL)" $(PERL) /ExtUtils/xsubpp -C++ -typemap /ExtUtils/typemap -typemap typemap.iom -typemap typemap -prototypes $(srcdir)/rxvtperl.xs >$@
+ PERL="$(PERL)" $(PERL) /opt/local/lib/perl5/5.8.8/ExtUtils/xsubpp -C++ -typemap /opt/local/lib/perl5/5.8.8/ExtUtils/typemap -typemap typemap.iom -typemap typemap -prototypes $(srcdir)/rxvtperl.xs >$@
rxvtperl.o: rxvtperl.C perlxsi.c
- $(COMPILE) -DLIBDIR="\"$(libdir)/urxvt\"" -c $<
+ $(COMPILE) -I/opt/local/include -fno-common -DPERL_DARWIN -no-cpp-precomp -fno-strict-aliasing -pipe -Wdeclaration-after-statement -I/usr/local/include -I/opt/local/include -I/opt/local/lib/perl5/5.8.8/darwin-2level/CORE -DLIBDIR="\"$(libdir)/urxvt\"" -c $<
depend:
makedepend -f Makefile.in -I. -I.. -I../libev -Y *.C >/dev/null 2>&1
@@ -251,116 +234,3 @@ xdefaults.o: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
xdefaults.o: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
xdefaults.o: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h
xdefaults.o: background.h rsinc.h optinc.h version.h keyboard.h
-
-
-
-
-background.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
-background.CE: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
-background.CE: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h
-background.CE: background.h rsinc.h optinc.h
-command.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
-command.CE: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
-command.CE: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
-command.CE: rsinc.h optinc.h version.h command.h keyboard.h
-encoding.CE: ../config.h encoding.h table/iso8859_1.h table/iso8859_15.h
-encoding.CE: table/iso8859_2.h table/iso8859_3.h table/iso8859_4.h
-encoding.CE: table/iso8859_5.h table/iso8859_6.h table/iso8859_7.h
-encoding.CE: table/iso8859_8.h table/iso8859_9.h table/iso8859_10.h
-encoding.CE: table/iso8859_11.h table/iso8859_13.h table/iso8859_14.h
-encoding.CE: table/iso8859_16.h table/koi8_r.h table/koi8_u.h
-encoding.CE: table/ksc5601_1987_0.h table/big5.h table/gbk_0.h
-encoding.CE: table/gb2312_1980_0.h table/cns11643_1992_1.h
-encoding.CE: table/cns11643_1992_2.h table/cns11643_1992_3.h
-encoding.CE: table/cns11643_1992_4.h table/cns11643_1992_5.h
-encoding.CE: table/cns11643_1992_6.h table/cns11643_1992_7.h
-encoding.CE: table/cns11643_1992_f.h table/big5_ext.h table/big5_plus.h
-encoding.CE: table/viscii.h table/jis0201_1976_0.h table/jis0208_1990_0.h
-encoding.CE: table/jis0212_1990_0.h table/jis0213_1.h table/jis0213_2.h
-encoding.CE: table/compose.h table/category.h
-ev_cpp.CE: ev_cpp.h ../libev/ev++.h ../libev/ev.h ../libev/ev.c ../config.h
-ev_cpp.CE: ../libev/ev_vars.h ../libev/ev_epoll.c ../libev/ev_select.c
-fdpass.CE: ../config.h libptytty.h
-init.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
-init.CE: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
-init.CE: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
-init.CE: rsinc.h optinc.h init.h keyboard.h
-keyboard.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
-keyboard.CE: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
-keyboard.CE: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h
-keyboard.CE: background.h rsinc.h optinc.h keyboard.h command.h
-logging.CE: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h feature.h
-logging.CE: encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h
-logging.CE: ../libev/ev++.h ../libev/ev.h callback.h scrollbar.h salloc.h
-logging.CE: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
-main.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
-main.CE: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
-main.CE: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
-main.CE: rsinc.h optinc.h keyboard.h
-misc.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
-misc.CE: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
-misc.CE: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
-misc.CE: rsinc.h optinc.h
-proxy.CE: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h feature.h
-proxy.CE: encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h
-proxy.CE: ../libev/ev++.h ../libev/ev.h callback.h scrollbar.h salloc.h
-proxy.CE: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
-ptytty.CE: ../config.h ptytty.h libptytty.h ptytty_conf.h rxvt.h feature.h
-ptytty.CE: encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h ev_cpp.h
-ptytty.CE: ../libev/ev++.h ../libev/ev.h callback.h scrollbar.h salloc.h
-ptytty.CE: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
-rxvt.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
-rxvt.CE: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
-rxvt.CE: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
-rxvt.CE: rsinc.h optinc.h
-rxvtc.CE: ../config.h rxvtdaemon.h rxvtutil.h libptytty.h rxvt.h feature.h
-rxvtc.CE: encoding.h rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-rxvtc.CE: ../libev/ev.h callback.h scrollbar.h salloc.h rxvtperl.h hookinc.h
-rxvtc.CE: background.h rsinc.h optinc.h
-rxvtd.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
-rxvtd.CE: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
-rxvtd.CE: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
-rxvtd.CE: rsinc.h optinc.h rxvtdaemon.h
-rxvtdaemon.CE: rxvtdaemon.h rxvtutil.h
-rxvtfont.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
-rxvtfont.CE: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
-rxvtfont.CE: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h
-rxvtfont.CE: background.h rsinc.h optinc.h table/linedraw.h
-rxvtperl.CE: ../config.h ev_cpp.h ../libev/ev++.h ../libev/ev.h rxvt.h
-rxvtperl.CE: feature.h encoding.h rxvtutil.h rxvtfont.h rxvttoolkit.h
-rxvtperl.CE: callback.h scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h
-rxvtperl.CE: background.h rsinc.h optinc.h keyboard.h perlxsi.c iom_perl.h
-rxvttoolkit.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
-rxvttoolkit.CE: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h
-rxvttoolkit.CE: callback.h scrollbar.h salloc.h libptytty.h rxvtperl.h
-rxvttoolkit.CE: hookinc.h background.h rsinc.h optinc.h
-rxvtutil.CE: rxvtutil.h
-salloc.CE: salloc.h
-screen.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
-screen.CE: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
-screen.CE: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h background.h
-screen.CE: rsinc.h optinc.h salloc.C
-scrollbar-next.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h
-scrollbar-next.CE: rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-scrollbar-next.CE: ../libev/ev.h callback.h scrollbar.h salloc.h libptytty.h
-scrollbar-next.CE: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
-scrollbar-plain.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h
-scrollbar-plain.CE: rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-scrollbar-plain.CE: ../libev/ev.h callback.h scrollbar.h salloc.h libptytty.h
-scrollbar-plain.CE: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
-scrollbar-rxvt.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h
-scrollbar-rxvt.CE: rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-scrollbar-rxvt.CE: ../libev/ev.h callback.h scrollbar.h salloc.h libptytty.h
-scrollbar-rxvt.CE: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
-scrollbar-xterm.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h
-scrollbar-xterm.CE: rxvtfont.h rxvttoolkit.h ev_cpp.h ../libev/ev++.h
-scrollbar-xterm.CE: ../libev/ev.h callback.h scrollbar.h salloc.h libptytty.h
-scrollbar-xterm.CE: rxvtperl.h hookinc.h background.h rsinc.h optinc.h
-scrollbar.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
-scrollbar.CE: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
-scrollbar.CE: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h
-scrollbar.CE: background.h rsinc.h optinc.h
-xdefaults.CE: ../config.h rxvt.h feature.h encoding.h rxvtutil.h rxvtfont.h
-xdefaults.CE: rxvttoolkit.h ev_cpp.h ../libev/ev++.h ../libev/ev.h callback.h
-xdefaults.CE: scrollbar.h salloc.h libptytty.h rxvtperl.h hookinc.h
-xdefaults.CE: background.h rsinc.h optinc.h version.h keyboard.h
View
12,095 src/background.C
1,451 additions, 10,644 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
BIN src/background.o
Binary file not shown.
View
3 src/command.C
@@ -1,4 +1,3 @@
-
/*----------------------------------------------------------------------*
* File: command.C
*----------------------------------------------------------------------*
@@ -1687,7 +1686,6 @@ rxvt_term::x_cb (XEvent &ev)
refresh_check ();
}
-#if ENABLE_FRILLS
void
rxvt_term::set_urgency (bool enable)
{
@@ -1701,7 +1699,6 @@ rxvt_term::set_urgency (bool enable)
urgency_hint = enable;
}
}
-#endif
void
rxvt_term::focus_in ()
View
BIN src/keyboard.o
Binary file not shown.
View
12 src/rxvt.h
@@ -977,16 +977,16 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
current_screen:1, /* primary or secondary */
num_scr_allow:1,
bypass_keystate:1,
-#if ENABLE_FRILLS
+#ifdef ENABLE_FRILLS
urgency_hint:1,
#endif
-#if CURSOR_BLINK
+#ifdef CURSOR_BLINK
hidden_cursor:1,
#endif
-#if TEXT_BLINK
+#ifdef TEXT_BLINK
hidden_text:1,
#endif
-#if POINTER_BLANK
+#ifdef POINTER_BLANK
hidden_pointer:1,
#endif
enc_utf8:1, /* wether locale uses utf-8 */
@@ -1236,11 +1236,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
void button_release (XButtonEvent &ev);
void focus_in ();
void focus_out ();
-#if ENABLE_FRILLS
void set_urgency (bool enable);
-#else
- void set_urgency (bool enable) { }
-#endif
void update_fade_color (unsigned int idx);
#ifdef PRINTPIPE
FILE *popen_printer ();

0 comments on commit de882d2

Please sign in to comment.