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.313 by ayin, Wed Oct 24 10:39:58 2007 UTC vs.
Revision 1.319 by ayin, Thu Nov 15 11:36:15 2007 UTC

… …
36 36
37#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h" 38#include "rxvtutil.h"
39#include "rxvtfont.h" 39#include "rxvtfont.h"
40#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
41#include "iom.h" 41#include "ev_cpp.h"
42#include "salloc.h" 42#include "salloc.h"
43#include "libptytty.h" 43#include "libptytty.h"
44 44
45#include "rxvtperl.h" 45#include "rxvtperl.h"
46 46
… …
73#endif 73#endif
74 74
75#include <termios.h> 75#include <termios.h>
76typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
77 77
78#ifdef HAVE_AFTERIMAGE
79# include <afterimage.h>
80#undef min
81#undef max
82#endif
83
84#include "background.h" 78#include "background.h"
85 79
86#ifndef STDIN_FILENO 80#ifndef STDIN_FILENO
87# define STDIN_FILENO 0 81# define STDIN_FILENO 0
88# define STDOUT_FILENO 1 82# define STDOUT_FILENO 1
… …
97// exception thrown when the command parser runs out of input data 91// exception thrown when the command parser runs out of input data
98class out_of_input { }; 92class out_of_input { };
99 93
100/* 94/*
101 ***************************************************************************** 95 *****************************************************************************
102 * PROTOTYPES 96 * PROTOTYPES
103 ***************************************************************************** 97 *****************************************************************************
104 */ 98 */
105// main.C 99// main.C
106void * rxvt_malloc (size_t size); 100void * rxvt_malloc (size_t size);
107void * rxvt_calloc (size_t number, size_t size); 101void * rxvt_calloc (size_t number, size_t size);
… …
110// misc.C 104// misc.C
111char * rxvt_wcstombs (const wchar_t *str, int len = -1); 105char * rxvt_wcstombs (const wchar_t *str, int len = -1);
112wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 106wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
113char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 107char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
114wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 108wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
115
116#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
117 109
118char * rxvt_basename (const char *str) NOTHROW; 110char * rxvt_basename (const char *str) NOTHROW;
119void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 111void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
120void rxvt_log (const char *fmt,...) NOTHROW; 112void rxvt_log (const char *fmt,...) NOTHROW;
121void rxvt_warn (const char *fmt,...) NOTHROW; 113void rxvt_warn (const char *fmt,...) NOTHROW;
… …
189} MWMHints; 181} MWMHints;
190#endif 182#endif
191 183
192#if ENABLE_XEMBED 184#if ENABLE_XEMBED
193// XEMBED messages 185// XEMBED messages
194# define XEMBED_EMBEDDED_NOTIFY 0 186# define XEMBED_EMBEDDED_NOTIFY 0
195# define XEMBED_WINDOW_ACTIVATE 1 187# define XEMBED_WINDOW_ACTIVATE 1
196# define XEMBED_WINDOW_DEACTIVATE 2 188# define XEMBED_WINDOW_DEACTIVATE 2
197# define XEMBED_REQUEST_FOCUS 3 189# define XEMBED_REQUEST_FOCUS 3
198# define XEMBED_FOCUS_IN 4 190# define XEMBED_FOCUS_IN 4
199# define XEMBED_FOCUS_OUT 5 191# define XEMBED_FOCUS_OUT 5
200# define XEMBED_FOCUS_NEXT 6 192# define XEMBED_FOCUS_NEXT 6
201# define XEMBED_FOCUS_PREV 7 193# define XEMBED_FOCUS_PREV 7
202 194
203# define XEMBED_MODALITY_ON 10 195# define XEMBED_MODALITY_ON 10
204# define XEMBED_MODALITY_OFF 11 196# define XEMBED_MODALITY_OFF 11
205# define XEMBED_REGISTER_ACCELERATOR 12 197# define XEMBED_REGISTER_ACCELERATOR 12
206# define XEMBED_UNREGISTER_ACCELERATOR 13 198# define XEMBED_UNREGISTER_ACCELERATOR 13
207# define XEMBED_ACTIVATE_ACCELERATOR 14 199# define XEMBED_ACTIVATE_ACCELERATOR 14
208 200
209// XEMBED detail code 201// XEMBED detail code
210# define XEMBED_FOCUS_CURRENT 0 202# define XEMBED_FOCUS_CURRENT 0
211# define XEMBED_FOCUS_FIRST 1 203# define XEMBED_FOCUS_FIRST 1
212# define XEMBED_FOCUS_LAST 2 204# define XEMBED_FOCUS_LAST 2
213 205
214# define XEMBED_MAPPED (1 << 0) 206# define XEMBED_MAPPED (1 << 0)
215#endif 207#endif
216 208
… …
429 C0_NUL = 0x00, 421 C0_NUL = 0x00,
430 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 422 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
431 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 423 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
432 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 424 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
433 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1, 425 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
434}; 426};
435#define CHAR_ST 0x9c /* 0234 */ 427#define CHAR_ST 0x9c /* 0234 */
436 428
437/* 429/*
438 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 430 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
439 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 431 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
… …
794 } 786 }
795}; 787};
796 788
797/****************************************************************************/ 789/****************************************************************************/
798 790
799// primivite wrapper around mbstate_t to ensure initialisation 791// primitive wrapper around mbstate_t to ensure initialisation
800struct mbstate { 792struct mbstate {
801 mbstate_t mbs; 793 mbstate_t mbs;
802 794
803 operator mbstate_t *() { return &mbs; } 795 operator mbstate_t *() { return &mbs; }
804 void reset () { memset (&mbs, 0, sizeof (mbs)); } 796 void reset () { memset (&mbs, 0, sizeof (mbs)); }
… …
861 853
862 // special markers with magic addresses 854 // special markers with magic addresses
863 static const char resval_undef []; // options specifically unset 855 static const char resval_undef []; // options specifically unset
864 static const char resval_on []; // boolean options switched on 856 static const char resval_on []; // boolean options switched on
865 static const char resval_off []; // or off 857 static const char resval_off []; // or off
866 858
867 log_callback *log_hook; // log error messages through this hook, if != 0 859 log_callback *log_hook; // log error messages through this hook, if != 0
868 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 860 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
869#if ENABLE_PERL 861#if ENABLE_PERL
870 rxvt_perl_term perl; 862 rxvt_perl_term perl;
871#endif 863#endif
… …
1056 void rootwin_cb (XEvent &xev); 1048 void rootwin_cb (XEvent &xev);
1057 xevent_watcher rootwin_ev; 1049 xevent_watcher rootwin_ev;
1058#endif 1050#endif
1059#ifdef HAVE_BG_PIXMAP 1051#ifdef HAVE_BG_PIXMAP
1060 int update_background (); 1052 int update_background ();
1061 void update_background_cb (time_watcher &w); 1053 void update_background_cb (ev::timer &w, int revents);
1062 time_watcher update_background_ev; 1054 ev::timer update_background_ev;
1063#endif 1055#endif
1064 1056
1065 void x_cb (XEvent &xev); 1057 void x_cb (XEvent &xev);
1066 xevent_watcher termwin_ev; 1058 xevent_watcher termwin_ev;
1067 xevent_watcher vt_ev; 1059 xevent_watcher vt_ev;
1068#ifdef HAVE_SCROLLBARS 1060#ifdef HAVE_SCROLLBARS
1069 xevent_watcher scrollbar_ev; 1061 xevent_watcher scrollbar_ev;
1070#endif 1062#endif
1071 1063
1072 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1064 void child_cb (ev::child &w, int revents); ev::child child_ev;
1073 void check_cb (check_watcher &w); check_watcher check_ev; 1065 void prepare_cb (ev::prepare &w, int revents); ev::prepare prepare_ev;
1074 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1066 void destroy_cb (ev::check &w, int revents); ev::check destroy_ev;
1075 void flush (); 1067 void flush ();
1076 void flush_cb (time_watcher &w); time_watcher flush_ev; 1068 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1077 bool pty_fill (); 1069 bool pty_fill ();
1078 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1070 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1079 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1071 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1080 1072
1081#ifdef CURSOR_BLINK 1073#ifdef CURSOR_BLINK
1082 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1074 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1083#endif 1075#endif
1084#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1085 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1077 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1086#endif 1078#endif
1087#ifndef NO_BELL 1079#ifndef NO_BELL
1088 void bell_cb (time_watcher &w); time_watcher bell_ev; 1080 void bell_cb (ev::timer &w, int revents); ev::timer bell_ev;
1089#endif 1081#endif
1090 1082
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1083#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1084 void cont_scroll_cb (ev::timer &w, int revents); ev::timer cont_scroll_ev;
1093#endif 1085#endif
1094#ifdef SELECTION_SCROLLING 1086#ifdef SELECTION_SCROLLING
1095 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev; 1087 void sel_scroll_cb (ev::timer &w, int revents); ev::timer sel_scroll_ev;
1096#endif 1088#endif
1097#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1098 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev; 1090 void slip_wheel_cb (ev::timer &w, int revents); ev::timer slip_wheel_ev;
1099#endif 1091#endif
1100 1092
1101#ifdef POINTER_BLANK 1093#ifdef POINTER_BLANK
1102 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1094 void pointer_cb (ev::timer &w, int revents); ev::timer pointer_ev;
1103 void pointer_blank (); 1095 void pointer_blank ();
1104#endif 1096#endif
1105 void pointer_unblank (); 1097 void pointer_unblank ();
1106 1098
1107 void tt_printf (const char *fmt,...); 1099 void tt_printf (const char *fmt,...);
… …
1404 int parse_keysym (const char *str, const char *arg); 1396 int parse_keysym (const char *str, const char *arg);
1405 const char *x_resource (const char *name); 1397 const char *x_resource (const char *name);
1406 void extract_resources (); 1398 void extract_resources ();
1407}; 1399};
1408 1400
1409#endif /* _RXVT_H_ */ 1401#endif /* _RXVT_H_ */
1410 1402

Diff Legend

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