ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.179 by root, Mon Jan 2 15:10:18 2006 UTC vs.
Revision 1.197 by root, Wed Jan 11 05:29:40 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
… …
209 211
210#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
211# define NO_MOUSE_REPORT_SCROLLBAR 1 213# define NO_MOUSE_REPORT_SCROLLBAR 1
212#endif 214#endif
213 215
214#ifdef NO_RESOURCES 216#if defined (ISO_14755) || defined (ENABLE_PERL)
215# undef USE_XGETDEFAULT
216#endif
217
218#if ISO_14755
219# define ENABLE_OVERLAY 1 217# define ENABLE_OVERLAY 1
220#endif 218#endif
221 219
222/* now look for other badly set stuff */ 220/* now look for other badly set stuff */
223 221
… …
238# define HAVE_SCROLLBARS 1 236# define HAVE_SCROLLBARS 1
239#endif 237#endif
240 238
241/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 239/* width of scrollBar, menuBar shadow, must be 1 or 2 */
242#ifdef HALFSHADOW 240#ifdef HALFSHADOW
243# define SHADOW 1 241# define MENU_SHADOW 1
244#else 242#else
245# define SHADOW 2 243# define MENU_SHADOW 2
246#endif 244#endif
247 245
248#define R_SB_ALIGN_CENTRE 0 246#define R_SB_ALIGN_CENTRE 0
249#define R_SB_ALIGN_TOP 1 247#define R_SB_ALIGN_TOP 1
250#define R_SB_ALIGN_BOTTOM 2 248#define R_SB_ALIGN_BOTTOM 2
… …
436 XTerm_property = 3, // change X property 434 XTerm_property = 3, // change X property
437 XTerm_Color = 4, // change colors 435 XTerm_Color = 4, // change colors
438 XTerm_Color00 = 10, // not implemented, CLASH! 436 XTerm_Color00 = 10, // not implemented, CLASH!
439 XTerm_Color01 = 11, // not implemented 437 XTerm_Color01 = 11, // not implemented
440 XTerm_Color_cursor = 12, // change actual 'Cursor' color 438 XTerm_Color_cursor = 12, // change actual 'Cursor' color
441 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 439 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
442 XTerm_Color_pointer_bg = 14, // not implemented 440 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
443 XTerm_Color05 = 15, // not implemented 441 XTerm_Color05 = 15, // not implemented (tektronix fg)
444 XTerm_Color06 = 16, // not implemented 442 XTerm_Color06 = 16, // not implemented (tektronix bg)
445 XTerm_Color_RV = 17, // change actual 'Highlight' color 443 XTerm_Color_RV = 17, // change actual 'Highlight' color
446 XTerm_logfile = 46, // not implemented 444 XTerm_logfile = 46, // not implemented
447 XTerm_font = 50, 445 XTerm_font = 50,
448 446
449 XTerm_konsole30 = 30, // reserved for konsole 447 XTerm_konsole30 = 30, // reserved for konsole
450 XTerm_konsole31 = 31, // reserved for konsole 448 XTerm_konsole31 = 31, // reserved for konsole
451 XTerm_emacs51 = 51, // reserved for emacs shell 449 XTerm_emacs51 = 51, // reserved for emacs shell
452 /* 450 /*
453 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 451 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
452 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
454 */ 453 */
455 XTerm_Color_BD = 18, // change actual 'Bold' color 454 Rxvt_Color_BD = 18, // change actual 'Bold' color
456 XTerm_Color_UL = 19, // change actual 'Underline' color 455 Rxvt_Color_UL = 19, // change actual 'Underline' color
457 XTerm_Pixmap = 20, // new bg pixmap 456 Rxvt_Pixmap = 20, // new bg pixmap
458 XTerm_restoreFG = 39, // change default fg color 457 Rxvt_restoreFG = 39, // change default fg color
459 XTerm_restoreBG = 49, // change default bg color 458 Rxvt_restoreBG = 49, // change default bg color
460 XTerm_dumpscreen = 55, // dump scrollback and all of screen 459 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
461 460
462 URxvt_locale = 701, // change locale 461 URxvt_locale = 701, // change locale
463 URxvt_Menu = 703, // set menu item 462 URxvt_Menu = 703, // set menu item
464 URxvt_Color_IT = 704, // change actual 'Italic' colour 463 URxvt_Color_IT = 704, // change actual 'Italic' colour
465 URxvt_Color_tint = 705, // change actual tint colour 464 URxvt_Color_tint = 705, // change actual tint colour
465 URxvt_Color_BD = 706,
466 URxvt_Color_UL = 707,
466 467
467 URxvt_font = 710, 468 URxvt_font = 710,
468 URxvt_boldFont = 711, 469 URxvt_boldFont = 711,
469 URxvt_italicFont = 712, 470 URxvt_italicFont = 712,
470 URxvt_boldItalicFont = 713, 471 URxvt_boldItalicFont = 713,
471 472
472 URxvt_view_up = 720, 473 URxvt_view_up = 720,
473 URxvt_view_down = 721, 474 URxvt_view_down = 721,
475
476 URxvt_perl = 777,
474}; 477};
475 478
476/* Words starting with `Color_' are colours. Others are counts */ 479/* Words starting with `Color_' are colours. Others are counts */
477/* 480/*
478 * The PixColor and rendition colour usage should probably be decoupled 481 * The PixColor and rendition colour usage should probably be decoupled
… …
555 558
556/* 559/*
557 * Resource list 560 * Resource list
558 */ 561 */
559enum { 562enum {
560 Rs_display_name = 0, 563# define def(name) Rs_ ## name,
561 Rs_term_name, 564# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
562 Rs_iconName, 565# include "rsinc.h"
563 Rs_geometry, 566# undef def
564 Rs_reverseVideo, 567# 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 568 NUM_RESOURCES
664}; 569};
665 570
666// see init.C:xa_names, which must be kept in sync 571// see init.C:xa_names, which must be kept in sync
667enum { 572enum {
… …
781/* 686/*
782 ***************************************************************************** 687 *****************************************************************************
783 * MACRO DEFINES 688 * MACRO DEFINES
784 ***************************************************************************** 689 *****************************************************************************
785 */ 690 */
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 691#define dDisp Display *disp = display->display
803 692
804/* convert pixel dimensions to row/column values. Everything as int32_t */ 693/* convert pixel dimensions to row/column values. Everything as int32_t */
805#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 694#define Pixel2Col(x) Pixel2Width((int32_t)(x))
806#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 695#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
809#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 698#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
810#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 699#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
811#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 700#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
812#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 701#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
813 702
814#define TermWin_TotalWidth() ((int32_t)this->width) 703#define TEMP_ENV temp_environ temp_environ (envv)
815#define TermWin_TotalHeight() ((int32_t)this->height) 704
705#define OPTION(opt) (options & (opt))
706#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
707 | Opt_jumpScroll | Opt_secondaryScreen \
708 | Opt_pastableTabs | Opt_intensityStyles)
816 709
817// for m >= -n, ensure remainder lies between 0..n-1 710// for m >= -n, ensure remainder lies between 0..n-1
818#define MOD(m,n) (((m) + (n)) % (n)) 711#define MOD(m,n) (((m) + (n)) % (n))
819 712
820#define LINENO(n) MOD (term_start + int(n), total_rows) 713#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
880#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 773#define scrollbar_size() (scrollBar.end - scrollBar.beg \
881 - scrollbar_minheight ()) 774 - scrollbar_minheight ())
882 775
883#if (MENUBAR_MAX > 1) 776#if (MENUBAR_MAX > 1)
884/* rendition style flags */ 777/* rendition style flags */
885# define menuBar_height() (fheight + SHADOW) 778# define menuBar_height() (fheight + MENU_SHADOW)
886# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 779# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
887# define isMenuBarWindow(w) ((w) == menuBar.win) 780# define isMenuBarWindow(w) ((w) == menuBar.win)
888#else 781#else
889# define menuBar_height() (0) 782# define menuBar_height() (0)
890# define menuBar_TotalHeight() (0) 783# define menuBar_TotalHeight() (0)
891# define isMenuBarWindow(w) (0) 784# define isMenuBarWindow(w) (0)
… …
947extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 840extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
948extern void rxvt_exit_failure () __attribute__ ((noreturn)); 841extern void rxvt_exit_failure () __attribute__ ((noreturn));
949 842
950#define SET_LOCALE(locale) rxvt_set_locale (locale) 843#define SET_LOCALE(locale) rxvt_set_locale (locale)
951extern bool rxvt_set_locale (const char *locale); 844extern bool rxvt_set_locale (const char *locale);
845extern void rxvt_push_locale (const char *locale);
846extern void rxvt_pop_locale ();
952 847
953/*
954 ***************************************************************************** 848/****************************************************************************/
955 * VARIABLES 849
956 *****************************************************************************
957 */
958#ifdef MENUBAR 850#ifdef MENUBAR
959# include "menubar.h" 851# include "menubar.h"
960#endif 852#endif
961 853
962#define BLINK_INTERVAL 0.5 854#define BLINK_INTERVAL 0.5
… …
969# endif 861# endif
970# endif 862# endif
971# define __attribute__(x) 863# define __attribute__(x)
972#endif 864#endif
973 865
866/****************************************************************************/
867
868#define LINE_LONGER 0x0001 // line is continued on the next row
869#define LINE_FILTERED 0x0002 // line has been filtered
870#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
871
872struct line_t {
873 text_t *t; // terminal the text
874 rend_t *r; // rendition, uses RS_ flags
875 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
876 uint32_t f; // flags
877
878 bool is_longer ()
879 {
880 return f & LINE_LONGER;
881 }
882
883 void is_longer (int set)
884 {
885 if (set)
886 f |= LINE_LONGER;
887 else
888 f &= ~LINE_LONGER;
889 }
890
891 void clear ()
892 {
893 t = 0;
894 r = 0;
895 l = 0;
896 f = 0;
897 }
898
899 void touch () // call whenever a line is changed/touched/updated
900 {
901#if ENABLE_PERL
902 f &= ~LINE_FILTERED;
903#endif
904 }
905
906 void touch (int col)
907 {
908 max_it (l, col);
909 touch ();
910 }
911};
912
913/****************************************************************************/
914
974// primivite wrapper around mbstate_t to ensure initialisation 915// primivite wrapper around mbstate_t to ensure initialisation
975struct mbstate { 916struct mbstate {
976 mbstate_t mbs; 917 mbstate_t mbs;
977 918
978 operator mbstate_t *() { return &mbs; } 919 operator mbstate_t *() { return &mbs; }
979 void reset () { memset (&mbs, 0, sizeof (mbs)); } 920 void reset () { memset (&mbs, 0, sizeof (mbs)); }
980 mbstate () { reset (); } 921 mbstate () { reset (); }
981}; 922};
982 923
924/****************************************************************************/
925
983#define UNICODE_MASK 0x1fffffUL 926#define UNICODE_MASK 0x1fffffUL
984 927
985#if UNICODE3 928#if UNICODE3
986# define COMPOSE_LO 0x40000000UL 929# define COMPOSE_LO 0x40000000UL
987# define COMPOSE_HI 0x400fffffUL 930# define COMPOSE_HI 0x400fffffUL
988# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 931# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
989#else 932#else
933# if ENABLE_PERL
934# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
935# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
936# else
990# define COMPOSE_LO 0xd800UL 937# define COMPOSE_LO 0xd800UL
991# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 938# define COMPOSE_HI 0xf8ffUL
992# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 939# endif
940# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
993#endif 941#endif
994 942
995#if ENABLE_COMBINING 943#if ENABLE_COMBINING
996// compose chars are used to represent composite characters 944// compose chars are used to represent composite characters
997// that are not representable in unicode, as well as characters 945// that are not representable in unicode, as well as characters
… …
1017}; 965};
1018 966
1019extern class rxvt_composite_vec rxvt_composite; 967extern class rxvt_composite_vec rxvt_composite;
1020#endif 968#endif
1021 969
970/****************************************************************************/
1022 971
1023#ifdef KEYSYM_RESOURCE 972#ifdef KEYSYM_RESOURCE
1024 class keyboard_manager; 973 class keyboard_manager;
1025#endif 974#endif
1026 975
1027struct rxvt_term : zero_initialized, rxvt_vars { 976struct rxvt_term : zero_initialized, rxvt_vars {
1028 log_callback *log_hook; // log error messages through this hook, if != 0 977 log_callback *log_hook; // log error messages through this hook, if != 0
1029 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 978 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1030 979#if ENABLE_PERL
980 rxvt_perl_term perl;
981#endif
1031 struct mbstate mbstate; // current input multibyte state 982 struct mbstate mbstate; // current input multibyte state
1032 983
1033 unsigned char want_refresh:1, 984 unsigned char want_refresh:1,
1034#ifdef TRANSPARENT 985#ifdef TRANSPARENT
1035 want_full_refresh:1, /* awaiting full screen refresh */ 986 want_full_refresh:1, /* awaiting full screen refresh */
… …
1185 bar_t *CurrentBar; 1136 bar_t *CurrentBar;
1186# if ! (MENUBAR_MAX > 1) 1137# if ! (MENUBAR_MAX > 1)
1187 bar_t BarList; 1138 bar_t BarList;
1188# endif /* (MENUBAR_MAX > 1) */ 1139# endif /* (MENUBAR_MAX > 1) */
1189#endif 1140#endif
1190#ifdef CURSOR_BLINK
1191 struct timeval lastcursorchange;
1192#endif
1193#ifdef POINTER_BLANK
1194 struct timeval lastmotion;
1195#endif
1196 1141
1197#if ENABLE_OVERLAY 1142#if ENABLE_OVERLAY
1198 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1143 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1199 text_t **ov_text; 1144 text_t **ov_text;
1200 rend_t **ov_rend; 1145 rend_t **ov_rend;
… …
1215 char *env_display; /* environmental variable DISPLAY */ 1160 char *env_display; /* environmental variable DISPLAY */
1216 char *env_term; /* environmental variable TERM */ 1161 char *env_term; /* environmental variable TERM */
1217 char *env_colorfgbg; 1162 char *env_colorfgbg;
1218 char *locale; 1163 char *locale;
1219 char charsets[4]; 1164 char charsets[4];
1220 unsigned char *v_buffer; /* pointer to physical buffer */ 1165 char *v_buffer; /* pointer to physical buffer */
1221 unsigned int v_buflen; /* size of area to write */ 1166 unsigned int v_buflen; /* size of area to write */
1222 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1167 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1223 1168
1224#ifdef KEYSYM_RESOURCE 1169#ifdef KEYSYM_RESOURCE
1225 keyboard_manager *keyboard; 1170 keyboard_manager *keyboard;
1226#endif 1171#endif
1227 1172
1228 const char *rs[NUM_RESOURCES]; 1173 const char *rs[NUM_RESOURCES];
1229 /* command input buffering */ 1174 /* command input buffering */
1230 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1175 char *cmdbuf_ptr, *cmdbuf_endp;
1231 unsigned char cmdbuf_base[CBUFSIZ]; 1176 char cmdbuf_base[CBUFSIZ];
1232 1177
1233 rxvt_salloc *talloc; // text line allocator 1178 rxvt_salloc *talloc; // text line allocator
1234 rxvt_salloc *ralloc; // rend line allocator 1179 rxvt_salloc *ralloc; // rend line allocator
1235 1180
1236 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1181 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1245 void iso14755_54 (int x, int y); 1190 void iso14755_54 (int x, int y);
1246# endif 1191# endif
1247#endif 1192#endif
1248 1193
1249 // modifies first argument(!) 1194 // modifies first argument(!)
1250 void paste (unsigned char *data, unsigned int len); 1195 void paste (char *data, unsigned int len);
1251 1196
1252 void flush (); 1197 void flush ();
1253 1198
1254#if TRANSPARENT 1199#if TRANSPARENT
1255 void rootwin_cb (XEvent &xev); 1200 void rootwin_cb (XEvent &xev);
… …
1296 void pointer_blank (); 1241 void pointer_blank ();
1297#endif 1242#endif
1298 void pointer_unblank (); 1243 void pointer_unblank ();
1299 1244
1300 void tt_printf (const char *fmt,...); 1245 void tt_printf (const char *fmt,...);
1301 void tt_write (const unsigned char *data, unsigned int len); 1246 void tt_write (const char *data, unsigned int len);
1302 void pty_write (); 1247 void pty_write ();
1303 1248
1304 void tt_winch (); 1249 void tt_winch ();
1305 1250
1306 rxvt_term (); 1251 rxvt_term ();
… …
1314 1259
1315 bool pty_fill (); 1260 bool pty_fill ();
1316 1261
1317 void init_secondary (); 1262 void init_secondary ();
1318 const char **init_resources (int argc, const char *const *argv); 1263 const char **init_resources (int argc, const char *const *argv);
1264 const char *x_resource (const char *name);
1319 void init_env (); 1265 void init_env ();
1320 void set_locale (const char *locale); 1266 void set_locale (const char *locale);
1321 void init_xlocale (); 1267 void init_xlocale ();
1322 void init_command (const char *const *argv); 1268 void init_command (const char *const *argv);
1323 void run_command (const char *const *argv); 1269 void run_command (const char *const *argv);
… …
1358 1304
1359 /* autoconvert */ 1305 /* autoconvert */
1360 1306
1361 // command.C 1307 // command.C
1362 void lookup_key (XKeyEvent &ev); 1308 void lookup_key (XKeyEvent &ev);
1363 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1309 unsigned int cmd_write (const char *str, unsigned int count);
1364 1310
1365 unicode_t next_char (); 1311 wchar_t next_char ();
1366 unicode_t cmd_getc (); 1312 wchar_t cmd_getc ();
1367 unicode_t next_octet (); 1313 uint32_t next_octet ();
1368 unicode_t cmd_get8 (); 1314 uint32_t cmd_get8 ();
1369 1315
1370 bool cmd_parse (); 1316 bool cmd_parse ();
1371 void mouse_report (XButtonEvent &ev); 1317 void mouse_report (XButtonEvent &ev);
1372 void button_press (XButtonEvent &ev); 1318 void button_press (XButtonEvent &ev);
1373 void button_release (XButtonEvent &ev); 1319 void button_release (XButtonEvent &ev);
… …
1382 void process_nonprinting (unicode_t ch); 1328 void process_nonprinting (unicode_t ch);
1383 void process_escape_vt52 (unicode_t ch); 1329 void process_escape_vt52 (unicode_t ch);
1384 void process_escape_seq (); 1330 void process_escape_seq ();
1385 void process_csi_seq (); 1331 void process_csi_seq ();
1386 void process_window_ops (const int *args, unsigned int nargs); 1332 void process_window_ops (const int *args, unsigned int nargs);
1387 unsigned char *get_to_st (unicode_t &ends_how); 1333 char *get_to_st (unicode_t &ends_how);
1388 void process_dcs_seq (); 1334 void process_dcs_seq ();
1389 void process_osc_seq (); 1335 void process_osc_seq ();
1390 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1336 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); 1337 void process_xterm_seq (int op, const char *str, char resp);
1392 int privcases (int mode, unsigned long bit); 1338 int privcases (int mode, unsigned long bit);
1393 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1339 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); 1340 void process_sgr_mode (unsigned int nargs, const int *arg);
1395 void process_graphics (); 1341 void process_graphics ();
1396 // init.C 1342 // init.C
… …
1500 base += minBrightCOLOR - minCOLOR; 1446 base += minBrightCOLOR - minCOLOR;
1501#endif 1447#endif
1502 return base; 1448 return base;
1503 } 1449 }
1504 1450
1451 bool option (uint32_t opt)
1452 {
1453 return OPTION (opt);
1454 }
1455
1456 void set_option (uint32_t opt, bool set)
1457 {
1458 if (set)
1459 options |= opt;
1460 else
1461 options &= ~opt;
1462 }
1463
1505 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1464 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); 1465 void scr_blank_screen_mem (line_t &l, rend_t efs);
1507 int scr_scroll_text (int row1, int row2, int count); 1466 int scr_scroll_text (int row1, int row2, int count);
1508 void scr_reset (); 1467 void scr_reset ();
1509 void scr_release (); 1468 void scr_release ();
… …
1519 void scr_touch (bool refresh); 1478 void scr_touch (bool refresh);
1520 void scr_expose (int x, int y, int width, int height, bool refresh); 1479 void scr_expose (int x, int y, int width, int height, bool refresh);
1521 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1480 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1522 void scr_recolour (); 1481 void scr_recolour ();
1523 void scr_remap_chars (); 1482 void scr_remap_chars ();
1524 void scr_remap_chars (const line_t &l); 1483 void scr_remap_chars (line_t &l);
1525 1484
1526 void scr_poweron (); 1485 void scr_poweron ();
1527 void scr_cursor (int mode); 1486 void scr_cursor (int mode);
1528 void scr_do_wrap (); 1487 void scr_do_wrap ();
1529 int scr_change_screen (int scrn); 1488 int scr_change_screen (int scrn);
1530 void scr_color (unsigned int color, int fgbg); 1489 void scr_color (unsigned int color, int fgbg);
1531 void scr_rendition (int set, int style); 1490 void scr_rendition (int set, int style);
1532 void scr_add_lines (const unicode_t *str, int nlines, int len); 1491 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1533 void scr_backspace (); 1492 void scr_backspace ();
1534 void scr_tab (int count, bool ht = false); 1493 void scr_tab (int count, bool ht = false);
1535 void scr_gotorc (int row, int col, int relative); 1494 void scr_gotorc (int row, int col, int relative);
1536 void scr_index (enum page_dirn direction); 1495 void scr_index (enum page_dirn direction);
1537 void scr_erase_line (int mode); 1496 void scr_erase_line (int mode);
… …
1552 int scr_move_to (int y, int len); 1511 int scr_move_to (int y, int len);
1553 int scr_page (enum page_dirn direction, int nlines); 1512 int scr_page (enum page_dirn direction, int nlines);
1554 int scr_changeview (unsigned int oldviewstart); 1513 int scr_changeview (unsigned int oldviewstart);
1555 void scr_bell (); 1514 void scr_bell ();
1556 void scr_printscreen (int fullhist); 1515 void scr_printscreen (int fullhist);
1516 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1517 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1557 void scr_reverse_selection (); 1518 void scr_reverse_selection ();
1558 void scr_dump (int fd); 1519 void scr_dump (int fd);
1559 void selection_check (int check_more); 1520 void selection_check (int check_more);
1560 void selection_paste (Window win, Atom prop, bool delete_prop); 1521 void selection_paste (Window win, Atom prop, bool delete_prop);
1561 void selection_property (Window win, Atom prop); 1522 void selection_property (Window win, Atom prop);
1562 void selection_request (Time tm, int x, int y); 1523 void selection_request (Time tm, int x, int y);
1563 int selection_request_other (Atom target, int selnum); 1524 int selection_request_other (Atom target, int selnum);
1564 void selection_clear (); 1525 void selection_clear ();
1565 void selection_make (Time tm); 1526 void selection_make (Time tm);
1527 bool selection_grab (Time tm);
1566 void selection_start_colrow (int col, int row); 1528 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); 1529 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); 1530 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1569 void selection_remove_trailing_spaces (); 1531 void selection_remove_trailing_spaces ();
1570 void selection_send (const XSelectionRequestEvent &rq); 1532 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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