ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.151 by root, Sun Feb 20 00:09:25 2005 UTC vs.
Revision 1.181 by root, Mon Jan 2 17:17:02 2006 UTC

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

Diff Legend

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