*** empty log message ***

[dana/urxvt.git] / src / rxvtlib.h.in

diff --git a/src/rxvtlib.h.in b/src/rxvtlib.h.in
index 5801c1a..ddbd819 100644 (file)
--- a/src/rxvtlib.h.in
+++ b/src/rxvtlib.h.in
@@ -1,24 +1,6 @@
 #ifndef _RXVTLIB_H_             /* include once only */
 #define _RXVTLIB_H_
 
-/*
- * section 1 generated by GNU autoconf for @build@
- * this section may be changed as appropriate _before_ building
- */
-/*****************************************************************************
- *                                 SECTION 1                                 *
- *****************************************************************************/
-
-/*
- * The following line MUST not be changed without also changing
- * config.h in the main directory before building
- */
-// none anymore
-
-/*****************************************************************************
- *                                 INCLUDES                                  *
- *****************************************************************************/
-
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
@@ -58,15 +40,12 @@ extern "C" {
 /* whatever normal size corresponds to a unsigned integer pointer */
 @rxvt_u_intp_define@
 
-/*****************************************************************************
- *                                 SECTION 2                                 *
- *                      DO NOT TOUCH ANYTHING BELOW HERE                     *
- *****************************************************************************/
-
 struct rxvt_fontset;
 struct rxvt_color;
 struct rxvt_vars;               /* defined later on */
 struct rxvt_term;
+struct rxvt_display;
+struct rxvt_im;
 
 typedef struct rxvt_term *rxvt_t;
 
@@ -263,16 +242,11 @@ struct rxvt_vars {
   menuBar_t       menuBar;
   unsigned long   Options;
   XSizeHints      szHint;
-  Display        *Xdisplay;
-  int             Xdepth;
-  int             Xscreen;
-  Visual         *Xvisual;
-  Colormap        Xcmap;
+  rxvt_display   *display;
   rxvt_color     *PixColors;
   short           numPixColors;
   Cursor          TermWin_cursor;       /* cursor for vt window */
   int             sb_shadow;    /* scrollbar shadow width                    */
-  int             Xfd;          /* file descriptor of X server connection    */
   int             cmd_fd;       /* pty file descriptor; connected to command */
   int             tty_fd;       /* tty file descriptor; connected to child   */
   int             numlock_state;