--- rxvt-unicode/src/rxvt.h	2005/02/04 11:41:23	1.145
+++ rxvt-unicode/src/rxvt.h	2005/02/20 00:09:25	1.151
@@ -21,6 +21,10 @@
 #include "iom.h"
 #include "salloc.h"
 
+#if ENABLE_FRILLS
+# define ENABLE_XEMBED 1
+#endif
+
 /*
  *****************************************************************************
  * SYSTEM HACKS
@@ -82,17 +86,23 @@
  * PROTOTYPES                    
  *****************************************************************************
  */
+// main.C
 RETSIGTYPE       rxvt_Child_signal                (int sig);
 RETSIGTYPE       rxvt_Exit_signal                 (int sig);
 void             rxvt_clean_exit                  ();
 void           * rxvt_malloc                      (size_t size);
 void           * rxvt_calloc                      (size_t number, size_t size);
 void           * rxvt_realloc                     (void *ptr, size_t size);
+void             rxvt_privileges                  (rxvt_privaction action);
+
+// util.C
 char *           rxvt_wcstombs                    (const wchar_t *str, int len = -1);
 wchar_t *        rxvt_mbstowcs                    (const char *str, int len = -1);
 char *           rxvt_wcstoutf8                   (const wchar_t *str, int len = -1);
 wchar_t *        rxvt_utf8towcs                   (const char *str, int len = -1);
 char *           rxvt_strdup                      (const char *str);
+
+// misc.C
 char *           rxvt_r_basename                  (const char *str);
 void             rxvt_vlog                        (const char *fmt, va_list arg_ptr);
 void             rxvt_log                         (const char *fmt,...);
@@ -109,8 +119,6 @@
 void             rxvt_Draw_Shadow                 (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
 void             rxvt_Draw_Triangle               (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
 
-void             rxvt_privileges                  (rxvt_privaction action);
-
 /*
  *****************************************************************************
  * STRUCTURES AND TYPEDEFS
@@ -175,6 +183,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
@@ -605,9 +638,11 @@
   Rs_ext_bwidth,
   Rs_int_bwidth,
   Rs_borderLess,
-#endif
-#if ENABLE_FRILLS
   Rs_lineSpace,
+  Rs_pty_fd,
+#endif
+#if ENABLE_XEMBED
+  Rs_embed,
 #endif
   Rs_cutchars,
   Rs_modifier,
@@ -643,7 +678,8 @@
   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,
@@ -662,6 +698,10 @@
   XA_DNDPROTOCOL,
   XA_DNDSELECTION,
 #endif
+#if ENABLE_XEMBED
+  XA_XEMBED,
+  XA_XEMBED_INFO,
+#endif
   NUM_XA
 };
 
@@ -698,9 +738,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
@@ -1344,6 +1384,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 ();