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

Diff Legend

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