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.406 by root, Sun May 23 00:02:52 2010 UTC vs.
Revision 1.436 by sf-exg, Sat Feb 12 00:30:00 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
… …
155void rxvt_warn (const char *fmt,...) NOTHROW; 165void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 166void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 167void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
158 168
159char * rxvt_strtrim (char *str) NOTHROW; 169char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 170char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 171
172static inline void
173rxvt_free_strsplit (char **ptr) NOTHROW
174{
175 free (ptr[0]);
176 free (ptr);
177}
162 178
163void * rxvt_malloc (size_t size); 179void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 180void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 181void * rxvt_realloc (void *ptr, size_t size);
166 182
… …
189#else 205#else
190 if (envv) 206 if (envv)
191#endif 207#endif
192 environ = envv; 208 environ = envv;
193} 209}
210
211struct localise_env
212{
213 char **orig_env;
214
215 localise_env (char **new_env)
216 {
217 orig_env = environ;
218 environ = new_env;
219 }
220
221 ~localise_env ()
222 {
223 environ = orig_env;
224 }
225};
194 226
195/* 227/*
196 ***************************************************************************** 228 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 229 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 230 *****************************************************************************
… …
323#define RS_fgMask (RS_colorMask << RS_fgShift) 355#define RS_fgMask (RS_colorMask << RS_fgShift)
324 356
325// must have space for rxvt_fontset::fontCount * 2 + 2 values 357// must have space for rxvt_fontset::fontCount * 2 + 2 values
326#define RS_fontShift (RS_fgShift + Color_Bits) 358#define RS_fontShift (RS_fgShift + Color_Bits)
327#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */ 359#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
360#define RS_fontCount rxvt_fontset::fontCount
328#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful 361#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
329 362
330// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" 363// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
331#define RS_redraw (2UL << RS_fontShift) 364#define RS_redraw (2UL << RS_fontShift)
332 365
333#define RS_Sel (1UL << 22) 366#define RS_Sel (1UL << 22)
334 367
335// 5 custom bits for extensions 368// 4 custom bits for extensions
336#define RS_customCount 16UL 369#define RS_customCount 16UL
337#define RS_customShift 23 370#define RS_customShift 23
338#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 371#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
339 372
340// font styles 373// font styles
… …
353#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 386#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
354#define RS_attrMask (RS_baseattrMask | RS_fontMask) 387#define RS_attrMask (RS_baseattrMask | RS_fontMask)
355 388
356#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 389#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
357#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 390#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
358
359#define Sel_none 0 /* Not waiting */
360#define Sel_normal 0x01 /* normal selection */
361#define Sel_incr 0x02 /* incremental selection */
362#define Sel_direct 0x00
363#define Sel_Primary 0x01
364#define Sel_Secondary 0x02
365#define Sel_Clipboard 0x03
366#define Sel_whereMask 0x0f
367#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
368#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
369 391
370enum { 392enum {
371 C0_NUL = 0x00, 393 C0_NUL = 0x00,
372 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 394 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
373 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 395 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
554#define PrivMode_vt52 (1UL<<18) 576#define PrivMode_vt52 (1UL<<18)
555#define PrivMode_LFNL (1UL<<19) 577#define PrivMode_LFNL (1UL<<19)
556#define PrivMode_MouseBtnEvent (1UL<<20) 578#define PrivMode_MouseBtnEvent (1UL<<20)
557#define PrivMode_MouseAnyEvent (1UL<<21) 579#define PrivMode_MouseAnyEvent (1UL<<21)
558#define PrivMode_BracketPaste (1UL<<22) 580#define PrivMode_BracketPaste (1UL<<22)
581#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
582#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
559 583
560#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 584#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
561 585
562#ifdef ALLOW_132_MODE 586#ifdef ALLOW_132_MODE
563# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 587# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
614/* 638/*
615 ***************************************************************************** 639 *****************************************************************************
616 * MACRO DEFINES 640 * MACRO DEFINES
617 ***************************************************************************** 641 *****************************************************************************
618 */ 642 */
643
644// speed hack, copy some member variable into a local variable of the same name
619#define dLocal(type,name) type const name = this->name 645#define dLocal(type,name) type const name = this->name
620 646
621// for speed reasons, we assume that all codepoints 32 to 126 are 647// for speed reasons, we assume that all codepoints 32 to 126 are
622// single-width. 648// single-width.
623#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 649#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
804{ 830{
805 int x, y, w, h; // overlay dimensions 831 int x, y, w, h; // overlay dimensions
806 text_t **text; 832 text_t **text;
807 rend_t **rend; 833 rend_t **rend;
808 834
809 // while tempting to add swap() etc. here, it effetcively only increases code size 835 // while tempting to add swap() etc. here, it effectively only increases code size
810}; 836};
811 837
812/* ------------------------------------------------------------------------- */ 838/* ------------------------------------------------------------------------- */
813 839
814typedef struct 840typedef struct
… …
946#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 972#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
947#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 973#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
948 974
949/* rxvt_vars.options */ 975/* rxvt_vars.options */
950enum { 976enum {
951# define def(name,idx) Opt_ ## name = idx,
952# define nodef(name) Opt_ ## name = 0, 977# define def(name) Opt_ ## name,
978# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
979 Opt_0,
953# include "optinc.h" 980# include "optinc.h"
954# undef nodef 981# undef nodef
955# undef def 982# undef def
956Opt_count 983 Opt_count
957}; 984};
958 985
959/* ------------------------------------------------------------------------- */ 986/* ------------------------------------------------------------------------- */
960 987
961struct rxvt_vars : TermWin_t 988struct rxvt_vars : TermWin_t
… …
1014 seen_resize:1, /* whether we had a resize event */ 1041 seen_resize:1, /* whether we had a resize event */
1015 parsed_geometry:1; 1042 parsed_geometry:1;
1016 1043
1017 unsigned char refresh_type, 1044 unsigned char refresh_type,
1018#ifdef META8_OPTION 1045#ifdef META8_OPTION
1019 meta_char, /* Alt-key prefix */ 1046 meta_char; /* Alt-key prefix */
1020#endif 1047#endif
1021 selection_wait,
1022 selection_type;
1023/* ---------- */ 1048/* ---------- */
1024 bool rvideo_state, rvideo_mode; 1049 bool rvideo_state, rvideo_mode;
1025#ifndef NO_BELL 1050#ifndef NO_BELL
1026 bool rvideo_bell; 1051 bool rvideo_bell;
1027#endif 1052#endif
… …
1063 SavedModes; 1088 SavedModes;
1064/* ---------- */ 1089/* ---------- */
1065 Atom *xa; 1090 Atom *xa;
1066/* ---------- */ 1091/* ---------- */
1067 Time selection_time, 1092 Time selection_time,
1068 selection_request_time,
1069 clipboard_time; 1093 clipboard_time;
1094 rxvt_selection *selection_req;
1070 pid_t cmd_pid; /* process id of child */ 1095 pid_t cmd_pid; /* process id of child */
1071 char * incr_buf;
1072 size_t incr_buf_size, incr_buf_fill;
1073/* ---------- */ 1096/* ---------- */
1074 struct mouse_event MEvent; 1097 struct mouse_event MEvent;
1075 XComposeStatus compose; 1098 XComposeStatus compose;
1076 struct termios tio; 1099 static struct termios def_tio;
1077 row_col_t oldcursor; 1100 row_col_t oldcursor;
1078#ifdef HAVE_BG_PIXMAP 1101#ifdef HAVE_BG_PIXMAP
1079 bgPixmap_t bgPixmap; 1102 void bg_init ();
1103 void bg_destroy ();
1104
1105 enum {
1106 //subset returned by make_transparency_pixmap
1107 BG_IS_VALID = 1 << 0,
1108 BG_NEEDS_TINT = 1 << 1,
1109 BG_NEEDS_BLUR = 1 << 2,
1110
1111 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1112
1113 BG_PROP_SCALE = 1 << 3,
1114 BG_ROOT_ALIGN = 1 << 4,
1115 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN,
1116
1117 BG_TINT_SET = 1 << 5,
1118 BG_TINT_BITAND = 1 << 6,
1119 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1120
1121 BG_HAS_RENDER = 1 << 7,
1122 BG_HAS_RENDER_CONV = 1 << 8,
1123 BG_CLIENT_RENDER = 1 << 9,
1124
1125 BG_IS_TRANSPARENT = 1 << 10,
1126 BG_NEEDS_REFRESH = 1 << 11,
1127 BG_IS_SIZE_SENSITIVE = 1 << 12,
1128 BG_IS_FROM_FILE = 1 << 13,
1129 };
1130
1131 unsigned int bg_flags;
1132
1133# ifdef BG_IMAGE_FROM_FILE
1134 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);
1136
1137 enum {
1138 noScale = 0,
1139 windowScale = 100,
1140 defaultScale = windowScale,
1141 centerAlign = 50,
1142 defaultAlign = centerAlign,
1143 };
1144
1145 unsigned int h_scale, v_scale; /* percents of the window size */
1146 int h_align, v_align; /* percents of the window size:
1147 0 - left align, 50 - center, 100 - right */
1148
1149 bool bg_set_geometry (const char *geom, bool update = false);
1150 void bg_set_default_geometry ()
1151 {
1152 h_scale = v_scale = defaultScale;
1153 h_align = v_align = defaultAlign;
1154 }
1155
1156 bool bg_set_file (const char *file);
1157# endif
1158
1159# ifdef ENABLE_TRANSPARENCY
1160 Pixmap root_pixmap; /* current root pixmap set */
1161 rxvt_color tint;
1162 int shade;
1163 int h_blurRadius, v_blurRadius;
1164
1165 bool bg_set_transparent ();
1166 void bg_set_root_pixmap ();
1167 void set_tint_shade_flags ();
1168 bool bg_set_tint (rxvt_color &new_tint);
1169 bool bg_set_shade (const char *shade_str);
1170 bool bg_set_blur (const char *geom);
1171
1172 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1173 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1174 unsigned long make_transparency_pixmap ();
1175# endif
1176
1177 ev_tstamp bg_valid_since;
1178
1179 Pixmap bg_pixmap;
1180 unsigned int bg_pmap_width, bg_pmap_height;
1181
1182 int target_x;
1183 int target_y;
1184 bool bg_set_position (int x, int y);
1185 bool bg_window_size_sensitive ();
1186 bool bg_window_position_sensitive ();
1187
1188 bool bg_render ();
1189 void bg_invalidate ()
1190 {
1191 bg_flags &= ~BG_IS_VALID;
1192 }
1080#endif 1193#endif
1081#ifdef HAVE_AFTERIMAGE 1194#ifdef HAVE_AFTERIMAGE
1195 ASImage *original_asim;
1082 ASVisual *asv; 1196 ASVisual *asv;
1083 ASImageManager *asimman; 1197 ASImageManager *asimman;
1084 1198
1085 void init_asv () 1199 void init_asv ()
1086 { 1200 {
1087 if (!asv) 1201 if (!asv)
1088 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1202 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1089 } 1203 }
1204#endif
1205#ifdef HAVE_PIXBUF
1206 GdkPixbuf *pixbuf;
1207 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1208 int src_x, int src_y, int dst_x, int dst_y,
1209 unsigned int width, unsigned int height);
1090#endif 1210#endif
1091 1211
1092#if ENABLE_OVERLAY 1212#if ENABLE_OVERLAY
1093 overlay_base ov; 1213 overlay_base ov;
1094 1214
… …
1155 void rootwin_cb (XEvent &xev); 1275 void rootwin_cb (XEvent &xev);
1156 xevent_watcher rootwin_ev; 1276 xevent_watcher rootwin_ev;
1157#endif 1277#endif
1158#ifdef HAVE_BG_PIXMAP 1278#ifdef HAVE_BG_PIXMAP
1159 void update_background (); 1279 void update_background ();
1160#if TRACE_PIXMAPS
1161 void trace_update_background (const char *file, int line);
1162# define update_background() trace_update_background (__FILE__, __LINE__)
1163#endif
1164 void update_background_cb (ev::timer &w, int revents); 1280 void update_background_cb (ev::timer &w, int revents);
1165 ev::timer update_background_ev; 1281 ev::timer update_background_ev;
1166#endif 1282#endif
1167 1283
1168 void x_cb (XEvent &xev); 1284 void x_cb (XEvent &xev);
… …
1175 void refresh_check (); 1291 void refresh_check ();
1176 void flush (); 1292 void flush ();
1177 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1293 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1178 bool pty_fill (); 1294 bool pty_fill ();
1179 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1295 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1180 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1181 1296
1182#ifdef CURSOR_BLINK 1297#ifdef CURSOR_BLINK
1183 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1298 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1184#endif 1299#endif
1185#ifdef TEXT_BLINK 1300#ifdef TEXT_BLINK
… …
1294 int run_child (const char *const *argv); 1409 int run_child (const char *const *argv);
1295 void color_aliases (int idx); 1410 void color_aliases (int idx);
1296 void create_windows (int argc, const char *const *argv); 1411 void create_windows (int argc, const char *const *argv);
1297 void get_colours (); 1412 void get_colours ();
1298 void get_ourmods (); 1413 void get_ourmods ();
1414 void set_icon (const char *file);
1299 // main.C 1415 // main.C
1300 void tt_winch (); 1416 void tt_winch ();
1301 rxvt_term (); 1417 rxvt_term ();
1302 ~rxvt_term (); 1418 ~rxvt_term ();
1303 void destroy (); 1419 void destroy ();
… …
1305 void recolour_cursor (); 1421 void recolour_cursor ();
1306 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1422 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1307 void window_calc (unsigned int newwidth, unsigned int newheight); 1423 void window_calc (unsigned int newwidth, unsigned int newheight);
1308 bool set_fonts (); 1424 bool set_fonts ();
1309 void set_string_property (Atom prop, const char *str, int len = -1); 1425 void set_string_property (Atom prop, const char *str, int len = -1);
1426 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1310 void set_utf8_property (Atom prop, const char *str, int len = -1); 1427 void set_utf8_property (Atom prop, const char *str, int len = -1);
1311 void set_title (const char *str); 1428 void set_title (const char *str);
1312 void set_icon_name (const char *str); 1429 void set_icon_name (const char *str);
1313 void set_window_color (int idx, const char *color); 1430 void set_window_color (int idx, const char *color);
1314 void set_colorfgbg (); 1431 void set_colorfgbg ();
1315 bool set_color (rxvt_color &color, const char *name); 1432 bool set_color (rxvt_color &color, const char *name);
1316 void alias_color (int dst, int src); 1433 void alias_color (int dst, int src);
1317 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1434 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1318 void get_window_origin (int &x, int &y); 1435 void get_window_origin (int &x, int &y);
1319 Pixmap get_pixmap_property (int prop_id); 1436 Pixmap get_pixmap_property (Atom property);
1320 1437
1321 // screen.C 1438 // screen.C
1322 1439
1323 void lalloc (line_t &l) const 1440 void lalloc (line_t &l) const
1324 { 1441 {
… …
1376 return base; 1493 return base;
1377 } 1494 }
1378 1495
1379 bool option (uint8_t opt) const NOTHROW 1496 bool option (uint8_t opt) const NOTHROW
1380 { 1497 {
1381 if (!opt)
1382 return 0;
1383
1384 --opt;
1385 return options[opt >> 3] & (1 << (opt & 7)); 1498 return options[opt >> 3] & (1 << (opt & 7));
1386 } 1499 }
1387 1500
1388 void set_option (uint8_t opt, bool set = true) NOTHROW 1501 void set_option (uint8_t opt, bool set = true) NOTHROW;
1389 {
1390 if (!opt)
1391 return;
1392
1393 --opt;
1394 if (set)
1395 options[opt >> 3] |= (1 << (opt & 7));
1396 else
1397 options[opt >> 3] &= ~(1 << (opt & 7));
1398 }
1399 1502
1400 void set_privmode (unsigned bit, int set) NOTHROW 1503 void set_privmode (unsigned bit, int set) NOTHROW
1401 { 1504 {
1402 if (set) 1505 if (set)
1403 priv_modes |= bit; 1506 priv_modes |= bit;
1404 else 1507 else
1405 priv_modes &= ~bit; 1508 priv_modes &= ~bit;
1406 } 1509 }
1407 1510
1408 // modifies first argument(!) 1511 // modifies first argument(!)
1512 void tt_paste (char *data, unsigned int len) NOTHROW;
1409 void paste (char *data, unsigned int len) NOTHROW; 1513 void paste (char *data, unsigned int len) NOTHROW;
1410 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1514 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1411 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1515 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1412 void scr_kill_char (line_t &l, int col) const NOTHROW; 1516 void scr_kill_char (line_t &l, int col) const NOTHROW;
1413 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1517 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1422 void scr_backindex () NOTHROW; 1526 void scr_backindex () NOTHROW;
1423 void scr_forwardindex () NOTHROW; 1527 void scr_forwardindex () NOTHROW;
1424#endif 1528#endif
1425 void scr_touch (bool refresh) NOTHROW; 1529 void scr_touch (bool refresh) NOTHROW;
1426 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1530 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1427 void scr_recolour () NOTHROW; 1531 void scr_recolour (bool refresh = true) NOTHROW;
1428 void scr_remap_chars () NOTHROW; 1532 void scr_remap_chars () NOTHROW;
1429 void scr_remap_chars (line_t &l) NOTHROW; 1533 void scr_remap_chars (line_t &l) NOTHROW;
1430 1534
1431 enum cursor_mode { SAVE, RESTORE }; 1535 enum cursor_mode { SAVE, RESTORE };
1432 1536
… …
1467 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1571 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1468 void scr_reverse_selection () NOTHROW; 1572 void scr_reverse_selection () NOTHROW;
1469 void scr_dump (int fd) NOTHROW; 1573 void scr_dump (int fd) NOTHROW;
1470 1574
1471 void selection_check (int check_more) NOTHROW; 1575 void selection_check (int check_more) NOTHROW;
1472 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1473 void selection_property (Window win, Atom prop) NOTHROW;
1474 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1576 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1475 int selection_request_other (Atom target, int selnum) NOTHROW;
1476 void selection_clear (bool clipboard = false) NOTHROW; 1577 void selection_clear (bool clipboard = false) NOTHROW;
1477 void clipboard_copy (Time tm);
1478 void selection_make (Time tm); 1578 void selection_make (Time tm);
1479 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1579 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1480 void selection_start_colrow (int col, int row) NOTHROW; 1580 void selection_start_colrow (int col, int row) NOTHROW;
1481 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1581 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1482 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1582 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;

Diff Legend

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