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.179 by root, Mon Jan 2 15:10:18 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
… …
213 215
214#ifdef NO_RESOURCES 216#ifdef NO_RESOURCES
215# undef USE_XGETDEFAULT 217# undef USE_XGETDEFAULT
216#endif 218#endif
217 219
218#if ISO_14755 220#if defined (ISO_14755) || defined (ENABLE_PERL)
219# define ENABLE_OVERLAY 1 221# define ENABLE_OVERLAY 1
220#endif 222#endif
221 223
222/* now look for other badly set stuff */ 224/* now look for other badly set stuff */
223 225
… …
238# define HAVE_SCROLLBARS 1 240# define HAVE_SCROLLBARS 1
239#endif 241#endif
240 242
241/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 243/* width of scrollBar, menuBar shadow, must be 1 or 2 */
242#ifdef HALFSHADOW 244#ifdef HALFSHADOW
243# define SHADOW 1 245# define MENU_SHADOW 1
244#else 246#else
245# define SHADOW 2 247# define MENU_SHADOW 2
246#endif 248#endif
247 249
248#define R_SB_ALIGN_CENTRE 0 250#define R_SB_ALIGN_CENTRE 0
249#define R_SB_ALIGN_TOP 1 251#define R_SB_ALIGN_TOP 1
250#define R_SB_ALIGN_BOTTOM 2 252#define R_SB_ALIGN_BOTTOM 2
… …
469 URxvt_italicFont = 712, 471 URxvt_italicFont = 712,
470 URxvt_boldItalicFont = 713, 472 URxvt_boldItalicFont = 713,
471 473
472 URxvt_view_up = 720, 474 URxvt_view_up = 720,
473 URxvt_view_down = 721, 475 URxvt_view_down = 721,
476
477 URxvt_perl = 777,
474}; 478};
475 479
476/* Words starting with `Color_' are colours. Others are counts */ 480/* Words starting with `Color_' are colours. Others are counts */
477/* 481/*
478 * The PixColor and rendition colour usage should probably be decoupled 482 * The PixColor and rendition colour usage should probably be decoupled
… …
555 559
556/* 560/*
557 * Resource list 561 * Resource list
558 */ 562 */
559enum { 563enum {
560 Rs_display_name = 0, 564# define def(name) Rs_ ## name,
561 Rs_term_name, 565# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
562 Rs_iconName, 566# include "rsinc.h"
563 Rs_geometry, 567# undef def
564 Rs_reverseVideo, 568# undef reserve
565 Rs_color,
566 _Rs_color = Rs_color + NRS_COLORS - 1,
567 Rs_font,
568#if ENABLE_STYLES
569 Rs_boldFont,
570 Rs_italicFont,
571 Rs_boldItalicFont,
572 Rs_intensityStyles,
573#endif
574 Rs_name,
575 Rs_title,
576#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
577 Rs_path,
578#endif
579#ifdef XPM_BACKGROUND
580 Rs_backgroundPixmap,
581#endif
582#if (MENUBAR_MAX)
583 Rs_menu,
584#endif
585 Rs_loginShell,
586 Rs_jumpScroll,
587#ifdef HAVE_SCROLLBARS
588 Rs_scrollBar,
589 Rs_scrollBar_right,
590 Rs_scrollBar_floating,
591 Rs_scrollBar_align,
592 Rs_scrollstyle, /* Rs_scrollBar_style */
593 Rs_scrollBar_thickness,
594#endif
595 Rs_scrollTtyOutput,
596 Rs_scrollTtyKeypress,
597 Rs_scrollWithBuffer,
598 Rs_saveLines,
599 Rs_utmpInhibit,
600 Rs_visualBell,
601#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
602 Rs_mapAlert,
603#endif
604#ifdef META8_OPTION
605 Rs_meta8,
606#endif
607#ifdef MOUSE_WHEEL
608 Rs_mouseWheelScrollPage,
609#endif
610#ifndef NO_BACKSPACE_KEY
611 Rs_backspace_key,
612#endif
613#ifndef NO_DELETE_KEY
614 Rs_delete_key,
615#endif
616 Rs_selectstyle,
617#ifdef PRINTPIPE
618 Rs_print_pipe,
619#endif
620#ifdef USE_XIM
621 Rs_preeditType,
622 Rs_inputMethod,
623#endif
624#ifdef TRANSPARENT
625 Rs_transparent,
626 Rs_transparent_all,
627#endif
628#if ENABLE_FRILLS
629 Rs_pty_fd,
630 Rs_hold,
631 Rs_ext_bwidth,
632 Rs_int_bwidth,
633 Rs_borderLess,
634 Rs_lineSpace,
635 Rs_cursorUnderline,
636#endif
637#if CURSOR_BLINK
638 Rs_cursorBlink,
639#endif
640#if ENABLE_XEMBED
641 Rs_embed,
642#endif
643 Rs_cutchars,
644 Rs_modifier,
645 Rs_answerbackstring,
646 Rs_tripleclickwords,
647 Rs_insecure,
648 Rs_pointerBlank,
649 Rs_pointerBlankDelay,
650 Rs_imLocale,
651 Rs_imFont,
652 Rs_pastableTabs,
653#ifndef NO_SECONDARY_SCREEN
654 Rs_secondaryScreen,
655 Rs_secondaryScroll,
656#endif
657#ifdef OFF_FOCUS_FADING
658 Rs_fade,
659#endif
660#ifdef TINTING
661 Rs_shade,
662#endif
663 NUM_RESOURCES 569 NUM_RESOURCES
664}; 570};
665 571
666// see init.C:xa_names, which must be kept in sync 572// see init.C:xa_names, which must be kept in sync
667enum { 573enum {
… …
781/* 687/*
782 ***************************************************************************** 688 *****************************************************************************
783 * MACRO DEFINES 689 * MACRO DEFINES
784 ***************************************************************************** 690 *****************************************************************************
785 */ 691 */
786#define memset(x, y, z) memset((x), (y), (size_t)(z))
787#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
788#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
789#define strcasecmp(x, y) strcasecmp((x), (y))
790#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
791#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
792#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
793#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
794#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
795#define strcat(x, y) strcat((char *)(x), (const char *)(y))
796#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
797#define strdup(x) strdup((const char *)(x))
798#define strlen(x) strlen((const char *)(x))
799#define strchr(x, y) strchr((const char *)(x), (int)(y))
800#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
801
802#define dDisp Display *disp = display->display 692#define dDisp Display *disp = display->display
803 693
804/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
805#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
806#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
809#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 699#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
810#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 700#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
811#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
812#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
813 703
814#define TermWin_TotalWidth() ((int32_t)this->width) 704#define OPTION(opt) (options & (opt))
815#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)
816 708
817// for m >= -n, ensure remainder lies between 0..n-1 709// for m >= -n, ensure remainder lies between 0..n-1
818#define MOD(m,n) (((m) + (n)) % (n)) 710#define MOD(m,n) (((m) + (n)) % (n))
819 711
820#define LINENO(n) MOD (term_start + int(n), total_rows) 712#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
880#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 772#define scrollbar_size() (scrollBar.end - scrollBar.beg \
881 - scrollbar_minheight ()) 773 - scrollbar_minheight ())
882 774
883#if (MENUBAR_MAX > 1) 775#if (MENUBAR_MAX > 1)
884/* rendition style flags */ 776/* rendition style flags */
885# define menuBar_height() (fheight + SHADOW) 777# define menuBar_height() (fheight + MENU_SHADOW)
886# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 778# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
887# define isMenuBarWindow(w) ((w) == menuBar.win) 779# define isMenuBarWindow(w) ((w) == menuBar.win)
888#else 780#else
889# define menuBar_height() (0) 781# define menuBar_height() (0)
890# define menuBar_TotalHeight() (0) 782# define menuBar_TotalHeight() (0)
891# define isMenuBarWindow(w) (0) 783# define isMenuBarWindow(w) (0)
… …
947extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 839extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
948extern void rxvt_exit_failure () __attribute__ ((noreturn)); 840extern void rxvt_exit_failure () __attribute__ ((noreturn));
949 841
950#define SET_LOCALE(locale) rxvt_set_locale (locale) 842#define SET_LOCALE(locale) rxvt_set_locale (locale)
951extern 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 ();
952 846
953/*
954 ***************************************************************************** 847/****************************************************************************/
955 * VARIABLES 848
956 *****************************************************************************
957 */
958#ifdef MENUBAR 849#ifdef MENUBAR
959# include "menubar.h" 850# include "menubar.h"
960#endif 851#endif
961 852
962#define BLINK_INTERVAL 0.5 853#define BLINK_INTERVAL 0.5
… …
969# endif 860# endif
970# endif 861# endif
971# define __attribute__(x) 862# define __attribute__(x)
972#endif 863#endif
973 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
974// primivite wrapper around mbstate_t to ensure initialisation 914// primivite wrapper around mbstate_t to ensure initialisation
975struct mbstate { 915struct mbstate {
976 mbstate_t mbs; 916 mbstate_t mbs;
977 917
978 operator mbstate_t *() { return &mbs; } 918 operator mbstate_t *() { return &mbs; }
979 void reset () { memset (&mbs, 0, sizeof (mbs)); } 919 void reset () { memset (&mbs, 0, sizeof (mbs)); }
980 mbstate () { reset (); } 920 mbstate () { reset (); }
981}; 921};
982 922
923/****************************************************************************/
924
983#define UNICODE_MASK 0x1fffffUL 925#define UNICODE_MASK 0x1fffffUL
984 926
985#if UNICODE3 927#if UNICODE3
986# define COMPOSE_LO 0x40000000UL 928# define COMPOSE_LO 0x40000000UL
987# define COMPOSE_HI 0x400fffffUL 929# define COMPOSE_HI 0x400fffffUL
988# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 930# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
989#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
990# define COMPOSE_LO 0xd800UL 936# define COMPOSE_LO 0xd800UL
991# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 937# define COMPOSE_HI 0xf8ffUL
992# 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)
993#endif 940#endif
994 941
995#if ENABLE_COMBINING 942#if ENABLE_COMBINING
996// compose chars are used to represent composite characters 943// compose chars are used to represent composite characters
997// that are not representable in unicode, as well as characters 944// that are not representable in unicode, as well as characters
… …
1017}; 964};
1018 965
1019extern class rxvt_composite_vec rxvt_composite; 966extern class rxvt_composite_vec rxvt_composite;
1020#endif 967#endif
1021 968
969/****************************************************************************/
1022 970
1023#ifdef KEYSYM_RESOURCE 971#ifdef KEYSYM_RESOURCE
1024 class keyboard_manager; 972 class keyboard_manager;
1025#endif 973#endif
1026 974
1027struct rxvt_term : zero_initialized, rxvt_vars { 975struct rxvt_term : zero_initialized, rxvt_vars {
1028 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
1029 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
1030 985
1031 struct mbstate mbstate; // current input multibyte state 986 struct mbstate mbstate; // current input multibyte state
1032 987
1033 unsigned char want_refresh:1, 988 unsigned char want_refresh:1,
1034#ifdef TRANSPARENT 989#ifdef TRANSPARENT
… …
1185 bar_t *CurrentBar; 1140 bar_t *CurrentBar;
1186# if ! (MENUBAR_MAX > 1) 1141# if ! (MENUBAR_MAX > 1)
1187 bar_t BarList; 1142 bar_t BarList;
1188# endif /* (MENUBAR_MAX > 1) */ 1143# endif /* (MENUBAR_MAX > 1) */
1189#endif 1144#endif
1190#ifdef CURSOR_BLINK
1191 struct timeval lastcursorchange;
1192#endif
1193#ifdef POINTER_BLANK
1194 struct timeval lastmotion;
1195#endif
1196 1145
1197#if ENABLE_OVERLAY 1146#if ENABLE_OVERLAY
1198 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1147 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1199 text_t **ov_text; 1148 text_t **ov_text;
1200 rend_t **ov_rend; 1149 rend_t **ov_rend;
… …
1215 char *env_display; /* environmental variable DISPLAY */ 1164 char *env_display; /* environmental variable DISPLAY */
1216 char *env_term; /* environmental variable TERM */ 1165 char *env_term; /* environmental variable TERM */
1217 char *env_colorfgbg; 1166 char *env_colorfgbg;
1218 char *locale; 1167 char *locale;
1219 char charsets[4]; 1168 char charsets[4];
1220 unsigned char *v_buffer; /* pointer to physical buffer */ 1169 char *v_buffer; /* pointer to physical buffer */
1221 unsigned int v_buflen; /* size of area to write */ 1170 unsigned int v_buflen; /* size of area to write */
1222 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1171 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1223 1172
1224#ifdef KEYSYM_RESOURCE 1173#ifdef KEYSYM_RESOURCE
1225 keyboard_manager *keyboard; 1174 keyboard_manager *keyboard;
1226#endif 1175#endif
1227 1176
1228 const char *rs[NUM_RESOURCES]; 1177 const char *rs[NUM_RESOURCES];
1229 /* command input buffering */ 1178 /* command input buffering */
1230 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1179 char *cmdbuf_ptr, *cmdbuf_endp;
1231 unsigned char cmdbuf_base[CBUFSIZ]; 1180 char cmdbuf_base[CBUFSIZ];
1232 1181
1233 rxvt_salloc *talloc; // text line allocator 1182 rxvt_salloc *talloc; // text line allocator
1234 rxvt_salloc *ralloc; // rend line allocator 1183 rxvt_salloc *ralloc; // rend line allocator
1235 1184
1236 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
… …
1245 void iso14755_54 (int x, int y); 1194 void iso14755_54 (int x, int y);
1246# endif 1195# endif
1247#endif 1196#endif
1248 1197
1249 // modifies first argument(!) 1198 // modifies first argument(!)
1250 void paste (unsigned char *data, unsigned int len); 1199 void paste (char *data, unsigned int len);
1251 1200
1252 void flush (); 1201 void flush ();
1253 1202
1254#if TRANSPARENT 1203#if TRANSPARENT
1255 void rootwin_cb (XEvent &xev); 1204 void rootwin_cb (XEvent &xev);
… …
1296 void pointer_blank (); 1245 void pointer_blank ();
1297#endif 1246#endif
1298 void pointer_unblank (); 1247 void pointer_unblank ();
1299 1248
1300 void tt_printf (const char *fmt,...); 1249 void tt_printf (const char *fmt,...);
1301 void tt_write (const unsigned char *data, unsigned int len); 1250 void tt_write (const char *data, unsigned int len);
1302 void pty_write (); 1251 void pty_write ();
1303 1252
1304 void tt_winch (); 1253 void tt_winch ();
1305 1254
1306 rxvt_term (); 1255 rxvt_term ();
… …
1358 1307
1359 /* autoconvert */ 1308 /* autoconvert */
1360 1309
1361 // command.C 1310 // command.C
1362 void lookup_key (XKeyEvent &ev); 1311 void lookup_key (XKeyEvent &ev);
1363 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1312 unsigned int cmd_write (const char *str, unsigned int count);
1364 1313
1365 unicode_t next_char (); 1314 wchar_t next_char ();
1366 unicode_t cmd_getc (); 1315 wchar_t cmd_getc ();
1367 unicode_t next_octet (); 1316 uint32_t next_octet ();
1368 unicode_t cmd_get8 (); 1317 uint32_t cmd_get8 ();
1369 1318
1370 bool cmd_parse (); 1319 bool cmd_parse ();
1371 void mouse_report (XButtonEvent &ev); 1320 void mouse_report (XButtonEvent &ev);
1372 void button_press (XButtonEvent &ev); 1321 void button_press (XButtonEvent &ev);
1373 void button_release (XButtonEvent &ev); 1322 void button_release (XButtonEvent &ev);
… …
1382 void process_nonprinting (unicode_t ch); 1331 void process_nonprinting (unicode_t ch);
1383 void process_escape_vt52 (unicode_t ch); 1332 void process_escape_vt52 (unicode_t ch);
1384 void process_escape_seq (); 1333 void process_escape_seq ();
1385 void process_csi_seq (); 1334 void process_csi_seq ();
1386 void process_window_ops (const int *args, unsigned int nargs); 1335 void process_window_ops (const int *args, unsigned int nargs);
1387 unsigned char *get_to_st (unicode_t &ends_how); 1336 char *get_to_st (unicode_t &ends_how);
1388 void process_dcs_seq (); 1337 void process_dcs_seq ();
1389 void process_osc_seq (); 1338 void process_osc_seq ();
1390 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);
1391 void process_xterm_seq (int op, const char *str, unsigned char resp); 1340 void process_xterm_seq (int op, const char *str, char resp);
1392 int privcases (int mode, unsigned long bit); 1341 int privcases (int mode, unsigned long bit);
1393 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);
1394 void process_sgr_mode (unsigned int nargs, const int *arg); 1343 void process_sgr_mode (unsigned int nargs, const int *arg);
1395 void process_graphics (); 1344 void process_graphics ();
1396 // init.C 1345 // init.C
… …
1500 base += minBrightCOLOR - minCOLOR; 1449 base += minBrightCOLOR - minCOLOR;
1501#endif 1450#endif
1502 return base; 1451 return base;
1503 } 1452 }
1504 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
1505 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);
1506 void scr_blank_screen_mem (line_t &l, rend_t efs); 1468 void scr_blank_screen_mem (line_t &l, rend_t efs);
1507 int scr_scroll_text (int row1, int row2, int count); 1469 int scr_scroll_text (int row1, int row2, int count);
1508 void scr_reset (); 1470 void scr_reset ();
1509 void scr_release (); 1471 void scr_release ();
… …
1519 void scr_touch (bool refresh); 1481 void scr_touch (bool refresh);
1520 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);
1521 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1483 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1522 void scr_recolour (); 1484 void scr_recolour ();
1523 void scr_remap_chars (); 1485 void scr_remap_chars ();
1524 void scr_remap_chars (const line_t &l); 1486 void scr_remap_chars (line_t &l);
1525 1487
1526 void scr_poweron (); 1488 void scr_poweron ();
1527 void scr_cursor (int mode); 1489 void scr_cursor (int mode);
1528 void scr_do_wrap (); 1490 void scr_do_wrap ();
1529 int scr_change_screen (int scrn); 1491 int scr_change_screen (int scrn);
1530 void scr_color (unsigned int color, int fgbg); 1492 void scr_color (unsigned int color, int fgbg);
1531 void scr_rendition (int set, int style); 1493 void scr_rendition (int set, int style);
1532 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);
1533 void scr_backspace (); 1495 void scr_backspace ();
1534 void scr_tab (int count, bool ht = false); 1496 void scr_tab (int count, bool ht = false);
1535 void scr_gotorc (int row, int col, int relative); 1497 void scr_gotorc (int row, int col, int relative);
1536 void scr_index (enum page_dirn direction); 1498 void scr_index (enum page_dirn direction);
1537 void scr_erase_line (int mode); 1499 void scr_erase_line (int mode);
… …
1561 void selection_property (Window win, Atom prop); 1523 void selection_property (Window win, Atom prop);
1562 void selection_request (Time tm, int x, int y); 1524 void selection_request (Time tm, int x, int y);
1563 int selection_request_other (Atom target, int selnum); 1525 int selection_request_other (Atom target, int selnum);
1564 void selection_clear (); 1526 void selection_clear ();
1565 void selection_make (Time tm); 1527 void selection_make (Time tm);
1528 bool selection_grab (Time tm);
1566 void selection_start_colrow (int col, int row); 1529 void selection_start_colrow (int col, int row);
1567 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);
1568 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);
1569 void selection_remove_trailing_spaces (); 1532 void selection_remove_trailing_spaces ();
1570 void selection_send (const XSelectionRequestEvent &rq); 1533 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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