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.152 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.182 by root, Mon Jan 2 18:20:23 2006 UTC

… …
22#include "salloc.h" 22#include "salloc.h"
23 23
24#if ENABLE_FRILLS 24#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1 25# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1 26# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1
27#endif 28#endif
28
29 29
30/* 30/*
31 ***************************************************************************** 31 *****************************************************************************
32 * SYSTEM HACKS 32 * SYSTEM HACKS
33 ***************************************************************************** 33 *****************************************************************************
… …
70 70
71#ifndef STDIN_FILENO 71#ifndef STDIN_FILENO
72# define STDIN_FILENO 0 72# define STDIN_FILENO 0
73# define STDOUT_FILENO 1 73# define STDOUT_FILENO 1
74# define STDERR_FILENO 2 74# 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 75#endif
85 76
86/* 77/*
87 ***************************************************************************** 78 *****************************************************************************
88 * PROTOTYPES 79 * PROTOTYPES
… …
118char ** rxvt_splitcommastring (const char *cs); 109char ** rxvt_splitcommastring (const char *cs);
119void rxvt_freecommastring (char **cs); 110void rxvt_freecommastring (char **cs);
120char * rxvt_File_find (const char *file, const char *ext, const char *path); 111char * 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); 112void 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); 113void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
114void rxvt_usleep (int usecs);
123 115
124/* 116/*
125 ***************************************************************************** 117 *****************************************************************************
126 * STRUCTURES AND TYPEDEFS 118 * STRUCTURES AND TYPEDEFS
127 ***************************************************************************** 119 *****************************************************************************
… …
137#endif 129#endif
138 130
139/* If we're using either the rxvt scrollbar or menu bars, keep the 131/* If we're using either the rxvt scrollbar or menu bars, keep the
140 * scrollColor resource. 132 * scrollColor resource.
141 */ 133 */
142#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 134#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
143# define KEEP_SCROLLCOLOR 1 135# define KEEP_SCROLLCOLOR 1
144#else 136#else
145# undef KEEP_SCROLLCOLOR 137# undef KEEP_SCROLLCOLOR
146#endif 138#endif
147 139
… …
161 Time time; /* milliseconds */ 153 Time time; /* milliseconds */
162 unsigned int state; /* key or button mask */ 154 unsigned int state; /* key or button mask */
163 unsigned int button; /* detail */ 155 unsigned int button; /* detail */
164}; 156};
165 157
166#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
167#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
168#define SWAP_IT(one, two, typeof) \
169 do { \
170 typeof swapittmp; \
171 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
172 } while (/* CONSTCOND */ 0)
173#define BOUND_POSITIVE_INT16(val) \
174 (int16_t) ((val) <= 0 \
175 ? 0 \
176 : min ((val), (((uint16_t)-1)>>1)))
177
178#if ENABLE_FRILLS 158#if ENABLE_FRILLS
179typedef struct _mwmhints { 159typedef struct _mwmhints {
180 CARD32 flags; 160 CARD32 flags;
181 CARD32 functions; 161 CARD32 functions;
182 CARD32 decorations; 162 CARD32 decorations;
… …
233 213
234#ifdef NO_RESOURCES 214#ifdef NO_RESOURCES
235# undef USE_XGETDEFAULT 215# undef USE_XGETDEFAULT
236#endif 216#endif
237 217
238#if ISO_14755 218#if defined (ISO_14755) || defined (ENABLE_PERL)
239# define ENABLE_OVERLAY 1 219# define ENABLE_OVERLAY 1
240#endif 220#endif
241 221
242/* now look for other badly set stuff */ 222/* now look for other badly set stuff */
243 223
… …
267 247
268#define R_SB_ALIGN_CENTRE 0 248#define R_SB_ALIGN_CENTRE 0
269#define R_SB_ALIGN_TOP 1 249#define R_SB_ALIGN_TOP 1
270#define R_SB_ALIGN_BOTTOM 2 250#define R_SB_ALIGN_BOTTOM 2
271 251
272#define R_SB_RXVT 0
273#define R_SB_NEXT 1 252#define R_SB_NEXT 1
274#define R_SB_XTERM 2 253#define R_SB_XTERM 2
275#define R_SB_PLAIN 4 254#define R_SB_PLAIN 4
255#define R_SB_RXVT 8
276 256
277#define SB_WIDTH_NEXT 19 257#define SB_WIDTH_NEXT 19
278#define SB_WIDTH_XTERM 15 258#define SB_WIDTH_XTERM 15
279#define SB_WIDTH_PLAIN 7 259#define SB_WIDTH_PLAIN 7
280#ifndef SB_WIDTH_RXVT 260#ifndef SB_WIDTH_RXVT
… …
362#define FONT_DN "#-" 342#define FONT_DN "#-"
363#define FONT_UP "#+" 343#define FONT_UP "#+"
364 344
365/* flags for rxvt_scr_gotorc () */ 345/* flags for rxvt_scr_gotorc () */
366enum { 346enum {
367 C_RELATIVE = 1 , /* col movement is relative */ 347 C_RELATIVE = 1, /* col movement is relative */
368 R_RELATIVE = 2, /* row movement is relative */ 348 R_RELATIVE = 2, /* row movement is relative */
369 RELATIVE = 1 | 2, 349 RELATIVE = C_RELATIVE | R_RELATIVE,
370}; 350};
371 351
372/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 352/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
373enum { 353enum {
374 INSERT = -1, /* don't change these values */ 354 INSERT = -1, /* don't change these values */
… …
387enum { 367enum {
388 PRIMARY = 0, 368 PRIMARY = 0,
389 SECONDARY, 369 SECONDARY,
390}; 370};
391 371
392#define RS_None 0 /* Normal */ 372#define RS_None 0
393 373
394#define RS_fgMask 0x0000007fUL /* 128 colors */ 374#define RS_fgMask 0x0000007fUL // 128 colors
395#define RS_bgMask 0x00003f80UL /* 128 colors */ 375#define RS_bgMask 0x00003f80UL // 128 colors
396 376
397// font styles 377// font styles
398#define RS_Bold 0x00004000UL // value 1 378#define RS_Bold 0x00004000UL // value 1
399#define RS_Italic 0x00008000UL // value 2 379#define RS_Italic 0x00008000UL // value 2
400 380
401// fake styles 381// fake styles
402#define RS_Blink 0x00010000UL /* blink */ 382#define RS_Blink 0x00010000UL // blink
403#define RS_RVid 0x00020000UL /* reverse video */ 383#define RS_RVid 0x00020000UL // reverse video
404#define RS_Uline 0x00040000UL /* underline */ 384#define RS_Uline 0x00040000UL // underline
405 385
406// 5 bits still to go 386// 5 custom bits for extensions
387#define RS_customCount 32
388#define RS_customMask 0x00f80000UL
389#define RS_customShift 19
407 390
408// other flags 391// other flags
409#define RS_Careful 0x80000000UL /* be careful when drawing these */ 392#define RS_Careful 0x80000000UL /* be careful when drawing these */
410 393
411#define RS_styleCount 4 394#define RS_styleCount 4
… …
473 XTerm_Color_UL = 19, // change actual 'Underline' color 456 XTerm_Color_UL = 19, // change actual 'Underline' color
474 XTerm_Pixmap = 20, // new bg pixmap 457 XTerm_Pixmap = 20, // new bg pixmap
475 XTerm_restoreFG = 39, // change default fg color 458 XTerm_restoreFG = 39, // change default fg color
476 XTerm_restoreBG = 49, // change default bg color 459 XTerm_restoreBG = 49, // change default bg color
477 XTerm_dumpscreen = 55, // dump scrollback and all of screen 460 XTerm_dumpscreen = 55, // dump scrollback and all of screen
461
478 XTerm_locale = 701, // change locale 462 URxvt_locale = 701, // change locale
479 XTerm_Menu = 703, // set menu item 463 URxvt_Menu = 703, // set menu item
480 XTerm_Color_IT = 704, // change actual 'Italic' colour 464 URxvt_Color_IT = 704, // change actual 'Italic' colour
481 XTerm_Color_tint = 705, // change actual tint colour 465 URxvt_Color_tint = 705, // change actual tint colour
482 466
483 URxvt_font = 710, 467 URxvt_font = 710,
484 URxvt_boldFont = 711, 468 URxvt_boldFont = 711,
485 URxvt_italicFont = 712, 469 URxvt_italicFont = 712,
486 URxvt_boldItalicFont = 713, 470 URxvt_boldItalicFont = 713,
471
472 URxvt_view_up = 720,
473 URxvt_view_down = 721,
487}; 474};
488 475
489/* Words starting with `Color_' are colours. Others are counts */ 476/* Words starting with `Color_' are colours. Others are counts */
490/* 477/*
491 * The following comment is mostly obsolete since pixcolor_set was expanded:
492 * We're currently upto 29 colours. Only 3 more available. The
493 * PixColor and rendition colour usage should probably be decoupled 478 * The PixColor and rendition colour usage should probably be decoupled
494 * on the unnecessary items, e.g. Color_pointer, but won't bother 479 * on the unnecessary items, e.g. Color_pointer, but won't bother
495 * until we need to. Also, be aware of usage in pixcolor_set 480 * until we need to. Also, be aware of usage in pixcolor_set
496 */ 481 */
497 482
498enum colour_list { 483enum colour_list {
… …
548 Color_trough, 533 Color_trough,
549#endif 534#endif
550#if TINTING 535#if TINTING
551 Color_tint, 536 Color_tint,
552#endif 537#endif
538#if OFF_FOCUS_FADING
539 Color_fade,
540#endif
553 NRS_COLORS, /* */ 541 NRS_COLORS, /* */
554#ifdef KEEP_SCROLLCOLOR 542#ifdef KEEP_SCROLLCOLOR
555 Color_topShadow = NRS_COLORS, 543 Color_topShadow = NRS_COLORS,
556 Color_bottomShadow, 544 Color_bottomShadow,
557 TOTAL_COLORS 545 TOTAL_COLORS
… …
567 555
568/* 556/*
569 * Resource list 557 * Resource list
570 */ 558 */
571enum { 559enum {
572 Rs_display_name = 0, 560#define Rs_def(name) Rs_ ## name,
573 Rs_term_name, 561#define Rs_reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
574 Rs_iconName, 562#include "rsinc.h"
575 Rs_geometry, 563#undef Rs_def
576 Rs_reverseVideo, 564#undef Rs_reserve
577 Rs_color,
578 _Rs_color = Rs_color + NRS_COLORS - 1,
579 Rs_font,
580#if ENABLE_STYLES
581 Rs_boldFont,
582 Rs_italicFont,
583 Rs_boldItalicFont,
584#endif
585 Rs_name,
586 Rs_title,
587#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
588 Rs_path,
589#endif
590#ifdef XPM_BACKGROUND
591 Rs_backgroundPixmap,
592#endif
593#if (MENUBAR_MAX)
594 Rs_menu,
595#endif
596 Rs_loginShell,
597 Rs_jumpScroll,
598#ifdef HAVE_SCROLLBARS
599 Rs_scrollBar,
600 Rs_scrollBar_right,
601 Rs_scrollBar_floating,
602 Rs_scrollBar_align,
603 Rs_scrollstyle, /* Rs_scrollBar_style */
604 Rs_scrollBar_thickness,
605#endif
606 Rs_scrollTtyOutput,
607 Rs_scrollTtyKeypress,
608 Rs_scrollWithBuffer,
609 Rs_saveLines,
610 Rs_utmpInhibit,
611 Rs_visualBell,
612#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
613 Rs_mapAlert,
614#endif
615#ifdef META8_OPTION
616 Rs_meta8,
617#endif
618#ifdef MOUSE_WHEEL
619 Rs_mouseWheelScrollPage,
620#endif
621#ifndef NO_BACKSPACE_KEY
622 Rs_backspace_key,
623#endif
624#ifndef NO_DELETE_KEY
625 Rs_delete_key,
626#endif
627 Rs_selectstyle,
628#ifdef PRINTPIPE
629 Rs_print_pipe,
630#endif
631#ifdef USE_XIM
632 Rs_preeditType,
633 Rs_inputMethod,
634#endif
635#ifdef TRANSPARENT
636 Rs_transparent,
637 Rs_transparent_all,
638#endif
639#if ENABLE_FRILLS
640 Rs_ext_bwidth,
641 Rs_int_bwidth,
642 Rs_borderLess,
643 Rs_lineSpace,
644 Rs_pty_fd,
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_cursorBlink,
655 Rs_pointerBlank,
656 Rs_pointerBlankDelay,
657 Rs_imLocale,
658 Rs_imFont,
659 Rs_pastableTabs,
660#ifndef NO_SECONDARY_SCREEN
661 Rs_secondaryScreen,
662 Rs_secondaryScroll,
663#endif
664#ifdef OFF_FOCUS_FADING
665 Rs_fade,
666#endif
667#ifdef TINTING
668 Rs_shade,
669#endif
670 NUM_RESOURCES 565 NUM_RESOURCES
671}; 566};
672 567
673// see init.C:xa_names, which must be kept in sync 568// see init.C:xa_names, which must be kept in sync
674enum { 569enum {
… …
749#endif 644#endif
750 645
751// do not change these constants lightly, there are many interdependencies 646// do not change these constants lightly, there are many interdependencies
752#define IMBUFSIZ 128 // input modifier buffer sizes 647#define IMBUFSIZ 128 // input modifier buffer sizes
753#define KBUFSZ 512 // size of keyboard mapping buffer 648#define KBUFSZ 512 // size of keyboard mapping buffer
754#define CBUFSIZ 4096 // size of command buffer 649#define CBUFSIZ 2048 // size of command buffer
755#define UBUFSIZ 4096 // character buffer 650#define UBUFSIZ 2048 // character buffer
756 651
757#ifndef PATH_MAX 652#ifndef PATH_MAX
758# define PATH_MAX 16384 653# define PATH_MAX 16384
759#endif 654#endif
760 655
… …
809#define dDisp Display *disp = display->display 704#define dDisp Display *disp = display->display
810 705
811/* convert pixel dimensions to row/column values. Everything as int32_t */ 706/* convert pixel dimensions to row/column values. Everything as int32_t */
812#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 707#define Pixel2Col(x) Pixel2Width((int32_t)(x))
813#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 708#define Pixel2Row(y) Pixel2Height((int32_t)(y))
814#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 709#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
815#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 710#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
816#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 711#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
817#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 712#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
818#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 713#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
819#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 714#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
820 715
821#define TermWin_TotalWidth() ((int32_t)TermWin.width) 716#define TermWin_TotalWidth() ((int32_t)this->width)
822#define TermWin_TotalHeight() ((int32_t)TermWin.height) 717#define TermWin_TotalHeight() ((int32_t)this->height)
718
719// for m >= -n, ensure remainder lies between 0..n-1
720#define MOD(m,n) (((m) + (n)) % (n))
721
722#define LINENO(n) MOD (term_start + int(n), total_rows)
723#define ROW(n) row_buf [LINENO (n)]
823 724
824/* how to build & extract colors and attributes */ 725/* how to build & extract colors and attributes */
825#define GET_BASEFG(x) (((x) & RS_fgMask)) 726#define GET_BASEFG(x) (((x) & RS_fgMask))
826#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 727#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
827#ifndef NO_BRIGHTCOLOR
828# define GET_FGCOLOR(x) \
829 ((((x) & RS_Bold) == 0 \
830 || GET_BASEFG (x) < minCOLOR \
831 || GET_BASEFG (x) >= minBrightCOLOR) \
832 ? GET_BASEFG (x) \
833 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
834# define GET_BGCOLOR(x) \
835 ((((x) & RS_Blink) == 0 \
836 || GET_BASEBG (x) < minCOLOR \
837 || GET_BASEBG (x) >= minBrightCOLOR) \
838 ? GET_BASEBG (x) \
839 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
840#else
841# define GET_FGCOLOR(x) GET_BASEFG(x)
842# define GET_BGCOLOR(x) GET_BASEBG(x)
843#endif
844 728
845#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 729#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
846#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 730#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
847 731
848#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 732#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
861 745
862#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 746#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
863#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 747#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
864 748
865#if ENABLE_STYLES 749#if ENABLE_STYLES
866# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 750# define FONTSET(style) fontset[GET_STYLE (style)]
867#else 751#else
868# define FONTSET(style) TermWin.fontset[0] 752# define FONTSET(style) fontset[0]
869#endif 753#endif
870 754
871#ifdef HAVE_SCROLLBARS 755#ifdef HAVE_SCROLLBARS
872# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 756# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
873#else 757#else
… …
898#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 782#define scrollbar_size() (scrollBar.end - scrollBar.beg \
899 - scrollbar_minheight ()) 783 - scrollbar_minheight ())
900 784
901#if (MENUBAR_MAX > 1) 785#if (MENUBAR_MAX > 1)
902/* rendition style flags */ 786/* rendition style flags */
903# define menuBar_height() (TermWin.fheight + SHADOW) 787# define menuBar_height() (fheight + SHADOW)
904# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 788# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
905# define isMenuBarWindow(w) ((w) == menuBar.win) 789# define isMenuBarWindow(w) ((w) == menuBar.win)
906#else 790#else
907# define menuBar_height() (0) 791# define menuBar_height() (0)
908# define menuBar_TotalHeight() (0) 792# define menuBar_TotalHeight() (0)
… …
955#endif 839#endif
956 840
957extern class rxvt_failure_exception { } rxvt_failure_exception; 841extern class rxvt_failure_exception { } rxvt_failure_exception;
958 842
959typedef callback1<void, const char *> log_callback; 843typedef callback1<void, const char *> log_callback;
844typedef callback1<int, int> getfd_callback;
960 845
961extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 846extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
962extern void rxvt_log (const char *fmt, ...); 847extern void rxvt_log (const char *fmt, ...);
963extern void rxvt_warn (const char *fmt, ...); 848extern void rxvt_warn (const char *fmt, ...);
964extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 849extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
965extern void rxvt_exit_failure () __attribute__ ((noreturn)); 850extern void rxvt_exit_failure () __attribute__ ((noreturn));
966 851
967#define SET_LOCALE(locale) rxvt_set_locale (locale) 852#define SET_LOCALE(locale) rxvt_set_locale (locale)
968extern bool rxvt_set_locale (const char *locale); 853extern bool rxvt_set_locale (const char *locale);
854extern bool rxvt_push_locale (const char *locale);
855extern void rxvt_pop_locale ();
969 856
970/* 857/*
971 ***************************************************************************** 858 *****************************************************************************
972 * VARIABLES 859 * VARIABLES
973 ***************************************************************************** 860 *****************************************************************************
… …
1041 class keyboard_manager; 928 class keyboard_manager;
1042#endif 929#endif
1043 930
1044struct rxvt_term : zero_initialized, rxvt_vars { 931struct rxvt_term : zero_initialized, rxvt_vars {
1045 log_callback *log_hook; // log error messages through this hook, if != 0 932 log_callback *log_hook; // log error messages through this hook, if != 0
933 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
934
935#if ENABLE_PERL
936 void *self; // perl's $self
937#endif
1046 938
1047 struct mbstate mbstate; // current input multibyte state 939 struct mbstate mbstate; // current input multibyte state
1048 940
1049 unsigned char want_refresh:1, 941 unsigned char want_refresh:1,
1050#ifdef TRANSPARENT 942#ifdef TRANSPARENT
… …
1220 void scr_overlay_off (); 1112 void scr_overlay_off ();
1221 void scr_overlay_set (int x, int y, 1113 void scr_overlay_set (int x, int y,
1222 text_t text, 1114 text_t text,
1223 rend_t rend = OVERLAY_RSTYLE); 1115 rend_t rend = OVERLAY_RSTYLE);
1224 void scr_overlay_set (int x, int y, const char *s); 1116 void scr_overlay_set (int x, int y, const char *s);
1117 void scr_overlay_set (int x, int y, const wchar_t *s);
1225#endif 1118#endif
1226 1119
1227 vector<void *> allocated; // free these memory blocks with free() 1120 vector<void *> allocated; // free these memory blocks with free()
1228 1121
1229 char *env_windowid; /* environmental variable WINDOWID */ 1122 char *env_windowid; /* environmental variable WINDOWID */
… …
1254 // ISO 14755 entry support 1147 // ISO 14755 entry support
1255 unicode_t iso14755buf; 1148 unicode_t iso14755buf;
1256 void commit_iso14755 (); 1149 void commit_iso14755 ();
1257 int hex_keyval (XKeyEvent &ev); 1150 int hex_keyval (XKeyEvent &ev);
1258# if ISO_14755 1151# if ISO_14755
1259 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1152 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1260 void iso14755_54 (int x, int y); 1153 void iso14755_54 (int x, int y);
1261# endif 1154# endif
1262#endif 1155#endif
1263 1156
1264 // modifies first argument(!) 1157 // modifies first argument(!)
… …
1268 1161
1269#if TRANSPARENT 1162#if TRANSPARENT
1270 void rootwin_cb (XEvent &xev); 1163 void rootwin_cb (XEvent &xev);
1271 xevent_watcher rootwin_ev; 1164 xevent_watcher rootwin_ev;
1272#endif 1165#endif
1273
1274
1275 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1276 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1277 1166
1278 void x_cb (XEvent &xev); 1167 void x_cb (XEvent &xev);
1279 xevent_watcher termwin_ev; 1168 xevent_watcher termwin_ev;
1280 xevent_watcher vt_ev; 1169 xevent_watcher vt_ev;
1281#ifdef HAVE_SCROLLBARS 1170#ifdef HAVE_SCROLLBARS
… …
1322 1211
1323 void tt_winch (); 1212 void tt_winch ();
1324 1213
1325 rxvt_term (); 1214 rxvt_term ();
1326 ~rxvt_term (); 1215 ~rxvt_term ();
1216 void child_exit (); // child has exited, usually destroys
1327 void destroy (); 1217 void destroy ();
1328 void emergency_cleanup (); 1218 void emergency_cleanup ();
1329 1219
1330 bool init (int argc, const char *const *argv); 1220 bool init (int argc, const char *const *argv);
1331 bool init_vars (); 1221 bool init_vars ();
… …
1342 int run_child (const char *const *argv); 1232 int run_child (const char *const *argv);
1343 1233
1344 void color_aliases (int idx); 1234 void color_aliases (int idx);
1345 void recolour_cursor (); 1235 void recolour_cursor ();
1346 void create_windows (int argc, const char *const *argv); 1236 void create_windows (int argc, const char *const *argv);
1347 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1237 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1348 void window_calc (unsigned int width, unsigned int height); 1238 void window_calc (unsigned int newwidth, unsigned int newheight);
1349 1239
1350#if USE_XIM 1240#if USE_XIM
1351 rxvt_xim *input_method; 1241 rxvt_xim *input_method;
1352 XIC Input_Context; 1242 XIC Input_Context;
1353 XIMStyle input_style; 1243 XIMStyle input_style;
… …
1425 void set_title (const char *str); 1315 void set_title (const char *str);
1426 void set_icon_name (const char *str); 1316 void set_icon_name (const char *str);
1427 void set_window_color (int idx, const char *color); 1317 void set_window_color (int idx, const char *color);
1428 void set_colorfgbg (); 1318 void set_colorfgbg ();
1429 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1319 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1430 void set_widthheight (unsigned int width, unsigned int height); 1320 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1431 1321
1432#ifdef MENUBAR 1322#ifdef MENUBAR
1433 // menubar.C 1323 // menubar.C
1434 void menuitem_free (menu_t *menu, menuitem_t *item); 1324 void menuitem_free (menu_t *menu, menuitem_t *item);
1435 int action_dispatch (action_t *action); 1325 int action_dispatch (action_t *action);
… …
1461 void menubar_control (XButtonEvent &ev); 1351 void menubar_control (XButtonEvent &ev);
1462 void map_menuBar (int map); 1352 void map_menuBar (int map);
1463#endif 1353#endif
1464 1354
1465 // screen.C 1355 // screen.C
1466 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1356
1467 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1357 void lalloc (line_t &l)
1358 {
1359 l.t = (text_t *)talloc->alloc ();
1360 l.r = (rend_t *)ralloc->alloc ();
1361 }
1362
1363#if 0
1364 void lfree (line_t &l)
1365 {
1366 talloc->free (l.t);
1367 ralloc->free (l.r);
1368 }
1369#endif
1370
1371 void lresize (line_t &l)
1372 {
1373 if (!l.t)
1374 return;
1375
1376 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1377 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1378
1379 l.l = min (l.l, ncol);
1380
1381 if (ncol > prev_ncol)
1382 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1383 }
1384
1385 int fgcolor_of (rend_t r)
1386 {
1387 int base = GET_BASEFG (r);
1388#ifndef NO_BRIGHTCOLOR
1389 if (r & RS_Bold
1390# if ENABLE_STYLES
1391 && OPTION (Opt_intensityStyles)
1392# endif
1393 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1394 base += minBrightCOLOR - minCOLOR;
1395#endif
1396 return base;
1397 }
1398
1399 int bgcolor_of (rend_t r)
1400 {
1401 int base = GET_BASEBG (r);
1402#ifndef NO_BRIGHTCOLOR
1403 if (r & RS_Blink
1404# if ENABLE_STYLES
1405 && OPTION (Opt_intensityStyles)
1406# endif
1407 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1408 base += minBrightCOLOR - minCOLOR;
1409#endif
1410 return base;
1411 }
1412
1413 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1414 void scr_blank_screen_mem (line_t &l, rend_t efs);
1468 int scr_scroll_text (int row1, int row2, int count, int spec); 1415 int scr_scroll_text (int row1, int row2, int count);
1469 void scr_reset (); 1416 void scr_reset ();
1470 void scr_reset_realloc ();
1471 void scr_release (); 1417 void scr_release ();
1472 void scr_clear (bool really = false); 1418 void scr_clear (bool really = false);
1473 void scr_refresh (unsigned char refresh_type); 1419 void scr_refresh (unsigned char refresh_type);
1474 bool scr_refresh_rend (rend_t mask, rend_t value); 1420 bool scr_refresh_rend (rend_t mask, rend_t value);
1475 void scr_erase_screen (int mode); 1421 void scr_erase_screen (int mode);
1422#if ENABLE_FRILLS
1423 void scr_erase_savelines ();
1424 void scr_backindex ();
1425 void scr_forwardindex ();
1426#endif
1476 void scr_touch (bool refresh); 1427 void scr_touch (bool refresh);
1477 void scr_expose (int x, int y, int width, int height, bool refresh); 1428 void scr_expose (int x, int y, int width, int height, bool refresh);
1478 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1429 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1479 void scr_recolour (); 1430 void scr_recolour ();
1480 void scr_remap_chars (); 1431 void scr_remap_chars ();
1481 void scr_remap_chars (text_t *tp, rend_t *rp); 1432 void scr_remap_chars (const line_t &l);
1482 1433
1483 void scr_poweron (); 1434 void scr_poweron ();
1484 void scr_cursor (int mode); 1435 void scr_cursor (int mode);
1485 void scr_do_wrap (); 1436 void scr_do_wrap ();
1486 int scr_change_screen (int scrn); 1437 int scr_change_screen (int scrn);
1487 void scr_color (unsigned int color, int fgbg); 1438 void scr_color (unsigned int color, int fgbg);
1488 void scr_rendition (int set, int style); 1439 void scr_rendition (int set, int style);
1489 void scr_add_lines (const unicode_t *str, int nlines, int len); 1440 void scr_add_lines (const unicode_t *str, int nlines, int len);
1490 void scr_backspace (); 1441 void scr_backspace ();
1491 void scr_tab (int count, bool ht = false); 1442 void scr_tab (int count, bool ht = false);
1492 void scr_backindex ();
1493 void scr_forwardindex ();
1494 void scr_gotorc (int row, int col, int relative); 1443 void scr_gotorc (int row, int col, int relative);
1495 void scr_index (enum page_dirn direction); 1444 void scr_index (enum page_dirn direction);
1496 void scr_erase_line (int mode); 1445 void scr_erase_line (int mode);
1497 void scr_E (); 1446 void scr_E ();
1498 void scr_insdel_lines (int count, int insdel); 1447 void scr_insdel_lines (int count, int insdel);
… …
1520 void selection_property (Window win, Atom prop); 1469 void selection_property (Window win, Atom prop);
1521 void selection_request (Time tm, int x, int y); 1470 void selection_request (Time tm, int x, int y);
1522 int selection_request_other (Atom target, int selnum); 1471 int selection_request_other (Atom target, int selnum);
1523 void selection_clear (); 1472 void selection_clear ();
1524 void selection_make (Time tm); 1473 void selection_make (Time tm);
1474 bool selection_grab (Time tm);
1525 void selection_start_colrow (int col, int row); 1475 void selection_start_colrow (int col, int row);
1526 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1476 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1527 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1477 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1528 void selection_remove_trailing_spaces (); 1478 void selection_remove_trailing_spaces ();
1529 void selection_send (const XSelectionRequestEvent &rq); 1479 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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