ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.135 by root, Mon Dec 20 18:07:19 2004 UTC vs.
Revision 1.140 by root, Mon Jan 17 00:59:23 2005 UTC

… …
10#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
11#include <X11/keysym.h> 11#include <X11/keysym.h>
12#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
13#include <X11/Xatom.h> 13#include <X11/Xatom.h>
14#if ENABLE_FRILLS 14#if ENABLE_FRILLS
15#include <X11/Xmd.h> 15# include <X11/Xmd.h>
16#endif 16#endif
17 17
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
… …
604 Rs_ext_bwidth, 604 Rs_ext_bwidth,
605 Rs_int_bwidth, 605 Rs_int_bwidth,
606 Rs_borderLess, 606 Rs_borderLess,
607#endif 607#endif
608 Rs_scrollBar_thickness, 608 Rs_scrollBar_thickness,
609#ifndef NO_LINESPACE 609#if ENABLE_FRILLS
610 Rs_lineSpace, 610 Rs_lineSpace,
611#endif 611#endif
612 Rs_cutchars, 612 Rs_cutchars,
613 Rs_modifier, 613 Rs_modifier,
614 Rs_answerbackstring, 614 Rs_answerbackstring,
… …
994 994
995extern class rxvt_composite_vec rxvt_composite; 995extern class rxvt_composite_vec rxvt_composite;
996#endif 996#endif
997 997
998 998
999#ifdef KEYSYM_RESOURCE
1000 class keyboard_manager;
1001#endif
1002
999struct rxvt_term : zero_initialized, rxvt_vars { 1003struct rxvt_term : zero_initialized, rxvt_vars {
1000 log_callback *log_hook; // log error messages through this hook, if != 0 1004 log_callback *log_hook; // log error messages through this hook, if != 0
1001 1005
1002 struct mbstate mbstate; // current input multibyte state 1006 struct mbstate mbstate; // current input multibyte state
1003 1007
… …
1020 hidden_text:1, 1024 hidden_text:1,
1021#endif 1025#endif
1022#ifdef POINTER_BLANK 1026#ifdef POINTER_BLANK
1023 hidden_pointer:1, 1027 hidden_pointer:1,
1024#endif 1028#endif
1025// enc_utf8:1, /* wether locale uses utf-8 */ 1029 enc_utf8:1, /* wether locale uses utf-8 */
1026 seen_input:1, /* wether we have seen some program output yet */ 1030 seen_input:1, /* wether we have seen some program output yet */
1027 seen_resize:1, /* wether we had a resize event */ 1031 seen_resize:1, /* wether we had a resize event */
1028 parsed_geometry:1; 1032 parsed_geometry:1;
1029 1033
1030 unsigned char refresh_type, 1034 unsigned char refresh_type,
… …
1076# ifdef POINTER_BLANK 1080# ifdef POINTER_BLANK
1077 pointerBlankDelay, 1081 pointerBlankDelay,
1078# endif 1082# endif
1079 allowedxerror; 1083 allowedxerror;
1080/* ---------- */ 1084/* ---------- */
1081 unsigned int ModMetaMask, 1085 unsigned int ModLevel3Mask,
1086 ModMetaMask,
1082 ModNumLockMask; 1087 ModNumLockMask;
1083 int old_width, /* last used width in screen resize */ 1088 int old_width, /* last used width in screen resize */
1084 old_height; /* last used height in screen resize */ 1089 old_height; /* last used height in screen resize */
1085 unsigned long priv_modes, 1090 unsigned long priv_modes,
1086 SavedModes; 1091 SavedModes;
… …
1120 pid_t cmd_pid; /* process id of child */ 1125 pid_t cmd_pid; /* process id of child */
1121 char * incr_buf; 1126 char * incr_buf;
1122 size_t incr_buf_size, incr_buf_fill; 1127 size_t incr_buf_size, incr_buf_fill;
1123/* ---------- */ 1128/* ---------- */
1124 Cursor leftptr_cursor; 1129 Cursor leftptr_cursor;
1125#ifdef POINTER_BLANK
1126 Cursor blank_cursor;
1127#endif
1128/* ---------- */ 1130/* ---------- */
1129#ifndef NO_BACKSPACE_KEY 1131#ifndef NO_BACKSPACE_KEY
1130 const char *key_backspace; 1132 const char *key_backspace;
1131#endif 1133#endif
1132#ifndef NO_DELETE_KEY 1134#ifndef NO_DELETE_KEY
… …
1190 char *locale; 1192 char *locale;
1191 char charsets[4]; 1193 char charsets[4];
1192 unsigned char *v_buffer; /* pointer to physical buffer */ 1194 unsigned char *v_buffer; /* pointer to physical buffer */
1193 unsigned int v_buflen; /* size of area to write */ 1195 unsigned int v_buflen; /* size of area to write */
1194 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1196 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1197
1195#ifdef KEYSYM_RESOURCE 1198#ifdef KEYSYM_RESOURCE
1196 const unsigned char *Keysym_map[256]; 1199 keyboard_manager *keyboard;
1197#endif 1200#endif
1201
1198 const char *rs[NUM_RESOURCES]; 1202 const char *rs[NUM_RESOURCES];
1199 /* command input buffering */ 1203 /* command input buffering */
1200 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1204 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1201 unsigned char cmdbuf_base[CBUFSIZ]; 1205 unsigned char cmdbuf_base[CBUFSIZ];
1202 1206

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines