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.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
… …
697#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 699#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
698#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 700#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
699#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
700#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
701 703
704#define OPTION(opt) (options & (opt))
705#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
706 | Opt_jumpScroll | Opt_secondaryScreen \
707 | Opt_pastableTabs | Opt_intensityStyles)
708
702// for m >= -n, ensure remainder lies between 0..n-1 709// for m >= -n, ensure remainder lies between 0..n-1
703#define MOD(m,n) (((m) + (n)) % (n)) 710#define MOD(m,n) (((m) + (n)) % (n))
704 711
705#define LINENO(n) MOD (term_start + int(n), total_rows) 712#define LINENO(n) MOD (term_start + int(n), total_rows)
706#define ROW(n) row_buf [LINENO (n)] 713#define ROW(n) row_buf [LINENO (n)]
… …
835#define SET_LOCALE(locale) rxvt_set_locale (locale) 842#define SET_LOCALE(locale) rxvt_set_locale (locale)
836extern bool rxvt_set_locale (const char *locale); 843extern bool rxvt_set_locale (const char *locale);
837extern bool rxvt_push_locale (const char *locale); 844extern bool rxvt_push_locale (const char *locale);
838extern void rxvt_pop_locale (); 845extern void rxvt_pop_locale ();
839 846
840/*
841 ***************************************************************************** 847/****************************************************************************/
842 * VARIABLES 848
843 *****************************************************************************
844 */
845#ifdef MENUBAR 849#ifdef MENUBAR
846# include "menubar.h" 850# include "menubar.h"
847#endif 851#endif
848 852
849#define BLINK_INTERVAL 0.5 853#define BLINK_INTERVAL 0.5
… …
856# endif 860# endif
857# endif 861# endif
858# define __attribute__(x) 862# define __attribute__(x)
859#endif 863#endif
860 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
861// primivite wrapper around mbstate_t to ensure initialisation 914// primivite wrapper around mbstate_t to ensure initialisation
862struct mbstate { 915struct mbstate {
863 mbstate_t mbs; 916 mbstate_t mbs;
864 917
865 operator mbstate_t *() { return &mbs; } 918 operator mbstate_t *() { return &mbs; }
866 void reset () { memset (&mbs, 0, sizeof (mbs)); } 919 void reset () { memset (&mbs, 0, sizeof (mbs)); }
867 mbstate () { reset (); } 920 mbstate () { reset (); }
868}; 921};
869 922
923/****************************************************************************/
924
870#define UNICODE_MASK 0x1fffffUL 925#define UNICODE_MASK 0x1fffffUL
871 926
872#if UNICODE3 927#if UNICODE3
873# define COMPOSE_LO 0x40000000UL 928# define COMPOSE_LO 0x40000000UL
874# define COMPOSE_HI 0x400fffffUL 929# define COMPOSE_HI 0x400fffffUL
875# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 930# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
876#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
877# define COMPOSE_LO 0xd800UL 936# define COMPOSE_LO 0xd800UL
878# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 937# define COMPOSE_HI 0xf8ffUL
879# 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)
880#endif 940#endif
881 941
882#if ENABLE_COMBINING 942#if ENABLE_COMBINING
883// compose chars are used to represent composite characters 943// compose chars are used to represent composite characters
884// that are not representable in unicode, as well as characters 944// that are not representable in unicode, as well as characters
… …
904}; 964};
905 965
906extern class rxvt_composite_vec rxvt_composite; 966extern class rxvt_composite_vec rxvt_composite;
907#endif 967#endif
908 968
969/****************************************************************************/
909 970
910#ifdef KEYSYM_RESOURCE 971#ifdef KEYSYM_RESOURCE
911 class keyboard_manager; 972 class keyboard_manager;
912#endif 973#endif
913 974
914struct rxvt_term : zero_initialized, rxvt_vars { 975struct rxvt_term : zero_initialized, rxvt_vars {
915 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
916 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 977 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
917 978
918#if ENABLE_PERL 979#if ENABLE_PERL
919 void *self; // perl's $self 980 rxvt_perl_term perl;
920#endif 981#endif
921 982
922 struct mbstate mbstate; // current input multibyte state 983 struct mbstate mbstate; // current input multibyte state
923 984
924 unsigned char want_refresh:1, 985 unsigned char want_refresh:1,
… …
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);

Diff Legend

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