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.426 by sf-exg, Tue Jan 4 23:12:10 2011 UTC vs.
Revision 1.458 by sf-exg, Sun Jan 1 17:43:47 2012 UTC

… …
74#include <X11/cursorfont.h> 74#include <X11/cursorfont.h>
75#include <X11/keysym.h> 75#include <X11/keysym.h>
76#include <X11/keysymdef.h> 76#include <X11/keysymdef.h>
77#include <X11/Xatom.h> 77#include <X11/Xatom.h>
78 78
79#ifdef HAVE_AFTERIMAGE
80# include <afterimage.h>
81# undef min
82# undef max
83#endif
84
85#ifdef HAVE_PIXBUF
86# include <gdk-pixbuf/gdk-pixbuf.h>
87#endif
88
89#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
90# define HAVE_BG_PIXMAP 1
91#endif
92
79#include "encoding.h" 93#include "encoding.h"
80#include "rxvtutil.h" 94#include "rxvtutil.h"
81#include "rxvtfont.h" 95#include "rxvtfont.h"
82#include "rxvttoolkit.h" 96#include "rxvttoolkit.h"
83#include "scrollbar.h" 97#include "scrollbar.h"
… …
102 ***************************************************************************** 116 *****************************************************************************
103 */ 117 */
104 118
105#include <termios.h> 119#include <termios.h>
106 120
107#include "background.h"
108
109#ifndef STDIN_FILENO 121#ifndef STDIN_FILENO
110# define STDIN_FILENO 0 122# define STDIN_FILENO 0
111# define STDOUT_FILENO 1 123# define STDOUT_FILENO 1
112# define STDERR_FILENO 2 124# define STDERR_FILENO 2
113#endif 125#endif
114 126
115#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 127#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
116# define EXIT_SUCCESS 0 /* exit function success */ 128# define EXIT_SUCCESS 0 /* exit function success */
117# define EXIT_FAILURE 1 /* exit function failure */ 129# define EXIT_FAILURE 1 /* exit function failure */
118#endif
119
120#ifndef PATH_MAX
121# define PATH_MAX 16384
122#endif 130#endif
123 131
124/****************************************************************************/ 132/****************************************************************************/
125 133
126// exception thrown on fatal (per-instance) errors 134// exception thrown on fatal (per-instance) errors
… …
149 157
150const char * rxvt_basename (const char *str) NOTHROW; 158const char * rxvt_basename (const char *str) NOTHROW;
151void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 159void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
152void rxvt_log (const char *fmt,...) NOTHROW; 160void rxvt_log (const char *fmt,...) NOTHROW;
153void rxvt_warn (const char *fmt,...) NOTHROW; 161void rxvt_warn (const char *fmt,...) NOTHROW;
154void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 162void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
155void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 163void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
156 164
157char * rxvt_strtrim (char *str) NOTHROW; 165char * rxvt_strtrim (char *str) NOTHROW;
158char ** rxvt_splitcommastring (const char *cs) NOTHROW; 166char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
159void rxvt_freecommastring (char **cs) NOTHROW; 167
168static inline void
169rxvt_free_strsplit (char **ptr) NOTHROW
170{
171 free (ptr[0]);
172 free (ptr);
173}
160 174
161void * rxvt_malloc (size_t size); 175void * rxvt_malloc (size_t size);
162void * rxvt_calloc (size_t number, size_t size); 176void * rxvt_calloc (size_t number, size_t size);
163void * rxvt_realloc (void *ptr, size_t size); 177void * rxvt_realloc (void *ptr, size_t size);
164 178
… …
290# define NSCREENS 0 304# define NSCREENS 0
291#else 305#else
292# define NSCREENS 1 306# define NSCREENS 1
293#endif 307#endif
294 308
295/* special (internal) prefix for font commands */
296#define FONT_CMD '#'
297#define FONT_DN "#-"
298#define FONT_UP "#+"
299
300/* flags for rxvt_scr_gotorc () */ 309/* flags for rxvt_term::scr_gotorc () */
301enum { 310enum {
302 C_RELATIVE = 1, /* col movement is relative */ 311 C_RELATIVE = 1, /* col movement is relative */
303 R_RELATIVE = 2, /* row movement is relative */ 312 R_RELATIVE = 2, /* row movement is relative */
304 RELATIVE = C_RELATIVE | R_RELATIVE, 313 RELATIVE = C_RELATIVE | R_RELATIVE,
305}; 314};
306 315
307/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 316/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
308enum { 317enum {
309 INSERT = -1, /* don't change these values */ 318 INSERT = -1, /* don't change these values */
310 DELETE = +1, 319 DELETE = +1,
311 ERASE = +2, 320 ERASE = +2,
312}; 321};
313 322
314/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 323/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
315enum page_dirn { 324enum page_dirn {
316 UP, 325 UP,
317 DN, 326 DN,
318 NO_DIR, 327 NO_DIR,
319}; 328};
320 329
321/* arguments for rxvt_scr_change_screen () */ 330/* arguments for rxvt_term::scr_change_screen () */
322enum { 331enum {
323 PRIMARY = 0, 332 PRIMARY = 0,
324 SECONDARY, 333 SECONDARY,
325}; 334};
326 335
… …
368#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 377#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
369#define RS_attrMask (RS_baseattrMask | RS_fontMask) 378#define RS_attrMask (RS_baseattrMask | RS_fontMask)
370 379
371#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 380#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
372#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 381#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
373
374#define Sel_none 0 /* Not waiting */
375#define Sel_normal 0x01 /* normal selection */
376#define Sel_incr 0x02 /* incremental selection */
377#define Sel_direct 0x00
378#define Sel_Primary 0x01
379#define Sel_Secondary 0x02
380#define Sel_Clipboard 0x03
381#define Sel_whereMask 0x0f
382#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
383#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
384 382
385enum { 383enum {
386 C0_NUL = 0x00, 384 C0_NUL = 0x00,
387 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 385 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
388 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 386 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
669 667
670#define GET_ATTR(x) (((x) & RS_attrMask)) 668#define GET_ATTR(x) (((x) & RS_attrMask))
671// return attributes defining the background, encoding doesn't matter 669// return attributes defining the background, encoding doesn't matter
672// depends on RS_fgShift > RS_bgShift 670// depends on RS_fgShift > RS_bgShift
673#define GET_BGATTR(x) \ 671#define GET_BGATTR(x) \
674 (expect_false ((x) & RS_RVid) \ 672 (ecb_unlikely ((x) & RS_RVid) \
675 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 673 ? (((x) & (RS_attrMask & ~RS_RVid)) \
676 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 674 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
677 : ((x) & (RS_attrMask | RS_bgMask))) 675 : ((x) & (RS_attrMask | RS_bgMask)))
678#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 676#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
679#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 677#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
890 int saveLines; /* number of lines that fit in scrollback */ 888 int saveLines; /* number of lines that fit in scrollback */
891 int total_rows; /* total number of rows in this terminal */ 889 int total_rows; /* total number of rows in this terminal */
892 int term_start; /* term lines start here */ 890 int term_start; /* term lines start here */
893 int view_start; /* scrollback view starts here */ 891 int view_start; /* scrollback view starts here */
894 int top_row; /* topmost row index of scrollback */ 892 int top_row; /* topmost row index of scrollback */
895 Window parent[6]; /* parent identifiers - we're parent[0] */ 893 Window parent; /* parent identifier */
896 Window vt; /* vt100 window */ 894 Window vt; /* vt100 window */
897 GC gc; /* GC for drawing */ 895 GC gc; /* GC for drawing */
898 Pixmap pixmap; 896 Pixmap pixmap;
899 rxvt_drawable *drawable; 897 rxvt_drawable *drawable;
900 rxvt_fontset *fontset[4]; 898 rxvt_fontset *fontset[4];
… …
983 scrollBar_t scrollBar; 981 scrollBar_t scrollBar;
984 uint8_t options[(Opt_count + 7) >> 3]; 982 uint8_t options[(Opt_count + 7) >> 3];
985 XSizeHints szHint; 983 XSizeHints szHint;
986 rxvt_color *pix_colors; 984 rxvt_color *pix_colors;
987 Cursor TermWin_cursor; /* cursor for vt window */ 985 Cursor TermWin_cursor; /* cursor for vt window */
988 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 986 line_t *row_buf; // all lines, scrollback + terminal, circular
989 line_t *drawn_buf; // text on screen 987 line_t *drawn_buf; // text on screen
990 line_t *swap_buf; // lines for swap buffer 988 line_t *swap_buf; // lines for swap buffer
991 char *tabs; /* per location: 1 == tab-stop */ 989 char *tabs; /* per location: 1 == tab-stop */
992 screen_t screen; 990 screen_t screen;
993 screen_t swap; 991 screen_t swap;
… …
1034 seen_resize:1, /* whether we had a resize event */ 1032 seen_resize:1, /* whether we had a resize event */
1035 parsed_geometry:1; 1033 parsed_geometry:1;
1036 1034
1037 unsigned char refresh_type, 1035 unsigned char refresh_type,
1038#ifdef META8_OPTION 1036#ifdef META8_OPTION
1039 meta_char, /* Alt-key prefix */ 1037 meta_char; /* Alt-key prefix */
1040#endif 1038#endif
1041 selection_wait,
1042 selection_type;
1043/* ---------- */ 1039/* ---------- */
1044 bool rvideo_state, rvideo_mode; 1040 bool rvideo_state, rvideo_mode;
1045#ifndef NO_BELL 1041#ifndef NO_BELL
1046 bool rvideo_bell; 1042 bool rvideo_bell;
1047#endif 1043#endif
… …
1083 SavedModes; 1079 SavedModes;
1084/* ---------- */ 1080/* ---------- */
1085 Atom *xa; 1081 Atom *xa;
1086/* ---------- */ 1082/* ---------- */
1087 Time selection_time, 1083 Time selection_time,
1088 selection_request_time,
1089 clipboard_time; 1084 clipboard_time;
1085 rxvt_selection *selection_req;
1090 pid_t cmd_pid; /* process id of child */ 1086 pid_t cmd_pid; /* process id of child */
1091 char * incr_buf;
1092 size_t incr_buf_size, incr_buf_fill;
1093/* ---------- */ 1087/* ---------- */
1094 struct mouse_event MEvent; 1088 struct mouse_event MEvent;
1095 XComposeStatus compose; 1089 XComposeStatus compose;
1096 static struct termios def_tio; 1090 static struct termios def_tio;
1097 row_col_t oldcursor; 1091 row_col_t oldcursor;
1098#ifdef HAVE_BG_PIXMAP 1092#ifdef HAVE_BG_PIXMAP
1099 bgPixmap_t bgPixmap; 1093 void bg_init ();
1094 void bg_destroy ();
1095
1096 enum {
1097 //subset returned by make_transparency_pixmap
1098 BG_IS_VALID = 1 << 0,
1099 BG_NEEDS_TINT = 1 << 1,
1100 BG_NEEDS_BLUR = 1 << 2,
1101
1102 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1103
1104 BG_KEEP_ASPECT = 1 << 3,
1105 BG_ROOT_ALIGN = 1 << 4,
1106 BG_TILE = 1 << 14,
1107 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1108
1109 BG_TINT_SET = 1 << 5,
1110 BG_TINT_BITAND = 1 << 6,
1111 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1112
1113 BG_HAS_RENDER = 1 << 7,
1114 BG_HAS_RENDER_CONV = 1 << 8,
1115 BG_CLIENT_RENDER = 1 << 9,
1116
1117 BG_IS_TRANSPARENT = 1 << 10,
1118 BG_NEEDS_REFRESH = 1 << 11,
1119 BG_IS_SIZE_SENSITIVE = 1 << 12,
1120 BG_IS_FROM_FILE = 1 << 13,
1121 };
1122
1123 unsigned int bg_flags;
1124
1125# ifdef BG_IMAGE_FROM_FILE
1126 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
1127 bool render_image (unsigned long tr_flags);
1128
1129 enum {
1130 noScale = 0,
1131 windowScale = 100,
1132 defaultScale = windowScale,
1133 centerAlign = 50,
1134 defaultAlign = centerAlign,
1135 };
1136
1137 unsigned int h_scale, v_scale; /* percents of the window size */
1138 int h_align, v_align; /* percents of the window size:
1139 0 - left align, 50 - center, 100 - right */
1140
1141 bool bg_set_geometry (const char *geom, bool update = false);
1142 void bg_set_default_geometry ()
1143 {
1144 h_scale = v_scale = defaultScale;
1145 h_align = v_align = defaultAlign;
1146 }
1147
1148 bool bg_set_file (const char *file);
1149# endif
1150
1151# ifdef ENABLE_TRANSPARENCY
1152 Pixmap root_pixmap; /* current root pixmap set */
1153 rxvt_color tint;
1154 int shade;
1155 int h_blurRadius, v_blurRadius;
1156
1157 bool bg_set_transparent ();
1158 void bg_set_root_pixmap ();
1159 void set_tint_shade_flags ();
1160 bool bg_set_tint (rxvt_color &new_tint);
1161 bool bg_set_shade (const char *shade_str);
1162 bool bg_set_blur (const char *geom);
1163
1164 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1165 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1166 void tint_ximage (Visual *visual, XImage *ximage);
1167 unsigned long make_transparency_pixmap ();
1168# endif
1169
1170 ev_tstamp bg_valid_since;
1171
1172 Pixmap bg_pixmap;
1173 unsigned int bg_pmap_width, bg_pmap_height;
1174
1175 int target_x;
1176 int target_y;
1177 bool bg_set_position (int x, int y);
1178 bool bg_window_size_sensitive ();
1179 bool bg_window_position_sensitive ();
1180
1181 bool bg_render ();
1182 void bg_invalidate ()
1183 {
1184 bg_flags &= ~BG_IS_VALID;
1185 }
1100#endif 1186#endif
1101#ifdef HAVE_AFTERIMAGE 1187#ifdef HAVE_AFTERIMAGE
1188 ASImage *original_asim;
1102 ASVisual *asv; 1189 ASVisual *asv;
1103 ASImageManager *asimman; 1190 ASImageManager *asimman;
1104 1191
1105 void init_asv () 1192 void init_asv ()
1106 { 1193 {
1107 if (!asv) 1194 if (!asv)
1108 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1195 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1109 } 1196 }
1197#endif
1198#ifdef HAVE_PIXBUF
1199 GdkPixbuf *pixbuf;
1200 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1201 int src_x, int src_y, int dst_x, int dst_y,
1202 unsigned int width, unsigned int height);
1110#endif 1203#endif
1111 1204
1112#if ENABLE_OVERLAY 1205#if ENABLE_OVERLAY
1113 overlay_base ov; 1206 overlay_base ov;
1114 1207
… …
1189 void child_cb (ev::child &w, int revents); ev::child child_ev; 1282 void child_cb (ev::child &w, int revents); ev::child child_ev;
1190 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1283 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1191 void refresh_check (); 1284 void refresh_check ();
1192 void flush (); 1285 void flush ();
1193 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1286 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1287 void cmdbuf_reify ();
1288 void cmdbuf_append (const char *str, size_t count);
1194 bool pty_fill (); 1289 bool pty_fill ();
1195 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1290 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1196 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1197 1291
1198#ifdef CURSOR_BLINK 1292#ifdef CURSOR_BLINK
1199 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1293 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1200#endif 1294#endif
1201#ifdef TEXT_BLINK 1295#ifdef TEXT_BLINK
… …
1222 void pointer_unblank (); 1316 void pointer_unblank ();
1223 1317
1224 void tt_printf (const char *fmt,...); 1318 void tt_printf (const char *fmt,...);
1225 void tt_write (const char *data, unsigned int len); 1319 void tt_write (const char *data, unsigned int len);
1226 void pty_write (); 1320 void pty_write ();
1227
1228 void init (stringvec *argv, stringvec *envv)
1229 {
1230 this->argv = argv;
1231 init (argv->size (), argv->begin (), envv);
1232 }
1233 1321
1234 void make_current () const // make this the "currently active" urxvt instance 1322 void make_current () const // make this the "currently active" urxvt instance
1235 { 1323 {
1236 SET_R (this); 1324 SET_R (this);
1237 set_environ (envv); 1325 set_environ (envv);
… …
1249 void im_set_size (XRectangle &size); 1337 void im_set_size (XRectangle &size);
1250 void im_set_position (XPoint &pos) NOTHROW; 1338 void im_set_position (XPoint &pos) NOTHROW;
1251 void im_set_color (unsigned long &fg, unsigned long &bg); 1339 void im_set_color (unsigned long &fg, unsigned long &bg);
1252 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1340 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1253 1341
1254 bool IMisRunning (); 1342 bool im_is_running ();
1255 void IMSendSpot (); 1343 void im_send_spot ();
1256 bool IM_get_IC (const char *modifiers); 1344 bool im_get_ic (const char *modifiers);
1257 void IMSetPosition (); 1345 void im_set_position ();
1258#endif 1346#endif
1259 1347
1260 // command.C 1348 // command.C
1261 void key_press (XKeyEvent &ev); 1349 void key_press (XKeyEvent &ev);
1262 void key_release (XKeyEvent &ev); 1350 void key_release (XKeyEvent &ev);
1263 unsigned int cmd_write (const char *str, unsigned int count);
1264 1351
1265 wchar_t next_char () NOTHROW; 1352 wchar_t next_char () NOTHROW;
1266 wchar_t cmd_getc () THROW ((class out_of_input)); 1353 wchar_t cmd_getc () THROW ((class out_of_input));
1267 uint32_t next_octet () NOTHROW; 1354 uint32_t next_octet () NOTHROW;
1268 uint32_t cmd_get8 () THROW ((class out_of_input)); 1355 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1295 void process_color_seq (int report, int color, const char *str, char resp); 1382 void process_color_seq (int report, int color, const char *str, char resp);
1296 void process_xterm_seq (int op, char *str, char resp); 1383 void process_xterm_seq (int op, char *str, char resp);
1297 int privcases (int mode, unsigned long bit); 1384 int privcases (int mode, unsigned long bit);
1298 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1385 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1299 void process_sgr_mode (unsigned int nargs, const int *arg); 1386 void process_sgr_mode (unsigned int nargs, const int *arg);
1300 void process_graphics ();
1301 // init.C 1387 // init.C
1388 void init (stringvec *argv, stringvec *envv);
1389 void init (int argc, const char *const *argv, const char *const *envv);
1390 void init2 (int argc, const char *const *argv);
1302 void init_vars (); 1391 void init_vars ();
1303 const char **init_resources (int argc, const char *const *argv); 1392 const char **init_resources (int argc, const char *const *argv);
1304 void init (int argc, const char *const *argv, stringvec *envv);
1305 void init_env (); 1393 void init_env ();
1306 void set_locale (const char *locale); 1394 void set_locale (const char *locale);
1307 void init_xlocale (); 1395 void init_xlocale ();
1308 void init_command (const char *const *argv); 1396 void init_command (const char *const *argv);
1309 void run_command (const char *const *argv); 1397 void run_command (const char *const *argv);
… …
1372#ifndef NO_BRIGHTCOLOR 1460#ifndef NO_BRIGHTCOLOR
1373 if (r & RS_Bold 1461 if (r & RS_Bold
1374# if ENABLE_STYLES 1462# if ENABLE_STYLES
1375 && option (Opt_intensityStyles) 1463 && option (Opt_intensityStyles)
1376# endif 1464# endif
1377 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1465 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1378 base += minBrightCOLOR - minCOLOR; 1466 base += minBrightCOLOR - minCOLOR;
1379#endif 1467#endif
1380 return base; 1468 return base;
1381 } 1469 }
1382 1470
… …
1386#ifndef NO_BRIGHTCOLOR 1474#ifndef NO_BRIGHTCOLOR
1387 if (r & RS_Blink 1475 if (r & RS_Blink
1388# if ENABLE_STYLES 1476# if ENABLE_STYLES
1389 && option (Opt_intensityStyles) 1477 && option (Opt_intensityStyles)
1390# endif 1478# endif
1391 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1479 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1392 base += minBrightCOLOR - minCOLOR; 1480 base += minBrightCOLOR - minCOLOR;
1393#endif 1481#endif
1394 return base; 1482 return base;
1395 } 1483 }
1396 1484
… …
1398 { 1486 {
1399 return options[opt >> 3] & (1 << (opt & 7)); 1487 return options[opt >> 3] & (1 << (opt & 7));
1400 } 1488 }
1401 1489
1402 void set_option (uint8_t opt, bool set = true) NOTHROW; 1490 void set_option (uint8_t opt, bool set = true) NOTHROW;
1403
1404 void set_privmode (unsigned bit, int set) NOTHROW
1405 {
1406 if (set)
1407 priv_modes |= bit;
1408 else
1409 priv_modes &= ~bit;
1410 }
1411 1491
1412 // modifies first argument(!) 1492 // modifies first argument(!)
1413 void tt_paste (char *data, unsigned int len) NOTHROW; 1493 void tt_paste (char *data, unsigned int len) NOTHROW;
1414 void paste (char *data, unsigned int len) NOTHROW; 1494 void paste (char *data, unsigned int len) NOTHROW;
1415 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1495 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1427 void scr_backindex () NOTHROW; 1507 void scr_backindex () NOTHROW;
1428 void scr_forwardindex () NOTHROW; 1508 void scr_forwardindex () NOTHROW;
1429#endif 1509#endif
1430 void scr_touch (bool refresh) NOTHROW; 1510 void scr_touch (bool refresh) NOTHROW;
1431 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1511 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1432 void scr_recolour () NOTHROW; 1512 void scr_recolour (bool refresh = true) NOTHROW;
1433 void scr_remap_chars () NOTHROW; 1513 void scr_remap_chars () NOTHROW;
1434 void scr_remap_chars (line_t &l) NOTHROW; 1514 void scr_remap_chars (line_t &l) NOTHROW;
1435 1515
1436 enum cursor_mode { SAVE, RESTORE }; 1516 enum cursor_mode { SAVE, RESTORE };
1437 1517
… …
1472 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1552 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1473 void scr_reverse_selection () NOTHROW; 1553 void scr_reverse_selection () NOTHROW;
1474 void scr_dump (int fd) NOTHROW; 1554 void scr_dump (int fd) NOTHROW;
1475 1555
1476 void selection_check (int check_more) NOTHROW; 1556 void selection_check (int check_more) NOTHROW;
1477 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1478 void selection_property (Window win, Atom prop) NOTHROW;
1479 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1557 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1480 int selection_request_other (Atom target, int selnum) NOTHROW;
1481 void selection_clear (bool clipboard = false) NOTHROW; 1558 void selection_clear (bool clipboard = false) NOTHROW;
1482 void selection_make (Time tm); 1559 void selection_make (Time tm);
1483 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1560 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1484 void selection_start_colrow (int col, int row) NOTHROW; 1561 void selection_start_colrow (int col, int row) NOTHROW;
1485 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1562 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
… …
1489 void selection_click (int clicks, int x, int y) NOTHROW; 1566 void selection_click (int clicks, int x, int y) NOTHROW;
1490 void selection_extend (int x, int y, int flag) NOTHROW; 1567 void selection_extend (int x, int y, int flag) NOTHROW;
1491 void selection_rotate (int x, int y) NOTHROW; 1568 void selection_rotate (int x, int y) NOTHROW;
1492 1569
1493 // xdefaults.C 1570 // xdefaults.C
1494 void get_options (int argc, const char *const *argv); 1571 const char **get_options (int argc, const char *const *argv);
1495 int parse_keysym (const char *str, const char *arg); 1572 int parse_keysym (const char *str, const char *arg);
1496 const char *x_resource (const char *name); 1573 const char *x_resource (const char *name);
1497 void extract_resources (); 1574 void extract_resources ();
1575 void extract_keysym_resources ();
1498}; 1576};
1499 1577
1500#endif /* _RXVT_H_ */ 1578#endif /* _RXVT_H_ */
1501 1579

Diff Legend

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