--- rxvt-unicode/src/rxvtlib.h.in 2004/01/31 00:20:21 1.9 +++ rxvt-unicode/src/rxvtlib.h.in 2004/03/14 23:14:39 1.17 @@ -1,27 +1,9 @@ #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 -#include -#include +#include +#include +#include @include_stdarg_h@ @include_stdlib_h@ @include_stdint_h@ @@ -40,6 +22,8 @@ #include #include +#include + extern "C" { #include /* Xlib, Xutil, Xresource, Xfuncproto */ } @@ -58,15 +42,13 @@ /* 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; +struct rxvt_drawable; typedef struct rxvt_term *rxvt_t; @@ -83,7 +65,7 @@ int32_t col; } row_col_t; -#if UNICODE3 +#if UNICODE_3 typedef uint32_t text_t; #else typedef uint16_t text_t; // saves lots of memory @@ -123,6 +105,7 @@ GC gc; /* GC for drawing */ Pixmap pixmap; rxvt_fontset *fontset; + rxvt_drawable *drawable; } TermWin_t; /* @@ -178,7 +161,7 @@ }; typedef struct { - unsigned char *text; /* selected text */ + wchar_t *text; /* selected text */ uint32_t len; /* length of selected text */ short screen; /* screen being used */ short clicks; /* number of clicks */ @@ -188,10 +171,6 @@ row_col_t end; /* one character past end point */ } selection_t; -typedef enum { - OLD_SELECT, OLD_WORD_SELECT, NEW_SELECT -} sstyle_t; - /* ------------------------------------------------------------------------- */ /* screen_t flags */ @@ -218,7 +197,7 @@ #define Opt_scrollTtyKeypress (1LU<<12) #define Opt_transparent (1LU<<13) #define Opt_transparent_all (1LU<<14) -#define Opt_mc_hack (1LU<<15) +#define Opt_15 (1LU<<15) // UNALLOCATED #define Opt_tripleclickwords (1LU<<16) #define Opt_scrollWithBuffer (1LU<<17) #define Opt_jumpScroll (1LU<<18) @@ -237,6 +216,7 @@ typedef struct { short state; Window win; + struct rxvt_drawable *drawable; } menuBar_t; typedef struct { @@ -249,7 +229,7 @@ short style; /* style: rxvt, xterm, next */ short width; /* scrollbar width */ Window win; - //int (*update)(int, int, int, int); + int (rxvt_term::*update)(int, int, int, int); void setIdle() { state = 1 ; } void setMotion() { state = 'm'; } @@ -263,16 +243,11 @@ 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; @@ -284,7 +259,6 @@ screen_t screen; screen_t swap; selection_t selection; - sstyle_t selection_style; }; void rxvt_init_signals ();