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.182 by root, Mon Jan 2 18:20:23 2006 UTC vs.
Revision 1.191 by root, Sun Jan 8 01:02:15 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
… …
238# define HAVE_SCROLLBARS 1 240# define HAVE_SCROLLBARS 1
239#endif 241#endif
240 242
241/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 243/* width of scrollBar, menuBar shadow, must be 1 or 2 */
242#ifdef HALFSHADOW 244#ifdef HALFSHADOW
243# define SHADOW 1 245# define MENU_SHADOW 1
244#else 246#else
245# define SHADOW 2 247# define MENU_SHADOW 2
246#endif 248#endif
247 249
248#define R_SB_ALIGN_CENTRE 0 250#define R_SB_ALIGN_CENTRE 0
249#define R_SB_ALIGN_TOP 1 251#define R_SB_ALIGN_TOP 1
250#define R_SB_ALIGN_BOTTOM 2 252#define R_SB_ALIGN_BOTTOM 2
… …
469 URxvt_italicFont = 712, 471 URxvt_italicFont = 712,
470 URxvt_boldItalicFont = 713, 472 URxvt_boldItalicFont = 713,
471 473
472 URxvt_view_up = 720, 474 URxvt_view_up = 720,
473 URxvt_view_down = 721, 475 URxvt_view_down = 721,
476
477 URxvt_perl = 777,
474}; 478};
475 479
476/* Words starting with `Color_' are colours. Others are counts */ 480/* Words starting with `Color_' are colours. Others are counts */
477/* 481/*
478 * The PixColor and rendition colour usage should probably be decoupled 482 * The PixColor and rendition colour usage should probably be decoupled
… …
555 559
556/* 560/*
557 * Resource list 561 * Resource list
558 */ 562 */
559enum { 563enum {
560#define Rs_def(name) Rs_ ## name, 564# define def(name) Rs_ ## name,
561#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 565# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
562#include "rsinc.h" 566# include "rsinc.h"
563#undef Rs_def 567# undef def
564#undef Rs_reserve 568# undef reserve
565 NUM_RESOURCES 569 NUM_RESOURCES
566}; 570};
567 571
568// see init.C:xa_names, which must be kept in sync 572// see init.C:xa_names, which must be kept in sync
569enum { 573enum {
… …
683/* 687/*
684 ***************************************************************************** 688 *****************************************************************************
685 * MACRO DEFINES 689 * MACRO DEFINES
686 ***************************************************************************** 690 *****************************************************************************
687 */ 691 */
688#define memset(x, y, z) memset((x), (y), (size_t)(z))
689#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
690#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
691#define strcasecmp(x, y) strcasecmp((x), (y))
692#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
693#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
694#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
695#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
696#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
697#define strcat(x, y) strcat((char *)(x), (const char *)(y))
698#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
699#define strdup(x) strdup((const char *)(x))
700#define strlen(x) strlen((const char *)(x))
701#define strchr(x, y) strchr((const char *)(x), (int)(y))
702#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
703
704#define dDisp Display *disp = display->display 692#define dDisp Display *disp = display->display
705 693
706/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
707#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
708#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
711#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 699#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
712#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 700#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
713#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
714#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
715 703
716#define TermWin_TotalWidth() ((int32_t)this->width) 704#define OPTION(opt) (options & (opt))
717#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)
718 708
719// for m >= -n, ensure remainder lies between 0..n-1 709// for m >= -n, ensure remainder lies between 0..n-1
720#define MOD(m,n) (((m) + (n)) % (n)) 710#define MOD(m,n) (((m) + (n)) % (n))
721 711
722#define LINENO(n) MOD (term_start + int(n), total_rows) 712#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
782#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 772#define scrollbar_size() (scrollBar.end - scrollBar.beg \
783 - scrollbar_minheight ()) 773 - scrollbar_minheight ())
784 774
785#if (MENUBAR_MAX > 1) 775#if (MENUBAR_MAX > 1)
786/* rendition style flags */ 776/* rendition style flags */
787# define menuBar_height() (fheight + SHADOW) 777# define menuBar_height() (fheight + MENU_SHADOW)
788# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 778# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
789# define isMenuBarWindow(w) ((w) == menuBar.win) 779# define isMenuBarWindow(w) ((w) == menuBar.win)
790#else 780#else
791# define menuBar_height() (0) 781# define menuBar_height() (0)
792# define menuBar_TotalHeight() (0) 782# define menuBar_TotalHeight() (0)
793# define isMenuBarWindow(w) (0) 783# define isMenuBarWindow(w) (0)
… …
852#define SET_LOCALE(locale) rxvt_set_locale (locale) 842#define SET_LOCALE(locale) rxvt_set_locale (locale)
853extern bool rxvt_set_locale (const char *locale); 843extern bool rxvt_set_locale (const char *locale);
854extern bool rxvt_push_locale (const char *locale); 844extern bool rxvt_push_locale (const char *locale);
855extern void rxvt_pop_locale (); 845extern void rxvt_pop_locale ();
856 846
857/*
858 ***************************************************************************** 847/****************************************************************************/
859 * VARIABLES 848
860 *****************************************************************************
861 */
862#ifdef MENUBAR 849#ifdef MENUBAR
863# include "menubar.h" 850# include "menubar.h"
864#endif 851#endif
865 852
866#define BLINK_INTERVAL 0.5 853#define BLINK_INTERVAL 0.5
… …
873# endif 860# endif
874# endif 861# endif
875# define __attribute__(x) 862# define __attribute__(x)
876#endif 863#endif
877 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
878// primivite wrapper around mbstate_t to ensure initialisation 914// primivite wrapper around mbstate_t to ensure initialisation
879struct mbstate { 915struct mbstate {
880 mbstate_t mbs; 916 mbstate_t mbs;
881 917
882 operator mbstate_t *() { return &mbs; } 918 operator mbstate_t *() { return &mbs; }
883 void reset () { memset (&mbs, 0, sizeof (mbs)); } 919 void reset () { memset (&mbs, 0, sizeof (mbs)); }
884 mbstate () { reset (); } 920 mbstate () { reset (); }
885}; 921};
886 922
923/****************************************************************************/
924
887#define UNICODE_MASK 0x1fffffUL 925#define UNICODE_MASK 0x1fffffUL
888 926
889#if UNICODE3 927#if UNICODE3
890# define COMPOSE_LO 0x40000000UL 928# define COMPOSE_LO 0x40000000UL
891# define COMPOSE_HI 0x400fffffUL 929# define COMPOSE_HI 0x400fffffUL
892# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 930# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
893#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
894# define COMPOSE_LO 0xd800UL 936# define COMPOSE_LO 0xd800UL
895# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 937# define COMPOSE_HI 0xf8ffUL
896# 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)
897#endif 940#endif
898 941
899#if ENABLE_COMBINING 942#if ENABLE_COMBINING
900// compose chars are used to represent composite characters 943// compose chars are used to represent composite characters
901// that are not representable in unicode, as well as characters 944// that are not representable in unicode, as well as characters
… …
921}; 964};
922 965
923extern class rxvt_composite_vec rxvt_composite; 966extern class rxvt_composite_vec rxvt_composite;
924#endif 967#endif
925 968
969/****************************************************************************/
926 970
927#ifdef KEYSYM_RESOURCE 971#ifdef KEYSYM_RESOURCE
928 class keyboard_manager; 972 class keyboard_manager;
929#endif 973#endif
930 974
931struct rxvt_term : zero_initialized, rxvt_vars { 975struct rxvt_term : zero_initialized, rxvt_vars {
932 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
933 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 977 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
934 978
935#if ENABLE_PERL 979#if ENABLE_PERL
936 void *self; // perl's $self 980 rxvt_perl_term perl;
937#endif 981#endif
938 982
939 struct mbstate mbstate; // current input multibyte state 983 struct mbstate mbstate; // current input multibyte state
940 984
941 unsigned char want_refresh:1, 985 unsigned char want_refresh:1,
… …
1093 bar_t *CurrentBar; 1137 bar_t *CurrentBar;
1094# if ! (MENUBAR_MAX > 1) 1138# if ! (MENUBAR_MAX > 1)
1095 bar_t BarList; 1139 bar_t BarList;
1096# endif /* (MENUBAR_MAX > 1) */ 1140# endif /* (MENUBAR_MAX > 1) */
1097#endif 1141#endif
1098#ifdef CURSOR_BLINK
1099 struct timeval lastcursorchange;
1100#endif
1101#ifdef POINTER_BLANK
1102 struct timeval lastmotion;
1103#endif
1104 1142
1105#if ENABLE_OVERLAY 1143#if ENABLE_OVERLAY
1106 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1144 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1107 text_t **ov_text; 1145 text_t **ov_text;
1108 rend_t **ov_rend; 1146 rend_t **ov_rend;
… …
1123 char *env_display; /* environmental variable DISPLAY */ 1161 char *env_display; /* environmental variable DISPLAY */
1124 char *env_term; /* environmental variable TERM */ 1162 char *env_term; /* environmental variable TERM */
1125 char *env_colorfgbg; 1163 char *env_colorfgbg;
1126 char *locale; 1164 char *locale;
1127 char charsets[4]; 1165 char charsets[4];
1128 unsigned char *v_buffer; /* pointer to physical buffer */ 1166 char *v_buffer; /* pointer to physical buffer */
1129 unsigned int v_buflen; /* size of area to write */ 1167 unsigned int v_buflen; /* size of area to write */
1130 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1168 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1131 1169
1132#ifdef KEYSYM_RESOURCE 1170#ifdef KEYSYM_RESOURCE
1133 keyboard_manager *keyboard; 1171 keyboard_manager *keyboard;
1134#endif 1172#endif
1135 1173
1136 const char *rs[NUM_RESOURCES]; 1174 const char *rs[NUM_RESOURCES];
1137 /* command input buffering */ 1175 /* command input buffering */
1138 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1176 char *cmdbuf_ptr, *cmdbuf_endp;
1139 unsigned char cmdbuf_base[CBUFSIZ]; 1177 char cmdbuf_base[CBUFSIZ];
1140 1178
1141 rxvt_salloc *talloc; // text line allocator 1179 rxvt_salloc *talloc; // text line allocator
1142 rxvt_salloc *ralloc; // rend line allocator 1180 rxvt_salloc *ralloc; // rend line allocator
1143 1181
1144 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1182 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1153 void iso14755_54 (int x, int y); 1191 void iso14755_54 (int x, int y);
1154# endif 1192# endif
1155#endif 1193#endif
1156 1194
1157 // modifies first argument(!) 1195 // modifies first argument(!)
1158 void paste (unsigned char *data, unsigned int len); 1196 void paste (char *data, unsigned int len);
1159 1197
1160 void flush (); 1198 void flush ();
1161 1199
1162#if TRANSPARENT 1200#if TRANSPARENT
1163 void rootwin_cb (XEvent &xev); 1201 void rootwin_cb (XEvent &xev);
… …
1204 void pointer_blank (); 1242 void pointer_blank ();
1205#endif 1243#endif
1206 void pointer_unblank (); 1244 void pointer_unblank ();
1207 1245
1208 void tt_printf (const char *fmt,...); 1246 void tt_printf (const char *fmt,...);
1209 void tt_write (const unsigned char *data, unsigned int len); 1247 void tt_write (const char *data, unsigned int len);
1210 void pty_write (); 1248 void pty_write ();
1211 1249
1212 void tt_winch (); 1250 void tt_winch ();
1213 1251
1214 rxvt_term (); 1252 rxvt_term ();
… …
1266 1304
1267 /* autoconvert */ 1305 /* autoconvert */
1268 1306
1269 // command.C 1307 // command.C
1270 void lookup_key (XKeyEvent &ev); 1308 void lookup_key (XKeyEvent &ev);
1271 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1309 unsigned int cmd_write (const char *str, unsigned int count);
1272 1310
1273 unicode_t next_char (); 1311 wchar_t next_char ();
1274 unicode_t cmd_getc (); 1312 wchar_t cmd_getc ();
1275 unicode_t next_octet (); 1313 uint32_t next_octet ();
1276 unicode_t cmd_get8 (); 1314 uint32_t cmd_get8 ();
1277 1315
1278 bool cmd_parse (); 1316 bool cmd_parse ();
1279 void mouse_report (XButtonEvent &ev); 1317 void mouse_report (XButtonEvent &ev);
1280 void button_press (XButtonEvent &ev); 1318 void button_press (XButtonEvent &ev);
1281 void button_release (XButtonEvent &ev); 1319 void button_release (XButtonEvent &ev);
… …
1290 void process_nonprinting (unicode_t ch); 1328 void process_nonprinting (unicode_t ch);
1291 void process_escape_vt52 (unicode_t ch); 1329 void process_escape_vt52 (unicode_t ch);
1292 void process_escape_seq (); 1330 void process_escape_seq ();
1293 void process_csi_seq (); 1331 void process_csi_seq ();
1294 void process_window_ops (const int *args, unsigned int nargs); 1332 void process_window_ops (const int *args, unsigned int nargs);
1295 unsigned char *get_to_st (unicode_t &ends_how); 1333 char *get_to_st (unicode_t &ends_how);
1296 void process_dcs_seq (); 1334 void process_dcs_seq ();
1297 void process_osc_seq (); 1335 void process_osc_seq ();
1298 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1336 void process_color_seq (int report, int color, const char *str, char resp);
1299 void process_xterm_seq (int op, const char *str, unsigned char resp); 1337 void process_xterm_seq (int op, const char *str, char resp);
1300 int privcases (int mode, unsigned long bit); 1338 int privcases (int mode, unsigned long bit);
1301 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1339 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1302 void process_sgr_mode (unsigned int nargs, const int *arg); 1340 void process_sgr_mode (unsigned int nargs, const int *arg);
1303 void process_graphics (); 1341 void process_graphics ();
1304 // init.C 1342 // init.C
… …
1408 base += minBrightCOLOR - minCOLOR; 1446 base += minBrightCOLOR - minCOLOR;
1409#endif 1447#endif
1410 return base; 1448 return base;
1411 } 1449 }
1412 1450
1451 bool option (uint32_t opt)
1452 {
1453 return OPTION (opt);
1454 }
1455
1456 void set_option (uint32_t opt, bool set)
1457 {
1458 if (set)
1459 options |= opt;
1460 else
1461 options &= ~opt;
1462 }
1463
1413 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1464 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1414 void scr_blank_screen_mem (line_t &l, rend_t efs); 1465 void scr_blank_screen_mem (line_t &l, rend_t efs);
1415 int scr_scroll_text (int row1, int row2, int count); 1466 int scr_scroll_text (int row1, int row2, int count);
1416 void scr_reset (); 1467 void scr_reset ();
1417 void scr_release (); 1468 void scr_release ();
… …
1427 void scr_touch (bool refresh); 1478 void scr_touch (bool refresh);
1428 void scr_expose (int x, int y, int width, int height, bool refresh); 1479 void scr_expose (int x, int y, int width, int height, bool refresh);
1429 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1480 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1430 void scr_recolour (); 1481 void scr_recolour ();
1431 void scr_remap_chars (); 1482 void scr_remap_chars ();
1432 void scr_remap_chars (const line_t &l); 1483 void scr_remap_chars (line_t &l);
1433 1484
1434 void scr_poweron (); 1485 void scr_poweron ();
1435 void scr_cursor (int mode); 1486 void scr_cursor (int mode);
1436 void scr_do_wrap (); 1487 void scr_do_wrap ();
1437 int scr_change_screen (int scrn); 1488 int scr_change_screen (int scrn);
1438 void scr_color (unsigned int color, int fgbg); 1489 void scr_color (unsigned int color, int fgbg);
1439 void scr_rendition (int set, int style); 1490 void scr_rendition (int set, int style);
1440 void scr_add_lines (const unicode_t *str, int nlines, int len); 1491 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1441 void scr_backspace (); 1492 void scr_backspace ();
1442 void scr_tab (int count, bool ht = false); 1493 void scr_tab (int count, bool ht = false);
1443 void scr_gotorc (int row, int col, int relative); 1494 void scr_gotorc (int row, int col, int relative);
1444 void scr_index (enum page_dirn direction); 1495 void scr_index (enum page_dirn direction);
1445 void scr_erase_line (int mode); 1496 void scr_erase_line (int mode);

Diff Legend

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