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.406 by root, Sun May 23 00:02:52 2010 UTC vs.
Revision 1.420 by root, Tue Dec 7 19:05:35 2010 UTC

… …
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
… …
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
… …
946#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 951#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
947#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 952#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
948 953
949/* rxvt_vars.options */ 954/* rxvt_vars.options */
950enum { 955enum {
951# define def(name,idx) Opt_ ## name = idx,
952# 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,
953# include "optinc.h" 959# include "optinc.h"
954# undef nodef 960# undef nodef
955# undef def 961# undef def
956Opt_count 962 Opt_count
957}; 963};
958 964
959/* ------------------------------------------------------------------------- */ 965/* ------------------------------------------------------------------------- */
960 966
961struct rxvt_vars : TermWin_t 967struct rxvt_vars : TermWin_t
… …
1071 char * incr_buf; 1077 char * incr_buf;
1072 size_t incr_buf_size, incr_buf_fill; 1078 size_t incr_buf_size, incr_buf_fill;
1073/* ---------- */ 1079/* ---------- */
1074 struct mouse_event MEvent; 1080 struct mouse_event MEvent;
1075 XComposeStatus compose; 1081 XComposeStatus compose;
1076 struct termios tio; 1082 static struct termios def_tio;
1077 row_col_t oldcursor; 1083 row_col_t oldcursor;
1078#ifdef HAVE_BG_PIXMAP 1084#ifdef HAVE_BG_PIXMAP
1079 bgPixmap_t bgPixmap; 1085 bgPixmap_t bgPixmap;
1080#endif 1086#endif
1081#ifdef HAVE_AFTERIMAGE 1087#ifdef HAVE_AFTERIMAGE
… …
1155 void rootwin_cb (XEvent &xev); 1161 void rootwin_cb (XEvent &xev);
1156 xevent_watcher rootwin_ev; 1162 xevent_watcher rootwin_ev;
1157#endif 1163#endif
1158#ifdef HAVE_BG_PIXMAP 1164#ifdef HAVE_BG_PIXMAP
1159 void update_background (); 1165 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); 1166 void update_background_cb (ev::timer &w, int revents);
1165 ev::timer update_background_ev; 1167 ev::timer update_background_ev;
1166#endif 1168#endif
1167 1169
1168 void x_cb (XEvent &xev); 1170 void x_cb (XEvent &xev);
… …
1294 int run_child (const char *const *argv); 1296 int run_child (const char *const *argv);
1295 void color_aliases (int idx); 1297 void color_aliases (int idx);
1296 void create_windows (int argc, const char *const *argv); 1298 void create_windows (int argc, const char *const *argv);
1297 void get_colours (); 1299 void get_colours ();
1298 void get_ourmods (); 1300 void get_ourmods ();
1301 void set_icon (const char *file);
1299 // main.C 1302 // main.C
1300 void tt_winch (); 1303 void tt_winch ();
1301 rxvt_term (); 1304 rxvt_term ();
1302 ~rxvt_term (); 1305 ~rxvt_term ();
1303 void destroy (); 1306 void destroy ();
… …
1305 void recolour_cursor (); 1308 void recolour_cursor ();
1306 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);
1307 void window_calc (unsigned int newwidth, unsigned int newheight); 1310 void window_calc (unsigned int newwidth, unsigned int newheight);
1308 bool set_fonts (); 1311 bool set_fonts ();
1309 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);
1310 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);
1311 void set_title (const char *str); 1315 void set_title (const char *str);
1312 void set_icon_name (const char *str); 1316 void set_icon_name (const char *str);
1313 void set_window_color (int idx, const char *color); 1317 void set_window_color (int idx, const char *color);
1314 void set_colorfgbg (); 1318 void set_colorfgbg ();
… …
1376 return base; 1380 return base;
1377 } 1381 }
1378 1382
1379 bool option (uint8_t opt) const NOTHROW 1383 bool option (uint8_t opt) const NOTHROW
1380 { 1384 {
1381 if (!opt)
1382 return 0;
1383
1384 --opt;
1385 return options[opt >> 3] & (1 << (opt & 7)); 1385 return options[opt >> 3] & (1 << (opt & 7));
1386 } 1386 }
1387 1387
1388 void set_option (uint8_t opt, bool set = true) NOTHROW 1388 void set_option (uint8_t opt, bool set = true) NOTHROW
1389 { 1389 {
1390 if (!opt) 1390 if (!opt)
1391 return; 1391 return;
1392 1392
1393 --opt; 1393 uint8_t mask = 1 << (opt & 7);
1394 if (set) 1394 uint8_t &val = options [opt >> 3];
1395 options[opt >> 3] |= (1 << (opt & 7)); 1395
1396 else 1396 val = val & ~mask | (set ? 0 : mask);
1397 options[opt >> 3] &= ~(1 << (opt & 7));
1398 } 1397 }
1399 1398
1400 void set_privmode (unsigned bit, int set) NOTHROW 1399 void set_privmode (unsigned bit, int set) NOTHROW
1401 { 1400 {
1402 if (set) 1401 if (set)
… …
1404 else 1403 else
1405 priv_modes &= ~bit; 1404 priv_modes &= ~bit;
1406 } 1405 }
1407 1406
1408 // modifies first argument(!) 1407 // modifies first argument(!)
1408 void tt_paste (char *data, unsigned int len) NOTHROW;
1409 void paste (char *data, unsigned int len) NOTHROW; 1409 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; 1410 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; 1411 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; 1412 void scr_kill_char (line_t &l, int col) const NOTHROW;
1413 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1413 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1472 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1472 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1473 void selection_property (Window win, Atom prop) NOTHROW; 1473 void selection_property (Window win, Atom prop) NOTHROW;
1474 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1474 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1475 int selection_request_other (Atom target, int selnum) NOTHROW; 1475 int selection_request_other (Atom target, int selnum) NOTHROW;
1476 void selection_clear (bool clipboard = false) NOTHROW; 1476 void selection_clear (bool clipboard = false) NOTHROW;
1477 void clipboard_copy (Time tm);
1478 void selection_make (Time tm); 1477 void selection_make (Time tm);
1479 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1478 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1480 void selection_start_colrow (int col, int row) NOTHROW; 1479 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; 1480 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; 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