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.143 by root, Thu Feb 3 07:18:30 2005 UTC vs.
Revision 1.168 by root, Thu Dec 22 16:44:10 2005 UTC

… …
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23
24#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
… …
600#ifdef TRANSPARENT 629#ifdef TRANSPARENT
601 Rs_transparent, 630 Rs_transparent,
602 Rs_transparent_all, 631 Rs_transparent_all,
603#endif 632#endif
604#if ENABLE_FRILLS 633#if ENABLE_FRILLS
634 Rs_pty_fd,
635 Rs_hold,
605 Rs_ext_bwidth, 636 Rs_ext_bwidth,
606 Rs_int_bwidth, 637 Rs_int_bwidth,
607 Rs_borderLess, 638 Rs_borderLess,
608#endif
609#if ENABLE_FRILLS
610 Rs_lineSpace, 639 Rs_lineSpace,
640 Rs_cursorUnderline,
641#endif
642#if CURSOR_BLINK
643 Rs_cursorBlink,
644#endif
645#if ENABLE_XEMBED
646 Rs_embed,
611#endif 647#endif
612 Rs_cutchars, 648 Rs_cutchars,
613 Rs_modifier, 649 Rs_modifier,
614 Rs_answerbackstring, 650 Rs_answerbackstring,
615 Rs_tripleclickwords, 651 Rs_tripleclickwords,
616 Rs_insecure, 652 Rs_insecure,
617 Rs_cursorBlink,
618 Rs_pointerBlank, 653 Rs_pointerBlank,
619 Rs_pointerBlankDelay, 654 Rs_pointerBlankDelay,
620 Rs_imLocale, 655 Rs_imLocale,
621 Rs_imFont, 656 Rs_imFont,
622 Rs_pastableTabs, 657 Rs_pastableTabs,
… …
641 XA_MULTIPLE, 676 XA_MULTIPLE,
642 XA_TARGETS, 677 XA_TARGETS,
643 XA_TIMESTAMP, 678 XA_TIMESTAMP,
644 XA_VT_SELECTION, 679 XA_VT_SELECTION,
645 XA_INCR, 680 XA_INCR,
681 XA_WM_PROTOCOLS,
646 XA_WMDELETEWINDOW, 682 XA_WM_DELETE_WINDOW,
647 XA_CLIPBOARD, 683 XA_CLIPBOARD,
648#if ENABLE_FRILLS 684#if ENABLE_FRILLS
685 XA_MOTIF_WM_HINTS,
686#endif
687#if ENABLE_EWMH
649 XA_NET_WM_PID, 688 XA_NET_WM_PID,
650 XA_MOTIF_WM_HINTS,
651 XA_NET_WM_NAME, 689 XA_NET_WM_NAME,
652 XA_NET_WM_ICON_NAME, 690 XA_NET_WM_ICON_NAME,
691 XA_NET_WM_PING,
653#endif 692#endif
654#if USE_XIM 693#if USE_XIM
655 XA_WM_LOCALE_NAME, 694 XA_WM_LOCALE_NAME,
656#endif 695#endif
657#if TRANSPARENT 696#if TRANSPARENT
… …
659 XA_ESETROOT_PMAP_ID, 698 XA_ESETROOT_PMAP_ID,
660#endif 699#endif
661#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 700#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
662 XA_DNDPROTOCOL, 701 XA_DNDPROTOCOL,
663 XA_DNDSELECTION, 702 XA_DNDSELECTION,
703#endif
704#if ENABLE_XEMBED
705 XA_XEMBED,
706 XA_XEMBED_INFO,
664#endif 707#endif
665 NUM_XA 708 NUM_XA
666}; 709};
667 710
668/* DEC private modes */ 711/* DEC private modes */
… …
696 priv_modes |= (bit); \ 739 priv_modes |= (bit); \
697 else \ 740 else \
698 priv_modes &= ~(bit) 741 priv_modes &= ~(bit)
699 742
700#ifdef ALLOW_132_MODE 743#ifdef ALLOW_132_MODE
701# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 744# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
702#else 745#else
703# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 746# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
704#endif 747#endif
705 748
706// do not change these constants lightly, there are many interdependencies 749// do not change these constants lightly, there are many interdependencies
707#define IMBUFSIZ 128 // input modifier buffer sizes 750#define IMBUFSIZ 128 // input modifier buffer sizes
708#define KBUFSZ 512 // size of keyboard mapping buffer 751#define KBUFSZ 512 // size of keyboard mapping buffer
… …
759#define strdup(x) strdup((const char *)(x)) 802#define strdup(x) strdup((const char *)(x))
760#define strlen(x) strlen((const char *)(x)) 803#define strlen(x) strlen((const char *)(x))
761#define strchr(x, y) strchr((const char *)(x), (int)(y)) 804#define strchr(x, y) strchr((const char *)(x), (int)(y))
762#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 805#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
763 806
807#define dDisp Display *disp = display->display
808
764/* convert pixel dimensions to row/column values. Everything as int32_t */ 809/* convert pixel dimensions to row/column values. Everything as int32_t */
765#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 810#define Pixel2Col(x) Pixel2Width((int32_t)(x))
766#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 811#define Pixel2Row(y) Pixel2Height((int32_t)(y))
767#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 812#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
768#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 813#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
769#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 814#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
770#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 815#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
771#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 816#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
772#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 817#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
773 818
774#define TermWin_TotalWidth() ((int32_t)TermWin.width) 819#define TermWin_TotalWidth() ((int32_t)this->width)
775#define TermWin_TotalHeight() ((int32_t)TermWin.height) 820#define TermWin_TotalHeight() ((int32_t)this->height)
821
822// for m >= -n, ensure remainder lies between 0..n-1
823#define MOD(m,n) (((m) + (n)) % (n))
824
825#define LINENO(n) MOD (term_start + int(n), total_rows)
826#define ROW(n) row_buf [LINENO (n)]
776 827
777/* how to build & extract colors and attributes */ 828/* how to build & extract colors and attributes */
778#define GET_BASEFG(x) (((x) & RS_fgMask)) 829#define GET_BASEFG(x) (((x) & RS_fgMask))
779#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 830#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
780#ifndef NO_BRIGHTCOLOR 831#ifndef NO_BRIGHTCOLOR
781# define GET_FGCOLOR(x) \ 832# define GET_FGCOLOR(x) \
782 ((((x) & RS_Bold) == 0 \ 833 ((((x) & RS_Bold) == 0 \
783 || GET_BASEFG (x) < minCOLOR \ 834 || GET_BASEFG (x) < minCOLOR \
784 || GET_BASEFG (x) >= minBrightCOLOR) \ 835 || GET_BASEFG (x) >= minBrightCOLOR) \
785 ? GET_BASEFG (x) \ 836 ? GET_BASEFG (x) \
786 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR))) 837 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
787# define GET_BGCOLOR(x) \ 838# define GET_BGCOLOR(x) \
788 ((((x) & RS_Blink) == 0 \ 839 ((((x) & RS_Blink) == 0 \
789 || GET_BASEBG (x) < minCOLOR \ 840 || GET_BASEBG (x) < minCOLOR \
790 || GET_BASEBG (x) >= minBrightCOLOR) \ 841 || GET_BASEBG (x) >= minBrightCOLOR) \
791 ? GET_BASEBG (x) \ 842 ? GET_BASEBG (x) \
792 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR))) 843 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
793#else 844#else
… …
814 865
815#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 866#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
816#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 867#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
817 868
818#if ENABLE_STYLES 869#if ENABLE_STYLES
819# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 870# define FONTSET(style) fontset[GET_STYLE (style)]
820#else 871#else
821# define FONTSET(style) TermWin.fontset[0] 872# define FONTSET(style) fontset[0]
822#endif 873#endif
823 874
824#ifdef HAVE_SCROLLBARS 875#ifdef HAVE_SCROLLBARS
825# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 876# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
826#else 877#else
… …
851#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 902#define scrollbar_size() (scrollBar.end - scrollBar.beg \
852 - scrollbar_minheight ()) 903 - scrollbar_minheight ())
853 904
854#if (MENUBAR_MAX > 1) 905#if (MENUBAR_MAX > 1)
855/* rendition style flags */ 906/* rendition style flags */
856# define menuBar_height() (TermWin.fheight + SHADOW) 907# define menuBar_height() (fheight + SHADOW)
857# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 908# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
858# define isMenuBarWindow(w) ((w) == menuBar.win) 909# define isMenuBarWindow(w) ((w) == menuBar.win)
859#else 910#else
860# define menuBar_height() (0) 911# define menuBar_height() (0)
861# define menuBar_TotalHeight() (0) 912# define menuBar_TotalHeight() (0)
… …
865#ifdef XPM_BACKGROUND 916#ifdef XPM_BACKGROUND
866# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 917# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
867#else 918#else
868# define XPMClearArea(a, b, c, d, e, f, g) 919# define XPMClearArea(a, b, c, d, e, f, g)
869#endif 920#endif
870
871#ifndef STRICT_FONT_CHECKING
872# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
873#endif
874
875#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
876#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
877 921
878#ifdef UTMP_SUPPORT 922#ifdef UTMP_SUPPORT
879# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 923# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
880# undef HAVE_UTMPX_H 924# undef HAVE_UTMPX_H
881# undef HAVE_STRUCT_UTMPX 925# undef HAVE_STRUCT_UTMPX
… …
1180 void scr_overlay_off (); 1224 void scr_overlay_off ();
1181 void scr_overlay_set (int x, int y, 1225 void scr_overlay_set (int x, int y,
1182 text_t text, 1226 text_t text,
1183 rend_t rend = OVERLAY_RSTYLE); 1227 rend_t rend = OVERLAY_RSTYLE);
1184 void scr_overlay_set (int x, int y, const char *s); 1228 void scr_overlay_set (int x, int y, const char *s);
1229 void scr_overlay_set (int x, int y, const wchar_t *s);
1185#endif 1230#endif
1186 1231
1187 vector<void *> allocated; // free these memory blocks with free() 1232 vector<void *> allocated; // free these memory blocks with free()
1188 1233
1189 char *env_windowid; /* environmental variable WINDOWID */ 1234 char *env_windowid; /* environmental variable WINDOWID */
… …
1229#if TRANSPARENT 1274#if TRANSPARENT
1230 void rootwin_cb (XEvent &xev); 1275 void rootwin_cb (XEvent &xev);
1231 xevent_watcher rootwin_ev; 1276 xevent_watcher rootwin_ev;
1232#endif 1277#endif
1233 1278
1234
1235 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1236 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1237
1238 void x_cb (XEvent &xev); 1279 void x_cb (XEvent &xev);
1239 xevent_watcher termwin_ev; 1280 xevent_watcher termwin_ev;
1240 xevent_watcher vt_ev; 1281 xevent_watcher vt_ev;
1241#ifdef HAVE_SCROLLBARS 1282#ifdef HAVE_SCROLLBARS
1242 xevent_watcher scrollbar_ev; 1283 xevent_watcher scrollbar_ev;
… …
1282 1323
1283 void tt_winch (); 1324 void tt_winch ();
1284 1325
1285 rxvt_term (); 1326 rxvt_term ();
1286 ~rxvt_term (); 1327 ~rxvt_term ();
1328 void child_exit (); // child has exited, usually destroys
1287 void destroy (); 1329 void destroy ();
1330 void emergency_cleanup ();
1288 1331
1289 bool init (int argc, const char *const *argv); 1332 bool init (int argc, const char *const *argv);
1290 bool init_vars (); 1333 bool init_vars ();
1291 1334
1292 bool pty_fill (); 1335 bool pty_fill ();
… …
1301 int run_child (const char *const *argv); 1344 int run_child (const char *const *argv);
1302 1345
1303 void color_aliases (int idx); 1346 void color_aliases (int idx);
1304 void recolour_cursor (); 1347 void recolour_cursor ();
1305 void create_windows (int argc, const char *const *argv); 1348 void create_windows (int argc, const char *const *argv);
1306 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1349 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1307 void window_calc (unsigned int width, unsigned int height); 1350 void window_calc (unsigned int newwidth, unsigned int newheight);
1308 1351
1309#if USE_XIM 1352#if USE_XIM
1310 rxvt_xim *input_method; 1353 rxvt_xim *input_method;
1311 XIC Input_Context; 1354 XIC Input_Context;
1312 XIMStyle input_style; 1355 XIMStyle input_style;
… …
1346 1389
1347 bool cmd_parse (); 1390 bool cmd_parse ();
1348 void mouse_report (XButtonEvent &ev); 1391 void mouse_report (XButtonEvent &ev);
1349 void button_press (XButtonEvent &ev); 1392 void button_press (XButtonEvent &ev);
1350 void button_release (XButtonEvent &ev); 1393 void button_release (XButtonEvent &ev);
1394 void focus_in ();
1395 void focus_out ();
1351 int check_our_parents (); 1396 int check_our_parents ();
1352#ifdef PRINTPIPE 1397#ifdef PRINTPIPE
1353 FILE *popen_printer (); 1398 FILE *popen_printer ();
1354 int pclose_printer (FILE *stream); 1399 int pclose_printer (FILE *stream);
1355#endif 1400#endif
… …
1382 void set_title (const char *str); 1427 void set_title (const char *str);
1383 void set_icon_name (const char *str); 1428 void set_icon_name (const char *str);
1384 void set_window_color (int idx, const char *color); 1429 void set_window_color (int idx, const char *color);
1385 void set_colorfgbg (); 1430 void set_colorfgbg ();
1386 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1431 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1387 void set_widthheight (unsigned int width, unsigned int height); 1432 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1388 1433
1389#ifdef MENUBAR 1434#ifdef MENUBAR
1390 // menubar.C 1435 // menubar.C
1391 void menuitem_free (menu_t *menu, menuitem_t *item); 1436 void menuitem_free (menu_t *menu, menuitem_t *item);
1392 int action_dispatch (action_t *action); 1437 int action_dispatch (action_t *action);
… …
1418 void menubar_control (XButtonEvent &ev); 1463 void menubar_control (XButtonEvent &ev);
1419 void map_menuBar (int map); 1464 void map_menuBar (int map);
1420#endif 1465#endif
1421 1466
1422 // screen.C 1467 // screen.C
1423 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1468
1424 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1469 void lalloc (line_t &l)
1470 {
1471 l.t = (text_t *)talloc->alloc ();
1472 l.r = (rend_t *)ralloc->alloc ();
1473 }
1474
1475 void lfree (line_t &l)
1476 {
1477 talloc->free (l.t);
1478 ralloc->free (l.r);
1479 }
1480
1481 void lresize (line_t &l)
1482 {
1483 if (!l.t)
1484 return;
1485
1486 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1487 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1488
1489 l.l = min (l.l, ncol);
1490
1491 if (ncol > prev_ncol)
1492 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1493 }
1494
1495 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1496 void scr_blank_screen_mem (line_t &l, rend_t efs);
1425 int scr_scroll_text (int row1, int row2, int count, int spec); 1497 int scr_scroll_text (int row1, int row2, int count);
1426 void scr_reset (); 1498 void scr_reset ();
1427 void scr_reset_realloc ();
1428 void scr_release (); 1499 void scr_release ();
1429 void scr_clear (bool really = false); 1500 void scr_clear (bool really = false);
1430 void scr_refresh (unsigned char refresh_type); 1501 void scr_refresh (unsigned char refresh_type);
1431 bool scr_refresh_rend (rend_t mask, rend_t value); 1502 bool scr_refresh_rend (rend_t mask, rend_t value);
1432 void scr_erase_screen (int mode); 1503 void scr_erase_screen (int mode);
1504#if ENABLE_FRILLS
1505 void scr_erase_savelines ();
1506 void scr_backindex ();
1507 void scr_forwardindex ();
1508#endif
1433 void scr_touch (bool refresh); 1509 void scr_touch (bool refresh);
1434 void scr_expose (int x, int y, int width, int height, bool refresh); 1510 void scr_expose (int x, int y, int width, int height, bool refresh);
1435 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1511 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1436 void scr_recolour (); 1512 void scr_recolour ();
1437 void scr_remap_chars (); 1513 void scr_remap_chars ();
1438 void scr_remap_chars (text_t *tp, rend_t *rp); 1514 void scr_remap_chars (const line_t &l);
1439 1515
1440 void scr_poweron (); 1516 void scr_poweron ();
1441 void scr_cursor (int mode); 1517 void scr_cursor (int mode);
1442 void scr_do_wrap (); 1518 void scr_do_wrap ();
1443 int scr_change_screen (int scrn); 1519 int scr_change_screen (int scrn);
1444 void scr_color (unsigned int color, int fgbg); 1520 void scr_color (unsigned int color, int fgbg);
1445 void scr_rendition (int set, int style); 1521 void scr_rendition (int set, int style);
1446 void scr_add_lines (const unicode_t *str, int nlines, int len); 1522 void scr_add_lines (const unicode_t *str, int nlines, int len);
1447 void scr_backspace (); 1523 void scr_backspace ();
1448 void scr_tab (int count, bool ht = false); 1524 void scr_tab (int count, bool ht = false);
1449 void scr_backindex ();
1450 void scr_forwardindex ();
1451 void scr_gotorc (int row, int col, int relative); 1525 void scr_gotorc (int row, int col, int relative);
1452 void scr_index (enum page_dirn direction); 1526 void scr_index (enum page_dirn direction);
1453 void scr_erase_line (int mode); 1527 void scr_erase_line (int mode);
1454 void scr_E (); 1528 void scr_E ();
1455 void scr_insdel_lines (int count, int insdel); 1529 void scr_insdel_lines (int count, int insdel);
… …
1516 1590
1517 // xdefaults.C 1591 // xdefaults.C
1518 void get_options (int argc, const char *const *argv); 1592 void get_options (int argc, const char *const *argv);
1519 int parse_keysym (const char *str, const char *arg); 1593 int parse_keysym (const char *str, const char *arg);
1520 void get_xdefaults (FILE *stream, const char *name); 1594 void get_xdefaults (FILE *stream, const char *name);
1521 void extract_resources (Display *display, const char *name); 1595 void extract_resources ();
1522 // xpm.C 1596 // xpm.C
1523 int scale_pixmap (const char *geom); 1597 int scale_pixmap (const char *geom);
1524 void resize_pixmap (); 1598 void resize_pixmap ();
1525 Pixmap set_bgPixmap (const char *file); 1599 Pixmap set_bgPixmap (const char *file);
1526}; 1600};

Diff Legend

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