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.272 by ayin, Sun Jun 10 15:16:15 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
78#ifdef HAVE_AFTERIMAGE
79# include <afterimage.h>
80#undef min
81#undef max
87#ifdef XPM_BACKGROUND 82#elif defined(XPM_BACKGROUND)
88# ifdef XPM_INC_X11 83# ifdef XPM_INC_X11
89# include <X11/xpm.h> 84# include <X11/xpm.h>
90# else 85# else
91# include <xpm.h> 86# include <xpm.h>
92# endif 87# endif
… …
97# define STDOUT_FILENO 1 92# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 93# define STDERR_FILENO 2
99#endif 94#endif
100 95
101/****************************************************************************/ 96/****************************************************************************/
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 97
124// exception thrown on fatal (per-instance) errors 98// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 99class rxvt_failure_exception { };
126 100
127// exception thrown when the command parser runs out of input data 101// exception thrown when the command parser runs out of input data
… …
207#endif 181#endif
208 182
209#ifdef XPM_BACKGROUND 183#ifdef XPM_BACKGROUND
210typedef struct { 184typedef struct {
211 short w, h, x, y; 185 short w, h, x, y;
186 bool auto_resize ;
212 Pixmap pixmap; 187 Pixmap pixmap;
213} bgPixmap_t; 188} bgPixmap_t;
214#endif 189#endif
215 190
216/* 191/*
… …
539 * on the unnecessary items, e.g. Color_pointer, but won't bother 514 * on the unnecessary items, e.g. Color_pointer, but won't bother
540 * until we need to. Also, be aware of usage in pixcolor_set 515 * until we need to. Also, be aware of usage in pixcolor_set
541 */ 516 */
542 517
543enum colour_list { 518enum colour_list {
519 Color_none = -2,
520 Color_transparent = -1,
544 Color_fg = 0, 521 Color_fg = 0,
545 Color_bg, 522 Color_bg,
546 minCOLOR, /* 2 */ 523 minCOLOR, /* 2 */
547 Color_Black = minCOLOR, 524 Color_Black = minCOLOR,
548 Color_Red3, 525 Color_Red3,
… …
607 TOTAL_COLORS = NRS_COLORS 584 TOTAL_COLORS = NRS_COLORS
608#endif 585#endif
609}; 586};
610 587
611#define Color_Bits 7 // 0 .. maxTermCOLOR 588#define Color_Bits 7 // 0 .. maxTermCOLOR
612
613#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
614#define NPIXCLR_BITS 32
615 589
616/* 590/*
617 * Resource list 591 * Resource list
618 */ 592 */
619enum { 593enum {
… …
704 * MACRO DEFINES 678 * MACRO DEFINES
705 ***************************************************************************** 679 *****************************************************************************
706 */ 680 */
707#define dLocal(type,name) type const name = this->name 681#define dLocal(type,name) type const name = this->name
708 682
709// for speed reasons, we assume that all latin1 characters 683// for speed reasons, we assume that all codepoints 32 to 126 are
710// are single-width (the first unicode combining character 684// single-width.
711// is actually 0x300, but ascii is what matters most). 685#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
712#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
713 686
714/* convert pixel dimensions to row/column values. Everything as int32_t */ 687/* convert pixel dimensions to row/column values. Everything as int32_t */
715#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 688#define Pixel2Col(x) Pixel2Width((int32_t)(x))
716#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 689#define Pixel2Row(y) Pixel2Height((int32_t)(y))
717#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 690#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
719#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 692#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
720#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 693#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
721#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 694#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
722#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 695#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
723 696
724#define OPTION(opt) (options & (opt))
725#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
726 | Opt_jumpScroll | Opt_secondaryScreen \
727 | Opt_pastableTabs | Opt_intensityStyles)
728
729// for m >= -n, ensure remainder lies between 0..n-1 697// for m >= -n, ensure remainder lies between 0..n-1
730#define MOD(m,n) (((m) + (n)) % (n)) 698#define MOD(m,n) (((m) + (n)) % (n))
731 699
732#define LINENO(n) MOD (term_start + int(n), total_rows) 700#define LINENO(n) MOD (term_start + int(n), total_rows)
733#define ROW(n) row_buf [LINENO (n)] 701#define ROW(n) row_buf [LINENO (n)]
… …
751#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 719#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
752#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 720#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
753 721
754#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 722#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
755 723
756#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 724#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
757#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 725#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
758 726
759#if ENABLE_STYLES 727#if ENABLE_STYLES
760# define FONTSET(style) fontset[GET_STYLE (style)] 728# define FONTSET(style) fontset[GET_STYLE (style)]
761#else 729#else
762# define FONTSET(style) fontset[0] 730# define FONTSET(style) fontset[0]
… …
796# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 764# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
797#else 765#else
798# define XPMClearArea(a, b, c, d, e, f, g) 766# define XPMClearArea(a, b, c, d, e, f, g)
799#endif 767#endif
800 768
801typedef callback1<void, const char *> log_callback; 769typedef callback<void (const char *)> log_callback;
802typedef callback1<int, int> getfd_callback; 770typedef callback<int (int)> getfd_callback;
803 771
804#define SET_LOCALE(locale) rxvt_set_locale (locale) 772#define SET_LOCALE(locale) rxvt_set_locale (locale)
805extern bool rxvt_set_locale (const char *locale) NOTHROW; 773extern bool rxvt_set_locale (const char *locale) NOTHROW;
806extern void rxvt_push_locale (const char *locale) NOTHROW; 774extern void rxvt_push_locale (const char *locale) NOTHROW;
807extern void rxvt_pop_locale () NOTHROW; 775extern void rxvt_pop_locale () NOTHROW;
… …
809/****************************************************************************/ 777/****************************************************************************/
810 778
811#define LINE_LONGER 0x0001 // line is continued on the next row 779#define LINE_LONGER 0x0001 // line is continued on the next row
812#define LINE_FILTERED 0x0002 // line has been filtered 780#define LINE_FILTERED 0x0002 // line has been filtered
813#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 781#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
782#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
783#define LINE_BIDI 0x0010 // line needs bidi (NYI)
814 784
815struct line_t { 785struct line_t {
816 text_t *t; // terminal the text 786 text_t *t; // terminal the text
817 rend_t *r; // rendition, uses RS_ flags 787 rend_t *r; // rendition, uses RS_ flags
818 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 788 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
872# define COMPOSE_LO 0x40000000UL 842# define COMPOSE_LO 0x40000000UL
873# define COMPOSE_HI 0x400fffffUL 843# define COMPOSE_HI 0x400fffffUL
874# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 844# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
875#else 845#else
876# if ENABLE_PERL 846# if ENABLE_PERL
877# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 847# 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 848# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
879# else 849# else
880# define COMPOSE_LO 0xd800UL 850# define COMPOSE_LO 0xd800UL
881# define COMPOSE_HI 0xf8ffUL 851# define COMPOSE_HI 0xf8ffUL
882# endif 852# endif
… …
911#endif 881#endif
912 882
913/****************************************************************************/ 883/****************************************************************************/
914 884
915#ifdef KEYSYM_RESOURCE 885#ifdef KEYSYM_RESOURCE
916 class keyboard_manager; 886class keyboard_manager;
917#endif 887#endif
918 888
919struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 889struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
890
891 // special markers with magic addresses
892 static const char resval_undef []; // options specifically unset
893 static const char resval_on []; // boolean options switched on
894 static const char resval_off []; // or off
895
920 log_callback *log_hook; // log error messages through this hook, if != 0 896 log_callback *log_hook; // log error messages through this hook, if != 0
921 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 897 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
922#if ENABLE_PERL 898#if ENABLE_PERL
923 rxvt_perl_term perl; 899 rxvt_perl_term perl;
924#endif 900#endif
925 struct mbstate mbstate; // current input multibyte state 901 struct mbstate mbstate; // current input multibyte state
926 902
927 unsigned char want_refresh:1, 903 unsigned char want_refresh:1,
928#ifdef TRANSPARENT 904#ifdef TRANSPARENT
929 want_full_refresh:1, /* awaiting full screen refresh */ 905 want_full_refresh:1, /* awaiting full screen refresh */
930#endif
931#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
932 am_transparent:1, /* is a transparent term */ 906 am_transparent:1, /* is a transparent term */
933 am_pixmap_trans:1, /* transparency w/known root pixmap */ 907 am_pixmap_trans:1, /* transparency w/known root pixmap */
934#endif 908#endif
935 current_screen:1, /* primary or secondary */ 909 current_screen:1, /* primary or secondary */
936 num_scr_allow:1, 910 num_scr_allow:1,
… …
964 int num_scr; /* screen: number lines scrolled */ 938 int num_scr; /* screen: number lines scrolled */
965 int prev_ncol, /* screen: previous number of columns */ 939 int prev_ncol, /* screen: previous number of columns */
966 prev_nrow; /* screen: previous number of rows */ 940 prev_nrow; /* screen: previous number of rows */
967/* ---------- */ 941/* ---------- */
968 rend_t rstyle; 942 rend_t rstyle;
969/* ---------- */
970 uint32_t pixcolor_set[NPIXCLR_SETS];
971/* ---------- */ 943/* ---------- */
972#ifdef SELECTION_SCROLLING 944#ifdef SELECTION_SCROLLING
973 int scroll_selection_lines; 945 int scroll_selection_lines;
974 enum page_dirn scroll_selection_dir; 946 enum page_dirn scroll_selection_dir;
975 int selection_save_x, 947 int selection_save_x,
… …
1049 XComposeStatus compose; 1021 XComposeStatus compose;
1050 ttymode_t tio; 1022 ttymode_t tio;
1051 row_col_t oldcursor; 1023 row_col_t oldcursor;
1052#ifdef XPM_BACKGROUND 1024#ifdef XPM_BACKGROUND
1053 bgPixmap_t bgPixmap; 1025 bgPixmap_t bgPixmap;
1026#ifdef HAVE_AFTERIMAGE
1027 ASImageManager *asimman;
1028 ASImage *original_asim;
1029 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1030#else
1054 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1031 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1032#endif
1055#endif 1033#endif
1056 1034
1057#if ENABLE_OVERLAY 1035#if ENABLE_OVERLAY
1058 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1036 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1059 text_t **ov_text; 1037 text_t **ov_text;
… …
1114 1092
1115 long vt_emask, vt_emask_perl, vt_emask_xim; 1093 long vt_emask, vt_emask_perl, vt_emask_xim;
1116 1094
1117 void vt_select_input () const NOTHROW 1095 void vt_select_input () const NOTHROW
1118 { 1096 {
1119 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1097 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1120 } 1098 }
1121 1099
1122#if TRANSPARENT 1100#if TRANSPARENT || ENABLE_PERL
1123 void rootwin_cb (XEvent &xev); 1101 void rootwin_cb (XEvent &xev);
1124 xevent_watcher rootwin_ev; 1102 xevent_watcher rootwin_ev;
1103#endif
1104#if TRANSPARENT
1105 void check_our_parents_cb (time_watcher &w);
1106 time_watcher check_our_parents_ev;
1125#endif 1107#endif
1126 1108
1127 void x_cb (XEvent &xev); 1109 void x_cb (XEvent &xev);
1128 void flush (); 1110 void flush ();
1129 xevent_watcher termwin_ev; 1111 xevent_watcher termwin_ev;
… …
1189 bool pty_fill (); 1171 bool pty_fill ();
1190 1172
1191 void make_current () const // make this the "currently active" urxvt instance 1173 void make_current () const // make this the "currently active" urxvt instance
1192 { 1174 {
1193 SET_R (this); 1175 SET_R (this);
1176 set_environ (envv);
1194 rxvt_set_locale (locale); 1177 rxvt_set_locale (locale);
1195 set_environ (envv);
1196 } 1178 }
1197 1179
1198 void init_secondary (); 1180 void init_secondary ();
1199 const char **init_resources (int argc, const char *const *argv); 1181 const char **init_resources (int argc, const char *const *argv);
1200 const char *x_resource (const char *name); 1182 const char *x_resource (const char *name);
… …
1225 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1207 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1226 1208
1227 bool IMisRunning (); 1209 bool IMisRunning ();
1228 void IMSendSpot (); 1210 void IMSendSpot ();
1229 bool IM_get_IC (const char *modifiers); 1211 bool IM_get_IC (const char *modifiers);
1230 void IMSetStatusPosition (); 1212 void IMSetPosition ();
1231#endif 1213#endif
1232 1214
1233 void resize_scrollbar (); 1215 void resize_scrollbar ();
1234 1216
1235 // command.C 1217 // command.C
1236 void lookup_key (XKeyEvent &ev); 1218 void key_press (XKeyEvent &ev);
1219 void key_release (XKeyEvent &ev);
1237 unsigned int cmd_write (const char *str, unsigned int count); 1220 unsigned int cmd_write (const char *str, unsigned int count);
1238 1221
1239 wchar_t next_char () NOTHROW; 1222 wchar_t next_char () NOTHROW;
1240 wchar_t cmd_getc () THROW ((class out_of_input)); 1223 wchar_t cmd_getc () THROW ((class out_of_input));
1241 uint32_t next_octet () NOTHROW; 1224 uint32_t next_octet () NOTHROW;
… …
1245 void mouse_report (XButtonEvent &ev); 1228 void mouse_report (XButtonEvent &ev);
1246 void button_press (XButtonEvent &ev); 1229 void button_press (XButtonEvent &ev);
1247 void button_release (XButtonEvent &ev); 1230 void button_release (XButtonEvent &ev);
1248 void focus_in (); 1231 void focus_in ();
1249 void focus_out (); 1232 void focus_out ();
1233 void update_fade_color (unsigned int idx);
1250 int check_our_parents (); 1234 int check_our_parents ();
1251#ifdef PRINTPIPE 1235#ifdef PRINTPIPE
1252 FILE *popen_printer (); 1236 FILE *popen_printer ();
1253 int pclose_printer (FILE *stream); 1237 int pclose_printer (FILE *stream);
1254#endif 1238#endif
… …
1276 void set_utf8_property (Atom prop, const char *str, int len = -1); 1260 void set_utf8_property (Atom prop, const char *str, int len = -1);
1277 void set_title (const char *str); 1261 void set_title (const char *str);
1278 void set_icon_name (const char *str); 1262 void set_icon_name (const char *str);
1279 void set_window_color (int idx, const char *color); 1263 void set_window_color (int idx, const char *color);
1280 void set_colorfgbg (); 1264 void set_colorfgbg ();
1281 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1265 bool set_color (rxvt_color &color, const char *name);
1266 void alias_color (int dst, int src);
1282 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1267 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1283 1268
1284 // screen.C 1269 // screen.C
1285 1270
1286 void lalloc (line_t &l) const 1271 void lalloc (line_t &l) const
… …
1315 { 1300 {
1316 int base = GET_BASEFG (r); 1301 int base = GET_BASEFG (r);
1317#ifndef NO_BRIGHTCOLOR 1302#ifndef NO_BRIGHTCOLOR
1318 if (r & RS_Bold 1303 if (r & RS_Bold
1319# if ENABLE_STYLES 1304# if ENABLE_STYLES
1320 && OPTION (Opt_intensityStyles) 1305 && option (Opt_intensityStyles)
1321# endif 1306# endif
1322 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1307 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1323 base += minBrightCOLOR - minCOLOR; 1308 base += minBrightCOLOR - minCOLOR;
1324#endif 1309#endif
1325 return base; 1310 return base;
… …
1329 { 1314 {
1330 int base = GET_BASEBG (r); 1315 int base = GET_BASEBG (r);
1331#ifndef NO_BRIGHTCOLOR 1316#ifndef NO_BRIGHTCOLOR
1332 if (r & RS_Blink 1317 if (r & RS_Blink
1333# if ENABLE_STYLES 1318# if ENABLE_STYLES
1334 && OPTION (Opt_intensityStyles) 1319 && option (Opt_intensityStyles)
1335# endif 1320# endif
1336 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1321 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1337 base += minBrightCOLOR - minCOLOR; 1322 base += minBrightCOLOR - minCOLOR;
1338#endif 1323#endif
1339 return base; 1324 return base;
1340 } 1325 }
1341 1326
1342 bool option (uint32_t opt) const NOTHROW 1327 bool option (uint8_t opt) const NOTHROW
1343 { 1328 {
1344 return OPTION (opt); 1329 return options[opt >> 3] & (1 << (opt & 7));
1345 } 1330 }
1346 1331
1347 void set_option (uint32_t opt, bool set) NOTHROW 1332 void set_option (uint8_t opt, bool set = true) NOTHROW
1348 { 1333 {
1349 if (set) 1334 if (set)
1350 options |= opt; 1335 options[opt >> 3] |= (1 << (opt & 7));
1351 else 1336 else
1352 options &= ~opt; 1337 options[opt >> 3] &= ~(1 << (opt & 7));
1353 } 1338 }
1354 1339
1355 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1340 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1356 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1341 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1357 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1342 int scr_scroll_text (int row1, int row2, int count) NOTHROW;

Diff Legend

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