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.133 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.171 by root, Sat Dec 31 16:06:48 2005 UTC

… …
10#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
11#include <X11/keysym.h> 11#include <X11/keysym.h>
12#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
13#include <X11/Xatom.h> 13#include <X11/Xatom.h>
14#if ENABLE_FRILLS 14#if ENABLE_FRILLS
15#include <X11/Xmd.h> 15# include <X11/Xmd.h>
16#endif 16#endif
17 17
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#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1
28#endif
23 29
24/* 30/*
25 ***************************************************************************** 31 *****************************************************************************
26 * SYSTEM HACKS 32 * SYSTEM HACKS
27 ***************************************************************************** 33 *****************************************************************************
… …
80/* 86/*
81 ***************************************************************************** 87 *****************************************************************************
82 * PROTOTYPES 88 * PROTOTYPES
83 ***************************************************************************** 89 *****************************************************************************
84 */ 90 */
91// main.C
85RETSIGTYPE rxvt_Child_signal (int sig); 92RETSIGTYPE rxvt_Child_signal (int sig);
86RETSIGTYPE rxvt_Exit_signal (int sig); 93RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit (); 94void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size); 95void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size); 96void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size); 97void * rxvt_realloc (void *ptr, size_t size);
98void rxvt_privileges (rxvt_privaction action);
99
100// util.C
91char * rxvt_wcstombs (const wchar_t *str, int len = -1); 101char * rxvt_wcstombs (const wchar_t *str, int len = -1);
92wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 102wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
93char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 103char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
94wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 104wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
95char * rxvt_strdup (const char *str); 105char * rxvt_strdup (const char *str);
106
107// misc.C
96char * rxvt_r_basename (const char *str); 108char * rxvt_r_basename (const char *str);
97void rxvt_vlog (const char *fmt, va_list arg_ptr); 109void rxvt_vlog (const char *fmt, va_list arg_ptr);
98void rxvt_log (const char *fmt,...); 110void rxvt_log (const char *fmt,...);
99void rxvt_warn (const char *fmt,...); 111void rxvt_warn (const char *fmt,...);
100void rxvt_fatal (const char *fmt,...); 112void rxvt_fatal (const char *fmt,...);
… …
106char ** rxvt_splitcommastring (const char *cs); 118char ** rxvt_splitcommastring (const char *cs);
107void rxvt_freecommastring (char **cs); 119void rxvt_freecommastring (char **cs);
108char * rxvt_File_find (const char *file, const char *ext, const char *path); 120char * rxvt_File_find (const char *file, const char *ext, const char *path);
109void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
110void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
111 123void rxvt_usleep (int usecs);
112void rxvt_privileges (rxvt_privaction action);
113 124
114/* 125/*
115 ***************************************************************************** 126 *****************************************************************************
116 * STRUCTURES AND TYPEDEFS 127 * STRUCTURES AND TYPEDEFS
117 ***************************************************************************** 128 *****************************************************************************
… …
127#endif 138#endif
128 139
129/* If we're using either the rxvt scrollbar or menu bars, keep the 140/* If we're using either the rxvt scrollbar or menu bars, keep the
130 * scrollColor resource. 141 * scrollColor resource.
131 */ 142 */
132#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 143#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
133# define KEEP_SCROLLCOLOR 1 144# define KEEP_SCROLLCOLOR 1
134#else 145#else
135# undef KEEP_SCROLLCOLOR 146# undef KEEP_SCROLLCOLOR
136#endif 147#endif
137 148
… …
151 Time time; /* milliseconds */ 162 Time time; /* milliseconds */
152 unsigned int state; /* key or button mask */ 163 unsigned int state; /* key or button mask */
153 unsigned int button; /* detail */ 164 unsigned int button; /* detail */
154}; 165};
155 166
156#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
157#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
158#define SWAP_IT(one, two, typeof) \
159 do { \
160 typeof swapittmp; \
161 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
162 } while (/* CONSTCOND */ 0)
163#define BOUND_POSITIVE_INT16(val) \
164 (int16_t) ((val) <= 0 \
165 ? 0 \
166 : min ((val), (((uint16_t)-1)>>1)))
167
168#if ENABLE_FRILLS 167#if ENABLE_FRILLS
169typedef struct _mwmhints { 168typedef struct _mwmhints {
170 CARD32 flags; 169 CARD32 flags;
171 CARD32 functions; 170 CARD32 functions;
172 CARD32 decorations; 171 CARD32 decorations;
173 INT32 input_mode; 172 INT32 input_mode;
174 CARD32 status; 173 CARD32 status;
175} MWMHints; 174} MWMHints;
176#endif 175#endif
177 176
177#if ENABLE_XEMBED
178// XEMBED messages
179# define XEMBED_EMBEDDED_NOTIFY 0
180# define XEMBED_WINDOW_ACTIVATE 1
181# define XEMBED_WINDOW_DEACTIVATE 2
182# define XEMBED_REQUEST_FOCUS 3
183# define XEMBED_FOCUS_IN 4
184# define XEMBED_FOCUS_OUT 5
185# define XEMBED_FOCUS_NEXT 6
186# define XEMBED_FOCUS_PREV 7
187
188# define XEMBED_MODALITY_ON 10
189# define XEMBED_MODALITY_OFF 11
190# define XEMBED_REGISTER_ACCELERATOR 12
191# define XEMBED_UNREGISTER_ACCELERATOR 13
192# define XEMBED_ACTIVATE_ACCELERATOR 14
193
194// XEMBED detail code
195# define XEMBED_FOCUS_CURRENT 0
196# define XEMBED_FOCUS_FIRST 1
197# define XEMBED_FOCUS_LAST 2
198
199# define XEMBED_MAPPED (1 << 0)
200#endif
201
178/* 202/*
179 ***************************************************************************** 203 *****************************************************************************
180 * NORMAL DEFINES 204 * NORMAL DEFINES
181 ***************************************************************************** 205 *****************************************************************************
182 */ 206 */
… …
232 256
233#define R_SB_ALIGN_CENTRE 0 257#define R_SB_ALIGN_CENTRE 0
234#define R_SB_ALIGN_TOP 1 258#define R_SB_ALIGN_TOP 1
235#define R_SB_ALIGN_BOTTOM 2 259#define R_SB_ALIGN_BOTTOM 2
236 260
237#define R_SB_RXVT 0
238#define R_SB_NEXT 1 261#define R_SB_NEXT 1
239#define R_SB_XTERM 2 262#define R_SB_XTERM 2
240#define R_SB_PLAIN 4 263#define R_SB_PLAIN 4
264#define R_SB_RXVT 8
241 265
242#define SB_WIDTH_NEXT 19 266#define SB_WIDTH_NEXT 19
243#define SB_WIDTH_XTERM 15 267#define SB_WIDTH_XTERM 15
244#define SB_WIDTH_PLAIN 7 268#define SB_WIDTH_PLAIN 7
245#ifndef SB_WIDTH_RXVT 269#ifndef SB_WIDTH_RXVT
… …
327#define FONT_DN "#-" 351#define FONT_DN "#-"
328#define FONT_UP "#+" 352#define FONT_UP "#+"
329 353
330/* flags for rxvt_scr_gotorc () */ 354/* flags for rxvt_scr_gotorc () */
331enum { 355enum {
332 C_RELATIVE = 1 , /* col movement is relative */ 356 C_RELATIVE = 1, /* col movement is relative */
333 R_RELATIVE = 2, /* row movement is relative */ 357 R_RELATIVE = 2, /* row movement is relative */
334 RELATIVE = 1 | 2, 358 RELATIVE = C_RELATIVE | R_RELATIVE,
335}; 359};
336 360
337/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 361/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
338enum { 362enum {
339 INSERT = -1, /* don't change these values */ 363 INSERT = -1, /* don't change these values */
… …
438 XTerm_Color_UL = 19, // change actual 'Underline' color 462 XTerm_Color_UL = 19, // change actual 'Underline' color
439 XTerm_Pixmap = 20, // new bg pixmap 463 XTerm_Pixmap = 20, // new bg pixmap
440 XTerm_restoreFG = 39, // change default fg color 464 XTerm_restoreFG = 39, // change default fg color
441 XTerm_restoreBG = 49, // change default bg color 465 XTerm_restoreBG = 49, // change default bg color
442 XTerm_dumpscreen = 55, // dump scrollback and all of screen 466 XTerm_dumpscreen = 55, // dump scrollback and all of screen
467
443 XTerm_locale = 701, // change locale 468 URxvt_locale = 701, // change locale
444 XTerm_Menu = 703, // set menu item 469 URxvt_Menu = 703, // set menu item
445 XTerm_Color_IT = 704, // change actual 'Italic' colour 470 URxvt_Color_IT = 704, // change actual 'Italic' colour
446 XTerm_Color_tint = 705, // change actual tint colour 471 URxvt_Color_tint = 705, // change actual tint colour
447 472
448 URxvt_font = 710, 473 URxvt_font = 710,
449 URxvt_boldFont = 711, 474 URxvt_boldFont = 711,
450 URxvt_italicFont = 712, 475 URxvt_italicFont = 712,
451 URxvt_boldItalicFont = 713, 476 URxvt_boldItalicFont = 713,
477
478 URxvt_view_up = 720,
479 URxvt_view_down = 721,
452}; 480};
453 481
454/* Words starting with `Color_' are colours. Others are counts */ 482/* Words starting with `Color_' are colours. Others are counts */
455/* 483/*
456 * The following comment is mostly obsolete since pixcolor_set was expanded:
457 * We're currently upto 29 colours. Only 3 more available. The
458 * PixColor and rendition colour usage should probably be decoupled 484 * The PixColor and rendition colour usage should probably be decoupled
459 * on the unnecessary items, e.g. Color_pointer, but won't bother 485 * on the unnecessary items, e.g. Color_pointer, but won't bother
460 * until we need to. Also, be aware of usage in pixcolor_set 486 * until we need to. Also, be aware of usage in pixcolor_set
461 */ 487 */
462 488
463enum colour_list { 489enum colour_list {
… …
513 Color_trough, 539 Color_trough,
514#endif 540#endif
515#if TINTING 541#if TINTING
516 Color_tint, 542 Color_tint,
517#endif 543#endif
544#if OFF_FOCUS_FADING
545 Color_fade,
546#endif
518 NRS_COLORS, /* */ 547 NRS_COLORS, /* */
519#ifdef KEEP_SCROLLCOLOR 548#ifdef KEEP_SCROLLCOLOR
520 Color_topShadow = NRS_COLORS, 549 Color_topShadow = NRS_COLORS,
521 Color_bottomShadow, 550 Color_bottomShadow,
522 TOTAL_COLORS 551 TOTAL_COLORS
… …
563#ifdef HAVE_SCROLLBARS 592#ifdef HAVE_SCROLLBARS
564 Rs_scrollBar, 593 Rs_scrollBar,
565 Rs_scrollBar_right, 594 Rs_scrollBar_right,
566 Rs_scrollBar_floating, 595 Rs_scrollBar_floating,
567 Rs_scrollBar_align, 596 Rs_scrollBar_align,
568#endif
569 Rs_scrollstyle, /* Rs_scrollBar_style */ 597 Rs_scrollstyle, /* Rs_scrollBar_style */
598 Rs_scrollBar_thickness,
599#endif
570 Rs_scrollTtyOutput, 600 Rs_scrollTtyOutput,
571 Rs_scrollTtyKeypress, 601 Rs_scrollTtyKeypress,
572 Rs_scrollWithBuffer, 602 Rs_scrollWithBuffer,
573 Rs_saveLines, 603 Rs_saveLines,
574 Rs_utmpInhibit, 604 Rs_utmpInhibit,
… …
599#ifdef TRANSPARENT 629#ifdef TRANSPARENT
600 Rs_transparent, 630 Rs_transparent,
601 Rs_transparent_all, 631 Rs_transparent_all,
602#endif 632#endif
603#if ENABLE_FRILLS 633#if ENABLE_FRILLS
634 Rs_pty_fd,
635 Rs_hold,
604 Rs_ext_bwidth, 636 Rs_ext_bwidth,
605 Rs_int_bwidth, 637 Rs_int_bwidth,
606 Rs_borderLess, 638 Rs_borderLess,
607#endif
608 Rs_scrollBar_thickness,
609#ifndef NO_LINESPACE
610 Rs_lineSpace, 639 Rs_lineSpace,
640 Rs_cursorUnderline,
641 Rs_intensityStyles,
642#endif
643#if CURSOR_BLINK
644 Rs_cursorBlink,
645#endif
646#if ENABLE_XEMBED
647 Rs_embed,
611#endif 648#endif
612 Rs_cutchars, 649 Rs_cutchars,
613 Rs_modifier, 650 Rs_modifier,
614 Rs_answerbackstring, 651 Rs_answerbackstring,
615 Rs_tripleclickwords, 652 Rs_tripleclickwords,
616 Rs_insecure, 653 Rs_insecure,
617 Rs_cursorBlink,
618 Rs_pointerBlank, 654 Rs_pointerBlank,
619 Rs_pointerBlankDelay, 655 Rs_pointerBlankDelay,
620 Rs_imLocale, 656 Rs_imLocale,
657 Rs_imFont,
621 Rs_pastableTabs, 658 Rs_pastableTabs,
622#ifndef NO_SECONDARY_SCREEN 659#ifndef NO_SECONDARY_SCREEN
623 Rs_secondaryScreen, 660 Rs_secondaryScreen,
624 Rs_secondaryScroll, 661 Rs_secondaryScroll,
625#endif 662#endif
… …
640 XA_MULTIPLE, 677 XA_MULTIPLE,
641 XA_TARGETS, 678 XA_TARGETS,
642 XA_TIMESTAMP, 679 XA_TIMESTAMP,
643 XA_VT_SELECTION, 680 XA_VT_SELECTION,
644 XA_INCR, 681 XA_INCR,
682 XA_WM_PROTOCOLS,
645 XA_WMDELETEWINDOW, 683 XA_WM_DELETE_WINDOW,
646 XA_CLIPBOARD, 684 XA_CLIPBOARD,
647#if ENABLE_FRILLS 685#if ENABLE_FRILLS
686 XA_MOTIF_WM_HINTS,
687#endif
688#if ENABLE_EWMH
648 XA_NET_WM_PID, 689 XA_NET_WM_PID,
649 XA_MOTIF_WM_HINTS,
650 XA_NET_WM_NAME, 690 XA_NET_WM_NAME,
651 XA_NET_WM_ICON_NAME, 691 XA_NET_WM_ICON_NAME,
692 XA_NET_WM_PING,
652#endif 693#endif
653#if USE_XIM 694#if USE_XIM
654 XA_WM_LOCALE_NAME, 695 XA_WM_LOCALE_NAME,
655#endif 696#endif
656#if TRANSPARENT 697#if TRANSPARENT
… …
658 XA_ESETROOT_PMAP_ID, 699 XA_ESETROOT_PMAP_ID,
659#endif 700#endif
660#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 701#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
661 XA_DNDPROTOCOL, 702 XA_DNDPROTOCOL,
662 XA_DNDSELECTION, 703 XA_DNDSELECTION,
663#endif /* OFFIX_DND */ 704#endif
705#if ENABLE_XEMBED
706 XA_XEMBED,
707 XA_XEMBED_INFO,
708#endif
664 NUM_XA 709 NUM_XA
665}; 710};
666 711
667/* DEC private modes */ 712/* DEC private modes */
668#define PrivMode_132 (1UL<<0) 713#define PrivMode_132 (1UL<<0)
… …
695 priv_modes |= (bit); \ 740 priv_modes |= (bit); \
696 else \ 741 else \
697 priv_modes &= ~(bit) 742 priv_modes &= ~(bit)
698 743
699#ifdef ALLOW_132_MODE 744#ifdef ALLOW_132_MODE
700# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 745# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
701#else 746#else
702# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 747# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
703#endif 748#endif
704 749
705// do not change these constants lightly, there are many interdependencies 750// do not change these constants lightly, there are many interdependencies
706#define IMBUFSIZ 128 // input modifier buffer sizes 751#define IMBUFSIZ 128 // input modifier buffer sizes
707#define KBUFSZ 512 // size of keyboard mapping buffer 752#define KBUFSZ 512 // size of keyboard mapping buffer
… …
758#define strdup(x) strdup((const char *)(x)) 803#define strdup(x) strdup((const char *)(x))
759#define strlen(x) strlen((const char *)(x)) 804#define strlen(x) strlen((const char *)(x))
760#define strchr(x, y) strchr((const char *)(x), (int)(y)) 805#define strchr(x, y) strchr((const char *)(x), (int)(y))
761#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 806#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
762 807
808#define dDisp Display *disp = display->display
809
763/* convert pixel dimensions to row/column values. Everything as int32_t */ 810/* convert pixel dimensions to row/column values. Everything as int32_t */
764#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 811#define Pixel2Col(x) Pixel2Width((int32_t)(x))
765#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 812#define Pixel2Row(y) Pixel2Height((int32_t)(y))
766#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 813#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
767#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 814#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
768#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 815#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
769#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 816#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
770#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
771#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
772 819
773#define TermWin_TotalWidth() ((int32_t)TermWin.width) 820#define TermWin_TotalWidth() ((int32_t)this->width)
774#define TermWin_TotalHeight() ((int32_t)TermWin.height) 821#define TermWin_TotalHeight() ((int32_t)this->height)
822
823// for m >= -n, ensure remainder lies between 0..n-1
824#define MOD(m,n) (((m) + (n)) % (n))
825
826#define LINENO(n) MOD (term_start + int(n), total_rows)
827#define ROW(n) row_buf [LINENO (n)]
775 828
776/* how to build & extract colors and attributes */ 829/* how to build & extract colors and attributes */
777#define GET_BASEFG(x) (((x) & RS_fgMask)) 830#define GET_BASEFG(x) (((x) & RS_fgMask))
778#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 831#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
779#ifndef NO_BRIGHTCOLOR 832#ifndef NO_BRIGHTCOLOR
780# define GET_FGCOLOR(x) \ 833# define GET_FGCOLOR(x) ( \
781 ((((x) & RS_Bold) == 0 \ 834 !((x) & RS_Bold) \
782 || GET_BASEFG (x) < minCOLOR \ 835 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
783 || GET_BASEFG (x) >= minBrightCOLOR) \ 836 || !IN_RANGE_INC (GET_BASEFG (x), minCOLOR, minBrightCOLOR) \
784 ? GET_BASEFG (x) \ 837 ? GET_BASEFG (x) \
785 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR))) 838 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
786# define GET_BGCOLOR(x) \ 839# define GET_BGCOLOR(x) ( \
787 ((((x) & RS_Blink) == 0 \ 840 !((x) & RS_Blink) \
788 || GET_BASEBG (x) < minCOLOR \ 841 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
789 || GET_BASEBG (x) >= minBrightCOLOR) \ 842 || !IN_RANGE_INC (GET_BASEBG (x), minCOLOR, minBrightCOLOR) \
790 ? GET_BASEBG (x) \ 843 ? GET_BASEBG (x) \
791 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR))) 844 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
792#else 845#else
793# define GET_FGCOLOR(x) GET_BASEFG(x) 846# define GET_FGCOLOR(x) GET_BASEFG(x)
794# define GET_BGCOLOR(x) GET_BASEBG(x) 847# define GET_BGCOLOR(x) GET_BASEBG(x)
795#endif 848#endif
796 849
… …
813 866
814#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 867#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
815#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 868#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
816 869
817#if ENABLE_STYLES 870#if ENABLE_STYLES
818# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 871# define FONTSET(style) fontset[GET_STYLE (style)]
819#else 872#else
820# define FONTSET(style) TermWin.fontset[0] 873# define FONTSET(style) fontset[0]
821#endif 874#endif
822 875
823#ifdef HAVE_SCROLLBARS 876#ifdef HAVE_SCROLLBARS
824# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 877# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
825#else 878#else
… …
850#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 903#define scrollbar_size() (scrollBar.end - scrollBar.beg \
851 - scrollbar_minheight ()) 904 - scrollbar_minheight ())
852 905
853#if (MENUBAR_MAX > 1) 906#if (MENUBAR_MAX > 1)
854/* rendition style flags */ 907/* rendition style flags */
855# define menuBar_height() (TermWin.fheight + SHADOW) 908# define menuBar_height() (fheight + SHADOW)
856# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 909# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
857# define isMenuBarWindow(w) ((w) == menuBar.win) 910# define isMenuBarWindow(w) ((w) == menuBar.win)
858#else 911#else
859# define menuBar_height() (0) 912# define menuBar_height() (0)
860# define menuBar_TotalHeight() (0) 913# define menuBar_TotalHeight() (0)
… …
864#ifdef XPM_BACKGROUND 917#ifdef XPM_BACKGROUND
865# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 918# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
866#else 919#else
867# define XPMClearArea(a, b, c, d, e, f, g) 920# define XPMClearArea(a, b, c, d, e, f, g)
868#endif 921#endif
869
870#ifndef STRICT_FONT_CHECKING
871# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
872#endif
873
874#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
875#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
876 922
877#ifdef UTMP_SUPPORT 923#ifdef UTMP_SUPPORT
878# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 924# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
879# undef HAVE_UTMPX_H 925# undef HAVE_UTMPX_H
880# undef HAVE_STRUCT_UTMPX 926# undef HAVE_STRUCT_UTMPX
… …
914#endif 960#endif
915 961
916extern class rxvt_failure_exception { } rxvt_failure_exception; 962extern class rxvt_failure_exception { } rxvt_failure_exception;
917 963
918typedef callback1<void, const char *> log_callback; 964typedef callback1<void, const char *> log_callback;
965typedef callback1<int, int> getfd_callback;
919 966
920extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 967extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
921extern void rxvt_log (const char *fmt, ...); 968extern void rxvt_log (const char *fmt, ...);
922extern void rxvt_warn (const char *fmt, ...); 969extern void rxvt_warn (const char *fmt, ...);
923extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 970extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
953 1000
954 operator mbstate_t *() { return &mbs; } 1001 operator mbstate_t *() { return &mbs; }
955 void reset () { memset (&mbs, 0, sizeof (mbs)); } 1002 void reset () { memset (&mbs, 0, sizeof (mbs)); }
956 mbstate () { reset (); } 1003 mbstate () { reset (); }
957}; 1004};
1005
1006#define UNICODE_MASK 0x1fffffUL
958 1007
959#if UNICODE3 1008#if UNICODE3
960# define COMPOSE_LO 0x40000000UL 1009# define COMPOSE_LO 0x40000000UL
961# define COMPOSE_HI 0x400fffffUL 1010# define COMPOSE_HI 0x400fffffUL
962# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 1011# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
992 1041
993extern class rxvt_composite_vec rxvt_composite; 1042extern class rxvt_composite_vec rxvt_composite;
994#endif 1043#endif
995 1044
996 1045
1046#ifdef KEYSYM_RESOURCE
1047 class keyboard_manager;
1048#endif
1049
997struct rxvt_term : zero_initialized, rxvt_vars { 1050struct rxvt_term : zero_initialized, rxvt_vars {
998 log_callback *log_hook; // log error messages through this hook, if != 0 1051 log_callback *log_hook; // log error messages through this hook, if != 0
1052 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
999 1053
1000 struct mbstate mbstate; // current input multibyte state 1054 struct mbstate mbstate; // current input multibyte state
1001 1055
1002 unsigned char want_refresh:1, 1056 unsigned char want_refresh:1,
1003#ifdef TRANSPARENT 1057#ifdef TRANSPARENT
… …
1018 hidden_text:1, 1072 hidden_text:1,
1019#endif 1073#endif
1020#ifdef POINTER_BLANK 1074#ifdef POINTER_BLANK
1021 hidden_pointer:1, 1075 hidden_pointer:1,
1022#endif 1076#endif
1023// enc_utf8:1, /* wether locale uses utf-8 */ 1077 enc_utf8:1, /* wether locale uses utf-8 */
1024 seen_input:1, /* wether we have seen some program output yet */ 1078 seen_input:1, /* wether we have seen some program output yet */
1025 seen_resize:1, /* wether we had a resize event */ 1079 seen_resize:1, /* wether we had a resize event */
1026 parsed_geometry:1; 1080 parsed_geometry:1;
1027 1081
1028 unsigned char refresh_type, 1082 unsigned char refresh_type,
… …
1074# ifdef POINTER_BLANK 1128# ifdef POINTER_BLANK
1075 pointerBlankDelay, 1129 pointerBlankDelay,
1076# endif 1130# endif
1077 allowedxerror; 1131 allowedxerror;
1078/* ---------- */ 1132/* ---------- */
1079 unsigned int ModMetaMask, 1133 unsigned int ModLevel3Mask,
1134 ModMetaMask,
1080 ModNumLockMask; 1135 ModNumLockMask;
1081 int old_width, /* last used width in screen resize */ 1136 int old_width, /* last used width in screen resize */
1082 old_height; /* last used height in screen resize */ 1137 old_height; /* last used height in screen resize */
1083 unsigned long priv_modes, 1138 unsigned long priv_modes,
1084 SavedModes; 1139 SavedModes;
… …
1118 pid_t cmd_pid; /* process id of child */ 1173 pid_t cmd_pid; /* process id of child */
1119 char * incr_buf; 1174 char * incr_buf;
1120 size_t incr_buf_size, incr_buf_fill; 1175 size_t incr_buf_size, incr_buf_fill;
1121/* ---------- */ 1176/* ---------- */
1122 Cursor leftptr_cursor; 1177 Cursor leftptr_cursor;
1123#ifdef POINTER_BLANK
1124 Cursor blank_cursor;
1125#endif
1126/* ---------- */ 1178/* ---------- */
1127#ifndef NO_BACKSPACE_KEY 1179#ifndef NO_BACKSPACE_KEY
1128 const char *key_backspace; 1180 const char *key_backspace;
1129#endif 1181#endif
1130#ifndef NO_DELETE_KEY 1182#ifndef NO_DELETE_KEY
… …
1175 void scr_overlay_off (); 1227 void scr_overlay_off ();
1176 void scr_overlay_set (int x, int y, 1228 void scr_overlay_set (int x, int y,
1177 text_t text, 1229 text_t text,
1178 rend_t rend = OVERLAY_RSTYLE); 1230 rend_t rend = OVERLAY_RSTYLE);
1179 void scr_overlay_set (int x, int y, const char *s); 1231 void scr_overlay_set (int x, int y, const char *s);
1232 void scr_overlay_set (int x, int y, const wchar_t *s);
1180#endif 1233#endif
1181 1234
1182 vector<void *> allocated; // free these memory blocks with free() 1235 vector<void *> allocated; // free these memory blocks with free()
1183 1236
1184 char *env_windowid; /* environmental variable WINDOWID */ 1237 char *env_windowid; /* environmental variable WINDOWID */
… …
1188 char *locale; 1241 char *locale;
1189 char charsets[4]; 1242 char charsets[4];
1190 unsigned char *v_buffer; /* pointer to physical buffer */ 1243 unsigned char *v_buffer; /* pointer to physical buffer */
1191 unsigned int v_buflen; /* size of area to write */ 1244 unsigned int v_buflen; /* size of area to write */
1192 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1245 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1246
1193#ifdef KEYSYM_RESOURCE 1247#ifdef KEYSYM_RESOURCE
1194 const unsigned char *Keysym_map[256]; 1248 keyboard_manager *keyboard;
1195#endif 1249#endif
1250
1196 const char *rs[NUM_RESOURCES]; 1251 const char *rs[NUM_RESOURCES];
1197 /* command input buffering */ 1252 /* command input buffering */
1198 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1253 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1199 unsigned char cmdbuf_base[CBUFSIZ]; 1254 unsigned char cmdbuf_base[CBUFSIZ];
1200 1255
… …
1222#if TRANSPARENT 1277#if TRANSPARENT
1223 void rootwin_cb (XEvent &xev); 1278 void rootwin_cb (XEvent &xev);
1224 xevent_watcher rootwin_ev; 1279 xevent_watcher rootwin_ev;
1225#endif 1280#endif
1226 1281
1227
1228 void sig_term (sig_watcher &w); sig_watcher sw_term;
1229 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1230
1231 void x_cb (XEvent &xev); 1282 void x_cb (XEvent &xev);
1232 xevent_watcher termwin_ev; 1283 xevent_watcher termwin_ev;
1233 xevent_watcher vt_ev; 1284 xevent_watcher vt_ev;
1234#ifdef HAVE_SCROLLBARS 1285#ifdef HAVE_SCROLLBARS
1235 xevent_watcher scrollbar_ev; 1286 xevent_watcher scrollbar_ev;
… …
1275 1326
1276 void tt_winch (); 1327 void tt_winch ();
1277 1328
1278 rxvt_term (); 1329 rxvt_term ();
1279 ~rxvt_term (); 1330 ~rxvt_term ();
1331 void child_exit (); // child has exited, usually destroys
1280 void destroy (); 1332 void destroy ();
1333 void emergency_cleanup ();
1281 1334
1282 bool init (int argc, const char *const *argv); 1335 bool init (int argc, const char *const *argv);
1283 bool init_vars (); 1336 bool init_vars ();
1284 1337
1285 bool pty_fill (); 1338 bool pty_fill ();
… …
1294 int run_child (const char *const *argv); 1347 int run_child (const char *const *argv);
1295 1348
1296 void color_aliases (int idx); 1349 void color_aliases (int idx);
1297 void recolour_cursor (); 1350 void recolour_cursor ();
1298 void create_windows (int argc, const char *const *argv); 1351 void create_windows (int argc, const char *const *argv);
1299 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1352 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1300 void window_calc (unsigned int width, unsigned int height); 1353 void window_calc (unsigned int newwidth, unsigned int newheight);
1301 1354
1302#if USE_XIM 1355#if USE_XIM
1303 rxvt_xim *input_method; 1356 rxvt_xim *input_method;
1304 XIC Input_Context; 1357 XIC Input_Context;
1305 XIMStyle input_style; 1358 XIMStyle input_style;
… …
1339 1392
1340 bool cmd_parse (); 1393 bool cmd_parse ();
1341 void mouse_report (XButtonEvent &ev); 1394 void mouse_report (XButtonEvent &ev);
1342 void button_press (XButtonEvent &ev); 1395 void button_press (XButtonEvent &ev);
1343 void button_release (XButtonEvent &ev); 1396 void button_release (XButtonEvent &ev);
1397 void focus_in ();
1398 void focus_out ();
1344 int check_our_parents (); 1399 int check_our_parents ();
1345#ifdef PRINTPIPE 1400#ifdef PRINTPIPE
1346 FILE *popen_printer (); 1401 FILE *popen_printer ();
1347 int pclose_printer (FILE *stream); 1402 int pclose_printer (FILE *stream);
1348#endif 1403#endif
… …
1375 void set_title (const char *str); 1430 void set_title (const char *str);
1376 void set_icon_name (const char *str); 1431 void set_icon_name (const char *str);
1377 void set_window_color (int idx, const char *color); 1432 void set_window_color (int idx, const char *color);
1378 void set_colorfgbg (); 1433 void set_colorfgbg ();
1379 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1434 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1380 void set_widthheight (unsigned int width, unsigned int height); 1435 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1381 1436
1382#ifdef MENUBAR 1437#ifdef MENUBAR
1383 // menubar.C 1438 // menubar.C
1384 void menuitem_free (menu_t *menu, menuitem_t *item); 1439 void menuitem_free (menu_t *menu, menuitem_t *item);
1385 int action_dispatch (action_t *action); 1440 int action_dispatch (action_t *action);
… …
1411 void menubar_control (XButtonEvent &ev); 1466 void menubar_control (XButtonEvent &ev);
1412 void map_menuBar (int map); 1467 void map_menuBar (int map);
1413#endif 1468#endif
1414 1469
1415 // screen.C 1470 // screen.C
1416 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1471
1417 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1472 void lalloc (line_t &l)
1473 {
1474 l.t = (text_t *)talloc->alloc ();
1475 l.r = (rend_t *)ralloc->alloc ();
1476 }
1477
1478#if 0
1479 void lfree (line_t &l)
1480 {
1481 talloc->free (l.t);
1482 ralloc->free (l.r);
1483 }
1484#endif
1485
1486 void lresize (line_t &l)
1487 {
1488 if (!l.t)
1489 return;
1490
1491 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1492 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1493
1494 l.l = min (l.l, ncol);
1495
1496 if (ncol > prev_ncol)
1497 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1498 }
1499
1500 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1501 void scr_blank_screen_mem (line_t &l, rend_t efs);
1418 int scr_scroll_text (int row1, int row2, int count, int spec); 1502 int scr_scroll_text (int row1, int row2, int count);
1419 void scr_reset (); 1503 void scr_reset ();
1420 void scr_reset_realloc ();
1421 void scr_release (); 1504 void scr_release ();
1422 void scr_clear (bool really = false); 1505 void scr_clear (bool really = false);
1423 void scr_refresh (unsigned char refresh_type); 1506 void scr_refresh (unsigned char refresh_type);
1424 bool scr_refresh_rend (rend_t mask, rend_t value); 1507 bool scr_refresh_rend (rend_t mask, rend_t value);
1425 void scr_erase_screen (int mode); 1508 void scr_erase_screen (int mode);
1509#if ENABLE_FRILLS
1510 void scr_erase_savelines ();
1511 void scr_backindex ();
1512 void scr_forwardindex ();
1513#endif
1426 void scr_touch (bool refresh); 1514 void scr_touch (bool refresh);
1427 void scr_expose (int x, int y, int width, int height, bool refresh); 1515 void scr_expose (int x, int y, int width, int height, bool refresh);
1428 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1516 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1429 void scr_recolour (); 1517 void scr_recolour ();
1430 void scr_remap_chars (); 1518 void scr_remap_chars ();
1431 void scr_remap_chars (text_t *tp, rend_t *rp); 1519 void scr_remap_chars (const line_t &l);
1432 1520
1433 void scr_poweron (); 1521 void scr_poweron ();
1434 void scr_cursor (int mode); 1522 void scr_cursor (int mode);
1435 void scr_do_wrap (); 1523 void scr_do_wrap ();
1436 int scr_change_screen (int scrn); 1524 int scr_change_screen (int scrn);
1437 void scr_color (unsigned int color, int fgbg); 1525 void scr_color (unsigned int color, int fgbg);
1438 void scr_rendition (int set, int style); 1526 void scr_rendition (int set, int style);
1439 void scr_add_lines (const unicode_t *str, int nlines, int len); 1527 void scr_add_lines (const unicode_t *str, int nlines, int len);
1440 void scr_backspace (); 1528 void scr_backspace ();
1441 void scr_tab (int count, bool ht = false); 1529 void scr_tab (int count, bool ht = false);
1442 void scr_backindex ();
1443 void scr_forwardindex ();
1444 void scr_gotorc (int row, int col, int relative); 1530 void scr_gotorc (int row, int col, int relative);
1445 void scr_index (enum page_dirn direction); 1531 void scr_index (enum page_dirn direction);
1446 void scr_erase_line (int mode); 1532 void scr_erase_line (int mode);
1447 void scr_E (); 1533 void scr_E ();
1448 void scr_insdel_lines (int count, int insdel); 1534 void scr_insdel_lines (int count, int insdel);
… …
1509 1595
1510 // xdefaults.C 1596 // xdefaults.C
1511 void get_options (int argc, const char *const *argv); 1597 void get_options (int argc, const char *const *argv);
1512 int parse_keysym (const char *str, const char *arg); 1598 int parse_keysym (const char *str, const char *arg);
1513 void get_xdefaults (FILE *stream, const char *name); 1599 void get_xdefaults (FILE *stream, const char *name);
1514 void extract_resources (Display *display, const char *name); 1600 void extract_resources ();
1515 // xpm.C 1601 // xpm.C
1516 int scale_pixmap (const char *geom); 1602 int scale_pixmap (const char *geom);
1517 void resize_pixmap (); 1603 void resize_pixmap ();
1518 Pixmap set_bgPixmap (const char *file); 1604 Pixmap set_bgPixmap (const char *file);
1519}; 1605};

Diff Legend

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