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.380 by sf-exg, Sun Jan 24 21:53:13 2010 UTC

… …
151char * rxvt_wcstombs (const wchar_t *str, int len = -1); 151char * rxvt_wcstombs (const wchar_t *str, int len = -1);
152wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 152wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
153char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 153char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
154wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 154wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
155 155
156char * rxvt_basename (const char *str) NOTHROW; 156const char * rxvt_basename (const char *str) NOTHROW;
157void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 157void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
158void rxvt_log (const char *fmt,...) NOTHROW; 158void rxvt_log (const char *fmt,...) NOTHROW;
159void rxvt_warn (const char *fmt,...) NOTHROW; 159void rxvt_warn (const char *fmt,...) NOTHROW;
160void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 160void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
161void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 161void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
… …
204 204
205/* 205/*
206 * the 'essential' information for reporting Mouse Events 206 * the 'essential' information for reporting Mouse Events
207 * pared down from XButtonEvent 207 * pared down from XButtonEvent
208 */ 208 */
209struct mouse_event { 209struct mouse_event
210{
210 int clicks; 211 int clicks;
211 Time time; /* milliseconds */ 212 Time time; /* milliseconds */
212 unsigned int state; /* key or button mask */ 213 unsigned int state; /* key or button mask */
213 unsigned int button; /* detail */ 214 unsigned int button; /* detail */
214}; 215};
… …
339#define RS_styleShift 14 340#define RS_styleShift 14
340 341
341#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 342#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
342#define RS_attrMask (RS_baseattrMask | RS_fontMask) 343#define RS_attrMask (RS_baseattrMask | RS_fontMask)
343 344
344#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h 345#define RS_fontCount 127 // not 128 or 256, see rxvtfont.h
345#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful 346#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
346#define RS_fontShift 24 347#define RS_fontShift 24
347 348
348#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 349#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
349#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 350#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
… …
410 411
411 URxvt_Color_IT = 704, // change actual 'Italic' colour 412 URxvt_Color_IT = 704, // change actual 'Italic' colour
412 URxvt_Color_tint = 705, // change actual tint colour 413 URxvt_Color_tint = 705, // change actual tint colour
413 URxvt_Color_BD = 706, // change actual 'Bold' color 414 URxvt_Color_BD = 706, // change actual 'Bold' color
414 URxvt_Color_UL = 707, // change actual 'Underline' color 415 URxvt_Color_UL = 707, // change actual 'Underline' color
416 URxvt_Color_border = 708,
415 417
416 URxvt_font = 710, 418 URxvt_font = 710,
417 URxvt_boldFont = 711, 419 URxvt_boldFont = 711,
418 URxvt_italicFont = 712, 420 URxvt_italicFont = 712,
419 URxvt_boldItalicFont = 713, 421 URxvt_boldItalicFont = 713,
… …
555#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row 557#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
556#define UBUFSIZ 2048 // character buffer 558#define UBUFSIZ 2048 // character buffer
557 559
558#if ENABLE_FRILLS 560#if ENABLE_FRILLS
559# include <X11/Xmd.h> 561# include <X11/Xmd.h>
560typedef struct _mwmhints { 562typedef struct _mwmhints
563{
561 CARD32 flags; 564 CARD32 flags;
562 CARD32 functions; 565 CARD32 functions;
563 CARD32 decorations; 566 CARD32 decorations;
564 INT32 input_mode; 567 INT32 input_mode;
565 CARD32 status; 568 CARD32 status;
… …
612#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 615#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
613#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 616#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
614#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 617#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
615#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 618#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
616 619
617#define LINENO(n) MOD (term_start + int(n), total_rows) 620#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
618#define ROW(n) row_buf [LINENO (n)] 621#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
622
623#define LINENO(n) LINENO_of (this, n)
624#define ROW(n) ROW_of (this, n)
619 625
620/* how to build & extract colors and attributes */ 626/* how to build & extract colors and attributes */
621#define GET_BASEFG(x) (((x) & RS_fgMask)) 627#define GET_BASEFG(x) (((x) & RS_fgMask))
622#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 628#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
623 629
… …
640 646
641#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 647#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
642#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 648#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
643 649
644#if ENABLE_STYLES 650#if ENABLE_STYLES
645# define FONTSET(style) fontset[GET_STYLE (style)] 651# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
646#else 652#else
647# define FONTSET(style) fontset[0] 653# define FONTSET_of(t,style) (t)->fontset[0]
648#endif 654#endif
655
656#define FONTSET(style) FONTSET_of (this, style)
649 657
650typedef callback<void (const char *)> log_callback; 658typedef callback<void (const char *)> log_callback;
651typedef callback<int (int)> getfd_callback; 659typedef callback<int (int)> getfd_callback;
652 660
653/****************************************************************************/ 661/****************************************************************************/
… …
656#define LINE_FILTERED 0x0002 // line has been filtered 664#define LINE_FILTERED 0x0002 // line has been filtered
657#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 665#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
658#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 666#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
659#define LINE_BIDI 0x0010 // line needs bidi (NYI) 667#define LINE_BIDI 0x0010 // line needs bidi (NYI)
660 668
661struct line_t { 669struct line_t
670{
662 text_t *t; // terminal the text 671 text_t *t; // terminal the text
663 rend_t *r; // rendition, uses RS_ flags 672 rend_t *r; // rendition, uses RS_ flags
664 tlen_t_ l; // length of each text line 673 tlen_t_ l; // length of each text line
665 uint32_t f; // flags 674 uint32_t f; // flags
666 675
… …
700}; 709};
701 710
702/****************************************************************************/ 711/****************************************************************************/
703 712
704// primitive wrapper around mbstate_t to ensure initialisation 713// primitive wrapper around mbstate_t to ensure initialisation
705struct mbstate { 714struct mbstate
715{
706 mbstate_t mbs; 716 mbstate_t mbs;
707 717
708 operator mbstate_t *() { return &mbs; } 718 operator mbstate_t *() { return &mbs; }
709 void reset () { memset (&mbs, 0, sizeof (mbs)); } 719 void reset () { memset (&mbs, 0, sizeof (mbs)); }
710 mbstate () { reset (); } 720 mbstate () { reset (); }
… …
731 741
732#if ENABLE_COMBINING 742#if ENABLE_COMBINING
733// compose chars are used to represent composite characters 743// compose chars are used to represent composite characters
734// that are not representable in unicode, as well as characters 744// that are not representable in unicode, as well as characters
735// not fitting in the BMP. 745// not fitting in the BMP.
736struct compose_char { 746struct compose_char
747{
737 unicode_t c1, c2; // any chars != NOCHAR are valid 748 unicode_t c1, c2; // any chars != NOCHAR are valid
738 compose_char (unicode_t c1, unicode_t c2) 749 compose_char (unicode_t c1, unicode_t c2)
739 : c1(c1), c2(c2) 750 : c1(c1), c2(c2)
740 { } 751 { }
741}; 752};
742 753
743class rxvt_composite_vec { 754class rxvt_composite_vec
755{
744 vector<compose_char> v; 756 vector<compose_char> v;
745public: 757public:
746 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 758 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
747 int expand (unicode_t c, wchar_t *r); 759 int expand (unicode_t c, wchar_t *r);
748 compose_char *operator [](text_t c) 760 compose_char *operator [](text_t c)
… …
767extern rxvt_t rxvt_current_term; 779extern rxvt_t rxvt_current_term;
768 780
769#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 781#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
770#define GET_R rxvt_current_term 782#define GET_R rxvt_current_term
771 783
784/* ------------------------------------------------------------------------- */
785struct overlay_base
786{
787 int x, y, w, h; // overlay dimensions
788 text_t **text;
789 rend_t **rend;
790
791 // while tempting to add swap() etc. here, it effetcively only increases code size
792};
793
794/* ------------------------------------------------------------------------- */
795
772typedef struct { 796typedef struct
797{
773 int row; 798 int row;
774 int col; 799 int col;
775} row_col_t; 800} row_col_t;
776 801
777/* 802/*
… …
808 * | 833 * |
809 * | 834 * |
810 * END······················= total_rows 835 * END······················= total_rows
811 */ 836 */
812 837
813struct TermWin_t { 838struct TermWin_t
839{
814 int width; /* window width [pixels] */ 840 int width; /* window width [pixels] */
815 int height; /* window height [pixels] */ 841 int height; /* window height [pixels] */
816 int fwidth; /* font width [pixels] */ 842 int fwidth; /* font width [pixels] */
817 int fheight; /* font height [pixels] */ 843 int fheight; /* font height [pixels] */
818 int fbase; /* font ascent (baseline) [pixels] */ 844 int fbase; /* font ascent (baseline) [pixels] */
… …
821 int focus; /* window has focus */ 847 int focus; /* window has focus */
822 int mapped; /* window state mapped? */ 848 int mapped; /* window state mapped? */
823 int int_bwidth; /* internal border width */ 849 int int_bwidth; /* internal border width */
824 int ext_bwidth; /* external border width */ 850 int ext_bwidth; /* external border width */
825 int lineSpace; /* number of extra pixels between rows */ 851 int lineSpace; /* number of extra pixels between rows */
852 int letterSpace; /* number of extra pixels between columns */
826 int saveLines; /* number of lines that fit in scrollback */ 853 int saveLines; /* number of lines that fit in scrollback */
827 int total_rows; /* total number of rows in this terminal */ 854 int total_rows; /* total number of rows in this terminal */
828 int term_start; /* term lines start here */ 855 int term_start; /* term lines start here */
829 int view_start; /* scrollback view starts here */ 856 int view_start; /* scrollback view starts here */
830 int top_row; /* topmost row index of scrollback */ 857 int top_row; /* topmost row index of scrollback */
… …
852 * end: row/column of one character past end of selection 879 * end: row/column of one character past end of selection
853 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow 880 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
854 * * Note: col == -1 ==> we're left of screen 881 * * Note: col == -1 ==> we're left of screen
855 * 882 *
856 */ 883 */
857typedef struct { 884struct screen_t
885{
858 row_col_t cur; /* cursor position on the screen */ 886 row_col_t cur; /* cursor position on the screen */
859 int tscroll; /* top of settable scroll region */ 887 int tscroll; /* top of settable scroll region */
860 int bscroll; /* bottom of settable scroll region */ 888 int bscroll; /* bottom of settable scroll region */
861 unsigned int charset; /* character set number [0..3] */ 889 unsigned int charset; /* character set number [0..3] */
862 unsigned int flags; /* see below */ 890 unsigned int flags; /* see below */
863 row_col_t s_cur; /* saved cursor position */ 891 row_col_t s_cur; /* saved cursor position */
864 unsigned int s_charset; /* saved character set number [0..3] */ 892 unsigned int s_charset; /* saved character set number [0..3] */
865 char s_charset_char; 893 char s_charset_char;
866 rend_t s_rstyle; /* saved rendition style */ 894 rend_t s_rstyle; /* saved rendition style */
867} screen_t; 895};
868 896
869enum selection_op_t { 897enum selection_op_t
898{
870 SELECTION_CLEAR = 0, /* nothing selected */ 899 SELECTION_CLEAR = 0, /* nothing selected */
871 SELECTION_INIT, /* marked a point */ 900 SELECTION_INIT, /* marked a point */
872 SELECTION_BEGIN, /* started a selection */ 901 SELECTION_BEGIN, /* started a selection */
873 SELECTION_CONT, /* continued selection */ 902 SELECTION_CONT, /* continued selection */
874 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 903 SELECTION_DONE /* selection put in CUT_BUFFER0 */
875}; 904};
876 905
877typedef struct { 906struct selection_t
907{
878 wchar_t *text; /* selected text */ 908 wchar_t *text; /* selected text */
879 unsigned int len; /* length of selected text */ 909 unsigned int len; /* length of selected text */
880 unsigned int screen; /* screen being used */ 910 unsigned int screen; /* screen being used */
881 unsigned int clicks; /* number of clicks */ 911 unsigned int clicks; /* number of clicks */
882 selection_op_t op; /* current operation */ 912 selection_op_t op; /* current operation */
883 bool rect; /* rectangular selection? */ 913 bool rect; /* rectangular selection? */
884 row_col_t beg; /* beginning of selection <= mark */ 914 row_col_t beg; /* beginning of selection <= mark */
885 row_col_t mark; /* point of initial click <= end */ 915 row_col_t mark; /* point of initial click <= end */
886 row_col_t end; /* one character past end point */ 916 row_col_t end; /* one character past end point */
887} selection_t; 917 wchar_t *clip_text; /* text copied to the clipboard */
918 unsigned int clip_len; /* length of clipboard text */
919};
888 920
889/* ------------------------------------------------------------------------- */ 921/* ------------------------------------------------------------------------- */
890 922
891/* screen_t flags */ 923/* screen_t flags */
892#define Screen_Relative (1<<0) /* relative origin mode flag */ 924#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
906Opt_count 938Opt_count
907}; 939};
908 940
909/* ------------------------------------------------------------------------- */ 941/* ------------------------------------------------------------------------- */
910 942
911struct rxvt_vars : TermWin_t { 943struct rxvt_vars : TermWin_t
944{
912 scrollBar_t scrollBar; 945 scrollBar_t scrollBar;
913 uint8_t options[(Opt_count + 7) >> 3]; 946 uint8_t options[(Opt_count + 7) >> 3];
914 XSizeHints szHint; 947 XSizeHints szHint;
915 rxvt_color *pix_colors; 948 rxvt_color *pix_colors;
916 Cursor TermWin_cursor; /* cursor for vt window */ 949 Cursor TermWin_cursor; /* cursor for vt window */
… …
926#ifdef OFF_FOCUS_FADING 959#ifdef OFF_FOCUS_FADING
927 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 960 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
928#endif 961#endif
929}; 962};
930 963
931struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 964struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
965{
932 966
933 // special markers with magic addresses 967 // special markers with magic addresses
934 static const char resval_undef []; // options specifically unset 968 static const char resval_undef []; // options specifically unset
935 static const char resval_on []; // boolean options switched on 969 static const char resval_on []; // boolean options switched on
936 static const char resval_off []; // or off 970 static const char resval_off []; // or off
… …
944 978
945 unsigned char want_refresh:1, 979 unsigned char want_refresh:1,
946 current_screen:1, /* primary or secondary */ 980 current_screen:1, /* primary or secondary */
947 num_scr_allow:1, 981 num_scr_allow:1,
948 bypass_keystate:1, 982 bypass_keystate:1,
949#ifdef ENABLE_FRILLS 983#if ENABLE_FRILLS
950 urgency_hint:1, 984 urgency_hint:1,
951#endif 985#endif
952#ifdef CURSOR_BLINK 986#if CURSOR_BLINK
953 hidden_cursor:1, 987 hidden_cursor:1,
954#endif 988#endif
955#ifdef TEXT_BLINK 989#if TEXT_BLINK
956 hidden_text:1, 990 hidden_text:1,
957#endif 991#endif
958#ifdef POINTER_BLANK 992#if POINTER_BLANK
959 hidden_pointer:1, 993 hidden_pointer:1,
960#endif 994#endif
961 enc_utf8:1, /* wether locale uses utf-8 */ 995 enc_utf8:1, /* wether locale uses utf-8 */
962 seen_input:1, /* wether we have seen some program output yet */ 996 seen_input:1, /* wether we have seen some program output yet */
963 seen_resize:1, /* wether we had a resize event */ 997 seen_resize:1, /* wether we had a resize event */
… …
972/* ---------- */ 1006/* ---------- */
973 bool rvideo_state, rvideo_mode; 1007 bool rvideo_state, rvideo_mode;
974#ifndef NO_BELL 1008#ifndef NO_BELL
975 bool rvideo_bell; 1009 bool rvideo_bell;
976#endif 1010#endif
977 int num_scr; /* screen: number lines scrolled */ 1011 int num_scr; /* screen: number of lines scrolled */
978 int prev_ncol, /* screen: previous number of columns */ 1012 int prev_ncol, /* screen: previous number of columns */
979 prev_nrow; /* screen: previous number of rows */ 1013 prev_nrow; /* screen: previous number of rows */
980/* ---------- */ 1014/* ---------- */
981 rend_t rstyle; 1015 rend_t rstyle;
982/* ---------- */ 1016/* ---------- */
… …
1012 SavedModes; 1046 SavedModes;
1013/* ---------- */ 1047/* ---------- */
1014 Atom *xa; 1048 Atom *xa;
1015/* ---------- */ 1049/* ---------- */
1016 Time selection_time, 1050 Time selection_time,
1017 selection_request_time; 1051 selection_request_time,
1052 clipboard_time;
1018 pid_t cmd_pid; /* process id of child */ 1053 pid_t cmd_pid; /* process id of child */
1019 char * incr_buf; 1054 char * incr_buf;
1020 size_t incr_buf_size, incr_buf_fill; 1055 size_t incr_buf_size, incr_buf_fill;
1021/* ---------- */ 1056/* ---------- */
1022 struct mouse_event MEvent; 1057 struct mouse_event MEvent;
… …
1036 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1071 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1037 } 1072 }
1038#endif 1073#endif
1039 1074
1040#if ENABLE_OVERLAY 1075#if ENABLE_OVERLAY
1041 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1076 overlay_base ov;
1042 text_t **ov_text;
1043 rend_t **ov_rend;
1044 1077
1045 void scr_swap_overlay () NOTHROW; 1078 void scr_swap_overlay () NOTHROW;
1046 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1079 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1047 void scr_overlay_off () NOTHROW; 1080 void scr_overlay_off () NOTHROW;
1048 void scr_overlay_set (int x, int y, 1081 void scr_overlay_set (int x, int y,
… …
1205 void mouse_report (XButtonEvent &ev); 1238 void mouse_report (XButtonEvent &ev);
1206 void button_press (XButtonEvent &ev); 1239 void button_press (XButtonEvent &ev);
1207 void button_release (XButtonEvent &ev); 1240 void button_release (XButtonEvent &ev);
1208 void focus_in (); 1241 void focus_in ();
1209 void focus_out (); 1242 void focus_out ();
1243#if ENABLE_FRILLS
1210 void set_urgency (bool enable); 1244 void set_urgency (bool enable);
1245#else
1246 void set_urgency (bool enable) { }
1247#endif
1211 void update_fade_color (unsigned int idx); 1248 void update_fade_color (unsigned int idx);
1212#ifdef PRINTPIPE 1249#ifdef PRINTPIPE
1213 FILE *popen_printer (); 1250 FILE *popen_printer ();
1214 int pclose_printer (FILE *stream); 1251 int pclose_printer (FILE *stream);
1215#endif 1252#endif
… …
1221 void process_window_ops (const int *args, unsigned int nargs); 1258 void process_window_ops (const int *args, unsigned int nargs);
1222 char *get_to_st (unicode_t &ends_how); 1259 char *get_to_st (unicode_t &ends_how);
1223 void process_dcs_seq (); 1260 void process_dcs_seq ();
1224 void process_osc_seq (); 1261 void process_osc_seq ();
1225 void process_color_seq (int report, int color, const char *str, char resp); 1262 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); 1263 void process_xterm_seq (int op, char *str, char resp);
1227 int privcases (int mode, unsigned long bit); 1264 int privcases (int mode, unsigned long bit);
1228 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1265 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); 1266 void process_sgr_mode (unsigned int nargs, const int *arg);
1230 void process_graphics (); 1267 void process_graphics ();
1231 // init.C 1268 // init.C
… …
1375 void scr_remap_chars (line_t &l) NOTHROW; 1412 void scr_remap_chars (line_t &l) NOTHROW;
1376 1413
1377 enum cursor_mode { SAVE, RESTORE }; 1414 enum cursor_mode { SAVE, RESTORE };
1378 1415
1379 void scr_poweron (); 1416 void scr_poweron ();
1417 void scr_soft_reset () NOTHROW;
1380 void scr_cursor (cursor_mode mode) NOTHROW; 1418 void scr_cursor (cursor_mode mode) NOTHROW;
1381 void scr_do_wrap () NOTHROW; 1419 void scr_do_wrap () NOTHROW;
1382 void scr_swap_screen () NOTHROW; 1420 void scr_swap_screen () NOTHROW;
1383 void scr_change_screen (int scrn); 1421 void scr_change_screen (int scrn);
1384 void scr_color (unsigned int color, int fgbg) NOTHROW; 1422 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1416 void selection_check (int check_more) NOTHROW; 1454 void selection_check (int check_more) NOTHROW;
1417 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1455 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1418 void selection_property (Window win, Atom prop) NOTHROW; 1456 void selection_property (Window win, Atom prop) NOTHROW;
1419 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1457 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1420 int selection_request_other (Atom target, int selnum) NOTHROW; 1458 int selection_request_other (Atom target, int selnum) NOTHROW;
1421 void selection_clear () NOTHROW; 1459 void selection_clear (bool clipboard = false) NOTHROW;
1460 void clipboard_copy (Time tm);
1422 void selection_make (Time tm); 1461 void selection_make (Time tm);
1423 bool selection_grab (Time tm) NOTHROW; 1462 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1424 void selection_start_colrow (int col, int row) NOTHROW; 1463 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; 1464 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; 1465 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1427 void selection_remove_trailing_spaces () NOTHROW; 1466 void selection_remove_trailing_spaces () NOTHROW;
1428 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1467 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;

Diff Legend

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