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.241 by root, Wed Jan 25 00:42:20 2006 UTC vs.
Revision 1.269 by root, Tue May 1 21:30:01 2007 UTC

… …
8#if defined (ISO_14755) || defined (ENABLE_PERL) 8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 9# define ENABLE_OVERLAY 1
10#endif 10#endif
11 11
12#if ENABLE_PERL 12#if ENABLE_PERL
13# define ENABLE_FRILLS 1 13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 14# define ENABLE_COMBINING 1
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1 20# define ENABLE_XIM_ONTHESPOT 1
21# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
22#else 23#else
23# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
24#endif 25#endif
25 26
26#include <limits.h> 27#include <limits.h>
… …
32#if ENABLE_FRILLS 33#if ENABLE_FRILLS
33# include <X11/Xmd.h> 34# include <X11/Xmd.h>
34#endif 35#endif
35 36
36#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
37#include "rxvtfont.h" 39#include "rxvtfont.h"
38#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
39#include "iom.h" 41#include "iom.h"
40#include "salloc.h" 42#include "salloc.h"
41#include "libptytty.h" 43#include "libptytty.h"
… …
68 70
69#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
70typedef char *XPointer; 72typedef char *XPointer;
71#endif 73#endif
72 74
73#ifdef HAVE_TERMIOS_H
74# include <termios.h> 75#include <termios.h>
75typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
76#else
77# include <sgtty.h>
78typedef struct {
79 struct sgttyb sg;
80 struct tchars tc;
81 struct ltchars lc;
82 int line;
83 int local;
84} ttymode_t;
85#endif
86 77
87#ifdef XPM_BACKGROUND 78#ifdef XPM_BACKGROUND
88# ifdef XPM_INC_X11 79# ifdef XPM_INC_X11
89# include <X11/xpm.h> 80# include <X11/xpm.h>
90# else 81# else
… …
97# define STDOUT_FILENO 1 88# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 89# define STDERR_FILENO 2
99#endif 90#endif
100 91
101/****************************************************************************/ 92/****************************************************************************/
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 93
124// exception thrown on fatal (per-instance) errors 94// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 95class rxvt_failure_exception { };
126 96
127// exception thrown when the command parser runs out of input data 97// exception thrown when the command parser runs out of input data
… …
432// fake styles 402// fake styles
433#define RS_Blink 0x00010000UL // blink 403#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 404#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 405#define RS_Uline 0x00040000UL // underline
436 406
407// toggle this to force redraw, must be != RS_Careful
408#define RS_redraw 0x01000000UL
409
437// 5 custom bits for extensions 410// 5 custom bits for extensions
438#define RS_customCount 32 411#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 412#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 413#define RS_customShift 19
441 414
… …
510 Rxvt_restoreFG = 39, // change default fg color 483 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 484 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 485 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 486
514 URxvt_locale = 701, // change locale 487 URxvt_locale = 701, // change locale
488 URxvt_version = 702, // request version
515 489
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 490 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 491 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 492 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 493 URxvt_Color_UL = 707,
… …
535 * on the unnecessary items, e.g. Color_pointer, but won't bother 509 * on the unnecessary items, e.g. Color_pointer, but won't bother
536 * until we need to. Also, be aware of usage in pixcolor_set 510 * until we need to. Also, be aware of usage in pixcolor_set
537 */ 511 */
538 512
539enum colour_list { 513enum colour_list {
514 Color_none = -2,
515 Color_transparent = -1,
540 Color_fg = 0, 516 Color_fg = 0,
541 Color_bg, 517 Color_bg,
542 minCOLOR, /* 2 */ 518 minCOLOR, /* 2 */
543 Color_Black = minCOLOR, 519 Color_Black = minCOLOR,
544 Color_Red3, 520 Color_Red3,
… …
604#endif 580#endif
605}; 581};
606 582
607#define Color_Bits 7 // 0 .. maxTermCOLOR 583#define Color_Bits 7 // 0 .. maxTermCOLOR
608 584
609#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
610#define NPIXCLR_BITS 32
611
612/* 585/*
613 * Resource list 586 * Resource list
614 */ 587 */
615enum { 588enum {
616# define def(name) Rs_ ## name, 589# define def(name) Rs_ ## name,
617# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 590# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
618# include "rsinc.h" 591# include "rsinc.h"
619# undef def 592# undef def
620# undef reserve 593# undef reserve
621 NUM_RESOURCES 594 NUM_RESOURCES
622};
623
624// see init.C:xa_names, which must be kept in sync
625enum {
626 XA_TEXT = 0,
627 XA_COMPOUND_TEXT,
628 XA_UTF8_STRING,
629 XA_MULTIPLE,
630 XA_TARGETS,
631 XA_TIMESTAMP,
632 XA_VT_SELECTION,
633 XA_INCR,
634 XA_WM_PROTOCOLS,
635 XA_WM_DELETE_WINDOW,
636 XA_CLIPBOARD,
637#if ENABLE_FRILLS
638 XA_MOTIF_WM_HINTS,
639#endif
640#if ENABLE_EWMH
641 XA_NET_WM_PID,
642 XA_NET_WM_NAME,
643 XA_NET_WM_ICON_NAME,
644 XA_NET_WM_PING,
645#endif
646#if USE_XIM
647 XA_WM_LOCALE_NAME,
648#endif
649#if TRANSPARENT
650 XA_XROOTPMAP_ID,
651 XA_ESETROOT_PMAP_ID,
652#endif
653#if ENABLE_XEMBED
654 XA_XEMBED,
655 XA_XEMBED_INFO,
656#endif
657 NUM_XA
658}; 595};
659 596
660/* DEC private modes */ 597/* DEC private modes */
661#define PrivMode_132 (1UL<<0) 598#define PrivMode_132 (1UL<<0)
662#define PrivMode_132OK (1UL<<1) 599#define PrivMode_132OK (1UL<<1)
… …
735 ***************************************************************************** 672 *****************************************************************************
736 * MACRO DEFINES 673 * MACRO DEFINES
737 ***************************************************************************** 674 *****************************************************************************
738 */ 675 */
739#define dLocal(type,name) type const name = this->name 676#define dLocal(type,name) type const name = this->name
740#define dDisp Display *disp = this->display->display
741 677
742// for speed reasons, we assume that all latin1 characters 678// for speed reasons, we assume that all codepoints 32 to 126 are
743// are single-width (the first unicdoe combining character 679// single-width.
744// is actually 0x300, but ascii is what matters most). 680#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
745#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c))
746 681
747/* convert pixel dimensions to row/column values. Everything as int32_t */ 682/* convert pixel dimensions to row/column values. Everything as int32_t */
748#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 683#define Pixel2Col(x) Pixel2Width((int32_t)(x))
749#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 684#define Pixel2Row(y) Pixel2Height((int32_t)(y))
750#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 685#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
752#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 687#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
753#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 688#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
754#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 689#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
755#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 690#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
756 691
757#define OPTION(opt) (options & (opt))
758#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
759 | Opt_jumpScroll | Opt_secondaryScreen \
760 | Opt_pastableTabs | Opt_intensityStyles)
761
762// for m >= -n, ensure remainder lies between 0..n-1 692// for m >= -n, ensure remainder lies between 0..n-1
763#define MOD(m,n) (((m) + (n)) % (n)) 693#define MOD(m,n) (((m) + (n)) % (n))
764 694
765#define LINENO(n) MOD (term_start + int(n), total_rows) 695#define LINENO(n) MOD (term_start + int(n), total_rows)
766#define ROW(n) row_buf [LINENO (n)] 696#define ROW(n) row_buf [LINENO (n)]
… …
784#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 714#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
785#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 715#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
786 716
787#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 717#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
788 718
789#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 719#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
790#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 720#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
791 721
792#if ENABLE_STYLES 722#if ENABLE_STYLES
793# define FONTSET(style) fontset[GET_STYLE (style)] 723# define FONTSET(style) fontset[GET_STYLE (style)]
794#else 724#else
795# define FONTSET(style) fontset[0] 725# define FONTSET(style) fontset[0]
… …
829# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 759# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
830#else 760#else
831# define XPMClearArea(a, b, c, d, e, f, g) 761# define XPMClearArea(a, b, c, d, e, f, g)
832#endif 762#endif
833 763
834typedef callback1<void, const char *> log_callback; 764typedef callback<void (const char *)> log_callback;
835typedef callback1<int, int> getfd_callback; 765typedef callback<int (int)> getfd_callback;
836 766
837#define SET_LOCALE(locale) rxvt_set_locale (locale) 767#define SET_LOCALE(locale) rxvt_set_locale (locale)
838extern bool rxvt_set_locale (const char *locale) NOTHROW; 768extern bool rxvt_set_locale (const char *locale) NOTHROW;
839extern void rxvt_push_locale (const char *locale) NOTHROW; 769extern void rxvt_push_locale (const char *locale) NOTHROW;
840extern void rxvt_pop_locale () NOTHROW; 770extern void rxvt_pop_locale () NOTHROW;
… …
842/****************************************************************************/ 772/****************************************************************************/
843 773
844#define LINE_LONGER 0x0001 // line is continued on the next row 774#define LINE_LONGER 0x0001 // line is continued on the next row
845#define LINE_FILTERED 0x0002 // line has been filtered 775#define LINE_FILTERED 0x0002 // line has been filtered
846#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 776#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
777#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
778#define LINE_BIDI 0x0010 // line needs bidi (NYI)
847 779
848struct line_t { 780struct line_t {
849 text_t *t; // terminal the text 781 text_t *t; // terminal the text
850 rend_t *r; // rendition, uses RS_ flags 782 rend_t *r; // rendition, uses RS_ flags
851 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 783 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
905# define COMPOSE_LO 0x40000000UL 837# define COMPOSE_LO 0x40000000UL
906# define COMPOSE_HI 0x400fffffUL 838# define COMPOSE_HI 0x400fffffUL
907# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 839# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
908#else 840#else
909# if ENABLE_PERL 841# if ENABLE_PERL
910# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 842# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
911# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 843# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
912# else 844# else
913# define COMPOSE_LO 0xd800UL 845# define COMPOSE_LO 0xd800UL
914# define COMPOSE_HI 0xf8ffUL 846# define COMPOSE_HI 0xf8ffUL
915# endif 847# endif
… …
944#endif 876#endif
945 877
946/****************************************************************************/ 878/****************************************************************************/
947 879
948#ifdef KEYSYM_RESOURCE 880#ifdef KEYSYM_RESOURCE
949 class keyboard_manager; 881class keyboard_manager;
950#endif 882#endif
951 883
952struct rxvt_term : zero_initialized, rxvt_vars { 884struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
885
886 // special markers with magic addresses
887 static const char resval_undef []; // options specifically unset
888 static const char resval_on []; // boolean options switched on
889 static const char resval_off []; // or off
890
953 log_callback *log_hook; // log error messages through this hook, if != 0 891 log_callback *log_hook; // log error messages through this hook, if != 0
954 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 892 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
955#if ENABLE_PERL 893#if ENABLE_PERL
956 rxvt_perl_term perl; 894 rxvt_perl_term perl;
957#endif 895#endif
958 struct mbstate mbstate; // current input multibyte state 896 struct mbstate mbstate; // current input multibyte state
959 897
960 unsigned char want_refresh:1, 898 unsigned char want_refresh:1,
961#ifdef TRANSPARENT 899#ifdef TRANSPARENT
962 want_full_refresh:1, /* awaiting full screen refresh */ 900 want_full_refresh:1, /* awaiting full screen refresh */
963#endif
964#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
965 am_transparent:1, /* is a transparent term */ 901 am_transparent:1, /* is a transparent term */
966 am_pixmap_trans:1, /* transparency w/known root pixmap */ 902 am_pixmap_trans:1, /* transparency w/known root pixmap */
967#endif 903#endif
968 current_screen:1, /* primary or secondary */ 904 current_screen:1, /* primary or secondary */
969 num_scr_allow:1, 905 num_scr_allow:1,
… …
997 int num_scr; /* screen: number lines scrolled */ 933 int num_scr; /* screen: number lines scrolled */
998 int prev_ncol, /* screen: previous number of columns */ 934 int prev_ncol, /* screen: previous number of columns */
999 prev_nrow; /* screen: previous number of rows */ 935 prev_nrow; /* screen: previous number of rows */
1000/* ---------- */ 936/* ---------- */
1001 rend_t rstyle; 937 rend_t rstyle;
1002/* ---------- */
1003 uint32_t pixcolor_set[NPIXCLR_SETS];
1004/* ---------- */ 938/* ---------- */
1005#ifdef SELECTION_SCROLLING 939#ifdef SELECTION_SCROLLING
1006 int scroll_selection_lines; 940 int scroll_selection_lines;
1007 enum page_dirn scroll_selection_dir; 941 enum page_dirn scroll_selection_dir;
1008 int selection_save_x, 942 int selection_save_x,
… …
1035 int old_width, /* last used width in screen resize */ 969 int old_width, /* last used width in screen resize */
1036 old_height; /* last used height in screen resize */ 970 old_height; /* last used height in screen resize */
1037 unsigned long priv_modes, 971 unsigned long priv_modes,
1038 SavedModes; 972 SavedModes;
1039/* ---------- */ 973/* ---------- */
1040 Atom xa[NUM_XA]; 974 Atom *xa;
1041/* ---------- */ 975/* ---------- */
1042#ifdef RXVT_SCROLLBAR 976#ifdef RXVT_SCROLLBAR
1043 GC scrollbarGC, 977 GC scrollbarGC,
1044 topShadowGC, 978 topShadowGC,
1045 botShadowGC; 979 botShadowGC;
… …
1102 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1036 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1103#endif 1037#endif
1104 1038
1105 vector<void *> allocated; // free these memory blocks with free() 1039 vector<void *> allocated; // free these memory blocks with free()
1106 1040
1107 char *env_windowid; /* environmental variable WINDOWID */ 1041 char env_windowid[21]; /* environmental variable WINDOWID */
1042 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1108 char *env_display; /* environmental variable DISPLAY */ 1043 char *env_display; /* environmental variable DISPLAY */
1109 char *env_term; /* environmental variable TERM */ 1044 char *env_term; /* environmental variable TERM */
1110 char *env_colorfgbg; 1045
1111 char *locale; 1046 char *locale;
1112 char charsets[4]; 1047 char charsets[4];
1113 char *v_buffer; /* pointer to physical buffer */ 1048 char *v_buffer; /* pointer to physical buffer */
1114 unsigned int v_buflen; /* size of area to write */ 1049 unsigned int v_buflen; /* size of area to write */
1115 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1050 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1116 1051
1117#ifdef KEYSYM_RESOURCE 1052#ifdef KEYSYM_RESOURCE
1118 keyboard_manager *keyboard; 1053 keyboard_manager *keyboard;
1119#endif 1054#endif
1120 1055
… …
1146 1081
1147 long vt_emask, vt_emask_perl, vt_emask_xim; 1082 long vt_emask, vt_emask_perl, vt_emask_xim;
1148 1083
1149 void vt_select_input () const NOTHROW 1084 void vt_select_input () const NOTHROW
1150 { 1085 {
1151 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1086 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1152 } 1087 }
1153 1088
1154#if TRANSPARENT 1089#if TRANSPARENT || ENABLE_PERL
1155 void rootwin_cb (XEvent &xev); 1090 void rootwin_cb (XEvent &xev);
1156 xevent_watcher rootwin_ev; 1091 xevent_watcher rootwin_ev;
1157#endif 1092#endif
1158 1093
1159 void x_cb (XEvent &xev); 1094 void x_cb (XEvent &xev);
… …
1221 bool pty_fill (); 1156 bool pty_fill ();
1222 1157
1223 void make_current () const // make this the "currently active" urxvt instance 1158 void make_current () const // make this the "currently active" urxvt instance
1224 { 1159 {
1225 SET_R (this); 1160 SET_R (this);
1161 set_environ (envv);
1226 rxvt_set_locale (locale); 1162 rxvt_set_locale (locale);
1227 set_environ (envv);
1228 } 1163 }
1229 1164
1230 void init_secondary (); 1165 void init_secondary ();
1231 const char **init_resources (int argc, const char *const *argv); 1166 const char **init_resources (int argc, const char *const *argv);
1232 const char *x_resource (const char *name); 1167 const char *x_resource (const char *name);
… …
1257 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1192 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1258 1193
1259 bool IMisRunning (); 1194 bool IMisRunning ();
1260 void IMSendSpot (); 1195 void IMSendSpot ();
1261 bool IM_get_IC (const char *modifiers); 1196 bool IM_get_IC (const char *modifiers);
1262 void IMSetStatusPosition (); 1197 void IMSetPosition ();
1263#endif 1198#endif
1264 1199
1265 void resize_scrollbar (); 1200 void resize_scrollbar ();
1266 1201
1267 // command.C 1202 // command.C
1268 void lookup_key (XKeyEvent &ev); 1203 void key_press (XKeyEvent &ev);
1204 void key_release (XKeyEvent &ev);
1269 unsigned int cmd_write (const char *str, unsigned int count); 1205 unsigned int cmd_write (const char *str, unsigned int count);
1270 1206
1271 wchar_t next_char () NOTHROW; 1207 wchar_t next_char () NOTHROW;
1272 wchar_t cmd_getc () THROW ((class out_of_input)); 1208 wchar_t cmd_getc () THROW ((class out_of_input));
1273 uint32_t next_octet () NOTHROW; 1209 uint32_t next_octet () NOTHROW;
… …
1277 void mouse_report (XButtonEvent &ev); 1213 void mouse_report (XButtonEvent &ev);
1278 void button_press (XButtonEvent &ev); 1214 void button_press (XButtonEvent &ev);
1279 void button_release (XButtonEvent &ev); 1215 void button_release (XButtonEvent &ev);
1280 void focus_in (); 1216 void focus_in ();
1281 void focus_out (); 1217 void focus_out ();
1218 void update_fade_color (unsigned int idx);
1282 int check_our_parents (); 1219 int check_our_parents ();
1283#ifdef PRINTPIPE 1220#ifdef PRINTPIPE
1284 FILE *popen_printer (); 1221 FILE *popen_printer ();
1285 int pclose_printer (FILE *stream); 1222 int pclose_printer (FILE *stream);
1286#endif 1223#endif
… …
1308 void set_utf8_property (Atom prop, const char *str, int len = -1); 1245 void set_utf8_property (Atom prop, const char *str, int len = -1);
1309 void set_title (const char *str); 1246 void set_title (const char *str);
1310 void set_icon_name (const char *str); 1247 void set_icon_name (const char *str);
1311 void set_window_color (int idx, const char *color); 1248 void set_window_color (int idx, const char *color);
1312 void set_colorfgbg (); 1249 void set_colorfgbg ();
1313 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1250 bool set_color (rxvt_color &color, const char *name);
1251 void alias_color (int dst, int src);
1314 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1252 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1315 1253
1316 // screen.C 1254 // screen.C
1317 1255
1318 void lalloc (line_t &l) const 1256 void lalloc (line_t &l) const
… …
1347 { 1285 {
1348 int base = GET_BASEFG (r); 1286 int base = GET_BASEFG (r);
1349#ifndef NO_BRIGHTCOLOR 1287#ifndef NO_BRIGHTCOLOR
1350 if (r & RS_Bold 1288 if (r & RS_Bold
1351# if ENABLE_STYLES 1289# if ENABLE_STYLES
1352 && OPTION (Opt_intensityStyles) 1290 && option (Opt_intensityStyles)
1353# endif 1291# endif
1354 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1292 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1355 base += minBrightCOLOR - minCOLOR; 1293 base += minBrightCOLOR - minCOLOR;
1356#endif 1294#endif
1357 return base; 1295 return base;
… …
1361 { 1299 {
1362 int base = GET_BASEBG (r); 1300 int base = GET_BASEBG (r);
1363#ifndef NO_BRIGHTCOLOR 1301#ifndef NO_BRIGHTCOLOR
1364 if (r & RS_Blink 1302 if (r & RS_Blink
1365# if ENABLE_STYLES 1303# if ENABLE_STYLES
1366 && OPTION (Opt_intensityStyles) 1304 && option (Opt_intensityStyles)
1367# endif 1305# endif
1368 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1306 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1369 base += minBrightCOLOR - minCOLOR; 1307 base += minBrightCOLOR - minCOLOR;
1370#endif 1308#endif
1371 return base; 1309 return base;
1372 } 1310 }
1373 1311
1374 bool option (uint32_t opt) const NOTHROW 1312 bool option (uint8_t opt) const NOTHROW
1375 { 1313 {
1376 return OPTION (opt); 1314 return options[opt >> 3] & (1 << (opt & 7));
1377 } 1315 }
1378 1316
1379 void set_option (uint32_t opt, bool set) NOTHROW 1317 void set_option (uint8_t opt, bool set = true) NOTHROW
1380 { 1318 {
1381 if (set) 1319 if (set)
1382 options |= opt; 1320 options[opt >> 3] |= (1 << (opt & 7));
1383 else 1321 else
1384 options &= ~opt; 1322 options[opt >> 3] &= ~(1 << (opt & 7));
1385 } 1323 }
1386 1324
1387 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1325 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1388 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1326 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1389 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1327 int scr_scroll_text (int row1, int row2, int count) NOTHROW;

Diff Legend

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