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.222 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.248 by root, Mon Jan 30 16:12:58 2006 UTC

… …
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
21#else 22#else
22# define ENABLE_MINIMAL 1 23# define ENABLE_MINIMAL 1
23#endif 24#endif
24 25
… …
31#if ENABLE_FRILLS 32#if ENABLE_FRILLS
32# include <X11/Xmd.h> 33# include <X11/Xmd.h>
33#endif 34#endif
34 35
35#include "encoding.h" 36#include "encoding.h"
37#include "rxvtutil.h"
36#include "rxvtfont.h" 38#include "rxvtfont.h"
37#include "rxvttoolkit.h" 39#include "rxvttoolkit.h"
38#include "iom.h" 40#include "iom.h"
39#include "salloc.h" 41#include "salloc.h"
42#include "libptytty.h"
40 43
41#include "rxvtperl.h" 44#include "rxvtperl.h"
42 45
43// try to avoid some macros to decrease code size, on some systems 46// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 47#if ENABLE_MINIMAL
… …
94# define STDIN_FILENO 0 97# define STDIN_FILENO 0
95# define STDOUT_FILENO 1 98# define STDOUT_FILENO 1
96# define STDERR_FILENO 2 99# define STDERR_FILENO 2
97#endif 100#endif
98 101
99enum rxvt_privaction { IGNORE = 'i', SAVE = 's', RESTORE = 'r' };//TODO 102/****************************************************************************/
103
104// exception thrown on fatal (per-instance) errors
105class rxvt_failure_exception { };
106
107// exception thrown when the command parser runs out of input data
108class out_of_input { };
100 109
101/* 110/*
102 ***************************************************************************** 111 *****************************************************************************
103 * PROTOTYPES 112 * PROTOTYPES
104 ***************************************************************************** 113 *****************************************************************************
105 */ 114 */
106// main.C 115// main.C
107RETSIGTYPE rxvt_Child_signal (int sig); 116RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
108RETSIGTYPE rxvt_Exit_signal (int sig); 117RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
109void rxvt_clean_exit (); 118void rxvt_clean_exit () NOTHROW;
110void * rxvt_malloc (size_t size); 119void * rxvt_malloc (size_t size);
111void * rxvt_calloc (size_t number, size_t size); 120void * rxvt_calloc (size_t number, size_t size);
112void * rxvt_realloc (void *ptr, size_t size); 121void * rxvt_realloc (void *ptr, size_t size);
113void rxvt_privileges (rxvt_privaction action);
114 122
115// util.C 123// misc.C
116char * rxvt_wcstombs (const wchar_t *str, int len = -1); 124char * rxvt_wcstombs (const wchar_t *str, int len = -1);
117wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 125wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
118char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 126char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
119wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 127wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
120char * rxvt_strdup (const char *str); 128char * rxvt_strdup_cpp (const char *str);
121 129
122// misc.C 130#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
131
123char * rxvt_r_basename (const char *str); 132char * rxvt_r_basename (const char *str) NOTHROW;
124void rxvt_vlog (const char *fmt, va_list arg_ptr); 133void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
125void rxvt_log (const char *fmt,...); 134void rxvt_log (const char *fmt,...) NOTHROW;
126void rxvt_warn (const char *fmt,...); 135void rxvt_warn (const char *fmt,...) NOTHROW;
127void rxvt_fatal (const char *fmt,...); 136void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
128void rxvt_exit_failure (); 137void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
138
129int rxvt_Str_match (const char *s1, const char *s2); 139int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
130const char * rxvt_Str_skip_space (const char *str); 140const char * rxvt_Str_skip_space (const char *str) NOTHROW;
131char * rxvt_Str_trim (char *str); 141char * rxvt_Str_trim (char *str) NOTHROW;
132int rxvt_Str_escaped (char *str); 142int rxvt_Str_escaped (char *str) NOTHROW;
133char ** rxvt_splitcommastring (const char *cs); 143char ** rxvt_splitcommastring (const char *cs) NOTHROW;
134void rxvt_freecommastring (char **cs); 144void rxvt_freecommastring (char **cs) NOTHROW;
135char * rxvt_File_find (const char *file, const char *ext, const char *path); 145char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
136void rxvt_usleep (int usecs);
137 146
138///////////////////////////////////////////////////////////////////////////// 147/////////////////////////////////////////////////////////////////////////////
139 148
140// temporarily replace the process environment 149// temporarily replace the process environment
141extern char **environ; 150extern char **environ;
142extern char **rxvt_environ; // the original environ pointer 151extern char **rxvt_environ; // the original environ pointer
143 152
144inline void set_environ (stringvec *envv) 153inline void set_environ (stringvec *envv)
145{ 154{
155#if ENABLE_PERL
156 assert (envv);
157#else
146 if (envv) 158 if (envv)
159#endif
147 environ = (char **)envv->begin (); 160 environ = (char **)envv->begin ();
148} 161}
149 162
150inline void set_environ (char **envv) 163inline void set_environ (char **envv)
151{ 164{
165#if ENABLE_PERL
166 assert (envv);
167#else
152 if (envv) 168 if (envv)
169#endif
153 environ = envv; 170 environ = envv;
154} 171}
155 172
156/* 173/*
157 ***************************************************************************** 174 *****************************************************************************
… …
173typedef struct { 190typedef struct {
174 short w, h, x, y; 191 short w, h, x, y;
175 Pixmap pixmap; 192 Pixmap pixmap;
176} bgPixmap_t; 193} bgPixmap_t;
177#endif 194#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 195
201/* 196/*
202 * the 'essential' information for reporting Mouse Events 197 * the 'essential' information for reporting Mouse Events
203 * pared down from XButtonEvent 198 * pared down from XButtonEvent
204 */ 199 */
… …
417// fake styles 412// fake styles
418#define RS_Blink 0x00010000UL // blink 413#define RS_Blink 0x00010000UL // blink
419#define RS_RVid 0x00020000UL // reverse video 414#define RS_RVid 0x00020000UL // reverse video
420#define RS_Uline 0x00040000UL // underline 415#define RS_Uline 0x00040000UL // underline
421 416
417// toggle this to force redraw, must be != RS_Careful
418#define RS_redraw 0x01000000UL
419
422// 5 custom bits for extensions 420// 5 custom bits for extensions
423#define RS_customCount 32 421#define RS_customCount 32
424#define RS_customMask 0x00f80000UL 422#define RS_customMask 0x00f80000UL
425#define RS_customShift 19 423#define RS_customShift 19
426 424
… …
495 Rxvt_restoreFG = 39, // change default fg color 493 Rxvt_restoreFG = 39, // change default fg color
496 Rxvt_restoreBG = 49, // change default bg color 494 Rxvt_restoreBG = 49, // change default bg color
497 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 495 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
498 496
499 URxvt_locale = 701, // change locale 497 URxvt_locale = 701, // change locale
498 URxvt_version = 702, // request version
500 499
501 URxvt_Color_IT = 704, // change actual 'Italic' colour 500 URxvt_Color_IT = 704, // change actual 'Italic' colour
502 URxvt_Color_tint = 705, // change actual tint colour 501 URxvt_Color_tint = 705, // change actual tint colour
503 URxvt_Color_BD = 706, 502 URxvt_Color_BD = 706,
504 URxvt_Color_UL = 707, 503 URxvt_Color_UL = 707,
… …
604# undef def 603# undef def
605# undef reserve 604# undef reserve
606 NUM_RESOURCES 605 NUM_RESOURCES
607}; 606};
608 607
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};
648
649/* DEC private modes */ 608/* DEC private modes */
650#define PrivMode_132 (1UL<<0) 609#define PrivMode_132 (1UL<<0)
651#define PrivMode_132OK (1UL<<1) 610#define PrivMode_132OK (1UL<<1)
652#define PrivMode_rVideo (1UL<<2) 611#define PrivMode_rVideo (1UL<<2)
653#define PrivMode_relOrigin (1UL<<3) 612#define PrivMode_relOrigin (1UL<<3)
… …
724 ***************************************************************************** 683 *****************************************************************************
725 * MACRO DEFINES 684 * MACRO DEFINES
726 ***************************************************************************** 685 *****************************************************************************
727 */ 686 */
728#define dLocal(type,name) type const name = this->name 687#define dLocal(type,name) type const name = this->name
729#define dDisp Display *disp = this->display->display 688
689// for speed reasons, we assume that all latin1 characters
690// are single-width (the first unicode combining character
691// is actually 0x300, but ascii is what matters most).
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
730 693
731/* convert pixel dimensions to row/column values. Everything as int32_t */ 694/* convert pixel dimensions to row/column values. Everything as int32_t */
732#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 695#define Pixel2Col(x) Pixel2Width((int32_t)(x))
733#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 696#define Pixel2Row(y) Pixel2Height((int32_t)(y))
734#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
813# 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))
814#else 777#else
815# define XPMClearArea(a, b, c, d, e, f, g) 778# define XPMClearArea(a, b, c, d, e, f, g)
816#endif 779#endif
817 780
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; 781typedef callback1<void, const char *> log_callback;
842typedef callback1<int, int> getfd_callback; 782typedef callback1<int, int> getfd_callback;
843 783
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
850#define SET_LOCALE(locale) rxvt_set_locale (locale) 784#define SET_LOCALE(locale) rxvt_set_locale (locale)
851extern bool rxvt_set_locale (const char *locale); 785extern bool rxvt_set_locale (const char *locale) NOTHROW;
852extern void rxvt_push_locale (const char *locale); 786extern void rxvt_push_locale (const char *locale) NOTHROW;
853extern void rxvt_pop_locale (); 787extern 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 788
869/****************************************************************************/ 789/****************************************************************************/
870 790
871#define LINE_LONGER 0x0001 // line is continued on the next row 791#define LINE_LONGER 0x0001 // line is continued on the next row
872#define LINE_FILTERED 0x0002 // line has been filtered 792#define LINE_FILTERED 0x0002 // line has been filtered
… …
974 894
975#ifdef KEYSYM_RESOURCE 895#ifdef KEYSYM_RESOURCE
976 class keyboard_manager; 896 class keyboard_manager;
977#endif 897#endif
978 898
979struct rxvt_term : zero_initialized, rxvt_vars { 899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
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
… …
991#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 911#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
992 am_transparent:1, /* is a transparent term */ 912 am_transparent:1, /* is a transparent term */
993 am_pixmap_trans:1, /* transparency w/known root pixmap */ 913 am_pixmap_trans:1, /* transparency w/known root pixmap */
994#endif 914#endif
995 current_screen:1, /* primary or secondary */ 915 current_screen:1, /* primary or secondary */
996 hate_those_clicks:1, /* a.k.a. keep mark position */
997 num_scr_allow:1, 916 num_scr_allow:1,
998 bypass_keystate:1, 917 bypass_keystate:1,
999#ifdef CURSOR_BLINK 918#ifdef CURSOR_BLINK
1000 hidden_cursor:1, 919 hidden_cursor:1,
1001#endif 920#endif
… …
1016#endif 935#endif
1017 scrollbar_align, 936 scrollbar_align,
1018 selection_wait, 937 selection_wait,
1019 selection_type; 938 selection_type;
1020/* ---------- */ 939/* ---------- */
940 bool rvideo_state, rvideo_mode;
941#ifndef NO_BELL
1021 short rvideo; 942 bool rvideo_bell;
943#endif
1022 int num_scr; /* screen: number lines scrolled */ 944 int num_scr; /* screen: number lines scrolled */
1023 int prev_ncol, /* screen: previous number of columns */ 945 int prev_ncol, /* screen: previous number of columns */
1024 prev_nrow; /* screen: previous number of rows */ 946 prev_nrow; /* screen: previous number of rows */
1025/* ---------- */ 947/* ---------- */
1026 rend_t rstyle; 948 rend_t rstyle;
… …
1060 int old_width, /* last used width in screen resize */ 982 int old_width, /* last used width in screen resize */
1061 old_height; /* last used height in screen resize */ 983 old_height; /* last used height in screen resize */
1062 unsigned long priv_modes, 984 unsigned long priv_modes,
1063 SavedModes; 985 SavedModes;
1064/* ---------- */ 986/* ---------- */
1065 Atom xa[NUM_XA]; 987 Atom *xa;
1066/* ---------- */ 988/* ---------- */
1067#ifdef RXVT_SCROLLBAR 989#ifdef RXVT_SCROLLBAR
1068 GC scrollbarGC, 990 GC scrollbarGC,
1069 topShadowGC, 991 topShadowGC,
1070 botShadowGC; 992 botShadowGC;
… …
1115#if ENABLE_OVERLAY 1037#if ENABLE_OVERLAY
1116 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1038 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1117 text_t **ov_text; 1039 text_t **ov_text;
1118 rend_t **ov_rend; 1040 rend_t **ov_rend;
1119 1041
1120 void scr_swap_overlay (); 1042 void scr_swap_overlay () NOTHROW;
1121 void scr_overlay_new (int x, int y, int w, int h); 1043 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1122 void scr_overlay_off (); 1044 void scr_overlay_off () NOTHROW;
1123 void scr_overlay_set (int x, int y, 1045 void scr_overlay_set (int x, int y,
1124 text_t text, 1046 text_t text,
1125 rend_t rend = OVERLAY_RSTYLE); 1047 rend_t rend = OVERLAY_RSTYLE) NOTHROW;
1126 void scr_overlay_set (int x, int y, const char *s); 1048 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); 1049 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1128#endif 1050#endif
1129 1051
1130 vector<void *> allocated; // free these memory blocks with free() 1052 vector<void *> allocated; // free these memory blocks with free()
1131 1053
1132 char *env_windowid; /* environmental variable WINDOWID */ 1054 char env_windowid[21]; /* environmental variable WINDOWID */
1055 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1133 char *env_display; /* environmental variable DISPLAY */ 1056 char *env_display; /* environmental variable DISPLAY */
1134 char *env_term; /* environmental variable TERM */ 1057 char *env_term; /* environmental variable TERM */
1135 char *env_colorfgbg; 1058
1136 char *locale; 1059 char *locale;
1137 char charsets[4]; 1060 char charsets[4];
1138 char *v_buffer; /* pointer to physical buffer */ 1061 char *v_buffer; /* pointer to physical buffer */
1139 unsigned int v_buflen; /* size of area to write */ 1062 unsigned int v_buflen; /* size of area to write */
1140 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1063 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1141 1064
1142#ifdef KEYSYM_RESOURCE 1065#ifdef KEYSYM_RESOURCE
1143 keyboard_manager *keyboard; 1066 keyboard_manager *keyboard;
1144#endif 1067#endif
1145 1068
1146 const char *rs[NUM_RESOURCES]; 1069 const char *rs[NUM_RESOURCES];
1147 /* command input buffering */ 1070 /* command input buffering */
1148 char *cmdbuf_ptr, *cmdbuf_endp; 1071 char *cmdbuf_ptr, *cmdbuf_endp;
1149 char cmdbuf_base[CBUFSIZ]; 1072 char cmdbuf_base[CBUFSIZ];
1150 1073
1151 rxvt_ptytty *pty; 1074 ptytty *pty;
1152 1075
1153 rxvt_salloc *talloc; // text line allocator 1076 rxvt_salloc *talloc; // text line allocator
1154 rxvt_salloc *ralloc; // rend line allocator 1077 rxvt_salloc *ralloc; // rend line allocator
1155 1078
1156 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1079 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1165 void iso14755_54 (int x, int y); 1088 void iso14755_54 (int x, int y);
1166# endif 1089# endif
1167#endif 1090#endif
1168 1091
1169 // modifies first argument(!) 1092 // modifies first argument(!)
1170 void paste (char *data, unsigned int len); 1093 void paste (char *data, unsigned int len) NOTHROW;
1171 1094
1172 long vt_emask, vt_emask_perl; 1095 long vt_emask, vt_emask_perl, vt_emask_xim;
1173 1096
1174 void vt_select_input () const 1097 void vt_select_input () const NOTHROW
1175 { 1098 {
1176 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1177 } 1100 }
1178 1101
1179#if TRANSPARENT 1102#if TRANSPARENT
1180 void rootwin_cb (XEvent &xev); 1103 void rootwin_cb (XEvent &xev);
1181 xevent_watcher rootwin_ev; 1104 xevent_watcher rootwin_ev;
… …
1191 1114
1192 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1115 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1193 void check_cb (check_watcher &w); check_watcher check_ev; 1116 void check_cb (check_watcher &w); check_watcher check_ev;
1194 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1117 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1195 void flush_cb (time_watcher &w); time_watcher flush_ev; 1118 void flush_cb (time_watcher &w); time_watcher flush_ev;
1196
1197 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1119 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1198
1199 void incr_cb (time_watcher &w); time_watcher incr_ev; 1120 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1200 1121
1201#ifdef CURSOR_BLINK 1122#ifdef CURSOR_BLINK
1202 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1123 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1203#endif 1124#endif
1204#ifdef TEXT_BLINK 1125#ifdef TEXT_BLINK
1205 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1126 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1127#endif
1128#ifndef NO_BELL
1129 void bell_cb (time_watcher &w); time_watcher bell_ev;
1206#endif 1130#endif
1207 1131
1208#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1132#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1209 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1133 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1210#endif 1134#endif
… …
1230 rxvt_term (); 1154 rxvt_term ();
1231 ~rxvt_term (); 1155 ~rxvt_term ();
1232 void destroy (); 1156 void destroy ();
1233 void emergency_cleanup (); 1157 void emergency_cleanup ();
1234 1158
1235 bool init (int argc, const char *const *argv); 1159 bool init (int argc, const char *const *argv, stringvec *envv);
1160
1161 bool init (stringvec *argv, stringvec *envv)
1162 {
1163 this->argv = argv;
1164 return init (argv->size (), argv->begin (), envv);
1165 }
1166
1236 bool init_vars (); 1167 bool init_vars ();
1237 1168
1238 bool pty_fill (); 1169 bool pty_fill ();
1239 1170
1240 void make_current () const // make this the "currently active" urxvt instance 1171 void make_current () const // make this the "currently active" urxvt instance
… …
1259 void create_windows (int argc, const char *const *argv); 1190 void create_windows (int argc, const char *const *argv);
1260 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1191 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1261 void window_calc (unsigned int newwidth, unsigned int newheight); 1192 void window_calc (unsigned int newwidth, unsigned int newheight);
1262 1193
1263#if USE_XIM 1194#if USE_XIM
1264 rxvt_xim *input_method; 1195 rxvt_xim *input_method;
1265 XIC Input_Context; 1196 XIC Input_Context;
1266 XIMStyle input_style; 1197 XIMStyle input_style;
1267 XPoint spot; // most recently sent spot position 1198 XPoint spot; // most recently sent spot position
1268 1199
1269 void im_destroy (); 1200 void im_destroy ();
1270 void im_cb (); im_watcher im_ev; 1201 void im_cb (); im_watcher im_ev;
1271 void im_set_size (XRectangle &size); 1202 void im_set_size (XRectangle &size);
1272 void im_set_position (XPoint &pos); 1203 void im_set_position (XPoint &pos) NOTHROW;
1273 void im_set_color (unsigned long &fg, unsigned long &bg); 1204 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); 1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1275 1206
1276 bool IMisRunning (); 1207 bool IMisRunning ();
1277 void IMSendSpot (); 1208 void IMSendSpot ();
… …
1279 void IMSetStatusPosition (); 1210 void IMSetStatusPosition ();
1280#endif 1211#endif
1281 1212
1282 void resize_scrollbar (); 1213 void resize_scrollbar ();
1283 1214
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 1215 // command.C
1293 void lookup_key (XKeyEvent &ev); 1216 void lookup_key (XKeyEvent &ev);
1294 unsigned int cmd_write (const char *str, unsigned int count); 1217 unsigned int cmd_write (const char *str, unsigned int count);
1295 1218
1296 wchar_t next_char (); 1219 wchar_t next_char () NOTHROW;
1297 wchar_t cmd_getc (); 1220 wchar_t cmd_getc () THROW ((class out_of_input));
1298 uint32_t next_octet (); 1221 uint32_t next_octet () NOTHROW;
1299 uint32_t cmd_get8 (); 1222 uint32_t cmd_get8 () THROW ((class out_of_input));
1300 1223
1301 bool cmd_parse (); 1224 bool cmd_parse ();
1302 void mouse_report (XButtonEvent &ev); 1225 void mouse_report (XButtonEvent &ev);
1303 void button_press (XButtonEvent &ev); 1226 void button_press (XButtonEvent &ev);
1304 void button_release (XButtonEvent &ev); 1227 void button_release (XButtonEvent &ev);
… …
1326 void process_graphics (); 1249 void process_graphics ();
1327 // init.C 1250 // init.C
1328 void Get_Colours (); 1251 void Get_Colours ();
1329 void get_ourmods (); 1252 void get_ourmods ();
1330 // main.C 1253 // main.C
1331 void privileged_utmp (rxvt_privaction action);
1332 bool set_fonts (); 1254 bool set_fonts ();
1333 void set_string_property (Atom prop, const char *str, int len = -1); 1255 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); 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);
… …
1367 1289
1368 if (ncol > prev_ncol) 1290 if (ncol > prev_ncol)
1369 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1291 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1370 } 1292 }
1371 1293
1372 int fgcolor_of (rend_t r) const 1294 int fgcolor_of (rend_t r) const NOTHROW
1373 { 1295 {
1374 int base = GET_BASEFG (r); 1296 int base = GET_BASEFG (r);
1375#ifndef NO_BRIGHTCOLOR 1297#ifndef NO_BRIGHTCOLOR
1376 if (r & RS_Bold 1298 if (r & RS_Bold
1377# if ENABLE_STYLES 1299# if ENABLE_STYLES
… …
1381 base += minBrightCOLOR - minCOLOR; 1303 base += minBrightCOLOR - minCOLOR;
1382#endif 1304#endif
1383 return base; 1305 return base;
1384 } 1306 }
1385 1307
1386 int bgcolor_of (rend_t r) const 1308 int bgcolor_of (rend_t r) const NOTHROW
1387 { 1309 {
1388 int base = GET_BASEBG (r); 1310 int base = GET_BASEBG (r);
1389#ifndef NO_BRIGHTCOLOR 1311#ifndef NO_BRIGHTCOLOR
1390 if (r & RS_Blink 1312 if (r & RS_Blink
1391# if ENABLE_STYLES 1313# if ENABLE_STYLES
… …
1395 base += minBrightCOLOR - minCOLOR; 1317 base += minBrightCOLOR - minCOLOR;
1396#endif 1318#endif
1397 return base; 1319 return base;
1398 } 1320 }
1399 1321
1400 bool option (uint32_t opt) const 1322 bool option (uint32_t opt) const NOTHROW
1401 { 1323 {
1402 return OPTION (opt); 1324 return OPTION (opt);
1403 } 1325 }
1404 1326
1405 void set_option (uint32_t opt, bool set) 1327 void set_option (uint32_t opt, bool set) NOTHROW
1406 { 1328 {
1407 if (set) 1329 if (set)
1408 options |= opt; 1330 options |= opt;
1409 else 1331 else
1410 options &= ~opt; 1332 options &= ~opt;
1411 } 1333 }
1412 1334
1413 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const; 1335 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; 1336 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1415 int scr_scroll_text (int row1, int row2, int count); 1337 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1416 void scr_reset (); 1338 void scr_reset ();
1417 void scr_release (); 1339 void scr_release () NOTHROW;
1418 void scr_clear (bool really = false); 1340 void scr_clear (bool really = false) NOTHROW;
1419 void scr_refresh (); 1341 void scr_refresh () NOTHROW;
1420 bool scr_refresh_rend (rend_t mask, rend_t value); 1342 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1421 void scr_erase_screen (int mode); 1343 void scr_erase_screen (int mode) NOTHROW;
1422#if ENABLE_FRILLS 1344#if ENABLE_FRILLS
1423 void scr_erase_savelines (); 1345 void scr_erase_savelines () NOTHROW;
1424 void scr_backindex (); 1346 void scr_backindex () NOTHROW;
1425 void scr_forwardindex (); 1347 void scr_forwardindex () NOTHROW;
1426#endif 1348#endif
1427 void scr_touch (bool refresh); 1349 void scr_touch (bool refresh) NOTHROW;
1428 void scr_expose (int x, int y, int width, int height, bool refresh); 1350 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); 1351 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1430 void scr_recolour (); 1352 void scr_recolour () NOTHROW;
1431 void scr_remap_chars (); 1353 void scr_remap_chars () NOTHROW;
1432 void scr_remap_chars (line_t &l); 1354 void scr_remap_chars (line_t &l) NOTHROW;
1355
1356 enum cursor_mode { SAVE, RESTORE };
1433 1357
1434 void scr_poweron (); 1358 void scr_poweron ();
1435 void scr_cursor (int mode); 1359 void scr_cursor (cursor_mode mode) NOTHROW;
1436 void scr_do_wrap (); 1360 void scr_do_wrap () NOTHROW;
1361 void scr_swap_screen () NOTHROW;
1437 int scr_change_screen (int scrn); 1362 void scr_change_screen (int scrn);
1438 void scr_color (unsigned int color, int fgbg); 1363 void scr_color (unsigned int color, int fgbg) NOTHROW;
1439 void scr_rendition (int set, int style); 1364 void scr_rendition (int set, int style) NOTHROW;
1440 void scr_add_lines (const wchar_t *str, int len, int minlines = 0); 1365 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1441 void scr_backspace (); 1366 void scr_backspace () NOTHROW;
1442 void scr_tab (int count, bool ht = false); 1367 void scr_tab (int count, bool ht = false) NOTHROW;
1443 void scr_gotorc (int row, int col, int relative); 1368 void scr_gotorc (int row, int col, int relative) NOTHROW;
1444 void scr_index (enum page_dirn direction); 1369 void scr_index (enum page_dirn direction) NOTHROW;
1445 void scr_erase_line (int mode); 1370 void scr_erase_line (int mode) NOTHROW;
1446 void scr_E (); 1371 void scr_E () NOTHROW;
1447 void scr_insdel_lines (int count, int insdel); 1372 void scr_insdel_lines (int count, int insdel) NOTHROW;
1448 void scr_insdel_chars (int count, int insdel); 1373 void scr_insdel_chars (int count, int insdel) NOTHROW;
1449 void scr_scroll_region (int top, int bot); 1374 void scr_scroll_region (int top, int bot) NOTHROW;
1450 void scr_cursor_visible (int mode); 1375 void scr_cursor_visible (int mode) NOTHROW;
1451 void scr_autowrap (int mode); 1376 void scr_autowrap (int mode) NOTHROW;
1452 void scr_relative_origin (int mode); 1377 void scr_relative_origin (int mode) NOTHROW;
1453 void scr_insert_mode (int mode); 1378 void scr_insert_mode (int mode) NOTHROW;
1454 void scr_set_tab (int mode); 1379 void scr_set_tab (int mode) NOTHROW;
1455 void scr_rvideo_mode (int mode); 1380 void scr_rvideo_mode (bool on) NOTHROW;
1456 void scr_report_position (); 1381 void scr_report_position () NOTHROW;
1457 void set_font_style (); 1382 void set_font_style () NOTHROW;
1458 void scr_charset_choose (int set); 1383 void scr_charset_choose (int set) NOTHROW;
1459 void scr_charset_set (int set, unsigned int ch); 1384 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1460 void scr_move_to (int y, int len); 1385 void scr_move_to (int y, int len) NOTHROW;
1461 bool scr_page (enum page_dirn direction, int nlines); 1386 bool scr_page (enum page_dirn direction, int nlines) NOTHROW;
1462 bool scr_changeview (int new_view_start); 1387 bool scr_changeview (int new_view_start) NOTHROW;
1463 void scr_bell (); 1388 void scr_bell () NOTHROW;
1464 void scr_printscreen (int fullhist); 1389 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); 1390 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); 1391 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 (); 1392 void scr_reverse_selection () NOTHROW;
1468 void scr_dump (int fd); 1393 void scr_dump (int fd) NOTHROW;
1394
1469 void selection_check (int check_more); 1395 void selection_check (int check_more) NOTHROW;
1470 void selection_paste (Window win, Atom prop, bool delete_prop); 1396 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1471 void selection_property (Window win, Atom prop); 1397 void selection_property (Window win, Atom prop) NOTHROW;
1472 void selection_request (Time tm, int x, int y); 1398 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1473 int selection_request_other (Atom target, int selnum); 1399 int selection_request_other (Atom target, int selnum) NOTHROW;
1474 void selection_clear (); 1400 void selection_clear () NOTHROW;
1475 void selection_make (Time tm); 1401 void selection_make (Time tm);
1476 bool selection_grab (Time tm); 1402 bool selection_grab (Time tm) NOTHROW;
1477 void selection_start_colrow (int col, int row); 1403 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); 1404 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); 1405 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1480 void selection_remove_trailing_spaces (); 1406 void selection_remove_trailing_spaces () NOTHROW;
1481 void selection_send (const XSelectionRequestEvent &rq); 1407 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1408 void selection_click (int clicks, int x, int y) NOTHROW;
1409 void selection_extend (int x, int y, int flag) NOTHROW;
1410 void selection_rotate (int x, int y) NOTHROW;
1411
1412 void pixel_position (int *x, int *y) NOTHROW;
1482 1413
1483#if defined(NEXT_SCROLLBAR) 1414#if defined(NEXT_SCROLLBAR)
1484 // scrollbar-next.C 1415 // scrollbar-next.C
1485 Pixmap renderPixmap (const char *const *data, int width, int height); 1416 Pixmap renderPixmap (const char *const *data, int width, int height);
1486 void init_scrollbar_stuff (); 1417 void init_scrollbar_stuff ();
… …
1528# define __PROTO(p) p 1459# define __PROTO(p) p
1529#else 1460#else
1530# define __PROTO(p) () 1461# define __PROTO(p) ()
1531#endif 1462#endif
1532 1463
1533#ifdef DEBUG_malloc
1534# include "dmalloc.h" /* This comes last */
1535#endif
1536
1537#endif /* _RXVT_H_ */ 1464#endif /* _RXVT_H_ */
1538 1465

Diff Legend

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