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

Diff Legend

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