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.125 by root, Sun Nov 21 19:04:07 2004 UTC vs.
Revision 1.157 by root, Mon Jun 13 05:30:26 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"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23
24#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1
28#endif
23 29
24/* 30/*
25 ***************************************************************************** 31 *****************************************************************************
26 * SYSTEM HACKS 32 * SYSTEM HACKS
27 ***************************************************************************** 33 *****************************************************************************
… …
80/* 86/*
81 ***************************************************************************** 87 *****************************************************************************
82 * PROTOTYPES 88 * PROTOTYPES
83 ***************************************************************************** 89 *****************************************************************************
84 */ 90 */
91// main.C
85RETSIGTYPE rxvt_Child_signal (int sig); 92RETSIGTYPE rxvt_Child_signal (int sig);
86RETSIGTYPE rxvt_Exit_signal (int sig); 93RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit (); 94void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size); 95void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size); 96void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size); 97void * rxvt_realloc (void *ptr, size_t size);
98void rxvt_privileges (rxvt_privaction action);
99
100// util.C
91char * rxvt_wcstombs (const wchar_t *str, int len); 101char * rxvt_wcstombs (const wchar_t *str, int len = -1);
102wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
103char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
104wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
92char * rxvt_strdup (const char *str); 105char * rxvt_strdup (const char *str);
106
107// misc.C
93char * rxvt_r_basename (const char *str); 108char * rxvt_r_basename (const char *str);
94void rxvt_vlog (const char *fmt, va_list arg_ptr); 109void rxvt_vlog (const char *fmt, va_list arg_ptr);
95void rxvt_log (const char *fmt,...); 110void rxvt_log (const char *fmt,...);
96void rxvt_warn (const char *fmt,...); 111void rxvt_warn (const char *fmt,...);
97void rxvt_fatal (const char *fmt,...); 112void rxvt_fatal (const char *fmt,...);
… …
104void rxvt_freecommastring (char **cs); 119void rxvt_freecommastring (char **cs);
105char * rxvt_File_find (const char *file, const char *ext, const char *path); 120char * rxvt_File_find (const char *file, const char *ext, const char *path);
106void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
107void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
108 123
109void rxvt_privileges (rxvt_privaction action);
110
111/* 124/*
112 ***************************************************************************** 125 *****************************************************************************
113 * STRUCTURES AND TYPEDEFS 126 * STRUCTURES AND TYPEDEFS
114 ***************************************************************************** 127 *****************************************************************************
115 */ 128 */
… …
124#endif 137#endif
125 138
126/* If we're using either the rxvt scrollbar or menu bars, keep the 139/* If we're using either the rxvt scrollbar or menu bars, keep the
127 * scrollColor resource. 140 * scrollColor resource.
128 */ 141 */
129#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 142#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
130# define KEEP_SCROLLCOLOR 1 143# define KEEP_SCROLLCOLOR 1
131#else 144#else
132# undef KEEP_SCROLLCOLOR 145# undef KEEP_SCROLLCOLOR
133#endif 146#endif
134 147
135#ifdef XPM_BACKGROUND 148#ifdef XPM_BACKGROUND
136typedef struct { 149typedef struct {
137 short w, h, x, y; 150 short w, h, x, y;
138 Pixmap pixmap; 151 Pixmap pixmap;
139} bgPixmap_t; 152} bgPixmap_t;
140#endif 153#endif
141 154
142/* 155/*
143 * the 'essential' information for reporting Mouse Events 156 * the 'essential' information for reporting Mouse Events
144 * pared down from XButtonEvent 157 * pared down from XButtonEvent
145 */ 158 */
146struct mouse_event { 159struct mouse_event {
147 int clicks; 160 int clicks;
148 Time time; /* milliseconds */ 161 Time time; /* milliseconds */
149 unsigned int state; /* key or button mask */ 162 unsigned int state; /* key or button mask */
150 unsigned int button; /* detail */ 163 unsigned int button; /* detail */
151}; 164};
152 165
153#define MAX_IT(current, other) if ((other) > (current)) (current) = (other) 166#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
154#define MIN_IT(current, other) if ((other) < (current)) (current) = (other) 167#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
155#define SWAP_IT(one, two, typeof) \ 168#define SWAP_IT(one, two, typeof) \
… …
170 INT32 input_mode; 183 INT32 input_mode;
171 CARD32 status; 184 CARD32 status;
172} MWMHints; 185} MWMHints;
173#endif 186#endif
174 187
188#if ENABLE_XEMBED
189// XEMBED messages
190# define XEMBED_EMBEDDED_NOTIFY 0
191# define XEMBED_WINDOW_ACTIVATE 1
192# define XEMBED_WINDOW_DEACTIVATE 2
193# define XEMBED_REQUEST_FOCUS 3
194# define XEMBED_FOCUS_IN 4
195# define XEMBED_FOCUS_OUT 5
196# define XEMBED_FOCUS_NEXT 6
197# define XEMBED_FOCUS_PREV 7
198
199# define XEMBED_MODALITY_ON 10
200# define XEMBED_MODALITY_OFF 11
201# define XEMBED_REGISTER_ACCELERATOR 12
202# define XEMBED_UNREGISTER_ACCELERATOR 13
203# define XEMBED_ACTIVATE_ACCELERATOR 14
204
205// XEMBED detail code
206# define XEMBED_FOCUS_CURRENT 0
207# define XEMBED_FOCUS_FIRST 1
208# define XEMBED_FOCUS_LAST 2
209
210# define XEMBED_MAPPED (1 << 0)
211#endif
212
175/* 213/*
176 ***************************************************************************** 214 *****************************************************************************
177 * NORMAL DEFINES 215 * NORMAL DEFINES
178 ***************************************************************************** 216 *****************************************************************************
179 */ 217 */
… …
229 267
230#define R_SB_ALIGN_CENTRE 0 268#define R_SB_ALIGN_CENTRE 0
231#define R_SB_ALIGN_TOP 1 269#define R_SB_ALIGN_TOP 1
232#define R_SB_ALIGN_BOTTOM 2 270#define R_SB_ALIGN_BOTTOM 2
233 271
234#define R_SB_RXVT 0
235#define R_SB_NEXT 1 272#define R_SB_NEXT 1
236#define R_SB_XTERM 2 273#define R_SB_XTERM 2
237#define R_SB_PLAIN 4 274#define R_SB_PLAIN 4
275#define R_SB_RXVT 8
238 276
239#define SB_WIDTH_NEXT 19 277#define SB_WIDTH_NEXT 19
240#define SB_WIDTH_XTERM 15 278#define SB_WIDTH_XTERM 15
241#define SB_WIDTH_PLAIN 7 279#define SB_WIDTH_PLAIN 7
242#ifndef SB_WIDTH_RXVT 280#ifndef SB_WIDTH_RXVT
… …
435 XTerm_Color_UL = 19, // change actual 'Underline' color 473 XTerm_Color_UL = 19, // change actual 'Underline' color
436 XTerm_Pixmap = 20, // new bg pixmap 474 XTerm_Pixmap = 20, // new bg pixmap
437 XTerm_restoreFG = 39, // change default fg color 475 XTerm_restoreFG = 39, // change default fg color
438 XTerm_restoreBG = 49, // change default bg color 476 XTerm_restoreBG = 49, // change default bg color
439 XTerm_dumpscreen = 55, // dump scrollback and all of screen 477 XTerm_dumpscreen = 55, // dump scrollback and all of screen
478
440 XTerm_locale = 701, // change locale 479 URxvt_locale = 701, // change locale
441 XTerm_Menu = 703, // set menu item 480 URxvt_Menu = 703, // set menu item
442 XTerm_Color_IT = 704, // change actual 'Italic' colour 481 URxvt_Color_IT = 704, // change actual 'Italic' colour
443 XTerm_Color_tint = 705, // change actual tint colour 482 URxvt_Color_tint = 705, // change actual tint colour
444 483
445 URxvt_font = 710, 484 URxvt_font = 710,
446 URxvt_boldFont = 711, 485 URxvt_boldFont = 711,
447 URxvt_italicFont = 712, 486 URxvt_italicFont = 712,
448 URxvt_boldItalicFont = 713, 487 URxvt_boldItalicFont = 713,
488
489 URxvt_view_up = 720,
490 URxvt_view_down = 721,
449}; 491};
450 492
451/* Words starting with `Color_' are colours. Others are counts */ 493/* Words starting with `Color_' are colours. Others are counts */
452/* 494/*
453 * The following comment is mostly obsolete since pixcolor_set was expanded: 495 * The following comment is mostly obsolete since pixcolor_set was expanded:
… …
497 Color_BD, 539 Color_BD,
498 Color_IT, 540 Color_IT,
499 Color_UL, 541 Color_UL,
500 Color_RV, 542 Color_RV,
501#endif 543#endif
544#if ENABLE_FRILLS
545 Color_underline,
546#endif
502#ifdef OPTION_HC 547#ifdef OPTION_HC
503 Color_HC, 548 Color_HC,
504#endif 549#endif
505#ifdef KEEP_SCROLLCOLOR 550#ifdef KEEP_SCROLLCOLOR
506 Color_scroll, 551 Color_scroll,
… …
557#ifdef HAVE_SCROLLBARS 602#ifdef HAVE_SCROLLBARS
558 Rs_scrollBar, 603 Rs_scrollBar,
559 Rs_scrollBar_right, 604 Rs_scrollBar_right,
560 Rs_scrollBar_floating, 605 Rs_scrollBar_floating,
561 Rs_scrollBar_align, 606 Rs_scrollBar_align,
562#endif
563 Rs_scrollstyle, /* Rs_scrollBar_style */ 607 Rs_scrollstyle, /* Rs_scrollBar_style */
608 Rs_scrollBar_thickness,
609#endif
564 Rs_scrollTtyOutput, 610 Rs_scrollTtyOutput,
565 Rs_scrollTtyKeypress, 611 Rs_scrollTtyKeypress,
566 Rs_scrollWithBuffer, 612 Rs_scrollWithBuffer,
567 Rs_saveLines, 613 Rs_saveLines,
568 Rs_utmpInhibit, 614 Rs_utmpInhibit,
… …
596#endif 642#endif
597#if ENABLE_FRILLS 643#if ENABLE_FRILLS
598 Rs_ext_bwidth, 644 Rs_ext_bwidth,
599 Rs_int_bwidth, 645 Rs_int_bwidth,
600 Rs_borderLess, 646 Rs_borderLess,
601#endif
602 Rs_scrollBar_thickness,
603#ifndef NO_LINESPACE
604 Rs_lineSpace, 647 Rs_lineSpace,
648 Rs_pty_fd,
649 Rs_cursorUnderline,
650#endif
651#if CURSOR_BLINK
652 Rs_cursorBlink,
653#endif
654#if ENABLE_XEMBED
655 Rs_embed,
605#endif 656#endif
606 Rs_cutchars, 657 Rs_cutchars,
607 Rs_modifier, 658 Rs_modifier,
608 Rs_answerbackstring, 659 Rs_answerbackstring,
609 Rs_tripleclickwords, 660 Rs_tripleclickwords,
610 Rs_insecure, 661 Rs_insecure,
611 Rs_cursorBlink,
612 Rs_pointerBlank, 662 Rs_pointerBlank,
613 Rs_pointerBlankDelay, 663 Rs_pointerBlankDelay,
614 Rs_imLocale, 664 Rs_imLocale,
665 Rs_imFont,
666 Rs_pastableTabs,
615#ifndef NO_SECONDARY_SCREEN 667#ifndef NO_SECONDARY_SCREEN
616 Rs_secondaryScreen, 668 Rs_secondaryScreen,
617 Rs_secondaryScroll, 669 Rs_secondaryScroll,
618#endif 670#endif
619#ifdef OFF_FOCUS_FADING 671#ifdef OFF_FOCUS_FADING
… …
633 XA_MULTIPLE, 685 XA_MULTIPLE,
634 XA_TARGETS, 686 XA_TARGETS,
635 XA_TIMESTAMP, 687 XA_TIMESTAMP,
636 XA_VT_SELECTION, 688 XA_VT_SELECTION,
637 XA_INCR, 689 XA_INCR,
690 XA_WM_PROTOCOLS,
638 XA_WMDELETEWINDOW, 691 XA_WM_DELETE_WINDOW,
692 XA_CLIPBOARD,
693#if ENABLE_FRILLS
694 XA_MOTIF_WM_HINTS,
695#endif
696#if ENABLE_EWMH
697 XA_NET_WM_PID,
698 XA_NET_WM_NAME,
699 XA_NET_WM_ICON_NAME,
700 XA_NET_WM_PING,
701#endif
702#if USE_XIM
703 XA_WM_LOCALE_NAME,
704#endif
639#ifdef TRANSPARENT 705#if TRANSPARENT
640 XA_XROOTPMAPID, 706 XA_XROOTPMAP_ID,
641 XA_XSETROOTID, 707 XA_ESETROOT_PMAP_ID,
642#endif 708#endif
643#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 709#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
644 XA_DNDPROTOCOL, 710 XA_DNDPROTOCOL,
645 XA_DNDSELECTION, 711 XA_DNDSELECTION,
646#endif /* OFFIX_DND */ 712#endif
647 XA_CLIPBOARD, 713#if ENABLE_XEMBED
714 XA_XEMBED,
715 XA_XEMBED_INFO,
716#endif
648 NUM_XA 717 NUM_XA
649}; 718};
650 719
651/* DEC private modes */ 720/* DEC private modes */
652#define PrivMode_132 (1UL<<0) 721#define PrivMode_132 (1UL<<0)
… …
679 priv_modes |= (bit); \ 748 priv_modes |= (bit); \
680 else \ 749 else \
681 priv_modes &= ~(bit) 750 priv_modes &= ~(bit)
682 751
683#ifdef ALLOW_132_MODE 752#ifdef ALLOW_132_MODE
684# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 753# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
685#else 754#else
686# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 755# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
687#endif 756#endif
688 757
689// do not change these constants lightly, there are many interdependencies 758// do not change these constants lightly, there are many interdependencies
690#define IMBUFSIZ 128 // input modifier buffer sizes 759#define IMBUFSIZ 128 // input modifier buffer sizes
691#define KBUFSZ 512 // size of keyboard mapping buffer 760#define KBUFSZ 512 // size of keyboard mapping buffer
… …
742#define strdup(x) strdup((const char *)(x)) 811#define strdup(x) strdup((const char *)(x))
743#define strlen(x) strlen((const char *)(x)) 812#define strlen(x) strlen((const char *)(x))
744#define strchr(x, y) strchr((const char *)(x), (int)(y)) 813#define strchr(x, y) strchr((const char *)(x), (int)(y))
745#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 814#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
746 815
816#define dDisp Display *disp = display->display
817
747/* convert pixel dimensions to row/column values. Everything as int32_t */ 818/* convert pixel dimensions to row/column values. Everything as int32_t */
748#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 819#define Pixel2Col(x) Pixel2Width((int32_t)(x))
749#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 820#define Pixel2Row(y) Pixel2Height((int32_t)(y))
750#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 821#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth)
751#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 822#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight)
… …
849# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 920# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
850#else 921#else
851# define XPMClearArea(a, b, c, d, e, f, g) 922# define XPMClearArea(a, b, c, d, e, f, g)
852#endif 923#endif
853 924
854#ifndef STRICT_FONT_CHECKING
855# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
856#endif
857
858#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
859#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
860
861#ifdef UTMP_SUPPORT 925#ifdef UTMP_SUPPORT
862# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 926# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
863# undef HAVE_UTMPX_H 927# undef HAVE_UTMPX_H
864# undef HAVE_STRUCT_UTMPX 928# undef HAVE_STRUCT_UTMPX
865# endif 929# endif
… …
937 1001
938 operator mbstate_t *() { return &mbs; } 1002 operator mbstate_t *() { return &mbs; }
939 void reset () { memset (&mbs, 0, sizeof (mbs)); } 1003 void reset () { memset (&mbs, 0, sizeof (mbs)); }
940 mbstate () { reset (); } 1004 mbstate () { reset (); }
941}; 1005};
1006
1007#define UNICODE_MASK 0x1fffffUL
942 1008
943#if UNICODE3 1009#if UNICODE3
944# define COMPOSE_LO 0x40000000UL 1010# define COMPOSE_LO 0x40000000UL
945# define COMPOSE_HI 0x400fffffUL 1011# define COMPOSE_HI 0x400fffffUL
946# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 1012# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
976 1042
977extern class rxvt_composite_vec rxvt_composite; 1043extern class rxvt_composite_vec rxvt_composite;
978#endif 1044#endif
979 1045
980 1046
1047#ifdef KEYSYM_RESOURCE
1048 class keyboard_manager;
1049#endif
1050
981struct rxvt_term : zero_initialized, rxvt_vars { 1051struct rxvt_term : zero_initialized, rxvt_vars {
982 log_callback *log_hook; // log error messages through this hook, if != 0 1052 log_callback *log_hook; // log error messages through this hook, if != 0
983 1053
984 struct mbstate mbstate; // current input multibyte state 1054 struct mbstate mbstate; // current input multibyte state
985 1055
… …
1002 hidden_text:1, 1072 hidden_text:1,
1003#endif 1073#endif
1004#ifdef POINTER_BLANK 1074#ifdef POINTER_BLANK
1005 hidden_pointer:1, 1075 hidden_pointer:1,
1006#endif 1076#endif
1007// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 1077 enc_utf8:1, /* wether locale uses utf-8 */
1008 seen_input:1, /* wether we have seen some program output yet */ 1078 seen_input:1, /* wether we have seen some program output yet */
1009 seen_resize:1, /* wether we had a resize event */ 1079 seen_resize:1, /* wether we had a resize event */
1010 parsed_geometry:1; 1080 parsed_geometry:1;
1011 1081
1012 unsigned char refresh_type, 1082 unsigned char refresh_type,
… …
1058# ifdef POINTER_BLANK 1128# ifdef POINTER_BLANK
1059 pointerBlankDelay, 1129 pointerBlankDelay,
1060# endif 1130# endif
1061 allowedxerror; 1131 allowedxerror;
1062/* ---------- */ 1132/* ---------- */
1063 unsigned int ModMetaMask, 1133 unsigned int ModLevel3Mask,
1134 ModMetaMask,
1064 ModNumLockMask; 1135 ModNumLockMask;
1065 int old_width, /* last used width in screen resize */ 1136 int old_width, /* last used width in screen resize */
1066 old_height; /* last used height in screen resize */ 1137 old_height; /* last used height in screen resize */
1067 unsigned long priv_modes, 1138 unsigned long priv_modes,
1068 SavedModes; 1139 SavedModes;
… …
1098#endif 1169#endif
1099/* ---------- */ 1170/* ---------- */
1100 Time selection_time, 1171 Time selection_time,
1101 selection_request_time; 1172 selection_request_time;
1102 pid_t cmd_pid; /* process id of child */ 1173 pid_t cmd_pid; /* process id of child */
1174 char * incr_buf;
1175 size_t incr_buf_size, incr_buf_fill;
1103/* ---------- */ 1176/* ---------- */
1104 Cursor leftptr_cursor; 1177 Cursor leftptr_cursor;
1105#ifdef POINTER_BLANK
1106 Cursor blank_cursor;
1107#endif
1108/* ---------- */ 1178/* ---------- */
1109#ifndef NO_BACKSPACE_KEY 1179#ifndef NO_BACKSPACE_KEY
1110 const char *key_backspace; 1180 const char *key_backspace;
1111#endif 1181#endif
1112#ifndef NO_DELETE_KEY 1182#ifndef NO_DELETE_KEY
… …
1166 char *env_windowid; /* environmental variable WINDOWID */ 1236 char *env_windowid; /* environmental variable WINDOWID */
1167 char *env_display; /* environmental variable DISPLAY */ 1237 char *env_display; /* environmental variable DISPLAY */
1168 char *env_term; /* environmental variable TERM */ 1238 char *env_term; /* environmental variable TERM */
1169 char *env_colorfgbg; 1239 char *env_colorfgbg;
1170 char *locale; 1240 char *locale;
1171#if 0
1172 char *codeset;
1173#endif
1174 char charsets[4]; 1241 char charsets[4];
1175 unsigned char *v_buffer; /* pointer to physical buffer */ 1242 unsigned char *v_buffer; /* pointer to physical buffer */
1176 unsigned int v_buflen; /* size of area to write */ 1243 unsigned int v_buflen; /* size of area to write */
1177 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1244 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1245
1178#ifdef KEYSYM_RESOURCE 1246#ifdef KEYSYM_RESOURCE
1179 const unsigned char *Keysym_map[256]; 1247 keyboard_manager *keyboard;
1180#endif 1248#endif
1249
1181 const char *rs[NUM_RESOURCES]; 1250 const char *rs[NUM_RESOURCES];
1182 /* command input buffering */ 1251 /* command input buffering */
1183 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1252 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1184 unsigned char cmdbuf_base[CBUFSIZ]; 1253 unsigned char cmdbuf_base[CBUFSIZ];
1185 1254
… …
1197 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1266 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE);
1198 void iso14755_54 (int x, int y); 1267 void iso14755_54 (int x, int y);
1199# endif 1268# endif
1200#endif 1269#endif
1201 1270
1271 // modifies first argument(!)
1202 void paste (const unsigned char *data, unsigned int len); 1272 void paste (unsigned char *data, unsigned int len);
1203 1273
1204 void flush (); 1274 void flush ();
1205 1275
1206#if TRANSPARENT 1276#if TRANSPARENT
1207 void rootwin_cb (XEvent &xev); 1277 void rootwin_cb (XEvent &xev);
1208 xevent_watcher rootwin_ev; 1278 xevent_watcher rootwin_ev;
1209#endif 1279#endif
1210 1280
1211 1281
1212 void sig_term (sig_watcher &w); sig_watcher sw_term; 1282 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1213 void sig_chld (sig_watcher &w); sig_watcher sw_chld; 1283 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1214 1284
1215 void x_cb (XEvent &xev); 1285 void x_cb (XEvent &xev);
1216 xevent_watcher termwin_ev; 1286 xevent_watcher termwin_ev;
1217 xevent_watcher vt_ev; 1287 xevent_watcher vt_ev;
… …
1253#endif 1323#endif
1254 void pointer_unblank (); 1324 void pointer_unblank ();
1255 1325
1256 void tt_printf (const char *fmt,...); 1326 void tt_printf (const char *fmt,...);
1257 void tt_write (const unsigned char *data, unsigned int len); 1327 void tt_write (const unsigned char *data, unsigned int len);
1328 void pty_write ();
1258 1329
1259 void tt_winch (); 1330 void tt_winch ();
1260 1331
1261 rxvt_term (); 1332 rxvt_term ();
1262 ~rxvt_term (); 1333 ~rxvt_term ();
1263 void destroy (); 1334 void destroy ();
1335 void emergency_cleanup ();
1264 1336
1265 bool init (int argc, const char *const *argv); 1337 bool init (int argc, const char *const *argv);
1266 bool init_vars (); 1338 bool init_vars ();
1267 1339
1268 bool pty_fill (); 1340 bool pty_fill ();
… …
1322 1394
1323 bool cmd_parse (); 1395 bool cmd_parse ();
1324 void mouse_report (XButtonEvent &ev); 1396 void mouse_report (XButtonEvent &ev);
1325 void button_press (XButtonEvent &ev); 1397 void button_press (XButtonEvent &ev);
1326 void button_release (XButtonEvent &ev); 1398 void button_release (XButtonEvent &ev);
1399 void focus_in ();
1400 void focus_out ();
1327 int check_our_parents (); 1401 int check_our_parents ();
1328#ifdef PRINTPIPE 1402#ifdef PRINTPIPE
1329 FILE *popen_printer (); 1403 FILE *popen_printer ();
1330 int pclose_printer (FILE *stream); 1404 int pclose_printer (FILE *stream);
1331#endif 1405#endif
… …
1351 void makeutent (const char *pty, const char *hostname); 1425 void makeutent (const char *pty, const char *hostname);
1352 void cleanutent (); 1426 void cleanutent ();
1353 // main.C 1427 // main.C
1354 void privileged_utmp (rxvt_privaction action); 1428 void privileged_utmp (rxvt_privaction action);
1355 bool set_fonts (); 1429 bool set_fonts ();
1430 void set_string_property (Atom prop, const char *str, int len = -1);
1431 void set_utf8_property (Atom prop, const char *str, int len = -1);
1356 void set_title (const char *str); 1432 void set_title (const char *str);
1357 void set_icon_name (const char *str); 1433 void set_icon_name (const char *str);
1358 void set_window_color (int idx, const char *color); 1434 void set_window_color (int idx, const char *color);
1359 void set_colorfgbg (); 1435 void set_colorfgbg ();
1360 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1436 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
… …
1402 void scr_release (); 1478 void scr_release ();
1403 void scr_clear (bool really = false); 1479 void scr_clear (bool really = false);
1404 void scr_refresh (unsigned char refresh_type); 1480 void scr_refresh (unsigned char refresh_type);
1405 bool scr_refresh_rend (rend_t mask, rend_t value); 1481 bool scr_refresh_rend (rend_t mask, rend_t value);
1406 void scr_erase_screen (int mode); 1482 void scr_erase_screen (int mode);
1483#if ENABLE_FRILLS
1484 void scr_erase_savelines ();
1485 void scr_backindex ();
1486 void scr_forwardindex ();
1487#endif
1407 void scr_touch (bool refresh); 1488 void scr_touch (bool refresh);
1408 void scr_expose (int x, int y, int width, int height, bool refresh); 1489 void scr_expose (int x, int y, int width, int height, bool refresh);
1409 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1490 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1410 void scr_recolour (); 1491 void scr_recolour ();
1411 void scr_remap_chars (); 1492 void scr_remap_chars ();
… …
1418 void scr_color (unsigned int color, int fgbg); 1499 void scr_color (unsigned int color, int fgbg);
1419 void scr_rendition (int set, int style); 1500 void scr_rendition (int set, int style);
1420 void scr_add_lines (const unicode_t *str, int nlines, int len); 1501 void scr_add_lines (const unicode_t *str, int nlines, int len);
1421 void scr_backspace (); 1502 void scr_backspace ();
1422 void scr_tab (int count, bool ht = false); 1503 void scr_tab (int count, bool ht = false);
1423 void scr_backindex ();
1424 void scr_forwardindex ();
1425 void scr_gotorc (int row, int col, int relative); 1504 void scr_gotorc (int row, int col, int relative);
1426 void scr_index (enum page_dirn direction); 1505 void scr_index (enum page_dirn direction);
1427 void scr_erase_line (int mode); 1506 void scr_erase_line (int mode);
1428 void scr_E (); 1507 void scr_E ();
1429 void scr_insdel_lines (int count, int insdel); 1508 void scr_insdel_lines (int count, int insdel);
… …
1445 void scr_bell (); 1524 void scr_bell ();
1446 void scr_printscreen (int fullhist); 1525 void scr_printscreen (int fullhist);
1447 void scr_reverse_selection (); 1526 void scr_reverse_selection ();
1448 void scr_dump (int fd); 1527 void scr_dump (int fd);
1449 void selection_check (int check_more); 1528 void selection_check (int check_more);
1450 int selection_paste (Window win, Atom prop, bool delete_prop); 1529 void selection_paste (Window win, Atom prop, bool delete_prop);
1451 void selection_property (Window win, Atom prop); 1530 void selection_property (Window win, Atom prop);
1452 void selection_request (Time tm, int x, int y); 1531 void selection_request (Time tm, int x, int y);
1453 int selection_request_other (Atom target, int selnum); 1532 int selection_request_other (Atom target, int selnum);
1454 void selection_clear (); 1533 void selection_clear ();
1455 void selection_make (Time tm); 1534 void selection_make (Time tm);
… …
1490 1569
1491 // xdefaults.C 1570 // xdefaults.C
1492 void get_options (int argc, const char *const *argv); 1571 void get_options (int argc, const char *const *argv);
1493 int parse_keysym (const char *str, const char *arg); 1572 int parse_keysym (const char *str, const char *arg);
1494 void get_xdefaults (FILE *stream, const char *name); 1573 void get_xdefaults (FILE *stream, const char *name);
1495 void extract_resources (Display *display, const char *name); 1574 void extract_resources ();
1496 // xpm.C 1575 // xpm.C
1497 int scale_pixmap (const char *geom); 1576 int scale_pixmap (const char *geom);
1498 void resize_pixmap (); 1577 void resize_pixmap ();
1499 Pixmap set_bgPixmap (const char *file); 1578 Pixmap set_bgPixmap (const char *file);
1500}; 1579};

Diff Legend

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