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.184 by root, Wed Jan 4 00:09:12 2006 UTC vs.
Revision 1.193 by root, Mon Jan 9 23:00:07 2006 UTC

… …
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23
24#include "rxvtperl.h"
23 25
24#if ENABLE_FRILLS 26#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1 27# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1 28# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1 29# define CURSOR_BLINK 1
… …
557 559
558/* 560/*
559 * Resource list 561 * Resource list
560 */ 562 */
561enum { 563enum {
562#define Rs_def(name) Rs_ ## name, 564# define def(name) Rs_ ## name,
563#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 565# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
564#include "rsinc.h" 566# include "rsinc.h"
565#undef Rs_def 567# undef def
566#undef Rs_reserve 568# undef reserve
567 NUM_RESOURCES 569 NUM_RESOURCES
568}; 570};
569 571
570// see init.C:xa_names, which must be kept in sync 572// see init.C:xa_names, which must be kept in sync
571enum { 573enum {
… …
685/* 687/*
686 ***************************************************************************** 688 *****************************************************************************
687 * MACRO DEFINES 689 * MACRO DEFINES
688 ***************************************************************************** 690 *****************************************************************************
689 */ 691 */
690#define memset(x, y, z) memset((x), (y), (size_t)(z))
691#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
692#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
693#define strcasecmp(x, y) strcasecmp((x), (y))
694#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
695#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
696#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
697#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
698#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
699#define strcat(x, y) strcat((char *)(x), (const char *)(y))
700#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
701#define strdup(x) strdup((const char *)(x))
702#define strlen(x) strlen((const char *)(x))
703#define strchr(x, y) strchr((const char *)(x), (int)(y))
704#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
705
706#define dDisp Display *disp = display->display 692#define dDisp Display *disp = display->display
707 693
708/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
709#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
710#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
713#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 699#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
714#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 700#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
715#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
716#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
717 703
718#define TermWin_TotalWidth() ((int32_t)this->width) 704#define OPTION(opt) (options & (opt))
719#define TermWin_TotalHeight() ((int32_t)this->height) 705#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
706 | Opt_jumpScroll | Opt_secondaryScreen \
707 | Opt_pastableTabs | Opt_intensityStyles)
720 708
721// for m >= -n, ensure remainder lies between 0..n-1 709// for m >= -n, ensure remainder lies between 0..n-1
722#define MOD(m,n) (((m) + (n)) % (n)) 710#define MOD(m,n) (((m) + (n)) % (n))
723 711
724#define LINENO(n) MOD (term_start + int(n), total_rows) 712#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
854#define SET_LOCALE(locale) rxvt_set_locale (locale) 842#define SET_LOCALE(locale) rxvt_set_locale (locale)
855extern bool rxvt_set_locale (const char *locale); 843extern bool rxvt_set_locale (const char *locale);
856extern bool rxvt_push_locale (const char *locale); 844extern bool rxvt_push_locale (const char *locale);
857extern void rxvt_pop_locale (); 845extern void rxvt_pop_locale ();
858 846
859/*
860 ***************************************************************************** 847/****************************************************************************/
861 * VARIABLES 848
862 *****************************************************************************
863 */
864#ifdef MENUBAR 849#ifdef MENUBAR
865# include "menubar.h" 850# include "menubar.h"
866#endif 851#endif
867 852
868#define BLINK_INTERVAL 0.5 853#define BLINK_INTERVAL 0.5
… …
875# endif 860# endif
876# endif 861# endif
877# define __attribute__(x) 862# define __attribute__(x)
878#endif 863#endif
879 864
865/****************************************************************************/
866
867#define LINE_LONGER 0x0001 // line is continued on the next row
868#define LINE_FILTERED 0x0002 // line has been filtered
869#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
870
871struct line_t {
872 text_t *t; // terminal the text
873 rend_t *r; // rendition, uses RS_ flags
874 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
875 uint32_t f; // flags
876
877 bool is_longer ()
878 {
879 return f & LINE_LONGER;
880 }
881
882 void is_longer (int set)
883 {
884 if (set)
885 f |= LINE_LONGER;
886 else
887 f &= ~LINE_LONGER;
888 }
889
890 void clear ()
891 {
892 t = 0;
893 r = 0;
894 l = 0;
895 f = 0;
896 }
897
898 void touch () // call whenever a line is changed/touched/updated
899 {
900#if ENABLE_PERL
901 f &= ~LINE_FILTERED;
902#endif
903 }
904
905 void touch (int col)
906 {
907 max_it (l, col);
908 touch ();
909 }
910};
911
912/****************************************************************************/
913
880// primivite wrapper around mbstate_t to ensure initialisation 914// primivite wrapper around mbstate_t to ensure initialisation
881struct mbstate { 915struct mbstate {
882 mbstate_t mbs; 916 mbstate_t mbs;
883 917
884 operator mbstate_t *() { return &mbs; } 918 operator mbstate_t *() { return &mbs; }
885 void reset () { memset (&mbs, 0, sizeof (mbs)); } 919 void reset () { memset (&mbs, 0, sizeof (mbs)); }
886 mbstate () { reset (); } 920 mbstate () { reset (); }
887}; 921};
888 922
923/****************************************************************************/
924
889#define UNICODE_MASK 0x1fffffUL 925#define UNICODE_MASK 0x1fffffUL
890 926
891#if UNICODE3 927#if UNICODE3
892# define COMPOSE_LO 0x40000000UL 928# define COMPOSE_LO 0x40000000UL
893# define COMPOSE_HI 0x400fffffUL 929# define COMPOSE_HI 0x400fffffUL
894# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 930# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
895#else 931#else
932# if ENABLE_PERL
933# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
934# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
935# else
896# define COMPOSE_LO 0xd800UL 936# define COMPOSE_LO 0xd800UL
897# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 937# define COMPOSE_HI 0xf8ffUL
898# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 938# endif
939# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
899#endif 940#endif
900 941
901#if ENABLE_COMBINING 942#if ENABLE_COMBINING
902// compose chars are used to represent composite characters 943// compose chars are used to represent composite characters
903// that are not representable in unicode, as well as characters 944// that are not representable in unicode, as well as characters
… …
923}; 964};
924 965
925extern class rxvt_composite_vec rxvt_composite; 966extern class rxvt_composite_vec rxvt_composite;
926#endif 967#endif
927 968
969/****************************************************************************/
928 970
929#ifdef KEYSYM_RESOURCE 971#ifdef KEYSYM_RESOURCE
930 class keyboard_manager; 972 class keyboard_manager;
931#endif 973#endif
932 974
933struct rxvt_term : zero_initialized, rxvt_vars { 975struct rxvt_term : zero_initialized, rxvt_vars {
934 log_callback *log_hook; // log error messages through this hook, if != 0 976 log_callback *log_hook; // log error messages through this hook, if != 0
935 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 977 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
936 978
937#if ENABLE_PERL 979#if ENABLE_PERL
938 void *self; // perl's $self 980 rxvt_perl_term perl;
981#endif
982#if USE_XGETDEFAULT
983 XrmDatabase xrmdatabase;
939#endif 984#endif
940 985
941 struct mbstate mbstate; // current input multibyte state 986 struct mbstate mbstate; // current input multibyte state
942 987
943 unsigned char want_refresh:1, 988 unsigned char want_refresh:1,
… …
1095 bar_t *CurrentBar; 1140 bar_t *CurrentBar;
1096# if ! (MENUBAR_MAX > 1) 1141# if ! (MENUBAR_MAX > 1)
1097 bar_t BarList; 1142 bar_t BarList;
1098# endif /* (MENUBAR_MAX > 1) */ 1143# endif /* (MENUBAR_MAX > 1) */
1099#endif 1144#endif
1100#ifdef CURSOR_BLINK
1101 struct timeval lastcursorchange;
1102#endif
1103#ifdef POINTER_BLANK
1104 struct timeval lastmotion;
1105#endif
1106 1145
1107#if ENABLE_OVERLAY 1146#if ENABLE_OVERLAY
1108 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1147 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1109 text_t **ov_text; 1148 text_t **ov_text;
1110 rend_t **ov_rend; 1149 rend_t **ov_rend;
… …
1125 char *env_display; /* environmental variable DISPLAY */ 1164 char *env_display; /* environmental variable DISPLAY */
1126 char *env_term; /* environmental variable TERM */ 1165 char *env_term; /* environmental variable TERM */
1127 char *env_colorfgbg; 1166 char *env_colorfgbg;
1128 char *locale; 1167 char *locale;
1129 char charsets[4]; 1168 char charsets[4];
1130 unsigned char *v_buffer; /* pointer to physical buffer */ 1169 char *v_buffer; /* pointer to physical buffer */
1131 unsigned int v_buflen; /* size of area to write */ 1170 unsigned int v_buflen; /* size of area to write */
1132 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1171 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1133 1172
1134#ifdef KEYSYM_RESOURCE 1173#ifdef KEYSYM_RESOURCE
1135 keyboard_manager *keyboard; 1174 keyboard_manager *keyboard;
1136#endif 1175#endif
1137 1176
1138 const char *rs[NUM_RESOURCES]; 1177 const char *rs[NUM_RESOURCES];
1139 /* command input buffering */ 1178 /* command input buffering */
1140 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1179 char *cmdbuf_ptr, *cmdbuf_endp;
1141 unsigned char cmdbuf_base[CBUFSIZ]; 1180 char cmdbuf_base[CBUFSIZ];
1142 1181
1143 rxvt_salloc *talloc; // text line allocator 1182 rxvt_salloc *talloc; // text line allocator
1144 rxvt_salloc *ralloc; // rend line allocator 1183 rxvt_salloc *ralloc; // rend line allocator
1145 1184
1146 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1185 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1155 void iso14755_54 (int x, int y); 1194 void iso14755_54 (int x, int y);
1156# endif 1195# endif
1157#endif 1196#endif
1158 1197
1159 // modifies first argument(!) 1198 // modifies first argument(!)
1160 void paste (unsigned char *data, unsigned int len); 1199 void paste (char *data, unsigned int len);
1161 1200
1162 void flush (); 1201 void flush ();
1163 1202
1164#if TRANSPARENT 1203#if TRANSPARENT
1165 void rootwin_cb (XEvent &xev); 1204 void rootwin_cb (XEvent &xev);
… …
1206 void pointer_blank (); 1245 void pointer_blank ();
1207#endif 1246#endif
1208 void pointer_unblank (); 1247 void pointer_unblank ();
1209 1248
1210 void tt_printf (const char *fmt,...); 1249 void tt_printf (const char *fmt,...);
1211 void tt_write (const unsigned char *data, unsigned int len); 1250 void tt_write (const char *data, unsigned int len);
1212 void pty_write (); 1251 void pty_write ();
1213 1252
1214 void tt_winch (); 1253 void tt_winch ();
1215 1254
1216 rxvt_term (); 1255 rxvt_term ();
… …
1268 1307
1269 /* autoconvert */ 1308 /* autoconvert */
1270 1309
1271 // command.C 1310 // command.C
1272 void lookup_key (XKeyEvent &ev); 1311 void lookup_key (XKeyEvent &ev);
1273 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1312 unsigned int cmd_write (const char *str, unsigned int count);
1274 1313
1275 unicode_t next_char (); 1314 wchar_t next_char ();
1276 unicode_t cmd_getc (); 1315 wchar_t cmd_getc ();
1277 unicode_t next_octet (); 1316 uint32_t next_octet ();
1278 unicode_t cmd_get8 (); 1317 uint32_t cmd_get8 ();
1279 1318
1280 bool cmd_parse (); 1319 bool cmd_parse ();
1281 void mouse_report (XButtonEvent &ev); 1320 void mouse_report (XButtonEvent &ev);
1282 void button_press (XButtonEvent &ev); 1321 void button_press (XButtonEvent &ev);
1283 void button_release (XButtonEvent &ev); 1322 void button_release (XButtonEvent &ev);
… …
1292 void process_nonprinting (unicode_t ch); 1331 void process_nonprinting (unicode_t ch);
1293 void process_escape_vt52 (unicode_t ch); 1332 void process_escape_vt52 (unicode_t ch);
1294 void process_escape_seq (); 1333 void process_escape_seq ();
1295 void process_csi_seq (); 1334 void process_csi_seq ();
1296 void process_window_ops (const int *args, unsigned int nargs); 1335 void process_window_ops (const int *args, unsigned int nargs);
1297 unsigned char *get_to_st (unicode_t &ends_how); 1336 char *get_to_st (unicode_t &ends_how);
1298 void process_dcs_seq (); 1337 void process_dcs_seq ();
1299 void process_osc_seq (); 1338 void process_osc_seq ();
1300 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1339 void process_color_seq (int report, int color, const char *str, char resp);
1301 void process_xterm_seq (int op, const char *str, unsigned char resp); 1340 void process_xterm_seq (int op, const char *str, char resp);
1302 int privcases (int mode, unsigned long bit); 1341 int privcases (int mode, unsigned long bit);
1303 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1342 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1304 void process_sgr_mode (unsigned int nargs, const int *arg); 1343 void process_sgr_mode (unsigned int nargs, const int *arg);
1305 void process_graphics (); 1344 void process_graphics ();
1306 // init.C 1345 // init.C
… …
1410 base += minBrightCOLOR - minCOLOR; 1449 base += minBrightCOLOR - minCOLOR;
1411#endif 1450#endif
1412 return base; 1451 return base;
1413 } 1452 }
1414 1453
1454 bool option (uint32_t opt)
1455 {
1456 return OPTION (opt);
1457 }
1458
1459 void set_option (uint32_t opt, bool set)
1460 {
1461 if (set)
1462 options |= opt;
1463 else
1464 options &= ~opt;
1465 }
1466
1415 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1467 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1416 void scr_blank_screen_mem (line_t &l, rend_t efs); 1468 void scr_blank_screen_mem (line_t &l, rend_t efs);
1417 int scr_scroll_text (int row1, int row2, int count); 1469 int scr_scroll_text (int row1, int row2, int count);
1418 void scr_reset (); 1470 void scr_reset ();
1419 void scr_release (); 1471 void scr_release ();
… …
1429 void scr_touch (bool refresh); 1481 void scr_touch (bool refresh);
1430 void scr_expose (int x, int y, int width, int height, bool refresh); 1482 void scr_expose (int x, int y, int width, int height, bool refresh);
1431 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1483 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1432 void scr_recolour (); 1484 void scr_recolour ();
1433 void scr_remap_chars (); 1485 void scr_remap_chars ();
1434 void scr_remap_chars (const line_t &l); 1486 void scr_remap_chars (line_t &l);
1435 1487
1436 void scr_poweron (); 1488 void scr_poweron ();
1437 void scr_cursor (int mode); 1489 void scr_cursor (int mode);
1438 void scr_do_wrap (); 1490 void scr_do_wrap ();
1439 int scr_change_screen (int scrn); 1491 int scr_change_screen (int scrn);
1440 void scr_color (unsigned int color, int fgbg); 1492 void scr_color (unsigned int color, int fgbg);
1441 void scr_rendition (int set, int style); 1493 void scr_rendition (int set, int style);
1442 void scr_add_lines (const unicode_t *str, int nlines, int len); 1494 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1443 void scr_backspace (); 1495 void scr_backspace ();
1444 void scr_tab (int count, bool ht = false); 1496 void scr_tab (int count, bool ht = false);
1445 void scr_gotorc (int row, int col, int relative); 1497 void scr_gotorc (int row, int col, int relative);
1446 void scr_index (enum page_dirn direction); 1498 void scr_index (enum page_dirn direction);
1447 void scr_erase_line (int mode); 1499 void scr_erase_line (int mode);
… …
1462 int scr_move_to (int y, int len); 1514 int scr_move_to (int y, int len);
1463 int scr_page (enum page_dirn direction, int nlines); 1515 int scr_page (enum page_dirn direction, int nlines);
1464 int scr_changeview (unsigned int oldviewstart); 1516 int scr_changeview (unsigned int oldviewstart);
1465 void scr_bell (); 1517 void scr_bell ();
1466 void scr_printscreen (int fullhist); 1518 void scr_printscreen (int fullhist);
1519 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1520 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1467 void scr_reverse_selection (); 1521 void scr_reverse_selection ();
1468 void scr_dump (int fd); 1522 void scr_dump (int fd);
1469 void selection_check (int check_more); 1523 void selection_check (int check_more);
1470 void selection_paste (Window win, Atom prop, bool delete_prop); 1524 void selection_paste (Window win, Atom prop, bool delete_prop);
1471 void selection_property (Window win, Atom prop); 1525 void selection_property (Window win, Atom prop);

Diff Legend

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