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.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
… …
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
… …
120char * 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);
121void 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);
122void 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);
123void rxvt_usleep (int usecs); 116void rxvt_usleep (int usecs);
124 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
125/* 150/*
126 ***************************************************************************** 151 *****************************************************************************
127 * STRUCTURES AND TYPEDEFS 152 * STRUCTURES AND TYPEDEFS
128 ***************************************************************************** 153 *****************************************************************************
129 */ 154 */
… …
218 243
219#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 244#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
220# define NO_MOUSE_REPORT_SCROLLBAR 1 245# define NO_MOUSE_REPORT_SCROLLBAR 1
221#endif 246#endif
222 247
223#ifdef NO_RESOURCES 248#if defined (ISO_14755) || defined (ENABLE_PERL)
224# undef USE_XGETDEFAULT
225#endif
226
227#if ISO_14755
228# define ENABLE_OVERLAY 1 249# define ENABLE_OVERLAY 1
229#endif 250#endif
230 251
231/* now look for other badly set stuff */ 252/* now look for other badly set stuff */
232 253
… …
247# define HAVE_SCROLLBARS 1 268# define HAVE_SCROLLBARS 1
248#endif 269#endif
249 270
250/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 271/* width of scrollBar, menuBar shadow, must be 1 or 2 */
251#ifdef HALFSHADOW 272#ifdef HALFSHADOW
252# define SHADOW 1 273# define MENU_SHADOW 1
253#else 274#else
254# define SHADOW 2 275# define MENU_SHADOW 2
255#endif 276#endif
256 277
257#define R_SB_ALIGN_CENTRE 0 278#define R_SB_ALIGN_CENTRE 0
258#define R_SB_ALIGN_TOP 1 279#define R_SB_ALIGN_TOP 1
259#define R_SB_ALIGN_BOTTOM 2 280#define R_SB_ALIGN_BOTTOM 2
… …
445 XTerm_property = 3, // change X property 466 XTerm_property = 3, // change X property
446 XTerm_Color = 4, // change colors 467 XTerm_Color = 4, // change colors
447 XTerm_Color00 = 10, // not implemented, CLASH! 468 XTerm_Color00 = 10, // not implemented, CLASH!
448 XTerm_Color01 = 11, // not implemented 469 XTerm_Color01 = 11, // not implemented
449 XTerm_Color_cursor = 12, // change actual 'Cursor' color 470 XTerm_Color_cursor = 12, // change actual 'Cursor' color
450 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 471 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
451 XTerm_Color_pointer_bg = 14, // not implemented 472 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
452 XTerm_Color05 = 15, // not implemented 473 XTerm_Color05 = 15, // not implemented (tektronix fg)
453 XTerm_Color06 = 16, // not implemented 474 XTerm_Color06 = 16, // not implemented (tektronix bg)
454 XTerm_Color_RV = 17, // change actual 'Highlight' color 475 XTerm_Color_RV = 17, // change actual 'Highlight' color
455 XTerm_logfile = 46, // not implemented 476 XTerm_logfile = 46, // not implemented
456 XTerm_font = 50, 477 XTerm_font = 50,
457 478
458 XTerm_konsole30 = 30, // reserved for konsole 479 XTerm_konsole30 = 30, // reserved for konsole
459 XTerm_konsole31 = 31, // reserved for konsole 480 XTerm_konsole31 = 31, // reserved for konsole
460 XTerm_emacs51 = 51, // reserved for emacs shell 481 XTerm_emacs51 = 51, // reserved for emacs shell
461 /* 482 /*
462 * 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
463 */ 485 */
464 XTerm_Color_BD = 18, // change actual 'Bold' color 486 Rxvt_Color_BD = 18, // change actual 'Bold' color
465 XTerm_Color_UL = 19, // change actual 'Underline' color 487 Rxvt_Color_UL = 19, // change actual 'Underline' color
466 XTerm_Pixmap = 20, // new bg pixmap 488 Rxvt_Pixmap = 20, // new bg pixmap
467 XTerm_restoreFG = 39, // change default fg color 489 Rxvt_restoreFG = 39, // change default fg color
468 XTerm_restoreBG = 49, // change default bg color 490 Rxvt_restoreBG = 49, // change default bg color
469 XTerm_dumpscreen = 55, // dump scrollback and all of screen 491 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
470 492
471 URxvt_locale = 701, // change locale 493 URxvt_locale = 701, // change locale
472 URxvt_Menu = 703, // set menu item 494 URxvt_Menu = 703, // set menu item
473 URxvt_Color_IT = 704, // change actual 'Italic' colour 495 URxvt_Color_IT = 704, // change actual 'Italic' colour
474 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,
475 499
476 URxvt_font = 710, 500 URxvt_font = 710,
477 URxvt_boldFont = 711, 501 URxvt_boldFont = 711,
478 URxvt_italicFont = 712, 502 URxvt_italicFont = 712,
479 URxvt_boldItalicFont = 713, 503 URxvt_boldItalicFont = 713,
480 504
481 URxvt_view_up = 720, 505 URxvt_view_up = 720,
482 URxvt_view_down = 721, 506 URxvt_view_down = 721,
507
508 URxvt_perl = 777,
483}; 509};
484 510
485/* Words starting with `Color_' are colours. Others are counts */ 511/* Words starting with `Color_' are colours. Others are counts */
486/* 512/*
487 * The PixColor and rendition colour usage should probably be decoupled 513 * The PixColor and rendition colour usage should probably be decoupled
… …
564 590
565/* 591/*
566 * Resource list 592 * Resource list
567 */ 593 */
568enum { 594enum {
569 Rs_display_name = 0, 595# define def(name) Rs_ ## name,
570 Rs_term_name, 596# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
571 Rs_iconName, 597# include "rsinc.h"
572 Rs_geometry, 598# undef def
573 Rs_reverseVideo, 599# 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 600 NUM_RESOURCES
673}; 601};
674 602
675// see init.C:xa_names, which must be kept in sync 603// see init.C:xa_names, which must be kept in sync
676enum { 604enum {
… …
790/* 718/*
791 ***************************************************************************** 719 *****************************************************************************
792 * MACRO DEFINES 720 * MACRO DEFINES
793 ***************************************************************************** 721 *****************************************************************************
794 */ 722 */
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 723#define dDisp Display *disp = display->display
812 724
813/* convert pixel dimensions to row/column values. Everything as int32_t */ 725/* convert pixel dimensions to row/column values. Everything as int32_t */
814#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 726#define Pixel2Col(x) Pixel2Width((int32_t)(x))
815#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 727#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
818#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 730#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
819#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 731#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
820#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 732#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
821#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 733#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
822 734
823#define TermWin_TotalWidth() ((int32_t)this->width) 735#define OPTION(opt) (options & (opt))
824#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)
825 739
826// for m >= -n, ensure remainder lies between 0..n-1 740// for m >= -n, ensure remainder lies between 0..n-1
827#define MOD(m,n) (((m) + (n)) % (n)) 741#define MOD(m,n) (((m) + (n)) % (n))
828 742
829#define LINENO(n) MOD (term_start + int(n), total_rows) 743#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
889#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 803#define scrollbar_size() (scrollBar.end - scrollBar.beg \
890 - scrollbar_minheight ()) 804 - scrollbar_minheight ())
891 805
892#if (MENUBAR_MAX > 1) 806#if (MENUBAR_MAX > 1)
893/* rendition style flags */ 807/* rendition style flags */
894# define menuBar_height() (fheight + SHADOW) 808# define menuBar_height() (fheight + MENU_SHADOW)
895# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 809# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
896# define isMenuBarWindow(w) ((w) == menuBar.win) 810# define isMenuBarWindow(w) ((w) == menuBar.win)
897#else 811#else
898# define menuBar_height() (0) 812# define menuBar_height() (0)
899# define menuBar_TotalHeight() (0) 813# define menuBar_TotalHeight() (0)
900# define isMenuBarWindow(w) (0) 814# define isMenuBarWindow(w) (0)
… …
956extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 870extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
957extern void rxvt_exit_failure () __attribute__ ((noreturn)); 871extern void rxvt_exit_failure () __attribute__ ((noreturn));
958 872
959#define SET_LOCALE(locale) rxvt_set_locale (locale) 873#define SET_LOCALE(locale) rxvt_set_locale (locale)
960extern 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 ();
961 877
962/*
963 ***************************************************************************** 878/****************************************************************************/
964 * VARIABLES 879
965 *****************************************************************************
966 */
967#ifdef MENUBAR 880#ifdef MENUBAR
968# include "menubar.h" 881# include "menubar.h"
969#endif 882#endif
970 883
971#define BLINK_INTERVAL 0.5 884#define BLINK_INTERVAL 0.5
… …
978# endif 891# endif
979# endif 892# endif
980# define __attribute__(x) 893# define __attribute__(x)
981#endif 894#endif
982 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
983// primivite wrapper around mbstate_t to ensure initialisation 945// primivite wrapper around mbstate_t to ensure initialisation
984struct mbstate { 946struct mbstate {
985 mbstate_t mbs; 947 mbstate_t mbs;
986 948
987 operator mbstate_t *() { return &mbs; } 949 operator mbstate_t *() { return &mbs; }
988 void reset () { memset (&mbs, 0, sizeof (mbs)); } 950 void reset () { memset (&mbs, 0, sizeof (mbs)); }
989 mbstate () { reset (); } 951 mbstate () { reset (); }
990}; 952};
991 953
954/****************************************************************************/
955
992#define UNICODE_MASK 0x1fffffUL 956#define UNICODE_MASK 0x1fffffUL
993 957
994#if UNICODE3 958#if UNICODE3
995# define COMPOSE_LO 0x40000000UL 959# define COMPOSE_LO 0x40000000UL
996# define COMPOSE_HI 0x400fffffUL 960# define COMPOSE_HI 0x400fffffUL
997# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 961# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
998#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
999# define COMPOSE_LO 0xd800UL 967# define COMPOSE_LO 0xd800UL
1000# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 968# define COMPOSE_HI 0xf8ffUL
1001# 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)
1002#endif 971#endif
1003 972
1004#if ENABLE_COMBINING 973#if ENABLE_COMBINING
1005// compose chars are used to represent composite characters 974// compose chars are used to represent composite characters
1006// that are not representable in unicode, as well as characters 975// that are not representable in unicode, as well as characters
… …
1026}; 995};
1027 996
1028extern class rxvt_composite_vec rxvt_composite; 997extern class rxvt_composite_vec rxvt_composite;
1029#endif 998#endif
1030 999
1000/****************************************************************************/
1031 1001
1032#ifdef KEYSYM_RESOURCE 1002#ifdef KEYSYM_RESOURCE
1033 class keyboard_manager; 1003 class keyboard_manager;
1034#endif 1004#endif
1035 1005
1036struct rxvt_term : zero_initialized, rxvt_vars { 1006struct rxvt_term : zero_initialized, rxvt_vars {
1037 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
1038 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 1008 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1039 1009#if ENABLE_PERL
1010 rxvt_perl_term perl;
1011#endif
1040 struct mbstate mbstate; // current input multibyte state 1012 struct mbstate mbstate; // current input multibyte state
1041 1013
1042 unsigned char want_refresh:1, 1014 unsigned char want_refresh:1,
1043#ifdef TRANSPARENT 1015#ifdef TRANSPARENT
1044 want_full_refresh:1, /* awaiting full screen refresh */ 1016 want_full_refresh:1, /* awaiting full screen refresh */
… …
1194 bar_t *CurrentBar; 1166 bar_t *CurrentBar;
1195# if ! (MENUBAR_MAX > 1) 1167# if ! (MENUBAR_MAX > 1)
1196 bar_t BarList; 1168 bar_t BarList;
1197# endif /* (MENUBAR_MAX > 1) */ 1169# endif /* (MENUBAR_MAX > 1) */
1198#endif 1170#endif
1199#ifdef CURSOR_BLINK
1200 struct timeval lastcursorchange;
1201#endif
1202#ifdef POINTER_BLANK
1203 struct timeval lastmotion;
1204#endif
1205 1171
1206#if ENABLE_OVERLAY 1172#if ENABLE_OVERLAY
1207 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1173 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1208 text_t **ov_text; 1174 text_t **ov_text;
1209 rend_t **ov_rend; 1175 rend_t **ov_rend;
… …
1224 char *env_display; /* environmental variable DISPLAY */ 1190 char *env_display; /* environmental variable DISPLAY */
1225 char *env_term; /* environmental variable TERM */ 1191 char *env_term; /* environmental variable TERM */
1226 char *env_colorfgbg; 1192 char *env_colorfgbg;
1227 char *locale; 1193 char *locale;
1228 char charsets[4]; 1194 char charsets[4];
1229 unsigned char *v_buffer; /* pointer to physical buffer */ 1195 char *v_buffer; /* pointer to physical buffer */
1230 unsigned int v_buflen; /* size of area to write */ 1196 unsigned int v_buflen; /* size of area to write */
1231 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1197 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1232 1198
1233#ifdef KEYSYM_RESOURCE 1199#ifdef KEYSYM_RESOURCE
1234 keyboard_manager *keyboard; 1200 keyboard_manager *keyboard;
1235#endif 1201#endif
1236 1202
1237 const char *rs[NUM_RESOURCES]; 1203 const char *rs[NUM_RESOURCES];
1238 /* command input buffering */ 1204 /* command input buffering */
1239 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1205 char *cmdbuf_ptr, *cmdbuf_endp;
1240 unsigned char cmdbuf_base[CBUFSIZ]; 1206 char cmdbuf_base[CBUFSIZ];
1241 1207
1242 rxvt_salloc *talloc; // text line allocator 1208 rxvt_salloc *talloc; // text line allocator
1243 rxvt_salloc *ralloc; // rend line allocator 1209 rxvt_salloc *ralloc; // rend line allocator
1244 1210
1245 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
… …
1254 void iso14755_54 (int x, int y); 1220 void iso14755_54 (int x, int y);
1255# endif 1221# endif
1256#endif 1222#endif
1257 1223
1258 // modifies first argument(!) 1224 // modifies first argument(!)
1259 void paste (unsigned char *data, unsigned int len); 1225 void paste (char *data, unsigned int len);
1260 1226
1261 void flush (); 1227 void flush ();
1262 1228
1263#if TRANSPARENT 1229#if TRANSPARENT
1264 void rootwin_cb (XEvent &xev); 1230 void rootwin_cb (XEvent &xev);
… …
1305 void pointer_blank (); 1271 void pointer_blank ();
1306#endif 1272#endif
1307 void pointer_unblank (); 1273 void pointer_unblank ();
1308 1274
1309 void tt_printf (const char *fmt,...); 1275 void tt_printf (const char *fmt,...);
1310 void tt_write (const unsigned char *data, unsigned int len); 1276 void tt_write (const char *data, unsigned int len);
1311 void pty_write (); 1277 void pty_write ();
1312 1278
1313 void tt_winch (); 1279 void tt_winch ();
1314 1280
1315 rxvt_term (); 1281 rxvt_term ();
… …
1323 1289
1324 bool pty_fill (); 1290 bool pty_fill ();
1325 1291
1326 void init_secondary (); 1292 void init_secondary ();
1327 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);
1328 void init_env (); 1295 void init_env ();
1329 void set_locale (const char *locale); 1296 void set_locale (const char *locale);
1330 void init_xlocale (); 1297 void init_xlocale ();
1331 void init_command (const char *const *argv); 1298 void init_command (const char *const *argv);
1332 void run_command (const char *const *argv); 1299 void run_command (const char *const *argv);
… …
1367 1334
1368 /* autoconvert */ 1335 /* autoconvert */
1369 1336
1370 // command.C 1337 // command.C
1371 void lookup_key (XKeyEvent &ev); 1338 void lookup_key (XKeyEvent &ev);
1372 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1339 unsigned int cmd_write (const char *str, unsigned int count);
1373 1340
1374 unicode_t next_char (); 1341 wchar_t next_char ();
1375 unicode_t cmd_getc (); 1342 wchar_t cmd_getc ();
1376 unicode_t next_octet (); 1343 uint32_t next_octet ();
1377 unicode_t cmd_get8 (); 1344 uint32_t cmd_get8 ();
1378 1345
1379 bool cmd_parse (); 1346 bool cmd_parse ();
1380 void mouse_report (XButtonEvent &ev); 1347 void mouse_report (XButtonEvent &ev);
1381 void button_press (XButtonEvent &ev); 1348 void button_press (XButtonEvent &ev);
1382 void button_release (XButtonEvent &ev); 1349 void button_release (XButtonEvent &ev);
… …
1391 void process_nonprinting (unicode_t ch); 1358 void process_nonprinting (unicode_t ch);
1392 void process_escape_vt52 (unicode_t ch); 1359 void process_escape_vt52 (unicode_t ch);
1393 void process_escape_seq (); 1360 void process_escape_seq ();
1394 void process_csi_seq (); 1361 void process_csi_seq ();
1395 void process_window_ops (const int *args, unsigned int nargs); 1362 void process_window_ops (const int *args, unsigned int nargs);
1396 unsigned char *get_to_st (unicode_t &ends_how); 1363 char *get_to_st (unicode_t &ends_how);
1397 void process_dcs_seq (); 1364 void process_dcs_seq ();
1398 void process_osc_seq (); 1365 void process_osc_seq ();
1399 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);
1400 void process_xterm_seq (int op, const char *str, unsigned char resp); 1367 void process_xterm_seq (int op, const char *str, char resp);
1401 int privcases (int mode, unsigned long bit); 1368 int privcases (int mode, unsigned long bit);
1402 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);
1403 void process_sgr_mode (unsigned int nargs, const int *arg); 1370 void process_sgr_mode (unsigned int nargs, const int *arg);
1404 void process_graphics (); 1371 void process_graphics ();
1405 // init.C 1372 // init.C
… …
1509 base += minBrightCOLOR - minCOLOR; 1476 base += minBrightCOLOR - minCOLOR;
1510#endif 1477#endif
1511 return base; 1478 return base;
1512 } 1479 }
1513 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
1514 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);
1515 void scr_blank_screen_mem (line_t &l, rend_t efs); 1495 void scr_blank_screen_mem (line_t &l, rend_t efs);
1516 int scr_scroll_text (int row1, int row2, int count); 1496 int scr_scroll_text (int row1, int row2, int count);
1517 void scr_reset (); 1497 void scr_reset ();
1518 void scr_release (); 1498 void scr_release ();
… …
1528 void scr_touch (bool refresh); 1508 void scr_touch (bool refresh);
1529 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);
1530 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1510 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1531 void scr_recolour (); 1511 void scr_recolour ();
1532 void scr_remap_chars (); 1512 void scr_remap_chars ();
1533 void scr_remap_chars (const line_t &l); 1513 void scr_remap_chars (line_t &l);
1534 1514
1535 void scr_poweron (); 1515 void scr_poweron ();
1536 void scr_cursor (int mode); 1516 void scr_cursor (int mode);
1537 void scr_do_wrap (); 1517 void scr_do_wrap ();
1538 int scr_change_screen (int scrn); 1518 int scr_change_screen (int scrn);
1539 void scr_color (unsigned int color, int fgbg); 1519 void scr_color (unsigned int color, int fgbg);
1540 void scr_rendition (int set, int style); 1520 void scr_rendition (int set, int style);
1541 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);
1542 void scr_backspace (); 1522 void scr_backspace ();
1543 void scr_tab (int count, bool ht = false); 1523 void scr_tab (int count, bool ht = false);
1544 void scr_gotorc (int row, int col, int relative); 1524 void scr_gotorc (int row, int col, int relative);
1545 void scr_index (enum page_dirn direction); 1525 void scr_index (enum page_dirn direction);
1546 void scr_erase_line (int mode); 1526 void scr_erase_line (int mode);
… …
1561 int scr_move_to (int y, int len); 1541 int scr_move_to (int y, int len);
1562 int scr_page (enum page_dirn direction, int nlines); 1542 int scr_page (enum page_dirn direction, int nlines);
1563 int scr_changeview (unsigned int oldviewstart); 1543 int scr_changeview (unsigned int oldviewstart);
1564 void scr_bell (); 1544 void scr_bell ();
1565 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);
1566 void scr_reverse_selection (); 1548 void scr_reverse_selection ();
1567 void scr_dump (int fd); 1549 void scr_dump (int fd);
1568 void selection_check (int check_more); 1550 void selection_check (int check_more);
1569 void selection_paste (Window win, Atom prop, bool delete_prop); 1551 void selection_paste (Window win, Atom prop, bool delete_prop);
1570 void selection_property (Window win, Atom prop); 1552 void selection_property (Window win, Atom prop);
1571 void selection_request (Time tm, int x, int y); 1553 void selection_request (Time tm, int x, int y);
1572 int selection_request_other (Atom target, int selnum); 1554 int selection_request_other (Atom target, int selnum);
1573 void selection_clear (); 1555 void selection_clear ();
1574 void selection_make (Time tm); 1556 void selection_make (Time tm);
1557 bool selection_grab (Time tm);
1575 void selection_start_colrow (int col, int row); 1558 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); 1559 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); 1560 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1578 void selection_remove_trailing_spaces (); 1561 void selection_remove_trailing_spaces ();
1579 void selection_send (const XSelectionRequestEvent &rq); 1562 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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