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.210 by root, Mon Jan 16 17:11:12 2006 UTC vs.
Revision 1.263 by root, Thu Nov 2 17:23:50 2006 UTC

… …
8#if defined (ISO_14755) || defined (ENABLE_PERL) 8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 9# define ENABLE_OVERLAY 1
10#endif 10#endif
11 11
12#if ENABLE_PERL 12#if ENABLE_PERL
13# define ENABLE_FRILLS 1 13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 14# define ENABLE_COMBINING 1
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1
20# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
21#else 23#else
22# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
23#endif 25#endif
24 26
25#include <limits.h> 27#include <limits.h>
… …
31#if ENABLE_FRILLS 33#if ENABLE_FRILLS
32# include <X11/Xmd.h> 34# include <X11/Xmd.h>
33#endif 35#endif
34 36
35#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
36#include "rxvtfont.h" 39#include "rxvtfont.h"
37#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
38#include "iom.h" 41#include "iom.h"
39#include "salloc.h" 42#include "salloc.h"
43#include "libptytty.h"
40 44
41#include "rxvtperl.h" 45#include "rxvtperl.h"
42 46
43// try to avoid some macros to decrease code size, on some systems 47// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 48#if ENABLE_MINIMAL
… …
94# define STDIN_FILENO 0 98# define STDIN_FILENO 0
95# define STDOUT_FILENO 1 99# define STDOUT_FILENO 1
96# define STDERR_FILENO 2 100# define STDERR_FILENO 2
97#endif 101#endif
98 102
103/****************************************************************************/
104
105// exception thrown on fatal (per-instance) errors
106class rxvt_failure_exception { };
107
108// exception thrown when the command parser runs out of input data
109class out_of_input { };
110
99/* 111/*
100 ***************************************************************************** 112 *****************************************************************************
101 * PROTOTYPES 113 * PROTOTYPES
102 ***************************************************************************** 114 *****************************************************************************
103 */ 115 */
104// main.C 116// main.C
105RETSIGTYPE rxvt_Child_signal (int sig); 117RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
106RETSIGTYPE rxvt_Exit_signal (int sig); 118RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
107void rxvt_clean_exit (); 119void rxvt_clean_exit () NOTHROW;
108void * rxvt_malloc (size_t size); 120void * rxvt_malloc (size_t size);
109void * rxvt_calloc (size_t number, size_t size); 121void * rxvt_calloc (size_t number, size_t size);
110void * rxvt_realloc (void *ptr, size_t size); 122void * rxvt_realloc (void *ptr, size_t size);
111void rxvt_privileges (rxvt_privaction action);
112 123
113// util.C 124// misc.C
114char * rxvt_wcstombs (const wchar_t *str, int len = -1); 125char * rxvt_wcstombs (const wchar_t *str, int len = -1);
115wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 126wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
116char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 127char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
117wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 128wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
118char * rxvt_strdup (const char *str); 129char * rxvt_strdup_cpp (const char *str);
119 130
120// misc.C 131#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
132
121char * rxvt_r_basename (const char *str); 133char * rxvt_r_basename (const char *str) NOTHROW;
122void rxvt_vlog (const char *fmt, va_list arg_ptr); 134void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
123void rxvt_log (const char *fmt,...); 135void rxvt_log (const char *fmt,...) NOTHROW;
124void rxvt_warn (const char *fmt,...); 136void rxvt_warn (const char *fmt,...) NOTHROW;
125void rxvt_fatal (const char *fmt,...); 137void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
126void rxvt_exit_failure (); 138void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
139
127int rxvt_Str_match (const char *s1, const char *s2); 140int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
128const char * rxvt_Str_skip_space (const char *str); 141const char * rxvt_Str_skip_space (const char *str) NOTHROW;
129char * rxvt_Str_trim (char *str); 142char * rxvt_Str_trim (char *str) NOTHROW;
130int rxvt_Str_escaped (char *str); 143int rxvt_Str_escaped (char *str) NOTHROW;
131char ** rxvt_splitcommastring (const char *cs); 144char ** rxvt_splitcommastring (const char *cs) NOTHROW;
132void rxvt_freecommastring (char **cs); 145void rxvt_freecommastring (char **cs) NOTHROW;
133char * rxvt_File_find (const char *file, const char *ext, const char *path); 146char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
134void rxvt_usleep (int usecs);
135 147
136///////////////////////////////////////////////////////////////////////////// 148/////////////////////////////////////////////////////////////////////////////
137 149
138// temporarily replace the process environment 150// temporarily replace the process environment
139extern char **environ; 151extern char **environ;
140extern char **rxvt_environ; // the original environ pointer 152extern char **rxvt_environ; // the original environ pointer
141 153
142inline void set_environ (stringvec *envv) 154inline void set_environ (stringvec *envv)
143{ 155{
156#if ENABLE_PERL
157 assert (envv);
158#else
144 if (envv) 159 if (envv)
160#endif
145 environ = (char **)envv->begin (); 161 environ = (char **)envv->begin ();
146} 162}
147 163
148inline void set_environ (char **envv) 164inline void set_environ (char **envv)
149{ 165{
166#if ENABLE_PERL
167 assert (envv);
168#else
150 if (envv) 169 if (envv)
170#endif
151 environ = envv; 171 environ = envv;
152} 172}
153 173
154/* 174/*
155 ***************************************************************************** 175 *****************************************************************************
… …
336 * | 356 * |
337 * +---< SB_WIDTH_NEXT 357 * +---< SB_WIDTH_NEXT
338 */ 358 */
339 359
340enum { 360enum {
341 NO_REFRESH = 0 , /* Window not visible at all! */ 361 NO_REFRESH = 0, /* Window not visible at all! */
342 FAST_REFRESH = 1<<0, /* Fully exposed window */ 362 FAST_REFRESH = 1, /* Fully exposed window */
343 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 363 SLOW_REFRESH = 2, /* Partially exposed window */
344 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
345}; 364};
346 365
347#ifdef NO_SECONDARY_SCREEN 366#ifdef NO_SECONDARY_SCREEN
348# define NSCREENS 0 367# define NSCREENS 0
349#else 368#else
… …
393 412
394// fake styles 413// fake styles
395#define RS_Blink 0x00010000UL // blink 414#define RS_Blink 0x00010000UL // blink
396#define RS_RVid 0x00020000UL // reverse video 415#define RS_RVid 0x00020000UL // reverse video
397#define RS_Uline 0x00040000UL // underline 416#define RS_Uline 0x00040000UL // underline
417
418// toggle this to force redraw, must be != RS_Careful
419#define RS_redraw 0x01000000UL
398 420
399// 5 custom bits for extensions 421// 5 custom bits for extensions
400#define RS_customCount 32 422#define RS_customCount 32
401#define RS_customMask 0x00f80000UL 423#define RS_customMask 0x00f80000UL
402#define RS_customShift 19 424#define RS_customShift 19
… …
472 Rxvt_restoreFG = 39, // change default fg color 494 Rxvt_restoreFG = 39, // change default fg color
473 Rxvt_restoreBG = 49, // change default bg color 495 Rxvt_restoreBG = 49, // change default bg color
474 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 496 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
475 497
476 URxvt_locale = 701, // change locale 498 URxvt_locale = 701, // change locale
499 URxvt_version = 702, // request version
477 500
478 URxvt_Color_IT = 704, // change actual 'Italic' colour 501 URxvt_Color_IT = 704, // change actual 'Italic' colour
479 URxvt_Color_tint = 705, // change actual tint colour 502 URxvt_Color_tint = 705, // change actual tint colour
480 URxvt_Color_BD = 706, 503 URxvt_Color_BD = 706,
481 URxvt_Color_UL = 707, 504 URxvt_Color_UL = 707,
… …
497 * on the unnecessary items, e.g. Color_pointer, but won't bother 520 * on the unnecessary items, e.g. Color_pointer, but won't bother
498 * until we need to. Also, be aware of usage in pixcolor_set 521 * until we need to. Also, be aware of usage in pixcolor_set
499 */ 522 */
500 523
501enum colour_list { 524enum colour_list {
525 Color_none = -2,
526 Color_transparent = -1,
502 Color_fg = 0, 527 Color_fg = 0,
503 Color_bg, 528 Color_bg,
504 minCOLOR, /* 2 */ 529 minCOLOR, /* 2 */
505 Color_Black = minCOLOR, 530 Color_Black = minCOLOR,
506 Color_Red3, 531 Color_Red3,
… …
566#endif 591#endif
567}; 592};
568 593
569#define Color_Bits 7 // 0 .. maxTermCOLOR 594#define Color_Bits 7 // 0 .. maxTermCOLOR
570 595
571#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
572#define NPIXCLR_BITS 32
573
574/* 596/*
575 * Resource list 597 * Resource list
576 */ 598 */
577enum { 599enum {
578# define def(name) Rs_ ## name, 600# define def(name) Rs_ ## name,
579# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 601# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
580# include "rsinc.h" 602# include "rsinc.h"
581# undef def 603# undef def
582# undef reserve 604# undef reserve
583 NUM_RESOURCES 605 NUM_RESOURCES
584};
585
586// see init.C:xa_names, which must be kept in sync
587enum {
588 XA_TEXT = 0,
589 XA_COMPOUND_TEXT,
590 XA_UTF8_STRING,
591 XA_MULTIPLE,
592 XA_TARGETS,
593 XA_TIMESTAMP,
594 XA_VT_SELECTION,
595 XA_INCR,
596 XA_WM_PROTOCOLS,
597 XA_WM_DELETE_WINDOW,
598 XA_CLIPBOARD,
599#if ENABLE_FRILLS
600 XA_MOTIF_WM_HINTS,
601#endif
602#if ENABLE_EWMH
603 XA_NET_WM_PID,
604 XA_NET_WM_NAME,
605 XA_NET_WM_ICON_NAME,
606 XA_NET_WM_PING,
607#endif
608#if USE_XIM
609 XA_WM_LOCALE_NAME,
610#endif
611#if TRANSPARENT
612 XA_XROOTPMAP_ID,
613 XA_ESETROOT_PMAP_ID,
614#endif
615#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
616 XA_DNDPROTOCOL,
617 XA_DNDSELECTION,
618#endif
619#if ENABLE_XEMBED
620 XA_XEMBED,
621 XA_XEMBED_INFO,
622#endif
623 NUM_XA
624}; 606};
625 607
626/* DEC private modes */ 608/* DEC private modes */
627#define PrivMode_132 (1UL<<0) 609#define PrivMode_132 (1UL<<0)
628#define PrivMode_132OK (1UL<<1) 610#define PrivMode_132OK (1UL<<1)
… …
700/* 682/*
701 ***************************************************************************** 683 *****************************************************************************
702 * MACRO DEFINES 684 * MACRO DEFINES
703 ***************************************************************************** 685 *****************************************************************************
704 */ 686 */
705#define dDisp Display *disp = display->display 687#define dLocal(type,name) type const name = this->name
688
689// for speed reasons, we assume that all latin1 characters
690// are single-width (the first unicode combining character
691// is actually 0x300, but ascii is what matters most).
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
706 693
707/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
708#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
709#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
710#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
744#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 731#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
745#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 732#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
746 733
747#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 734#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
748 735
749#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 736#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
750#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 737#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
751 738
752#if ENABLE_STYLES 739#if ENABLE_STYLES
753# define FONTSET(style) fontset[GET_STYLE (style)] 740# define FONTSET(style) fontset[GET_STYLE (style)]
754#else 741#else
755# define FONTSET(style) fontset[0] 742# define FONTSET(style) fontset[0]
… …
789# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 776# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
790#else 777#else
791# define XPMClearArea(a, b, c, d, e, f, g) 778# define XPMClearArea(a, b, c, d, e, f, g)
792#endif 779#endif
793 780
794#ifdef UTMP_SUPPORT
795# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
796# undef HAVE_UTMPX_H
797# undef HAVE_STRUCT_UTMPX
798# endif
799# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
800# undef HAVE_UTMP_H
801# undef HAVE_STRUCT_UTMP
802# endif
803
804# ifdef HAVE_UTMPX_H
805# include <utmpx.h>
806# endif
807# ifdef HAVE_UTMP_H
808# include <utmp.h>
809# endif
810#endif
811
812#ifdef DEBUG_CMD
813# define D_CMD(x) fprintf x ; fputc('\n', stderr)
814#else
815# define D_CMD(x)
816#endif
817#ifdef DEBUG_INIT
818# define D_INIT(x) fprintf x ; fputc('\n', stderr)
819#else
820# define D_INIT(x)
821#endif
822#ifdef DEBUG_MAIN
823# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
824#else
825# define D_MAIN(x)
826#endif
827#ifdef DEBUG_SIZE
828# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
829#else
830# define D_SIZE(x)
831#endif
832
833extern class rxvt_failure_exception { } rxvt_failure_exception;
834
835typedef callback1<void, const char *> log_callback; 781typedef callback<void (const char *)> log_callback;
836typedef callback1<int, int> getfd_callback; 782typedef callback<int (int)> getfd_callback;
837
838extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
839extern void rxvt_log (const char *fmt, ...);
840extern void rxvt_warn (const char *fmt, ...);
841extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
842extern void rxvt_exit_failure () __attribute__ ((noreturn));
843 783
844#define SET_LOCALE(locale) rxvt_set_locale (locale) 784#define SET_LOCALE(locale) rxvt_set_locale (locale)
845extern bool rxvt_set_locale (const char *locale); 785extern bool rxvt_set_locale (const char *locale) NOTHROW;
846extern void rxvt_push_locale (const char *locale); 786extern void rxvt_push_locale (const char *locale) NOTHROW;
847extern void rxvt_pop_locale (); 787extern void rxvt_pop_locale () NOTHROW;
848
849/****************************************************************************/
850
851#define BLINK_INTERVAL 0.5
852#define TEXT_BLINK_INTERVAL 0.5
853
854#ifndef __attribute__
855# ifdef __GNUC__
856# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
857# define __attribute__(x)
858# endif
859# endif
860# define __attribute__(x)
861#endif
862 788
863/****************************************************************************/ 789/****************************************************************************/
864 790
865#define LINE_LONGER 0x0001 // line is continued on the next row 791#define LINE_LONGER 0x0001 // line is continued on the next row
866#define LINE_FILTERED 0x0002 // line has been filtered 792#define LINE_FILTERED 0x0002 // line has been filtered
867#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 793#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
794#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
795#define LINE_BIDI 0x0010 // line needs bidi (NYI)
868 796
869struct line_t { 797struct line_t {
870 text_t *t; // terminal the text 798 text_t *t; // terminal the text
871 rend_t *r; // rendition, uses RS_ flags 799 rend_t *r; // rendition, uses RS_ flags
872 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 800 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
926# define COMPOSE_LO 0x40000000UL 854# define COMPOSE_LO 0x40000000UL
927# define COMPOSE_HI 0x400fffffUL 855# define COMPOSE_HI 0x400fffffUL
928# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 856# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
929#else 857#else
930# if ENABLE_PERL 858# if ENABLE_PERL
931# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 859# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
932# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 860# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
933# else 861# else
934# define COMPOSE_LO 0xd800UL 862# define COMPOSE_LO 0xd800UL
935# define COMPOSE_HI 0xf8ffUL 863# define COMPOSE_HI 0xf8ffUL
936# endif 864# endif
… …
965#endif 893#endif
966 894
967/****************************************************************************/ 895/****************************************************************************/
968 896
969#ifdef KEYSYM_RESOURCE 897#ifdef KEYSYM_RESOURCE
970 class keyboard_manager; 898class keyboard_manager;
971#endif 899#endif
972 900
973struct rxvt_term : zero_initialized, rxvt_vars { 901struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
902
903 // special markers with magic addresses
904 static const char resval_undef []; // options specifically unset
905 static const char resval_on []; // boolean options switched on
906 static const char resval_off []; // or off
907
974 log_callback *log_hook; // log error messages through this hook, if != 0 908 log_callback *log_hook; // log error messages through this hook, if != 0
975 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 909 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
976#if ENABLE_PERL 910#if ENABLE_PERL
977 rxvt_perl_term perl; 911 rxvt_perl_term perl;
978#endif 912#endif
979 struct mbstate mbstate; // current input multibyte state 913 struct mbstate mbstate; // current input multibyte state
… …
985#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 919#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
986 am_transparent:1, /* is a transparent term */ 920 am_transparent:1, /* is a transparent term */
987 am_pixmap_trans:1, /* transparency w/known root pixmap */ 921 am_pixmap_trans:1, /* transparency w/known root pixmap */
988#endif 922#endif
989 current_screen:1, /* primary or secondary */ 923 current_screen:1, /* primary or secondary */
990 hate_those_clicks:1, /* a.k.a. keep mark position */
991 num_scr_allow:1, 924 num_scr_allow:1,
992 bypass_keystate:1, 925 bypass_keystate:1,
993#ifdef CURSOR_BLINK 926#ifdef CURSOR_BLINK
994 hidden_cursor:1, 927 hidden_cursor:1,
995#endif 928#endif
… …
1010#endif 943#endif
1011 scrollbar_align, 944 scrollbar_align,
1012 selection_wait, 945 selection_wait,
1013 selection_type; 946 selection_type;
1014/* ---------- */ 947/* ---------- */
948 bool rvideo_state, rvideo_mode;
949#ifndef NO_BELL
1015 short rvideo; 950 bool rvideo_bell;
951#endif
1016 int num_scr; /* screen: number lines scrolled */ 952 int num_scr; /* screen: number lines scrolled */
1017 int prev_ncol, /* screen: previous number of columns */ 953 int prev_ncol, /* screen: previous number of columns */
1018 prev_nrow; /* screen: previous number of rows */ 954 prev_nrow; /* screen: previous number of rows */
1019/* ---------- */ 955/* ---------- */
1020 rend_t rstyle; 956 rend_t rstyle;
1021/* ---------- */
1022 uint32_t pixcolor_set[NPIXCLR_SETS];
1023/* ---------- */ 957/* ---------- */
1024#ifdef SELECTION_SCROLLING 958#ifdef SELECTION_SCROLLING
1025 int scroll_selection_lines; 959 int scroll_selection_lines;
1026 enum page_dirn scroll_selection_dir; 960 enum page_dirn scroll_selection_dir;
1027 int selection_save_x, 961 int selection_save_x,
… …
1054 int old_width, /* last used width in screen resize */ 988 int old_width, /* last used width in screen resize */
1055 old_height; /* last used height in screen resize */ 989 old_height; /* last used height in screen resize */
1056 unsigned long priv_modes, 990 unsigned long priv_modes,
1057 SavedModes; 991 SavedModes;
1058/* ---------- */ 992/* ---------- */
1059 Atom xa[NUM_XA]; 993 Atom *xa;
1060/* ---------- */ 994/* ---------- */
1061#ifdef RXVT_SCROLLBAR 995#ifdef RXVT_SCROLLBAR
1062 GC scrollbarGC, 996 GC scrollbarGC,
1063 topShadowGC, 997 topShadowGC,
1064 botShadowGC; 998 botShadowGC;
… …
1098 const char *key_delete; 1032 const char *key_delete;
1099#endif 1033#endif
1100 struct mouse_event MEvent; 1034 struct mouse_event MEvent;
1101 XComposeStatus compose; 1035 XComposeStatus compose;
1102 ttymode_t tio; 1036 ttymode_t tio;
1103#ifdef UTMP_SUPPORT
1104# ifdef HAVE_STRUCT_UTMP
1105 struct utmp ut;
1106# endif
1107# ifdef HAVE_STRUCT_UTMPX
1108 struct utmpx utx;
1109# endif
1110# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1111 char ut_id[5];
1112# endif
1113 int utmp_pos;
1114#endif
1115 row_col_t oldcursor; 1037 row_col_t oldcursor;
1116#ifdef XPM_BACKGROUND 1038#ifdef XPM_BACKGROUND
1117 bgPixmap_t bgPixmap; 1039 bgPixmap_t bgPixmap;
1118 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1040 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1119#endif 1041#endif
… …
1121#if ENABLE_OVERLAY 1043#if ENABLE_OVERLAY
1122 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1044 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1123 text_t **ov_text; 1045 text_t **ov_text;
1124 rend_t **ov_rend; 1046 rend_t **ov_rend;
1125 1047
1126 void scr_swap_overlay (); 1048 void scr_swap_overlay () NOTHROW;
1127 void scr_overlay_new (int x, int y, int w, int h); 1049 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1128 void scr_overlay_off (); 1050 void scr_overlay_off () NOTHROW;
1129 void scr_overlay_set (int x, int y, 1051 void scr_overlay_set (int x, int y,
1130 text_t text, 1052 text_t text,
1131 rend_t rend = OVERLAY_RSTYLE); 1053 rend_t rend = OVERLAY_RSTYLE) NOTHROW;
1132 void scr_overlay_set (int x, int y, const char *s); 1054 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1133 void scr_overlay_set (int x, int y, const wchar_t *s); 1055 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1134#endif 1056#endif
1135 1057
1136 vector<void *> allocated; // free these memory blocks with free() 1058 vector<void *> allocated; // free these memory blocks with free()
1137 1059
1138 char *env_windowid; /* environmental variable WINDOWID */ 1060 char env_windowid[21]; /* environmental variable WINDOWID */
1061 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1139 char *env_display; /* environmental variable DISPLAY */ 1062 char *env_display; /* environmental variable DISPLAY */
1140 char *env_term; /* environmental variable TERM */ 1063 char *env_term; /* environmental variable TERM */
1141 char *env_colorfgbg; 1064
1142 char *locale; 1065 char *locale;
1143 char charsets[4]; 1066 char charsets[4];
1144 char *v_buffer; /* pointer to physical buffer */ 1067 char *v_buffer; /* pointer to physical buffer */
1145 unsigned int v_buflen; /* size of area to write */ 1068 unsigned int v_buflen; /* size of area to write */
1146 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1069 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1147 1070
1148#ifdef KEYSYM_RESOURCE 1071#ifdef KEYSYM_RESOURCE
1149 keyboard_manager *keyboard; 1072 keyboard_manager *keyboard;
1150#endif 1073#endif
1151 1074
1152 const char *rs[NUM_RESOURCES]; 1075 const char *rs[NUM_RESOURCES];
1153 /* command input buffering */ 1076 /* command input buffering */
1154 char *cmdbuf_ptr, *cmdbuf_endp; 1077 char *cmdbuf_ptr, *cmdbuf_endp;
1155 char cmdbuf_base[CBUFSIZ]; 1078 char cmdbuf_base[CBUFSIZ];
1079
1080 ptytty *pty;
1156 1081
1157 rxvt_salloc *talloc; // text line allocator 1082 rxvt_salloc *talloc; // text line allocator
1158 rxvt_salloc *ralloc; // rend line allocator 1083 rxvt_salloc *ralloc; // rend line allocator
1159 1084
1160 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1085 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1169 void iso14755_54 (int x, int y); 1094 void iso14755_54 (int x, int y);
1170# endif 1095# endif
1171#endif 1096#endif
1172 1097
1173 // modifies first argument(!) 1098 // modifies first argument(!)
1174 void paste (char *data, unsigned int len); 1099 void paste (char *data, unsigned int len) NOTHROW;
1175 1100
1176 long vt_emask, vt_emask_perl; 1101 long vt_emask, vt_emask_perl, vt_emask_xim;
1177 1102
1178 void vt_select_input () const 1103 void vt_select_input () const NOTHROW
1179 { 1104 {
1180 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1105 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1181 } 1106 }
1182 1107
1183#if TRANSPARENT 1108#if TRANSPARENT || ENABLE_PERL
1184 void rootwin_cb (XEvent &xev); 1109 void rootwin_cb (XEvent &xev);
1185 xevent_watcher rootwin_ev; 1110 xevent_watcher rootwin_ev;
1186#endif 1111#endif
1187 1112
1188 void x_cb (XEvent &xev); 1113 void x_cb (XEvent &xev);
… …
1191 xevent_watcher vt_ev; 1116 xevent_watcher vt_ev;
1192#ifdef HAVE_SCROLLBARS 1117#ifdef HAVE_SCROLLBARS
1193 xevent_watcher scrollbar_ev; 1118 xevent_watcher scrollbar_ev;
1194#endif 1119#endif
1195 1120
1121 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1196 void check_cb (check_watcher &w); check_watcher check_ev; 1122 void check_cb (check_watcher &w); check_watcher check_ev;
1197 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1123 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1198 void flush_cb (time_watcher &w); time_watcher flush_ev; 1124 void flush_cb (time_watcher &w); time_watcher flush_ev;
1199
1200 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1125 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1201
1202 void incr_cb (time_watcher &w); time_watcher incr_ev; 1126 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1203 1127
1204#ifdef CURSOR_BLINK 1128#ifdef CURSOR_BLINK
1205 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1129 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1206#endif 1130#endif
1207#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
1208 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1132 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1133#endif
1134#ifndef NO_BELL
1135 void bell_cb (time_watcher &w); time_watcher bell_ev;
1209#endif 1136#endif
1210 1137
1211#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1138#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1212 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1139 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1213#endif 1140#endif
… …
1230 1157
1231 void tt_winch (); 1158 void tt_winch ();
1232 1159
1233 rxvt_term (); 1160 rxvt_term ();
1234 ~rxvt_term (); 1161 ~rxvt_term ();
1235 void child_exit (); // child has exited, usually destroys
1236 void destroy (); 1162 void destroy ();
1237 void emergency_cleanup (); 1163 void emergency_cleanup ();
1238 1164
1239 bool init (int argc, const char *const *argv); 1165 bool init (int argc, const char *const *argv, stringvec *envv);
1166
1167 bool init (stringvec *argv, stringvec *envv)
1168 {
1169 this->argv = argv;
1170 return init (argv->size (), argv->begin (), envv);
1171 }
1172
1240 bool init_vars (); 1173 bool init_vars ();
1241 1174
1242 bool pty_fill (); 1175 bool pty_fill ();
1243 1176
1244 void make_current () const // make this the "currently active" urxvt instance 1177 void make_current () const // make this the "currently active" urxvt instance
1245 { 1178 {
1246 SET_R (this); 1179 SET_R (this);
1180 set_environ (envv);
1247 rxvt_set_locale (locale); 1181 rxvt_set_locale (locale);
1248 set_environ (envv);
1249 } 1182 }
1250 1183
1251 void init_secondary (); 1184 void init_secondary ();
1252 const char **init_resources (int argc, const char *const *argv); 1185 const char **init_resources (int argc, const char *const *argv);
1253 const char *x_resource (const char *name); 1186 const char *x_resource (const char *name);
… …
1263 void create_windows (int argc, const char *const *argv); 1196 void create_windows (int argc, const char *const *argv);
1264 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1197 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1265 void window_calc (unsigned int newwidth, unsigned int newheight); 1198 void window_calc (unsigned int newwidth, unsigned int newheight);
1266 1199
1267#if USE_XIM 1200#if USE_XIM
1268 rxvt_xim *input_method; 1201 rxvt_xim *input_method;
1269 XIC Input_Context; 1202 XIC Input_Context;
1270 XIMStyle input_style; 1203 XIMStyle input_style;
1271 XPoint spot; // most recently sent spot position 1204 XPoint spot; // most recently sent spot position
1272 1205
1273 void im_destroy (); 1206 void im_destroy ();
1274 void im_cb (); im_watcher im_ev; 1207 void im_cb (); im_watcher im_ev;
1275 void im_set_size (XRectangle &size); 1208 void im_set_size (XRectangle &size);
1276 void im_set_position (XPoint &pos); 1209 void im_set_position (XPoint &pos) NOTHROW;
1277 void im_set_color (unsigned long &fg, unsigned long &bg); 1210 void im_set_color (unsigned long &fg, unsigned long &bg);
1278 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1211 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1279 1212
1280 bool IMisRunning (); 1213 bool IMisRunning ();
1281 void IMSendSpot (); 1214 void IMSendSpot ();
1282 bool IM_get_IC (const char *modifiers); 1215 bool IM_get_IC (const char *modifiers);
1283 void IMSetStatusPosition (); 1216 void IMSetPosition ();
1284#endif 1217#endif
1285 1218
1286 void resize_scrollbar (); 1219 void resize_scrollbar ();
1287 1220
1288 void pixel_position (int *x, int *y);
1289
1290 void selection_click (int clicks, int x, int y);
1291 void selection_extend (int x, int y, int flag);
1292 void selection_rotate (int x, int y);
1293
1294 /* autoconvert */
1295
1296 // command.C 1221 // command.C
1297 void lookup_key (XKeyEvent &ev); 1222 void key_press (XKeyEvent &ev);
1223 void key_release (XKeyEvent &ev);
1298 unsigned int cmd_write (const char *str, unsigned int count); 1224 unsigned int cmd_write (const char *str, unsigned int count);
1299 1225
1300 wchar_t next_char (); 1226 wchar_t next_char () NOTHROW;
1301 wchar_t cmd_getc (); 1227 wchar_t cmd_getc () THROW ((class out_of_input));
1302 uint32_t next_octet (); 1228 uint32_t next_octet () NOTHROW;
1303 uint32_t cmd_get8 (); 1229 uint32_t cmd_get8 () THROW ((class out_of_input));
1304 1230
1305 bool cmd_parse (); 1231 bool cmd_parse ();
1306 void mouse_report (XButtonEvent &ev); 1232 void mouse_report (XButtonEvent &ev);
1307 void button_press (XButtonEvent &ev); 1233 void button_press (XButtonEvent &ev);
1308 void button_release (XButtonEvent &ev); 1234 void button_release (XButtonEvent &ev);
1309 void focus_in (); 1235 void focus_in ();
1310 void focus_out (); 1236 void focus_out ();
1237 void update_fade_color (unsigned int idx);
1311 int check_our_parents (); 1238 int check_our_parents ();
1312#ifdef PRINTPIPE 1239#ifdef PRINTPIPE
1313 FILE *popen_printer (); 1240 FILE *popen_printer ();
1314 int pclose_printer (FILE *stream); 1241 int pclose_printer (FILE *stream);
1315#endif 1242#endif
… …
1329 void process_sgr_mode (unsigned int nargs, const int *arg); 1256 void process_sgr_mode (unsigned int nargs, const int *arg);
1330 void process_graphics (); 1257 void process_graphics ();
1331 // init.C 1258 // init.C
1332 void Get_Colours (); 1259 void Get_Colours ();
1333 void get_ourmods (); 1260 void get_ourmods ();
1334 // logging.C
1335 void makeutent (const char *pty, const char *hostname);
1336 void cleanutent ();
1337 // main.C 1261 // main.C
1338 void privileged_utmp (rxvt_privaction action);
1339 bool set_fonts (); 1262 bool set_fonts ();
1340 void set_string_property (Atom prop, const char *str, int len = -1); 1263 void set_string_property (Atom prop, const char *str, int len = -1);
1341 void set_utf8_property (Atom prop, const char *str, int len = -1); 1264 void set_utf8_property (Atom prop, const char *str, int len = -1);
1342 void set_title (const char *str); 1265 void set_title (const char *str);
1343 void set_icon_name (const char *str); 1266 void set_icon_name (const char *str);
1344 void set_window_color (int idx, const char *color); 1267 void set_window_color (int idx, const char *color);
1345 void set_colorfgbg (); 1268 void set_colorfgbg ();
1346 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1269 bool set_color (rxvt_color &color, const char *name);
1270 void alias_color (int dst, int src);
1347 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1271 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1348 1272
1349 // screen.C 1273 // screen.C
1350 1274
1351 void lalloc (line_t &l) const 1275 void lalloc (line_t &l) const
… …
1374 1298
1375 if (ncol > prev_ncol) 1299 if (ncol > prev_ncol)
1376 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1300 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1377 } 1301 }
1378 1302
1379 int fgcolor_of (rend_t r) const 1303 int fgcolor_of (rend_t r) const NOTHROW
1380 { 1304 {
1381 int base = GET_BASEFG (r); 1305 int base = GET_BASEFG (r);
1382#ifndef NO_BRIGHTCOLOR 1306#ifndef NO_BRIGHTCOLOR
1383 if (r & RS_Bold 1307 if (r & RS_Bold
1384# if ENABLE_STYLES 1308# if ENABLE_STYLES
… …
1388 base += minBrightCOLOR - minCOLOR; 1312 base += minBrightCOLOR - minCOLOR;
1389#endif 1313#endif
1390 return base; 1314 return base;
1391 } 1315 }
1392 1316
1393 int bgcolor_of (rend_t r) const 1317 int bgcolor_of (rend_t r) const NOTHROW
1394 { 1318 {
1395 int base = GET_BASEBG (r); 1319 int base = GET_BASEBG (r);
1396#ifndef NO_BRIGHTCOLOR 1320#ifndef NO_BRIGHTCOLOR
1397 if (r & RS_Blink 1321 if (r & RS_Blink
1398# if ENABLE_STYLES 1322# if ENABLE_STYLES
… …
1402 base += minBrightCOLOR - minCOLOR; 1326 base += minBrightCOLOR - minCOLOR;
1403#endif 1327#endif
1404 return base; 1328 return base;
1405 } 1329 }
1406 1330
1407 bool option (uint32_t opt) const 1331 bool option (uint32_t opt) const NOTHROW
1408 { 1332 {
1409 return OPTION (opt); 1333 return OPTION (opt);
1410 } 1334 }
1411 1335
1412 void set_option (uint32_t opt, bool set) 1336 void set_option (uint32_t opt, bool set) NOTHROW
1413 { 1337 {
1414 if (set) 1338 if (set)
1415 options |= opt; 1339 options |= opt;
1416 else 1340 else
1417 options &= ~opt; 1341 options &= ~opt;
1418 } 1342 }
1419 1343
1420 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const; 1344 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1421 void scr_blank_screen_mem (line_t &l, rend_t efs) const; 1345 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1422 int scr_scroll_text (int row1, int row2, int count); 1346 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1423 void scr_reset (); 1347 void scr_reset ();
1424 void scr_release (); 1348 void scr_release () NOTHROW;
1425 void scr_clear (bool really = false); 1349 void scr_clear (bool really = false) NOTHROW;
1426 void scr_refresh (unsigned char refresh_type); 1350 void scr_refresh () NOTHROW;
1427 bool scr_refresh_rend (rend_t mask, rend_t value); 1351 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1428 void scr_erase_screen (int mode); 1352 void scr_erase_screen (int mode) NOTHROW;
1429#if ENABLE_FRILLS 1353#if ENABLE_FRILLS
1430 void scr_erase_savelines (); 1354 void scr_erase_savelines () NOTHROW;
1431 void scr_backindex (); 1355 void scr_backindex () NOTHROW;
1432 void scr_forwardindex (); 1356 void scr_forwardindex () NOTHROW;
1433#endif 1357#endif
1434 void scr_touch (bool refresh); 1358 void scr_touch (bool refresh) NOTHROW;
1435 void scr_expose (int x, int y, int width, int height, bool refresh); 1359 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1436 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1360 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1437 void scr_recolour (); 1361 void scr_recolour () NOTHROW;
1438 void scr_remap_chars (); 1362 void scr_remap_chars () NOTHROW;
1439 void scr_remap_chars (line_t &l); 1363 void scr_remap_chars (line_t &l) NOTHROW;
1364
1365 enum cursor_mode { SAVE, RESTORE };
1440 1366
1441 void scr_poweron (); 1367 void scr_poweron ();
1442 void scr_cursor (int mode); 1368 void scr_cursor (cursor_mode mode) NOTHROW;
1443 void scr_do_wrap (); 1369 void scr_do_wrap () NOTHROW;
1370 void scr_swap_screen () NOTHROW;
1444 int scr_change_screen (int scrn); 1371 void scr_change_screen (int scrn);
1445 void scr_color (unsigned int color, int fgbg); 1372 void scr_color (unsigned int color, int fgbg) NOTHROW;
1446 void scr_rendition (int set, int style); 1373 void scr_rendition (int set, int style) NOTHROW;
1447 void scr_add_lines (const wchar_t *str, int len, int minlines = 0); 1374 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1448 void scr_backspace (); 1375 void scr_backspace () NOTHROW;
1449 void scr_tab (int count, bool ht = false); 1376 void scr_tab (int count, bool ht = false) NOTHROW;
1450 void scr_gotorc (int row, int col, int relative); 1377 void scr_gotorc (int row, int col, int relative) NOTHROW;
1451 void scr_index (enum page_dirn direction); 1378 void scr_index (enum page_dirn direction) NOTHROW;
1452 void scr_erase_line (int mode); 1379 void scr_erase_line (int mode) NOTHROW;
1453 void scr_E (); 1380 void scr_E () NOTHROW;
1454 void scr_insdel_lines (int count, int insdel); 1381 void scr_insdel_lines (int count, int insdel) NOTHROW;
1455 void scr_insdel_chars (int count, int insdel); 1382 void scr_insdel_chars (int count, int insdel) NOTHROW;
1456 void scr_scroll_region (int top, int bot); 1383 void scr_scroll_region (int top, int bot) NOTHROW;
1457 void scr_cursor_visible (int mode); 1384 void scr_cursor_visible (int mode) NOTHROW;
1458 void scr_autowrap (int mode); 1385 void scr_autowrap (int mode) NOTHROW;
1459 void scr_relative_origin (int mode); 1386 void scr_relative_origin (int mode) NOTHROW;
1460 void scr_insert_mode (int mode); 1387 void scr_insert_mode (int mode) NOTHROW;
1461 void scr_set_tab (int mode); 1388 void scr_set_tab (int mode) NOTHROW;
1462 void scr_rvideo_mode (int mode); 1389 void scr_rvideo_mode (bool on) NOTHROW;
1463 void scr_report_position (); 1390 void scr_report_position () NOTHROW;
1464 void set_font_style (); 1391 void set_font_style () NOTHROW;
1465 void scr_charset_choose (int set); 1392 void scr_charset_choose (int set) NOTHROW;
1466 void scr_charset_set (int set, unsigned int ch); 1393 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1467 void scr_move_to (int y, int len); 1394 void scr_move_to (int y, int len) NOTHROW;
1468 bool scr_page (enum page_dirn direction, int nlines); 1395 bool scr_page (enum page_dirn direction, int nlines) NOTHROW;
1469 bool scr_changeview (int new_view_start); 1396 bool scr_changeview (int new_view_start) NOTHROW;
1470 void scr_bell (); 1397 void scr_bell () NOTHROW;
1471 void scr_printscreen (int fullhist); 1398 void scr_printscreen (int fullhist) NOTHROW;
1472 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); 1399 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1473 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); 1400 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1474 void scr_reverse_selection (); 1401 void scr_reverse_selection () NOTHROW;
1475 void scr_dump (int fd); 1402 void scr_dump (int fd) NOTHROW;
1403
1476 void selection_check (int check_more); 1404 void selection_check (int check_more) NOTHROW;
1477 void selection_paste (Window win, Atom prop, bool delete_prop); 1405 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1478 void selection_property (Window win, Atom prop); 1406 void selection_property (Window win, Atom prop) NOTHROW;
1479 void selection_request (Time tm, int x, int y); 1407 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1480 int selection_request_other (Atom target, int selnum); 1408 int selection_request_other (Atom target, int selnum) NOTHROW;
1481 void selection_clear (); 1409 void selection_clear () NOTHROW;
1482 void selection_make (Time tm); 1410 void selection_make (Time tm);
1483 bool selection_grab (Time tm); 1411 bool selection_grab (Time tm) NOTHROW;
1484 void selection_start_colrow (int col, int row); 1412 void selection_start_colrow (int col, int row) NOTHROW;
1485 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1413 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1486 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1414 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1487 void selection_remove_trailing_spaces (); 1415 void selection_remove_trailing_spaces () NOTHROW;
1488 void selection_send (const XSelectionRequestEvent &rq); 1416 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1417 void selection_click (int clicks, int x, int y) NOTHROW;
1418 void selection_extend (int x, int y, int flag) NOTHROW;
1419 void selection_rotate (int x, int y) NOTHROW;
1420
1421 void pixel_position (int *x, int *y) NOTHROW;
1489 1422
1490#if defined(NEXT_SCROLLBAR) 1423#if defined(NEXT_SCROLLBAR)
1491 // scrollbar-next.C 1424 // scrollbar-next.C
1492 Pixmap renderPixmap (const char *const *data, int width, int height); 1425 Pixmap renderPixmap (const char *const *data, int width, int height);
1493 void init_scrollbar_stuff (); 1426 void init_scrollbar_stuff ();
… …
1495 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1428 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1496#endif 1429#endif
1497 1430
1498#if defined(RXVT_SCROLLBAR) 1431#if defined(RXVT_SCROLLBAR)
1499 // scrollbar-rxvt.C 1432 // scrollbar-rxvt.C
1500 void Draw_button (int x, int y, int state, int dirn);
1501 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1433 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1502#endif 1434#endif
1503 1435
1504#if defined(XTERM_SCROLLBAR) 1436#if defined(XTERM_SCROLLBAR)
1505 // scrollbar-xterm.C 1437 // scrollbar-xterm.C
… …
1536# define __PROTO(p) p 1468# define __PROTO(p) p
1537#else 1469#else
1538# define __PROTO(p) () 1470# define __PROTO(p) ()
1539#endif 1471#endif
1540 1472
1541#ifdef DEBUG_malloc
1542# include "dmalloc.h" /* This comes last */
1543#endif
1544
1545#endif /* _RXVT_H_ */ 1473#endif /* _RXVT_H_ */
1546 1474

Diff Legend

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