# define STDERR_FILENO 2
#endif
-#if !defined (EACCESS) && defined(EAGAIN)
-# define EACCESS EAGAIN
-#endif
-
#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
# define EXIT_SUCCESS 0 /* exit function success */
# define EXIT_FAILURE 1 /* exit function failure */
char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
-char * rxvt_basename (const char *str) NOTHROW;
+const char * rxvt_basename (const char *str) NOTHROW;
void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
void rxvt_log (const char *fmt,...) NOTHROW;
void rxvt_warn (const char *fmt,...) NOTHROW;
#define RS_None 0
-#define RS_fgMask 0x0000007fUL // 128 colors
-#define RS_bgMask 0x00003f80UL // 128 colors
+#ifndef USE_256_COLORS
+#define RS_colorMask 0x0000007fUL // 128 colors
+#else
+#define RS_colorMask 0x000001ffUL
+#endif
+#define RS_fgShift 0
+#define RS_bgShift Color_Bits
+#define RS_fgMask (RS_colorMask << RS_fgShift)
+#define RS_bgMask (RS_colorMask << RS_bgShift)
// font styles
-#define RS_Bold 0x00004000UL // value 1
-#define RS_Italic 0x00008000UL // value 2
+#define RS_Bold 0x08000000UL // value 1
+#define RS_Italic 0x10000000UL // value 2
// fake styles
-#define RS_Blink 0x00010000UL // blink
-#define RS_RVid 0x00020000UL // reverse video
-#define RS_Uline 0x00040000UL // underline
-
-// toggle this to force redraw, must be != RS_Careful
-#define RS_redraw 0x01000000UL
+#define RS_Blink 0x20000000UL // blink
+#define RS_RVid 0x40000000UL // reverse video
+#define RS_Uline 0x80000000UL // underline
// 5 custom bits for extensions
-#define RS_customCount 32
-#define RS_customMask 0x00f80000UL
-#define RS_customShift 19
+#define RS_customCount 16
+#define RS_customMask 0x07800000UL
+#define RS_customShift 23
+
+// must have space for rxvt_fontset::fontCount * 2 + 2 values
+#define RS_fontMask 0x007c0000UL // includes RS_Careful
+#define RS_fontShift 18
+#define RS_Careful 0x00010000UL /* be careful when drawing these */
-// other flags
-#define RS_Careful 0x80000000UL /* be careful when drawing these */
+// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
+#define RS_redraw 0x00020000UL
#define RS_styleCount 4
#define RS_styleMask (RS_Bold | RS_Italic)
-#define RS_styleShift 14
+#define RS_styleShift 27
#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
#define RS_attrMask (RS_baseattrMask | RS_fontMask)
-#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
-#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
-#define RS_fontShift 24
-
-#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits))
-#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits))
+#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
+#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
#define Sel_none 0 /* Not waiting */
#define Sel_normal 0x01 /* normal selection */
Color_White = maxCOLOR,
#endif
minTermCOLOR = Color_White + 1,
+#ifndef USE_256_COLORS
maxTermCOLOR = Color_White + 72,
+#else
+ maxTermCOLOR = Color_White + 240,
+#endif
#ifndef NO_CURSORCOLOR
Color_cursor,
Color_cursor2,
#endif
};
+#ifndef USE_256_COLORS
#define Color_Bits 7 // 0 .. maxTermCOLOR
+#else
+#define Color_Bits 9 // 0 .. maxTermCOLOR
+#endif
/*
* Resource list
#define ROW(n) ROW_of (this, n)
/* how to build & extract colors and attributes */
-#define GET_BASEFG(x) (((x) & RS_fgMask))
-#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
+#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
+#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
#define GET_ATTR(x) (((x) & RS_attrMask))
#define GET_BGATTR(x) \
(((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
- | (((x) & RS_fgMask)<<Color_Bits)) \
+ | (((x) & RS_colorMask) << RS_bgShift)) \
: ((x) & (RS_attrMask | RS_bgMask)))
-#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg))
-#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
+#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
+#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
int int_bwidth; /* internal border width */
int ext_bwidth; /* external border width */
int lineSpace; /* number of extra pixels between rows */
+ int letterSpace; /* number of extra pixels between columns */
int saveLines; /* number of lines that fit in scrollback */
int total_rows; /* total number of rows in this terminal */
int term_start; /* term lines start here */
row_col_t beg; /* beginning of selection <= mark */
row_col_t mark; /* point of initial click <= end */
row_col_t end; /* one character past end point */
+ wchar_t *clip_text; /* text copied to the clipboard */
+ unsigned int clip_len; /* length of clipboard text */
};
/* ------------------------------------------------------------------------- */
#if POINTER_BLANK
hidden_pointer:1,
#endif
- enc_utf8:1, /* wether locale uses utf-8 */
- seen_input:1, /* wether we have seen some program output yet */
- seen_resize:1, /* wether we had a resize event */
+ enc_utf8:1, /* whether locale uses utf-8 */
+ seen_input:1, /* whether we have seen some program output yet */
+ seen_resize:1, /* whether we had a resize event */
parsed_geometry:1;
unsigned char refresh_type,
#ifndef NO_BELL
bool rvideo_bell;
#endif
- int num_scr; /* screen: number lines scrolled */
+ int num_scr; /* screen: number of lines scrolled */
int prev_ncol, /* screen: previous number of columns */
prev_nrow; /* screen: previous number of rows */
/* ---------- */
Atom *xa;
/* ---------- */
Time selection_time,
- selection_request_time;
+ selection_request_time,
+ clipboard_time;
pid_t cmd_pid; /* process id of child */
char * incr_buf;
size_t incr_buf_size, incr_buf_fill;
void process_dcs_seq ();
void process_osc_seq ();
void process_color_seq (int report, int color, const char *str, char resp);
- void process_xterm_seq (int op, const char *str, char resp);
+ void process_xterm_seq (int op, char *str, char resp);
int privcases (int mode, unsigned long bit);
void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
void process_sgr_mode (unsigned int nargs, const int *arg);
void selection_property (Window win, Atom prop) NOTHROW;
void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
int selection_request_other (Atom target, int selnum) NOTHROW;
- void selection_clear () NOTHROW;
+ void selection_clear (bool clipboard = false) NOTHROW;
+ void clipboard_copy (Time tm);
void selection_make (Time tm);
- bool selection_grab (Time tm) NOTHROW;
+ bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
void selection_start_colrow (int col, int row) NOTHROW;
void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
projects / dana / urxvt.git / blobdiff