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.134 by root, Wed Dec 15 02:30:47 2004 UTC vs.
Revision 1.145 by root, Fri Feb 4 11:41:23 2005 UTC

… …
10#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
11#include <X11/keysym.h> 11#include <X11/keysym.h>
12#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
13#include <X11/Xatom.h> 13#include <X11/Xatom.h>
14#if ENABLE_FRILLS 14#if ENABLE_FRILLS
15#include <X11/Xmd.h> 15# include <X11/Xmd.h>
16#endif 16#endif
17 17
18#include "encoding.h" 18#include "encoding.h"
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
… …
563#ifdef HAVE_SCROLLBARS 563#ifdef HAVE_SCROLLBARS
564 Rs_scrollBar, 564 Rs_scrollBar,
565 Rs_scrollBar_right, 565 Rs_scrollBar_right,
566 Rs_scrollBar_floating, 566 Rs_scrollBar_floating,
567 Rs_scrollBar_align, 567 Rs_scrollBar_align,
568#endif
569 Rs_scrollstyle, /* Rs_scrollBar_style */ 568 Rs_scrollstyle, /* Rs_scrollBar_style */
569 Rs_scrollBar_thickness,
570#endif
570 Rs_scrollTtyOutput, 571 Rs_scrollTtyOutput,
571 Rs_scrollTtyKeypress, 572 Rs_scrollTtyKeypress,
572 Rs_scrollWithBuffer, 573 Rs_scrollWithBuffer,
573 Rs_saveLines, 574 Rs_saveLines,
574 Rs_utmpInhibit, 575 Rs_utmpInhibit,
… …
603#if ENABLE_FRILLS 604#if ENABLE_FRILLS
604 Rs_ext_bwidth, 605 Rs_ext_bwidth,
605 Rs_int_bwidth, 606 Rs_int_bwidth,
606 Rs_borderLess, 607 Rs_borderLess,
607#endif 608#endif
608 Rs_scrollBar_thickness, 609#if ENABLE_FRILLS
609#ifndef NO_LINESPACE
610 Rs_lineSpace, 610 Rs_lineSpace,
611#endif 611#endif
612 Rs_cutchars, 612 Rs_cutchars,
613 Rs_modifier, 613 Rs_modifier,
614 Rs_answerbackstring, 614 Rs_answerbackstring,
… …
616 Rs_insecure, 616 Rs_insecure,
617 Rs_cursorBlink, 617 Rs_cursorBlink,
618 Rs_pointerBlank, 618 Rs_pointerBlank,
619 Rs_pointerBlankDelay, 619 Rs_pointerBlankDelay,
620 Rs_imLocale, 620 Rs_imLocale,
621 Rs_imFont,
621 Rs_pastableTabs, 622 Rs_pastableTabs,
622#ifndef NO_SECONDARY_SCREEN 623#ifndef NO_SECONDARY_SCREEN
623 Rs_secondaryScreen, 624 Rs_secondaryScreen,
624 Rs_secondaryScroll, 625 Rs_secondaryScroll,
625#endif 626#endif
… …
758#define strdup(x) strdup((const char *)(x)) 759#define strdup(x) strdup((const char *)(x))
759#define strlen(x) strlen((const char *)(x)) 760#define strlen(x) strlen((const char *)(x))
760#define strchr(x, y) strchr((const char *)(x), (int)(y)) 761#define strchr(x, y) strchr((const char *)(x), (int)(y))
761#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 762#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
762 763
764#define dDisp Display *disp = display->display
765
763/* convert pixel dimensions to row/column values. Everything as int32_t */ 766/* convert pixel dimensions to row/column values. Everything as int32_t */
764#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 767#define Pixel2Col(x) Pixel2Width((int32_t)(x))
765#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 768#define Pixel2Row(y) Pixel2Height((int32_t)(y))
766#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 769#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)
767#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 770#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)
… …
865# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 868# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
866#else 869#else
867# define XPMClearArea(a, b, c, d, e, f, g) 870# define XPMClearArea(a, b, c, d, e, f, g)
868#endif 871#endif
869 872
870#ifndef STRICT_FONT_CHECKING
871# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
872#endif
873
874#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
875#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
876
877#ifdef UTMP_SUPPORT 873#ifdef UTMP_SUPPORT
878# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 874# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
879# undef HAVE_UTMPX_H 875# undef HAVE_UTMPX_H
880# undef HAVE_STRUCT_UTMPX 876# undef HAVE_STRUCT_UTMPX
881# endif 877# endif
… …
953 949
954 operator mbstate_t *() { return &mbs; } 950 operator mbstate_t *() { return &mbs; }
955 void reset () { memset (&mbs, 0, sizeof (mbs)); } 951 void reset () { memset (&mbs, 0, sizeof (mbs)); }
956 mbstate () { reset (); } 952 mbstate () { reset (); }
957}; 953};
954
955#define UNICODE_MASK 0x1fffffUL
958 956
959#if UNICODE3 957#if UNICODE3
960# define COMPOSE_LO 0x40000000UL 958# define COMPOSE_LO 0x40000000UL
961# define COMPOSE_HI 0x400fffffUL 959# define COMPOSE_HI 0x400fffffUL
962# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 960# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
992 990
993extern class rxvt_composite_vec rxvt_composite; 991extern class rxvt_composite_vec rxvt_composite;
994#endif 992#endif
995 993
996 994
995#ifdef KEYSYM_RESOURCE
996 class keyboard_manager;
997#endif
998
997struct rxvt_term : zero_initialized, rxvt_vars { 999struct rxvt_term : zero_initialized, rxvt_vars {
998 log_callback *log_hook; // log error messages through this hook, if != 0 1000 log_callback *log_hook; // log error messages through this hook, if != 0
999 1001
1000 struct mbstate mbstate; // current input multibyte state 1002 struct mbstate mbstate; // current input multibyte state
1001 1003
… …
1018 hidden_text:1, 1020 hidden_text:1,
1019#endif 1021#endif
1020#ifdef POINTER_BLANK 1022#ifdef POINTER_BLANK
1021 hidden_pointer:1, 1023 hidden_pointer:1,
1022#endif 1024#endif
1023// enc_utf8:1, /* wether locale uses utf-8 */ 1025 enc_utf8:1, /* wether locale uses utf-8 */
1024 seen_input:1, /* wether we have seen some program output yet */ 1026 seen_input:1, /* wether we have seen some program output yet */
1025 seen_resize:1, /* wether we had a resize event */ 1027 seen_resize:1, /* wether we had a resize event */
1026 parsed_geometry:1; 1028 parsed_geometry:1;
1027 1029
1028 unsigned char refresh_type, 1030 unsigned char refresh_type,
… …
1074# ifdef POINTER_BLANK 1076# ifdef POINTER_BLANK
1075 pointerBlankDelay, 1077 pointerBlankDelay,
1076# endif 1078# endif
1077 allowedxerror; 1079 allowedxerror;
1078/* ---------- */ 1080/* ---------- */
1079 unsigned int ModMetaMask, 1081 unsigned int ModLevel3Mask,
1082 ModMetaMask,
1080 ModNumLockMask; 1083 ModNumLockMask;
1081 int old_width, /* last used width in screen resize */ 1084 int old_width, /* last used width in screen resize */
1082 old_height; /* last used height in screen resize */ 1085 old_height; /* last used height in screen resize */
1083 unsigned long priv_modes, 1086 unsigned long priv_modes,
1084 SavedModes; 1087 SavedModes;
… …
1118 pid_t cmd_pid; /* process id of child */ 1121 pid_t cmd_pid; /* process id of child */
1119 char * incr_buf; 1122 char * incr_buf;
1120 size_t incr_buf_size, incr_buf_fill; 1123 size_t incr_buf_size, incr_buf_fill;
1121/* ---------- */ 1124/* ---------- */
1122 Cursor leftptr_cursor; 1125 Cursor leftptr_cursor;
1123#ifdef POINTER_BLANK
1124 Cursor blank_cursor;
1125#endif
1126/* ---------- */ 1126/* ---------- */
1127#ifndef NO_BACKSPACE_KEY 1127#ifndef NO_BACKSPACE_KEY
1128 const char *key_backspace; 1128 const char *key_backspace;
1129#endif 1129#endif
1130#ifndef NO_DELETE_KEY 1130#ifndef NO_DELETE_KEY
… …
1188 char *locale; 1188 char *locale;
1189 char charsets[4]; 1189 char charsets[4];
1190 unsigned char *v_buffer; /* pointer to physical buffer */ 1190 unsigned char *v_buffer; /* pointer to physical buffer */
1191 unsigned int v_buflen; /* size of area to write */ 1191 unsigned int v_buflen; /* size of area to write */
1192 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1192 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1193
1193#ifdef KEYSYM_RESOURCE 1194#ifdef KEYSYM_RESOURCE
1194 const unsigned char *Keysym_map[256]; 1195 keyboard_manager *keyboard;
1195#endif 1196#endif
1197
1196 const char *rs[NUM_RESOURCES]; 1198 const char *rs[NUM_RESOURCES];
1197 /* command input buffering */ 1199 /* command input buffering */
1198 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1200 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1199 unsigned char cmdbuf_base[CBUFSIZ]; 1201 unsigned char cmdbuf_base[CBUFSIZ];
1200 1202
… …
1223 void rootwin_cb (XEvent &xev); 1225 void rootwin_cb (XEvent &xev);
1224 xevent_watcher rootwin_ev; 1226 xevent_watcher rootwin_ev;
1225#endif 1227#endif
1226 1228
1227 1229
1228 void sig_term (sig_watcher &w); sig_watcher sw_term; 1230 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1229 void sig_chld (sig_watcher &w); sig_watcher sw_chld; 1231 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1230 1232
1231 void x_cb (XEvent &xev); 1233 void x_cb (XEvent &xev);
1232 xevent_watcher termwin_ev; 1234 xevent_watcher termwin_ev;
1233 xevent_watcher vt_ev; 1235 xevent_watcher vt_ev;
… …
1276 void tt_winch (); 1278 void tt_winch ();
1277 1279
1278 rxvt_term (); 1280 rxvt_term ();
1279 ~rxvt_term (); 1281 ~rxvt_term ();
1280 void destroy (); 1282 void destroy ();
1283 void emergency_cleanup ();
1281 1284
1282 bool init (int argc, const char *const *argv); 1285 bool init (int argc, const char *const *argv);
1283 bool init_vars (); 1286 bool init_vars ();
1284 1287
1285 bool pty_fill (); 1288 bool pty_fill ();
… …
1509 1512
1510 // xdefaults.C 1513 // xdefaults.C
1511 void get_options (int argc, const char *const *argv); 1514 void get_options (int argc, const char *const *argv);
1512 int parse_keysym (const char *str, const char *arg); 1515 int parse_keysym (const char *str, const char *arg);
1513 void get_xdefaults (FILE *stream, const char *name); 1516 void get_xdefaults (FILE *stream, const char *name);
1514 void extract_resources (Display *display, const char *name); 1517 void extract_resources ();
1515 // xpm.C 1518 // xpm.C
1516 int scale_pixmap (const char *geom); 1519 int scale_pixmap (const char *geom);
1517 void resize_pixmap (); 1520 void resize_pixmap ();
1518 Pixmap set_bgPixmap (const char *file); 1521 Pixmap set_bgPixmap (const char *file);
1519}; 1522};

Diff Legend

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