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.247 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.251 by root, Tue Jan 31 18:36:35 2006 UTC

… …
32#if ENABLE_FRILLS 32#if ENABLE_FRILLS
33# include <X11/Xmd.h> 33# include <X11/Xmd.h>
34#endif 34#endif
35 35
36#include "encoding.h" 36#include "encoding.h"
37#include "rxvtutil.h"
37#include "rxvtfont.h" 38#include "rxvtfont.h"
38#include "rxvttoolkit.h" 39#include "rxvttoolkit.h"
39#include "iom.h" 40#include "iom.h"
40#include "salloc.h" 41#include "salloc.h"
41#include "libptytty.h" 42#include "libptytty.h"
… …
97# define STDOUT_FILENO 1 98# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 99# define STDERR_FILENO 2
99#endif 100#endif
100 101
101/****************************************************************************/ 102/****************************************************************************/
102
103#ifndef __attribute__
104# if __GNUC__
105# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
106# define __attribute__(x)
107# endif
108# endif
109# define __attribute__(x)
110#endif
111
112#define NORETURN __attribute__ ((noreturn))
113#define UNUSED __attribute__ ((unused))
114
115// increases code size unless -fno-enforce-eh-specs
116#if __GNUC__
117# define NOTHROW
118# define THROW(x)
119#else
120# define NOTHROW throw()
121# define THROW(x) throw x
122#endif
123 103
124// exception thrown on fatal (per-instance) errors 104// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 105class rxvt_failure_exception { };
126 106
127// exception thrown when the command parser runs out of input data 107// exception thrown when the command parser runs out of input data
… …
608#endif 588#endif
609}; 589};
610 590
611#define Color_Bits 7 // 0 .. maxTermCOLOR 591#define Color_Bits 7 // 0 .. maxTermCOLOR
612 592
613#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
614#define NPIXCLR_BITS 32
615
616/* 593/*
617 * Resource list 594 * Resource list
618 */ 595 */
619enum { 596enum {
620# define def(name) Rs_ ## name, 597# define def(name) Rs_ ## name,
… …
751#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 728#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
752#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 729#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
753 730
754#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 731#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
755 732
756#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 733#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
757#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 734#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
758 735
759#if ENABLE_STYLES 736#if ENABLE_STYLES
760# define FONTSET(style) fontset[GET_STYLE (style)] 737# define FONTSET(style) fontset[GET_STYLE (style)]
761#else 738#else
762# define FONTSET(style) fontset[0] 739# define FONTSET(style) fontset[0]
… …
872# define COMPOSE_LO 0x40000000UL 849# define COMPOSE_LO 0x40000000UL
873# define COMPOSE_HI 0x400fffffUL 850# define COMPOSE_HI 0x400fffffUL
874# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 851# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
875#else 852#else
876# if ENABLE_PERL 853# if ENABLE_PERL
877# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 854# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
878# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 855# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
879# else 856# else
880# define COMPOSE_LO 0xd800UL 857# define COMPOSE_LO 0xd800UL
881# define COMPOSE_HI 0xf8ffUL 858# define COMPOSE_HI 0xf8ffUL
882# endif 859# endif
… …
964 int num_scr; /* screen: number lines scrolled */ 941 int num_scr; /* screen: number lines scrolled */
965 int prev_ncol, /* screen: previous number of columns */ 942 int prev_ncol, /* screen: previous number of columns */
966 prev_nrow; /* screen: previous number of rows */ 943 prev_nrow; /* screen: previous number of rows */
967/* ---------- */ 944/* ---------- */
968 rend_t rstyle; 945 rend_t rstyle;
969/* ---------- */
970 uint32_t pixcolor_set[NPIXCLR_SETS];
971/* ---------- */ 946/* ---------- */
972#ifdef SELECTION_SCROLLING 947#ifdef SELECTION_SCROLLING
973 int scroll_selection_lines; 948 int scroll_selection_lines;
974 enum page_dirn scroll_selection_dir; 949 enum page_dirn scroll_selection_dir;
975 int selection_save_x, 950 int selection_save_x,
… …
1276 void set_utf8_property (Atom prop, const char *str, int len = -1); 1251 void set_utf8_property (Atom prop, const char *str, int len = -1);
1277 void set_title (const char *str); 1252 void set_title (const char *str);
1278 void set_icon_name (const char *str); 1253 void set_icon_name (const char *str);
1279 void set_window_color (int idx, const char *color); 1254 void set_window_color (int idx, const char *color);
1280 void set_colorfgbg (); 1255 void set_colorfgbg ();
1281 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1256 bool set_color (rxvt_color &color, const char *name);
1282 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1257 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1283 1258
1284 // screen.C 1259 // screen.C
1285 1260
1286 void lalloc (line_t &l) const 1261 void lalloc (line_t &l) const

Diff Legend

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