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.343 by ayin, Sat Dec 29 12:36:56 2007 UTC vs.
Revision 1.396 by root, Thu Apr 1 00:58:38 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};
… …
277# define NO_MOUSE_REPORT_SCROLLBAR 1 256# define NO_MOUSE_REPORT_SCROLLBAR 1
278#endif 257#endif
279 258
280#define scrollBar_esc 30 259#define scrollBar_esc 30
281 260
282#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 261#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR)
283# define HAVE_SCROLLBARS 1 262# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
284#endif 263#endif
285 264
286enum { 265enum {
287 NO_REFRESH = 0, /* Window not visible at all! */ 266 NO_REFRESH = 0, /* Window not visible at all! */
288 FAST_REFRESH = 1, /* Fully exposed window */ 267 FAST_REFRESH = 1, /* Fully exposed window */
… …
327 SECONDARY, 306 SECONDARY,
328}; 307};
329 308
330#define RS_None 0 309#define RS_None 0
331 310
332#define RS_fgMask 0x0000007fUL // 128 colors 311// GET_BGATTR depends on RS_fgShift > RS_bgShift
333#define RS_bgMask 0x00003f80UL // 128 colors 312#define RS_colorMask ((1UL << Color_Bits) - 1UL)
313#define RS_bgShift 0
314#define RS_fgShift (RS_bgShift + Color_Bits)
315#define RS_bgMask (RS_colorMask << RS_bgShift)
316#define RS_fgMask (RS_colorMask << RS_fgShift)
334 317
335// font styles 318// font styles
336#define RS_Bold 0x00004000UL // value 1 319#define RS_Bold 0x08000000UL // value 1
337#define RS_Italic 0x00008000UL // value 2 320#define RS_Italic 0x10000000UL // value 2
338
339// fake styles
340#define RS_Blink 0x00010000UL // blink
341#define RS_RVid 0x00020000UL // reverse video
342#define RS_Uline 0x00040000UL // 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 321
355#define RS_styleCount 4 322#define RS_styleCount 4
356#define RS_styleMask (RS_Bold | RS_Italic) 323#define RS_styleMask (RS_Bold | RS_Italic)
357#define RS_styleShift 14 324#define RS_styleShift 27
325
326// fake styles
327#define RS_Blink 0x20000000UL // blink
328#define RS_RVid 0x40000000UL // reverse video
329#define RS_Uline 0x80000000UL // underline
330
331// 5 custom bits for extensions
332#define RS_customCount 16UL
333#define RS_customShift 23
334#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
335
336// must have space for rxvt_fontset::fontCount * 2 + 2 values
337#define RS_fontShift (RS_fgShift + Color_Bits)
338#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
339#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
340
341// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
342#define RS_redraw (2UL << RS_fontShift)
358 343
359#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 344#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
360#define RS_attrMask (RS_baseattrMask | RS_fontMask) 345#define RS_attrMask (RS_baseattrMask | RS_fontMask)
361 346
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)) 347#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)) 348#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
368 349
369#define Sel_none 0 /* Not waiting */ 350#define Sel_none 0 /* Not waiting */
370#define Sel_normal 0x01 /* normal selection */ 351#define Sel_normal 0x01 /* normal selection */
371#define Sel_incr 0x02 /* incremental selection */ 352#define Sel_incr 0x02 /* incremental selection */
372#define Sel_direct 0x00 353#define Sel_direct 0x00
… …
394 XTerm_name = 0, 375 XTerm_name = 0,
395 XTerm_iconName = 1, 376 XTerm_iconName = 1,
396 XTerm_title = 2, 377 XTerm_title = 2,
397 XTerm_property = 3, // change X property 378 XTerm_property = 3, // change X property
398 XTerm_Color = 4, // change colors 379 XTerm_Color = 4, // change colors
399 XTerm_Color00 = 10, // not implemented, CLASH! 380 XTerm_Color00 = 10, // change fg color
400 XTerm_Color01 = 11, // not implemented 381 XTerm_Color01 = 11, // change bg color
401 XTerm_Color_cursor = 12, // change actual 'Cursor' color 382 XTerm_Color_cursor = 12, // change actual 'Cursor' color
402 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 383 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
403 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 384 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
404 XTerm_Color05 = 15, // not implemented (tektronix fg) 385 XTerm_Color05 = 15, // not implemented (tektronix fg)
405 XTerm_Color06 = 16, // not implemented (tektronix bg) 386 XTerm_Color06 = 16, // not implemented (tektronix bg)
… …
410 XTerm_konsole30 = 30, // reserved for konsole 391 XTerm_konsole30 = 30, // reserved for konsole
411 XTerm_konsole31 = 31, // reserved for konsole 392 XTerm_konsole31 = 31, // reserved for konsole
412 XTerm_emacs51 = 51, // reserved for emacs shell 393 XTerm_emacs51 = 51, // reserved for emacs shell
413 /* 394 /*
414 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 395 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
415 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
416 */ 396 */
417 Rxvt_Color_BD = 18, // change actual 'Bold' color 397
418 Rxvt_Color_UL = 19, // change actual 'Underline' color 398 // deprecated
399 Rxvt_Color_BD = 18,
400 Rxvt_Color_UL = 19,
401 Rxvt_restoreFG = 39,
402 Rxvt_restoreBG = 49,
403
419 Rxvt_Pixmap = 20, // new bg pixmap 404 Rxvt_Pixmap = 20, // new bg pixmap
420 Rxvt_restoreFG = 39, // change default fg color
421 Rxvt_restoreBG = 49, // change default bg color
422 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 405 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
423 406
424 URxvt_locale = 701, // change locale 407 URxvt_locale = 701, // change locale
425 URxvt_version = 702, // request version 408 URxvt_version = 702, // request version
426 409
427 URxvt_Color_IT = 704, // change actual 'Italic' colour 410 URxvt_Color_IT = 704, // change actual 'Italic' colour
428 URxvt_Color_tint = 705, // change actual tint colour 411 URxvt_Color_tint = 705, // change actual tint colour
412 URxvt_Color_BD = 706, // change actual 'Bold' color
413 URxvt_Color_UL = 707, // change actual 'Underline' color
429 URxvt_Color_BD = 706, 414 URxvt_Color_border = 708,
430 URxvt_Color_UL = 707,
431 415
432 URxvt_font = 710, 416 URxvt_font = 710,
433 URxvt_boldFont = 711, 417 URxvt_boldFont = 711,
434 URxvt_italicFont = 712, 418 URxvt_italicFont = 712,
435 URxvt_boldItalicFont = 713, 419 URxvt_boldItalicFont = 713,
436 420
437 URxvt_view_up = 720, 421 URxvt_view_up = 720,
438 URxvt_view_down = 721, 422 URxvt_view_down = 721,
439 423
440 URxvt_perl = 777, 424 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
441}; 425};
442 426
443/* Words starting with `Color_' are colours. Others are counts */ 427/* Words starting with `Color_' are colours. Others are counts */
444/* 428/*
445 * The PixColor and rendition colour usage should probably be decoupled 429 * The PixColor and rendition colour usage should probably be decoupled
… …
475 Color_White = maxBrightCOLOR, 459 Color_White = maxBrightCOLOR,
476#else 460#else
477 Color_White = maxCOLOR, 461 Color_White = maxCOLOR,
478#endif 462#endif
479 minTermCOLOR = Color_White + 1, 463 minTermCOLOR = Color_White + 1,
464#ifndef USE_256_COLORS
480 maxTermCOLOR = Color_White + 72, 465 maxTermCOLOR = Color_White + 72,
466#else
467 maxTermCOLOR = Color_White + 240,
468#endif
481#ifndef NO_CURSORCOLOR 469#ifndef NO_CURSORCOLOR
482 Color_cursor, 470 Color_cursor,
483 Color_cursor2, 471 Color_cursor2,
484#endif 472#endif
485 Color_pointer_fg, 473 Color_pointer_fg,
… …
495 Color_underline, 483 Color_underline,
496#endif 484#endif
497#ifdef OPTION_HC 485#ifdef OPTION_HC
498 Color_HC, 486 Color_HC,
499#endif 487#endif
500#ifdef KEEP_SCROLLCOLOR
501 Color_scroll, 488 Color_scroll,
489#ifdef RXVT_SCROLLBAR
502 Color_trough, 490 Color_trough,
503#endif 491#endif
504#if ENABLE_TRANSPARENCY 492#if ENABLE_TRANSPARENCY
505 Color_tint, 493 Color_tint,
506#endif 494#endif
507#if OFF_FOCUS_FADING 495#if OFF_FOCUS_FADING
508 Color_fade, 496 Color_fade,
509#endif 497#endif
510 NRS_COLORS, /* */ 498 NRS_COLORS, /* */
511#ifdef KEEP_SCROLLCOLOR 499#ifdef RXVT_SCROLLBAR
512 Color_topShadow = NRS_COLORS, 500 Color_topShadow = NRS_COLORS,
513 Color_bottomShadow, 501 Color_bottomShadow,
514 TOTAL_COLORS 502 TOTAL_COLORS
515#else 503#else
516 TOTAL_COLORS = NRS_COLORS 504 TOTAL_COLORS = NRS_COLORS
517#endif 505#endif
518}; 506};
519 507
508#ifndef USE_256_COLORS
520#define Color_Bits 7 // 0 .. maxTermCOLOR 509#define Color_Bits 7 // 0 .. maxTermCOLOR
510#else
511#define Color_Bits 9 // 0 .. maxTermCOLOR
512#endif
521 513
522/* 514/*
523 * Resource list 515 * Resource list
524 */ 516 */
525enum { 517enum {
… …
552#define PrivMode_smoothScroll (1UL<<17) 544#define PrivMode_smoothScroll (1UL<<17)
553#define PrivMode_vt52 (1UL<<18) 545#define PrivMode_vt52 (1UL<<18)
554#define PrivMode_LFNL (1UL<<19) 546#define PrivMode_LFNL (1UL<<19)
555#define PrivMode_MouseBtnEvent (1UL<<20) 547#define PrivMode_MouseBtnEvent (1UL<<20)
556#define PrivMode_MouseAnyEvent (1UL<<21) 548#define PrivMode_MouseAnyEvent (1UL<<21)
549#define PrivMode_BracketPaste (1UL<<22)
557 550
558#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 551#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
559 552
560#ifdef ALLOW_132_MODE 553#ifdef ALLOW_132_MODE
561# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 554# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
565 558
566// do not change these constants lightly, there are many interdependencies 559// do not change these constants lightly, there are many interdependencies
567#define IMBUFSIZ 128 // input modifier buffer sizes 560#define IMBUFSIZ 128 // input modifier buffer sizes
568#define KBUFSZ 512 // size of keyboard mapping buffer 561#define KBUFSZ 512 // size of keyboard mapping buffer
569#define CBUFSIZ 2048 // size of command buffer 562#define CBUFSIZ 2048 // size of command buffer
563#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
570#define UBUFSIZ 2048 // character buffer 564#define UBUFSIZ 2048 // character buffer
571 565
572#if ENABLE_FRILLS 566#if ENABLE_FRILLS
573# include <X11/Xmd.h> 567# include <X11/Xmd.h>
574typedef struct _mwmhints { 568typedef struct _mwmhints
569{
575 CARD32 flags; 570 CARD32 flags;
576 CARD32 functions; 571 CARD32 functions;
577 CARD32 decorations; 572 CARD32 decorations;
578 INT32 input_mode; 573 INT32 input_mode;
579 CARD32 status; 574 CARD32 status;
… …
626#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 621#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
627#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 622#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
628#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 623#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
629#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 624#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
630 625
631#define LINENO(n) MOD (term_start + int(n), total_rows) 626#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
632#define ROW(n) row_buf [LINENO (n)] 627#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
628
629#define LINENO(n) LINENO_of (this, n)
630#define ROW(n) ROW_of (this, n)
633 631
634/* how to build & extract colors and attributes */ 632/* how to build & extract colors and attributes */
635#define GET_BASEFG(x) (((x) & RS_fgMask)) 633#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
636#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 634#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
637 635
638#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 636#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
639#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 637#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
640 638
641#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 639#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
642#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 640#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
643 641
644#define GET_ATTR(x) (((x) & RS_attrMask)) 642#define GET_ATTR(x) (((x) & RS_attrMask))
643// return attributes defining the background, encoding doesn't matter
644// depends on RS_fgShift > RS_bgShift
645#define GET_BGATTR(x) \ 645#define GET_BGATTR(x) \
646 (expect_false ((x) & RS_RVid) \
646 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 647 ? (((x) & (RS_attrMask & ~RS_RVid)) \
647 | (((x) & RS_fgMask)<<Color_Bits)) \ 648 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
648 : ((x) & (RS_attrMask | RS_bgMask))) 649 : ((x) & (RS_attrMask | RS_bgMask)))
649#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 650#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
650#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 651#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
651#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 652#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
652 653
653#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 654#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
654 655
655#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 656#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
656#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 657#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
657 658
658#if ENABLE_STYLES 659#if ENABLE_STYLES
659# define FONTSET(style) fontset[GET_STYLE (style)] 660# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
660#else 661#else
661# define FONTSET(style) fontset[0] 662# define FONTSET_of(t,style) (t)->fontset[0]
662#endif 663#endif
663 664
664#ifdef HAVE_SCROLLBARS 665#define FONTSET(style) FONTSET_of (this, style)
665# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
666#else
667# define scrollbar_TotalWidth() (0)
668#endif
669 666
670typedef callback<void (const char *)> log_callback; 667typedef callback<void (const char *)> log_callback;
671typedef callback<int (int)> getfd_callback; 668typedef callback<int (int)> getfd_callback;
672 669
673/****************************************************************************/ 670/****************************************************************************/
… …
676#define LINE_FILTERED 0x0002 // line has been filtered 673#define LINE_FILTERED 0x0002 // line has been filtered
677#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 674#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
678#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 675#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
679#define LINE_BIDI 0x0010 // line needs bidi (NYI) 676#define LINE_BIDI 0x0010 // line needs bidi (NYI)
680 677
681struct line_t { 678struct line_t
679{
682 text_t *t; // terminal the text 680 text_t *t; // terminal the text
683 rend_t *r; // rendition, uses RS_ flags 681 rend_t *r; // rendition, uses RS_ flags
684 tlen_t_ l; // length of each text line 682 tlen_t_ l; // length of each text line
685 uint32_t f; // flags 683 uint32_t f; // flags
686 684
… …
720}; 718};
721 719
722/****************************************************************************/ 720/****************************************************************************/
723 721
724// primitive wrapper around mbstate_t to ensure initialisation 722// primitive wrapper around mbstate_t to ensure initialisation
725struct mbstate { 723struct mbstate
724{
726 mbstate_t mbs; 725 mbstate_t mbs;
727 726
728 operator mbstate_t *() { return &mbs; } 727 operator mbstate_t *() { return &mbs; }
729 void reset () { memset (&mbs, 0, sizeof (mbs)); } 728 void reset () { memset (&mbs, 0, sizeof (mbs)); }
730 mbstate () { reset (); } 729 mbstate () { reset (); }
… …
751 750
752#if ENABLE_COMBINING 751#if ENABLE_COMBINING
753// compose chars are used to represent composite characters 752// compose chars are used to represent composite characters
754// that are not representable in unicode, as well as characters 753// that are not representable in unicode, as well as characters
755// not fitting in the BMP. 754// not fitting in the BMP.
756struct compose_char { 755struct compose_char
756{
757 unicode_t c1, c2; // any chars != NOCHAR are valid 757 unicode_t c1, c2; // any chars != NOCHAR are valid
758 compose_char (unicode_t c1, unicode_t c2) 758 compose_char (unicode_t c1, unicode_t c2)
759 : c1(c1), c2(c2) 759 : c1(c1), c2(c2)
760 { } 760 { }
761}; 761};
762 762
763class rxvt_composite_vec { 763class rxvt_composite_vec
764{
764 vector<compose_char> v; 765 vector<compose_char> v;
765public: 766public:
766 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 767 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
767 int expand (unicode_t c, wchar_t *r); 768 int expand (unicode_t c, wchar_t *r);
768 compose_char *operator [](text_t c) 769 compose_char *operator [](text_t c)
… …
787extern rxvt_t rxvt_current_term; 788extern rxvt_t rxvt_current_term;
788 789
789#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 790#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
790#define GET_R rxvt_current_term 791#define GET_R rxvt_current_term
791 792
793/* ------------------------------------------------------------------------- */
794struct overlay_base
795{
796 int x, y, w, h; // overlay dimensions
797 text_t **text;
798 rend_t **rend;
799
800 // while tempting to add swap() etc. here, it effetcively only increases code size
801};
802
803/* ------------------------------------------------------------------------- */
804
792typedef struct { 805typedef struct
806{
793 int row; 807 int row;
794 int col; 808 int col;
795} row_col_t; 809} row_col_t;
796 810
797/* 811/*
… …
822 * +------------+·display·+·= term_start 836 * +------------+·display·+·= term_start
823 * | terminal | display | 837 * | terminal | display |
824 * | terminal +---------+ 838 * | terminal +---------+
825 * | terminal | 839 * | terminal |
826 * | terminal | 840 * | terminal |
827 * +------------+···········= term_stat + nrow - 1 841 * +------------+···········= term_start + nrow - 1
828 * | 842 * |
829 * | 843 * |
830 * END······················= total_rows 844 * END······················= total_rows
831 */ 845 */
832 846
833struct TermWin_t { 847struct TermWin_t
848{
834 int width; /* window width [pixels] */ 849 int width; /* window width [pixels] */
835 int height; /* window height [pixels] */ 850 int height; /* window height [pixels] */
836 int fwidth; /* font width [pixels] */ 851 int fwidth; /* font width [pixels] */
837 int fheight; /* font height [pixels] */ 852 int fheight; /* font height [pixels] */
838 int fbase; /* font ascent (baseline) [pixels] */ 853 int fbase; /* font ascent (baseline) [pixels] */
… …
841 int focus; /* window has focus */ 856 int focus; /* window has focus */
842 int mapped; /* window state mapped? */ 857 int mapped; /* window state mapped? */
843 int int_bwidth; /* internal border width */ 858 int int_bwidth; /* internal border width */
844 int ext_bwidth; /* external border width */ 859 int ext_bwidth; /* external border width */
845 int lineSpace; /* number of extra pixels between rows */ 860 int lineSpace; /* number of extra pixels between rows */
861 int letterSpace; /* number of extra pixels between columns */
846 int saveLines; /* number of lines that fit in scrollback */ 862 int saveLines; /* number of lines that fit in scrollback */
847 int total_rows; /* total number of rows in this terminal */ 863 int total_rows; /* total number of rows in this terminal */
848 int term_start; /* term lines start here */ 864 int term_start; /* term lines start here */
849 int view_start; /* scrollback view starts here */ 865 int view_start; /* scrollback view starts here */
850 int top_row; /* topmost row index of scrollback */ 866 int top_row; /* topmost row index of scrollback */
… …
868 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 884 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
869 * nothing is selected 885 * nothing is selected
870 * beg: row/column of beginning of selection : never past mark 886 * beg: row/column of beginning of selection : never past mark
871 * mark: row/column of initial click : never past end 887 * mark: row/column of initial click : never past end
872 * end: row/column of one character past end of selection 888 * end: row/column of one character past end of selection
873 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 889 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
874 * * Note: col == -1 ==> we're left of screen 890 * * Note: col == -1 ==> we're left of screen
875 * 891 *
876 */ 892 */
877typedef struct { 893struct screen_t
894{
878 row_col_t cur; /* cursor position on the screen */ 895 row_col_t cur; /* cursor position on the screen */
879 int tscroll; /* top of settable scroll region */ 896 int tscroll; /* top of settable scroll region */
880 int bscroll; /* bottom of settable scroll region */ 897 int bscroll; /* bottom of settable scroll region */
881 unsigned int charset; /* character set number [0..3] */ 898 unsigned int charset; /* character set number [0..3] */
882 unsigned int flags; /* see below */ 899 unsigned int flags; /* see below */
883 row_col_t s_cur; /* saved cursor position */ 900 row_col_t s_cur; /* saved cursor position */
884 unsigned int s_charset; /* saved character set number [0..3] */ 901 unsigned int s_charset; /* saved character set number [0..3] */
885 char s_charset_char; 902 char s_charset_char;
886 rend_t s_rstyle; /* saved rendition style */ 903 rend_t s_rstyle; /* saved rendition style */
887} screen_t; 904};
888 905
889enum selection_op_t { 906enum selection_op_t
907{
890 SELECTION_CLEAR = 0, /* nothing selected */ 908 SELECTION_CLEAR = 0, /* nothing selected */
891 SELECTION_INIT, /* marked a point */ 909 SELECTION_INIT, /* marked a point */
892 SELECTION_BEGIN, /* started a selection */ 910 SELECTION_BEGIN, /* started a selection */
893 SELECTION_CONT, /* continued selection */ 911 SELECTION_CONT, /* continued selection */
894 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 912 SELECTION_DONE /* selection put in CUT_BUFFER0 */
895}; 913};
896 914
897typedef struct { 915struct selection_t
916{
898 wchar_t *text; /* selected text */ 917 wchar_t *text; /* selected text */
899 unsigned int len; /* length of selected text */ 918 unsigned int len; /* length of selected text */
900 unsigned int screen; /* screen being used */ 919 unsigned int screen; /* screen being used */
901 unsigned int clicks; /* number of clicks */ 920 unsigned int clicks; /* number of clicks */
902 selection_op_t op; /* current operation */ 921 selection_op_t op; /* current operation */
903 bool rect; /* rectangular selection? */ 922 bool rect; /* rectangular selection? */
904 row_col_t beg; /* beginning of selection <= mark */ 923 row_col_t beg; /* beginning of selection <= mark */
905 row_col_t mark; /* point of initial click <= end */ 924 row_col_t mark; /* point of initial click <= end */
906 row_col_t end; /* one character past end point */ 925 row_col_t end; /* one character past end point */
907} selection_t; 926 wchar_t *clip_text; /* text copied to the clipboard */
927 unsigned int clip_len; /* length of clipboard text */
928};
908 929
909/* ------------------------------------------------------------------------- */ 930/* ------------------------------------------------------------------------- */
910 931
911/* screen_t flags */ 932/* screen_t flags */
912#define Screen_Relative (1<<0) /* relative origin mode flag */ 933#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
926Opt_count 947Opt_count
927}; 948};
928 949
929/* ------------------------------------------------------------------------- */ 950/* ------------------------------------------------------------------------- */
930 951
931struct rxvt_vars : TermWin_t { 952struct rxvt_vars : TermWin_t
953{
932 scrollBar_t scrollBar; 954 scrollBar_t scrollBar;
933 uint8_t options[(Opt_count + 7) >> 3]; 955 uint8_t options[(Opt_count + 7) >> 3];
934 XSizeHints szHint; 956 XSizeHints szHint;
935 rxvt_color *pix_colors; 957 rxvt_color *pix_colors;
936 Cursor TermWin_cursor; /* cursor for vt window */ 958 Cursor TermWin_cursor; /* cursor for vt window */
937 int sb_shadow; /* scrollbar shadow width */
938 int numlock_state; 959 int numlock_state;
939 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 960 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
940 line_t *drawn_buf; // text on screen 961 line_t *drawn_buf; // text on screen
941 line_t *swap_buf; // lines for swap buffer 962 line_t *swap_buf; // lines for swap buffer
942 char *tabs; /* per location: 1 == tab-stop */ 963 char *tabs; /* per location: 1 == tab-stop */
… …
947#ifdef OFF_FOCUS_FADING 968#ifdef OFF_FOCUS_FADING
948 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 969 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
949#endif 970#endif
950}; 971};
951 972
952struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 973struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
974{
953 975
954 // special markers with magic addresses 976 // special markers with magic addresses
955 static const char resval_undef []; // options specifically unset 977 static const char resval_undef []; // options specifically unset
956 static const char resval_on []; // boolean options switched on 978 static const char resval_on []; // boolean options switched on
957 static const char resval_off []; // or off 979 static const char resval_off []; // or off
… …
965 987
966 unsigned char want_refresh:1, 988 unsigned char want_refresh:1,
967 current_screen:1, /* primary or secondary */ 989 current_screen:1, /* primary or secondary */
968 num_scr_allow:1, 990 num_scr_allow:1,
969 bypass_keystate:1, 991 bypass_keystate:1,
992#if ENABLE_FRILLS
993 urgency_hint:1,
994#endif
970#ifdef CURSOR_BLINK 995#if CURSOR_BLINK
971 hidden_cursor:1, 996 hidden_cursor:1,
972#endif 997#endif
973#ifdef TEXT_BLINK 998#if TEXT_BLINK
974 hidden_text:1, 999 hidden_text:1,
975#endif 1000#endif
976#ifdef POINTER_BLANK 1001#if POINTER_BLANK
977 hidden_pointer:1, 1002 hidden_pointer:1,
978#endif 1003#endif
979 enc_utf8:1, /* wether locale uses utf-8 */ 1004 enc_utf8:1, /* whether locale uses utf-8 */
980 seen_input:1, /* wether we have seen some program output yet */ 1005 seen_input:1, /* whether we have seen some program output yet */
981 seen_resize:1, /* wether we had a resize event */ 1006 seen_resize:1, /* whether we had a resize event */
982 parsed_geometry:1; 1007 parsed_geometry:1;
983 1008
984 unsigned char refresh_type, 1009 unsigned char refresh_type,
985#ifdef META8_OPTION 1010#ifdef META8_OPTION
986 meta_char, /* Alt-key prefix */ 1011 meta_char, /* Alt-key prefix */
987#endif 1012#endif
988 scrollbar_align,
989 selection_wait, 1013 selection_wait,
990 selection_type; 1014 selection_type;
991/* ---------- */ 1015/* ---------- */
992 bool rvideo_state, rvideo_mode; 1016 bool rvideo_state, rvideo_mode;
993#ifndef NO_BELL 1017#ifndef NO_BELL
994 bool rvideo_bell; 1018 bool rvideo_bell;
995#endif 1019#endif
996 int num_scr; /* screen: number lines scrolled */ 1020 int num_scr; /* screen: number of lines scrolled */
997 int prev_ncol, /* screen: previous number of columns */ 1021 int prev_ncol, /* screen: previous number of columns */
998 prev_nrow; /* screen: previous number of rows */ 1022 prev_nrow; /* screen: previous number of rows */
999/* ---------- */ 1023/* ---------- */
1000 rend_t rstyle; 1024 rend_t rstyle;
1001/* ---------- */ 1025/* ---------- */
… …
1011 /* give proper Scroll behaviour */ 1035 /* give proper Scroll behaviour */
1012#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1036#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1013 mouse_slip_wheel_speed, 1037 mouse_slip_wheel_speed,
1014#endif 1038#endif
1015 refresh_count, 1039 refresh_count,
1016 last_bot, /* scrollbar last bottom position */
1017 last_top, /* scrollbar last top position */
1018 last_state, /* scrollbar last state */
1019 scrollbar_len,
1020 window_vt_x, 1040 window_vt_x,
1021 window_vt_y, 1041 window_vt_y,
1022 window_sb_x,
1023 mouse_row, 1042 mouse_row,
1024 mouse_col, 1043 mouse_col,
1025# ifdef POINTER_BLANK 1044# ifdef POINTER_BLANK
1026 pointerBlankDelay, 1045 pointerBlankDelay,
1027# endif 1046# endif
… …
1035 unsigned long priv_modes, 1054 unsigned long priv_modes,
1036 SavedModes; 1055 SavedModes;
1037/* ---------- */ 1056/* ---------- */
1038 Atom *xa; 1057 Atom *xa;
1039/* ---------- */ 1058/* ---------- */
1040#ifdef RXVT_SCROLLBAR
1041 GC scrollbarGC,
1042 topShadowGC,
1043 botShadowGC;
1044#endif
1045#ifdef XTERM_SCROLLBAR
1046 GC xscrollbarGC,
1047 ShadowGC;
1048#endif
1049#ifdef PLAIN_SCROLLBAR
1050 GC pscrollbarGC;
1051#endif
1052#ifdef NEXT_SCROLLBAR
1053 GC blackGC,
1054 whiteGC,
1055 grayGC,
1056 darkGC,
1057 stippleGC;
1058 Pixmap dimple,
1059 upArrow,
1060 downArrow,
1061 upArrowHi,
1062 downArrowHi;
1063#endif
1064/* ---------- */
1065 Time selection_time, 1059 Time selection_time,
1066 selection_request_time; 1060 selection_request_time,
1061 clipboard_time;
1067 pid_t cmd_pid; /* process id of child */ 1062 pid_t cmd_pid; /* process id of child */
1068 char * incr_buf; 1063 char * incr_buf;
1069 size_t incr_buf_size, incr_buf_fill; 1064 size_t incr_buf_size, incr_buf_fill;
1070/* ---------- */
1071 Cursor leftptr_cursor;
1072/* ---------- */ 1065/* ---------- */
1073 struct mouse_event MEvent; 1066 struct mouse_event MEvent;
1074 XComposeStatus compose; 1067 XComposeStatus compose;
1075 struct termios tio; 1068 struct termios tio;
1076 row_col_t oldcursor; 1069 row_col_t oldcursor;
… …
1078 bgPixmap_t bgPixmap; 1071 bgPixmap_t bgPixmap;
1079#endif 1072#endif
1080#ifdef HAVE_AFTERIMAGE 1073#ifdef HAVE_AFTERIMAGE
1081 ASVisual *asv; 1074 ASVisual *asv;
1082 ASImageManager *asimman; 1075 ASImageManager *asimman;
1076
1077 void init_asv ()
1078 {
1079 if (!asv)
1080 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1081 }
1083#endif 1082#endif
1084 1083
1085#if ENABLE_OVERLAY 1084#if ENABLE_OVERLAY
1086 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1085 overlay_base ov;
1087 text_t **ov_text;
1088 rend_t **ov_rend;
1089 1086
1090 void scr_swap_overlay () NOTHROW; 1087 void scr_swap_overlay () NOTHROW;
1091 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1088 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1092 void scr_overlay_off () NOTHROW; 1089 void scr_overlay_off () NOTHROW;
1093 void scr_overlay_set (int x, int y, 1090 void scr_overlay_set (int x, int y,
… …
1131 1128
1132#if ENABLE_FRILLS || ISO_14755 1129#if ENABLE_FRILLS || ISO_14755
1133 // ISO 14755 entry support 1130 // ISO 14755 entry support
1134 unicode_t iso14755buf; 1131 unicode_t iso14755buf;
1135 void commit_iso14755 (); 1132 void commit_iso14755 ();
1136 int hex_keyval (XKeyEvent &ev);
1137# if ISO_14755 1133# if ISO_14755
1138 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1134 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1139 void iso14755_54 (int x, int y); 1135 void iso14755_54 (int x, int y);
1140# endif 1136# endif
1141#endif 1137#endif
… …
1162#endif 1158#endif
1163 1159
1164 void x_cb (XEvent &xev); 1160 void x_cb (XEvent &xev);
1165 xevent_watcher termwin_ev; 1161 xevent_watcher termwin_ev;
1166 xevent_watcher vt_ev; 1162 xevent_watcher vt_ev;
1167#ifdef HAVE_SCROLLBARS
1168 xevent_watcher scrollbar_ev; 1163 xevent_watcher scrollbar_ev;
1169#endif
1170 1164
1171 void child_cb (ev::child &w, int revents); ev::child child_ev; 1165 void child_cb (ev::child &w, int revents); ev::child child_ev;
1172 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1166 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1173 void refresh_check (); 1167 void refresh_check ();
1174 void flush (); 1168 void flush ();
… …
1247 wchar_t next_char () NOTHROW; 1241 wchar_t next_char () NOTHROW;
1248 wchar_t cmd_getc () THROW ((class out_of_input)); 1242 wchar_t cmd_getc () THROW ((class out_of_input));
1249 uint32_t next_octet () NOTHROW; 1243 uint32_t next_octet () NOTHROW;
1250 uint32_t cmd_get8 () THROW ((class out_of_input)); 1244 uint32_t cmd_get8 () THROW ((class out_of_input));
1251 1245
1252 bool cmd_parse (); 1246 void cmd_parse ();
1253 void mouse_report (XButtonEvent &ev); 1247 void mouse_report (XButtonEvent &ev);
1254 void button_press (XButtonEvent &ev); 1248 void button_press (XButtonEvent &ev);
1255 void button_release (XButtonEvent &ev); 1249 void button_release (XButtonEvent &ev);
1256 void focus_in (); 1250 void focus_in ();
1257 void focus_out (); 1251 void focus_out ();
1252#if ENABLE_FRILLS
1253 void set_urgency (bool enable);
1254#else
1255 void set_urgency (bool enable) { }
1256#endif
1258 void update_fade_color (unsigned int idx); 1257 void update_fade_color (unsigned int idx);
1259#ifdef PRINTPIPE 1258#ifdef PRINTPIPE
1260 FILE *popen_printer (); 1259 FILE *popen_printer ();
1261 int pclose_printer (FILE *stream); 1260 int pclose_printer (FILE *stream);
1262#endif 1261#endif
… …
1268 void process_window_ops (const int *args, unsigned int nargs); 1267 void process_window_ops (const int *args, unsigned int nargs);
1269 char *get_to_st (unicode_t &ends_how); 1268 char *get_to_st (unicode_t &ends_how);
1270 void process_dcs_seq (); 1269 void process_dcs_seq ();
1271 void process_osc_seq (); 1270 void process_osc_seq ();
1272 void process_color_seq (int report, int color, const char *str, char resp); 1271 void process_color_seq (int report, int color, const char *str, char resp);
1273 void process_xterm_seq (int op, const char *str, char resp); 1272 void process_xterm_seq (int op, char *str, char resp);
1274 int privcases (int mode, unsigned long bit); 1273 int privcases (int mode, unsigned long bit);
1275 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1274 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1276 void process_sgr_mode (unsigned int nargs, const int *arg); 1275 void process_sgr_mode (unsigned int nargs, const int *arg);
1277 void process_graphics (); 1276 void process_graphics ();
1278 // init.C 1277 // init.C
1279 void init_vars (); 1278 void init_vars ();
1280 void init_secondary ();
1281 const char **init_resources (int argc, const char *const *argv); 1279 const char **init_resources (int argc, const char *const *argv);
1280 void init (int argc, const char *const *argv, stringvec *envv);
1282 void init_env (); 1281 void init_env ();
1283 void set_locale (const char *locale); 1282 void set_locale (const char *locale);
1284 void init_xlocale (); 1283 void init_xlocale ();
1285 void init_command (const char *const *argv); 1284 void init_command (const char *const *argv);
1286 void run_command (const char *const *argv); 1285 void run_command (const char *const *argv);
1287 int run_child (const char *const *argv); 1286 int run_child (const char *const *argv);
1288 void color_aliases (int idx); 1287 void color_aliases (int idx);
1289 void create_windows (int argc, const char *const *argv); 1288 void create_windows (int argc, const char *const *argv);
1290 void Get_Colours (); 1289 void get_colours ();
1291 void get_ourmods (); 1290 void get_ourmods ();
1292 // main.C 1291 // main.C
1293 void tt_winch (); 1292 void tt_winch ();
1294 rxvt_term (); 1293 rxvt_term ();
1295 ~rxvt_term (); 1294 ~rxvt_term ();
1296 void destroy (); 1295 void destroy ();
1297 void emergency_cleanup (); 1296 void emergency_cleanup ();
1298 void init (int argc, const char *const *argv, stringvec *envv);
1299 void recolour_cursor (); 1297 void recolour_cursor ();
1300 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1298 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1301 void window_calc (unsigned int newwidth, unsigned int newheight); 1299 void window_calc (unsigned int newwidth, unsigned int newheight);
1302 bool set_fonts (); 1300 bool set_fonts ();
1303 void set_string_property (Atom prop, const char *str, int len = -1); 1301 void set_string_property (Atom prop, const char *str, int len = -1);
… …
1389 options[opt >> 3] |= (1 << (opt & 7)); 1387 options[opt >> 3] |= (1 << (opt & 7));
1390 else 1388 else
1391 options[opt >> 3] &= ~(1 << (opt & 7)); 1389 options[opt >> 3] &= ~(1 << (opt & 7));
1392 } 1390 }
1393 1391
1394 void PrivMode (int set, unsigned bit) NOTHROW 1392 void set_privmode (unsigned bit, int set) NOTHROW
1395 { 1393 {
1396 if (set) 1394 if (set)
1397 priv_modes |= bit; 1395 priv_modes |= bit;
1398 else 1396 else
1399 priv_modes &= ~bit; 1397 priv_modes &= ~bit;
… …
1401 1399
1402 // modifies first argument(!) 1400 // modifies first argument(!)
1403 void paste (char *data, unsigned int len) NOTHROW; 1401 void paste (char *data, unsigned int len) NOTHROW;
1404 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1402 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1405 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1403 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1404 void scr_kill_char (line_t &l, int col) const NOTHROW;
1406 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1405 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1407 void scr_reset (); 1406 void scr_reset ();
1408 void scr_release () NOTHROW; 1407 void scr_release () NOTHROW;
1409 void scr_clear (bool really = false) NOTHROW; 1408 void scr_clear (bool really = false) NOTHROW;
1410 void scr_refresh () NOTHROW; 1409 void scr_refresh () NOTHROW;
… …
1422 void scr_remap_chars (line_t &l) NOTHROW; 1421 void scr_remap_chars (line_t &l) NOTHROW;
1423 1422
1424 enum cursor_mode { SAVE, RESTORE }; 1423 enum cursor_mode { SAVE, RESTORE };
1425 1424
1426 void scr_poweron (); 1425 void scr_poweron ();
1426 void scr_soft_reset () NOTHROW;
1427 void scr_cursor (cursor_mode mode) NOTHROW; 1427 void scr_cursor (cursor_mode mode) NOTHROW;
1428 void scr_do_wrap () NOTHROW; 1428 void scr_do_wrap () NOTHROW;
1429 void scr_swap_screen () NOTHROW; 1429 void scr_swap_screen () NOTHROW;
1430 void scr_change_screen (int scrn); 1430 void scr_change_screen (int scrn);
1431 void scr_color (unsigned int color, int fgbg) NOTHROW; 1431 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1463 void selection_check (int check_more) NOTHROW; 1463 void selection_check (int check_more) NOTHROW;
1464 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1464 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1465 void selection_property (Window win, Atom prop) NOTHROW; 1465 void selection_property (Window win, Atom prop) NOTHROW;
1466 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1466 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1467 int selection_request_other (Atom target, int selnum) NOTHROW; 1467 int selection_request_other (Atom target, int selnum) NOTHROW;
1468 void selection_clear () NOTHROW; 1468 void selection_clear (bool clipboard = false) NOTHROW;
1469 void clipboard_copy (Time tm);
1469 void selection_make (Time tm); 1470 void selection_make (Time tm);
1470 bool selection_grab (Time tm) NOTHROW; 1471 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1471 void selection_start_colrow (int col, int row) NOTHROW; 1472 void selection_start_colrow (int col, int row) NOTHROW;
1472 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1473 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1473 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1474 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1474 void selection_remove_trailing_spaces () NOTHROW; 1475 void selection_remove_trailing_spaces () NOTHROW;
1475 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1476 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1476 void selection_click (int clicks, int x, int y) NOTHROW; 1477 void selection_click (int clicks, int x, int y) NOTHROW;
1477 void selection_extend (int x, int y, int flag) NOTHROW; 1478 void selection_extend (int x, int y, int flag) NOTHROW;
1478 void selection_rotate (int x, int y) NOTHROW; 1479 void selection_rotate (int x, int y) NOTHROW;
1479 1480
1480#if defined(NEXT_SCROLLBAR)
1481 // scrollbar-next.C
1482 Pixmap renderPixmap (const char *const *data, int width, int height);
1483 void init_scrollbar_stuff ();
1484 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1485 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1486#endif
1487
1488#if defined(RXVT_SCROLLBAR)
1489 // scrollbar-rxvt.C
1490 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1491#endif
1492
1493#if defined(XTERM_SCROLLBAR)
1494 // scrollbar-xterm.C
1495 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1496#endif
1497
1498#if defined(PLAIN_SCROLLBAR)
1499 // scrollbar-plain.C
1500 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1501#endif
1502
1503 // scrollbar.C
1504 void resize_scrollbar ();
1505 int scrollbar_mapping (int map);
1506 int scrollbar_show (int update);
1507 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1508
1509 // xdefaults.C 1481 // xdefaults.C
1510 void get_options (int argc, const char *const *argv); 1482 void get_options (int argc, const char *const *argv);
1511 int parse_keysym (const char *str, const char *arg); 1483 int parse_keysym (const char *str, const char *arg);
1512 const char *x_resource (const char *name); 1484 const char *x_resource (const char *name);
1513 void extract_resources (); 1485 void extract_resources ();

Diff Legend

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