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.240 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.284 by ayin, Fri Aug 3 23:32:14 2007 UTC

… …
8#if defined (ISO_14755) || defined (ENABLE_PERL) 8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 9# define ENABLE_OVERLAY 1
10#endif 10#endif
11 11
12#if ENABLE_PERL 12#if ENABLE_PERL
13# define ENABLE_FRILLS 1 13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 14# define ENABLE_COMBINING 1
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1
20# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
21#else 23#else
22# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
23#endif 25#endif
24 26
25#include <limits.h> 27#include <limits.h>
… …
31#if ENABLE_FRILLS 33#if ENABLE_FRILLS
32# include <X11/Xmd.h> 34# include <X11/Xmd.h>
33#endif 35#endif
34 36
35#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
36#include "rxvtfont.h" 39#include "rxvtfont.h"
37#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
38#include "iom.h" 41#include "iom.h"
39#include "salloc.h" 42#include "salloc.h"
40#include "libptytty.h" 43#include "libptytty.h"
… …
67 70
68#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
69typedef char *XPointer; 72typedef char *XPointer;
70#endif 73#endif
71 74
72#ifdef HAVE_TERMIOS_H
73# include <termios.h> 75#include <termios.h>
74typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
75#else
76# include <sgtty.h>
77typedef struct {
78 struct sgttyb sg;
79 struct tchars tc;
80 struct ltchars lc;
81 int line;
82 int local;
83} ttymode_t;
84#endif
85 77
86#ifdef XPM_BACKGROUND 78#ifdef HAVE_AFTERIMAGE
87# ifdef XPM_INC_X11 79# include <afterimage.h>
88# include <X11/xpm.h> 80#undef min
89# else 81#undef max
90# include <xpm.h>
91# endif
92#endif 82#endif
93 83
94#ifndef STDIN_FILENO 84#ifndef STDIN_FILENO
95# define STDIN_FILENO 0 85# define STDIN_FILENO 0
96# define STDOUT_FILENO 1 86# define STDOUT_FILENO 1
97# define STDERR_FILENO 2 87# define STDERR_FILENO 2
98#endif 88#endif
99 89
100/****************************************************************************/ 90/****************************************************************************/
101
102#ifndef __attribute__
103# if __GNUC__
104# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
105# define __attribute__(x)
106# endif
107# endif
108# define __attribute__(x)
109#endif
110
111#define NORETURN __attribute__ ((noreturn))
112#define UNUSED __attribute__ ((unused))
113
114// increases code size unless -fno-enforce-eh-specs
115#if __GNUC__
116# define NOTHROW
117# define THROW(x)
118#else
119# define NOTHROW throw()
120# define THROW(x) throw x
121#endif
122 91
123// exception thrown on fatal (per-instance) errors 92// exception thrown on fatal (per-instance) errors
124class rxvt_failure_exception { }; 93class rxvt_failure_exception { };
125 94
126// exception thrown when the command parser runs out of input data 95// exception thrown when the command parser runs out of input data
… …
142// misc.C 111// misc.C
143char * rxvt_wcstombs (const wchar_t *str, int len = -1); 112char * rxvt_wcstombs (const wchar_t *str, int len = -1);
144wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 113wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
145char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 114char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
146wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 115wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
147char * rxvt_strdup_cpp (const char *str);
148 116
149#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 117#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
150 118
151char * rxvt_r_basename (const char *str) NOTHROW; 119char * rxvt_r_basename (const char *str) NOTHROW;
152void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 120void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
… …
159const char * rxvt_Str_skip_space (const char *str) NOTHROW; 127const char * rxvt_Str_skip_space (const char *str) NOTHROW;
160char * rxvt_Str_trim (char *str) NOTHROW; 128char * rxvt_Str_trim (char *str) NOTHROW;
161int rxvt_Str_escaped (char *str) NOTHROW; 129int rxvt_Str_escaped (char *str) NOTHROW;
162char ** rxvt_splitcommastring (const char *cs) NOTHROW; 130char ** rxvt_splitcommastring (const char *cs) NOTHROW;
163void rxvt_freecommastring (char **cs) NOTHROW; 131void rxvt_freecommastring (char **cs) NOTHROW;
164char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
165 132
166///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
167 134
168// temporarily replace the process environment 135// temporarily replace the process environment
169extern char **environ; 136extern char **environ;
… …
203# define KEEP_SCROLLCOLOR 1 170# define KEEP_SCROLLCOLOR 1
204#else 171#else
205# undef KEEP_SCROLLCOLOR 172# undef KEEP_SCROLLCOLOR
206#endif 173#endif
207 174
175#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
176# define HAVE_BG_PIXMAP 1/* to simplify further usage */
177struct bgPixmap_t {
208#ifdef XPM_BACKGROUND 178# ifdef XPM_BACKGROUND
209typedef struct { 179
210 short w, h, x, y; 180# ifdef HAVE_AFTERIMAGE
181 ASImage *original_asim;
182# endif
183
184 unsigned int h_scale, v_scale;/* percents of the window size */
185 int h_align, v_align; /* percents of the window size:
186 0 - left align, 50 - center, 100 - right */
187
188 bool handle_geometry (const char *geom);
189
190# endif
191
192# define bgPmap_geometrySet (1UL<<0)
193# define bgPmap_hScale (1UL<<1)
194# define bgPmap_vScale (1UL<<2)
195# define bgPmap_Scale (bgPmap_hScale|bgPmap_vScale)
196# define bgPmap_propScale (1UL<<3)
197# define bgPmap_geometryFlags (bgPmap_geometrySet|bgPmap_Scale|bgPmap_propScale)
198
199# define bgPmap_Transparent (1UL<<16)
200 unsigned long flags;
201
211 Pixmap pixmap; 202 Pixmap pixmap;
212} bgPixmap_t; 203 unsigned int pmap_width, pmap_height;
204 unsigned int pmap_depth;
205
206 bool window_size_sensitive();
207
208};
209#else
210# undef HAVE_BG_PIXMAP
213#endif 211#endif
214 212
215/* 213/*
216 * the 'essential' information for reporting Mouse Events 214 * the 'essential' information for reporting Mouse Events
217 * pared down from XButtonEvent 215 * pared down from XButtonEvent
… …
431// fake styles 429// fake styles
432#define RS_Blink 0x00010000UL // blink 430#define RS_Blink 0x00010000UL // blink
433#define RS_RVid 0x00020000UL // reverse video 431#define RS_RVid 0x00020000UL // reverse video
434#define RS_Uline 0x00040000UL // underline 432#define RS_Uline 0x00040000UL // underline
435 433
434// toggle this to force redraw, must be != RS_Careful
435#define RS_redraw 0x01000000UL
436
436// 5 custom bits for extensions 437// 5 custom bits for extensions
437#define RS_customCount 32 438#define RS_customCount 32
438#define RS_customMask 0x00f80000UL 439#define RS_customMask 0x00f80000UL
439#define RS_customShift 19 440#define RS_customShift 19
440 441
… …
509 Rxvt_restoreFG = 39, // change default fg color 510 Rxvt_restoreFG = 39, // change default fg color
510 Rxvt_restoreBG = 49, // change default bg color 511 Rxvt_restoreBG = 49, // change default bg color
511 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
512 513
513 URxvt_locale = 701, // change locale 514 URxvt_locale = 701, // change locale
515 URxvt_version = 702, // request version
514 516
515 URxvt_Color_IT = 704, // change actual 'Italic' colour 517 URxvt_Color_IT = 704, // change actual 'Italic' colour
516 URxvt_Color_tint = 705, // change actual tint colour 518 URxvt_Color_tint = 705, // change actual tint colour
517 URxvt_Color_BD = 706, 519 URxvt_Color_BD = 706,
518 URxvt_Color_UL = 707, 520 URxvt_Color_UL = 707,
… …
534 * on the unnecessary items, e.g. Color_pointer, but won't bother 536 * on the unnecessary items, e.g. Color_pointer, but won't bother
535 * until we need to. Also, be aware of usage in pixcolor_set 537 * until we need to. Also, be aware of usage in pixcolor_set
536 */ 538 */
537 539
538enum colour_list { 540enum colour_list {
541 Color_none = -2,
542 Color_transparent = -1,
539 Color_fg = 0, 543 Color_fg = 0,
540 Color_bg, 544 Color_bg,
541 minCOLOR, /* 2 */ 545 minCOLOR, /* 2 */
542 Color_Black = minCOLOR, 546 Color_Black = minCOLOR,
543 Color_Red3, 547 Color_Red3,
… …
585#endif 589#endif
586#ifdef KEEP_SCROLLCOLOR 590#ifdef KEEP_SCROLLCOLOR
587 Color_scroll, 591 Color_scroll,
588 Color_trough, 592 Color_trough,
589#endif 593#endif
590#if TINTING 594#if ENABLE_TRANSPARENCY
591 Color_tint, 595 Color_tint,
592#endif 596#endif
593#if OFF_FOCUS_FADING 597#if OFF_FOCUS_FADING
594 Color_fade, 598 Color_fade,
595#endif 599#endif
… …
602 TOTAL_COLORS = NRS_COLORS 606 TOTAL_COLORS = NRS_COLORS
603#endif 607#endif
604}; 608};
605 609
606#define Color_Bits 7 // 0 .. maxTermCOLOR 610#define Color_Bits 7 // 0 .. maxTermCOLOR
607
608#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
609#define NPIXCLR_BITS 32
610 611
611/* 612/*
612 * Resource list 613 * Resource list
613 */ 614 */
614enum { 615enum {
… …
616# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 617# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
617# include "rsinc.h" 618# include "rsinc.h"
618# undef def 619# undef def
619# undef reserve 620# undef reserve
620 NUM_RESOURCES 621 NUM_RESOURCES
621};
622
623// see init.C:xa_names, which must be kept in sync
624enum {
625 XA_TEXT = 0,
626 XA_COMPOUND_TEXT,
627 XA_UTF8_STRING,
628 XA_MULTIPLE,
629 XA_TARGETS,
630 XA_TIMESTAMP,
631 XA_VT_SELECTION,
632 XA_INCR,
633 XA_WM_PROTOCOLS,
634 XA_WM_DELETE_WINDOW,
635 XA_CLIPBOARD,
636#if ENABLE_FRILLS
637 XA_MOTIF_WM_HINTS,
638#endif
639#if ENABLE_EWMH
640 XA_NET_WM_PID,
641 XA_NET_WM_NAME,
642 XA_NET_WM_ICON_NAME,
643 XA_NET_WM_PING,
644#endif
645#if USE_XIM
646 XA_WM_LOCALE_NAME,
647#endif
648#if TRANSPARENT
649 XA_XROOTPMAP_ID,
650 XA_ESETROOT_PMAP_ID,
651#endif
652#if ENABLE_XEMBED
653 XA_XEMBED,
654 XA_XEMBED_INFO,
655#endif
656 NUM_XA
657}; 622};
658 623
659/* DEC private modes */ 624/* DEC private modes */
660#define PrivMode_132 (1UL<<0) 625#define PrivMode_132 (1UL<<0)
661#define PrivMode_132OK (1UL<<1) 626#define PrivMode_132OK (1UL<<1)
… …
734 ***************************************************************************** 699 *****************************************************************************
735 * MACRO DEFINES 700 * MACRO DEFINES
736 ***************************************************************************** 701 *****************************************************************************
737 */ 702 */
738#define dLocal(type,name) type const name = this->name 703#define dLocal(type,name) type const name = this->name
739#define dDisp Display *disp = this->display->display 704
705// for speed reasons, we assume that all codepoints 32 to 126 are
706// single-width.
707#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
740 708
741/* convert pixel dimensions to row/column values. Everything as int32_t */ 709/* convert pixel dimensions to row/column values. Everything as int32_t */
742#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 710#define Pixel2Col(x) Pixel2Width((int32_t)(x))
743#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 711#define Pixel2Row(y) Pixel2Height((int32_t)(y))
744#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 712#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
746#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 714#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
747#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 715#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
748#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 716#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
749#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 717#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
750 718
751#define OPTION(opt) (options & (opt))
752#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
753 | Opt_jumpScroll | Opt_secondaryScreen \
754 | Opt_pastableTabs | Opt_intensityStyles)
755
756// for m >= -n, ensure remainder lies between 0..n-1 719// for m >= -n, ensure remainder lies between 0..n-1
757#define MOD(m,n) (((m) + (n)) % (n)) 720#define MOD(m,n) (((m) + (n)) % (n))
758 721
759#define LINENO(n) MOD (term_start + int(n), total_rows) 722#define LINENO(n) MOD (term_start + int(n), total_rows)
760#define ROW(n) row_buf [LINENO (n)] 723#define ROW(n) row_buf [LINENO (n)]
… …
778#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 741#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
779#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 742#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
780 743
781#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 744#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
782 745
783#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 746#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
784#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 747#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
785 748
786#if ENABLE_STYLES 749#if ENABLE_STYLES
787# define FONTSET(style) fontset[GET_STYLE (style)] 750# define FONTSET(style) fontset[GET_STYLE (style)]
788#else 751#else
789# define FONTSET(style) fontset[0] 752# define FONTSET(style) fontset[0]
… …
817#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 780#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
818#define scrollbar_position(y) ((y) - scrollBar.beg) 781#define scrollbar_position(y) ((y) - scrollBar.beg)
819#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 782#define scrollbar_size() (scrollBar.end - scrollBar.beg \
820 - scrollbar_minheight ()) 783 - scrollbar_minheight ())
821 784
822#ifdef XPM_BACKGROUND
823# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
824#else
825# define XPMClearArea(a, b, c, d, e, f, g)
826#endif
827
828typedef callback1<void, const char *> log_callback; 785typedef callback<void (const char *)> log_callback;
829typedef callback1<int, int> getfd_callback; 786typedef callback<int (int)> getfd_callback;
830 787
831#define SET_LOCALE(locale) rxvt_set_locale (locale) 788#define SET_LOCALE(locale) rxvt_set_locale (locale)
832extern bool rxvt_set_locale (const char *locale) NOTHROW; 789extern bool rxvt_set_locale (const char *locale) NOTHROW;
833extern void rxvt_push_locale (const char *locale) NOTHROW; 790extern void rxvt_push_locale (const char *locale) NOTHROW;
834extern void rxvt_pop_locale () NOTHROW; 791extern void rxvt_pop_locale () NOTHROW;
… …
836/****************************************************************************/ 793/****************************************************************************/
837 794
838#define LINE_LONGER 0x0001 // line is continued on the next row 795#define LINE_LONGER 0x0001 // line is continued on the next row
839#define LINE_FILTERED 0x0002 // line has been filtered 796#define LINE_FILTERED 0x0002 // line has been filtered
840#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 797#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
798#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
799#define LINE_BIDI 0x0010 // line needs bidi (NYI)
841 800
842struct line_t { 801struct line_t {
843 text_t *t; // terminal the text 802 text_t *t; // terminal the text
844 rend_t *r; // rendition, uses RS_ flags 803 rend_t *r; // rendition, uses RS_ flags
845 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 804 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
899# define COMPOSE_LO 0x40000000UL 858# define COMPOSE_LO 0x40000000UL
900# define COMPOSE_HI 0x400fffffUL 859# define COMPOSE_HI 0x400fffffUL
901# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 860# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
902#else 861#else
903# if ENABLE_PERL 862# if ENABLE_PERL
904# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 863# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
905# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 864# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
906# else 865# else
907# define COMPOSE_LO 0xd800UL 866# define COMPOSE_LO 0xd800UL
908# define COMPOSE_HI 0xf8ffUL 867# define COMPOSE_HI 0xf8ffUL
909# endif 868# endif
… …
938#endif 897#endif
939 898
940/****************************************************************************/ 899/****************************************************************************/
941 900
942#ifdef KEYSYM_RESOURCE 901#ifdef KEYSYM_RESOURCE
943 class keyboard_manager; 902class keyboard_manager;
944#endif 903#endif
945 904
946struct rxvt_term : zero_initialized, rxvt_vars { 905struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
906
907 // special markers with magic addresses
908 static const char resval_undef []; // options specifically unset
909 static const char resval_on []; // boolean options switched on
910 static const char resval_off []; // or off
911
947 log_callback *log_hook; // log error messages through this hook, if != 0 912 log_callback *log_hook; // log error messages through this hook, if != 0
948 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 913 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
949#if ENABLE_PERL 914#if ENABLE_PERL
950 rxvt_perl_term perl; 915 rxvt_perl_term perl;
951#endif 916#endif
952 struct mbstate mbstate; // current input multibyte state 917 struct mbstate mbstate; // current input multibyte state
953 918
954 unsigned char want_refresh:1, 919 unsigned char want_refresh:1,
955#ifdef TRANSPARENT 920#ifdef ENABLE_TRANSPARENCY
956 want_full_refresh:1, /* awaiting full screen refresh */ 921 want_full_refresh:1, /* awaiting full screen refresh */
957#endif
958#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
959 am_transparent:1, /* is a transparent term */ 922 am_transparent:1, /* is a transparent term */
960 am_pixmap_trans:1, /* transparency w/known root pixmap */ 923 am_pixmap_trans:1, /* transparency w/known root pixmap */
961#endif 924#endif
962 current_screen:1, /* primary or secondary */ 925 current_screen:1, /* primary or secondary */
963 num_scr_allow:1, 926 num_scr_allow:1,
… …
992 int prev_ncol, /* screen: previous number of columns */ 955 int prev_ncol, /* screen: previous number of columns */
993 prev_nrow; /* screen: previous number of rows */ 956 prev_nrow; /* screen: previous number of rows */
994/* ---------- */ 957/* ---------- */
995 rend_t rstyle; 958 rend_t rstyle;
996/* ---------- */ 959/* ---------- */
997 uint32_t pixcolor_set[NPIXCLR_SETS];
998/* ---------- */
999#ifdef SELECTION_SCROLLING 960#ifdef SELECTION_SCROLLING
1000 int scroll_selection_lines; 961 int scroll_selection_lines;
1001 enum page_dirn scroll_selection_dir; 962 enum page_dirn scroll_selection_dir;
1002 int selection_save_x, 963 int selection_save_x,
1003 selection_save_y, 964 selection_save_y,
… …
1008 /* give proper Scroll behaviour */ 969 /* give proper Scroll behaviour */
1009#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 970#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1010 mouse_slip_wheel_speed, 971 mouse_slip_wheel_speed,
1011#endif 972#endif
1012 refresh_count, 973 refresh_count,
1013 refresh_limit,
1014 last_bot, /* scrollbar last bottom position */ 974 last_bot, /* scrollbar last bottom position */
1015 last_top, /* scrollbar last top position */ 975 last_top, /* scrollbar last top position */
1016 last_state, /* scrollbar last state */ 976 last_state, /* scrollbar last state */
1017 scrollbar_len, 977 scrollbar_len,
1018 window_vt_x, 978 window_vt_x,
… …
1029 int old_width, /* last used width in screen resize */ 989 int old_width, /* last used width in screen resize */
1030 old_height; /* last used height in screen resize */ 990 old_height; /* last used height in screen resize */
1031 unsigned long priv_modes, 991 unsigned long priv_modes,
1032 SavedModes; 992 SavedModes;
1033/* ---------- */ 993/* ---------- */
1034 Atom xa[NUM_XA]; 994 Atom *xa;
1035/* ---------- */ 995/* ---------- */
1036#ifdef RXVT_SCROLLBAR 996#ifdef RXVT_SCROLLBAR
1037 GC scrollbarGC, 997 GC scrollbarGC,
1038 topShadowGC, 998 topShadowGC,
1039 botShadowGC; 999 botShadowGC;
… …
1074#endif 1034#endif
1075 struct mouse_event MEvent; 1035 struct mouse_event MEvent;
1076 XComposeStatus compose; 1036 XComposeStatus compose;
1077 ttymode_t tio; 1037 ttymode_t tio;
1078 row_col_t oldcursor; 1038 row_col_t oldcursor;
1079#ifdef XPM_BACKGROUND 1039#ifdef HAVE_BG_PIXMAP
1080 bgPixmap_t bgPixmap; 1040 bgPixmap_t bgPixmap;
1081 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1041#endif
1042#ifdef HAVE_AFTERIMAGE
1043 ASVisual *asv;
1044 ASImageManager *asimman;
1082#endif 1045#endif
1083 1046
1084#if ENABLE_OVERLAY 1047#if ENABLE_OVERLAY
1085 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1048 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1086 text_t **ov_text; 1049 text_t **ov_text;
… …
1096 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1059 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1097#endif 1060#endif
1098 1061
1099 vector<void *> allocated; // free these memory blocks with free() 1062 vector<void *> allocated; // free these memory blocks with free()
1100 1063
1101 char *env_windowid; /* environmental variable WINDOWID */ 1064 char env_windowid[21]; /* environmental variable WINDOWID */
1065 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1102 char *env_display; /* environmental variable DISPLAY */ 1066 char *env_display; /* environmental variable DISPLAY */
1103 char *env_term; /* environmental variable TERM */ 1067 char *env_term; /* environmental variable TERM */
1104 char *env_colorfgbg; 1068
1105 char *locale; 1069 char *locale;
1106 char charsets[4]; 1070 char charsets[4];
1107 char *v_buffer; /* pointer to physical buffer */ 1071 char *v_buffer; /* pointer to physical buffer */
1108 unsigned int v_buflen; /* size of area to write */ 1072 unsigned int v_buflen; /* size of area to write */
1109 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1073 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1110 1074
1111#ifdef KEYSYM_RESOURCE 1075#ifdef KEYSYM_RESOURCE
1112 keyboard_manager *keyboard; 1076 keyboard_manager *keyboard;
1113#endif 1077#endif
1114 1078
… …
1140 1104
1141 long vt_emask, vt_emask_perl, vt_emask_xim; 1105 long vt_emask, vt_emask_perl, vt_emask_xim;
1142 1106
1143 void vt_select_input () const NOTHROW 1107 void vt_select_input () const NOTHROW
1144 { 1108 {
1145 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1109 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1146 } 1110 }
1147 1111
1148#if TRANSPARENT 1112#if ENABLE_TRANSPARENCY || ENABLE_PERL
1149 void rootwin_cb (XEvent &xev); 1113 void rootwin_cb (XEvent &xev);
1150 xevent_watcher rootwin_ev; 1114 xevent_watcher rootwin_ev;
1115#endif
1116#if ENABLE_TRANSPARENCY
1117 int check_our_parents ();
1118 void check_our_parents_cb (time_watcher &w);
1119 time_watcher check_our_parents_ev;
1151#endif 1120#endif
1152 1121
1153 void x_cb (XEvent &xev); 1122 void x_cb (XEvent &xev);
1154 void flush (); 1123 void flush ();
1155 xevent_watcher termwin_ev; 1124 xevent_watcher termwin_ev;
… …
1215 bool pty_fill (); 1184 bool pty_fill ();
1216 1185
1217 void make_current () const // make this the "currently active" urxvt instance 1186 void make_current () const // make this the "currently active" urxvt instance
1218 { 1187 {
1219 SET_R (this); 1188 SET_R (this);
1189 set_environ (envv);
1220 rxvt_set_locale (locale); 1190 rxvt_set_locale (locale);
1221 set_environ (envv);
1222 } 1191 }
1223 1192
1224 void init_secondary (); 1193 void init_secondary ();
1225 const char **init_resources (int argc, const char *const *argv); 1194 const char **init_resources (int argc, const char *const *argv);
1226 const char *x_resource (const char *name); 1195 const char *x_resource (const char *name);
… …
1251 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1220 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1252 1221
1253 bool IMisRunning (); 1222 bool IMisRunning ();
1254 void IMSendSpot (); 1223 void IMSendSpot ();
1255 bool IM_get_IC (const char *modifiers); 1224 bool IM_get_IC (const char *modifiers);
1256 void IMSetStatusPosition (); 1225 void IMSetPosition ();
1257#endif 1226#endif
1258 1227
1259 void resize_scrollbar (); 1228 void resize_scrollbar ();
1260 1229
1261 // command.C 1230 // command.C
1262 void lookup_key (XKeyEvent &ev); 1231 void key_press (XKeyEvent &ev);
1232 void key_release (XKeyEvent &ev);
1263 unsigned int cmd_write (const char *str, unsigned int count); 1233 unsigned int cmd_write (const char *str, unsigned int count);
1264 1234
1265 wchar_t next_char () NOTHROW; 1235 wchar_t next_char () NOTHROW;
1266 wchar_t cmd_getc () THROW ((class out_of_input)); 1236 wchar_t cmd_getc () THROW ((class out_of_input));
1267 uint32_t next_octet () NOTHROW; 1237 uint32_t next_octet () NOTHROW;
… …
1271 void mouse_report (XButtonEvent &ev); 1241 void mouse_report (XButtonEvent &ev);
1272 void button_press (XButtonEvent &ev); 1242 void button_press (XButtonEvent &ev);
1273 void button_release (XButtonEvent &ev); 1243 void button_release (XButtonEvent &ev);
1274 void focus_in (); 1244 void focus_in ();
1275 void focus_out (); 1245 void focus_out ();
1276 int check_our_parents (); 1246 void update_fade_color (unsigned int idx);
1277#ifdef PRINTPIPE 1247#ifdef PRINTPIPE
1278 FILE *popen_printer (); 1248 FILE *popen_printer ();
1279 int pclose_printer (FILE *stream); 1249 int pclose_printer (FILE *stream);
1280#endif 1250#endif
1281 void process_print_pipe (); 1251 void process_print_pipe ();
… …
1302 void set_utf8_property (Atom prop, const char *str, int len = -1); 1272 void set_utf8_property (Atom prop, const char *str, int len = -1);
1303 void set_title (const char *str); 1273 void set_title (const char *str);
1304 void set_icon_name (const char *str); 1274 void set_icon_name (const char *str);
1305 void set_window_color (int idx, const char *color); 1275 void set_window_color (int idx, const char *color);
1306 void set_colorfgbg (); 1276 void set_colorfgbg ();
1307 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1277 bool set_color (rxvt_color &color, const char *name);
1278 void alias_color (int dst, int src);
1308 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1279 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1309 1280
1310 // screen.C 1281 // screen.C
1311 1282
1312 void lalloc (line_t &l) const 1283 void lalloc (line_t &l) const
… …
1341 { 1312 {
1342 int base = GET_BASEFG (r); 1313 int base = GET_BASEFG (r);
1343#ifndef NO_BRIGHTCOLOR 1314#ifndef NO_BRIGHTCOLOR
1344 if (r & RS_Bold 1315 if (r & RS_Bold
1345# if ENABLE_STYLES 1316# if ENABLE_STYLES
1346 && OPTION (Opt_intensityStyles) 1317 && option (Opt_intensityStyles)
1347# endif 1318# endif
1348 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1349 base += minBrightCOLOR - minCOLOR; 1320 base += minBrightCOLOR - minCOLOR;
1350#endif 1321#endif
1351 return base; 1322 return base;
… …
1355 { 1326 {
1356 int base = GET_BASEBG (r); 1327 int base = GET_BASEBG (r);
1357#ifndef NO_BRIGHTCOLOR 1328#ifndef NO_BRIGHTCOLOR
1358 if (r & RS_Blink 1329 if (r & RS_Blink
1359# if ENABLE_STYLES 1330# if ENABLE_STYLES
1360 && OPTION (Opt_intensityStyles) 1331 && option (Opt_intensityStyles)
1361# endif 1332# endif
1362 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1333 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1363 base += minBrightCOLOR - minCOLOR; 1334 base += minBrightCOLOR - minCOLOR;
1364#endif 1335#endif
1365 return base; 1336 return base;
1366 } 1337 }
1367 1338
1368 bool option (uint32_t opt) const NOTHROW 1339 bool option (uint8_t opt) const NOTHROW
1369 { 1340 {
1370 return OPTION (opt); 1341 return options[opt >> 3] & (1 << (opt & 7));
1371 } 1342 }
1372 1343
1373 void set_option (uint32_t opt, bool set) NOTHROW 1344 void set_option (uint8_t opt, bool set = true) NOTHROW
1374 { 1345 {
1375 if (set) 1346 if (set)
1376 options |= opt; 1347 options[opt >> 3] |= (1 << (opt & 7));
1377 else 1348 else
1378 options &= ~opt; 1349 options[opt >> 3] &= ~(1 << (opt & 7));
1379 } 1350 }
1380 1351
1381 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1352 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1382 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1353 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1383 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1354 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1489 void get_options (int argc, const char *const *argv); 1460 void get_options (int argc, const char *const *argv);
1490 int parse_keysym (const char *str, const char *arg); 1461 int parse_keysym (const char *str, const char *arg);
1491 void get_xdefaults (FILE *stream, const char *name); 1462 void get_xdefaults (FILE *stream, const char *name);
1492 void extract_resources (); 1463 void extract_resources ();
1493 // xpm.C 1464 // xpm.C
1494 int scale_pixmap (const char *geom); 1465//int scale_pixmap (const char *geom);
1495 void resize_pixmap (); 1466 void resize_pixmap ();
1496 Pixmap set_bgPixmap (const char *file); 1467 void set_bgPixmap (const char *file);
1497}; 1468};
1498 1469
1499/* 1470/*
1500 ***************************************************************************** 1471 *****************************************************************************
1501 * PROTOTYPES 1472 * PROTOTYPES

Diff Legend

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