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.135 by root, Mon Dec 20 18:07:19 2004 UTC vs.
Revision 1.165 by root, Tue Dec 20 22:27:49 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 = -1); 101char * rxvt_wcstombs (const wchar_t *str, int len = -1);
92wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 102wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
93char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 103char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
94wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 104wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
95char * rxvt_strdup (const char *str); 105char * rxvt_strdup (const char *str);
106
107// misc.C
96char * rxvt_r_basename (const char *str); 108char * rxvt_r_basename (const char *str);
97void rxvt_vlog (const char *fmt, va_list arg_ptr); 109void rxvt_vlog (const char *fmt, va_list arg_ptr);
98void rxvt_log (const char *fmt,...); 110void rxvt_log (const char *fmt,...);
99void rxvt_warn (const char *fmt,...); 111void rxvt_warn (const char *fmt,...);
100void rxvt_fatal (const char *fmt,...); 112void rxvt_fatal (const char *fmt,...);
… …
106char ** rxvt_splitcommastring (const char *cs); 118char ** rxvt_splitcommastring (const char *cs);
107void rxvt_freecommastring (char **cs); 119void rxvt_freecommastring (char **cs);
108char * 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);
109void 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);
110void 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);
111 123void rxvt_usleep (int usecs);
112void rxvt_privileges (rxvt_privaction action);
113 124
114/* 125/*
115 ***************************************************************************** 126 *****************************************************************************
116 * STRUCTURES AND TYPEDEFS 127 * STRUCTURES AND TYPEDEFS
117 ***************************************************************************** 128 *****************************************************************************
… …
127#endif 138#endif
128 139
129/* If we're using either the rxvt scrollbar or menu bars, keep the 140/* If we're using either the rxvt scrollbar or menu bars, keep the
130 * scrollColor resource. 141 * scrollColor resource.
131 */ 142 */
132#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 143#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
133# define KEEP_SCROLLCOLOR 1 144# define KEEP_SCROLLCOLOR 1
134#else 145#else
135# undef KEEP_SCROLLCOLOR 146# undef KEEP_SCROLLCOLOR
136#endif 147#endif
137 148
… …
173 INT32 input_mode; 184 INT32 input_mode;
174 CARD32 status; 185 CARD32 status;
175} MWMHints; 186} MWMHints;
176#endif 187#endif
177 188
189#if ENABLE_XEMBED
190// XEMBED messages
191# define XEMBED_EMBEDDED_NOTIFY 0
192# define XEMBED_WINDOW_ACTIVATE 1
193# define XEMBED_WINDOW_DEACTIVATE 2
194# define XEMBED_REQUEST_FOCUS 3
195# define XEMBED_FOCUS_IN 4
196# define XEMBED_FOCUS_OUT 5
197# define XEMBED_FOCUS_NEXT 6
198# define XEMBED_FOCUS_PREV 7
199
200# define XEMBED_MODALITY_ON 10
201# define XEMBED_MODALITY_OFF 11
202# define XEMBED_REGISTER_ACCELERATOR 12
203# define XEMBED_UNREGISTER_ACCELERATOR 13
204# define XEMBED_ACTIVATE_ACCELERATOR 14
205
206// XEMBED detail code
207# define XEMBED_FOCUS_CURRENT 0
208# define XEMBED_FOCUS_FIRST 1
209# define XEMBED_FOCUS_LAST 2
210
211# define XEMBED_MAPPED (1 << 0)
212#endif
213
178/* 214/*
179 ***************************************************************************** 215 *****************************************************************************
180 * NORMAL DEFINES 216 * NORMAL DEFINES
181 ***************************************************************************** 217 *****************************************************************************
182 */ 218 */
… …
232 268
233#define R_SB_ALIGN_CENTRE 0 269#define R_SB_ALIGN_CENTRE 0
234#define R_SB_ALIGN_TOP 1 270#define R_SB_ALIGN_TOP 1
235#define R_SB_ALIGN_BOTTOM 2 271#define R_SB_ALIGN_BOTTOM 2
236 272
237#define R_SB_RXVT 0
238#define R_SB_NEXT 1 273#define R_SB_NEXT 1
239#define R_SB_XTERM 2 274#define R_SB_XTERM 2
240#define R_SB_PLAIN 4 275#define R_SB_PLAIN 4
276#define R_SB_RXVT 8
241 277
242#define SB_WIDTH_NEXT 19 278#define SB_WIDTH_NEXT 19
243#define SB_WIDTH_XTERM 15 279#define SB_WIDTH_XTERM 15
244#define SB_WIDTH_PLAIN 7 280#define SB_WIDTH_PLAIN 7
245#ifndef SB_WIDTH_RXVT 281#ifndef SB_WIDTH_RXVT
… …
438 XTerm_Color_UL = 19, // change actual 'Underline' color 474 XTerm_Color_UL = 19, // change actual 'Underline' color
439 XTerm_Pixmap = 20, // new bg pixmap 475 XTerm_Pixmap = 20, // new bg pixmap
440 XTerm_restoreFG = 39, // change default fg color 476 XTerm_restoreFG = 39, // change default fg color
441 XTerm_restoreBG = 49, // change default bg color 477 XTerm_restoreBG = 49, // change default bg color
442 XTerm_dumpscreen = 55, // dump scrollback and all of screen 478 XTerm_dumpscreen = 55, // dump scrollback and all of screen
479
443 XTerm_locale = 701, // change locale 480 URxvt_locale = 701, // change locale
444 XTerm_Menu = 703, // set menu item 481 URxvt_Menu = 703, // set menu item
445 XTerm_Color_IT = 704, // change actual 'Italic' colour 482 URxvt_Color_IT = 704, // change actual 'Italic' colour
446 XTerm_Color_tint = 705, // change actual tint colour 483 URxvt_Color_tint = 705, // change actual tint colour
447 484
448 URxvt_font = 710, 485 URxvt_font = 710,
449 URxvt_boldFont = 711, 486 URxvt_boldFont = 711,
450 URxvt_italicFont = 712, 487 URxvt_italicFont = 712,
451 URxvt_boldItalicFont = 713, 488 URxvt_boldItalicFont = 713,
489
490 URxvt_view_up = 720,
491 URxvt_view_down = 721,
452}; 492};
453 493
454/* Words starting with `Color_' are colours. Others are counts */ 494/* Words starting with `Color_' are colours. Others are counts */
455/* 495/*
456 * The following comment is mostly obsolete since pixcolor_set was expanded:
457 * We're currently upto 29 colours. Only 3 more available. The
458 * PixColor and rendition colour usage should probably be decoupled 496 * The PixColor and rendition colour usage should probably be decoupled
459 * on the unnecessary items, e.g. Color_pointer, but won't bother 497 * on the unnecessary items, e.g. Color_pointer, but won't bother
460 * until we need to. Also, be aware of usage in pixcolor_set 498 * until we need to. Also, be aware of usage in pixcolor_set
461 */ 499 */
462 500
463enum colour_list { 501enum colour_list {
… …
513 Color_trough, 551 Color_trough,
514#endif 552#endif
515#if TINTING 553#if TINTING
516 Color_tint, 554 Color_tint,
517#endif 555#endif
556#if OFF_FOCUS_FADING
557 Color_fade,
558#endif
518 NRS_COLORS, /* */ 559 NRS_COLORS, /* */
519#ifdef KEEP_SCROLLCOLOR 560#ifdef KEEP_SCROLLCOLOR
520 Color_topShadow = NRS_COLORS, 561 Color_topShadow = NRS_COLORS,
521 Color_bottomShadow, 562 Color_bottomShadow,
522 TOTAL_COLORS 563 TOTAL_COLORS
… …
563#ifdef HAVE_SCROLLBARS 604#ifdef HAVE_SCROLLBARS
564 Rs_scrollBar, 605 Rs_scrollBar,
565 Rs_scrollBar_right, 606 Rs_scrollBar_right,
566 Rs_scrollBar_floating, 607 Rs_scrollBar_floating,
567 Rs_scrollBar_align, 608 Rs_scrollBar_align,
568#endif
569 Rs_scrollstyle, /* Rs_scrollBar_style */ 609 Rs_scrollstyle, /* Rs_scrollBar_style */
610 Rs_scrollBar_thickness,
611#endif
570 Rs_scrollTtyOutput, 612 Rs_scrollTtyOutput,
571 Rs_scrollTtyKeypress, 613 Rs_scrollTtyKeypress,
572 Rs_scrollWithBuffer, 614 Rs_scrollWithBuffer,
573 Rs_saveLines, 615 Rs_saveLines,
574 Rs_utmpInhibit, 616 Rs_utmpInhibit,
… …
602#endif 644#endif
603#if ENABLE_FRILLS 645#if ENABLE_FRILLS
604 Rs_ext_bwidth, 646 Rs_ext_bwidth,
605 Rs_int_bwidth, 647 Rs_int_bwidth,
606 Rs_borderLess, 648 Rs_borderLess,
607#endif
608 Rs_scrollBar_thickness,
609#ifndef NO_LINESPACE
610 Rs_lineSpace, 649 Rs_lineSpace,
650 Rs_pty_fd,
651 Rs_cursorUnderline,
652#endif
653#if CURSOR_BLINK
654 Rs_cursorBlink,
655#endif
656#if ENABLE_XEMBED
657 Rs_embed,
611#endif 658#endif
612 Rs_cutchars, 659 Rs_cutchars,
613 Rs_modifier, 660 Rs_modifier,
614 Rs_answerbackstring, 661 Rs_answerbackstring,
615 Rs_tripleclickwords, 662 Rs_tripleclickwords,
616 Rs_insecure, 663 Rs_insecure,
617 Rs_cursorBlink,
618 Rs_pointerBlank, 664 Rs_pointerBlank,
619 Rs_pointerBlankDelay, 665 Rs_pointerBlankDelay,
620 Rs_imLocale, 666 Rs_imLocale,
667 Rs_imFont,
621 Rs_pastableTabs, 668 Rs_pastableTabs,
622#ifndef NO_SECONDARY_SCREEN 669#ifndef NO_SECONDARY_SCREEN
623 Rs_secondaryScreen, 670 Rs_secondaryScreen,
624 Rs_secondaryScroll, 671 Rs_secondaryScroll,
625#endif 672#endif
… …
640 XA_MULTIPLE, 687 XA_MULTIPLE,
641 XA_TARGETS, 688 XA_TARGETS,
642 XA_TIMESTAMP, 689 XA_TIMESTAMP,
643 XA_VT_SELECTION, 690 XA_VT_SELECTION,
644 XA_INCR, 691 XA_INCR,
692 XA_WM_PROTOCOLS,
645 XA_WMDELETEWINDOW, 693 XA_WM_DELETE_WINDOW,
646 XA_CLIPBOARD, 694 XA_CLIPBOARD,
647#if ENABLE_FRILLS 695#if ENABLE_FRILLS
696 XA_MOTIF_WM_HINTS,
697#endif
698#if ENABLE_EWMH
648 XA_NET_WM_PID, 699 XA_NET_WM_PID,
649 XA_MOTIF_WM_HINTS,
650 XA_NET_WM_NAME, 700 XA_NET_WM_NAME,
651 XA_NET_WM_ICON_NAME, 701 XA_NET_WM_ICON_NAME,
702 XA_NET_WM_PING,
652#endif 703#endif
653#if USE_XIM 704#if USE_XIM
654 XA_WM_LOCALE_NAME, 705 XA_WM_LOCALE_NAME,
655#endif 706#endif
656#if TRANSPARENT 707#if TRANSPARENT
… …
658 XA_ESETROOT_PMAP_ID, 709 XA_ESETROOT_PMAP_ID,
659#endif 710#endif
660#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 711#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
661 XA_DNDPROTOCOL, 712 XA_DNDPROTOCOL,
662 XA_DNDSELECTION, 713 XA_DNDSELECTION,
714#endif
715#if ENABLE_XEMBED
716 XA_XEMBED,
717 XA_XEMBED_INFO,
663#endif 718#endif
664 NUM_XA 719 NUM_XA
665}; 720};
666 721
667/* DEC private modes */ 722/* DEC private modes */
… …
695 priv_modes |= (bit); \ 750 priv_modes |= (bit); \
696 else \ 751 else \
697 priv_modes &= ~(bit) 752 priv_modes &= ~(bit)
698 753
699#ifdef ALLOW_132_MODE 754#ifdef ALLOW_132_MODE
700# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 755# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
701#else 756#else
702# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 757# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
703#endif 758#endif
704 759
705// do not change these constants lightly, there are many interdependencies 760// do not change these constants lightly, there are many interdependencies
706#define IMBUFSIZ 128 // input modifier buffer sizes 761#define IMBUFSIZ 128 // input modifier buffer sizes
707#define KBUFSZ 512 // size of keyboard mapping buffer 762#define KBUFSZ 512 // size of keyboard mapping buffer
… …
758#define strdup(x) strdup((const char *)(x)) 813#define strdup(x) strdup((const char *)(x))
759#define strlen(x) strlen((const char *)(x)) 814#define strlen(x) strlen((const char *)(x))
760#define strchr(x, y) strchr((const char *)(x), (int)(y)) 815#define strchr(x, y) strchr((const char *)(x), (int)(y))
761#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 816#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
762 817
818#define dDisp Display *disp = display->display
819
763/* convert pixel dimensions to row/column values. Everything as int32_t */ 820/* convert pixel dimensions to row/column values. Everything as int32_t */
764#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 821#define Pixel2Col(x) Pixel2Width((int32_t)(x))
765#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 822#define Pixel2Row(y) Pixel2Height((int32_t)(y))
766#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 823#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
767#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 824#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
768#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 825#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
769#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 826#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
770#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 827#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
771#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 828#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
772 829
773#define TermWin_TotalWidth() ((int32_t)TermWin.width) 830#define TermWin_TotalWidth() ((int32_t)this->width)
774#define TermWin_TotalHeight() ((int32_t)TermWin.height) 831#define TermWin_TotalHeight() ((int32_t)this->height)
832
833#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
834#define ROW(n) (save [LINENO (n)])
775 835
776/* how to build & extract colors and attributes */ 836/* how to build & extract colors and attributes */
777#define GET_BASEFG(x) (((x) & RS_fgMask)) 837#define GET_BASEFG(x) (((x) & RS_fgMask))
778#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 838#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
779#ifndef NO_BRIGHTCOLOR 839#ifndef NO_BRIGHTCOLOR
… …
813 873
814#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 874#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
815#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 875#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
816 876
817#if ENABLE_STYLES 877#if ENABLE_STYLES
818# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 878# define FONTSET(style) fontset[GET_STYLE (style)]
819#else 879#else
820# define FONTSET(style) TermWin.fontset[0] 880# define FONTSET(style) fontset[0]
821#endif 881#endif
822 882
823#ifdef HAVE_SCROLLBARS 883#ifdef HAVE_SCROLLBARS
824# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 884# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
825#else 885#else
… …
850#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 910#define scrollbar_size() (scrollBar.end - scrollBar.beg \
851 - scrollbar_minheight ()) 911 - scrollbar_minheight ())
852 912
853#if (MENUBAR_MAX > 1) 913#if (MENUBAR_MAX > 1)
854/* rendition style flags */ 914/* rendition style flags */
855# define menuBar_height() (TermWin.fheight + SHADOW) 915# define menuBar_height() (fheight + SHADOW)
856# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 916# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
857# define isMenuBarWindow(w) ((w) == menuBar.win) 917# define isMenuBarWindow(w) ((w) == menuBar.win)
858#else 918#else
859# define menuBar_height() (0) 919# define menuBar_height() (0)
860# define menuBar_TotalHeight() (0) 920# define menuBar_TotalHeight() (0)
… …
864#ifdef XPM_BACKGROUND 924#ifdef XPM_BACKGROUND
865# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 925# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
866#else 926#else
867# define XPMClearArea(a, b, c, d, e, f, g) 927# define XPMClearArea(a, b, c, d, e, f, g)
868#endif 928#endif
869
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 929
877#ifdef UTMP_SUPPORT 930#ifdef UTMP_SUPPORT
878# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 931# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
879# undef HAVE_UTMPX_H 932# undef HAVE_UTMPX_H
880# undef HAVE_STRUCT_UTMPX 933# undef HAVE_STRUCT_UTMPX
… …
994 1047
995extern class rxvt_composite_vec rxvt_composite; 1048extern class rxvt_composite_vec rxvt_composite;
996#endif 1049#endif
997 1050
998 1051
1052#ifdef KEYSYM_RESOURCE
1053 class keyboard_manager;
1054#endif
1055
999struct rxvt_term : zero_initialized, rxvt_vars { 1056struct rxvt_term : zero_initialized, rxvt_vars {
1000 log_callback *log_hook; // log error messages through this hook, if != 0 1057 log_callback *log_hook; // log error messages through this hook, if != 0
1001 1058
1002 struct mbstate mbstate; // current input multibyte state 1059 struct mbstate mbstate; // current input multibyte state
1003 1060
… …
1020 hidden_text:1, 1077 hidden_text:1,
1021#endif 1078#endif
1022#ifdef POINTER_BLANK 1079#ifdef POINTER_BLANK
1023 hidden_pointer:1, 1080 hidden_pointer:1,
1024#endif 1081#endif
1025// enc_utf8:1, /* wether locale uses utf-8 */ 1082 enc_utf8:1, /* wether locale uses utf-8 */
1026 seen_input:1, /* wether we have seen some program output yet */ 1083 seen_input:1, /* wether we have seen some program output yet */
1027 seen_resize:1, /* wether we had a resize event */ 1084 seen_resize:1, /* wether we had a resize event */
1028 parsed_geometry:1; 1085 parsed_geometry:1;
1029 1086
1030 unsigned char refresh_type, 1087 unsigned char refresh_type,
… …
1076# ifdef POINTER_BLANK 1133# ifdef POINTER_BLANK
1077 pointerBlankDelay, 1134 pointerBlankDelay,
1078# endif 1135# endif
1079 allowedxerror; 1136 allowedxerror;
1080/* ---------- */ 1137/* ---------- */
1081 unsigned int ModMetaMask, 1138 unsigned int ModLevel3Mask,
1139 ModMetaMask,
1082 ModNumLockMask; 1140 ModNumLockMask;
1083 int old_width, /* last used width in screen resize */ 1141 int old_width, /* last used width in screen resize */
1084 old_height; /* last used height in screen resize */ 1142 old_height; /* last used height in screen resize */
1085 unsigned long priv_modes, 1143 unsigned long priv_modes,
1086 SavedModes; 1144 SavedModes;
… …
1120 pid_t cmd_pid; /* process id of child */ 1178 pid_t cmd_pid; /* process id of child */
1121 char * incr_buf; 1179 char * incr_buf;
1122 size_t incr_buf_size, incr_buf_fill; 1180 size_t incr_buf_size, incr_buf_fill;
1123/* ---------- */ 1181/* ---------- */
1124 Cursor leftptr_cursor; 1182 Cursor leftptr_cursor;
1125#ifdef POINTER_BLANK
1126 Cursor blank_cursor;
1127#endif
1128/* ---------- */ 1183/* ---------- */
1129#ifndef NO_BACKSPACE_KEY 1184#ifndef NO_BACKSPACE_KEY
1130 const char *key_backspace; 1185 const char *key_backspace;
1131#endif 1186#endif
1132#ifndef NO_DELETE_KEY 1187#ifndef NO_DELETE_KEY
… …
1177 void scr_overlay_off (); 1232 void scr_overlay_off ();
1178 void scr_overlay_set (int x, int y, 1233 void scr_overlay_set (int x, int y,
1179 text_t text, 1234 text_t text,
1180 rend_t rend = OVERLAY_RSTYLE); 1235 rend_t rend = OVERLAY_RSTYLE);
1181 void scr_overlay_set (int x, int y, const char *s); 1236 void scr_overlay_set (int x, int y, const char *s);
1237 void scr_overlay_set (int x, int y, const wchar_t *s);
1182#endif 1238#endif
1183 1239
1184 vector<void *> allocated; // free these memory blocks with free() 1240 vector<void *> allocated; // free these memory blocks with free()
1185 1241
1186 char *env_windowid; /* environmental variable WINDOWID */ 1242 char *env_windowid; /* environmental variable WINDOWID */
… …
1190 char *locale; 1246 char *locale;
1191 char charsets[4]; 1247 char charsets[4];
1192 unsigned char *v_buffer; /* pointer to physical buffer */ 1248 unsigned char *v_buffer; /* pointer to physical buffer */
1193 unsigned int v_buflen; /* size of area to write */ 1249 unsigned int v_buflen; /* size of area to write */
1194 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1250 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1251
1195#ifdef KEYSYM_RESOURCE 1252#ifdef KEYSYM_RESOURCE
1196 const unsigned char *Keysym_map[256]; 1253 keyboard_manager *keyboard;
1197#endif 1254#endif
1255
1198 const char *rs[NUM_RESOURCES]; 1256 const char *rs[NUM_RESOURCES];
1199 /* command input buffering */ 1257 /* command input buffering */
1200 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1258 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1201 unsigned char cmdbuf_base[CBUFSIZ]; 1259 unsigned char cmdbuf_base[CBUFSIZ];
1202 1260
… …
1224#if TRANSPARENT 1282#if TRANSPARENT
1225 void rootwin_cb (XEvent &xev); 1283 void rootwin_cb (XEvent &xev);
1226 xevent_watcher rootwin_ev; 1284 xevent_watcher rootwin_ev;
1227#endif 1285#endif
1228 1286
1229
1230 void sig_term (sig_watcher &w); sig_watcher sw_term;
1231 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1232
1233 void x_cb (XEvent &xev); 1287 void x_cb (XEvent &xev);
1234 xevent_watcher termwin_ev; 1288 xevent_watcher termwin_ev;
1235 xevent_watcher vt_ev; 1289 xevent_watcher vt_ev;
1236#ifdef HAVE_SCROLLBARS 1290#ifdef HAVE_SCROLLBARS
1237 xevent_watcher scrollbar_ev; 1291 xevent_watcher scrollbar_ev;
… …
1278 void tt_winch (); 1332 void tt_winch ();
1279 1333
1280 rxvt_term (); 1334 rxvt_term ();
1281 ~rxvt_term (); 1335 ~rxvt_term ();
1282 void destroy (); 1336 void destroy ();
1337 void emergency_cleanup ();
1283 1338
1284 bool init (int argc, const char *const *argv); 1339 bool init (int argc, const char *const *argv);
1285 bool init_vars (); 1340 bool init_vars ();
1286 1341
1287 bool pty_fill (); 1342 bool pty_fill ();
… …
1296 int run_child (const char *const *argv); 1351 int run_child (const char *const *argv);
1297 1352
1298 void color_aliases (int idx); 1353 void color_aliases (int idx);
1299 void recolour_cursor (); 1354 void recolour_cursor ();
1300 void create_windows (int argc, const char *const *argv); 1355 void create_windows (int argc, const char *const *argv);
1301 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1356 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1302 void window_calc (unsigned int width, unsigned int height); 1357 void window_calc (unsigned int newwidth, unsigned int newheight);
1303 1358
1304#if USE_XIM 1359#if USE_XIM
1305 rxvt_xim *input_method; 1360 rxvt_xim *input_method;
1306 XIC Input_Context; 1361 XIC Input_Context;
1307 XIMStyle input_style; 1362 XIMStyle input_style;
… …
1341 1396
1342 bool cmd_parse (); 1397 bool cmd_parse ();
1343 void mouse_report (XButtonEvent &ev); 1398 void mouse_report (XButtonEvent &ev);
1344 void button_press (XButtonEvent &ev); 1399 void button_press (XButtonEvent &ev);
1345 void button_release (XButtonEvent &ev); 1400 void button_release (XButtonEvent &ev);
1401 void focus_in ();
1402 void focus_out ();
1346 int check_our_parents (); 1403 int check_our_parents ();
1347#ifdef PRINTPIPE 1404#ifdef PRINTPIPE
1348 FILE *popen_printer (); 1405 FILE *popen_printer ();
1349 int pclose_printer (FILE *stream); 1406 int pclose_printer (FILE *stream);
1350#endif 1407#endif
… …
1377 void set_title (const char *str); 1434 void set_title (const char *str);
1378 void set_icon_name (const char *str); 1435 void set_icon_name (const char *str);
1379 void set_window_color (int idx, const char *color); 1436 void set_window_color (int idx, const char *color);
1380 void set_colorfgbg (); 1437 void set_colorfgbg ();
1381 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1438 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1382 void set_widthheight (unsigned int width, unsigned int height); 1439 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1383 1440
1384#ifdef MENUBAR 1441#ifdef MENUBAR
1385 // menubar.C 1442 // menubar.C
1386 void menuitem_free (menu_t *menu, menuitem_t *item); 1443 void menuitem_free (menu_t *menu, menuitem_t *item);
1387 int action_dispatch (action_t *action); 1444 int action_dispatch (action_t *action);
… …
1413 void menubar_control (XButtonEvent &ev); 1470 void menubar_control (XButtonEvent &ev);
1414 void map_menuBar (int map); 1471 void map_menuBar (int map);
1415#endif 1472#endif
1416 1473
1417 // screen.C 1474 // screen.C
1418 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1475
1419 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1476 void lalloc (line_t &l)
1477 {
1478 l.t = (text_t *)talloc->alloc ();
1479 l.r = (rend_t *)ralloc->alloc ();
1480 }
1481
1482 void lfree (line_t &l)
1483 {
1484 talloc->free (l.t);
1485 ralloc->free (l.r);
1486 }
1487
1488 void lresize (line_t &l)
1489 {
1490 if (!l.t)
1491 return;
1492
1493 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1494 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1495
1496 MIN_IT (l.l, (int16_t)ncol);
1497
1498 if (ncol > prev_ncol)
1499 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1500 }
1501
1502 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1503 void scr_blank_screen_mem (line_t &l, rend_t efs);
1420 int scr_scroll_text (int row1, int row2, int count, int spec); 1504 int scr_scroll_text (int row1, int row2, int count);
1421 void scr_reset (); 1505 void scr_reset ();
1422 void scr_reset_realloc (); 1506 void scr_reset_realloc ();
1423 void scr_release (); 1507 void scr_release ();
1424 void scr_clear (bool really = false); 1508 void scr_clear (bool really = false);
1425 void scr_refresh (unsigned char refresh_type); 1509 void scr_refresh (unsigned char refresh_type);
1426 bool scr_refresh_rend (rend_t mask, rend_t value); 1510 bool scr_refresh_rend (rend_t mask, rend_t value);
1427 void scr_erase_screen (int mode); 1511 void scr_erase_screen (int mode);
1512#if ENABLE_FRILLS
1513 void scr_erase_savelines ();
1514 void scr_backindex ();
1515 void scr_forwardindex ();
1516#endif
1428 void scr_touch (bool refresh); 1517 void scr_touch (bool refresh);
1429 void scr_expose (int x, int y, int width, int height, bool refresh); 1518 void scr_expose (int x, int y, int width, int height, bool refresh);
1430 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1519 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1431 void scr_recolour (); 1520 void scr_recolour ();
1432 void scr_remap_chars (); 1521 void scr_remap_chars ();
1433 void scr_remap_chars (text_t *tp, rend_t *rp); 1522 void scr_remap_chars (const line_t &l);
1434 1523
1435 void scr_poweron (); 1524 void scr_poweron ();
1436 void scr_cursor (int mode); 1525 void scr_cursor (int mode);
1437 void scr_do_wrap (); 1526 void scr_do_wrap ();
1438 int scr_change_screen (int scrn); 1527 int scr_change_screen (int scrn);
1439 void scr_color (unsigned int color, int fgbg); 1528 void scr_color (unsigned int color, int fgbg);
1440 void scr_rendition (int set, int style); 1529 void scr_rendition (int set, int style);
1441 void scr_add_lines (const unicode_t *str, int nlines, int len); 1530 void scr_add_lines (const unicode_t *str, int nlines, int len);
1442 void scr_backspace (); 1531 void scr_backspace ();
1443 void scr_tab (int count, bool ht = false); 1532 void scr_tab (int count, bool ht = false);
1444 void scr_backindex ();
1445 void scr_forwardindex ();
1446 void scr_gotorc (int row, int col, int relative); 1533 void scr_gotorc (int row, int col, int relative);
1447 void scr_index (enum page_dirn direction); 1534 void scr_index (enum page_dirn direction);
1448 void scr_erase_line (int mode); 1535 void scr_erase_line (int mode);
1449 void scr_E (); 1536 void scr_E ();
1450 void scr_insdel_lines (int count, int insdel); 1537 void scr_insdel_lines (int count, int insdel);
… …
1511 1598
1512 // xdefaults.C 1599 // xdefaults.C
1513 void get_options (int argc, const char *const *argv); 1600 void get_options (int argc, const char *const *argv);
1514 int parse_keysym (const char *str, const char *arg); 1601 int parse_keysym (const char *str, const char *arg);
1515 void get_xdefaults (FILE *stream, const char *name); 1602 void get_xdefaults (FILE *stream, const char *name);
1516 void extract_resources (Display *display, const char *name); 1603 void extract_resources ();
1517 // xpm.C 1604 // xpm.C
1518 int scale_pixmap (const char *geom); 1605 int scale_pixmap (const char *geom);
1519 void resize_pixmap (); 1606 void resize_pixmap ();
1520 Pixmap set_bgPixmap (const char *file); 1607 Pixmap set_bgPixmap (const char *file);
1521}; 1608};

Diff Legend

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