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.178 by root, Sun Jan 1 14:43:43 2006 UTC vs.
Revision 1.192 by root, Sun Jan 8 07:55:36 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__)
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
… …
478 URxvt_italicFont = 712, 471 URxvt_italicFont = 712,
479 URxvt_boldItalicFont = 713, 472 URxvt_boldItalicFont = 713,
480 473
481 URxvt_view_up = 720, 474 URxvt_view_up = 720,
482 URxvt_view_down = 721, 475 URxvt_view_down = 721,
476
477 URxvt_perl = 777,
483}; 478};
484 479
485/* Words starting with `Color_' are colours. Others are counts */ 480/* Words starting with `Color_' are colours. Others are counts */
486/* 481/*
487 * The PixColor and rendition colour usage should probably be decoupled 482 * The PixColor and rendition colour usage should probably be decoupled
… …
564 559
565/* 560/*
566 * Resource list 561 * Resource list
567 */ 562 */
568enum { 563enum {
569 Rs_display_name = 0, 564# define def(name) Rs_ ## name,
570 Rs_term_name, 565# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
571 Rs_iconName, 566# include "rsinc.h"
572 Rs_geometry, 567# undef def
573 Rs_reverseVideo, 568# undef reserve
574 Rs_color,
575 _Rs_color = Rs_color + NRS_COLORS - 1,
576 Rs_font,
577#if ENABLE_STYLES
578 Rs_boldFont,
579 Rs_italicFont,
580 Rs_boldItalicFont,
581 Rs_intensityStyles,
582#endif
583 Rs_name,
584 Rs_title,
585#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
586 Rs_path,
587#endif
588#ifdef XPM_BACKGROUND
589 Rs_backgroundPixmap,
590#endif
591#if (MENUBAR_MAX)
592 Rs_menu,
593#endif
594 Rs_loginShell,
595 Rs_jumpScroll,
596#ifdef HAVE_SCROLLBARS
597 Rs_scrollBar,
598 Rs_scrollBar_right,
599 Rs_scrollBar_floating,
600 Rs_scrollBar_align,
601 Rs_scrollstyle, /* Rs_scrollBar_style */
602 Rs_scrollBar_thickness,
603#endif
604 Rs_scrollTtyOutput,
605 Rs_scrollTtyKeypress,
606 Rs_scrollWithBuffer,
607 Rs_saveLines,
608 Rs_utmpInhibit,
609 Rs_visualBell,
610#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
611 Rs_mapAlert,
612#endif
613#ifdef META8_OPTION
614 Rs_meta8,
615#endif
616#ifdef MOUSE_WHEEL
617 Rs_mouseWheelScrollPage,
618#endif
619#ifndef NO_BACKSPACE_KEY
620 Rs_backspace_key,
621#endif
622#ifndef NO_DELETE_KEY
623 Rs_delete_key,
624#endif
625 Rs_selectstyle,
626#ifdef PRINTPIPE
627 Rs_print_pipe,
628#endif
629#ifdef USE_XIM
630 Rs_preeditType,
631 Rs_inputMethod,
632#endif
633#ifdef TRANSPARENT
634 Rs_transparent,
635 Rs_transparent_all,
636#endif
637#if ENABLE_FRILLS
638 Rs_pty_fd,
639 Rs_hold,
640 Rs_ext_bwidth,
641 Rs_int_bwidth,
642 Rs_borderLess,
643 Rs_lineSpace,
644 Rs_cursorUnderline,
645#endif
646#if CURSOR_BLINK
647 Rs_cursorBlink,
648#endif
649#if ENABLE_XEMBED
650 Rs_embed,
651#endif
652 Rs_cutchars,
653 Rs_modifier,
654 Rs_answerbackstring,
655 Rs_tripleclickwords,
656 Rs_insecure,
657 Rs_pointerBlank,
658 Rs_pointerBlankDelay,
659 Rs_imLocale,
660 Rs_imFont,
661 Rs_pastableTabs,
662#ifndef NO_SECONDARY_SCREEN
663 Rs_secondaryScreen,
664 Rs_secondaryScroll,
665#endif
666#ifdef OFF_FOCUS_FADING
667 Rs_fade,
668#endif
669#ifdef TINTING
670 Rs_shade,
671#endif
672 NUM_RESOURCES 569 NUM_RESOURCES
673}; 570};
674 571
675// see init.C:xa_names, which must be kept in sync 572// see init.C:xa_names, which must be kept in sync
676enum { 573enum {
… …
790/* 687/*
791 ***************************************************************************** 688 *****************************************************************************
792 * MACRO DEFINES 689 * MACRO DEFINES
793 ***************************************************************************** 690 *****************************************************************************
794 */ 691 */
795#define memset(x, y, z) memset((x), (y), (size_t)(z))
796#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
797#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
798#define strcasecmp(x, y) strcasecmp((x), (y))
799#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
800#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
801#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
802#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
803#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
804#define strcat(x, y) strcat((char *)(x), (const char *)(y))
805#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
806#define strdup(x) strdup((const char *)(x))
807#define strlen(x) strlen((const char *)(x))
808#define strchr(x, y) strchr((const char *)(x), (int)(y))
809#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
810
811#define dDisp Display *disp = display->display 692#define dDisp Display *disp = display->display
812 693
813/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
814#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
815#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
818#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 699#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
819#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 700#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
820#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
821#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
822 703
823#define TermWin_TotalWidth() ((int32_t)this->width) 704#define OPTION(opt) (options & (opt))
824#define TermWin_TotalHeight() ((int32_t)this->height) 705#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
706 | Opt_jumpScroll | Opt_secondaryScreen \
707 | Opt_pastableTabs | Opt_intensityStyles)
825 708
826// for m >= -n, ensure remainder lies between 0..n-1 709// for m >= -n, ensure remainder lies between 0..n-1
827#define MOD(m,n) (((m) + (n)) % (n)) 710#define MOD(m,n) (((m) + (n)) % (n))
828 711
829#define LINENO(n) MOD (term_start + int(n), total_rows) 712#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
889#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 772#define scrollbar_size() (scrollBar.end - scrollBar.beg \
890 - scrollbar_minheight ()) 773 - scrollbar_minheight ())
891 774
892#if (MENUBAR_MAX > 1) 775#if (MENUBAR_MAX > 1)
893/* rendition style flags */ 776/* rendition style flags */
894# define menuBar_height() (fheight + SHADOW) 777# define menuBar_height() (fheight + MENU_SHADOW)
895# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 778# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
896# define isMenuBarWindow(w) ((w) == menuBar.win) 779# define isMenuBarWindow(w) ((w) == menuBar.win)
897#else 780#else
898# define menuBar_height() (0) 781# define menuBar_height() (0)
899# define menuBar_TotalHeight() (0) 782# define menuBar_TotalHeight() (0)
900# define isMenuBarWindow(w) (0) 783# define isMenuBarWindow(w) (0)
… …
956extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 839extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
957extern void rxvt_exit_failure () __attribute__ ((noreturn)); 840extern void rxvt_exit_failure () __attribute__ ((noreturn));
958 841
959#define SET_LOCALE(locale) rxvt_set_locale (locale) 842#define SET_LOCALE(locale) rxvt_set_locale (locale)
960extern bool rxvt_set_locale (const char *locale); 843extern bool rxvt_set_locale (const char *locale);
844extern bool rxvt_push_locale (const char *locale);
845extern void rxvt_pop_locale ();
961 846
962/*
963 ***************************************************************************** 847/****************************************************************************/
964 * VARIABLES 848
965 *****************************************************************************
966 */
967#ifdef MENUBAR 849#ifdef MENUBAR
968# include "menubar.h" 850# include "menubar.h"
969#endif 851#endif
970 852
971#define BLINK_INTERVAL 0.5 853#define BLINK_INTERVAL 0.5
… …
978# endif 860# endif
979# endif 861# endif
980# define __attribute__(x) 862# define __attribute__(x)
981#endif 863#endif
982 864
865/****************************************************************************/
866
867#define LINE_LONGER 0x0001 // line is continued on the next row
868#define LINE_FILTERED 0x0002 // line has been filtered
869#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
870
871struct line_t {
872 text_t *t; // terminal the text
873 rend_t *r; // rendition, uses RS_ flags
874 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
875 uint32_t f; // flags
876
877 bool is_longer ()
878 {
879 return f & LINE_LONGER;
880 }
881
882 void is_longer (int set)
883 {
884 if (set)
885 f |= LINE_LONGER;
886 else
887 f &= ~LINE_LONGER;
888 }
889
890 void clear ()
891 {
892 t = 0;
893 r = 0;
894 l = 0;
895 f = 0;
896 }
897
898 void touch () // call whenever a line is changed/touched/updated
899 {
900#if ENABLE_PERL
901 f &= ~LINE_FILTERED;
902#endif
903 }
904
905 void touch (int col)
906 {
907 max_it (l, col);
908 touch ();
909 }
910};
911
912/****************************************************************************/
913
983// primivite wrapper around mbstate_t to ensure initialisation 914// primivite wrapper around mbstate_t to ensure initialisation
984struct mbstate { 915struct mbstate {
985 mbstate_t mbs; 916 mbstate_t mbs;
986 917
987 operator mbstate_t *() { return &mbs; } 918 operator mbstate_t *() { return &mbs; }
988 void reset () { memset (&mbs, 0, sizeof (mbs)); } 919 void reset () { memset (&mbs, 0, sizeof (mbs)); }
989 mbstate () { reset (); } 920 mbstate () { reset (); }
990}; 921};
991 922
923/****************************************************************************/
924
992#define UNICODE_MASK 0x1fffffUL 925#define UNICODE_MASK 0x1fffffUL
993 926
994#if UNICODE3 927#if UNICODE3
995# define COMPOSE_LO 0x40000000UL 928# define COMPOSE_LO 0x40000000UL
996# define COMPOSE_HI 0x400fffffUL 929# define COMPOSE_HI 0x400fffffUL
997# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 930# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
998#else 931#else
932# if ENABLE_PERL
933# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
934# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
935# else
999# define COMPOSE_LO 0xd800UL 936# define COMPOSE_LO 0xd800UL
1000# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 937# define COMPOSE_HI 0xf8ffUL
1001# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 938# endif
939# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
1002#endif 940#endif
1003 941
1004#if ENABLE_COMBINING 942#if ENABLE_COMBINING
1005// compose chars are used to represent composite characters 943// compose chars are used to represent composite characters
1006// that are not representable in unicode, as well as characters 944// that are not representable in unicode, as well as characters
… …
1026}; 964};
1027 965
1028extern class rxvt_composite_vec rxvt_composite; 966extern class rxvt_composite_vec rxvt_composite;
1029#endif 967#endif
1030 968
969/****************************************************************************/
1031 970
1032#ifdef KEYSYM_RESOURCE 971#ifdef KEYSYM_RESOURCE
1033 class keyboard_manager; 972 class keyboard_manager;
1034#endif 973#endif
1035 974
1036struct rxvt_term : zero_initialized, rxvt_vars { 975struct rxvt_term : zero_initialized, rxvt_vars {
1037 log_callback *log_hook; // log error messages through this hook, if != 0 976 log_callback *log_hook; // log error messages through this hook, if != 0
1038 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 977 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
978
979#if ENABLE_PERL
980 rxvt_perl_term perl;
981#endif
982#if USE_XGETDEFAULT
983 XrmDatabase xrmdatabase;
984#endif
1039 985
1040 struct mbstate mbstate; // current input multibyte state 986 struct mbstate mbstate; // current input multibyte state
1041 987
1042 unsigned char want_refresh:1, 988 unsigned char want_refresh:1,
1043#ifdef TRANSPARENT 989#ifdef TRANSPARENT
… …
1194 bar_t *CurrentBar; 1140 bar_t *CurrentBar;
1195# if ! (MENUBAR_MAX > 1) 1141# if ! (MENUBAR_MAX > 1)
1196 bar_t BarList; 1142 bar_t BarList;
1197# endif /* (MENUBAR_MAX > 1) */ 1143# endif /* (MENUBAR_MAX > 1) */
1198#endif 1144#endif
1199#ifdef CURSOR_BLINK
1200 struct timeval lastcursorchange;
1201#endif
1202#ifdef POINTER_BLANK
1203 struct timeval lastmotion;
1204#endif
1205 1145
1206#if ENABLE_OVERLAY 1146#if ENABLE_OVERLAY
1207 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1147 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1208 text_t **ov_text; 1148 text_t **ov_text;
1209 rend_t **ov_rend; 1149 rend_t **ov_rend;
… …
1224 char *env_display; /* environmental variable DISPLAY */ 1164 char *env_display; /* environmental variable DISPLAY */
1225 char *env_term; /* environmental variable TERM */ 1165 char *env_term; /* environmental variable TERM */
1226 char *env_colorfgbg; 1166 char *env_colorfgbg;
1227 char *locale; 1167 char *locale;
1228 char charsets[4]; 1168 char charsets[4];
1229 unsigned char *v_buffer; /* pointer to physical buffer */ 1169 char *v_buffer; /* pointer to physical buffer */
1230 unsigned int v_buflen; /* size of area to write */ 1170 unsigned int v_buflen; /* size of area to write */
1231 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1171 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1232 1172
1233#ifdef KEYSYM_RESOURCE 1173#ifdef KEYSYM_RESOURCE
1234 keyboard_manager *keyboard; 1174 keyboard_manager *keyboard;
1235#endif 1175#endif
1236 1176
1237 const char *rs[NUM_RESOURCES]; 1177 const char *rs[NUM_RESOURCES];
1238 /* command input buffering */ 1178 /* command input buffering */
1239 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1179 char *cmdbuf_ptr, *cmdbuf_endp;
1240 unsigned char cmdbuf_base[CBUFSIZ]; 1180 char cmdbuf_base[CBUFSIZ];
1241 1181
1242 rxvt_salloc *talloc; // text line allocator 1182 rxvt_salloc *talloc; // text line allocator
1243 rxvt_salloc *ralloc; // rend line allocator 1183 rxvt_salloc *ralloc; // rend line allocator
1244 1184
1245 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1185 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1254 void iso14755_54 (int x, int y); 1194 void iso14755_54 (int x, int y);
1255# endif 1195# endif
1256#endif 1196#endif
1257 1197
1258 // modifies first argument(!) 1198 // modifies first argument(!)
1259 void paste (unsigned char *data, unsigned int len); 1199 void paste (char *data, unsigned int len);
1260 1200
1261 void flush (); 1201 void flush ();
1262 1202
1263#if TRANSPARENT 1203#if TRANSPARENT
1264 void rootwin_cb (XEvent &xev); 1204 void rootwin_cb (XEvent &xev);
… …
1305 void pointer_blank (); 1245 void pointer_blank ();
1306#endif 1246#endif
1307 void pointer_unblank (); 1247 void pointer_unblank ();
1308 1248
1309 void tt_printf (const char *fmt,...); 1249 void tt_printf (const char *fmt,...);
1310 void tt_write (const unsigned char *data, unsigned int len); 1250 void tt_write (const char *data, unsigned int len);
1311 void pty_write (); 1251 void pty_write ();
1312 1252
1313 void tt_winch (); 1253 void tt_winch ();
1314 1254
1315 rxvt_term (); 1255 rxvt_term ();
… …
1367 1307
1368 /* autoconvert */ 1308 /* autoconvert */
1369 1309
1370 // command.C 1310 // command.C
1371 void lookup_key (XKeyEvent &ev); 1311 void lookup_key (XKeyEvent &ev);
1372 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1312 unsigned int cmd_write (const char *str, unsigned int count);
1373 1313
1374 unicode_t next_char (); 1314 wchar_t next_char ();
1375 unicode_t cmd_getc (); 1315 wchar_t cmd_getc ();
1376 unicode_t next_octet (); 1316 uint32_t next_octet ();
1377 unicode_t cmd_get8 (); 1317 uint32_t cmd_get8 ();
1378 1318
1379 bool cmd_parse (); 1319 bool cmd_parse ();
1380 void mouse_report (XButtonEvent &ev); 1320 void mouse_report (XButtonEvent &ev);
1381 void button_press (XButtonEvent &ev); 1321 void button_press (XButtonEvent &ev);
1382 void button_release (XButtonEvent &ev); 1322 void button_release (XButtonEvent &ev);
… …
1391 void process_nonprinting (unicode_t ch); 1331 void process_nonprinting (unicode_t ch);
1392 void process_escape_vt52 (unicode_t ch); 1332 void process_escape_vt52 (unicode_t ch);
1393 void process_escape_seq (); 1333 void process_escape_seq ();
1394 void process_csi_seq (); 1334 void process_csi_seq ();
1395 void process_window_ops (const int *args, unsigned int nargs); 1335 void process_window_ops (const int *args, unsigned int nargs);
1396 unsigned char *get_to_st (unicode_t &ends_how); 1336 char *get_to_st (unicode_t &ends_how);
1397 void process_dcs_seq (); 1337 void process_dcs_seq ();
1398 void process_osc_seq (); 1338 void process_osc_seq ();
1399 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1339 void process_color_seq (int report, int color, const char *str, char resp);
1400 void process_xterm_seq (int op, const char *str, unsigned char resp); 1340 void process_xterm_seq (int op, const char *str, char resp);
1401 int privcases (int mode, unsigned long bit); 1341 int privcases (int mode, unsigned long bit);
1402 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1342 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1403 void process_sgr_mode (unsigned int nargs, const int *arg); 1343 void process_sgr_mode (unsigned int nargs, const int *arg);
1404 void process_graphics (); 1344 void process_graphics ();
1405 // init.C 1345 // init.C
… …
1509 base += minBrightCOLOR - minCOLOR; 1449 base += minBrightCOLOR - minCOLOR;
1510#endif 1450#endif
1511 return base; 1451 return base;
1512 } 1452 }
1513 1453
1454 bool option (uint32_t opt)
1455 {
1456 return OPTION (opt);
1457 }
1458
1459 void set_option (uint32_t opt, bool set)
1460 {
1461 if (set)
1462 options |= opt;
1463 else
1464 options &= ~opt;
1465 }
1466
1514 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1467 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1515 void scr_blank_screen_mem (line_t &l, rend_t efs); 1468 void scr_blank_screen_mem (line_t &l, rend_t efs);
1516 int scr_scroll_text (int row1, int row2, int count); 1469 int scr_scroll_text (int row1, int row2, int count);
1517 void scr_reset (); 1470 void scr_reset ();
1518 void scr_release (); 1471 void scr_release ();
… …
1528 void scr_touch (bool refresh); 1481 void scr_touch (bool refresh);
1529 void scr_expose (int x, int y, int width, int height, bool refresh); 1482 void scr_expose (int x, int y, int width, int height, bool refresh);
1530 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1483 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1531 void scr_recolour (); 1484 void scr_recolour ();
1532 void scr_remap_chars (); 1485 void scr_remap_chars ();
1533 void scr_remap_chars (const line_t &l); 1486 void scr_remap_chars (line_t &l);
1534 1487
1535 void scr_poweron (); 1488 void scr_poweron ();
1536 void scr_cursor (int mode); 1489 void scr_cursor (int mode);
1537 void scr_do_wrap (); 1490 void scr_do_wrap ();
1538 int scr_change_screen (int scrn); 1491 int scr_change_screen (int scrn);
1539 void scr_color (unsigned int color, int fgbg); 1492 void scr_color (unsigned int color, int fgbg);
1540 void scr_rendition (int set, int style); 1493 void scr_rendition (int set, int style);
1541 void scr_add_lines (const unicode_t *str, int nlines, int len); 1494 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1542 void scr_backspace (); 1495 void scr_backspace ();
1543 void scr_tab (int count, bool ht = false); 1496 void scr_tab (int count, bool ht = false);
1544 void scr_gotorc (int row, int col, int relative); 1497 void scr_gotorc (int row, int col, int relative);
1545 void scr_index (enum page_dirn direction); 1498 void scr_index (enum page_dirn direction);
1546 void scr_erase_line (int mode); 1499 void scr_erase_line (int mode);
… …
1570 void selection_property (Window win, Atom prop); 1523 void selection_property (Window win, Atom prop);
1571 void selection_request (Time tm, int x, int y); 1524 void selection_request (Time tm, int x, int y);
1572 int selection_request_other (Atom target, int selnum); 1525 int selection_request_other (Atom target, int selnum);
1573 void selection_clear (); 1526 void selection_clear ();
1574 void selection_make (Time tm); 1527 void selection_make (Time tm);
1528 bool selection_grab (Time tm);
1575 void selection_start_colrow (int col, int row); 1529 void selection_start_colrow (int col, int row);
1576 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1530 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1577 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1531 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1578 void selection_remove_trailing_spaces (); 1532 void selection_remove_trailing_spaces ();
1579 void selection_send (const XSelectionRequestEvent &rq); 1533 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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