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.353 by ayin, Sat Jan 26 15:26:54 2008 UTC vs.
Revision 1.400 by sf-exg, Thu Apr 1 16:39:31 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# ifdef 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
282#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
283# define HAVE_SCROLLBARS 1
284#endif
285 264
286#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR) 265#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR)
287# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1 266# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
288#endif 267#endif
289 268
… …
329enum { 308enum {
330 PRIMARY = 0, 309 PRIMARY = 0,
331 SECONDARY, 310 SECONDARY,
332}; 311};
333 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
334#define RS_None 0 316#define RS_None 0
335 317
336#define RS_fgMask 0x0000007fUL // 128 colors 318// GET_BGATTR depends on RS_fgShift > RS_bgShift
337#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_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
329
330// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
331#define RS_redraw (2UL << RS_fontShift)
332
333// 5 custom bits for extensions
334#define RS_customCount 16UL
335#define RS_customShift 23
336#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
338 337
339// font styles 338// font styles
340#define RS_Bold 0x00004000UL // value 1 339#define RS_Bold (1UL << RS_styleShift)
341#define RS_Italic 0x00008000UL // value 2 340#define RS_Italic (2UL << RS_styleShift)
341
342#define RS_styleCount 4
343#define RS_styleShift 27
344#define RS_styleMask (RS_Bold | RS_Italic)
342 345
343// fake styles 346// fake styles
344#define RS_Blink 0x00010000UL // blink 347#define RS_Blink (1UL << 29)
345#define RS_RVid 0x00020000UL // reverse video 348#define RS_RVid (1UL << 30) // reverse video
346#define RS_Uline 0x00040000UL // underline 349#define RS_Uline (1UL << 31) // underline
347
348// toggle this to force redraw, must be != RS_Careful
349#define RS_redraw 0x01000000UL
350
351// 5 custom bits for extensions
352#define RS_customCount 32
353#define RS_customMask 0x00f80000UL
354#define RS_customShift 19
355
356// other flags
357#define RS_Careful 0x80000000UL /* be careful when drawing these */
358
359#define RS_styleCount 4
360#define RS_styleMask (RS_Bold | RS_Italic)
361#define RS_styleShift 14
362 350
363#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 351#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
364#define RS_attrMask (RS_baseattrMask | RS_fontMask) 352#define RS_attrMask (RS_baseattrMask | RS_fontMask)
365 353
366#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
367#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
368#define RS_fontShift 24
369
370#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 354#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
371#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 355#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
372 356
373#define Sel_none 0 /* Not waiting */ 357#define Sel_none 0 /* Not waiting */
374#define Sel_normal 0x01 /* normal selection */ 358#define Sel_normal 0x01 /* normal selection */
375#define Sel_incr 0x02 /* incremental selection */ 359#define Sel_incr 0x02 /* incremental selection */
376#define Sel_direct 0x00 360#define Sel_direct 0x00
… …
432 416
433 URxvt_Color_IT = 704, // change actual 'Italic' colour 417 URxvt_Color_IT = 704, // change actual 'Italic' colour
434 URxvt_Color_tint = 705, // change actual tint colour 418 URxvt_Color_tint = 705, // change actual tint colour
435 URxvt_Color_BD = 706, // change actual 'Bold' color 419 URxvt_Color_BD = 706, // change actual 'Bold' color
436 URxvt_Color_UL = 707, // change actual 'Underline' color 420 URxvt_Color_UL = 707, // change actual 'Underline' color
421 URxvt_Color_border = 708,
437 422
438 URxvt_font = 710, 423 URxvt_font = 710,
439 URxvt_boldFont = 711, 424 URxvt_boldFont = 711,
440 URxvt_italicFont = 712, 425 URxvt_italicFont = 712,
441 URxvt_boldItalicFont = 713, 426 URxvt_boldItalicFont = 713,
442 427
443 URxvt_view_up = 720, 428 URxvt_view_up = 720,
444 URxvt_view_down = 721, 429 URxvt_view_down = 721,
445 430
446 URxvt_perl = 777, 431 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
447}; 432};
448 433
449/* Words starting with `Color_' are colours. Others are counts */ 434/* Words starting with `Color_' are colours. Others are counts */
450/* 435/*
451 * The PixColor and rendition colour usage should probably be decoupled 436 * The PixColor and rendition colour usage should probably be decoupled
… …
481 Color_White = maxBrightCOLOR, 466 Color_White = maxBrightCOLOR,
482#else 467#else
483 Color_White = maxCOLOR, 468 Color_White = maxCOLOR,
484#endif 469#endif
485 minTermCOLOR = Color_White + 1, 470 minTermCOLOR = Color_White + 1,
471#ifndef USE_256_COLORS
486 maxTermCOLOR = Color_White + 72, 472 maxTermCOLOR = Color_White + 72,
473#else
474 maxTermCOLOR = Color_White + 240,
475#endif
487#ifndef NO_CURSORCOLOR 476#ifndef NO_CURSORCOLOR
488 Color_cursor, 477 Color_cursor,
489 Color_cursor2, 478 Color_cursor2,
490#endif 479#endif
491 Color_pointer_fg, 480 Color_pointer_fg,
… …
501 Color_underline, 490 Color_underline,
502#endif 491#endif
503#ifdef OPTION_HC 492#ifdef OPTION_HC
504 Color_HC, 493 Color_HC,
505#endif 494#endif
506#ifdef KEEP_SCROLLCOLOR
507 Color_scroll, 495 Color_scroll,
496#ifdef RXVT_SCROLLBAR
508 Color_trough, 497 Color_trough,
509#endif 498#endif
510#if ENABLE_TRANSPARENCY 499#if ENABLE_TRANSPARENCY
511 Color_tint, 500 Color_tint,
512#endif 501#endif
513#if OFF_FOCUS_FADING 502#if OFF_FOCUS_FADING
514 Color_fade, 503 Color_fade,
515#endif 504#endif
516 NRS_COLORS, /* */ 505 NRS_COLORS, /* */
517#ifdef KEEP_SCROLLCOLOR 506#ifdef RXVT_SCROLLBAR
518 Color_topShadow = NRS_COLORS, 507 Color_topShadow = NRS_COLORS,
519 Color_bottomShadow, 508 Color_bottomShadow,
520 TOTAL_COLORS 509 TOTAL_COLORS
521#else 510#else
522 TOTAL_COLORS = NRS_COLORS 511 TOTAL_COLORS = NRS_COLORS
523#endif 512#endif
524}; 513};
525 514
515#ifndef USE_256_COLORS
526#define Color_Bits 7 // 0 .. maxTermCOLOR 516#define Color_Bits 7 // 0 .. maxTermCOLOR
517#else
518#define Color_Bits 9 // 0 .. maxTermCOLOR
519#endif
527 520
528/* 521/*
529 * Resource list 522 * Resource list
530 */ 523 */
531enum { 524enum {
… …
572 565
573// do not change these constants lightly, there are many interdependencies 566// do not change these constants lightly, there are many interdependencies
574#define IMBUFSIZ 128 // input modifier buffer sizes 567#define IMBUFSIZ 128 // input modifier buffer sizes
575#define KBUFSZ 512 // size of keyboard mapping buffer 568#define KBUFSZ 512 // size of keyboard mapping buffer
576#define CBUFSIZ 2048 // size of command buffer 569#define CBUFSIZ 2048 // size of command buffer
570#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
577#define UBUFSIZ 2048 // character buffer 571#define UBUFSIZ 2048 // character buffer
578 572
579#if ENABLE_FRILLS 573#if ENABLE_FRILLS
580# include <X11/Xmd.h> 574# include <X11/Xmd.h>
581typedef struct _mwmhints { 575typedef struct _mwmhints
576{
582 CARD32 flags; 577 CARD32 flags;
583 CARD32 functions; 578 CARD32 functions;
584 CARD32 decorations; 579 CARD32 decorations;
585 INT32 input_mode; 580 INT32 input_mode;
586 CARD32 status; 581 CARD32 status;
… …
633#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 628#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
634#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 629#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
635#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 630#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
636#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 631#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
637 632
638#define LINENO(n) MOD (term_start + int(n), total_rows) 633#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
639#define ROW(n) row_buf [LINENO (n)] 634#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
635
636#define LINENO(n) LINENO_of (this, n)
637#define ROW(n) ROW_of (this, n)
640 638
641/* how to build & extract colors and attributes */ 639/* how to build & extract colors and attributes */
642#define GET_BASEFG(x) (((x) & RS_fgMask)) 640#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
643#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 641#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
644 642
645#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 643#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
646#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 644#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
647 645
648#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 646#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
649#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 647#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
650 648
651#define GET_ATTR(x) (((x) & RS_attrMask)) 649#define GET_ATTR(x) (((x) & RS_attrMask))
650// return attributes defining the background, encoding doesn't matter
651// depends on RS_fgShift > RS_bgShift
652#define GET_BGATTR(x) \ 652#define GET_BGATTR(x) \
653 (expect_false ((x) & RS_RVid) \
653 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 654 ? (((x) & (RS_attrMask & ~RS_RVid)) \
654 | (((x) & RS_fgMask)<<Color_Bits)) \ 655 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
655 : ((x) & (RS_attrMask | RS_bgMask))) 656 : ((x) & (RS_attrMask | RS_bgMask)))
656#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 657#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
657#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 658#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
658#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 659#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
659 660
660#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 661#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
661 662
662#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 663#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
663#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 664#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
664 665
665#if ENABLE_STYLES 666#if ENABLE_STYLES
666# define FONTSET(style) fontset[GET_STYLE (style)] 667# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
667#else 668#else
668# define FONTSET(style) fontset[0] 669# define FONTSET_of(t,style) (t)->fontset[0]
669#endif 670#endif
671
672#define FONTSET(style) FONTSET_of (this, style)
670 673
671typedef callback<void (const char *)> log_callback; 674typedef callback<void (const char *)> log_callback;
672typedef callback<int (int)> getfd_callback; 675typedef callback<int (int)> getfd_callback;
673 676
674/****************************************************************************/ 677/****************************************************************************/
… …
677#define LINE_FILTERED 0x0002 // line has been filtered 680#define LINE_FILTERED 0x0002 // line has been filtered
678#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 681#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
679#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 682#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
680#define LINE_BIDI 0x0010 // line needs bidi (NYI) 683#define LINE_BIDI 0x0010 // line needs bidi (NYI)
681 684
682struct line_t { 685struct line_t
686{
683 text_t *t; // terminal the text 687 text_t *t; // terminal the text
684 rend_t *r; // rendition, uses RS_ flags 688 rend_t *r; // rendition, uses RS_ flags
685 tlen_t_ l; // length of each text line 689 tlen_t_ l; // length of each text line
686 uint32_t f; // flags 690 uint32_t f; // flags
687 691
… …
721}; 725};
722 726
723/****************************************************************************/ 727/****************************************************************************/
724 728
725// primitive wrapper around mbstate_t to ensure initialisation 729// primitive wrapper around mbstate_t to ensure initialisation
726struct mbstate { 730struct mbstate
731{
727 mbstate_t mbs; 732 mbstate_t mbs;
728 733
729 operator mbstate_t *() { return &mbs; } 734 operator mbstate_t *() { return &mbs; }
730 void reset () { memset (&mbs, 0, sizeof (mbs)); } 735 void reset () { memset (&mbs, 0, sizeof (mbs)); }
731 mbstate () { reset (); } 736 mbstate () { reset (); }
… …
752 757
753#if ENABLE_COMBINING 758#if ENABLE_COMBINING
754// compose chars are used to represent composite characters 759// compose chars are used to represent composite characters
755// that are not representable in unicode, as well as characters 760// that are not representable in unicode, as well as characters
756// not fitting in the BMP. 761// not fitting in the BMP.
757struct compose_char { 762struct compose_char
763{
758 unicode_t c1, c2; // any chars != NOCHAR are valid 764 unicode_t c1, c2; // any chars != NOCHAR are valid
759 compose_char (unicode_t c1, unicode_t c2) 765 compose_char (unicode_t c1, unicode_t c2)
760 : c1(c1), c2(c2) 766 : c1(c1), c2(c2)
761 { } 767 { }
762}; 768};
763 769
764class rxvt_composite_vec { 770class rxvt_composite_vec
771{
765 vector<compose_char> v; 772 vector<compose_char> v;
766public: 773public:
767 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 774 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
768 int expand (unicode_t c, wchar_t *r); 775 int expand (unicode_t c, wchar_t *r);
769 compose_char *operator [](text_t c) 776 compose_char *operator [](text_t c)
… …
788extern rxvt_t rxvt_current_term; 795extern rxvt_t rxvt_current_term;
789 796
790#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 797#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
791#define GET_R rxvt_current_term 798#define GET_R rxvt_current_term
792 799
800/* ------------------------------------------------------------------------- */
801struct overlay_base
802{
803 int x, y, w, h; // overlay dimensions
804 text_t **text;
805 rend_t **rend;
806
807 // while tempting to add swap() etc. here, it effetcively only increases code size
808};
809
810/* ------------------------------------------------------------------------- */
811
793typedef struct { 812typedef struct
813{
794 int row; 814 int row;
795 int col; 815 int col;
796} row_col_t; 816} row_col_t;
797 817
798/* 818/*
… …
823 * +------------+·display·+·= term_start 843 * +------------+·display·+·= term_start
824 * | terminal | display | 844 * | terminal | display |
825 * | terminal +---------+ 845 * | terminal +---------+
826 * | terminal | 846 * | terminal |
827 * | terminal | 847 * | terminal |
828 * +------------+···········= term_stat + nrow - 1 848 * +------------+···········= term_start + nrow - 1
829 * | 849 * |
830 * | 850 * |
831 * END······················= total_rows 851 * END······················= total_rows
832 */ 852 */
833 853
834struct TermWin_t { 854struct TermWin_t
855{
835 int width; /* window width [pixels] */ 856 int width; /* window width [pixels] */
836 int height; /* window height [pixels] */ 857 int height; /* window height [pixels] */
837 int fwidth; /* font width [pixels] */ 858 int fwidth; /* font width [pixels] */
838 int fheight; /* font height [pixels] */ 859 int fheight; /* font height [pixels] */
839 int fbase; /* font ascent (baseline) [pixels] */ 860 int fbase; /* font ascent (baseline) [pixels] */
… …
842 int focus; /* window has focus */ 863 int focus; /* window has focus */
843 int mapped; /* window state mapped? */ 864 int mapped; /* window state mapped? */
844 int int_bwidth; /* internal border width */ 865 int int_bwidth; /* internal border width */
845 int ext_bwidth; /* external border width */ 866 int ext_bwidth; /* external border width */
846 int lineSpace; /* number of extra pixels between rows */ 867 int lineSpace; /* number of extra pixels between rows */
868 int letterSpace; /* number of extra pixels between columns */
847 int saveLines; /* number of lines that fit in scrollback */ 869 int saveLines; /* number of lines that fit in scrollback */
848 int total_rows; /* total number of rows in this terminal */ 870 int total_rows; /* total number of rows in this terminal */
849 int term_start; /* term lines start here */ 871 int term_start; /* term lines start here */
850 int view_start; /* scrollback view starts here */ 872 int view_start; /* scrollback view starts here */
851 int top_row; /* topmost row index of scrollback */ 873 int top_row; /* topmost row index of scrollback */
… …
869 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 891 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
870 * nothing is selected 892 * nothing is selected
871 * beg: row/column of beginning of selection : never past mark 893 * beg: row/column of beginning of selection : never past mark
872 * mark: row/column of initial click : never past end 894 * mark: row/column of initial click : never past end
873 * end: row/column of one character past end of selection 895 * end: row/column of one character past end of selection
874 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 896 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
875 * * Note: col == -1 ==> we're left of screen 897 * * Note: col == -1 ==> we're left of screen
876 * 898 *
877 */ 899 */
878typedef struct { 900struct screen_t
901{
879 row_col_t cur; /* cursor position on the screen */ 902 row_col_t cur; /* cursor position on the screen */
880 int tscroll; /* top of settable scroll region */ 903 int tscroll; /* top of settable scroll region */
881 int bscroll; /* bottom of settable scroll region */ 904 int bscroll; /* bottom of settable scroll region */
882 unsigned int charset; /* character set number [0..3] */ 905 unsigned int charset; /* character set number [0..3] */
883 unsigned int flags; /* see below */ 906 unsigned int flags; /* see below */
884 row_col_t s_cur; /* saved cursor position */ 907 row_col_t s_cur; /* saved cursor position */
885 unsigned int s_charset; /* saved character set number [0..3] */ 908 unsigned int s_charset; /* saved character set number [0..3] */
886 char s_charset_char; 909 char s_charset_char;
887 rend_t s_rstyle; /* saved rendition style */ 910 rend_t s_rstyle; /* saved rendition style */
888} screen_t; 911};
889 912
890enum selection_op_t { 913enum selection_op_t
914{
891 SELECTION_CLEAR = 0, /* nothing selected */ 915 SELECTION_CLEAR = 0, /* nothing selected */
892 SELECTION_INIT, /* marked a point */ 916 SELECTION_INIT, /* marked a point */
893 SELECTION_BEGIN, /* started a selection */ 917 SELECTION_BEGIN, /* started a selection */
894 SELECTION_CONT, /* continued selection */ 918 SELECTION_CONT, /* continued selection */
895 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 919 SELECTION_DONE /* selection put in CUT_BUFFER0 */
896}; 920};
897 921
898typedef struct { 922struct selection_t
923{
899 wchar_t *text; /* selected text */ 924 wchar_t *text; /* selected text */
900 unsigned int len; /* length of selected text */ 925 unsigned int len; /* length of selected text */
901 unsigned int screen; /* screen being used */ 926 unsigned int screen; /* screen being used */
902 unsigned int clicks; /* number of clicks */ 927 unsigned int clicks; /* number of clicks */
903 selection_op_t op; /* current operation */ 928 selection_op_t op; /* current operation */
904 bool rect; /* rectangular selection? */ 929 bool rect; /* rectangular selection? */
905 row_col_t beg; /* beginning of selection <= mark */ 930 row_col_t beg; /* beginning of selection <= mark */
906 row_col_t mark; /* point of initial click <= end */ 931 row_col_t mark; /* point of initial click <= end */
907 row_col_t end; /* one character past end point */ 932 row_col_t end; /* one character past end point */
908} selection_t; 933 wchar_t *clip_text; /* text copied to the clipboard */
934 unsigned int clip_len; /* length of clipboard text */
935};
909 936
910/* ------------------------------------------------------------------------- */ 937/* ------------------------------------------------------------------------- */
911 938
912/* screen_t flags */ 939/* screen_t flags */
913#define Screen_Relative (1<<0) /* relative origin mode flag */ 940#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
927Opt_count 954Opt_count
928}; 955};
929 956
930/* ------------------------------------------------------------------------- */ 957/* ------------------------------------------------------------------------- */
931 958
932struct rxvt_vars : TermWin_t { 959struct rxvt_vars : TermWin_t
960{
933 scrollBar_t scrollBar; 961 scrollBar_t scrollBar;
934 uint8_t options[(Opt_count + 7) >> 3]; 962 uint8_t options[(Opt_count + 7) >> 3];
935 XSizeHints szHint; 963 XSizeHints szHint;
936 rxvt_color *pix_colors; 964 rxvt_color *pix_colors;
937 Cursor TermWin_cursor; /* cursor for vt window */ 965 Cursor TermWin_cursor; /* cursor for vt window */
… …
947#ifdef OFF_FOCUS_FADING 975#ifdef OFF_FOCUS_FADING
948 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 976 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
949#endif 977#endif
950}; 978};
951 979
952struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 980struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
981{
953 982
954 // special markers with magic addresses 983 // special markers with magic addresses
955 static const char resval_undef []; // options specifically unset 984 static const char resval_undef []; // options specifically unset
956 static const char resval_on []; // boolean options switched on 985 static const char resval_on []; // boolean options switched on
957 static const char resval_off []; // or off 986 static const char resval_off []; // or off
… …
965 994
966 unsigned char want_refresh:1, 995 unsigned char want_refresh:1,
967 current_screen:1, /* primary or secondary */ 996 current_screen:1, /* primary or secondary */
968 num_scr_allow:1, 997 num_scr_allow:1,
969 bypass_keystate:1, 998 bypass_keystate:1,
999#if ENABLE_FRILLS
1000 urgency_hint:1,
1001#endif
970#ifdef CURSOR_BLINK 1002#if CURSOR_BLINK
971 hidden_cursor:1, 1003 hidden_cursor:1,
972#endif 1004#endif
973#ifdef TEXT_BLINK 1005#if TEXT_BLINK
974 hidden_text:1, 1006 hidden_text:1,
975#endif 1007#endif
976#ifdef POINTER_BLANK 1008#if POINTER_BLANK
977 hidden_pointer:1, 1009 hidden_pointer:1,
978#endif 1010#endif
979 enc_utf8:1, /* wether locale uses utf-8 */ 1011 enc_utf8:1, /* whether locale uses utf-8 */
980 seen_input:1, /* wether we have seen some program output yet */ 1012 seen_input:1, /* whether we have seen some program output yet */
981 seen_resize:1, /* wether we had a resize event */ 1013 seen_resize:1, /* whether we had a resize event */
982 parsed_geometry:1; 1014 parsed_geometry:1;
983 1015
984 unsigned char refresh_type, 1016 unsigned char refresh_type,
985#ifdef META8_OPTION 1017#ifdef META8_OPTION
986 meta_char, /* Alt-key prefix */ 1018 meta_char, /* Alt-key prefix */
… …
990/* ---------- */ 1022/* ---------- */
991 bool rvideo_state, rvideo_mode; 1023 bool rvideo_state, rvideo_mode;
992#ifndef NO_BELL 1024#ifndef NO_BELL
993 bool rvideo_bell; 1025 bool rvideo_bell;
994#endif 1026#endif
995 int num_scr; /* screen: number lines scrolled */ 1027 int num_scr; /* screen: number of lines scrolled */
996 int prev_ncol, /* screen: previous number of columns */ 1028 int prev_ncol, /* screen: previous number of columns */
997 prev_nrow; /* screen: previous number of rows */ 1029 prev_nrow; /* screen: previous number of rows */
998/* ---------- */ 1030/* ---------- */
999 rend_t rstyle; 1031 rend_t rstyle;
1000/* ---------- */ 1032/* ---------- */
… …
1012 mouse_slip_wheel_speed, 1044 mouse_slip_wheel_speed,
1013#endif 1045#endif
1014 refresh_count, 1046 refresh_count,
1015 window_vt_x, 1047 window_vt_x,
1016 window_vt_y, 1048 window_vt_y,
1017 window_sb_x,
1018 mouse_row, 1049 mouse_row,
1019 mouse_col, 1050 mouse_col,
1020# ifdef POINTER_BLANK 1051# ifdef POINTER_BLANK
1021 pointerBlankDelay, 1052 pointerBlankDelay,
1022# endif 1053# endif
… …
1030 unsigned long priv_modes, 1061 unsigned long priv_modes,
1031 SavedModes; 1062 SavedModes;
1032/* ---------- */ 1063/* ---------- */
1033 Atom *xa; 1064 Atom *xa;
1034/* ---------- */ 1065/* ---------- */
1035#ifdef RXVT_SCROLLBAR
1036 GC scrollbarGC,
1037 topShadowGC,
1038 botShadowGC;
1039#endif
1040#ifdef XTERM_SCROLLBAR
1041 GC xscrollbarGC,
1042 ShadowGC;
1043#endif
1044#ifdef PLAIN_SCROLLBAR
1045 GC pscrollbarGC;
1046#endif
1047#ifdef NEXT_SCROLLBAR
1048 GC blackGC,
1049 whiteGC,
1050 grayGC,
1051 darkGC,
1052 stippleGC;
1053 Pixmap dimple,
1054 upArrow,
1055 downArrow,
1056 upArrowHi,
1057 downArrowHi;
1058#endif
1059/* ---------- */
1060 Time selection_time, 1066 Time selection_time,
1061 selection_request_time; 1067 selection_request_time,
1068 clipboard_time;
1062 pid_t cmd_pid; /* process id of child */ 1069 pid_t cmd_pid; /* process id of child */
1063 char * incr_buf; 1070 char * incr_buf;
1064 size_t incr_buf_size, incr_buf_fill; 1071 size_t incr_buf_size, incr_buf_fill;
1065/* ---------- */ 1072/* ---------- */
1066 struct mouse_event MEvent; 1073 struct mouse_event MEvent;
… …
1071 bgPixmap_t bgPixmap; 1078 bgPixmap_t bgPixmap;
1072#endif 1079#endif
1073#ifdef HAVE_AFTERIMAGE 1080#ifdef HAVE_AFTERIMAGE
1074 ASVisual *asv; 1081 ASVisual *asv;
1075 ASImageManager *asimman; 1082 ASImageManager *asimman;
1083
1084 void init_asv ()
1085 {
1086 if (!asv)
1087 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1088 }
1076#endif 1089#endif
1077 1090
1078#if ENABLE_OVERLAY 1091#if ENABLE_OVERLAY
1079 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1092 overlay_base ov;
1080 text_t **ov_text;
1081 rend_t **ov_rend;
1082 1093
1083 void scr_swap_overlay () NOTHROW; 1094 void scr_swap_overlay () NOTHROW;
1084 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1095 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1085 void scr_overlay_off () NOTHROW; 1096 void scr_overlay_off () NOTHROW;
1086 void scr_overlay_set (int x, int y, 1097 void scr_overlay_set (int x, int y,
… …
1124 1135
1125#if ENABLE_FRILLS || ISO_14755 1136#if ENABLE_FRILLS || ISO_14755
1126 // ISO 14755 entry support 1137 // ISO 14755 entry support
1127 unicode_t iso14755buf; 1138 unicode_t iso14755buf;
1128 void commit_iso14755 (); 1139 void commit_iso14755 ();
1129 int hex_keyval (XKeyEvent &ev);
1130# if ISO_14755 1140# if ISO_14755
1131 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1141 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1132 void iso14755_54 (int x, int y); 1142 void iso14755_54 (int x, int y);
1133# endif 1143# endif
1134#endif 1144#endif
… …
1155#endif 1165#endif
1156 1166
1157 void x_cb (XEvent &xev); 1167 void x_cb (XEvent &xev);
1158 xevent_watcher termwin_ev; 1168 xevent_watcher termwin_ev;
1159 xevent_watcher vt_ev; 1169 xevent_watcher vt_ev;
1160#ifdef HAVE_SCROLLBARS
1161 xevent_watcher scrollbar_ev; 1170 xevent_watcher scrollbar_ev;
1162#endif
1163 1171
1164 void child_cb (ev::child &w, int revents); ev::child child_ev; 1172 void child_cb (ev::child &w, int revents); ev::child child_ev;
1165 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1173 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1166 void refresh_check (); 1174 void refresh_check ();
1167 void flush (); 1175 void flush ();
… …
1240 wchar_t next_char () NOTHROW; 1248 wchar_t next_char () NOTHROW;
1241 wchar_t cmd_getc () THROW ((class out_of_input)); 1249 wchar_t cmd_getc () THROW ((class out_of_input));
1242 uint32_t next_octet () NOTHROW; 1250 uint32_t next_octet () NOTHROW;
1243 uint32_t cmd_get8 () THROW ((class out_of_input)); 1251 uint32_t cmd_get8 () THROW ((class out_of_input));
1244 1252
1245 bool cmd_parse (); 1253 void cmd_parse ();
1246 void mouse_report (XButtonEvent &ev); 1254 void mouse_report (XButtonEvent &ev);
1247 void button_press (XButtonEvent &ev); 1255 void button_press (XButtonEvent &ev);
1248 void button_release (XButtonEvent &ev); 1256 void button_release (XButtonEvent &ev);
1249 void focus_in (); 1257 void focus_in ();
1250 void focus_out (); 1258 void focus_out ();
1259#if ENABLE_FRILLS
1260 void set_urgency (bool enable);
1261#else
1262 void set_urgency (bool enable) { }
1263#endif
1251 void update_fade_color (unsigned int idx); 1264 void update_fade_color (unsigned int idx);
1252#ifdef PRINTPIPE 1265#ifdef PRINTPIPE
1253 FILE *popen_printer (); 1266 FILE *popen_printer ();
1254 int pclose_printer (FILE *stream); 1267 int pclose_printer (FILE *stream);
1255#endif 1268#endif
… …
1261 void process_window_ops (const int *args, unsigned int nargs); 1274 void process_window_ops (const int *args, unsigned int nargs);
1262 char *get_to_st (unicode_t &ends_how); 1275 char *get_to_st (unicode_t &ends_how);
1263 void process_dcs_seq (); 1276 void process_dcs_seq ();
1264 void process_osc_seq (); 1277 void process_osc_seq ();
1265 void process_color_seq (int report, int color, const char *str, char resp); 1278 void process_color_seq (int report, int color, const char *str, char resp);
1266 void process_xterm_seq (int op, const char *str, char resp); 1279 void process_xterm_seq (int op, char *str, char resp);
1267 int privcases (int mode, unsigned long bit); 1280 int privcases (int mode, unsigned long bit);
1268 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1281 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1269 void process_sgr_mode (unsigned int nargs, const int *arg); 1282 void process_sgr_mode (unsigned int nargs, const int *arg);
1270 void process_graphics (); 1283 void process_graphics ();
1271 // init.C 1284 // init.C
… …
1278 void init_command (const char *const *argv); 1291 void init_command (const char *const *argv);
1279 void run_command (const char *const *argv); 1292 void run_command (const char *const *argv);
1280 int run_child (const char *const *argv); 1293 int run_child (const char *const *argv);
1281 void color_aliases (int idx); 1294 void color_aliases (int idx);
1282 void create_windows (int argc, const char *const *argv); 1295 void create_windows (int argc, const char *const *argv);
1283 void Get_Colours (); 1296 void get_colours ();
1284 void get_ourmods (); 1297 void get_ourmods ();
1285 // main.C 1298 // main.C
1286 void tt_winch (); 1299 void tt_winch ();
1287 rxvt_term (); 1300 rxvt_term ();
1288 ~rxvt_term (); 1301 ~rxvt_term ();
… …
1381 options[opt >> 3] |= (1 << (opt & 7)); 1394 options[opt >> 3] |= (1 << (opt & 7));
1382 else 1395 else
1383 options[opt >> 3] &= ~(1 << (opt & 7)); 1396 options[opt >> 3] &= ~(1 << (opt & 7));
1384 } 1397 }
1385 1398
1386 void PrivMode (int set, unsigned bit) NOTHROW 1399 void set_privmode (unsigned bit, int set) NOTHROW
1387 { 1400 {
1388 if (set) 1401 if (set)
1389 priv_modes |= bit; 1402 priv_modes |= bit;
1390 else 1403 else
1391 priv_modes &= ~bit; 1404 priv_modes &= ~bit;
… …
1393 1406
1394 // modifies first argument(!) 1407 // modifies first argument(!)
1395 void paste (char *data, unsigned int len) NOTHROW; 1408 void paste (char *data, unsigned int len) NOTHROW;
1396 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1409 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1397 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1410 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1411 void scr_kill_char (line_t &l, int col) const NOTHROW;
1398 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1412 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1399 void scr_reset (); 1413 void scr_reset ();
1400 void scr_release () NOTHROW; 1414 void scr_release () NOTHROW;
1401 void scr_clear (bool really = false) NOTHROW; 1415 void scr_clear (bool really = false) NOTHROW;
1402 void scr_refresh () NOTHROW; 1416 void scr_refresh () NOTHROW;
… …
1414 void scr_remap_chars (line_t &l) NOTHROW; 1428 void scr_remap_chars (line_t &l) NOTHROW;
1415 1429
1416 enum cursor_mode { SAVE, RESTORE }; 1430 enum cursor_mode { SAVE, RESTORE };
1417 1431
1418 void scr_poweron (); 1432 void scr_poweron ();
1433 void scr_soft_reset () NOTHROW;
1419 void scr_cursor (cursor_mode mode) NOTHROW; 1434 void scr_cursor (cursor_mode mode) NOTHROW;
1420 void scr_do_wrap () NOTHROW; 1435 void scr_do_wrap () NOTHROW;
1421 void scr_swap_screen () NOTHROW; 1436 void scr_swap_screen () NOTHROW;
1422 void scr_change_screen (int scrn); 1437 void scr_change_screen (int scrn);
1423 void scr_color (unsigned int color, int fgbg) NOTHROW; 1438 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1455 void selection_check (int check_more) NOTHROW; 1470 void selection_check (int check_more) NOTHROW;
1456 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1471 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1457 void selection_property (Window win, Atom prop) NOTHROW; 1472 void selection_property (Window win, Atom prop) NOTHROW;
1458 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1473 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1459 int selection_request_other (Atom target, int selnum) NOTHROW; 1474 int selection_request_other (Atom target, int selnum) NOTHROW;
1460 void selection_clear () NOTHROW; 1475 void selection_clear (bool clipboard = false) NOTHROW;
1476 void clipboard_copy (Time tm);
1461 void selection_make (Time tm); 1477 void selection_make (Time tm);
1462 bool selection_grab (Time tm) NOTHROW; 1478 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1463 void selection_start_colrow (int col, int row) NOTHROW; 1479 void selection_start_colrow (int col, int row) NOTHROW;
1464 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1480 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1465 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1481 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1466 void selection_remove_trailing_spaces () NOTHROW; 1482 void selection_remove_trailing_spaces () NOTHROW;
1467 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1483 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1468 void selection_click (int clicks, int x, int y) NOTHROW; 1484 void selection_click (int clicks, int x, int y) NOTHROW;
1469 void selection_extend (int x, int y, int flag) NOTHROW; 1485 void selection_extend (int x, int y, int flag) NOTHROW;
1470 void selection_rotate (int x, int y) NOTHROW; 1486 void selection_rotate (int x, int y) NOTHROW;
1471 1487
1472#if defined(NEXT_SCROLLBAR)
1473 // scrollbar-next.C
1474 Pixmap renderPixmap (const char *const *data, int width, int height);
1475 void init_scrollbar_stuff ();
1476 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1477 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1478#endif
1479
1480#if defined(RXVT_SCROLLBAR)
1481 // scrollbar-rxvt.C
1482 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1483#endif
1484
1485#if defined(XTERM_SCROLLBAR)
1486 // scrollbar-xterm.C
1487 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1488#endif
1489
1490#if defined(PLAIN_SCROLLBAR)
1491 // scrollbar-plain.C
1492 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1493#endif
1494
1495 // scrollbar.C
1496 void resize_scrollbar ();
1497 int scrollbar_mapping (int map);
1498 int scrollbar_show (int update);
1499 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1500
1501 // xdefaults.C 1488 // xdefaults.C
1502 void get_options (int argc, const char *const *argv); 1489 void get_options (int argc, const char *const *argv);
1503 int parse_keysym (const char *str, const char *arg); 1490 int parse_keysym (const char *str, const char *arg);
1504 const char *x_resource (const char *name); 1491 const char *x_resource (const char *name);
1505 void extract_resources (); 1492 void extract_resources ();

Diff Legend

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