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.240 by root, Tue Jan 24 19:40:12 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 CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
21#else 23#else
22# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
23#endif 25#endif
24 26
25#include <limits.h> 27#include <limits.h>
… …
31#if ENABLE_FRILLS 33#if ENABLE_FRILLS
32# include <X11/Xmd.h> 34# include <X11/Xmd.h>
33#endif 35#endif
34 36
35#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
36#include "rxvtfont.h" 39#include "rxvtfont.h"
37#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
38#include "iom.h" 41#include "iom.h"
39#include "salloc.h" 42#include "salloc.h"
40#include "libptytty.h" 43#include "libptytty.h"
… …
67 70
68#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
69typedef char *XPointer; 72typedef char *XPointer;
70#endif 73#endif
71 74
72#ifdef HAVE_TERMIOS_H
73# include <termios.h> 75#include <termios.h>
74typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
75#else
76# include <sgtty.h>
77typedef struct {
78 struct sgttyb sg;
79 struct tchars tc;
80 struct ltchars lc;
81 int line;
82 int local;
83} ttymode_t;
84#endif
85 77
86#ifdef XPM_BACKGROUND 78#ifdef XPM_BACKGROUND
87# ifdef XPM_INC_X11 79# ifdef XPM_INC_X11
88# include <X11/xpm.h> 80# include <X11/xpm.h>
89# else 81# else
… …
96# define STDOUT_FILENO 1 88# define STDOUT_FILENO 1
97# define STDERR_FILENO 2 89# define STDERR_FILENO 2
98#endif 90#endif
99 91
100/****************************************************************************/ 92/****************************************************************************/
101
102#ifndef __attribute__
103# if __GNUC__
104# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
105# define __attribute__(x)
106# endif
107# endif
108# define __attribute__(x)
109#endif
110
111#define NORETURN __attribute__ ((noreturn))
112#define UNUSED __attribute__ ((unused))
113
114// increases code size unless -fno-enforce-eh-specs
115#if __GNUC__
116# define NOTHROW
117# define THROW(x)
118#else
119# define NOTHROW throw()
120# define THROW(x) throw x
121#endif
122 93
123// exception thrown on fatal (per-instance) errors 94// exception thrown on fatal (per-instance) errors
124class rxvt_failure_exception { }; 95class rxvt_failure_exception { };
125 96
126// exception thrown when the command parser runs out of input data 97// exception thrown when the command parser runs out of input data
… …
431// fake styles 402// fake styles
432#define RS_Blink 0x00010000UL // blink 403#define RS_Blink 0x00010000UL // blink
433#define RS_RVid 0x00020000UL // reverse video 404#define RS_RVid 0x00020000UL // reverse video
434#define RS_Uline 0x00040000UL // underline 405#define RS_Uline 0x00040000UL // underline
435 406
407// toggle this to force redraw, must be != RS_Careful
408#define RS_redraw 0x01000000UL
409
436// 5 custom bits for extensions 410// 5 custom bits for extensions
437#define RS_customCount 32 411#define RS_customCount 32
438#define RS_customMask 0x00f80000UL 412#define RS_customMask 0x00f80000UL
439#define RS_customShift 19 413#define RS_customShift 19
440 414
… …
509 Rxvt_restoreFG = 39, // change default fg color 483 Rxvt_restoreFG = 39, // change default fg color
510 Rxvt_restoreBG = 49, // change default bg color 484 Rxvt_restoreBG = 49, // change default bg color
511 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 485 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
512 486
513 URxvt_locale = 701, // change locale 487 URxvt_locale = 701, // change locale
488 URxvt_version = 702, // request version
514 489
515 URxvt_Color_IT = 704, // change actual 'Italic' colour 490 URxvt_Color_IT = 704, // change actual 'Italic' colour
516 URxvt_Color_tint = 705, // change actual tint colour 491 URxvt_Color_tint = 705, // change actual tint colour
517 URxvt_Color_BD = 706, 492 URxvt_Color_BD = 706,
518 URxvt_Color_UL = 707, 493 URxvt_Color_UL = 707,
… …
534 * 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
535 * 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
536 */ 511 */
537 512
538enum colour_list { 513enum colour_list {
514 Color_none = -2,
515 Color_transparent = -1,
539 Color_fg = 0, 516 Color_fg = 0,
540 Color_bg, 517 Color_bg,
541 minCOLOR, /* 2 */ 518 minCOLOR, /* 2 */
542 Color_Black = minCOLOR, 519 Color_Black = minCOLOR,
543 Color_Red3, 520 Color_Red3,
… …
603#endif 580#endif
604}; 581};
605 582
606#define Color_Bits 7 // 0 .. maxTermCOLOR 583#define Color_Bits 7 // 0 .. maxTermCOLOR
607 584
608#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
609#define NPIXCLR_BITS 32
610
611/* 585/*
612 * Resource list 586 * Resource list
613 */ 587 */
614enum { 588enum {
615# define def(name) Rs_ ## name, 589# define def(name) Rs_ ## name,
616# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 590# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
617# include "rsinc.h" 591# include "rsinc.h"
618# undef def 592# undef def
619# undef reserve 593# undef reserve
620 NUM_RESOURCES 594 NUM_RESOURCES
621};
622
623// see init.C:xa_names, which must be kept in sync
624enum {
625 XA_TEXT = 0,
626 XA_COMPOUND_TEXT,
627 XA_UTF8_STRING,
628 XA_MULTIPLE,
629 XA_TARGETS,
630 XA_TIMESTAMP,
631 XA_VT_SELECTION,
632 XA_INCR,
633 XA_WM_PROTOCOLS,
634 XA_WM_DELETE_WINDOW,
635 XA_CLIPBOARD,
636#if ENABLE_FRILLS
637 XA_MOTIF_WM_HINTS,
638#endif
639#if ENABLE_EWMH
640 XA_NET_WM_PID,
641 XA_NET_WM_NAME,
642 XA_NET_WM_ICON_NAME,
643 XA_NET_WM_PING,
644#endif
645#if USE_XIM
646 XA_WM_LOCALE_NAME,
647#endif
648#if TRANSPARENT
649 XA_XROOTPMAP_ID,
650 XA_ESETROOT_PMAP_ID,
651#endif
652#if ENABLE_XEMBED
653 XA_XEMBED,
654 XA_XEMBED_INFO,
655#endif
656 NUM_XA
657}; 595};
658 596
659/* DEC private modes */ 597/* DEC private modes */
660#define PrivMode_132 (1UL<<0) 598#define PrivMode_132 (1UL<<0)
661#define PrivMode_132OK (1UL<<1) 599#define PrivMode_132OK (1UL<<1)
… …
734 ***************************************************************************** 672 *****************************************************************************
735 * MACRO DEFINES 673 * MACRO DEFINES
736 ***************************************************************************** 674 *****************************************************************************
737 */ 675 */
738#define dLocal(type,name) type const name = this->name 676#define dLocal(type,name) type const name = this->name
739#define dDisp Display *disp = this->display->display 677
678// for speed reasons, we assume that all codepoints 32 to 126 are
679// single-width.
680#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
740 681
741/* convert pixel dimensions to row/column values. Everything as int32_t */ 682/* convert pixel dimensions to row/column values. Everything as int32_t */
742#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 683#define Pixel2Col(x) Pixel2Width((int32_t)(x))
743#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 684#define Pixel2Row(y) Pixel2Height((int32_t)(y))
744#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 685#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
746#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 687#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
747#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 688#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
748#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 689#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
749#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 690#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
750 691
751#define OPTION(opt) (options & (opt))
752#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
753 | Opt_jumpScroll | Opt_secondaryScreen \
754 | Opt_pastableTabs | Opt_intensityStyles)
755
756// for m >= -n, ensure remainder lies between 0..n-1 692// for m >= -n, ensure remainder lies between 0..n-1
757#define MOD(m,n) (((m) + (n)) % (n)) 693#define MOD(m,n) (((m) + (n)) % (n))
758 694
759#define LINENO(n) MOD (term_start + int(n), total_rows) 695#define LINENO(n) MOD (term_start + int(n), total_rows)
760#define ROW(n) row_buf [LINENO (n)] 696#define ROW(n) row_buf [LINENO (n)]
… …
778#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 714#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
779#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 715#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
780 716
781#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 717#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
782 718
783#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 719#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
784#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 720#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
785 721
786#if ENABLE_STYLES 722#if ENABLE_STYLES
787# define FONTSET(style) fontset[GET_STYLE (style)] 723# define FONTSET(style) fontset[GET_STYLE (style)]
788#else 724#else
789# define FONTSET(style) fontset[0] 725# define FONTSET(style) fontset[0]
… …
823# 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))
824#else 760#else
825# define XPMClearArea(a, b, c, d, e, f, g) 761# define XPMClearArea(a, b, c, d, e, f, g)
826#endif 762#endif
827 763
828typedef callback1<void, const char *> log_callback; 764typedef callback<void (const char *)> log_callback;
829typedef callback1<int, int> getfd_callback; 765typedef callback<int (int)> getfd_callback;
830 766
831#define SET_LOCALE(locale) rxvt_set_locale (locale) 767#define SET_LOCALE(locale) rxvt_set_locale (locale)
832extern bool rxvt_set_locale (const char *locale) NOTHROW; 768extern bool rxvt_set_locale (const char *locale) NOTHROW;
833extern void rxvt_push_locale (const char *locale) NOTHROW; 769extern void rxvt_push_locale (const char *locale) NOTHROW;
834extern void rxvt_pop_locale () NOTHROW; 770extern void rxvt_pop_locale () NOTHROW;
… …
836/****************************************************************************/ 772/****************************************************************************/
837 773
838#define LINE_LONGER 0x0001 // line is continued on the next row 774#define LINE_LONGER 0x0001 // line is continued on the next row
839#define LINE_FILTERED 0x0002 // line has been filtered 775#define LINE_FILTERED 0x0002 // line has been filtered
840#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)
841 779
842struct line_t { 780struct line_t {
843 text_t *t; // terminal the text 781 text_t *t; // terminal the text
844 rend_t *r; // rendition, uses RS_ flags 782 rend_t *r; // rendition, uses RS_ flags
845 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
… …
899# define COMPOSE_LO 0x40000000UL 837# define COMPOSE_LO 0x40000000UL
900# define COMPOSE_HI 0x400fffffUL 838# define COMPOSE_HI 0x400fffffUL
901# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 839# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
902#else 840#else
903# if ENABLE_PERL 841# if ENABLE_PERL
904# 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
905# 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
906# else 844# else
907# define COMPOSE_LO 0xd800UL 845# define COMPOSE_LO 0xd800UL
908# define COMPOSE_HI 0xf8ffUL 846# define COMPOSE_HI 0xf8ffUL
909# endif 847# endif
… …
938#endif 876#endif
939 877
940/****************************************************************************/ 878/****************************************************************************/
941 879
942#ifdef KEYSYM_RESOURCE 880#ifdef KEYSYM_RESOURCE
943 class keyboard_manager; 881class keyboard_manager;
944#endif 882#endif
945 883
946struct 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
947 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
948 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 892 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
949#if ENABLE_PERL 893#if ENABLE_PERL
950 rxvt_perl_term perl; 894 rxvt_perl_term perl;
951#endif 895#endif
952 struct mbstate mbstate; // current input multibyte state 896 struct mbstate mbstate; // current input multibyte state
953 897
954 unsigned char want_refresh:1, 898 unsigned char want_refresh:1,
955#ifdef TRANSPARENT 899#ifdef TRANSPARENT
956 want_full_refresh:1, /* awaiting full screen refresh */ 900 want_full_refresh:1, /* awaiting full screen refresh */
957#endif
958#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
959 am_transparent:1, /* is a transparent term */ 901 am_transparent:1, /* is a transparent term */
960 am_pixmap_trans:1, /* transparency w/known root pixmap */ 902 am_pixmap_trans:1, /* transparency w/known root pixmap */
961#endif 903#endif
962 current_screen:1, /* primary or secondary */ 904 current_screen:1, /* primary or secondary */
963 num_scr_allow:1, 905 num_scr_allow:1,
… …
991 int num_scr; /* screen: number lines scrolled */ 933 int num_scr; /* screen: number lines scrolled */
992 int prev_ncol, /* screen: previous number of columns */ 934 int prev_ncol, /* screen: previous number of columns */
993 prev_nrow; /* screen: previous number of rows */ 935 prev_nrow; /* screen: previous number of rows */
994/* ---------- */ 936/* ---------- */
995 rend_t rstyle; 937 rend_t rstyle;
996/* ---------- */
997 uint32_t pixcolor_set[NPIXCLR_SETS];
998/* ---------- */ 938/* ---------- */
999#ifdef SELECTION_SCROLLING 939#ifdef SELECTION_SCROLLING
1000 int scroll_selection_lines; 940 int scroll_selection_lines;
1001 enum page_dirn scroll_selection_dir; 941 enum page_dirn scroll_selection_dir;
1002 int selection_save_x, 942 int selection_save_x,
… …
1029 int old_width, /* last used width in screen resize */ 969 int old_width, /* last used width in screen resize */
1030 old_height; /* last used height in screen resize */ 970 old_height; /* last used height in screen resize */
1031 unsigned long priv_modes, 971 unsigned long priv_modes,
1032 SavedModes; 972 SavedModes;
1033/* ---------- */ 973/* ---------- */
1034 Atom xa[NUM_XA]; 974 Atom *xa;
1035/* ---------- */ 975/* ---------- */
1036#ifdef RXVT_SCROLLBAR 976#ifdef RXVT_SCROLLBAR
1037 GC scrollbarGC, 977 GC scrollbarGC,
1038 topShadowGC, 978 topShadowGC,
1039 botShadowGC; 979 botShadowGC;
… …
1096 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;
1097#endif 1037#endif
1098 1038
1099 vector<void *> allocated; // free these memory blocks with free() 1039 vector<void *> allocated; // free these memory blocks with free()
1100 1040
1101 char *env_windowid; /* environmental variable WINDOWID */ 1041 char env_windowid[21]; /* environmental variable WINDOWID */
1042 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1102 char *env_display; /* environmental variable DISPLAY */ 1043 char *env_display; /* environmental variable DISPLAY */
1103 char *env_term; /* environmental variable TERM */ 1044 char *env_term; /* environmental variable TERM */
1104 char *env_colorfgbg; 1045
1105 char *locale; 1046 char *locale;
1106 char charsets[4]; 1047 char charsets[4];
1107 char *v_buffer; /* pointer to physical buffer */ 1048 char *v_buffer; /* pointer to physical buffer */
1108 unsigned int v_buflen; /* size of area to write */ 1049 unsigned int v_buflen; /* size of area to write */
1109 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1050 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1110 1051
1111#ifdef KEYSYM_RESOURCE 1052#ifdef KEYSYM_RESOURCE
1112 keyboard_manager *keyboard; 1053 keyboard_manager *keyboard;
1113#endif 1054#endif
1114 1055
… …
1140 1081
1141 long vt_emask, vt_emask_perl, vt_emask_xim; 1082 long vt_emask, vt_emask_perl, vt_emask_xim;
1142 1083
1143 void vt_select_input () const NOTHROW 1084 void vt_select_input () const NOTHROW
1144 { 1085 {
1145 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1086 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1146 } 1087 }
1147 1088
1148#if TRANSPARENT 1089#if TRANSPARENT || ENABLE_PERL
1149 void rootwin_cb (XEvent &xev); 1090 void rootwin_cb (XEvent &xev);
1150 xevent_watcher rootwin_ev; 1091 xevent_watcher rootwin_ev;
1151#endif 1092#endif
1152 1093
1153 void x_cb (XEvent &xev); 1094 void x_cb (XEvent &xev);
… …
1215 bool pty_fill (); 1156 bool pty_fill ();
1216 1157
1217 void make_current () const // make this the "currently active" urxvt instance 1158 void make_current () const // make this the "currently active" urxvt instance
1218 { 1159 {
1219 SET_R (this); 1160 SET_R (this);
1161 set_environ (envv);
1220 rxvt_set_locale (locale); 1162 rxvt_set_locale (locale);
1221 set_environ (envv);
1222 } 1163 }
1223 1164
1224 void init_secondary (); 1165 void init_secondary ();
1225 const char **init_resources (int argc, const char *const *argv); 1166 const char **init_resources (int argc, const char *const *argv);
1226 const char *x_resource (const char *name); 1167 const char *x_resource (const char *name);
… …
1251 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);
1252 1193
1253 bool IMisRunning (); 1194 bool IMisRunning ();
1254 void IMSendSpot (); 1195 void IMSendSpot ();
1255 bool IM_get_IC (const char *modifiers); 1196 bool IM_get_IC (const char *modifiers);
1256 void IMSetStatusPosition (); 1197 void IMSetPosition ();
1257#endif 1198#endif
1258 1199
1259 void resize_scrollbar (); 1200 void resize_scrollbar ();
1260 1201
1261 // command.C 1202 // command.C
1262 void lookup_key (XKeyEvent &ev); 1203 void key_press (XKeyEvent &ev);
1204 void key_release (XKeyEvent &ev);
1263 unsigned int cmd_write (const char *str, unsigned int count); 1205 unsigned int cmd_write (const char *str, unsigned int count);
1264 1206
1265 wchar_t next_char () NOTHROW; 1207 wchar_t next_char () NOTHROW;
1266 wchar_t cmd_getc () THROW ((class out_of_input)); 1208 wchar_t cmd_getc () THROW ((class out_of_input));
1267 uint32_t next_octet () NOTHROW; 1209 uint32_t next_octet () NOTHROW;
… …
1271 void mouse_report (XButtonEvent &ev); 1213 void mouse_report (XButtonEvent &ev);
1272 void button_press (XButtonEvent &ev); 1214 void button_press (XButtonEvent &ev);
1273 void button_release (XButtonEvent &ev); 1215 void button_release (XButtonEvent &ev);
1274 void focus_in (); 1216 void focus_in ();
1275 void focus_out (); 1217 void focus_out ();
1218 void update_fade_color (unsigned int idx);
1276 int check_our_parents (); 1219 int check_our_parents ();
1277#ifdef PRINTPIPE 1220#ifdef PRINTPIPE
1278 FILE *popen_printer (); 1221 FILE *popen_printer ();
1279 int pclose_printer (FILE *stream); 1222 int pclose_printer (FILE *stream);
1280#endif 1223#endif
… …
1302 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);
1303 void set_title (const char *str); 1246 void set_title (const char *str);
1304 void set_icon_name (const char *str); 1247 void set_icon_name (const char *str);
1305 void set_window_color (int idx, const char *color); 1248 void set_window_color (int idx, const char *color);
1306 void set_colorfgbg (); 1249 void set_colorfgbg ();
1307 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);
1308 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1252 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1309 1253
1310 // screen.C 1254 // screen.C
1311 1255
1312 void lalloc (line_t &l) const 1256 void lalloc (line_t &l) const
… …
1341 { 1285 {
1342 int base = GET_BASEFG (r); 1286 int base = GET_BASEFG (r);
1343#ifndef NO_BRIGHTCOLOR 1287#ifndef NO_BRIGHTCOLOR
1344 if (r & RS_Bold 1288 if (r & RS_Bold
1345# if ENABLE_STYLES 1289# if ENABLE_STYLES
1346 && OPTION (Opt_intensityStyles) 1290 && option (Opt_intensityStyles)
1347# endif 1291# endif
1348 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1292 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1349 base += minBrightCOLOR - minCOLOR; 1293 base += minBrightCOLOR - minCOLOR;
1350#endif 1294#endif
1351 return base; 1295 return base;
… …
1355 { 1299 {
1356 int base = GET_BASEBG (r); 1300 int base = GET_BASEBG (r);
1357#ifndef NO_BRIGHTCOLOR 1301#ifndef NO_BRIGHTCOLOR
1358 if (r & RS_Blink 1302 if (r & RS_Blink
1359# if ENABLE_STYLES 1303# if ENABLE_STYLES
1360 && OPTION (Opt_intensityStyles) 1304 && option (Opt_intensityStyles)
1361# endif 1305# endif
1362 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1306 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1363 base += minBrightCOLOR - minCOLOR; 1307 base += minBrightCOLOR - minCOLOR;
1364#endif 1308#endif
1365 return base; 1309 return base;
1366 } 1310 }
1367 1311
1368 bool option (uint32_t opt) const NOTHROW 1312 bool option (uint8_t opt) const NOTHROW
1369 { 1313 {
1370 return OPTION (opt); 1314 return options[opt >> 3] & (1 << (opt & 7));
1371 } 1315 }
1372 1316
1373 void set_option (uint32_t opt, bool set) NOTHROW 1317 void set_option (uint8_t opt, bool set = true) NOTHROW
1374 { 1318 {
1375 if (set) 1319 if (set)
1376 options |= opt; 1320 options[opt >> 3] |= (1 << (opt & 7));
1377 else 1321 else
1378 options &= ~opt; 1322 options[opt >> 3] &= ~(1 << (opt & 7));
1379 } 1323 }
1380 1324
1381 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;
1382 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;
1383 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