From 7af5d208eb2bf74dfc19c6fb7bcb2d9d6250e29c Mon Sep 17 00:00:00 2001
From: Michael Jennings <mej@kainx.org>
Date: Thu, 22 Dec 2005 23:31:33 +0000
Subject: [PATCH] Thu Dec 22 18:32:31 2005                        Michael
 Jennings (mej)

Cleanups and minor enhancements.
----------------------------------------------------------------------


SVN revision: 19251
---
 ChangeLog      |  4 ++++
 Eterm.spec     |  6 ++++--
 doc/Eterm.tcap | 19 -------------------
 src/pixmap.c   |  1 +
 stamp-h.in     |  1 -
 5 files changed, 9 insertions(+), 22 deletions(-)
 delete mode 100644 doc/Eterm.tcap
 delete mode 100644 stamp-h.in

diff --git a/ChangeLog b/ChangeLog
index a7a3ac9..25fcd32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5441,3 +5441,7 @@ Mon Dec  5 15:46:34 2005                        Michael Jennings (mej)
 
 Prevent firewall bounces from trying for the same port.
 ----------------------------------------------------------------------
+Thu Dec 22 18:32:31 2005                        Michael Jennings (mej)
+
+Cleanups and minor enhancements.
+----------------------------------------------------------------------
diff --git a/Eterm.spec b/Eterm.spec
index 5aabe3f..7426abc 100644
--- a/Eterm.spec
+++ b/Eterm.spec
@@ -3,6 +3,9 @@
 %endif
 
 %define __os_install_post /usr/lib/rpm/brp-compress
+%if %{?optflags:1}0
+%define optflags ${RPM_OPT_FLAGS:--O0 -g3}
+%endif
 
 Summary: Enlightened terminal emulator
 Name: Eterm
@@ -32,8 +35,7 @@ have the Imlib2 library installed.
 %setup -a 1
 
 %build
-#CFLAGS="$RPM_OPT_FLAGS"
-CFLAGS="-O0 -g3"
+CFLAGS="%{optflags}"
 export CFLAGS
 
 # When using the configure macro, I also specify all the directory
diff --git a/doc/Eterm.tcap b/doc/Eterm.tcap
deleted file mode 100644
index 821d708..0000000
--- a/doc/Eterm.tcap
+++ /dev/null
@@ -1,19 +0,0 @@
-Eterm|Eterm Terminal Emulator (X11 Window System):\
-	:am:bw:eo:km:mi:ms:xn:xo:\
-	:co#80:it#8:li#24:lm#0:pa#64:Co#8:AF=\E[3%dm:AB=\E[4%dm:op=\E[39m\E[49m:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:K1=\E[7~:K2=\EOu:K3=\E[5~:K4=\E[8~:K5=\E[6~:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\
-	:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\
-	:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=\E[B:\
-	:ec=\E[%dX:ei=\E[4l:ho=\E[H:i1=\E[?47l\E>\E[?1l:ic=\E[@:\
-	:im=\E[4h:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
-	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
-	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:kD=\E[3~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=:kh=\E[7~:\
-	:kl=\E[D:kr=\E[C:ks=:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\
-	:me=\E[m\017:mr=\E[7m:nd=\E[C:rc=\E8:\
-	:sc=\E7:se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:\
-	:us=\E[4m:vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:\
-	:ac=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:
diff --git a/src/pixmap.c b/src/pixmap.c
index 724e33b..9c97d25 100644
--- a/src/pixmap.c
+++ b/src/pixmap.c
@@ -1251,6 +1251,7 @@ render_simage(simage_t *simg, Window win, unsigned short width, unsigned short h
                 } else if (renderop & RENDER_FORCE_PIXMAP) {
                     pixmap = simg->pmap->pixmap;
                     simg->pmap->pixmap = LIBAST_X_CREATE_PIXMAP(width, height);
+                    D_PIXMAP(("Replacing pixmap 0x%08x with new pixmap 0x%08x.\n", pixmap, simg->pmap->pixmap));
                     XCopyArea(Xdisplay, pixmap, simg->pmap->pixmap, gc, 0, 0, width, height, 0, 0);
                     IMLIB_FREE_PIXMAP(pixmap);
                 } else {
diff --git a/stamp-h.in b/stamp-h.in
deleted file mode 100644
index 9788f70..0000000
--- a/stamp-h.in
+++ /dev/null
@@ -1 +0,0 @@
-timestamp