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.370 by root, Tue Nov 4 14:25:10 2008 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>
… …
98 ***************************************************************************** 100 *****************************************************************************
99 * SYSTEM HACKS 101 * SYSTEM HACKS
100 ***************************************************************************** 102 *****************************************************************************
101 */ 103 */
102 104
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 105#include <termios.h>
108 106
109#include "background.h" 107#include "background.h"
110 108
111#ifndef STDIN_FILENO 109#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 110# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 111# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 112# define STDERR_FILENO 2
115#endif
116
117#if !defined (EACCESS) && defined(EAGAIN)
118# define EACCESS EAGAIN
119#endif 113#endif
120 114
121#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 115#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
122# define EXIT_SUCCESS 0 /* exit function success */ 116# define EXIT_SUCCESS 0 /* exit function success */
123# define EXIT_FAILURE 1 /* exit function failure */ 117# define EXIT_FAILURE 1 /* exit function failure */
… …
151char * rxvt_wcstombs (const wchar_t *str, int len = -1); 145char * rxvt_wcstombs (const wchar_t *str, int len = -1);
152wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 146wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
153char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 147char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
154wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 148wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
155 149
156char * rxvt_basename (const char *str) NOTHROW; 150const char * rxvt_basename (const char *str) NOTHROW;
157void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 151void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
158void rxvt_log (const char *fmt,...) NOTHROW; 152void rxvt_log (const char *fmt,...) NOTHROW;
159void rxvt_warn (const char *fmt,...) NOTHROW; 153void rxvt_warn (const char *fmt,...) NOTHROW;
160void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 154void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
161void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 155void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
162 156
163char * rxvt_strtrim (char *str) NOTHROW; 157char * rxvt_strtrim (char *str) NOTHROW;
164char ** rxvt_splitcommastring (const char *cs) NOTHROW; 158char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
165void rxvt_freecommastring (char **cs) NOTHROW; 159
160static inline void
161rxvt_free_strsplit (char **ptr) NOTHROW
162{
163 free (ptr[0]);
164 free (ptr);
165}
166 166
167void * rxvt_malloc (size_t size); 167void * rxvt_malloc (size_t size);
168void * rxvt_calloc (size_t number, size_t size); 168void * rxvt_calloc (size_t number, size_t size);
169void * rxvt_realloc (void *ptr, size_t size); 169void * rxvt_realloc (void *ptr, size_t size);
170 170
… …
193#else 193#else
194 if (envv) 194 if (envv)
195#endif 195#endif
196 environ = envv; 196 environ = envv;
197} 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};
198 214
199/* 215/*
200 ***************************************************************************** 216 *****************************************************************************
201 * STRUCTURES AND TYPEDEFS 217 * STRUCTURES AND TYPEDEFS
202 ***************************************************************************** 218 *****************************************************************************
… …
204 220
205/* 221/*
206 * the 'essential' information for reporting Mouse Events 222 * the 'essential' information for reporting Mouse Events
207 * pared down from XButtonEvent 223 * pared down from XButtonEvent
208 */ 224 */
209struct mouse_event { 225struct mouse_event
226{
210 int clicks; 227 int clicks;
211 Time time; /* milliseconds */ 228 Time time; /* milliseconds */
212 unsigned int state; /* key or button mask */ 229 unsigned int state; /* key or button mask */
213 unsigned int button; /* detail */ 230 unsigned int button; /* detail */
214}; 231};
… …
250# define COLORTERMENVFULL COLORTERMENV "-xpm" 267# define COLORTERMENVFULL COLORTERMENV "-xpm"
251#else 268#else
252# define COLORTERMENVFULL COLORTERMENV 269# define COLORTERMENVFULL COLORTERMENV
253#endif 270#endif
254#ifndef TERMENV 271#ifndef TERMENV
272# if USE_256_COLORS
273# define TERMENV "rxvt-unicode-256color"
274# else
255# define TERMENV "rxvt-unicode" 275# define TERMENV "rxvt-unicode"
276# endif
256#endif 277#endif
257 278
258#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 279#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
259# define NO_MOUSE_REPORT_SCROLLBAR 1 280# define NO_MOUSE_REPORT_SCROLLBAR 1
260#endif 281#endif
… …
307enum { 328enum {
308 PRIMARY = 0, 329 PRIMARY = 0,
309 SECONDARY, 330 SECONDARY,
310}; 331};
311 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
335
312#define RS_None 0 336#define RS_None 0
313 337
314#define RS_fgMask 0x0000007fUL // 128 colors 338// GET_BGATTR depends on RS_fgShift > RS_bgShift
315#define RS_bgMask 0x00003f80UL // 128 colors 339#define RS_colorMask ((1UL << Color_Bits) - 1UL)
340#define RS_bgShift 0
341#define RS_fgShift (RS_bgShift + Color_Bits)
342#define RS_bgMask (RS_colorMask << RS_bgShift)
343#define RS_fgMask (RS_colorMask << RS_fgShift)
344
345// must have space for rxvt_fontset::fontCount * 2 + 2 values
346#define RS_fontShift (RS_fgShift + Color_Bits)
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
350
351// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
352#define RS_redraw (2UL << RS_fontShift)
353
354#define RS_Sel (1UL << 22)
355
356// 4 custom bits for extensions
357#define RS_customCount 16UL
358#define RS_customShift 23
359#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
316 360
317// font styles 361// font styles
318#define RS_Bold 0x00004000UL // value 1 362#define RS_Bold (1UL << RS_styleShift)
319#define RS_Italic 0x00008000UL // value 2 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)
320 368
321// fake styles 369// fake styles
322#define RS_Blink 0x00010000UL // blink 370#define RS_Blink (1UL << 29)
323#define RS_RVid 0x00020000UL // reverse video 371#define RS_RVid (1UL << 30) // reverse video
324#define RS_Uline 0x00040000UL // underline 372#define RS_Uline (1UL << 31) // underline
325
326// toggle this to force redraw, must be != RS_Careful
327#define RS_redraw 0x01000000UL
328
329// 5 custom bits for extensions
330#define RS_customCount 32
331#define RS_customMask 0x00f80000UL
332#define RS_customShift 19
333
334// other flags
335#define RS_Careful 0x80000000UL /* be careful when drawing these */
336
337#define RS_styleCount 4
338#define RS_styleMask (RS_Bold | RS_Italic)
339#define RS_styleShift 14
340 373
341#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)
342#define RS_attrMask (RS_baseattrMask | RS_fontMask) 375#define RS_attrMask (RS_baseattrMask | RS_fontMask)
343 376
344#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
345#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
346#define RS_fontShift 24
347
348#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 377#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
349#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 378#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
350 379
351#define Sel_none 0 /* Not waiting */ 380#define Sel_none 0 /* Not waiting */
352#define Sel_normal 0x01 /* normal selection */ 381#define Sel_normal 0x01 /* normal selection */
353#define Sel_incr 0x02 /* incremental selection */ 382#define Sel_incr 0x02 /* incremental selection */
354#define Sel_direct 0x00 383#define Sel_direct 0x00
… …
383 XTerm_Color_cursor = 12, // change actual 'Cursor' color 412 XTerm_Color_cursor = 12, // change actual 'Cursor' color
384 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 413 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
385 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 414 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
386 XTerm_Color05 = 15, // not implemented (tektronix fg) 415 XTerm_Color05 = 15, // not implemented (tektronix fg)
387 XTerm_Color06 = 16, // not implemented (tektronix bg) 416 XTerm_Color06 = 16, // not implemented (tektronix bg)
388 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
389 XTerm_logfile = 46, // not implemented 419 XTerm_logfile = 46, // not implemented
390 XTerm_font = 50, 420 XTerm_font = 50,
391 421
392 XTerm_konsole30 = 30, // reserved for konsole 422 XTerm_konsole30 = 30, // reserved for konsole
393 XTerm_konsole31 = 31, // reserved for konsole 423 XTerm_konsole31 = 31, // reserved for konsole
… …
395 /* 425 /*
396 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 426 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
397 */ 427 */
398 428
399 // deprecated 429 // deprecated
400 Rxvt_Color_BD = 18,
401 Rxvt_Color_UL = 19,
402 Rxvt_restoreFG = 39, 430 Rxvt_restoreFG = 39,
403 Rxvt_restoreBG = 49, 431 Rxvt_restoreBG = 49,
404 432
405 Rxvt_Pixmap = 20, // new bg pixmap 433 Rxvt_Pixmap = 20, // new bg pixmap
406 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 434 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
410 438
411 URxvt_Color_IT = 704, // change actual 'Italic' colour 439 URxvt_Color_IT = 704, // change actual 'Italic' colour
412 URxvt_Color_tint = 705, // change actual tint colour 440 URxvt_Color_tint = 705, // change actual tint colour
413 URxvt_Color_BD = 706, // change actual 'Bold' color 441 URxvt_Color_BD = 706, // change actual 'Bold' color
414 URxvt_Color_UL = 707, // change actual 'Underline' color 442 URxvt_Color_UL = 707, // change actual 'Underline' color
443 URxvt_Color_border = 708,
415 444
416 URxvt_font = 710, 445 URxvt_font = 710,
417 URxvt_boldFont = 711, 446 URxvt_boldFont = 711,
418 URxvt_italicFont = 712, 447 URxvt_italicFont = 712,
419 URxvt_boldItalicFont = 713, 448 URxvt_boldItalicFont = 713,
… …
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,
493#if USE_256_COLORS
494 maxTermCOLOR = Color_White + 240,
495#else
464 maxTermCOLOR = Color_White + 72, 496 maxTermCOLOR = Color_White + 72,
497#endif
465#ifndef NO_CURSORCOLOR 498#ifndef NO_CURSORCOLOR
466 Color_cursor, 499 Color_cursor,
467 Color_cursor2, 500 Color_cursor2,
468#endif 501#endif
469 Color_pointer_fg, 502 Color_pointer_fg,
… …
478#if ENABLE_FRILLS 511#if ENABLE_FRILLS
479 Color_underline, 512 Color_underline,
480#endif 513#endif
481#ifdef OPTION_HC 514#ifdef OPTION_HC
482 Color_HC, 515 Color_HC,
516 Color_HTC,
483#endif 517#endif
484 Color_scroll, 518 Color_scroll,
485#ifdef RXVT_SCROLLBAR 519#ifdef RXVT_SCROLLBAR
486 Color_trough, 520 Color_trough,
487#endif 521#endif
… …
499#else 533#else
500 TOTAL_COLORS = NRS_COLORS 534 TOTAL_COLORS = NRS_COLORS
501#endif 535#endif
502}; 536};
503 537
538#if USE_256_COLORS
539# define Color_Bits 9 // 0 .. maxTermCOLOR
540#else
504#define Color_Bits 7 // 0 .. maxTermCOLOR 541# define Color_Bits 7 // 0 .. maxTermCOLOR
542#endif
505 543
506/* 544/*
507 * Resource list 545 * Resource list
508 */ 546 */
509enum { 547enum {
… …
537#define PrivMode_vt52 (1UL<<18) 575#define PrivMode_vt52 (1UL<<18)
538#define PrivMode_LFNL (1UL<<19) 576#define PrivMode_LFNL (1UL<<19)
539#define PrivMode_MouseBtnEvent (1UL<<20) 577#define PrivMode_MouseBtnEvent (1UL<<20)
540#define PrivMode_MouseAnyEvent (1UL<<21) 578#define PrivMode_MouseAnyEvent (1UL<<21)
541#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
542 582
543#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)
544 584
545#ifdef ALLOW_132_MODE 585#ifdef ALLOW_132_MODE
546# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 586# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
555#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row 595#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
556#define UBUFSIZ 2048 // character buffer 596#define UBUFSIZ 2048 // character buffer
557 597
558#if ENABLE_FRILLS 598#if ENABLE_FRILLS
559# include <X11/Xmd.h> 599# include <X11/Xmd.h>
560typedef struct _mwmhints { 600typedef struct _mwmhints
601{
561 CARD32 flags; 602 CARD32 flags;
562 CARD32 functions; 603 CARD32 functions;
563 CARD32 decorations; 604 CARD32 decorations;
564 INT32 input_mode; 605 INT32 input_mode;
565 CARD32 status; 606 CARD32 status;
… …
596/* 637/*
597 ***************************************************************************** 638 *****************************************************************************
598 * MACRO DEFINES 639 * MACRO DEFINES
599 ***************************************************************************** 640 *****************************************************************************
600 */ 641 */
642
643// speed hack, copy some member variable into a local variable of the same name
601#define dLocal(type,name) type const name = this->name 644#define dLocal(type,name) type const name = this->name
602 645
603// 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
604// single-width. 647// single-width.
605#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))
… …
612#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 655#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
613#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 656#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
614#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 657#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
615#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 658#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
616 659
617#define LINENO(n) MOD (term_start + int(n), total_rows) 660#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
618#define ROW(n) row_buf [LINENO (n)] 661#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
662
663#define LINENO(n) LINENO_of (this, n)
664#define ROW(n) ROW_of (this, n)
619 665
620/* how to build & extract colors and attributes */ 666/* how to build & extract colors and attributes */
621#define GET_BASEFG(x) (((x) & RS_fgMask)) 667#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
622#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 668#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
623 669
624#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 670#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
625#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 671#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
626 672
627#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 673#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
628#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 674#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
629 675
630#define GET_ATTR(x) (((x) & RS_attrMask)) 676#define GET_ATTR(x) (((x) & RS_attrMask))
677// return attributes defining the background, encoding doesn't matter
678// depends on RS_fgShift > RS_bgShift
631#define GET_BGATTR(x) \ 679#define GET_BGATTR(x) \
680 (expect_false ((x) & RS_RVid) \
632 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 681 ? (((x) & (RS_attrMask & ~RS_RVid)) \
633 | (((x) & RS_fgMask)<<Color_Bits)) \ 682 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
634 : ((x) & (RS_attrMask | RS_bgMask))) 683 : ((x) & (RS_attrMask | RS_bgMask)))
635#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 684#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
636#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 685#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
637#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 686#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
638 687
639#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 688#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
640 689
641#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 690#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
642#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 691#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
643 692
644#if ENABLE_STYLES 693#if ENABLE_STYLES
645# define FONTSET(style) fontset[GET_STYLE (style)] 694# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
646#else 695#else
647# define FONTSET(style) fontset[0] 696# define FONTSET_of(t,style) (t)->fontset[0]
648#endif 697#endif
698
699#define FONTSET(style) FONTSET_of (this, style)
649 700
650typedef callback<void (const char *)> log_callback; 701typedef callback<void (const char *)> log_callback;
651typedef callback<int (int)> getfd_callback; 702typedef callback<int (int)> getfd_callback;
652 703
653/****************************************************************************/ 704/****************************************************************************/
… …
656#define LINE_FILTERED 0x0002 // line has been filtered 707#define LINE_FILTERED 0x0002 // line has been filtered
657#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 708#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
658#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 709#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
659#define LINE_BIDI 0x0010 // line needs bidi (NYI) 710#define LINE_BIDI 0x0010 // line needs bidi (NYI)
660 711
661struct line_t { 712struct line_t
713{
662 text_t *t; // terminal the text 714 text_t *t; // terminal the text
663 rend_t *r; // rendition, uses RS_ flags 715 rend_t *r; // rendition, uses RS_ flags
664 tlen_t_ l; // length of each text line 716 tlen_t_ l; // length of each text line
665 uint32_t f; // flags 717 uint32_t f; // flags
666 718
… …
700}; 752};
701 753
702/****************************************************************************/ 754/****************************************************************************/
703 755
704// primitive wrapper around mbstate_t to ensure initialisation 756// primitive wrapper around mbstate_t to ensure initialisation
705struct mbstate { 757struct mbstate
758{
706 mbstate_t mbs; 759 mbstate_t mbs;
707 760
708 operator mbstate_t *() { return &mbs; } 761 operator mbstate_t *() { return &mbs; }
709 void reset () { memset (&mbs, 0, sizeof (mbs)); } 762 void reset () { memset (&mbs, 0, sizeof (mbs)); }
710 mbstate () { reset (); } 763 mbstate () { reset (); }
… …
731 784
732#if ENABLE_COMBINING 785#if ENABLE_COMBINING
733// compose chars are used to represent composite characters 786// compose chars are used to represent composite characters
734// that are not representable in unicode, as well as characters 787// that are not representable in unicode, as well as characters
735// not fitting in the BMP. 788// not fitting in the BMP.
736struct compose_char { 789struct compose_char
790{
737 unicode_t c1, c2; // any chars != NOCHAR are valid 791 unicode_t c1, c2; // any chars != NOCHAR are valid
738 compose_char (unicode_t c1, unicode_t c2) 792 compose_char (unicode_t c1, unicode_t c2)
739 : c1(c1), c2(c2) 793 : c1(c1), c2(c2)
740 { } 794 { }
741}; 795};
742 796
743class rxvt_composite_vec { 797class rxvt_composite_vec
798{
744 vector<compose_char> v; 799 vector<compose_char> v;
745public: 800public:
746 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 801 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
747 int expand (unicode_t c, wchar_t *r); 802 int expand (unicode_t c, wchar_t *r);
748 compose_char *operator [](text_t c) 803 compose_char *operator [](text_t c)
… …
767extern rxvt_t rxvt_current_term; 822extern rxvt_t rxvt_current_term;
768 823
769#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 824#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
770#define GET_R rxvt_current_term 825#define GET_R rxvt_current_term
771 826
827/* ------------------------------------------------------------------------- */
828struct overlay_base
829{
830 int x, y, w, h; // overlay dimensions
831 text_t **text;
832 rend_t **rend;
833
834 // while tempting to add swap() etc. here, it effectively only increases code size
835};
836
837/* ------------------------------------------------------------------------- */
838
772typedef struct { 839typedef struct
840{
773 int row; 841 int row;
774 int col; 842 int col;
775} row_col_t; 843} row_col_t;
776 844
777/* 845/*
… …
808 * | 876 * |
809 * | 877 * |
810 * END······················= total_rows 878 * END······················= total_rows
811 */ 879 */
812 880
813struct TermWin_t { 881struct TermWin_t
882{
814 int width; /* window width [pixels] */ 883 int width; /* window width [pixels] */
815 int height; /* window height [pixels] */ 884 int height; /* window height [pixels] */
816 int fwidth; /* font width [pixels] */ 885 int fwidth; /* font width [pixels] */
817 int fheight; /* font height [pixels] */ 886 int fheight; /* font height [pixels] */
818 int fbase; /* font ascent (baseline) [pixels] */ 887 int fbase; /* font ascent (baseline) [pixels] */
… …
821 int focus; /* window has focus */ 890 int focus; /* window has focus */
822 int mapped; /* window state mapped? */ 891 int mapped; /* window state mapped? */
823 int int_bwidth; /* internal border width */ 892 int int_bwidth; /* internal border width */
824 int ext_bwidth; /* external border width */ 893 int ext_bwidth; /* external border width */
825 int lineSpace; /* number of extra pixels between rows */ 894 int lineSpace; /* number of extra pixels between rows */
895 int letterSpace; /* number of extra pixels between columns */
826 int saveLines; /* number of lines that fit in scrollback */ 896 int saveLines; /* number of lines that fit in scrollback */
827 int total_rows; /* total number of rows in this terminal */ 897 int total_rows; /* total number of rows in this terminal */
828 int term_start; /* term lines start here */ 898 int term_start; /* term lines start here */
829 int view_start; /* scrollback view starts here */ 899 int view_start; /* scrollback view starts here */
830 int top_row; /* topmost row index of scrollback */ 900 int top_row; /* topmost row index of scrollback */
… …
852 * end: row/column of one character past end of selection 922 * end: row/column of one character past end of selection
853 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow 923 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
854 * * Note: col == -1 ==> we're left of screen 924 * * Note: col == -1 ==> we're left of screen
855 * 925 *
856 */ 926 */
857typedef struct { 927struct screen_t
928{
858 row_col_t cur; /* cursor position on the screen */ 929 row_col_t cur; /* cursor position on the screen */
859 int tscroll; /* top of settable scroll region */ 930 int tscroll; /* top of settable scroll region */
860 int bscroll; /* bottom of settable scroll region */ 931 int bscroll; /* bottom of settable scroll region */
861 unsigned int charset; /* character set number [0..3] */ 932 unsigned int charset; /* character set number [0..3] */
862 unsigned int flags; /* see below */ 933 unsigned int flags; /* see below */
863 row_col_t s_cur; /* saved cursor position */ 934 row_col_t s_cur; /* saved cursor position */
864 unsigned int s_charset; /* saved character set number [0..3] */ 935 unsigned int s_charset; /* saved character set number [0..3] */
865 char s_charset_char; 936 char s_charset_char;
866 rend_t s_rstyle; /* saved rendition style */ 937 rend_t s_rstyle; /* saved rendition style */
867} screen_t; 938};
868 939
869enum selection_op_t { 940enum selection_op_t
941{
870 SELECTION_CLEAR = 0, /* nothing selected */ 942 SELECTION_CLEAR = 0, /* nothing selected */
871 SELECTION_INIT, /* marked a point */ 943 SELECTION_INIT, /* marked a point */
872 SELECTION_BEGIN, /* started a selection */ 944 SELECTION_BEGIN, /* started a selection */
873 SELECTION_CONT, /* continued selection */ 945 SELECTION_CONT, /* continued selection */
874 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 946 SELECTION_DONE /* selection put in CUT_BUFFER0 */
875}; 947};
876 948
877typedef struct { 949struct selection_t
950{
878 wchar_t *text; /* selected text */ 951 wchar_t *text; /* selected text */
879 unsigned int len; /* length of selected text */ 952 unsigned int len; /* length of selected text */
880 unsigned int screen; /* screen being used */ 953 unsigned int screen; /* screen being used */
881 unsigned int clicks; /* number of clicks */ 954 unsigned int clicks; /* number of clicks */
882 selection_op_t op; /* current operation */ 955 selection_op_t op; /* current operation */
883 bool rect; /* rectangular selection? */ 956 bool rect; /* rectangular selection? */
884 row_col_t beg; /* beginning of selection <= mark */ 957 row_col_t beg; /* beginning of selection <= mark */
885 row_col_t mark; /* point of initial click <= end */ 958 row_col_t mark; /* point of initial click <= end */
886 row_col_t end; /* one character past end point */ 959 row_col_t end; /* one character past end point */
887} selection_t; 960 wchar_t *clip_text; /* text copied to the clipboard */
961 unsigned int clip_len; /* length of clipboard text */
962};
888 963
889/* ------------------------------------------------------------------------- */ 964/* ------------------------------------------------------------------------- */
890 965
891/* screen_t flags */ 966/* screen_t flags */
892#define Screen_Relative (1<<0) /* relative origin mode flag */ 967#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
896#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 971#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
897#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 972#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
898 973
899/* rxvt_vars.options */ 974/* rxvt_vars.options */
900enum { 975enum {
901# define def(name,idx) Opt_ ## name = idx,
902# 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,
903# include "optinc.h" 979# include "optinc.h"
904# undef nodef 980# undef nodef
905# undef def 981# undef def
906Opt_count 982 Opt_count
907}; 983};
908 984
909/* ------------------------------------------------------------------------- */ 985/* ------------------------------------------------------------------------- */
910 986
911struct rxvt_vars : TermWin_t { 987struct rxvt_vars : TermWin_t
988{
912 scrollBar_t scrollBar; 989 scrollBar_t scrollBar;
913 uint8_t options[(Opt_count + 7) >> 3]; 990 uint8_t options[(Opt_count + 7) >> 3];
914 XSizeHints szHint; 991 XSizeHints szHint;
915 rxvt_color *pix_colors; 992 rxvt_color *pix_colors;
916 Cursor TermWin_cursor; /* cursor for vt window */ 993 Cursor TermWin_cursor; /* cursor for vt window */
917 int numlock_state;
918 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
919 line_t *drawn_buf; // text on screen 995 line_t *drawn_buf; // text on screen
920 line_t *swap_buf; // lines for swap buffer 996 line_t *swap_buf; // lines for swap buffer
921 char *tabs; /* per location: 1 == tab-stop */ 997 char *tabs; /* per location: 1 == tab-stop */
922 screen_t screen; 998 screen_t screen;
… …
926#ifdef OFF_FOCUS_FADING 1002#ifdef OFF_FOCUS_FADING
927 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 1003 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
928#endif 1004#endif
929}; 1005};
930 1006
931struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 1007struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
1008{
932 1009
933 // special markers with magic addresses 1010 // special markers with magic addresses
934 static const char resval_undef []; // options specifically unset 1011 static const char resval_undef []; // options specifically unset
935 static const char resval_on []; // boolean options switched on 1012 static const char resval_on []; // boolean options switched on
936 static const char resval_off []; // or off 1013 static const char resval_off []; // or off
… …
944 1021
945 unsigned char want_refresh:1, 1022 unsigned char want_refresh:1,
946 current_screen:1, /* primary or secondary */ 1023 current_screen:1, /* primary or secondary */
947 num_scr_allow:1, 1024 num_scr_allow:1,
948 bypass_keystate:1, 1025 bypass_keystate:1,
949#ifdef ENABLE_FRILLS 1026#if ENABLE_FRILLS
950 urgency_hint:1, 1027 urgency_hint:1,
951#endif 1028#endif
952#ifdef CURSOR_BLINK 1029#if CURSOR_BLINK
953 hidden_cursor:1, 1030 hidden_cursor:1,
954#endif 1031#endif
955#ifdef TEXT_BLINK 1032#if TEXT_BLINK
956 hidden_text:1, 1033 hidden_text:1,
957#endif 1034#endif
958#ifdef POINTER_BLANK 1035#if POINTER_BLANK
959 hidden_pointer:1, 1036 hidden_pointer:1,
960#endif 1037#endif
961 enc_utf8:1, /* wether locale uses utf-8 */ 1038 enc_utf8:1, /* whether locale uses utf-8 */
962 seen_input:1, /* wether we have seen some program output yet */ 1039 seen_input:1, /* whether we have seen some program output yet */
963 seen_resize:1, /* wether we had a resize event */ 1040 seen_resize:1, /* whether we had a resize event */
964 parsed_geometry:1; 1041 parsed_geometry:1;
965 1042
966 unsigned char refresh_type, 1043 unsigned char refresh_type,
967#ifdef META8_OPTION 1044#ifdef META8_OPTION
968 meta_char, /* Alt-key prefix */ 1045 meta_char, /* Alt-key prefix */
… …
972/* ---------- */ 1049/* ---------- */
973 bool rvideo_state, rvideo_mode; 1050 bool rvideo_state, rvideo_mode;
974#ifndef NO_BELL 1051#ifndef NO_BELL
975 bool rvideo_bell; 1052 bool rvideo_bell;
976#endif 1053#endif
977 int num_scr; /* screen: number lines scrolled */ 1054 int num_scr; /* screen: number of lines scrolled */
978 int prev_ncol, /* screen: previous number of columns */ 1055 int prev_ncol, /* screen: previous number of columns */
979 prev_nrow; /* screen: previous number of rows */ 1056 prev_nrow; /* screen: previous number of rows */
980/* ---------- */ 1057/* ---------- */
981 rend_t rstyle; 1058 rend_t rstyle;
982/* ---------- */ 1059/* ---------- */
… …
1012 SavedModes; 1089 SavedModes;
1013/* ---------- */ 1090/* ---------- */
1014 Atom *xa; 1091 Atom *xa;
1015/* ---------- */ 1092/* ---------- */
1016 Time selection_time, 1093 Time selection_time,
1017 selection_request_time; 1094 selection_request_time,
1095 clipboard_time;
1018 pid_t cmd_pid; /* process id of child */ 1096 pid_t cmd_pid; /* process id of child */
1019 char * incr_buf; 1097 char * incr_buf;
1020 size_t incr_buf_size, incr_buf_fill; 1098 size_t incr_buf_size, incr_buf_fill;
1021/* ---------- */ 1099/* ---------- */
1022 struct mouse_event MEvent; 1100 struct mouse_event MEvent;
1023 XComposeStatus compose; 1101 XComposeStatus compose;
1024 struct termios tio; 1102 static struct termios def_tio;
1025 row_col_t oldcursor; 1103 row_col_t oldcursor;
1026#ifdef HAVE_BG_PIXMAP 1104#ifdef HAVE_BG_PIXMAP
1027 bgPixmap_t bgPixmap; 1105 bgPixmap_t bgPixmap;
1028#endif 1106#endif
1029#ifdef HAVE_AFTERIMAGE 1107#ifdef HAVE_AFTERIMAGE
… …
1036 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1114 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1037 } 1115 }
1038#endif 1116#endif
1039 1117
1040#if ENABLE_OVERLAY 1118#if ENABLE_OVERLAY
1041 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1119 overlay_base ov;
1042 text_t **ov_text;
1043 rend_t **ov_rend;
1044 1120
1045 void scr_swap_overlay () NOTHROW; 1121 void scr_swap_overlay () NOTHROW;
1046 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1122 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1047 void scr_overlay_off () NOTHROW; 1123 void scr_overlay_off () NOTHROW;
1048 void scr_overlay_set (int x, int y, 1124 void scr_overlay_set (int x, int y,
… …
1105 void rootwin_cb (XEvent &xev); 1181 void rootwin_cb (XEvent &xev);
1106 xevent_watcher rootwin_ev; 1182 xevent_watcher rootwin_ev;
1107#endif 1183#endif
1108#ifdef HAVE_BG_PIXMAP 1184#ifdef HAVE_BG_PIXMAP
1109 void update_background (); 1185 void update_background ();
1110#if TRACE_PIXMAPS
1111 void trace_update_background (const char *file, int line);
1112# define update_background() trace_update_background (__FILE__, __LINE__)
1113#endif
1114 void update_background_cb (ev::timer &w, int revents); 1186 void update_background_cb (ev::timer &w, int revents);
1115 ev::timer update_background_ev; 1187 ev::timer update_background_ev;
1116#endif 1188#endif
1117 1189
1118 void x_cb (XEvent &xev); 1190 void x_cb (XEvent &xev);
… …
1205 void mouse_report (XButtonEvent &ev); 1277 void mouse_report (XButtonEvent &ev);
1206 void button_press (XButtonEvent &ev); 1278 void button_press (XButtonEvent &ev);
1207 void button_release (XButtonEvent &ev); 1279 void button_release (XButtonEvent &ev);
1208 void focus_in (); 1280 void focus_in ();
1209 void focus_out (); 1281 void focus_out ();
1282#if ENABLE_FRILLS
1210 void set_urgency (bool enable); 1283 void set_urgency (bool enable);
1284#else
1285 void set_urgency (bool enable) { }
1286#endif
1211 void update_fade_color (unsigned int idx); 1287 void update_fade_color (unsigned int idx);
1212#ifdef PRINTPIPE 1288#ifdef PRINTPIPE
1213 FILE *popen_printer (); 1289 FILE *popen_printer ();
1214 int pclose_printer (FILE *stream); 1290 int pclose_printer (FILE *stream);
1215#endif 1291#endif
… …
1221 void process_window_ops (const int *args, unsigned int nargs); 1297 void process_window_ops (const int *args, unsigned int nargs);
1222 char *get_to_st (unicode_t &ends_how); 1298 char *get_to_st (unicode_t &ends_how);
1223 void process_dcs_seq (); 1299 void process_dcs_seq ();
1224 void process_osc_seq (); 1300 void process_osc_seq ();
1225 void process_color_seq (int report, int color, const char *str, char resp); 1301 void process_color_seq (int report, int color, const char *str, char resp);
1226 void process_xterm_seq (int op, const char *str, char resp); 1302 void process_xterm_seq (int op, char *str, char resp);
1227 int privcases (int mode, unsigned long bit); 1303 int privcases (int mode, unsigned long bit);
1228 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1304 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1229 void process_sgr_mode (unsigned int nargs, const int *arg); 1305 void process_sgr_mode (unsigned int nargs, const int *arg);
1230 void process_graphics (); 1306 void process_graphics ();
1231 // init.C 1307 // init.C
… …
1240 int run_child (const char *const *argv); 1316 int run_child (const char *const *argv);
1241 void color_aliases (int idx); 1317 void color_aliases (int idx);
1242 void create_windows (int argc, const char *const *argv); 1318 void create_windows (int argc, const char *const *argv);
1243 void get_colours (); 1319 void get_colours ();
1244 void get_ourmods (); 1320 void get_ourmods ();
1321 void set_icon (const char *file);
1245 // main.C 1322 // main.C
1246 void tt_winch (); 1323 void tt_winch ();
1247 rxvt_term (); 1324 rxvt_term ();
1248 ~rxvt_term (); 1325 ~rxvt_term ();
1249 void destroy (); 1326 void destroy ();
… …
1251 void recolour_cursor (); 1328 void recolour_cursor ();
1252 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);
1253 void window_calc (unsigned int newwidth, unsigned int newheight); 1330 void window_calc (unsigned int newwidth, unsigned int newheight);
1254 bool set_fonts (); 1331 bool set_fonts ();
1255 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);
1256 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);
1257 void set_title (const char *str); 1335 void set_title (const char *str);
1258 void set_icon_name (const char *str); 1336 void set_icon_name (const char *str);
1259 void set_window_color (int idx, const char *color); 1337 void set_window_color (int idx, const char *color);
1260 void set_colorfgbg (); 1338 void set_colorfgbg ();
1261 bool set_color (rxvt_color &color, const char *name); 1339 bool set_color (rxvt_color &color, const char *name);
1262 void alias_color (int dst, int src); 1340 void alias_color (int dst, int src);
1263 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1341 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1264 void get_window_origin (int &x, int &y); 1342 void get_window_origin (int &x, int &y);
1265 Pixmap get_pixmap_property (int prop_id); 1343 Pixmap get_pixmap_property (Atom property);
1266 1344
1267 // screen.C 1345 // screen.C
1268 1346
1269 void lalloc (line_t &l) const 1347 void lalloc (line_t &l) const
1270 { 1348 {
… …
1322 return base; 1400 return base;
1323 } 1401 }
1324 1402
1325 bool option (uint8_t opt) const NOTHROW 1403 bool option (uint8_t opt) const NOTHROW
1326 { 1404 {
1327 if (!opt)
1328 return 0;
1329
1330 --opt;
1331 return options[opt >> 3] & (1 << (opt & 7)); 1405 return options[opt >> 3] & (1 << (opt & 7));
1332 } 1406 }
1333 1407
1334 void set_option (uint8_t opt, bool set = true) NOTHROW 1408 void set_option (uint8_t opt, bool set = true) NOTHROW;
1335 {
1336 if (!opt)
1337 return;
1338
1339 --opt;
1340 if (set)
1341 options[opt >> 3] |= (1 << (opt & 7));
1342 else
1343 options[opt >> 3] &= ~(1 << (opt & 7));
1344 }
1345 1409
1346 void set_privmode (unsigned bit, int set) NOTHROW 1410 void set_privmode (unsigned bit, int set) NOTHROW
1347 { 1411 {
1348 if (set) 1412 if (set)
1349 priv_modes |= bit; 1413 priv_modes |= bit;
1350 else 1414 else
1351 priv_modes &= ~bit; 1415 priv_modes &= ~bit;
1352 } 1416 }
1353 1417
1354 // modifies first argument(!) 1418 // modifies first argument(!)
1419 void tt_paste (char *data, unsigned int len) NOTHROW;
1355 void paste (char *data, unsigned int len) NOTHROW; 1420 void paste (char *data, unsigned int len) NOTHROW;
1356 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;
1357 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;
1358 void scr_kill_char (line_t &l, int col) const NOTHROW; 1423 void scr_kill_char (line_t &l, int col) const NOTHROW;
1359 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1424 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1368 void scr_backindex () NOTHROW; 1433 void scr_backindex () NOTHROW;
1369 void scr_forwardindex () NOTHROW; 1434 void scr_forwardindex () NOTHROW;
1370#endif 1435#endif
1371 void scr_touch (bool refresh) NOTHROW; 1436 void scr_touch (bool refresh) NOTHROW;
1372 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;
1373 void scr_recolour () NOTHROW; 1438 void scr_recolour (bool refresh = true) NOTHROW;
1374 void scr_remap_chars () NOTHROW; 1439 void scr_remap_chars () NOTHROW;
1375 void scr_remap_chars (line_t &l) NOTHROW; 1440 void scr_remap_chars (line_t &l) NOTHROW;
1376 1441
1377 enum cursor_mode { SAVE, RESTORE }; 1442 enum cursor_mode { SAVE, RESTORE };
1378 1443
1379 void scr_poweron (); 1444 void scr_poweron ();
1445 void scr_soft_reset () NOTHROW;
1380 void scr_cursor (cursor_mode mode) NOTHROW; 1446 void scr_cursor (cursor_mode mode) NOTHROW;
1381 void scr_do_wrap () NOTHROW; 1447 void scr_do_wrap () NOTHROW;
1382 void scr_swap_screen () NOTHROW; 1448 void scr_swap_screen () NOTHROW;
1383 void scr_change_screen (int scrn); 1449 void scr_change_screen (int scrn);
1384 void scr_color (unsigned int color, int fgbg) NOTHROW; 1450 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1416 void selection_check (int check_more) NOTHROW; 1482 void selection_check (int check_more) NOTHROW;
1417 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1483 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1418 void selection_property (Window win, Atom prop) NOTHROW; 1484 void selection_property (Window win, Atom prop) NOTHROW;
1419 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1485 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1420 int selection_request_other (Atom target, int selnum) NOTHROW; 1486 int selection_request_other (Atom target, int selnum) NOTHROW;
1421 void selection_clear () NOTHROW; 1487 void selection_clear (bool clipboard = false) NOTHROW;
1422 void selection_make (Time tm); 1488 void selection_make (Time tm);
1423 bool selection_grab (Time tm) NOTHROW; 1489 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1424 void selection_start_colrow (int col, int row) NOTHROW; 1490 void selection_start_colrow (int col, int row) NOTHROW;
1425 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;
1426 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;
1427 void selection_remove_trailing_spaces () NOTHROW; 1493 void selection_remove_trailing_spaces () NOTHROW;
1428 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1494 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;

Diff Legend

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