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.417 by root, Tue Nov 23 22:58:09 2010 UTC vs.
Revision 1.444 by sf-exg, Fri Jul 8 20:54:31 2011 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
… …
189#else 201#else
190 if (envv) 202 if (envv)
191#endif 203#endif
192 environ = envv; 204 environ = envv;
193} 205}
206
207struct localise_env
208{
209 char **orig_env;
210
211 localise_env (char **new_env)
212 {
213 orig_env = environ;
214 environ = new_env;
215 }
216
217 ~localise_env ()
218 {
219 environ = orig_env;
220 }
221};
194 222
195/* 223/*
196 ***************************************************************************** 224 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 225 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 226 *****************************************************************************
… …
276# define NSCREENS 0 304# define NSCREENS 0
277#else 305#else
278# define NSCREENS 1 306# define NSCREENS 1
279#endif 307#endif
280 308
281/* special (internal) prefix for font commands */
282#define FONT_CMD '#'
283#define FONT_DN "#-"
284#define FONT_UP "#+"
285
286/* flags for rxvt_scr_gotorc () */ 309/* flags for rxvt_term::scr_gotorc () */
287enum { 310enum {
288 C_RELATIVE = 1, /* col movement is relative */ 311 C_RELATIVE = 1, /* col movement is relative */
289 R_RELATIVE = 2, /* row movement is relative */ 312 R_RELATIVE = 2, /* row movement is relative */
290 RELATIVE = C_RELATIVE | R_RELATIVE, 313 RELATIVE = C_RELATIVE | R_RELATIVE,
291}; 314};
292 315
293/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 316/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
294enum { 317enum {
295 INSERT = -1, /* don't change these values */ 318 INSERT = -1, /* don't change these values */
296 DELETE = +1, 319 DELETE = +1,
297 ERASE = +2, 320 ERASE = +2,
298}; 321};
299 322
300/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 323/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
301enum page_dirn { 324enum page_dirn {
302 UP, 325 UP,
303 DN, 326 DN,
304 NO_DIR, 327 NO_DIR,
305}; 328};
306 329
307/* arguments for rxvt_scr_change_screen () */ 330/* arguments for rxvt_term::scr_change_screen () */
308enum { 331enum {
309 PRIMARY = 0, 332 PRIMARY = 0,
310 SECONDARY, 333 SECONDARY,
311}; 334};
312 335
… …
354#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)
355#define RS_attrMask (RS_baseattrMask | RS_fontMask) 378#define RS_attrMask (RS_baseattrMask | RS_fontMask)
356 379
357#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))
358#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))
359
360#define Sel_none 0 /* Not waiting */
361#define Sel_normal 0x01 /* normal selection */
362#define Sel_incr 0x02 /* incremental selection */
363#define Sel_direct 0x00
364#define Sel_Primary 0x01
365#define Sel_Secondary 0x02
366#define Sel_Clipboard 0x03
367#define Sel_whereMask 0x0f
368#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
369#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
370 382
371enum { 383enum {
372 C0_NUL = 0x00, 384 C0_NUL = 0x00,
373 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,
374 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 ,
… …
655 667
656#define GET_ATTR(x) (((x) & RS_attrMask)) 668#define GET_ATTR(x) (((x) & RS_attrMask))
657// return attributes defining the background, encoding doesn't matter 669// return attributes defining the background, encoding doesn't matter
658// depends on RS_fgShift > RS_bgShift 670// depends on RS_fgShift > RS_bgShift
659#define GET_BGATTR(x) \ 671#define GET_BGATTR(x) \
660 (expect_false ((x) & RS_RVid) \ 672 (ecb_unlikely ((x) & RS_RVid) \
661 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 673 ? (((x) & (RS_attrMask & ~RS_RVid)) \
662 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 674 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
663 : ((x) & (RS_attrMask | RS_bgMask))) 675 : ((x) & (RS_attrMask | RS_bgMask)))
664#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 676#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
665#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 677#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
876 int saveLines; /* number of lines that fit in scrollback */ 888 int saveLines; /* number of lines that fit in scrollback */
877 int total_rows; /* total number of rows in this terminal */ 889 int total_rows; /* total number of rows in this terminal */
878 int term_start; /* term lines start here */ 890 int term_start; /* term lines start here */
879 int view_start; /* scrollback view starts here */ 891 int view_start; /* scrollback view starts here */
880 int top_row; /* topmost row index of scrollback */ 892 int top_row; /* topmost row index of scrollback */
881 Window parent[6]; /* parent identifiers - we're parent[0] */ 893 Window parent; /* parent identifier */
882 Window vt; /* vt100 window */ 894 Window vt; /* vt100 window */
883 GC gc; /* GC for drawing */ 895 GC gc; /* GC for drawing */
884 Pixmap pixmap; 896 Pixmap pixmap;
885 rxvt_drawable *drawable; 897 rxvt_drawable *drawable;
886 rxvt_fontset *fontset[4]; 898 rxvt_fontset *fontset[4];
… …
951#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 963#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
952#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 964#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
953 965
954/* rxvt_vars.options */ 966/* rxvt_vars.options */
955enum { 967enum {
956# define def(name,idx) Opt_ ## name = idx,
957# define nodef(name) Opt_ ## name = 0, 968# define def(name) Opt_ ## name,
969# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
970 Opt_0,
958# include "optinc.h" 971# include "optinc.h"
959# undef nodef 972# undef nodef
960# undef def 973# undef def
961Opt_count 974 Opt_count
962}; 975};
963 976
964/* ------------------------------------------------------------------------- */ 977/* ------------------------------------------------------------------------- */
965 978
966struct rxvt_vars : TermWin_t 979struct rxvt_vars : TermWin_t
… …
968 scrollBar_t scrollBar; 981 scrollBar_t scrollBar;
969 uint8_t options[(Opt_count + 7) >> 3]; 982 uint8_t options[(Opt_count + 7) >> 3];
970 XSizeHints szHint; 983 XSizeHints szHint;
971 rxvt_color *pix_colors; 984 rxvt_color *pix_colors;
972 Cursor TermWin_cursor; /* cursor for vt window */ 985 Cursor TermWin_cursor; /* cursor for vt window */
973 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 986 line_t *row_buf; // all lines, scrollback + terminal, circular
974 line_t *drawn_buf; // text on screen 987 line_t *drawn_buf; // text on screen
975 line_t *swap_buf; // lines for swap buffer 988 line_t *swap_buf; // lines for swap buffer
976 char *tabs; /* per location: 1 == tab-stop */ 989 char *tabs; /* per location: 1 == tab-stop */
977 screen_t screen; 990 screen_t screen;
978 screen_t swap; 991 screen_t swap;
… …
1019 seen_resize:1, /* whether we had a resize event */ 1032 seen_resize:1, /* whether we had a resize event */
1020 parsed_geometry:1; 1033 parsed_geometry:1;
1021 1034
1022 unsigned char refresh_type, 1035 unsigned char refresh_type,
1023#ifdef META8_OPTION 1036#ifdef META8_OPTION
1024 meta_char, /* Alt-key prefix */ 1037 meta_char; /* Alt-key prefix */
1025#endif 1038#endif
1026 selection_wait,
1027 selection_type;
1028/* ---------- */ 1039/* ---------- */
1029 bool rvideo_state, rvideo_mode; 1040 bool rvideo_state, rvideo_mode;
1030#ifndef NO_BELL 1041#ifndef NO_BELL
1031 bool rvideo_bell; 1042 bool rvideo_bell;
1032#endif 1043#endif
… …
1068 SavedModes; 1079 SavedModes;
1069/* ---------- */ 1080/* ---------- */
1070 Atom *xa; 1081 Atom *xa;
1071/* ---------- */ 1082/* ---------- */
1072 Time selection_time, 1083 Time selection_time,
1073 selection_request_time,
1074 clipboard_time; 1084 clipboard_time;
1085 rxvt_selection *selection_req;
1075 pid_t cmd_pid; /* process id of child */ 1086 pid_t cmd_pid; /* process id of child */
1076 char * incr_buf;
1077 size_t incr_buf_size, incr_buf_fill;
1078/* ---------- */ 1087/* ---------- */
1079 struct mouse_event MEvent; 1088 struct mouse_event MEvent;
1080 XComposeStatus compose; 1089 XComposeStatus compose;
1081 static struct termios def_tio; 1090 static struct termios def_tio;
1082 row_col_t oldcursor; 1091 row_col_t oldcursor;
1083#ifdef HAVE_BG_PIXMAP 1092#ifdef HAVE_BG_PIXMAP
1084 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_PROP_SCALE = 1 << 3,
1105 BG_ROOT_ALIGN = 1 << 4,
1106 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN,
1107
1108 BG_TINT_SET = 1 << 5,
1109 BG_TINT_BITAND = 1 << 6,
1110 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1111
1112 BG_HAS_RENDER = 1 << 7,
1113 BG_HAS_RENDER_CONV = 1 << 8,
1114 BG_CLIENT_RENDER = 1 << 9,
1115
1116 BG_IS_TRANSPARENT = 1 << 10,
1117 BG_NEEDS_REFRESH = 1 << 11,
1118 BG_IS_SIZE_SENSITIVE = 1 << 12,
1119 BG_IS_FROM_FILE = 1 << 13,
1120 };
1121
1122 unsigned int bg_flags;
1123
1124# ifdef BG_IMAGE_FROM_FILE
1125 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
1126 bool render_image (unsigned long tr_flags);
1127
1128 enum {
1129 noScale = 0,
1130 windowScale = 100,
1131 defaultScale = windowScale,
1132 centerAlign = 50,
1133 defaultAlign = centerAlign,
1134 };
1135
1136 unsigned int h_scale, v_scale; /* percents of the window size */
1137 int h_align, v_align; /* percents of the window size:
1138 0 - left align, 50 - center, 100 - right */
1139
1140 bool bg_set_geometry (const char *geom, bool update = false);
1141 void bg_set_default_geometry ()
1142 {
1143 h_scale = v_scale = defaultScale;
1144 h_align = v_align = defaultAlign;
1145 }
1146
1147 bool bg_set_file (const char *file);
1148# endif
1149
1150# ifdef ENABLE_TRANSPARENCY
1151 Pixmap root_pixmap; /* current root pixmap set */
1152 rxvt_color tint;
1153 int shade;
1154 int h_blurRadius, v_blurRadius;
1155
1156 bool bg_set_transparent ();
1157 void bg_set_root_pixmap ();
1158 void set_tint_shade_flags ();
1159 bool bg_set_tint (rxvt_color &new_tint);
1160 bool bg_set_shade (const char *shade_str);
1161 bool bg_set_blur (const char *geom);
1162
1163 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1164 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1165 unsigned long make_transparency_pixmap ();
1166# endif
1167
1168 ev_tstamp bg_valid_since;
1169
1170 Pixmap bg_pixmap;
1171 unsigned int bg_pmap_width, bg_pmap_height;
1172
1173 int target_x;
1174 int target_y;
1175 bool bg_set_position (int x, int y);
1176 bool bg_window_size_sensitive ();
1177 bool bg_window_position_sensitive ();
1178
1179 bool bg_render ();
1180 void bg_invalidate ()
1181 {
1182 bg_flags &= ~BG_IS_VALID;
1183 }
1085#endif 1184#endif
1086#ifdef HAVE_AFTERIMAGE 1185#ifdef HAVE_AFTERIMAGE
1186 ASImage *original_asim;
1087 ASVisual *asv; 1187 ASVisual *asv;
1088 ASImageManager *asimman; 1188 ASImageManager *asimman;
1089 1189
1090 void init_asv () 1190 void init_asv ()
1091 { 1191 {
1092 if (!asv) 1192 if (!asv)
1093 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1193 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1094 } 1194 }
1195#endif
1196#ifdef HAVE_PIXBUF
1197 GdkPixbuf *pixbuf;
1198 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1199 int src_x, int src_y, int dst_x, int dst_y,
1200 unsigned int width, unsigned int height);
1095#endif 1201#endif
1096 1202
1097#if ENABLE_OVERLAY 1203#if ENABLE_OVERLAY
1098 overlay_base ov; 1204 overlay_base ov;
1099 1205
… …
1174 void child_cb (ev::child &w, int revents); ev::child child_ev; 1280 void child_cb (ev::child &w, int revents); ev::child child_ev;
1175 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1281 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1176 void refresh_check (); 1282 void refresh_check ();
1177 void flush (); 1283 void flush ();
1178 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1284 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1285 void cmdbuf_reify ();
1286 void cmdbuf_append (const char *str, size_t count);
1179 bool pty_fill (); 1287 bool pty_fill ();
1180 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1288 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1181 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1182 1289
1183#ifdef CURSOR_BLINK 1290#ifdef CURSOR_BLINK
1184 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1291 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1185#endif 1292#endif
1186#ifdef TEXT_BLINK 1293#ifdef TEXT_BLINK
… …
1243#endif 1350#endif
1244 1351
1245 // command.C 1352 // command.C
1246 void key_press (XKeyEvent &ev); 1353 void key_press (XKeyEvent &ev);
1247 void key_release (XKeyEvent &ev); 1354 void key_release (XKeyEvent &ev);
1248 unsigned int cmd_write (const char *str, unsigned int count);
1249 1355
1250 wchar_t next_char () NOTHROW; 1356 wchar_t next_char () NOTHROW;
1251 wchar_t cmd_getc () THROW ((class out_of_input)); 1357 wchar_t cmd_getc () THROW ((class out_of_input));
1252 uint32_t next_octet () NOTHROW; 1358 uint32_t next_octet () NOTHROW;
1253 uint32_t cmd_get8 () THROW ((class out_of_input)); 1359 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1280 void process_color_seq (int report, int color, const char *str, char resp); 1386 void process_color_seq (int report, int color, const char *str, char resp);
1281 void process_xterm_seq (int op, char *str, char resp); 1387 void process_xterm_seq (int op, char *str, char resp);
1282 int privcases (int mode, unsigned long bit); 1388 int privcases (int mode, unsigned long bit);
1283 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1389 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1284 void process_sgr_mode (unsigned int nargs, const int *arg); 1390 void process_sgr_mode (unsigned int nargs, const int *arg);
1285 void process_graphics ();
1286 // init.C 1391 // init.C
1287 void init_vars (); 1392 void init_vars ();
1288 const char **init_resources (int argc, const char *const *argv); 1393 const char **init_resources (int argc, const char *const *argv);
1289 void init (int argc, const char *const *argv, stringvec *envv); 1394 void init (int argc, const char *const *argv, stringvec *envv);
1290 void init_env (); 1395 void init_env ();
… …
1317 void set_colorfgbg (); 1422 void set_colorfgbg ();
1318 bool set_color (rxvt_color &color, const char *name); 1423 bool set_color (rxvt_color &color, const char *name);
1319 void alias_color (int dst, int src); 1424 void alias_color (int dst, int src);
1320 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1425 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1321 void get_window_origin (int &x, int &y); 1426 void get_window_origin (int &x, int &y);
1322 Pixmap get_pixmap_property (int prop_id); 1427 Pixmap get_pixmap_property (Atom property);
1323 1428
1324 // screen.C 1429 // screen.C
1325 1430
1326 void lalloc (line_t &l) const 1431 void lalloc (line_t &l) const
1327 { 1432 {
… …
1379 return base; 1484 return base;
1380 } 1485 }
1381 1486
1382 bool option (uint8_t opt) const NOTHROW 1487 bool option (uint8_t opt) const NOTHROW
1383 { 1488 {
1384 if (!opt)
1385 return 0;
1386
1387 --opt;
1388 return options[opt >> 3] & (1 << (opt & 7)); 1489 return options[opt >> 3] & (1 << (opt & 7));
1389 } 1490 }
1390 1491
1391 void set_option (uint8_t opt, bool set = true) NOTHROW 1492 void set_option (uint8_t opt, bool set = true) NOTHROW;
1392 {
1393 if (!opt)
1394 return;
1395
1396 --opt;
1397 if (set)
1398 options[opt >> 3] |= (1 << (opt & 7));
1399 else
1400 options[opt >> 3] &= ~(1 << (opt & 7));
1401 }
1402 1493
1403 void set_privmode (unsigned bit, int set) NOTHROW 1494 void set_privmode (unsigned bit, int set) NOTHROW
1404 { 1495 {
1405 if (set) 1496 if (set)
1406 priv_modes |= bit; 1497 priv_modes |= bit;
… …
1426 void scr_backindex () NOTHROW; 1517 void scr_backindex () NOTHROW;
1427 void scr_forwardindex () NOTHROW; 1518 void scr_forwardindex () NOTHROW;
1428#endif 1519#endif
1429 void scr_touch (bool refresh) NOTHROW; 1520 void scr_touch (bool refresh) NOTHROW;
1430 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1521 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1431 void scr_recolour () NOTHROW; 1522 void scr_recolour (bool refresh = true) NOTHROW;
1432 void scr_remap_chars () NOTHROW; 1523 void scr_remap_chars () NOTHROW;
1433 void scr_remap_chars (line_t &l) NOTHROW; 1524 void scr_remap_chars (line_t &l) NOTHROW;
1434 1525
1435 enum cursor_mode { SAVE, RESTORE }; 1526 enum cursor_mode { SAVE, RESTORE };
1436 1527
… …
1471 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1562 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1472 void scr_reverse_selection () NOTHROW; 1563 void scr_reverse_selection () NOTHROW;
1473 void scr_dump (int fd) NOTHROW; 1564 void scr_dump (int fd) NOTHROW;
1474 1565
1475 void selection_check (int check_more) NOTHROW; 1566 void selection_check (int check_more) NOTHROW;
1476 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1477 void selection_property (Window win, Atom prop) NOTHROW;
1478 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1567 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1479 int selection_request_other (Atom target, int selnum) NOTHROW;
1480 void selection_clear (bool clipboard = false) NOTHROW; 1568 void selection_clear (bool clipboard = false) NOTHROW;
1481 void selection_make (Time tm); 1569 void selection_make (Time tm);
1482 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1570 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1483 void selection_start_colrow (int col, int row) NOTHROW; 1571 void selection_start_colrow (int col, int row) NOTHROW;
1484 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1572 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;

Diff Legend

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