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.131 by root, Mon Dec 13 19:16:36 2004 UTC vs.
Revision 1.143 by root, Thu Feb 3 07:18:30 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,
… …
560#ifdef HAVE_SCROLLBARS 563#ifdef HAVE_SCROLLBARS
561 Rs_scrollBar, 564 Rs_scrollBar,
562 Rs_scrollBar_right, 565 Rs_scrollBar_right,
563 Rs_scrollBar_floating, 566 Rs_scrollBar_floating,
564 Rs_scrollBar_align, 567 Rs_scrollBar_align,
565#endif
566 Rs_scrollstyle, /* Rs_scrollBar_style */ 568 Rs_scrollstyle, /* Rs_scrollBar_style */
569 Rs_scrollBar_thickness,
570#endif
567 Rs_scrollTtyOutput, 571 Rs_scrollTtyOutput,
568 Rs_scrollTtyKeypress, 572 Rs_scrollTtyKeypress,
569 Rs_scrollWithBuffer, 573 Rs_scrollWithBuffer,
570 Rs_saveLines, 574 Rs_saveLines,
571 Rs_utmpInhibit, 575 Rs_utmpInhibit,
… …
600#if ENABLE_FRILLS 604#if ENABLE_FRILLS
601 Rs_ext_bwidth, 605 Rs_ext_bwidth,
602 Rs_int_bwidth, 606 Rs_int_bwidth,
603 Rs_borderLess, 607 Rs_borderLess,
604#endif 608#endif
605 Rs_scrollBar_thickness, 609#if ENABLE_FRILLS
606#ifndef NO_LINESPACE
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,
… …
613 Rs_insecure, 616 Rs_insecure,
614 Rs_cursorBlink, 617 Rs_cursorBlink,
615 Rs_pointerBlank, 618 Rs_pointerBlank,
616 Rs_pointerBlankDelay, 619 Rs_pointerBlankDelay,
617 Rs_imLocale, 620 Rs_imLocale,
621 Rs_imFont,
618 Rs_pastableTabs, 622 Rs_pastableTabs,
619#ifndef NO_SECONDARY_SCREEN 623#ifndef NO_SECONDARY_SCREEN
620 Rs_secondaryScreen, 624 Rs_secondaryScreen,
621 Rs_secondaryScroll, 625 Rs_secondaryScroll,
622#endif 626#endif
… …
638 XA_TARGETS, 642 XA_TARGETS,
639 XA_TIMESTAMP, 643 XA_TIMESTAMP,
640 XA_VT_SELECTION, 644 XA_VT_SELECTION,
641 XA_INCR, 645 XA_INCR,
642 XA_WMDELETEWINDOW, 646 XA_WMDELETEWINDOW,
647 XA_CLIPBOARD,
648#if ENABLE_FRILLS
649 XA_NET_WM_PID,
650 XA_MOTIF_WM_HINTS,
651 XA_NET_WM_NAME,
652 XA_NET_WM_ICON_NAME,
653#endif
654#if USE_XIM
655 XA_WM_LOCALE_NAME,
656#endif
643#ifdef TRANSPARENT 657#if TRANSPARENT
644 XA_XROOTPMAPID, 658 XA_XROOTPMAP_ID,
645 XA_XSETROOTID, 659 XA_ESETROOT_PMAP_ID,
646#endif 660#endif
647#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 661#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
648 XA_DNDPROTOCOL, 662 XA_DNDPROTOCOL,
649 XA_DNDSELECTION, 663 XA_DNDSELECTION,
650#endif /* OFFIX_DND */ 664#endif
651 XA_CLIPBOARD,
652 NUM_XA 665 NUM_XA
653}; 666};
654 667
655/* DEC private modes */ 668/* DEC private modes */
656#define PrivMode_132 (1UL<<0) 669#define PrivMode_132 (1UL<<0)
… …
942 operator mbstate_t *() { return &mbs; } 955 operator mbstate_t *() { return &mbs; }
943 void reset () { memset (&mbs, 0, sizeof (mbs)); } 956 void reset () { memset (&mbs, 0, sizeof (mbs)); }
944 mbstate () { reset (); } 957 mbstate () { reset (); }
945}; 958};
946 959
960#define UNICODE_MASK 0x1fffffUL
961
947#if UNICODE3 962#if UNICODE3
948# define COMPOSE_LO 0x40000000UL 963# define COMPOSE_LO 0x40000000UL
949# define COMPOSE_HI 0x400fffffUL 964# define COMPOSE_HI 0x400fffffUL
950# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 965# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
951#else 966#else
… …
980 995
981extern class rxvt_composite_vec rxvt_composite; 996extern class rxvt_composite_vec rxvt_composite;
982#endif 997#endif
983 998
984 999
1000#ifdef KEYSYM_RESOURCE
1001 class keyboard_manager;
1002#endif
1003
985struct rxvt_term : zero_initialized, rxvt_vars { 1004struct rxvt_term : zero_initialized, rxvt_vars {
986 log_callback *log_hook; // log error messages through this hook, if != 0 1005 log_callback *log_hook; // log error messages through this hook, if != 0
987 1006
988 struct mbstate mbstate; // current input multibyte state 1007 struct mbstate mbstate; // current input multibyte state
989 1008
… …
1006 hidden_text:1, 1025 hidden_text:1,
1007#endif 1026#endif
1008#ifdef POINTER_BLANK 1027#ifdef POINTER_BLANK
1009 hidden_pointer:1, 1028 hidden_pointer:1,
1010#endif 1029#endif
1011// enc_utf8:1, /* wether locale uses utf-8 */ 1030 enc_utf8:1, /* wether locale uses utf-8 */
1012 seen_input:1, /* wether we have seen some program output yet */ 1031 seen_input:1, /* wether we have seen some program output yet */
1013 seen_resize:1, /* wether we had a resize event */ 1032 seen_resize:1, /* wether we had a resize event */
1014 parsed_geometry:1; 1033 parsed_geometry:1;
1015 1034
1016 unsigned char refresh_type, 1035 unsigned char refresh_type,
… …
1062# ifdef POINTER_BLANK 1081# ifdef POINTER_BLANK
1063 pointerBlankDelay, 1082 pointerBlankDelay,
1064# endif 1083# endif
1065 allowedxerror; 1084 allowedxerror;
1066/* ---------- */ 1085/* ---------- */
1067 unsigned int ModMetaMask, 1086 unsigned int ModLevel3Mask,
1087 ModMetaMask,
1068 ModNumLockMask; 1088 ModNumLockMask;
1069 int old_width, /* last used width in screen resize */ 1089 int old_width, /* last used width in screen resize */
1070 old_height; /* last used height in screen resize */ 1090 old_height; /* last used height in screen resize */
1071 unsigned long priv_modes, 1091 unsigned long priv_modes,
1072 SavedModes; 1092 SavedModes;
… …
1106 pid_t cmd_pid; /* process id of child */ 1126 pid_t cmd_pid; /* process id of child */
1107 char * incr_buf; 1127 char * incr_buf;
1108 size_t incr_buf_size, incr_buf_fill; 1128 size_t incr_buf_size, incr_buf_fill;
1109/* ---------- */ 1129/* ---------- */
1110 Cursor leftptr_cursor; 1130 Cursor leftptr_cursor;
1111#ifdef POINTER_BLANK
1112 Cursor blank_cursor;
1113#endif
1114/* ---------- */ 1131/* ---------- */
1115#ifndef NO_BACKSPACE_KEY 1132#ifndef NO_BACKSPACE_KEY
1116 const char *key_backspace; 1133 const char *key_backspace;
1117#endif 1134#endif
1118#ifndef NO_DELETE_KEY 1135#ifndef NO_DELETE_KEY
… …
1176 char *locale; 1193 char *locale;
1177 char charsets[4]; 1194 char charsets[4];
1178 unsigned char *v_buffer; /* pointer to physical buffer */ 1195 unsigned char *v_buffer; /* pointer to physical buffer */
1179 unsigned int v_buflen; /* size of area to write */ 1196 unsigned int v_buflen; /* size of area to write */
1180 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1197 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1198
1181#ifdef KEYSYM_RESOURCE 1199#ifdef KEYSYM_RESOURCE
1182 const unsigned char *Keysym_map[256]; 1200 keyboard_manager *keyboard;
1183#endif 1201#endif
1202
1184 const char *rs[NUM_RESOURCES]; 1203 const char *rs[NUM_RESOURCES];
1185 /* command input buffering */ 1204 /* command input buffering */
1186 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1205 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1187 unsigned char cmdbuf_base[CBUFSIZ]; 1206 unsigned char cmdbuf_base[CBUFSIZ];
1188 1207
… …
1211 void rootwin_cb (XEvent &xev); 1230 void rootwin_cb (XEvent &xev);
1212 xevent_watcher rootwin_ev; 1231 xevent_watcher rootwin_ev;
1213#endif 1232#endif
1214 1233
1215 1234
1216 void sig_term (sig_watcher &w); sig_watcher sw_term; 1235 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1217 void sig_chld (sig_watcher &w); sig_watcher sw_chld; 1236 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1218 1237
1219 void x_cb (XEvent &xev); 1238 void x_cb (XEvent &xev);
1220 xevent_watcher termwin_ev; 1239 xevent_watcher termwin_ev;
1221 xevent_watcher vt_ev; 1240 xevent_watcher vt_ev;

Diff Legend

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