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.180 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.198 by root, Thu Jan 12 00:35:39 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
111char * rxvt_File_find (const char *file, const char *ext, const char *path); 113char * rxvt_File_find (const char *file, const char *ext, const char *path);
112void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 114void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
113void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 115void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
114void rxvt_usleep (int usecs); 116void rxvt_usleep (int usecs);
115 117
118/////////////////////////////////////////////////////////////////////////////
119
120// temporarily replace the process environment
121extern char **environ;
122extern char **rxvt_environ; // the original environ pointer
123
124struct temp_environ
125{
126 char **prev;
127
128 temp_environ (const stringvec *envv)
129 : prev(environ)
130 {
131 if (envv)
132 environ = (char **)envv->begin ();
133 }
134
135 temp_environ (char **env)
136 : prev(environ)
137 {
138 if (env)
139 environ = env;
140 }
141
142 ~temp_environ ()
143 {
144 environ = prev;
145 }
146};
147
148#define TEMP_ENV temp_environ temp_environ (envv)
149
116/* 150/*
117 ***************************************************************************** 151 *****************************************************************************
118 * STRUCTURES AND TYPEDEFS 152 * STRUCTURES AND TYPEDEFS
119 ***************************************************************************** 153 *****************************************************************************
120 */ 154 */
209 243
210#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 244#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
211# define NO_MOUSE_REPORT_SCROLLBAR 1 245# define NO_MOUSE_REPORT_SCROLLBAR 1
212#endif 246#endif
213 247
214#ifdef NO_RESOURCES
215# undef USE_XGETDEFAULT
216#endif
217
218#if defined (ISO_14755) || defined (ENABLE_PERL) 248#if defined (ISO_14755) || defined (ENABLE_PERL)
219# define ENABLE_OVERLAY 1 249# define ENABLE_OVERLAY 1
220#endif 250#endif
221 251
222/* now look for other badly set stuff */ 252/* now look for other badly set stuff */
238# define HAVE_SCROLLBARS 1 268# define HAVE_SCROLLBARS 1
239#endif 269#endif
240 270
241/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 271/* width of scrollBar, menuBar shadow, must be 1 or 2 */
242#ifdef HALFSHADOW 272#ifdef HALFSHADOW
243# define SHADOW 1 273# define MENU_SHADOW 1
244#else 274#else
245# define SHADOW 2 275# define MENU_SHADOW 2
246#endif 276#endif
247 277
248#define R_SB_ALIGN_CENTRE 0 278#define R_SB_ALIGN_CENTRE 0
249#define R_SB_ALIGN_TOP 1 279#define R_SB_ALIGN_TOP 1
250#define R_SB_ALIGN_BOTTOM 2 280#define R_SB_ALIGN_BOTTOM 2
436 XTerm_property = 3, // change X property 466 XTerm_property = 3, // change X property
437 XTerm_Color = 4, // change colors 467 XTerm_Color = 4, // change colors
438 XTerm_Color00 = 10, // not implemented, CLASH! 468 XTerm_Color00 = 10, // not implemented, CLASH!
439 XTerm_Color01 = 11, // not implemented 469 XTerm_Color01 = 11, // not implemented
440 XTerm_Color_cursor = 12, // change actual 'Cursor' color 470 XTerm_Color_cursor = 12, // change actual 'Cursor' color
441 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 471 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
442 XTerm_Color_pointer_bg = 14, // not implemented 472 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
443 XTerm_Color05 = 15, // not implemented 473 XTerm_Color05 = 15, // not implemented (tektronix fg)
444 XTerm_Color06 = 16, // not implemented 474 XTerm_Color06 = 16, // not implemented (tektronix bg)
445 XTerm_Color_RV = 17, // change actual 'Highlight' color 475 XTerm_Color_RV = 17, // change actual 'Highlight' color
446 XTerm_logfile = 46, // not implemented 476 XTerm_logfile = 46, // not implemented
447 XTerm_font = 50, 477 XTerm_font = 50,
448 478
449 XTerm_konsole30 = 30, // reserved for konsole 479 XTerm_konsole30 = 30, // reserved for konsole
450 XTerm_konsole31 = 31, // reserved for konsole 480 XTerm_konsole31 = 31, // reserved for konsole
451 XTerm_emacs51 = 51, // reserved for emacs shell 481 XTerm_emacs51 = 51, // reserved for emacs shell
452 /* 482 /*
453 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 483 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
484 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
454 */ 485 */
455 XTerm_Color_BD = 18, // change actual 'Bold' color 486 Rxvt_Color_BD = 18, // change actual 'Bold' color
456 XTerm_Color_UL = 19, // change actual 'Underline' color 487 Rxvt_Color_UL = 19, // change actual 'Underline' color
457 XTerm_Pixmap = 20, // new bg pixmap 488 Rxvt_Pixmap = 20, // new bg pixmap
458 XTerm_restoreFG = 39, // change default fg color 489 Rxvt_restoreFG = 39, // change default fg color
459 XTerm_restoreBG = 49, // change default bg color 490 Rxvt_restoreBG = 49, // change default bg color
460 XTerm_dumpscreen = 55, // dump scrollback and all of screen 491 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
461 492
462 URxvt_locale = 701, // change locale 493 URxvt_locale = 701, // change locale
463 URxvt_Menu = 703, // set menu item 494 URxvt_Menu = 703, // set menu item
464 URxvt_Color_IT = 704, // change actual 'Italic' colour 495 URxvt_Color_IT = 704, // change actual 'Italic' colour
465 URxvt_Color_tint = 705, // change actual tint colour 496 URxvt_Color_tint = 705, // change actual tint colour
497 URxvt_Color_BD = 706,
498 URxvt_Color_UL = 707,
466 499
467 URxvt_font = 710, 500 URxvt_font = 710,
468 URxvt_boldFont = 711, 501 URxvt_boldFont = 711,
469 URxvt_italicFont = 712, 502 URxvt_italicFont = 712,
470 URxvt_boldItalicFont = 713, 503 URxvt_boldItalicFont = 713,
471 504
472 URxvt_view_up = 720, 505 URxvt_view_up = 720,
473 URxvt_view_down = 721, 506 URxvt_view_down = 721,
507
508 URxvt_perl = 777,
474}; 509};
475 510
476/* Words starting with `Color_' are colours. Others are counts */ 511/* Words starting with `Color_' are colours. Others are counts */
477/* 512/*
478 * The PixColor and rendition colour usage should probably be decoupled 513 * The PixColor and rendition colour usage should probably be decoupled
555 590
556/* 591/*
557 * Resource list 592 * Resource list
558 */ 593 */
559enum { 594enum {
560 Rs_display_name = 0, 595# define def(name) Rs_ ## name,
561 Rs_term_name, 596# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
562 Rs_iconName, 597# include "rsinc.h"
563 Rs_geometry, 598# undef def
564 Rs_reverseVideo, 599# 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 600 NUM_RESOURCES
664}; 601};
665 602
666// see init.C:xa_names, which must be kept in sync 603// see init.C:xa_names, which must be kept in sync
667enum { 604enum {
781/* 718/*
782 ***************************************************************************** 719 *****************************************************************************
783 * MACRO DEFINES 720 * MACRO DEFINES
784 ***************************************************************************** 721 *****************************************************************************
785 */ 722 */
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 723#define dDisp Display *disp = display->display
803 724
804/* convert pixel dimensions to row/column values. Everything as int32_t */ 725/* convert pixel dimensions to row/column values. Everything as int32_t */
805#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 726#define Pixel2Col(x) Pixel2Width((int32_t)(x))
806#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 727#define Pixel2Row(y) Pixel2Height((int32_t)(y))
809#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 730#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
810#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 731#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
811#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 732#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
812#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 733#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
813 734
814#define TermWin_TotalWidth() ((int32_t)this->width) 735#define OPTION(opt) (options & (opt))
815#define TermWin_TotalHeight() ((int32_t)this->height) 736#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
737 | Opt_jumpScroll | Opt_secondaryScreen \
738 | Opt_pastableTabs | Opt_intensityStyles)
816 739
817// for m >= -n, ensure remainder lies between 0..n-1 740// for m >= -n, ensure remainder lies between 0..n-1
818#define MOD(m,n) (((m) + (n)) % (n)) 741#define MOD(m,n) (((m) + (n)) % (n))
819 742
820#define LINENO(n) MOD (term_start + int(n), total_rows) 743#define LINENO(n) MOD (term_start + int(n), total_rows)
880#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 803#define scrollbar_size() (scrollBar.end - scrollBar.beg \
881 - scrollbar_minheight ()) 804 - scrollbar_minheight ())
882 805
883#if (MENUBAR_MAX > 1) 806#if (MENUBAR_MAX > 1)
884/* rendition style flags */ 807/* rendition style flags */
885# define menuBar_height() (fheight + SHADOW) 808# define menuBar_height() (fheight + MENU_SHADOW)
886# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 809# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
887# define isMenuBarWindow(w) ((w) == menuBar.win) 810# define isMenuBarWindow(w) ((w) == menuBar.win)
888#else 811#else
889# define menuBar_height() (0) 812# define menuBar_height() (0)
890# define menuBar_TotalHeight() (0) 813# define menuBar_TotalHeight() (0)
891# define isMenuBarWindow(w) (0) 814# define isMenuBarWindow(w) (0)
947extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 870extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
948extern void rxvt_exit_failure () __attribute__ ((noreturn)); 871extern void rxvt_exit_failure () __attribute__ ((noreturn));
949 872
950#define SET_LOCALE(locale) rxvt_set_locale (locale) 873#define SET_LOCALE(locale) rxvt_set_locale (locale)
951extern bool rxvt_set_locale (const char *locale); 874extern bool rxvt_set_locale (const char *locale);
875extern void rxvt_push_locale (const char *locale);
876extern void rxvt_pop_locale ();
952 877
953/*
954 ***************************************************************************** 878/****************************************************************************/
955 * VARIABLES 879
956 *****************************************************************************
957 */
958#ifdef MENUBAR 880#ifdef MENUBAR
959# include "menubar.h" 881# include "menubar.h"
960#endif 882#endif
961 883
962#define BLINK_INTERVAL 0.5 884#define BLINK_INTERVAL 0.5
969# endif 891# endif
970# endif 892# endif
971# define __attribute__(x) 893# define __attribute__(x)
972#endif 894#endif
973 895
896/****************************************************************************/
897
898#define LINE_LONGER 0x0001 // line is continued on the next row
899#define LINE_FILTERED 0x0002 // line has been filtered
900#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
901
902struct line_t {
903 text_t *t; // terminal the text
904 rend_t *r; // rendition, uses RS_ flags
905 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
906 uint32_t f; // flags
907
908 bool is_longer ()
909 {
910 return f & LINE_LONGER;
911 }
912
913 void is_longer (int set)
914 {
915 if (set)
916 f |= LINE_LONGER;
917 else
918 f &= ~LINE_LONGER;
919 }
920
921 void clear ()
922 {
923 t = 0;
924 r = 0;
925 l = 0;
926 f = 0;
927 }
928
929 void touch () // call whenever a line is changed/touched/updated
930 {
931#if ENABLE_PERL
932 f &= ~LINE_FILTERED;
933#endif
934 }
935
936 void touch (int col)
937 {
938 max_it (l, col);
939 touch ();
940 }
941};
942
943/****************************************************************************/
944
974// primivite wrapper around mbstate_t to ensure initialisation 945// primivite wrapper around mbstate_t to ensure initialisation
975struct mbstate { 946struct mbstate {
976 mbstate_t mbs; 947 mbstate_t mbs;
977 948
978 operator mbstate_t *() { return &mbs; } 949 operator mbstate_t *() { return &mbs; }
979 void reset () { memset (&mbs, 0, sizeof (mbs)); } 950 void reset () { memset (&mbs, 0, sizeof (mbs)); }
980 mbstate () { reset (); } 951 mbstate () { reset (); }
981}; 952};
982 953
954/****************************************************************************/
955
983#define UNICODE_MASK 0x1fffffUL 956#define UNICODE_MASK 0x1fffffUL
984 957
985#if UNICODE3 958#if UNICODE3
986# define COMPOSE_LO 0x40000000UL 959# define COMPOSE_LO 0x40000000UL
987# define COMPOSE_HI 0x400fffffUL 960# define COMPOSE_HI 0x400fffffUL
988# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 961# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
989#else 962#else
963# if ENABLE_PERL
964# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
965# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
966# else
990# define COMPOSE_LO 0xd800UL 967# define COMPOSE_LO 0xd800UL
991# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 968# define COMPOSE_HI 0xf8ffUL
992# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 969# endif
970# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
993#endif 971#endif
994 972
995#if ENABLE_COMBINING 973#if ENABLE_COMBINING
996// compose chars are used to represent composite characters 974// compose chars are used to represent composite characters
997// that are not representable in unicode, as well as characters 975// that are not representable in unicode, as well as characters
1017}; 995};
1018 996
1019extern class rxvt_composite_vec rxvt_composite; 997extern class rxvt_composite_vec rxvt_composite;
1020#endif 998#endif
1021 999
1000/****************************************************************************/
1022 1001
1023#ifdef KEYSYM_RESOURCE 1002#ifdef KEYSYM_RESOURCE
1024 class keyboard_manager; 1003 class keyboard_manager;
1025#endif 1004#endif
1026 1005
1027struct rxvt_term : zero_initialized, rxvt_vars { 1006struct rxvt_term : zero_initialized, rxvt_vars {
1028 log_callback *log_hook; // log error messages through this hook, if != 0 1007 log_callback *log_hook; // log error messages through this hook, if != 0
1029 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 1008 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1030
1031#if ENABLE_PERL 1009#if ENABLE_PERL
1032 void *self; // perl's $self 1010 rxvt_perl_term perl;
1033#endif 1011#endif
1034
1035 struct mbstate mbstate; // current input multibyte state 1012 struct mbstate mbstate; // current input multibyte state
1036 1013
1037 unsigned char want_refresh:1, 1014 unsigned char want_refresh:1,
1038#ifdef TRANSPARENT 1015#ifdef TRANSPARENT
1039 want_full_refresh:1, /* awaiting full screen refresh */ 1016 want_full_refresh:1, /* awaiting full screen refresh */
1189 bar_t *CurrentBar; 1166 bar_t *CurrentBar;
1190# if ! (MENUBAR_MAX > 1) 1167# if ! (MENUBAR_MAX > 1)
1191 bar_t BarList; 1168 bar_t BarList;
1192# endif /* (MENUBAR_MAX > 1) */ 1169# endif /* (MENUBAR_MAX > 1) */
1193#endif 1170#endif
1194#ifdef CURSOR_BLINK
1195 struct timeval lastcursorchange;
1196#endif
1197#ifdef POINTER_BLANK
1198 struct timeval lastmotion;
1199#endif
1200 1171
1201#if ENABLE_OVERLAY 1172#if ENABLE_OVERLAY
1202 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1173 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1203 text_t **ov_text; 1174 text_t **ov_text;
1204 rend_t **ov_rend; 1175 rend_t **ov_rend;
1219 char *env_display; /* environmental variable DISPLAY */ 1190 char *env_display; /* environmental variable DISPLAY */
1220 char *env_term; /* environmental variable TERM */ 1191 char *env_term; /* environmental variable TERM */
1221 char *env_colorfgbg; 1192 char *env_colorfgbg;
1222 char *locale; 1193 char *locale;
1223 char charsets[4]; 1194 char charsets[4];
1224 unsigned char *v_buffer; /* pointer to physical buffer */ 1195 char *v_buffer; /* pointer to physical buffer */
1225 unsigned int v_buflen; /* size of area to write */ 1196 unsigned int v_buflen; /* size of area to write */
1226 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1197 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1227 1198
1228#ifdef KEYSYM_RESOURCE 1199#ifdef KEYSYM_RESOURCE
1229 keyboard_manager *keyboard; 1200 keyboard_manager *keyboard;
1230#endif 1201#endif
1231 1202
1232 const char *rs[NUM_RESOURCES]; 1203 const char *rs[NUM_RESOURCES];
1233 /* command input buffering */ 1204 /* command input buffering */
1234 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1205 char *cmdbuf_ptr, *cmdbuf_endp;
1235 unsigned char cmdbuf_base[CBUFSIZ]; 1206 char cmdbuf_base[CBUFSIZ];
1236 1207
1237 rxvt_salloc *talloc; // text line allocator 1208 rxvt_salloc *talloc; // text line allocator
1238 rxvt_salloc *ralloc; // rend line allocator 1209 rxvt_salloc *ralloc; // rend line allocator
1239 1210
1240 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1211 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1249 void iso14755_54 (int x, int y); 1220 void iso14755_54 (int x, int y);
1250# endif 1221# endif
1251#endif 1222#endif
1252 1223
1253 // modifies first argument(!) 1224 // modifies first argument(!)
1254 void paste (unsigned char *data, unsigned int len); 1225 void paste (char *data, unsigned int len);
1255 1226
1256 void flush (); 1227 void flush ();
1257 1228
1258#if TRANSPARENT 1229#if TRANSPARENT
1259 void rootwin_cb (XEvent &xev); 1230 void rootwin_cb (XEvent &xev);
1300 void pointer_blank (); 1271 void pointer_blank ();
1301#endif 1272#endif
1302 void pointer_unblank (); 1273 void pointer_unblank ();
1303 1274
1304 void tt_printf (const char *fmt,...); 1275 void tt_printf (const char *fmt,...);
1305 void tt_write (const unsigned char *data, unsigned int len); 1276 void tt_write (const char *data, unsigned int len);
1306 void pty_write (); 1277 void pty_write ();
1307 1278
1308 void tt_winch (); 1279 void tt_winch ();
1309 1280
1310 rxvt_term (); 1281 rxvt_term ();
1318 1289
1319 bool pty_fill (); 1290 bool pty_fill ();
1320 1291
1321 void init_secondary (); 1292 void init_secondary ();
1322 const char **init_resources (int argc, const char *const *argv); 1293 const char **init_resources (int argc, const char *const *argv);
1294 const char *x_resource (const char *name);
1323 void init_env (); 1295 void init_env ();
1324 void set_locale (const char *locale); 1296 void set_locale (const char *locale);
1325 void init_xlocale (); 1297 void init_xlocale ();
1326 void init_command (const char *const *argv); 1298 void init_command (const char *const *argv);
1327 void run_command (const char *const *argv); 1299 void run_command (const char *const *argv);
1362 1334
1363 /* autoconvert */ 1335 /* autoconvert */
1364 1336
1365 // command.C 1337 // command.C
1366 void lookup_key (XKeyEvent &ev); 1338 void lookup_key (XKeyEvent &ev);
1367 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1339 unsigned int cmd_write (const char *str, unsigned int count);
1368 1340
1369 unicode_t next_char (); 1341 wchar_t next_char ();
1370 unicode_t cmd_getc (); 1342 wchar_t cmd_getc ();
1371 unicode_t next_octet (); 1343 uint32_t next_octet ();
1372 unicode_t cmd_get8 (); 1344 uint32_t cmd_get8 ();
1373 1345
1374 bool cmd_parse (); 1346 bool cmd_parse ();
1375 void mouse_report (XButtonEvent &ev); 1347 void mouse_report (XButtonEvent &ev);
1376 void button_press (XButtonEvent &ev); 1348 void button_press (XButtonEvent &ev);
1377 void button_release (XButtonEvent &ev); 1349 void button_release (XButtonEvent &ev);
1386 void process_nonprinting (unicode_t ch); 1358 void process_nonprinting (unicode_t ch);
1387 void process_escape_vt52 (unicode_t ch); 1359 void process_escape_vt52 (unicode_t ch);
1388 void process_escape_seq (); 1360 void process_escape_seq ();
1389 void process_csi_seq (); 1361 void process_csi_seq ();
1390 void process_window_ops (const int *args, unsigned int nargs); 1362 void process_window_ops (const int *args, unsigned int nargs);
1391 unsigned char *get_to_st (unicode_t &ends_how); 1363 char *get_to_st (unicode_t &ends_how);
1392 void process_dcs_seq (); 1364 void process_dcs_seq ();
1393 void process_osc_seq (); 1365 void process_osc_seq ();
1394 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1366 void process_color_seq (int report, int color, const char *str, char resp);
1395 void process_xterm_seq (int op, const char *str, unsigned char resp); 1367 void process_xterm_seq (int op, const char *str, char resp);
1396 int privcases (int mode, unsigned long bit); 1368 int privcases (int mode, unsigned long bit);
1397 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1369 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1398 void process_sgr_mode (unsigned int nargs, const int *arg); 1370 void process_sgr_mode (unsigned int nargs, const int *arg);
1399 void process_graphics (); 1371 void process_graphics ();
1400 // init.C 1372 // init.C
1504 base += minBrightCOLOR - minCOLOR; 1476 base += minBrightCOLOR - minCOLOR;
1505#endif 1477#endif
1506 return base; 1478 return base;
1507 } 1479 }
1508 1480
1481 bool option (uint32_t opt)
1482 {
1483 return OPTION (opt);
1484 }
1485
1486 void set_option (uint32_t opt, bool set)
1487 {
1488 if (set)
1489 options |= opt;
1490 else
1491 options &= ~opt;
1492 }
1493
1509 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1494 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1510 void scr_blank_screen_mem (line_t &l, rend_t efs); 1495 void scr_blank_screen_mem (line_t &l, rend_t efs);
1511 int scr_scroll_text (int row1, int row2, int count); 1496 int scr_scroll_text (int row1, int row2, int count);
1512 void scr_reset (); 1497 void scr_reset ();
1513 void scr_release (); 1498 void scr_release ();
1523 void scr_touch (bool refresh); 1508 void scr_touch (bool refresh);
1524 void scr_expose (int x, int y, int width, int height, bool refresh); 1509 void scr_expose (int x, int y, int width, int height, bool refresh);
1525 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1510 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1526 void scr_recolour (); 1511 void scr_recolour ();
1527 void scr_remap_chars (); 1512 void scr_remap_chars ();
1528 void scr_remap_chars (const line_t &l); 1513 void scr_remap_chars (line_t &l);
1529 1514
1530 void scr_poweron (); 1515 void scr_poweron ();
1531 void scr_cursor (int mode); 1516 void scr_cursor (int mode);
1532 void scr_do_wrap (); 1517 void scr_do_wrap ();
1533 int scr_change_screen (int scrn); 1518 int scr_change_screen (int scrn);
1534 void scr_color (unsigned int color, int fgbg); 1519 void scr_color (unsigned int color, int fgbg);
1535 void scr_rendition (int set, int style); 1520 void scr_rendition (int set, int style);
1536 void scr_add_lines (const unicode_t *str, int nlines, int len); 1521 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1537 void scr_backspace (); 1522 void scr_backspace ();
1538 void scr_tab (int count, bool ht = false); 1523 void scr_tab (int count, bool ht = false);
1539 void scr_gotorc (int row, int col, int relative); 1524 void scr_gotorc (int row, int col, int relative);
1540 void scr_index (enum page_dirn direction); 1525 void scr_index (enum page_dirn direction);
1541 void scr_erase_line (int mode); 1526 void scr_erase_line (int mode);
1556 int scr_move_to (int y, int len); 1541 int scr_move_to (int y, int len);
1557 int scr_page (enum page_dirn direction, int nlines); 1542 int scr_page (enum page_dirn direction, int nlines);
1558 int scr_changeview (unsigned int oldviewstart); 1543 int scr_changeview (unsigned int oldviewstart);
1559 void scr_bell (); 1544 void scr_bell ();
1560 void scr_printscreen (int fullhist); 1545 void scr_printscreen (int fullhist);
1546 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1547 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1561 void scr_reverse_selection (); 1548 void scr_reverse_selection ();
1562 void scr_dump (int fd); 1549 void scr_dump (int fd);
1563 void selection_check (int check_more); 1550 void selection_check (int check_more);
1564 void selection_paste (Window win, Atom prop, bool delete_prop); 1551 void selection_paste (Window win, Atom prop, bool delete_prop);
1565 void selection_property (Window win, Atom prop); 1552 void selection_property (Window win, Atom prop);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines