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.396 by root, Thu Apr 1 00:58:38 2010 UTC vs.
Revision 1.420 by root, Tue Dec 7 19:05:35 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
… …
303/* arguments for rxvt_scr_change_screen () */ 307/* arguments for rxvt_scr_change_screen () */
304enum { 308enum {
305 PRIMARY = 0, 309 PRIMARY = 0,
306 SECONDARY, 310 SECONDARY,
307}; 311};
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
308 315
309#define RS_None 0 316#define RS_None 0
310 317
311// GET_BGATTR depends on RS_fgShift > RS_bgShift 318// GET_BGATTR depends on RS_fgShift > RS_bgShift
312#define RS_colorMask ((1UL << Color_Bits) - 1UL) 319#define RS_colorMask ((1UL << Color_Bits) - 1UL)
313#define RS_bgShift 0 320#define RS_bgShift 0
314#define RS_fgShift (RS_bgShift + Color_Bits) 321#define RS_fgShift (RS_bgShift + Color_Bits)
315#define RS_bgMask (RS_colorMask << RS_bgShift) 322#define RS_bgMask (RS_colorMask << RS_bgShift)
316#define RS_fgMask (RS_colorMask << RS_fgShift) 323#define RS_fgMask (RS_colorMask << RS_fgShift)
317 324
318// font styles 325// must have space for rxvt_fontset::fontCount * 2 + 2 values
319#define RS_Bold 0x08000000UL // value 1 326#define RS_fontShift (RS_fgShift + Color_Bits)
320#define RS_Italic 0x10000000UL // value 2 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
321 330
322#define RS_styleCount 4 331// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
323#define RS_styleMask (RS_Bold | RS_Italic) 332#define RS_redraw (2UL << RS_fontShift)
324#define RS_styleShift 27
325 333
326// fake styles 334#define RS_Sel (1UL << 22)
327#define RS_Blink 0x20000000UL // blink
328#define RS_RVid 0x40000000UL // reverse video
329#define RS_Uline 0x80000000UL // underline
330 335
331// 5 custom bits for extensions 336// 4 custom bits for extensions
332#define RS_customCount 16UL 337#define RS_customCount 16UL
333#define RS_customShift 23 338#define RS_customShift 23
334#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 339#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
335 340
336// must have space for rxvt_fontset::fontCount * 2 + 2 values 341// font styles
337#define RS_fontShift (RS_fgShift + Color_Bits) 342#define RS_Bold (1UL << RS_styleShift)
338#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
339#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
340
341// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
342#define RS_redraw (2UL << RS_fontShift) 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)
348
349// fake styles
350#define RS_Blink (1UL << 29)
351#define RS_RVid (1UL << 30) // reverse video
352#define RS_Uline (1UL << 31) // underline
343 353
344#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)
345#define RS_attrMask (RS_baseattrMask | RS_fontMask) 355#define RS_attrMask (RS_baseattrMask | RS_fontMask)
346 356
347#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 357#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
… …
382 XTerm_Color_cursor = 12, // change actual 'Cursor' color 392 XTerm_Color_cursor = 12, // change actual 'Cursor' color
383 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 393 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
384 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 394 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
385 XTerm_Color05 = 15, // not implemented (tektronix fg) 395 XTerm_Color05 = 15, // not implemented (tektronix fg)
386 XTerm_Color06 = 16, // not implemented (tektronix bg) 396 XTerm_Color06 = 16, // not implemented (tektronix bg)
387 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
388 XTerm_logfile = 46, // not implemented 399 XTerm_logfile = 46, // not implemented
389 XTerm_font = 50, 400 XTerm_font = 50,
390 401
391 XTerm_konsole30 = 30, // reserved for konsole 402 XTerm_konsole30 = 30, // reserved for konsole
392 XTerm_konsole31 = 31, // reserved for konsole 403 XTerm_konsole31 = 31, // reserved for konsole
… …
394 /* 405 /*
395 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 406 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
396 */ 407 */
397 408
398 // deprecated 409 // deprecated
399 Rxvt_Color_BD = 18,
400 Rxvt_Color_UL = 19,
401 Rxvt_restoreFG = 39, 410 Rxvt_restoreFG = 39,
402 Rxvt_restoreBG = 49, 411 Rxvt_restoreBG = 49,
403 412
404 Rxvt_Pixmap = 20, // new bg pixmap 413 Rxvt_Pixmap = 20, // new bg pixmap
405 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 414 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
459 Color_White = maxBrightCOLOR, 468 Color_White = maxBrightCOLOR,
460#else 469#else
461 Color_White = maxCOLOR, 470 Color_White = maxCOLOR,
462#endif 471#endif
463 minTermCOLOR = Color_White + 1, 472 minTermCOLOR = Color_White + 1,
464#ifndef USE_256_COLORS 473#if USE_256_COLORS
474 maxTermCOLOR = Color_White + 240,
475#else
465 maxTermCOLOR = Color_White + 72, 476 maxTermCOLOR = Color_White + 72,
466#else
467 maxTermCOLOR = Color_White + 240,
468#endif 477#endif
469#ifndef NO_CURSORCOLOR 478#ifndef NO_CURSORCOLOR
470 Color_cursor, 479 Color_cursor,
471 Color_cursor2, 480 Color_cursor2,
472#endif 481#endif
… …
482#if ENABLE_FRILLS 491#if ENABLE_FRILLS
483 Color_underline, 492 Color_underline,
484#endif 493#endif
485#ifdef OPTION_HC 494#ifdef OPTION_HC
486 Color_HC, 495 Color_HC,
496 Color_HTC,
487#endif 497#endif
488 Color_scroll, 498 Color_scroll,
489#ifdef RXVT_SCROLLBAR 499#ifdef RXVT_SCROLLBAR
490 Color_trough, 500 Color_trough,
491#endif 501#endif
… …
503#else 513#else
504 TOTAL_COLORS = NRS_COLORS 514 TOTAL_COLORS = NRS_COLORS
505#endif 515#endif
506}; 516};
507 517
508#ifndef USE_256_COLORS 518#if USE_256_COLORS
509#define Color_Bits 7 // 0 .. maxTermCOLOR 519# define Color_Bits 9 // 0 .. maxTermCOLOR
510#else 520#else
511#define Color_Bits 9 // 0 .. maxTermCOLOR 521# define Color_Bits 7 // 0 .. maxTermCOLOR
512#endif 522#endif
513 523
514/* 524/*
515 * Resource list 525 * Resource list
516 */ 526 */
… …
545#define PrivMode_vt52 (1UL<<18) 555#define PrivMode_vt52 (1UL<<18)
546#define PrivMode_LFNL (1UL<<19) 556#define PrivMode_LFNL (1UL<<19)
547#define PrivMode_MouseBtnEvent (1UL<<20) 557#define PrivMode_MouseBtnEvent (1UL<<20)
548#define PrivMode_MouseAnyEvent (1UL<<21) 558#define PrivMode_MouseAnyEvent (1UL<<21)
549#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
550 562
551#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)
552 564
553#ifdef ALLOW_132_MODE 565#ifdef ALLOW_132_MODE
554# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 566# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
605/* 617/*
606 ***************************************************************************** 618 *****************************************************************************
607 * MACRO DEFINES 619 * MACRO DEFINES
608 ***************************************************************************** 620 *****************************************************************************
609 */ 621 */
622
623// speed hack, copy some member variable into a local variable of the same name
610#define dLocal(type,name) type const name = this->name 624#define dLocal(type,name) type const name = this->name
611 625
612// 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
613// single-width. 627// single-width.
614#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))
… …
795{ 809{
796 int x, y, w, h; // overlay dimensions 810 int x, y, w, h; // overlay dimensions
797 text_t **text; 811 text_t **text;
798 rend_t **rend; 812 rend_t **rend;
799 813
800 // 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
801}; 815};
802 816
803/* ------------------------------------------------------------------------- */ 817/* ------------------------------------------------------------------------- */
804 818
805typedef struct 819typedef struct
… …
937#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 951#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
938#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 952#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
939 953
940/* rxvt_vars.options */ 954/* rxvt_vars.options */
941enum { 955enum {
942# define def(name,idx) Opt_ ## name = idx,
943# define nodef(name) Opt_ ## name = 0, 956# define def(name) Opt_ ## name,
957# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
958 Opt_0,
944# include "optinc.h" 959# include "optinc.h"
945# undef nodef 960# undef nodef
946# undef def 961# undef def
947Opt_count 962 Opt_count
948}; 963};
949 964
950/* ------------------------------------------------------------------------- */ 965/* ------------------------------------------------------------------------- */
951 966
952struct rxvt_vars : TermWin_t 967struct rxvt_vars : TermWin_t
… …
954 scrollBar_t scrollBar; 969 scrollBar_t scrollBar;
955 uint8_t options[(Opt_count + 7) >> 3]; 970 uint8_t options[(Opt_count + 7) >> 3];
956 XSizeHints szHint; 971 XSizeHints szHint;
957 rxvt_color *pix_colors; 972 rxvt_color *pix_colors;
958 Cursor TermWin_cursor; /* cursor for vt window */ 973 Cursor TermWin_cursor; /* cursor for vt window */
959 int numlock_state;
960 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 974 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
961 line_t *drawn_buf; // text on screen 975 line_t *drawn_buf; // text on screen
962 line_t *swap_buf; // lines for swap buffer 976 line_t *swap_buf; // lines for swap buffer
963 char *tabs; /* per location: 1 == tab-stop */ 977 char *tabs; /* per location: 1 == tab-stop */
964 screen_t screen; 978 screen_t screen;
… …
1063 char * incr_buf; 1077 char * incr_buf;
1064 size_t incr_buf_size, incr_buf_fill; 1078 size_t incr_buf_size, incr_buf_fill;
1065/* ---------- */ 1079/* ---------- */
1066 struct mouse_event MEvent; 1080 struct mouse_event MEvent;
1067 XComposeStatus compose; 1081 XComposeStatus compose;
1068 struct termios tio; 1082 static struct termios def_tio;
1069 row_col_t oldcursor; 1083 row_col_t oldcursor;
1070#ifdef HAVE_BG_PIXMAP 1084#ifdef HAVE_BG_PIXMAP
1071 bgPixmap_t bgPixmap; 1085 bgPixmap_t bgPixmap;
1072#endif 1086#endif
1073#ifdef HAVE_AFTERIMAGE 1087#ifdef HAVE_AFTERIMAGE
… …
1147 void rootwin_cb (XEvent &xev); 1161 void rootwin_cb (XEvent &xev);
1148 xevent_watcher rootwin_ev; 1162 xevent_watcher rootwin_ev;
1149#endif 1163#endif
1150#ifdef HAVE_BG_PIXMAP 1164#ifdef HAVE_BG_PIXMAP
1151 void update_background (); 1165 void update_background ();
1152#if TRACE_PIXMAPS
1153 void trace_update_background (const char *file, int line);
1154# define update_background() trace_update_background (__FILE__, __LINE__)
1155#endif
1156 void update_background_cb (ev::timer &w, int revents); 1166 void update_background_cb (ev::timer &w, int revents);
1157 ev::timer update_background_ev; 1167 ev::timer update_background_ev;
1158#endif 1168#endif
1159 1169
1160 void x_cb (XEvent &xev); 1170 void x_cb (XEvent &xev);
… …
1286 int run_child (const char *const *argv); 1296 int run_child (const char *const *argv);
1287 void color_aliases (int idx); 1297 void color_aliases (int idx);
1288 void create_windows (int argc, const char *const *argv); 1298 void create_windows (int argc, const char *const *argv);
1289 void get_colours (); 1299 void get_colours ();
1290 void get_ourmods (); 1300 void get_ourmods ();
1301 void set_icon (const char *file);
1291 // main.C 1302 // main.C
1292 void tt_winch (); 1303 void tt_winch ();
1293 rxvt_term (); 1304 rxvt_term ();
1294 ~rxvt_term (); 1305 ~rxvt_term ();
1295 void destroy (); 1306 void destroy ();
… …
1297 void recolour_cursor (); 1308 void recolour_cursor ();
1298 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1309 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1299 void window_calc (unsigned int newwidth, unsigned int newheight); 1310 void window_calc (unsigned int newwidth, unsigned int newheight);
1300 bool set_fonts (); 1311 bool set_fonts ();
1301 void set_string_property (Atom prop, const char *str, int len = -1); 1312 void set_string_property (Atom prop, const char *str, int len = -1);
1313 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1302 void set_utf8_property (Atom prop, const char *str, int len = -1); 1314 void set_utf8_property (Atom prop, const char *str, int len = -1);
1303 void set_title (const char *str); 1315 void set_title (const char *str);
1304 void set_icon_name (const char *str); 1316 void set_icon_name (const char *str);
1305 void set_window_color (int idx, const char *color); 1317 void set_window_color (int idx, const char *color);
1306 void set_colorfgbg (); 1318 void set_colorfgbg ();
… …
1368 return base; 1380 return base;
1369 } 1381 }
1370 1382
1371 bool option (uint8_t opt) const NOTHROW 1383 bool option (uint8_t opt) const NOTHROW
1372 { 1384 {
1373 if (!opt)
1374 return 0;
1375
1376 --opt;
1377 return options[opt >> 3] & (1 << (opt & 7)); 1385 return options[opt >> 3] & (1 << (opt & 7));
1378 } 1386 }
1379 1387
1380 void set_option (uint8_t opt, bool set = true) NOTHROW 1388 void set_option (uint8_t opt, bool set = true) NOTHROW
1381 { 1389 {
1382 if (!opt) 1390 if (!opt)
1383 return; 1391 return;
1384 1392
1385 --opt; 1393 uint8_t mask = 1 << (opt & 7);
1386 if (set) 1394 uint8_t &val = options [opt >> 3];
1387 options[opt >> 3] |= (1 << (opt & 7)); 1395
1388 else 1396 val = val & ~mask | (set ? 0 : mask);
1389 options[opt >> 3] &= ~(1 << (opt & 7));
1390 } 1397 }
1391 1398
1392 void set_privmode (unsigned bit, int set) NOTHROW 1399 void set_privmode (unsigned bit, int set) NOTHROW
1393 { 1400 {
1394 if (set) 1401 if (set)
… …
1396 else 1403 else
1397 priv_modes &= ~bit; 1404 priv_modes &= ~bit;
1398 } 1405 }
1399 1406
1400 // modifies first argument(!) 1407 // modifies first argument(!)
1408 void tt_paste (char *data, unsigned int len) NOTHROW;
1401 void paste (char *data, unsigned int len) NOTHROW; 1409 void paste (char *data, unsigned int len) NOTHROW;
1402 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1410 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1403 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1411 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1404 void scr_kill_char (line_t &l, int col) const NOTHROW; 1412 void scr_kill_char (line_t &l, int col) const NOTHROW;
1405 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1413 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1464 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1472 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1465 void selection_property (Window win, Atom prop) NOTHROW; 1473 void selection_property (Window win, Atom prop) NOTHROW;
1466 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1474 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1467 int selection_request_other (Atom target, int selnum) NOTHROW; 1475 int selection_request_other (Atom target, int selnum) NOTHROW;
1468 void selection_clear (bool clipboard = false) NOTHROW; 1476 void selection_clear (bool clipboard = false) NOTHROW;
1469 void clipboard_copy (Time tm);
1470 void selection_make (Time tm); 1477 void selection_make (Time tm);
1471 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1478 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1472 void selection_start_colrow (int col, int row) NOTHROW; 1479 void selection_start_colrow (int col, int row) NOTHROW;
1473 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1480 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1474 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1481 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