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.225 by root, Thu Jan 19 20:30:36 2006 UTC vs.
Revision 1.264 by root, Sat Dec 2 16:57:16 2006 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
… …
94# define STDIN_FILENO 0 98# define STDIN_FILENO 0
95# define STDOUT_FILENO 1 99# define STDOUT_FILENO 1
96# define STDERR_FILENO 2 100# define STDERR_FILENO 2
97#endif 101#endif
98 102
103/****************************************************************************/
104
105// exception thrown on fatal (per-instance) errors
106class rxvt_failure_exception { };
107
108// exception thrown when the command parser runs out of input data
109class out_of_input { };
110
99/* 111/*
100 ***************************************************************************** 112 *****************************************************************************
101 * PROTOTYPES 113 * PROTOTYPES
102 ***************************************************************************** 114 *****************************************************************************
103 */ 115 */
104// main.C 116// main.C
105RETSIGTYPE rxvt_Child_signal (int sig); 117RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
106RETSIGTYPE rxvt_Exit_signal (int sig); 118RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
107void rxvt_clean_exit (); 119void rxvt_clean_exit () NOTHROW;
108void * rxvt_malloc (size_t size); 120void * rxvt_malloc (size_t size);
109void * rxvt_calloc (size_t number, size_t size); 121void * rxvt_calloc (size_t number, size_t size);
110void * rxvt_realloc (void *ptr, size_t size); 122void * rxvt_realloc (void *ptr, size_t size);
111 123
112// util.C 124// misc.C
113char * rxvt_wcstombs (const wchar_t *str, int len = -1); 125char * rxvt_wcstombs (const wchar_t *str, int len = -1);
114wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 126wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
115char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 127char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
116wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 128wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
117char * rxvt_strdup (const char *str); 129char * rxvt_strdup_cpp (const char *str);
118 130
119// misc.C 131#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
132
120char * rxvt_r_basename (const char *str); 133char * rxvt_r_basename (const char *str) NOTHROW;
121void rxvt_vlog (const char *fmt, va_list arg_ptr); 134void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
122void rxvt_log (const char *fmt,...); 135void rxvt_log (const char *fmt,...) NOTHROW;
123void rxvt_warn (const char *fmt,...); 136void rxvt_warn (const char *fmt,...) NOTHROW;
124void rxvt_fatal (const char *fmt,...); 137void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
125void rxvt_exit_failure (); 138void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
139
126int rxvt_Str_match (const char *s1, const char *s2); 140int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
127const char * rxvt_Str_skip_space (const char *str); 141const char * rxvt_Str_skip_space (const char *str) NOTHROW;
128char * rxvt_Str_trim (char *str); 142char * rxvt_Str_trim (char *str) NOTHROW;
129int rxvt_Str_escaped (char *str); 143int rxvt_Str_escaped (char *str) NOTHROW;
130char ** rxvt_splitcommastring (const char *cs); 144char ** rxvt_splitcommastring (const char *cs) NOTHROW;
131void rxvt_freecommastring (char **cs); 145void rxvt_freecommastring (char **cs) NOTHROW;
132char * rxvt_File_find (const char *file, const char *ext, const char *path); 146char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
133void rxvt_usleep (int usecs);
134 147
135///////////////////////////////////////////////////////////////////////////// 148/////////////////////////////////////////////////////////////////////////////
136 149
137// temporarily replace the process environment 150// temporarily replace the process environment
138extern char **environ; 151extern char **environ;
139extern char **rxvt_environ; // the original environ pointer 152extern char **rxvt_environ; // the original environ pointer
140 153
141inline void set_environ (stringvec *envv) 154inline void set_environ (stringvec *envv)
142{ 155{
156#if ENABLE_PERL
157 assert (envv);
158#else
143 if (envv) 159 if (envv)
160#endif
144 environ = (char **)envv->begin (); 161 environ = (char **)envv->begin ();
145} 162}
146 163
147inline void set_environ (char **envv) 164inline void set_environ (char **envv)
148{ 165{
166#if ENABLE_PERL
167 assert (envv);
168#else
149 if (envv) 169 if (envv)
170#endif
150 environ = envv; 171 environ = envv;
151} 172}
152 173
153/* 174/*
154 ***************************************************************************** 175 *****************************************************************************
… …
170typedef struct { 191typedef struct {
171 short w, h, x, y; 192 short w, h, x, y;
172 Pixmap pixmap; 193 Pixmap pixmap;
173} bgPixmap_t; 194} bgPixmap_t;
174#endif 195#endif
175
176struct rxvt_ptytty {
177 int pty; // pty file descriptor; connected to rxvt
178 int tty; // tty file descriptor; connected to child
179
180 rxvt_ptytty ()
181 : pty(-1), tty(-1)
182 {
183 }
184
185 virtual ~rxvt_ptytty ()
186 {
187 }
188
189 virtual bool get () = 0;
190#if UTMP_SUPPORT
191 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
192#endif
193
194 void close_tty ();
195 bool make_controlling_tty ();
196 void set_utf8_mode (bool on);
197};
198
199rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
200void rxvt_ptytty_server (); // start the ptytty server process
201 196
202/* 197/*
203 * the 'essential' information for reporting Mouse Events 198 * the 'essential' information for reporting Mouse Events
204 * pared down from XButtonEvent 199 * pared down from XButtonEvent
205 */ 200 */
… …
418// fake styles 413// fake styles
419#define RS_Blink 0x00010000UL // blink 414#define RS_Blink 0x00010000UL // blink
420#define RS_RVid 0x00020000UL // reverse video 415#define RS_RVid 0x00020000UL // reverse video
421#define RS_Uline 0x00040000UL // underline 416#define RS_Uline 0x00040000UL // underline
422 417
418// toggle this to force redraw, must be != RS_Careful
419#define RS_redraw 0x01000000UL
420
423// 5 custom bits for extensions 421// 5 custom bits for extensions
424#define RS_customCount 32 422#define RS_customCount 32
425#define RS_customMask 0x00f80000UL 423#define RS_customMask 0x00f80000UL
426#define RS_customShift 19 424#define RS_customShift 19
427 425
… …
496 Rxvt_restoreFG = 39, // change default fg color 494 Rxvt_restoreFG = 39, // change default fg color
497 Rxvt_restoreBG = 49, // change default bg color 495 Rxvt_restoreBG = 49, // change default bg color
498 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 496 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
499 497
500 URxvt_locale = 701, // change locale 498 URxvt_locale = 701, // change locale
499 URxvt_version = 702, // request version
501 500
502 URxvt_Color_IT = 704, // change actual 'Italic' colour 501 URxvt_Color_IT = 704, // change actual 'Italic' colour
503 URxvt_Color_tint = 705, // change actual tint colour 502 URxvt_Color_tint = 705, // change actual tint colour
504 URxvt_Color_BD = 706, 503 URxvt_Color_BD = 706,
505 URxvt_Color_UL = 707, 504 URxvt_Color_UL = 707,
… …
521 * on the unnecessary items, e.g. Color_pointer, but won't bother 520 * on the unnecessary items, e.g. Color_pointer, but won't bother
522 * until we need to. Also, be aware of usage in pixcolor_set 521 * until we need to. Also, be aware of usage in pixcolor_set
523 */ 522 */
524 523
525enum colour_list { 524enum colour_list {
525 Color_none = -2,
526 Color_transparent = -1,
526 Color_fg = 0, 527 Color_fg = 0,
527 Color_bg, 528 Color_bg,
528 minCOLOR, /* 2 */ 529 minCOLOR, /* 2 */
529 Color_Black = minCOLOR, 530 Color_Black = minCOLOR,
530 Color_Red3, 531 Color_Red3,
… …
590#endif 591#endif
591}; 592};
592 593
593#define Color_Bits 7 // 0 .. maxTermCOLOR 594#define Color_Bits 7 // 0 .. maxTermCOLOR
594 595
595#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
596#define NPIXCLR_BITS 32
597
598/* 596/*
599 * Resource list 597 * Resource list
600 */ 598 */
601enum { 599enum {
602# define def(name) Rs_ ## name, 600# define def(name) Rs_ ## name,
603# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 601# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
604# include "rsinc.h" 602# include "rsinc.h"
605# undef def 603# undef def
606# undef reserve 604# undef reserve
607 NUM_RESOURCES 605 NUM_RESOURCES
608};
609
610// see init.C:xa_names, which must be kept in sync
611enum {
612 XA_TEXT = 0,
613 XA_COMPOUND_TEXT,
614 XA_UTF8_STRING,
615 XA_MULTIPLE,
616 XA_TARGETS,
617 XA_TIMESTAMP,
618 XA_VT_SELECTION,
619 XA_INCR,
620 XA_WM_PROTOCOLS,
621 XA_WM_DELETE_WINDOW,
622 XA_CLIPBOARD,
623#if ENABLE_FRILLS
624 XA_MOTIF_WM_HINTS,
625#endif
626#if ENABLE_EWMH
627 XA_NET_WM_PID,
628 XA_NET_WM_NAME,
629 XA_NET_WM_ICON_NAME,
630 XA_NET_WM_PING,
631#endif
632#if USE_XIM
633 XA_WM_LOCALE_NAME,
634#endif
635#if TRANSPARENT
636 XA_XROOTPMAP_ID,
637 XA_ESETROOT_PMAP_ID,
638#endif
639#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
640 XA_DNDPROTOCOL,
641 XA_DNDSELECTION,
642#endif
643#if ENABLE_XEMBED
644 XA_XEMBED,
645 XA_XEMBED_INFO,
646#endif
647 NUM_XA
648}; 606};
649 607
650/* DEC private modes */ 608/* DEC private modes */
651#define PrivMode_132 (1UL<<0) 609#define PrivMode_132 (1UL<<0)
652#define PrivMode_132OK (1UL<<1) 610#define PrivMode_132OK (1UL<<1)
… …
725 ***************************************************************************** 683 *****************************************************************************
726 * MACRO DEFINES 684 * MACRO DEFINES
727 ***************************************************************************** 685 *****************************************************************************
728 */ 686 */
729#define dLocal(type,name) type const name = this->name 687#define dLocal(type,name) type const name = this->name
730#define dDisp Display *disp = this->display->display 688
689// for speed reasons, we assume that all latin1 characters
690// are single-width (the first unicode combining character
691// is actually 0x300, but ascii is what matters most).
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
731 693
732/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
733#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
734#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
735#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
738#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 700#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
739#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
740#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
741 703
742#define OPTION(opt) (options & (opt)) 704#define OPTION(opt) (options & (opt))
743#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ 705#define DEFAULT_OPTIONS (Opt_scrollBar \
744 | Opt_jumpScroll | Opt_secondaryScreen \ 706 | Opt_scrollTtyOutput \
745 | Opt_pastableTabs | Opt_intensityStyles) 707 | Opt_jumpScroll \
708 | Opt_secondaryScreen \
709 | Opt_secondaryScroll \
710 | Opt_pastableTabs \
711 | Opt_intensityStyles)
746 712
747// for m >= -n, ensure remainder lies between 0..n-1 713// for m >= -n, ensure remainder lies between 0..n-1
748#define MOD(m,n) (((m) + (n)) % (n)) 714#define MOD(m,n) (((m) + (n)) % (n))
749 715
750#define LINENO(n) MOD (term_start + int(n), total_rows) 716#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
769#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 735#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
770#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 736#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
771 737
772#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 738#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
773 739
774#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 740#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
775#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 741#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
776 742
777#if ENABLE_STYLES 743#if ENABLE_STYLES
778# define FONTSET(style) fontset[GET_STYLE (style)] 744# define FONTSET(style) fontset[GET_STYLE (style)]
779#else 745#else
780# define FONTSET(style) fontset[0] 746# define FONTSET(style) fontset[0]
… …
814# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 780# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
815#else 781#else
816# define XPMClearArea(a, b, c, d, e, f, g) 782# define XPMClearArea(a, b, c, d, e, f, g)
817#endif 783#endif
818 784
819#ifdef DEBUG_CMD
820# define D_CMD(x) fprintf x ; fputc('\n', stderr)
821#else
822# define D_CMD(x)
823#endif
824#ifdef DEBUG_INIT
825# define D_INIT(x) fprintf x ; fputc('\n', stderr)
826#else
827# define D_INIT(x)
828#endif
829#ifdef DEBUG_MAIN
830# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
831#else
832# define D_MAIN(x)
833#endif
834#ifdef DEBUG_SIZE
835# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
836#else
837# define D_SIZE(x)
838#endif
839
840extern class rxvt_failure_exception { } rxvt_failure_exception;
841
842typedef callback1<void, const char *> log_callback; 785typedef callback<void (const char *)> log_callback;
843typedef callback1<int, int> getfd_callback; 786typedef callback<int (int)> getfd_callback;
844
845extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
846extern void rxvt_log (const char *fmt, ...);
847extern void rxvt_warn (const char *fmt, ...);
848extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
849extern void rxvt_exit_failure () __attribute__ ((noreturn));
850 787
851#define SET_LOCALE(locale) rxvt_set_locale (locale) 788#define SET_LOCALE(locale) rxvt_set_locale (locale)
852extern bool rxvt_set_locale (const char *locale); 789extern bool rxvt_set_locale (const char *locale) NOTHROW;
853extern void rxvt_push_locale (const char *locale); 790extern void rxvt_push_locale (const char *locale) NOTHROW;
854extern void rxvt_pop_locale (); 791extern void rxvt_pop_locale () NOTHROW;
855
856/****************************************************************************/
857
858#define BLINK_INTERVAL 0.5
859#define TEXT_BLINK_INTERVAL 0.5
860
861#ifndef __attribute__
862# ifdef __GNUC__
863# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
864# define __attribute__(x)
865# endif
866# endif
867# define __attribute__(x)
868#endif
869 792
870/****************************************************************************/ 793/****************************************************************************/
871 794
872#define LINE_LONGER 0x0001 // line is continued on the next row 795#define LINE_LONGER 0x0001 // line is continued on the next row
873#define LINE_FILTERED 0x0002 // line has been filtered 796#define LINE_FILTERED 0x0002 // line has been filtered
874#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 797#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
798#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
799#define LINE_BIDI 0x0010 // line needs bidi (NYI)
875 800
876struct line_t { 801struct line_t {
877 text_t *t; // terminal the text 802 text_t *t; // terminal the text
878 rend_t *r; // rendition, uses RS_ flags 803 rend_t *r; // rendition, uses RS_ flags
879 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 804 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
933# define COMPOSE_LO 0x40000000UL 858# define COMPOSE_LO 0x40000000UL
934# define COMPOSE_HI 0x400fffffUL 859# define COMPOSE_HI 0x400fffffUL
935# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 860# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
936#else 861#else
937# if ENABLE_PERL 862# if ENABLE_PERL
938# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 863# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
939# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 864# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
940# else 865# else
941# define COMPOSE_LO 0xd800UL 866# define COMPOSE_LO 0xd800UL
942# define COMPOSE_HI 0xf8ffUL 867# define COMPOSE_HI 0xf8ffUL
943# endif 868# endif
… …
972#endif 897#endif
973 898
974/****************************************************************************/ 899/****************************************************************************/
975 900
976#ifdef KEYSYM_RESOURCE 901#ifdef KEYSYM_RESOURCE
977 class keyboard_manager; 902class keyboard_manager;
978#endif 903#endif
979 904
980struct rxvt_term : zero_initialized, rxvt_vars { 905struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
906
907 // special markers with magic addresses
908 static const char resval_undef []; // options specifically unset
909 static const char resval_on []; // boolean options switched on
910 static const char resval_off []; // or off
911
981 log_callback *log_hook; // log error messages through this hook, if != 0 912 log_callback *log_hook; // log error messages through this hook, if != 0
982 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 913 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
983#if ENABLE_PERL 914#if ENABLE_PERL
984 rxvt_perl_term perl; 915 rxvt_perl_term perl;
985#endif 916#endif
986 struct mbstate mbstate; // current input multibyte state 917 struct mbstate mbstate; // current input multibyte state
… …
992#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 923#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
993 am_transparent:1, /* is a transparent term */ 924 am_transparent:1, /* is a transparent term */
994 am_pixmap_trans:1, /* transparency w/known root pixmap */ 925 am_pixmap_trans:1, /* transparency w/known root pixmap */
995#endif 926#endif
996 current_screen:1, /* primary or secondary */ 927 current_screen:1, /* primary or secondary */
997 hate_those_clicks:1, /* a.k.a. keep mark position */
998 num_scr_allow:1, 928 num_scr_allow:1,
999 bypass_keystate:1, 929 bypass_keystate:1,
1000#ifdef CURSOR_BLINK 930#ifdef CURSOR_BLINK
1001 hidden_cursor:1, 931 hidden_cursor:1,
1002#endif 932#endif
… …
1017#endif 947#endif
1018 scrollbar_align, 948 scrollbar_align,
1019 selection_wait, 949 selection_wait,
1020 selection_type; 950 selection_type;
1021/* ---------- */ 951/* ---------- */
952 bool rvideo_state, rvideo_mode;
953#ifndef NO_BELL
1022 short rvideo; 954 bool rvideo_bell;
955#endif
1023 int num_scr; /* screen: number lines scrolled */ 956 int num_scr; /* screen: number lines scrolled */
1024 int prev_ncol, /* screen: previous number of columns */ 957 int prev_ncol, /* screen: previous number of columns */
1025 prev_nrow; /* screen: previous number of rows */ 958 prev_nrow; /* screen: previous number of rows */
1026/* ---------- */ 959/* ---------- */
1027 rend_t rstyle; 960 rend_t rstyle;
1028/* ---------- */
1029 uint32_t pixcolor_set[NPIXCLR_SETS];
1030/* ---------- */ 961/* ---------- */
1031#ifdef SELECTION_SCROLLING 962#ifdef SELECTION_SCROLLING
1032 int scroll_selection_lines; 963 int scroll_selection_lines;
1033 enum page_dirn scroll_selection_dir; 964 enum page_dirn scroll_selection_dir;
1034 int selection_save_x, 965 int selection_save_x,
… …
1061 int old_width, /* last used width in screen resize */ 992 int old_width, /* last used width in screen resize */
1062 old_height; /* last used height in screen resize */ 993 old_height; /* last used height in screen resize */
1063 unsigned long priv_modes, 994 unsigned long priv_modes,
1064 SavedModes; 995 SavedModes;
1065/* ---------- */ 996/* ---------- */
1066 Atom xa[NUM_XA]; 997 Atom *xa;
1067/* ---------- */ 998/* ---------- */
1068#ifdef RXVT_SCROLLBAR 999#ifdef RXVT_SCROLLBAR
1069 GC scrollbarGC, 1000 GC scrollbarGC,
1070 topShadowGC, 1001 topShadowGC,
1071 botShadowGC; 1002 botShadowGC;
… …
1116#if ENABLE_OVERLAY 1047#if ENABLE_OVERLAY
1117 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1048 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1118 text_t **ov_text; 1049 text_t **ov_text;
1119 rend_t **ov_rend; 1050 rend_t **ov_rend;
1120 1051
1121 void scr_swap_overlay (); 1052 void scr_swap_overlay () NOTHROW;
1122 void scr_overlay_new (int x, int y, int w, int h); 1053 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1123 void scr_overlay_off (); 1054 void scr_overlay_off () NOTHROW;
1124 void scr_overlay_set (int x, int y, 1055 void scr_overlay_set (int x, int y,
1125 text_t text, 1056 text_t text,
1126 rend_t rend = OVERLAY_RSTYLE); 1057 rend_t rend = OVERLAY_RSTYLE) NOTHROW;
1127 void scr_overlay_set (int x, int y, const char *s); 1058 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1128 void scr_overlay_set (int x, int y, const wchar_t *s); 1059 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1129#endif 1060#endif
1130 1061
1131 vector<void *> allocated; // free these memory blocks with free() 1062 vector<void *> allocated; // free these memory blocks with free()
1132 1063
1133 char *env_windowid; /* environmental variable WINDOWID */ 1064 char env_windowid[21]; /* environmental variable WINDOWID */
1065 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1134 char *env_display; /* environmental variable DISPLAY */ 1066 char *env_display; /* environmental variable DISPLAY */
1135 char *env_term; /* environmental variable TERM */ 1067 char *env_term; /* environmental variable TERM */
1136 char *env_colorfgbg; 1068
1137 char *locale; 1069 char *locale;
1138 char charsets[4]; 1070 char charsets[4];
1139 char *v_buffer; /* pointer to physical buffer */ 1071 char *v_buffer; /* pointer to physical buffer */
1140 unsigned int v_buflen; /* size of area to write */ 1072 unsigned int v_buflen; /* size of area to write */
1141 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1073 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1142 1074
1143#ifdef KEYSYM_RESOURCE 1075#ifdef KEYSYM_RESOURCE
1144 keyboard_manager *keyboard; 1076 keyboard_manager *keyboard;
1145#endif 1077#endif
1146 1078
1147 const char *rs[NUM_RESOURCES]; 1079 const char *rs[NUM_RESOURCES];
1148 /* command input buffering */ 1080 /* command input buffering */
1149 char *cmdbuf_ptr, *cmdbuf_endp; 1081 char *cmdbuf_ptr, *cmdbuf_endp;
1150 char cmdbuf_base[CBUFSIZ]; 1082 char cmdbuf_base[CBUFSIZ];
1151 1083
1152 rxvt_ptytty *pty; 1084 ptytty *pty;
1153 1085
1154 rxvt_salloc *talloc; // text line allocator 1086 rxvt_salloc *talloc; // text line allocator
1155 rxvt_salloc *ralloc; // rend line allocator 1087 rxvt_salloc *ralloc; // rend line allocator
1156 1088
1157 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1089 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1166 void iso14755_54 (int x, int y); 1098 void iso14755_54 (int x, int y);
1167# endif 1099# endif
1168#endif 1100#endif
1169 1101
1170 // modifies first argument(!) 1102 // modifies first argument(!)
1171 void paste (char *data, unsigned int len); 1103 void paste (char *data, unsigned int len) NOTHROW;
1172 1104
1173 long vt_emask, vt_emask_perl; 1105 long vt_emask, vt_emask_perl, vt_emask_xim;
1174 1106
1175 void vt_select_input () const 1107 void vt_select_input () const NOTHROW
1176 { 1108 {
1177 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1109 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1178 } 1110 }
1179 1111
1180#if TRANSPARENT 1112#if TRANSPARENT || ENABLE_PERL
1181 void rootwin_cb (XEvent &xev); 1113 void rootwin_cb (XEvent &xev);
1182 xevent_watcher rootwin_ev; 1114 xevent_watcher rootwin_ev;
1183#endif 1115#endif
1184 1116
1185 void x_cb (XEvent &xev); 1117 void x_cb (XEvent &xev);
… …
1192 1124
1193 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1125 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1194 void check_cb (check_watcher &w); check_watcher check_ev; 1126 void check_cb (check_watcher &w); check_watcher check_ev;
1195 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1127 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1196 void flush_cb (time_watcher &w); time_watcher flush_ev; 1128 void flush_cb (time_watcher &w); time_watcher flush_ev;
1197
1198 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1129 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1199
1200 void incr_cb (time_watcher &w); time_watcher incr_ev; 1130 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1201 1131
1202#ifdef CURSOR_BLINK 1132#ifdef CURSOR_BLINK
1203 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1133 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1204#endif 1134#endif
1205#ifdef TEXT_BLINK 1135#ifdef TEXT_BLINK
1206 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1136 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1137#endif
1138#ifndef NO_BELL
1139 void bell_cb (time_watcher &w); time_watcher bell_ev;
1207#endif 1140#endif
1208 1141
1209#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1210 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1143 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1211#endif 1144#endif
… …
1231 rxvt_term (); 1164 rxvt_term ();
1232 ~rxvt_term (); 1165 ~rxvt_term ();
1233 void destroy (); 1166 void destroy ();
1234 void emergency_cleanup (); 1167 void emergency_cleanup ();
1235 1168
1236 bool init (int argc, const char *const *argv); 1169 bool init (int argc, const char *const *argv, stringvec *envv);
1170
1171 bool init (stringvec *argv, stringvec *envv)
1172 {
1173 this->argv = argv;
1174 return init (argv->size (), argv->begin (), envv);
1175 }
1176
1237 bool init_vars (); 1177 bool init_vars ();
1238 1178
1239 bool pty_fill (); 1179 bool pty_fill ();
1240 1180
1241 void make_current () const // make this the "currently active" urxvt instance 1181 void make_current () const // make this the "currently active" urxvt instance
1242 { 1182 {
1243 SET_R (this); 1183 SET_R (this);
1184 set_environ (envv);
1244 rxvt_set_locale (locale); 1185 rxvt_set_locale (locale);
1245 set_environ (envv);
1246 } 1186 }
1247 1187
1248 void init_secondary (); 1188 void init_secondary ();
1249 const char **init_resources (int argc, const char *const *argv); 1189 const char **init_resources (int argc, const char *const *argv);
1250 const char *x_resource (const char *name); 1190 const char *x_resource (const char *name);
… …
1260 void create_windows (int argc, const char *const *argv); 1200 void create_windows (int argc, const char *const *argv);
1261 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1201 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1262 void window_calc (unsigned int newwidth, unsigned int newheight); 1202 void window_calc (unsigned int newwidth, unsigned int newheight);
1263 1203
1264#if USE_XIM 1204#if USE_XIM
1265 rxvt_xim *input_method; 1205 rxvt_xim *input_method;
1266 XIC Input_Context; 1206 XIC Input_Context;
1267 XIMStyle input_style; 1207 XIMStyle input_style;
1268 XPoint spot; // most recently sent spot position 1208 XPoint spot; // most recently sent spot position
1269 1209
1270 void im_destroy (); 1210 void im_destroy ();
1271 void im_cb (); im_watcher im_ev; 1211 void im_cb (); im_watcher im_ev;
1272 void im_set_size (XRectangle &size); 1212 void im_set_size (XRectangle &size);
1273 void im_set_position (XPoint &pos); 1213 void im_set_position (XPoint &pos) NOTHROW;
1274 void im_set_color (unsigned long &fg, unsigned long &bg); 1214 void im_set_color (unsigned long &fg, unsigned long &bg);
1275 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1215 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1276 1216
1277 bool IMisRunning (); 1217 bool IMisRunning ();
1278 void IMSendSpot (); 1218 void IMSendSpot ();
1279 bool IM_get_IC (const char *modifiers); 1219 bool IM_get_IC (const char *modifiers);
1280 void IMSetStatusPosition (); 1220 void IMSetPosition ();
1281#endif 1221#endif
1282 1222
1283 void resize_scrollbar (); 1223 void resize_scrollbar ();
1284 1224
1285 void pixel_position (int *x, int *y);
1286
1287 void selection_click (int clicks, int x, int y);
1288 void selection_extend (int x, int y, int flag);
1289 void selection_rotate (int x, int y);
1290
1291 /* autoconvert */
1292
1293 // command.C 1225 // command.C
1294 void lookup_key (XKeyEvent &ev); 1226 void key_press (XKeyEvent &ev);
1227 void key_release (XKeyEvent &ev);
1295 unsigned int cmd_write (const char *str, unsigned int count); 1228 unsigned int cmd_write (const char *str, unsigned int count);
1296 1229
1297 wchar_t next_char (); 1230 wchar_t next_char () NOTHROW;
1298 wchar_t cmd_getc (); 1231 wchar_t cmd_getc () THROW ((class out_of_input));
1299 uint32_t next_octet (); 1232 uint32_t next_octet () NOTHROW;
1300 uint32_t cmd_get8 (); 1233 uint32_t cmd_get8 () THROW ((class out_of_input));
1301 1234
1302 bool cmd_parse (); 1235 bool cmd_parse ();
1303 void mouse_report (XButtonEvent &ev); 1236 void mouse_report (XButtonEvent &ev);
1304 void button_press (XButtonEvent &ev); 1237 void button_press (XButtonEvent &ev);
1305 void button_release (XButtonEvent &ev); 1238 void button_release (XButtonEvent &ev);
1306 void focus_in (); 1239 void focus_in ();
1307 void focus_out (); 1240 void focus_out ();
1241 void update_fade_color (unsigned int idx);
1308 int check_our_parents (); 1242 int check_our_parents ();
1309#ifdef PRINTPIPE 1243#ifdef PRINTPIPE
1310 FILE *popen_printer (); 1244 FILE *popen_printer ();
1311 int pclose_printer (FILE *stream); 1245 int pclose_printer (FILE *stream);
1312#endif 1246#endif
… …
1334 void set_utf8_property (Atom prop, const char *str, int len = -1); 1268 void set_utf8_property (Atom prop, const char *str, int len = -1);
1335 void set_title (const char *str); 1269 void set_title (const char *str);
1336 void set_icon_name (const char *str); 1270 void set_icon_name (const char *str);
1337 void set_window_color (int idx, const char *color); 1271 void set_window_color (int idx, const char *color);
1338 void set_colorfgbg (); 1272 void set_colorfgbg ();
1339 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1273 bool set_color (rxvt_color &color, const char *name);
1274 void alias_color (int dst, int src);
1340 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1275 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1341 1276
1342 // screen.C 1277 // screen.C
1343 1278
1344 void lalloc (line_t &l) const 1279 void lalloc (line_t &l) const
… …
1367 1302
1368 if (ncol > prev_ncol) 1303 if (ncol > prev_ncol)
1369 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1304 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1370 } 1305 }
1371 1306
1372 int fgcolor_of (rend_t r) const 1307 int fgcolor_of (rend_t r) const NOTHROW
1373 { 1308 {
1374 int base = GET_BASEFG (r); 1309 int base = GET_BASEFG (r);
1375#ifndef NO_BRIGHTCOLOR 1310#ifndef NO_BRIGHTCOLOR
1376 if (r & RS_Bold 1311 if (r & RS_Bold
1377# if ENABLE_STYLES 1312# if ENABLE_STYLES
… …
1381 base += minBrightCOLOR - minCOLOR; 1316 base += minBrightCOLOR - minCOLOR;
1382#endif 1317#endif
1383 return base; 1318 return base;
1384 } 1319 }
1385 1320
1386 int bgcolor_of (rend_t r) const 1321 int bgcolor_of (rend_t r) const NOTHROW
1387 { 1322 {
1388 int base = GET_BASEBG (r); 1323 int base = GET_BASEBG (r);
1389#ifndef NO_BRIGHTCOLOR 1324#ifndef NO_BRIGHTCOLOR
1390 if (r & RS_Blink 1325 if (r & RS_Blink
1391# if ENABLE_STYLES 1326# if ENABLE_STYLES
… …
1395 base += minBrightCOLOR - minCOLOR; 1330 base += minBrightCOLOR - minCOLOR;
1396#endif 1331#endif
1397 return base; 1332 return base;
1398 } 1333 }
1399 1334
1400 bool option (uint32_t opt) const 1335 bool option (uint32_t opt) const NOTHROW
1401 { 1336 {
1402 return OPTION (opt); 1337 return OPTION (opt);
1403 } 1338 }
1404 1339
1405 void set_option (uint32_t opt, bool set) 1340 void set_option (uint32_t opt, bool set) NOTHROW
1406 { 1341 {
1407 if (set) 1342 if (set)
1408 options |= opt; 1343 options |= opt;
1409 else 1344 else
1410 options &= ~opt; 1345 options &= ~opt;
1411 } 1346 }
1412 1347
1413 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const; 1348 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; 1349 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1415 int scr_scroll_text (int row1, int row2, int count); 1350 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1416 void scr_reset (); 1351 void scr_reset ();
1417 void scr_release (); 1352 void scr_release () NOTHROW;
1418 void scr_clear (bool really = false); 1353 void scr_clear (bool really = false) NOTHROW;
1419 void scr_refresh (); 1354 void scr_refresh () NOTHROW;
1420 bool scr_refresh_rend (rend_t mask, rend_t value); 1355 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1421 void scr_erase_screen (int mode); 1356 void scr_erase_screen (int mode) NOTHROW;
1422#if ENABLE_FRILLS 1357#if ENABLE_FRILLS
1423 void scr_erase_savelines (); 1358 void scr_erase_savelines () NOTHROW;
1424 void scr_backindex (); 1359 void scr_backindex () NOTHROW;
1425 void scr_forwardindex (); 1360 void scr_forwardindex () NOTHROW;
1426#endif 1361#endif
1427 void scr_touch (bool refresh); 1362 void scr_touch (bool refresh) NOTHROW;
1428 void scr_expose (int x, int y, int width, int height, bool refresh); 1363 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1429 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1364 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1430 void scr_recolour (); 1365 void scr_recolour () NOTHROW;
1431 void scr_remap_chars (); 1366 void scr_remap_chars () NOTHROW;
1432 void scr_remap_chars (line_t &l); 1367 void scr_remap_chars (line_t &l) NOTHROW;
1433 1368
1434 enum cursor_mode { SAVE, RESTORE }; 1369 enum cursor_mode { SAVE, RESTORE };
1435 1370
1436 void scr_poweron (); 1371 void scr_poweron ();
1437 void scr_cursor (cursor_mode mode); 1372 void scr_cursor (cursor_mode mode) NOTHROW;
1438 void scr_do_wrap (); 1373 void scr_do_wrap () NOTHROW;
1374 void scr_swap_screen () NOTHROW;
1439 int scr_change_screen (int scrn); 1375 void scr_change_screen (int scrn);
1440 void scr_color (unsigned int color, int fgbg); 1376 void scr_color (unsigned int color, int fgbg) NOTHROW;
1441 void scr_rendition (int set, int style); 1377 void scr_rendition (int set, int style) NOTHROW;
1442 void scr_add_lines (const wchar_t *str, int len, int minlines = 0); 1378 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1443 void scr_backspace (); 1379 void scr_backspace () NOTHROW;
1444 void scr_tab (int count, bool ht = false); 1380 void scr_tab (int count, bool ht = false) NOTHROW;
1445 void scr_gotorc (int row, int col, int relative); 1381 void scr_gotorc (int row, int col, int relative) NOTHROW;
1446 void scr_index (enum page_dirn direction); 1382 void scr_index (enum page_dirn direction) NOTHROW;
1447 void scr_erase_line (int mode); 1383 void scr_erase_line (int mode) NOTHROW;
1448 void scr_E (); 1384 void scr_E () NOTHROW;
1449 void scr_insdel_lines (int count, int insdel); 1385 void scr_insdel_lines (int count, int insdel) NOTHROW;
1450 void scr_insdel_chars (int count, int insdel); 1386 void scr_insdel_chars (int count, int insdel) NOTHROW;
1451 void scr_scroll_region (int top, int bot); 1387 void scr_scroll_region (int top, int bot) NOTHROW;
1452 void scr_cursor_visible (int mode); 1388 void scr_cursor_visible (int mode) NOTHROW;
1453 void scr_autowrap (int mode); 1389 void scr_autowrap (int mode) NOTHROW;
1454 void scr_relative_origin (int mode); 1390 void scr_relative_origin (int mode) NOTHROW;
1455 void scr_insert_mode (int mode); 1391 void scr_insert_mode (int mode) NOTHROW;
1456 void scr_set_tab (int mode); 1392 void scr_set_tab (int mode) NOTHROW;
1457 void scr_rvideo_mode (int mode); 1393 void scr_rvideo_mode (bool on) NOTHROW;
1458 void scr_report_position (); 1394 void scr_report_position () NOTHROW;
1459 void set_font_style (); 1395 void set_font_style () NOTHROW;
1460 void scr_charset_choose (int set); 1396 void scr_charset_choose (int set) NOTHROW;
1461 void scr_charset_set (int set, unsigned int ch); 1397 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1462 void scr_move_to (int y, int len); 1398 void scr_move_to (int y, int len) NOTHROW;
1463 bool scr_page (enum page_dirn direction, int nlines); 1399 bool scr_page (enum page_dirn direction, int nlines) NOTHROW;
1464 bool scr_changeview (int new_view_start); 1400 bool scr_changeview (int new_view_start) NOTHROW;
1465 void scr_bell (); 1401 void scr_bell () NOTHROW;
1466 void scr_printscreen (int fullhist); 1402 void scr_printscreen (int fullhist) NOTHROW;
1467 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); 1403 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1468 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); 1404 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1469 void scr_reverse_selection (); 1405 void scr_reverse_selection () NOTHROW;
1470 void scr_dump (int fd); 1406 void scr_dump (int fd) NOTHROW;
1407
1471 void selection_check (int check_more); 1408 void selection_check (int check_more) NOTHROW;
1472 void selection_paste (Window win, Atom prop, bool delete_prop); 1409 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1473 void selection_property (Window win, Atom prop); 1410 void selection_property (Window win, Atom prop) NOTHROW;
1474 void selection_request (Time tm); 1411 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1475 int selection_request_other (Atom target, int selnum); 1412 int selection_request_other (Atom target, int selnum) NOTHROW;
1476 void selection_clear (); 1413 void selection_clear () NOTHROW;
1477 void selection_make (Time tm); 1414 void selection_make (Time tm);
1478 bool selection_grab (Time tm); 1415 bool selection_grab (Time tm) NOTHROW;
1479 void selection_start_colrow (int col, int row); 1416 void selection_start_colrow (int col, int row) NOTHROW;
1480 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1417 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1481 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1418 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1482 void selection_remove_trailing_spaces (); 1419 void selection_remove_trailing_spaces () NOTHROW;
1483 void selection_send (const XSelectionRequestEvent &rq); 1420 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1421 void selection_click (int clicks, int x, int y) NOTHROW;
1422 void selection_extend (int x, int y, int flag) NOTHROW;
1423 void selection_rotate (int x, int y) NOTHROW;
1424
1425 void pixel_position (int *x, int *y) NOTHROW;
1484 1426
1485#if defined(NEXT_SCROLLBAR) 1427#if defined(NEXT_SCROLLBAR)
1486 // scrollbar-next.C 1428 // scrollbar-next.C
1487 Pixmap renderPixmap (const char *const *data, int width, int height); 1429 Pixmap renderPixmap (const char *const *data, int width, int height);
1488 void init_scrollbar_stuff (); 1430 void init_scrollbar_stuff ();
… …
1530# define __PROTO(p) p 1472# define __PROTO(p) p
1531#else 1473#else
1532# define __PROTO(p) () 1474# define __PROTO(p) ()
1533#endif 1475#endif
1534 1476
1535#ifdef DEBUG_malloc
1536# include "dmalloc.h" /* This comes last */
1537#endif
1538
1539#endif /* _RXVT_H_ */ 1477#endif /* _RXVT_H_ */
1540 1478

Diff Legend

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