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.372 by root, Wed Nov 5 14:43:54 2008 UTC vs.
Revision 1.419 by root, Tue Dec 7 17:51:27 2010 UTC

… …
110 110
111#ifndef STDIN_FILENO 111#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 112# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 113# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 114# define STDERR_FILENO 2
115#endif
116
117#if !defined (EACCESS) && defined(EAGAIN)
118# define EACCESS EAGAIN
119#endif 115#endif
120 116
121#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
122# define EXIT_SUCCESS 0 /* exit function success */ 118# define EXIT_SUCCESS 0 /* exit function success */
123# define EXIT_FAILURE 1 /* exit function failure */ 119# define EXIT_FAILURE 1 /* exit function failure */
… …
151char * rxvt_wcstombs (const wchar_t *str, int len = -1); 147char * rxvt_wcstombs (const wchar_t *str, int len = -1);
152wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 148wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
153char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 149char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
154wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 150wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
155 151
156char * rxvt_basename (const char *str) NOTHROW; 152const char * rxvt_basename (const char *str) NOTHROW;
157void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
158void rxvt_log (const char *fmt,...) NOTHROW; 154void rxvt_log (const char *fmt,...) NOTHROW;
159void rxvt_warn (const char *fmt,...) NOTHROW; 155void rxvt_warn (const char *fmt,...) NOTHROW;
160void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
161void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
… …
251# define COLORTERMENVFULL COLORTERMENV "-xpm" 247# define COLORTERMENVFULL COLORTERMENV "-xpm"
252#else 248#else
253# define COLORTERMENVFULL COLORTERMENV 249# define COLORTERMENVFULL COLORTERMENV
254#endif 250#endif
255#ifndef TERMENV 251#ifndef TERMENV
252# if USE_256_COLORS
253# define TERMENV "rxvt-unicode-256color"
254# else
256# define TERMENV "rxvt-unicode" 255# define TERMENV "rxvt-unicode"
256# endif
257#endif 257#endif
258 258
259#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 259#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
260# define NO_MOUSE_REPORT_SCROLLBAR 1 260# define NO_MOUSE_REPORT_SCROLLBAR 1
261#endif 261#endif
… …
308enum { 308enum {
309 PRIMARY = 0, 309 PRIMARY = 0,
310 SECONDARY, 310 SECONDARY,
311}; 311};
312 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
313#define RS_None 0 316#define RS_None 0
314 317
315#define RS_fgMask 0x0000007fUL // 128 colors 318// GET_BGATTR depends on RS_fgShift > RS_bgShift
316#define RS_bgMask 0x00003f80UL // 128 colors 319#define RS_colorMask ((1UL << Color_Bits) - 1UL)
320#define RS_bgShift 0
321#define RS_fgShift (RS_bgShift + Color_Bits)
322#define RS_bgMask (RS_colorMask << RS_bgShift)
323#define RS_fgMask (RS_colorMask << RS_fgShift)
324
325// must have space for rxvt_fontset::fontCount * 2 + 2 values
326#define RS_fontShift (RS_fgShift + Color_Bits)
327#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
328#define RS_fontCount rxvt_fontset::fontCount
329#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
330
331// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
332#define RS_redraw (2UL << RS_fontShift)
333
334#define RS_Sel (1UL << 22)
335
336// 4 custom bits for extensions
337#define RS_customCount 16UL
338#define RS_customShift 23
339#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
317 340
318// font styles 341// font styles
319#define RS_Bold 0x00004000UL // value 1 342#define RS_Bold (1UL << RS_styleShift)
320#define RS_Italic 0x00008000UL // value 2 343#define RS_Italic (2UL << RS_styleShift)
344
345#define RS_styleCount 4
346#define RS_styleShift 27
347#define RS_styleMask (RS_Bold | RS_Italic)
321 348
322// fake styles 349// fake styles
323#define RS_Blink 0x00010000UL // blink 350#define RS_Blink (1UL << 29)
324#define RS_RVid 0x00020000UL // reverse video 351#define RS_RVid (1UL << 30) // reverse video
325#define RS_Uline 0x00040000UL // underline 352#define RS_Uline (1UL << 31) // underline
326
327// toggle this to force redraw, must be != RS_Careful
328#define RS_redraw 0x01000000UL
329
330// 5 custom bits for extensions
331#define RS_customCount 32
332#define RS_customMask 0x00f80000UL
333#define RS_customShift 19
334
335// other flags
336#define RS_Careful 0x80000000UL /* be careful when drawing these */
337
338#define RS_styleCount 4
339#define RS_styleMask (RS_Bold | RS_Italic)
340#define RS_styleShift 14
341 353
342#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 354#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
343#define RS_attrMask (RS_baseattrMask | RS_fontMask) 355#define RS_attrMask (RS_baseattrMask | RS_fontMask)
344 356
345#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
346#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
347#define RS_fontShift 24
348
349#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 357#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
350#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 358#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
351 359
352#define Sel_none 0 /* Not waiting */ 360#define Sel_none 0 /* Not waiting */
353#define Sel_normal 0x01 /* normal selection */ 361#define Sel_normal 0x01 /* normal selection */
354#define Sel_incr 0x02 /* incremental selection */ 362#define Sel_incr 0x02 /* incremental selection */
355#define Sel_direct 0x00 363#define Sel_direct 0x00
… …
384 XTerm_Color_cursor = 12, // change actual 'Cursor' color 392 XTerm_Color_cursor = 12, // change actual 'Cursor' color
385 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 393 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
386 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 394 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
387 XTerm_Color05 = 15, // not implemented (tektronix fg) 395 XTerm_Color05 = 15, // not implemented (tektronix fg)
388 XTerm_Color06 = 16, // not implemented (tektronix bg) 396 XTerm_Color06 = 16, // not implemented (tektronix bg)
389 XTerm_Color_RV = 17, // change actual 'Highlight' color 397 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
398 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
390 XTerm_logfile = 46, // not implemented 399 XTerm_logfile = 46, // not implemented
391 XTerm_font = 50, 400 XTerm_font = 50,
392 401
393 XTerm_konsole30 = 30, // reserved for konsole 402 XTerm_konsole30 = 30, // reserved for konsole
394 XTerm_konsole31 = 31, // reserved for konsole 403 XTerm_konsole31 = 31, // reserved for konsole
… …
396 /* 405 /*
397 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 406 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
398 */ 407 */
399 408
400 // deprecated 409 // deprecated
401 Rxvt_Color_BD = 18,
402 Rxvt_Color_UL = 19,
403 Rxvt_restoreFG = 39, 410 Rxvt_restoreFG = 39,
404 Rxvt_restoreBG = 49, 411 Rxvt_restoreBG = 49,
405 412
406 Rxvt_Pixmap = 20, // new bg pixmap 413 Rxvt_Pixmap = 20, // new bg pixmap
407 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 414 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
411 418
412 URxvt_Color_IT = 704, // change actual 'Italic' colour 419 URxvt_Color_IT = 704, // change actual 'Italic' colour
413 URxvt_Color_tint = 705, // change actual tint colour 420 URxvt_Color_tint = 705, // change actual tint colour
414 URxvt_Color_BD = 706, // change actual 'Bold' color 421 URxvt_Color_BD = 706, // change actual 'Bold' color
415 URxvt_Color_UL = 707, // change actual 'Underline' color 422 URxvt_Color_UL = 707, // change actual 'Underline' color
423 URxvt_Color_border = 708,
416 424
417 URxvt_font = 710, 425 URxvt_font = 710,
418 URxvt_boldFont = 711, 426 URxvt_boldFont = 711,
419 URxvt_italicFont = 712, 427 URxvt_italicFont = 712,
420 URxvt_boldItalicFont = 713, 428 URxvt_boldItalicFont = 713,
… …
460 Color_White = maxBrightCOLOR, 468 Color_White = maxBrightCOLOR,
461#else 469#else
462 Color_White = maxCOLOR, 470 Color_White = maxCOLOR,
463#endif 471#endif
464 minTermCOLOR = Color_White + 1, 472 minTermCOLOR = Color_White + 1,
473#if USE_256_COLORS
474 maxTermCOLOR = Color_White + 240,
475#else
465 maxTermCOLOR = Color_White + 72, 476 maxTermCOLOR = Color_White + 72,
477#endif
466#ifndef NO_CURSORCOLOR 478#ifndef NO_CURSORCOLOR
467 Color_cursor, 479 Color_cursor,
468 Color_cursor2, 480 Color_cursor2,
469#endif 481#endif
470 Color_pointer_fg, 482 Color_pointer_fg,
… …
479#if ENABLE_FRILLS 491#if ENABLE_FRILLS
480 Color_underline, 492 Color_underline,
481#endif 493#endif
482#ifdef OPTION_HC 494#ifdef OPTION_HC
483 Color_HC, 495 Color_HC,
496 Color_HTC,
484#endif 497#endif
485 Color_scroll, 498 Color_scroll,
486#ifdef RXVT_SCROLLBAR 499#ifdef RXVT_SCROLLBAR
487 Color_trough, 500 Color_trough,
488#endif 501#endif
… …
500#else 513#else
501 TOTAL_COLORS = NRS_COLORS 514 TOTAL_COLORS = NRS_COLORS
502#endif 515#endif
503}; 516};
504 517
518#if USE_256_COLORS
519# define Color_Bits 9 // 0 .. maxTermCOLOR
520#else
505#define Color_Bits 7 // 0 .. maxTermCOLOR 521# define Color_Bits 7 // 0 .. maxTermCOLOR
522#endif
506 523
507/* 524/*
508 * Resource list 525 * Resource list
509 */ 526 */
510enum { 527enum {
… …
538#define PrivMode_vt52 (1UL<<18) 555#define PrivMode_vt52 (1UL<<18)
539#define PrivMode_LFNL (1UL<<19) 556#define PrivMode_LFNL (1UL<<19)
540#define PrivMode_MouseBtnEvent (1UL<<20) 557#define PrivMode_MouseBtnEvent (1UL<<20)
541#define PrivMode_MouseAnyEvent (1UL<<21) 558#define PrivMode_MouseAnyEvent (1UL<<21)
542#define PrivMode_BracketPaste (1UL<<22) 559#define PrivMode_BracketPaste (1UL<<22)
560#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
561#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
543 562
544#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 563#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
545 564
546#ifdef ALLOW_132_MODE 565#ifdef ALLOW_132_MODE
547# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 566# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
598/* 617/*
599 ***************************************************************************** 618 *****************************************************************************
600 * MACRO DEFINES 619 * MACRO DEFINES
601 ***************************************************************************** 620 *****************************************************************************
602 */ 621 */
622
623// speed hack, copy some member variable into a local variable of the same name
603#define dLocal(type,name) type const name = this->name 624#define dLocal(type,name) type const name = this->name
604 625
605// for speed reasons, we assume that all codepoints 32 to 126 are 626// for speed reasons, we assume that all codepoints 32 to 126 are
606// single-width. 627// single-width.
607#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 628#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
621 642
622#define LINENO(n) LINENO_of (this, n) 643#define LINENO(n) LINENO_of (this, n)
623#define ROW(n) ROW_of (this, n) 644#define ROW(n) ROW_of (this, n)
624 645
625/* how to build & extract colors and attributes */ 646/* how to build & extract colors and attributes */
626#define GET_BASEFG(x) (((x) & RS_fgMask)) 647#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
627#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 648#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
628 649
629#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 650#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
630#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 651#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
631 652
632#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 653#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
633#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 654#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
634 655
635#define GET_ATTR(x) (((x) & RS_attrMask)) 656#define GET_ATTR(x) (((x) & RS_attrMask))
657// return attributes defining the background, encoding doesn't matter
658// depends on RS_fgShift > RS_bgShift
636#define GET_BGATTR(x) \ 659#define GET_BGATTR(x) \
660 (expect_false ((x) & RS_RVid) \
637 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 661 ? (((x) & (RS_attrMask & ~RS_RVid)) \
638 | (((x) & RS_fgMask)<<Color_Bits)) \ 662 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
639 : ((x) & (RS_attrMask | RS_bgMask))) 663 : ((x) & (RS_attrMask | RS_bgMask)))
640#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 664#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
641#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 665#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
642#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 666#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
643 667
644#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 668#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
645 669
646#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 670#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
… …
785{ 809{
786 int x, y, w, h; // overlay dimensions 810 int x, y, w, h; // overlay dimensions
787 text_t **text; 811 text_t **text;
788 rend_t **rend; 812 rend_t **rend;
789 813
790 // while tempting to add swap() etc. here, it effetcively only increases code size 814 // while tempting to add swap() etc. here, it effectively only increases code size
791}; 815};
792 816
793/* ------------------------------------------------------------------------- */ 817/* ------------------------------------------------------------------------- */
794 818
795typedef struct 819typedef struct
… …
846 int focus; /* window has focus */ 870 int focus; /* window has focus */
847 int mapped; /* window state mapped? */ 871 int mapped; /* window state mapped? */
848 int int_bwidth; /* internal border width */ 872 int int_bwidth; /* internal border width */
849 int ext_bwidth; /* external border width */ 873 int ext_bwidth; /* external border width */
850 int lineSpace; /* number of extra pixels between rows */ 874 int lineSpace; /* number of extra pixels between rows */
875 int letterSpace; /* number of extra pixels between columns */
851 int saveLines; /* number of lines that fit in scrollback */ 876 int saveLines; /* number of lines that fit in scrollback */
852 int total_rows; /* total number of rows in this terminal */ 877 int total_rows; /* total number of rows in this terminal */
853 int term_start; /* term lines start here */ 878 int term_start; /* term lines start here */
854 int view_start; /* scrollback view starts here */ 879 int view_start; /* scrollback view starts here */
855 int top_row; /* topmost row index of scrollback */ 880 int top_row; /* topmost row index of scrollback */
… …
910 selection_op_t op; /* current operation */ 935 selection_op_t op; /* current operation */
911 bool rect; /* rectangular selection? */ 936 bool rect; /* rectangular selection? */
912 row_col_t beg; /* beginning of selection <= mark */ 937 row_col_t beg; /* beginning of selection <= mark */
913 row_col_t mark; /* point of initial click <= end */ 938 row_col_t mark; /* point of initial click <= end */
914 row_col_t end; /* one character past end point */ 939 row_col_t end; /* one character past end point */
940 wchar_t *clip_text; /* text copied to the clipboard */
941 unsigned int clip_len; /* length of clipboard text */
915}; 942};
916 943
917/* ------------------------------------------------------------------------- */ 944/* ------------------------------------------------------------------------- */
918 945
919/* screen_t flags */ 946/* screen_t flags */
… …
924#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 951#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
925#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 952#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
926 953
927/* rxvt_vars.options */ 954/* rxvt_vars.options */
928enum { 955enum {
929# define def(name,idx) Opt_ ## name = idx,
930# define nodef(name) Opt_ ## name = 0, 956# define def(name) Opt_ ## name,
957# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
958 Opt_0,
931# include "optinc.h" 959# include "optinc.h"
932# undef nodef 960# undef nodef
933# undef def 961# undef def
934Opt_count 962 Opt_count
935}; 963};
936 964
937/* ------------------------------------------------------------------------- */ 965/* ------------------------------------------------------------------------- */
938 966
939struct rxvt_vars : TermWin_t 967struct rxvt_vars : TermWin_t
… …
941 scrollBar_t scrollBar; 969 scrollBar_t scrollBar;
942 uint8_t options[(Opt_count + 7) >> 3]; 970 uint8_t options[(Opt_count + 7) >> 3];
943 XSizeHints szHint; 971 XSizeHints szHint;
944 rxvt_color *pix_colors; 972 rxvt_color *pix_colors;
945 Cursor TermWin_cursor; /* cursor for vt window */ 973 Cursor TermWin_cursor; /* cursor for vt window */
946 int numlock_state;
947 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 974 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
948 line_t *drawn_buf; // text on screen 975 line_t *drawn_buf; // text on screen
949 line_t *swap_buf; // lines for swap buffer 976 line_t *swap_buf; // lines for swap buffer
950 char *tabs; /* per location: 1 == tab-stop */ 977 char *tabs; /* per location: 1 == tab-stop */
951 screen_t screen; 978 screen_t screen;
… …
974 1001
975 unsigned char want_refresh:1, 1002 unsigned char want_refresh:1,
976 current_screen:1, /* primary or secondary */ 1003 current_screen:1, /* primary or secondary */
977 num_scr_allow:1, 1004 num_scr_allow:1,
978 bypass_keystate:1, 1005 bypass_keystate:1,
979#ifdef ENABLE_FRILLS 1006#if ENABLE_FRILLS
980 urgency_hint:1, 1007 urgency_hint:1,
981#endif 1008#endif
982#ifdef CURSOR_BLINK 1009#if CURSOR_BLINK
983 hidden_cursor:1, 1010 hidden_cursor:1,
984#endif 1011#endif
985#ifdef TEXT_BLINK 1012#if TEXT_BLINK
986 hidden_text:1, 1013 hidden_text:1,
987#endif 1014#endif
988#ifdef POINTER_BLANK 1015#if POINTER_BLANK
989 hidden_pointer:1, 1016 hidden_pointer:1,
990#endif 1017#endif
991 enc_utf8:1, /* wether locale uses utf-8 */ 1018 enc_utf8:1, /* whether locale uses utf-8 */
992 seen_input:1, /* wether we have seen some program output yet */ 1019 seen_input:1, /* whether we have seen some program output yet */
993 seen_resize:1, /* wether we had a resize event */ 1020 seen_resize:1, /* whether we had a resize event */
994 parsed_geometry:1; 1021 parsed_geometry:1;
995 1022
996 unsigned char refresh_type, 1023 unsigned char refresh_type,
997#ifdef META8_OPTION 1024#ifdef META8_OPTION
998 meta_char, /* Alt-key prefix */ 1025 meta_char, /* Alt-key prefix */
… …
1002/* ---------- */ 1029/* ---------- */
1003 bool rvideo_state, rvideo_mode; 1030 bool rvideo_state, rvideo_mode;
1004#ifndef NO_BELL 1031#ifndef NO_BELL
1005 bool rvideo_bell; 1032 bool rvideo_bell;
1006#endif 1033#endif
1007 int num_scr; /* screen: number lines scrolled */ 1034 int num_scr; /* screen: number of lines scrolled */
1008 int prev_ncol, /* screen: previous number of columns */ 1035 int prev_ncol, /* screen: previous number of columns */
1009 prev_nrow; /* screen: previous number of rows */ 1036 prev_nrow; /* screen: previous number of rows */
1010/* ---------- */ 1037/* ---------- */
1011 rend_t rstyle; 1038 rend_t rstyle;
1012/* ---------- */ 1039/* ---------- */
… …
1042 SavedModes; 1069 SavedModes;
1043/* ---------- */ 1070/* ---------- */
1044 Atom *xa; 1071 Atom *xa;
1045/* ---------- */ 1072/* ---------- */
1046 Time selection_time, 1073 Time selection_time,
1047 selection_request_time; 1074 selection_request_time,
1075 clipboard_time;
1048 pid_t cmd_pid; /* process id of child */ 1076 pid_t cmd_pid; /* process id of child */
1049 char * incr_buf; 1077 char * incr_buf;
1050 size_t incr_buf_size, incr_buf_fill; 1078 size_t incr_buf_size, incr_buf_fill;
1051/* ---------- */ 1079/* ---------- */
1052 struct mouse_event MEvent; 1080 struct mouse_event MEvent;
1053 XComposeStatus compose; 1081 XComposeStatus compose;
1054 struct termios tio; 1082 static struct termios def_tio;
1055 row_col_t oldcursor; 1083 row_col_t oldcursor;
1056#ifdef HAVE_BG_PIXMAP 1084#ifdef HAVE_BG_PIXMAP
1057 bgPixmap_t bgPixmap; 1085 bgPixmap_t bgPixmap;
1058#endif 1086#endif
1059#ifdef HAVE_AFTERIMAGE 1087#ifdef HAVE_AFTERIMAGE
… …
1133 void rootwin_cb (XEvent &xev); 1161 void rootwin_cb (XEvent &xev);
1134 xevent_watcher rootwin_ev; 1162 xevent_watcher rootwin_ev;
1135#endif 1163#endif
1136#ifdef HAVE_BG_PIXMAP 1164#ifdef HAVE_BG_PIXMAP
1137 void update_background (); 1165 void update_background ();
1138#if TRACE_PIXMAPS
1139 void trace_update_background (const char *file, int line);
1140# define update_background() trace_update_background (__FILE__, __LINE__)
1141#endif
1142 void update_background_cb (ev::timer &w, int revents); 1166 void update_background_cb (ev::timer &w, int revents);
1143 ev::timer update_background_ev; 1167 ev::timer update_background_ev;
1144#endif 1168#endif
1145 1169
1146 void x_cb (XEvent &xev); 1170 void x_cb (XEvent &xev);
… …
1233 void mouse_report (XButtonEvent &ev); 1257 void mouse_report (XButtonEvent &ev);
1234 void button_press (XButtonEvent &ev); 1258 void button_press (XButtonEvent &ev);
1235 void button_release (XButtonEvent &ev); 1259 void button_release (XButtonEvent &ev);
1236 void focus_in (); 1260 void focus_in ();
1237 void focus_out (); 1261 void focus_out ();
1262#if ENABLE_FRILLS
1238 void set_urgency (bool enable); 1263 void set_urgency (bool enable);
1264#else
1265 void set_urgency (bool enable) { }
1266#endif
1239 void update_fade_color (unsigned int idx); 1267 void update_fade_color (unsigned int idx);
1240#ifdef PRINTPIPE 1268#ifdef PRINTPIPE
1241 FILE *popen_printer (); 1269 FILE *popen_printer ();
1242 int pclose_printer (FILE *stream); 1270 int pclose_printer (FILE *stream);
1243#endif 1271#endif
… …
1249 void process_window_ops (const int *args, unsigned int nargs); 1277 void process_window_ops (const int *args, unsigned int nargs);
1250 char *get_to_st (unicode_t &ends_how); 1278 char *get_to_st (unicode_t &ends_how);
1251 void process_dcs_seq (); 1279 void process_dcs_seq ();
1252 void process_osc_seq (); 1280 void process_osc_seq ();
1253 void process_color_seq (int report, int color, const char *str, char resp); 1281 void process_color_seq (int report, int color, const char *str, char resp);
1254 void process_xterm_seq (int op, const char *str, char resp); 1282 void process_xterm_seq (int op, char *str, char resp);
1255 int privcases (int mode, unsigned long bit); 1283 int privcases (int mode, unsigned long bit);
1256 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1284 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1257 void process_sgr_mode (unsigned int nargs, const int *arg); 1285 void process_sgr_mode (unsigned int nargs, const int *arg);
1258 void process_graphics (); 1286 void process_graphics ();
1259 // init.C 1287 // init.C
… …
1268 int run_child (const char *const *argv); 1296 int run_child (const char *const *argv);
1269 void color_aliases (int idx); 1297 void color_aliases (int idx);
1270 void create_windows (int argc, const char *const *argv); 1298 void create_windows (int argc, const char *const *argv);
1271 void get_colours (); 1299 void get_colours ();
1272 void get_ourmods (); 1300 void get_ourmods ();
1301 void set_icon (const char *file);
1273 // main.C 1302 // main.C
1274 void tt_winch (); 1303 void tt_winch ();
1275 rxvt_term (); 1304 rxvt_term ();
1276 ~rxvt_term (); 1305 ~rxvt_term ();
1277 void destroy (); 1306 void destroy ();
… …
1279 void recolour_cursor (); 1308 void recolour_cursor ();
1280 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1309 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1281 void window_calc (unsigned int newwidth, unsigned int newheight); 1310 void window_calc (unsigned int newwidth, unsigned int newheight);
1282 bool set_fonts (); 1311 bool set_fonts ();
1283 void set_string_property (Atom prop, const char *str, int len = -1); 1312 void set_string_property (Atom prop, const char *str, int len = -1);
1313 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1284 void set_utf8_property (Atom prop, const char *str, int len = -1); 1314 void set_utf8_property (Atom prop, const char *str, int len = -1);
1285 void set_title (const char *str); 1315 void set_title (const char *str);
1286 void set_icon_name (const char *str); 1316 void set_icon_name (const char *str);
1287 void set_window_color (int idx, const char *color); 1317 void set_window_color (int idx, const char *color);
1288 void set_colorfgbg (); 1318 void set_colorfgbg ();
… …
1378 else 1408 else
1379 priv_modes &= ~bit; 1409 priv_modes &= ~bit;
1380 } 1410 }
1381 1411
1382 // modifies first argument(!) 1412 // modifies first argument(!)
1413 void tt_paste (char *data, unsigned int len) NOTHROW;
1383 void paste (char *data, unsigned int len) NOTHROW; 1414 void paste (char *data, unsigned int len) NOTHROW;
1384 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1415 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1385 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1416 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1386 void scr_kill_char (line_t &l, int col) const NOTHROW; 1417 void scr_kill_char (line_t &l, int col) const NOTHROW;
1387 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1418 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1445 void selection_check (int check_more) NOTHROW; 1476 void selection_check (int check_more) NOTHROW;
1446 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1477 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1447 void selection_property (Window win, Atom prop) NOTHROW; 1478 void selection_property (Window win, Atom prop) NOTHROW;
1448 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1479 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1449 int selection_request_other (Atom target, int selnum) NOTHROW; 1480 int selection_request_other (Atom target, int selnum) NOTHROW;
1450 void selection_clear () NOTHROW; 1481 void selection_clear (bool clipboard = false) NOTHROW;
1451 void selection_make (Time tm); 1482 void selection_make (Time tm);
1452 bool selection_grab (Time tm) NOTHROW; 1483 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1453 void selection_start_colrow (int col, int row) NOTHROW; 1484 void selection_start_colrow (int col, int row) NOTHROW;
1454 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1485 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1455 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1486 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1456 void selection_remove_trailing_spaces () NOTHROW; 1487 void selection_remove_trailing_spaces () NOTHROW;
1457 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1488 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;

Diff Legend

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