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.166 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.191 by root, Sun Jan 8 01:02:15 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__) || defined(PTYS_ARE_OPENPTY)
83# define NO_SETOWNER_TTYDEV 1
84#endif 77#endif
85 78
86/* 79/*
87 ***************************************************************************** 80 *****************************************************************************
88 * PROTOTYPES 81 * PROTOTYPES
162 Time time; /* milliseconds */ 155 Time time; /* milliseconds */
163 unsigned int state; /* key or button mask */ 156 unsigned int state; /* key or button mask */
164 unsigned int button; /* detail */ 157 unsigned int button; /* detail */
165}; 158};
166 159
167#define MAX_POSITIVE_INT16 (((uint16_t)-1)>>1) // TODO: configure/limits
168
169#if ENABLE_FRILLS 160#if ENABLE_FRILLS
170typedef struct _mwmhints { 161typedef struct _mwmhints {
171 CARD32 flags; 162 CARD32 flags;
172 CARD32 functions; 163 CARD32 functions;
173 CARD32 decorations; 164 CARD32 decorations;
224 215
225#ifdef NO_RESOURCES 216#ifdef NO_RESOURCES
226# undef USE_XGETDEFAULT 217# undef USE_XGETDEFAULT
227#endif 218#endif
228 219
229#if ISO_14755 220#if defined (ISO_14755) || defined (ENABLE_PERL)
230# define ENABLE_OVERLAY 1 221# define ENABLE_OVERLAY 1
231#endif 222#endif
232 223
233/* now look for other badly set stuff */ 224/* now look for other badly set stuff */
234 225
249# define HAVE_SCROLLBARS 1 240# define HAVE_SCROLLBARS 1
250#endif 241#endif
251 242
252/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 243/* width of scrollBar, menuBar shadow, must be 1 or 2 */
253#ifdef HALFSHADOW 244#ifdef HALFSHADOW
254# define SHADOW 1 245# define MENU_SHADOW 1
255#else 246#else
256# define SHADOW 2 247# define MENU_SHADOW 2
257#endif 248#endif
258 249
259#define R_SB_ALIGN_CENTRE 0 250#define R_SB_ALIGN_CENTRE 0
260#define R_SB_ALIGN_TOP 1 251#define R_SB_ALIGN_TOP 1
261#define R_SB_ALIGN_BOTTOM 2 252#define R_SB_ALIGN_BOTTOM 2
353#define FONT_DN "#-" 344#define FONT_DN "#-"
354#define FONT_UP "#+" 345#define FONT_UP "#+"
355 346
356/* flags for rxvt_scr_gotorc () */ 347/* flags for rxvt_scr_gotorc () */
357enum { 348enum {
358 C_RELATIVE = 1 , /* col movement is relative */ 349 C_RELATIVE = 1, /* col movement is relative */
359 R_RELATIVE = 2, /* row movement is relative */ 350 R_RELATIVE = 2, /* row movement is relative */
360 RELATIVE = 1 | 2, 351 RELATIVE = C_RELATIVE | R_RELATIVE,
361}; 352};
362 353
363/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 354/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
364enum { 355enum {
365 INSERT = -1, /* don't change these values */ 356 INSERT = -1, /* don't change these values */
378enum { 369enum {
379 PRIMARY = 0, 370 PRIMARY = 0,
380 SECONDARY, 371 SECONDARY,
381}; 372};
382 373
383#define RS_None 0 /* Normal */ 374#define RS_None 0
384 375
385#define RS_fgMask 0x0000007fUL /* 128 colors */ 376#define RS_fgMask 0x0000007fUL // 128 colors
386#define RS_bgMask 0x00003f80UL /* 128 colors */ 377#define RS_bgMask 0x00003f80UL // 128 colors
387 378
388// font styles 379// font styles
389#define RS_Bold 0x00004000UL // value 1 380#define RS_Bold 0x00004000UL // value 1
390#define RS_Italic 0x00008000UL // value 2 381#define RS_Italic 0x00008000UL // value 2
391 382
392// fake styles 383// fake styles
393#define RS_Blink 0x00010000UL /* blink */ 384#define RS_Blink 0x00010000UL // blink
394#define RS_RVid 0x00020000UL /* reverse video */ 385#define RS_RVid 0x00020000UL // reverse video
395#define RS_Uline 0x00040000UL /* underline */ 386#define RS_Uline 0x00040000UL // underline
396 387
397// 5 bits still to go 388// 5 custom bits for extensions
389#define RS_customCount 32
390#define RS_customMask 0x00f80000UL
391#define RS_customShift 19
398 392
399// other flags 393// other flags
400#define RS_Careful 0x80000000UL /* be careful when drawing these */ 394#define RS_Careful 0x80000000UL /* be careful when drawing these */
401 395
402#define RS_styleCount 4 396#define RS_styleCount 4
477 URxvt_italicFont = 712, 471 URxvt_italicFont = 712,
478 URxvt_boldItalicFont = 713, 472 URxvt_boldItalicFont = 713,
479 473
480 URxvt_view_up = 720, 474 URxvt_view_up = 720,
481 URxvt_view_down = 721, 475 URxvt_view_down = 721,
476
477 URxvt_perl = 777,
482}; 478};
483 479
484/* Words starting with `Color_' are colours. Others are counts */ 480/* Words starting with `Color_' are colours. Others are counts */
485/* 481/*
486 * The PixColor and rendition colour usage should probably be decoupled 482 * The PixColor and rendition colour usage should probably be decoupled
563 559
564/* 560/*
565 * Resource list 561 * Resource list
566 */ 562 */
567enum { 563enum {
568 Rs_display_name = 0, 564# define def(name) Rs_ ## name,
569 Rs_term_name, 565# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
570 Rs_iconName, 566# include "rsinc.h"
571 Rs_geometry, 567# undef def
572 Rs_reverseVideo, 568# undef reserve
573 Rs_color,
574 _Rs_color = Rs_color + NRS_COLORS - 1,
575 Rs_font,
576#if ENABLE_STYLES
577 Rs_boldFont,
578 Rs_italicFont,
579 Rs_boldItalicFont,
580#endif
581 Rs_name,
582 Rs_title,
583#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
584 Rs_path,
585#endif
586#ifdef XPM_BACKGROUND
587 Rs_backgroundPixmap,
588#endif
589#if (MENUBAR_MAX)
590 Rs_menu,
591#endif
592 Rs_loginShell,
593 Rs_jumpScroll,
594#ifdef HAVE_SCROLLBARS
595 Rs_scrollBar,
596 Rs_scrollBar_right,
597 Rs_scrollBar_floating,
598 Rs_scrollBar_align,
599 Rs_scrollstyle, /* Rs_scrollBar_style */
600 Rs_scrollBar_thickness,
601#endif
602 Rs_scrollTtyOutput,
603 Rs_scrollTtyKeypress,
604 Rs_scrollWithBuffer,
605 Rs_saveLines,
606 Rs_utmpInhibit,
607 Rs_visualBell,
608#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
609 Rs_mapAlert,
610#endif
611#ifdef META8_OPTION
612 Rs_meta8,
613#endif
614#ifdef MOUSE_WHEEL
615 Rs_mouseWheelScrollPage,
616#endif
617#ifndef NO_BACKSPACE_KEY
618 Rs_backspace_key,
619#endif
620#ifndef NO_DELETE_KEY
621 Rs_delete_key,
622#endif
623 Rs_selectstyle,
624#ifdef PRINTPIPE
625 Rs_print_pipe,
626#endif
627#ifdef USE_XIM
628 Rs_preeditType,
629 Rs_inputMethod,
630#endif
631#ifdef TRANSPARENT
632 Rs_transparent,
633 Rs_transparent_all,
634#endif
635#if ENABLE_FRILLS
636 Rs_ext_bwidth,
637 Rs_int_bwidth,
638 Rs_borderLess,
639 Rs_lineSpace,
640 Rs_pty_fd,
641 Rs_cursorUnderline,
642#endif
643#if CURSOR_BLINK
644 Rs_cursorBlink,
645#endif
646#if ENABLE_XEMBED
647 Rs_embed,
648#endif
649 Rs_cutchars,
650 Rs_modifier,
651 Rs_answerbackstring,
652 Rs_tripleclickwords,
653 Rs_insecure,
654 Rs_pointerBlank,
655 Rs_pointerBlankDelay,
656 Rs_imLocale,
657 Rs_imFont,
658 Rs_pastableTabs,
659#ifndef NO_SECONDARY_SCREEN
660 Rs_secondaryScreen,
661 Rs_secondaryScroll,
662#endif
663#ifdef OFF_FOCUS_FADING
664 Rs_fade,
665#endif
666#ifdef TINTING
667 Rs_shade,
668#endif
669 NUM_RESOURCES 569 NUM_RESOURCES
670}; 570};
671 571
672// see init.C:xa_names, which must be kept in sync 572// see init.C:xa_names, which must be kept in sync
673enum { 573enum {
748#endif 648#endif
749 649
750// do not change these constants lightly, there are many interdependencies 650// do not change these constants lightly, there are many interdependencies
751#define IMBUFSIZ 128 // input modifier buffer sizes 651#define IMBUFSIZ 128 // input modifier buffer sizes
752#define KBUFSZ 512 // size of keyboard mapping buffer 652#define KBUFSZ 512 // size of keyboard mapping buffer
753#define CBUFSIZ 4096 // size of command buffer 653#define CBUFSIZ 2048 // size of command buffer
754#define UBUFSIZ 4096 // character buffer 654#define UBUFSIZ 2048 // character buffer
755 655
756#ifndef PATH_MAX 656#ifndef PATH_MAX
757# define PATH_MAX 16384 657# define PATH_MAX 16384
758#endif 658#endif
759 659
787/* 687/*
788 ***************************************************************************** 688 *****************************************************************************
789 * MACRO DEFINES 689 * MACRO DEFINES
790 ***************************************************************************** 690 *****************************************************************************
791 */ 691 */
792#define memset(x, y, z) memset((x), (y), (size_t)(z))
793#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
794#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
795#define strcasecmp(x, y) strcasecmp((x), (y))
796#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
797#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
798#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
799#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
800#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
801#define strcat(x, y) strcat((char *)(x), (const char *)(y))
802#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
803#define strdup(x) strdup((const char *)(x))
804#define strlen(x) strlen((const char *)(x))
805#define strchr(x, y) strchr((const char *)(x), (int)(y))
806#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
807
808#define dDisp Display *disp = display->display 692#define dDisp Display *disp = display->display
809 693
810/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
811#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
812#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
815#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 699#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
816#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 700#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
819 703
820#define TermWin_TotalWidth() ((int32_t)this->width) 704#define OPTION(opt) (options & (opt))
821#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)
822 708
823#define LINENO(n) (((n) + term_start + total_rows) % total_rows) 709// for m >= -n, ensure remainder lies between 0..n-1
710#define MOD(m,n) (((m) + (n)) % (n))
711
712#define LINENO(n) MOD (term_start + int(n), total_rows)
824#define ROW(n) (save [LINENO (n)]) 713#define ROW(n) row_buf [LINENO (n)]
825 714
826/* how to build & extract colors and attributes */ 715/* how to build & extract colors and attributes */
827#define GET_BASEFG(x) (((x) & RS_fgMask)) 716#define GET_BASEFG(x) (((x) & RS_fgMask))
828#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 717#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
829#ifndef NO_BRIGHTCOLOR
830# define GET_FGCOLOR(x) \
831 ((((x) & RS_Bold) == 0 \
832 || GET_BASEFG (x) < minCOLOR \
833 || GET_BASEFG (x) >= minBrightCOLOR) \
834 ? GET_BASEFG (x) \
835 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
836# define GET_BGCOLOR(x) \
837 ((((x) & RS_Blink) == 0 \
838 || GET_BASEBG (x) < minCOLOR \
839 || GET_BASEBG (x) >= minBrightCOLOR) \
840 ? GET_BASEBG (x) \
841 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
842#else
843# define GET_FGCOLOR(x) GET_BASEFG(x)
844# define GET_BGCOLOR(x) GET_BASEBG(x)
845#endif
846 718
847#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 719#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
848#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 720#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
849 721
850#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 722#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
900#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 772#define scrollbar_size() (scrollBar.end - scrollBar.beg \
901 - scrollbar_minheight ()) 773 - scrollbar_minheight ())
902 774
903#if (MENUBAR_MAX > 1) 775#if (MENUBAR_MAX > 1)
904/* rendition style flags */ 776/* rendition style flags */
905# define menuBar_height() (fheight + SHADOW) 777# define menuBar_height() (fheight + MENU_SHADOW)
906# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 778# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
907# define isMenuBarWindow(w) ((w) == menuBar.win) 779# define isMenuBarWindow(w) ((w) == menuBar.win)
908#else 780#else
909# define menuBar_height() (0) 781# define menuBar_height() (0)
910# define menuBar_TotalHeight() (0) 782# define menuBar_TotalHeight() (0)
911# define isMenuBarWindow(w) (0) 783# define isMenuBarWindow(w) (0)
957#endif 829#endif
958 830
959extern class rxvt_failure_exception { } rxvt_failure_exception; 831extern class rxvt_failure_exception { } rxvt_failure_exception;
960 832
961typedef callback1<void, const char *> log_callback; 833typedef callback1<void, const char *> log_callback;
834typedef callback1<int, int> getfd_callback;
962 835
963extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 836extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
964extern void rxvt_log (const char *fmt, ...); 837extern void rxvt_log (const char *fmt, ...);
965extern void rxvt_warn (const char *fmt, ...); 838extern void rxvt_warn (const char *fmt, ...);
966extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 839extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
967extern void rxvt_exit_failure () __attribute__ ((noreturn)); 840extern void rxvt_exit_failure () __attribute__ ((noreturn));
968 841
969#define SET_LOCALE(locale) rxvt_set_locale (locale) 842#define SET_LOCALE(locale) rxvt_set_locale (locale)
970extern 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 ();
971 846
972/*
973 ***************************************************************************** 847/****************************************************************************/
974 * VARIABLES 848
975 *****************************************************************************
976 */
977#ifdef MENUBAR 849#ifdef MENUBAR
978# include "menubar.h" 850# include "menubar.h"
979#endif 851#endif
980 852
981#define BLINK_INTERVAL 0.5 853#define BLINK_INTERVAL 0.5
988# endif 860# endif
989# endif 861# endif
990# define __attribute__(x) 862# define __attribute__(x)
991#endif 863#endif
992 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
993// primivite wrapper around mbstate_t to ensure initialisation 914// primivite wrapper around mbstate_t to ensure initialisation
994struct mbstate { 915struct mbstate {
995 mbstate_t mbs; 916 mbstate_t mbs;
996 917
997 operator mbstate_t *() { return &mbs; } 918 operator mbstate_t *() { return &mbs; }
998 void reset () { memset (&mbs, 0, sizeof (mbs)); } 919 void reset () { memset (&mbs, 0, sizeof (mbs)); }
999 mbstate () { reset (); } 920 mbstate () { reset (); }
1000}; 921};
1001 922
923/****************************************************************************/
924
1002#define UNICODE_MASK 0x1fffffUL 925#define UNICODE_MASK 0x1fffffUL
1003 926
1004#if UNICODE3 927#if UNICODE3
1005# define COMPOSE_LO 0x40000000UL 928# define COMPOSE_LO 0x40000000UL
1006# define COMPOSE_HI 0x400fffffUL 929# define COMPOSE_HI 0x400fffffUL
1007# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 930# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
1008#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
1009# define COMPOSE_LO 0xd800UL 936# define COMPOSE_LO 0xd800UL
1010# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 937# define COMPOSE_HI 0xf8ffUL
1011# 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)
1012#endif 940#endif
1013 941
1014#if ENABLE_COMBINING 942#if ENABLE_COMBINING
1015// compose chars are used to represent composite characters 943// compose chars are used to represent composite characters
1016// that are not representable in unicode, as well as characters 944// that are not representable in unicode, as well as characters
1036}; 964};
1037 965
1038extern class rxvt_composite_vec rxvt_composite; 966extern class rxvt_composite_vec rxvt_composite;
1039#endif 967#endif
1040 968
969/****************************************************************************/
1041 970
1042#ifdef KEYSYM_RESOURCE 971#ifdef KEYSYM_RESOURCE
1043 class keyboard_manager; 972 class keyboard_manager;
1044#endif 973#endif
1045 974
1046struct rxvt_term : zero_initialized, rxvt_vars { 975struct rxvt_term : zero_initialized, rxvt_vars {
1047 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
977 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
978
979#if ENABLE_PERL
980 rxvt_perl_term perl;
981#endif
1048 982
1049 struct mbstate mbstate; // current input multibyte state 983 struct mbstate mbstate; // current input multibyte state
1050 984
1051 unsigned char want_refresh:1, 985 unsigned char want_refresh:1,
1052#ifdef TRANSPARENT 986#ifdef TRANSPARENT
1203 bar_t *CurrentBar; 1137 bar_t *CurrentBar;
1204# if ! (MENUBAR_MAX > 1) 1138# if ! (MENUBAR_MAX > 1)
1205 bar_t BarList; 1139 bar_t BarList;
1206# endif /* (MENUBAR_MAX > 1) */ 1140# endif /* (MENUBAR_MAX > 1) */
1207#endif 1141#endif
1208#ifdef CURSOR_BLINK
1209 struct timeval lastcursorchange;
1210#endif
1211#ifdef POINTER_BLANK
1212 struct timeval lastmotion;
1213#endif
1214 1142
1215#if ENABLE_OVERLAY 1143#if ENABLE_OVERLAY
1216 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1144 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1217 text_t **ov_text; 1145 text_t **ov_text;
1218 rend_t **ov_rend; 1146 rend_t **ov_rend;
1233 char *env_display; /* environmental variable DISPLAY */ 1161 char *env_display; /* environmental variable DISPLAY */
1234 char *env_term; /* environmental variable TERM */ 1162 char *env_term; /* environmental variable TERM */
1235 char *env_colorfgbg; 1163 char *env_colorfgbg;
1236 char *locale; 1164 char *locale;
1237 char charsets[4]; 1165 char charsets[4];
1238 unsigned char *v_buffer; /* pointer to physical buffer */ 1166 char *v_buffer; /* pointer to physical buffer */
1239 unsigned int v_buflen; /* size of area to write */ 1167 unsigned int v_buflen; /* size of area to write */
1240 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1168 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1241 1169
1242#ifdef KEYSYM_RESOURCE 1170#ifdef KEYSYM_RESOURCE
1243 keyboard_manager *keyboard; 1171 keyboard_manager *keyboard;
1244#endif 1172#endif
1245 1173
1246 const char *rs[NUM_RESOURCES]; 1174 const char *rs[NUM_RESOURCES];
1247 /* command input buffering */ 1175 /* command input buffering */
1248 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1176 char *cmdbuf_ptr, *cmdbuf_endp;
1249 unsigned char cmdbuf_base[CBUFSIZ]; 1177 char cmdbuf_base[CBUFSIZ];
1250 1178
1251 rxvt_salloc *talloc; // text line allocator 1179 rxvt_salloc *talloc; // text line allocator
1252 rxvt_salloc *ralloc; // rend line allocator 1180 rxvt_salloc *ralloc; // rend line allocator
1253 1181
1254 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1182 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1257 // ISO 14755 entry support 1185 // ISO 14755 entry support
1258 unicode_t iso14755buf; 1186 unicode_t iso14755buf;
1259 void commit_iso14755 (); 1187 void commit_iso14755 ();
1260 int hex_keyval (XKeyEvent &ev); 1188 int hex_keyval (XKeyEvent &ev);
1261# if ISO_14755 1189# if ISO_14755
1262 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1190 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1263 void iso14755_54 (int x, int y); 1191 void iso14755_54 (int x, int y);
1264# endif 1192# endif
1265#endif 1193#endif
1266 1194
1267 // modifies first argument(!) 1195 // modifies first argument(!)
1268 void paste (unsigned char *data, unsigned int len); 1196 void paste (char *data, unsigned int len);
1269 1197
1270 void flush (); 1198 void flush ();
1271 1199
1272#if TRANSPARENT 1200#if TRANSPARENT
1273 void rootwin_cb (XEvent &xev); 1201 void rootwin_cb (XEvent &xev);
1314 void pointer_blank (); 1242 void pointer_blank ();
1315#endif 1243#endif
1316 void pointer_unblank (); 1244 void pointer_unblank ();
1317 1245
1318 void tt_printf (const char *fmt,...); 1246 void tt_printf (const char *fmt,...);
1319 void tt_write (const unsigned char *data, unsigned int len); 1247 void tt_write (const char *data, unsigned int len);
1320 void pty_write (); 1248 void pty_write ();
1321 1249
1322 void tt_winch (); 1250 void tt_winch ();
1323 1251
1324 rxvt_term (); 1252 rxvt_term ();
1325 ~rxvt_term (); 1253 ~rxvt_term ();
1254 void child_exit (); // child has exited, usually destroys
1326 void destroy (); 1255 void destroy ();
1327 void emergency_cleanup (); 1256 void emergency_cleanup ();
1328 1257
1329 bool init (int argc, const char *const *argv); 1258 bool init (int argc, const char *const *argv);
1330 bool init_vars (); 1259 bool init_vars ();
1375 1304
1376 /* autoconvert */ 1305 /* autoconvert */
1377 1306
1378 // command.C 1307 // command.C
1379 void lookup_key (XKeyEvent &ev); 1308 void lookup_key (XKeyEvent &ev);
1380 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1309 unsigned int cmd_write (const char *str, unsigned int count);
1381 1310
1382 unicode_t next_char (); 1311 wchar_t next_char ();
1383 unicode_t cmd_getc (); 1312 wchar_t cmd_getc ();
1384 unicode_t next_octet (); 1313 uint32_t next_octet ();
1385 unicode_t cmd_get8 (); 1314 uint32_t cmd_get8 ();
1386 1315
1387 bool cmd_parse (); 1316 bool cmd_parse ();
1388 void mouse_report (XButtonEvent &ev); 1317 void mouse_report (XButtonEvent &ev);
1389 void button_press (XButtonEvent &ev); 1318 void button_press (XButtonEvent &ev);
1390 void button_release (XButtonEvent &ev); 1319 void button_release (XButtonEvent &ev);
1399 void process_nonprinting (unicode_t ch); 1328 void process_nonprinting (unicode_t ch);
1400 void process_escape_vt52 (unicode_t ch); 1329 void process_escape_vt52 (unicode_t ch);
1401 void process_escape_seq (); 1330 void process_escape_seq ();
1402 void process_csi_seq (); 1331 void process_csi_seq ();
1403 void process_window_ops (const int *args, unsigned int nargs); 1332 void process_window_ops (const int *args, unsigned int nargs);
1404 unsigned char *get_to_st (unicode_t &ends_how); 1333 char *get_to_st (unicode_t &ends_how);
1405 void process_dcs_seq (); 1334 void process_dcs_seq ();
1406 void process_osc_seq (); 1335 void process_osc_seq ();
1407 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);
1408 void process_xterm_seq (int op, const char *str, unsigned char resp); 1337 void process_xterm_seq (int op, const char *str, char resp);
1409 int privcases (int mode, unsigned long bit); 1338 int privcases (int mode, unsigned long bit);
1410 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);
1411 void process_sgr_mode (unsigned int nargs, const int *arg); 1340 void process_sgr_mode (unsigned int nargs, const int *arg);
1412 void process_graphics (); 1341 void process_graphics ();
1413 // init.C 1342 // init.C
1467 { 1396 {
1468 l.t = (text_t *)talloc->alloc (); 1397 l.t = (text_t *)talloc->alloc ();
1469 l.r = (rend_t *)ralloc->alloc (); 1398 l.r = (rend_t *)ralloc->alloc ();
1470 } 1399 }
1471 1400
1401#if 0
1472 void lfree (line_t &l) 1402 void lfree (line_t &l)
1473 { 1403 {
1474 talloc->free (l.t); 1404 talloc->free (l.t);
1475 ralloc->free (l.r); 1405 ralloc->free (l.r);
1476 } 1406 }
1407#endif
1477 1408
1478 void lresize (line_t &l) 1409 void lresize (line_t &l)
1479 { 1410 {
1480 if (!l.t) 1411 if (!l.t)
1481 return; 1412 return;
1487 1418
1488 if (ncol > prev_ncol) 1419 if (ncol > prev_ncol)
1489 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1420 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1490 } 1421 }
1491 1422
1423 int fgcolor_of (rend_t r)
1424 {
1425 int base = GET_BASEFG (r);
1426#ifndef NO_BRIGHTCOLOR
1427 if (r & RS_Bold
1428# if ENABLE_STYLES
1429 && OPTION (Opt_intensityStyles)
1430# endif
1431 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1432 base += minBrightCOLOR - minCOLOR;
1433#endif
1434 return base;
1435 }
1436
1437 int bgcolor_of (rend_t r)
1438 {
1439 int base = GET_BASEBG (r);
1440#ifndef NO_BRIGHTCOLOR
1441 if (r & RS_Blink
1442# if ENABLE_STYLES
1443 && OPTION (Opt_intensityStyles)
1444# endif
1445 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1446 base += minBrightCOLOR - minCOLOR;
1447#endif
1448 return base;
1449 }
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
1492 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);
1493 void scr_blank_screen_mem (line_t &l, rend_t efs); 1465 void scr_blank_screen_mem (line_t &l, rend_t efs);
1494 int scr_scroll_text (int row1, int row2, int count); 1466 int scr_scroll_text (int row1, int row2, int count);
1495 void scr_reset (); 1467 void scr_reset ();
1496 void scr_reset_realloc ();
1497 void scr_release (); 1468 void scr_release ();
1498 void scr_clear (bool really = false); 1469 void scr_clear (bool really = false);
1499 void scr_refresh (unsigned char refresh_type); 1470 void scr_refresh (unsigned char refresh_type);
1500 bool scr_refresh_rend (rend_t mask, rend_t value); 1471 bool scr_refresh_rend (rend_t mask, rend_t value);
1501 void scr_erase_screen (int mode); 1472 void scr_erase_screen (int mode);
1507 void scr_touch (bool refresh); 1478 void scr_touch (bool refresh);
1508 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);
1509 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1480 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1510 void scr_recolour (); 1481 void scr_recolour ();
1511 void scr_remap_chars (); 1482 void scr_remap_chars ();
1512 void scr_remap_chars (const line_t &l); 1483 void scr_remap_chars (line_t &l);
1513 1484
1514 void scr_poweron (); 1485 void scr_poweron ();
1515 void scr_cursor (int mode); 1486 void scr_cursor (int mode);
1516 void scr_do_wrap (); 1487 void scr_do_wrap ();
1517 int scr_change_screen (int scrn); 1488 int scr_change_screen (int scrn);
1518 void scr_color (unsigned int color, int fgbg); 1489 void scr_color (unsigned int color, int fgbg);
1519 void scr_rendition (int set, int style); 1490 void scr_rendition (int set, int style);
1520 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);
1521 void scr_backspace (); 1492 void scr_backspace ();
1522 void scr_tab (int count, bool ht = false); 1493 void scr_tab (int count, bool ht = false);
1523 void scr_gotorc (int row, int col, int relative); 1494 void scr_gotorc (int row, int col, int relative);
1524 void scr_index (enum page_dirn direction); 1495 void scr_index (enum page_dirn direction);
1525 void scr_erase_line (int mode); 1496 void scr_erase_line (int mode);
1549 void selection_property (Window win, Atom prop); 1520 void selection_property (Window win, Atom prop);
1550 void selection_request (Time tm, int x, int y); 1521 void selection_request (Time tm, int x, int y);
1551 int selection_request_other (Atom target, int selnum); 1522 int selection_request_other (Atom target, int selnum);
1552 void selection_clear (); 1523 void selection_clear ();
1553 void selection_make (Time tm); 1524 void selection_make (Time tm);
1525 bool selection_grab (Time tm);
1554 void selection_start_colrow (int col, int row); 1526 void selection_start_colrow (int col, int row);
1555 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1527 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1556 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1528 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1557 void selection_remove_trailing_spaces (); 1529 void selection_remove_trailing_spaces ();
1558 void selection_send (const XSelectionRequestEvent &rq); 1530 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines