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.130 by root, Mon Dec 13 07:18:52 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"
… …
500 Color_BD, 500 Color_BD,
501 Color_IT, 501 Color_IT,
502 Color_UL, 502 Color_UL,
503 Color_RV, 503 Color_RV,
504#endif 504#endif
505#if ENABLE_FRILLS
506 Color_underline,
507#endif
505#ifdef OPTION_HC 508#ifdef OPTION_HC
506 Color_HC, 509 Color_HC,
507#endif 510#endif
508#ifdef KEEP_SCROLLCOLOR 511#ifdef KEEP_SCROLLCOLOR
509 Color_scroll, 512 Color_scroll,
… …
560#ifdef HAVE_SCROLLBARS 563#ifdef HAVE_SCROLLBARS
561 Rs_scrollBar, 564 Rs_scrollBar,
562 Rs_scrollBar_right, 565 Rs_scrollBar_right,
563 Rs_scrollBar_floating, 566 Rs_scrollBar_floating,
564 Rs_scrollBar_align, 567 Rs_scrollBar_align,
565#endif
566 Rs_scrollstyle, /* Rs_scrollBar_style */ 568 Rs_scrollstyle, /* Rs_scrollBar_style */
569 Rs_scrollBar_thickness,
570#endif
567 Rs_scrollTtyOutput, 571 Rs_scrollTtyOutput,
568 Rs_scrollTtyKeypress, 572 Rs_scrollTtyKeypress,
569 Rs_scrollWithBuffer, 573 Rs_scrollWithBuffer,
570 Rs_saveLines, 574 Rs_saveLines,
571 Rs_utmpInhibit, 575 Rs_utmpInhibit,
… …
600#if ENABLE_FRILLS 604#if ENABLE_FRILLS
601 Rs_ext_bwidth, 605 Rs_ext_bwidth,
602 Rs_int_bwidth, 606 Rs_int_bwidth,
603 Rs_borderLess, 607 Rs_borderLess,
604#endif 608#endif
605 Rs_scrollBar_thickness, 609#if ENABLE_FRILLS
606#ifndef NO_LINESPACE
607 Rs_lineSpace, 610 Rs_lineSpace,
608#endif 611#endif
609 Rs_cutchars, 612 Rs_cutchars,
610 Rs_modifier, 613 Rs_modifier,
611 Rs_answerbackstring, 614 Rs_answerbackstring,
… …
613 Rs_insecure, 616 Rs_insecure,
614 Rs_cursorBlink, 617 Rs_cursorBlink,
615 Rs_pointerBlank, 618 Rs_pointerBlank,
616 Rs_pointerBlankDelay, 619 Rs_pointerBlankDelay,
617 Rs_imLocale, 620 Rs_imLocale,
621 Rs_imFont,
618 Rs_pastableTabs, 622 Rs_pastableTabs,
619#ifndef NO_SECONDARY_SCREEN 623#ifndef NO_SECONDARY_SCREEN
620 Rs_secondaryScreen, 624 Rs_secondaryScreen,
621 Rs_secondaryScroll, 625 Rs_secondaryScroll,
622#endif 626#endif
… …
638 XA_TARGETS, 642 XA_TARGETS,
639 XA_TIMESTAMP, 643 XA_TIMESTAMP,
640 XA_VT_SELECTION, 644 XA_VT_SELECTION,
641 XA_INCR, 645 XA_INCR,
642 XA_WMDELETEWINDOW, 646 XA_WMDELETEWINDOW,
647 XA_CLIPBOARD,
648#if ENABLE_FRILLS
649 XA_NET_WM_PID,
650 XA_MOTIF_WM_HINTS,
651 XA_NET_WM_NAME,
652 XA_NET_WM_ICON_NAME,
653#endif
654#if USE_XIM
655 XA_WM_LOCALE_NAME,
656#endif
643#ifdef TRANSPARENT 657#if TRANSPARENT
644 XA_XROOTPMAPID, 658 XA_XROOTPMAP_ID,
645 XA_XSETROOTID, 659 XA_ESETROOT_PMAP_ID,
646#endif 660#endif
647#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 661#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
648 XA_DNDPROTOCOL, 662 XA_DNDPROTOCOL,
649 XA_DNDSELECTION, 663 XA_DNDSELECTION,
650#endif /* OFFIX_DND */ 664#endif
651 XA_CLIPBOARD,
652 NUM_XA 665 NUM_XA
653}; 666};
654 667
655/* DEC private modes */ 668/* DEC private modes */
656#define PrivMode_132 (1UL<<0) 669#define PrivMode_132 (1UL<<0)
… …
746#define strdup(x) strdup((const char *)(x)) 759#define strdup(x) strdup((const char *)(x))
747#define strlen(x) strlen((const char *)(x)) 760#define strlen(x) strlen((const char *)(x))
748#define strchr(x, y) strchr((const char *)(x), (int)(y)) 761#define strchr(x, y) strchr((const char *)(x), (int)(y))
749#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 762#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
750 763
764#define dDisp Display *disp = display->display
765
751/* convert pixel dimensions to row/column values. Everything as int32_t */ 766/* convert pixel dimensions to row/column values. Everything as int32_t */
752#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 767#define Pixel2Col(x) Pixel2Width((int32_t)(x))
753#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 768#define Pixel2Row(y) Pixel2Height((int32_t)(y))
754#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 769#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)
755#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 770#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)
… …
853# 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))
854#else 869#else
855# define XPMClearArea(a, b, c, d, e, f, g) 870# define XPMClearArea(a, b, c, d, e, f, g)
856#endif 871#endif
857 872
858#ifndef STRICT_FONT_CHECKING
859# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
860#endif
861
862#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
863#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
864
865#ifdef UTMP_SUPPORT 873#ifdef UTMP_SUPPORT
866# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 874# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
867# undef HAVE_UTMPX_H 875# undef HAVE_UTMPX_H
868# undef HAVE_STRUCT_UTMPX 876# undef HAVE_STRUCT_UTMPX
869# endif 877# endif
… …
941 949
942 operator mbstate_t *() { return &mbs; } 950 operator mbstate_t *() { return &mbs; }
943 void reset () { memset (&mbs, 0, sizeof (mbs)); } 951 void reset () { memset (&mbs, 0, sizeof (mbs)); }
944 mbstate () { reset (); } 952 mbstate () { reset (); }
945}; 953};
954
955#define UNICODE_MASK 0x1fffffUL
946 956
947#if UNICODE3 957#if UNICODE3
948# define COMPOSE_LO 0x40000000UL 958# define COMPOSE_LO 0x40000000UL
949# define COMPOSE_HI 0x400fffffUL 959# define COMPOSE_HI 0x400fffffUL
950# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 960# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
980 990
981extern class rxvt_composite_vec rxvt_composite; 991extern class rxvt_composite_vec rxvt_composite;
982#endif 992#endif
983 993
984 994
995#ifdef KEYSYM_RESOURCE
996 class keyboard_manager;
997#endif
998
985struct rxvt_term : zero_initialized, rxvt_vars { 999struct rxvt_term : zero_initialized, rxvt_vars {
986 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
987 1001
988 struct mbstate mbstate; // current input multibyte state 1002 struct mbstate mbstate; // current input multibyte state
989 1003
… …
1006 hidden_text:1, 1020 hidden_text:1,
1007#endif 1021#endif
1008#ifdef POINTER_BLANK 1022#ifdef POINTER_BLANK
1009 hidden_pointer:1, 1023 hidden_pointer:1,
1010#endif 1024#endif
1011// enc_utf8:1, /* wether locale uses utf-8 */ 1025 enc_utf8:1, /* wether locale uses utf-8 */
1012 seen_input:1, /* wether we have seen some program output yet */ 1026 seen_input:1, /* wether we have seen some program output yet */
1013 seen_resize:1, /* wether we had a resize event */ 1027 seen_resize:1, /* wether we had a resize event */
1014 parsed_geometry:1; 1028 parsed_geometry:1;
1015 1029
1016 unsigned char refresh_type, 1030 unsigned char refresh_type,
… …
1062# ifdef POINTER_BLANK 1076# ifdef POINTER_BLANK
1063 pointerBlankDelay, 1077 pointerBlankDelay,
1064# endif 1078# endif
1065 allowedxerror; 1079 allowedxerror;
1066/* ---------- */ 1080/* ---------- */
1067 unsigned int ModMetaMask, 1081 unsigned int ModLevel3Mask,
1082 ModMetaMask,
1068 ModNumLockMask; 1083 ModNumLockMask;
1069 int old_width, /* last used width in screen resize */ 1084 int old_width, /* last used width in screen resize */
1070 old_height; /* last used height in screen resize */ 1085 old_height; /* last used height in screen resize */
1071 unsigned long priv_modes, 1086 unsigned long priv_modes,
1072 SavedModes; 1087 SavedModes;
… …
1106 pid_t cmd_pid; /* process id of child */ 1121 pid_t cmd_pid; /* process id of child */
1107 char * incr_buf; 1122 char * incr_buf;
1108 size_t incr_buf_size, incr_buf_fill; 1123 size_t incr_buf_size, incr_buf_fill;
1109/* ---------- */ 1124/* ---------- */
1110 Cursor leftptr_cursor; 1125 Cursor leftptr_cursor;
1111#ifdef POINTER_BLANK
1112 Cursor blank_cursor;
1113#endif
1114/* ---------- */ 1126/* ---------- */
1115#ifndef NO_BACKSPACE_KEY 1127#ifndef NO_BACKSPACE_KEY
1116 const char *key_backspace; 1128 const char *key_backspace;
1117#endif 1129#endif
1118#ifndef NO_DELETE_KEY 1130#ifndef NO_DELETE_KEY
… …
1176 char *locale; 1188 char *locale;
1177 char charsets[4]; 1189 char charsets[4];
1178 unsigned char *v_buffer; /* pointer to physical buffer */ 1190 unsigned char *v_buffer; /* pointer to physical buffer */
1179 unsigned int v_buflen; /* size of area to write */ 1191 unsigned int v_buflen; /* size of area to write */
1180 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1192 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1193
1181#ifdef KEYSYM_RESOURCE 1194#ifdef KEYSYM_RESOURCE
1182 const unsigned char *Keysym_map[256]; 1195 keyboard_manager *keyboard;
1183#endif 1196#endif
1197
1184 const char *rs[NUM_RESOURCES]; 1198 const char *rs[NUM_RESOURCES];
1185 /* command input buffering */ 1199 /* command input buffering */
1186 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1200 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1187 unsigned char cmdbuf_base[CBUFSIZ]; 1201 unsigned char cmdbuf_base[CBUFSIZ];
1188 1202
… …
1200 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1214 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);
1201 void iso14755_54 (int x, int y); 1215 void iso14755_54 (int x, int y);
1202# endif 1216# endif
1203#endif 1217#endif
1204 1218
1219 // modifies first argument(!)
1205 void paste (const unsigned char *data, unsigned int len); 1220 void paste (unsigned char *data, unsigned int len);
1206 1221
1207 void flush (); 1222 void flush ();
1208 1223
1209#if TRANSPARENT 1224#if TRANSPARENT
1210 void rootwin_cb (XEvent &xev); 1225 void rootwin_cb (XEvent &xev);
1211 xevent_watcher rootwin_ev; 1226 xevent_watcher rootwin_ev;
1212#endif 1227#endif
1213 1228
1214 1229
1215 void sig_term (sig_watcher &w); sig_watcher sw_term; 1230 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1216 void sig_chld (sig_watcher &w); sig_watcher sw_chld; 1231 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1217 1232
1218 void x_cb (XEvent &xev); 1233 void x_cb (XEvent &xev);
1219 xevent_watcher termwin_ev; 1234 xevent_watcher termwin_ev;
1220 xevent_watcher vt_ev; 1235 xevent_watcher vt_ev;
… …
1263 void tt_winch (); 1278 void tt_winch ();
1264 1279
1265 rxvt_term (); 1280 rxvt_term ();
1266 ~rxvt_term (); 1281 ~rxvt_term ();
1267 void destroy (); 1282 void destroy ();
1283 void emergency_cleanup ();
1268 1284
1269 bool init (int argc, const char *const *argv); 1285 bool init (int argc, const char *const *argv);
1270 bool init_vars (); 1286 bool init_vars ();
1271 1287
1272 bool pty_fill (); 1288 bool pty_fill ();
… …
1496 1512
1497 // xdefaults.C 1513 // xdefaults.C
1498 void get_options (int argc, const char *const *argv); 1514 void get_options (int argc, const char *const *argv);
1499 int parse_keysym (const char *str, const char *arg); 1515 int parse_keysym (const char *str, const char *arg);
1500 void get_xdefaults (FILE *stream, const char *name); 1516 void get_xdefaults (FILE *stream, const char *name);
1501 void extract_resources (Display *display, const char *name); 1517 void extract_resources ();
1502 // xpm.C 1518 // xpm.C
1503 int scale_pixmap (const char *geom); 1519 int scale_pixmap (const char *geom);
1504 void resize_pixmap (); 1520 void resize_pixmap ();
1505 Pixmap set_bgPixmap (const char *file); 1521 Pixmap set_bgPixmap (const char *file);
1506}; 1522};

Diff Legend

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