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.316 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.322 by ayin, Thu Nov 22 15:07:10 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
… …
786 } 786 }
787}; 787};
788 788
789/****************************************************************************/ 789/****************************************************************************/
790 790
791// primivite wrapper around mbstate_t to ensure initialisation 791// primitive wrapper around mbstate_t to ensure initialisation
792struct mbstate { 792struct mbstate {
793 mbstate_t mbs; 793 mbstate_t mbs;
794 794
795 operator mbstate_t *() { return &mbs; } 795 operator mbstate_t *() { return &mbs; }
796 void reset () { memset (&mbs, 0, sizeof (mbs)); } 796 void reset () { memset (&mbs, 0, sizeof (mbs)); }
… …
1011 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1011 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1012 1012
1013#ifdef KEYSYM_RESOURCE 1013#ifdef KEYSYM_RESOURCE
1014 keyboard_manager *keyboard; 1014 keyboard_manager *keyboard;
1015#endif 1015#endif
1016#ifndef NO_RESOURCES
1017 XrmDatabase option_db;
1018#endif
1016 1019
1017 const char *rs[NUM_RESOURCES]; 1020 const char *rs[NUM_RESOURCES];
1018 /* command input buffering */ 1021 /* command input buffering */
1019 char *cmdbuf_ptr, *cmdbuf_endp; 1022 char *cmdbuf_ptr, *cmdbuf_endp;
1020 char cmdbuf_base[CBUFSIZ]; 1023 char cmdbuf_base[CBUFSIZ];
… …
1048 void rootwin_cb (XEvent &xev); 1051 void rootwin_cb (XEvent &xev);
1049 xevent_watcher rootwin_ev; 1052 xevent_watcher rootwin_ev;
1050#endif 1053#endif
1051#ifdef HAVE_BG_PIXMAP 1054#ifdef HAVE_BG_PIXMAP
1052 int update_background (); 1055 int update_background ();
1056#if TRACE_PIXMAPS
1057 int trace_update_background (const char* file, int line);
1058# define update_background() trace_update_background (__FILE__, __LINE__)
1059#endif
1053 void update_background_cb (time_watcher &w); 1060 void update_background_cb (ev::timer &w, int revents);
1054 time_watcher update_background_ev; 1061 ev::timer update_background_ev;
1055#endif 1062#endif
1056 1063
1057 void x_cb (XEvent &xev); 1064 void x_cb (XEvent &xev);
1058 xevent_watcher termwin_ev; 1065 xevent_watcher termwin_ev;
1059 xevent_watcher vt_ev; 1066 xevent_watcher vt_ev;
1060#ifdef HAVE_SCROLLBARS 1067#ifdef HAVE_SCROLLBARS
1061 xevent_watcher scrollbar_ev; 1068 xevent_watcher scrollbar_ev;
1062#endif 1069#endif
1063 1070
1064 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1071 void child_cb (ev::child &w, int revents); ev::child child_ev;
1065 void check_cb (check_watcher &w); check_watcher check_ev; 1072 void prepare_cb (ev::prepare &w, int revents); ev::prepare prepare_ev;
1066 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1073 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1067 void flush (); 1074 void flush ();
1068 void flush_cb (time_watcher &w); time_watcher flush_ev; 1075 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1069 bool pty_fill (); 1076 bool pty_fill ();
1070 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1077 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1071 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1078 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1072 1079
1073#ifdef CURSOR_BLINK 1080#ifdef CURSOR_BLINK
1074 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1081 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1075#endif 1082#endif
1076#ifdef TEXT_BLINK 1083#ifdef TEXT_BLINK
1077 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1084 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1078#endif 1085#endif
1079#ifndef NO_BELL 1086#ifndef NO_BELL
1080 void bell_cb (time_watcher &w); time_watcher bell_ev; 1087 void bell_cb (ev::timer &w, int revents); ev::timer bell_ev;
1081#endif 1088#endif
1082 1089
1083#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1084 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1091 void cont_scroll_cb (ev::timer &w, int revents); ev::timer cont_scroll_ev;
1085#endif 1092#endif
1086#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1087 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev; 1094 void sel_scroll_cb (ev::timer &w, int revents); ev::timer sel_scroll_ev;
1088#endif 1095#endif
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1096#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev; 1097 void slip_wheel_cb (ev::timer &w, int revents); ev::timer slip_wheel_ev;
1091#endif 1098#endif
1092 1099
1093#ifdef POINTER_BLANK 1100#ifdef POINTER_BLANK
1094 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1101 void pointer_cb (ev::timer &w, int revents); ev::timer pointer_ev;
1095 void pointer_blank (); 1102 void pointer_blank ();
1096#endif 1103#endif
1097 void pointer_unblank (); 1104 void pointer_unblank ();
1098 1105
1099 void tt_printf (const char *fmt,...); 1106 void tt_printf (const char *fmt,...);
… …
1396 int parse_keysym (const char *str, const char *arg); 1403 int parse_keysym (const char *str, const char *arg);
1397 const char *x_resource (const char *name); 1404 const char *x_resource (const char *name);
1398 void extract_resources (); 1405 void extract_resources ();
1399}; 1406};
1400 1407
1401#endif /* _RXVT_H_ */ 1408#endif /* _RXVT_H_ */
1402 1409

Diff Legend

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