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.373 by root, Wed Nov 5 15:44:04 2008 UTC vs.
Revision 1.422 by root, Thu Dec 16 23:03:50 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;
… …
193#else 189#else
194 if (envv) 190 if (envv)
195#endif 191#endif
196 environ = envv; 192 environ = envv;
197} 193}
194
195struct localise_env
196{
197 char **orig_env;
198
199 localise_env (char **new_env)
200 {
201 orig_env = environ;
202 environ = new_env;
203 }
204
205 ~localise_env ()
206 {
207 environ = orig_env;
208 }
209};
198 210
199/* 211/*
200 ***************************************************************************** 212 *****************************************************************************
201 * STRUCTURES AND TYPEDEFS 213 * STRUCTURES AND TYPEDEFS
202 ***************************************************************************** 214 *****************************************************************************
… …
251# define COLORTERMENVFULL COLORTERMENV "-xpm" 263# define COLORTERMENVFULL COLORTERMENV "-xpm"
252#else 264#else
253# define COLORTERMENVFULL COLORTERMENV 265# define COLORTERMENVFULL COLORTERMENV
254#endif 266#endif
255#ifndef TERMENV 267#ifndef TERMENV
268# if USE_256_COLORS
269# define TERMENV "rxvt-unicode-256color"
270# else
256# define TERMENV "rxvt-unicode" 271# define TERMENV "rxvt-unicode"
272# endif
257#endif 273#endif
258 274
259#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 275#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
260# define NO_MOUSE_REPORT_SCROLLBAR 1 276# define NO_MOUSE_REPORT_SCROLLBAR 1
261#endif 277#endif
… …
308enum { 324enum {
309 PRIMARY = 0, 325 PRIMARY = 0,
310 SECONDARY, 326 SECONDARY,
311}; 327};
312 328
329// define various rendition bits and masks. the rendition word
330// is 32 bits in size, and we should use it as efficiently as possible
331
313#define RS_None 0 332#define RS_None 0
314 333
315#define RS_fgMask 0x0000007fUL // 128 colors 334// GET_BGATTR depends on RS_fgShift > RS_bgShift
316#define RS_bgMask 0x00003f80UL // 128 colors 335#define RS_colorMask ((1UL << Color_Bits) - 1UL)
336#define RS_bgShift 0
337#define RS_fgShift (RS_bgShift + Color_Bits)
338#define RS_bgMask (RS_colorMask << RS_bgShift)
339#define RS_fgMask (RS_colorMask << RS_fgShift)
340
341// must have space for rxvt_fontset::fontCount * 2 + 2 values
342#define RS_fontShift (RS_fgShift + Color_Bits)
343#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
344#define RS_fontCount rxvt_fontset::fontCount
345#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
346
347// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
348#define RS_redraw (2UL << RS_fontShift)
349
350#define RS_Sel (1UL << 22)
351
352// 4 custom bits for extensions
353#define RS_customCount 16UL
354#define RS_customShift 23
355#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
317 356
318// font styles 357// font styles
319#define RS_Bold 0x00004000UL // value 1 358#define RS_Bold (1UL << RS_styleShift)
320#define RS_Italic 0x00008000UL // value 2 359#define RS_Italic (2UL << RS_styleShift)
360
361#define RS_styleCount 4
362#define RS_styleShift 27
363#define RS_styleMask (RS_Bold | RS_Italic)
321 364
322// fake styles 365// fake styles
323#define RS_Blink 0x00010000UL // blink 366#define RS_Blink (1UL << 29)
324#define RS_RVid 0x00020000UL // reverse video 367#define RS_RVid (1UL << 30) // reverse video
325#define RS_Uline 0x00040000UL // underline 368#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 369
342#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 370#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
343#define RS_attrMask (RS_baseattrMask | RS_fontMask) 371#define RS_attrMask (RS_baseattrMask | RS_fontMask)
344 372
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)) 373#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)) 374#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
351 375
352#define Sel_none 0 /* Not waiting */ 376#define Sel_none 0 /* Not waiting */
353#define Sel_normal 0x01 /* normal selection */ 377#define Sel_normal 0x01 /* normal selection */
354#define Sel_incr 0x02 /* incremental selection */ 378#define Sel_incr 0x02 /* incremental selection */
355#define Sel_direct 0x00 379#define Sel_direct 0x00
… …
384 XTerm_Color_cursor = 12, // change actual 'Cursor' color 408 XTerm_Color_cursor = 12, // change actual 'Cursor' color
385 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 409 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
386 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 410 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
387 XTerm_Color05 = 15, // not implemented (tektronix fg) 411 XTerm_Color05 = 15, // not implemented (tektronix fg)
388 XTerm_Color06 = 16, // not implemented (tektronix bg) 412 XTerm_Color06 = 16, // not implemented (tektronix bg)
389 XTerm_Color_RV = 17, // change actual 'Highlight' color 413 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
414 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
390 XTerm_logfile = 46, // not implemented 415 XTerm_logfile = 46, // not implemented
391 XTerm_font = 50, 416 XTerm_font = 50,
392 417
393 XTerm_konsole30 = 30, // reserved for konsole 418 XTerm_konsole30 = 30, // reserved for konsole
394 XTerm_konsole31 = 31, // reserved for konsole 419 XTerm_konsole31 = 31, // reserved for konsole
… …
396 /* 421 /*
397 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 422 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
398 */ 423 */
399 424
400 // deprecated 425 // deprecated
401 Rxvt_Color_BD = 18,
402 Rxvt_Color_UL = 19,
403 Rxvt_restoreFG = 39, 426 Rxvt_restoreFG = 39,
404 Rxvt_restoreBG = 49, 427 Rxvt_restoreBG = 49,
405 428
406 Rxvt_Pixmap = 20, // new bg pixmap 429 Rxvt_Pixmap = 20, // new bg pixmap
407 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 430 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
461 Color_White = maxBrightCOLOR, 484 Color_White = maxBrightCOLOR,
462#else 485#else
463 Color_White = maxCOLOR, 486 Color_White = maxCOLOR,
464#endif 487#endif
465 minTermCOLOR = Color_White + 1, 488 minTermCOLOR = Color_White + 1,
489#if USE_256_COLORS
490 maxTermCOLOR = Color_White + 240,
491#else
466 maxTermCOLOR = Color_White + 72, 492 maxTermCOLOR = Color_White + 72,
493#endif
467#ifndef NO_CURSORCOLOR 494#ifndef NO_CURSORCOLOR
468 Color_cursor, 495 Color_cursor,
469 Color_cursor2, 496 Color_cursor2,
470#endif 497#endif
471 Color_pointer_fg, 498 Color_pointer_fg,
… …
480#if ENABLE_FRILLS 507#if ENABLE_FRILLS
481 Color_underline, 508 Color_underline,
482#endif 509#endif
483#ifdef OPTION_HC 510#ifdef OPTION_HC
484 Color_HC, 511 Color_HC,
512 Color_HTC,
485#endif 513#endif
486 Color_scroll, 514 Color_scroll,
487#ifdef RXVT_SCROLLBAR 515#ifdef RXVT_SCROLLBAR
488 Color_trough, 516 Color_trough,
489#endif 517#endif
… …
501#else 529#else
502 TOTAL_COLORS = NRS_COLORS 530 TOTAL_COLORS = NRS_COLORS
503#endif 531#endif
504}; 532};
505 533
534#if USE_256_COLORS
535# define Color_Bits 9 // 0 .. maxTermCOLOR
536#else
506#define Color_Bits 7 // 0 .. maxTermCOLOR 537# define Color_Bits 7 // 0 .. maxTermCOLOR
538#endif
507 539
508/* 540/*
509 * Resource list 541 * Resource list
510 */ 542 */
511enum { 543enum {
… …
539#define PrivMode_vt52 (1UL<<18) 571#define PrivMode_vt52 (1UL<<18)
540#define PrivMode_LFNL (1UL<<19) 572#define PrivMode_LFNL (1UL<<19)
541#define PrivMode_MouseBtnEvent (1UL<<20) 573#define PrivMode_MouseBtnEvent (1UL<<20)
542#define PrivMode_MouseAnyEvent (1UL<<21) 574#define PrivMode_MouseAnyEvent (1UL<<21)
543#define PrivMode_BracketPaste (1UL<<22) 575#define PrivMode_BracketPaste (1UL<<22)
576#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
577#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
544 578
545#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 579#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
546 580
547#ifdef ALLOW_132_MODE 581#ifdef ALLOW_132_MODE
548# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 582# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
599/* 633/*
600 ***************************************************************************** 634 *****************************************************************************
601 * MACRO DEFINES 635 * MACRO DEFINES
602 ***************************************************************************** 636 *****************************************************************************
603 */ 637 */
638
639// speed hack, copy some member variable into a local variable of the same name
604#define dLocal(type,name) type const name = this->name 640#define dLocal(type,name) type const name = this->name
605 641
606// for speed reasons, we assume that all codepoints 32 to 126 are 642// for speed reasons, we assume that all codepoints 32 to 126 are
607// single-width. 643// single-width.
608#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 644#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
622 658
623#define LINENO(n) LINENO_of (this, n) 659#define LINENO(n) LINENO_of (this, n)
624#define ROW(n) ROW_of (this, n) 660#define ROW(n) ROW_of (this, n)
625 661
626/* how to build & extract colors and attributes */ 662/* how to build & extract colors and attributes */
627#define GET_BASEFG(x) (((x) & RS_fgMask)) 663#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
628#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 664#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
629 665
630#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 666#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
631#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 667#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
632 668
633#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 669#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
634#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 670#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
635 671
636#define GET_ATTR(x) (((x) & RS_attrMask)) 672#define GET_ATTR(x) (((x) & RS_attrMask))
673// return attributes defining the background, encoding doesn't matter
674// depends on RS_fgShift > RS_bgShift
637#define GET_BGATTR(x) \ 675#define GET_BGATTR(x) \
676 (expect_false ((x) & RS_RVid) \
638 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 677 ? (((x) & (RS_attrMask & ~RS_RVid)) \
639 | (((x) & RS_fgMask)<<Color_Bits)) \ 678 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
640 : ((x) & (RS_attrMask | RS_bgMask))) 679 : ((x) & (RS_attrMask | RS_bgMask)))
641#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 680#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
642#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 681#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
643#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 682#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
644 683
645#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 684#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
646 685
647#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 686#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
… …
786{ 825{
787 int x, y, w, h; // overlay dimensions 826 int x, y, w, h; // overlay dimensions
788 text_t **text; 827 text_t **text;
789 rend_t **rend; 828 rend_t **rend;
790 829
791 // while tempting to add swap() etc. here, it effetcively only increases code size 830 // while tempting to add swap() etc. here, it effectively only increases code size
792}; 831};
793 832
794/* ------------------------------------------------------------------------- */ 833/* ------------------------------------------------------------------------- */
795 834
796typedef struct 835typedef struct
… …
847 int focus; /* window has focus */ 886 int focus; /* window has focus */
848 int mapped; /* window state mapped? */ 887 int mapped; /* window state mapped? */
849 int int_bwidth; /* internal border width */ 888 int int_bwidth; /* internal border width */
850 int ext_bwidth; /* external border width */ 889 int ext_bwidth; /* external border width */
851 int lineSpace; /* number of extra pixels between rows */ 890 int lineSpace; /* number of extra pixels between rows */
891 int letterSpace; /* number of extra pixels between columns */
852 int saveLines; /* number of lines that fit in scrollback */ 892 int saveLines; /* number of lines that fit in scrollback */
853 int total_rows; /* total number of rows in this terminal */ 893 int total_rows; /* total number of rows in this terminal */
854 int term_start; /* term lines start here */ 894 int term_start; /* term lines start here */
855 int view_start; /* scrollback view starts here */ 895 int view_start; /* scrollback view starts here */
856 int top_row; /* topmost row index of scrollback */ 896 int top_row; /* topmost row index of scrollback */
… …
911 selection_op_t op; /* current operation */ 951 selection_op_t op; /* current operation */
912 bool rect; /* rectangular selection? */ 952 bool rect; /* rectangular selection? */
913 row_col_t beg; /* beginning of selection <= mark */ 953 row_col_t beg; /* beginning of selection <= mark */
914 row_col_t mark; /* point of initial click <= end */ 954 row_col_t mark; /* point of initial click <= end */
915 row_col_t end; /* one character past end point */ 955 row_col_t end; /* one character past end point */
956 wchar_t *clip_text; /* text copied to the clipboard */
957 unsigned int clip_len; /* length of clipboard text */
916}; 958};
917 959
918/* ------------------------------------------------------------------------- */ 960/* ------------------------------------------------------------------------- */
919 961
920/* screen_t flags */ 962/* screen_t flags */
… …
925#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 967#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
926#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 968#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
927 969
928/* rxvt_vars.options */ 970/* rxvt_vars.options */
929enum { 971enum {
930# define def(name,idx) Opt_ ## name = idx,
931# define nodef(name) Opt_ ## name = 0, 972# define def(name) Opt_ ## name,
973# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
974 Opt_0,
932# include "optinc.h" 975# include "optinc.h"
933# undef nodef 976# undef nodef
934# undef def 977# undef def
935Opt_count 978 Opt_count
936}; 979};
937 980
938/* ------------------------------------------------------------------------- */ 981/* ------------------------------------------------------------------------- */
939 982
940struct rxvt_vars : TermWin_t 983struct rxvt_vars : TermWin_t
… …
942 scrollBar_t scrollBar; 985 scrollBar_t scrollBar;
943 uint8_t options[(Opt_count + 7) >> 3]; 986 uint8_t options[(Opt_count + 7) >> 3];
944 XSizeHints szHint; 987 XSizeHints szHint;
945 rxvt_color *pix_colors; 988 rxvt_color *pix_colors;
946 Cursor TermWin_cursor; /* cursor for vt window */ 989 Cursor TermWin_cursor; /* cursor for vt window */
947 int numlock_state;
948 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 990 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
949 line_t *drawn_buf; // text on screen 991 line_t *drawn_buf; // text on screen
950 line_t *swap_buf; // lines for swap buffer 992 line_t *swap_buf; // lines for swap buffer
951 char *tabs; /* per location: 1 == tab-stop */ 993 char *tabs; /* per location: 1 == tab-stop */
952 screen_t screen; 994 screen_t screen;
… …
975 1017
976 unsigned char want_refresh:1, 1018 unsigned char want_refresh:1,
977 current_screen:1, /* primary or secondary */ 1019 current_screen:1, /* primary or secondary */
978 num_scr_allow:1, 1020 num_scr_allow:1,
979 bypass_keystate:1, 1021 bypass_keystate:1,
980#ifdef ENABLE_FRILLS 1022#if ENABLE_FRILLS
981 urgency_hint:1, 1023 urgency_hint:1,
982#endif 1024#endif
983#ifdef CURSOR_BLINK 1025#if CURSOR_BLINK
984 hidden_cursor:1, 1026 hidden_cursor:1,
985#endif 1027#endif
986#ifdef TEXT_BLINK 1028#if TEXT_BLINK
987 hidden_text:1, 1029 hidden_text:1,
988#endif 1030#endif
989#ifdef POINTER_BLANK 1031#if POINTER_BLANK
990 hidden_pointer:1, 1032 hidden_pointer:1,
991#endif 1033#endif
992 enc_utf8:1, /* wether locale uses utf-8 */ 1034 enc_utf8:1, /* whether locale uses utf-8 */
993 seen_input:1, /* wether we have seen some program output yet */ 1035 seen_input:1, /* whether we have seen some program output yet */
994 seen_resize:1, /* wether we had a resize event */ 1036 seen_resize:1, /* whether we had a resize event */
995 parsed_geometry:1; 1037 parsed_geometry:1;
996 1038
997 unsigned char refresh_type, 1039 unsigned char refresh_type,
998#ifdef META8_OPTION 1040#ifdef META8_OPTION
999 meta_char, /* Alt-key prefix */ 1041 meta_char, /* Alt-key prefix */
… …
1003/* ---------- */ 1045/* ---------- */
1004 bool rvideo_state, rvideo_mode; 1046 bool rvideo_state, rvideo_mode;
1005#ifndef NO_BELL 1047#ifndef NO_BELL
1006 bool rvideo_bell; 1048 bool rvideo_bell;
1007#endif 1049#endif
1008 int num_scr; /* screen: number lines scrolled */ 1050 int num_scr; /* screen: number of lines scrolled */
1009 int prev_ncol, /* screen: previous number of columns */ 1051 int prev_ncol, /* screen: previous number of columns */
1010 prev_nrow; /* screen: previous number of rows */ 1052 prev_nrow; /* screen: previous number of rows */
1011/* ---------- */ 1053/* ---------- */
1012 rend_t rstyle; 1054 rend_t rstyle;
1013/* ---------- */ 1055/* ---------- */
… …
1043 SavedModes; 1085 SavedModes;
1044/* ---------- */ 1086/* ---------- */
1045 Atom *xa; 1087 Atom *xa;
1046/* ---------- */ 1088/* ---------- */
1047 Time selection_time, 1089 Time selection_time,
1048 selection_request_time; 1090 selection_request_time,
1091 clipboard_time;
1049 pid_t cmd_pid; /* process id of child */ 1092 pid_t cmd_pid; /* process id of child */
1050 char * incr_buf; 1093 char * incr_buf;
1051 size_t incr_buf_size, incr_buf_fill; 1094 size_t incr_buf_size, incr_buf_fill;
1052/* ---------- */ 1095/* ---------- */
1053 struct mouse_event MEvent; 1096 struct mouse_event MEvent;
1054 XComposeStatus compose; 1097 XComposeStatus compose;
1055 struct termios tio; 1098 static struct termios def_tio;
1056 row_col_t oldcursor; 1099 row_col_t oldcursor;
1057#ifdef HAVE_BG_PIXMAP 1100#ifdef HAVE_BG_PIXMAP
1058 bgPixmap_t bgPixmap; 1101 bgPixmap_t bgPixmap;
1059#endif 1102#endif
1060#ifdef HAVE_AFTERIMAGE 1103#ifdef HAVE_AFTERIMAGE
… …
1134 void rootwin_cb (XEvent &xev); 1177 void rootwin_cb (XEvent &xev);
1135 xevent_watcher rootwin_ev; 1178 xevent_watcher rootwin_ev;
1136#endif 1179#endif
1137#ifdef HAVE_BG_PIXMAP 1180#ifdef HAVE_BG_PIXMAP
1138 void update_background (); 1181 void update_background ();
1139#if TRACE_PIXMAPS
1140 void trace_update_background (const char *file, int line);
1141# define update_background() trace_update_background (__FILE__, __LINE__)
1142#endif
1143 void update_background_cb (ev::timer &w, int revents); 1182 void update_background_cb (ev::timer &w, int revents);
1144 ev::timer update_background_ev; 1183 ev::timer update_background_ev;
1145#endif 1184#endif
1146 1185
1147 void x_cb (XEvent &xev); 1186 void x_cb (XEvent &xev);
… …
1234 void mouse_report (XButtonEvent &ev); 1273 void mouse_report (XButtonEvent &ev);
1235 void button_press (XButtonEvent &ev); 1274 void button_press (XButtonEvent &ev);
1236 void button_release (XButtonEvent &ev); 1275 void button_release (XButtonEvent &ev);
1237 void focus_in (); 1276 void focus_in ();
1238 void focus_out (); 1277 void focus_out ();
1278#if ENABLE_FRILLS
1239 void set_urgency (bool enable); 1279 void set_urgency (bool enable);
1280#else
1281 void set_urgency (bool enable) { }
1282#endif
1240 void update_fade_color (unsigned int idx); 1283 void update_fade_color (unsigned int idx);
1241#ifdef PRINTPIPE 1284#ifdef PRINTPIPE
1242 FILE *popen_printer (); 1285 FILE *popen_printer ();
1243 int pclose_printer (FILE *stream); 1286 int pclose_printer (FILE *stream);
1244#endif 1287#endif
… …
1250 void process_window_ops (const int *args, unsigned int nargs); 1293 void process_window_ops (const int *args, unsigned int nargs);
1251 char *get_to_st (unicode_t &ends_how); 1294 char *get_to_st (unicode_t &ends_how);
1252 void process_dcs_seq (); 1295 void process_dcs_seq ();
1253 void process_osc_seq (); 1296 void process_osc_seq ();
1254 void process_color_seq (int report, int color, const char *str, char resp); 1297 void process_color_seq (int report, int color, const char *str, char resp);
1255 void process_xterm_seq (int op, const char *str, char resp); 1298 void process_xterm_seq (int op, char *str, char resp);
1256 int privcases (int mode, unsigned long bit); 1299 int privcases (int mode, unsigned long bit);
1257 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1300 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1258 void process_sgr_mode (unsigned int nargs, const int *arg); 1301 void process_sgr_mode (unsigned int nargs, const int *arg);
1259 void process_graphics (); 1302 void process_graphics ();
1260 // init.C 1303 // init.C
… …
1269 int run_child (const char *const *argv); 1312 int run_child (const char *const *argv);
1270 void color_aliases (int idx); 1313 void color_aliases (int idx);
1271 void create_windows (int argc, const char *const *argv); 1314 void create_windows (int argc, const char *const *argv);
1272 void get_colours (); 1315 void get_colours ();
1273 void get_ourmods (); 1316 void get_ourmods ();
1317 void set_icon (const char *file);
1274 // main.C 1318 // main.C
1275 void tt_winch (); 1319 void tt_winch ();
1276 rxvt_term (); 1320 rxvt_term ();
1277 ~rxvt_term (); 1321 ~rxvt_term ();
1278 void destroy (); 1322 void destroy ();
… …
1280 void recolour_cursor (); 1324 void recolour_cursor ();
1281 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1325 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1282 void window_calc (unsigned int newwidth, unsigned int newheight); 1326 void window_calc (unsigned int newwidth, unsigned int newheight);
1283 bool set_fonts (); 1327 bool set_fonts ();
1284 void set_string_property (Atom prop, const char *str, int len = -1); 1328 void set_string_property (Atom prop, const char *str, int len = -1);
1329 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1285 void set_utf8_property (Atom prop, const char *str, int len = -1); 1330 void set_utf8_property (Atom prop, const char *str, int len = -1);
1286 void set_title (const char *str); 1331 void set_title (const char *str);
1287 void set_icon_name (const char *str); 1332 void set_icon_name (const char *str);
1288 void set_window_color (int idx, const char *color); 1333 void set_window_color (int idx, const char *color);
1289 void set_colorfgbg (); 1334 void set_colorfgbg ();
… …
1351 return base; 1396 return base;
1352 } 1397 }
1353 1398
1354 bool option (uint8_t opt) const NOTHROW 1399 bool option (uint8_t opt) const NOTHROW
1355 { 1400 {
1356 if (!opt)
1357 return 0;
1358
1359 --opt;
1360 return options[opt >> 3] & (1 << (opt & 7)); 1401 return options[opt >> 3] & (1 << (opt & 7));
1361 } 1402 }
1362 1403
1363 void set_option (uint8_t opt, bool set = true) NOTHROW 1404 void set_option (uint8_t opt, bool set = true) NOTHROW;
1364 {
1365 if (!opt)
1366 return;
1367
1368 --opt;
1369 if (set)
1370 options[opt >> 3] |= (1 << (opt & 7));
1371 else
1372 options[opt >> 3] &= ~(1 << (opt & 7));
1373 }
1374 1405
1375 void set_privmode (unsigned bit, int set) NOTHROW 1406 void set_privmode (unsigned bit, int set) NOTHROW
1376 { 1407 {
1377 if (set) 1408 if (set)
1378 priv_modes |= bit; 1409 priv_modes |= bit;
1379 else 1410 else
1380 priv_modes &= ~bit; 1411 priv_modes &= ~bit;
1381 } 1412 }
1382 1413
1383 // modifies first argument(!) 1414 // modifies first argument(!)
1415 void tt_paste (char *data, unsigned int len) NOTHROW;
1384 void paste (char *data, unsigned int len) NOTHROW; 1416 void paste (char *data, unsigned int len) NOTHROW;
1385 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1417 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1386 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1418 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1387 void scr_kill_char (line_t &l, int col) const NOTHROW; 1419 void scr_kill_char (line_t &l, int col) const NOTHROW;
1388 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1420 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1446 void selection_check (int check_more) NOTHROW; 1478 void selection_check (int check_more) NOTHROW;
1447 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1479 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1448 void selection_property (Window win, Atom prop) NOTHROW; 1480 void selection_property (Window win, Atom prop) NOTHROW;
1449 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1481 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1450 int selection_request_other (Atom target, int selnum) NOTHROW; 1482 int selection_request_other (Atom target, int selnum) NOTHROW;
1451 void selection_clear () NOTHROW; 1483 void selection_clear (bool clipboard = false) NOTHROW;
1452 void selection_make (Time tm); 1484 void selection_make (Time tm);
1453 bool selection_grab (Time tm) NOTHROW; 1485 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1454 void selection_start_colrow (int col, int row) NOTHROW; 1486 void selection_start_colrow (int col, int row) NOTHROW;
1455 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1487 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1456 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1488 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1457 void selection_remove_trailing_spaces () NOTHROW; 1489 void selection_remove_trailing_spaces () NOTHROW;
1458 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1490 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;

Diff Legend

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