--- rxvt-unicode/src/command.C	2006/01/06 18:33:30	1.245
+++ rxvt-unicode/src/command.C	2006/01/07 20:23:52	1.247
@@ -1564,18 +1564,20 @@
         selection_send (ev.xselectionrequest);
         break;
 
-      case UnmapNotify:
-        mapped = 0;
+      case MapNotify:
+        mapped = 1;
 #ifdef TEXT_BLINK
-        text_blink_ev.stop ();
+        text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
 #endif
+        HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
         break;
 
-      case MapNotify:
-        mapped = 1;
+      case UnmapNotify:
+        mapped = 0;
 #ifdef TEXT_BLINK
-        text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
+        text_blink_ev.stop ();
 #endif
+        HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
         break;
 
 #ifdef TRANSPARENT
@@ -2892,7 +2894,7 @@
 rxvt_term::next_octet ()
 {
   return cmdbuf_ptr < cmdbuf_endp
-         ? *cmdbuf_ptr++
+         ? (unsigned char)*cmdbuf_ptr++
          : NOCHAR;
 }