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.140 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.166 by root, Wed Dec 21 14:19:19 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) 167#define MAX_POSITIVE_INT16 (((uint16_t)-1)>>1) // TODO: configure/limits
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
168#if ENABLE_FRILLS 169#if ENABLE_FRILLS
169typedef struct _mwmhints { 170typedef struct _mwmhints {
170 CARD32 flags; 171 CARD32 flags;
171 CARD32 functions; 172 CARD32 functions;
… …
173 INT32 input_mode; 174 INT32 input_mode;
174 CARD32 status; 175 CARD32 status;
175} MWMHints; 176} MWMHints;
176#endif 177#endif
177 178
179#if ENABLE_XEMBED
180// XEMBED messages
181# define XEMBED_EMBEDDED_NOTIFY 0
182# define XEMBED_WINDOW_ACTIVATE 1
183# define XEMBED_WINDOW_DEACTIVATE 2
184# define XEMBED_REQUEST_FOCUS 3
185# define XEMBED_FOCUS_IN 4
186# define XEMBED_FOCUS_OUT 5
187# define XEMBED_FOCUS_NEXT 6
188# define XEMBED_FOCUS_PREV 7
189
190# define XEMBED_MODALITY_ON 10
191# define XEMBED_MODALITY_OFF 11
192# define XEMBED_REGISTER_ACCELERATOR 12
193# define XEMBED_UNREGISTER_ACCELERATOR 13
194# define XEMBED_ACTIVATE_ACCELERATOR 14
195
196// XEMBED detail code
197# define XEMBED_FOCUS_CURRENT 0
198# define XEMBED_FOCUS_FIRST 1
199# define XEMBED_FOCUS_LAST 2
200
201# define XEMBED_MAPPED (1 << 0)
202#endif
203
178/* 204/*
179 ***************************************************************************** 205 *****************************************************************************
180 * NORMAL DEFINES 206 * NORMAL DEFINES
181 ***************************************************************************** 207 *****************************************************************************
182 */ 208 */
… …
232 258
233#define R_SB_ALIGN_CENTRE 0 259#define R_SB_ALIGN_CENTRE 0
234#define R_SB_ALIGN_TOP 1 260#define R_SB_ALIGN_TOP 1
235#define R_SB_ALIGN_BOTTOM 2 261#define R_SB_ALIGN_BOTTOM 2
236 262
237#define R_SB_RXVT 0
238#define R_SB_NEXT 1 263#define R_SB_NEXT 1
239#define R_SB_XTERM 2 264#define R_SB_XTERM 2
240#define R_SB_PLAIN 4 265#define R_SB_PLAIN 4
266#define R_SB_RXVT 8
241 267
242#define SB_WIDTH_NEXT 19 268#define SB_WIDTH_NEXT 19
243#define SB_WIDTH_XTERM 15 269#define SB_WIDTH_XTERM 15
244#define SB_WIDTH_PLAIN 7 270#define SB_WIDTH_PLAIN 7
245#ifndef SB_WIDTH_RXVT 271#ifndef SB_WIDTH_RXVT
… …
438 XTerm_Color_UL = 19, // change actual 'Underline' color 464 XTerm_Color_UL = 19, // change actual 'Underline' color
439 XTerm_Pixmap = 20, // new bg pixmap 465 XTerm_Pixmap = 20, // new bg pixmap
440 XTerm_restoreFG = 39, // change default fg color 466 XTerm_restoreFG = 39, // change default fg color
441 XTerm_restoreBG = 49, // change default bg color 467 XTerm_restoreBG = 49, // change default bg color
442 XTerm_dumpscreen = 55, // dump scrollback and all of screen 468 XTerm_dumpscreen = 55, // dump scrollback and all of screen
469
443 XTerm_locale = 701, // change locale 470 URxvt_locale = 701, // change locale
444 XTerm_Menu = 703, // set menu item 471 URxvt_Menu = 703, // set menu item
445 XTerm_Color_IT = 704, // change actual 'Italic' colour 472 URxvt_Color_IT = 704, // change actual 'Italic' colour
446 XTerm_Color_tint = 705, // change actual tint colour 473 URxvt_Color_tint = 705, // change actual tint colour
447 474
448 URxvt_font = 710, 475 URxvt_font = 710,
449 URxvt_boldFont = 711, 476 URxvt_boldFont = 711,
450 URxvt_italicFont = 712, 477 URxvt_italicFont = 712,
451 URxvt_boldItalicFont = 713, 478 URxvt_boldItalicFont = 713,
479
480 URxvt_view_up = 720,
481 URxvt_view_down = 721,
452}; 482};
453 483
454/* Words starting with `Color_' are colours. Others are counts */ 484/* Words starting with `Color_' are colours. Others are counts */
455/* 485/*
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 486 * The PixColor and rendition colour usage should probably be decoupled
459 * on the unnecessary items, e.g. Color_pointer, but won't bother 487 * 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 488 * until we need to. Also, be aware of usage in pixcolor_set
461 */ 489 */
462 490
463enum colour_list { 491enum colour_list {
… …
513 Color_trough, 541 Color_trough,
514#endif 542#endif
515#if TINTING 543#if TINTING
516 Color_tint, 544 Color_tint,
517#endif 545#endif
546#if OFF_FOCUS_FADING
547 Color_fade,
548#endif
518 NRS_COLORS, /* */ 549 NRS_COLORS, /* */
519#ifdef KEEP_SCROLLCOLOR 550#ifdef KEEP_SCROLLCOLOR
520 Color_topShadow = NRS_COLORS, 551 Color_topShadow = NRS_COLORS,
521 Color_bottomShadow, 552 Color_bottomShadow,
522 TOTAL_COLORS 553 TOTAL_COLORS
… …
563#ifdef HAVE_SCROLLBARS 594#ifdef HAVE_SCROLLBARS
564 Rs_scrollBar, 595 Rs_scrollBar,
565 Rs_scrollBar_right, 596 Rs_scrollBar_right,
566 Rs_scrollBar_floating, 597 Rs_scrollBar_floating,
567 Rs_scrollBar_align, 598 Rs_scrollBar_align,
568#endif
569 Rs_scrollstyle, /* Rs_scrollBar_style */ 599 Rs_scrollstyle, /* Rs_scrollBar_style */
600 Rs_scrollBar_thickness,
601#endif
570 Rs_scrollTtyOutput, 602 Rs_scrollTtyOutput,
571 Rs_scrollTtyKeypress, 603 Rs_scrollTtyKeypress,
572 Rs_scrollWithBuffer, 604 Rs_scrollWithBuffer,
573 Rs_saveLines, 605 Rs_saveLines,
574 Rs_utmpInhibit, 606 Rs_utmpInhibit,
… …
602#endif 634#endif
603#if ENABLE_FRILLS 635#if ENABLE_FRILLS
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#if ENABLE_FRILLS
610 Rs_lineSpace, 639 Rs_lineSpace,
640 Rs_pty_fd,
641 Rs_cursorUnderline,
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,
704#endif
705#if ENABLE_XEMBED
706 XA_XEMBED,
707 XA_XEMBED_INFO,
663#endif 708#endif
664 NUM_XA 709 NUM_XA
665}; 710};
666 711
667/* DEC private modes */ 712/* DEC private modes */
… …
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#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
824#define ROW(n) (save [LINENO (n)])
775 825
776/* how to build & extract colors and attributes */ 826/* how to build & extract colors and attributes */
777#define GET_BASEFG(x) (((x) & RS_fgMask)) 827#define GET_BASEFG(x) (((x) & RS_fgMask))
778#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 828#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
779#ifndef NO_BRIGHTCOLOR 829#ifndef NO_BRIGHTCOLOR
… …
813 863
814#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 864#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))) 865#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
816 866
817#if ENABLE_STYLES 867#if ENABLE_STYLES
818# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 868# define FONTSET(style) fontset[GET_STYLE (style)]
819#else 869#else
820# define FONTSET(style) TermWin.fontset[0] 870# define FONTSET(style) fontset[0]
821#endif 871#endif
822 872
823#ifdef HAVE_SCROLLBARS 873#ifdef HAVE_SCROLLBARS
824# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 874# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
825#else 875#else
… …
850#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 900#define scrollbar_size() (scrollBar.end - scrollBar.beg \
851 - scrollbar_minheight ()) 901 - scrollbar_minheight ())
852 902
853#if (MENUBAR_MAX > 1) 903#if (MENUBAR_MAX > 1)
854/* rendition style flags */ 904/* rendition style flags */
855# define menuBar_height() (TermWin.fheight + SHADOW) 905# define menuBar_height() (fheight + SHADOW)
856# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 906# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
857# define isMenuBarWindow(w) ((w) == menuBar.win) 907# define isMenuBarWindow(w) ((w) == menuBar.win)
858#else 908#else
859# define menuBar_height() (0) 909# define menuBar_height() (0)
860# define menuBar_TotalHeight() (0) 910# define menuBar_TotalHeight() (0)
… …
864#ifdef XPM_BACKGROUND 914#ifdef XPM_BACKGROUND
865# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 915# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
866#else 916#else
867# define XPMClearArea(a, b, c, d, e, f, g) 917# define XPMClearArea(a, b, c, d, e, f, g)
868#endif 918#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 919
877#ifdef UTMP_SUPPORT 920#ifdef UTMP_SUPPORT
878# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 921# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
879# undef HAVE_UTMPX_H 922# undef HAVE_UTMPX_H
880# undef HAVE_STRUCT_UTMPX 923# undef HAVE_STRUCT_UTMPX
… …
1179 void scr_overlay_off (); 1222 void scr_overlay_off ();
1180 void scr_overlay_set (int x, int y, 1223 void scr_overlay_set (int x, int y,
1181 text_t text, 1224 text_t text,
1182 rend_t rend = OVERLAY_RSTYLE); 1225 rend_t rend = OVERLAY_RSTYLE);
1183 void scr_overlay_set (int x, int y, const char *s); 1226 void scr_overlay_set (int x, int y, const char *s);
1227 void scr_overlay_set (int x, int y, const wchar_t *s);
1184#endif 1228#endif
1185 1229
1186 vector<void *> allocated; // free these memory blocks with free() 1230 vector<void *> allocated; // free these memory blocks with free()
1187 1231
1188 char *env_windowid; /* environmental variable WINDOWID */ 1232 char *env_windowid; /* environmental variable WINDOWID */
… …
1228#if TRANSPARENT 1272#if TRANSPARENT
1229 void rootwin_cb (XEvent &xev); 1273 void rootwin_cb (XEvent &xev);
1230 xevent_watcher rootwin_ev; 1274 xevent_watcher rootwin_ev;
1231#endif 1275#endif
1232 1276
1233
1234 void sig_term (sig_watcher &w); sig_watcher sw_term;
1235 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1236
1237 void x_cb (XEvent &xev); 1277 void x_cb (XEvent &xev);
1238 xevent_watcher termwin_ev; 1278 xevent_watcher termwin_ev;
1239 xevent_watcher vt_ev; 1279 xevent_watcher vt_ev;
1240#ifdef HAVE_SCROLLBARS 1280#ifdef HAVE_SCROLLBARS
1241 xevent_watcher scrollbar_ev; 1281 xevent_watcher scrollbar_ev;
… …
1282 void tt_winch (); 1322 void tt_winch ();
1283 1323
1284 rxvt_term (); 1324 rxvt_term ();
1285 ~rxvt_term (); 1325 ~rxvt_term ();
1286 void destroy (); 1326 void destroy ();
1327 void emergency_cleanup ();
1287 1328
1288 bool init (int argc, const char *const *argv); 1329 bool init (int argc, const char *const *argv);
1289 bool init_vars (); 1330 bool init_vars ();
1290 1331
1291 bool pty_fill (); 1332 bool pty_fill ();
… …
1300 int run_child (const char *const *argv); 1341 int run_child (const char *const *argv);
1301 1342
1302 void color_aliases (int idx); 1343 void color_aliases (int idx);
1303 void recolour_cursor (); 1344 void recolour_cursor ();
1304 void create_windows (int argc, const char *const *argv); 1345 void create_windows (int argc, const char *const *argv);
1305 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1346 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1306 void window_calc (unsigned int width, unsigned int height); 1347 void window_calc (unsigned int newwidth, unsigned int newheight);
1307 1348
1308#if USE_XIM 1349#if USE_XIM
1309 rxvt_xim *input_method; 1350 rxvt_xim *input_method;
1310 XIC Input_Context; 1351 XIC Input_Context;
1311 XIMStyle input_style; 1352 XIMStyle input_style;
… …
1345 1386
1346 bool cmd_parse (); 1387 bool cmd_parse ();
1347 void mouse_report (XButtonEvent &ev); 1388 void mouse_report (XButtonEvent &ev);
1348 void button_press (XButtonEvent &ev); 1389 void button_press (XButtonEvent &ev);
1349 void button_release (XButtonEvent &ev); 1390 void button_release (XButtonEvent &ev);
1391 void focus_in ();
1392 void focus_out ();
1350 int check_our_parents (); 1393 int check_our_parents ();
1351#ifdef PRINTPIPE 1394#ifdef PRINTPIPE
1352 FILE *popen_printer (); 1395 FILE *popen_printer ();
1353 int pclose_printer (FILE *stream); 1396 int pclose_printer (FILE *stream);
1354#endif 1397#endif
… …
1381 void set_title (const char *str); 1424 void set_title (const char *str);
1382 void set_icon_name (const char *str); 1425 void set_icon_name (const char *str);
1383 void set_window_color (int idx, const char *color); 1426 void set_window_color (int idx, const char *color);
1384 void set_colorfgbg (); 1427 void set_colorfgbg ();
1385 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1428 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1386 void set_widthheight (unsigned int width, unsigned int height); 1429 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1387 1430
1388#ifdef MENUBAR 1431#ifdef MENUBAR
1389 // menubar.C 1432 // menubar.C
1390 void menuitem_free (menu_t *menu, menuitem_t *item); 1433 void menuitem_free (menu_t *menu, menuitem_t *item);
1391 int action_dispatch (action_t *action); 1434 int action_dispatch (action_t *action);
… …
1417 void menubar_control (XButtonEvent &ev); 1460 void menubar_control (XButtonEvent &ev);
1418 void map_menuBar (int map); 1461 void map_menuBar (int map);
1419#endif 1462#endif
1420 1463
1421 // screen.C 1464 // screen.C
1422 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1465
1423 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1466 void lalloc (line_t &l)
1467 {
1468 l.t = (text_t *)talloc->alloc ();
1469 l.r = (rend_t *)ralloc->alloc ();
1470 }
1471
1472 void lfree (line_t &l)
1473 {
1474 talloc->free (l.t);
1475 ralloc->free (l.r);
1476 }
1477
1478 void lresize (line_t &l)
1479 {
1480 if (!l.t)
1481 return;
1482
1483 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1484 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1485
1486 l.l = min (l.l, ncol);
1487
1488 if (ncol > prev_ncol)
1489 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1490 }
1491
1492 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1493 void scr_blank_screen_mem (line_t &l, rend_t efs);
1424 int scr_scroll_text (int row1, int row2, int count, int spec); 1494 int scr_scroll_text (int row1, int row2, int count);
1425 void scr_reset (); 1495 void scr_reset ();
1426 void scr_reset_realloc (); 1496 void scr_reset_realloc ();
1427 void scr_release (); 1497 void scr_release ();
1428 void scr_clear (bool really = false); 1498 void scr_clear (bool really = false);
1429 void scr_refresh (unsigned char refresh_type); 1499 void scr_refresh (unsigned char refresh_type);
1430 bool scr_refresh_rend (rend_t mask, rend_t value); 1500 bool scr_refresh_rend (rend_t mask, rend_t value);
1431 void scr_erase_screen (int mode); 1501 void scr_erase_screen (int mode);
1502#if ENABLE_FRILLS
1503 void scr_erase_savelines ();
1504 void scr_backindex ();
1505 void scr_forwardindex ();
1506#endif
1432 void scr_touch (bool refresh); 1507 void scr_touch (bool refresh);
1433 void scr_expose (int x, int y, int width, int height, bool refresh); 1508 void scr_expose (int x, int y, int width, int height, bool refresh);
1434 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1509 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1435 void scr_recolour (); 1510 void scr_recolour ();
1436 void scr_remap_chars (); 1511 void scr_remap_chars ();
1437 void scr_remap_chars (text_t *tp, rend_t *rp); 1512 void scr_remap_chars (const line_t &l);
1438 1513
1439 void scr_poweron (); 1514 void scr_poweron ();
1440 void scr_cursor (int mode); 1515 void scr_cursor (int mode);
1441 void scr_do_wrap (); 1516 void scr_do_wrap ();
1442 int scr_change_screen (int scrn); 1517 int scr_change_screen (int scrn);
1443 void scr_color (unsigned int color, int fgbg); 1518 void scr_color (unsigned int color, int fgbg);
1444 void scr_rendition (int set, int style); 1519 void scr_rendition (int set, int style);
1445 void scr_add_lines (const unicode_t *str, int nlines, int len); 1520 void scr_add_lines (const unicode_t *str, int nlines, int len);
1446 void scr_backspace (); 1521 void scr_backspace ();
1447 void scr_tab (int count, bool ht = false); 1522 void scr_tab (int count, bool ht = false);
1448 void scr_backindex ();
1449 void scr_forwardindex ();
1450 void scr_gotorc (int row, int col, int relative); 1523 void scr_gotorc (int row, int col, int relative);
1451 void scr_index (enum page_dirn direction); 1524 void scr_index (enum page_dirn direction);
1452 void scr_erase_line (int mode); 1525 void scr_erase_line (int mode);
1453 void scr_E (); 1526 void scr_E ();
1454 void scr_insdel_lines (int count, int insdel); 1527 void scr_insdel_lines (int count, int insdel);
… …
1515 1588
1516 // xdefaults.C 1589 // xdefaults.C
1517 void get_options (int argc, const char *const *argv); 1590 void get_options (int argc, const char *const *argv);
1518 int parse_keysym (const char *str, const char *arg); 1591 int parse_keysym (const char *str, const char *arg);
1519 void get_xdefaults (FILE *stream, const char *name); 1592 void get_xdefaults (FILE *stream, const char *name);
1520 void extract_resources (Display *display, const char *name); 1593 void extract_resources ();
1521 // xpm.C 1594 // xpm.C
1522 int scale_pixmap (const char *geom); 1595 int scale_pixmap (const char *geom);
1523 void resize_pixmap (); 1596 void resize_pixmap ();
1524 Pixmap set_bgPixmap (const char *file); 1597 Pixmap set_bgPixmap (const char *file);
1525}; 1598};

Diff Legend

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