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

Diff Legend

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