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.405 by sf-exg, Sun Apr 18 11:11:28 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# ifdef USE_256_COLORS 252# if USE_256_COLORS
253# define TERMENV "rxvt-unicode-256color" 253# define TERMENV "rxvt-unicode-256color"
254# else 254# else
255# define TERMENV "rxvt-unicode" 255# define TERMENV "rxvt-unicode"
256# endif 256# endif
257#endif 257#endif
… …
323#define RS_fgMask (RS_colorMask << RS_fgShift) 323#define RS_fgMask (RS_colorMask << RS_fgShift)
324 324
325// must have space for rxvt_fontset::fontCount * 2 + 2 values 325// must have space for rxvt_fontset::fontCount * 2 + 2 values
326#define RS_fontShift (RS_fgShift + Color_Bits) 326#define RS_fontShift (RS_fgShift + Color_Bits)
327#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */ 327#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
328#define RS_fontCount rxvt_fontset::fontCount
328#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful 329#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
329 330
330// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral" 331// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
331#define RS_redraw (2UL << RS_fontShift) 332#define RS_redraw (2UL << RS_fontShift)
332 333
333#define RS_Sel (1UL << 22) 334#define RS_Sel (1UL << 22)
334 335
335// 5 custom bits for extensions 336// 4 custom bits for extensions
336#define RS_customCount 16UL 337#define RS_customCount 16UL
337#define RS_customShift 23 338#define RS_customShift 23
338#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 339#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
339 340
340// font styles 341// font styles
… …
467 Color_White = maxBrightCOLOR, 468 Color_White = maxBrightCOLOR,
468#else 469#else
469 Color_White = maxCOLOR, 470 Color_White = maxCOLOR,
470#endif 471#endif
471 minTermCOLOR = Color_White + 1, 472 minTermCOLOR = Color_White + 1,
472#ifndef USE_256_COLORS 473#if USE_256_COLORS
474 maxTermCOLOR = Color_White + 240,
475#else
473 maxTermCOLOR = Color_White + 72, 476 maxTermCOLOR = Color_White + 72,
474#else
475 maxTermCOLOR = Color_White + 240,
476#endif 477#endif
477#ifndef NO_CURSORCOLOR 478#ifndef NO_CURSORCOLOR
478 Color_cursor, 479 Color_cursor,
479 Color_cursor2, 480 Color_cursor2,
480#endif 481#endif
… …
512#else 513#else
513 TOTAL_COLORS = NRS_COLORS 514 TOTAL_COLORS = NRS_COLORS
514#endif 515#endif
515}; 516};
516 517
517#ifndef USE_256_COLORS 518#if USE_256_COLORS
518#define Color_Bits 7 // 0 .. maxTermCOLOR 519# define Color_Bits 9 // 0 .. maxTermCOLOR
519#else 520#else
520#define Color_Bits 9 // 0 .. maxTermCOLOR 521# define Color_Bits 7 // 0 .. maxTermCOLOR
521#endif 522#endif
522 523
523/* 524/*
524 * Resource list 525 * Resource list
525 */ 526 */
… …
554#define PrivMode_vt52 (1UL<<18) 555#define PrivMode_vt52 (1UL<<18)
555#define PrivMode_LFNL (1UL<<19) 556#define PrivMode_LFNL (1UL<<19)
556#define PrivMode_MouseBtnEvent (1UL<<20) 557#define PrivMode_MouseBtnEvent (1UL<<20)
557#define PrivMode_MouseAnyEvent (1UL<<21) 558#define PrivMode_MouseAnyEvent (1UL<<21)
558#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
559 562
560#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)
561 564
562#ifdef ALLOW_132_MODE 565#ifdef ALLOW_132_MODE
563# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 566# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
614/* 617/*
615 ***************************************************************************** 618 *****************************************************************************
616 * MACRO DEFINES 619 * MACRO DEFINES
617 ***************************************************************************** 620 *****************************************************************************
618 */ 621 */
622
623// speed hack, copy some member variable into a local variable of the same name
619#define dLocal(type,name) type const name = this->name 624#define dLocal(type,name) type const name = this->name
620 625
621// 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
622// single-width. 627// single-width.
623#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))
… …
804{ 809{
805 int x, y, w, h; // overlay dimensions 810 int x, y, w, h; // overlay dimensions
806 text_t **text; 811 text_t **text;
807 rend_t **rend; 812 rend_t **rend;
808 813
809 // 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
810}; 815};
811 816
812/* ------------------------------------------------------------------------- */ 817/* ------------------------------------------------------------------------- */
813 818
814typedef struct 819typedef struct
… …
1071 char * incr_buf; 1076 char * incr_buf;
1072 size_t incr_buf_size, incr_buf_fill; 1077 size_t incr_buf_size, incr_buf_fill;
1073/* ---------- */ 1078/* ---------- */
1074 struct mouse_event MEvent; 1079 struct mouse_event MEvent;
1075 XComposeStatus compose; 1080 XComposeStatus compose;
1076 struct termios tio; 1081 static struct termios def_tio;
1077 row_col_t oldcursor; 1082 row_col_t oldcursor;
1078#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
1079 bgPixmap_t bgPixmap; 1084 bgPixmap_t bgPixmap;
1080#endif 1085#endif
1081#ifdef HAVE_AFTERIMAGE 1086#ifdef HAVE_AFTERIMAGE
… …
1155 void rootwin_cb (XEvent &xev); 1160 void rootwin_cb (XEvent &xev);
1156 xevent_watcher rootwin_ev; 1161 xevent_watcher rootwin_ev;
1157#endif 1162#endif
1158#ifdef HAVE_BG_PIXMAP 1163#ifdef HAVE_BG_PIXMAP
1159 void update_background (); 1164 void update_background ();
1160#if TRACE_PIXMAPS
1161 void trace_update_background (const char *file, int line);
1162# define update_background() trace_update_background (__FILE__, __LINE__)
1163#endif
1164 void update_background_cb (ev::timer &w, int revents); 1165 void update_background_cb (ev::timer &w, int revents);
1165 ev::timer update_background_ev; 1166 ev::timer update_background_ev;
1166#endif 1167#endif
1167 1168
1168 void x_cb (XEvent &xev); 1169 void x_cb (XEvent &xev);
… …
1294 int run_child (const char *const *argv); 1295 int run_child (const char *const *argv);
1295 void color_aliases (int idx); 1296 void color_aliases (int idx);
1296 void create_windows (int argc, const char *const *argv); 1297 void create_windows (int argc, const char *const *argv);
1297 void get_colours (); 1298 void get_colours ();
1298 void get_ourmods (); 1299 void get_ourmods ();
1300 void set_icon (const char *file);
1299 // main.C 1301 // main.C
1300 void tt_winch (); 1302 void tt_winch ();
1301 rxvt_term (); 1303 rxvt_term ();
1302 ~rxvt_term (); 1304 ~rxvt_term ();
1303 void destroy (); 1305 void destroy ();
… …
1305 void recolour_cursor (); 1307 void recolour_cursor ();
1306 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);
1307 void window_calc (unsigned int newwidth, unsigned int newheight); 1309 void window_calc (unsigned int newwidth, unsigned int newheight);
1308 bool set_fonts (); 1310 bool set_fonts ();
1309 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);
1310 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);
1311 void set_title (const char *str); 1314 void set_title (const char *str);
1312 void set_icon_name (const char *str); 1315 void set_icon_name (const char *str);
1313 void set_window_color (int idx, const char *color); 1316 void set_window_color (int idx, const char *color);
1314 void set_colorfgbg (); 1317 void set_colorfgbg ();
… …
1404 else 1407 else
1405 priv_modes &= ~bit; 1408 priv_modes &= ~bit;
1406 } 1409 }
1407 1410
1408 // modifies first argument(!) 1411 // modifies first argument(!)
1412 void tt_paste (char *data, unsigned int len) NOTHROW;
1409 void paste (char *data, unsigned int len) NOTHROW; 1413 void paste (char *data, unsigned int len) NOTHROW;
1410 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;
1411 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;
1412 void scr_kill_char (line_t &l, int col) const NOTHROW; 1416 void scr_kill_char (line_t &l, int col) const NOTHROW;
1413 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1417 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1472 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1476 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1473 void selection_property (Window win, Atom prop) NOTHROW; 1477 void selection_property (Window win, Atom prop) NOTHROW;
1474 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1478 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1475 int selection_request_other (Atom target, int selnum) NOTHROW; 1479 int selection_request_other (Atom target, int selnum) NOTHROW;
1476 void selection_clear (bool clipboard = false) NOTHROW; 1480 void selection_clear (bool clipboard = false) NOTHROW;
1477 void clipboard_copy (Time tm);
1478 void selection_make (Time tm); 1481 void selection_make (Time tm);
1479 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1482 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1480 void selection_start_colrow (int col, int row) NOTHROW; 1483 void selection_start_colrow (int col, int row) NOTHROW;
1481 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;
1482 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