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.227 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.290 by sasha, Thu Aug 9 22:08:21 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"
43#include "libptytty.h"
40 44
41#include "rxvtperl.h" 45#include "rxvtperl.h"
42 46
43// try to avoid some macros to decrease code size, on some systems 47// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 48#if ENABLE_MINIMAL
… …
66 70
67#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
68typedef char *XPointer; 72typedef char *XPointer;
69#endif 73#endif
70 74
71#ifdef HAVE_TERMIOS_H
72# include <termios.h> 75#include <termios.h>
73typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
74#else
75# include <sgtty.h>
76typedef struct {
77 struct sgttyb sg;
78 struct tchars tc;
79 struct ltchars lc;
80 int line;
81 int local;
82} ttymode_t;
83#endif
84 77
85#ifdef XPM_BACKGROUND 78#ifdef HAVE_AFTERIMAGE
86# ifdef XPM_INC_X11 79# include <afterimage.h>
87# include <X11/xpm.h> 80#undef min
88# else 81#undef max
89# include <xpm.h>
90# endif
91#endif 82#endif
92 83
93#ifndef STDIN_FILENO 84#ifndef STDIN_FILENO
94# define STDIN_FILENO 0 85# define STDIN_FILENO 0
95# define STDOUT_FILENO 1 86# define STDOUT_FILENO 1
96# define STDERR_FILENO 2 87# define STDERR_FILENO 2
97#endif 88#endif
98 89
99/****************************************************************************/ 90/****************************************************************************/
100
101#ifndef __attribute__
102# if __GNUC__
103# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
104# define __attribute__(x)
105# endif
106# endif
107# define __attribute__(x)
108#endif
109
110#define NORETURN __attribute__ ((noreturn))
111#define UNUSED __attribute__ ((unused))
112
113// increases code size unless -fno-enforce-eh-specs
114#if __GNUC__
115# define NOTHROW
116# define THROW(x)
117#else
118# define NOTHROW throw()
119# define THROW(x) throw x
120#endif
121 91
122// exception thrown on fatal (per-instance) errors 92// exception thrown on fatal (per-instance) errors
123class rxvt_failure_exception { }; 93class rxvt_failure_exception { };
124 94
125// exception thrown when the command parser runs out of input data 95// exception thrown when the command parser runs out of input data
… …
157const char * rxvt_Str_skip_space (const char *str) NOTHROW; 127const char * rxvt_Str_skip_space (const char *str) NOTHROW;
158char * rxvt_Str_trim (char *str) NOTHROW; 128char * rxvt_Str_trim (char *str) NOTHROW;
159int rxvt_Str_escaped (char *str) NOTHROW; 129int rxvt_Str_escaped (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 130char ** rxvt_splitcommastring (const char *cs) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 131void rxvt_freecommastring (char **cs) NOTHROW;
162char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
163void rxvt_usleep (int usecs) NOTHROW;
164 132
165///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
166 134
167// temporarily replace the process environment 135// temporarily replace the process environment
168extern char **environ; 136extern char **environ;
169extern char **rxvt_environ; // the original environ pointer 137extern char **rxvt_environ; // the original environ pointer
170 138
171inline void set_environ (stringvec *envv) 139inline void set_environ (stringvec *envv)
172{ 140{
141#if ENABLE_PERL
142 assert (envv);
143#else
173 if (envv) 144 if (envv)
145#endif
174 environ = (char **)envv->begin (); 146 environ = (char **)envv->begin ();
175} 147}
176 148
177inline void set_environ (char **envv) 149inline void set_environ (char **envv)
178{ 150{
151#if ENABLE_PERL
152 assert (envv);
153#else
179 if (envv) 154 if (envv)
155#endif
180 environ = envv; 156 environ = envv;
181} 157}
182 158
183/* 159/*
184 ***************************************************************************** 160 *****************************************************************************
… …
194# define KEEP_SCROLLCOLOR 1 170# define KEEP_SCROLLCOLOR 1
195#else 171#else
196# undef KEEP_SCROLLCOLOR 172# undef KEEP_SCROLLCOLOR
197#endif 173#endif
198 174
175#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
176# define HAVE_BG_PIXMAP 1/* to simplify further usage */
177struct bgPixmap_t {
178# define bgPmap_geometrySet (1UL<<0)
179# define bgPmap_propScale (1UL<<1)
180# define bgPmap_geometryFlags (bgPmap_geometrySet|bgPmap_propScale)
181
182# define bgPmap_Transparent (1UL<<16)
183 unsigned long flags;
184
199#ifdef XPM_BACKGROUND 185# ifdef XPM_BACKGROUND
200typedef struct { 186# ifdef HAVE_AFTERIMAGE
201 short w, h, x, y; 187 ASImage *original_asim;
188 bool render_asim (ASImage *background, ARGB32 background_tint);
189# endif
190
191#define bgPmap_defaultScale 100
192#define bgPmap_defaultAlign 50
193 unsigned int h_scale, v_scale;/* percents of the window size */
194 int h_align, v_align; /* percents of the window size:
195 0 - left align, 50 - center, 100 - right */
196 bool handle_geometry (const char *geom);
197 void set_defaultGeometry ()
198 {
199 h_scale = v_scale = bgPmap_defaultScale;
200 h_align = v_align = bgPmap_defaultAlign;
201 flags |= bgPmap_geometrySet;
202 };
203
204# endif /* XPM_BACKGROUND */
205
206 rxvt_term *target;
207 bool set_target (rxvt_term *new_target);
208
209# ifdef ENABLE_TRANSPARENCY
210 int root_depth; /* obtained when target is set */
211 Pixmap root_pixmap; /* current root pixmap set */
212 bool make_transparency_pixmap ();
213# endif
214
202 Pixmap pixmap; 215 Pixmap pixmap;
203} bgPixmap_t; 216 unsigned int pmap_width, pmap_height;
204#endif 217 unsigned int pmap_depth;
205 218
206struct rxvt_ptytty { 219 bool window_size_sensitive ();
207 int pty; // pty file descriptor; connected to rxvt 220 void apply_background ();
208 int tty; // tty file descriptor; connected to child
209 221
210 rxvt_ptytty ()
211 : pty(-1), tty(-1)
212 {
213 }
214
215 virtual ~rxvt_ptytty ()
216 {
217 }
218
219 virtual bool get () = 0;
220#if UTMP_SUPPORT
221 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
222#endif
223
224 void close_tty ();
225 bool make_controlling_tty ();
226 void set_utf8_mode (bool on);
227}; 222};
228 223#else
229rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object 224# undef HAVE_BG_PIXMAP
230void rxvt_ptytty_server (); // start the ptytty server process 225#endif
231 226
232/* 227/*
233 * the 'essential' information for reporting Mouse Events 228 * the 'essential' information for reporting Mouse Events
234 * pared down from XButtonEvent 229 * pared down from XButtonEvent
235 */ 230 */
… …
448// fake styles 443// fake styles
449#define RS_Blink 0x00010000UL // blink 444#define RS_Blink 0x00010000UL // blink
450#define RS_RVid 0x00020000UL // reverse video 445#define RS_RVid 0x00020000UL // reverse video
451#define RS_Uline 0x00040000UL // underline 446#define RS_Uline 0x00040000UL // underline
452 447
448// toggle this to force redraw, must be != RS_Careful
449#define RS_redraw 0x01000000UL
450
453// 5 custom bits for extensions 451// 5 custom bits for extensions
454#define RS_customCount 32 452#define RS_customCount 32
455#define RS_customMask 0x00f80000UL 453#define RS_customMask 0x00f80000UL
456#define RS_customShift 19 454#define RS_customShift 19
457 455
… …
526 Rxvt_restoreFG = 39, // change default fg color 524 Rxvt_restoreFG = 39, // change default fg color
527 Rxvt_restoreBG = 49, // change default bg color 525 Rxvt_restoreBG = 49, // change default bg color
528 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 526 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
529 527
530 URxvt_locale = 701, // change locale 528 URxvt_locale = 701, // change locale
529 URxvt_version = 702, // request version
531 530
532 URxvt_Color_IT = 704, // change actual 'Italic' colour 531 URxvt_Color_IT = 704, // change actual 'Italic' colour
533 URxvt_Color_tint = 705, // change actual tint colour 532 URxvt_Color_tint = 705, // change actual tint colour
534 URxvt_Color_BD = 706, 533 URxvt_Color_BD = 706,
535 URxvt_Color_UL = 707, 534 URxvt_Color_UL = 707,
… …
551 * on the unnecessary items, e.g. Color_pointer, but won't bother 550 * on the unnecessary items, e.g. Color_pointer, but won't bother
552 * until we need to. Also, be aware of usage in pixcolor_set 551 * until we need to. Also, be aware of usage in pixcolor_set
553 */ 552 */
554 553
555enum colour_list { 554enum colour_list {
555 Color_none = -2,
556 Color_transparent = -1,
556 Color_fg = 0, 557 Color_fg = 0,
557 Color_bg, 558 Color_bg,
558 minCOLOR, /* 2 */ 559 minCOLOR, /* 2 */
559 Color_Black = minCOLOR, 560 Color_Black = minCOLOR,
560 Color_Red3, 561 Color_Red3,
… …
602#endif 603#endif
603#ifdef KEEP_SCROLLCOLOR 604#ifdef KEEP_SCROLLCOLOR
604 Color_scroll, 605 Color_scroll,
605 Color_trough, 606 Color_trough,
606#endif 607#endif
607#if TINTING 608#if ENABLE_TRANSPARENCY
608 Color_tint, 609 Color_tint,
609#endif 610#endif
610#if OFF_FOCUS_FADING 611#if OFF_FOCUS_FADING
611 Color_fade, 612 Color_fade,
612#endif 613#endif
… …
619 TOTAL_COLORS = NRS_COLORS 620 TOTAL_COLORS = NRS_COLORS
620#endif 621#endif
621}; 622};
622 623
623#define Color_Bits 7 // 0 .. maxTermCOLOR 624#define Color_Bits 7 // 0 .. maxTermCOLOR
624
625#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
626#define NPIXCLR_BITS 32
627 625
628/* 626/*
629 * Resource list 627 * Resource list
630 */ 628 */
631enum { 629enum {
… …
633# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 631# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
634# include "rsinc.h" 632# include "rsinc.h"
635# undef def 633# undef def
636# undef reserve 634# undef reserve
637 NUM_RESOURCES 635 NUM_RESOURCES
638};
639
640// see init.C:xa_names, which must be kept in sync
641enum {
642 XA_TEXT = 0,
643 XA_COMPOUND_TEXT,
644 XA_UTF8_STRING,
645 XA_MULTIPLE,
646 XA_TARGETS,
647 XA_TIMESTAMP,
648 XA_VT_SELECTION,
649 XA_INCR,
650 XA_WM_PROTOCOLS,
651 XA_WM_DELETE_WINDOW,
652 XA_CLIPBOARD,
653#if ENABLE_FRILLS
654 XA_MOTIF_WM_HINTS,
655#endif
656#if ENABLE_EWMH
657 XA_NET_WM_PID,
658 XA_NET_WM_NAME,
659 XA_NET_WM_ICON_NAME,
660 XA_NET_WM_PING,
661#endif
662#if USE_XIM
663 XA_WM_LOCALE_NAME,
664#endif
665#if TRANSPARENT
666 XA_XROOTPMAP_ID,
667 XA_ESETROOT_PMAP_ID,
668#endif
669#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
670 XA_DNDPROTOCOL,
671 XA_DNDSELECTION,
672#endif
673#if ENABLE_XEMBED
674 XA_XEMBED,
675 XA_XEMBED_INFO,
676#endif
677 NUM_XA
678}; 636};
679 637
680/* DEC private modes */ 638/* DEC private modes */
681#define PrivMode_132 (1UL<<0) 639#define PrivMode_132 (1UL<<0)
682#define PrivMode_132OK (1UL<<1) 640#define PrivMode_132OK (1UL<<1)
… …
755 ***************************************************************************** 713 *****************************************************************************
756 * MACRO DEFINES 714 * MACRO DEFINES
757 ***************************************************************************** 715 *****************************************************************************
758 */ 716 */
759#define dLocal(type,name) type const name = this->name 717#define dLocal(type,name) type const name = this->name
760#define dDisp Display *disp = this->display->display 718
719// for speed reasons, we assume that all codepoints 32 to 126 are
720// single-width.
721#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
761 722
762/* convert pixel dimensions to row/column values. Everything as int32_t */ 723/* convert pixel dimensions to row/column values. Everything as int32_t */
763#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 724#define Pixel2Col(x) Pixel2Width((int32_t)(x))
764#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 725#define Pixel2Row(y) Pixel2Height((int32_t)(y))
765#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 726#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
767#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 728#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
768#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 729#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
769#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 730#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
770#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 731#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
771 732
772#define OPTION(opt) (options & (opt))
773#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
774 | Opt_jumpScroll | Opt_secondaryScreen \
775 | Opt_pastableTabs | Opt_intensityStyles)
776
777// for m >= -n, ensure remainder lies between 0..n-1 733// for m >= -n, ensure remainder lies between 0..n-1
778#define MOD(m,n) (((m) + (n)) % (n)) 734#define MOD(m,n) (((m) + (n)) % (n))
779 735
780#define LINENO(n) MOD (term_start + int(n), total_rows) 736#define LINENO(n) MOD (term_start + int(n), total_rows)
781#define ROW(n) row_buf [LINENO (n)] 737#define ROW(n) row_buf [LINENO (n)]
… …
799#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 755#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
800#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 756#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
801 757
802#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 758#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
803 759
804#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 760#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
805#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 761#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
806 762
807#if ENABLE_STYLES 763#if ENABLE_STYLES
808# define FONTSET(style) fontset[GET_STYLE (style)] 764# define FONTSET(style) fontset[GET_STYLE (style)]
809#else 765#else
810# define FONTSET(style) fontset[0] 766# define FONTSET(style) fontset[0]
… …
838#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 794#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
839#define scrollbar_position(y) ((y) - scrollBar.beg) 795#define scrollbar_position(y) ((y) - scrollBar.beg)
840#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 796#define scrollbar_size() (scrollBar.end - scrollBar.beg \
841 - scrollbar_minheight ()) 797 - scrollbar_minheight ())
842 798
843#ifdef XPM_BACKGROUND
844# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
845#else
846# define XPMClearArea(a, b, c, d, e, f, g)
847#endif
848
849#ifdef DEBUG_CMD
850# define D_CMD(x) fprintf x ; fputc('\n', stderr)
851#else
852# define D_CMD(x)
853#endif
854#ifdef DEBUG_INIT
855# define D_INIT(x) fprintf x ; fputc('\n', stderr)
856#else
857# define D_INIT(x)
858#endif
859#ifdef DEBUG_MAIN
860# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
861#else
862# define D_MAIN(x)
863#endif
864#ifdef DEBUG_SIZE
865# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
866#else
867# define D_SIZE(x)
868#endif
869
870typedef callback1<void, const char *> log_callback; 799typedef callback<void (const char *)> log_callback;
871typedef callback1<int, int> getfd_callback; 800typedef callback<int (int)> getfd_callback;
872 801
873#define SET_LOCALE(locale) rxvt_set_locale (locale) 802#define SET_LOCALE(locale) rxvt_set_locale (locale)
874extern bool rxvt_set_locale (const char *locale) NOTHROW; 803extern bool rxvt_set_locale (const char *locale) NOTHROW;
875extern void rxvt_push_locale (const char *locale) NOTHROW; 804extern void rxvt_push_locale (const char *locale) NOTHROW;
876extern void rxvt_pop_locale () NOTHROW; 805extern void rxvt_pop_locale () NOTHROW;
… …
878/****************************************************************************/ 807/****************************************************************************/
879 808
880#define LINE_LONGER 0x0001 // line is continued on the next row 809#define LINE_LONGER 0x0001 // line is continued on the next row
881#define LINE_FILTERED 0x0002 // line has been filtered 810#define LINE_FILTERED 0x0002 // line has been filtered
882#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 811#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
812#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
813#define LINE_BIDI 0x0010 // line needs bidi (NYI)
883 814
884struct line_t { 815struct line_t {
885 text_t *t; // terminal the text 816 text_t *t; // terminal the text
886 rend_t *r; // rendition, uses RS_ flags 817 rend_t *r; // rendition, uses RS_ flags
887 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 818 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
941# define COMPOSE_LO 0x40000000UL 872# define COMPOSE_LO 0x40000000UL
942# define COMPOSE_HI 0x400fffffUL 873# define COMPOSE_HI 0x400fffffUL
943# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 874# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
944#else 875#else
945# if ENABLE_PERL 876# if ENABLE_PERL
946# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 877# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
947# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 878# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
948# else 879# else
949# define COMPOSE_LO 0xd800UL 880# define COMPOSE_LO 0xd800UL
950# define COMPOSE_HI 0xf8ffUL 881# define COMPOSE_HI 0xf8ffUL
951# endif 882# endif
… …
980#endif 911#endif
981 912
982/****************************************************************************/ 913/****************************************************************************/
983 914
984#ifdef KEYSYM_RESOURCE 915#ifdef KEYSYM_RESOURCE
985 class keyboard_manager; 916class keyboard_manager;
986#endif 917#endif
987 918
988struct rxvt_term : zero_initialized, rxvt_vars { 919struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
920
921 // special markers with magic addresses
922 static const char resval_undef []; // options specifically unset
923 static const char resval_on []; // boolean options switched on
924 static const char resval_off []; // or off
925
989 log_callback *log_hook; // log error messages through this hook, if != 0 926 log_callback *log_hook; // log error messages through this hook, if != 0
990 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 927 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
991#if ENABLE_PERL 928#if ENABLE_PERL
992 rxvt_perl_term perl; 929 rxvt_perl_term perl;
993#endif 930#endif
994 struct mbstate mbstate; // current input multibyte state 931 struct mbstate mbstate; // current input multibyte state
995 932
996 unsigned char want_refresh:1, 933 unsigned char want_refresh:1,
997#ifdef TRANSPARENT 934#ifdef ENABLE_TRANSPARENCY
998 want_full_refresh:1, /* awaiting full screen refresh */ 935 want_full_refresh:1, /* awaiting full screen refresh */
999#endif
1000#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
1001 am_transparent:1, /* is a transparent term */ 936 am_transparent:1, /* is a transparent term */
1002 am_pixmap_trans:1, /* transparency w/known root pixmap */ 937 am_pixmap_trans:1, /* transparency w/known root pixmap */
1003#endif 938#endif
1004 current_screen:1, /* primary or secondary */ 939 current_screen:1, /* primary or secondary */
1005 hate_those_clicks:1, /* a.k.a. keep mark position */
1006 num_scr_allow:1, 940 num_scr_allow:1,
1007 bypass_keystate:1, 941 bypass_keystate:1,
1008#ifdef CURSOR_BLINK 942#ifdef CURSOR_BLINK
1009 hidden_cursor:1, 943 hidden_cursor:1,
1010#endif 944#endif
… …
1025#endif 959#endif
1026 scrollbar_align, 960 scrollbar_align,
1027 selection_wait, 961 selection_wait,
1028 selection_type; 962 selection_type;
1029/* ---------- */ 963/* ---------- */
964 bool rvideo_state, rvideo_mode;
965#ifndef NO_BELL
1030 short rvideo; 966 bool rvideo_bell;
967#endif
1031 int num_scr; /* screen: number lines scrolled */ 968 int num_scr; /* screen: number lines scrolled */
1032 int prev_ncol, /* screen: previous number of columns */ 969 int prev_ncol, /* screen: previous number of columns */
1033 prev_nrow; /* screen: previous number of rows */ 970 prev_nrow; /* screen: previous number of rows */
1034/* ---------- */ 971/* ---------- */
1035 rend_t rstyle; 972 rend_t rstyle;
1036/* ---------- */
1037 uint32_t pixcolor_set[NPIXCLR_SETS];
1038/* ---------- */ 973/* ---------- */
1039#ifdef SELECTION_SCROLLING 974#ifdef SELECTION_SCROLLING
1040 int scroll_selection_lines; 975 int scroll_selection_lines;
1041 enum page_dirn scroll_selection_dir; 976 enum page_dirn scroll_selection_dir;
1042 int selection_save_x, 977 int selection_save_x,
… …
1048 /* give proper Scroll behaviour */ 983 /* give proper Scroll behaviour */
1049#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 984#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1050 mouse_slip_wheel_speed, 985 mouse_slip_wheel_speed,
1051#endif 986#endif
1052 refresh_count, 987 refresh_count,
1053 refresh_limit,
1054 last_bot, /* scrollbar last bottom position */ 988 last_bot, /* scrollbar last bottom position */
1055 last_top, /* scrollbar last top position */ 989 last_top, /* scrollbar last top position */
1056 last_state, /* scrollbar last state */ 990 last_state, /* scrollbar last state */
1057 scrollbar_len, 991 scrollbar_len,
1058 window_vt_x, 992 window_vt_x,
… …
1069 int old_width, /* last used width in screen resize */ 1003 int old_width, /* last used width in screen resize */
1070 old_height; /* last used height in screen resize */ 1004 old_height; /* last used height in screen resize */
1071 unsigned long priv_modes, 1005 unsigned long priv_modes,
1072 SavedModes; 1006 SavedModes;
1073/* ---------- */ 1007/* ---------- */
1074 Atom xa[NUM_XA]; 1008 Atom *xa;
1075/* ---------- */ 1009/* ---------- */
1076#ifdef RXVT_SCROLLBAR 1010#ifdef RXVT_SCROLLBAR
1077 GC scrollbarGC, 1011 GC scrollbarGC,
1078 topShadowGC, 1012 topShadowGC,
1079 botShadowGC; 1013 botShadowGC;
… …
1114#endif 1048#endif
1115 struct mouse_event MEvent; 1049 struct mouse_event MEvent;
1116 XComposeStatus compose; 1050 XComposeStatus compose;
1117 ttymode_t tio; 1051 ttymode_t tio;
1118 row_col_t oldcursor; 1052 row_col_t oldcursor;
1119#ifdef XPM_BACKGROUND 1053#ifdef HAVE_BG_PIXMAP
1120 bgPixmap_t bgPixmap; 1054 bgPixmap_t bgPixmap;
1121 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1055#endif
1056#ifdef HAVE_AFTERIMAGE
1057 ASVisual *asv;
1058 ASImageManager *asimman;
1122#endif 1059#endif
1123 1060
1124#if ENABLE_OVERLAY 1061#if ENABLE_OVERLAY
1125 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1062 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1126 text_t **ov_text; 1063 text_t **ov_text;
… …
1136 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1073 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1137#endif 1074#endif
1138 1075
1139 vector<void *> allocated; // free these memory blocks with free() 1076 vector<void *> allocated; // free these memory blocks with free()
1140 1077
1141 char *env_windowid; /* environmental variable WINDOWID */ 1078 char env_windowid[21]; /* environmental variable WINDOWID */
1079 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1142 char *env_display; /* environmental variable DISPLAY */ 1080 char *env_display; /* environmental variable DISPLAY */
1143 char *env_term; /* environmental variable TERM */ 1081 char *env_term; /* environmental variable TERM */
1144 char *env_colorfgbg; 1082
1145 char *locale; 1083 char *locale;
1146 char charsets[4]; 1084 char charsets[4];
1147 char *v_buffer; /* pointer to physical buffer */ 1085 char *v_buffer; /* pointer to physical buffer */
1148 unsigned int v_buflen; /* size of area to write */ 1086 unsigned int v_buflen; /* size of area to write */
1149 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1087 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1150 1088
1151#ifdef KEYSYM_RESOURCE 1089#ifdef KEYSYM_RESOURCE
1152 keyboard_manager *keyboard; 1090 keyboard_manager *keyboard;
1153#endif 1091#endif
1154 1092
1155 const char *rs[NUM_RESOURCES]; 1093 const char *rs[NUM_RESOURCES];
1156 /* command input buffering */ 1094 /* command input buffering */
1157 char *cmdbuf_ptr, *cmdbuf_endp; 1095 char *cmdbuf_ptr, *cmdbuf_endp;
1158 char cmdbuf_base[CBUFSIZ]; 1096 char cmdbuf_base[CBUFSIZ];
1159 1097
1160 rxvt_ptytty *pty; 1098 ptytty *pty;
1161 1099
1162 rxvt_salloc *talloc; // text line allocator 1100 rxvt_salloc *talloc; // text line allocator
1163 rxvt_salloc *ralloc; // rend line allocator 1101 rxvt_salloc *ralloc; // rend line allocator
1164 1102
1165 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1103 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1176#endif 1114#endif
1177 1115
1178 // modifies first argument(!) 1116 // modifies first argument(!)
1179 void paste (char *data, unsigned int len) NOTHROW; 1117 void paste (char *data, unsigned int len) NOTHROW;
1180 1118
1181 long vt_emask, vt_emask_perl; 1119 long vt_emask, vt_emask_perl, vt_emask_xim;
1182 1120
1183 void vt_select_input () const NOTHROW 1121 void vt_select_input () const NOTHROW
1184 { 1122 {
1185 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1123 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1186 } 1124 }
1187 1125
1188#if TRANSPARENT 1126#if ENABLE_TRANSPARENCY || ENABLE_PERL
1189 void rootwin_cb (XEvent &xev); 1127 void rootwin_cb (XEvent &xev);
1190 xevent_watcher rootwin_ev; 1128 xevent_watcher rootwin_ev;
1129#endif
1130#if ENABLE_TRANSPARENCY
1131 int check_our_parents ();
1132 void check_our_parents_cb (time_watcher &w);
1133 time_watcher check_our_parents_ev;
1191#endif 1134#endif
1192 1135
1193 void x_cb (XEvent &xev); 1136 void x_cb (XEvent &xev);
1194 void flush (); 1137 void flush ();
1195 xevent_watcher termwin_ev; 1138 xevent_watcher termwin_ev;
… …
1200 1143
1201 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1144 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1202 void check_cb (check_watcher &w); check_watcher check_ev; 1145 void check_cb (check_watcher &w); check_watcher check_ev;
1203 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1146 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1204 void flush_cb (time_watcher &w); time_watcher flush_ev; 1147 void flush_cb (time_watcher &w); time_watcher flush_ev;
1205
1206 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1148 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1207
1208 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1149 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1209 1150
1210#ifdef CURSOR_BLINK 1151#ifdef CURSOR_BLINK
1211 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1152 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1212#endif 1153#endif
1213#ifdef TEXT_BLINK 1154#ifdef TEXT_BLINK
1214 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1155 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1156#endif
1157#ifndef NO_BELL
1158 void bell_cb (time_watcher &w); time_watcher bell_ev;
1215#endif 1159#endif
1216 1160
1217#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1161#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1218 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1162 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1219#endif 1163#endif
… …
1239 rxvt_term (); 1183 rxvt_term ();
1240 ~rxvt_term (); 1184 ~rxvt_term ();
1241 void destroy (); 1185 void destroy ();
1242 void emergency_cleanup (); 1186 void emergency_cleanup ();
1243 1187
1244 bool init (int argc, const char *const *argv); 1188 bool init (int argc, const char *const *argv, stringvec *envv);
1189
1190 bool init (stringvec *argv, stringvec *envv)
1191 {
1192 this->argv = argv;
1193 return init (argv->size (), argv->begin (), envv);
1194 }
1195
1245 bool init_vars (); 1196 bool init_vars ();
1246 1197
1247 bool pty_fill (); 1198 bool pty_fill ();
1248 1199
1249 void make_current () const // make this the "currently active" urxvt instance 1200 void make_current () const // make this the "currently active" urxvt instance
1250 { 1201 {
1251 SET_R (this); 1202 SET_R (this);
1203 set_environ (envv);
1252 rxvt_set_locale (locale); 1204 rxvt_set_locale (locale);
1253 set_environ (envv);
1254 } 1205 }
1255 1206
1256 void init_secondary (); 1207 void init_secondary ();
1257 const char **init_resources (int argc, const char *const *argv); 1208 const char **init_resources (int argc, const char *const *argv);
1258 const char *x_resource (const char *name); 1209 const char *x_resource (const char *name);
… …
1268 void create_windows (int argc, const char *const *argv); 1219 void create_windows (int argc, const char *const *argv);
1269 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1220 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1270 void window_calc (unsigned int newwidth, unsigned int newheight); 1221 void window_calc (unsigned int newwidth, unsigned int newheight);
1271 1222
1272#if USE_XIM 1223#if USE_XIM
1273 rxvt_xim *input_method; 1224 rxvt_xim *input_method;
1274 XIC Input_Context; 1225 XIC Input_Context;
1275 XIMStyle input_style; 1226 XIMStyle input_style;
1276 XPoint spot; // most recently sent spot position 1227 XPoint spot; // most recently sent spot position
1277 1228
1278 void im_destroy (); 1229 void im_destroy ();
1279 void im_cb (); im_watcher im_ev; 1230 void im_cb (); im_watcher im_ev;
1280 void im_set_size (XRectangle &size); 1231 void im_set_size (XRectangle &size);
1281 void im_set_position (XPoint &pos) NOTHROW; 1232 void im_set_position (XPoint &pos) NOTHROW;
… …
1283 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1234 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1284 1235
1285 bool IMisRunning (); 1236 bool IMisRunning ();
1286 void IMSendSpot (); 1237 void IMSendSpot ();
1287 bool IM_get_IC (const char *modifiers); 1238 bool IM_get_IC (const char *modifiers);
1288 void IMSetStatusPosition (); 1239 void IMSetPosition ();
1289#endif 1240#endif
1290 1241
1291 void resize_scrollbar (); 1242 void resize_scrollbar ();
1292 1243
1293 // command.C 1244 // command.C
1294 void lookup_key (XKeyEvent &ev); 1245 void key_press (XKeyEvent &ev);
1246 void key_release (XKeyEvent &ev);
1295 unsigned int cmd_write (const char *str, unsigned int count); 1247 unsigned int cmd_write (const char *str, unsigned int count);
1296 1248
1297 wchar_t next_char () NOTHROW; 1249 wchar_t next_char () NOTHROW;
1298 wchar_t cmd_getc () THROW ((class out_of_input)); 1250 wchar_t cmd_getc () THROW ((class out_of_input));
1299 uint32_t next_octet () NOTHROW; 1251 uint32_t next_octet () NOTHROW;
… …
1303 void mouse_report (XButtonEvent &ev); 1255 void mouse_report (XButtonEvent &ev);
1304 void button_press (XButtonEvent &ev); 1256 void button_press (XButtonEvent &ev);
1305 void button_release (XButtonEvent &ev); 1257 void button_release (XButtonEvent &ev);
1306 void focus_in (); 1258 void focus_in ();
1307 void focus_out (); 1259 void focus_out ();
1308 int check_our_parents (); 1260 void update_fade_color (unsigned int idx);
1309#ifdef PRINTPIPE 1261#ifdef PRINTPIPE
1310 FILE *popen_printer (); 1262 FILE *popen_printer ();
1311 int pclose_printer (FILE *stream); 1263 int pclose_printer (FILE *stream);
1312#endif 1264#endif
1313 void process_print_pipe (); 1265 void process_print_pipe ();
… …
1334 void set_utf8_property (Atom prop, const char *str, int len = -1); 1286 void set_utf8_property (Atom prop, const char *str, int len = -1);
1335 void set_title (const char *str); 1287 void set_title (const char *str);
1336 void set_icon_name (const char *str); 1288 void set_icon_name (const char *str);
1337 void set_window_color (int idx, const char *color); 1289 void set_window_color (int idx, const char *color);
1338 void set_colorfgbg (); 1290 void set_colorfgbg ();
1339 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1291 bool set_color (rxvt_color &color, const char *name);
1292 void alias_color (int dst, int src);
1340 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1293 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1341 1294
1342 // screen.C 1295 // screen.C
1343 1296
1344 void lalloc (line_t &l) const NOTHROW 1297 void lalloc (line_t &l) const
1345 { 1298 {
1346 l.t = (text_t *)talloc->alloc (); 1299 l.t = (text_t *)talloc->alloc ();
1347 l.r = (rend_t *)ralloc->alloc (); 1300 l.r = (rend_t *)ralloc->alloc ();
1348 } 1301 }
1349 1302
… …
1353 talloc->free (l.t); 1306 talloc->free (l.t);
1354 ralloc->free (l.r); 1307 ralloc->free (l.r);
1355 } 1308 }
1356#endif 1309#endif
1357 1310
1358 void lresize (line_t &l) const NOTHROW 1311 void lresize (line_t &l) const
1359 { 1312 {
1360 if (!l.t) 1313 if (!l.t)
1361 return; 1314 return;
1362 1315
1363 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1316 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1373 { 1326 {
1374 int base = GET_BASEFG (r); 1327 int base = GET_BASEFG (r);
1375#ifndef NO_BRIGHTCOLOR 1328#ifndef NO_BRIGHTCOLOR
1376 if (r & RS_Bold 1329 if (r & RS_Bold
1377# if ENABLE_STYLES 1330# if ENABLE_STYLES
1378 && OPTION (Opt_intensityStyles) 1331 && option (Opt_intensityStyles)
1379# endif 1332# endif
1380 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1333 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1381 base += minBrightCOLOR - minCOLOR; 1334 base += minBrightCOLOR - minCOLOR;
1382#endif 1335#endif
1383 return base; 1336 return base;
… …
1387 { 1340 {
1388 int base = GET_BASEBG (r); 1341 int base = GET_BASEBG (r);
1389#ifndef NO_BRIGHTCOLOR 1342#ifndef NO_BRIGHTCOLOR
1390 if (r & RS_Blink 1343 if (r & RS_Blink
1391# if ENABLE_STYLES 1344# if ENABLE_STYLES
1392 && OPTION (Opt_intensityStyles) 1345 && option (Opt_intensityStyles)
1393# endif 1346# endif
1394 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1347 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1395 base += minBrightCOLOR - minCOLOR; 1348 base += minBrightCOLOR - minCOLOR;
1396#endif 1349#endif
1397 return base; 1350 return base;
1398 } 1351 }
1399 1352
1400 bool option (uint32_t opt) const NOTHROW 1353 bool option (uint8_t opt) const NOTHROW
1401 { 1354 {
1402 return OPTION (opt); 1355 return options[opt >> 3] & (1 << (opt & 7));
1403 } 1356 }
1404 1357
1405 void set_option (uint32_t opt, bool set) NOTHROW 1358 void set_option (uint8_t opt, bool set = true) NOTHROW
1406 { 1359 {
1407 if (set) 1360 if (set)
1408 options |= opt; 1361 options[opt >> 3] |= (1 << (opt & 7));
1409 else 1362 else
1410 options &= ~opt; 1363 options[opt >> 3] &= ~(1 << (opt & 7));
1411 } 1364 }
1412 1365
1413 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1366 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1414 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1367 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1415 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1368 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1431 void scr_remap_chars () NOTHROW; 1384 void scr_remap_chars () NOTHROW;
1432 void scr_remap_chars (line_t &l) NOTHROW; 1385 void scr_remap_chars (line_t &l) NOTHROW;
1433 1386
1434 enum cursor_mode { SAVE, RESTORE }; 1387 enum cursor_mode { SAVE, RESTORE };
1435 1388
1436 void scr_poweron () NOTHROW; 1389 void scr_poweron ();
1437 void scr_cursor (cursor_mode mode) NOTHROW; 1390 void scr_cursor (cursor_mode mode) NOTHROW;
1438 void scr_do_wrap () NOTHROW; 1391 void scr_do_wrap () NOTHROW;
1392 void scr_swap_screen () NOTHROW;
1439 int scr_change_screen (int scrn) NOTHROW; 1393 void scr_change_screen (int scrn);
1440 void scr_color (unsigned int color, int fgbg) NOTHROW; 1394 void scr_color (unsigned int color, int fgbg) NOTHROW;
1441 void scr_rendition (int set, int style) NOTHROW; 1395 void scr_rendition (int set, int style) NOTHROW;
1442 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1396 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1443 void scr_backspace () NOTHROW; 1397 void scr_backspace () NOTHROW;
1444 void scr_tab (int count, bool ht = false) NOTHROW; 1398 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1452 void scr_cursor_visible (int mode) NOTHROW; 1406 void scr_cursor_visible (int mode) NOTHROW;
1453 void scr_autowrap (int mode) NOTHROW; 1407 void scr_autowrap (int mode) NOTHROW;
1454 void scr_relative_origin (int mode) NOTHROW; 1408 void scr_relative_origin (int mode) NOTHROW;
1455 void scr_insert_mode (int mode) NOTHROW; 1409 void scr_insert_mode (int mode) NOTHROW;
1456 void scr_set_tab (int mode) NOTHROW; 1410 void scr_set_tab (int mode) NOTHROW;
1457 void scr_rvideo_mode (int mode) NOTHROW; 1411 void scr_rvideo_mode (bool on) NOTHROW;
1458 void scr_report_position () NOTHROW; 1412 void scr_report_position () NOTHROW;
1459 void set_font_style () NOTHROW; 1413 void set_font_style () NOTHROW;
1460 void scr_charset_choose (int set) NOTHROW; 1414 void scr_charset_choose (int set) NOTHROW;
1461 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1415 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1462 void scr_move_to (int y, int len) NOTHROW; 1416 void scr_move_to (int y, int len) NOTHROW;
… …
1470 void scr_dump (int fd) NOTHROW; 1424 void scr_dump (int fd) NOTHROW;
1471 1425
1472 void selection_check (int check_more) NOTHROW; 1426 void selection_check (int check_more) NOTHROW;
1473 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1427 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1474 void selection_property (Window win, Atom prop) NOTHROW; 1428 void selection_property (Window win, Atom prop) NOTHROW;
1475 void selection_request (Time tm, int selnum) NOTHROW; 1429 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1476 int selection_request_other (Atom target, int selnum) NOTHROW; 1430 int selection_request_other (Atom target, int selnum) NOTHROW;
1477 void selection_clear () NOTHROW; 1431 void selection_clear () NOTHROW;
1478 void selection_make (Time tm); 1432 void selection_make (Time tm);
1479 bool selection_grab (Time tm) NOTHROW; 1433 bool selection_grab (Time tm) NOTHROW;
1480 void selection_start_colrow (int col, int row) NOTHROW; 1434 void selection_start_colrow (int col, int row) NOTHROW;
… …
1520 void get_options (int argc, const char *const *argv); 1474 void get_options (int argc, const char *const *argv);
1521 int parse_keysym (const char *str, const char *arg); 1475 int parse_keysym (const char *str, const char *arg);
1522 void get_xdefaults (FILE *stream, const char *name); 1476 void get_xdefaults (FILE *stream, const char *name);
1523 void extract_resources (); 1477 void extract_resources ();
1524 // xpm.C 1478 // xpm.C
1525 int scale_pixmap (const char *geom); 1479//int scale_pixmap (const char *geom);
1526 void resize_pixmap (); 1480 void resize_pixmap ();
1527 Pixmap set_bgPixmap (const char *file); 1481 void set_bgPixmap (const char *file);
1482 void get_window_origin (int &x, int &y);
1483 Pixmap get_pixmap_property (int prop_id);
1528}; 1484};
1529 1485
1530/* 1486/*
1531 ***************************************************************************** 1487 *****************************************************************************
1532 * PROTOTYPES 1488 * PROTOTYPES
… …
1536# define __PROTO(p) p 1492# define __PROTO(p) p
1537#else 1493#else
1538# define __PROTO(p) () 1494# define __PROTO(p) ()
1539#endif 1495#endif
1540 1496
1541#ifdef DEBUG_malloc
1542# include "dmalloc.h" /* This comes last */
1543#endif
1544
1545#endif /* _RXVT_H_ */ 1497#endif /* _RXVT_H_ */
1546 1498

Diff Legend

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