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.440 by sf-exg, Tue Apr 26 16:19:45 2011 UTC vs.
Revision 1.474 by sf-exg, Sun May 13 21:12:01 2012 UTC

1#ifndef RXVT_H_ /* include once only */ 1#ifndef RXVT_H_ /* include once only */
2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include <cstdio> 4#include <stdio.h>
5#include <cctype> 5#include <ctype.h>
6#include <cerrno> 6#include <errno.h>
7#include <cstdarg> 7#include <stdarg.h>
8#include <cstdlib> 8#include <stdlib.h>
9#ifdef HAVE_STDINT_H 9#ifdef HAVE_STDINT_H
10#include <stdint.h> 10#include <stdint.h>
11#endif 11#endif
12#include <sys/types.h> 12#include <sys/types.h>
13#include <unistd.h> 13#include <unistd.h>
14#include <cstring> 14#include <string.h>
15#include <assert.h> 15#include <assert.h>
16#ifdef HAVE_SYS_IOCTL_H 16#ifdef HAVE_SYS_IOCTL_H
17#include <sys/ioctl.h> 17#include <sys/ioctl.h>
18#endif 18#endif
19#ifdef HAVE_SYS_STRREDIR_H 19#ifdef HAVE_SYS_STRREDIR_H
20#include <sys/strredir.h> 20#include <sys/strredir.h>
21#endif 21#endif
22 22
23#if HAVE_CWCHAR
24# include <cwchar>
25#elif HAVE_WCHAR_H 23#if HAVE_WCHAR_H
26# include <wchar.h> 24# include <wchar.h>
27#else 25#else
28// stdlib.h might provide it 26// stdlib.h might provide it
29#endif 27#endif
30
31using namespace std;
32 28
33// we assume that Xlib.h defines XPointer, and it does since at least 1994... 29// we assume that Xlib.h defines XPointer, and it does since at least 1994...
34 30
35extern "C" { 31extern "C" {
36#include <X11/Xlib.h> 32#include <X11/Xlib.h>
… …
74#include <X11/cursorfont.h> 70#include <X11/cursorfont.h>
75#include <X11/keysym.h> 71#include <X11/keysym.h>
76#include <X11/keysymdef.h> 72#include <X11/keysymdef.h>
77#include <X11/Xatom.h> 73#include <X11/Xatom.h>
78 74
79#ifdef HAVE_AFTERIMAGE
80# include <afterimage.h>
81# undef min
82# undef max
83#endif
84
85#ifdef HAVE_PIXBUF 75#ifdef HAVE_PIXBUF
86# include <gdk-pixbuf/gdk-pixbuf.h> 76# include <gdk-pixbuf/gdk-pixbuf.h>
87#endif 77#endif
88 78
89#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
… …
125#endif 115#endif
126 116
127#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
128# define EXIT_SUCCESS 0 /* exit function success */ 118# define EXIT_SUCCESS 0 /* exit function success */
129# define EXIT_FAILURE 1 /* exit function failure */ 119# define EXIT_FAILURE 1 /* exit function failure */
130#endif
131
132#ifndef PATH_MAX
133# define PATH_MAX 16384
134#endif 120#endif
135 121
136/****************************************************************************/ 122/****************************************************************************/
137 123
138// exception thrown on fatal (per-instance) errors 124// exception thrown on fatal (per-instance) errors
… …
161 147
162const char * rxvt_basename (const char *str) NOTHROW; 148const char * rxvt_basename (const char *str) NOTHROW;
163void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 149void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
164void rxvt_log (const char *fmt,...) NOTHROW; 150void rxvt_log (const char *fmt,...) NOTHROW;
165void rxvt_warn (const char *fmt,...) NOTHROW; 151void rxvt_warn (const char *fmt,...) NOTHROW;
166void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 152void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
167void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 153void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
168 154
169char * rxvt_strtrim (char *str) NOTHROW; 155char * rxvt_strtrim (char *str) NOTHROW;
170char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 156char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
171 157
172static inline void 158static inline void
… …
307#ifdef NO_SECONDARY_SCREEN 293#ifdef NO_SECONDARY_SCREEN
308# define NSCREENS 0 294# define NSCREENS 0
309#else 295#else
310# define NSCREENS 1 296# define NSCREENS 1
311#endif 297#endif
312
313/* special (internal) prefix for font commands */
314#define FONT_CMD '#'
315#define FONT_DN "#-"
316#define FONT_UP "#+"
317 298
318/* flags for rxvt_term::scr_gotorc () */ 299/* flags for rxvt_term::scr_gotorc () */
319enum { 300enum {
320 C_RELATIVE = 1, /* col movement is relative */ 301 C_RELATIVE = 1, /* col movement is relative */
321 R_RELATIVE = 2, /* row movement is relative */ 302 R_RELATIVE = 2, /* row movement is relative */
… …
676 657
677#define GET_ATTR(x) (((x) & RS_attrMask)) 658#define GET_ATTR(x) (((x) & RS_attrMask))
678// return attributes defining the background, encoding doesn't matter 659// return attributes defining the background, encoding doesn't matter
679// depends on RS_fgShift > RS_bgShift 660// depends on RS_fgShift > RS_bgShift
680#define GET_BGATTR(x) \ 661#define GET_BGATTR(x) \
681 (expect_false ((x) & RS_RVid) \ 662 (ecb_unlikely ((x) & RS_RVid) \
682 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 663 ? (((x) & (RS_attrMask & ~RS_RVid)) \
683 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 664 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
684 : ((x) & (RS_attrMask | RS_bgMask))) 665 : ((x) & (RS_attrMask | RS_bgMask)))
685#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 666#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
686#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 667#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
879 * END······················= total_rows 860 * END······················= total_rows
880 */ 861 */
881 862
882struct TermWin_t 863struct TermWin_t
883{ 864{
865 int vt_width; /* actual window width [pixels] */
866 int vt_height; /* actual window height [pixels] */
884 int width; /* window width [pixels] */ 867 int width; /* window width [pixels] */
885 int height; /* window height [pixels] */ 868 int height; /* window height [pixels] */
886 int fwidth; /* font width [pixels] */ 869 int fwidth; /* font width [pixels] */
887 int fheight; /* font height [pixels] */ 870 int fheight; /* font height [pixels] */
888 int fbase; /* font ascent (baseline) [pixels] */ 871 int fbase; /* font ascent (baseline) [pixels] */
… …
900 int view_start; /* scrollback view starts here */ 883 int view_start; /* scrollback view starts here */
901 int top_row; /* topmost row index of scrollback */ 884 int top_row; /* topmost row index of scrollback */
902 Window parent; /* parent identifier */ 885 Window parent; /* parent identifier */
903 Window vt; /* vt100 window */ 886 Window vt; /* vt100 window */
904 GC gc; /* GC for drawing */ 887 GC gc; /* GC for drawing */
905 Pixmap pixmap;
906 rxvt_drawable *drawable; 888 rxvt_drawable *drawable;
907 rxvt_fontset *fontset[4]; 889 rxvt_fontset *fontset[4];
908}; 890};
909 891
910/* 892/*
… …
990 scrollBar_t scrollBar; 972 scrollBar_t scrollBar;
991 uint8_t options[(Opt_count + 7) >> 3]; 973 uint8_t options[(Opt_count + 7) >> 3];
992 XSizeHints szHint; 974 XSizeHints szHint;
993 rxvt_color *pix_colors; 975 rxvt_color *pix_colors;
994 Cursor TermWin_cursor; /* cursor for vt window */ 976 Cursor TermWin_cursor; /* cursor for vt window */
995 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 977 line_t *row_buf; // all lines, scrollback + terminal, circular
996 line_t *drawn_buf; // text on screen 978 line_t *drawn_buf; // text on screen
997 line_t *swap_buf; // lines for swap buffer 979 line_t *swap_buf; // lines for swap buffer
998 char *tabs; /* per location: 1 == tab-stop */ 980 char *tabs; /* per location: 1 == tab-stop */
999 screen_t screen; 981 screen_t screen;
1000 screen_t swap; 982 screen_t swap;
… …
1037 hidden_pointer:1, 1019 hidden_pointer:1,
1038#endif 1020#endif
1039 enc_utf8:1, /* whether locale uses utf-8 */ 1021 enc_utf8:1, /* whether locale uses utf-8 */
1040 seen_input:1, /* whether we have seen some program output yet */ 1022 seen_input:1, /* whether we have seen some program output yet */
1041 seen_resize:1, /* whether we had a resize event */ 1023 seen_resize:1, /* whether we had a resize event */
1024 init_done:1,
1042 parsed_geometry:1; 1025 parsed_geometry:1;
1043 1026
1044 unsigned char refresh_type, 1027 unsigned char refresh_type,
1045#ifdef META8_OPTION 1028#ifdef META8_OPTION
1046 meta_char; /* Alt-key prefix */ 1029 meta_char; /* Alt-key prefix */
… …
1080 allowedxerror; 1063 allowedxerror;
1081/* ---------- */ 1064/* ---------- */
1082 unsigned int ModLevel3Mask, 1065 unsigned int ModLevel3Mask,
1083 ModMetaMask, 1066 ModMetaMask,
1084 ModNumLockMask; 1067 ModNumLockMask;
1085 int old_width, /* last used width in screen resize */
1086 old_height; /* last used height in screen resize */
1087 unsigned long priv_modes, 1068 unsigned long priv_modes,
1088 SavedModes; 1069 SavedModes;
1089/* ---------- */ 1070/* ---------- */
1090 Atom *xa; 1071 Atom *xa;
1091/* ---------- */ 1072/* ---------- */
… …
1101#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1102 void bg_init (); 1083 void bg_init ();
1103 void bg_destroy (); 1084 void bg_destroy ();
1104 1085
1105 enum { 1086 enum {
1106 //subset returned by make_transparency_pixmap
1107 BG_IS_VALID = 1 << 0, 1087 BG_IS_VALID = 1 << 0,
1108 BG_NEEDS_TINT = 1 << 1,
1109 BG_NEEDS_BLUR = 1 << 2,
1110 1088
1111 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1112
1113 BG_PROP_SCALE = 1 << 3, 1089 BG_KEEP_ASPECT = 1 << 3,
1114 BG_ROOT_ALIGN = 1 << 4, 1090 BG_ROOT_ALIGN = 1 << 4,
1091 BG_TILE = 1 << 14,
1115 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN, 1092 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1116 1093
1117 BG_TINT_SET = 1 << 5, 1094 BG_TINT_SET = 1 << 5,
1118 BG_TINT_BITAND = 1 << 6, 1095 BG_TINT_BITAND = 1 << 6,
1119 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1120 1096
1121 BG_HAS_RENDER = 1 << 7, 1097 BG_HAS_RENDER = 1 << 7,
1122 BG_HAS_RENDER_CONV = 1 << 8, 1098 BG_HAS_RENDER_CONV = 1 << 8,
1123 BG_CLIENT_RENDER = 1 << 9, 1099 BG_CLIENT_RENDER = 1 << 9,
1124 1100
… …
1130 1106
1131 unsigned int bg_flags; 1107 unsigned int bg_flags;
1132 1108
1133# ifdef BG_IMAGE_FROM_FILE 1109# ifdef BG_IMAGE_FROM_FILE
1134 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y); 1110 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
1135 bool render_image (unsigned long tr_flags); 1111 bool render_image (bool transparent);
1136 1112
1137 enum { 1113 enum {
1138 noScale = 0, 1114 noScale = 0,
1139 windowScale = 100, 1115 windowScale = 100,
1140 defaultScale = windowScale, 1116 defaultScale = windowScale,
… …
1160 Pixmap root_pixmap; /* current root pixmap set */ 1136 Pixmap root_pixmap; /* current root pixmap set */
1161 rxvt_color tint; 1137 rxvt_color tint;
1162 int shade; 1138 int shade;
1163 int h_blurRadius, v_blurRadius; 1139 int h_blurRadius, v_blurRadius;
1164 1140
1165 bool bg_set_transparent (); 1141 void bg_set_transparent ()
1142 {
1143 bg_flags |= BG_IS_TRANSPARENT;
1144 }
1166 void bg_set_root_pixmap (); 1145 void bg_set_root_pixmap ();
1167 void set_tint_shade_flags ();
1168 bool bg_set_tint (rxvt_color &new_tint); 1146 bool bg_set_tint (rxvt_color &new_tint);
1169 bool bg_set_shade (const char *shade_str); 1147 bool bg_set_shade (const char *shade_str);
1170 bool bg_set_blur (const char *geom); 1148 bool bg_set_blur (const char *geom);
1171 1149
1172 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1150 bool blur_pixmap (Pixmap pixmap, int width, int height);
1173 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1151 bool tint_pixmap (Pixmap pixmap, int width, int height);
1152 void tint_ximage (XImage *ximage);
1174 unsigned long make_transparency_pixmap (); 1153 bool make_transparency_pixmap ();
1175# endif 1154# endif
1176 1155
1177 ev_tstamp bg_valid_since; 1156 ev_tstamp bg_valid_since;
1178 1157
1179 Pixmap bg_pixmap; 1158 Pixmap bg_pixmap;
… …
1187 1166
1188 bool bg_render (); 1167 bool bg_render ();
1189 void bg_invalidate () 1168 void bg_invalidate ()
1190 { 1169 {
1191 bg_flags &= ~BG_IS_VALID; 1170 bg_flags &= ~BG_IS_VALID;
1192 }
1193#endif
1194#ifdef HAVE_AFTERIMAGE
1195 ASImage *original_asim;
1196 ASVisual *asv;
1197 ASImageManager *asimman;
1198
1199 void init_asv ()
1200 {
1201 if (!asv)
1202 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1203 } 1171 }
1204#endif 1172#endif
1205#ifdef HAVE_PIXBUF 1173#ifdef HAVE_PIXBUF
1206 GdkPixbuf *pixbuf; 1174 GdkPixbuf *pixbuf;
1207 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 1175 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
… …
1221 void scr_overlay_set (int x, int y, const char *s) NOTHROW; 1189 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1222 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1190 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1223#endif 1191#endif
1224 1192
1225 vector<void *> allocated; // free these memory blocks with free() 1193 vector<void *> allocated; // free these memory blocks with free()
1226
1227 char env_windowid[21]; /* environmental variable WINDOWID */
1228 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1229 char *env_display; /* environmental variable DISPLAY */
1230 char *env_term; /* environmental variable TERM */
1231 1194
1232 char *locale; 1195 char *locale;
1233 char charsets[4]; 1196 char charsets[4];
1234 char *v_buffer; /* pointer to physical buffer */ 1197 char *v_buffer; /* pointer to physical buffer */
1235 unsigned int v_buflen; /* size of area to write */ 1198 unsigned int v_buflen; /* size of area to write */
… …
1295 void cmdbuf_append (const char *str, size_t count); 1258 void cmdbuf_append (const char *str, size_t count);
1296 bool pty_fill (); 1259 bool pty_fill ();
1297 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1260 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1298 1261
1299#ifdef CURSOR_BLINK 1262#ifdef CURSOR_BLINK
1263 void cursor_blink_reset ();
1300 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1264 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1301#endif 1265#endif
1302#ifdef TEXT_BLINK 1266#ifdef TEXT_BLINK
1303 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1267 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1304#endif 1268#endif
… …
1323 void pointer_unblank (); 1287 void pointer_unblank ();
1324 1288
1325 void tt_printf (const char *fmt,...); 1289 void tt_printf (const char *fmt,...);
1326 void tt_write (const char *data, unsigned int len); 1290 void tt_write (const char *data, unsigned int len);
1327 void pty_write (); 1291 void pty_write ();
1328
1329 void init (stringvec *argv, stringvec *envv)
1330 {
1331 this->argv = argv;
1332 init (argv->size (), argv->begin (), envv);
1333 }
1334 1292
1335 void make_current () const // make this the "currently active" urxvt instance 1293 void make_current () const // make this the "currently active" urxvt instance
1336 { 1294 {
1337 SET_R (this); 1295 SET_R (this);
1338 set_environ (envv); 1296 set_environ (envv);
… …
1350 void im_set_size (XRectangle &size); 1308 void im_set_size (XRectangle &size);
1351 void im_set_position (XPoint &pos) NOTHROW; 1309 void im_set_position (XPoint &pos) NOTHROW;
1352 void im_set_color (unsigned long &fg, unsigned long &bg); 1310 void im_set_color (unsigned long &fg, unsigned long &bg);
1353 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1311 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1354 1312
1355 bool IMisRunning (); 1313 bool im_is_running ();
1356 void IMSendSpot (); 1314 void im_send_spot ();
1357 bool IM_get_IC (const char *modifiers); 1315 bool im_get_ic (const char *modifiers);
1358 void IMSetPosition (); 1316 void im_set_position ();
1359#endif 1317#endif
1360 1318
1361 // command.C 1319 // command.C
1362 void key_press (XKeyEvent &ev); 1320 void key_press (XKeyEvent &ev);
1363 void key_release (XKeyEvent &ev); 1321 void key_release (XKeyEvent &ev);
… …
1396 void process_xterm_seq (int op, char *str, char resp); 1354 void process_xterm_seq (int op, char *str, char resp);
1397 int privcases (int mode, unsigned long bit); 1355 int privcases (int mode, unsigned long bit);
1398 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1356 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1399 void process_sgr_mode (unsigned int nargs, const int *arg); 1357 void process_sgr_mode (unsigned int nargs, const int *arg);
1400 // init.C 1358 // init.C
1359 void init (stringvec *argv, stringvec *envv);
1360 void init (int argc, const char *const *argv, const char *const *envv);
1361 void init2 (int argc, const char *const *argv);
1401 void init_vars (); 1362 void init_vars ();
1402 const char **init_resources (int argc, const char *const *argv); 1363 const char **init_resources (int argc, const char *const *argv);
1403 void init (int argc, const char *const *argv, stringvec *envv);
1404 void init_env (); 1364 void init_env ();
1405 void set_locale (const char *locale); 1365 void set_locale (const char *locale);
1406 void init_xlocale (); 1366 void init_xlocale ();
1407 void init_command (const char *const *argv); 1367 void init_command (const char *const *argv);
1408 void run_command (const char *const *argv); 1368 void run_command (const char *const *argv);
… …
1426 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1386 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1427 void set_utf8_property (Atom prop, const char *str, int len = -1); 1387 void set_utf8_property (Atom prop, const char *str, int len = -1);
1428 void set_title (const char *str); 1388 void set_title (const char *str);
1429 void set_icon_name (const char *str); 1389 void set_icon_name (const char *str);
1430 void set_window_color (int idx, const char *color); 1390 void set_window_color (int idx, const char *color);
1431 void set_colorfgbg (); 1391 char *get_colorfgbg ();
1432 bool set_color (rxvt_color &color, const char *name); 1392 bool set_color (rxvt_color &color, const char *name);
1433 void alias_color (int dst, int src); 1393 void alias_color (int dst, int src);
1434 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1394 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1435 void get_window_origin (int &x, int &y); 1395 void get_window_origin (int &x, int &y);
1436 Pixmap get_pixmap_property (Atom property); 1396 Pixmap get_pixmap_property (Atom property);
… …
1471#ifndef NO_BRIGHTCOLOR 1431#ifndef NO_BRIGHTCOLOR
1472 if (r & RS_Bold 1432 if (r & RS_Bold
1473# if ENABLE_STYLES 1433# if ENABLE_STYLES
1474 && option (Opt_intensityStyles) 1434 && option (Opt_intensityStyles)
1475# endif 1435# endif
1476 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1436 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1477 base += minBrightCOLOR - minCOLOR; 1437 base += minBrightCOLOR - minCOLOR;
1478#endif 1438#endif
1479 return base; 1439 return base;
1480 } 1440 }
1481 1441
… …
1485#ifndef NO_BRIGHTCOLOR 1445#ifndef NO_BRIGHTCOLOR
1486 if (r & RS_Blink 1446 if (r & RS_Blink
1487# if ENABLE_STYLES 1447# if ENABLE_STYLES
1488 && option (Opt_intensityStyles) 1448 && option (Opt_intensityStyles)
1489# endif 1449# endif
1490 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1450 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1491 base += minBrightCOLOR - minCOLOR; 1451 base += minBrightCOLOR - minCOLOR;
1492#endif 1452#endif
1493 return base; 1453 return base;
1494 } 1454 }
1495 1455
… …
1497 { 1457 {
1498 return options[opt >> 3] & (1 << (opt & 7)); 1458 return options[opt >> 3] & (1 << (opt & 7));
1499 } 1459 }
1500 1460
1501 void set_option (uint8_t opt, bool set = true) NOTHROW; 1461 void set_option (uint8_t opt, bool set = true) NOTHROW;
1502
1503 void set_privmode (unsigned bit, int set) NOTHROW
1504 {
1505 if (set)
1506 priv_modes |= bit;
1507 else
1508 priv_modes &= ~bit;
1509 }
1510 1462
1511 // modifies first argument(!) 1463 // modifies first argument(!)
1512 void tt_paste (char *data, unsigned int len) NOTHROW; 1464 void tt_paste (char *data, unsigned int len) NOTHROW;
1513 void paste (char *data, unsigned int len) NOTHROW; 1465 void paste (char *data, unsigned int len) NOTHROW;
1514 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1466 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1585 void selection_click (int clicks, int x, int y) NOTHROW; 1537 void selection_click (int clicks, int x, int y) NOTHROW;
1586 void selection_extend (int x, int y, int flag) NOTHROW; 1538 void selection_extend (int x, int y, int flag) NOTHROW;
1587 void selection_rotate (int x, int y) NOTHROW; 1539 void selection_rotate (int x, int y) NOTHROW;
1588 1540
1589 // xdefaults.C 1541 // xdefaults.C
1590 void get_options (int argc, const char *const *argv); 1542 const char **get_options (int argc, const char *const *argv);
1591 int parse_keysym (const char *str, const char *arg); 1543 int parse_keysym (const char *str, const char *arg);
1592 const char *x_resource (const char *name); 1544 const char *x_resource (const char *name);
1593 void extract_resources (); 1545 void extract_resources ();
1546 void extract_keysym_resources ();
1594}; 1547};
1595 1548
1596#endif /* _RXVT_H_ */ 1549#endif /* _RXVT_H_ */
1597 1550

Diff Legend

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