* src/Makefile.am (ratpoison_SOURCES): add linkedlist.h

* src/bar.c (marked_message): pass correct arguments to bar_y.

* src/actions.c (cmd_defwinliststyle): error messages print the
correct command name.

5 files changed, 16 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 86c3c75..d96b14e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-07  Shawn Betts  <sabetts@sfu.ca>
+
+	* src/input.c (read_key): remove the local variable, key_presses.
+
+	* src/Makefile.am (ratpoison_SOURCES): add linkedlist.h
+
+	* src/bar.c (marked_message): pass correct arguments to bar_y.
+
+	* src/actions.c (cmd_defwinliststyle): error messages print the
+	correct command name.
+
 2003-04-06  Shawn Betts  <sabetts@sfu.ca>
 
 	* src/actions.h: All cmd_* functions take char* instead of
diff --git a/src/Makefile.am b/src/Makefile.am
index 5a10925..6baf5b0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-## $Id: Makefile.am,v 1.14 2003/03/31 07:06:23 sabetts Exp $
+## $Id: Makefile.am,v 1.15 2003/04/08 00:00:49 sabetts Exp $
 
 bin_PROGRAMS		= ratpoison
 
@@ -38,6 +38,7 @@ ratpoison_SOURCES	= actions.c		\
 			getopt1.c		\
 			input.c			\
 			input.h			\
+			linkedlist.h		\
 			main.c			\
 			manage.c		\
 			manage.h		\
diff --git a/src/actions.c b/src/actions.c
index 4007bcc..1bd0930 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -3112,7 +3112,7 @@ cmd_defwinliststyle (int interactive, char *data)
 
   if (data == NULL)
     {
-      message (" defwrapwinlist: One argument required ");
+      message (" defwinliststyle: One argument required ");
       return NULL;
      }
 
@@ -3126,7 +3126,7 @@ cmd_defwinliststyle (int interactive, char *data)
     }
   else
     {
-      message (" defwrapwinlist: Bad argument ");
+      message (" defwinliststyle: Bad argument ");
     }
 
    return NULL;    
diff --git a/src/bar.c b/src/bar.c
index c084775..7394e58 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -427,7 +427,7 @@ marked_message (char *msg, int mark_start, int mark_end)
   alarm_signalled = 0;
 
   XMoveResizeWindow (dpy, s->bar_window, 
-		     bar_x (s, width), bar_y (s, width),
+		     bar_x (s, width), bar_y (s, height),
 		     width,
 		     height);
 
diff --git a/src/input.c b/src/input.c
index 0d788ae..0679b1e 100644
--- a/src/input.c
+++ b/src/input.c
@@ -260,7 +260,6 @@ cook_keycode (XKeyEvent *ev, KeySym *keysym, unsigned int *mod, char *keysym_nam
 int
 read_key (KeySym *keysym, unsigned int *modifiers, char *keysym_name, int len, int gobble_rel)
 {
-  int key_presses = 0;
   XEvent ev;
   int nbytes;
   unsigned int keycode;
@@ -276,8 +275,6 @@ read_key (KeySym *keysym, unsigned int *modifiers, char *keysym_name, int len, i
       nbytes = cook_keycode (&ev.xkey, keysym, modifiers, keysym_name, len, 0);
     } while (IsModifierKey (*keysym));
 
-  PRINT_DEBUG (("key press events: %d\n", key_presses));
-
   /* Gobble the release event for the key we pressed. */
   if (gobble_rel)
     do