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.407 by root, Sun May 23 00:08:53 2010 UTC vs.
Revision 1.417 by root, Tue Nov 23 22:58:09 2010 UTC

… …
331// 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"
332#define RS_redraw (2UL << RS_fontShift) 332#define RS_redraw (2UL << RS_fontShift)
333 333
334#define RS_Sel (1UL << 22) 334#define RS_Sel (1UL << 22)
335 335
336// 5 custom bits for extensions 336// 4 custom bits for extensions
337#define RS_customCount 16UL 337#define RS_customCount 16UL
338#define RS_customShift 23 338#define RS_customShift 23
339#define RS_customMask ((RS_customCount - 1UL) << RS_customShift) 339#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
340 340
341// font styles 341// font styles
… …
555#define PrivMode_vt52 (1UL<<18) 555#define PrivMode_vt52 (1UL<<18)
556#define PrivMode_LFNL (1UL<<19) 556#define PrivMode_LFNL (1UL<<19)
557#define PrivMode_MouseBtnEvent (1UL<<20) 557#define PrivMode_MouseBtnEvent (1UL<<20)
558#define PrivMode_MouseAnyEvent (1UL<<21) 558#define PrivMode_MouseAnyEvent (1UL<<21)
559#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
560 562
561#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)
562 564
563#ifdef ALLOW_132_MODE 565#ifdef ALLOW_132_MODE
564# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 566# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
615/* 617/*
616 ***************************************************************************** 618 *****************************************************************************
617 * MACRO DEFINES 619 * MACRO DEFINES
618 ***************************************************************************** 620 *****************************************************************************
619 */ 621 */
622
623// speed hack, copy some member variable into a local variable of the same name
620#define dLocal(type,name) type const name = this->name 624#define dLocal(type,name) type const name = this->name
621 625
622// 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
623// single-width. 627// single-width.
624#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))
… …
805{ 809{
806 int x, y, w, h; // overlay dimensions 810 int x, y, w, h; // overlay dimensions
807 text_t **text; 811 text_t **text;
808 rend_t **rend; 812 rend_t **rend;
809 813
810 // 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
811}; 815};
812 816
813/* ------------------------------------------------------------------------- */ 817/* ------------------------------------------------------------------------- */
814 818
815typedef struct 819typedef struct
… …
1072 char * incr_buf; 1076 char * incr_buf;
1073 size_t incr_buf_size, incr_buf_fill; 1077 size_t incr_buf_size, incr_buf_fill;
1074/* ---------- */ 1078/* ---------- */
1075 struct mouse_event MEvent; 1079 struct mouse_event MEvent;
1076 XComposeStatus compose; 1080 XComposeStatus compose;
1077 struct termios tio; 1081 static struct termios def_tio;
1078 row_col_t oldcursor; 1082 row_col_t oldcursor;
1079#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
1080 bgPixmap_t bgPixmap; 1084 bgPixmap_t bgPixmap;
1081#endif 1085#endif
1082#ifdef HAVE_AFTERIMAGE 1086#ifdef HAVE_AFTERIMAGE
… …
1156 void rootwin_cb (XEvent &xev); 1160 void rootwin_cb (XEvent &xev);
1157 xevent_watcher rootwin_ev; 1161 xevent_watcher rootwin_ev;
1158#endif 1162#endif
1159#ifdef HAVE_BG_PIXMAP 1163#ifdef HAVE_BG_PIXMAP
1160 void update_background (); 1164 void update_background ();
1161#if TRACE_PIXMAPS
1162 void trace_update_background (const char *file, int line);
1163# define update_background() trace_update_background (__FILE__, __LINE__)
1164#endif
1165 void update_background_cb (ev::timer &w, int revents); 1165 void update_background_cb (ev::timer &w, int revents);
1166 ev::timer update_background_ev; 1166 ev::timer update_background_ev;
1167#endif 1167#endif
1168 1168
1169 void x_cb (XEvent &xev); 1169 void x_cb (XEvent &xev);
… …
1295 int run_child (const char *const *argv); 1295 int run_child (const char *const *argv);
1296 void color_aliases (int idx); 1296 void color_aliases (int idx);
1297 void create_windows (int argc, const char *const *argv); 1297 void create_windows (int argc, const char *const *argv);
1298 void get_colours (); 1298 void get_colours ();
1299 void get_ourmods (); 1299 void get_ourmods ();
1300 void set_icon (const char *file);
1300 // main.C 1301 // main.C
1301 void tt_winch (); 1302 void tt_winch ();
1302 rxvt_term (); 1303 rxvt_term ();
1303 ~rxvt_term (); 1304 ~rxvt_term ();
1304 void destroy (); 1305 void destroy ();
… …
1306 void recolour_cursor (); 1307 void recolour_cursor ();
1307 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);
1308 void window_calc (unsigned int newwidth, unsigned int newheight); 1309 void window_calc (unsigned int newwidth, unsigned int newheight);
1309 bool set_fonts (); 1310 bool set_fonts ();
1310 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);
1311 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);
1312 void set_title (const char *str); 1314 void set_title (const char *str);
1313 void set_icon_name (const char *str); 1315 void set_icon_name (const char *str);
1314 void set_window_color (int idx, const char *color); 1316 void set_window_color (int idx, const char *color);
1315 void set_colorfgbg (); 1317 void set_colorfgbg ();
… …
1405 else 1407 else
1406 priv_modes &= ~bit; 1408 priv_modes &= ~bit;
1407 } 1409 }
1408 1410
1409 // modifies first argument(!) 1411 // modifies first argument(!)
1412 void tt_paste (char *data, unsigned int len) NOTHROW;
1410 void paste (char *data, unsigned int len) NOTHROW; 1413 void paste (char *data, unsigned int len) NOTHROW;
1411 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;
1412 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;
1413 void scr_kill_char (line_t &l, int col) const NOTHROW; 1416 void scr_kill_char (line_t &l, int col) const NOTHROW;
1414 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1417 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1473 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1476 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1474 void selection_property (Window win, Atom prop) NOTHROW; 1477 void selection_property (Window win, Atom prop) NOTHROW;
1475 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1478 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1476 int selection_request_other (Atom target, int selnum) NOTHROW; 1479 int selection_request_other (Atom target, int selnum) NOTHROW;
1477 void selection_clear (bool clipboard = false) NOTHROW; 1480 void selection_clear (bool clipboard = false) NOTHROW;
1478 void clipboard_copy (Time tm);
1479 void selection_make (Time tm); 1481 void selection_make (Time tm);
1480 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1482 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1481 void selection_start_colrow (int col, int row) NOTHROW; 1483 void selection_start_colrow (int col, int row) NOTHROW;
1482 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;
1483 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