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.236 by root, Sun Jan 22 17:10:01 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
828#ifdef DEBUG_CMD
829# define D_CMD(x) fprintf x ; fputc('\n', stderr)
830#else
831# define D_CMD(x)
832#endif
833#ifdef DEBUG_INIT
834# define D_INIT(x) fprintf x ; fputc('\n', stderr)
835#else
836# define D_INIT(x)
837#endif
838#ifdef DEBUG_MAIN
839# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
840#else
841# define D_MAIN(x)
842#endif
843#ifdef DEBUG_SIZE
844# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
845#else
846# define D_SIZE(x)
847#endif
848
849typedef callback1<void, const char *> log_callback; 764typedef callback<void (const char *)> log_callback;
850typedef callback1<int, int> getfd_callback; 765typedef callback<int (int)> getfd_callback;
851 766
852#define SET_LOCALE(locale) rxvt_set_locale (locale) 767#define SET_LOCALE(locale) rxvt_set_locale (locale)
853extern bool rxvt_set_locale (const char *locale) NOTHROW; 768extern bool rxvt_set_locale (const char *locale) NOTHROW;
854extern void rxvt_push_locale (const char *locale) NOTHROW; 769extern void rxvt_push_locale (const char *locale) NOTHROW;
855extern void rxvt_pop_locale () NOTHROW; 770extern void rxvt_pop_locale () NOTHROW;
… …
857/****************************************************************************/ 772/****************************************************************************/
858 773
859#define LINE_LONGER 0x0001 // line is continued on the next row 774#define LINE_LONGER 0x0001 // line is continued on the next row
860#define LINE_FILTERED 0x0002 // line has been filtered 775#define LINE_FILTERED 0x0002 // line has been filtered
861#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)
862 779
863struct line_t { 780struct line_t {
864 text_t *t; // terminal the text 781 text_t *t; // terminal the text
865 rend_t *r; // rendition, uses RS_ flags 782 rend_t *r; // rendition, uses RS_ flags
866 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
… …
920# define COMPOSE_LO 0x40000000UL 837# define COMPOSE_LO 0x40000000UL
921# define COMPOSE_HI 0x400fffffUL 838# define COMPOSE_HI 0x400fffffUL
922# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 839# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
923#else 840#else
924# if ENABLE_PERL 841# if ENABLE_PERL
925# 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
926# 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
927# else 844# else
928# define COMPOSE_LO 0xd800UL 845# define COMPOSE_LO 0xd800UL
929# define COMPOSE_HI 0xf8ffUL 846# define COMPOSE_HI 0xf8ffUL
930# endif 847# endif
… …
959#endif 876#endif
960 877
961/****************************************************************************/ 878/****************************************************************************/
962 879
963#ifdef KEYSYM_RESOURCE 880#ifdef KEYSYM_RESOURCE
964 class keyboard_manager; 881class keyboard_manager;
965#endif 882#endif
966 883
967struct 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
968 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
969 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 892 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
970#if ENABLE_PERL 893#if ENABLE_PERL
971 rxvt_perl_term perl; 894 rxvt_perl_term perl;
972#endif 895#endif
973 struct mbstate mbstate; // current input multibyte state 896 struct mbstate mbstate; // current input multibyte state
974 897
975 unsigned char want_refresh:1, 898 unsigned char want_refresh:1,
976#ifdef TRANSPARENT 899#ifdef TRANSPARENT
977 want_full_refresh:1, /* awaiting full screen refresh */ 900 want_full_refresh:1, /* awaiting full screen refresh */
978#endif
979#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
980 am_transparent:1, /* is a transparent term */ 901 am_transparent:1, /* is a transparent term */
981 am_pixmap_trans:1, /* transparency w/known root pixmap */ 902 am_pixmap_trans:1, /* transparency w/known root pixmap */
982#endif 903#endif
983 current_screen:1, /* primary or secondary */ 904 current_screen:1, /* primary or secondary */
984 num_scr_allow:1, 905 num_scr_allow:1,
… …
1012 int num_scr; /* screen: number lines scrolled */ 933 int num_scr; /* screen: number lines scrolled */
1013 int prev_ncol, /* screen: previous number of columns */ 934 int prev_ncol, /* screen: previous number of columns */
1014 prev_nrow; /* screen: previous number of rows */ 935 prev_nrow; /* screen: previous number of rows */
1015/* ---------- */ 936/* ---------- */
1016 rend_t rstyle; 937 rend_t rstyle;
1017/* ---------- */
1018 uint32_t pixcolor_set[NPIXCLR_SETS];
1019/* ---------- */ 938/* ---------- */
1020#ifdef SELECTION_SCROLLING 939#ifdef SELECTION_SCROLLING
1021 int scroll_selection_lines; 940 int scroll_selection_lines;
1022 enum page_dirn scroll_selection_dir; 941 enum page_dirn scroll_selection_dir;
1023 int selection_save_x, 942 int selection_save_x,
… …
1050 int old_width, /* last used width in screen resize */ 969 int old_width, /* last used width in screen resize */
1051 old_height; /* last used height in screen resize */ 970 old_height; /* last used height in screen resize */
1052 unsigned long priv_modes, 971 unsigned long priv_modes,
1053 SavedModes; 972 SavedModes;
1054/* ---------- */ 973/* ---------- */
1055 Atom xa[NUM_XA]; 974 Atom *xa;
1056/* ---------- */ 975/* ---------- */
1057#ifdef RXVT_SCROLLBAR 976#ifdef RXVT_SCROLLBAR
1058 GC scrollbarGC, 977 GC scrollbarGC,
1059 topShadowGC, 978 topShadowGC,
1060 botShadowGC; 979 botShadowGC;
… …
1117 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;
1118#endif 1037#endif
1119 1038
1120 vector<void *> allocated; // free these memory blocks with free() 1039 vector<void *> allocated; // free these memory blocks with free()
1121 1040
1122 char *env_windowid; /* environmental variable WINDOWID */ 1041 char env_windowid[21]; /* environmental variable WINDOWID */
1042 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1123 char *env_display; /* environmental variable DISPLAY */ 1043 char *env_display; /* environmental variable DISPLAY */
1124 char *env_term; /* environmental variable TERM */ 1044 char *env_term; /* environmental variable TERM */
1125 char *env_colorfgbg; 1045
1126 char *locale; 1046 char *locale;
1127 char charsets[4]; 1047 char charsets[4];
1128 char *v_buffer; /* pointer to physical buffer */ 1048 char *v_buffer; /* pointer to physical buffer */
1129 unsigned int v_buflen; /* size of area to write */ 1049 unsigned int v_buflen; /* size of area to write */
1130 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1050 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1131 1051
1132#ifdef KEYSYM_RESOURCE 1052#ifdef KEYSYM_RESOURCE
1133 keyboard_manager *keyboard; 1053 keyboard_manager *keyboard;
1134#endif 1054#endif
1135 1055
… …
1157#endif 1077#endif
1158 1078
1159 // modifies first argument(!) 1079 // modifies first argument(!)
1160 void paste (char *data, unsigned int len) NOTHROW; 1080 void paste (char *data, unsigned int len) NOTHROW;
1161 1081
1162 long vt_emask, vt_emask_perl; 1082 long vt_emask, vt_emask_perl, vt_emask_xim;
1163 1083
1164 void vt_select_input () const NOTHROW 1084 void vt_select_input () const NOTHROW
1165 { 1085 {
1166 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1086 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1167 } 1087 }
1168 1088
1169#if TRANSPARENT 1089#if TRANSPARENT || ENABLE_PERL
1170 void rootwin_cb (XEvent &xev); 1090 void rootwin_cb (XEvent &xev);
1171 xevent_watcher rootwin_ev; 1091 xevent_watcher rootwin_ev;
1172#endif 1092#endif
1173 1093
1174 void x_cb (XEvent &xev); 1094 void x_cb (XEvent &xev);
… …
1236 bool pty_fill (); 1156 bool pty_fill ();
1237 1157
1238 void make_current () const // make this the "currently active" urxvt instance 1158 void make_current () const // make this the "currently active" urxvt instance
1239 { 1159 {
1240 SET_R (this); 1160 SET_R (this);
1161 set_environ (envv);
1241 rxvt_set_locale (locale); 1162 rxvt_set_locale (locale);
1242 set_environ (envv);
1243 } 1163 }
1244 1164
1245 void init_secondary (); 1165 void init_secondary ();
1246 const char **init_resources (int argc, const char *const *argv); 1166 const char **init_resources (int argc, const char *const *argv);
1247 const char *x_resource (const char *name); 1167 const char *x_resource (const char *name);
… …
1272 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);
1273 1193
1274 bool IMisRunning (); 1194 bool IMisRunning ();
1275 void IMSendSpot (); 1195 void IMSendSpot ();
1276 bool IM_get_IC (const char *modifiers); 1196 bool IM_get_IC (const char *modifiers);
1277 void IMSetStatusPosition (); 1197 void IMSetPosition ();
1278#endif 1198#endif
1279 1199
1280 void resize_scrollbar (); 1200 void resize_scrollbar ();
1281 1201
1282 // command.C 1202 // command.C
1283 void lookup_key (XKeyEvent &ev); 1203 void key_press (XKeyEvent &ev);
1204 void key_release (XKeyEvent &ev);
1284 unsigned int cmd_write (const char *str, unsigned int count); 1205 unsigned int cmd_write (const char *str, unsigned int count);
1285 1206
1286 wchar_t next_char () NOTHROW; 1207 wchar_t next_char () NOTHROW;
1287 wchar_t cmd_getc () THROW ((class out_of_input)); 1208 wchar_t cmd_getc () THROW ((class out_of_input));
1288 uint32_t next_octet () NOTHROW; 1209 uint32_t next_octet () NOTHROW;
… …
1292 void mouse_report (XButtonEvent &ev); 1213 void mouse_report (XButtonEvent &ev);
1293 void button_press (XButtonEvent &ev); 1214 void button_press (XButtonEvent &ev);
1294 void button_release (XButtonEvent &ev); 1215 void button_release (XButtonEvent &ev);
1295 void focus_in (); 1216 void focus_in ();
1296 void focus_out (); 1217 void focus_out ();
1218 void update_fade_color (unsigned int idx);
1297 int check_our_parents (); 1219 int check_our_parents ();
1298#ifdef PRINTPIPE 1220#ifdef PRINTPIPE
1299 FILE *popen_printer (); 1221 FILE *popen_printer ();
1300 int pclose_printer (FILE *stream); 1222 int pclose_printer (FILE *stream);
1301#endif 1223#endif
… …
1323 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);
1324 void set_title (const char *str); 1246 void set_title (const char *str);
1325 void set_icon_name (const char *str); 1247 void set_icon_name (const char *str);
1326 void set_window_color (int idx, const char *color); 1248 void set_window_color (int idx, const char *color);
1327 void set_colorfgbg (); 1249 void set_colorfgbg ();
1328 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);
1329 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1252 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1330 1253
1331 // screen.C 1254 // screen.C
1332 1255
1333 void lalloc (line_t &l) const NOTHROW 1256 void lalloc (line_t &l) const
1334 { 1257 {
1335 l.t = (text_t *)talloc->alloc (); 1258 l.t = (text_t *)talloc->alloc ();
1336 l.r = (rend_t *)ralloc->alloc (); 1259 l.r = (rend_t *)ralloc->alloc ();
1337 } 1260 }
1338 1261
… …
1342 talloc->free (l.t); 1265 talloc->free (l.t);
1343 ralloc->free (l.r); 1266 ralloc->free (l.r);
1344 } 1267 }
1345#endif 1268#endif
1346 1269
1347 void lresize (line_t &l) const NOTHROW 1270 void lresize (line_t &l) const
1348 { 1271 {
1349 if (!l.t) 1272 if (!l.t)
1350 return; 1273 return;
1351 1274
1352 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1275 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1362 { 1285 {
1363 int base = GET_BASEFG (r); 1286 int base = GET_BASEFG (r);
1364#ifndef NO_BRIGHTCOLOR 1287#ifndef NO_BRIGHTCOLOR
1365 if (r & RS_Bold 1288 if (r & RS_Bold
1366# if ENABLE_STYLES 1289# if ENABLE_STYLES
1367 && OPTION (Opt_intensityStyles) 1290 && option (Opt_intensityStyles)
1368# endif 1291# endif
1369 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1292 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1370 base += minBrightCOLOR - minCOLOR; 1293 base += minBrightCOLOR - minCOLOR;
1371#endif 1294#endif
1372 return base; 1295 return base;
… …
1376 { 1299 {
1377 int base = GET_BASEBG (r); 1300 int base = GET_BASEBG (r);
1378#ifndef NO_BRIGHTCOLOR 1301#ifndef NO_BRIGHTCOLOR
1379 if (r & RS_Blink 1302 if (r & RS_Blink
1380# if ENABLE_STYLES 1303# if ENABLE_STYLES
1381 && OPTION (Opt_intensityStyles) 1304 && option (Opt_intensityStyles)
1382# endif 1305# endif
1383 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1306 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1384 base += minBrightCOLOR - minCOLOR; 1307 base += minBrightCOLOR - minCOLOR;
1385#endif 1308#endif
1386 return base; 1309 return base;
1387 } 1310 }
1388 1311
1389 bool option (uint32_t opt) const NOTHROW 1312 bool option (uint8_t opt) const NOTHROW
1390 { 1313 {
1391 return OPTION (opt); 1314 return options[opt >> 3] & (1 << (opt & 7));
1392 } 1315 }
1393 1316
1394 void set_option (uint32_t opt, bool set) NOTHROW 1317 void set_option (uint8_t opt, bool set = true) NOTHROW
1395 { 1318 {
1396 if (set) 1319 if (set)
1397 options |= opt; 1320 options[opt >> 3] |= (1 << (opt & 7));
1398 else 1321 else
1399 options &= ~opt; 1322 options[opt >> 3] &= ~(1 << (opt & 7));
1400 } 1323 }
1401 1324
1402 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;
1403 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;
1404 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1327 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1420 void scr_remap_chars () NOTHROW; 1343 void scr_remap_chars () NOTHROW;
1421 void scr_remap_chars (line_t &l) NOTHROW; 1344 void scr_remap_chars (line_t &l) NOTHROW;
1422 1345
1423 enum cursor_mode { SAVE, RESTORE }; 1346 enum cursor_mode { SAVE, RESTORE };
1424 1347
1425 void scr_poweron () NOTHROW; 1348 void scr_poweron ();
1426 void scr_cursor (cursor_mode mode) NOTHROW; 1349 void scr_cursor (cursor_mode mode) NOTHROW;
1427 void scr_do_wrap () NOTHROW; 1350 void scr_do_wrap () NOTHROW;
1351 void scr_swap_screen () NOTHROW;
1428 int scr_change_screen (int scrn) NOTHROW; 1352 void scr_change_screen (int scrn);
1429 void scr_color (unsigned int color, int fgbg) NOTHROW; 1353 void scr_color (unsigned int color, int fgbg) NOTHROW;
1430 void scr_rendition (int set, int style) NOTHROW; 1354 void scr_rendition (int set, int style) NOTHROW;
1431 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1355 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1432 void scr_backspace () NOTHROW; 1356 void scr_backspace () NOTHROW;
1433 void scr_tab (int count, bool ht = false) NOTHROW; 1357 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1525# define __PROTO(p) p 1449# define __PROTO(p) p
1526#else 1450#else
1527# define __PROTO(p) () 1451# define __PROTO(p) ()
1528#endif 1452#endif
1529 1453
1530#ifdef DEBUG_malloc
1531# include "dmalloc.h" /* This comes last */
1532#endif
1533
1534#endif /* _RXVT_H_ */ 1454#endif /* _RXVT_H_ */
1535 1455

Diff Legend

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