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

Diff Legend

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