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.356 by ayin, Tue Jan 29 14:45:54 2008 UTC vs.
Revision 1.404 by sf-exg, Sun Apr 18 11:06:46 2010 UTC

… …
97/* 97/*
98 ***************************************************************************** 98 *****************************************************************************
99 * SYSTEM HACKS 99 * SYSTEM HACKS
100 ***************************************************************************** 100 *****************************************************************************
101 */ 101 */
102/* Consistent defines - please report on the necessity
103 * @ Unixware: defines (__svr4__)
104 */
105#if defined (SVR4) && !defined (__svr4__)
106# define __svr4__ 1
107#endif
108#if defined (sun) && !defined (__sun__)
109# define __sun__ 1
110#endif
111 102
112#ifndef HAVE_XPOINTER 103#ifndef HAVE_XPOINTER
113typedef char *XPointer; 104typedef char *XPointer;
114#endif 105#endif
115 106
… …
119 110
120#ifndef STDIN_FILENO 111#ifndef STDIN_FILENO
121# define STDIN_FILENO 0 112# define STDIN_FILENO 0
122# define STDOUT_FILENO 1 113# define STDOUT_FILENO 1
123# define STDERR_FILENO 2 114# define STDERR_FILENO 2
124#endif
125
126#if !defined (EACCESS) && defined(EAGAIN)
127# define EACCESS EAGAIN
128#endif 115#endif
129 116
130#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
131# define EXIT_SUCCESS 0 /* exit function success */ 118# define EXIT_SUCCESS 0 /* exit function success */
132# define EXIT_FAILURE 1 /* exit function failure */ 119# define EXIT_FAILURE 1 /* exit function failure */
… …
160char * rxvt_wcstombs (const wchar_t *str, int len = -1); 147char * rxvt_wcstombs (const wchar_t *str, int len = -1);
161wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 148wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
162char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 149char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
163wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 150wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
164 151
165char * rxvt_basename (const char *str) NOTHROW; 152const char * rxvt_basename (const char *str) NOTHROW;
166void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
167void rxvt_log (const char *fmt,...) NOTHROW; 154void rxvt_log (const char *fmt,...) NOTHROW;
168void rxvt_warn (const char *fmt,...) NOTHROW; 155void rxvt_warn (const char *fmt,...) NOTHROW;
169void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
170void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
… …
213 200
214/* 201/*
215 * the 'essential' information for reporting Mouse Events 202 * the 'essential' information for reporting Mouse Events
216 * pared down from XButtonEvent 203 * pared down from XButtonEvent
217 */ 204 */
218struct mouse_event { 205struct mouse_event
206{
219 int clicks; 207 int clicks;
220 Time time; /* milliseconds */ 208 Time time; /* milliseconds */
221 unsigned int state; /* key or button mask */ 209 unsigned int state; /* key or button mask */
222 unsigned int button; /* detail */ 210 unsigned int button; /* detail */
223}; 211};
… …
259# define COLORTERMENVFULL COLORTERMENV "-xpm" 247# define COLORTERMENVFULL COLORTERMENV "-xpm"
260#else 248#else
261# define COLORTERMENVFULL COLORTERMENV 249# define COLORTERMENVFULL COLORTERMENV
262#endif 250#endif
263#ifndef TERMENV 251#ifndef TERMENV
252# ifdef USE_256_COLORS
253# define TERMENV "rxvt-unicode-256color"
254# else
264# define TERMENV "rxvt-unicode" 255# define TERMENV "rxvt-unicode"
256# endif
265#endif 257#endif
266 258
267#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 259#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
268# define NO_MOUSE_REPORT_SCROLLBAR 1 260# define NO_MOUSE_REPORT_SCROLLBAR 1
269#endif 261#endif
… …
316enum { 308enum {
317 PRIMARY = 0, 309 PRIMARY = 0,
318 SECONDARY, 310 SECONDARY,
319}; 311};
320 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
321#define RS_None 0 316#define RS_None 0
322 317
323#define RS_fgMask 0x0000007fUL // 128 colors 318// GET_BGATTR depends on RS_fgShift > RS_bgShift
324#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#define RS_Sel (1UL << 22)
334
335// 5 custom bits for extensions
336#define RS_customCount 16UL
337#define RS_customShift 23
338#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
325 339
326// font styles 340// font styles
327#define RS_Bold 0x00004000UL // value 1 341#define RS_Bold (1UL << RS_styleShift)
328#define RS_Italic 0x00008000UL // value 2 342#define RS_Italic (2UL << RS_styleShift)
343
344#define RS_styleCount 4
345#define RS_styleShift 27
346#define RS_styleMask (RS_Bold | RS_Italic)
329 347
330// fake styles 348// fake styles
331#define RS_Blink 0x00010000UL // blink 349#define RS_Blink (1UL << 29)
332#define RS_RVid 0x00020000UL // reverse video 350#define RS_RVid (1UL << 30) // reverse video
333#define RS_Uline 0x00040000UL // underline 351#define RS_Uline (1UL << 31) // underline
334
335// toggle this to force redraw, must be != RS_Careful
336#define RS_redraw 0x01000000UL
337
338// 5 custom bits for extensions
339#define RS_customCount 32
340#define RS_customMask 0x00f80000UL
341#define RS_customShift 19
342
343// other flags
344#define RS_Careful 0x80000000UL /* be careful when drawing these */
345
346#define RS_styleCount 4
347#define RS_styleMask (RS_Bold | RS_Italic)
348#define RS_styleShift 14
349 352
350#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 353#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
351#define RS_attrMask (RS_baseattrMask | RS_fontMask) 354#define RS_attrMask (RS_baseattrMask | RS_fontMask)
352 355
353#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
354#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
355#define RS_fontShift 24
356
357#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 356#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
358#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 357#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
359 358
360#define Sel_none 0 /* Not waiting */ 359#define Sel_none 0 /* Not waiting */
361#define Sel_normal 0x01 /* normal selection */ 360#define Sel_normal 0x01 /* normal selection */
362#define Sel_incr 0x02 /* incremental selection */ 361#define Sel_incr 0x02 /* incremental selection */
363#define Sel_direct 0x00 362#define Sel_direct 0x00
… …
392 XTerm_Color_cursor = 12, // change actual 'Cursor' color 391 XTerm_Color_cursor = 12, // change actual 'Cursor' color
393 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 392 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
394 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 393 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
395 XTerm_Color05 = 15, // not implemented (tektronix fg) 394 XTerm_Color05 = 15, // not implemented (tektronix fg)
396 XTerm_Color06 = 16, // not implemented (tektronix bg) 395 XTerm_Color06 = 16, // not implemented (tektronix bg)
397 XTerm_Color_RV = 17, // change actual 'Highlight' color 396 XTerm_Color_HC = 17, // change actual 'Highlight' color
398 XTerm_logfile = 46, // not implemented 397 XTerm_logfile = 46, // not implemented
399 XTerm_font = 50, 398 XTerm_font = 50,
400 399
401 XTerm_konsole30 = 30, // reserved for konsole 400 XTerm_konsole30 = 30, // reserved for konsole
402 XTerm_konsole31 = 31, // reserved for konsole 401 XTerm_konsole31 = 31, // reserved for konsole
… …
404 /* 403 /*
405 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 404 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
406 */ 405 */
407 406
408 // deprecated 407 // deprecated
409 Rxvt_Color_BD = 18,
410 Rxvt_Color_UL = 19,
411 Rxvt_restoreFG = 39, 408 Rxvt_restoreFG = 39,
412 Rxvt_restoreBG = 49, 409 Rxvt_restoreBG = 49,
413 410
414 Rxvt_Pixmap = 20, // new bg pixmap 411 Rxvt_Pixmap = 20, // new bg pixmap
415 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 412 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
419 416
420 URxvt_Color_IT = 704, // change actual 'Italic' colour 417 URxvt_Color_IT = 704, // change actual 'Italic' colour
421 URxvt_Color_tint = 705, // change actual tint colour 418 URxvt_Color_tint = 705, // change actual tint colour
422 URxvt_Color_BD = 706, // change actual 'Bold' color 419 URxvt_Color_BD = 706, // change actual 'Bold' color
423 URxvt_Color_UL = 707, // change actual 'Underline' color 420 URxvt_Color_UL = 707, // change actual 'Underline' color
421 URxvt_Color_border = 708,
424 422
425 URxvt_font = 710, 423 URxvt_font = 710,
426 URxvt_boldFont = 711, 424 URxvt_boldFont = 711,
427 URxvt_italicFont = 712, 425 URxvt_italicFont = 712,
428 URxvt_boldItalicFont = 713, 426 URxvt_boldItalicFont = 713,
429 427
430 URxvt_view_up = 720, 428 URxvt_view_up = 720,
431 URxvt_view_down = 721, 429 URxvt_view_down = 721,
432 430
433 URxvt_perl = 777, 431 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
434}; 432};
435 433
436/* Words starting with `Color_' are colours. Others are counts */ 434/* Words starting with `Color_' are colours. Others are counts */
437/* 435/*
438 * The PixColor and rendition colour usage should probably be decoupled 436 * The PixColor and rendition colour usage should probably be decoupled
… …
468 Color_White = maxBrightCOLOR, 466 Color_White = maxBrightCOLOR,
469#else 467#else
470 Color_White = maxCOLOR, 468 Color_White = maxCOLOR,
471#endif 469#endif
472 minTermCOLOR = Color_White + 1, 470 minTermCOLOR = Color_White + 1,
471#ifndef USE_256_COLORS
473 maxTermCOLOR = Color_White + 72, 472 maxTermCOLOR = Color_White + 72,
473#else
474 maxTermCOLOR = Color_White + 240,
475#endif
474#ifndef NO_CURSORCOLOR 476#ifndef NO_CURSORCOLOR
475 Color_cursor, 477 Color_cursor,
476 Color_cursor2, 478 Color_cursor2,
477#endif 479#endif
478 Color_pointer_fg, 480 Color_pointer_fg,
… …
487#if ENABLE_FRILLS 489#if ENABLE_FRILLS
488 Color_underline, 490 Color_underline,
489#endif 491#endif
490#ifdef OPTION_HC 492#ifdef OPTION_HC
491 Color_HC, 493 Color_HC,
494 Color_HTC,
492#endif 495#endif
493 Color_scroll, 496 Color_scroll,
494#ifdef RXVT_SCROLLBAR 497#ifdef RXVT_SCROLLBAR
495 Color_trough, 498 Color_trough,
496#endif 499#endif
… …
508#else 511#else
509 TOTAL_COLORS = NRS_COLORS 512 TOTAL_COLORS = NRS_COLORS
510#endif 513#endif
511}; 514};
512 515
516#ifndef USE_256_COLORS
513#define Color_Bits 7 // 0 .. maxTermCOLOR 517#define Color_Bits 7 // 0 .. maxTermCOLOR
518#else
519#define Color_Bits 9 // 0 .. maxTermCOLOR
520#endif
514 521
515/* 522/*
516 * Resource list 523 * Resource list
517 */ 524 */
518enum { 525enum {
… …
559 566
560// do not change these constants lightly, there are many interdependencies 567// do not change these constants lightly, there are many interdependencies
561#define IMBUFSIZ 128 // input modifier buffer sizes 568#define IMBUFSIZ 128 // input modifier buffer sizes
562#define KBUFSZ 512 // size of keyboard mapping buffer 569#define KBUFSZ 512 // size of keyboard mapping buffer
563#define CBUFSIZ 2048 // size of command buffer 570#define CBUFSIZ 2048 // size of command buffer
571#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
564#define UBUFSIZ 2048 // character buffer 572#define UBUFSIZ 2048 // character buffer
565 573
566#if ENABLE_FRILLS 574#if ENABLE_FRILLS
567# include <X11/Xmd.h> 575# include <X11/Xmd.h>
568typedef struct _mwmhints { 576typedef struct _mwmhints
577{
569 CARD32 flags; 578 CARD32 flags;
570 CARD32 functions; 579 CARD32 functions;
571 CARD32 decorations; 580 CARD32 decorations;
572 INT32 input_mode; 581 INT32 input_mode;
573 CARD32 status; 582 CARD32 status;
… …
620#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 629#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
621#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 630#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
622#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 631#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
623#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 632#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
624 633
625#define LINENO(n) MOD (term_start + int(n), total_rows) 634#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
626#define ROW(n) row_buf [LINENO (n)] 635#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
636
637#define LINENO(n) LINENO_of (this, n)
638#define ROW(n) ROW_of (this, n)
627 639
628/* how to build & extract colors and attributes */ 640/* how to build & extract colors and attributes */
629#define GET_BASEFG(x) (((x) & RS_fgMask)) 641#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
630#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 642#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
631 643
632#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 644#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
633#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 645#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
634 646
635#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 647#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
636#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 648#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
637 649
638#define GET_ATTR(x) (((x) & RS_attrMask)) 650#define GET_ATTR(x) (((x) & RS_attrMask))
651// return attributes defining the background, encoding doesn't matter
652// depends on RS_fgShift > RS_bgShift
639#define GET_BGATTR(x) \ 653#define GET_BGATTR(x) \
654 (expect_false ((x) & RS_RVid) \
640 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 655 ? (((x) & (RS_attrMask & ~RS_RVid)) \
641 | (((x) & RS_fgMask)<<Color_Bits)) \ 656 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
642 : ((x) & (RS_attrMask | RS_bgMask))) 657 : ((x) & (RS_attrMask | RS_bgMask)))
643#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 658#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
644#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 659#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
645#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 660#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
646 661
647#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 662#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
648 663
649#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 664#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
650#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 665#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
651 666
652#if ENABLE_STYLES 667#if ENABLE_STYLES
653# define FONTSET(style) fontset[GET_STYLE (style)] 668# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
654#else 669#else
655# define FONTSET(style) fontset[0] 670# define FONTSET_of(t,style) (t)->fontset[0]
656#endif 671#endif
672
673#define FONTSET(style) FONTSET_of (this, style)
657 674
658typedef callback<void (const char *)> log_callback; 675typedef callback<void (const char *)> log_callback;
659typedef callback<int (int)> getfd_callback; 676typedef callback<int (int)> getfd_callback;
660 677
661/****************************************************************************/ 678/****************************************************************************/
… …
664#define LINE_FILTERED 0x0002 // line has been filtered 681#define LINE_FILTERED 0x0002 // line has been filtered
665#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 682#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
666#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 683#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
667#define LINE_BIDI 0x0010 // line needs bidi (NYI) 684#define LINE_BIDI 0x0010 // line needs bidi (NYI)
668 685
669struct line_t { 686struct line_t
687{
670 text_t *t; // terminal the text 688 text_t *t; // terminal the text
671 rend_t *r; // rendition, uses RS_ flags 689 rend_t *r; // rendition, uses RS_ flags
672 tlen_t_ l; // length of each text line 690 tlen_t_ l; // length of each text line
673 uint32_t f; // flags 691 uint32_t f; // flags
674 692
… …
708}; 726};
709 727
710/****************************************************************************/ 728/****************************************************************************/
711 729
712// primitive wrapper around mbstate_t to ensure initialisation 730// primitive wrapper around mbstate_t to ensure initialisation
713struct mbstate { 731struct mbstate
732{
714 mbstate_t mbs; 733 mbstate_t mbs;
715 734
716 operator mbstate_t *() { return &mbs; } 735 operator mbstate_t *() { return &mbs; }
717 void reset () { memset (&mbs, 0, sizeof (mbs)); } 736 void reset () { memset (&mbs, 0, sizeof (mbs)); }
718 mbstate () { reset (); } 737 mbstate () { reset (); }
… …
739 758
740#if ENABLE_COMBINING 759#if ENABLE_COMBINING
741// compose chars are used to represent composite characters 760// compose chars are used to represent composite characters
742// that are not representable in unicode, as well as characters 761// that are not representable in unicode, as well as characters
743// not fitting in the BMP. 762// not fitting in the BMP.
744struct compose_char { 763struct compose_char
764{
745 unicode_t c1, c2; // any chars != NOCHAR are valid 765 unicode_t c1, c2; // any chars != NOCHAR are valid
746 compose_char (unicode_t c1, unicode_t c2) 766 compose_char (unicode_t c1, unicode_t c2)
747 : c1(c1), c2(c2) 767 : c1(c1), c2(c2)
748 { } 768 { }
749}; 769};
750 770
751class rxvt_composite_vec { 771class rxvt_composite_vec
772{
752 vector<compose_char> v; 773 vector<compose_char> v;
753public: 774public:
754 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 775 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
755 int expand (unicode_t c, wchar_t *r); 776 int expand (unicode_t c, wchar_t *r);
756 compose_char *operator [](text_t c) 777 compose_char *operator [](text_t c)
… …
775extern rxvt_t rxvt_current_term; 796extern rxvt_t rxvt_current_term;
776 797
777#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 798#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
778#define GET_R rxvt_current_term 799#define GET_R rxvt_current_term
779 800
801/* ------------------------------------------------------------------------- */
802struct overlay_base
803{
804 int x, y, w, h; // overlay dimensions
805 text_t **text;
806 rend_t **rend;
807
808 // while tempting to add swap() etc. here, it effetcively only increases code size
809};
810
811/* ------------------------------------------------------------------------- */
812
780typedef struct { 813typedef struct
814{
781 int row; 815 int row;
782 int col; 816 int col;
783} row_col_t; 817} row_col_t;
784 818
785/* 819/*
… …
810 * +------------+·display·+·= term_start 844 * +------------+·display·+·= term_start
811 * | terminal | display | 845 * | terminal | display |
812 * | terminal +---------+ 846 * | terminal +---------+
813 * | terminal | 847 * | terminal |
814 * | terminal | 848 * | terminal |
815 * +------------+···········= term_stat + nrow - 1 849 * +------------+···········= term_start + nrow - 1
816 * | 850 * |
817 * | 851 * |
818 * END······················= total_rows 852 * END······················= total_rows
819 */ 853 */
820 854
821struct TermWin_t { 855struct TermWin_t
856{
822 int width; /* window width [pixels] */ 857 int width; /* window width [pixels] */
823 int height; /* window height [pixels] */ 858 int height; /* window height [pixels] */
824 int fwidth; /* font width [pixels] */ 859 int fwidth; /* font width [pixels] */
825 int fheight; /* font height [pixels] */ 860 int fheight; /* font height [pixels] */
826 int fbase; /* font ascent (baseline) [pixels] */ 861 int fbase; /* font ascent (baseline) [pixels] */
… …
829 int focus; /* window has focus */ 864 int focus; /* window has focus */
830 int mapped; /* window state mapped? */ 865 int mapped; /* window state mapped? */
831 int int_bwidth; /* internal border width */ 866 int int_bwidth; /* internal border width */
832 int ext_bwidth; /* external border width */ 867 int ext_bwidth; /* external border width */
833 int lineSpace; /* number of extra pixels between rows */ 868 int lineSpace; /* number of extra pixels between rows */
869 int letterSpace; /* number of extra pixels between columns */
834 int saveLines; /* number of lines that fit in scrollback */ 870 int saveLines; /* number of lines that fit in scrollback */
835 int total_rows; /* total number of rows in this terminal */ 871 int total_rows; /* total number of rows in this terminal */
836 int term_start; /* term lines start here */ 872 int term_start; /* term lines start here */
837 int view_start; /* scrollback view starts here */ 873 int view_start; /* scrollback view starts here */
838 int top_row; /* topmost row index of scrollback */ 874 int top_row; /* topmost row index of scrollback */
… …
856 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 892 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
857 * nothing is selected 893 * nothing is selected
858 * beg: row/column of beginning of selection : never past mark 894 * beg: row/column of beginning of selection : never past mark
859 * mark: row/column of initial click : never past end 895 * mark: row/column of initial click : never past end
860 * end: row/column of one character past end of selection 896 * end: row/column of one character past end of selection
861 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 897 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
862 * * Note: col == -1 ==> we're left of screen 898 * * Note: col == -1 ==> we're left of screen
863 * 899 *
864 */ 900 */
865typedef struct { 901struct screen_t
902{
866 row_col_t cur; /* cursor position on the screen */ 903 row_col_t cur; /* cursor position on the screen */
867 int tscroll; /* top of settable scroll region */ 904 int tscroll; /* top of settable scroll region */
868 int bscroll; /* bottom of settable scroll region */ 905 int bscroll; /* bottom of settable scroll region */
869 unsigned int charset; /* character set number [0..3] */ 906 unsigned int charset; /* character set number [0..3] */
870 unsigned int flags; /* see below */ 907 unsigned int flags; /* see below */
871 row_col_t s_cur; /* saved cursor position */ 908 row_col_t s_cur; /* saved cursor position */
872 unsigned int s_charset; /* saved character set number [0..3] */ 909 unsigned int s_charset; /* saved character set number [0..3] */
873 char s_charset_char; 910 char s_charset_char;
874 rend_t s_rstyle; /* saved rendition style */ 911 rend_t s_rstyle; /* saved rendition style */
875} screen_t; 912};
876 913
877enum selection_op_t { 914enum selection_op_t
915{
878 SELECTION_CLEAR = 0, /* nothing selected */ 916 SELECTION_CLEAR = 0, /* nothing selected */
879 SELECTION_INIT, /* marked a point */ 917 SELECTION_INIT, /* marked a point */
880 SELECTION_BEGIN, /* started a selection */ 918 SELECTION_BEGIN, /* started a selection */
881 SELECTION_CONT, /* continued selection */ 919 SELECTION_CONT, /* continued selection */
882 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 920 SELECTION_DONE /* selection put in CUT_BUFFER0 */
883}; 921};
884 922
885typedef struct { 923struct selection_t
924{
886 wchar_t *text; /* selected text */ 925 wchar_t *text; /* selected text */
887 unsigned int len; /* length of selected text */ 926 unsigned int len; /* length of selected text */
888 unsigned int screen; /* screen being used */ 927 unsigned int screen; /* screen being used */
889 unsigned int clicks; /* number of clicks */ 928 unsigned int clicks; /* number of clicks */
890 selection_op_t op; /* current operation */ 929 selection_op_t op; /* current operation */
891 bool rect; /* rectangular selection? */ 930 bool rect; /* rectangular selection? */
892 row_col_t beg; /* beginning of selection <= mark */ 931 row_col_t beg; /* beginning of selection <= mark */
893 row_col_t mark; /* point of initial click <= end */ 932 row_col_t mark; /* point of initial click <= end */
894 row_col_t end; /* one character past end point */ 933 row_col_t end; /* one character past end point */
895} selection_t; 934 wchar_t *clip_text; /* text copied to the clipboard */
935 unsigned int clip_len; /* length of clipboard text */
936};
896 937
897/* ------------------------------------------------------------------------- */ 938/* ------------------------------------------------------------------------- */
898 939
899/* screen_t flags */ 940/* screen_t flags */
900#define Screen_Relative (1<<0) /* relative origin mode flag */ 941#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
914Opt_count 955Opt_count
915}; 956};
916 957
917/* ------------------------------------------------------------------------- */ 958/* ------------------------------------------------------------------------- */
918 959
919struct rxvt_vars : TermWin_t { 960struct rxvt_vars : TermWin_t
961{
920 scrollBar_t scrollBar; 962 scrollBar_t scrollBar;
921 uint8_t options[(Opt_count + 7) >> 3]; 963 uint8_t options[(Opt_count + 7) >> 3];
922 XSizeHints szHint; 964 XSizeHints szHint;
923 rxvt_color *pix_colors; 965 rxvt_color *pix_colors;
924 Cursor TermWin_cursor; /* cursor for vt window */ 966 Cursor TermWin_cursor; /* cursor for vt window */
925 int numlock_state;
926 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 967 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
927 line_t *drawn_buf; // text on screen 968 line_t *drawn_buf; // text on screen
928 line_t *swap_buf; // lines for swap buffer 969 line_t *swap_buf; // lines for swap buffer
929 char *tabs; /* per location: 1 == tab-stop */ 970 char *tabs; /* per location: 1 == tab-stop */
930 screen_t screen; 971 screen_t screen;
… …
934#ifdef OFF_FOCUS_FADING 975#ifdef OFF_FOCUS_FADING
935 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 976 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
936#endif 977#endif
937}; 978};
938 979
939struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 980struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
981{
940 982
941 // special markers with magic addresses 983 // special markers with magic addresses
942 static const char resval_undef []; // options specifically unset 984 static const char resval_undef []; // options specifically unset
943 static const char resval_on []; // boolean options switched on 985 static const char resval_on []; // boolean options switched on
944 static const char resval_off []; // or off 986 static const char resval_off []; // or off
… …
952 994
953 unsigned char want_refresh:1, 995 unsigned char want_refresh:1,
954 current_screen:1, /* primary or secondary */ 996 current_screen:1, /* primary or secondary */
955 num_scr_allow:1, 997 num_scr_allow:1,
956 bypass_keystate:1, 998 bypass_keystate:1,
999#if ENABLE_FRILLS
1000 urgency_hint:1,
1001#endif
957#ifdef CURSOR_BLINK 1002#if CURSOR_BLINK
958 hidden_cursor:1, 1003 hidden_cursor:1,
959#endif 1004#endif
960#ifdef TEXT_BLINK 1005#if TEXT_BLINK
961 hidden_text:1, 1006 hidden_text:1,
962#endif 1007#endif
963#ifdef POINTER_BLANK 1008#if POINTER_BLANK
964 hidden_pointer:1, 1009 hidden_pointer:1,
965#endif 1010#endif
966 enc_utf8:1, /* wether locale uses utf-8 */ 1011 enc_utf8:1, /* whether locale uses utf-8 */
967 seen_input:1, /* wether we have seen some program output yet */ 1012 seen_input:1, /* whether we have seen some program output yet */
968 seen_resize:1, /* wether we had a resize event */ 1013 seen_resize:1, /* whether we had a resize event */
969 parsed_geometry:1; 1014 parsed_geometry:1;
970 1015
971 unsigned char refresh_type, 1016 unsigned char refresh_type,
972#ifdef META8_OPTION 1017#ifdef META8_OPTION
973 meta_char, /* Alt-key prefix */ 1018 meta_char, /* Alt-key prefix */
… …
977/* ---------- */ 1022/* ---------- */
978 bool rvideo_state, rvideo_mode; 1023 bool rvideo_state, rvideo_mode;
979#ifndef NO_BELL 1024#ifndef NO_BELL
980 bool rvideo_bell; 1025 bool rvideo_bell;
981#endif 1026#endif
982 int num_scr; /* screen: number lines scrolled */ 1027 int num_scr; /* screen: number of lines scrolled */
983 int prev_ncol, /* screen: previous number of columns */ 1028 int prev_ncol, /* screen: previous number of columns */
984 prev_nrow; /* screen: previous number of rows */ 1029 prev_nrow; /* screen: previous number of rows */
985/* ---------- */ 1030/* ---------- */
986 rend_t rstyle; 1031 rend_t rstyle;
987/* ---------- */ 1032/* ---------- */
… …
999 mouse_slip_wheel_speed, 1044 mouse_slip_wheel_speed,
1000#endif 1045#endif
1001 refresh_count, 1046 refresh_count,
1002 window_vt_x, 1047 window_vt_x,
1003 window_vt_y, 1048 window_vt_y,
1004 window_sb_x,
1005 mouse_row, 1049 mouse_row,
1006 mouse_col, 1050 mouse_col,
1007# ifdef POINTER_BLANK 1051# ifdef POINTER_BLANK
1008 pointerBlankDelay, 1052 pointerBlankDelay,
1009# endif 1053# endif
… …
1017 unsigned long priv_modes, 1061 unsigned long priv_modes,
1018 SavedModes; 1062 SavedModes;
1019/* ---------- */ 1063/* ---------- */
1020 Atom *xa; 1064 Atom *xa;
1021/* ---------- */ 1065/* ---------- */
1022#ifdef RXVT_SCROLLBAR
1023 GC scrollbarGC,
1024 topShadowGC,
1025 botShadowGC;
1026#endif
1027#ifdef XTERM_SCROLLBAR
1028 GC xscrollbarGC,
1029 ShadowGC;
1030#endif
1031#ifdef PLAIN_SCROLLBAR
1032 GC pscrollbarGC;
1033#endif
1034#ifdef NEXT_SCROLLBAR
1035 GC blackGC,
1036 whiteGC,
1037 grayGC,
1038 darkGC,
1039 stippleGC;
1040 Pixmap dimple,
1041 upArrow,
1042 downArrow,
1043 upArrowHi,
1044 downArrowHi;
1045#endif
1046/* ---------- */
1047 Time selection_time, 1066 Time selection_time,
1048 selection_request_time; 1067 selection_request_time,
1068 clipboard_time;
1049 pid_t cmd_pid; /* process id of child */ 1069 pid_t cmd_pid; /* process id of child */
1050 char * incr_buf; 1070 char * incr_buf;
1051 size_t incr_buf_size, incr_buf_fill; 1071 size_t incr_buf_size, incr_buf_fill;
1052/* ---------- */ 1072/* ---------- */
1053 struct mouse_event MEvent; 1073 struct mouse_event MEvent;
… …
1058 bgPixmap_t bgPixmap; 1078 bgPixmap_t bgPixmap;
1059#endif 1079#endif
1060#ifdef HAVE_AFTERIMAGE 1080#ifdef HAVE_AFTERIMAGE
1061 ASVisual *asv; 1081 ASVisual *asv;
1062 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 }
1063#endif 1089#endif
1064 1090
1065#if ENABLE_OVERLAY 1091#if ENABLE_OVERLAY
1066 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1092 overlay_base ov;
1067 text_t **ov_text;
1068 rend_t **ov_rend;
1069 1093
1070 void scr_swap_overlay () NOTHROW; 1094 void scr_swap_overlay () NOTHROW;
1071 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;
1072 void scr_overlay_off () NOTHROW; 1096 void scr_overlay_off () NOTHROW;
1073 void scr_overlay_set (int x, int y, 1097 void scr_overlay_set (int x, int y,
… …
1111 1135
1112#if ENABLE_FRILLS || ISO_14755 1136#if ENABLE_FRILLS || ISO_14755
1113 // ISO 14755 entry support 1137 // ISO 14755 entry support
1114 unicode_t iso14755buf; 1138 unicode_t iso14755buf;
1115 void commit_iso14755 (); 1139 void commit_iso14755 ();
1116 int hex_keyval (XKeyEvent &ev);
1117# if ISO_14755 1140# if ISO_14755
1118 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);
1119 void iso14755_54 (int x, int y); 1142 void iso14755_54 (int x, int y);
1120# endif 1143# endif
1121#endif 1144#endif
… …
1225 wchar_t next_char () NOTHROW; 1248 wchar_t next_char () NOTHROW;
1226 wchar_t cmd_getc () THROW ((class out_of_input)); 1249 wchar_t cmd_getc () THROW ((class out_of_input));
1227 uint32_t next_octet () NOTHROW; 1250 uint32_t next_octet () NOTHROW;
1228 uint32_t cmd_get8 () THROW ((class out_of_input)); 1251 uint32_t cmd_get8 () THROW ((class out_of_input));
1229 1252
1230 bool cmd_parse (); 1253 void cmd_parse ();
1231 void mouse_report (XButtonEvent &ev); 1254 void mouse_report (XButtonEvent &ev);
1232 void button_press (XButtonEvent &ev); 1255 void button_press (XButtonEvent &ev);
1233 void button_release (XButtonEvent &ev); 1256 void button_release (XButtonEvent &ev);
1234 void focus_in (); 1257 void focus_in ();
1235 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
1236 void update_fade_color (unsigned int idx); 1264 void update_fade_color (unsigned int idx);
1237#ifdef PRINTPIPE 1265#ifdef PRINTPIPE
1238 FILE *popen_printer (); 1266 FILE *popen_printer ();
1239 int pclose_printer (FILE *stream); 1267 int pclose_printer (FILE *stream);
1240#endif 1268#endif
… …
1246 void process_window_ops (const int *args, unsigned int nargs); 1274 void process_window_ops (const int *args, unsigned int nargs);
1247 char *get_to_st (unicode_t &ends_how); 1275 char *get_to_st (unicode_t &ends_how);
1248 void process_dcs_seq (); 1276 void process_dcs_seq ();
1249 void process_osc_seq (); 1277 void process_osc_seq ();
1250 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);
1251 void process_xterm_seq (int op, const char *str, char resp); 1279 void process_xterm_seq (int op, char *str, char resp);
1252 int privcases (int mode, unsigned long bit); 1280 int privcases (int mode, unsigned long bit);
1253 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);
1254 void process_sgr_mode (unsigned int nargs, const int *arg); 1282 void process_sgr_mode (unsigned int nargs, const int *arg);
1255 void process_graphics (); 1283 void process_graphics ();
1256 // init.C 1284 // init.C
… …
1263 void init_command (const char *const *argv); 1291 void init_command (const char *const *argv);
1264 void run_command (const char *const *argv); 1292 void run_command (const char *const *argv);
1265 int run_child (const char *const *argv); 1293 int run_child (const char *const *argv);
1266 void color_aliases (int idx); 1294 void color_aliases (int idx);
1267 void create_windows (int argc, const char *const *argv); 1295 void create_windows (int argc, const char *const *argv);
1268 void Get_Colours (); 1296 void get_colours ();
1269 void get_ourmods (); 1297 void get_ourmods ();
1270 // main.C 1298 // main.C
1271 void tt_winch (); 1299 void tt_winch ();
1272 rxvt_term (); 1300 rxvt_term ();
1273 ~rxvt_term (); 1301 ~rxvt_term ();
… …
1366 options[opt >> 3] |= (1 << (opt & 7)); 1394 options[opt >> 3] |= (1 << (opt & 7));
1367 else 1395 else
1368 options[opt >> 3] &= ~(1 << (opt & 7)); 1396 options[opt >> 3] &= ~(1 << (opt & 7));
1369 } 1397 }
1370 1398
1371 void PrivMode (int set, unsigned bit) NOTHROW 1399 void set_privmode (unsigned bit, int set) NOTHROW
1372 { 1400 {
1373 if (set) 1401 if (set)
1374 priv_modes |= bit; 1402 priv_modes |= bit;
1375 else 1403 else
1376 priv_modes &= ~bit; 1404 priv_modes &= ~bit;
… …
1378 1406
1379 // modifies first argument(!) 1407 // modifies first argument(!)
1380 void paste (char *data, unsigned int len) NOTHROW; 1408 void paste (char *data, unsigned int len) NOTHROW;
1381 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;
1382 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;
1383 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1412 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1384 void scr_reset (); 1413 void scr_reset ();
1385 void scr_release () NOTHROW; 1414 void scr_release () NOTHROW;
1386 void scr_clear (bool really = false) NOTHROW; 1415 void scr_clear (bool really = false) NOTHROW;
1387 void scr_refresh () NOTHROW; 1416 void scr_refresh () NOTHROW;
… …
1399 void scr_remap_chars (line_t &l) NOTHROW; 1428 void scr_remap_chars (line_t &l) NOTHROW;
1400 1429
1401 enum cursor_mode { SAVE, RESTORE }; 1430 enum cursor_mode { SAVE, RESTORE };
1402 1431
1403 void scr_poweron (); 1432 void scr_poweron ();
1433 void scr_soft_reset () NOTHROW;
1404 void scr_cursor (cursor_mode mode) NOTHROW; 1434 void scr_cursor (cursor_mode mode) NOTHROW;
1405 void scr_do_wrap () NOTHROW; 1435 void scr_do_wrap () NOTHROW;
1406 void scr_swap_screen () NOTHROW; 1436 void scr_swap_screen () NOTHROW;
1407 void scr_change_screen (int scrn); 1437 void scr_change_screen (int scrn);
1408 void scr_color (unsigned int color, int fgbg) NOTHROW; 1438 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1440 void selection_check (int check_more) NOTHROW; 1470 void selection_check (int check_more) NOTHROW;
1441 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1471 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1442 void selection_property (Window win, Atom prop) NOTHROW; 1472 void selection_property (Window win, Atom prop) NOTHROW;
1443 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1473 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1444 int selection_request_other (Atom target, int selnum) NOTHROW; 1474 int selection_request_other (Atom target, int selnum) NOTHROW;
1445 void selection_clear () NOTHROW; 1475 void selection_clear (bool clipboard = false) NOTHROW;
1476 void clipboard_copy (Time tm);
1446 void selection_make (Time tm); 1477 void selection_make (Time tm);
1447 bool selection_grab (Time tm) NOTHROW; 1478 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1448 void selection_start_colrow (int col, int row) NOTHROW; 1479 void selection_start_colrow (int col, int row) NOTHROW;
1449 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;
1450 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;
1451 void selection_remove_trailing_spaces () NOTHROW; 1482 void selection_remove_trailing_spaces () NOTHROW;
1452 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1483 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1453 void selection_click (int clicks, int x, int y) NOTHROW; 1484 void selection_click (int clicks, int x, int y) NOTHROW;
1454 void selection_extend (int x, int y, int flag) NOTHROW; 1485 void selection_extend (int x, int y, int flag) NOTHROW;
1455 void selection_rotate (int x, int y) NOTHROW; 1486 void selection_rotate (int x, int y) NOTHROW;
1456 1487
1457#if defined(NEXT_SCROLLBAR)
1458 // scrollbar-next.C
1459 Pixmap renderPixmap (const char *const *data, int width, int height);
1460 void init_scrollbar_stuff ();
1461 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1462 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1463#endif
1464
1465#if defined(RXVT_SCROLLBAR)
1466 // scrollbar-rxvt.C
1467 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1468#endif
1469
1470#if defined(XTERM_SCROLLBAR)
1471 // scrollbar-xterm.C
1472 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1473#endif
1474
1475#if defined(PLAIN_SCROLLBAR)
1476 // scrollbar-plain.C
1477 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1478#endif
1479
1480 // scrollbar.C
1481 void resize_scrollbar ();
1482 int scrollbar_mapping (int map);
1483 int scrollbar_show (int update);
1484
1485 // xdefaults.C 1488 // xdefaults.C
1486 void get_options (int argc, const char *const *argv); 1489 void get_options (int argc, const char *const *argv);
1487 int parse_keysym (const char *str, const char *arg); 1490 int parse_keysym (const char *str, const char *arg);
1488 const char *x_resource (const char *name); 1491 const char *x_resource (const char *name);
1489 void extract_resources (); 1492 void extract_resources ();

Diff Legend

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