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.243 by root, Wed Jan 25 02:53:13 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
… …
432// fake styles 412// fake styles
433#define RS_Blink 0x00010000UL // blink 413#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 414#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 415#define RS_Uline 0x00040000UL // underline
436 416
417// toggle this to force redraw, must be != RS_Careful
418#define RS_redraw 0x01000000UL
419
437// 5 custom bits for extensions 420// 5 custom bits for extensions
438#define RS_customCount 32 421#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 422#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 423#define RS_customShift 19
441 424
… …
510 Rxvt_restoreFG = 39, // change default fg color 493 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 494 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 495 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 496
514 URxvt_locale = 701, // change locale 497 URxvt_locale = 701, // change locale
498 URxvt_version = 702, // request version
515 499
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 500 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 501 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 502 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 503 URxvt_Color_UL = 707,
… …
604#endif 588#endif
605}; 589};
606 590
607#define Color_Bits 7 // 0 .. maxTermCOLOR 591#define Color_Bits 7 // 0 .. maxTermCOLOR
608 592
609#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
610#define NPIXCLR_BITS 32
611
612/* 593/*
613 * Resource list 594 * Resource list
614 */ 595 */
615enum { 596enum {
616# define def(name) Rs_ ## name, 597# define def(name) Rs_ ## name,
… …
699 ***************************************************************************** 680 *****************************************************************************
700 * MACRO DEFINES 681 * MACRO DEFINES
701 ***************************************************************************** 682 *****************************************************************************
702 */ 683 */
703#define dLocal(type,name) type const name = this->name 684#define dLocal(type,name) type const name = this->name
704#define dDisp Display *disp = this->display->display
705 685
706// for speed reasons, we assume that all latin1 characters 686// for speed reasons, we assume that all latin1 characters
707// are single-width (the first unicdoe combining character 687// are single-width (the first unicode combining character
708// is actually 0x300, but ascii is what matters most). 688// is actually 0x300, but ascii is what matters most).
709#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c)) 689#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
710 690
711/* convert pixel dimensions to row/column values. Everything as int32_t */ 691/* convert pixel dimensions to row/column values. Everything as int32_t */
712#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 692#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 693#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 694#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
748#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 728#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
749#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 729#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
750 730
751#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 731#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
752 732
753#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 733#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
754#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 734#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
755 735
756#if ENABLE_STYLES 736#if ENABLE_STYLES
757# define FONTSET(style) fontset[GET_STYLE (style)] 737# define FONTSET(style) fontset[GET_STYLE (style)]
758#else 738#else
759# define FONTSET(style) fontset[0] 739# define FONTSET(style) fontset[0]
… …
869# define COMPOSE_LO 0x40000000UL 849# define COMPOSE_LO 0x40000000UL
870# define COMPOSE_HI 0x400fffffUL 850# define COMPOSE_HI 0x400fffffUL
871# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 851# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
872#else 852#else
873# if ENABLE_PERL 853# if ENABLE_PERL
874# 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
875# 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
876# else 856# else
877# define COMPOSE_LO 0xd800UL 857# define COMPOSE_LO 0xd800UL
878# define COMPOSE_HI 0xf8ffUL 858# define COMPOSE_HI 0xf8ffUL
879# endif 859# endif
… …
911 891
912#ifdef KEYSYM_RESOURCE 892#ifdef KEYSYM_RESOURCE
913 class keyboard_manager; 893 class keyboard_manager;
914#endif 894#endif
915 895
916struct rxvt_term : zero_initialized, rxvt_vars { 896struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
917 log_callback *log_hook; // log error messages through this hook, if != 0 897 log_callback *log_hook; // log error messages through this hook, if != 0
918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 898 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
919#if ENABLE_PERL 899#if ENABLE_PERL
920 rxvt_perl_term perl; 900 rxvt_perl_term perl;
921#endif 901#endif
… …
961 int num_scr; /* screen: number lines scrolled */ 941 int num_scr; /* screen: number lines scrolled */
962 int prev_ncol, /* screen: previous number of columns */ 942 int prev_ncol, /* screen: previous number of columns */
963 prev_nrow; /* screen: previous number of rows */ 943 prev_nrow; /* screen: previous number of rows */
964/* ---------- */ 944/* ---------- */
965 rend_t rstyle; 945 rend_t rstyle;
966/* ---------- */
967 uint32_t pixcolor_set[NPIXCLR_SETS];
968/* ---------- */ 946/* ---------- */
969#ifdef SELECTION_SCROLLING 947#ifdef SELECTION_SCROLLING
970 int scroll_selection_lines; 948 int scroll_selection_lines;
971 enum page_dirn scroll_selection_dir; 949 enum page_dirn scroll_selection_dir;
972 int selection_save_x, 950 int selection_save_x,
… …
1111 1089
1112 long vt_emask, vt_emask_perl, vt_emask_xim; 1090 long vt_emask, vt_emask_perl, vt_emask_xim;
1113 1091
1114 void vt_select_input () const NOTHROW 1092 void vt_select_input () const NOTHROW
1115 { 1093 {
1116 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1094 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1117 } 1095 }
1118 1096
1119#if TRANSPARENT 1097#if TRANSPARENT
1120 void rootwin_cb (XEvent &xev); 1098 void rootwin_cb (XEvent &xev);
1121 xevent_watcher rootwin_ev; 1099 xevent_watcher rootwin_ev;
… …
1273 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);
1274 void set_title (const char *str); 1252 void set_title (const char *str);
1275 void set_icon_name (const char *str); 1253 void set_icon_name (const char *str);
1276 void set_window_color (int idx, const char *color); 1254 void set_window_color (int idx, const char *color);
1277 void set_colorfgbg (); 1255 void set_colorfgbg ();
1278 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1256 bool set_color (rxvt_color &color, const char *name);
1279 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1257 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1280 1258
1281 // screen.C 1259 // screen.C
1282 1260
1283 void lalloc (line_t &l) const 1261 void lalloc (line_t &l) const

Diff Legend

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