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.433 by sf-exg, Sun Jan 30 18:38:01 2011 UTC vs.
Revision 1.440 by sf-exg, Tue Apr 26 16:19:45 2011 UTC

… …
313/* special (internal) prefix for font commands */ 313/* special (internal) prefix for font commands */
314#define FONT_CMD '#' 314#define FONT_CMD '#'
315#define FONT_DN "#-" 315#define FONT_DN "#-"
316#define FONT_UP "#+" 316#define FONT_UP "#+"
317 317
318/* flags for rxvt_scr_gotorc () */ 318/* flags for rxvt_term::scr_gotorc () */
319enum { 319enum {
320 C_RELATIVE = 1, /* col movement is relative */ 320 C_RELATIVE = 1, /* col movement is relative */
321 R_RELATIVE = 2, /* row movement is relative */ 321 R_RELATIVE = 2, /* row movement is relative */
322 RELATIVE = C_RELATIVE | R_RELATIVE, 322 RELATIVE = C_RELATIVE | R_RELATIVE,
323}; 323};
324 324
325/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 325/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
326enum { 326enum {
327 INSERT = -1, /* don't change these values */ 327 INSERT = -1, /* don't change these values */
328 DELETE = +1, 328 DELETE = +1,
329 ERASE = +2, 329 ERASE = +2,
330}; 330};
331 331
332/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 332/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
333enum page_dirn { 333enum page_dirn {
334 UP, 334 UP,
335 DN, 335 DN,
336 NO_DIR, 336 NO_DIR,
337}; 337};
338 338
339/* arguments for rxvt_scr_change_screen () */ 339/* arguments for rxvt_term::scr_change_screen () */
340enum { 340enum {
341 PRIMARY = 0, 341 PRIMARY = 0,
342 SECONDARY, 342 SECONDARY,
343}; 343};
344 344
… …
386#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 386#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
387#define RS_attrMask (RS_baseattrMask | RS_fontMask) 387#define RS_attrMask (RS_baseattrMask | RS_fontMask)
388 388
389#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 389#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
390#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 390#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
391
392#define Sel_none 0 /* Not waiting */
393#define Sel_normal 0x01 /* normal selection */
394#define Sel_incr 0x02 /* incremental selection */
395#define Sel_direct 0x00
396#define Sel_Primary 0x01
397#define Sel_Secondary 0x02
398#define Sel_Clipboard 0x03
399#define Sel_whereMask 0x0f
400#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
401#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
402 391
403enum { 392enum {
404 C0_NUL = 0x00, 393 C0_NUL = 0x00,
405 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 394 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
406 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 395 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
908 int saveLines; /* number of lines that fit in scrollback */ 897 int saveLines; /* number of lines that fit in scrollback */
909 int total_rows; /* total number of rows in this terminal */ 898 int total_rows; /* total number of rows in this terminal */
910 int term_start; /* term lines start here */ 899 int term_start; /* term lines start here */
911 int view_start; /* scrollback view starts here */ 900 int view_start; /* scrollback view starts here */
912 int top_row; /* topmost row index of scrollback */ 901 int top_row; /* topmost row index of scrollback */
913 Window parent[6]; /* parent identifiers - we're parent[0] */ 902 Window parent; /* parent identifier */
914 Window vt; /* vt100 window */ 903 Window vt; /* vt100 window */
915 GC gc; /* GC for drawing */ 904 GC gc; /* GC for drawing */
916 Pixmap pixmap; 905 Pixmap pixmap;
917 rxvt_drawable *drawable; 906 rxvt_drawable *drawable;
918 rxvt_fontset *fontset[4]; 907 rxvt_fontset *fontset[4];
… …
1052 seen_resize:1, /* whether we had a resize event */ 1041 seen_resize:1, /* whether we had a resize event */
1053 parsed_geometry:1; 1042 parsed_geometry:1;
1054 1043
1055 unsigned char refresh_type, 1044 unsigned char refresh_type,
1056#ifdef META8_OPTION 1045#ifdef META8_OPTION
1057 meta_char, /* Alt-key prefix */ 1046 meta_char; /* Alt-key prefix */
1058#endif 1047#endif
1059 selection_wait,
1060 selection_type;
1061/* ---------- */ 1048/* ---------- */
1062 bool rvideo_state, rvideo_mode; 1049 bool rvideo_state, rvideo_mode;
1063#ifndef NO_BELL 1050#ifndef NO_BELL
1064 bool rvideo_bell; 1051 bool rvideo_bell;
1065#endif 1052#endif
… …
1101 SavedModes; 1088 SavedModes;
1102/* ---------- */ 1089/* ---------- */
1103 Atom *xa; 1090 Atom *xa;
1104/* ---------- */ 1091/* ---------- */
1105 Time selection_time, 1092 Time selection_time,
1106 selection_request_time,
1107 clipboard_time; 1093 clipboard_time;
1094 rxvt_selection *selection_req;
1108 pid_t cmd_pid; /* process id of child */ 1095 pid_t cmd_pid; /* process id of child */
1109 char * incr_buf;
1110 size_t incr_buf_size, incr_buf_fill;
1111/* ---------- */ 1096/* ---------- */
1112 struct mouse_event MEvent; 1097 struct mouse_event MEvent;
1113 XComposeStatus compose; 1098 XComposeStatus compose;
1114 static struct termios def_tio; 1099 static struct termios def_tio;
1115 row_col_t oldcursor; 1100 row_col_t oldcursor;
… …
1304 void child_cb (ev::child &w, int revents); ev::child child_ev; 1289 void child_cb (ev::child &w, int revents); ev::child child_ev;
1305 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1290 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1306 void refresh_check (); 1291 void refresh_check ();
1307 void flush (); 1292 void flush ();
1308 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1293 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1294 void cmdbuf_reify ();
1295 void cmdbuf_append (const char *str, size_t count);
1309 bool pty_fill (); 1296 bool pty_fill ();
1310 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1297 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1311 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1312 1298
1313#ifdef CURSOR_BLINK 1299#ifdef CURSOR_BLINK
1314 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1300 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1315#endif 1301#endif
1316#ifdef TEXT_BLINK 1302#ifdef TEXT_BLINK
… …
1373#endif 1359#endif
1374 1360
1375 // command.C 1361 // command.C
1376 void key_press (XKeyEvent &ev); 1362 void key_press (XKeyEvent &ev);
1377 void key_release (XKeyEvent &ev); 1363 void key_release (XKeyEvent &ev);
1378 unsigned int cmd_write (const char *str, unsigned int count);
1379 1364
1380 wchar_t next_char () NOTHROW; 1365 wchar_t next_char () NOTHROW;
1381 wchar_t cmd_getc () THROW ((class out_of_input)); 1366 wchar_t cmd_getc () THROW ((class out_of_input));
1382 uint32_t next_octet () NOTHROW; 1367 uint32_t next_octet () NOTHROW;
1383 uint32_t cmd_get8 () THROW ((class out_of_input)); 1368 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1410 void process_color_seq (int report, int color, const char *str, char resp); 1395 void process_color_seq (int report, int color, const char *str, char resp);
1411 void process_xterm_seq (int op, char *str, char resp); 1396 void process_xterm_seq (int op, char *str, char resp);
1412 int privcases (int mode, unsigned long bit); 1397 int privcases (int mode, unsigned long bit);
1413 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1398 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1414 void process_sgr_mode (unsigned int nargs, const int *arg); 1399 void process_sgr_mode (unsigned int nargs, const int *arg);
1415 void process_graphics ();
1416 // init.C 1400 // init.C
1417 void init_vars (); 1401 void init_vars ();
1418 const char **init_resources (int argc, const char *const *argv); 1402 const char **init_resources (int argc, const char *const *argv);
1419 void init (int argc, const char *const *argv, stringvec *envv); 1403 void init (int argc, const char *const *argv, stringvec *envv);
1420 void init_env (); 1404 void init_env ();
… …
1587 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1571 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1588 void scr_reverse_selection () NOTHROW; 1572 void scr_reverse_selection () NOTHROW;
1589 void scr_dump (int fd) NOTHROW; 1573 void scr_dump (int fd) NOTHROW;
1590 1574
1591 void selection_check (int check_more) NOTHROW; 1575 void selection_check (int check_more) NOTHROW;
1592 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1593 void selection_property (Window win, Atom prop) NOTHROW;
1594 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1576 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1595 int selection_request_other (Atom target, int selnum) NOTHROW;
1596 void selection_clear (bool clipboard = false) NOTHROW; 1577 void selection_clear (bool clipboard = false) NOTHROW;
1597 void selection_make (Time tm); 1578 void selection_make (Time tm);
1598 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1579 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1599 void selection_start_colrow (int col, int row) NOTHROW; 1580 void selection_start_colrow (int col, int row) NOTHROW;
1600 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1581 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;

Diff Legend

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