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.128 by root, Sat Dec 11 23:01:36 2004 UTC vs.
Revision 1.146 by root, Mon Feb 14 18:47:54 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,
… …
599#endif 603#endif
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
605 Rs_scrollBar_thickness,
606#ifndef NO_LINESPACE
607 Rs_lineSpace, 608 Rs_lineSpace,
609 Rs_embed,
608#endif 610#endif
609 Rs_cutchars, 611 Rs_cutchars,
610 Rs_modifier, 612 Rs_modifier,
611 Rs_answerbackstring, 613 Rs_answerbackstring,
612 Rs_tripleclickwords, 614 Rs_tripleclickwords,
613 Rs_insecure, 615 Rs_insecure,
614 Rs_cursorBlink, 616 Rs_cursorBlink,
615 Rs_pointerBlank, 617 Rs_pointerBlank,
616 Rs_pointerBlankDelay, 618 Rs_pointerBlankDelay,
617 Rs_imLocale, 619 Rs_imLocale,
620 Rs_imFont,
618 Rs_pastableTabs, 621 Rs_pastableTabs,
619#ifndef NO_SECONDARY_SCREEN 622#ifndef NO_SECONDARY_SCREEN
620 Rs_secondaryScreen, 623 Rs_secondaryScreen,
621 Rs_secondaryScroll, 624 Rs_secondaryScroll,
622#endif 625#endif
… …
638 XA_TARGETS, 641 XA_TARGETS,
639 XA_TIMESTAMP, 642 XA_TIMESTAMP,
640 XA_VT_SELECTION, 643 XA_VT_SELECTION,
641 XA_INCR, 644 XA_INCR,
642 XA_WMDELETEWINDOW, 645 XA_WMDELETEWINDOW,
646 XA_CLIPBOARD,
647#if ENABLE_FRILLS
648 XA_NET_WM_PID,
649 XA_MOTIF_WM_HINTS,
650 XA_NET_WM_NAME,
651 XA_NET_WM_ICON_NAME,
652#endif
653#if USE_XIM
654 XA_WM_LOCALE_NAME,
655#endif
643#ifdef TRANSPARENT 656#if TRANSPARENT
644 XA_XROOTPMAPID, 657 XA_XROOTPMAP_ID,
645 XA_XSETROOTID, 658 XA_ESETROOT_PMAP_ID,
646#endif 659#endif
647#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 660#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
648 XA_DNDPROTOCOL, 661 XA_DNDPROTOCOL,
649 XA_DNDSELECTION, 662 XA_DNDSELECTION,
650#endif /* OFFIX_DND */ 663#endif
651 XA_CLIPBOARD,
652 NUM_XA 664 NUM_XA
653}; 665};
654 666
655/* DEC private modes */ 667/* DEC private modes */
656#define PrivMode_132 (1UL<<0) 668#define PrivMode_132 (1UL<<0)
… …
746#define strdup(x) strdup((const char *)(x)) 758#define strdup(x) strdup((const char *)(x))
747#define strlen(x) strlen((const char *)(x)) 759#define strlen(x) strlen((const char *)(x))
748#define strchr(x, y) strchr((const char *)(x), (int)(y)) 760#define strchr(x, y) strchr((const char *)(x), (int)(y))
749#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 761#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
750 762
763#define dDisp Display *disp = display->display
764
751/* convert pixel dimensions to row/column values. Everything as int32_t */ 765/* convert pixel dimensions to row/column values. Everything as int32_t */
752#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 766#define Pixel2Col(x) Pixel2Width((int32_t)(x))
753#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 767#define Pixel2Row(y) Pixel2Height((int32_t)(y))
754#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 768#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)
755#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 769#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)) 867# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
854#else 868#else
855# define XPMClearArea(a, b, c, d, e, f, g) 869# define XPMClearArea(a, b, c, d, e, f, g)
856#endif 870#endif
857 871
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 872#ifdef UTMP_SUPPORT
866# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 873# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
867# undef HAVE_UTMPX_H 874# undef HAVE_UTMPX_H
868# undef HAVE_STRUCT_UTMPX 875# undef HAVE_STRUCT_UTMPX
869# endif 876# endif
… …
941 948
942 operator mbstate_t *() { return &mbs; } 949 operator mbstate_t *() { return &mbs; }
943 void reset () { memset (&mbs, 0, sizeof (mbs)); } 950 void reset () { memset (&mbs, 0, sizeof (mbs)); }
944 mbstate () { reset (); } 951 mbstate () { reset (); }
945}; 952};
953
954#define UNICODE_MASK 0x1fffffUL
946 955
947#if UNICODE3 956#if UNICODE3
948# define COMPOSE_LO 0x40000000UL 957# define COMPOSE_LO 0x40000000UL
949# define COMPOSE_HI 0x400fffffUL 958# define COMPOSE_HI 0x400fffffUL
950# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 959# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
980 989
981extern class rxvt_composite_vec rxvt_composite; 990extern class rxvt_composite_vec rxvt_composite;
982#endif 991#endif
983 992
984 993
994#ifdef KEYSYM_RESOURCE
995 class keyboard_manager;
996#endif
997
985struct rxvt_term : zero_initialized, rxvt_vars { 998struct rxvt_term : zero_initialized, rxvt_vars {
986 log_callback *log_hook; // log error messages through this hook, if != 0 999 log_callback *log_hook; // log error messages through this hook, if != 0
987 1000
988 struct mbstate mbstate; // current input multibyte state 1001 struct mbstate mbstate; // current input multibyte state
989 1002
… …
1006 hidden_text:1, 1019 hidden_text:1,
1007#endif 1020#endif
1008#ifdef POINTER_BLANK 1021#ifdef POINTER_BLANK
1009 hidden_pointer:1, 1022 hidden_pointer:1,
1010#endif 1023#endif
1011// enc_utf8:1, /* wether locale uses utf-8 */ 1024 enc_utf8:1, /* wether locale uses utf-8 */
1012 seen_input:1, /* wether we have seen some program output yet */ 1025 seen_input:1, /* wether we have seen some program output yet */
1013 seen_resize:1, /* wether we had a resize event */ 1026 seen_resize:1, /* wether we had a resize event */
1014 parsed_geometry:1; 1027 parsed_geometry:1;
1015 1028
1016 unsigned char refresh_type, 1029 unsigned char refresh_type,
… …
1062# ifdef POINTER_BLANK 1075# ifdef POINTER_BLANK
1063 pointerBlankDelay, 1076 pointerBlankDelay,
1064# endif 1077# endif
1065 allowedxerror; 1078 allowedxerror;
1066/* ---------- */ 1079/* ---------- */
1067 unsigned int ModMetaMask, 1080 unsigned int ModLevel3Mask,
1081 ModMetaMask,
1068 ModNumLockMask; 1082 ModNumLockMask;
1069 int old_width, /* last used width in screen resize */ 1083 int old_width, /* last used width in screen resize */
1070 old_height; /* last used height in screen resize */ 1084 old_height; /* last used height in screen resize */
1071 unsigned long priv_modes, 1085 unsigned long priv_modes,
1072 SavedModes; 1086 SavedModes;
… …
1102#endif 1116#endif
1103/* ---------- */ 1117/* ---------- */
1104 Time selection_time, 1118 Time selection_time,
1105 selection_request_time; 1119 selection_request_time;
1106 pid_t cmd_pid; /* process id of child */ 1120 pid_t cmd_pid; /* process id of child */
1121 char * incr_buf;
1122 size_t incr_buf_size, incr_buf_fill;
1107/* ---------- */ 1123/* ---------- */
1108 Cursor leftptr_cursor; 1124 Cursor leftptr_cursor;
1109#ifdef POINTER_BLANK
1110 Cursor blank_cursor;
1111#endif
1112/* ---------- */ 1125/* ---------- */
1113#ifndef NO_BACKSPACE_KEY 1126#ifndef NO_BACKSPACE_KEY
1114 const char *key_backspace; 1127 const char *key_backspace;
1115#endif 1128#endif
1116#ifndef NO_DELETE_KEY 1129#ifndef NO_DELETE_KEY
… …
1174 char *locale; 1187 char *locale;
1175 char charsets[4]; 1188 char charsets[4];
1176 unsigned char *v_buffer; /* pointer to physical buffer */ 1189 unsigned char *v_buffer; /* pointer to physical buffer */
1177 unsigned int v_buflen; /* size of area to write */ 1190 unsigned int v_buflen; /* size of area to write */
1178 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1191 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1192
1179#ifdef KEYSYM_RESOURCE 1193#ifdef KEYSYM_RESOURCE
1180 const unsigned char *Keysym_map[256]; 1194 keyboard_manager *keyboard;
1181#endif 1195#endif
1196
1182 const char *rs[NUM_RESOURCES]; 1197 const char *rs[NUM_RESOURCES];
1183 /* command input buffering */ 1198 /* command input buffering */
1184 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1199 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1185 unsigned char cmdbuf_base[CBUFSIZ]; 1200 unsigned char cmdbuf_base[CBUFSIZ];
1186 1201
… …
1198 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1213 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);
1199 void iso14755_54 (int x, int y); 1214 void iso14755_54 (int x, int y);
1200# endif 1215# endif
1201#endif 1216#endif
1202 1217
1218 // modifies first argument(!)
1203 void paste (const unsigned char *data, unsigned int len); 1219 void paste (unsigned char *data, unsigned int len);
1204 1220
1205 void flush (); 1221 void flush ();
1206 1222
1207#if TRANSPARENT 1223#if TRANSPARENT
1208 void rootwin_cb (XEvent &xev); 1224 void rootwin_cb (XEvent &xev);
1209 xevent_watcher rootwin_ev; 1225 xevent_watcher rootwin_ev;
1210#endif 1226#endif
1211 1227
1212 1228
1213 void sig_term (sig_watcher &w); sig_watcher sw_term; 1229 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1214 void sig_chld (sig_watcher &w); sig_watcher sw_chld; 1230 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1215 1231
1216 void x_cb (XEvent &xev); 1232 void x_cb (XEvent &xev);
1217 xevent_watcher termwin_ev; 1233 xevent_watcher termwin_ev;
1218 xevent_watcher vt_ev; 1234 xevent_watcher vt_ev;
… …
1254#endif 1270#endif
1255 void pointer_unblank (); 1271 void pointer_unblank ();
1256 1272
1257 void tt_printf (const char *fmt,...); 1273 void tt_printf (const char *fmt,...);
1258 void tt_write (const unsigned char *data, unsigned int len); 1274 void tt_write (const unsigned char *data, unsigned int len);
1275 void pty_write ();
1259 1276
1260 void tt_winch (); 1277 void tt_winch ();
1261 1278
1262 rxvt_term (); 1279 rxvt_term ();
1263 ~rxvt_term (); 1280 ~rxvt_term ();
1264 void destroy (); 1281 void destroy ();
1282 void emergency_cleanup ();
1265 1283
1266 bool init (int argc, const char *const *argv); 1284 bool init (int argc, const char *const *argv);
1267 bool init_vars (); 1285 bool init_vars ();
1268 1286
1269 bool pty_fill (); 1287 bool pty_fill ();
… …
1448 void scr_bell (); 1466 void scr_bell ();
1449 void scr_printscreen (int fullhist); 1467 void scr_printscreen (int fullhist);
1450 void scr_reverse_selection (); 1468 void scr_reverse_selection ();
1451 void scr_dump (int fd); 1469 void scr_dump (int fd);
1452 void selection_check (int check_more); 1470 void selection_check (int check_more);
1453 int selection_paste (Window win, Atom prop, bool delete_prop); 1471 void selection_paste (Window win, Atom prop, bool delete_prop);
1454 void selection_property (Window win, Atom prop); 1472 void selection_property (Window win, Atom prop);
1455 void selection_request (Time tm, int x, int y); 1473 void selection_request (Time tm, int x, int y);
1456 int selection_request_other (Atom target, int selnum); 1474 int selection_request_other (Atom target, int selnum);
1457 void selection_clear (); 1475 void selection_clear ();
1458 void selection_make (Time tm); 1476 void selection_make (Time tm);
… …
1493 1511
1494 // xdefaults.C 1512 // xdefaults.C
1495 void get_options (int argc, const char *const *argv); 1513 void get_options (int argc, const char *const *argv);
1496 int parse_keysym (const char *str, const char *arg); 1514 int parse_keysym (const char *str, const char *arg);
1497 void get_xdefaults (FILE *stream, const char *name); 1515 void get_xdefaults (FILE *stream, const char *name);
1498 void extract_resources (Display *display, const char *name); 1516 void extract_resources ();
1499 // xpm.C 1517 // xpm.C
1500 int scale_pixmap (const char *geom); 1518 int scale_pixmap (const char *geom);
1501 void resize_pixmap (); 1519 void resize_pixmap ();
1502 Pixmap set_bgPixmap (const char *file); 1520 Pixmap set_bgPixmap (const char *file);
1503}; 1521};

Diff Legend

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