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.396 by root, Thu Apr 1 00:58:38 2010 UTC vs.
Revision 1.428 by sf-exg, Thu Jan 20 17:39:29 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>
… …
97/* 99/*
98 ***************************************************************************** 100 *****************************************************************************
99 * SYSTEM HACKS 101 * SYSTEM HACKS
100 ***************************************************************************** 102 *****************************************************************************
101 */ 103 */
102
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106 104
107#include <termios.h> 105#include <termios.h>
108 106
109#include "background.h" 107#include "background.h"
110 108
… …
155void rxvt_warn (const char *fmt,...) NOTHROW; 153void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 154void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 155void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
158 156
159char * rxvt_strtrim (char *str) NOTHROW; 157char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 158char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 159
160static inline void
161rxvt_free_strsplit (char **ptr) NOTHROW
162{
163 free (ptr[0]);
164 free (ptr);
165}
162 166
163void * rxvt_malloc (size_t size); 167void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 168void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 169void * rxvt_realloc (void *ptr, size_t size);
166 170
… …
189#else 193#else
190 if (envv) 194 if (envv)
191#endif 195#endif
192 environ = envv; 196 environ = envv;
193} 197}
198
199struct localise_env
200{
201 char **orig_env;
202
203 localise_env (char **new_env)
204 {
205 orig_env = environ;
206 environ = new_env;
207 }
208
209 ~localise_env ()
210 {
211 environ = orig_env;
212 }
213};
194 214
195/* 215/*
196 ***************************************************************************** 216 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 217 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 218 *****************************************************************************
… …
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 267# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 268#else
249# define COLORTERMENVFULL COLORTERMENV 269# define COLORTERMENVFULL COLORTERMENV
250#endif 270#endif
251#ifndef TERMENV 271#ifndef TERMENV
272# if USE_256_COLORS
273# define TERMENV "rxvt-unicode-256color"
274# else
252# define TERMENV "rxvt-unicode" 275# define TERMENV "rxvt-unicode"
276# endif
253#endif 277#endif
254 278
255#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 279#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
256# define NO_MOUSE_REPORT_SCROLLBAR 1 280# define NO_MOUSE_REPORT_SCROLLBAR 1
257#endif 281#endif
… …
303/* arguments for rxvt_scr_change_screen () */ 327/* arguments for rxvt_scr_change_screen () */
304enum { 328enum {
305 PRIMARY = 0, 329 PRIMARY = 0,
306 SECONDARY, 330 SECONDARY,
307}; 331};
332
333// define various rendition bits and masks. the rendition word
334// is 32 bits in size, and we should use it as efficiently as possible
308 335
309#define RS_None 0 336#define RS_None 0
310 337
311// GET_BGATTR depends on RS_fgShift > RS_bgShift 338// GET_BGATTR depends on RS_fgShift > RS_bgShift
312#define RS_colorMask ((1UL << Color_Bits) - 1UL) 339#define RS_colorMask ((1UL << Color_Bits) - 1UL)
313#define RS_bgShift 0 340#define RS_bgShift 0
314#define RS_fgShift (RS_bgShift + Color_Bits) 341#define RS_fgShift (RS_bgShift + Color_Bits)
315#define RS_bgMask (RS_colorMask << RS_bgShift) 342#define RS_bgMask (RS_colorMask << RS_bgShift)
316#define RS_fgMask (RS_colorMask << RS_fgShift) 343#define RS_fgMask (RS_colorMask << RS_fgShift)
317 344
318// font styles 345// must have space for rxvt_fontset::fontCount * 2 + 2 values
319#define RS_Bold 0x08000000UL // value 1 346#define RS_fontShift (RS_fgShift + Color_Bits)
320#define RS_Italic 0x10000000UL // value 2 347#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
348#define RS_fontCount rxvt_fontset::fontCount
349#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
321 350
322#define RS_styleCount 4 351// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
323#define RS_styleMask (RS_Bold | RS_Italic) 352#define RS_redraw (2UL << RS_fontShift)
324#define RS_styleShift 27
325 353
326// fake styles 354#define RS_Sel (1UL << 22)
327#define RS_Blink 0x20000000UL // blink
328#define RS_RVid 0x40000000UL // reverse video
329#define RS_Uline 0x80000000UL // underline
330 355
331// 5 custom bits for extensions 356// 4 custom bits for extensions
332#define RS_customCount 16UL 357#define RS_customCount 16UL
333#define RS_customShift 23 358#define RS_customShift 23
334#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 359#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
335 360
336// must have space for rxvt_fontset::fontCount * 2 + 2 values 361// font styles
337#define RS_fontShift (RS_fgShift + Color_Bits) 362#define RS_Bold (1UL << RS_styleShift)
338#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
339#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
340
341// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
342#define RS_redraw (2UL << RS_fontShift) 363#define RS_Italic (2UL << RS_styleShift)
364
365#define RS_styleCount 4
366#define RS_styleShift 27
367#define RS_styleMask (RS_Bold | RS_Italic)
368
369// fake styles
370#define RS_Blink (1UL << 29)
371#define RS_RVid (1UL << 30) // reverse video
372#define RS_Uline (1UL << 31) // underline
343 373
344#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 374#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
345#define RS_attrMask (RS_baseattrMask | RS_fontMask) 375#define RS_attrMask (RS_baseattrMask | RS_fontMask)
346 376
347#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 377#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
… …
382 XTerm_Color_cursor = 12, // change actual 'Cursor' color 412 XTerm_Color_cursor = 12, // change actual 'Cursor' color
383 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 413 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
384 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 414 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
385 XTerm_Color05 = 15, // not implemented (tektronix fg) 415 XTerm_Color05 = 15, // not implemented (tektronix fg)
386 XTerm_Color06 = 16, // not implemented (tektronix bg) 416 XTerm_Color06 = 16, // not implemented (tektronix bg)
387 XTerm_Color_RV = 17, // change actual 'Highlight' color 417 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
418 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
388 XTerm_logfile = 46, // not implemented 419 XTerm_logfile = 46, // not implemented
389 XTerm_font = 50, 420 XTerm_font = 50,
390 421
391 XTerm_konsole30 = 30, // reserved for konsole 422 XTerm_konsole30 = 30, // reserved for konsole
392 XTerm_konsole31 = 31, // reserved for konsole 423 XTerm_konsole31 = 31, // reserved for konsole
… …
394 /* 425 /*
395 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 426 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
396 */ 427 */
397 428
398 // deprecated 429 // deprecated
399 Rxvt_Color_BD = 18,
400 Rxvt_Color_UL = 19,
401 Rxvt_restoreFG = 39, 430 Rxvt_restoreFG = 39,
402 Rxvt_restoreBG = 49, 431 Rxvt_restoreBG = 49,
403 432
404 Rxvt_Pixmap = 20, // new bg pixmap 433 Rxvt_Pixmap = 20, // new bg pixmap
405 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 434 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
459 Color_White = maxBrightCOLOR, 488 Color_White = maxBrightCOLOR,
460#else 489#else
461 Color_White = maxCOLOR, 490 Color_White = maxCOLOR,
462#endif 491#endif
463 minTermCOLOR = Color_White + 1, 492 minTermCOLOR = Color_White + 1,
464#ifndef USE_256_COLORS 493#if USE_256_COLORS
494 maxTermCOLOR = Color_White + 240,
495#else
465 maxTermCOLOR = Color_White + 72, 496 maxTermCOLOR = Color_White + 72,
466#else
467 maxTermCOLOR = Color_White + 240,
468#endif 497#endif
469#ifndef NO_CURSORCOLOR 498#ifndef NO_CURSORCOLOR
470 Color_cursor, 499 Color_cursor,
471 Color_cursor2, 500 Color_cursor2,
472#endif 501#endif
… …
482#if ENABLE_FRILLS 511#if ENABLE_FRILLS
483 Color_underline, 512 Color_underline,
484#endif 513#endif
485#ifdef OPTION_HC 514#ifdef OPTION_HC
486 Color_HC, 515 Color_HC,
516 Color_HTC,
487#endif 517#endif
488 Color_scroll, 518 Color_scroll,
489#ifdef RXVT_SCROLLBAR 519#ifdef RXVT_SCROLLBAR
490 Color_trough, 520 Color_trough,
491#endif 521#endif
… …
503#else 533#else
504 TOTAL_COLORS = NRS_COLORS 534 TOTAL_COLORS = NRS_COLORS
505#endif 535#endif
506}; 536};
507 537
508#ifndef USE_256_COLORS 538#if USE_256_COLORS
509#define Color_Bits 7 // 0 .. maxTermCOLOR 539# define Color_Bits 9 // 0 .. maxTermCOLOR
510#else 540#else
511#define Color_Bits 9 // 0 .. maxTermCOLOR 541# define Color_Bits 7 // 0 .. maxTermCOLOR
512#endif 542#endif
513 543
514/* 544/*
515 * Resource list 545 * Resource list
516 */ 546 */
… …
545#define PrivMode_vt52 (1UL<<18) 575#define PrivMode_vt52 (1UL<<18)
546#define PrivMode_LFNL (1UL<<19) 576#define PrivMode_LFNL (1UL<<19)
547#define PrivMode_MouseBtnEvent (1UL<<20) 577#define PrivMode_MouseBtnEvent (1UL<<20)
548#define PrivMode_MouseAnyEvent (1UL<<21) 578#define PrivMode_MouseAnyEvent (1UL<<21)
549#define PrivMode_BracketPaste (1UL<<22) 579#define PrivMode_BracketPaste (1UL<<22)
580#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
581#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
550 582
551#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 583#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
552 584
553#ifdef ALLOW_132_MODE 585#ifdef ALLOW_132_MODE
554# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 586# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
605/* 637/*
606 ***************************************************************************** 638 *****************************************************************************
607 * MACRO DEFINES 639 * MACRO DEFINES
608 ***************************************************************************** 640 *****************************************************************************
609 */ 641 */
642
643// speed hack, copy some member variable into a local variable of the same name
610#define dLocal(type,name) type const name = this->name 644#define dLocal(type,name) type const name = this->name
611 645
612// for speed reasons, we assume that all codepoints 32 to 126 are 646// for speed reasons, we assume that all codepoints 32 to 126 are
613// single-width. 647// single-width.
614#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 648#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
795{ 829{
796 int x, y, w, h; // overlay dimensions 830 int x, y, w, h; // overlay dimensions
797 text_t **text; 831 text_t **text;
798 rend_t **rend; 832 rend_t **rend;
799 833
800 // while tempting to add swap() etc. here, it effetcively only increases code size 834 // while tempting to add swap() etc. here, it effectively only increases code size
801}; 835};
802 836
803/* ------------------------------------------------------------------------- */ 837/* ------------------------------------------------------------------------- */
804 838
805typedef struct 839typedef struct
… …
937#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 971#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
938#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 972#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
939 973
940/* rxvt_vars.options */ 974/* rxvt_vars.options */
941enum { 975enum {
942# define def(name,idx) Opt_ ## name = idx,
943# define nodef(name) Opt_ ## name = 0, 976# define def(name) Opt_ ## name,
977# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
978 Opt_0,
944# include "optinc.h" 979# include "optinc.h"
945# undef nodef 980# undef nodef
946# undef def 981# undef def
947Opt_count 982 Opt_count
948}; 983};
949 984
950/* ------------------------------------------------------------------------- */ 985/* ------------------------------------------------------------------------- */
951 986
952struct rxvt_vars : TermWin_t 987struct rxvt_vars : TermWin_t
… …
954 scrollBar_t scrollBar; 989 scrollBar_t scrollBar;
955 uint8_t options[(Opt_count + 7) >> 3]; 990 uint8_t options[(Opt_count + 7) >> 3];
956 XSizeHints szHint; 991 XSizeHints szHint;
957 rxvt_color *pix_colors; 992 rxvt_color *pix_colors;
958 Cursor TermWin_cursor; /* cursor for vt window */ 993 Cursor TermWin_cursor; /* cursor for vt window */
959 int numlock_state;
960 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 994 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
961 line_t *drawn_buf; // text on screen 995 line_t *drawn_buf; // text on screen
962 line_t *swap_buf; // lines for swap buffer 996 line_t *swap_buf; // lines for swap buffer
963 char *tabs; /* per location: 1 == tab-stop */ 997 char *tabs; /* per location: 1 == tab-stop */
964 screen_t screen; 998 screen_t screen;
… …
1063 char * incr_buf; 1097 char * incr_buf;
1064 size_t incr_buf_size, incr_buf_fill; 1098 size_t incr_buf_size, incr_buf_fill;
1065/* ---------- */ 1099/* ---------- */
1066 struct mouse_event MEvent; 1100 struct mouse_event MEvent;
1067 XComposeStatus compose; 1101 XComposeStatus compose;
1068 struct termios tio; 1102 static struct termios def_tio;
1069 row_col_t oldcursor; 1103 row_col_t oldcursor;
1070#ifdef HAVE_BG_PIXMAP 1104#ifdef HAVE_BG_PIXMAP
1071 bgPixmap_t bgPixmap; 1105 bgPixmap_t bgPixmap;
1072#endif 1106#endif
1073#ifdef HAVE_AFTERIMAGE 1107#ifdef HAVE_AFTERIMAGE
… …
1147 void rootwin_cb (XEvent &xev); 1181 void rootwin_cb (XEvent &xev);
1148 xevent_watcher rootwin_ev; 1182 xevent_watcher rootwin_ev;
1149#endif 1183#endif
1150#ifdef HAVE_BG_PIXMAP 1184#ifdef HAVE_BG_PIXMAP
1151 void update_background (); 1185 void update_background ();
1152#if TRACE_PIXMAPS
1153 void trace_update_background (const char *file, int line);
1154# define update_background() trace_update_background (__FILE__, __LINE__)
1155#endif
1156 void update_background_cb (ev::timer &w, int revents); 1186 void update_background_cb (ev::timer &w, int revents);
1157 ev::timer update_background_ev; 1187 ev::timer update_background_ev;
1158#endif 1188#endif
1159 1189
1160 void x_cb (XEvent &xev); 1190 void x_cb (XEvent &xev);
… …
1286 int run_child (const char *const *argv); 1316 int run_child (const char *const *argv);
1287 void color_aliases (int idx); 1317 void color_aliases (int idx);
1288 void create_windows (int argc, const char *const *argv); 1318 void create_windows (int argc, const char *const *argv);
1289 void get_colours (); 1319 void get_colours ();
1290 void get_ourmods (); 1320 void get_ourmods ();
1321 void set_icon (const char *file);
1291 // main.C 1322 // main.C
1292 void tt_winch (); 1323 void tt_winch ();
1293 rxvt_term (); 1324 rxvt_term ();
1294 ~rxvt_term (); 1325 ~rxvt_term ();
1295 void destroy (); 1326 void destroy ();
… …
1297 void recolour_cursor (); 1328 void recolour_cursor ();
1298 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1329 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1299 void window_calc (unsigned int newwidth, unsigned int newheight); 1330 void window_calc (unsigned int newwidth, unsigned int newheight);
1300 bool set_fonts (); 1331 bool set_fonts ();
1301 void set_string_property (Atom prop, const char *str, int len = -1); 1332 void set_string_property (Atom prop, const char *str, int len = -1);
1333 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1302 void set_utf8_property (Atom prop, const char *str, int len = -1); 1334 void set_utf8_property (Atom prop, const char *str, int len = -1);
1303 void set_title (const char *str); 1335 void set_title (const char *str);
1304 void set_icon_name (const char *str); 1336 void set_icon_name (const char *str);
1305 void set_window_color (int idx, const char *color); 1337 void set_window_color (int idx, const char *color);
1306 void set_colorfgbg (); 1338 void set_colorfgbg ();
1307 bool set_color (rxvt_color &color, const char *name); 1339 bool set_color (rxvt_color &color, const char *name);
1308 void alias_color (int dst, int src); 1340 void alias_color (int dst, int src);
1309 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1341 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1310 void get_window_origin (int &x, int &y); 1342 void get_window_origin (int &x, int &y);
1311 Pixmap get_pixmap_property (int prop_id); 1343 Pixmap get_pixmap_property (Atom property);
1312 1344
1313 // screen.C 1345 // screen.C
1314 1346
1315 void lalloc (line_t &l) const 1347 void lalloc (line_t &l) const
1316 { 1348 {
… …
1368 return base; 1400 return base;
1369 } 1401 }
1370 1402
1371 bool option (uint8_t opt) const NOTHROW 1403 bool option (uint8_t opt) const NOTHROW
1372 { 1404 {
1373 if (!opt)
1374 return 0;
1375
1376 --opt;
1377 return options[opt >> 3] & (1 << (opt & 7)); 1405 return options[opt >> 3] & (1 << (opt & 7));
1378 } 1406 }
1379 1407
1380 void set_option (uint8_t opt, bool set = true) NOTHROW 1408 void set_option (uint8_t opt, bool set = true) NOTHROW;
1381 {
1382 if (!opt)
1383 return;
1384
1385 --opt;
1386 if (set)
1387 options[opt >> 3] |= (1 << (opt & 7));
1388 else
1389 options[opt >> 3] &= ~(1 << (opt & 7));
1390 }
1391 1409
1392 void set_privmode (unsigned bit, int set) NOTHROW 1410 void set_privmode (unsigned bit, int set) NOTHROW
1393 { 1411 {
1394 if (set) 1412 if (set)
1395 priv_modes |= bit; 1413 priv_modes |= bit;
1396 else 1414 else
1397 priv_modes &= ~bit; 1415 priv_modes &= ~bit;
1398 } 1416 }
1399 1417
1400 // modifies first argument(!) 1418 // modifies first argument(!)
1419 void tt_paste (char *data, unsigned int len) NOTHROW;
1401 void paste (char *data, unsigned int len) NOTHROW; 1420 void paste (char *data, unsigned int len) NOTHROW;
1402 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1421 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1403 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1422 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1404 void scr_kill_char (line_t &l, int col) const NOTHROW; 1423 void scr_kill_char (line_t &l, int col) const NOTHROW;
1405 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1424 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1414 void scr_backindex () NOTHROW; 1433 void scr_backindex () NOTHROW;
1415 void scr_forwardindex () NOTHROW; 1434 void scr_forwardindex () NOTHROW;
1416#endif 1435#endif
1417 void scr_touch (bool refresh) NOTHROW; 1436 void scr_touch (bool refresh) NOTHROW;
1418 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1437 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1419 void scr_recolour () NOTHROW; 1438 void scr_recolour (bool refresh = true) NOTHROW;
1420 void scr_remap_chars () NOTHROW; 1439 void scr_remap_chars () NOTHROW;
1421 void scr_remap_chars (line_t &l) NOTHROW; 1440 void scr_remap_chars (line_t &l) NOTHROW;
1422 1441
1423 enum cursor_mode { SAVE, RESTORE }; 1442 enum cursor_mode { SAVE, RESTORE };
1424 1443
… …
1464 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1483 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1465 void selection_property (Window win, Atom prop) NOTHROW; 1484 void selection_property (Window win, Atom prop) NOTHROW;
1466 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1485 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1467 int selection_request_other (Atom target, int selnum) NOTHROW; 1486 int selection_request_other (Atom target, int selnum) NOTHROW;
1468 void selection_clear (bool clipboard = false) NOTHROW; 1487 void selection_clear (bool clipboard = false) NOTHROW;
1469 void clipboard_copy (Time tm);
1470 void selection_make (Time tm); 1488 void selection_make (Time tm);
1471 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1489 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1472 void selection_start_colrow (int col, int row) NOTHROW; 1490 void selection_start_colrow (int col, int row) NOTHROW;
1473 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1491 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1474 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1492 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