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.432 by sf-exg, Sat Jan 29 17:50:31 2011 UTC vs.
Revision 1.465 by sf-exg, Tue Jan 10 18:50:14 2012 UTC

… …
125#endif 125#endif
126 126
127#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 127#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
128# define EXIT_SUCCESS 0 /* exit function success */ 128# define EXIT_SUCCESS 0 /* exit function success */
129# define EXIT_FAILURE 1 /* exit function failure */ 129# define EXIT_FAILURE 1 /* exit function failure */
130#endif
131
132#ifndef PATH_MAX
133# define PATH_MAX 16384
134#endif 130#endif
135 131
136/****************************************************************************/ 132/****************************************************************************/
137 133
138// exception thrown on fatal (per-instance) errors 134// exception thrown on fatal (per-instance) errors
… …
161 157
162const char * rxvt_basename (const char *str) NOTHROW; 158const char * rxvt_basename (const char *str) NOTHROW;
163void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 159void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
164void rxvt_log (const char *fmt,...) NOTHROW; 160void rxvt_log (const char *fmt,...) NOTHROW;
165void rxvt_warn (const char *fmt,...) NOTHROW; 161void rxvt_warn (const char *fmt,...) NOTHROW;
166void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 162void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
167void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 163void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
168 164
169char * rxvt_strtrim (char *str) NOTHROW; 165char * rxvt_strtrim (char *str) NOTHROW;
170char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 166char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
171 167
172static inline void 168static inline void
… …
308# define NSCREENS 0 304# define NSCREENS 0
309#else 305#else
310# define NSCREENS 1 306# define NSCREENS 1
311#endif 307#endif
312 308
313/* special (internal) prefix for font commands */
314#define FONT_CMD '#'
315#define FONT_DN "#-"
316#define FONT_UP "#+"
317
318/* flags for rxvt_scr_gotorc () */ 309/* flags for rxvt_term::scr_gotorc () */
319enum { 310enum {
320 C_RELATIVE = 1, /* col movement is relative */ 311 C_RELATIVE = 1, /* col movement is relative */
321 R_RELATIVE = 2, /* row movement is relative */ 312 R_RELATIVE = 2, /* row movement is relative */
322 RELATIVE = C_RELATIVE | R_RELATIVE, 313 RELATIVE = C_RELATIVE | R_RELATIVE,
323}; 314};
324 315
325/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 316/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
326enum { 317enum {
327 INSERT = -1, /* don't change these values */ 318 INSERT = -1, /* don't change these values */
328 DELETE = +1, 319 DELETE = +1,
329 ERASE = +2, 320 ERASE = +2,
330}; 321};
331 322
332/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 323/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
333enum page_dirn { 324enum page_dirn {
334 UP, 325 UP,
335 DN, 326 DN,
336 NO_DIR, 327 NO_DIR,
337}; 328};
338 329
339/* arguments for rxvt_scr_change_screen () */ 330/* arguments for rxvt_term::scr_change_screen () */
340enum { 331enum {
341 PRIMARY = 0, 332 PRIMARY = 0,
342 SECONDARY, 333 SECONDARY,
343}; 334};
344 335
… …
386#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)
387#define RS_attrMask (RS_baseattrMask | RS_fontMask) 378#define RS_attrMask (RS_baseattrMask | RS_fontMask)
388 379
389#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))
390#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))
391
392#define Sel_none 0 /* Not waiting */
393#define Sel_normal 0x01 /* normal selection */
394#define Sel_incr 0x02 /* incremental selection */
395#define Sel_direct 0x00
396#define Sel_Primary 0x01
397#define Sel_Secondary 0x02
398#define Sel_Clipboard 0x03
399#define Sel_whereMask 0x0f
400#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
401#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
402 382
403enum { 383enum {
404 C0_NUL = 0x00, 384 C0_NUL = 0x00,
405 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,
406 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 ,
… …
687 667
688#define GET_ATTR(x) (((x) & RS_attrMask)) 668#define GET_ATTR(x) (((x) & RS_attrMask))
689// return attributes defining the background, encoding doesn't matter 669// return attributes defining the background, encoding doesn't matter
690// depends on RS_fgShift > RS_bgShift 670// depends on RS_fgShift > RS_bgShift
691#define GET_BGATTR(x) \ 671#define GET_BGATTR(x) \
692 (expect_false ((x) & RS_RVid) \ 672 (ecb_unlikely ((x) & RS_RVid) \
693 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 673 ? (((x) & (RS_attrMask & ~RS_RVid)) \
694 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 674 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
695 : ((x) & (RS_attrMask | RS_bgMask))) 675 : ((x) & (RS_attrMask | RS_bgMask)))
696#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 676#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
697#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 677#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
890 * END······················= total_rows 870 * END······················= total_rows
891 */ 871 */
892 872
893struct TermWin_t 873struct TermWin_t
894{ 874{
875 int vt_width; /* actual window width [pixels] */
876 int vt_height; /* actual window height [pixels] */
895 int width; /* window width [pixels] */ 877 int width; /* window width [pixels] */
896 int height; /* window height [pixels] */ 878 int height; /* window height [pixels] */
897 int fwidth; /* font width [pixels] */ 879 int fwidth; /* font width [pixels] */
898 int fheight; /* font height [pixels] */ 880 int fheight; /* font height [pixels] */
899 int fbase; /* font ascent (baseline) [pixels] */ 881 int fbase; /* font ascent (baseline) [pixels] */
… …
908 int saveLines; /* number of lines that fit in scrollback */ 890 int saveLines; /* number of lines that fit in scrollback */
909 int total_rows; /* total number of rows in this terminal */ 891 int total_rows; /* total number of rows in this terminal */
910 int term_start; /* term lines start here */ 892 int term_start; /* term lines start here */
911 int view_start; /* scrollback view starts here */ 893 int view_start; /* scrollback view starts here */
912 int top_row; /* topmost row index of scrollback */ 894 int top_row; /* topmost row index of scrollback */
913 Window parent[6]; /* parent identifiers - we're parent[0] */ 895 Window parent; /* parent identifier */
914 Window vt; /* vt100 window */ 896 Window vt; /* vt100 window */
915 GC gc; /* GC for drawing */ 897 GC gc; /* GC for drawing */
916 Pixmap pixmap;
917 rxvt_drawable *drawable; 898 rxvt_drawable *drawable;
918 rxvt_fontset *fontset[4]; 899 rxvt_fontset *fontset[4];
919}; 900};
920 901
921/* 902/*
… …
1001 scrollBar_t scrollBar; 982 scrollBar_t scrollBar;
1002 uint8_t options[(Opt_count + 7) >> 3]; 983 uint8_t options[(Opt_count + 7) >> 3];
1003 XSizeHints szHint; 984 XSizeHints szHint;
1004 rxvt_color *pix_colors; 985 rxvt_color *pix_colors;
1005 Cursor TermWin_cursor; /* cursor for vt window */ 986 Cursor TermWin_cursor; /* cursor for vt window */
1006 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 987 line_t *row_buf; // all lines, scrollback + terminal, circular
1007 line_t *drawn_buf; // text on screen 988 line_t *drawn_buf; // text on screen
1008 line_t *swap_buf; // lines for swap buffer 989 line_t *swap_buf; // lines for swap buffer
1009 char *tabs; /* per location: 1 == tab-stop */ 990 char *tabs; /* per location: 1 == tab-stop */
1010 screen_t screen; 991 screen_t screen;
1011 screen_t swap; 992 screen_t swap;
… …
1048 hidden_pointer:1, 1029 hidden_pointer:1,
1049#endif 1030#endif
1050 enc_utf8:1, /* whether locale uses utf-8 */ 1031 enc_utf8:1, /* whether locale uses utf-8 */
1051 seen_input:1, /* whether we have seen some program output yet */ 1032 seen_input:1, /* whether we have seen some program output yet */
1052 seen_resize:1, /* whether we had a resize event */ 1033 seen_resize:1, /* whether we had a resize event */
1034 init_done:1,
1053 parsed_geometry:1; 1035 parsed_geometry:1;
1054 1036
1055 unsigned char refresh_type, 1037 unsigned char refresh_type,
1056#ifdef META8_OPTION 1038#ifdef META8_OPTION
1057 meta_char, /* Alt-key prefix */ 1039 meta_char; /* Alt-key prefix */
1058#endif 1040#endif
1059 selection_wait,
1060 selection_type;
1061/* ---------- */ 1041/* ---------- */
1062 bool rvideo_state, rvideo_mode; 1042 bool rvideo_state, rvideo_mode;
1063#ifndef NO_BELL 1043#ifndef NO_BELL
1064 bool rvideo_bell; 1044 bool rvideo_bell;
1065#endif 1045#endif
… …
1093 allowedxerror; 1073 allowedxerror;
1094/* ---------- */ 1074/* ---------- */
1095 unsigned int ModLevel3Mask, 1075 unsigned int ModLevel3Mask,
1096 ModMetaMask, 1076 ModMetaMask,
1097 ModNumLockMask; 1077 ModNumLockMask;
1098 int old_width, /* last used width in screen resize */
1099 old_height; /* last used height in screen resize */
1100 unsigned long priv_modes, 1078 unsigned long priv_modes,
1101 SavedModes; 1079 SavedModes;
1102/* ---------- */ 1080/* ---------- */
1103 Atom *xa; 1081 Atom *xa;
1104/* ---------- */ 1082/* ---------- */
1105 Time selection_time, 1083 Time selection_time,
1106 selection_request_time,
1107 clipboard_time; 1084 clipboard_time;
1085 rxvt_selection *selection_req;
1108 pid_t cmd_pid; /* process id of child */ 1086 pid_t cmd_pid; /* process id of child */
1109 char * incr_buf;
1110 size_t incr_buf_size, incr_buf_fill;
1111/* ---------- */ 1087/* ---------- */
1112 struct mouse_event MEvent; 1088 struct mouse_event MEvent;
1113 XComposeStatus compose; 1089 XComposeStatus compose;
1114 static struct termios def_tio; 1090 static struct termios def_tio;
1115 row_col_t oldcursor; 1091 row_col_t oldcursor;
… …
1123 BG_NEEDS_TINT = 1 << 1, 1099 BG_NEEDS_TINT = 1 << 1,
1124 BG_NEEDS_BLUR = 1 << 2, 1100 BG_NEEDS_BLUR = 1 << 2,
1125 1101
1126 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR, 1102 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1127 1103
1128 BG_PROP_SCALE = 1 << 3, 1104 BG_KEEP_ASPECT = 1 << 3,
1129 BG_ROOT_ALIGN = 1 << 4, 1105 BG_ROOT_ALIGN = 1 << 4,
1106 BG_TILE = 1 << 14,
1130 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN, 1107 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1131 1108
1132 BG_TINT_SET = 1 << 5, 1109 BG_TINT_SET = 1 << 5,
1133 BG_TINT_BITAND = 1 << 6, 1110 BG_TINT_BITAND = 1 << 6,
1134 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND, 1111 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1135 1112
… …
1182 void set_tint_shade_flags (); 1159 void set_tint_shade_flags ();
1183 bool bg_set_tint (rxvt_color &new_tint); 1160 bool bg_set_tint (rxvt_color &new_tint);
1184 bool bg_set_shade (const char *shade_str); 1161 bool bg_set_shade (const char *shade_str);
1185 bool bg_set_blur (const char *geom); 1162 bool bg_set_blur (const char *geom);
1186 1163
1187 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1164 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
1188 bool tint_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);
1189 unsigned long make_transparency_pixmap (); 1167 unsigned long make_transparency_pixmap ();
1190# endif 1168# endif
1191 1169
1192 double bg_valid_since; 1170 ev_tstamp bg_valid_since;
1193 1171
1194 Pixmap bg_pixmap; 1172 Pixmap bg_pixmap;
1195 unsigned int bg_pmap_width, bg_pmap_height; 1173 unsigned int bg_pmap_width, bg_pmap_height;
1196 1174
1197 int target_x; 1175 int target_x;
… …
1237 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1215 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1238#endif 1216#endif
1239 1217
1240 vector<void *> allocated; // free these memory blocks with free() 1218 vector<void *> allocated; // free these memory blocks with free()
1241 1219
1242 char env_windowid[21]; /* environmental variable WINDOWID */
1243 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1244 char *env_display; /* environmental variable DISPLAY */
1245 char *env_term; /* environmental variable TERM */
1246
1247 char *locale; 1220 char *locale;
1248 char charsets[4]; 1221 char charsets[4];
1249 char *v_buffer; /* pointer to physical buffer */ 1222 char *v_buffer; /* pointer to physical buffer */
1250 unsigned int v_buflen; /* size of area to write */ 1223 unsigned int v_buflen; /* size of area to write */
1251 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1224 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1304 void child_cb (ev::child &w, int revents); ev::child child_ev; 1277 void child_cb (ev::child &w, int revents); ev::child child_ev;
1305 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1278 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1306 void refresh_check (); 1279 void refresh_check ();
1307 void flush (); 1280 void flush ();
1308 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1281 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1282 void cmdbuf_reify ();
1283 void cmdbuf_append (const char *str, size_t count);
1309 bool pty_fill (); 1284 bool pty_fill ();
1310 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1285 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1311 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1312 1286
1313#ifdef CURSOR_BLINK 1287#ifdef CURSOR_BLINK
1314 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1288 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1315#endif 1289#endif
1316#ifdef TEXT_BLINK 1290#ifdef TEXT_BLINK
… …
1337 void pointer_unblank (); 1311 void pointer_unblank ();
1338 1312
1339 void tt_printf (const char *fmt,...); 1313 void tt_printf (const char *fmt,...);
1340 void tt_write (const char *data, unsigned int len); 1314 void tt_write (const char *data, unsigned int len);
1341 void pty_write (); 1315 void pty_write ();
1342
1343 void init (stringvec *argv, stringvec *envv)
1344 {
1345 this->argv = argv;
1346 init (argv->size (), argv->begin (), envv);
1347 }
1348 1316
1349 void make_current () const // make this the "currently active" urxvt instance 1317 void make_current () const // make this the "currently active" urxvt instance
1350 { 1318 {
1351 SET_R (this); 1319 SET_R (this);
1352 set_environ (envv); 1320 set_environ (envv);
… …
1364 void im_set_size (XRectangle &size); 1332 void im_set_size (XRectangle &size);
1365 void im_set_position (XPoint &pos) NOTHROW; 1333 void im_set_position (XPoint &pos) NOTHROW;
1366 void im_set_color (unsigned long &fg, unsigned long &bg); 1334 void im_set_color (unsigned long &fg, unsigned long &bg);
1367 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1335 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1368 1336
1369 bool IMisRunning (); 1337 bool im_is_running ();
1370 void IMSendSpot (); 1338 void im_send_spot ();
1371 bool IM_get_IC (const char *modifiers); 1339 bool im_get_ic (const char *modifiers);
1372 void IMSetPosition (); 1340 void im_set_position ();
1373#endif 1341#endif
1374 1342
1375 // command.C 1343 // command.C
1376 void key_press (XKeyEvent &ev); 1344 void key_press (XKeyEvent &ev);
1377 void key_release (XKeyEvent &ev); 1345 void key_release (XKeyEvent &ev);
1378 unsigned int cmd_write (const char *str, unsigned int count);
1379 1346
1380 wchar_t next_char () NOTHROW; 1347 wchar_t next_char () NOTHROW;
1381 wchar_t cmd_getc () THROW ((class out_of_input)); 1348 wchar_t cmd_getc () THROW ((class out_of_input));
1382 uint32_t next_octet () NOTHROW; 1349 uint32_t next_octet () NOTHROW;
1383 uint32_t cmd_get8 () THROW ((class out_of_input)); 1350 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1410 void process_color_seq (int report, int color, const char *str, char resp); 1377 void process_color_seq (int report, int color, const char *str, char resp);
1411 void process_xterm_seq (int op, char *str, char resp); 1378 void process_xterm_seq (int op, char *str, char resp);
1412 int privcases (int mode, unsigned long bit); 1379 int privcases (int mode, unsigned long bit);
1413 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1380 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1414 void process_sgr_mode (unsigned int nargs, const int *arg); 1381 void process_sgr_mode (unsigned int nargs, const int *arg);
1415 void process_graphics ();
1416 // init.C 1382 // init.C
1383 void init (stringvec *argv, stringvec *envv);
1384 void init (int argc, const char *const *argv, const char *const *envv);
1385 void init2 (int argc, const char *const *argv);
1417 void init_vars (); 1386 void init_vars ();
1418 const char **init_resources (int argc, const char *const *argv); 1387 const char **init_resources (int argc, const char *const *argv);
1419 void init (int argc, const char *const *argv, stringvec *envv);
1420 void init_env (); 1388 void init_env ();
1421 void set_locale (const char *locale); 1389 void set_locale (const char *locale);
1422 void init_xlocale (); 1390 void init_xlocale ();
1423 void init_command (const char *const *argv); 1391 void init_command (const char *const *argv);
1424 void run_command (const char *const *argv); 1392 void run_command (const char *const *argv);
… …
1442 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1410 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1443 void set_utf8_property (Atom prop, const char *str, int len = -1); 1411 void set_utf8_property (Atom prop, const char *str, int len = -1);
1444 void set_title (const char *str); 1412 void set_title (const char *str);
1445 void set_icon_name (const char *str); 1413 void set_icon_name (const char *str);
1446 void set_window_color (int idx, const char *color); 1414 void set_window_color (int idx, const char *color);
1447 void set_colorfgbg (); 1415 char *get_colorfgbg ();
1448 bool set_color (rxvt_color &color, const char *name); 1416 bool set_color (rxvt_color &color, const char *name);
1449 void alias_color (int dst, int src); 1417 void alias_color (int dst, int src);
1450 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1418 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1451 void get_window_origin (int &x, int &y); 1419 void get_window_origin (int &x, int &y);
1452 Pixmap get_pixmap_property (Atom property); 1420 Pixmap get_pixmap_property (Atom property);
… …
1487#ifndef NO_BRIGHTCOLOR 1455#ifndef NO_BRIGHTCOLOR
1488 if (r & RS_Bold 1456 if (r & RS_Bold
1489# if ENABLE_STYLES 1457# if ENABLE_STYLES
1490 && option (Opt_intensityStyles) 1458 && option (Opt_intensityStyles)
1491# endif 1459# endif
1492 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1460 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1493 base += minBrightCOLOR - minCOLOR; 1461 base += minBrightCOLOR - minCOLOR;
1494#endif 1462#endif
1495 return base; 1463 return base;
1496 } 1464 }
1497 1465
… …
1501#ifndef NO_BRIGHTCOLOR 1469#ifndef NO_BRIGHTCOLOR
1502 if (r & RS_Blink 1470 if (r & RS_Blink
1503# if ENABLE_STYLES 1471# if ENABLE_STYLES
1504 && option (Opt_intensityStyles) 1472 && option (Opt_intensityStyles)
1505# endif 1473# endif
1506 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1474 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1507 base += minBrightCOLOR - minCOLOR; 1475 base += minBrightCOLOR - minCOLOR;
1508#endif 1476#endif
1509 return base; 1477 return base;
1510 } 1478 }
1511 1479
… …
1513 { 1481 {
1514 return options[opt >> 3] & (1 << (opt & 7)); 1482 return options[opt >> 3] & (1 << (opt & 7));
1515 } 1483 }
1516 1484
1517 void set_option (uint8_t opt, bool set = true) NOTHROW; 1485 void set_option (uint8_t opt, bool set = true) NOTHROW;
1518
1519 void set_privmode (unsigned bit, int set) NOTHROW
1520 {
1521 if (set)
1522 priv_modes |= bit;
1523 else
1524 priv_modes &= ~bit;
1525 }
1526 1486
1527 // modifies first argument(!) 1487 // modifies first argument(!)
1528 void tt_paste (char *data, unsigned int len) NOTHROW; 1488 void tt_paste (char *data, unsigned int len) NOTHROW;
1529 void paste (char *data, unsigned int len) NOTHROW; 1489 void paste (char *data, unsigned int len) NOTHROW;
1530 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1490 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1587 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1547 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1588 void scr_reverse_selection () NOTHROW; 1548 void scr_reverse_selection () NOTHROW;
1589 void scr_dump (int fd) NOTHROW; 1549 void scr_dump (int fd) NOTHROW;
1590 1550
1591 void selection_check (int check_more) NOTHROW; 1551 void selection_check (int check_more) NOTHROW;
1592 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1593 void selection_property (Window win, Atom prop) NOTHROW;
1594 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1552 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1595 int selection_request_other (Atom target, int selnum) NOTHROW;
1596 void selection_clear (bool clipboard = false) NOTHROW; 1553 void selection_clear (bool clipboard = false) NOTHROW;
1597 void selection_make (Time tm); 1554 void selection_make (Time tm);
1598 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1555 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1599 void selection_start_colrow (int col, int row) NOTHROW; 1556 void selection_start_colrow (int col, int row) NOTHROW;
1600 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1557 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
… …
1604 void selection_click (int clicks, int x, int y) NOTHROW; 1561 void selection_click (int clicks, int x, int y) NOTHROW;
1605 void selection_extend (int x, int y, int flag) NOTHROW; 1562 void selection_extend (int x, int y, int flag) NOTHROW;
1606 void selection_rotate (int x, int y) NOTHROW; 1563 void selection_rotate (int x, int y) NOTHROW;
1607 1564
1608 // xdefaults.C 1565 // xdefaults.C
1609 void get_options (int argc, const char *const *argv); 1566 const char **get_options (int argc, const char *const *argv);
1610 int parse_keysym (const char *str, const char *arg); 1567 int parse_keysym (const char *str, const char *arg);
1611 const char *x_resource (const char *name); 1568 const char *x_resource (const char *name);
1612 void extract_resources (); 1569 void extract_resources ();
1570 void extract_keysym_resources ();
1613}; 1571};
1614 1572
1615#endif /* _RXVT_H_ */ 1573#endif /* _RXVT_H_ */
1616 1574

Diff Legend

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