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.186 by root, Wed Jan 4 04:42:45 2006 UTC vs.
Revision 1.197 by root, Wed Jan 11 05:29:40 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
… …
207# define TERMENV "rxvt-unicode" 209# define TERMENV "rxvt-unicode"
208#endif 210#endif
209 211
210#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
211# define NO_MOUSE_REPORT_SCROLLBAR 1 213# define NO_MOUSE_REPORT_SCROLLBAR 1
212#endif
213
214#ifdef NO_RESOURCES
215# undef USE_XGETDEFAULT
216#endif 214#endif
217 215
218#if defined (ISO_14755) || defined (ENABLE_PERL) 216#if defined (ISO_14755) || defined (ENABLE_PERL)
219# define ENABLE_OVERLAY 1 217# define ENABLE_OVERLAY 1
220#endif 218#endif
… …
436 XTerm_property = 3, // change X property 434 XTerm_property = 3, // change X property
437 XTerm_Color = 4, // change colors 435 XTerm_Color = 4, // change colors
438 XTerm_Color00 = 10, // not implemented, CLASH! 436 XTerm_Color00 = 10, // not implemented, CLASH!
439 XTerm_Color01 = 11, // not implemented 437 XTerm_Color01 = 11, // not implemented
440 XTerm_Color_cursor = 12, // change actual 'Cursor' color 438 XTerm_Color_cursor = 12, // change actual 'Cursor' color
441 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 439 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
442 XTerm_Color_pointer_bg = 14, // not implemented 440 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
443 XTerm_Color05 = 15, // not implemented 441 XTerm_Color05 = 15, // not implemented (tektronix fg)
444 XTerm_Color06 = 16, // not implemented 442 XTerm_Color06 = 16, // not implemented (tektronix bg)
445 XTerm_Color_RV = 17, // change actual 'Highlight' color 443 XTerm_Color_RV = 17, // change actual 'Highlight' color
446 XTerm_logfile = 46, // not implemented 444 XTerm_logfile = 46, // not implemented
447 XTerm_font = 50, 445 XTerm_font = 50,
448 446
449 XTerm_konsole30 = 30, // reserved for konsole 447 XTerm_konsole30 = 30, // reserved for konsole
450 XTerm_konsole31 = 31, // reserved for konsole 448 XTerm_konsole31 = 31, // reserved for konsole
451 XTerm_emacs51 = 51, // reserved for emacs shell 449 XTerm_emacs51 = 51, // reserved for emacs shell
452 /* 450 /*
453 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 451 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
452 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
454 */ 453 */
455 XTerm_Color_BD = 18, // change actual 'Bold' color 454 Rxvt_Color_BD = 18, // change actual 'Bold' color
456 XTerm_Color_UL = 19, // change actual 'Underline' color 455 Rxvt_Color_UL = 19, // change actual 'Underline' color
457 XTerm_Pixmap = 20, // new bg pixmap 456 Rxvt_Pixmap = 20, // new bg pixmap
458 XTerm_restoreFG = 39, // change default fg color 457 Rxvt_restoreFG = 39, // change default fg color
459 XTerm_restoreBG = 49, // change default bg color 458 Rxvt_restoreBG = 49, // change default bg color
460 XTerm_dumpscreen = 55, // dump scrollback and all of screen 459 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
461 460
462 URxvt_locale = 701, // change locale 461 URxvt_locale = 701, // change locale
463 URxvt_Menu = 703, // set menu item 462 URxvt_Menu = 703, // set menu item
464 URxvt_Color_IT = 704, // change actual 'Italic' colour 463 URxvt_Color_IT = 704, // change actual 'Italic' colour
465 URxvt_Color_tint = 705, // change actual tint colour 464 URxvt_Color_tint = 705, // change actual tint colour
465 URxvt_Color_BD = 706,
466 URxvt_Color_UL = 707,
466 467
467 URxvt_font = 710, 468 URxvt_font = 710,
468 URxvt_boldFont = 711, 469 URxvt_boldFont = 711,
469 URxvt_italicFont = 712, 470 URxvt_italicFont = 712,
470 URxvt_boldItalicFont = 713, 471 URxvt_boldItalicFont = 713,
… …
697#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 698#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
698#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 699#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
699#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 700#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
700#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 701#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
701 702
703#define TEMP_ENV temp_environ temp_environ (envv)
704
705#define OPTION(opt) (options & (opt))
706#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
707 | Opt_jumpScroll | Opt_secondaryScreen \
708 | Opt_pastableTabs | Opt_intensityStyles)
709
702// for m >= -n, ensure remainder lies between 0..n-1 710// for m >= -n, ensure remainder lies between 0..n-1
703#define MOD(m,n) (((m) + (n)) % (n)) 711#define MOD(m,n) (((m) + (n)) % (n))
704 712
705#define LINENO(n) MOD (term_start + int(n), total_rows) 713#define LINENO(n) MOD (term_start + int(n), total_rows)
706#define ROW(n) row_buf [LINENO (n)] 714#define ROW(n) row_buf [LINENO (n)]
… …
832extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 840extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
833extern void rxvt_exit_failure () __attribute__ ((noreturn)); 841extern void rxvt_exit_failure () __attribute__ ((noreturn));
834 842
835#define SET_LOCALE(locale) rxvt_set_locale (locale) 843#define SET_LOCALE(locale) rxvt_set_locale (locale)
836extern bool rxvt_set_locale (const char *locale); 844extern bool rxvt_set_locale (const char *locale);
837extern bool rxvt_push_locale (const char *locale); 845extern void rxvt_push_locale (const char *locale);
838extern void rxvt_pop_locale (); 846extern void rxvt_pop_locale ();
839 847
840/*
841 ***************************************************************************** 848/****************************************************************************/
842 * VARIABLES 849
843 *****************************************************************************
844 */
845#ifdef MENUBAR 850#ifdef MENUBAR
846# include "menubar.h" 851# include "menubar.h"
847#endif 852#endif
848 853
849#define BLINK_INTERVAL 0.5 854#define BLINK_INTERVAL 0.5
… …
856# endif 861# endif
857# endif 862# endif
858# define __attribute__(x) 863# define __attribute__(x)
859#endif 864#endif
860 865
866/****************************************************************************/
867
868#define LINE_LONGER 0x0001 // line is continued on the next row
869#define LINE_FILTERED 0x0002 // line has been filtered
870#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
871
872struct line_t {
873 text_t *t; // terminal the text
874 rend_t *r; // rendition, uses RS_ flags
875 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
876 uint32_t f; // flags
877
878 bool is_longer ()
879 {
880 return f & LINE_LONGER;
881 }
882
883 void is_longer (int set)
884 {
885 if (set)
886 f |= LINE_LONGER;
887 else
888 f &= ~LINE_LONGER;
889 }
890
891 void clear ()
892 {
893 t = 0;
894 r = 0;
895 l = 0;
896 f = 0;
897 }
898
899 void touch () // call whenever a line is changed/touched/updated
900 {
901#if ENABLE_PERL
902 f &= ~LINE_FILTERED;
903#endif
904 }
905
906 void touch (int col)
907 {
908 max_it (l, col);
909 touch ();
910 }
911};
912
913/****************************************************************************/
914
861// primivite wrapper around mbstate_t to ensure initialisation 915// primivite wrapper around mbstate_t to ensure initialisation
862struct mbstate { 916struct mbstate {
863 mbstate_t mbs; 917 mbstate_t mbs;
864 918
865 operator mbstate_t *() { return &mbs; } 919 operator mbstate_t *() { return &mbs; }
866 void reset () { memset (&mbs, 0, sizeof (mbs)); } 920 void reset () { memset (&mbs, 0, sizeof (mbs)); }
867 mbstate () { reset (); } 921 mbstate () { reset (); }
868}; 922};
869 923
924/****************************************************************************/
925
870#define UNICODE_MASK 0x1fffffUL 926#define UNICODE_MASK 0x1fffffUL
871 927
872#if UNICODE3 928#if UNICODE3
873# define COMPOSE_LO 0x40000000UL 929# define COMPOSE_LO 0x40000000UL
874# define COMPOSE_HI 0x400fffffUL 930# define COMPOSE_HI 0x400fffffUL
875# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 931# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
876#else 932#else
933# if ENABLE_PERL
934# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
935# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
936# else
877# define COMPOSE_LO 0xd800UL 937# define COMPOSE_LO 0xd800UL
878# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 938# define COMPOSE_HI 0xf8ffUL
879# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 939# endif
940# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
880#endif 941#endif
881 942
882#if ENABLE_COMBINING 943#if ENABLE_COMBINING
883// compose chars are used to represent composite characters 944// compose chars are used to represent composite characters
884// that are not representable in unicode, as well as characters 945// that are not representable in unicode, as well as characters
… …
904}; 965};
905 966
906extern class rxvt_composite_vec rxvt_composite; 967extern class rxvt_composite_vec rxvt_composite;
907#endif 968#endif
908 969
970/****************************************************************************/
909 971
910#ifdef KEYSYM_RESOURCE 972#ifdef KEYSYM_RESOURCE
911 class keyboard_manager; 973 class keyboard_manager;
912#endif 974#endif
913 975
914struct rxvt_term : zero_initialized, rxvt_vars { 976struct rxvt_term : zero_initialized, rxvt_vars {
915 log_callback *log_hook; // log error messages through this hook, if != 0 977 log_callback *log_hook; // log error messages through this hook, if != 0
916 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 978 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
917
918#if ENABLE_PERL 979#if ENABLE_PERL
919 void *self; // perl's $self 980 rxvt_perl_term perl;
920#endif 981#endif
921
922 struct mbstate mbstate; // current input multibyte state 982 struct mbstate mbstate; // current input multibyte state
923 983
924 unsigned char want_refresh:1, 984 unsigned char want_refresh:1,
925#ifdef TRANSPARENT 985#ifdef TRANSPARENT
926 want_full_refresh:1, /* awaiting full screen refresh */ 986 want_full_refresh:1, /* awaiting full screen refresh */
… …
1199 1259
1200 bool pty_fill (); 1260 bool pty_fill ();
1201 1261
1202 void init_secondary (); 1262 void init_secondary ();
1203 const char **init_resources (int argc, const char *const *argv); 1263 const char **init_resources (int argc, const char *const *argv);
1264 const char *x_resource (const char *name);
1204 void init_env (); 1265 void init_env ();
1205 void set_locale (const char *locale); 1266 void set_locale (const char *locale);
1206 void init_xlocale (); 1267 void init_xlocale ();
1207 void init_command (const char *const *argv); 1268 void init_command (const char *const *argv);
1208 void run_command (const char *const *argv); 1269 void run_command (const char *const *argv);
… …
1245 1306
1246 // command.C 1307 // command.C
1247 void lookup_key (XKeyEvent &ev); 1308 void lookup_key (XKeyEvent &ev);
1248 unsigned int cmd_write (const char *str, unsigned int count); 1309 unsigned int cmd_write (const char *str, unsigned int count);
1249 1310
1250 unicode_t next_char (); 1311 wchar_t next_char ();
1251 unicode_t cmd_getc (); 1312 wchar_t cmd_getc ();
1252 unicode_t next_octet (); 1313 uint32_t next_octet ();
1253 unicode_t cmd_get8 (); 1314 uint32_t cmd_get8 ();
1254 1315
1255 bool cmd_parse (); 1316 bool cmd_parse ();
1256 void mouse_report (XButtonEvent &ev); 1317 void mouse_report (XButtonEvent &ev);
1257 void button_press (XButtonEvent &ev); 1318 void button_press (XButtonEvent &ev);
1258 void button_release (XButtonEvent &ev); 1319 void button_release (XButtonEvent &ev);
… …
1385 base += minBrightCOLOR - minCOLOR; 1446 base += minBrightCOLOR - minCOLOR;
1386#endif 1447#endif
1387 return base; 1448 return base;
1388 } 1449 }
1389 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
1390 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);
1391 void scr_blank_screen_mem (line_t &l, rend_t efs); 1465 void scr_blank_screen_mem (line_t &l, rend_t efs);
1392 int scr_scroll_text (int row1, int row2, int count); 1466 int scr_scroll_text (int row1, int row2, int count);
1393 void scr_reset (); 1467 void scr_reset ();
1394 void scr_release (); 1468 void scr_release ();
… …
1404 void scr_touch (bool refresh); 1478 void scr_touch (bool refresh);
1405 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);
1406 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1480 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1407 void scr_recolour (); 1481 void scr_recolour ();
1408 void scr_remap_chars (); 1482 void scr_remap_chars ();
1409 void scr_remap_chars (const line_t &l); 1483 void scr_remap_chars (line_t &l);
1410 1484
1411 void scr_poweron (); 1485 void scr_poweron ();
1412 void scr_cursor (int mode); 1486 void scr_cursor (int mode);
1413 void scr_do_wrap (); 1487 void scr_do_wrap ();
1414 int scr_change_screen (int scrn); 1488 int scr_change_screen (int scrn);
1415 void scr_color (unsigned int color, int fgbg); 1489 void scr_color (unsigned int color, int fgbg);
1416 void scr_rendition (int set, int style); 1490 void scr_rendition (int set, int style);
1417 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);
1418 void scr_backspace (); 1492 void scr_backspace ();
1419 void scr_tab (int count, bool ht = false); 1493 void scr_tab (int count, bool ht = false);
1420 void scr_gotorc (int row, int col, int relative); 1494 void scr_gotorc (int row, int col, int relative);
1421 void scr_index (enum page_dirn direction); 1495 void scr_index (enum page_dirn direction);
1422 void scr_erase_line (int mode); 1496 void scr_erase_line (int mode);
… …
1437 int scr_move_to (int y, int len); 1511 int scr_move_to (int y, int len);
1438 int scr_page (enum page_dirn direction, int nlines); 1512 int scr_page (enum page_dirn direction, int nlines);
1439 int scr_changeview (unsigned int oldviewstart); 1513 int scr_changeview (unsigned int oldviewstart);
1440 void scr_bell (); 1514 void scr_bell ();
1441 void scr_printscreen (int fullhist); 1515 void scr_printscreen (int fullhist);
1516 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1517 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1442 void scr_reverse_selection (); 1518 void scr_reverse_selection ();
1443 void scr_dump (int fd); 1519 void scr_dump (int fd);
1444 void selection_check (int check_more); 1520 void selection_check (int check_more);
1445 void selection_paste (Window win, Atom prop, bool delete_prop); 1521 void selection_paste (Window win, Atom prop, bool delete_prop);
1446 void selection_property (Window win, Atom prop); 1522 void selection_property (Window win, Atom prop);

Diff Legend

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