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.173 by root, Sat Dec 31 16:40:28 2005 UTC vs.
Revision 1.190 by root, Sat Jan 7 19:29:17 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
70 72
71#ifndef STDIN_FILENO 73#ifndef STDIN_FILENO
72# define STDIN_FILENO 0 74# define STDIN_FILENO 0
73# define STDOUT_FILENO 1 75# define STDOUT_FILENO 1
74# define STDERR_FILENO 2 76# define STDERR_FILENO 2
75#endif
76
77#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
78# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
79# define NO_SETOWNER_TTYDEV 1
80# endif
81#endif
82#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
83# define NO_SETOWNER_TTYDEV 1
84#endif 77#endif
85 78
86/* 79/*
87 ***************************************************************************** 80 *****************************************************************************
88 * PROTOTYPES 81 * PROTOTYPES
222 215
223#ifdef NO_RESOURCES 216#ifdef NO_RESOURCES
224# undef USE_XGETDEFAULT 217# undef USE_XGETDEFAULT
225#endif 218#endif
226 219
227#if ISO_14755 220#if defined (ISO_14755) || defined (ENABLE_PERL)
228# define ENABLE_OVERLAY 1 221# define ENABLE_OVERLAY 1
229#endif 222#endif
230 223
231/* now look for other badly set stuff */ 224/* now look for other badly set stuff */
232 225
247# define HAVE_SCROLLBARS 1 240# define HAVE_SCROLLBARS 1
248#endif 241#endif
249 242
250/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 243/* width of scrollBar, menuBar shadow, must be 1 or 2 */
251#ifdef HALFSHADOW 244#ifdef HALFSHADOW
252# define SHADOW 1 245# define MENU_SHADOW 1
253#else 246#else
254# define SHADOW 2 247# define MENU_SHADOW 2
255#endif 248#endif
256 249
257#define R_SB_ALIGN_CENTRE 0 250#define R_SB_ALIGN_CENTRE 0
258#define R_SB_ALIGN_TOP 1 251#define R_SB_ALIGN_TOP 1
259#define R_SB_ALIGN_BOTTOM 2 252#define R_SB_ALIGN_BOTTOM 2
376enum { 369enum {
377 PRIMARY = 0, 370 PRIMARY = 0,
378 SECONDARY, 371 SECONDARY,
379}; 372};
380 373
381#define RS_None 0 /* Normal */ 374#define RS_None 0
382 375
383#define RS_fgMask 0x0000007fUL /* 128 colors */ 376#define RS_fgMask 0x0000007fUL // 128 colors
384#define RS_bgMask 0x00003f80UL /* 128 colors */ 377#define RS_bgMask 0x00003f80UL // 128 colors
385 378
386// font styles 379// font styles
387#define RS_Bold 0x00004000UL // value 1 380#define RS_Bold 0x00004000UL // value 1
388#define RS_Italic 0x00008000UL // value 2 381#define RS_Italic 0x00008000UL // value 2
389 382
390// fake styles 383// fake styles
391#define RS_Blink 0x00010000UL /* blink */ 384#define RS_Blink 0x00010000UL // blink
392#define RS_RVid 0x00020000UL /* reverse video */ 385#define RS_RVid 0x00020000UL // reverse video
393#define RS_Uline 0x00040000UL /* underline */ 386#define RS_Uline 0x00040000UL // underline
394 387
395// 5 bits still to go 388// 5 custom bits for extensions
389#define RS_customCount 32
390#define RS_customMask 0x00f80000UL
391#define RS_customShift 19
396 392
397// other flags 393// other flags
398#define RS_Careful 0x80000000UL /* be careful when drawing these */ 394#define RS_Careful 0x80000000UL /* be careful when drawing these */
399 395
400#define RS_styleCount 4 396#define RS_styleCount 4
475 URxvt_italicFont = 712, 471 URxvt_italicFont = 712,
476 URxvt_boldItalicFont = 713, 472 URxvt_boldItalicFont = 713,
477 473
478 URxvt_view_up = 720, 474 URxvt_view_up = 720,
479 URxvt_view_down = 721, 475 URxvt_view_down = 721,
476
477 URxvt_perl = 777,
480}; 478};
481 479
482/* Words starting with `Color_' are colours. Others are counts */ 480/* Words starting with `Color_' are colours. Others are counts */
483/* 481/*
484 * The PixColor and rendition colour usage should probably be decoupled 482 * The PixColor and rendition colour usage should probably be decoupled
561 559
562/* 560/*
563 * Resource list 561 * Resource list
564 */ 562 */
565enum { 563enum {
566 Rs_display_name = 0, 564# define def(name) Rs_ ## name,
567 Rs_term_name, 565# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
568 Rs_iconName, 566# include "rsinc.h"
569 Rs_geometry, 567# undef def
570 Rs_reverseVideo, 568# undef reserve
571 Rs_color,
572 _Rs_color = Rs_color + NRS_COLORS - 1,
573 Rs_font,
574#if ENABLE_STYLES
575 Rs_boldFont,
576 Rs_italicFont,
577 Rs_boldItalicFont,
578#endif
579 Rs_name,
580 Rs_title,
581#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
582 Rs_path,
583#endif
584#ifdef XPM_BACKGROUND
585 Rs_backgroundPixmap,
586#endif
587#if (MENUBAR_MAX)
588 Rs_menu,
589#endif
590 Rs_loginShell,
591 Rs_jumpScroll,
592#ifdef HAVE_SCROLLBARS
593 Rs_scrollBar,
594 Rs_scrollBar_right,
595 Rs_scrollBar_floating,
596 Rs_scrollBar_align,
597 Rs_scrollstyle, /* Rs_scrollBar_style */
598 Rs_scrollBar_thickness,
599#endif
600 Rs_scrollTtyOutput,
601 Rs_scrollTtyKeypress,
602 Rs_scrollWithBuffer,
603 Rs_saveLines,
604 Rs_utmpInhibit,
605 Rs_visualBell,
606#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
607 Rs_mapAlert,
608#endif
609#ifdef META8_OPTION
610 Rs_meta8,
611#endif
612#ifdef MOUSE_WHEEL
613 Rs_mouseWheelScrollPage,
614#endif
615#ifndef NO_BACKSPACE_KEY
616 Rs_backspace_key,
617#endif
618#ifndef NO_DELETE_KEY
619 Rs_delete_key,
620#endif
621 Rs_selectstyle,
622#ifdef PRINTPIPE
623 Rs_print_pipe,
624#endif
625#ifdef USE_XIM
626 Rs_preeditType,
627 Rs_inputMethod,
628#endif
629#ifdef TRANSPARENT
630 Rs_transparent,
631 Rs_transparent_all,
632#endif
633#if ENABLE_FRILLS
634 Rs_pty_fd,
635 Rs_hold,
636 Rs_ext_bwidth,
637 Rs_int_bwidth,
638 Rs_borderLess,
639 Rs_lineSpace,
640 Rs_cursorUnderline,
641 Rs_intensityStyles,
642#endif
643#if CURSOR_BLINK
644 Rs_cursorBlink,
645#endif
646#if ENABLE_XEMBED
647 Rs_embed,
648#endif
649 Rs_cutchars,
650 Rs_modifier,
651 Rs_answerbackstring,
652 Rs_tripleclickwords,
653 Rs_insecure,
654 Rs_pointerBlank,
655 Rs_pointerBlankDelay,
656 Rs_imLocale,
657 Rs_imFont,
658 Rs_pastableTabs,
659#ifndef NO_SECONDARY_SCREEN
660 Rs_secondaryScreen,
661 Rs_secondaryScroll,
662#endif
663#ifdef OFF_FOCUS_FADING
664 Rs_fade,
665#endif
666#ifdef TINTING
667 Rs_shade,
668#endif
669 NUM_RESOURCES 569 NUM_RESOURCES
670}; 570};
671 571
672// see init.C:xa_names, which must be kept in sync 572// see init.C:xa_names, which must be kept in sync
673enum { 573enum {
748#endif 648#endif
749 649
750// do not change these constants lightly, there are many interdependencies 650// do not change these constants lightly, there are many interdependencies
751#define IMBUFSIZ 128 // input modifier buffer sizes 651#define IMBUFSIZ 128 // input modifier buffer sizes
752#define KBUFSZ 512 // size of keyboard mapping buffer 652#define KBUFSZ 512 // size of keyboard mapping buffer
753#define CBUFSIZ 4096 // size of command buffer 653#define CBUFSIZ 2048 // size of command buffer
754#define UBUFSIZ 4096 // character buffer 654#define UBUFSIZ 2048 // character buffer
755 655
756#ifndef PATH_MAX 656#ifndef PATH_MAX
757# define PATH_MAX 16384 657# define PATH_MAX 16384
758#endif 658#endif
759 659
787/* 687/*
788 ***************************************************************************** 688 *****************************************************************************
789 * MACRO DEFINES 689 * MACRO DEFINES
790 ***************************************************************************** 690 *****************************************************************************
791 */ 691 */
792#define memset(x, y, z) memset((x), (y), (size_t)(z))
793#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
794#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
795#define strcasecmp(x, y) strcasecmp((x), (y))
796#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
797#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
798#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
799#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
800#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
801#define strcat(x, y) strcat((char *)(x), (const char *)(y))
802#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
803#define strdup(x) strdup((const char *)(x))
804#define strlen(x) strlen((const char *)(x))
805#define strchr(x, y) strchr((const char *)(x), (int)(y))
806#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
807
808#define dDisp Display *disp = display->display 692#define dDisp Display *disp = display->display
809 693
810/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
811#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
812#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
815#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 699#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
816#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 700#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
819 703
820#define TermWin_TotalWidth() ((int32_t)this->width)
821#define TermWin_TotalHeight() ((int32_t)this->height)
822
823// for m >= -n, ensure remainder lies between 0..n-1 704// for m >= -n, ensure remainder lies between 0..n-1
824#define MOD(m,n) (((m) + (n)) % (n)) 705#define MOD(m,n) (((m) + (n)) % (n))
825 706
826#define LINENO(n) MOD (term_start + int(n), total_rows) 707#define LINENO(n) MOD (term_start + int(n), total_rows)
827#define ROW(n) row_buf [LINENO (n)] 708#define ROW(n) row_buf [LINENO (n)]
886#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 767#define scrollbar_size() (scrollBar.end - scrollBar.beg \
887 - scrollbar_minheight ()) 768 - scrollbar_minheight ())
888 769
889#if (MENUBAR_MAX > 1) 770#if (MENUBAR_MAX > 1)
890/* rendition style flags */ 771/* rendition style flags */
891# define menuBar_height() (fheight + SHADOW) 772# define menuBar_height() (fheight + MENU_SHADOW)
892# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 773# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
893# define isMenuBarWindow(w) ((w) == menuBar.win) 774# define isMenuBarWindow(w) ((w) == menuBar.win)
894#else 775#else
895# define menuBar_height() (0) 776# define menuBar_height() (0)
896# define menuBar_TotalHeight() (0) 777# define menuBar_TotalHeight() (0)
897# define isMenuBarWindow(w) (0) 778# define isMenuBarWindow(w) (0)
953extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 834extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
954extern void rxvt_exit_failure () __attribute__ ((noreturn)); 835extern void rxvt_exit_failure () __attribute__ ((noreturn));
955 836
956#define SET_LOCALE(locale) rxvt_set_locale (locale) 837#define SET_LOCALE(locale) rxvt_set_locale (locale)
957extern bool rxvt_set_locale (const char *locale); 838extern bool rxvt_set_locale (const char *locale);
839extern bool rxvt_push_locale (const char *locale);
840extern void rxvt_pop_locale ();
958 841
959/*
960 ***************************************************************************** 842/****************************************************************************/
961 * VARIABLES 843
962 *****************************************************************************
963 */
964#ifdef MENUBAR 844#ifdef MENUBAR
965# include "menubar.h" 845# include "menubar.h"
966#endif 846#endif
967 847
968#define BLINK_INTERVAL 0.5 848#define BLINK_INTERVAL 0.5
975# endif 855# endif
976# endif 856# endif
977# define __attribute__(x) 857# define __attribute__(x)
978#endif 858#endif
979 859
860/****************************************************************************/
861
862#define LINE_LONGER 0x0001 // line is continued on the next row
863#define LINE_FILTERED 0x0002 // line has been filtered
864#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
865
866struct line_t {
867 text_t *t; // terminal the text
868 rend_t *r; // rendition, uses RS_ flags
869 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
870 uint32_t f; // flags
871
872 bool is_longer ()
873 {
874 return f & LINE_LONGER;
875 }
876
877 void is_longer (int set)
878 {
879 if (set)
880 f |= LINE_LONGER;
881 else
882 f &= ~LINE_LONGER;
883 }
884
885 void clear ()
886 {
887 t = 0;
888 r = 0;
889 l = 0;
890 f = 0;
891 }
892
893 void touch () // call whenever a line is changed/touched/updated
894 {
895#if ENABLE_PERL
896 f &= ~LINE_FILTERED;
897#endif
898 }
899
900 void touch (int col)
901 {
902 max_it (l, col);
903 touch ();
904 }
905};
906
907/****************************************************************************/
908
980// primivite wrapper around mbstate_t to ensure initialisation 909// primivite wrapper around mbstate_t to ensure initialisation
981struct mbstate { 910struct mbstate {
982 mbstate_t mbs; 911 mbstate_t mbs;
983 912
984 operator mbstate_t *() { return &mbs; } 913 operator mbstate_t *() { return &mbs; }
985 void reset () { memset (&mbs, 0, sizeof (mbs)); } 914 void reset () { memset (&mbs, 0, sizeof (mbs)); }
986 mbstate () { reset (); } 915 mbstate () { reset (); }
987}; 916};
988 917
918/****************************************************************************/
919
989#define UNICODE_MASK 0x1fffffUL 920#define UNICODE_MASK 0x1fffffUL
990 921
991#if UNICODE3 922#if UNICODE3
992# define COMPOSE_LO 0x40000000UL 923# define COMPOSE_LO 0x40000000UL
993# define COMPOSE_HI 0x400fffffUL 924# define COMPOSE_HI 0x400fffffUL
994# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 925# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
995#else 926#else
927# if ENABLE_PERL
928# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
929# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
930# else
996# define COMPOSE_LO 0xd800UL 931# define COMPOSE_LO 0xd800UL
997# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 932# define COMPOSE_HI 0xf8ffUL
998# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 933# endif
934# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
999#endif 935#endif
1000 936
1001#if ENABLE_COMBINING 937#if ENABLE_COMBINING
1002// compose chars are used to represent composite characters 938// compose chars are used to represent composite characters
1003// that are not representable in unicode, as well as characters 939// that are not representable in unicode, as well as characters
1023}; 959};
1024 960
1025extern class rxvt_composite_vec rxvt_composite; 961extern class rxvt_composite_vec rxvt_composite;
1026#endif 962#endif
1027 963
964/****************************************************************************/
1028 965
1029#ifdef KEYSYM_RESOURCE 966#ifdef KEYSYM_RESOURCE
1030 class keyboard_manager; 967 class keyboard_manager;
1031#endif 968#endif
1032 969
1033struct rxvt_term : zero_initialized, rxvt_vars { 970struct rxvt_term : zero_initialized, rxvt_vars {
1034 log_callback *log_hook; // log error messages through this hook, if != 0 971 log_callback *log_hook; // log error messages through this hook, if != 0
1035 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 972 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
973
974#if ENABLE_PERL
975 rxvt_perl_term perl;
976#endif
1036 977
1037 struct mbstate mbstate; // current input multibyte state 978 struct mbstate mbstate; // current input multibyte state
1038 979
1039 unsigned char want_refresh:1, 980 unsigned char want_refresh:1,
1040#ifdef TRANSPARENT 981#ifdef TRANSPARENT
1191 bar_t *CurrentBar; 1132 bar_t *CurrentBar;
1192# if ! (MENUBAR_MAX > 1) 1133# if ! (MENUBAR_MAX > 1)
1193 bar_t BarList; 1134 bar_t BarList;
1194# endif /* (MENUBAR_MAX > 1) */ 1135# endif /* (MENUBAR_MAX > 1) */
1195#endif 1136#endif
1196#ifdef CURSOR_BLINK
1197 struct timeval lastcursorchange;
1198#endif
1199#ifdef POINTER_BLANK
1200 struct timeval lastmotion;
1201#endif
1202 1137
1203#if ENABLE_OVERLAY 1138#if ENABLE_OVERLAY
1204 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1139 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1205 text_t **ov_text; 1140 text_t **ov_text;
1206 rend_t **ov_rend; 1141 rend_t **ov_rend;
1221 char *env_display; /* environmental variable DISPLAY */ 1156 char *env_display; /* environmental variable DISPLAY */
1222 char *env_term; /* environmental variable TERM */ 1157 char *env_term; /* environmental variable TERM */
1223 char *env_colorfgbg; 1158 char *env_colorfgbg;
1224 char *locale; 1159 char *locale;
1225 char charsets[4]; 1160 char charsets[4];
1226 unsigned char *v_buffer; /* pointer to physical buffer */ 1161 char *v_buffer; /* pointer to physical buffer */
1227 unsigned int v_buflen; /* size of area to write */ 1162 unsigned int v_buflen; /* size of area to write */
1228 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1163 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1229 1164
1230#ifdef KEYSYM_RESOURCE 1165#ifdef KEYSYM_RESOURCE
1231 keyboard_manager *keyboard; 1166 keyboard_manager *keyboard;
1232#endif 1167#endif
1233 1168
1234 const char *rs[NUM_RESOURCES]; 1169 const char *rs[NUM_RESOURCES];
1235 /* command input buffering */ 1170 /* command input buffering */
1236 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1171 char *cmdbuf_ptr, *cmdbuf_endp;
1237 unsigned char cmdbuf_base[CBUFSIZ]; 1172 char cmdbuf_base[CBUFSIZ];
1238 1173
1239 rxvt_salloc *talloc; // text line allocator 1174 rxvt_salloc *talloc; // text line allocator
1240 rxvt_salloc *ralloc; // rend line allocator 1175 rxvt_salloc *ralloc; // rend line allocator
1241 1176
1242 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1177 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1251 void iso14755_54 (int x, int y); 1186 void iso14755_54 (int x, int y);
1252# endif 1187# endif
1253#endif 1188#endif
1254 1189
1255 // modifies first argument(!) 1190 // modifies first argument(!)
1256 void paste (unsigned char *data, unsigned int len); 1191 void paste (char *data, unsigned int len);
1257 1192
1258 void flush (); 1193 void flush ();
1259 1194
1260#if TRANSPARENT 1195#if TRANSPARENT
1261 void rootwin_cb (XEvent &xev); 1196 void rootwin_cb (XEvent &xev);
1302 void pointer_blank (); 1237 void pointer_blank ();
1303#endif 1238#endif
1304 void pointer_unblank (); 1239 void pointer_unblank ();
1305 1240
1306 void tt_printf (const char *fmt,...); 1241 void tt_printf (const char *fmt,...);
1307 void tt_write (const unsigned char *data, unsigned int len); 1242 void tt_write (const char *data, unsigned int len);
1308 void pty_write (); 1243 void pty_write ();
1309 1244
1310 void tt_winch (); 1245 void tt_winch ();
1311 1246
1312 rxvt_term (); 1247 rxvt_term ();
1364 1299
1365 /* autoconvert */ 1300 /* autoconvert */
1366 1301
1367 // command.C 1302 // command.C
1368 void lookup_key (XKeyEvent &ev); 1303 void lookup_key (XKeyEvent &ev);
1369 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1304 unsigned int cmd_write (const char *str, unsigned int count);
1370 1305
1371 unicode_t next_char (); 1306 wchar_t next_char ();
1372 unicode_t cmd_getc (); 1307 wchar_t cmd_getc ();
1373 unicode_t next_octet (); 1308 uint32_t next_octet ();
1374 unicode_t cmd_get8 (); 1309 uint32_t cmd_get8 ();
1375 1310
1376 bool cmd_parse (); 1311 bool cmd_parse ();
1377 void mouse_report (XButtonEvent &ev); 1312 void mouse_report (XButtonEvent &ev);
1378 void button_press (XButtonEvent &ev); 1313 void button_press (XButtonEvent &ev);
1379 void button_release (XButtonEvent &ev); 1314 void button_release (XButtonEvent &ev);
1388 void process_nonprinting (unicode_t ch); 1323 void process_nonprinting (unicode_t ch);
1389 void process_escape_vt52 (unicode_t ch); 1324 void process_escape_vt52 (unicode_t ch);
1390 void process_escape_seq (); 1325 void process_escape_seq ();
1391 void process_csi_seq (); 1326 void process_csi_seq ();
1392 void process_window_ops (const int *args, unsigned int nargs); 1327 void process_window_ops (const int *args, unsigned int nargs);
1393 unsigned char *get_to_st (unicode_t &ends_how); 1328 char *get_to_st (unicode_t &ends_how);
1394 void process_dcs_seq (); 1329 void process_dcs_seq ();
1395 void process_osc_seq (); 1330 void process_osc_seq ();
1396 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1331 void process_color_seq (int report, int color, const char *str, char resp);
1397 void process_xterm_seq (int op, const char *str, unsigned char resp); 1332 void process_xterm_seq (int op, const char *str, char resp);
1398 int privcases (int mode, unsigned long bit); 1333 int privcases (int mode, unsigned long bit);
1399 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1334 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1400 void process_sgr_mode (unsigned int nargs, const int *arg); 1335 void process_sgr_mode (unsigned int nargs, const int *arg);
1401 void process_graphics (); 1336 void process_graphics ();
1402 // init.C 1337 // init.C
1483 int fgcolor_of (rend_t r) 1418 int fgcolor_of (rend_t r)
1484 { 1419 {
1485 int base = GET_BASEFG (r); 1420 int base = GET_BASEFG (r);
1486#ifndef NO_BRIGHTCOLOR 1421#ifndef NO_BRIGHTCOLOR
1487 if (r & RS_Bold 1422 if (r & RS_Bold
1488 && (!ENABLE_STYLES || options & Opt_intensityStyles) 1423# if ENABLE_STYLES
1424 && OPTION (Opt_intensityStyles)
1425# endif
1489 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1426 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1490 base += minBrightCOLOR - minCOLOR; 1427 base += minBrightCOLOR - minCOLOR;
1491#endif 1428#endif
1492 return base; 1429 return base;
1493 } 1430 }
1495 int bgcolor_of (rend_t r) 1432 int bgcolor_of (rend_t r)
1496 { 1433 {
1497 int base = GET_BASEBG (r); 1434 int base = GET_BASEBG (r);
1498#ifndef NO_BRIGHTCOLOR 1435#ifndef NO_BRIGHTCOLOR
1499 if (r & RS_Blink 1436 if (r & RS_Blink
1500 && (!ENABLE_STYLES || options & Opt_intensityStyles) 1437# if ENABLE_STYLES
1438 && OPTION (Opt_intensityStyles)
1439# endif
1501 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1440 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1502 base += minBrightCOLOR - minCOLOR; 1441 base += minBrightCOLOR - minCOLOR;
1503#endif 1442#endif
1504 return base; 1443 return base;
1505 } 1444 }
1521 void scr_touch (bool refresh); 1460 void scr_touch (bool refresh);
1522 void scr_expose (int x, int y, int width, int height, bool refresh); 1461 void scr_expose (int x, int y, int width, int height, bool refresh);
1523 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1462 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1524 void scr_recolour (); 1463 void scr_recolour ();
1525 void scr_remap_chars (); 1464 void scr_remap_chars ();
1526 void scr_remap_chars (const line_t &l); 1465 void scr_remap_chars (line_t &l);
1527 1466
1528 void scr_poweron (); 1467 void scr_poweron ();
1529 void scr_cursor (int mode); 1468 void scr_cursor (int mode);
1530 void scr_do_wrap (); 1469 void scr_do_wrap ();
1531 int scr_change_screen (int scrn); 1470 int scr_change_screen (int scrn);
1532 void scr_color (unsigned int color, int fgbg); 1471 void scr_color (unsigned int color, int fgbg);
1533 void scr_rendition (int set, int style); 1472 void scr_rendition (int set, int style);
1534 void scr_add_lines (const unicode_t *str, int nlines, int len); 1473 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1535 void scr_backspace (); 1474 void scr_backspace ();
1536 void scr_tab (int count, bool ht = false); 1475 void scr_tab (int count, bool ht = false);
1537 void scr_gotorc (int row, int col, int relative); 1476 void scr_gotorc (int row, int col, int relative);
1538 void scr_index (enum page_dirn direction); 1477 void scr_index (enum page_dirn direction);
1539 void scr_erase_line (int mode); 1478 void scr_erase_line (int mode);
1563 void selection_property (Window win, Atom prop); 1502 void selection_property (Window win, Atom prop);
1564 void selection_request (Time tm, int x, int y); 1503 void selection_request (Time tm, int x, int y);
1565 int selection_request_other (Atom target, int selnum); 1504 int selection_request_other (Atom target, int selnum);
1566 void selection_clear (); 1505 void selection_clear ();
1567 void selection_make (Time tm); 1506 void selection_make (Time tm);
1507 bool selection_grab (Time tm);
1568 void selection_start_colrow (int col, int row); 1508 void selection_start_colrow (int col, int row);
1569 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1509 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1570 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1510 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1571 void selection_remove_trailing_spaces (); 1511 void selection_remove_trailing_spaces ();
1572 void selection_send (const XSelectionRequestEvent &rq); 1512 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines