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.422 by root, Thu Dec 16 23:03:50 2010 UTC vs.
Revision 1.458 by sf-exg, Sun Jan 1 17:43:47 2012 UTC

… …
27#else 27#else
28// stdlib.h might provide it 28// stdlib.h might provide it
29#endif 29#endif
30 30
31using namespace std; 31using namespace std;
32
33// we assume that Xlib.h defines XPointer, and it does since at least 1994...
32 34
33extern "C" { 35extern "C" {
34#include <X11/Xlib.h> 36#include <X11/Xlib.h>
35#include <X11/Xutil.h> 37#include <X11/Xutil.h>
36#include <X11/Xresource.h> 38#include <X11/Xresource.h>
… …
72#include <X11/cursorfont.h> 74#include <X11/cursorfont.h>
73#include <X11/keysym.h> 75#include <X11/keysym.h>
74#include <X11/keysymdef.h> 76#include <X11/keysymdef.h>
75#include <X11/Xatom.h> 77#include <X11/Xatom.h>
76 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
77#include "encoding.h" 93#include "encoding.h"
78#include "rxvtutil.h" 94#include "rxvtutil.h"
79#include "rxvtfont.h" 95#include "rxvtfont.h"
80#include "rxvttoolkit.h" 96#include "rxvttoolkit.h"
81#include "scrollbar.h" 97#include "scrollbar.h"
… …
98 ***************************************************************************** 114 *****************************************************************************
99 * SYSTEM HACKS 115 * SYSTEM HACKS
100 ***************************************************************************** 116 *****************************************************************************
101 */ 117 */
102 118
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 119#include <termios.h>
108
109#include "background.h"
110 120
111#ifndef STDIN_FILENO 121#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 122# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 123# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 124# define STDERR_FILENO 2
115#endif 125#endif
116 126
117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 127#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 128# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 129# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 130#endif
125 131
126/****************************************************************************/ 132/****************************************************************************/
127 133
128// exception thrown on fatal (per-instance) errors 134// exception thrown on fatal (per-instance) errors
… …
151 157
152const char * rxvt_basename (const char *str) NOTHROW; 158const char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 159void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 160void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 161void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 162void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 163void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
158 164
159char * rxvt_strtrim (char *str) NOTHROW; 165char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 166char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 167
168static inline void
169rxvt_free_strsplit (char **ptr) NOTHROW
170{
171 free (ptr[0]);
172 free (ptr);
173}
162 174
163void * rxvt_malloc (size_t size); 175void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 176void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 177void * rxvt_realloc (void *ptr, size_t size);
166 178
… …
292# define NSCREENS 0 304# define NSCREENS 0
293#else 305#else
294# define NSCREENS 1 306# define NSCREENS 1
295#endif 307#endif
296 308
297/* special (internal) prefix for font commands */
298#define FONT_CMD '#'
299#define FONT_DN "#-"
300#define FONT_UP "#+"
301
302/* flags for rxvt_scr_gotorc () */ 309/* flags for rxvt_term::scr_gotorc () */
303enum { 310enum {
304 C_RELATIVE = 1, /* col movement is relative */ 311 C_RELATIVE = 1, /* col movement is relative */
305 R_RELATIVE = 2, /* row movement is relative */ 312 R_RELATIVE = 2, /* row movement is relative */
306 RELATIVE = C_RELATIVE | R_RELATIVE, 313 RELATIVE = C_RELATIVE | R_RELATIVE,
307}; 314};
308 315
309/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 316/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
310enum { 317enum {
311 INSERT = -1, /* don't change these values */ 318 INSERT = -1, /* don't change these values */
312 DELETE = +1, 319 DELETE = +1,
313 ERASE = +2, 320 ERASE = +2,
314}; 321};
315 322
316/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 323/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
317enum page_dirn { 324enum page_dirn {
318 UP, 325 UP,
319 DN, 326 DN,
320 NO_DIR, 327 NO_DIR,
321}; 328};
322 329
323/* arguments for rxvt_scr_change_screen () */ 330/* arguments for rxvt_term::scr_change_screen () */
324enum { 331enum {
325 PRIMARY = 0, 332 PRIMARY = 0,
326 SECONDARY, 333 SECONDARY,
327}; 334};
328 335
… …
370#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)
371#define RS_attrMask (RS_baseattrMask | RS_fontMask) 378#define RS_attrMask (RS_baseattrMask | RS_fontMask)
372 379
373#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))
374#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))
375
376#define Sel_none 0 /* Not waiting */
377#define Sel_normal 0x01 /* normal selection */
378#define Sel_incr 0x02 /* incremental selection */
379#define Sel_direct 0x00
380#define Sel_Primary 0x01
381#define Sel_Secondary 0x02
382#define Sel_Clipboard 0x03
383#define Sel_whereMask 0x0f
384#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
385#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
386 382
387enum { 383enum {
388 C0_NUL = 0x00, 384 C0_NUL = 0x00,
389 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,
390 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 ,
… …
671 667
672#define GET_ATTR(x) (((x) & RS_attrMask)) 668#define GET_ATTR(x) (((x) & RS_attrMask))
673// return attributes defining the background, encoding doesn't matter 669// return attributes defining the background, encoding doesn't matter
674// depends on RS_fgShift > RS_bgShift 670// depends on RS_fgShift > RS_bgShift
675#define GET_BGATTR(x) \ 671#define GET_BGATTR(x) \
676 (expect_false ((x) & RS_RVid) \ 672 (ecb_unlikely ((x) & RS_RVid) \
677 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 673 ? (((x) & (RS_attrMask & ~RS_RVid)) \
678 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 674 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
679 : ((x) & (RS_attrMask | RS_bgMask))) 675 : ((x) & (RS_attrMask | RS_bgMask)))
680#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 676#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
681#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 677#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
892 int saveLines; /* number of lines that fit in scrollback */ 888 int saveLines; /* number of lines that fit in scrollback */
893 int total_rows; /* total number of rows in this terminal */ 889 int total_rows; /* total number of rows in this terminal */
894 int term_start; /* term lines start here */ 890 int term_start; /* term lines start here */
895 int view_start; /* scrollback view starts here */ 891 int view_start; /* scrollback view starts here */
896 int top_row; /* topmost row index of scrollback */ 892 int top_row; /* topmost row index of scrollback */
897 Window parent[6]; /* parent identifiers - we're parent[0] */ 893 Window parent; /* parent identifier */
898 Window vt; /* vt100 window */ 894 Window vt; /* vt100 window */
899 GC gc; /* GC for drawing */ 895 GC gc; /* GC for drawing */
900 Pixmap pixmap; 896 Pixmap pixmap;
901 rxvt_drawable *drawable; 897 rxvt_drawable *drawable;
902 rxvt_fontset *fontset[4]; 898 rxvt_fontset *fontset[4];
… …
985 scrollBar_t scrollBar; 981 scrollBar_t scrollBar;
986 uint8_t options[(Opt_count + 7) >> 3]; 982 uint8_t options[(Opt_count + 7) >> 3];
987 XSizeHints szHint; 983 XSizeHints szHint;
988 rxvt_color *pix_colors; 984 rxvt_color *pix_colors;
989 Cursor TermWin_cursor; /* cursor for vt window */ 985 Cursor TermWin_cursor; /* cursor for vt window */
990 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 986 line_t *row_buf; // all lines, scrollback + terminal, circular
991 line_t *drawn_buf; // text on screen 987 line_t *drawn_buf; // text on screen
992 line_t *swap_buf; // lines for swap buffer 988 line_t *swap_buf; // lines for swap buffer
993 char *tabs; /* per location: 1 == tab-stop */ 989 char *tabs; /* per location: 1 == tab-stop */
994 screen_t screen; 990 screen_t screen;
995 screen_t swap; 991 screen_t swap;
… …
1036 seen_resize:1, /* whether we had a resize event */ 1032 seen_resize:1, /* whether we had a resize event */
1037 parsed_geometry:1; 1033 parsed_geometry:1;
1038 1034
1039 unsigned char refresh_type, 1035 unsigned char refresh_type,
1040#ifdef META8_OPTION 1036#ifdef META8_OPTION
1041 meta_char, /* Alt-key prefix */ 1037 meta_char; /* Alt-key prefix */
1042#endif 1038#endif
1043 selection_wait,
1044 selection_type;
1045/* ---------- */ 1039/* ---------- */
1046 bool rvideo_state, rvideo_mode; 1040 bool rvideo_state, rvideo_mode;
1047#ifndef NO_BELL 1041#ifndef NO_BELL
1048 bool rvideo_bell; 1042 bool rvideo_bell;
1049#endif 1043#endif
… …
1085 SavedModes; 1079 SavedModes;
1086/* ---------- */ 1080/* ---------- */
1087 Atom *xa; 1081 Atom *xa;
1088/* ---------- */ 1082/* ---------- */
1089 Time selection_time, 1083 Time selection_time,
1090 selection_request_time,
1091 clipboard_time; 1084 clipboard_time;
1085 rxvt_selection *selection_req;
1092 pid_t cmd_pid; /* process id of child */ 1086 pid_t cmd_pid; /* process id of child */
1093 char * incr_buf;
1094 size_t incr_buf_size, incr_buf_fill;
1095/* ---------- */ 1087/* ---------- */
1096 struct mouse_event MEvent; 1088 struct mouse_event MEvent;
1097 XComposeStatus compose; 1089 XComposeStatus compose;
1098 static struct termios def_tio; 1090 static struct termios def_tio;
1099 row_col_t oldcursor; 1091 row_col_t oldcursor;
1100#ifdef HAVE_BG_PIXMAP 1092#ifdef HAVE_BG_PIXMAP
1101 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 }
1102#endif 1186#endif
1103#ifdef HAVE_AFTERIMAGE 1187#ifdef HAVE_AFTERIMAGE
1188 ASImage *original_asim;
1104 ASVisual *asv; 1189 ASVisual *asv;
1105 ASImageManager *asimman; 1190 ASImageManager *asimman;
1106 1191
1107 void init_asv () 1192 void init_asv ()
1108 { 1193 {
1109 if (!asv) 1194 if (!asv)
1110 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);
1111 } 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);
1112#endif 1203#endif
1113 1204
1114#if ENABLE_OVERLAY 1205#if ENABLE_OVERLAY
1115 overlay_base ov; 1206 overlay_base ov;
1116 1207
… …
1191 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;
1192 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;
1193 void refresh_check (); 1284 void refresh_check ();
1194 void flush (); 1285 void flush ();
1195 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);
1196 bool pty_fill (); 1289 bool pty_fill ();
1197 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;
1198 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1199 1291
1200#ifdef CURSOR_BLINK 1292#ifdef CURSOR_BLINK
1201 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;
1202#endif 1294#endif
1203#ifdef TEXT_BLINK 1295#ifdef TEXT_BLINK
… …
1224 void pointer_unblank (); 1316 void pointer_unblank ();
1225 1317
1226 void tt_printf (const char *fmt,...); 1318 void tt_printf (const char *fmt,...);
1227 void tt_write (const char *data, unsigned int len); 1319 void tt_write (const char *data, unsigned int len);
1228 void pty_write (); 1320 void pty_write ();
1229
1230 void init (stringvec *argv, stringvec *envv)
1231 {
1232 this->argv = argv;
1233 init (argv->size (), argv->begin (), envv);
1234 }
1235 1321
1236 void make_current () const // make this the "currently active" urxvt instance 1322 void make_current () const // make this the "currently active" urxvt instance
1237 { 1323 {
1238 SET_R (this); 1324 SET_R (this);
1239 set_environ (envv); 1325 set_environ (envv);
… …
1251 void im_set_size (XRectangle &size); 1337 void im_set_size (XRectangle &size);
1252 void im_set_position (XPoint &pos) NOTHROW; 1338 void im_set_position (XPoint &pos) NOTHROW;
1253 void im_set_color (unsigned long &fg, unsigned long &bg); 1339 void im_set_color (unsigned long &fg, unsigned long &bg);
1254 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);
1255 1341
1256 bool IMisRunning (); 1342 bool im_is_running ();
1257 void IMSendSpot (); 1343 void im_send_spot ();
1258 bool IM_get_IC (const char *modifiers); 1344 bool im_get_ic (const char *modifiers);
1259 void IMSetPosition (); 1345 void im_set_position ();
1260#endif 1346#endif
1261 1347
1262 // command.C 1348 // command.C
1263 void key_press (XKeyEvent &ev); 1349 void key_press (XKeyEvent &ev);
1264 void key_release (XKeyEvent &ev); 1350 void key_release (XKeyEvent &ev);
1265 unsigned int cmd_write (const char *str, unsigned int count);
1266 1351
1267 wchar_t next_char () NOTHROW; 1352 wchar_t next_char () NOTHROW;
1268 wchar_t cmd_getc () THROW ((class out_of_input)); 1353 wchar_t cmd_getc () THROW ((class out_of_input));
1269 uint32_t next_octet () NOTHROW; 1354 uint32_t next_octet () NOTHROW;
1270 uint32_t cmd_get8 () THROW ((class out_of_input)); 1355 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1297 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);
1298 void process_xterm_seq (int op, char *str, char resp); 1383 void process_xterm_seq (int op, char *str, char resp);
1299 int privcases (int mode, unsigned long bit); 1384 int privcases (int mode, unsigned long bit);
1300 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);
1301 void process_sgr_mode (unsigned int nargs, const int *arg); 1386 void process_sgr_mode (unsigned int nargs, const int *arg);
1302 void process_graphics ();
1303 // 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);
1304 void init_vars (); 1391 void init_vars ();
1305 const char **init_resources (int argc, const char *const *argv); 1392 const char **init_resources (int argc, const char *const *argv);
1306 void init (int argc, const char *const *argv, stringvec *envv);
1307 void init_env (); 1393 void init_env ();
1308 void set_locale (const char *locale); 1394 void set_locale (const char *locale);
1309 void init_xlocale (); 1395 void init_xlocale ();
1310 void init_command (const char *const *argv); 1396 void init_command (const char *const *argv);
1311 void run_command (const char *const *argv); 1397 void run_command (const char *const *argv);
… …
1334 void set_colorfgbg (); 1420 void set_colorfgbg ();
1335 bool set_color (rxvt_color &color, const char *name); 1421 bool set_color (rxvt_color &color, const char *name);
1336 void alias_color (int dst, int src); 1422 void alias_color (int dst, int src);
1337 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1423 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1338 void get_window_origin (int &x, int &y); 1424 void get_window_origin (int &x, int &y);
1339 Pixmap get_pixmap_property (int prop_id); 1425 Pixmap get_pixmap_property (Atom property);
1340 1426
1341 // screen.C 1427 // screen.C
1342 1428
1343 void lalloc (line_t &l) const 1429 void lalloc (line_t &l) const
1344 { 1430 {
… …
1374#ifndef NO_BRIGHTCOLOR 1460#ifndef NO_BRIGHTCOLOR
1375 if (r & RS_Bold 1461 if (r & RS_Bold
1376# if ENABLE_STYLES 1462# if ENABLE_STYLES
1377 && option (Opt_intensityStyles) 1463 && option (Opt_intensityStyles)
1378# endif 1464# endif
1379 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1465 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1380 base += minBrightCOLOR - minCOLOR; 1466 base += minBrightCOLOR - minCOLOR;
1381#endif 1467#endif
1382 return base; 1468 return base;
1383 } 1469 }
1384 1470
… …
1388#ifndef NO_BRIGHTCOLOR 1474#ifndef NO_BRIGHTCOLOR
1389 if (r & RS_Blink 1475 if (r & RS_Blink
1390# if ENABLE_STYLES 1476# if ENABLE_STYLES
1391 && option (Opt_intensityStyles) 1477 && option (Opt_intensityStyles)
1392# endif 1478# endif
1393 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1479 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1394 base += minBrightCOLOR - minCOLOR; 1480 base += minBrightCOLOR - minCOLOR;
1395#endif 1481#endif
1396 return base; 1482 return base;
1397 } 1483 }
1398 1484
… …
1400 { 1486 {
1401 return options[opt >> 3] & (1 << (opt & 7)); 1487 return options[opt >> 3] & (1 << (opt & 7));
1402 } 1488 }
1403 1489
1404 void set_option (uint8_t opt, bool set = true) NOTHROW; 1490 void set_option (uint8_t opt, bool set = true) NOTHROW;
1405
1406 void set_privmode (unsigned bit, int set) NOTHROW
1407 {
1408 if (set)
1409 priv_modes |= bit;
1410 else
1411 priv_modes &= ~bit;
1412 }
1413 1491
1414 // modifies first argument(!) 1492 // modifies first argument(!)
1415 void tt_paste (char *data, unsigned int len) NOTHROW; 1493 void tt_paste (char *data, unsigned int len) NOTHROW;
1416 void paste (char *data, unsigned int len) NOTHROW; 1494 void paste (char *data, unsigned int len) NOTHROW;
1417 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;
… …
1429 void scr_backindex () NOTHROW; 1507 void scr_backindex () NOTHROW;
1430 void scr_forwardindex () NOTHROW; 1508 void scr_forwardindex () NOTHROW;
1431#endif 1509#endif
1432 void scr_touch (bool refresh) NOTHROW; 1510 void scr_touch (bool refresh) NOTHROW;
1433 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;
1434 void scr_recolour () NOTHROW; 1512 void scr_recolour (bool refresh = true) NOTHROW;
1435 void scr_remap_chars () NOTHROW; 1513 void scr_remap_chars () NOTHROW;
1436 void scr_remap_chars (line_t &l) NOTHROW; 1514 void scr_remap_chars (line_t &l) NOTHROW;
1437 1515
1438 enum cursor_mode { SAVE, RESTORE }; 1516 enum cursor_mode { SAVE, RESTORE };
1439 1517
… …
1474 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;
1475 void scr_reverse_selection () NOTHROW; 1553 void scr_reverse_selection () NOTHROW;
1476 void scr_dump (int fd) NOTHROW; 1554 void scr_dump (int fd) NOTHROW;
1477 1555
1478 void selection_check (int check_more) NOTHROW; 1556 void selection_check (int check_more) NOTHROW;
1479 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1480 void selection_property (Window win, Atom prop) NOTHROW;
1481 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1557 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1482 int selection_request_other (Atom target, int selnum) NOTHROW;
1483 void selection_clear (bool clipboard = false) NOTHROW; 1558 void selection_clear (bool clipboard = false) NOTHROW;
1484 void selection_make (Time tm); 1559 void selection_make (Time tm);
1485 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1560 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1486 void selection_start_colrow (int col, int row) NOTHROW; 1561 void selection_start_colrow (int col, int row) NOTHROW;
1487 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;
… …
1491 void selection_click (int clicks, int x, int y) NOTHROW; 1566 void selection_click (int clicks, int x, int y) NOTHROW;
1492 void selection_extend (int x, int y, int flag) NOTHROW; 1567 void selection_extend (int x, int y, int flag) NOTHROW;
1493 void selection_rotate (int x, int y) NOTHROW; 1568 void selection_rotate (int x, int y) NOTHROW;
1494 1569
1495 // xdefaults.C 1570 // xdefaults.C
1496 void get_options (int argc, const char *const *argv); 1571 const char **get_options (int argc, const char *const *argv);
1497 int parse_keysym (const char *str, const char *arg); 1572 int parse_keysym (const char *str, const char *arg);
1498 const char *x_resource (const char *name); 1573 const char *x_resource (const char *name);
1499 void extract_resources (); 1574 void extract_resources ();
1575 void extract_keysym_resources ();
1500}; 1576};
1501 1577
1502#endif /* _RXVT_H_ */ 1578#endif /* _RXVT_H_ */
1503 1579

Diff Legend

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