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.355 by ayin, Sun Jan 27 22:48:33 2008 UTC vs.
Revision 1.374 by root, Wed Nov 12 02:37:58 2008 UTC

… …
97/* 97/*
98 ***************************************************************************** 98 *****************************************************************************
99 * SYSTEM HACKS 99 * SYSTEM HACKS
100 ***************************************************************************** 100 *****************************************************************************
101 */ 101 */
102/* Consistent defines - please report on the necessity
103 * @ Unixware: defines (__svr4__)
104 */
105#if defined (SVR4) && !defined (__svr4__)
106# define __svr4__ 1
107#endif
108#if defined (sun) && !defined (__sun__)
109# define __sun__ 1
110#endif
111 102
112#ifndef HAVE_XPOINTER 103#ifndef HAVE_XPOINTER
113typedef char *XPointer; 104typedef char *XPointer;
114#endif 105#endif
115 106
… …
213 204
214/* 205/*
215 * the 'essential' information for reporting Mouse Events 206 * the 'essential' information for reporting Mouse Events
216 * pared down from XButtonEvent 207 * pared down from XButtonEvent
217 */ 208 */
218struct mouse_event { 209struct mouse_event
210{
219 int clicks; 211 int clicks;
220 Time time; /* milliseconds */ 212 Time time; /* milliseconds */
221 unsigned int state; /* key or button mask */ 213 unsigned int state; /* key or button mask */
222 unsigned int button; /* detail */ 214 unsigned int button; /* detail */
223}; 215};
… …
419 411
420 URxvt_Color_IT = 704, // change actual 'Italic' colour 412 URxvt_Color_IT = 704, // change actual 'Italic' colour
421 URxvt_Color_tint = 705, // change actual tint colour 413 URxvt_Color_tint = 705, // change actual tint colour
422 URxvt_Color_BD = 706, // change actual 'Bold' color 414 URxvt_Color_BD = 706, // change actual 'Bold' color
423 URxvt_Color_UL = 707, // change actual 'Underline' color 415 URxvt_Color_UL = 707, // change actual 'Underline' color
416 URxvt_Color_border = 708,
424 417
425 URxvt_font = 710, 418 URxvt_font = 710,
426 URxvt_boldFont = 711, 419 URxvt_boldFont = 711,
427 URxvt_italicFont = 712, 420 URxvt_italicFont = 712,
428 URxvt_boldItalicFont = 713, 421 URxvt_boldItalicFont = 713,
429 422
430 URxvt_view_up = 720, 423 URxvt_view_up = 720,
431 URxvt_view_down = 721, 424 URxvt_view_down = 721,
432 425
433 URxvt_perl = 777, 426 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
434}; 427};
435 428
436/* Words starting with `Color_' are colours. Others are counts */ 429/* Words starting with `Color_' are colours. Others are counts */
437/* 430/*
438 * The PixColor and rendition colour usage should probably be decoupled 431 * The PixColor and rendition colour usage should probably be decoupled
… …
559 552
560// do not change these constants lightly, there are many interdependencies 553// do not change these constants lightly, there are many interdependencies
561#define IMBUFSIZ 128 // input modifier buffer sizes 554#define IMBUFSIZ 128 // input modifier buffer sizes
562#define KBUFSZ 512 // size of keyboard mapping buffer 555#define KBUFSZ 512 // size of keyboard mapping buffer
563#define CBUFSIZ 2048 // size of command buffer 556#define CBUFSIZ 2048 // size of command buffer
557#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
564#define UBUFSIZ 2048 // character buffer 558#define UBUFSIZ 2048 // character buffer
565 559
566#if ENABLE_FRILLS 560#if ENABLE_FRILLS
567# include <X11/Xmd.h> 561# include <X11/Xmd.h>
568typedef struct _mwmhints { 562typedef struct _mwmhints
563{
569 CARD32 flags; 564 CARD32 flags;
570 CARD32 functions; 565 CARD32 functions;
571 CARD32 decorations; 566 CARD32 decorations;
572 INT32 input_mode; 567 INT32 input_mode;
573 CARD32 status; 568 CARD32 status;
… …
620#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 615#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
621#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 616#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
622#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 617#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
623#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 618#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
624 619
625#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)
626#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)
627 625
628/* how to build & extract colors and attributes */ 626/* how to build & extract colors and attributes */
629#define GET_BASEFG(x) (((x) & RS_fgMask)) 627#define GET_BASEFG(x) (((x) & RS_fgMask))
630#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 628#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
631 629
… …
648 646
649#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 647#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
650#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 648#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
651 649
652#if ENABLE_STYLES 650#if ENABLE_STYLES
653# define FONTSET(style) fontset[GET_STYLE (style)] 651# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
654#else 652#else
655# define FONTSET(style) fontset[0] 653# define FONTSET_of(t,style) (t)->fontset[0]
656#endif 654#endif
655
656#define FONTSET(style) FONTSET_of (this, style)
657 657
658typedef callback<void (const char *)> log_callback; 658typedef callback<void (const char *)> log_callback;
659typedef callback<int (int)> getfd_callback; 659typedef callback<int (int)> getfd_callback;
660 660
661/****************************************************************************/ 661/****************************************************************************/
… …
664#define LINE_FILTERED 0x0002 // line has been filtered 664#define LINE_FILTERED 0x0002 // line has been filtered
665#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 665#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
666#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)
667#define LINE_BIDI 0x0010 // line needs bidi (NYI) 667#define LINE_BIDI 0x0010 // line needs bidi (NYI)
668 668
669struct line_t { 669struct line_t
670{
670 text_t *t; // terminal the text 671 text_t *t; // terminal the text
671 rend_t *r; // rendition, uses RS_ flags 672 rend_t *r; // rendition, uses RS_ flags
672 tlen_t_ l; // length of each text line 673 tlen_t_ l; // length of each text line
673 uint32_t f; // flags 674 uint32_t f; // flags
674 675
… …
708}; 709};
709 710
710/****************************************************************************/ 711/****************************************************************************/
711 712
712// primitive wrapper around mbstate_t to ensure initialisation 713// primitive wrapper around mbstate_t to ensure initialisation
713struct mbstate { 714struct mbstate
715{
714 mbstate_t mbs; 716 mbstate_t mbs;
715 717
716 operator mbstate_t *() { return &mbs; } 718 operator mbstate_t *() { return &mbs; }
717 void reset () { memset (&mbs, 0, sizeof (mbs)); } 719 void reset () { memset (&mbs, 0, sizeof (mbs)); }
718 mbstate () { reset (); } 720 mbstate () { reset (); }
… …
739 741
740#if ENABLE_COMBINING 742#if ENABLE_COMBINING
741// compose chars are used to represent composite characters 743// compose chars are used to represent composite characters
742// that are not representable in unicode, as well as characters 744// that are not representable in unicode, as well as characters
743// not fitting in the BMP. 745// not fitting in the BMP.
744struct compose_char { 746struct compose_char
747{
745 unicode_t c1, c2; // any chars != NOCHAR are valid 748 unicode_t c1, c2; // any chars != NOCHAR are valid
746 compose_char (unicode_t c1, unicode_t c2) 749 compose_char (unicode_t c1, unicode_t c2)
747 : c1(c1), c2(c2) 750 : c1(c1), c2(c2)
748 { } 751 { }
749}; 752};
750 753
751class rxvt_composite_vec { 754class rxvt_composite_vec
755{
752 vector<compose_char> v; 756 vector<compose_char> v;
753public: 757public:
754 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 758 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
755 int expand (unicode_t c, wchar_t *r); 759 int expand (unicode_t c, wchar_t *r);
756 compose_char *operator [](text_t c) 760 compose_char *operator [](text_t c)
… …
775extern rxvt_t rxvt_current_term; 779extern rxvt_t rxvt_current_term;
776 780
777#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)
778#define GET_R rxvt_current_term 782#define GET_R rxvt_current_term
779 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
780typedef struct { 796typedef struct
797{
781 int row; 798 int row;
782 int col; 799 int col;
783} row_col_t; 800} row_col_t;
784 801
785/* 802/*
… …
810 * +------------+·display·+·= term_start 827 * +------------+·display·+·= term_start
811 * | terminal | display | 828 * | terminal | display |
812 * | terminal +---------+ 829 * | terminal +---------+
813 * | terminal | 830 * | terminal |
814 * | terminal | 831 * | terminal |
815 * +------------+···········= term_stat + nrow - 1 832 * +------------+···········= term_start + nrow - 1
816 * | 833 * |
817 * | 834 * |
818 * END······················= total_rows 835 * END······················= total_rows
819 */ 836 */
820 837
821struct TermWin_t { 838struct TermWin_t
839{
822 int width; /* window width [pixels] */ 840 int width; /* window width [pixels] */
823 int height; /* window height [pixels] */ 841 int height; /* window height [pixels] */
824 int fwidth; /* font width [pixels] */ 842 int fwidth; /* font width [pixels] */
825 int fheight; /* font height [pixels] */ 843 int fheight; /* font height [pixels] */
826 int fbase; /* font ascent (baseline) [pixels] */ 844 int fbase; /* font ascent (baseline) [pixels] */
… …
856 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 874 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
857 * nothing is selected 875 * nothing is selected
858 * beg: row/column of beginning of selection : never past mark 876 * beg: row/column of beginning of selection : never past mark
859 * mark: row/column of initial click : never past end 877 * mark: row/column of initial click : never past end
860 * end: row/column of one character past end of selection 878 * end: row/column of one character past end of selection
861 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 879 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
862 * * Note: col == -1 ==> we're left of screen 880 * * Note: col == -1 ==> we're left of screen
863 * 881 *
864 */ 882 */
865typedef struct { 883struct screen_t
884{
866 row_col_t cur; /* cursor position on the screen */ 885 row_col_t cur; /* cursor position on the screen */
867 int tscroll; /* top of settable scroll region */ 886 int tscroll; /* top of settable scroll region */
868 int bscroll; /* bottom of settable scroll region */ 887 int bscroll; /* bottom of settable scroll region */
869 unsigned int charset; /* character set number [0..3] */ 888 unsigned int charset; /* character set number [0..3] */
870 unsigned int flags; /* see below */ 889 unsigned int flags; /* see below */
871 row_col_t s_cur; /* saved cursor position */ 890 row_col_t s_cur; /* saved cursor position */
872 unsigned int s_charset; /* saved character set number [0..3] */ 891 unsigned int s_charset; /* saved character set number [0..3] */
873 char s_charset_char; 892 char s_charset_char;
874 rend_t s_rstyle; /* saved rendition style */ 893 rend_t s_rstyle; /* saved rendition style */
875} screen_t; 894};
876 895
877enum selection_op_t { 896enum selection_op_t
897{
878 SELECTION_CLEAR = 0, /* nothing selected */ 898 SELECTION_CLEAR = 0, /* nothing selected */
879 SELECTION_INIT, /* marked a point */ 899 SELECTION_INIT, /* marked a point */
880 SELECTION_BEGIN, /* started a selection */ 900 SELECTION_BEGIN, /* started a selection */
881 SELECTION_CONT, /* continued selection */ 901 SELECTION_CONT, /* continued selection */
882 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 902 SELECTION_DONE /* selection put in CUT_BUFFER0 */
883}; 903};
884 904
885typedef struct { 905struct selection_t
906{
886 wchar_t *text; /* selected text */ 907 wchar_t *text; /* selected text */
887 unsigned int len; /* length of selected text */ 908 unsigned int len; /* length of selected text */
888 unsigned int screen; /* screen being used */ 909 unsigned int screen; /* screen being used */
889 unsigned int clicks; /* number of clicks */ 910 unsigned int clicks; /* number of clicks */
890 selection_op_t op; /* current operation */ 911 selection_op_t op; /* current operation */
891 bool rect; /* rectangular selection? */ 912 bool rect; /* rectangular selection? */
892 row_col_t beg; /* beginning of selection <= mark */ 913 row_col_t beg; /* beginning of selection <= mark */
893 row_col_t mark; /* point of initial click <= end */ 914 row_col_t mark; /* point of initial click <= end */
894 row_col_t end; /* one character past end point */ 915 row_col_t end; /* one character past end point */
895} selection_t; 916};
896 917
897/* ------------------------------------------------------------------------- */ 918/* ------------------------------------------------------------------------- */
898 919
899/* screen_t flags */ 920/* screen_t flags */
900#define Screen_Relative (1<<0) /* relative origin mode flag */ 921#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
914Opt_count 935Opt_count
915}; 936};
916 937
917/* ------------------------------------------------------------------------- */ 938/* ------------------------------------------------------------------------- */
918 939
919struct rxvt_vars : TermWin_t { 940struct rxvt_vars : TermWin_t
941{
920 scrollBar_t scrollBar; 942 scrollBar_t scrollBar;
921 uint8_t options[(Opt_count + 7) >> 3]; 943 uint8_t options[(Opt_count + 7) >> 3];
922 XSizeHints szHint; 944 XSizeHints szHint;
923 rxvt_color *pix_colors; 945 rxvt_color *pix_colors;
924 Cursor TermWin_cursor; /* cursor for vt window */ 946 Cursor TermWin_cursor; /* cursor for vt window */
… …
934#ifdef OFF_FOCUS_FADING 956#ifdef OFF_FOCUS_FADING
935 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 957 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
936#endif 958#endif
937}; 959};
938 960
939struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 961struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
962{
940 963
941 // special markers with magic addresses 964 // special markers with magic addresses
942 static const char resval_undef []; // options specifically unset 965 static const char resval_undef []; // options specifically unset
943 static const char resval_on []; // boolean options switched on 966 static const char resval_on []; // boolean options switched on
944 static const char resval_off []; // or off 967 static const char resval_off []; // or off
… …
952 975
953 unsigned char want_refresh:1, 976 unsigned char want_refresh:1,
954 current_screen:1, /* primary or secondary */ 977 current_screen:1, /* primary or secondary */
955 num_scr_allow:1, 978 num_scr_allow:1,
956 bypass_keystate:1, 979 bypass_keystate:1,
980#if ENABLE_FRILLS
981 urgency_hint:1,
982#endif
957#ifdef CURSOR_BLINK 983#if CURSOR_BLINK
958 hidden_cursor:1, 984 hidden_cursor:1,
959#endif 985#endif
960#ifdef TEXT_BLINK 986#if TEXT_BLINK
961 hidden_text:1, 987 hidden_text:1,
962#endif 988#endif
963#ifdef POINTER_BLANK 989#if POINTER_BLANK
964 hidden_pointer:1, 990 hidden_pointer:1,
965#endif 991#endif
966 enc_utf8:1, /* wether locale uses utf-8 */ 992 enc_utf8:1, /* wether locale uses utf-8 */
967 seen_input:1, /* wether we have seen some program output yet */ 993 seen_input:1, /* wether we have seen some program output yet */
968 seen_resize:1, /* wether we had a resize event */ 994 seen_resize:1, /* wether we had a resize event */
… …
999 mouse_slip_wheel_speed, 1025 mouse_slip_wheel_speed,
1000#endif 1026#endif
1001 refresh_count, 1027 refresh_count,
1002 window_vt_x, 1028 window_vt_x,
1003 window_vt_y, 1029 window_vt_y,
1004 window_sb_x,
1005 mouse_row, 1030 mouse_row,
1006 mouse_col, 1031 mouse_col,
1007# ifdef POINTER_BLANK 1032# ifdef POINTER_BLANK
1008 pointerBlankDelay, 1033 pointerBlankDelay,
1009# endif 1034# endif
… …
1017 unsigned long priv_modes, 1042 unsigned long priv_modes,
1018 SavedModes; 1043 SavedModes;
1019/* ---------- */ 1044/* ---------- */
1020 Atom *xa; 1045 Atom *xa;
1021/* ---------- */ 1046/* ---------- */
1022#ifdef RXVT_SCROLLBAR
1023 GC scrollbarGC,
1024 topShadowGC,
1025 botShadowGC;
1026#endif
1027#ifdef XTERM_SCROLLBAR
1028 GC xscrollbarGC,
1029 ShadowGC;
1030#endif
1031#ifdef PLAIN_SCROLLBAR
1032 GC pscrollbarGC;
1033#endif
1034#ifdef NEXT_SCROLLBAR
1035 GC blackGC,
1036 whiteGC,
1037 grayGC,
1038 darkGC,
1039 stippleGC;
1040 Pixmap dimple,
1041 upArrow,
1042 downArrow,
1043 upArrowHi,
1044 downArrowHi;
1045#endif
1046/* ---------- */
1047 Time selection_time, 1047 Time selection_time,
1048 selection_request_time; 1048 selection_request_time;
1049 pid_t cmd_pid; /* process id of child */ 1049 pid_t cmd_pid; /* process id of child */
1050 char * incr_buf; 1050 char * incr_buf;
1051 size_t incr_buf_size, incr_buf_fill; 1051 size_t incr_buf_size, incr_buf_fill;
… …
1058 bgPixmap_t bgPixmap; 1058 bgPixmap_t bgPixmap;
1059#endif 1059#endif
1060#ifdef HAVE_AFTERIMAGE 1060#ifdef HAVE_AFTERIMAGE
1061 ASVisual *asv; 1061 ASVisual *asv;
1062 ASImageManager *asimman; 1062 ASImageManager *asimman;
1063
1064 void init_asv ()
1065 {
1066 if (!asv)
1067 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1068 }
1063#endif 1069#endif
1064 1070
1065#if ENABLE_OVERLAY 1071#if ENABLE_OVERLAY
1066 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1072 overlay_base ov;
1067 text_t **ov_text;
1068 rend_t **ov_rend;
1069 1073
1070 void scr_swap_overlay () NOTHROW; 1074 void scr_swap_overlay () NOTHROW;
1071 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1075 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1072 void scr_overlay_off () NOTHROW; 1076 void scr_overlay_off () NOTHROW;
1073 void scr_overlay_set (int x, int y, 1077 void scr_overlay_set (int x, int y,
… …
1111 1115
1112#if ENABLE_FRILLS || ISO_14755 1116#if ENABLE_FRILLS || ISO_14755
1113 // ISO 14755 entry support 1117 // ISO 14755 entry support
1114 unicode_t iso14755buf; 1118 unicode_t iso14755buf;
1115 void commit_iso14755 (); 1119 void commit_iso14755 ();
1116 int hex_keyval (XKeyEvent &ev);
1117# if ISO_14755 1120# if ISO_14755
1118 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1121 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1119 void iso14755_54 (int x, int y); 1122 void iso14755_54 (int x, int y);
1120# endif 1123# endif
1121#endif 1124#endif
… …
1225 wchar_t next_char () NOTHROW; 1228 wchar_t next_char () NOTHROW;
1226 wchar_t cmd_getc () THROW ((class out_of_input)); 1229 wchar_t cmd_getc () THROW ((class out_of_input));
1227 uint32_t next_octet () NOTHROW; 1230 uint32_t next_octet () NOTHROW;
1228 uint32_t cmd_get8 () THROW ((class out_of_input)); 1231 uint32_t cmd_get8 () THROW ((class out_of_input));
1229 1232
1230 bool cmd_parse (); 1233 void cmd_parse ();
1231 void mouse_report (XButtonEvent &ev); 1234 void mouse_report (XButtonEvent &ev);
1232 void button_press (XButtonEvent &ev); 1235 void button_press (XButtonEvent &ev);
1233 void button_release (XButtonEvent &ev); 1236 void button_release (XButtonEvent &ev);
1234 void focus_in (); 1237 void focus_in ();
1235 void focus_out (); 1238 void focus_out ();
1239#if ENABLE_FRILLS
1240 void set_urgency (bool enable);
1241#else
1242 void set_urgency (bool enable) { }
1243#endif
1236 void update_fade_color (unsigned int idx); 1244 void update_fade_color (unsigned int idx);
1237#ifdef PRINTPIPE 1245#ifdef PRINTPIPE
1238 FILE *popen_printer (); 1246 FILE *popen_printer ();
1239 int pclose_printer (FILE *stream); 1247 int pclose_printer (FILE *stream);
1240#endif 1248#endif
… …
1263 void init_command (const char *const *argv); 1271 void init_command (const char *const *argv);
1264 void run_command (const char *const *argv); 1272 void run_command (const char *const *argv);
1265 int run_child (const char *const *argv); 1273 int run_child (const char *const *argv);
1266 void color_aliases (int idx); 1274 void color_aliases (int idx);
1267 void create_windows (int argc, const char *const *argv); 1275 void create_windows (int argc, const char *const *argv);
1268 void Get_Colours (); 1276 void get_colours ();
1269 void get_ourmods (); 1277 void get_ourmods ();
1270 // main.C 1278 // main.C
1271 void tt_winch (); 1279 void tt_winch ();
1272 rxvt_term (); 1280 rxvt_term ();
1273 ~rxvt_term (); 1281 ~rxvt_term ();
… …
1366 options[opt >> 3] |= (1 << (opt & 7)); 1374 options[opt >> 3] |= (1 << (opt & 7));
1367 else 1375 else
1368 options[opt >> 3] &= ~(1 << (opt & 7)); 1376 options[opt >> 3] &= ~(1 << (opt & 7));
1369 } 1377 }
1370 1378
1371 void PrivMode (int set, unsigned bit) NOTHROW 1379 void set_privmode (unsigned bit, int set) NOTHROW
1372 { 1380 {
1373 if (set) 1381 if (set)
1374 priv_modes |= bit; 1382 priv_modes |= bit;
1375 else 1383 else
1376 priv_modes &= ~bit; 1384 priv_modes &= ~bit;
… …
1378 1386
1379 // modifies first argument(!) 1387 // modifies first argument(!)
1380 void paste (char *data, unsigned int len) NOTHROW; 1388 void paste (char *data, unsigned int len) NOTHROW;
1381 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1389 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1382 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1390 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1391 void scr_kill_char (line_t &l, int col) const NOTHROW;
1383 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1392 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1384 void scr_reset (); 1393 void scr_reset ();
1385 void scr_release () NOTHROW; 1394 void scr_release () NOTHROW;
1386 void scr_clear (bool really = false) NOTHROW; 1395 void scr_clear (bool really = false) NOTHROW;
1387 void scr_refresh () NOTHROW; 1396 void scr_refresh () NOTHROW;
… …
1399 void scr_remap_chars (line_t &l) NOTHROW; 1408 void scr_remap_chars (line_t &l) NOTHROW;
1400 1409
1401 enum cursor_mode { SAVE, RESTORE }; 1410 enum cursor_mode { SAVE, RESTORE };
1402 1411
1403 void scr_poweron (); 1412 void scr_poweron ();
1413 void scr_soft_reset () NOTHROW;
1404 void scr_cursor (cursor_mode mode) NOTHROW; 1414 void scr_cursor (cursor_mode mode) NOTHROW;
1405 void scr_do_wrap () NOTHROW; 1415 void scr_do_wrap () NOTHROW;
1406 void scr_swap_screen () NOTHROW; 1416 void scr_swap_screen () NOTHROW;
1407 void scr_change_screen (int scrn); 1417 void scr_change_screen (int scrn);
1408 void scr_color (unsigned int color, int fgbg) NOTHROW; 1418 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1452 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1462 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1453 void selection_click (int clicks, int x, int y) NOTHROW; 1463 void selection_click (int clicks, int x, int y) NOTHROW;
1454 void selection_extend (int x, int y, int flag) NOTHROW; 1464 void selection_extend (int x, int y, int flag) NOTHROW;
1455 void selection_rotate (int x, int y) NOTHROW; 1465 void selection_rotate (int x, int y) NOTHROW;
1456 1466
1457#if defined(NEXT_SCROLLBAR)
1458 // scrollbar-next.C
1459 Pixmap renderPixmap (const char *const *data, int width, int height);
1460 void init_scrollbar_stuff ();
1461 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1462 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1463#endif
1464
1465#if defined(RXVT_SCROLLBAR)
1466 // scrollbar-rxvt.C
1467 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1468#endif
1469
1470#if defined(XTERM_SCROLLBAR)
1471 // scrollbar-xterm.C
1472 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1473#endif
1474
1475#if defined(PLAIN_SCROLLBAR)
1476 // scrollbar-plain.C
1477 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1478#endif
1479
1480 // scrollbar.C
1481 void resize_scrollbar ();
1482 int scrollbar_mapping (int map);
1483 int scrollbar_show (int update);
1484 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1485
1486 // xdefaults.C 1467 // xdefaults.C
1487 void get_options (int argc, const char *const *argv); 1468 void get_options (int argc, const char *const *argv);
1488 int parse_keysym (const char *str, const char *arg); 1469 int parse_keysym (const char *str, const char *arg);
1489 const char *x_resource (const char *name); 1470 const char *x_resource (const char *name);
1490 void extract_resources (); 1471 void extract_resources ();

Diff Legend

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