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.386 by root, Wed Mar 31 23:01:51 2010 UTC vs.
Revision 1.417 by root, Tue Nov 23 22:58:09 2010 UTC

… …
247# define COLORTERMENVFULL COLORTERMENV "-xpm" 247# define COLORTERMENVFULL COLORTERMENV "-xpm"
248#else 248#else
249# define COLORTERMENVFULL COLORTERMENV 249# define COLORTERMENVFULL COLORTERMENV
250#endif 250#endif
251#ifndef TERMENV 251#ifndef TERMENV
252# if USE_256_COLORS
253# define TERMENV "rxvt-unicode-256color"
254# else
252# define TERMENV "rxvt-unicode" 255# define TERMENV "rxvt-unicode"
256# endif
253#endif 257#endif
254 258
255#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 259#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
256# define NO_MOUSE_REPORT_SCROLLBAR 1 260# define NO_MOUSE_REPORT_SCROLLBAR 1
257#endif 261#endif
… …
304enum { 308enum {
305 PRIMARY = 0, 309 PRIMARY = 0,
306 SECONDARY, 310 SECONDARY,
307}; 311};
308 312
313// define various rendition bits and masks. the rendition word
314// is 32 bits in size, and we should use it as efficiently as possible
315
309#define RS_None 0 316#define RS_None 0
310 317
311#define RS_fgMask 0x0000007fUL // 128 colors 318// GET_BGATTR depends on RS_fgShift > RS_bgShift
312#define RS_bgMask 0x00003f80UL // 128 colors 319#define RS_colorMask ((1UL << Color_Bits) - 1UL)
320#define RS_bgShift 0
321#define RS_fgShift (RS_bgShift + Color_Bits)
322#define RS_bgMask (RS_colorMask << RS_bgShift)
323#define RS_fgMask (RS_colorMask << RS_fgShift)
324
325// must have space for rxvt_fontset::fontCount * 2 + 2 values
326#define RS_fontShift (RS_fgShift + Color_Bits)
327#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
328#define RS_fontCount rxvt_fontset::fontCount
329#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
330
331// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
332#define RS_redraw (2UL << RS_fontShift)
333
334#define RS_Sel (1UL << 22)
335
336// 4 custom bits for extensions
337#define RS_customCount 16UL
338#define RS_customShift 23
339#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
313 340
314// font styles 341// font styles
315#define RS_Bold 0x00004000UL // value 1 342#define RS_Bold (1UL << RS_styleShift)
316#define RS_Italic 0x00008000UL // value 2 343#define RS_Italic (2UL << RS_styleShift)
344
345#define RS_styleCount 4
346#define RS_styleShift 27
347#define RS_styleMask (RS_Bold | RS_Italic)
317 348
318// fake styles 349// fake styles
319#define RS_Blink 0x00010000UL // blink 350#define RS_Blink (1UL << 29)
320#define RS_RVid 0x00020000UL // reverse video 351#define RS_RVid (1UL << 30) // reverse video
321#define RS_Uline 0x00040000UL // underline 352#define RS_Uline (1UL << 31) // underline
322
323// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
324#define RS_redraw 0x02000000UL
325
326// 5 custom bits for extensions
327#define RS_customCount 16
328#define RS_customMask 0x00780000UL
329#define RS_customShift 19
330
331// must have space for rxvt_fontset::fontCount * 2 + 2 values
332#define RS_fontMask 0xf8000000UL // includes RS_Careful
333#define RS_fontShift 27
334#define RS_Careful 0x08000000UL /* be careful when drawing these */
335
336#define RS_styleCount 4
337#define RS_styleMask (RS_Bold | RS_Italic)
338#define RS_styleShift 14
339 353
340#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 354#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
341#define RS_attrMask (RS_baseattrMask | RS_fontMask) 355#define RS_attrMask (RS_baseattrMask | RS_fontMask)
342 356
343#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 357#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
344#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 358#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
345 359
346#define Sel_none 0 /* Not waiting */ 360#define Sel_none 0 /* Not waiting */
347#define Sel_normal 0x01 /* normal selection */ 361#define Sel_normal 0x01 /* normal selection */
348#define Sel_incr 0x02 /* incremental selection */ 362#define Sel_incr 0x02 /* incremental selection */
349#define Sel_direct 0x00 363#define Sel_direct 0x00
… …
378 XTerm_Color_cursor = 12, // change actual 'Cursor' color 392 XTerm_Color_cursor = 12, // change actual 'Cursor' color
379 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 393 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
380 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 394 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
381 XTerm_Color05 = 15, // not implemented (tektronix fg) 395 XTerm_Color05 = 15, // not implemented (tektronix fg)
382 XTerm_Color06 = 16, // not implemented (tektronix bg) 396 XTerm_Color06 = 16, // not implemented (tektronix bg)
383 XTerm_Color_RV = 17, // change actual 'Highlight' color 397 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
398 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
384 XTerm_logfile = 46, // not implemented 399 XTerm_logfile = 46, // not implemented
385 XTerm_font = 50, 400 XTerm_font = 50,
386 401
387 XTerm_konsole30 = 30, // reserved for konsole 402 XTerm_konsole30 = 30, // reserved for konsole
388 XTerm_konsole31 = 31, // reserved for konsole 403 XTerm_konsole31 = 31, // reserved for konsole
… …
390 /* 405 /*
391 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 406 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
392 */ 407 */
393 408
394 // deprecated 409 // deprecated
395 Rxvt_Color_BD = 18,
396 Rxvt_Color_UL = 19,
397 Rxvt_restoreFG = 39, 410 Rxvt_restoreFG = 39,
398 Rxvt_restoreBG = 49, 411 Rxvt_restoreBG = 49,
399 412
400 Rxvt_Pixmap = 20, // new bg pixmap 413 Rxvt_Pixmap = 20, // new bg pixmap
401 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 414 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
455 Color_White = maxBrightCOLOR, 468 Color_White = maxBrightCOLOR,
456#else 469#else
457 Color_White = maxCOLOR, 470 Color_White = maxCOLOR,
458#endif 471#endif
459 minTermCOLOR = Color_White + 1, 472 minTermCOLOR = Color_White + 1,
473#if USE_256_COLORS
474 maxTermCOLOR = Color_White + 240,
475#else
460 maxTermCOLOR = Color_White + 72, 476 maxTermCOLOR = Color_White + 72,
477#endif
461#ifndef NO_CURSORCOLOR 478#ifndef NO_CURSORCOLOR
462 Color_cursor, 479 Color_cursor,
463 Color_cursor2, 480 Color_cursor2,
464#endif 481#endif
465 Color_pointer_fg, 482 Color_pointer_fg,
… …
474#if ENABLE_FRILLS 491#if ENABLE_FRILLS
475 Color_underline, 492 Color_underline,
476#endif 493#endif
477#ifdef OPTION_HC 494#ifdef OPTION_HC
478 Color_HC, 495 Color_HC,
496 Color_HTC,
479#endif 497#endif
480 Color_scroll, 498 Color_scroll,
481#ifdef RXVT_SCROLLBAR 499#ifdef RXVT_SCROLLBAR
482 Color_trough, 500 Color_trough,
483#endif 501#endif
… …
495#else 513#else
496 TOTAL_COLORS = NRS_COLORS 514 TOTAL_COLORS = NRS_COLORS
497#endif 515#endif
498}; 516};
499 517
518#if USE_256_COLORS
519# define Color_Bits 9 // 0 .. maxTermCOLOR
520#else
500#define Color_Bits 7 // 0 .. maxTermCOLOR 521# define Color_Bits 7 // 0 .. maxTermCOLOR
522#endif
501 523
502/* 524/*
503 * Resource list 525 * Resource list
504 */ 526 */
505enum { 527enum {
… …
533#define PrivMode_vt52 (1UL<<18) 555#define PrivMode_vt52 (1UL<<18)
534#define PrivMode_LFNL (1UL<<19) 556#define PrivMode_LFNL (1UL<<19)
535#define PrivMode_MouseBtnEvent (1UL<<20) 557#define PrivMode_MouseBtnEvent (1UL<<20)
536#define PrivMode_MouseAnyEvent (1UL<<21) 558#define PrivMode_MouseAnyEvent (1UL<<21)
537#define PrivMode_BracketPaste (1UL<<22) 559#define PrivMode_BracketPaste (1UL<<22)
560#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
561#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
538 562
539#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 563#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
540 564
541#ifdef ALLOW_132_MODE 565#ifdef ALLOW_132_MODE
542# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 566# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
593/* 617/*
594 ***************************************************************************** 618 *****************************************************************************
595 * MACRO DEFINES 619 * MACRO DEFINES
596 ***************************************************************************** 620 *****************************************************************************
597 */ 621 */
622
623// speed hack, copy some member variable into a local variable of the same name
598#define dLocal(type,name) type const name = this->name 624#define dLocal(type,name) type const name = this->name
599 625
600// for speed reasons, we assume that all codepoints 32 to 126 are 626// for speed reasons, we assume that all codepoints 32 to 126 are
601// single-width. 627// single-width.
602#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 628#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
616 642
617#define LINENO(n) LINENO_of (this, n) 643#define LINENO(n) LINENO_of (this, n)
618#define ROW(n) ROW_of (this, n) 644#define ROW(n) ROW_of (this, n)
619 645
620/* how to build & extract colors and attributes */ 646/* how to build & extract colors and attributes */
621#define GET_BASEFG(x) (((x) & RS_fgMask)) 647#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
622#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 648#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
623 649
624#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 650#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
625#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 651#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
626 652
627#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 653#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
628#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 654#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
629 655
630#define GET_ATTR(x) (((x) & RS_attrMask)) 656#define GET_ATTR(x) (((x) & RS_attrMask))
657// return attributes defining the background, encoding doesn't matter
658// depends on RS_fgShift > RS_bgShift
631#define GET_BGATTR(x) \ 659#define GET_BGATTR(x) \
660 (expect_false ((x) & RS_RVid) \
632 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 661 ? (((x) & (RS_attrMask & ~RS_RVid)) \
633 | (((x) & RS_fgMask)<<Color_Bits)) \ 662 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
634 : ((x) & (RS_attrMask | RS_bgMask))) 663 : ((x) & (RS_attrMask | RS_bgMask)))
635#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 664#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
636#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 665#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
637#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 666#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
638 667
639#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 668#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
640 669
641#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 670#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
… …
780{ 809{
781 int x, y, w, h; // overlay dimensions 810 int x, y, w, h; // overlay dimensions
782 text_t **text; 811 text_t **text;
783 rend_t **rend; 812 rend_t **rend;
784 813
785 // while tempting to add swap() etc. here, it effetcively only increases code size 814 // while tempting to add swap() etc. here, it effectively only increases code size
786}; 815};
787 816
788/* ------------------------------------------------------------------------- */ 817/* ------------------------------------------------------------------------- */
789 818
790typedef struct 819typedef struct
… …
939 scrollBar_t scrollBar; 968 scrollBar_t scrollBar;
940 uint8_t options[(Opt_count + 7) >> 3]; 969 uint8_t options[(Opt_count + 7) >> 3];
941 XSizeHints szHint; 970 XSizeHints szHint;
942 rxvt_color *pix_colors; 971 rxvt_color *pix_colors;
943 Cursor TermWin_cursor; /* cursor for vt window */ 972 Cursor TermWin_cursor; /* cursor for vt window */
944 int numlock_state;
945 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 973 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
946 line_t *drawn_buf; // text on screen 974 line_t *drawn_buf; // text on screen
947 line_t *swap_buf; // lines for swap buffer 975 line_t *swap_buf; // lines for swap buffer
948 char *tabs; /* per location: 1 == tab-stop */ 976 char *tabs; /* per location: 1 == tab-stop */
949 screen_t screen; 977 screen_t screen;
… …
1048 char * incr_buf; 1076 char * incr_buf;
1049 size_t incr_buf_size, incr_buf_fill; 1077 size_t incr_buf_size, incr_buf_fill;
1050/* ---------- */ 1078/* ---------- */
1051 struct mouse_event MEvent; 1079 struct mouse_event MEvent;
1052 XComposeStatus compose; 1080 XComposeStatus compose;
1053 struct termios tio; 1081 static struct termios def_tio;
1054 row_col_t oldcursor; 1082 row_col_t oldcursor;
1055#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
1056 bgPixmap_t bgPixmap; 1084 bgPixmap_t bgPixmap;
1057#endif 1085#endif
1058#ifdef HAVE_AFTERIMAGE 1086#ifdef HAVE_AFTERIMAGE
… …
1132 void rootwin_cb (XEvent &xev); 1160 void rootwin_cb (XEvent &xev);
1133 xevent_watcher rootwin_ev; 1161 xevent_watcher rootwin_ev;
1134#endif 1162#endif
1135#ifdef HAVE_BG_PIXMAP 1163#ifdef HAVE_BG_PIXMAP
1136 void update_background (); 1164 void update_background ();
1137#if TRACE_PIXMAPS
1138 void trace_update_background (const char *file, int line);
1139# define update_background() trace_update_background (__FILE__, __LINE__)
1140#endif
1141 void update_background_cb (ev::timer &w, int revents); 1165 void update_background_cb (ev::timer &w, int revents);
1142 ev::timer update_background_ev; 1166 ev::timer update_background_ev;
1143#endif 1167#endif
1144 1168
1145 void x_cb (XEvent &xev); 1169 void x_cb (XEvent &xev);
… …
1271 int run_child (const char *const *argv); 1295 int run_child (const char *const *argv);
1272 void color_aliases (int idx); 1296 void color_aliases (int idx);
1273 void create_windows (int argc, const char *const *argv); 1297 void create_windows (int argc, const char *const *argv);
1274 void get_colours (); 1298 void get_colours ();
1275 void get_ourmods (); 1299 void get_ourmods ();
1300 void set_icon (const char *file);
1276 // main.C 1301 // main.C
1277 void tt_winch (); 1302 void tt_winch ();
1278 rxvt_term (); 1303 rxvt_term ();
1279 ~rxvt_term (); 1304 ~rxvt_term ();
1280 void destroy (); 1305 void destroy ();
… …
1282 void recolour_cursor (); 1307 void recolour_cursor ();
1283 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1308 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1284 void window_calc (unsigned int newwidth, unsigned int newheight); 1309 void window_calc (unsigned int newwidth, unsigned int newheight);
1285 bool set_fonts (); 1310 bool set_fonts ();
1286 void set_string_property (Atom prop, const char *str, int len = -1); 1311 void set_string_property (Atom prop, const char *str, int len = -1);
1312 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1287 void set_utf8_property (Atom prop, const char *str, int len = -1); 1313 void set_utf8_property (Atom prop, const char *str, int len = -1);
1288 void set_title (const char *str); 1314 void set_title (const char *str);
1289 void set_icon_name (const char *str); 1315 void set_icon_name (const char *str);
1290 void set_window_color (int idx, const char *color); 1316 void set_window_color (int idx, const char *color);
1291 void set_colorfgbg (); 1317 void set_colorfgbg ();
… …
1381 else 1407 else
1382 priv_modes &= ~bit; 1408 priv_modes &= ~bit;
1383 } 1409 }
1384 1410
1385 // modifies first argument(!) 1411 // modifies first argument(!)
1412 void tt_paste (char *data, unsigned int len) NOTHROW;
1386 void paste (char *data, unsigned int len) NOTHROW; 1413 void paste (char *data, unsigned int len) NOTHROW;
1387 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1414 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1388 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1415 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1389 void scr_kill_char (line_t &l, int col) const NOTHROW; 1416 void scr_kill_char (line_t &l, int col) const NOTHROW;
1390 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1417 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1449 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1476 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1450 void selection_property (Window win, Atom prop) NOTHROW; 1477 void selection_property (Window win, Atom prop) NOTHROW;
1451 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1478 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1452 int selection_request_other (Atom target, int selnum) NOTHROW; 1479 int selection_request_other (Atom target, int selnum) NOTHROW;
1453 void selection_clear (bool clipboard = false) NOTHROW; 1480 void selection_clear (bool clipboard = false) NOTHROW;
1454 void clipboard_copy (Time tm);
1455 void selection_make (Time tm); 1481 void selection_make (Time tm);
1456 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1482 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1457 void selection_start_colrow (int col, int row) NOTHROW; 1483 void selection_start_colrow (int col, int row) NOTHROW;
1458 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1484 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1459 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1485 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;

Diff Legend

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