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.370 by root, Tue Nov 4 14:25:10 2008 UTC vs.
Revision 1.386 by root, Wed Mar 31 23:01:51 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;
… …
204 200
205/* 201/*
206 * the 'essential' information for reporting Mouse Events 202 * the 'essential' information for reporting Mouse Events
207 * pared down from XButtonEvent 203 * pared down from XButtonEvent
208 */ 204 */
209struct mouse_event { 205struct mouse_event
206{
210 int clicks; 207 int clicks;
211 Time time; /* milliseconds */ 208 Time time; /* milliseconds */
212 unsigned int state; /* key or button mask */ 209 unsigned int state; /* key or button mask */
213 unsigned int button; /* detail */ 210 unsigned int button; /* detail */
214}; 211};
… …
321// fake styles 318// fake styles
322#define RS_Blink 0x00010000UL // blink 319#define RS_Blink 0x00010000UL // blink
323#define RS_RVid 0x00020000UL // reverse video 320#define RS_RVid 0x00020000UL // reverse video
324#define RS_Uline 0x00040000UL // underline 321#define RS_Uline 0x00040000UL // underline
325 322
326// toggle this to force redraw, must be != RS_Careful 323// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
327#define RS_redraw 0x01000000UL 324#define RS_redraw 0x02000000UL
328 325
329// 5 custom bits for extensions 326// 5 custom bits for extensions
330#define RS_customCount 32 327#define RS_customCount 16
331#define RS_customMask 0x00f80000UL 328#define RS_customMask 0x00780000UL
332#define RS_customShift 19 329#define RS_customShift 19
333 330
334// other flags 331// must have space for rxvt_fontset::fontCount * 2 + 2 values
332#define RS_fontMask 0xf8000000UL // includes RS_Careful
333#define RS_fontShift 27
335#define RS_Careful 0x80000000UL /* be careful when drawing these */ 334#define RS_Careful 0x08000000UL /* be careful when drawing these */
336 335
337#define RS_styleCount 4 336#define RS_styleCount 4
338#define RS_styleMask (RS_Bold | RS_Italic) 337#define RS_styleMask (RS_Bold | RS_Italic)
339#define RS_styleShift 14 338#define RS_styleShift 14
340 339
341#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 340#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
342#define RS_attrMask (RS_baseattrMask | RS_fontMask) 341#define RS_attrMask (RS_baseattrMask | RS_fontMask)
343
344#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
345#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
346#define RS_fontShift 24
347 342
348#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 343#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
349#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 344#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
350 345
351#define Sel_none 0 /* Not waiting */ 346#define Sel_none 0 /* Not waiting */
… …
410 405
411 URxvt_Color_IT = 704, // change actual 'Italic' colour 406 URxvt_Color_IT = 704, // change actual 'Italic' colour
412 URxvt_Color_tint = 705, // change actual tint colour 407 URxvt_Color_tint = 705, // change actual tint colour
413 URxvt_Color_BD = 706, // change actual 'Bold' color 408 URxvt_Color_BD = 706, // change actual 'Bold' color
414 URxvt_Color_UL = 707, // change actual 'Underline' color 409 URxvt_Color_UL = 707, // change actual 'Underline' color
410 URxvt_Color_border = 708,
415 411
416 URxvt_font = 710, 412 URxvt_font = 710,
417 URxvt_boldFont = 711, 413 URxvt_boldFont = 711,
418 URxvt_italicFont = 712, 414 URxvt_italicFont = 712,
419 URxvt_boldItalicFont = 713, 415 URxvt_boldItalicFont = 713,
… …
555#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row 551#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
556#define UBUFSIZ 2048 // character buffer 552#define UBUFSIZ 2048 // character buffer
557 553
558#if ENABLE_FRILLS 554#if ENABLE_FRILLS
559# include <X11/Xmd.h> 555# include <X11/Xmd.h>
560typedef struct _mwmhints { 556typedef struct _mwmhints
557{
561 CARD32 flags; 558 CARD32 flags;
562 CARD32 functions; 559 CARD32 functions;
563 CARD32 decorations; 560 CARD32 decorations;
564 INT32 input_mode; 561 INT32 input_mode;
565 CARD32 status; 562 CARD32 status;
… …
612#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 609#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
613#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 610#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
614#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 611#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
615#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 612#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
616 613
617#define LINENO(n) MOD (term_start + int(n), total_rows) 614#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
618#define ROW(n) row_buf [LINENO (n)] 615#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
616
617#define LINENO(n) LINENO_of (this, n)
618#define ROW(n) ROW_of (this, n)
619 619
620/* how to build & extract colors and attributes */ 620/* how to build & extract colors and attributes */
621#define GET_BASEFG(x) (((x) & RS_fgMask)) 621#define GET_BASEFG(x) (((x) & RS_fgMask))
622#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 622#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
623 623
… …
640 640
641#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 641#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
642#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 642#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
643 643
644#if ENABLE_STYLES 644#if ENABLE_STYLES
645# define FONTSET(style) fontset[GET_STYLE (style)] 645# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
646#else 646#else
647# define FONTSET(style) fontset[0] 647# define FONTSET_of(t,style) (t)->fontset[0]
648#endif 648#endif
649
650#define FONTSET(style) FONTSET_of (this, style)
649 651
650typedef callback<void (const char *)> log_callback; 652typedef callback<void (const char *)> log_callback;
651typedef callback<int (int)> getfd_callback; 653typedef callback<int (int)> getfd_callback;
652 654
653/****************************************************************************/ 655/****************************************************************************/
… …
656#define LINE_FILTERED 0x0002 // line has been filtered 658#define LINE_FILTERED 0x0002 // line has been filtered
657#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 659#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
658#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 660#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
659#define LINE_BIDI 0x0010 // line needs bidi (NYI) 661#define LINE_BIDI 0x0010 // line needs bidi (NYI)
660 662
661struct line_t { 663struct line_t
664{
662 text_t *t; // terminal the text 665 text_t *t; // terminal the text
663 rend_t *r; // rendition, uses RS_ flags 666 rend_t *r; // rendition, uses RS_ flags
664 tlen_t_ l; // length of each text line 667 tlen_t_ l; // length of each text line
665 uint32_t f; // flags 668 uint32_t f; // flags
666 669
… …
700}; 703};
701 704
702/****************************************************************************/ 705/****************************************************************************/
703 706
704// primitive wrapper around mbstate_t to ensure initialisation 707// primitive wrapper around mbstate_t to ensure initialisation
705struct mbstate { 708struct mbstate
709{
706 mbstate_t mbs; 710 mbstate_t mbs;
707 711
708 operator mbstate_t *() { return &mbs; } 712 operator mbstate_t *() { return &mbs; }
709 void reset () { memset (&mbs, 0, sizeof (mbs)); } 713 void reset () { memset (&mbs, 0, sizeof (mbs)); }
710 mbstate () { reset (); } 714 mbstate () { reset (); }
… …
731 735
732#if ENABLE_COMBINING 736#if ENABLE_COMBINING
733// compose chars are used to represent composite characters 737// compose chars are used to represent composite characters
734// that are not representable in unicode, as well as characters 738// that are not representable in unicode, as well as characters
735// not fitting in the BMP. 739// not fitting in the BMP.
736struct compose_char { 740struct compose_char
741{
737 unicode_t c1, c2; // any chars != NOCHAR are valid 742 unicode_t c1, c2; // any chars != NOCHAR are valid
738 compose_char (unicode_t c1, unicode_t c2) 743 compose_char (unicode_t c1, unicode_t c2)
739 : c1(c1), c2(c2) 744 : c1(c1), c2(c2)
740 { } 745 { }
741}; 746};
742 747
743class rxvt_composite_vec { 748class rxvt_composite_vec
749{
744 vector<compose_char> v; 750 vector<compose_char> v;
745public: 751public:
746 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 752 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
747 int expand (unicode_t c, wchar_t *r); 753 int expand (unicode_t c, wchar_t *r);
748 compose_char *operator [](text_t c) 754 compose_char *operator [](text_t c)
… …
767extern rxvt_t rxvt_current_term; 773extern rxvt_t rxvt_current_term;
768 774
769#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 775#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
770#define GET_R rxvt_current_term 776#define GET_R rxvt_current_term
771 777
778/* ------------------------------------------------------------------------- */
779struct overlay_base
780{
781 int x, y, w, h; // overlay dimensions
782 text_t **text;
783 rend_t **rend;
784
785 // while tempting to add swap() etc. here, it effetcively only increases code size
786};
787
788/* ------------------------------------------------------------------------- */
789
772typedef struct { 790typedef struct
791{
773 int row; 792 int row;
774 int col; 793 int col;
775} row_col_t; 794} row_col_t;
776 795
777/* 796/*
… …
808 * | 827 * |
809 * | 828 * |
810 * END······················= total_rows 829 * END······················= total_rows
811 */ 830 */
812 831
813struct TermWin_t { 832struct TermWin_t
833{
814 int width; /* window width [pixels] */ 834 int width; /* window width [pixels] */
815 int height; /* window height [pixels] */ 835 int height; /* window height [pixels] */
816 int fwidth; /* font width [pixels] */ 836 int fwidth; /* font width [pixels] */
817 int fheight; /* font height [pixels] */ 837 int fheight; /* font height [pixels] */
818 int fbase; /* font ascent (baseline) [pixels] */ 838 int fbase; /* font ascent (baseline) [pixels] */
… …
821 int focus; /* window has focus */ 841 int focus; /* window has focus */
822 int mapped; /* window state mapped? */ 842 int mapped; /* window state mapped? */
823 int int_bwidth; /* internal border width */ 843 int int_bwidth; /* internal border width */
824 int ext_bwidth; /* external border width */ 844 int ext_bwidth; /* external border width */
825 int lineSpace; /* number of extra pixels between rows */ 845 int lineSpace; /* number of extra pixels between rows */
846 int letterSpace; /* number of extra pixels between columns */
826 int saveLines; /* number of lines that fit in scrollback */ 847 int saveLines; /* number of lines that fit in scrollback */
827 int total_rows; /* total number of rows in this terminal */ 848 int total_rows; /* total number of rows in this terminal */
828 int term_start; /* term lines start here */ 849 int term_start; /* term lines start here */
829 int view_start; /* scrollback view starts here */ 850 int view_start; /* scrollback view starts here */
830 int top_row; /* topmost row index of scrollback */ 851 int top_row; /* topmost row index of scrollback */
… …
852 * end: row/column of one character past end of selection 873 * end: row/column of one character past end of selection
853 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow 874 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
854 * * Note: col == -1 ==> we're left of screen 875 * * Note: col == -1 ==> we're left of screen
855 * 876 *
856 */ 877 */
857typedef struct { 878struct screen_t
879{
858 row_col_t cur; /* cursor position on the screen */ 880 row_col_t cur; /* cursor position on the screen */
859 int tscroll; /* top of settable scroll region */ 881 int tscroll; /* top of settable scroll region */
860 int bscroll; /* bottom of settable scroll region */ 882 int bscroll; /* bottom of settable scroll region */
861 unsigned int charset; /* character set number [0..3] */ 883 unsigned int charset; /* character set number [0..3] */
862 unsigned int flags; /* see below */ 884 unsigned int flags; /* see below */
863 row_col_t s_cur; /* saved cursor position */ 885 row_col_t s_cur; /* saved cursor position */
864 unsigned int s_charset; /* saved character set number [0..3] */ 886 unsigned int s_charset; /* saved character set number [0..3] */
865 char s_charset_char; 887 char s_charset_char;
866 rend_t s_rstyle; /* saved rendition style */ 888 rend_t s_rstyle; /* saved rendition style */
867} screen_t; 889};
868 890
869enum selection_op_t { 891enum selection_op_t
892{
870 SELECTION_CLEAR = 0, /* nothing selected */ 893 SELECTION_CLEAR = 0, /* nothing selected */
871 SELECTION_INIT, /* marked a point */ 894 SELECTION_INIT, /* marked a point */
872 SELECTION_BEGIN, /* started a selection */ 895 SELECTION_BEGIN, /* started a selection */
873 SELECTION_CONT, /* continued selection */ 896 SELECTION_CONT, /* continued selection */
874 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 897 SELECTION_DONE /* selection put in CUT_BUFFER0 */
875}; 898};
876 899
877typedef struct { 900struct selection_t
901{
878 wchar_t *text; /* selected text */ 902 wchar_t *text; /* selected text */
879 unsigned int len; /* length of selected text */ 903 unsigned int len; /* length of selected text */
880 unsigned int screen; /* screen being used */ 904 unsigned int screen; /* screen being used */
881 unsigned int clicks; /* number of clicks */ 905 unsigned int clicks; /* number of clicks */
882 selection_op_t op; /* current operation */ 906 selection_op_t op; /* current operation */
883 bool rect; /* rectangular selection? */ 907 bool rect; /* rectangular selection? */
884 row_col_t beg; /* beginning of selection <= mark */ 908 row_col_t beg; /* beginning of selection <= mark */
885 row_col_t mark; /* point of initial click <= end */ 909 row_col_t mark; /* point of initial click <= end */
886 row_col_t end; /* one character past end point */ 910 row_col_t end; /* one character past end point */
887} selection_t; 911 wchar_t *clip_text; /* text copied to the clipboard */
912 unsigned int clip_len; /* length of clipboard text */
913};
888 914
889/* ------------------------------------------------------------------------- */ 915/* ------------------------------------------------------------------------- */
890 916
891/* screen_t flags */ 917/* screen_t flags */
892#define Screen_Relative (1<<0) /* relative origin mode flag */ 918#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
906Opt_count 932Opt_count
907}; 933};
908 934
909/* ------------------------------------------------------------------------- */ 935/* ------------------------------------------------------------------------- */
910 936
911struct rxvt_vars : TermWin_t { 937struct rxvt_vars : TermWin_t
938{
912 scrollBar_t scrollBar; 939 scrollBar_t scrollBar;
913 uint8_t options[(Opt_count + 7) >> 3]; 940 uint8_t options[(Opt_count + 7) >> 3];
914 XSizeHints szHint; 941 XSizeHints szHint;
915 rxvt_color *pix_colors; 942 rxvt_color *pix_colors;
916 Cursor TermWin_cursor; /* cursor for vt window */ 943 Cursor TermWin_cursor; /* cursor for vt window */
… …
926#ifdef OFF_FOCUS_FADING 953#ifdef OFF_FOCUS_FADING
927 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 954 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
928#endif 955#endif
929}; 956};
930 957
931struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 958struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
959{
932 960
933 // special markers with magic addresses 961 // special markers with magic addresses
934 static const char resval_undef []; // options specifically unset 962 static const char resval_undef []; // options specifically unset
935 static const char resval_on []; // boolean options switched on 963 static const char resval_on []; // boolean options switched on
936 static const char resval_off []; // or off 964 static const char resval_off []; // or off
… …
944 972
945 unsigned char want_refresh:1, 973 unsigned char want_refresh:1,
946 current_screen:1, /* primary or secondary */ 974 current_screen:1, /* primary or secondary */
947 num_scr_allow:1, 975 num_scr_allow:1,
948 bypass_keystate:1, 976 bypass_keystate:1,
949#ifdef ENABLE_FRILLS 977#if ENABLE_FRILLS
950 urgency_hint:1, 978 urgency_hint:1,
951#endif 979#endif
952#ifdef CURSOR_BLINK 980#if CURSOR_BLINK
953 hidden_cursor:1, 981 hidden_cursor:1,
954#endif 982#endif
955#ifdef TEXT_BLINK 983#if TEXT_BLINK
956 hidden_text:1, 984 hidden_text:1,
957#endif 985#endif
958#ifdef POINTER_BLANK 986#if POINTER_BLANK
959 hidden_pointer:1, 987 hidden_pointer:1,
960#endif 988#endif
961 enc_utf8:1, /* wether locale uses utf-8 */ 989 enc_utf8:1, /* whether locale uses utf-8 */
962 seen_input:1, /* wether we have seen some program output yet */ 990 seen_input:1, /* whether we have seen some program output yet */
963 seen_resize:1, /* wether we had a resize event */ 991 seen_resize:1, /* whether we had a resize event */
964 parsed_geometry:1; 992 parsed_geometry:1;
965 993
966 unsigned char refresh_type, 994 unsigned char refresh_type,
967#ifdef META8_OPTION 995#ifdef META8_OPTION
968 meta_char, /* Alt-key prefix */ 996 meta_char, /* Alt-key prefix */
… …
972/* ---------- */ 1000/* ---------- */
973 bool rvideo_state, rvideo_mode; 1001 bool rvideo_state, rvideo_mode;
974#ifndef NO_BELL 1002#ifndef NO_BELL
975 bool rvideo_bell; 1003 bool rvideo_bell;
976#endif 1004#endif
977 int num_scr; /* screen: number lines scrolled */ 1005 int num_scr; /* screen: number of lines scrolled */
978 int prev_ncol, /* screen: previous number of columns */ 1006 int prev_ncol, /* screen: previous number of columns */
979 prev_nrow; /* screen: previous number of rows */ 1007 prev_nrow; /* screen: previous number of rows */
980/* ---------- */ 1008/* ---------- */
981 rend_t rstyle; 1009 rend_t rstyle;
982/* ---------- */ 1010/* ---------- */
… …
1012 SavedModes; 1040 SavedModes;
1013/* ---------- */ 1041/* ---------- */
1014 Atom *xa; 1042 Atom *xa;
1015/* ---------- */ 1043/* ---------- */
1016 Time selection_time, 1044 Time selection_time,
1017 selection_request_time; 1045 selection_request_time,
1046 clipboard_time;
1018 pid_t cmd_pid; /* process id of child */ 1047 pid_t cmd_pid; /* process id of child */
1019 char * incr_buf; 1048 char * incr_buf;
1020 size_t incr_buf_size, incr_buf_fill; 1049 size_t incr_buf_size, incr_buf_fill;
1021/* ---------- */ 1050/* ---------- */
1022 struct mouse_event MEvent; 1051 struct mouse_event MEvent;
… …
1036 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1065 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1037 } 1066 }
1038#endif 1067#endif
1039 1068
1040#if ENABLE_OVERLAY 1069#if ENABLE_OVERLAY
1041 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1070 overlay_base ov;
1042 text_t **ov_text;
1043 rend_t **ov_rend;
1044 1071
1045 void scr_swap_overlay () NOTHROW; 1072 void scr_swap_overlay () NOTHROW;
1046 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1073 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1047 void scr_overlay_off () NOTHROW; 1074 void scr_overlay_off () NOTHROW;
1048 void scr_overlay_set (int x, int y, 1075 void scr_overlay_set (int x, int y,
… …
1205 void mouse_report (XButtonEvent &ev); 1232 void mouse_report (XButtonEvent &ev);
1206 void button_press (XButtonEvent &ev); 1233 void button_press (XButtonEvent &ev);
1207 void button_release (XButtonEvent &ev); 1234 void button_release (XButtonEvent &ev);
1208 void focus_in (); 1235 void focus_in ();
1209 void focus_out (); 1236 void focus_out ();
1237#if ENABLE_FRILLS
1210 void set_urgency (bool enable); 1238 void set_urgency (bool enable);
1239#else
1240 void set_urgency (bool enable) { }
1241#endif
1211 void update_fade_color (unsigned int idx); 1242 void update_fade_color (unsigned int idx);
1212#ifdef PRINTPIPE 1243#ifdef PRINTPIPE
1213 FILE *popen_printer (); 1244 FILE *popen_printer ();
1214 int pclose_printer (FILE *stream); 1245 int pclose_printer (FILE *stream);
1215#endif 1246#endif
… …
1221 void process_window_ops (const int *args, unsigned int nargs); 1252 void process_window_ops (const int *args, unsigned int nargs);
1222 char *get_to_st (unicode_t &ends_how); 1253 char *get_to_st (unicode_t &ends_how);
1223 void process_dcs_seq (); 1254 void process_dcs_seq ();
1224 void process_osc_seq (); 1255 void process_osc_seq ();
1225 void process_color_seq (int report, int color, const char *str, char resp); 1256 void process_color_seq (int report, int color, const char *str, char resp);
1226 void process_xterm_seq (int op, const char *str, char resp); 1257 void process_xterm_seq (int op, char *str, char resp);
1227 int privcases (int mode, unsigned long bit); 1258 int privcases (int mode, unsigned long bit);
1228 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1259 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1229 void process_sgr_mode (unsigned int nargs, const int *arg); 1260 void process_sgr_mode (unsigned int nargs, const int *arg);
1230 void process_graphics (); 1261 void process_graphics ();
1231 // init.C 1262 // init.C
… …
1375 void scr_remap_chars (line_t &l) NOTHROW; 1406 void scr_remap_chars (line_t &l) NOTHROW;
1376 1407
1377 enum cursor_mode { SAVE, RESTORE }; 1408 enum cursor_mode { SAVE, RESTORE };
1378 1409
1379 void scr_poweron (); 1410 void scr_poweron ();
1411 void scr_soft_reset () NOTHROW;
1380 void scr_cursor (cursor_mode mode) NOTHROW; 1412 void scr_cursor (cursor_mode mode) NOTHROW;
1381 void scr_do_wrap () NOTHROW; 1413 void scr_do_wrap () NOTHROW;
1382 void scr_swap_screen () NOTHROW; 1414 void scr_swap_screen () NOTHROW;
1383 void scr_change_screen (int scrn); 1415 void scr_change_screen (int scrn);
1384 void scr_color (unsigned int color, int fgbg) NOTHROW; 1416 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1416 void selection_check (int check_more) NOTHROW; 1448 void selection_check (int check_more) NOTHROW;
1417 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1449 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1418 void selection_property (Window win, Atom prop) NOTHROW; 1450 void selection_property (Window win, Atom prop) NOTHROW;
1419 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1451 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1420 int selection_request_other (Atom target, int selnum) NOTHROW; 1452 int selection_request_other (Atom target, int selnum) NOTHROW;
1421 void selection_clear () NOTHROW; 1453 void selection_clear (bool clipboard = false) NOTHROW;
1454 void clipboard_copy (Time tm);
1422 void selection_make (Time tm); 1455 void selection_make (Time tm);
1423 bool selection_grab (Time tm) NOTHROW; 1456 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1424 void selection_start_colrow (int col, int row) NOTHROW; 1457 void selection_start_colrow (int col, int row) NOTHROW;
1425 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1458 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1426 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1459 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1427 void selection_remove_trailing_spaces () NOTHROW; 1460 void selection_remove_trailing_spaces () NOTHROW;
1428 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1461 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;

Diff Legend

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