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.159 by root, Fri Aug 5 16:42:44 2005 UTC vs.
Revision 1.190 by root, Sat Jan 7 19:29:17 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_IT(current, other) if ((other) > (current)) (current) = (other)
168#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
169#define SWAP_IT(one, two, typeof) \
170 do { \
171 typeof swapittmp; \
172 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
173 } while (/* CONSTCOND */ 0)
174#define BOUND_POSITIVE_INT16(val) \
175 (int16_t) ((val) <= 0 \
176 ? 0 \
177 : min ((val), (((uint16_t)-1)>>1)))
178
179#if ENABLE_FRILLS 160#if ENABLE_FRILLS
180typedef struct _mwmhints { 161typedef struct _mwmhints {
181 CARD32 flags; 162 CARD32 flags;
182 CARD32 functions; 163 CARD32 functions;
183 CARD32 decorations; 164 CARD32 decorations;
… …
234 215
235#ifdef NO_RESOURCES 216#ifdef NO_RESOURCES
236# undef USE_XGETDEFAULT 217# undef USE_XGETDEFAULT
237#endif 218#endif
238 219
239#if ISO_14755 220#if defined (ISO_14755) || defined (ENABLE_PERL)
240# define ENABLE_OVERLAY 1 221# define ENABLE_OVERLAY 1
241#endif 222#endif
242 223
243/* now look for other badly set stuff */ 224/* now look for other badly set stuff */
244 225
… …
259# define HAVE_SCROLLBARS 1 240# define HAVE_SCROLLBARS 1
260#endif 241#endif
261 242
262/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 243/* width of scrollBar, menuBar shadow, must be 1 or 2 */
263#ifdef HALFSHADOW 244#ifdef HALFSHADOW
264# define SHADOW 1 245# define MENU_SHADOW 1
265#else 246#else
266# define SHADOW 2 247# define MENU_SHADOW 2
267#endif 248#endif
268 249
269#define R_SB_ALIGN_CENTRE 0 250#define R_SB_ALIGN_CENTRE 0
270#define R_SB_ALIGN_TOP 1 251#define R_SB_ALIGN_TOP 1
271#define R_SB_ALIGN_BOTTOM 2 252#define R_SB_ALIGN_BOTTOM 2
… …
363#define FONT_DN "#-" 344#define FONT_DN "#-"
364#define FONT_UP "#+" 345#define FONT_UP "#+"
365 346
366/* flags for rxvt_scr_gotorc () */ 347/* flags for rxvt_scr_gotorc () */
367enum { 348enum {
368 C_RELATIVE = 1 , /* col movement is relative */ 349 C_RELATIVE = 1, /* col movement is relative */
369 R_RELATIVE = 2, /* row movement is relative */ 350 R_RELATIVE = 2, /* row movement is relative */
370 RELATIVE = 1 | 2, 351 RELATIVE = C_RELATIVE | R_RELATIVE,
371}; 352};
372 353
373/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 354/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
374enum { 355enum {
375 INSERT = -1, /* don't change these values */ 356 INSERT = -1, /* don't change these values */
… …
388enum { 369enum {
389 PRIMARY = 0, 370 PRIMARY = 0,
390 SECONDARY, 371 SECONDARY,
391}; 372};
392 373
393#define RS_None 0 /* Normal */ 374#define RS_None 0
394 375
395#define RS_fgMask 0x0000007fUL /* 128 colors */ 376#define RS_fgMask 0x0000007fUL // 128 colors
396#define RS_bgMask 0x00003f80UL /* 128 colors */ 377#define RS_bgMask 0x00003f80UL // 128 colors
397 378
398// font styles 379// font styles
399#define RS_Bold 0x00004000UL // value 1 380#define RS_Bold 0x00004000UL // value 1
400#define RS_Italic 0x00008000UL // value 2 381#define RS_Italic 0x00008000UL // value 2
401 382
402// fake styles 383// fake styles
403#define RS_Blink 0x00010000UL /* blink */ 384#define RS_Blink 0x00010000UL // blink
404#define RS_RVid 0x00020000UL /* reverse video */ 385#define RS_RVid 0x00020000UL // reverse video
405#define RS_Uline 0x00040000UL /* underline */ 386#define RS_Uline 0x00040000UL // underline
406 387
407// 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
408 392
409// other flags 393// other flags
410#define RS_Careful 0x80000000UL /* be careful when drawing these */ 394#define RS_Careful 0x80000000UL /* be careful when drawing these */
411 395
412#define RS_styleCount 4 396#define RS_styleCount 4
… …
487 URxvt_italicFont = 712, 471 URxvt_italicFont = 712,
488 URxvt_boldItalicFont = 713, 472 URxvt_boldItalicFont = 713,
489 473
490 URxvt_view_up = 720, 474 URxvt_view_up = 720,
491 URxvt_view_down = 721, 475 URxvt_view_down = 721,
476
477 URxvt_perl = 777,
492}; 478};
493 479
494/* Words starting with `Color_' are colours. Others are counts */ 480/* Words starting with `Color_' are colours. Others are counts */
495/* 481/*
496 * The following comment is mostly obsolete since pixcolor_set was expanded:
497 * We're currently upto 29 colours. Only 3 more available. The
498 * PixColor and rendition colour usage should probably be decoupled 482 * The PixColor and rendition colour usage should probably be decoupled
499 * on the unnecessary items, e.g. Color_pointer, but won't bother 483 * on the unnecessary items, e.g. Color_pointer, but won't bother
500 * until we need to. Also, be aware of usage in pixcolor_set 484 * until we need to. Also, be aware of usage in pixcolor_set
501 */ 485 */
502 486
503enum colour_list { 487enum colour_list {
… …
553 Color_trough, 537 Color_trough,
554#endif 538#endif
555#if TINTING 539#if TINTING
556 Color_tint, 540 Color_tint,
557#endif 541#endif
542#if OFF_FOCUS_FADING
543 Color_fade,
544#endif
558 NRS_COLORS, /* */ 545 NRS_COLORS, /* */
559#ifdef KEEP_SCROLLCOLOR 546#ifdef KEEP_SCROLLCOLOR
560 Color_topShadow = NRS_COLORS, 547 Color_topShadow = NRS_COLORS,
561 Color_bottomShadow, 548 Color_bottomShadow,
562 TOTAL_COLORS 549 TOTAL_COLORS
… …
572 559
573/* 560/*
574 * Resource list 561 * Resource list
575 */ 562 */
576enum { 563enum {
577 Rs_display_name = 0, 564# define def(name) Rs_ ## name,
578 Rs_term_name, 565# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
579 Rs_iconName, 566# include "rsinc.h"
580 Rs_geometry, 567# undef def
581 Rs_reverseVideo, 568# undef reserve
582 Rs_color,
583 _Rs_color = Rs_color + NRS_COLORS - 1,
584 Rs_font,
585#if ENABLE_STYLES
586 Rs_boldFont,
587 Rs_italicFont,
588 Rs_boldItalicFont,
589#endif
590 Rs_name,
591 Rs_title,
592#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
593 Rs_path,
594#endif
595#ifdef XPM_BACKGROUND
596 Rs_backgroundPixmap,
597#endif
598#if (MENUBAR_MAX)
599 Rs_menu,
600#endif
601 Rs_loginShell,
602 Rs_jumpScroll,
603#ifdef HAVE_SCROLLBARS
604 Rs_scrollBar,
605 Rs_scrollBar_right,
606 Rs_scrollBar_floating,
607 Rs_scrollBar_align,
608 Rs_scrollstyle, /* Rs_scrollBar_style */
609 Rs_scrollBar_thickness,
610#endif
611 Rs_scrollTtyOutput,
612 Rs_scrollTtyKeypress,
613 Rs_scrollWithBuffer,
614 Rs_saveLines,
615 Rs_utmpInhibit,
616 Rs_visualBell,
617#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
618 Rs_mapAlert,
619#endif
620#ifdef META8_OPTION
621 Rs_meta8,
622#endif
623#ifdef MOUSE_WHEEL
624 Rs_mouseWheelScrollPage,
625#endif
626#ifndef NO_BACKSPACE_KEY
627 Rs_backspace_key,
628#endif
629#ifndef NO_DELETE_KEY
630 Rs_delete_key,
631#endif
632 Rs_selectstyle,
633#ifdef PRINTPIPE
634 Rs_print_pipe,
635#endif
636#ifdef USE_XIM
637 Rs_preeditType,
638 Rs_inputMethod,
639#endif
640#ifdef TRANSPARENT
641 Rs_transparent,
642 Rs_transparent_all,
643#endif
644#if ENABLE_FRILLS
645 Rs_ext_bwidth,
646 Rs_int_bwidth,
647 Rs_borderLess,
648 Rs_lineSpace,
649 Rs_pty_fd,
650 Rs_cursorUnderline,
651#endif
652#if CURSOR_BLINK
653 Rs_cursorBlink,
654#endif
655#if ENABLE_XEMBED
656 Rs_embed,
657#endif
658 Rs_cutchars,
659 Rs_modifier,
660 Rs_answerbackstring,
661 Rs_tripleclickwords,
662 Rs_insecure,
663 Rs_pointerBlank,
664 Rs_pointerBlankDelay,
665 Rs_imLocale,
666 Rs_imFont,
667 Rs_pastableTabs,
668#ifndef NO_SECONDARY_SCREEN
669 Rs_secondaryScreen,
670 Rs_secondaryScroll,
671#endif
672#ifdef OFF_FOCUS_FADING
673 Rs_fade,
674#endif
675#ifdef TINTING
676 Rs_shade,
677#endif
678 NUM_RESOURCES 569 NUM_RESOURCES
679}; 570};
680 571
681// see init.C:xa_names, which must be kept in sync 572// see init.C:xa_names, which must be kept in sync
682enum { 573enum {
… …
757#endif 648#endif
758 649
759// do not change these constants lightly, there are many interdependencies 650// do not change these constants lightly, there are many interdependencies
760#define IMBUFSIZ 128 // input modifier buffer sizes 651#define IMBUFSIZ 128 // input modifier buffer sizes
761#define KBUFSZ 512 // size of keyboard mapping buffer 652#define KBUFSZ 512 // size of keyboard mapping buffer
762#define CBUFSIZ 4096 // size of command buffer 653#define CBUFSIZ 2048 // size of command buffer
763#define UBUFSIZ 4096 // character buffer 654#define UBUFSIZ 2048 // character buffer
764 655
765#ifndef PATH_MAX 656#ifndef PATH_MAX
766# define PATH_MAX 16384 657# define PATH_MAX 16384
767#endif 658#endif
768 659
… …
796/* 687/*
797 ***************************************************************************** 688 *****************************************************************************
798 * MACRO DEFINES 689 * MACRO DEFINES
799 ***************************************************************************** 690 *****************************************************************************
800 */ 691 */
801#define memset(x, y, z) memset((x), (y), (size_t)(z))
802#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
803#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
804#define strcasecmp(x, y) strcasecmp((x), (y))
805#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
806#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
807#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
808#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
809#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
810#define strcat(x, y) strcat((char *)(x), (const char *)(y))
811#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
812#define strdup(x) strdup((const char *)(x))
813#define strlen(x) strlen((const char *)(x))
814#define strchr(x, y) strchr((const char *)(x), (int)(y))
815#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
816
817#define dDisp Display *disp = display->display 692#define dDisp Display *disp = display->display
818 693
819/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
820#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
821#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
822#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
823#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 698#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
824#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 699#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
825#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 700#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
826#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
827#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
828 703
829#define TermWin_TotalWidth() ((int32_t)TermWin.width) 704// for m >= -n, ensure remainder lies between 0..n-1
830#define TermWin_TotalHeight() ((int32_t)TermWin.height) 705#define MOD(m,n) (((m) + (n)) % (n))
706
707#define LINENO(n) MOD (term_start + int(n), total_rows)
708#define ROW(n) row_buf [LINENO (n)]
831 709
832/* how to build & extract colors and attributes */ 710/* how to build & extract colors and attributes */
833#define GET_BASEFG(x) (((x) & RS_fgMask)) 711#define GET_BASEFG(x) (((x) & RS_fgMask))
834#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 712#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
835#ifndef NO_BRIGHTCOLOR
836# define GET_FGCOLOR(x) \
837 ((((x) & RS_Bold) == 0 \
838 || GET_BASEFG (x) < minCOLOR \
839 || GET_BASEFG (x) >= minBrightCOLOR) \
840 ? GET_BASEFG (x) \
841 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
842# define GET_BGCOLOR(x) \
843 ((((x) & RS_Blink) == 0 \
844 || GET_BASEBG (x) < minCOLOR \
845 || GET_BASEBG (x) >= minBrightCOLOR) \
846 ? GET_BASEBG (x) \
847 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
848#else
849# define GET_FGCOLOR(x) GET_BASEFG(x)
850# define GET_BGCOLOR(x) GET_BASEBG(x)
851#endif
852 713
853#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 714#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
854#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 715#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
855 716
856#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 717#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
869 730
870#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 731#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
871#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 732#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
872 733
873#if ENABLE_STYLES 734#if ENABLE_STYLES
874# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 735# define FONTSET(style) fontset[GET_STYLE (style)]
875#else 736#else
876# define FONTSET(style) TermWin.fontset[0] 737# define FONTSET(style) fontset[0]
877#endif 738#endif
878 739
879#ifdef HAVE_SCROLLBARS 740#ifdef HAVE_SCROLLBARS
880# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 741# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
881#else 742#else
… …
906#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 767#define scrollbar_size() (scrollBar.end - scrollBar.beg \
907 - scrollbar_minheight ()) 768 - scrollbar_minheight ())
908 769
909#if (MENUBAR_MAX > 1) 770#if (MENUBAR_MAX > 1)
910/* rendition style flags */ 771/* rendition style flags */
911# define menuBar_height() (TermWin.fheight + SHADOW) 772# define menuBar_height() (fheight + MENU_SHADOW)
912# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 773# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
913# define isMenuBarWindow(w) ((w) == menuBar.win) 774# define isMenuBarWindow(w) ((w) == menuBar.win)
914#else 775#else
915# define menuBar_height() (0) 776# define menuBar_height() (0)
916# define menuBar_TotalHeight() (0) 777# define menuBar_TotalHeight() (0)
917# define isMenuBarWindow(w) (0) 778# define isMenuBarWindow(w) (0)
… …
963#endif 824#endif
964 825
965extern class rxvt_failure_exception { } rxvt_failure_exception; 826extern class rxvt_failure_exception { } rxvt_failure_exception;
966 827
967typedef callback1<void, const char *> log_callback; 828typedef callback1<void, const char *> log_callback;
829typedef callback1<int, int> getfd_callback;
968 830
969extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 831extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
970extern void rxvt_log (const char *fmt, ...); 832extern void rxvt_log (const char *fmt, ...);
971extern void rxvt_warn (const char *fmt, ...); 833extern void rxvt_warn (const char *fmt, ...);
972extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 834extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
973extern void rxvt_exit_failure () __attribute__ ((noreturn)); 835extern void rxvt_exit_failure () __attribute__ ((noreturn));
974 836
975#define SET_LOCALE(locale) rxvt_set_locale (locale) 837#define SET_LOCALE(locale) rxvt_set_locale (locale)
976extern bool rxvt_set_locale (const char *locale); 838extern bool rxvt_set_locale (const char *locale);
839extern bool rxvt_push_locale (const char *locale);
840extern void rxvt_pop_locale ();
977 841
978/*
979 ***************************************************************************** 842/****************************************************************************/
980 * VARIABLES 843
981 *****************************************************************************
982 */
983#ifdef MENUBAR 844#ifdef MENUBAR
984# include "menubar.h" 845# include "menubar.h"
985#endif 846#endif
986 847
987#define BLINK_INTERVAL 0.5 848#define BLINK_INTERVAL 0.5
… …
994# endif 855# endif
995# endif 856# endif
996# define __attribute__(x) 857# define __attribute__(x)
997#endif 858#endif
998 859
860/****************************************************************************/
861
862#define LINE_LONGER 0x0001 // line is continued on the next row
863#define LINE_FILTERED 0x0002 // line has been filtered
864#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
865
866struct line_t {
867 text_t *t; // terminal the text
868 rend_t *r; // rendition, uses RS_ flags
869 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
870 uint32_t f; // flags
871
872 bool is_longer ()
873 {
874 return f & LINE_LONGER;
875 }
876
877 void is_longer (int set)
878 {
879 if (set)
880 f |= LINE_LONGER;
881 else
882 f &= ~LINE_LONGER;
883 }
884
885 void clear ()
886 {
887 t = 0;
888 r = 0;
889 l = 0;
890 f = 0;
891 }
892
893 void touch () // call whenever a line is changed/touched/updated
894 {
895#if ENABLE_PERL
896 f &= ~LINE_FILTERED;
897#endif
898 }
899
900 void touch (int col)
901 {
902 max_it (l, col);
903 touch ();
904 }
905};
906
907/****************************************************************************/
908
999// primivite wrapper around mbstate_t to ensure initialisation 909// primivite wrapper around mbstate_t to ensure initialisation
1000struct mbstate { 910struct mbstate {
1001 mbstate_t mbs; 911 mbstate_t mbs;
1002 912
1003 operator mbstate_t *() { return &mbs; } 913 operator mbstate_t *() { return &mbs; }
1004 void reset () { memset (&mbs, 0, sizeof (mbs)); } 914 void reset () { memset (&mbs, 0, sizeof (mbs)); }
1005 mbstate () { reset (); } 915 mbstate () { reset (); }
1006}; 916};
1007 917
918/****************************************************************************/
919
1008#define UNICODE_MASK 0x1fffffUL 920#define UNICODE_MASK 0x1fffffUL
1009 921
1010#if UNICODE3 922#if UNICODE3
1011# define COMPOSE_LO 0x40000000UL 923# define COMPOSE_LO 0x40000000UL
1012# define COMPOSE_HI 0x400fffffUL 924# define COMPOSE_HI 0x400fffffUL
1013# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 925# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
1014#else 926#else
927# if ENABLE_PERL
928# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
929# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
930# else
1015# define COMPOSE_LO 0xd800UL 931# define COMPOSE_LO 0xd800UL
1016# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 932# define COMPOSE_HI 0xf8ffUL
1017# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 933# endif
934# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
1018#endif 935#endif
1019 936
1020#if ENABLE_COMBINING 937#if ENABLE_COMBINING
1021// compose chars are used to represent composite characters 938// compose chars are used to represent composite characters
1022// that are not representable in unicode, as well as characters 939// that are not representable in unicode, as well as characters
… …
1042}; 959};
1043 960
1044extern class rxvt_composite_vec rxvt_composite; 961extern class rxvt_composite_vec rxvt_composite;
1045#endif 962#endif
1046 963
964/****************************************************************************/
1047 965
1048#ifdef KEYSYM_RESOURCE 966#ifdef KEYSYM_RESOURCE
1049 class keyboard_manager; 967 class keyboard_manager;
1050#endif 968#endif
1051 969
1052struct rxvt_term : zero_initialized, rxvt_vars { 970struct rxvt_term : zero_initialized, rxvt_vars {
1053 log_callback *log_hook; // log error messages through this hook, if != 0 971 log_callback *log_hook; // log error messages through this hook, if != 0
972 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
973
974#if ENABLE_PERL
975 rxvt_perl_term perl;
976#endif
1054 977
1055 struct mbstate mbstate; // current input multibyte state 978 struct mbstate mbstate; // current input multibyte state
1056 979
1057 unsigned char want_refresh:1, 980 unsigned char want_refresh:1,
1058#ifdef TRANSPARENT 981#ifdef TRANSPARENT
… …
1209 bar_t *CurrentBar; 1132 bar_t *CurrentBar;
1210# if ! (MENUBAR_MAX > 1) 1133# if ! (MENUBAR_MAX > 1)
1211 bar_t BarList; 1134 bar_t BarList;
1212# endif /* (MENUBAR_MAX > 1) */ 1135# endif /* (MENUBAR_MAX > 1) */
1213#endif 1136#endif
1214#ifdef CURSOR_BLINK
1215 struct timeval lastcursorchange;
1216#endif
1217#ifdef POINTER_BLANK
1218 struct timeval lastmotion;
1219#endif
1220 1137
1221#if ENABLE_OVERLAY 1138#if ENABLE_OVERLAY
1222 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1139 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1223 text_t **ov_text; 1140 text_t **ov_text;
1224 rend_t **ov_rend; 1141 rend_t **ov_rend;
… …
1239 char *env_display; /* environmental variable DISPLAY */ 1156 char *env_display; /* environmental variable DISPLAY */
1240 char *env_term; /* environmental variable TERM */ 1157 char *env_term; /* environmental variable TERM */
1241 char *env_colorfgbg; 1158 char *env_colorfgbg;
1242 char *locale; 1159 char *locale;
1243 char charsets[4]; 1160 char charsets[4];
1244 unsigned char *v_buffer; /* pointer to physical buffer */ 1161 char *v_buffer; /* pointer to physical buffer */
1245 unsigned int v_buflen; /* size of area to write */ 1162 unsigned int v_buflen; /* size of area to write */
1246 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1163 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1247 1164
1248#ifdef KEYSYM_RESOURCE 1165#ifdef KEYSYM_RESOURCE
1249 keyboard_manager *keyboard; 1166 keyboard_manager *keyboard;
1250#endif 1167#endif
1251 1168
1252 const char *rs[NUM_RESOURCES]; 1169 const char *rs[NUM_RESOURCES];
1253 /* command input buffering */ 1170 /* command input buffering */
1254 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1171 char *cmdbuf_ptr, *cmdbuf_endp;
1255 unsigned char cmdbuf_base[CBUFSIZ]; 1172 char cmdbuf_base[CBUFSIZ];
1256 1173
1257 rxvt_salloc *talloc; // text line allocator 1174 rxvt_salloc *talloc; // text line allocator
1258 rxvt_salloc *ralloc; // rend line allocator 1175 rxvt_salloc *ralloc; // rend line allocator
1259 1176
1260 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1177 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1263 // ISO 14755 entry support 1180 // ISO 14755 entry support
1264 unicode_t iso14755buf; 1181 unicode_t iso14755buf;
1265 void commit_iso14755 (); 1182 void commit_iso14755 ();
1266 int hex_keyval (XKeyEvent &ev); 1183 int hex_keyval (XKeyEvent &ev);
1267# if ISO_14755 1184# if ISO_14755
1268 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1185 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1269 void iso14755_54 (int x, int y); 1186 void iso14755_54 (int x, int y);
1270# endif 1187# endif
1271#endif 1188#endif
1272 1189
1273 // modifies first argument(!) 1190 // modifies first argument(!)
1274 void paste (unsigned char *data, unsigned int len); 1191 void paste (char *data, unsigned int len);
1275 1192
1276 void flush (); 1193 void flush ();
1277 1194
1278#if TRANSPARENT 1195#if TRANSPARENT
1279 void rootwin_cb (XEvent &xev); 1196 void rootwin_cb (XEvent &xev);
1280 xevent_watcher rootwin_ev; 1197 xevent_watcher rootwin_ev;
1281#endif 1198#endif
1282
1283
1284 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1285 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1286 1199
1287 void x_cb (XEvent &xev); 1200 void x_cb (XEvent &xev);
1288 xevent_watcher termwin_ev; 1201 xevent_watcher termwin_ev;
1289 xevent_watcher vt_ev; 1202 xevent_watcher vt_ev;
1290#ifdef HAVE_SCROLLBARS 1203#ifdef HAVE_SCROLLBARS
… …
1324 void pointer_blank (); 1237 void pointer_blank ();
1325#endif 1238#endif
1326 void pointer_unblank (); 1239 void pointer_unblank ();
1327 1240
1328 void tt_printf (const char *fmt,...); 1241 void tt_printf (const char *fmt,...);
1329 void tt_write (const unsigned char *data, unsigned int len); 1242 void tt_write (const char *data, unsigned int len);
1330 void pty_write (); 1243 void pty_write ();
1331 1244
1332 void tt_winch (); 1245 void tt_winch ();
1333 1246
1334 rxvt_term (); 1247 rxvt_term ();
1335 ~rxvt_term (); 1248 ~rxvt_term ();
1249 void child_exit (); // child has exited, usually destroys
1336 void destroy (); 1250 void destroy ();
1337 void emergency_cleanup (); 1251 void emergency_cleanup ();
1338 1252
1339 bool init (int argc, const char *const *argv); 1253 bool init (int argc, const char *const *argv);
1340 bool init_vars (); 1254 bool init_vars ();
… …
1351 int run_child (const char *const *argv); 1265 int run_child (const char *const *argv);
1352 1266
1353 void color_aliases (int idx); 1267 void color_aliases (int idx);
1354 void recolour_cursor (); 1268 void recolour_cursor ();
1355 void create_windows (int argc, const char *const *argv); 1269 void create_windows (int argc, const char *const *argv);
1356 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1270 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1357 void window_calc (unsigned int width, unsigned int height); 1271 void window_calc (unsigned int newwidth, unsigned int newheight);
1358 1272
1359#if USE_XIM 1273#if USE_XIM
1360 rxvt_xim *input_method; 1274 rxvt_xim *input_method;
1361 XIC Input_Context; 1275 XIC Input_Context;
1362 XIMStyle input_style; 1276 XIMStyle input_style;
… …
1385 1299
1386 /* autoconvert */ 1300 /* autoconvert */
1387 1301
1388 // command.C 1302 // command.C
1389 void lookup_key (XKeyEvent &ev); 1303 void lookup_key (XKeyEvent &ev);
1390 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1304 unsigned int cmd_write (const char *str, unsigned int count);
1391 1305
1392 unicode_t next_char (); 1306 wchar_t next_char ();
1393 unicode_t cmd_getc (); 1307 wchar_t cmd_getc ();
1394 unicode_t next_octet (); 1308 uint32_t next_octet ();
1395 unicode_t cmd_get8 (); 1309 uint32_t cmd_get8 ();
1396 1310
1397 bool cmd_parse (); 1311 bool cmd_parse ();
1398 void mouse_report (XButtonEvent &ev); 1312 void mouse_report (XButtonEvent &ev);
1399 void button_press (XButtonEvent &ev); 1313 void button_press (XButtonEvent &ev);
1400 void button_release (XButtonEvent &ev); 1314 void button_release (XButtonEvent &ev);
… …
1409 void process_nonprinting (unicode_t ch); 1323 void process_nonprinting (unicode_t ch);
1410 void process_escape_vt52 (unicode_t ch); 1324 void process_escape_vt52 (unicode_t ch);
1411 void process_escape_seq (); 1325 void process_escape_seq ();
1412 void process_csi_seq (); 1326 void process_csi_seq ();
1413 void process_window_ops (const int *args, unsigned int nargs); 1327 void process_window_ops (const int *args, unsigned int nargs);
1414 unsigned char *get_to_st (unicode_t &ends_how); 1328 char *get_to_st (unicode_t &ends_how);
1415 void process_dcs_seq (); 1329 void process_dcs_seq ();
1416 void process_osc_seq (); 1330 void process_osc_seq ();
1417 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1331 void process_color_seq (int report, int color, const char *str, char resp);
1418 void process_xterm_seq (int op, const char *str, unsigned char resp); 1332 void process_xterm_seq (int op, const char *str, char resp);
1419 int privcases (int mode, unsigned long bit); 1333 int privcases (int mode, unsigned long bit);
1420 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1334 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1421 void process_sgr_mode (unsigned int nargs, const int *arg); 1335 void process_sgr_mode (unsigned int nargs, const int *arg);
1422 void process_graphics (); 1336 void process_graphics ();
1423 // init.C 1337 // init.C
… …
1434 void set_title (const char *str); 1348 void set_title (const char *str);
1435 void set_icon_name (const char *str); 1349 void set_icon_name (const char *str);
1436 void set_window_color (int idx, const char *color); 1350 void set_window_color (int idx, const char *color);
1437 void set_colorfgbg (); 1351 void set_colorfgbg ();
1438 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1352 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1439 void set_widthheight (unsigned int width, unsigned int height); 1353 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1440 1354
1441#ifdef MENUBAR 1355#ifdef MENUBAR
1442 // menubar.C 1356 // menubar.C
1443 void menuitem_free (menu_t *menu, menuitem_t *item); 1357 void menuitem_free (menu_t *menu, menuitem_t *item);
1444 int action_dispatch (action_t *action); 1358 int action_dispatch (action_t *action);
… …
1470 void menubar_control (XButtonEvent &ev); 1384 void menubar_control (XButtonEvent &ev);
1471 void map_menuBar (int map); 1385 void map_menuBar (int map);
1472#endif 1386#endif
1473 1387
1474 // screen.C 1388 // screen.C
1475 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1389
1476 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1390 void lalloc (line_t &l)
1391 {
1392 l.t = (text_t *)talloc->alloc ();
1393 l.r = (rend_t *)ralloc->alloc ();
1394 }
1395
1396#if 0
1397 void lfree (line_t &l)
1398 {
1399 talloc->free (l.t);
1400 ralloc->free (l.r);
1401 }
1402#endif
1403
1404 void lresize (line_t &l)
1405 {
1406 if (!l.t)
1407 return;
1408
1409 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1410 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1411
1412 l.l = min (l.l, ncol);
1413
1414 if (ncol > prev_ncol)
1415 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1416 }
1417
1418 int fgcolor_of (rend_t r)
1419 {
1420 int base = GET_BASEFG (r);
1421#ifndef NO_BRIGHTCOLOR
1422 if (r & RS_Bold
1423# if ENABLE_STYLES
1424 && OPTION (Opt_intensityStyles)
1425# endif
1426 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1427 base += minBrightCOLOR - minCOLOR;
1428#endif
1429 return base;
1430 }
1431
1432 int bgcolor_of (rend_t r)
1433 {
1434 int base = GET_BASEBG (r);
1435#ifndef NO_BRIGHTCOLOR
1436 if (r & RS_Blink
1437# if ENABLE_STYLES
1438 && OPTION (Opt_intensityStyles)
1439# endif
1440 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1441 base += minBrightCOLOR - minCOLOR;
1442#endif
1443 return base;
1444 }
1445
1446 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1447 void scr_blank_screen_mem (line_t &l, rend_t efs);
1477 int scr_scroll_text (int row1, int row2, int count, int spec); 1448 int scr_scroll_text (int row1, int row2, int count);
1478 void scr_reset (); 1449 void scr_reset ();
1479 void scr_reset_realloc ();
1480 void scr_release (); 1450 void scr_release ();
1481 void scr_clear (bool really = false); 1451 void scr_clear (bool really = false);
1482 void scr_refresh (unsigned char refresh_type); 1452 void scr_refresh (unsigned char refresh_type);
1483 bool scr_refresh_rend (rend_t mask, rend_t value); 1453 bool scr_refresh_rend (rend_t mask, rend_t value);
1484 void scr_erase_screen (int mode); 1454 void scr_erase_screen (int mode);
… …
1490 void scr_touch (bool refresh); 1460 void scr_touch (bool refresh);
1491 void scr_expose (int x, int y, int width, int height, bool refresh); 1461 void scr_expose (int x, int y, int width, int height, bool refresh);
1492 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1462 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1493 void scr_recolour (); 1463 void scr_recolour ();
1494 void scr_remap_chars (); 1464 void scr_remap_chars ();
1495 void scr_remap_chars (text_t *tp, rend_t *rp); 1465 void scr_remap_chars (line_t &l);
1496 1466
1497 void scr_poweron (); 1467 void scr_poweron ();
1498 void scr_cursor (int mode); 1468 void scr_cursor (int mode);
1499 void scr_do_wrap (); 1469 void scr_do_wrap ();
1500 int scr_change_screen (int scrn); 1470 int scr_change_screen (int scrn);
1501 void scr_color (unsigned int color, int fgbg); 1471 void scr_color (unsigned int color, int fgbg);
1502 void scr_rendition (int set, int style); 1472 void scr_rendition (int set, int style);
1503 void scr_add_lines (const unicode_t *str, int nlines, int len); 1473 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1504 void scr_backspace (); 1474 void scr_backspace ();
1505 void scr_tab (int count, bool ht = false); 1475 void scr_tab (int count, bool ht = false);
1506 void scr_gotorc (int row, int col, int relative); 1476 void scr_gotorc (int row, int col, int relative);
1507 void scr_index (enum page_dirn direction); 1477 void scr_index (enum page_dirn direction);
1508 void scr_erase_line (int mode); 1478 void scr_erase_line (int mode);
… …
1532 void selection_property (Window win, Atom prop); 1502 void selection_property (Window win, Atom prop);
1533 void selection_request (Time tm, int x, int y); 1503 void selection_request (Time tm, int x, int y);
1534 int selection_request_other (Atom target, int selnum); 1504 int selection_request_other (Atom target, int selnum);
1535 void selection_clear (); 1505 void selection_clear ();
1536 void selection_make (Time tm); 1506 void selection_make (Time tm);
1507 bool selection_grab (Time tm);
1537 void selection_start_colrow (int col, int row); 1508 void selection_start_colrow (int col, int row);
1538 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1509 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1539 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1510 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1540 void selection_remove_trailing_spaces (); 1511 void selection_remove_trailing_spaces ();
1541 void selection_send (const XSelectionRequestEvent &rq); 1512 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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