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.188 by root, Fri Jan 6 18:33:30 2006 UTC vs.
Revision 1.191 by root, Sun Jan 8 01:02:15 2006 UTC

… …
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23
24#include "rxvtperl.h"
23 25
24#if ENABLE_FRILLS 26#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1 27# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1 28# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1 29# define CURSOR_BLINK 1
… …
697#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 699#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
698#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 700#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
699#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
700#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
701 703
704#define OPTION(opt) (options & (opt))
705#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
706 | Opt_jumpScroll | Opt_secondaryScreen \
707 | Opt_pastableTabs | Opt_intensityStyles)
708
702// for m >= -n, ensure remainder lies between 0..n-1 709// for m >= -n, ensure remainder lies between 0..n-1
703#define MOD(m,n) (((m) + (n)) % (n)) 710#define MOD(m,n) (((m) + (n)) % (n))
704 711
705#define LINENO(n) MOD (term_start + int(n), total_rows) 712#define LINENO(n) MOD (term_start + int(n), total_rows)
706#define ROW(n) row_buf [LINENO (n)] 713#define ROW(n) row_buf [LINENO (n)]
… …
920#if UNICODE3 927#if UNICODE3
921# define COMPOSE_LO 0x40000000UL 928# define COMPOSE_LO 0x40000000UL
922# define COMPOSE_HI 0x400fffffUL 929# define COMPOSE_HI 0x400fffffUL
923# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 930# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
924#else 931#else
932# if ENABLE_PERL
933# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
934# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
935# else
925# define COMPOSE_LO 0xd800UL 936# define COMPOSE_LO 0xd800UL
926# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 937# define COMPOSE_HI 0xf8ffUL
927# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 938# endif
939# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
928#endif 940#endif
929 941
930#if ENABLE_COMBINING 942#if ENABLE_COMBINING
931// compose chars are used to represent composite characters 943// compose chars are used to represent composite characters
932// that are not representable in unicode, as well as characters 944// that are not representable in unicode, as well as characters
… …
959#ifdef KEYSYM_RESOURCE 971#ifdef KEYSYM_RESOURCE
960 class keyboard_manager; 972 class keyboard_manager;
961#endif 973#endif
962 974
963struct rxvt_term : zero_initialized, rxvt_vars { 975struct rxvt_term : zero_initialized, rxvt_vars {
964 log_callback *log_hook; // log error messages through this hook, if != 0 976 log_callback *log_hook; // log error messages through this hook, if != 0
965 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 977 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
966 978
967#if ENABLE_PERL 979#if ENABLE_PERL
968 void *self; // perl's $self 980 rxvt_perl_term perl;
969#endif 981#endif
970 982
971 struct mbstate mbstate; // current input multibyte state 983 struct mbstate mbstate; // current input multibyte state
972 984
973 unsigned char want_refresh:1, 985 unsigned char want_refresh:1,
… …
1432# endif 1444# endif
1433 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1445 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1434 base += minBrightCOLOR - minCOLOR; 1446 base += minBrightCOLOR - minCOLOR;
1435#endif 1447#endif
1436 return base; 1448 return base;
1449 }
1450
1451 bool option (uint32_t opt)
1452 {
1453 return OPTION (opt);
1454 }
1455
1456 void set_option (uint32_t opt, bool set)
1457 {
1458 if (set)
1459 options |= opt;
1460 else
1461 options &= ~opt;
1437 } 1462 }
1438 1463
1439 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1464 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1440 void scr_blank_screen_mem (line_t &l, rend_t efs); 1465 void scr_blank_screen_mem (line_t &l, rend_t efs);
1441 int scr_scroll_text (int row1, int row2, int count); 1466 int scr_scroll_text (int row1, int row2, int count);

Diff Legend

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