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.160 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.182 by root, Mon Jan 2 18:20:23 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
… …
162 Time time; /* milliseconds */ 153 Time time; /* milliseconds */
163 unsigned int state; /* key or button mask */ 154 unsigned int state; /* key or button mask */
164 unsigned int button; /* detail */ 155 unsigned int button; /* detail */
165}; 156};
166 157
167#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
168#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
169#define SWAP_IT(one, two, typeof) \
170 do { \
171 typeof swapittmp; \
172 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
173 } while (/* CONSTCOND */ 0)
174#define BOUND_POSITIVE_INT16(val) \
175 (int16_t) ((val) <= 0 \
176 ? 0 \
177 : min ((val), (((uint16_t)-1)>>1)))
178
179#if ENABLE_FRILLS 158#if ENABLE_FRILLS
180typedef struct _mwmhints { 159typedef struct _mwmhints {
181 CARD32 flags; 160 CARD32 flags;
182 CARD32 functions; 161 CARD32 functions;
183 CARD32 decorations; 162 CARD32 decorations;
… …
234 213
235#ifdef NO_RESOURCES 214#ifdef NO_RESOURCES
236# undef USE_XGETDEFAULT 215# undef USE_XGETDEFAULT
237#endif 216#endif
238 217
239#if ISO_14755 218#if defined (ISO_14755) || defined (ENABLE_PERL)
240# define ENABLE_OVERLAY 1 219# define ENABLE_OVERLAY 1
241#endif 220#endif
242 221
243/* now look for other badly set stuff */ 222/* now look for other badly set stuff */
244 223
… …
363#define FONT_DN "#-" 342#define FONT_DN "#-"
364#define FONT_UP "#+" 343#define FONT_UP "#+"
365 344
366/* flags for rxvt_scr_gotorc () */ 345/* flags for rxvt_scr_gotorc () */
367enum { 346enum {
368 C_RELATIVE = 1 , /* col movement is relative */ 347 C_RELATIVE = 1, /* col movement is relative */
369 R_RELATIVE = 2, /* row movement is relative */ 348 R_RELATIVE = 2, /* row movement is relative */
370 RELATIVE = 1 | 2, 349 RELATIVE = C_RELATIVE | R_RELATIVE,
371}; 350};
372 351
373/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 352/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
374enum { 353enum {
375 INSERT = -1, /* don't change these values */ 354 INSERT = -1, /* don't change these values */
… …
388enum { 367enum {
389 PRIMARY = 0, 368 PRIMARY = 0,
390 SECONDARY, 369 SECONDARY,
391}; 370};
392 371
393#define RS_None 0 /* Normal */ 372#define RS_None 0
394 373
395#define RS_fgMask 0x0000007fUL /* 128 colors */ 374#define RS_fgMask 0x0000007fUL // 128 colors
396#define RS_bgMask 0x00003f80UL /* 128 colors */ 375#define RS_bgMask 0x00003f80UL // 128 colors
397 376
398// font styles 377// font styles
399#define RS_Bold 0x00004000UL // value 1 378#define RS_Bold 0x00004000UL // value 1
400#define RS_Italic 0x00008000UL // value 2 379#define RS_Italic 0x00008000UL // value 2
401 380
402// fake styles 381// fake styles
403#define RS_Blink 0x00010000UL /* blink */ 382#define RS_Blink 0x00010000UL // blink
404#define RS_RVid 0x00020000UL /* reverse video */ 383#define RS_RVid 0x00020000UL // reverse video
405#define RS_Uline 0x00040000UL /* underline */ 384#define RS_Uline 0x00040000UL // underline
406 385
407// 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
408 390
409// other flags 391// other flags
410#define RS_Careful 0x80000000UL /* be careful when drawing these */ 392#define RS_Careful 0x80000000UL /* be careful when drawing these */
411 393
412#define RS_styleCount 4 394#define RS_styleCount 4
… …
573 555
574/* 556/*
575 * Resource list 557 * Resource list
576 */ 558 */
577enum { 559enum {
578 Rs_display_name = 0, 560#define Rs_def(name) Rs_ ## name,
579 Rs_term_name, 561#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
580 Rs_iconName, 562#include "rsinc.h"
581 Rs_geometry, 563#undef Rs_def
582 Rs_reverseVideo, 564#undef Rs_reserve
583 Rs_color,
584 _Rs_color = Rs_color + NRS_COLORS - 1,
585 Rs_font,
586#if ENABLE_STYLES
587 Rs_boldFont,
588 Rs_italicFont,
589 Rs_boldItalicFont,
590#endif
591 Rs_name,
592 Rs_title,
593#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
594 Rs_path,
595#endif
596#ifdef XPM_BACKGROUND
597 Rs_backgroundPixmap,
598#endif
599#if (MENUBAR_MAX)
600 Rs_menu,
601#endif
602 Rs_loginShell,
603 Rs_jumpScroll,
604#ifdef HAVE_SCROLLBARS
605 Rs_scrollBar,
606 Rs_scrollBar_right,
607 Rs_scrollBar_floating,
608 Rs_scrollBar_align,
609 Rs_scrollstyle, /* Rs_scrollBar_style */
610 Rs_scrollBar_thickness,
611#endif
612 Rs_scrollTtyOutput,
613 Rs_scrollTtyKeypress,
614 Rs_scrollWithBuffer,
615 Rs_saveLines,
616 Rs_utmpInhibit,
617 Rs_visualBell,
618#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
619 Rs_mapAlert,
620#endif
621#ifdef META8_OPTION
622 Rs_meta8,
623#endif
624#ifdef MOUSE_WHEEL
625 Rs_mouseWheelScrollPage,
626#endif
627#ifndef NO_BACKSPACE_KEY
628 Rs_backspace_key,
629#endif
630#ifndef NO_DELETE_KEY
631 Rs_delete_key,
632#endif
633 Rs_selectstyle,
634#ifdef PRINTPIPE
635 Rs_print_pipe,
636#endif
637#ifdef USE_XIM
638 Rs_preeditType,
639 Rs_inputMethod,
640#endif
641#ifdef TRANSPARENT
642 Rs_transparent,
643 Rs_transparent_all,
644#endif
645#if ENABLE_FRILLS
646 Rs_ext_bwidth,
647 Rs_int_bwidth,
648 Rs_borderLess,
649 Rs_lineSpace,
650 Rs_pty_fd,
651 Rs_cursorUnderline,
652#endif
653#if CURSOR_BLINK
654 Rs_cursorBlink,
655#endif
656#if ENABLE_XEMBED
657 Rs_embed,
658#endif
659 Rs_cutchars,
660 Rs_modifier,
661 Rs_answerbackstring,
662 Rs_tripleclickwords,
663 Rs_insecure,
664 Rs_pointerBlank,
665 Rs_pointerBlankDelay,
666 Rs_imLocale,
667 Rs_imFont,
668 Rs_pastableTabs,
669#ifndef NO_SECONDARY_SCREEN
670 Rs_secondaryScreen,
671 Rs_secondaryScroll,
672#endif
673#ifdef OFF_FOCUS_FADING
674 Rs_fade,
675#endif
676#ifdef TINTING
677 Rs_shade,
678#endif
679 NUM_RESOURCES 565 NUM_RESOURCES
680}; 566};
681 567
682// see init.C:xa_names, which must be kept in sync 568// see init.C:xa_names, which must be kept in sync
683enum { 569enum {
… …
758#endif 644#endif
759 645
760// do not change these constants lightly, there are many interdependencies 646// do not change these constants lightly, there are many interdependencies
761#define IMBUFSIZ 128 // input modifier buffer sizes 647#define IMBUFSIZ 128 // input modifier buffer sizes
762#define KBUFSZ 512 // size of keyboard mapping buffer 648#define KBUFSZ 512 // size of keyboard mapping buffer
763#define CBUFSIZ 4096 // size of command buffer 649#define CBUFSIZ 2048 // size of command buffer
764#define UBUFSIZ 4096 // character buffer 650#define UBUFSIZ 2048 // character buffer
765 651
766#ifndef PATH_MAX 652#ifndef PATH_MAX
767# define PATH_MAX 16384 653# define PATH_MAX 16384
768#endif 654#endif
769 655
… …
818#define dDisp Display *disp = display->display 704#define dDisp Display *disp = display->display
819 705
820/* convert pixel dimensions to row/column values. Everything as int32_t */ 706/* convert pixel dimensions to row/column values. Everything as int32_t */
821#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 707#define Pixel2Col(x) Pixel2Width((int32_t)(x))
822#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 708#define Pixel2Row(y) Pixel2Height((int32_t)(y))
823#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 709#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
824#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 710#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
825#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 711#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
826#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 712#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
827#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 713#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
828#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 714#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
829 715
830#define TermWin_TotalWidth() ((int32_t)TermWin.width) 716#define TermWin_TotalWidth() ((int32_t)this->width)
831#define TermWin_TotalHeight() ((int32_t)TermWin.height) 717#define TermWin_TotalHeight() ((int32_t)this->height)
718
719// for m >= -n, ensure remainder lies between 0..n-1
720#define MOD(m,n) (((m) + (n)) % (n))
721
722#define LINENO(n) MOD (term_start + int(n), total_rows)
723#define ROW(n) row_buf [LINENO (n)]
832 724
833/* how to build & extract colors and attributes */ 725/* how to build & extract colors and attributes */
834#define GET_BASEFG(x) (((x) & RS_fgMask)) 726#define GET_BASEFG(x) (((x) & RS_fgMask))
835#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 727#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
836#ifndef NO_BRIGHTCOLOR
837# define GET_FGCOLOR(x) \
838 ((((x) & RS_Bold) == 0 \
839 || GET_BASEFG (x) < minCOLOR \
840 || GET_BASEFG (x) >= minBrightCOLOR) \
841 ? GET_BASEFG (x) \
842 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
843# define GET_BGCOLOR(x) \
844 ((((x) & RS_Blink) == 0 \
845 || GET_BASEBG (x) < minCOLOR \
846 || GET_BASEBG (x) >= minBrightCOLOR) \
847 ? GET_BASEBG (x) \
848 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
849#else
850# define GET_FGCOLOR(x) GET_BASEFG(x)
851# define GET_BGCOLOR(x) GET_BASEBG(x)
852#endif
853 728
854#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 729#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
855#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 730#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
856 731
857#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 732#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
870 745
871#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 746#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
872#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 747#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
873 748
874#if ENABLE_STYLES 749#if ENABLE_STYLES
875# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 750# define FONTSET(style) fontset[GET_STYLE (style)]
876#else 751#else
877# define FONTSET(style) TermWin.fontset[0] 752# define FONTSET(style) fontset[0]
878#endif 753#endif
879 754
880#ifdef HAVE_SCROLLBARS 755#ifdef HAVE_SCROLLBARS
881# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 756# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
882#else 757#else
… …
907#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 782#define scrollbar_size() (scrollBar.end - scrollBar.beg \
908 - scrollbar_minheight ()) 783 - scrollbar_minheight ())
909 784
910#if (MENUBAR_MAX > 1) 785#if (MENUBAR_MAX > 1)
911/* rendition style flags */ 786/* rendition style flags */
912# define menuBar_height() (TermWin.fheight + SHADOW) 787# define menuBar_height() (fheight + SHADOW)
913# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 788# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
914# define isMenuBarWindow(w) ((w) == menuBar.win) 789# define isMenuBarWindow(w) ((w) == menuBar.win)
915#else 790#else
916# define menuBar_height() (0) 791# define menuBar_height() (0)
917# define menuBar_TotalHeight() (0) 792# define menuBar_TotalHeight() (0)
… …
964#endif 839#endif
965 840
966extern class rxvt_failure_exception { } rxvt_failure_exception; 841extern class rxvt_failure_exception { } rxvt_failure_exception;
967 842
968typedef callback1<void, const char *> log_callback; 843typedef callback1<void, const char *> log_callback;
844typedef callback1<int, int> getfd_callback;
969 845
970extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 846extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
971extern void rxvt_log (const char *fmt, ...); 847extern void rxvt_log (const char *fmt, ...);
972extern void rxvt_warn (const char *fmt, ...); 848extern void rxvt_warn (const char *fmt, ...);
973extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 849extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
974extern void rxvt_exit_failure () __attribute__ ((noreturn)); 850extern void rxvt_exit_failure () __attribute__ ((noreturn));
975 851
976#define SET_LOCALE(locale) rxvt_set_locale (locale) 852#define SET_LOCALE(locale) rxvt_set_locale (locale)
977extern bool rxvt_set_locale (const char *locale); 853extern bool rxvt_set_locale (const char *locale);
854extern bool rxvt_push_locale (const char *locale);
855extern void rxvt_pop_locale ();
978 856
979/* 857/*
980 ***************************************************************************** 858 *****************************************************************************
981 * VARIABLES 859 * VARIABLES
982 ***************************************************************************** 860 *****************************************************************************
… …
1050 class keyboard_manager; 928 class keyboard_manager;
1051#endif 929#endif
1052 930
1053struct rxvt_term : zero_initialized, rxvt_vars { 931struct rxvt_term : zero_initialized, rxvt_vars {
1054 log_callback *log_hook; // log error messages through this hook, if != 0 932 log_callback *log_hook; // log error messages through this hook, if != 0
933 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
934
935#if ENABLE_PERL
936 void *self; // perl's $self
937#endif
1055 938
1056 struct mbstate mbstate; // current input multibyte state 939 struct mbstate mbstate; // current input multibyte state
1057 940
1058 unsigned char want_refresh:1, 941 unsigned char want_refresh:1,
1059#ifdef TRANSPARENT 942#ifdef TRANSPARENT
… …
1264 // ISO 14755 entry support 1147 // ISO 14755 entry support
1265 unicode_t iso14755buf; 1148 unicode_t iso14755buf;
1266 void commit_iso14755 (); 1149 void commit_iso14755 ();
1267 int hex_keyval (XKeyEvent &ev); 1150 int hex_keyval (XKeyEvent &ev);
1268# if ISO_14755 1151# if ISO_14755
1269 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1152 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1270 void iso14755_54 (int x, int y); 1153 void iso14755_54 (int x, int y);
1271# endif 1154# endif
1272#endif 1155#endif
1273 1156
1274 // modifies first argument(!) 1157 // modifies first argument(!)
… …
1278 1161
1279#if TRANSPARENT 1162#if TRANSPARENT
1280 void rootwin_cb (XEvent &xev); 1163 void rootwin_cb (XEvent &xev);
1281 xevent_watcher rootwin_ev; 1164 xevent_watcher rootwin_ev;
1282#endif 1165#endif
1283
1284
1285 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1286 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1287 1166
1288 void x_cb (XEvent &xev); 1167 void x_cb (XEvent &xev);
1289 xevent_watcher termwin_ev; 1168 xevent_watcher termwin_ev;
1290 xevent_watcher vt_ev; 1169 xevent_watcher vt_ev;
1291#ifdef HAVE_SCROLLBARS 1170#ifdef HAVE_SCROLLBARS
… …
1332 1211
1333 void tt_winch (); 1212 void tt_winch ();
1334 1213
1335 rxvt_term (); 1214 rxvt_term ();
1336 ~rxvt_term (); 1215 ~rxvt_term ();
1216 void child_exit (); // child has exited, usually destroys
1337 void destroy (); 1217 void destroy ();
1338 void emergency_cleanup (); 1218 void emergency_cleanup ();
1339 1219
1340 bool init (int argc, const char *const *argv); 1220 bool init (int argc, const char *const *argv);
1341 bool init_vars (); 1221 bool init_vars ();
… …
1352 int run_child (const char *const *argv); 1232 int run_child (const char *const *argv);
1353 1233
1354 void color_aliases (int idx); 1234 void color_aliases (int idx);
1355 void recolour_cursor (); 1235 void recolour_cursor ();
1356 void create_windows (int argc, const char *const *argv); 1236 void create_windows (int argc, const char *const *argv);
1357 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1237 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1358 void window_calc (unsigned int width, unsigned int height); 1238 void window_calc (unsigned int newwidth, unsigned int newheight);
1359 1239
1360#if USE_XIM 1240#if USE_XIM
1361 rxvt_xim *input_method; 1241 rxvt_xim *input_method;
1362 XIC Input_Context; 1242 XIC Input_Context;
1363 XIMStyle input_style; 1243 XIMStyle input_style;
… …
1435 void set_title (const char *str); 1315 void set_title (const char *str);
1436 void set_icon_name (const char *str); 1316 void set_icon_name (const char *str);
1437 void set_window_color (int idx, const char *color); 1317 void set_window_color (int idx, const char *color);
1438 void set_colorfgbg (); 1318 void set_colorfgbg ();
1439 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1319 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1440 void set_widthheight (unsigned int width, unsigned int height); 1320 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1441 1321
1442#ifdef MENUBAR 1322#ifdef MENUBAR
1443 // menubar.C 1323 // menubar.C
1444 void menuitem_free (menu_t *menu, menuitem_t *item); 1324 void menuitem_free (menu_t *menu, menuitem_t *item);
1445 int action_dispatch (action_t *action); 1325 int action_dispatch (action_t *action);
… …
1471 void menubar_control (XButtonEvent &ev); 1351 void menubar_control (XButtonEvent &ev);
1472 void map_menuBar (int map); 1352 void map_menuBar (int map);
1473#endif 1353#endif
1474 1354
1475 // screen.C 1355 // screen.C
1476 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1356
1477 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1357 void lalloc (line_t &l)
1358 {
1359 l.t = (text_t *)talloc->alloc ();
1360 l.r = (rend_t *)ralloc->alloc ();
1361 }
1362
1363#if 0
1364 void lfree (line_t &l)
1365 {
1366 talloc->free (l.t);
1367 ralloc->free (l.r);
1368 }
1369#endif
1370
1371 void lresize (line_t &l)
1372 {
1373 if (!l.t)
1374 return;
1375
1376 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1377 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1378
1379 l.l = min (l.l, ncol);
1380
1381 if (ncol > prev_ncol)
1382 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1383 }
1384
1385 int fgcolor_of (rend_t r)
1386 {
1387 int base = GET_BASEFG (r);
1388#ifndef NO_BRIGHTCOLOR
1389 if (r & RS_Bold
1390# if ENABLE_STYLES
1391 && OPTION (Opt_intensityStyles)
1392# endif
1393 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1394 base += minBrightCOLOR - minCOLOR;
1395#endif
1396 return base;
1397 }
1398
1399 int bgcolor_of (rend_t r)
1400 {
1401 int base = GET_BASEBG (r);
1402#ifndef NO_BRIGHTCOLOR
1403 if (r & RS_Blink
1404# if ENABLE_STYLES
1405 && OPTION (Opt_intensityStyles)
1406# endif
1407 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1408 base += minBrightCOLOR - minCOLOR;
1409#endif
1410 return base;
1411 }
1412
1413 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1414 void scr_blank_screen_mem (line_t &l, rend_t efs);
1478 int scr_scroll_text (int row1, int row2, int count, int spec); 1415 int scr_scroll_text (int row1, int row2, int count);
1479 void scr_reset (); 1416 void scr_reset ();
1480 void scr_reset_realloc ();
1481 void scr_release (); 1417 void scr_release ();
1482 void scr_clear (bool really = false); 1418 void scr_clear (bool really = false);
1483 void scr_refresh (unsigned char refresh_type); 1419 void scr_refresh (unsigned char refresh_type);
1484 bool scr_refresh_rend (rend_t mask, rend_t value); 1420 bool scr_refresh_rend (rend_t mask, rend_t value);
1485 void scr_erase_screen (int mode); 1421 void scr_erase_screen (int mode);
… …
1491 void scr_touch (bool refresh); 1427 void scr_touch (bool refresh);
1492 void scr_expose (int x, int y, int width, int height, bool refresh); 1428 void scr_expose (int x, int y, int width, int height, bool refresh);
1493 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1429 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1494 void scr_recolour (); 1430 void scr_recolour ();
1495 void scr_remap_chars (); 1431 void scr_remap_chars ();
1496 void scr_remap_chars (text_t *tp, rend_t *rp); 1432 void scr_remap_chars (const line_t &l);
1497 1433
1498 void scr_poweron (); 1434 void scr_poweron ();
1499 void scr_cursor (int mode); 1435 void scr_cursor (int mode);
1500 void scr_do_wrap (); 1436 void scr_do_wrap ();
1501 int scr_change_screen (int scrn); 1437 int scr_change_screen (int scrn);
… …
1533 void selection_property (Window win, Atom prop); 1469 void selection_property (Window win, Atom prop);
1534 void selection_request (Time tm, int x, int y); 1470 void selection_request (Time tm, int x, int y);
1535 int selection_request_other (Atom target, int selnum); 1471 int selection_request_other (Atom target, int selnum);
1536 void selection_clear (); 1472 void selection_clear ();
1537 void selection_make (Time tm); 1473 void selection_make (Time tm);
1474 bool selection_grab (Time tm);
1538 void selection_start_colrow (int col, int row); 1475 void selection_start_colrow (int col, int row);
1539 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1476 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1540 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1477 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1541 void selection_remove_trailing_spaces (); 1478 void selection_remove_trailing_spaces ();
1542 void selection_send (const XSelectionRequestEvent &rq); 1479 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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