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.354 by ayin, Sun Jan 27 16:52:13 2008 UTC vs.
Revision 1.417 by root, Tue Nov 23 22:58:09 2010 UTC

… …
97/* 97/*
98 ***************************************************************************** 98 *****************************************************************************
99 * SYSTEM HACKS 99 * SYSTEM HACKS
100 ***************************************************************************** 100 *****************************************************************************
101 */ 101 */
102/* Consistent defines - please report on the necessity
103 * @ Unixware: defines (__svr4__)
104 */
105#if defined (SVR4) && !defined (__svr4__)
106# define __svr4__ 1
107#endif
108#if defined (sun) && !defined (__sun__)
109# define __sun__ 1
110#endif
111 102
112#ifndef HAVE_XPOINTER 103#ifndef HAVE_XPOINTER
113typedef char *XPointer; 104typedef char *XPointer;
114#endif 105#endif
115 106
… …
119 110
120#ifndef STDIN_FILENO 111#ifndef STDIN_FILENO
121# define STDIN_FILENO 0 112# define STDIN_FILENO 0
122# define STDOUT_FILENO 1 113# define STDOUT_FILENO 1
123# define STDERR_FILENO 2 114# define STDERR_FILENO 2
124#endif
125
126#if !defined (EACCESS) && defined(EAGAIN)
127# define EACCESS EAGAIN
128#endif 115#endif
129 116
130#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
131# define EXIT_SUCCESS 0 /* exit function success */ 118# define EXIT_SUCCESS 0 /* exit function success */
132# define EXIT_FAILURE 1 /* exit function failure */ 119# define EXIT_FAILURE 1 /* exit function failure */
… …
160char * rxvt_wcstombs (const wchar_t *str, int len = -1); 147char * rxvt_wcstombs (const wchar_t *str, int len = -1);
161wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 148wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
162char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 149char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
163wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 150wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
164 151
165char * rxvt_basename (const char *str) NOTHROW; 152const char * rxvt_basename (const char *str) NOTHROW;
166void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
167void rxvt_log (const char *fmt,...) NOTHROW; 154void rxvt_log (const char *fmt,...) NOTHROW;
168void rxvt_warn (const char *fmt,...) NOTHROW; 155void rxvt_warn (const char *fmt,...) NOTHROW;
169void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
170void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
… …
213 200
214/* 201/*
215 * the 'essential' information for reporting Mouse Events 202 * the 'essential' information for reporting Mouse Events
216 * pared down from XButtonEvent 203 * pared down from XButtonEvent
217 */ 204 */
218struct mouse_event { 205struct mouse_event
206{
219 int clicks; 207 int clicks;
220 Time time; /* milliseconds */ 208 Time time; /* milliseconds */
221 unsigned int state; /* key or button mask */ 209 unsigned int state; /* key or button mask */
222 unsigned int button; /* detail */ 210 unsigned int button; /* detail */
223}; 211};
… …
259# define COLORTERMENVFULL COLORTERMENV "-xpm" 247# define COLORTERMENVFULL COLORTERMENV "-xpm"
260#else 248#else
261# define COLORTERMENVFULL COLORTERMENV 249# define COLORTERMENVFULL COLORTERMENV
262#endif 250#endif
263#ifndef TERMENV 251#ifndef TERMENV
252# if USE_256_COLORS
253# define TERMENV "rxvt-unicode-256color"
254# else
264# define TERMENV "rxvt-unicode" 255# define TERMENV "rxvt-unicode"
256# endif
265#endif 257#endif
266 258
267#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 259#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
268# define NO_MOUSE_REPORT_SCROLLBAR 1 260# define NO_MOUSE_REPORT_SCROLLBAR 1
269#endif 261#endif
270 262
271#define scrollBar_esc 30 263#define scrollBar_esc 30
272
273#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
274# define HAVE_SCROLLBARS 1
275#endif
276 264
277#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR) 265#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR)
278# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1 266# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
279#endif 267#endif
280 268
… …
320enum { 308enum {
321 PRIMARY = 0, 309 PRIMARY = 0,
322 SECONDARY, 310 SECONDARY,
323}; 311};
324 312
313// define various rendition bits and masks. the rendition word
314// is 32 bits in size, and we should use it as efficiently as possible
315
325#define RS_None 0 316#define RS_None 0
326 317
327#define RS_fgMask 0x0000007fUL // 128 colors 318// GET_BGATTR depends on RS_fgShift > RS_bgShift
328#define RS_bgMask 0x00003f80UL // 128 colors 319#define RS_colorMask ((1UL << Color_Bits) - 1UL)
320#define RS_bgShift 0
321#define RS_fgShift (RS_bgShift + Color_Bits)
322#define RS_bgMask (RS_colorMask << RS_bgShift)
323#define RS_fgMask (RS_colorMask << RS_fgShift)
324
325// must have space for rxvt_fontset::fontCount * 2 + 2 values
326#define RS_fontShift (RS_fgShift + Color_Bits)
327#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
328#define RS_fontCount rxvt_fontset::fontCount
329#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
330
331// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
332#define RS_redraw (2UL << RS_fontShift)
333
334#define RS_Sel (1UL << 22)
335
336// 4 custom bits for extensions
337#define RS_customCount 16UL
338#define RS_customShift 23
339#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
329 340
330// font styles 341// font styles
331#define RS_Bold 0x00004000UL // value 1 342#define RS_Bold (1UL << RS_styleShift)
332#define RS_Italic 0x00008000UL // value 2 343#define RS_Italic (2UL << RS_styleShift)
344
345#define RS_styleCount 4
346#define RS_styleShift 27
347#define RS_styleMask (RS_Bold | RS_Italic)
333 348
334// fake styles 349// fake styles
335#define RS_Blink 0x00010000UL // blink 350#define RS_Blink (1UL << 29)
336#define RS_RVid 0x00020000UL // reverse video 351#define RS_RVid (1UL << 30) // reverse video
337#define RS_Uline 0x00040000UL // underline 352#define RS_Uline (1UL << 31) // underline
338
339// toggle this to force redraw, must be != RS_Careful
340#define RS_redraw 0x01000000UL
341
342// 5 custom bits for extensions
343#define RS_customCount 32
344#define RS_customMask 0x00f80000UL
345#define RS_customShift 19
346
347// other flags
348#define RS_Careful 0x80000000UL /* be careful when drawing these */
349
350#define RS_styleCount 4
351#define RS_styleMask (RS_Bold | RS_Italic)
352#define RS_styleShift 14
353 353
354#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 354#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
355#define RS_attrMask (RS_baseattrMask | RS_fontMask) 355#define RS_attrMask (RS_baseattrMask | RS_fontMask)
356 356
357#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
358#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
359#define RS_fontShift 24
360
361#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 357#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
362#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 358#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
363 359
364#define Sel_none 0 /* Not waiting */ 360#define Sel_none 0 /* Not waiting */
365#define Sel_normal 0x01 /* normal selection */ 361#define Sel_normal 0x01 /* normal selection */
366#define Sel_incr 0x02 /* incremental selection */ 362#define Sel_incr 0x02 /* incremental selection */
367#define Sel_direct 0x00 363#define Sel_direct 0x00
… …
396 XTerm_Color_cursor = 12, // change actual 'Cursor' color 392 XTerm_Color_cursor = 12, // change actual 'Cursor' color
397 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 393 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
398 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 394 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
399 XTerm_Color05 = 15, // not implemented (tektronix fg) 395 XTerm_Color05 = 15, // not implemented (tektronix fg)
400 XTerm_Color06 = 16, // not implemented (tektronix bg) 396 XTerm_Color06 = 16, // not implemented (tektronix bg)
401 XTerm_Color_RV = 17, // change actual 'Highlight' color 397 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
398 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
402 XTerm_logfile = 46, // not implemented 399 XTerm_logfile = 46, // not implemented
403 XTerm_font = 50, 400 XTerm_font = 50,
404 401
405 XTerm_konsole30 = 30, // reserved for konsole 402 XTerm_konsole30 = 30, // reserved for konsole
406 XTerm_konsole31 = 31, // reserved for konsole 403 XTerm_konsole31 = 31, // reserved for konsole
… …
408 /* 405 /*
409 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 406 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
410 */ 407 */
411 408
412 // deprecated 409 // deprecated
413 Rxvt_Color_BD = 18,
414 Rxvt_Color_UL = 19,
415 Rxvt_restoreFG = 39, 410 Rxvt_restoreFG = 39,
416 Rxvt_restoreBG = 49, 411 Rxvt_restoreBG = 49,
417 412
418 Rxvt_Pixmap = 20, // new bg pixmap 413 Rxvt_Pixmap = 20, // new bg pixmap
419 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 414 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
423 418
424 URxvt_Color_IT = 704, // change actual 'Italic' colour 419 URxvt_Color_IT = 704, // change actual 'Italic' colour
425 URxvt_Color_tint = 705, // change actual tint colour 420 URxvt_Color_tint = 705, // change actual tint colour
426 URxvt_Color_BD = 706, // change actual 'Bold' color 421 URxvt_Color_BD = 706, // change actual 'Bold' color
427 URxvt_Color_UL = 707, // change actual 'Underline' color 422 URxvt_Color_UL = 707, // change actual 'Underline' color
423 URxvt_Color_border = 708,
428 424
429 URxvt_font = 710, 425 URxvt_font = 710,
430 URxvt_boldFont = 711, 426 URxvt_boldFont = 711,
431 URxvt_italicFont = 712, 427 URxvt_italicFont = 712,
432 URxvt_boldItalicFont = 713, 428 URxvt_boldItalicFont = 713,
433 429
434 URxvt_view_up = 720, 430 URxvt_view_up = 720,
435 URxvt_view_down = 721, 431 URxvt_view_down = 721,
436 432
437 URxvt_perl = 777, 433 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
438}; 434};
439 435
440/* Words starting with `Color_' are colours. Others are counts */ 436/* Words starting with `Color_' are colours. Others are counts */
441/* 437/*
442 * The PixColor and rendition colour usage should probably be decoupled 438 * The PixColor and rendition colour usage should probably be decoupled
… …
472 Color_White = maxBrightCOLOR, 468 Color_White = maxBrightCOLOR,
473#else 469#else
474 Color_White = maxCOLOR, 470 Color_White = maxCOLOR,
475#endif 471#endif
476 minTermCOLOR = Color_White + 1, 472 minTermCOLOR = Color_White + 1,
473#if USE_256_COLORS
474 maxTermCOLOR = Color_White + 240,
475#else
477 maxTermCOLOR = Color_White + 72, 476 maxTermCOLOR = Color_White + 72,
477#endif
478#ifndef NO_CURSORCOLOR 478#ifndef NO_CURSORCOLOR
479 Color_cursor, 479 Color_cursor,
480 Color_cursor2, 480 Color_cursor2,
481#endif 481#endif
482 Color_pointer_fg, 482 Color_pointer_fg,
… …
491#if ENABLE_FRILLS 491#if ENABLE_FRILLS
492 Color_underline, 492 Color_underline,
493#endif 493#endif
494#ifdef OPTION_HC 494#ifdef OPTION_HC
495 Color_HC, 495 Color_HC,
496 Color_HTC,
496#endif 497#endif
497#ifdef HAVE_SCROLLBARS
498 Color_scroll, 498 Color_scroll,
499#endif
500#ifdef RXVT_SCROLLBAR 499#ifdef RXVT_SCROLLBAR
501 Color_trough, 500 Color_trough,
502#endif 501#endif
503#if ENABLE_TRANSPARENCY 502#if ENABLE_TRANSPARENCY
504 Color_tint, 503 Color_tint,
… …
514#else 513#else
515 TOTAL_COLORS = NRS_COLORS 514 TOTAL_COLORS = NRS_COLORS
516#endif 515#endif
517}; 516};
518 517
518#if USE_256_COLORS
519# define Color_Bits 9 // 0 .. maxTermCOLOR
520#else
519#define Color_Bits 7 // 0 .. maxTermCOLOR 521# define Color_Bits 7 // 0 .. maxTermCOLOR
522#endif
520 523
521/* 524/*
522 * Resource list 525 * Resource list
523 */ 526 */
524enum { 527enum {
… …
552#define PrivMode_vt52 (1UL<<18) 555#define PrivMode_vt52 (1UL<<18)
553#define PrivMode_LFNL (1UL<<19) 556#define PrivMode_LFNL (1UL<<19)
554#define PrivMode_MouseBtnEvent (1UL<<20) 557#define PrivMode_MouseBtnEvent (1UL<<20)
555#define PrivMode_MouseAnyEvent (1UL<<21) 558#define PrivMode_MouseAnyEvent (1UL<<21)
556#define PrivMode_BracketPaste (1UL<<22) 559#define PrivMode_BracketPaste (1UL<<22)
560#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
561#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
557 562
558#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 563#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
559 564
560#ifdef ALLOW_132_MODE 565#ifdef ALLOW_132_MODE
561# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 566# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
565 570
566// do not change these constants lightly, there are many interdependencies 571// do not change these constants lightly, there are many interdependencies
567#define IMBUFSIZ 128 // input modifier buffer sizes 572#define IMBUFSIZ 128 // input modifier buffer sizes
568#define KBUFSZ 512 // size of keyboard mapping buffer 573#define KBUFSZ 512 // size of keyboard mapping buffer
569#define CBUFSIZ 2048 // size of command buffer 574#define CBUFSIZ 2048 // size of command buffer
575#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
570#define UBUFSIZ 2048 // character buffer 576#define UBUFSIZ 2048 // character buffer
571 577
572#if ENABLE_FRILLS 578#if ENABLE_FRILLS
573# include <X11/Xmd.h> 579# include <X11/Xmd.h>
574typedef struct _mwmhints { 580typedef struct _mwmhints
581{
575 CARD32 flags; 582 CARD32 flags;
576 CARD32 functions; 583 CARD32 functions;
577 CARD32 decorations; 584 CARD32 decorations;
578 INT32 input_mode; 585 INT32 input_mode;
579 CARD32 status; 586 CARD32 status;
… …
610/* 617/*
611 ***************************************************************************** 618 *****************************************************************************
612 * MACRO DEFINES 619 * MACRO DEFINES
613 ***************************************************************************** 620 *****************************************************************************
614 */ 621 */
622
623// speed hack, copy some member variable into a local variable of the same name
615#define dLocal(type,name) type const name = this->name 624#define dLocal(type,name) type const name = this->name
616 625
617// for speed reasons, we assume that all codepoints 32 to 126 are 626// for speed reasons, we assume that all codepoints 32 to 126 are
618// single-width. 627// single-width.
619#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 628#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
626#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 635#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
627#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 636#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
628#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 637#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
629#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 638#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
630 639
631#define LINENO(n) MOD (term_start + int(n), total_rows) 640#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
632#define ROW(n) row_buf [LINENO (n)] 641#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
642
643#define LINENO(n) LINENO_of (this, n)
644#define ROW(n) ROW_of (this, n)
633 645
634/* how to build & extract colors and attributes */ 646/* how to build & extract colors and attributes */
635#define GET_BASEFG(x) (((x) & RS_fgMask)) 647#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
636#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 648#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
637 649
638#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 650#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
639#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 651#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
640 652
641#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 653#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
642#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 654#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
643 655
644#define GET_ATTR(x) (((x) & RS_attrMask)) 656#define GET_ATTR(x) (((x) & RS_attrMask))
657// return attributes defining the background, encoding doesn't matter
658// depends on RS_fgShift > RS_bgShift
645#define GET_BGATTR(x) \ 659#define GET_BGATTR(x) \
660 (expect_false ((x) & RS_RVid) \
646 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 661 ? (((x) & (RS_attrMask & ~RS_RVid)) \
647 | (((x) & RS_fgMask)<<Color_Bits)) \ 662 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
648 : ((x) & (RS_attrMask | RS_bgMask))) 663 : ((x) & (RS_attrMask | RS_bgMask)))
649#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 664#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
650#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 665#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
651#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 666#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
652 667
653#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 668#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
654 669
655#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 670#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
656#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 671#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
657 672
658#if ENABLE_STYLES 673#if ENABLE_STYLES
659# define FONTSET(style) fontset[GET_STYLE (style)] 674# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
660#else 675#else
661# define FONTSET(style) fontset[0] 676# define FONTSET_of(t,style) (t)->fontset[0]
662#endif 677#endif
678
679#define FONTSET(style) FONTSET_of (this, style)
663 680
664typedef callback<void (const char *)> log_callback; 681typedef callback<void (const char *)> log_callback;
665typedef callback<int (int)> getfd_callback; 682typedef callback<int (int)> getfd_callback;
666 683
667/****************************************************************************/ 684/****************************************************************************/
… …
670#define LINE_FILTERED 0x0002 // line has been filtered 687#define LINE_FILTERED 0x0002 // line has been filtered
671#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 688#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
672#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 689#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
673#define LINE_BIDI 0x0010 // line needs bidi (NYI) 690#define LINE_BIDI 0x0010 // line needs bidi (NYI)
674 691
675struct line_t { 692struct line_t
693{
676 text_t *t; // terminal the text 694 text_t *t; // terminal the text
677 rend_t *r; // rendition, uses RS_ flags 695 rend_t *r; // rendition, uses RS_ flags
678 tlen_t_ l; // length of each text line 696 tlen_t_ l; // length of each text line
679 uint32_t f; // flags 697 uint32_t f; // flags
680 698
… …
714}; 732};
715 733
716/****************************************************************************/ 734/****************************************************************************/
717 735
718// primitive wrapper around mbstate_t to ensure initialisation 736// primitive wrapper around mbstate_t to ensure initialisation
719struct mbstate { 737struct mbstate
738{
720 mbstate_t mbs; 739 mbstate_t mbs;
721 740
722 operator mbstate_t *() { return &mbs; } 741 operator mbstate_t *() { return &mbs; }
723 void reset () { memset (&mbs, 0, sizeof (mbs)); } 742 void reset () { memset (&mbs, 0, sizeof (mbs)); }
724 mbstate () { reset (); } 743 mbstate () { reset (); }
… …
745 764
746#if ENABLE_COMBINING 765#if ENABLE_COMBINING
747// compose chars are used to represent composite characters 766// compose chars are used to represent composite characters
748// that are not representable in unicode, as well as characters 767// that are not representable in unicode, as well as characters
749// not fitting in the BMP. 768// not fitting in the BMP.
750struct compose_char { 769struct compose_char
770{
751 unicode_t c1, c2; // any chars != NOCHAR are valid 771 unicode_t c1, c2; // any chars != NOCHAR are valid
752 compose_char (unicode_t c1, unicode_t c2) 772 compose_char (unicode_t c1, unicode_t c2)
753 : c1(c1), c2(c2) 773 : c1(c1), c2(c2)
754 { } 774 { }
755}; 775};
756 776
757class rxvt_composite_vec { 777class rxvt_composite_vec
778{
758 vector<compose_char> v; 779 vector<compose_char> v;
759public: 780public:
760 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 781 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
761 int expand (unicode_t c, wchar_t *r); 782 int expand (unicode_t c, wchar_t *r);
762 compose_char *operator [](text_t c) 783 compose_char *operator [](text_t c)
… …
781extern rxvt_t rxvt_current_term; 802extern rxvt_t rxvt_current_term;
782 803
783#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 804#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
784#define GET_R rxvt_current_term 805#define GET_R rxvt_current_term
785 806
807/* ------------------------------------------------------------------------- */
808struct overlay_base
809{
810 int x, y, w, h; // overlay dimensions
811 text_t **text;
812 rend_t **rend;
813
814 // while tempting to add swap() etc. here, it effectively only increases code size
815};
816
817/* ------------------------------------------------------------------------- */
818
786typedef struct { 819typedef struct
820{
787 int row; 821 int row;
788 int col; 822 int col;
789} row_col_t; 823} row_col_t;
790 824
791/* 825/*
… …
816 * +------------+·display·+·= term_start 850 * +------------+·display·+·= term_start
817 * | terminal | display | 851 * | terminal | display |
818 * | terminal +---------+ 852 * | terminal +---------+
819 * | terminal | 853 * | terminal |
820 * | terminal | 854 * | terminal |
821 * +------------+···········= term_stat + nrow - 1 855 * +------------+···········= term_start + nrow - 1
822 * | 856 * |
823 * | 857 * |
824 * END······················= total_rows 858 * END······················= total_rows
825 */ 859 */
826 860
827struct TermWin_t { 861struct TermWin_t
862{
828 int width; /* window width [pixels] */ 863 int width; /* window width [pixels] */
829 int height; /* window height [pixels] */ 864 int height; /* window height [pixels] */
830 int fwidth; /* font width [pixels] */ 865 int fwidth; /* font width [pixels] */
831 int fheight; /* font height [pixels] */ 866 int fheight; /* font height [pixels] */
832 int fbase; /* font ascent (baseline) [pixels] */ 867 int fbase; /* font ascent (baseline) [pixels] */
… …
835 int focus; /* window has focus */ 870 int focus; /* window has focus */
836 int mapped; /* window state mapped? */ 871 int mapped; /* window state mapped? */
837 int int_bwidth; /* internal border width */ 872 int int_bwidth; /* internal border width */
838 int ext_bwidth; /* external border width */ 873 int ext_bwidth; /* external border width */
839 int lineSpace; /* number of extra pixels between rows */ 874 int lineSpace; /* number of extra pixels between rows */
875 int letterSpace; /* number of extra pixels between columns */
840 int saveLines; /* number of lines that fit in scrollback */ 876 int saveLines; /* number of lines that fit in scrollback */
841 int total_rows; /* total number of rows in this terminal */ 877 int total_rows; /* total number of rows in this terminal */
842 int term_start; /* term lines start here */ 878 int term_start; /* term lines start here */
843 int view_start; /* scrollback view starts here */ 879 int view_start; /* scrollback view starts here */
844 int top_row; /* topmost row index of scrollback */ 880 int top_row; /* topmost row index of scrollback */
… …
862 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 898 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
863 * nothing is selected 899 * nothing is selected
864 * beg: row/column of beginning of selection : never past mark 900 * beg: row/column of beginning of selection : never past mark
865 * mark: row/column of initial click : never past end 901 * mark: row/column of initial click : never past end
866 * end: row/column of one character past end of selection 902 * end: row/column of one character past end of selection
867 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 903 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
868 * * Note: col == -1 ==> we're left of screen 904 * * Note: col == -1 ==> we're left of screen
869 * 905 *
870 */ 906 */
871typedef struct { 907struct screen_t
908{
872 row_col_t cur; /* cursor position on the screen */ 909 row_col_t cur; /* cursor position on the screen */
873 int tscroll; /* top of settable scroll region */ 910 int tscroll; /* top of settable scroll region */
874 int bscroll; /* bottom of settable scroll region */ 911 int bscroll; /* bottom of settable scroll region */
875 unsigned int charset; /* character set number [0..3] */ 912 unsigned int charset; /* character set number [0..3] */
876 unsigned int flags; /* see below */ 913 unsigned int flags; /* see below */
877 row_col_t s_cur; /* saved cursor position */ 914 row_col_t s_cur; /* saved cursor position */
878 unsigned int s_charset; /* saved character set number [0..3] */ 915 unsigned int s_charset; /* saved character set number [0..3] */
879 char s_charset_char; 916 char s_charset_char;
880 rend_t s_rstyle; /* saved rendition style */ 917 rend_t s_rstyle; /* saved rendition style */
881} screen_t; 918};
882 919
883enum selection_op_t { 920enum selection_op_t
921{
884 SELECTION_CLEAR = 0, /* nothing selected */ 922 SELECTION_CLEAR = 0, /* nothing selected */
885 SELECTION_INIT, /* marked a point */ 923 SELECTION_INIT, /* marked a point */
886 SELECTION_BEGIN, /* started a selection */ 924 SELECTION_BEGIN, /* started a selection */
887 SELECTION_CONT, /* continued selection */ 925 SELECTION_CONT, /* continued selection */
888 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 926 SELECTION_DONE /* selection put in CUT_BUFFER0 */
889}; 927};
890 928
891typedef struct { 929struct selection_t
930{
892 wchar_t *text; /* selected text */ 931 wchar_t *text; /* selected text */
893 unsigned int len; /* length of selected text */ 932 unsigned int len; /* length of selected text */
894 unsigned int screen; /* screen being used */ 933 unsigned int screen; /* screen being used */
895 unsigned int clicks; /* number of clicks */ 934 unsigned int clicks; /* number of clicks */
896 selection_op_t op; /* current operation */ 935 selection_op_t op; /* current operation */
897 bool rect; /* rectangular selection? */ 936 bool rect; /* rectangular selection? */
898 row_col_t beg; /* beginning of selection <= mark */ 937 row_col_t beg; /* beginning of selection <= mark */
899 row_col_t mark; /* point of initial click <= end */ 938 row_col_t mark; /* point of initial click <= end */
900 row_col_t end; /* one character past end point */ 939 row_col_t end; /* one character past end point */
901} selection_t; 940 wchar_t *clip_text; /* text copied to the clipboard */
941 unsigned int clip_len; /* length of clipboard text */
942};
902 943
903/* ------------------------------------------------------------------------- */ 944/* ------------------------------------------------------------------------- */
904 945
905/* screen_t flags */ 946/* screen_t flags */
906#define Screen_Relative (1<<0) /* relative origin mode flag */ 947#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
920Opt_count 961Opt_count
921}; 962};
922 963
923/* ------------------------------------------------------------------------- */ 964/* ------------------------------------------------------------------------- */
924 965
925struct rxvt_vars : TermWin_t { 966struct rxvt_vars : TermWin_t
967{
926 scrollBar_t scrollBar; 968 scrollBar_t scrollBar;
927 uint8_t options[(Opt_count + 7) >> 3]; 969 uint8_t options[(Opt_count + 7) >> 3];
928 XSizeHints szHint; 970 XSizeHints szHint;
929 rxvt_color *pix_colors; 971 rxvt_color *pix_colors;
930 Cursor TermWin_cursor; /* cursor for vt window */ 972 Cursor TermWin_cursor; /* cursor for vt window */
931 int numlock_state;
932 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 973 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
933 line_t *drawn_buf; // text on screen 974 line_t *drawn_buf; // text on screen
934 line_t *swap_buf; // lines for swap buffer 975 line_t *swap_buf; // lines for swap buffer
935 char *tabs; /* per location: 1 == tab-stop */ 976 char *tabs; /* per location: 1 == tab-stop */
936 screen_t screen; 977 screen_t screen;
… …
940#ifdef OFF_FOCUS_FADING 981#ifdef OFF_FOCUS_FADING
941 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 982 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
942#endif 983#endif
943}; 984};
944 985
945struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 986struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
987{
946 988
947 // special markers with magic addresses 989 // special markers with magic addresses
948 static const char resval_undef []; // options specifically unset 990 static const char resval_undef []; // options specifically unset
949 static const char resval_on []; // boolean options switched on 991 static const char resval_on []; // boolean options switched on
950 static const char resval_off []; // or off 992 static const char resval_off []; // or off
… …
958 1000
959 unsigned char want_refresh:1, 1001 unsigned char want_refresh:1,
960 current_screen:1, /* primary or secondary */ 1002 current_screen:1, /* primary or secondary */
961 num_scr_allow:1, 1003 num_scr_allow:1,
962 bypass_keystate:1, 1004 bypass_keystate:1,
1005#if ENABLE_FRILLS
1006 urgency_hint:1,
1007#endif
963#ifdef CURSOR_BLINK 1008#if CURSOR_BLINK
964 hidden_cursor:1, 1009 hidden_cursor:1,
965#endif 1010#endif
966#ifdef TEXT_BLINK 1011#if TEXT_BLINK
967 hidden_text:1, 1012 hidden_text:1,
968#endif 1013#endif
969#ifdef POINTER_BLANK 1014#if POINTER_BLANK
970 hidden_pointer:1, 1015 hidden_pointer:1,
971#endif 1016#endif
972 enc_utf8:1, /* wether locale uses utf-8 */ 1017 enc_utf8:1, /* whether locale uses utf-8 */
973 seen_input:1, /* wether we have seen some program output yet */ 1018 seen_input:1, /* whether we have seen some program output yet */
974 seen_resize:1, /* wether we had a resize event */ 1019 seen_resize:1, /* whether we had a resize event */
975 parsed_geometry:1; 1020 parsed_geometry:1;
976 1021
977 unsigned char refresh_type, 1022 unsigned char refresh_type,
978#ifdef META8_OPTION 1023#ifdef META8_OPTION
979 meta_char, /* Alt-key prefix */ 1024 meta_char, /* Alt-key prefix */
… …
983/* ---------- */ 1028/* ---------- */
984 bool rvideo_state, rvideo_mode; 1029 bool rvideo_state, rvideo_mode;
985#ifndef NO_BELL 1030#ifndef NO_BELL
986 bool rvideo_bell; 1031 bool rvideo_bell;
987#endif 1032#endif
988 int num_scr; /* screen: number lines scrolled */ 1033 int num_scr; /* screen: number of lines scrolled */
989 int prev_ncol, /* screen: previous number of columns */ 1034 int prev_ncol, /* screen: previous number of columns */
990 prev_nrow; /* screen: previous number of rows */ 1035 prev_nrow; /* screen: previous number of rows */
991/* ---------- */ 1036/* ---------- */
992 rend_t rstyle; 1037 rend_t rstyle;
993/* ---------- */ 1038/* ---------- */
… …
1005 mouse_slip_wheel_speed, 1050 mouse_slip_wheel_speed,
1006#endif 1051#endif
1007 refresh_count, 1052 refresh_count,
1008 window_vt_x, 1053 window_vt_x,
1009 window_vt_y, 1054 window_vt_y,
1010 window_sb_x,
1011 mouse_row, 1055 mouse_row,
1012 mouse_col, 1056 mouse_col,
1013# ifdef POINTER_BLANK 1057# ifdef POINTER_BLANK
1014 pointerBlankDelay, 1058 pointerBlankDelay,
1015# endif 1059# endif
… …
1023 unsigned long priv_modes, 1067 unsigned long priv_modes,
1024 SavedModes; 1068 SavedModes;
1025/* ---------- */ 1069/* ---------- */
1026 Atom *xa; 1070 Atom *xa;
1027/* ---------- */ 1071/* ---------- */
1028#ifdef RXVT_SCROLLBAR
1029 GC scrollbarGC,
1030 topShadowGC,
1031 botShadowGC;
1032#endif
1033#ifdef XTERM_SCROLLBAR
1034 GC xscrollbarGC,
1035 ShadowGC;
1036#endif
1037#ifdef PLAIN_SCROLLBAR
1038 GC pscrollbarGC;
1039#endif
1040#ifdef NEXT_SCROLLBAR
1041 GC blackGC,
1042 whiteGC,
1043 grayGC,
1044 darkGC,
1045 stippleGC;
1046 Pixmap dimple,
1047 upArrow,
1048 downArrow,
1049 upArrowHi,
1050 downArrowHi;
1051#endif
1052/* ---------- */
1053 Time selection_time, 1072 Time selection_time,
1054 selection_request_time; 1073 selection_request_time,
1074 clipboard_time;
1055 pid_t cmd_pid; /* process id of child */ 1075 pid_t cmd_pid; /* process id of child */
1056 char * incr_buf; 1076 char * incr_buf;
1057 size_t incr_buf_size, incr_buf_fill; 1077 size_t incr_buf_size, incr_buf_fill;
1058/* ---------- */ 1078/* ---------- */
1059 struct mouse_event MEvent; 1079 struct mouse_event MEvent;
1060 XComposeStatus compose; 1080 XComposeStatus compose;
1061 struct termios tio; 1081 static struct termios def_tio;
1062 row_col_t oldcursor; 1082 row_col_t oldcursor;
1063#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
1064 bgPixmap_t bgPixmap; 1084 bgPixmap_t bgPixmap;
1065#endif 1085#endif
1066#ifdef HAVE_AFTERIMAGE 1086#ifdef HAVE_AFTERIMAGE
1067 ASVisual *asv; 1087 ASVisual *asv;
1068 ASImageManager *asimman; 1088 ASImageManager *asimman;
1089
1090 void init_asv ()
1091 {
1092 if (!asv)
1093 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1094 }
1069#endif 1095#endif
1070 1096
1071#if ENABLE_OVERLAY 1097#if ENABLE_OVERLAY
1072 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1098 overlay_base ov;
1073 text_t **ov_text;
1074 rend_t **ov_rend;
1075 1099
1076 void scr_swap_overlay () NOTHROW; 1100 void scr_swap_overlay () NOTHROW;
1077 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1101 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1078 void scr_overlay_off () NOTHROW; 1102 void scr_overlay_off () NOTHROW;
1079 void scr_overlay_set (int x, int y, 1103 void scr_overlay_set (int x, int y,
… …
1117 1141
1118#if ENABLE_FRILLS || ISO_14755 1142#if ENABLE_FRILLS || ISO_14755
1119 // ISO 14755 entry support 1143 // ISO 14755 entry support
1120 unicode_t iso14755buf; 1144 unicode_t iso14755buf;
1121 void commit_iso14755 (); 1145 void commit_iso14755 ();
1122 int hex_keyval (XKeyEvent &ev);
1123# if ISO_14755 1146# if ISO_14755
1124 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1147 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1125 void iso14755_54 (int x, int y); 1148 void iso14755_54 (int x, int y);
1126# endif 1149# endif
1127#endif 1150#endif
… …
1137 void rootwin_cb (XEvent &xev); 1160 void rootwin_cb (XEvent &xev);
1138 xevent_watcher rootwin_ev; 1161 xevent_watcher rootwin_ev;
1139#endif 1162#endif
1140#ifdef HAVE_BG_PIXMAP 1163#ifdef HAVE_BG_PIXMAP
1141 void update_background (); 1164 void update_background ();
1142#if TRACE_PIXMAPS
1143 void trace_update_background (const char *file, int line);
1144# define update_background() trace_update_background (__FILE__, __LINE__)
1145#endif
1146 void update_background_cb (ev::timer &w, int revents); 1165 void update_background_cb (ev::timer &w, int revents);
1147 ev::timer update_background_ev; 1166 ev::timer update_background_ev;
1148#endif 1167#endif
1149 1168
1150 void x_cb (XEvent &xev); 1169 void x_cb (XEvent &xev);
1151 xevent_watcher termwin_ev; 1170 xevent_watcher termwin_ev;
1152 xevent_watcher vt_ev; 1171 xevent_watcher vt_ev;
1153#ifdef HAVE_SCROLLBARS
1154 xevent_watcher scrollbar_ev; 1172 xevent_watcher scrollbar_ev;
1155#endif
1156 1173
1157 void child_cb (ev::child &w, int revents); ev::child child_ev; 1174 void child_cb (ev::child &w, int revents); ev::child child_ev;
1158 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1175 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1159 void refresh_check (); 1176 void refresh_check ();
1160 void flush (); 1177 void flush ();
… …
1233 wchar_t next_char () NOTHROW; 1250 wchar_t next_char () NOTHROW;
1234 wchar_t cmd_getc () THROW ((class out_of_input)); 1251 wchar_t cmd_getc () THROW ((class out_of_input));
1235 uint32_t next_octet () NOTHROW; 1252 uint32_t next_octet () NOTHROW;
1236 uint32_t cmd_get8 () THROW ((class out_of_input)); 1253 uint32_t cmd_get8 () THROW ((class out_of_input));
1237 1254
1238 bool cmd_parse (); 1255 void cmd_parse ();
1239 void mouse_report (XButtonEvent &ev); 1256 void mouse_report (XButtonEvent &ev);
1240 void button_press (XButtonEvent &ev); 1257 void button_press (XButtonEvent &ev);
1241 void button_release (XButtonEvent &ev); 1258 void button_release (XButtonEvent &ev);
1242 void focus_in (); 1259 void focus_in ();
1243 void focus_out (); 1260 void focus_out ();
1261#if ENABLE_FRILLS
1262 void set_urgency (bool enable);
1263#else
1264 void set_urgency (bool enable) { }
1265#endif
1244 void update_fade_color (unsigned int idx); 1266 void update_fade_color (unsigned int idx);
1245#ifdef PRINTPIPE 1267#ifdef PRINTPIPE
1246 FILE *popen_printer (); 1268 FILE *popen_printer ();
1247 int pclose_printer (FILE *stream); 1269 int pclose_printer (FILE *stream);
1248#endif 1270#endif
… …
1254 void process_window_ops (const int *args, unsigned int nargs); 1276 void process_window_ops (const int *args, unsigned int nargs);
1255 char *get_to_st (unicode_t &ends_how); 1277 char *get_to_st (unicode_t &ends_how);
1256 void process_dcs_seq (); 1278 void process_dcs_seq ();
1257 void process_osc_seq (); 1279 void process_osc_seq ();
1258 void process_color_seq (int report, int color, const char *str, char resp); 1280 void process_color_seq (int report, int color, const char *str, char resp);
1259 void process_xterm_seq (int op, const char *str, char resp); 1281 void process_xterm_seq (int op, char *str, char resp);
1260 int privcases (int mode, unsigned long bit); 1282 int privcases (int mode, unsigned long bit);
1261 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1283 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1262 void process_sgr_mode (unsigned int nargs, const int *arg); 1284 void process_sgr_mode (unsigned int nargs, const int *arg);
1263 void process_graphics (); 1285 void process_graphics ();
1264 // init.C 1286 // init.C
… …
1271 void init_command (const char *const *argv); 1293 void init_command (const char *const *argv);
1272 void run_command (const char *const *argv); 1294 void run_command (const char *const *argv);
1273 int run_child (const char *const *argv); 1295 int run_child (const char *const *argv);
1274 void color_aliases (int idx); 1296 void color_aliases (int idx);
1275 void create_windows (int argc, const char *const *argv); 1297 void create_windows (int argc, const char *const *argv);
1276 void Get_Colours (); 1298 void get_colours ();
1277 void get_ourmods (); 1299 void get_ourmods ();
1300 void set_icon (const char *file);
1278 // main.C 1301 // main.C
1279 void tt_winch (); 1302 void tt_winch ();
1280 rxvt_term (); 1303 rxvt_term ();
1281 ~rxvt_term (); 1304 ~rxvt_term ();
1282 void destroy (); 1305 void destroy ();
… …
1284 void recolour_cursor (); 1307 void recolour_cursor ();
1285 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1308 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1286 void window_calc (unsigned int newwidth, unsigned int newheight); 1309 void window_calc (unsigned int newwidth, unsigned int newheight);
1287 bool set_fonts (); 1310 bool set_fonts ();
1288 void set_string_property (Atom prop, const char *str, int len = -1); 1311 void set_string_property (Atom prop, const char *str, int len = -1);
1312 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1289 void set_utf8_property (Atom prop, const char *str, int len = -1); 1313 void set_utf8_property (Atom prop, const char *str, int len = -1);
1290 void set_title (const char *str); 1314 void set_title (const char *str);
1291 void set_icon_name (const char *str); 1315 void set_icon_name (const char *str);
1292 void set_window_color (int idx, const char *color); 1316 void set_window_color (int idx, const char *color);
1293 void set_colorfgbg (); 1317 void set_colorfgbg ();
… …
1374 options[opt >> 3] |= (1 << (opt & 7)); 1398 options[opt >> 3] |= (1 << (opt & 7));
1375 else 1399 else
1376 options[opt >> 3] &= ~(1 << (opt & 7)); 1400 options[opt >> 3] &= ~(1 << (opt & 7));
1377 } 1401 }
1378 1402
1379 void PrivMode (int set, unsigned bit) NOTHROW 1403 void set_privmode (unsigned bit, int set) NOTHROW
1380 { 1404 {
1381 if (set) 1405 if (set)
1382 priv_modes |= bit; 1406 priv_modes |= bit;
1383 else 1407 else
1384 priv_modes &= ~bit; 1408 priv_modes &= ~bit;
1385 } 1409 }
1386 1410
1387 // modifies first argument(!) 1411 // modifies first argument(!)
1412 void tt_paste (char *data, unsigned int len) NOTHROW;
1388 void paste (char *data, unsigned int len) NOTHROW; 1413 void paste (char *data, unsigned int len) NOTHROW;
1389 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1414 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1390 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1415 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1416 void scr_kill_char (line_t &l, int col) const NOTHROW;
1391 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1417 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1392 void scr_reset (); 1418 void scr_reset ();
1393 void scr_release () NOTHROW; 1419 void scr_release () NOTHROW;
1394 void scr_clear (bool really = false) NOTHROW; 1420 void scr_clear (bool really = false) NOTHROW;
1395 void scr_refresh () NOTHROW; 1421 void scr_refresh () NOTHROW;
… …
1407 void scr_remap_chars (line_t &l) NOTHROW; 1433 void scr_remap_chars (line_t &l) NOTHROW;
1408 1434
1409 enum cursor_mode { SAVE, RESTORE }; 1435 enum cursor_mode { SAVE, RESTORE };
1410 1436
1411 void scr_poweron (); 1437 void scr_poweron ();
1438 void scr_soft_reset () NOTHROW;
1412 void scr_cursor (cursor_mode mode) NOTHROW; 1439 void scr_cursor (cursor_mode mode) NOTHROW;
1413 void scr_do_wrap () NOTHROW; 1440 void scr_do_wrap () NOTHROW;
1414 void scr_swap_screen () NOTHROW; 1441 void scr_swap_screen () NOTHROW;
1415 void scr_change_screen (int scrn); 1442 void scr_change_screen (int scrn);
1416 void scr_color (unsigned int color, int fgbg) NOTHROW; 1443 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1448 void selection_check (int check_more) NOTHROW; 1475 void selection_check (int check_more) NOTHROW;
1449 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1476 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1450 void selection_property (Window win, Atom prop) NOTHROW; 1477 void selection_property (Window win, Atom prop) NOTHROW;
1451 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1478 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1452 int selection_request_other (Atom target, int selnum) NOTHROW; 1479 int selection_request_other (Atom target, int selnum) NOTHROW;
1453 void selection_clear () NOTHROW; 1480 void selection_clear (bool clipboard = false) NOTHROW;
1454 void selection_make (Time tm); 1481 void selection_make (Time tm);
1455 bool selection_grab (Time tm) NOTHROW; 1482 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1456 void selection_start_colrow (int col, int row) NOTHROW; 1483 void selection_start_colrow (int col, int row) NOTHROW;
1457 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1484 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1458 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1485 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1459 void selection_remove_trailing_spaces () NOTHROW; 1486 void selection_remove_trailing_spaces () NOTHROW;
1460 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1487 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1461 void selection_click (int clicks, int x, int y) NOTHROW; 1488 void selection_click (int clicks, int x, int y) NOTHROW;
1462 void selection_extend (int x, int y, int flag) NOTHROW; 1489 void selection_extend (int x, int y, int flag) NOTHROW;
1463 void selection_rotate (int x, int y) NOTHROW; 1490 void selection_rotate (int x, int y) NOTHROW;
1464 1491
1465#if defined(NEXT_SCROLLBAR)
1466 // scrollbar-next.C
1467 Pixmap renderPixmap (const char *const *data, int width, int height);
1468 void init_scrollbar_stuff ();
1469 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1470 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1471#endif
1472
1473#if defined(RXVT_SCROLLBAR)
1474 // scrollbar-rxvt.C
1475 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1476#endif
1477
1478#if defined(XTERM_SCROLLBAR)
1479 // scrollbar-xterm.C
1480 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1481#endif
1482
1483#if defined(PLAIN_SCROLLBAR)
1484 // scrollbar-plain.C
1485 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1486#endif
1487
1488 // scrollbar.C
1489 void resize_scrollbar ();
1490 int scrollbar_mapping (int map);
1491 int scrollbar_show (int update);
1492 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1493
1494 // xdefaults.C 1492 // xdefaults.C
1495 void get_options (int argc, const char *const *argv); 1493 void get_options (int argc, const char *const *argv);
1496 int parse_keysym (const char *str, const char *arg); 1494 int parse_keysym (const char *str, const char *arg);
1497 const char *x_resource (const char *name); 1495 const char *x_resource (const char *name);
1498 void extract_resources (); 1496 void extract_resources ();

Diff Legend

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