--- rxvt-unicode/src/rxvt.h	2005/02/16 20:32:05	1.147
+++ rxvt-unicode/src/rxvt.h	2005/02/20 19:45:30	1.152
@@ -21,6 +21,12 @@
 #include "iom.h"
 #include "salloc.h"
 
+#if ENABLE_FRILLS
+# define ENABLE_XEMBED 1
+# define ENABLE_EWMH   1
+#endif
+
+
 /*
  *****************************************************************************
  * SYSTEM HACKS
@@ -179,6 +185,31 @@
 } MWMHints;
 #endif
 
+#if ENABLE_XEMBED
+// XEMBED messages
+# define XEMBED_EMBEDDED_NOTIFY          0 
+# define XEMBED_WINDOW_ACTIVATE          1 
+# define XEMBED_WINDOW_DEACTIVATE        2 
+# define XEMBED_REQUEST_FOCUS            3 
+# define XEMBED_FOCUS_IN                 4 
+# define XEMBED_FOCUS_OUT                5 
+# define XEMBED_FOCUS_NEXT               6 
+# define XEMBED_FOCUS_PREV               7
+
+# define XEMBED_MODALITY_ON              10 
+# define XEMBED_MODALITY_OFF             11 
+# define XEMBED_REGISTER_ACCELERATOR     12 
+# define XEMBED_UNREGISTER_ACCELERATOR   13 
+# define XEMBED_ACTIVATE_ACCELERATOR     14
+
+// XEMBED detail code
+# define XEMBED_FOCUS_CURRENT            0 
+# define XEMBED_FOCUS_FIRST              1 
+# define XEMBED_FOCUS_LAST               2
+
+# define XEMBED_MAPPED			(1 << 0)
+#endif
+
 /*
  *****************************************************************************
  * NORMAL DEFINES
@@ -610,6 +641,9 @@
   Rs_int_bwidth,
   Rs_borderLess,
   Rs_lineSpace,
+  Rs_pty_fd,
+#endif
+#if ENABLE_XEMBED
   Rs_embed,
 #endif
   Rs_cutchars,
@@ -646,13 +680,17 @@
   XA_TIMESTAMP,
   XA_VT_SELECTION,
   XA_INCR,
-  XA_WMDELETEWINDOW,
+  XA_WM_PROTOCOLS,
+  XA_WM_DELETE_WINDOW,
   XA_CLIPBOARD,
 #if ENABLE_FRILLS
-  XA_NET_WM_PID,
   XA_MOTIF_WM_HINTS,
+#endif
+#if ENABLE_EWMH
+  XA_NET_WM_PID,
   XA_NET_WM_NAME,
   XA_NET_WM_ICON_NAME,
+  XA_NET_WM_PING,
 #endif
 #if USE_XIM
   XA_WM_LOCALE_NAME,
@@ -665,6 +703,10 @@
   XA_DNDPROTOCOL,
   XA_DNDSELECTION,
 #endif
+#if ENABLE_XEMBED
+  XA_XEMBED,
+  XA_XEMBED_INFO,
+#endif
   NUM_XA
 };
 
@@ -701,9 +743,9 @@
         priv_modes &= ~(bit)
 
 #ifdef ALLOW_132_MODE
-# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
+# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
 #else
-# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
+# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
 #endif
 
 // do not change these constants lightly, there are many interdependencies
@@ -1347,6 +1389,8 @@
   void mouse_report (XButtonEvent &ev);
   void button_press (XButtonEvent &ev);
   void button_release (XButtonEvent &ev);
+  void focus_in ();
+  void focus_out ();
   int check_our_parents ();
 #ifdef PRINTPIPE
   FILE *popen_printer ();