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.174 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.188 by root, Fri Jan 6 18:33:30 2006 UTC

… …
70 70
71#ifndef STDIN_FILENO 71#ifndef STDIN_FILENO
72# define STDIN_FILENO 0 72# define STDIN_FILENO 0
73# define STDOUT_FILENO 1 73# define STDOUT_FILENO 1
74# define STDERR_FILENO 2 74# 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 75#endif
85 76
86/* 77/*
87 ***************************************************************************** 78 *****************************************************************************
88 * PROTOTYPES 79 * PROTOTYPES
… …
222 213
223#ifdef NO_RESOURCES 214#ifdef NO_RESOURCES
224# undef USE_XGETDEFAULT 215# undef USE_XGETDEFAULT
225#endif 216#endif
226 217
227#if ISO_14755 218#if defined (ISO_14755) || defined (ENABLE_PERL)
228# define ENABLE_OVERLAY 1 219# define ENABLE_OVERLAY 1
229#endif 220#endif
230 221
231/* now look for other badly set stuff */ 222/* now look for other badly set stuff */
232 223
… …
247# define HAVE_SCROLLBARS 1 238# define HAVE_SCROLLBARS 1
248#endif 239#endif
249 240
250/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 241/* width of scrollBar, menuBar shadow, must be 1 or 2 */
251#ifdef HALFSHADOW 242#ifdef HALFSHADOW
252# define SHADOW 1 243# define MENU_SHADOW 1
253#else 244#else
254# define SHADOW 2 245# define MENU_SHADOW 2
255#endif 246#endif
256 247
257#define R_SB_ALIGN_CENTRE 0 248#define R_SB_ALIGN_CENTRE 0
258#define R_SB_ALIGN_TOP 1 249#define R_SB_ALIGN_TOP 1
259#define R_SB_ALIGN_BOTTOM 2 250#define R_SB_ALIGN_BOTTOM 2
… …
376enum { 367enum {
377 PRIMARY = 0, 368 PRIMARY = 0,
378 SECONDARY, 369 SECONDARY,
379}; 370};
380 371
381#define RS_None 0 /* Normal */ 372#define RS_None 0
382 373
383#define RS_fgMask 0x0000007fUL /* 128 colors */ 374#define RS_fgMask 0x0000007fUL // 128 colors
384#define RS_bgMask 0x00003f80UL /* 128 colors */ 375#define RS_bgMask 0x00003f80UL // 128 colors
385 376
386// font styles 377// font styles
387#define RS_Bold 0x00004000UL // value 1 378#define RS_Bold 0x00004000UL // value 1
388#define RS_Italic 0x00008000UL // value 2 379#define RS_Italic 0x00008000UL // value 2
389 380
390// fake styles 381// fake styles
391#define RS_Blink 0x00010000UL /* blink */ 382#define RS_Blink 0x00010000UL // blink
392#define RS_RVid 0x00020000UL /* reverse video */ 383#define RS_RVid 0x00020000UL // reverse video
393#define RS_Uline 0x00040000UL /* underline */ 384#define RS_Uline 0x00040000UL // underline
394 385
395// 5 bits still to go 386// 5 custom bits for extensions
387#define RS_customCount 32
388#define RS_customMask 0x00f80000UL
389#define RS_customShift 19
396 390
397// other flags 391// other flags
398#define RS_Careful 0x80000000UL /* be careful when drawing these */ 392#define RS_Careful 0x80000000UL /* be careful when drawing these */
399 393
400#define RS_styleCount 4 394#define RS_styleCount 4
… …
475 URxvt_italicFont = 712, 469 URxvt_italicFont = 712,
476 URxvt_boldItalicFont = 713, 470 URxvt_boldItalicFont = 713,
477 471
478 URxvt_view_up = 720, 472 URxvt_view_up = 720,
479 URxvt_view_down = 721, 473 URxvt_view_down = 721,
474
475 URxvt_perl = 777,
480}; 476};
481 477
482/* Words starting with `Color_' are colours. Others are counts */ 478/* Words starting with `Color_' are colours. Others are counts */
483/* 479/*
484 * The PixColor and rendition colour usage should probably be decoupled 480 * The PixColor and rendition colour usage should probably be decoupled
… …
561 557
562/* 558/*
563 * Resource list 559 * Resource list
564 */ 560 */
565enum { 561enum {
566 Rs_display_name = 0, 562# define def(name) Rs_ ## name,
567 Rs_term_name, 563# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
568 Rs_iconName, 564# include "rsinc.h"
569 Rs_geometry, 565# undef def
570 Rs_reverseVideo, 566# 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 567 NUM_RESOURCES
670}; 568};
671 569
672// see init.C:xa_names, which must be kept in sync 570// see init.C:xa_names, which must be kept in sync
673enum { 571enum {
… …
748#endif 646#endif
749 647
750// do not change these constants lightly, there are many interdependencies 648// do not change these constants lightly, there are many interdependencies
751#define IMBUFSIZ 128 // input modifier buffer sizes 649#define IMBUFSIZ 128 // input modifier buffer sizes
752#define KBUFSZ 512 // size of keyboard mapping buffer 650#define KBUFSZ 512 // size of keyboard mapping buffer
753#define CBUFSIZ 4096 // size of command buffer 651#define CBUFSIZ 2048 // size of command buffer
754#define UBUFSIZ 4096 // character buffer 652#define UBUFSIZ 2048 // character buffer
755 653
756#ifndef PATH_MAX 654#ifndef PATH_MAX
757# define PATH_MAX 16384 655# define PATH_MAX 16384
758#endif 656#endif
759 657
… …
787/* 685/*
788 ***************************************************************************** 686 *****************************************************************************
789 * MACRO DEFINES 687 * MACRO DEFINES
790 ***************************************************************************** 688 *****************************************************************************
791 */ 689 */
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 690#define dDisp Display *disp = display->display
809 691
810/* convert pixel dimensions to row/column values. Everything as int32_t */ 692/* convert pixel dimensions to row/column values. Everything as int32_t */
811#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 693#define Pixel2Col(x) Pixel2Width((int32_t)(x))
812#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 694#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
815#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 697#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
816#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 698#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 699#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 700#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
819 701
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 702// for m >= -n, ensure remainder lies between 0..n-1
824#define MOD(m,n) (((m) + (n)) % (n)) 703#define MOD(m,n) (((m) + (n)) % (n))
825 704
826#define LINENO(n) MOD (term_start + int(n), total_rows) 705#define LINENO(n) MOD (term_start + int(n), total_rows)
827#define ROW(n) row_buf [LINENO (n)] 706#define ROW(n) row_buf [LINENO (n)]
… …
886#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 765#define scrollbar_size() (scrollBar.end - scrollBar.beg \
887 - scrollbar_minheight ()) 766 - scrollbar_minheight ())
888 767
889#if (MENUBAR_MAX > 1) 768#if (MENUBAR_MAX > 1)
890/* rendition style flags */ 769/* rendition style flags */
891# define menuBar_height() (fheight + SHADOW) 770# define menuBar_height() (fheight + MENU_SHADOW)
892# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 771# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
893# define isMenuBarWindow(w) ((w) == menuBar.win) 772# define isMenuBarWindow(w) ((w) == menuBar.win)
894#else 773#else
895# define menuBar_height() (0) 774# define menuBar_height() (0)
896# define menuBar_TotalHeight() (0) 775# define menuBar_TotalHeight() (0)
897# define isMenuBarWindow(w) (0) 776# define isMenuBarWindow(w) (0)
… …
953extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 832extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
954extern void rxvt_exit_failure () __attribute__ ((noreturn)); 833extern void rxvt_exit_failure () __attribute__ ((noreturn));
955 834
956#define SET_LOCALE(locale) rxvt_set_locale (locale) 835#define SET_LOCALE(locale) rxvt_set_locale (locale)
957extern bool rxvt_set_locale (const char *locale); 836extern bool rxvt_set_locale (const char *locale);
837extern bool rxvt_push_locale (const char *locale);
838extern void rxvt_pop_locale ();
958 839
959/*
960 ***************************************************************************** 840/****************************************************************************/
961 * VARIABLES 841
962 *****************************************************************************
963 */
964#ifdef MENUBAR 842#ifdef MENUBAR
965# include "menubar.h" 843# include "menubar.h"
966#endif 844#endif
967 845
968#define BLINK_INTERVAL 0.5 846#define BLINK_INTERVAL 0.5
… …
975# endif 853# endif
976# endif 854# endif
977# define __attribute__(x) 855# define __attribute__(x)
978#endif 856#endif
979 857
858/****************************************************************************/
859
860#define LINE_LONGER 0x0001 // line is continued on the next row
861#define LINE_FILTERED 0x0002 // line has been filtered
862#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
863
864struct line_t {
865 text_t *t; // terminal the text
866 rend_t *r; // rendition, uses RS_ flags
867 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
868 uint32_t f; // flags
869
870 bool is_longer ()
871 {
872 return f & LINE_LONGER;
873 }
874
875 void is_longer (int set)
876 {
877 if (set)
878 f |= LINE_LONGER;
879 else
880 f &= ~LINE_LONGER;
881 }
882
883 void clear ()
884 {
885 t = 0;
886 r = 0;
887 l = 0;
888 f = 0;
889 }
890
891 void touch () // call whenever a line is changed/touched/updated
892 {
893#if ENABLE_PERL
894 f &= ~LINE_FILTERED;
895#endif
896 }
897
898 void touch (int col)
899 {
900 max_it (l, col);
901 touch ();
902 }
903};
904
905/****************************************************************************/
906
980// primivite wrapper around mbstate_t to ensure initialisation 907// primivite wrapper around mbstate_t to ensure initialisation
981struct mbstate { 908struct mbstate {
982 mbstate_t mbs; 909 mbstate_t mbs;
983 910
984 operator mbstate_t *() { return &mbs; } 911 operator mbstate_t *() { return &mbs; }
985 void reset () { memset (&mbs, 0, sizeof (mbs)); } 912 void reset () { memset (&mbs, 0, sizeof (mbs)); }
986 mbstate () { reset (); } 913 mbstate () { reset (); }
987}; 914};
915
916/****************************************************************************/
988 917
989#define UNICODE_MASK 0x1fffffUL 918#define UNICODE_MASK 0x1fffffUL
990 919
991#if UNICODE3 920#if UNICODE3
992# define COMPOSE_LO 0x40000000UL 921# define COMPOSE_LO 0x40000000UL
… …
1023}; 952};
1024 953
1025extern class rxvt_composite_vec rxvt_composite; 954extern class rxvt_composite_vec rxvt_composite;
1026#endif 955#endif
1027 956
957/****************************************************************************/
1028 958
1029#ifdef KEYSYM_RESOURCE 959#ifdef KEYSYM_RESOURCE
1030 class keyboard_manager; 960 class keyboard_manager;
1031#endif 961#endif
1032 962
1033struct rxvt_term : zero_initialized, rxvt_vars { 963struct rxvt_term : zero_initialized, rxvt_vars {
1034 log_callback *log_hook; // log error messages through this hook, if != 0 964 log_callback *log_hook; // log error messages through this hook, if != 0
1035 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 965 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
966
967#if ENABLE_PERL
968 void *self; // perl's $self
969#endif
1036 970
1037 struct mbstate mbstate; // current input multibyte state 971 struct mbstate mbstate; // current input multibyte state
1038 972
1039 unsigned char want_refresh:1, 973 unsigned char want_refresh:1,
1040#ifdef TRANSPARENT 974#ifdef TRANSPARENT
… …
1191 bar_t *CurrentBar; 1125 bar_t *CurrentBar;
1192# if ! (MENUBAR_MAX > 1) 1126# if ! (MENUBAR_MAX > 1)
1193 bar_t BarList; 1127 bar_t BarList;
1194# endif /* (MENUBAR_MAX > 1) */ 1128# endif /* (MENUBAR_MAX > 1) */
1195#endif 1129#endif
1196#ifdef CURSOR_BLINK
1197 struct timeval lastcursorchange;
1198#endif
1199#ifdef POINTER_BLANK
1200 struct timeval lastmotion;
1201#endif
1202 1130
1203#if ENABLE_OVERLAY 1131#if ENABLE_OVERLAY
1204 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1132 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1205 text_t **ov_text; 1133 text_t **ov_text;
1206 rend_t **ov_rend; 1134 rend_t **ov_rend;
… …
1221 char *env_display; /* environmental variable DISPLAY */ 1149 char *env_display; /* environmental variable DISPLAY */
1222 char *env_term; /* environmental variable TERM */ 1150 char *env_term; /* environmental variable TERM */
1223 char *env_colorfgbg; 1151 char *env_colorfgbg;
1224 char *locale; 1152 char *locale;
1225 char charsets[4]; 1153 char charsets[4];
1226 unsigned char *v_buffer; /* pointer to physical buffer */ 1154 char *v_buffer; /* pointer to physical buffer */
1227 unsigned int v_buflen; /* size of area to write */ 1155 unsigned int v_buflen; /* size of area to write */
1228 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1156 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1229 1157
1230#ifdef KEYSYM_RESOURCE 1158#ifdef KEYSYM_RESOURCE
1231 keyboard_manager *keyboard; 1159 keyboard_manager *keyboard;
1232#endif 1160#endif
1233 1161
1234 const char *rs[NUM_RESOURCES]; 1162 const char *rs[NUM_RESOURCES];
1235 /* command input buffering */ 1163 /* command input buffering */
1236 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1164 char *cmdbuf_ptr, *cmdbuf_endp;
1237 unsigned char cmdbuf_base[CBUFSIZ]; 1165 char cmdbuf_base[CBUFSIZ];
1238 1166
1239 rxvt_salloc *talloc; // text line allocator 1167 rxvt_salloc *talloc; // text line allocator
1240 rxvt_salloc *ralloc; // rend line allocator 1168 rxvt_salloc *ralloc; // rend line allocator
1241 1169
1242 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1170 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1251 void iso14755_54 (int x, int y); 1179 void iso14755_54 (int x, int y);
1252# endif 1180# endif
1253#endif 1181#endif
1254 1182
1255 // modifies first argument(!) 1183 // modifies first argument(!)
1256 void paste (unsigned char *data, unsigned int len); 1184 void paste (char *data, unsigned int len);
1257 1185
1258 void flush (); 1186 void flush ();
1259 1187
1260#if TRANSPARENT 1188#if TRANSPARENT
1261 void rootwin_cb (XEvent &xev); 1189 void rootwin_cb (XEvent &xev);
… …
1302 void pointer_blank (); 1230 void pointer_blank ();
1303#endif 1231#endif
1304 void pointer_unblank (); 1232 void pointer_unblank ();
1305 1233
1306 void tt_printf (const char *fmt,...); 1234 void tt_printf (const char *fmt,...);
1307 void tt_write (const unsigned char *data, unsigned int len); 1235 void tt_write (const char *data, unsigned int len);
1308 void pty_write (); 1236 void pty_write ();
1309 1237
1310 void tt_winch (); 1238 void tt_winch ();
1311 1239
1312 rxvt_term (); 1240 rxvt_term ();
… …
1364 1292
1365 /* autoconvert */ 1293 /* autoconvert */
1366 1294
1367 // command.C 1295 // command.C
1368 void lookup_key (XKeyEvent &ev); 1296 void lookup_key (XKeyEvent &ev);
1369 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1297 unsigned int cmd_write (const char *str, unsigned int count);
1370 1298
1371 unicode_t next_char (); 1299 wchar_t next_char ();
1372 unicode_t cmd_getc (); 1300 wchar_t cmd_getc ();
1373 unicode_t next_octet (); 1301 uint32_t next_octet ();
1374 unicode_t cmd_get8 (); 1302 uint32_t cmd_get8 ();
1375 1303
1376 bool cmd_parse (); 1304 bool cmd_parse ();
1377 void mouse_report (XButtonEvent &ev); 1305 void mouse_report (XButtonEvent &ev);
1378 void button_press (XButtonEvent &ev); 1306 void button_press (XButtonEvent &ev);
1379 void button_release (XButtonEvent &ev); 1307 void button_release (XButtonEvent &ev);
… …
1388 void process_nonprinting (unicode_t ch); 1316 void process_nonprinting (unicode_t ch);
1389 void process_escape_vt52 (unicode_t ch); 1317 void process_escape_vt52 (unicode_t ch);
1390 void process_escape_seq (); 1318 void process_escape_seq ();
1391 void process_csi_seq (); 1319 void process_csi_seq ();
1392 void process_window_ops (const int *args, unsigned int nargs); 1320 void process_window_ops (const int *args, unsigned int nargs);
1393 unsigned char *get_to_st (unicode_t &ends_how); 1321 char *get_to_st (unicode_t &ends_how);
1394 void process_dcs_seq (); 1322 void process_dcs_seq ();
1395 void process_osc_seq (); 1323 void process_osc_seq ();
1396 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1324 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); 1325 void process_xterm_seq (int op, const char *str, char resp);
1398 int privcases (int mode, unsigned long bit); 1326 int privcases (int mode, unsigned long bit);
1399 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1327 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); 1328 void process_sgr_mode (unsigned int nargs, const int *arg);
1401 void process_graphics (); 1329 void process_graphics ();
1402 // init.C 1330 // init.C
… …
1483 int fgcolor_of (rend_t r) 1411 int fgcolor_of (rend_t r)
1484 { 1412 {
1485 int base = GET_BASEFG (r); 1413 int base = GET_BASEFG (r);
1486#ifndef NO_BRIGHTCOLOR 1414#ifndef NO_BRIGHTCOLOR
1487 if (r & RS_Bold 1415 if (r & RS_Bold
1416# if ENABLE_STYLES
1488 && (!ENABLE_STYLES || OPTION (Opt_intensityStyles)) 1417 && OPTION (Opt_intensityStyles)
1418# endif
1489 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1419 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1490 base += minBrightCOLOR - minCOLOR; 1420 base += minBrightCOLOR - minCOLOR;
1491#endif 1421#endif
1492 return base; 1422 return base;
1493 } 1423 }
… …
1495 int bgcolor_of (rend_t r) 1425 int bgcolor_of (rend_t r)
1496 { 1426 {
1497 int base = GET_BASEBG (r); 1427 int base = GET_BASEBG (r);
1498#ifndef NO_BRIGHTCOLOR 1428#ifndef NO_BRIGHTCOLOR
1499 if (r & RS_Blink 1429 if (r & RS_Blink
1430# if ENABLE_STYLES
1500 && (!ENABLE_STYLES || OPTION (Opt_intensityStyles)) 1431 && OPTION (Opt_intensityStyles)
1432# endif
1501 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1433 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1502 base += minBrightCOLOR - minCOLOR; 1434 base += minBrightCOLOR - minCOLOR;
1503#endif 1435#endif
1504 return base; 1436 return base;
1505 } 1437 }
… …
1521 void scr_touch (bool refresh); 1453 void scr_touch (bool refresh);
1522 void scr_expose (int x, int y, int width, int height, bool refresh); 1454 void scr_expose (int x, int y, int width, int height, bool refresh);
1523 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1455 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1524 void scr_recolour (); 1456 void scr_recolour ();
1525 void scr_remap_chars (); 1457 void scr_remap_chars ();
1526 void scr_remap_chars (const line_t &l); 1458 void scr_remap_chars (line_t &l);
1527 1459
1528 void scr_poweron (); 1460 void scr_poweron ();
1529 void scr_cursor (int mode); 1461 void scr_cursor (int mode);
1530 void scr_do_wrap (); 1462 void scr_do_wrap ();
1531 int scr_change_screen (int scrn); 1463 int scr_change_screen (int scrn);
1532 void scr_color (unsigned int color, int fgbg); 1464 void scr_color (unsigned int color, int fgbg);
1533 void scr_rendition (int set, int style); 1465 void scr_rendition (int set, int style);
1534 void scr_add_lines (const unicode_t *str, int nlines, int len); 1466 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1535 void scr_backspace (); 1467 void scr_backspace ();
1536 void scr_tab (int count, bool ht = false); 1468 void scr_tab (int count, bool ht = false);
1537 void scr_gotorc (int row, int col, int relative); 1469 void scr_gotorc (int row, int col, int relative);
1538 void scr_index (enum page_dirn direction); 1470 void scr_index (enum page_dirn direction);
1539 void scr_erase_line (int mode); 1471 void scr_erase_line (int mode);
… …
1563 void selection_property (Window win, Atom prop); 1495 void selection_property (Window win, Atom prop);
1564 void selection_request (Time tm, int x, int y); 1496 void selection_request (Time tm, int x, int y);
1565 int selection_request_other (Atom target, int selnum); 1497 int selection_request_other (Atom target, int selnum);
1566 void selection_clear (); 1498 void selection_clear ();
1567 void selection_make (Time tm); 1499 void selection_make (Time tm);
1500 bool selection_grab (Time tm);
1568 void selection_start_colrow (int col, int row); 1501 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); 1502 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); 1503 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1571 void selection_remove_trailing_spaces (); 1504 void selection_remove_trailing_spaces ();
1572 void selection_send (const XSelectionRequestEvent &rq); 1505 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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