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.266 by root, Sat Jan 20 00:45:30 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 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 185
202/* 186/*
203 * the 'essential' information for reporting Mouse Events 187 * the 'essential' information for reporting Mouse Events
204 * pared down from XButtonEvent 188 * pared down from XButtonEvent
205 */ 189 */
… …
418// fake styles 402// fake styles
419#define RS_Blink 0x00010000UL // blink 403#define RS_Blink 0x00010000UL // blink
420#define RS_RVid 0x00020000UL // reverse video 404#define RS_RVid 0x00020000UL // reverse video
421#define RS_Uline 0x00040000UL // underline 405#define RS_Uline 0x00040000UL // underline
422 406
407// toggle this to force redraw, must be != RS_Careful
408#define RS_redraw 0x01000000UL
409
423// 5 custom bits for extensions 410// 5 custom bits for extensions
424#define RS_customCount 32 411#define RS_customCount 32
425#define RS_customMask 0x00f80000UL 412#define RS_customMask 0x00f80000UL
426#define RS_customShift 19 413#define RS_customShift 19
427 414
… …
496 Rxvt_restoreFG = 39, // change default fg color 483 Rxvt_restoreFG = 39, // change default fg color
497 Rxvt_restoreBG = 49, // change default bg color 484 Rxvt_restoreBG = 49, // change default bg color
498 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 485 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
499 486
500 URxvt_locale = 701, // change locale 487 URxvt_locale = 701, // change locale
488 URxvt_version = 702, // request version
501 489
502 URxvt_Color_IT = 704, // change actual 'Italic' colour 490 URxvt_Color_IT = 704, // change actual 'Italic' colour
503 URxvt_Color_tint = 705, // change actual tint colour 491 URxvt_Color_tint = 705, // change actual tint colour
504 URxvt_Color_BD = 706, 492 URxvt_Color_BD = 706,
505 URxvt_Color_UL = 707, 493 URxvt_Color_UL = 707,
… …
521 * 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
522 * 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
523 */ 511 */
524 512
525enum colour_list { 513enum colour_list {
514 Color_none = -2,
515 Color_transparent = -1,
526 Color_fg = 0, 516 Color_fg = 0,
527 Color_bg, 517 Color_bg,
528 minCOLOR, /* 2 */ 518 minCOLOR, /* 2 */
529 Color_Black = minCOLOR, 519 Color_Black = minCOLOR,
530 Color_Red3, 520 Color_Red3,
… …
590#endif 580#endif
591}; 581};
592 582
593#define Color_Bits 7 // 0 .. maxTermCOLOR 583#define Color_Bits 7 // 0 .. maxTermCOLOR
594 584
595#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
596#define NPIXCLR_BITS 32
597
598/* 585/*
599 * Resource list 586 * Resource list
600 */ 587 */
601enum { 588enum {
602# define def(name) Rs_ ## name, 589# define def(name) Rs_ ## name,
603# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 590# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
604# include "rsinc.h" 591# include "rsinc.h"
605# undef def 592# undef def
606# undef reserve 593# undef reserve
607 NUM_RESOURCES 594 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}; 595};
649 596
650/* DEC private modes */ 597/* DEC private modes */
651#define PrivMode_132 (1UL<<0) 598#define PrivMode_132 (1UL<<0)
652#define PrivMode_132OK (1UL<<1) 599#define PrivMode_132OK (1UL<<1)
… …
725 ***************************************************************************** 672 *****************************************************************************
726 * MACRO DEFINES 673 * MACRO DEFINES
727 ***************************************************************************** 674 *****************************************************************************
728 */ 675 */
729#define dLocal(type,name) type const name = this->name 676#define dLocal(type,name) type const name = this->name
730#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))
731 681
732/* convert pixel dimensions to row/column values. Everything as int32_t */ 682/* convert pixel dimensions to row/column values. Everything as int32_t */
733#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 683#define Pixel2Col(x) Pixel2Width((int32_t)(x))
734#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 684#define Pixel2Row(y) Pixel2Height((int32_t)(y))
735#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 685#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
738#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 688#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
739#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 689#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
740#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 690#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
741 691
742#define OPTION(opt) (options & (opt)) 692#define OPTION(opt) (options & (opt))
743#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ 693#define DEFAULT_OPTIONS (Opt_scrollBar \
744 | Opt_jumpScroll | Opt_secondaryScreen \ 694 | Opt_scrollTtyOutput \
745 | Opt_pastableTabs | Opt_intensityStyles) 695 | Opt_jumpScroll \
696 | Opt_secondaryScreen \
697 | Opt_secondaryScroll \
698 | Opt_pastableTabs \
699 | Opt_intensityStyles)
746 700
747// for m >= -n, ensure remainder lies between 0..n-1 701// for m >= -n, ensure remainder lies between 0..n-1
748#define MOD(m,n) (((m) + (n)) % (n)) 702#define MOD(m,n) (((m) + (n)) % (n))
749 703
750#define LINENO(n) MOD (term_start + int(n), total_rows) 704#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
769#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 723#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
770#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 724#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
771 725
772#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 726#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
773 727
774#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 728#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
775#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 729#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
776 730
777#if ENABLE_STYLES 731#if ENABLE_STYLES
778# define FONTSET(style) fontset[GET_STYLE (style)] 732# define FONTSET(style) fontset[GET_STYLE (style)]
779#else 733#else
780# define FONTSET(style) fontset[0] 734# define FONTSET(style) fontset[0]
… …
814# 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))
815#else 769#else
816# define XPMClearArea(a, b, c, d, e, f, g) 770# define XPMClearArea(a, b, c, d, e, f, g)
817#endif 771#endif
818 772
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; 773typedef callback<void (const char *)> log_callback;
843typedef callback1<int, int> getfd_callback; 774typedef 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 775
851#define SET_LOCALE(locale) rxvt_set_locale (locale) 776#define SET_LOCALE(locale) rxvt_set_locale (locale)
852extern bool rxvt_set_locale (const char *locale); 777extern bool rxvt_set_locale (const char *locale) NOTHROW;
853extern void rxvt_push_locale (const char *locale); 778extern void rxvt_push_locale (const char *locale) NOTHROW;
854extern void rxvt_pop_locale (); 779extern 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 780
870/****************************************************************************/ 781/****************************************************************************/
871 782
872#define LINE_LONGER 0x0001 // line is continued on the next row 783#define LINE_LONGER 0x0001 // line is continued on the next row
873#define LINE_FILTERED 0x0002 // line has been filtered 784#define LINE_FILTERED 0x0002 // line has been filtered
874#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)
875 788
876struct line_t { 789struct line_t {
877 text_t *t; // terminal the text 790 text_t *t; // terminal the text
878 rend_t *r; // rendition, uses RS_ flags 791 rend_t *r; // rendition, uses RS_ flags
879 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
… …
933# define COMPOSE_LO 0x40000000UL 846# define COMPOSE_LO 0x40000000UL
934# define COMPOSE_HI 0x400fffffUL 847# define COMPOSE_HI 0x400fffffUL
935# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 848# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
936#else 849#else
937# if ENABLE_PERL 850# if ENABLE_PERL
938# 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
939# 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
940# else 853# else
941# define COMPOSE_LO 0xd800UL 854# define COMPOSE_LO 0xd800UL
942# define COMPOSE_HI 0xf8ffUL 855# define COMPOSE_HI 0xf8ffUL
943# endif 856# endif
… …
972#endif 885#endif
973 886
974/****************************************************************************/ 887/****************************************************************************/
975 888
976#ifdef KEYSYM_RESOURCE 889#ifdef KEYSYM_RESOURCE
977 class keyboard_manager; 890class keyboard_manager;
978#endif 891#endif
979 892
980struct 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
981 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
982 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
983#if ENABLE_PERL 902#if ENABLE_PERL
984 rxvt_perl_term perl; 903 rxvt_perl_term perl;
985#endif 904#endif
986 struct mbstate mbstate; // current input multibyte state 905 struct mbstate mbstate; // current input multibyte state
… …
992#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 911#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
993 am_transparent:1, /* is a transparent term */ 912 am_transparent:1, /* is a transparent term */
994 am_pixmap_trans:1, /* transparency w/known root pixmap */ 913 am_pixmap_trans:1, /* transparency w/known root pixmap */
995#endif 914#endif
996 current_screen:1, /* primary or secondary */ 915 current_screen:1, /* primary or secondary */
997 hate_those_clicks:1, /* a.k.a. keep mark position */
998 num_scr_allow:1, 916 num_scr_allow:1,
999 bypass_keystate:1, 917 bypass_keystate:1,
1000#ifdef CURSOR_BLINK 918#ifdef CURSOR_BLINK
1001 hidden_cursor:1, 919 hidden_cursor:1,
1002#endif 920#endif
… …
1017#endif 935#endif
1018 scrollbar_align, 936 scrollbar_align,
1019 selection_wait, 937 selection_wait,
1020 selection_type; 938 selection_type;
1021/* ---------- */ 939/* ---------- */
940 bool rvideo_state, rvideo_mode;
941#ifndef NO_BELL
1022 short rvideo; 942 bool rvideo_bell;
943#endif
1023 int num_scr; /* screen: number lines scrolled */ 944 int num_scr; /* screen: number lines scrolled */
1024 int prev_ncol, /* screen: previous number of columns */ 945 int prev_ncol, /* screen: previous number of columns */
1025 prev_nrow; /* screen: previous number of rows */ 946 prev_nrow; /* screen: previous number of rows */
1026/* ---------- */ 947/* ---------- */
1027 rend_t rstyle; 948 rend_t rstyle;
1028/* ---------- */
1029 uint32_t pixcolor_set[NPIXCLR_SETS];
1030/* ---------- */ 949/* ---------- */
1031#ifdef SELECTION_SCROLLING 950#ifdef SELECTION_SCROLLING
1032 int scroll_selection_lines; 951 int scroll_selection_lines;
1033 enum page_dirn scroll_selection_dir; 952 enum page_dirn scroll_selection_dir;
1034 int selection_save_x, 953 int selection_save_x,
… …
1061 int old_width, /* last used width in screen resize */ 980 int old_width, /* last used width in screen resize */
1062 old_height; /* last used height in screen resize */ 981 old_height; /* last used height in screen resize */
1063 unsigned long priv_modes, 982 unsigned long priv_modes,
1064 SavedModes; 983 SavedModes;
1065/* ---------- */ 984/* ---------- */
1066 Atom xa[NUM_XA]; 985 Atom *xa;
1067/* ---------- */ 986/* ---------- */
1068#ifdef RXVT_SCROLLBAR 987#ifdef RXVT_SCROLLBAR
1069 GC scrollbarGC, 988 GC scrollbarGC,
1070 topShadowGC, 989 topShadowGC,
1071 botShadowGC; 990 botShadowGC;
… …
1116#if ENABLE_OVERLAY 1035#if ENABLE_OVERLAY
1117 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1036 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1118 text_t **ov_text; 1037 text_t **ov_text;
1119 rend_t **ov_rend; 1038 rend_t **ov_rend;
1120 1039
1121 void scr_swap_overlay (); 1040 void scr_swap_overlay () NOTHROW;
1122 void scr_overlay_new (int x, int y, int w, int h); 1041 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1123 void scr_overlay_off (); 1042 void scr_overlay_off () NOTHROW;
1124 void scr_overlay_set (int x, int y, 1043 void scr_overlay_set (int x, int y,
1125 text_t text, 1044 text_t text,
1126 rend_t rend = OVERLAY_RSTYLE); 1045 rend_t rend = OVERLAY_RSTYLE) NOTHROW;
1127 void scr_overlay_set (int x, int y, const char *s); 1046 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); 1047 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1129#endif 1048#endif
1130 1049
1131 vector<void *> allocated; // free these memory blocks with free() 1050 vector<void *> allocated; // free these memory blocks with free()
1132 1051
1133 char *env_windowid; /* environmental variable WINDOWID */ 1052 char env_windowid[21]; /* environmental variable WINDOWID */
1053 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1134 char *env_display; /* environmental variable DISPLAY */ 1054 char *env_display; /* environmental variable DISPLAY */
1135 char *env_term; /* environmental variable TERM */ 1055 char *env_term; /* environmental variable TERM */
1136 char *env_colorfgbg; 1056
1137 char *locale; 1057 char *locale;
1138 char charsets[4]; 1058 char charsets[4];
1139 char *v_buffer; /* pointer to physical buffer */ 1059 char *v_buffer; /* pointer to physical buffer */
1140 unsigned int v_buflen; /* size of area to write */ 1060 unsigned int v_buflen; /* size of area to write */
1141 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1061 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1142 1062
1143#ifdef KEYSYM_RESOURCE 1063#ifdef KEYSYM_RESOURCE
1144 keyboard_manager *keyboard; 1064 keyboard_manager *keyboard;
1145#endif 1065#endif
1146 1066
1147 const char *rs[NUM_RESOURCES]; 1067 const char *rs[NUM_RESOURCES];
1148 /* command input buffering */ 1068 /* command input buffering */
1149 char *cmdbuf_ptr, *cmdbuf_endp; 1069 char *cmdbuf_ptr, *cmdbuf_endp;
1150 char cmdbuf_base[CBUFSIZ]; 1070 char cmdbuf_base[CBUFSIZ];
1151 1071
1152 rxvt_ptytty *pty; 1072 ptytty *pty;
1153 1073
1154 rxvt_salloc *talloc; // text line allocator 1074 rxvt_salloc *talloc; // text line allocator
1155 rxvt_salloc *ralloc; // rend line allocator 1075 rxvt_salloc *ralloc; // rend line allocator
1156 1076
1157 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1077 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1166 void iso14755_54 (int x, int y); 1086 void iso14755_54 (int x, int y);
1167# endif 1087# endif
1168#endif 1088#endif
1169 1089
1170 // modifies first argument(!) 1090 // modifies first argument(!)
1171 void paste (char *data, unsigned int len); 1091 void paste (char *data, unsigned int len) NOTHROW;
1172 1092
1173 long vt_emask, vt_emask_perl; 1093 long vt_emask, vt_emask_perl, vt_emask_xim;
1174 1094
1175 void vt_select_input () const 1095 void vt_select_input () const NOTHROW
1176 { 1096 {
1177 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1097 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1178 } 1098 }
1179 1099
1180#if TRANSPARENT 1100#if TRANSPARENT || ENABLE_PERL
1181 void rootwin_cb (XEvent &xev); 1101 void rootwin_cb (XEvent &xev);
1182 xevent_watcher rootwin_ev; 1102 xevent_watcher rootwin_ev;
1183#endif 1103#endif
1184 1104
1185 void x_cb (XEvent &xev); 1105 void x_cb (XEvent &xev);
… …
1192 1112
1193 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1113 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1194 void check_cb (check_watcher &w); check_watcher check_ev; 1114 void check_cb (check_watcher &w); check_watcher check_ev;
1195 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1115 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1196 void flush_cb (time_watcher &w); time_watcher flush_ev; 1116 void flush_cb (time_watcher &w); time_watcher flush_ev;
1197
1198 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1117 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1199
1200 void incr_cb (time_watcher &w); time_watcher incr_ev; 1118 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1201 1119
1202#ifdef CURSOR_BLINK 1120#ifdef CURSOR_BLINK
1203 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1121 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1204#endif 1122#endif
1205#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1206 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1124 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1125#endif
1126#ifndef NO_BELL
1127 void bell_cb (time_watcher &w); time_watcher bell_ev;
1207#endif 1128#endif
1208 1129
1209#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1130#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1210 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1131 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1211#endif 1132#endif
… …
1231 rxvt_term (); 1152 rxvt_term ();
1232 ~rxvt_term (); 1153 ~rxvt_term ();
1233 void destroy (); 1154 void destroy ();
1234 void emergency_cleanup (); 1155 void emergency_cleanup ();
1235 1156
1236 bool init (int argc, const char *const *argv); 1157 bool init (int argc, const char *const *argv, stringvec *envv);
1158
1159 bool init (stringvec *argv, stringvec *envv)
1160 {
1161 this->argv = argv;
1162 return init (argv->size (), argv->begin (), envv);
1163 }
1164
1237 bool init_vars (); 1165 bool init_vars ();
1238 1166
1239 bool pty_fill (); 1167 bool pty_fill ();
1240 1168
1241 void make_current () const // make this the "currently active" urxvt instance 1169 void make_current () const // make this the "currently active" urxvt instance
1242 { 1170 {
1243 SET_R (this); 1171 SET_R (this);
1172 set_environ (envv);
1244 rxvt_set_locale (locale); 1173 rxvt_set_locale (locale);
1245 set_environ (envv);
1246 } 1174 }
1247 1175
1248 void init_secondary (); 1176 void init_secondary ();
1249 const char **init_resources (int argc, const char *const *argv); 1177 const char **init_resources (int argc, const char *const *argv);
1250 const char *x_resource (const char *name); 1178 const char *x_resource (const char *name);
… …
1260 void create_windows (int argc, const char *const *argv); 1188 void create_windows (int argc, const char *const *argv);
1261 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1189 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1262 void window_calc (unsigned int newwidth, unsigned int newheight); 1190 void window_calc (unsigned int newwidth, unsigned int newheight);
1263 1191
1264#if USE_XIM 1192#if USE_XIM
1265 rxvt_xim *input_method; 1193 rxvt_xim *input_method;
1266 XIC Input_Context; 1194 XIC Input_Context;
1267 XIMStyle input_style; 1195 XIMStyle input_style;
1268 XPoint spot; // most recently sent spot position 1196 XPoint spot; // most recently sent spot position
1269 1197
1270 void im_destroy (); 1198 void im_destroy ();
1271 void im_cb (); im_watcher im_ev; 1199 void im_cb (); im_watcher im_ev;
1272 void im_set_size (XRectangle &size); 1200 void im_set_size (XRectangle &size);
1273 void im_set_position (XPoint &pos); 1201 void im_set_position (XPoint &pos) NOTHROW;
1274 void im_set_color (unsigned long &fg, unsigned long &bg); 1202 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); 1203 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1276 1204
1277 bool IMisRunning (); 1205 bool IMisRunning ();
1278 void IMSendSpot (); 1206 void IMSendSpot ();
1279 bool IM_get_IC (const char *modifiers); 1207 bool IM_get_IC (const char *modifiers);
1280 void IMSetStatusPosition (); 1208 void IMSetPosition ();
1281#endif 1209#endif
1282 1210
1283 void resize_scrollbar (); 1211 void resize_scrollbar ();
1284 1212
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 1213 // command.C
1294 void lookup_key (XKeyEvent &ev); 1214 void key_press (XKeyEvent &ev);
1215 void key_release (XKeyEvent &ev);
1295 unsigned int cmd_write (const char *str, unsigned int count); 1216 unsigned int cmd_write (const char *str, unsigned int count);
1296 1217
1297 wchar_t next_char (); 1218 wchar_t next_char () NOTHROW;
1298 wchar_t cmd_getc (); 1219 wchar_t cmd_getc () THROW ((class out_of_input));
1299 uint32_t next_octet (); 1220 uint32_t next_octet () NOTHROW;
1300 uint32_t cmd_get8 (); 1221 uint32_t cmd_get8 () THROW ((class out_of_input));
1301 1222
1302 bool cmd_parse (); 1223 bool cmd_parse ();
1303 void mouse_report (XButtonEvent &ev); 1224 void mouse_report (XButtonEvent &ev);
1304 void button_press (XButtonEvent &ev); 1225 void button_press (XButtonEvent &ev);
1305 void button_release (XButtonEvent &ev); 1226 void button_release (XButtonEvent &ev);
1306 void focus_in (); 1227 void focus_in ();
1307 void focus_out (); 1228 void focus_out ();
1229 void update_fade_color (unsigned int idx);
1308 int check_our_parents (); 1230 int check_our_parents ();
1309#ifdef PRINTPIPE 1231#ifdef PRINTPIPE
1310 FILE *popen_printer (); 1232 FILE *popen_printer ();
1311 int pclose_printer (FILE *stream); 1233 int pclose_printer (FILE *stream);
1312#endif 1234#endif
… …
1334 void set_utf8_property (Atom prop, const char *str, int len = -1); 1256 void set_utf8_property (Atom prop, const char *str, int len = -1);
1335 void set_title (const char *str); 1257 void set_title (const char *str);
1336 void set_icon_name (const char *str); 1258 void set_icon_name (const char *str);
1337 void set_window_color (int idx, const char *color); 1259 void set_window_color (int idx, const char *color);
1338 void set_colorfgbg (); 1260 void set_colorfgbg ();
1339 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1261 bool set_color (rxvt_color &color, const char *name);
1262 void alias_color (int dst, int src);
1340 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1263 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1341 1264
1342 // screen.C 1265 // screen.C
1343 1266
1344 void lalloc (line_t &l) const 1267 void lalloc (line_t &l) const
… …
1367 1290
1368 if (ncol > prev_ncol) 1291 if (ncol > prev_ncol)
1369 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1292 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1370 } 1293 }
1371 1294
1372 int fgcolor_of (rend_t r) const 1295 int fgcolor_of (rend_t r) const NOTHROW
1373 { 1296 {
1374 int base = GET_BASEFG (r); 1297 int base = GET_BASEFG (r);
1375#ifndef NO_BRIGHTCOLOR 1298#ifndef NO_BRIGHTCOLOR
1376 if (r & RS_Bold 1299 if (r & RS_Bold
1377# if ENABLE_STYLES 1300# if ENABLE_STYLES
… …
1381 base += minBrightCOLOR - minCOLOR; 1304 base += minBrightCOLOR - minCOLOR;
1382#endif 1305#endif
1383 return base; 1306 return base;
1384 } 1307 }
1385 1308
1386 int bgcolor_of (rend_t r) const 1309 int bgcolor_of (rend_t r) const NOTHROW
1387 { 1310 {
1388 int base = GET_BASEBG (r); 1311 int base = GET_BASEBG (r);
1389#ifndef NO_BRIGHTCOLOR 1312#ifndef NO_BRIGHTCOLOR
1390 if (r & RS_Blink 1313 if (r & RS_Blink
1391# if ENABLE_STYLES 1314# if ENABLE_STYLES
… …
1395 base += minBrightCOLOR - minCOLOR; 1318 base += minBrightCOLOR - minCOLOR;
1396#endif 1319#endif
1397 return base; 1320 return base;
1398 } 1321 }
1399 1322
1400 bool option (uint32_t opt) const 1323 bool option (uint32_t opt) const NOTHROW
1401 { 1324 {
1402 return OPTION (opt); 1325 return OPTION (opt);
1403 } 1326 }
1404 1327
1405 void set_option (uint32_t opt, bool set) 1328 void set_option (uint32_t opt, bool set) NOTHROW
1406 { 1329 {
1407 if (set) 1330 if (set)
1408 options |= opt; 1331 options |= opt;
1409 else 1332 else
1410 options &= ~opt; 1333 options &= ~opt;
1411 } 1334 }
1412 1335
1413 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const; 1336 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; 1337 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1415 int scr_scroll_text (int row1, int row2, int count); 1338 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1416 void scr_reset (); 1339 void scr_reset ();
1417 void scr_release (); 1340 void scr_release () NOTHROW;
1418 void scr_clear (bool really = false); 1341 void scr_clear (bool really = false) NOTHROW;
1419 void scr_refresh (); 1342 void scr_refresh () NOTHROW;
1420 bool scr_refresh_rend (rend_t mask, rend_t value); 1343 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1421 void scr_erase_screen (int mode); 1344 void scr_erase_screen (int mode) NOTHROW;
1422#if ENABLE_FRILLS 1345#if ENABLE_FRILLS
1423 void scr_erase_savelines (); 1346 void scr_erase_savelines () NOTHROW;
1424 void scr_backindex (); 1347 void scr_backindex () NOTHROW;
1425 void scr_forwardindex (); 1348 void scr_forwardindex () NOTHROW;
1426#endif 1349#endif
1427 void scr_touch (bool refresh); 1350 void scr_touch (bool refresh) NOTHROW;
1428 void scr_expose (int x, int y, int width, int height, bool refresh); 1351 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); 1352 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1430 void scr_recolour (); 1353 void scr_recolour () NOTHROW;
1431 void scr_remap_chars (); 1354 void scr_remap_chars () NOTHROW;
1432 void scr_remap_chars (line_t &l); 1355 void scr_remap_chars (line_t &l) NOTHROW;
1433 1356
1434 enum cursor_mode { SAVE, RESTORE }; 1357 enum cursor_mode { SAVE, RESTORE };
1435 1358
1436 void scr_poweron (); 1359 void scr_poweron ();
1437 void scr_cursor (cursor_mode mode); 1360 void scr_cursor (cursor_mode mode) NOTHROW;
1438 void scr_do_wrap (); 1361 void scr_do_wrap () NOTHROW;
1362 void scr_swap_screen () NOTHROW;
1439 int scr_change_screen (int scrn); 1363 void scr_change_screen (int scrn);
1440 void scr_color (unsigned int color, int fgbg); 1364 void scr_color (unsigned int color, int fgbg) NOTHROW;
1441 void scr_rendition (int set, int style); 1365 void scr_rendition (int set, int style) NOTHROW;
1442 void scr_add_lines (const wchar_t *str, int len, int minlines = 0); 1366 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1443 void scr_backspace (); 1367 void scr_backspace () NOTHROW;
1444 void scr_tab (int count, bool ht = false); 1368 void scr_tab (int count, bool ht = false) NOTHROW;
1445 void scr_gotorc (int row, int col, int relative); 1369 void scr_gotorc (int row, int col, int relative) NOTHROW;
1446 void scr_index (enum page_dirn direction); 1370 void scr_index (enum page_dirn direction) NOTHROW;
1447 void scr_erase_line (int mode); 1371 void scr_erase_line (int mode) NOTHROW;
1448 void scr_E (); 1372 void scr_E () NOTHROW;
1449 void scr_insdel_lines (int count, int insdel); 1373 void scr_insdel_lines (int count, int insdel) NOTHROW;
1450 void scr_insdel_chars (int count, int insdel); 1374 void scr_insdel_chars (int count, int insdel) NOTHROW;
1451 void scr_scroll_region (int top, int bot); 1375 void scr_scroll_region (int top, int bot) NOTHROW;
1452 void scr_cursor_visible (int mode); 1376 void scr_cursor_visible (int mode) NOTHROW;
1453 void scr_autowrap (int mode); 1377 void scr_autowrap (int mode) NOTHROW;
1454 void scr_relative_origin (int mode); 1378 void scr_relative_origin (int mode) NOTHROW;
1455 void scr_insert_mode (int mode); 1379 void scr_insert_mode (int mode) NOTHROW;
1456 void scr_set_tab (int mode); 1380 void scr_set_tab (int mode) NOTHROW;
1457 void scr_rvideo_mode (int mode); 1381 void scr_rvideo_mode (bool on) NOTHROW;
1458 void scr_report_position (); 1382 void scr_report_position () NOTHROW;
1459 void set_font_style (); 1383 void set_font_style () NOTHROW;
1460 void scr_charset_choose (int set); 1384 void scr_charset_choose (int set) NOTHROW;
1461 void scr_charset_set (int set, unsigned int ch); 1385 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1462 void scr_move_to (int y, int len); 1386 void scr_move_to (int y, int len) NOTHROW;
1463 bool scr_page (enum page_dirn direction, int nlines); 1387 bool scr_page (enum page_dirn direction, int nlines) NOTHROW;
1464 bool scr_changeview (int new_view_start); 1388 bool scr_changeview (int new_view_start) NOTHROW;
1465 void scr_bell (); 1389 void scr_bell () NOTHROW;
1466 void scr_printscreen (int fullhist); 1390 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); 1391 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); 1392 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 (); 1393 void scr_reverse_selection () NOTHROW;
1470 void scr_dump (int fd); 1394 void scr_dump (int fd) NOTHROW;
1395
1471 void selection_check (int check_more); 1396 void selection_check (int check_more) NOTHROW;
1472 void selection_paste (Window win, Atom prop, bool delete_prop); 1397 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1473 void selection_property (Window win, Atom prop); 1398 void selection_property (Window win, Atom prop) NOTHROW;
1474 void selection_request (Time tm); 1399 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1475 int selection_request_other (Atom target, int selnum); 1400 int selection_request_other (Atom target, int selnum) NOTHROW;
1476 void selection_clear (); 1401 void selection_clear () NOTHROW;
1477 void selection_make (Time tm); 1402 void selection_make (Time tm);
1478 bool selection_grab (Time tm); 1403 bool selection_grab (Time tm) NOTHROW;
1479 void selection_start_colrow (int col, int row); 1404 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); 1405 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); 1406 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1482 void selection_remove_trailing_spaces (); 1407 void selection_remove_trailing_spaces () NOTHROW;
1483 void selection_send (const XSelectionRequestEvent &rq); 1408 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1409 void selection_click (int clicks, int x, int y) NOTHROW;
1410 void selection_extend (int x, int y, int flag) NOTHROW;
1411 void selection_rotate (int x, int y) NOTHROW;
1412
1413 void pixel_position (int *x, int *y) NOTHROW;
1484 1414
1485#if defined(NEXT_SCROLLBAR) 1415#if defined(NEXT_SCROLLBAR)
1486 // scrollbar-next.C 1416 // scrollbar-next.C
1487 Pixmap renderPixmap (const char *const *data, int width, int height); 1417 Pixmap renderPixmap (const char *const *data, int width, int height);
1488 void init_scrollbar_stuff (); 1418 void init_scrollbar_stuff ();
… …
1530# define __PROTO(p) p 1460# define __PROTO(p) p
1531#else 1461#else
1532# define __PROTO(p) () 1462# define __PROTO(p) ()
1533#endif 1463#endif
1534 1464
1535#ifdef DEBUG_malloc
1536# include "dmalloc.h" /* This comes last */
1537#endif
1538
1539#endif /* _RXVT_H_ */ 1465#endif /* _RXVT_H_ */
1540 1466

Diff Legend

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