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.130 by root, Mon Dec 13 07:18:52 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,
… …
638 XA_TARGETS, 641 XA_TARGETS,
639 XA_TIMESTAMP, 642 XA_TIMESTAMP,
640 XA_VT_SELECTION, 643 XA_VT_SELECTION,
641 XA_INCR, 644 XA_INCR,
642 XA_WMDELETEWINDOW, 645 XA_WMDELETEWINDOW,
646 XA_CLIPBOARD,
647#if ENABLE_FRILLS
648 XA_NET_WM_PID,
649 XA_MOTIF_WM_HINTS,
650 XA_NET_WM_NAME,
651 XA_NET_WM_ICON_NAME,
652#endif
653#if USE_XIM
654 XA_WM_LOCALE_NAME,
655#endif
643#ifdef TRANSPARENT 656#if TRANSPARENT
644 XA_XROOTPMAPID, 657 XA_XROOTPMAP_ID,
645 XA_XSETROOTID, 658 XA_ESETROOT_PMAP_ID,
646#endif 659#endif
647#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 660#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
648 XA_DNDPROTOCOL, 661 XA_DNDPROTOCOL,
649 XA_DNDSELECTION, 662 XA_DNDSELECTION,
650#endif /* OFFIX_DND */ 663#endif
651 XA_CLIPBOARD,
652 NUM_XA 664 NUM_XA
653}; 665};
654 666
655/* DEC private modes */ 667/* DEC private modes */
656#define PrivMode_132 (1UL<<0) 668#define PrivMode_132 (1UL<<0)
… …
942 operator mbstate_t *() { return &mbs; } 954 operator mbstate_t *() { return &mbs; }
943 void reset () { memset (&mbs, 0, sizeof (mbs)); } 955 void reset () { memset (&mbs, 0, sizeof (mbs)); }
944 mbstate () { reset (); } 956 mbstate () { reset (); }
945}; 957};
946 958
959#define UNICODE_MASK 0x1fffffUL
960
947#if UNICODE3 961#if UNICODE3
948# define COMPOSE_LO 0x40000000UL 962# define COMPOSE_LO 0x40000000UL
949# define COMPOSE_HI 0x400fffffUL 963# define COMPOSE_HI 0x400fffffUL
950# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 964# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
951#else 965#else
… …
980 994
981extern class rxvt_composite_vec rxvt_composite; 995extern class rxvt_composite_vec rxvt_composite;
982#endif 996#endif
983 997
984 998
999#ifdef KEYSYM_RESOURCE
1000 class keyboard_manager;
1001#endif
1002
985struct rxvt_term : zero_initialized, rxvt_vars { 1003struct rxvt_term : zero_initialized, rxvt_vars {
986 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
987 1005
988 struct mbstate mbstate; // current input multibyte state 1006 struct mbstate mbstate; // current input multibyte state
989 1007
… …
1006 hidden_text:1, 1024 hidden_text:1,
1007#endif 1025#endif
1008#ifdef POINTER_BLANK 1026#ifdef POINTER_BLANK
1009 hidden_pointer:1, 1027 hidden_pointer:1,
1010#endif 1028#endif
1011// enc_utf8:1, /* wether locale uses utf-8 */ 1029 enc_utf8:1, /* wether locale uses utf-8 */
1012 seen_input:1, /* wether we have seen some program output yet */ 1030 seen_input:1, /* wether we have seen some program output yet */
1013 seen_resize:1, /* wether we had a resize event */ 1031 seen_resize:1, /* wether we had a resize event */
1014 parsed_geometry:1; 1032 parsed_geometry:1;
1015 1033
1016 unsigned char refresh_type, 1034 unsigned char refresh_type,
… …
1062# ifdef POINTER_BLANK 1080# ifdef POINTER_BLANK
1063 pointerBlankDelay, 1081 pointerBlankDelay,
1064# endif 1082# endif
1065 allowedxerror; 1083 allowedxerror;
1066/* ---------- */ 1084/* ---------- */
1067 unsigned int ModMetaMask, 1085 unsigned int ModLevel3Mask,
1086 ModMetaMask,
1068 ModNumLockMask; 1087 ModNumLockMask;
1069 int old_width, /* last used width in screen resize */ 1088 int old_width, /* last used width in screen resize */
1070 old_height; /* last used height in screen resize */ 1089 old_height; /* last used height in screen resize */
1071 unsigned long priv_modes, 1090 unsigned long priv_modes,
1072 SavedModes; 1091 SavedModes;
… …
1106 pid_t cmd_pid; /* process id of child */ 1125 pid_t cmd_pid; /* process id of child */
1107 char * incr_buf; 1126 char * incr_buf;
1108 size_t incr_buf_size, incr_buf_fill; 1127 size_t incr_buf_size, incr_buf_fill;
1109/* ---------- */ 1128/* ---------- */
1110 Cursor leftptr_cursor; 1129 Cursor leftptr_cursor;
1111#ifdef POINTER_BLANK
1112 Cursor blank_cursor;
1113#endif
1114/* ---------- */ 1130/* ---------- */
1115#ifndef NO_BACKSPACE_KEY 1131#ifndef NO_BACKSPACE_KEY
1116 const char *key_backspace; 1132 const char *key_backspace;
1117#endif 1133#endif
1118#ifndef NO_DELETE_KEY 1134#ifndef NO_DELETE_KEY
… …
1176 char *locale; 1192 char *locale;
1177 char charsets[4]; 1193 char charsets[4];
1178 unsigned char *v_buffer; /* pointer to physical buffer */ 1194 unsigned char *v_buffer; /* pointer to physical buffer */
1179 unsigned int v_buflen; /* size of area to write */ 1195 unsigned int v_buflen; /* size of area to write */
1180 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1196 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1197
1181#ifdef KEYSYM_RESOURCE 1198#ifdef KEYSYM_RESOURCE
1182 const unsigned char *Keysym_map[256]; 1199 keyboard_manager *keyboard;
1183#endif 1200#endif
1201
1184 const char *rs[NUM_RESOURCES]; 1202 const char *rs[NUM_RESOURCES];
1185 /* command input buffering */ 1203 /* command input buffering */
1186 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1204 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1187 unsigned char cmdbuf_base[CBUFSIZ]; 1205 unsigned char cmdbuf_base[CBUFSIZ];
1188 1206
… …
1200 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1218 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);
1201 void iso14755_54 (int x, int y); 1219 void iso14755_54 (int x, int y);
1202# endif 1220# endif
1203#endif 1221#endif
1204 1222
1223 // modifies first argument(!)
1205 void paste (const unsigned char *data, unsigned int len); 1224 void paste (unsigned char *data, unsigned int len);
1206 1225
1207 void flush (); 1226 void flush ();
1208 1227
1209#if TRANSPARENT 1228#if TRANSPARENT
1210 void rootwin_cb (XEvent &xev); 1229 void rootwin_cb (XEvent &xev);

Diff Legend

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