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.51 by pcg, Sat Mar 6 00:05:01 2004 UTC vs.
Revision 1.52 by pcg, Sun Mar 14 17:33:08 2004 UTC

… …
521#endif 521#endif
522#ifdef USE_XIM 522#ifdef USE_XIM
523 Rs_preeditType, 523 Rs_preeditType,
524 Rs_inputMethod, 524 Rs_inputMethod,
525#endif 525#endif
526#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
527 Rs_bigfont_key,
528 Rs_smallfont_key,
529#endif
530#ifdef TRANSPARENT 526#ifdef TRANSPARENT
531 Rs_transparent, 527 Rs_transparent,
532 Rs_transparent_all, 528 Rs_transparent_all,
533#endif 529#endif
534#ifndef NO_FRILLS 530#ifndef NO_FRILLS
… …
538 Rs_scrollBar_thickness, 534 Rs_scrollBar_thickness,
539#ifndef NO_LINESPACE 535#ifndef NO_LINESPACE
540 Rs_lineSpace, 536 Rs_lineSpace,
541#endif 537#endif
542 Rs_cutchars, 538 Rs_cutchars,
543#ifdef ACS_ASCII
544 Rs_acs_chars,
545#endif
546 Rs_modifier, 539 Rs_modifier,
547 Rs_answerbackstring, 540 Rs_answerbackstring,
548 Rs_tripleclickwords, 541 Rs_tripleclickwords,
549 Rs_cursorBlink, 542 Rs_cursorBlink,
550 Rs_pointerBlank, 543 Rs_pointerBlank,
… …
602#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 595#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
603#define PrivMode(test,bit) \ 596#define PrivMode(test,bit) \
604 if (test) \ 597 if (test) \
605 PrivateModes |= (bit); \ 598 PrivateModes |= (bit); \
606 else \ 599 else \
607 PrivateModes &= ~ (bit) 600 PrivateModes &= ~(bit)
608 601
609#ifdef ALLOW_132_MODE 602#ifdef ALLOW_132_MODE
610# define PrivMode_Default \
611(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 603# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
612#else 604#else
613# define PrivMode_Default \
614(PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 605# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
615#endif 606#endif
616 607
617#define XDEPTH display->depth 608#define XDEPTH display->depth
618#define XCMAP display->cmap 609#define XCMAP display->cmap
619#define XVISUAL display->visual 610#define XVISUAL display->visual
… …
840# define COMPOSE_LO 0xd800UL 831# define COMPOSE_LO 0xd800UL
841# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 832# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but...
842# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 833# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI)
843#endif 834#endif
844 835
845#if ENCODING_COMPOSE 836#if ENABLE_COMBINING
846// compose chars are used to represent composite characters 837// compose chars are used to represent composite characters
847// that are not representable in unicode, as well as characters 838// that are not representable in unicode, as well as characters
848// not fitting in the BMP. 839// not fitting in the BMP.
849struct compose_char { 840struct compose_char {
850 uint32_t c1, c2; // any chars != NOCHAR are valid 841 uint32_t c1, c2; // any chars != NOCHAR are valid
… …
1022 const char *key_backspace; 1013 const char *key_backspace;
1023#endif 1014#endif
1024#ifndef NO_DELETE_KEY 1015#ifndef NO_DELETE_KEY
1025 const char *key_delete; 1016 const char *key_delete;
1026#endif 1017#endif
1027#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
1028 KeySym ks_bigfont, ks_smallfont;
1029#endif
1030#ifdef USE_XIM 1018#ifdef USE_XIM
1031 rxvt_xim *input_method; 1019 rxvt_xim *input_method;
1032 XIC Input_Context; 1020 XIC Input_Context;
1033 XIMStyle input_style; 1021 XIMStyle input_style;
1034 int event_type; 1022 int event_type;
… …
1079 char *locale; 1067 char *locale;
1080 char *codeset; 1068 char *codeset;
1081 char charsets[4]; 1069 char charsets[4];
1082 unsigned char *v_buffer; /* pointer to physical buffer */ 1070 unsigned char *v_buffer; /* pointer to physical buffer */
1083 unsigned int v_buflen; /* size of area to write */ 1071 unsigned int v_buflen; /* size of area to write */
1084 char *newfont[MAX_NFONTS];
1085 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1072 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1086#ifdef KEYSYM_RESOURCE 1073#ifdef KEYSYM_RESOURCE
1087 const unsigned char *Keysym_map[256]; 1074 const unsigned char *Keysym_map[256];
1088#endif 1075#endif
1089 const char *rs[NUM_RESOURCES]; 1076 const char *rs[NUM_RESOURCES];

Diff Legend

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