--- rxvt-unicode/src/command.C	2003/12/16 23:04:13	1.15
+++ rxvt-unicode/src/command.C	2003/12/18 02:07:12	1.18
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:	command.c
  *----------------------------------------------------------------------*
- * $Id: command.C,v 1.15 2003/12/16 23:04:13 pcg Exp $
+ * $Id: command.C,v 1.18 2003/12/18 02:07:12 pcg Exp $
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1992      John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
@@ -90,19 +90,31 @@
 	Status status_return;
 
 #ifdef X_HAVE_UTF8_STRING
-	len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf,
-			      KBUFSZ, &keysym, &status_return);
+	len = Xutf8LookupString (R->Input_Context, ev, (char *)kbuf,
+			         KBUFSZ, &keysym, &status_return);
 #else
-	len = XmbLookupString(R->Input_Context, ev, (char *)kbuf,
-			      KBUFSZ, &keysym, &status_return);
+        wchar_t wkbuf[KBUFSZ + 1];
+
+        // assume wchar_t == unicode or better
+	len = XwcLookupString (R->Input_Context, ev, wkbuf,
+			       KBUFSZ, &keysym, &status_return);
+
+        if (status_return == XLookupChars
+            || status_return == XLookupBoth)
+          {
+            wkbuf[len] = 0;
+            len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
+          }
+        else
+          len = 0;
 #endif
-	valid_keysym = ((status_return == XLookupKeySym)
-			|| (status_return == XLookupBoth));
+	valid_keysym = status_return == XLookupKeySym
+		       || status_return == XLookupBoth;
       }
     else
 #endif
       {
-	len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
+	len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose);
 	valid_keysym = !len;
       }
 
@@ -1545,7 +1557,7 @@
       {
 #if RXVT_GRAPHICS
 	if (ev->subwindow != None)
-	  rxvt_Gr_ButtonPress(ev->x, ev->y);
+	  rxvt_Gr_ButtonPress (ev->x, ev->y);
 	else
 #endif
           {
@@ -1820,7 +1832,8 @@
 	    case Button4:
 	    case Button5:
 		  {
-		    int             i, v;
+		    int i;
+                    page_dirn v;
 
 		    v = (ev->button == Button4) ? UP : DN;
 		    if (ev->state & ShiftMask)
@@ -2005,7 +2018,7 @@
 	    for (; n < (unsigned int)i; n++) {
 		XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr);
 		D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
-		if (wattr.depth != rootdepth || wattr.class == InputOnly) {
+		if (wattr.depth != rootdepth || wattr.c_class == InputOnly) {
 		    n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1;
 		    break;
 		}
@@ -2584,7 +2597,7 @@
 	arg[0] = -arg[0];
     /* FALLTHROUGH */
     case CSI_SU:		/* 8.3.148: (1) SCROLL UP */
-	rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0);
+	R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, arg[0], 0);
 	break;
 
     case CSI_DA:		/* 8.3.24: (0) DEVICE ATTRIBUTES */
@@ -3363,7 +3376,7 @@
     if ((cmd == 'T') && (nargs >= 5)) {
 	int             i, len = args[4];
 
-	text = rxvt_malloc((len + 1) * sizeof(char));
+	text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
 
 	if (text != NULL) {
 	    for (i = 0; i < len; i++)