--- rxvt-unicode/src/command.C	2003/12/17 09:00:35	1.16
+++ rxvt-unicode/src/command.C	2003/12/18 05:45:11	1.19
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:	command.c
  *----------------------------------------------------------------------*
- * $Id: command.C,v 1.16 2003/12/17 09:00:35 pcg Exp $
+ * $Id: command.C,v 1.19 2003/12/18 05:45:11 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;
       }
 
@@ -681,6 +693,7 @@
 rxvt_term::check_cb (check_watcher &w)
 {
   SET_R (this);
+  SET_LOCALE (locale);
 
   flush ();
 }
@@ -734,8 +747,6 @@
 void
 rxvt_term::blink_cb (time_watcher &w)
 {
-  SET_R (this);
-
   w.at += BLINK_INTERVAL;
   hidden_cursor = !hidden_cursor;
   want_refresh = 1;
@@ -745,6 +756,7 @@
 rxvt_term::x_cb (io_watcher &w, short revents)
 {
   SET_R (this);
+  SET_LOCALE (locale);
 
   process_x_events ();
 }
@@ -775,6 +787,7 @@
 rxvt_term::pty_cb (io_watcher &w, short revents)
 {
   SET_R (this);
+  SET_LOCALE (locale);
 
   if (revents & EVENT_WRITE)
     tt_write (0, 0);
@@ -1028,7 +1041,7 @@
 rxvt_term::pointer_unblank ()
 {
   XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor);
-  rxvt_recolour_cursor (this);
+  recolour_cursor ();
 
 #ifdef POINTER_BLANK
   hidden_pointer = 0;
@@ -1057,6 +1070,7 @@
 rxvt_term::pointer_cb (time_watcher &w)
 {
   SET_R (this);
+  SET_LOCALE (locale);
 
   pointer_blank ();
 }
@@ -1422,7 +1436,7 @@
 					  GraphicsExpose,
 					  &unused_xevent)) ;
 	    if (isScrollbarWindow(ev->xany.window)) {
-		scrollbar_setIdle();
+		R->scrollBar.setIdle();
 		rxvt_scrollbar_show(aR_ 0);
 	    }
 #ifdef MENUBAR
@@ -1545,7 +1559,7 @@
       {
 #if RXVT_GRAPHICS
 	if (ev->subwindow != None)
-	  rxvt_Gr_ButtonPress(ev->x, ev->y);
+	  rxvt_Gr_ButtonPress (ev->x, ev->y);
 	else
 #endif
           {
@@ -1617,7 +1631,7 @@
  */
     if (isScrollbarWindow(ev->window))
       {
-	scrollbar_setIdle();
+	R->scrollBar.setIdle ();
 	/*
 	 * Rxvt-style scrollbar:
 	 * move up if mouse is above slider
@@ -1680,9 +1694,9 @@
 #endif
 		if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
 		    if (upordown < 0)
-			scrollbar_setUp();
+			R->scrollBar.setUp ();
 		    else
-			scrollbar_setDn();
+			R->scrollBar.setDn ();
 		}
 	    } else
 		switch (ev->button) {
@@ -1704,7 +1718,7 @@
 			rxvt_scr_move_to(aR_
 					 scrollbar_position(ev->y) - R->csrO,
 					 scrollbar_size());
-		    scrollbar_setMotion();
+		    R->scrollBar.setMotion ();
 		    break;
 
 		case Button1:
@@ -1727,7 +1741,7 @@
 			    rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
 # endif
 			else
-			    scrollbar_setMotion();
+			    R->scrollBar.setMotion ();
 		    } else {
 			rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
 				      (R->TermWin.nrow
@@ -1759,7 +1773,7 @@
 	reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
 
     if (scrollbar_isUpDn()) {
-	scrollbar_setIdle();
+	R->scrollBar.setIdle ();
 	rxvt_scrollbar_show(aR_ 0);
 #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
 	R->refresh_type &= ~SMOOTH_REFRESH;
@@ -1820,7 +1834,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 +2020,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;
 		}
@@ -3363,7 +3378,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++)