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.236 by root, Sun Jan 22 17:10:01 2006 UTC vs.
Revision 1.285 by sasha, Sat Aug 4 07:05:31 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#define bgPmap_defaultScale 100
185#define bgPmap_defaultAlign 50
186 unsigned int h_scale, v_scale;/* percents of the window size */
187 int h_align, v_align; /* percents of the window size:
188 0 - left align, 50 - center, 100 - right */
189
190 bool handle_geometry (const char *geom);
191
192# endif
193
194# define bgPmap_geometrySet (1UL<<0)
195# define bgPmap_propScale (1UL<<1)
196# define bgPmap_geometryFlags (bgPmap_geometrySet|bgPmap_propScale)
197
198# define bgPmap_Transparent (1UL<<16)
199 unsigned long flags;
200
211 Pixmap pixmap; 201 Pixmap pixmap;
212} bgPixmap_t; 202 unsigned int pmap_width, pmap_height;
203 unsigned int pmap_depth;
204
205 bool window_size_sensitive();
206
207};
208#else
209# undef HAVE_BG_PIXMAP
213#endif 210#endif
214 211
215/* 212/*
216 * the 'essential' information for reporting Mouse Events 213 * the 'essential' information for reporting Mouse Events
217 * pared down from XButtonEvent 214 * pared down from XButtonEvent
… …
431// fake styles 428// fake styles
432#define RS_Blink 0x00010000UL // blink 429#define RS_Blink 0x00010000UL // blink
433#define RS_RVid 0x00020000UL // reverse video 430#define RS_RVid 0x00020000UL // reverse video
434#define RS_Uline 0x00040000UL // underline 431#define RS_Uline 0x00040000UL // underline
435 432
433// toggle this to force redraw, must be != RS_Careful
434#define RS_redraw 0x01000000UL
435
436// 5 custom bits for extensions 436// 5 custom bits for extensions
437#define RS_customCount 32 437#define RS_customCount 32
438#define RS_customMask 0x00f80000UL 438#define RS_customMask 0x00f80000UL
439#define RS_customShift 19 439#define RS_customShift 19
440 440
… …
509 Rxvt_restoreFG = 39, // change default fg color 509 Rxvt_restoreFG = 39, // change default fg color
510 Rxvt_restoreBG = 49, // change default bg color 510 Rxvt_restoreBG = 49, // change default bg color
511 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 511 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
512 512
513 URxvt_locale = 701, // change locale 513 URxvt_locale = 701, // change locale
514 URxvt_version = 702, // request version
514 515
515 URxvt_Color_IT = 704, // change actual 'Italic' colour 516 URxvt_Color_IT = 704, // change actual 'Italic' colour
516 URxvt_Color_tint = 705, // change actual tint colour 517 URxvt_Color_tint = 705, // change actual tint colour
517 URxvt_Color_BD = 706, 518 URxvt_Color_BD = 706,
518 URxvt_Color_UL = 707, 519 URxvt_Color_UL = 707,
… …
534 * on the unnecessary items, e.g. Color_pointer, but won't bother 535 * 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 536 * until we need to. Also, be aware of usage in pixcolor_set
536 */ 537 */
537 538
538enum colour_list { 539enum colour_list {
540 Color_none = -2,
541 Color_transparent = -1,
539 Color_fg = 0, 542 Color_fg = 0,
540 Color_bg, 543 Color_bg,
541 minCOLOR, /* 2 */ 544 minCOLOR, /* 2 */
542 Color_Black = minCOLOR, 545 Color_Black = minCOLOR,
543 Color_Red3, 546 Color_Red3,
… …
585#endif 588#endif
586#ifdef KEEP_SCROLLCOLOR 589#ifdef KEEP_SCROLLCOLOR
587 Color_scroll, 590 Color_scroll,
588 Color_trough, 591 Color_trough,
589#endif 592#endif
590#if TINTING 593#if ENABLE_TRANSPARENCY
591 Color_tint, 594 Color_tint,
592#endif 595#endif
593#if OFF_FOCUS_FADING 596#if OFF_FOCUS_FADING
594 Color_fade, 597 Color_fade,
595#endif 598#endif
… …
602 TOTAL_COLORS = NRS_COLORS 605 TOTAL_COLORS = NRS_COLORS
603#endif 606#endif
604}; 607};
605 608
606#define Color_Bits 7 // 0 .. maxTermCOLOR 609#define Color_Bits 7 // 0 .. maxTermCOLOR
607
608#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
609#define NPIXCLR_BITS 32
610 610
611/* 611/*
612 * Resource list 612 * Resource list
613 */ 613 */
614enum { 614enum {
… …
616# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 616# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
617# include "rsinc.h" 617# include "rsinc.h"
618# undef def 618# undef def
619# undef reserve 619# undef reserve
620 NUM_RESOURCES 620 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}; 621};
658 622
659/* DEC private modes */ 623/* DEC private modes */
660#define PrivMode_132 (1UL<<0) 624#define PrivMode_132 (1UL<<0)
661#define PrivMode_132OK (1UL<<1) 625#define PrivMode_132OK (1UL<<1)
… …
734 ***************************************************************************** 698 *****************************************************************************
735 * MACRO DEFINES 699 * MACRO DEFINES
736 ***************************************************************************** 700 *****************************************************************************
737 */ 701 */
738#define dLocal(type,name) type const name = this->name 702#define dLocal(type,name) type const name = this->name
739#define dDisp Display *disp = this->display->display 703
704// for speed reasons, we assume that all codepoints 32 to 126 are
705// single-width.
706#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
740 707
741/* convert pixel dimensions to row/column values. Everything as int32_t */ 708/* convert pixel dimensions to row/column values. Everything as int32_t */
742#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 709#define Pixel2Col(x) Pixel2Width((int32_t)(x))
743#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 710#define Pixel2Row(y) Pixel2Height((int32_t)(y))
744#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 711#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
746#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 713#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
747#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 714#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
748#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 715#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
749#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 716#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
750 717
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 718// for m >= -n, ensure remainder lies between 0..n-1
757#define MOD(m,n) (((m) + (n)) % (n)) 719#define MOD(m,n) (((m) + (n)) % (n))
758 720
759#define LINENO(n) MOD (term_start + int(n), total_rows) 721#define LINENO(n) MOD (term_start + int(n), total_rows)
760#define ROW(n) row_buf [LINENO (n)] 722#define ROW(n) row_buf [LINENO (n)]
… …
778#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 740#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
779#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 741#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
780 742
781#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 743#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
782 744
783#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 745#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
784#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 746#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
785 747
786#if ENABLE_STYLES 748#if ENABLE_STYLES
787# define FONTSET(style) fontset[GET_STYLE (style)] 749# define FONTSET(style) fontset[GET_STYLE (style)]
788#else 750#else
789# define FONTSET(style) fontset[0] 751# define FONTSET(style) fontset[0]
… …
817#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 779#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
818#define scrollbar_position(y) ((y) - scrollBar.beg) 780#define scrollbar_position(y) ((y) - scrollBar.beg)
819#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 781#define scrollbar_size() (scrollBar.end - scrollBar.beg \
820 - scrollbar_minheight ()) 782 - scrollbar_minheight ())
821 783
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
828#ifdef DEBUG_CMD
829# define D_CMD(x) fprintf x ; fputc('\n', stderr)
830#else
831# define D_CMD(x)
832#endif
833#ifdef DEBUG_INIT
834# define D_INIT(x) fprintf x ; fputc('\n', stderr)
835#else
836# define D_INIT(x)
837#endif
838#ifdef DEBUG_MAIN
839# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
840#else
841# define D_MAIN(x)
842#endif
843#ifdef DEBUG_SIZE
844# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
845#else
846# define D_SIZE(x)
847#endif
848
849typedef callback1<void, const char *> log_callback; 784typedef callback<void (const char *)> log_callback;
850typedef callback1<int, int> getfd_callback; 785typedef callback<int (int)> getfd_callback;
851 786
852#define SET_LOCALE(locale) rxvt_set_locale (locale) 787#define SET_LOCALE(locale) rxvt_set_locale (locale)
853extern bool rxvt_set_locale (const char *locale) NOTHROW; 788extern bool rxvt_set_locale (const char *locale) NOTHROW;
854extern void rxvt_push_locale (const char *locale) NOTHROW; 789extern void rxvt_push_locale (const char *locale) NOTHROW;
855extern void rxvt_pop_locale () NOTHROW; 790extern void rxvt_pop_locale () NOTHROW;
… …
857/****************************************************************************/ 792/****************************************************************************/
858 793
859#define LINE_LONGER 0x0001 // line is continued on the next row 794#define LINE_LONGER 0x0001 // line is continued on the next row
860#define LINE_FILTERED 0x0002 // line has been filtered 795#define LINE_FILTERED 0x0002 // line has been filtered
861#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 796#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
797#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
798#define LINE_BIDI 0x0010 // line needs bidi (NYI)
862 799
863struct line_t { 800struct line_t {
864 text_t *t; // terminal the text 801 text_t *t; // terminal the text
865 rend_t *r; // rendition, uses RS_ flags 802 rend_t *r; // rendition, uses RS_ flags
866 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 803 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
920# define COMPOSE_LO 0x40000000UL 857# define COMPOSE_LO 0x40000000UL
921# define COMPOSE_HI 0x400fffffUL 858# define COMPOSE_HI 0x400fffffUL
922# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 859# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
923#else 860#else
924# if ENABLE_PERL 861# if ENABLE_PERL
925# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 862# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
926# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 863# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
927# else 864# else
928# define COMPOSE_LO 0xd800UL 865# define COMPOSE_LO 0xd800UL
929# define COMPOSE_HI 0xf8ffUL 866# define COMPOSE_HI 0xf8ffUL
930# endif 867# endif
… …
959#endif 896#endif
960 897
961/****************************************************************************/ 898/****************************************************************************/
962 899
963#ifdef KEYSYM_RESOURCE 900#ifdef KEYSYM_RESOURCE
964 class keyboard_manager; 901class keyboard_manager;
965#endif 902#endif
966 903
967struct rxvt_term : zero_initialized, rxvt_vars { 904struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
905
906 // special markers with magic addresses
907 static const char resval_undef []; // options specifically unset
908 static const char resval_on []; // boolean options switched on
909 static const char resval_off []; // or off
910
968 log_callback *log_hook; // log error messages through this hook, if != 0 911 log_callback *log_hook; // log error messages through this hook, if != 0
969 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 912 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
970#if ENABLE_PERL 913#if ENABLE_PERL
971 rxvt_perl_term perl; 914 rxvt_perl_term perl;
972#endif 915#endif
973 struct mbstate mbstate; // current input multibyte state 916 struct mbstate mbstate; // current input multibyte state
974 917
975 unsigned char want_refresh:1, 918 unsigned char want_refresh:1,
976#ifdef TRANSPARENT 919#ifdef ENABLE_TRANSPARENCY
977 want_full_refresh:1, /* awaiting full screen refresh */ 920 want_full_refresh:1, /* awaiting full screen refresh */
978#endif
979#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
980 am_transparent:1, /* is a transparent term */ 921 am_transparent:1, /* is a transparent term */
981 am_pixmap_trans:1, /* transparency w/known root pixmap */ 922 am_pixmap_trans:1, /* transparency w/known root pixmap */
982#endif 923#endif
983 current_screen:1, /* primary or secondary */ 924 current_screen:1, /* primary or secondary */
984 num_scr_allow:1, 925 num_scr_allow:1,
… …
1013 int prev_ncol, /* screen: previous number of columns */ 954 int prev_ncol, /* screen: previous number of columns */
1014 prev_nrow; /* screen: previous number of rows */ 955 prev_nrow; /* screen: previous number of rows */
1015/* ---------- */ 956/* ---------- */
1016 rend_t rstyle; 957 rend_t rstyle;
1017/* ---------- */ 958/* ---------- */
1018 uint32_t pixcolor_set[NPIXCLR_SETS];
1019/* ---------- */
1020#ifdef SELECTION_SCROLLING 959#ifdef SELECTION_SCROLLING
1021 int scroll_selection_lines; 960 int scroll_selection_lines;
1022 enum page_dirn scroll_selection_dir; 961 enum page_dirn scroll_selection_dir;
1023 int selection_save_x, 962 int selection_save_x,
1024 selection_save_y, 963 selection_save_y,
… …
1029 /* give proper Scroll behaviour */ 968 /* give proper Scroll behaviour */
1030#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 969#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1031 mouse_slip_wheel_speed, 970 mouse_slip_wheel_speed,
1032#endif 971#endif
1033 refresh_count, 972 refresh_count,
1034 refresh_limit,
1035 last_bot, /* scrollbar last bottom position */ 973 last_bot, /* scrollbar last bottom position */
1036 last_top, /* scrollbar last top position */ 974 last_top, /* scrollbar last top position */
1037 last_state, /* scrollbar last state */ 975 last_state, /* scrollbar last state */
1038 scrollbar_len, 976 scrollbar_len,
1039 window_vt_x, 977 window_vt_x,
… …
1050 int old_width, /* last used width in screen resize */ 988 int old_width, /* last used width in screen resize */
1051 old_height; /* last used height in screen resize */ 989 old_height; /* last used height in screen resize */
1052 unsigned long priv_modes, 990 unsigned long priv_modes,
1053 SavedModes; 991 SavedModes;
1054/* ---------- */ 992/* ---------- */
1055 Atom xa[NUM_XA]; 993 Atom *xa;
1056/* ---------- */ 994/* ---------- */
1057#ifdef RXVT_SCROLLBAR 995#ifdef RXVT_SCROLLBAR
1058 GC scrollbarGC, 996 GC scrollbarGC,
1059 topShadowGC, 997 topShadowGC,
1060 botShadowGC; 998 botShadowGC;
… …
1095#endif 1033#endif
1096 struct mouse_event MEvent; 1034 struct mouse_event MEvent;
1097 XComposeStatus compose; 1035 XComposeStatus compose;
1098 ttymode_t tio; 1036 ttymode_t tio;
1099 row_col_t oldcursor; 1037 row_col_t oldcursor;
1100#ifdef XPM_BACKGROUND 1038#ifdef HAVE_BG_PIXMAP
1101 bgPixmap_t bgPixmap; 1039 bgPixmap_t bgPixmap;
1102 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1040#endif
1041#ifdef HAVE_AFTERIMAGE
1042 ASVisual *asv;
1043 ASImageManager *asimman;
1103#endif 1044#endif
1104 1045
1105#if ENABLE_OVERLAY 1046#if ENABLE_OVERLAY
1106 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1047 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1107 text_t **ov_text; 1048 text_t **ov_text;
… …
1117 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1058 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1118#endif 1059#endif
1119 1060
1120 vector<void *> allocated; // free these memory blocks with free() 1061 vector<void *> allocated; // free these memory blocks with free()
1121 1062
1122 char *env_windowid; /* environmental variable WINDOWID */ 1063 char env_windowid[21]; /* environmental variable WINDOWID */
1064 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1123 char *env_display; /* environmental variable DISPLAY */ 1065 char *env_display; /* environmental variable DISPLAY */
1124 char *env_term; /* environmental variable TERM */ 1066 char *env_term; /* environmental variable TERM */
1125 char *env_colorfgbg; 1067
1126 char *locale; 1068 char *locale;
1127 char charsets[4]; 1069 char charsets[4];
1128 char *v_buffer; /* pointer to physical buffer */ 1070 char *v_buffer; /* pointer to physical buffer */
1129 unsigned int v_buflen; /* size of area to write */ 1071 unsigned int v_buflen; /* size of area to write */
1130 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1072 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1131 1073
1132#ifdef KEYSYM_RESOURCE 1074#ifdef KEYSYM_RESOURCE
1133 keyboard_manager *keyboard; 1075 keyboard_manager *keyboard;
1134#endif 1076#endif
1135 1077
… …
1157#endif 1099#endif
1158 1100
1159 // modifies first argument(!) 1101 // modifies first argument(!)
1160 void paste (char *data, unsigned int len) NOTHROW; 1102 void paste (char *data, unsigned int len) NOTHROW;
1161 1103
1162 long vt_emask, vt_emask_perl; 1104 long vt_emask, vt_emask_perl, vt_emask_xim;
1163 1105
1164 void vt_select_input () const NOTHROW 1106 void vt_select_input () const NOTHROW
1165 { 1107 {
1166 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1108 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1167 } 1109 }
1168 1110
1169#if TRANSPARENT 1111#if ENABLE_TRANSPARENCY || ENABLE_PERL
1170 void rootwin_cb (XEvent &xev); 1112 void rootwin_cb (XEvent &xev);
1171 xevent_watcher rootwin_ev; 1113 xevent_watcher rootwin_ev;
1114#endif
1115#if ENABLE_TRANSPARENCY
1116 int check_our_parents ();
1117 void check_our_parents_cb (time_watcher &w);
1118 time_watcher check_our_parents_ev;
1172#endif 1119#endif
1173 1120
1174 void x_cb (XEvent &xev); 1121 void x_cb (XEvent &xev);
1175 void flush (); 1122 void flush ();
1176 xevent_watcher termwin_ev; 1123 xevent_watcher termwin_ev;
… …
1236 bool pty_fill (); 1183 bool pty_fill ();
1237 1184
1238 void make_current () const // make this the "currently active" urxvt instance 1185 void make_current () const // make this the "currently active" urxvt instance
1239 { 1186 {
1240 SET_R (this); 1187 SET_R (this);
1188 set_environ (envv);
1241 rxvt_set_locale (locale); 1189 rxvt_set_locale (locale);
1242 set_environ (envv);
1243 } 1190 }
1244 1191
1245 void init_secondary (); 1192 void init_secondary ();
1246 const char **init_resources (int argc, const char *const *argv); 1193 const char **init_resources (int argc, const char *const *argv);
1247 const char *x_resource (const char *name); 1194 const char *x_resource (const char *name);
… …
1272 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1219 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1273 1220
1274 bool IMisRunning (); 1221 bool IMisRunning ();
1275 void IMSendSpot (); 1222 void IMSendSpot ();
1276 bool IM_get_IC (const char *modifiers); 1223 bool IM_get_IC (const char *modifiers);
1277 void IMSetStatusPosition (); 1224 void IMSetPosition ();
1278#endif 1225#endif
1279 1226
1280 void resize_scrollbar (); 1227 void resize_scrollbar ();
1281 1228
1282 // command.C 1229 // command.C
1283 void lookup_key (XKeyEvent &ev); 1230 void key_press (XKeyEvent &ev);
1231 void key_release (XKeyEvent &ev);
1284 unsigned int cmd_write (const char *str, unsigned int count); 1232 unsigned int cmd_write (const char *str, unsigned int count);
1285 1233
1286 wchar_t next_char () NOTHROW; 1234 wchar_t next_char () NOTHROW;
1287 wchar_t cmd_getc () THROW ((class out_of_input)); 1235 wchar_t cmd_getc () THROW ((class out_of_input));
1288 uint32_t next_octet () NOTHROW; 1236 uint32_t next_octet () NOTHROW;
… …
1292 void mouse_report (XButtonEvent &ev); 1240 void mouse_report (XButtonEvent &ev);
1293 void button_press (XButtonEvent &ev); 1241 void button_press (XButtonEvent &ev);
1294 void button_release (XButtonEvent &ev); 1242 void button_release (XButtonEvent &ev);
1295 void focus_in (); 1243 void focus_in ();
1296 void focus_out (); 1244 void focus_out ();
1297 int check_our_parents (); 1245 void update_fade_color (unsigned int idx);
1298#ifdef PRINTPIPE 1246#ifdef PRINTPIPE
1299 FILE *popen_printer (); 1247 FILE *popen_printer ();
1300 int pclose_printer (FILE *stream); 1248 int pclose_printer (FILE *stream);
1301#endif 1249#endif
1302 void process_print_pipe (); 1250 void process_print_pipe ();
… …
1323 void set_utf8_property (Atom prop, const char *str, int len = -1); 1271 void set_utf8_property (Atom prop, const char *str, int len = -1);
1324 void set_title (const char *str); 1272 void set_title (const char *str);
1325 void set_icon_name (const char *str); 1273 void set_icon_name (const char *str);
1326 void set_window_color (int idx, const char *color); 1274 void set_window_color (int idx, const char *color);
1327 void set_colorfgbg (); 1275 void set_colorfgbg ();
1328 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1276 bool set_color (rxvt_color &color, const char *name);
1277 void alias_color (int dst, int src);
1329 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1278 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1330 1279
1331 // screen.C 1280 // screen.C
1332 1281
1333 void lalloc (line_t &l) const NOTHROW 1282 void lalloc (line_t &l) const
1334 { 1283 {
1335 l.t = (text_t *)talloc->alloc (); 1284 l.t = (text_t *)talloc->alloc ();
1336 l.r = (rend_t *)ralloc->alloc (); 1285 l.r = (rend_t *)ralloc->alloc ();
1337 } 1286 }
1338 1287
… …
1342 talloc->free (l.t); 1291 talloc->free (l.t);
1343 ralloc->free (l.r); 1292 ralloc->free (l.r);
1344 } 1293 }
1345#endif 1294#endif
1346 1295
1347 void lresize (line_t &l) const NOTHROW 1296 void lresize (line_t &l) const
1348 { 1297 {
1349 if (!l.t) 1298 if (!l.t)
1350 return; 1299 return;
1351 1300
1352 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1301 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1362 { 1311 {
1363 int base = GET_BASEFG (r); 1312 int base = GET_BASEFG (r);
1364#ifndef NO_BRIGHTCOLOR 1313#ifndef NO_BRIGHTCOLOR
1365 if (r & RS_Bold 1314 if (r & RS_Bold
1366# if ENABLE_STYLES 1315# if ENABLE_STYLES
1367 && OPTION (Opt_intensityStyles) 1316 && option (Opt_intensityStyles)
1368# endif 1317# endif
1369 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1318 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1370 base += minBrightCOLOR - minCOLOR; 1319 base += minBrightCOLOR - minCOLOR;
1371#endif 1320#endif
1372 return base; 1321 return base;
… …
1376 { 1325 {
1377 int base = GET_BASEBG (r); 1326 int base = GET_BASEBG (r);
1378#ifndef NO_BRIGHTCOLOR 1327#ifndef NO_BRIGHTCOLOR
1379 if (r & RS_Blink 1328 if (r & RS_Blink
1380# if ENABLE_STYLES 1329# if ENABLE_STYLES
1381 && OPTION (Opt_intensityStyles) 1330 && option (Opt_intensityStyles)
1382# endif 1331# endif
1383 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1332 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1384 base += minBrightCOLOR - minCOLOR; 1333 base += minBrightCOLOR - minCOLOR;
1385#endif 1334#endif
1386 return base; 1335 return base;
1387 } 1336 }
1388 1337
1389 bool option (uint32_t opt) const NOTHROW 1338 bool option (uint8_t opt) const NOTHROW
1390 { 1339 {
1391 return OPTION (opt); 1340 return options[opt >> 3] & (1 << (opt & 7));
1392 } 1341 }
1393 1342
1394 void set_option (uint32_t opt, bool set) NOTHROW 1343 void set_option (uint8_t opt, bool set = true) NOTHROW
1395 { 1344 {
1396 if (set) 1345 if (set)
1397 options |= opt; 1346 options[opt >> 3] |= (1 << (opt & 7));
1398 else 1347 else
1399 options &= ~opt; 1348 options[opt >> 3] &= ~(1 << (opt & 7));
1400 } 1349 }
1401 1350
1402 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1351 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1403 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1352 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1404 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1353 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1420 void scr_remap_chars () NOTHROW; 1369 void scr_remap_chars () NOTHROW;
1421 void scr_remap_chars (line_t &l) NOTHROW; 1370 void scr_remap_chars (line_t &l) NOTHROW;
1422 1371
1423 enum cursor_mode { SAVE, RESTORE }; 1372 enum cursor_mode { SAVE, RESTORE };
1424 1373
1425 void scr_poweron () NOTHROW; 1374 void scr_poweron ();
1426 void scr_cursor (cursor_mode mode) NOTHROW; 1375 void scr_cursor (cursor_mode mode) NOTHROW;
1427 void scr_do_wrap () NOTHROW; 1376 void scr_do_wrap () NOTHROW;
1377 void scr_swap_screen () NOTHROW;
1428 int scr_change_screen (int scrn) NOTHROW; 1378 void scr_change_screen (int scrn);
1429 void scr_color (unsigned int color, int fgbg) NOTHROW; 1379 void scr_color (unsigned int color, int fgbg) NOTHROW;
1430 void scr_rendition (int set, int style) NOTHROW; 1380 void scr_rendition (int set, int style) NOTHROW;
1431 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1381 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1432 void scr_backspace () NOTHROW; 1382 void scr_backspace () NOTHROW;
1433 void scr_tab (int count, bool ht = false) NOTHROW; 1383 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1509 void get_options (int argc, const char *const *argv); 1459 void get_options (int argc, const char *const *argv);
1510 int parse_keysym (const char *str, const char *arg); 1460 int parse_keysym (const char *str, const char *arg);
1511 void get_xdefaults (FILE *stream, const char *name); 1461 void get_xdefaults (FILE *stream, const char *name);
1512 void extract_resources (); 1462 void extract_resources ();
1513 // xpm.C 1463 // xpm.C
1514 int scale_pixmap (const char *geom); 1464//int scale_pixmap (const char *geom);
1515 void resize_pixmap (); 1465 void resize_pixmap ();
1516 Pixmap set_bgPixmap (const char *file); 1466 void set_bgPixmap (const char *file);
1517}; 1467};
1518 1468
1519/* 1469/*
1520 ***************************************************************************** 1470 *****************************************************************************
1521 * PROTOTYPES 1471 * PROTOTYPES
… …
1525# define __PROTO(p) p 1475# define __PROTO(p) p
1526#else 1476#else
1527# define __PROTO(p) () 1477# define __PROTO(p) ()
1528#endif 1478#endif
1529 1479
1530#ifdef DEBUG_malloc
1531# include "dmalloc.h" /* This comes last */
1532#endif
1533
1534#endif /* _RXVT_H_ */ 1480#endif /* _RXVT_H_ */
1535 1481

Diff Legend

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