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.151 by root, Sun Feb 20 00:09:25 2005 UTC vs.
Revision 1.179 by root, Mon Jan 2 15:10:18 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;
… …
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
… …
577 Rs_font, 567 Rs_font,
578#if ENABLE_STYLES 568#if ENABLE_STYLES
579 Rs_boldFont, 569 Rs_boldFont,
580 Rs_italicFont, 570 Rs_italicFont,
581 Rs_boldItalicFont, 571 Rs_boldItalicFont,
572 Rs_intensityStyles,
582#endif 573#endif
583 Rs_name, 574 Rs_name,
584 Rs_title, 575 Rs_title,
585#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 576#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
586 Rs_path, 577 Rs_path,
… …
633#ifdef TRANSPARENT 624#ifdef TRANSPARENT
634 Rs_transparent, 625 Rs_transparent,
635 Rs_transparent_all, 626 Rs_transparent_all,
636#endif 627#endif
637#if ENABLE_FRILLS 628#if ENABLE_FRILLS
629 Rs_pty_fd,
630 Rs_hold,
638 Rs_ext_bwidth, 631 Rs_ext_bwidth,
639 Rs_int_bwidth, 632 Rs_int_bwidth,
640 Rs_borderLess, 633 Rs_borderLess,
641 Rs_lineSpace, 634 Rs_lineSpace,
642 Rs_pty_fd, 635 Rs_cursorUnderline,
636#endif
637#if CURSOR_BLINK
638 Rs_cursorBlink,
643#endif 639#endif
644#if ENABLE_XEMBED 640#if ENABLE_XEMBED
645 Rs_embed, 641 Rs_embed,
646#endif 642#endif
647 Rs_cutchars, 643 Rs_cutchars,
648 Rs_modifier, 644 Rs_modifier,
649 Rs_answerbackstring, 645 Rs_answerbackstring,
650 Rs_tripleclickwords, 646 Rs_tripleclickwords,
651 Rs_insecure, 647 Rs_insecure,
652 Rs_cursorBlink,
653 Rs_pointerBlank, 648 Rs_pointerBlank,
654 Rs_pointerBlankDelay, 649 Rs_pointerBlankDelay,
655 Rs_imLocale, 650 Rs_imLocale,
656 Rs_imFont, 651 Rs_imFont,
657 Rs_pastableTabs, 652 Rs_pastableTabs,
… …
680 XA_INCR, 675 XA_INCR,
681 XA_WM_PROTOCOLS, 676 XA_WM_PROTOCOLS,
682 XA_WM_DELETE_WINDOW, 677 XA_WM_DELETE_WINDOW,
683 XA_CLIPBOARD, 678 XA_CLIPBOARD,
684#if ENABLE_FRILLS 679#if ENABLE_FRILLS
680 XA_MOTIF_WM_HINTS,
681#endif
682#if ENABLE_EWMH
685 XA_NET_WM_PID, 683 XA_NET_WM_PID,
686 XA_MOTIF_WM_HINTS,
687 XA_NET_WM_NAME, 684 XA_NET_WM_NAME,
688 XA_NET_WM_ICON_NAME, 685 XA_NET_WM_ICON_NAME,
686 XA_NET_WM_PING,
689#endif 687#endif
690#if USE_XIM 688#if USE_XIM
691 XA_WM_LOCALE_NAME, 689 XA_WM_LOCALE_NAME,
692#endif 690#endif
693#if TRANSPARENT 691#if TRANSPARENT
… …
744#endif 742#endif
745 743
746// do not change these constants lightly, there are many interdependencies 744// do not change these constants lightly, there are many interdependencies
747#define IMBUFSIZ 128 // input modifier buffer sizes 745#define IMBUFSIZ 128 // input modifier buffer sizes
748#define KBUFSZ 512 // size of keyboard mapping buffer 746#define KBUFSZ 512 // size of keyboard mapping buffer
749#define CBUFSIZ 4096 // size of command buffer 747#define CBUFSIZ 2048 // size of command buffer
750#define UBUFSIZ 4096 // character buffer 748#define UBUFSIZ 2048 // character buffer
751 749
752#ifndef PATH_MAX 750#ifndef PATH_MAX
753# define PATH_MAX 16384 751# define PATH_MAX 16384
754#endif 752#endif
755 753
… …
804#define dDisp Display *disp = display->display 802#define dDisp Display *disp = display->display
805 803
806/* convert pixel dimensions to row/column values. Everything as int32_t */ 804/* convert pixel dimensions to row/column values. Everything as int32_t */
807#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 805#define Pixel2Col(x) Pixel2Width((int32_t)(x))
808#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 806#define Pixel2Row(y) Pixel2Height((int32_t)(y))
809#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 807#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
810#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 808#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
811#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 809#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
812#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 810#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
813#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 811#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
814#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 812#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
815 813
816#define TermWin_TotalWidth() ((int32_t)TermWin.width) 814#define TermWin_TotalWidth() ((int32_t)this->width)
817#define TermWin_TotalHeight() ((int32_t)TermWin.height) 815#define TermWin_TotalHeight() ((int32_t)this->height)
816
817// for m >= -n, ensure remainder lies between 0..n-1
818#define MOD(m,n) (((m) + (n)) % (n))
819
820#define LINENO(n) MOD (term_start + int(n), total_rows)
821#define ROW(n) row_buf [LINENO (n)]
818 822
819/* how to build & extract colors and attributes */ 823/* how to build & extract colors and attributes */
820#define GET_BASEFG(x) (((x) & RS_fgMask)) 824#define GET_BASEFG(x) (((x) & RS_fgMask))
821#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 825#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 826
840#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 827#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
841#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 828#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
842 829
843#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 830#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
856 843
857#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 844#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))) 845#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
859 846
860#if ENABLE_STYLES 847#if ENABLE_STYLES
861# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 848# define FONTSET(style) fontset[GET_STYLE (style)]
862#else 849#else
863# define FONTSET(style) TermWin.fontset[0] 850# define FONTSET(style) fontset[0]
864#endif 851#endif
865 852
866#ifdef HAVE_SCROLLBARS 853#ifdef HAVE_SCROLLBARS
867# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 854# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
868#else 855#else
… …
893#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 880#define scrollbar_size() (scrollBar.end - scrollBar.beg \
894 - scrollbar_minheight ()) 881 - scrollbar_minheight ())
895 882
896#if (MENUBAR_MAX > 1) 883#if (MENUBAR_MAX > 1)
897/* rendition style flags */ 884/* rendition style flags */
898# define menuBar_height() (TermWin.fheight + SHADOW) 885# define menuBar_height() (fheight + SHADOW)
899# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 886# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
900# define isMenuBarWindow(w) ((w) == menuBar.win) 887# define isMenuBarWindow(w) ((w) == menuBar.win)
901#else 888#else
902# define menuBar_height() (0) 889# define menuBar_height() (0)
903# define menuBar_TotalHeight() (0) 890# define menuBar_TotalHeight() (0)
… …
950#endif 937#endif
951 938
952extern class rxvt_failure_exception { } rxvt_failure_exception; 939extern class rxvt_failure_exception { } rxvt_failure_exception;
953 940
954typedef callback1<void, const char *> log_callback; 941typedef callback1<void, const char *> log_callback;
942typedef callback1<int, int> getfd_callback;
955 943
956extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 944extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
957extern void rxvt_log (const char *fmt, ...); 945extern void rxvt_log (const char *fmt, ...);
958extern void rxvt_warn (const char *fmt, ...); 946extern void rxvt_warn (const char *fmt, ...);
959extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 947extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
1036 class keyboard_manager; 1024 class keyboard_manager;
1037#endif 1025#endif
1038 1026
1039struct rxvt_term : zero_initialized, rxvt_vars { 1027struct rxvt_term : zero_initialized, rxvt_vars {
1040 log_callback *log_hook; // log error messages through this hook, if != 0 1028 log_callback *log_hook; // log error messages through this hook, if != 0
1029 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1041 1030
1042 struct mbstate mbstate; // current input multibyte state 1031 struct mbstate mbstate; // current input multibyte state
1043 1032
1044 unsigned char want_refresh:1, 1033 unsigned char want_refresh:1,
1045#ifdef TRANSPARENT 1034#ifdef TRANSPARENT
… …
1215 void scr_overlay_off (); 1204 void scr_overlay_off ();
1216 void scr_overlay_set (int x, int y, 1205 void scr_overlay_set (int x, int y,
1217 text_t text, 1206 text_t text,
1218 rend_t rend = OVERLAY_RSTYLE); 1207 rend_t rend = OVERLAY_RSTYLE);
1219 void scr_overlay_set (int x, int y, const char *s); 1208 void scr_overlay_set (int x, int y, const char *s);
1209 void scr_overlay_set (int x, int y, const wchar_t *s);
1220#endif 1210#endif
1221 1211
1222 vector<void *> allocated; // free these memory blocks with free() 1212 vector<void *> allocated; // free these memory blocks with free()
1223 1213
1224 char *env_windowid; /* environmental variable WINDOWID */ 1214 char *env_windowid; /* environmental variable WINDOWID */
… …
1249 // ISO 14755 entry support 1239 // ISO 14755 entry support
1250 unicode_t iso14755buf; 1240 unicode_t iso14755buf;
1251 void commit_iso14755 (); 1241 void commit_iso14755 ();
1252 int hex_keyval (XKeyEvent &ev); 1242 int hex_keyval (XKeyEvent &ev);
1253# if ISO_14755 1243# if ISO_14755
1254 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1244 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); 1245 void iso14755_54 (int x, int y);
1256# endif 1246# endif
1257#endif 1247#endif
1258 1248
1259 // modifies first argument(!) 1249 // modifies first argument(!)
… …
1263 1253
1264#if TRANSPARENT 1254#if TRANSPARENT
1265 void rootwin_cb (XEvent &xev); 1255 void rootwin_cb (XEvent &xev);
1266 xevent_watcher rootwin_ev; 1256 xevent_watcher rootwin_ev;
1267#endif 1257#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 1258
1273 void x_cb (XEvent &xev); 1259 void x_cb (XEvent &xev);
1274 xevent_watcher termwin_ev; 1260 xevent_watcher termwin_ev;
1275 xevent_watcher vt_ev; 1261 xevent_watcher vt_ev;
1276#ifdef HAVE_SCROLLBARS 1262#ifdef HAVE_SCROLLBARS
… …
1317 1303
1318 void tt_winch (); 1304 void tt_winch ();
1319 1305
1320 rxvt_term (); 1306 rxvt_term ();
1321 ~rxvt_term (); 1307 ~rxvt_term ();
1308 void child_exit (); // child has exited, usually destroys
1322 void destroy (); 1309 void destroy ();
1323 void emergency_cleanup (); 1310 void emergency_cleanup ();
1324 1311
1325 bool init (int argc, const char *const *argv); 1312 bool init (int argc, const char *const *argv);
1326 bool init_vars (); 1313 bool init_vars ();
… …
1337 int run_child (const char *const *argv); 1324 int run_child (const char *const *argv);
1338 1325
1339 void color_aliases (int idx); 1326 void color_aliases (int idx);
1340 void recolour_cursor (); 1327 void recolour_cursor ();
1341 void create_windows (int argc, const char *const *argv); 1328 void create_windows (int argc, const char *const *argv);
1342 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1329 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1343 void window_calc (unsigned int width, unsigned int height); 1330 void window_calc (unsigned int newwidth, unsigned int newheight);
1344 1331
1345#if USE_XIM 1332#if USE_XIM
1346 rxvt_xim *input_method; 1333 rxvt_xim *input_method;
1347 XIC Input_Context; 1334 XIC Input_Context;
1348 XIMStyle input_style; 1335 XIMStyle input_style;
… …
1420 void set_title (const char *str); 1407 void set_title (const char *str);
1421 void set_icon_name (const char *str); 1408 void set_icon_name (const char *str);
1422 void set_window_color (int idx, const char *color); 1409 void set_window_color (int idx, const char *color);
1423 void set_colorfgbg (); 1410 void set_colorfgbg ();
1424 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1411 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1425 void set_widthheight (unsigned int width, unsigned int height); 1412 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1426 1413
1427#ifdef MENUBAR 1414#ifdef MENUBAR
1428 // menubar.C 1415 // menubar.C
1429 void menuitem_free (menu_t *menu, menuitem_t *item); 1416 void menuitem_free (menu_t *menu, menuitem_t *item);
1430 int action_dispatch (action_t *action); 1417 int action_dispatch (action_t *action);
… …
1456 void menubar_control (XButtonEvent &ev); 1443 void menubar_control (XButtonEvent &ev);
1457 void map_menuBar (int map); 1444 void map_menuBar (int map);
1458#endif 1445#endif
1459 1446
1460 // screen.C 1447 // screen.C
1461 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1448
1462 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1449 void lalloc (line_t &l)
1450 {
1451 l.t = (text_t *)talloc->alloc ();
1452 l.r = (rend_t *)ralloc->alloc ();
1453 }
1454
1455#if 0
1456 void lfree (line_t &l)
1457 {
1458 talloc->free (l.t);
1459 ralloc->free (l.r);
1460 }
1461#endif
1462
1463 void lresize (line_t &l)
1464 {
1465 if (!l.t)
1466 return;
1467
1468 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1469 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1470
1471 l.l = min (l.l, ncol);
1472
1473 if (ncol > prev_ncol)
1474 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1475 }
1476
1477 int fgcolor_of (rend_t r)
1478 {
1479 int base = GET_BASEFG (r);
1480#ifndef NO_BRIGHTCOLOR
1481 if (r & RS_Bold
1482# if ENABLE_STYLES
1483 && OPTION (Opt_intensityStyles)
1484# endif
1485 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1486 base += minBrightCOLOR - minCOLOR;
1487#endif
1488 return base;
1489 }
1490
1491 int bgcolor_of (rend_t r)
1492 {
1493 int base = GET_BASEBG (r);
1494#ifndef NO_BRIGHTCOLOR
1495 if (r & RS_Blink
1496# if ENABLE_STYLES
1497 && OPTION (Opt_intensityStyles)
1498# endif
1499 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1500 base += minBrightCOLOR - minCOLOR;
1501#endif
1502 return base;
1503 }
1504
1505 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1506 void scr_blank_screen_mem (line_t &l, rend_t efs);
1463 int scr_scroll_text (int row1, int row2, int count, int spec); 1507 int scr_scroll_text (int row1, int row2, int count);
1464 void scr_reset (); 1508 void scr_reset ();
1465 void scr_reset_realloc ();
1466 void scr_release (); 1509 void scr_release ();
1467 void scr_clear (bool really = false); 1510 void scr_clear (bool really = false);
1468 void scr_refresh (unsigned char refresh_type); 1511 void scr_refresh (unsigned char refresh_type);
1469 bool scr_refresh_rend (rend_t mask, rend_t value); 1512 bool scr_refresh_rend (rend_t mask, rend_t value);
1470 void scr_erase_screen (int mode); 1513 void scr_erase_screen (int mode);
1514#if ENABLE_FRILLS
1515 void scr_erase_savelines ();
1516 void scr_backindex ();
1517 void scr_forwardindex ();
1518#endif
1471 void scr_touch (bool refresh); 1519 void scr_touch (bool refresh);
1472 void scr_expose (int x, int y, int width, int height, bool refresh); 1520 void scr_expose (int x, int y, int width, int height, bool refresh);
1473 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1521 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1474 void scr_recolour (); 1522 void scr_recolour ();
1475 void scr_remap_chars (); 1523 void scr_remap_chars ();
1476 void scr_remap_chars (text_t *tp, rend_t *rp); 1524 void scr_remap_chars (const line_t &l);
1477 1525
1478 void scr_poweron (); 1526 void scr_poweron ();
1479 void scr_cursor (int mode); 1527 void scr_cursor (int mode);
1480 void scr_do_wrap (); 1528 void scr_do_wrap ();
1481 int scr_change_screen (int scrn); 1529 int scr_change_screen (int scrn);
1482 void scr_color (unsigned int color, int fgbg); 1530 void scr_color (unsigned int color, int fgbg);
1483 void scr_rendition (int set, int style); 1531 void scr_rendition (int set, int style);
1484 void scr_add_lines (const unicode_t *str, int nlines, int len); 1532 void scr_add_lines (const unicode_t *str, int nlines, int len);
1485 void scr_backspace (); 1533 void scr_backspace ();
1486 void scr_tab (int count, bool ht = false); 1534 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); 1535 void scr_gotorc (int row, int col, int relative);
1490 void scr_index (enum page_dirn direction); 1536 void scr_index (enum page_dirn direction);
1491 void scr_erase_line (int mode); 1537 void scr_erase_line (int mode);
1492 void scr_E (); 1538 void scr_E ();
1493 void scr_insdel_lines (int count, int insdel); 1539 void scr_insdel_lines (int count, int insdel);

Diff Legend

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