--- rxvt-unicode/src/rxvt.h	2005/02/17 15:07:48	1.149
+++ rxvt-unicode/src/rxvt.h	2005/06/18 09:02:37	1.158
@@ -21,6 +21,12 @@
 #include "iom.h"
 #include "salloc.h"
 
+#if ENABLE_FRILLS
+# define ENABLE_XEMBED 1
+# define ENABLE_EWMH   1
+# define CURSOR_BLINK  1
+#endif
+
 /*
  *****************************************************************************
  * SYSTEM HACKS
@@ -133,7 +139,7 @@
 /* If we're using either the rxvt scrollbar or menu bars, keep the
  * scrollColor resource.
  */
-#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
+#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
 # define KEEP_SCROLLCOLOR 1
 #else
 # undef KEEP_SCROLLCOLOR
@@ -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
@@ -238,10 +269,10 @@
 #define R_SB_ALIGN_TOP          1
 #define R_SB_ALIGN_BOTTOM       2
 
-#define R_SB_RXVT               0
 #define R_SB_NEXT               1
 #define R_SB_XTERM              2
 #define R_SB_PLAIN              4
+#define R_SB_RXVT               8
 
 #define SB_WIDTH_NEXT           19
 #define SB_WIDTH_XTERM          15
@@ -444,15 +475,19 @@
   XTerm_restoreFG        = 39,      // change default fg color
   XTerm_restoreBG        = 49,      // change default bg color
   XTerm_dumpscreen       = 55,      // dump scrollback and all of screen
-  XTerm_locale           = 701,     // change locale
-  XTerm_Menu             = 703,     // set menu item
-  XTerm_Color_IT         = 704,     // change actual 'Italic' colour
-  XTerm_Color_tint       = 705,     // change actual tint colour
+
+  URxvt_locale           = 701,     // change locale
+  URxvt_Menu             = 703,     // set menu item
+  URxvt_Color_IT         = 704,     // change actual 'Italic' colour
+  URxvt_Color_tint       = 705,     // change actual tint colour
 
   URxvt_font             = 710,
   URxvt_boldFont         = 711,
   URxvt_italicFont       = 712,
   URxvt_boldItalicFont   = 713,
+
+  URxvt_view_up          = 720,
+  URxvt_view_down        = 721,
 };
 
 /* Words starting with `Color_' are colours.  Others are counts */
@@ -610,15 +645,20 @@
   Rs_int_bwidth,
   Rs_borderLess,
   Rs_lineSpace,
-  Rs_embed,
   Rs_pty_fd,
+  Rs_cursorUnderline,
+#endif
+#if CURSOR_BLINK
+  Rs_cursorBlink,
+#endif
+#if ENABLE_XEMBED
+  Rs_embed,
 #endif
   Rs_cutchars,
   Rs_modifier,
   Rs_answerbackstring,
   Rs_tripleclickwords,
   Rs_insecure,
-  Rs_cursorBlink,
   Rs_pointerBlank,
   Rs_pointerBlankDelay,
   Rs_imLocale,
@@ -647,13 +687,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,
@@ -666,6 +710,10 @@
   XA_DNDPROTOCOL,
   XA_DNDSELECTION,
 #endif
+#if ENABLE_XEMBED
+  XA_XEMBED,
+  XA_XEMBED_INFO,
+#endif
   NUM_XA
 };
 
@@ -1181,6 +1229,7 @@
                         text_t text,
                         rend_t rend = OVERLAY_RSTYLE);
   void scr_overlay_set (int x, int y, const char *s);
+  void scr_overlay_set (int x, int y, const wchar_t *s);
 #endif
 
   vector<void *> allocated;           // free these memory blocks with free()
@@ -1348,6 +1397,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 ();
@@ -1430,6 +1481,11 @@
   void scr_refresh (unsigned char refresh_type);
   bool scr_refresh_rend (rend_t mask, rend_t value);
   void scr_erase_screen (int mode);
+#if ENABLE_FRILLS
+  void scr_erase_savelines ();
+  void scr_backindex ();
+  void scr_forwardindex ();
+#endif
   void scr_touch (bool refresh);
   void scr_expose (int x, int y, int width, int height, bool refresh);
   rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
@@ -1446,8 +1502,6 @@
   void scr_add_lines (const unicode_t *str, int nlines, int len);
   void scr_backspace ();
   void scr_tab (int count, bool ht = false);
-  void scr_backindex ();
-  void scr_forwardindex ();
   void scr_gotorc (int row, int col, int relative);
   void scr_index (enum page_dirn direction);
   void scr_erase_line (int mode);