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.132 by root, Wed Dec 15 00:12:58 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"
… …
500 Color_BD, 500 Color_BD,
501 Color_IT, 501 Color_IT,
502 Color_UL, 502 Color_UL,
503 Color_RV, 503 Color_RV,
504#endif 504#endif
505#if ENABLE_FRILLS
506 Color_underline,
507#endif
505#ifdef OPTION_HC 508#ifdef OPTION_HC
506 Color_HC, 509 Color_HC,
507#endif 510#endif
508#ifdef KEEP_SCROLLCOLOR 511#ifdef KEEP_SCROLLCOLOR
509 Color_scroll, 512 Color_scroll,
… …
601 Rs_ext_bwidth, 604 Rs_ext_bwidth,
602 Rs_int_bwidth, 605 Rs_int_bwidth,
603 Rs_borderLess, 606 Rs_borderLess,
604#endif 607#endif
605 Rs_scrollBar_thickness, 608 Rs_scrollBar_thickness,
606#ifndef NO_LINESPACE 609#if ENABLE_FRILLS
607 Rs_lineSpace, 610 Rs_lineSpace,
608#endif 611#endif
609 Rs_cutchars, 612 Rs_cutchars,
610 Rs_modifier, 613 Rs_modifier,
611 Rs_answerbackstring, 614 Rs_answerbackstring,
… …
649#endif 652#endif
650#if USE_XIM 653#if USE_XIM
651 XA_WM_LOCALE_NAME, 654 XA_WM_LOCALE_NAME,
652#endif 655#endif
653#if TRANSPARENT 656#if TRANSPARENT
654 XA_XROOTPMAPID, 657 XA_XROOTPMAP_ID,
655 XA_XSETROOTID, 658 XA_ESETROOT_PMAP_ID,
656#endif 659#endif
657#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 660#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
658 XA_DNDPROTOCOL, 661 XA_DNDPROTOCOL,
659 XA_DNDSELECTION, 662 XA_DNDSELECTION,
660#endif /* OFFIX_DND */ 663#endif
661 NUM_XA 664 NUM_XA
662}; 665};
663 666
664/* DEC private modes */ 667/* DEC private modes */
665#define PrivMode_132 (1UL<<0) 668#define PrivMode_132 (1UL<<0)
… …
951 operator mbstate_t *() { return &mbs; } 954 operator mbstate_t *() { return &mbs; }
952 void reset () { memset (&mbs, 0, sizeof (mbs)); } 955 void reset () { memset (&mbs, 0, sizeof (mbs)); }
953 mbstate () { reset (); } 956 mbstate () { reset (); }
954}; 957};
955 958
959#define UNICODE_MASK 0x1fffffUL
960
956#if UNICODE3 961#if UNICODE3
957# define COMPOSE_LO 0x40000000UL 962# define COMPOSE_LO 0x40000000UL
958# define COMPOSE_HI 0x400fffffUL 963# define COMPOSE_HI 0x400fffffUL
959# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 964# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
960#else 965#else
… …
989 994
990extern class rxvt_composite_vec rxvt_composite; 995extern class rxvt_composite_vec rxvt_composite;
991#endif 996#endif
992 997
993 998
999#ifdef KEYSYM_RESOURCE
1000 class keyboard_manager;
1001#endif
1002
994struct rxvt_term : zero_initialized, rxvt_vars { 1003struct rxvt_term : zero_initialized, rxvt_vars {
995 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
996 1005
997 struct mbstate mbstate; // current input multibyte state 1006 struct mbstate mbstate; // current input multibyte state
998 1007
… …
1015 hidden_text:1, 1024 hidden_text:1,
1016#endif 1025#endif
1017#ifdef POINTER_BLANK 1026#ifdef POINTER_BLANK
1018 hidden_pointer:1, 1027 hidden_pointer:1,
1019#endif 1028#endif
1020// enc_utf8:1, /* wether locale uses utf-8 */ 1029 enc_utf8:1, /* wether locale uses utf-8 */
1021 seen_input:1, /* wether we have seen some program output yet */ 1030 seen_input:1, /* wether we have seen some program output yet */
1022 seen_resize:1, /* wether we had a resize event */ 1031 seen_resize:1, /* wether we had a resize event */
1023 parsed_geometry:1; 1032 parsed_geometry:1;
1024 1033
1025 unsigned char refresh_type, 1034 unsigned char refresh_type,
… …
1071# ifdef POINTER_BLANK 1080# ifdef POINTER_BLANK
1072 pointerBlankDelay, 1081 pointerBlankDelay,
1073# endif 1082# endif
1074 allowedxerror; 1083 allowedxerror;
1075/* ---------- */ 1084/* ---------- */
1076 unsigned int ModMetaMask, 1085 unsigned int ModLevel3Mask,
1086 ModMetaMask,
1077 ModNumLockMask; 1087 ModNumLockMask;
1078 int old_width, /* last used width in screen resize */ 1088 int old_width, /* last used width in screen resize */
1079 old_height; /* last used height in screen resize */ 1089 old_height; /* last used height in screen resize */
1080 unsigned long priv_modes, 1090 unsigned long priv_modes,
1081 SavedModes; 1091 SavedModes;
… …
1115 pid_t cmd_pid; /* process id of child */ 1125 pid_t cmd_pid; /* process id of child */
1116 char * incr_buf; 1126 char * incr_buf;
1117 size_t incr_buf_size, incr_buf_fill; 1127 size_t incr_buf_size, incr_buf_fill;
1118/* ---------- */ 1128/* ---------- */
1119 Cursor leftptr_cursor; 1129 Cursor leftptr_cursor;
1120#ifdef POINTER_BLANK
1121 Cursor blank_cursor;
1122#endif
1123/* ---------- */ 1130/* ---------- */
1124#ifndef NO_BACKSPACE_KEY 1131#ifndef NO_BACKSPACE_KEY
1125 const char *key_backspace; 1132 const char *key_backspace;
1126#endif 1133#endif
1127#ifndef NO_DELETE_KEY 1134#ifndef NO_DELETE_KEY
… …
1185 char *locale; 1192 char *locale;
1186 char charsets[4]; 1193 char charsets[4];
1187 unsigned char *v_buffer; /* pointer to physical buffer */ 1194 unsigned char *v_buffer; /* pointer to physical buffer */
1188 unsigned int v_buflen; /* size of area to write */ 1195 unsigned int v_buflen; /* size of area to write */
1189 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1196 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1197
1190#ifdef KEYSYM_RESOURCE 1198#ifdef KEYSYM_RESOURCE
1191 const unsigned char *Keysym_map[256]; 1199 keyboard_manager *keyboard;
1192#endif 1200#endif
1201
1193 const char *rs[NUM_RESOURCES]; 1202 const char *rs[NUM_RESOURCES];
1194 /* command input buffering */ 1203 /* command input buffering */
1195 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1204 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1196 unsigned char cmdbuf_base[CBUFSIZ]; 1205 unsigned char cmdbuf_base[CBUFSIZ];
1197 1206

Diff Legend

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