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.170 by root, Fri Dec 23 14:46:35 2005 UTC vs.
Revision 1.186 by root, Wed Jan 4 04:42:45 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#endif
642#if CURSOR_BLINK
643 Rs_cursorBlink,
644#endif
645#if ENABLE_XEMBED
646 Rs_embed,
647#endif
648 Rs_cutchars,
649 Rs_modifier,
650 Rs_answerbackstring,
651 Rs_tripleclickwords,
652 Rs_insecure,
653 Rs_pointerBlank,
654 Rs_pointerBlankDelay,
655 Rs_imLocale,
656 Rs_imFont,
657 Rs_pastableTabs,
658#ifndef NO_SECONDARY_SCREEN
659 Rs_secondaryScreen,
660 Rs_secondaryScroll,
661#endif
662#ifdef OFF_FOCUS_FADING
663 Rs_fade,
664#endif
665#ifdef TINTING
666 Rs_shade,
667#endif
668 NUM_RESOURCES 567 NUM_RESOURCES
669}; 568};
670 569
671// see init.C:xa_names, which must be kept in sync 570// see init.C:xa_names, which must be kept in sync
672enum { 571enum {
… …
747#endif 646#endif
748 647
749// do not change these constants lightly, there are many interdependencies 648// do not change these constants lightly, there are many interdependencies
750#define IMBUFSIZ 128 // input modifier buffer sizes 649#define IMBUFSIZ 128 // input modifier buffer sizes
751#define KBUFSZ 512 // size of keyboard mapping buffer 650#define KBUFSZ 512 // size of keyboard mapping buffer
752#define CBUFSIZ 4096 // size of command buffer 651#define CBUFSIZ 2048 // size of command buffer
753#define UBUFSIZ 4096 // character buffer 652#define UBUFSIZ 2048 // character buffer
754 653
755#ifndef PATH_MAX 654#ifndef PATH_MAX
756# define PATH_MAX 16384 655# define PATH_MAX 16384
757#endif 656#endif
758 657
… …
786/* 685/*
787 ***************************************************************************** 686 *****************************************************************************
788 * MACRO DEFINES 687 * MACRO DEFINES
789 ***************************************************************************** 688 *****************************************************************************
790 */ 689 */
791#define memset(x, y, z) memset((x), (y), (size_t)(z))
792#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
793#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
794#define strcasecmp(x, y) strcasecmp((x), (y))
795#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
796#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
797#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
798#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
799#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
800#define strcat(x, y) strcat((char *)(x), (const char *)(y))
801#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
802#define strdup(x) strdup((const char *)(x))
803#define strlen(x) strlen((const char *)(x))
804#define strchr(x, y) strchr((const char *)(x), (int)(y))
805#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
806
807#define dDisp Display *disp = display->display 690#define dDisp Display *disp = display->display
808 691
809/* convert pixel dimensions to row/column values. Everything as int32_t */ 692/* convert pixel dimensions to row/column values. Everything as int32_t */
810#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 693#define Pixel2Col(x) Pixel2Width((int32_t)(x))
811#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 694#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
814#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 697#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
815#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 698#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
816#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 699#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
817#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 700#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
818 701
819#define TermWin_TotalWidth() ((int32_t)this->width)
820#define TermWin_TotalHeight() ((int32_t)this->height)
821
822// for m >= -n, ensure remainder lies between 0..n-1 702// for m >= -n, ensure remainder lies between 0..n-1
823#define MOD(m,n) (((m) + (n)) % (n)) 703#define MOD(m,n) (((m) + (n)) % (n))
824 704
825#define LINENO(n) MOD (term_start + int(n), total_rows) 705#define LINENO(n) MOD (term_start + int(n), total_rows)
826#define ROW(n) row_buf [LINENO (n)] 706#define ROW(n) row_buf [LINENO (n)]
827 707
828/* how to build & extract colors and attributes */ 708/* how to build & extract colors and attributes */
829#define GET_BASEFG(x) (((x) & RS_fgMask)) 709#define GET_BASEFG(x) (((x) & RS_fgMask))
830#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 710#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
831#ifndef NO_BRIGHTCOLOR
832# define GET_FGCOLOR(x) \
833 ((((x) & RS_Bold) == 0 \
834 || GET_BASEFG (x) < minCOLOR \
835 || GET_BASEFG (x) >= minBrightCOLOR) \
836 ? GET_BASEFG (x) \
837 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
838# define GET_BGCOLOR(x) \
839 ((((x) & RS_Blink) == 0 \
840 || GET_BASEBG (x) < minCOLOR \
841 || GET_BASEBG (x) >= minBrightCOLOR) \
842 ? GET_BASEBG (x) \
843 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
844#else
845# define GET_FGCOLOR(x) GET_BASEFG(x)
846# define GET_BGCOLOR(x) GET_BASEBG(x)
847#endif
848 711
849#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 712#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
850#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 713#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
851 714
852#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 715#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
902#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 765#define scrollbar_size() (scrollBar.end - scrollBar.beg \
903 - scrollbar_minheight ()) 766 - scrollbar_minheight ())
904 767
905#if (MENUBAR_MAX > 1) 768#if (MENUBAR_MAX > 1)
906/* rendition style flags */ 769/* rendition style flags */
907# define menuBar_height() (fheight + SHADOW) 770# define menuBar_height() (fheight + MENU_SHADOW)
908# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 771# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
909# define isMenuBarWindow(w) ((w) == menuBar.win) 772# define isMenuBarWindow(w) ((w) == menuBar.win)
910#else 773#else
911# define menuBar_height() (0) 774# define menuBar_height() (0)
912# define menuBar_TotalHeight() (0) 775# define menuBar_TotalHeight() (0)
913# define isMenuBarWindow(w) (0) 776# define isMenuBarWindow(w) (0)
… …
969extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 832extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
970extern void rxvt_exit_failure () __attribute__ ((noreturn)); 833extern void rxvt_exit_failure () __attribute__ ((noreturn));
971 834
972#define SET_LOCALE(locale) rxvt_set_locale (locale) 835#define SET_LOCALE(locale) rxvt_set_locale (locale)
973extern 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 ();
974 839
975/* 840/*
976 ***************************************************************************** 841 *****************************************************************************
977 * VARIABLES 842 * VARIABLES
978 ***************************************************************************** 843 *****************************************************************************
… …
1047#endif 912#endif
1048 913
1049struct rxvt_term : zero_initialized, rxvt_vars { 914struct rxvt_term : zero_initialized, rxvt_vars {
1050 log_callback *log_hook; // log error messages through this hook, if != 0 915 log_callback *log_hook; // log error messages through this hook, if != 0
1051 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 916 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
917
918#if ENABLE_PERL
919 void *self; // perl's $self
920#endif
1052 921
1053 struct mbstate mbstate; // current input multibyte state 922 struct mbstate mbstate; // current input multibyte state
1054 923
1055 unsigned char want_refresh:1, 924 unsigned char want_refresh:1,
1056#ifdef TRANSPARENT 925#ifdef TRANSPARENT
… …
1207 bar_t *CurrentBar; 1076 bar_t *CurrentBar;
1208# if ! (MENUBAR_MAX > 1) 1077# if ! (MENUBAR_MAX > 1)
1209 bar_t BarList; 1078 bar_t BarList;
1210# endif /* (MENUBAR_MAX > 1) */ 1079# endif /* (MENUBAR_MAX > 1) */
1211#endif 1080#endif
1212#ifdef CURSOR_BLINK
1213 struct timeval lastcursorchange;
1214#endif
1215#ifdef POINTER_BLANK
1216 struct timeval lastmotion;
1217#endif
1218 1081
1219#if ENABLE_OVERLAY 1082#if ENABLE_OVERLAY
1220 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1083 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1221 text_t **ov_text; 1084 text_t **ov_text;
1222 rend_t **ov_rend; 1085 rend_t **ov_rend;
… …
1237 char *env_display; /* environmental variable DISPLAY */ 1100 char *env_display; /* environmental variable DISPLAY */
1238 char *env_term; /* environmental variable TERM */ 1101 char *env_term; /* environmental variable TERM */
1239 char *env_colorfgbg; 1102 char *env_colorfgbg;
1240 char *locale; 1103 char *locale;
1241 char charsets[4]; 1104 char charsets[4];
1242 unsigned char *v_buffer; /* pointer to physical buffer */ 1105 char *v_buffer; /* pointer to physical buffer */
1243 unsigned int v_buflen; /* size of area to write */ 1106 unsigned int v_buflen; /* size of area to write */
1244 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1107 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1245 1108
1246#ifdef KEYSYM_RESOURCE 1109#ifdef KEYSYM_RESOURCE
1247 keyboard_manager *keyboard; 1110 keyboard_manager *keyboard;
1248#endif 1111#endif
1249 1112
1250 const char *rs[NUM_RESOURCES]; 1113 const char *rs[NUM_RESOURCES];
1251 /* command input buffering */ 1114 /* command input buffering */
1252 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1115 char *cmdbuf_ptr, *cmdbuf_endp;
1253 unsigned char cmdbuf_base[CBUFSIZ]; 1116 char cmdbuf_base[CBUFSIZ];
1254 1117
1255 rxvt_salloc *talloc; // text line allocator 1118 rxvt_salloc *talloc; // text line allocator
1256 rxvt_salloc *ralloc; // rend line allocator 1119 rxvt_salloc *ralloc; // rend line allocator
1257 1120
1258 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1121 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1261 // ISO 14755 entry support 1124 // ISO 14755 entry support
1262 unicode_t iso14755buf; 1125 unicode_t iso14755buf;
1263 void commit_iso14755 (); 1126 void commit_iso14755 ();
1264 int hex_keyval (XKeyEvent &ev); 1127 int hex_keyval (XKeyEvent &ev);
1265# if ISO_14755 1128# if ISO_14755
1266 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1129 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1267 void iso14755_54 (int x, int y); 1130 void iso14755_54 (int x, int y);
1268# endif 1131# endif
1269#endif 1132#endif
1270 1133
1271 // modifies first argument(!) 1134 // modifies first argument(!)
1272 void paste (unsigned char *data, unsigned int len); 1135 void paste (char *data, unsigned int len);
1273 1136
1274 void flush (); 1137 void flush ();
1275 1138
1276#if TRANSPARENT 1139#if TRANSPARENT
1277 void rootwin_cb (XEvent &xev); 1140 void rootwin_cb (XEvent &xev);
… …
1318 void pointer_blank (); 1181 void pointer_blank ();
1319#endif 1182#endif
1320 void pointer_unblank (); 1183 void pointer_unblank ();
1321 1184
1322 void tt_printf (const char *fmt,...); 1185 void tt_printf (const char *fmt,...);
1323 void tt_write (const unsigned char *data, unsigned int len); 1186 void tt_write (const char *data, unsigned int len);
1324 void pty_write (); 1187 void pty_write ();
1325 1188
1326 void tt_winch (); 1189 void tt_winch ();
1327 1190
1328 rxvt_term (); 1191 rxvt_term ();
… …
1380 1243
1381 /* autoconvert */ 1244 /* autoconvert */
1382 1245
1383 // command.C 1246 // command.C
1384 void lookup_key (XKeyEvent &ev); 1247 void lookup_key (XKeyEvent &ev);
1385 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1248 unsigned int cmd_write (const char *str, unsigned int count);
1386 1249
1387 unicode_t next_char (); 1250 unicode_t next_char ();
1388 unicode_t cmd_getc (); 1251 unicode_t cmd_getc ();
1389 unicode_t next_octet (); 1252 unicode_t next_octet ();
1390 unicode_t cmd_get8 (); 1253 unicode_t cmd_get8 ();
… …
1404 void process_nonprinting (unicode_t ch); 1267 void process_nonprinting (unicode_t ch);
1405 void process_escape_vt52 (unicode_t ch); 1268 void process_escape_vt52 (unicode_t ch);
1406 void process_escape_seq (); 1269 void process_escape_seq ();
1407 void process_csi_seq (); 1270 void process_csi_seq ();
1408 void process_window_ops (const int *args, unsigned int nargs); 1271 void process_window_ops (const int *args, unsigned int nargs);
1409 unsigned char *get_to_st (unicode_t &ends_how); 1272 char *get_to_st (unicode_t &ends_how);
1410 void process_dcs_seq (); 1273 void process_dcs_seq ();
1411 void process_osc_seq (); 1274 void process_osc_seq ();
1412 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1275 void process_color_seq (int report, int color, const char *str, char resp);
1413 void process_xterm_seq (int op, const char *str, unsigned char resp); 1276 void process_xterm_seq (int op, const char *str, char resp);
1414 int privcases (int mode, unsigned long bit); 1277 int privcases (int mode, unsigned long bit);
1415 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1278 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1416 void process_sgr_mode (unsigned int nargs, const int *arg); 1279 void process_sgr_mode (unsigned int nargs, const int *arg);
1417 void process_graphics (); 1280 void process_graphics ();
1418 // init.C 1281 // init.C
… …
1492 1355
1493 l.l = min (l.l, ncol); 1356 l.l = min (l.l, ncol);
1494 1357
1495 if (ncol > prev_ncol) 1358 if (ncol > prev_ncol)
1496 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1359 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1360 }
1361
1362 int fgcolor_of (rend_t r)
1363 {
1364 int base = GET_BASEFG (r);
1365#ifndef NO_BRIGHTCOLOR
1366 if (r & RS_Bold
1367# if ENABLE_STYLES
1368 && OPTION (Opt_intensityStyles)
1369# endif
1370 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1371 base += minBrightCOLOR - minCOLOR;
1372#endif
1373 return base;
1374 }
1375
1376 int bgcolor_of (rend_t r)
1377 {
1378 int base = GET_BASEBG (r);
1379#ifndef NO_BRIGHTCOLOR
1380 if (r & RS_Blink
1381# if ENABLE_STYLES
1382 && OPTION (Opt_intensityStyles)
1383# endif
1384 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1385 base += minBrightCOLOR - minCOLOR;
1386#endif
1387 return base;
1497 } 1388 }
1498 1389
1499 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1390 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1500 void scr_blank_screen_mem (line_t &l, rend_t efs); 1391 void scr_blank_screen_mem (line_t &l, rend_t efs);
1501 int scr_scroll_text (int row1, int row2, int count); 1392 int scr_scroll_text (int row1, int row2, int count);
… …
1555 void selection_property (Window win, Atom prop); 1446 void selection_property (Window win, Atom prop);
1556 void selection_request (Time tm, int x, int y); 1447 void selection_request (Time tm, int x, int y);
1557 int selection_request_other (Atom target, int selnum); 1448 int selection_request_other (Atom target, int selnum);
1558 void selection_clear (); 1449 void selection_clear ();
1559 void selection_make (Time tm); 1450 void selection_make (Time tm);
1451 bool selection_grab (Time tm);
1560 void selection_start_colrow (int col, int row); 1452 void selection_start_colrow (int col, int row);
1561 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1453 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1562 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1454 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1563 void selection_remove_trailing_spaces (); 1455 void selection_remove_trailing_spaces ();
1564 void selection_send (const XSelectionRequestEvent &rq); 1456 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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