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.132 by root, Wed Dec 15 00:12:58 2004 UTC vs.
Revision 1.162 by root, Sun Dec 18 00:59:42 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 {
… …
500 Color_BD, 538 Color_BD,
501 Color_IT, 539 Color_IT,
502 Color_UL, 540 Color_UL,
503 Color_RV, 541 Color_RV,
504#endif 542#endif
543#if ENABLE_FRILLS
544 Color_underline,
545#endif
505#ifdef OPTION_HC 546#ifdef OPTION_HC
506 Color_HC, 547 Color_HC,
507#endif 548#endif
508#ifdef KEEP_SCROLLCOLOR 549#ifdef KEEP_SCROLLCOLOR
509 Color_scroll, 550 Color_scroll,
510 Color_trough, 551 Color_trough,
511#endif 552#endif
512#if TINTING 553#if TINTING
513 Color_tint, 554 Color_tint,
555#endif
556#if OFF_FOCUS_FADING
557 Color_fade,
514#endif 558#endif
515 NRS_COLORS, /* */ 559 NRS_COLORS, /* */
516#ifdef KEEP_SCROLLCOLOR 560#ifdef KEEP_SCROLLCOLOR
517 Color_topShadow = NRS_COLORS, 561 Color_topShadow = NRS_COLORS,
518 Color_bottomShadow, 562 Color_bottomShadow,
… …
560#ifdef HAVE_SCROLLBARS 604#ifdef HAVE_SCROLLBARS
561 Rs_scrollBar, 605 Rs_scrollBar,
562 Rs_scrollBar_right, 606 Rs_scrollBar_right,
563 Rs_scrollBar_floating, 607 Rs_scrollBar_floating,
564 Rs_scrollBar_align, 608 Rs_scrollBar_align,
565#endif
566 Rs_scrollstyle, /* Rs_scrollBar_style */ 609 Rs_scrollstyle, /* Rs_scrollBar_style */
610 Rs_scrollBar_thickness,
611#endif
567 Rs_scrollTtyOutput, 612 Rs_scrollTtyOutput,
568 Rs_scrollTtyKeypress, 613 Rs_scrollTtyKeypress,
569 Rs_scrollWithBuffer, 614 Rs_scrollWithBuffer,
570 Rs_saveLines, 615 Rs_saveLines,
571 Rs_utmpInhibit, 616 Rs_utmpInhibit,
… …
599#endif 644#endif
600#if ENABLE_FRILLS 645#if ENABLE_FRILLS
601 Rs_ext_bwidth, 646 Rs_ext_bwidth,
602 Rs_int_bwidth, 647 Rs_int_bwidth,
603 Rs_borderLess, 648 Rs_borderLess,
604#endif
605 Rs_scrollBar_thickness,
606#ifndef NO_LINESPACE
607 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,
608#endif 658#endif
609 Rs_cutchars, 659 Rs_cutchars,
610 Rs_modifier, 660 Rs_modifier,
611 Rs_answerbackstring, 661 Rs_answerbackstring,
612 Rs_tripleclickwords, 662 Rs_tripleclickwords,
613 Rs_insecure, 663 Rs_insecure,
614 Rs_cursorBlink,
615 Rs_pointerBlank, 664 Rs_pointerBlank,
616 Rs_pointerBlankDelay, 665 Rs_pointerBlankDelay,
617 Rs_imLocale, 666 Rs_imLocale,
667 Rs_imFont,
618 Rs_pastableTabs, 668 Rs_pastableTabs,
619#ifndef NO_SECONDARY_SCREEN 669#ifndef NO_SECONDARY_SCREEN
620 Rs_secondaryScreen, 670 Rs_secondaryScreen,
621 Rs_secondaryScroll, 671 Rs_secondaryScroll,
622#endif 672#endif
… …
637 XA_MULTIPLE, 687 XA_MULTIPLE,
638 XA_TARGETS, 688 XA_TARGETS,
639 XA_TIMESTAMP, 689 XA_TIMESTAMP,
640 XA_VT_SELECTION, 690 XA_VT_SELECTION,
641 XA_INCR, 691 XA_INCR,
692 XA_WM_PROTOCOLS,
642 XA_WMDELETEWINDOW, 693 XA_WM_DELETE_WINDOW,
643 XA_CLIPBOARD, 694 XA_CLIPBOARD,
644#if ENABLE_FRILLS 695#if ENABLE_FRILLS
696 XA_MOTIF_WM_HINTS,
697#endif
698#if ENABLE_EWMH
645 XA_NET_WM_PID, 699 XA_NET_WM_PID,
646 XA_MOTIF_WM_HINTS,
647 XA_NET_WM_NAME, 700 XA_NET_WM_NAME,
648 XA_NET_WM_ICON_NAME, 701 XA_NET_WM_ICON_NAME,
702 XA_NET_WM_PING,
649#endif 703#endif
650#if USE_XIM 704#if USE_XIM
651 XA_WM_LOCALE_NAME, 705 XA_WM_LOCALE_NAME,
652#endif 706#endif
653#if TRANSPARENT 707#if TRANSPARENT
654 XA_XROOTPMAPID, 708 XA_XROOTPMAP_ID,
655 XA_XSETROOTID, 709 XA_ESETROOT_PMAP_ID,
656#endif 710#endif
657#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 711#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
658 XA_DNDPROTOCOL, 712 XA_DNDPROTOCOL,
659 XA_DNDSELECTION, 713 XA_DNDSELECTION,
660#endif /* OFFIX_DND */ 714#endif
715#if ENABLE_XEMBED
716 XA_XEMBED,
717 XA_XEMBED_INFO,
718#endif
661 NUM_XA 719 NUM_XA
662}; 720};
663 721
664/* DEC private modes */ 722/* DEC private modes */
665#define PrivMode_132 (1UL<<0) 723#define PrivMode_132 (1UL<<0)
… …
692 priv_modes |= (bit); \ 750 priv_modes |= (bit); \
693 else \ 751 else \
694 priv_modes &= ~(bit) 752 priv_modes &= ~(bit)
695 753
696#ifdef ALLOW_132_MODE 754#ifdef ALLOW_132_MODE
697# 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)
698#else 756#else
699# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 757# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
700#endif 758#endif
701 759
702// do not change these constants lightly, there are many interdependencies 760// do not change these constants lightly, there are many interdependencies
703#define IMBUFSIZ 128 // input modifier buffer sizes 761#define IMBUFSIZ 128 // input modifier buffer sizes
704#define KBUFSZ 512 // size of keyboard mapping buffer 762#define KBUFSZ 512 // size of keyboard mapping buffer
… …
755#define strdup(x) strdup((const char *)(x)) 813#define strdup(x) strdup((const char *)(x))
756#define strlen(x) strlen((const char *)(x)) 814#define strlen(x) strlen((const char *)(x))
757#define strchr(x, y) strchr((const char *)(x), (int)(y)) 815#define strchr(x, y) strchr((const char *)(x), (int)(y))
758#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 816#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
759 817
818#define dDisp Display *disp = display->display
819
760/* convert pixel dimensions to row/column values. Everything as int32_t */ 820/* convert pixel dimensions to row/column values. Everything as int32_t */
761#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 821#define Pixel2Col(x) Pixel2Width((int32_t)(x))
762#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 822#define Pixel2Row(y) Pixel2Height((int32_t)(y))
763#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 823#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
764#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 824#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
765#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 825#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
766#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 826#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
767#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 827#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
768#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 828#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
769 829
770#define TermWin_TotalWidth() ((int32_t)TermWin.width) 830#define TermWin_TotalWidth() ((int32_t)width)
771#define TermWin_TotalHeight() ((int32_t)TermWin.height) 831#define TermWin_TotalHeight() ((int32_t)height)
772 832
773/* how to build & extract colors and attributes */ 833/* how to build & extract colors and attributes */
774#define GET_BASEFG(x) (((x) & RS_fgMask)) 834#define GET_BASEFG(x) (((x) & RS_fgMask))
775#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 835#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
776#ifndef NO_BRIGHTCOLOR 836#ifndef NO_BRIGHTCOLOR
… …
810 870
811#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 871#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
812#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 872#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
813 873
814#if ENABLE_STYLES 874#if ENABLE_STYLES
815# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 875# define FONTSET(style) fontset[GET_STYLE (style)]
816#else 876#else
817# define FONTSET(style) TermWin.fontset[0] 877# define FONTSET(style) fontset[0]
818#endif 878#endif
819 879
820#ifdef HAVE_SCROLLBARS 880#ifdef HAVE_SCROLLBARS
821# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 881# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
822#else 882#else
… …
847#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 907#define scrollbar_size() (scrollBar.end - scrollBar.beg \
848 - scrollbar_minheight ()) 908 - scrollbar_minheight ())
849 909
850#if (MENUBAR_MAX > 1) 910#if (MENUBAR_MAX > 1)
851/* rendition style flags */ 911/* rendition style flags */
852# define menuBar_height() (TermWin.fheight + SHADOW) 912# define menuBar_height() (fheight + SHADOW)
853# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 913# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
854# define isMenuBarWindow(w) ((w) == menuBar.win) 914# define isMenuBarWindow(w) ((w) == menuBar.win)
855#else 915#else
856# define menuBar_height() (0) 916# define menuBar_height() (0)
857# define menuBar_TotalHeight() (0) 917# define menuBar_TotalHeight() (0)
… …
861#ifdef XPM_BACKGROUND 921#ifdef XPM_BACKGROUND
862# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 922# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
863#else 923#else
864# define XPMClearArea(a, b, c, d, e, f, g) 924# define XPMClearArea(a, b, c, d, e, f, g)
865#endif 925#endif
866
867#ifndef STRICT_FONT_CHECKING
868# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
869#endif
870
871#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
872#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
873 926
874#ifdef UTMP_SUPPORT 927#ifdef UTMP_SUPPORT
875# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 928# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
876# undef HAVE_UTMPX_H 929# undef HAVE_UTMPX_H
877# undef HAVE_STRUCT_UTMPX 930# undef HAVE_STRUCT_UTMPX
… …
950 1003
951 operator mbstate_t *() { return &mbs; } 1004 operator mbstate_t *() { return &mbs; }
952 void reset () { memset (&mbs, 0, sizeof (mbs)); } 1005 void reset () { memset (&mbs, 0, sizeof (mbs)); }
953 mbstate () { reset (); } 1006 mbstate () { reset (); }
954}; 1007};
1008
1009#define UNICODE_MASK 0x1fffffUL
955 1010
956#if UNICODE3 1011#if UNICODE3
957# define COMPOSE_LO 0x40000000UL 1012# define COMPOSE_LO 0x40000000UL
958# define COMPOSE_HI 0x400fffffUL 1013# define COMPOSE_HI 0x400fffffUL
959# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 1014# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
989 1044
990extern class rxvt_composite_vec rxvt_composite; 1045extern class rxvt_composite_vec rxvt_composite;
991#endif 1046#endif
992 1047
993 1048
1049#ifdef KEYSYM_RESOURCE
1050 class keyboard_manager;
1051#endif
1052
994struct rxvt_term : zero_initialized, rxvt_vars { 1053struct rxvt_term : zero_initialized, rxvt_vars {
995 log_callback *log_hook; // log error messages through this hook, if != 0 1054 log_callback *log_hook; // log error messages through this hook, if != 0
996 1055
997 struct mbstate mbstate; // current input multibyte state 1056 struct mbstate mbstate; // current input multibyte state
998 1057
… …
1015 hidden_text:1, 1074 hidden_text:1,
1016#endif 1075#endif
1017#ifdef POINTER_BLANK 1076#ifdef POINTER_BLANK
1018 hidden_pointer:1, 1077 hidden_pointer:1,
1019#endif 1078#endif
1020// enc_utf8:1, /* wether locale uses utf-8 */ 1079 enc_utf8:1, /* wether locale uses utf-8 */
1021 seen_input:1, /* wether we have seen some program output yet */ 1080 seen_input:1, /* wether we have seen some program output yet */
1022 seen_resize:1, /* wether we had a resize event */ 1081 seen_resize:1, /* wether we had a resize event */
1023 parsed_geometry:1; 1082 parsed_geometry:1;
1024 1083
1025 unsigned char refresh_type, 1084 unsigned char refresh_type,
… …
1071# ifdef POINTER_BLANK 1130# ifdef POINTER_BLANK
1072 pointerBlankDelay, 1131 pointerBlankDelay,
1073# endif 1132# endif
1074 allowedxerror; 1133 allowedxerror;
1075/* ---------- */ 1134/* ---------- */
1076 unsigned int ModMetaMask, 1135 unsigned int ModLevel3Mask,
1136 ModMetaMask,
1077 ModNumLockMask; 1137 ModNumLockMask;
1078 int old_width, /* last used width in screen resize */ 1138 int old_width, /* last used width in screen resize */
1079 old_height; /* last used height in screen resize */ 1139 old_height; /* last used height in screen resize */
1080 unsigned long priv_modes, 1140 unsigned long priv_modes,
1081 SavedModes; 1141 SavedModes;
… …
1115 pid_t cmd_pid; /* process id of child */ 1175 pid_t cmd_pid; /* process id of child */
1116 char * incr_buf; 1176 char * incr_buf;
1117 size_t incr_buf_size, incr_buf_fill; 1177 size_t incr_buf_size, incr_buf_fill;
1118/* ---------- */ 1178/* ---------- */
1119 Cursor leftptr_cursor; 1179 Cursor leftptr_cursor;
1120#ifdef POINTER_BLANK
1121 Cursor blank_cursor;
1122#endif
1123/* ---------- */ 1180/* ---------- */
1124#ifndef NO_BACKSPACE_KEY 1181#ifndef NO_BACKSPACE_KEY
1125 const char *key_backspace; 1182 const char *key_backspace;
1126#endif 1183#endif
1127#ifndef NO_DELETE_KEY 1184#ifndef NO_DELETE_KEY
… …
1172 void scr_overlay_off (); 1229 void scr_overlay_off ();
1173 void scr_overlay_set (int x, int y, 1230 void scr_overlay_set (int x, int y,
1174 text_t text, 1231 text_t text,
1175 rend_t rend = OVERLAY_RSTYLE); 1232 rend_t rend = OVERLAY_RSTYLE);
1176 void scr_overlay_set (int x, int y, const char *s); 1233 void scr_overlay_set (int x, int y, const char *s);
1234 void scr_overlay_set (int x, int y, const wchar_t *s);
1177#endif 1235#endif
1178 1236
1179 vector<void *> allocated; // free these memory blocks with free() 1237 vector<void *> allocated; // free these memory blocks with free()
1180 1238
1181 char *env_windowid; /* environmental variable WINDOWID */ 1239 char *env_windowid; /* environmental variable WINDOWID */
… …
1185 char *locale; 1243 char *locale;
1186 char charsets[4]; 1244 char charsets[4];
1187 unsigned char *v_buffer; /* pointer to physical buffer */ 1245 unsigned char *v_buffer; /* pointer to physical buffer */
1188 unsigned int v_buflen; /* size of area to write */ 1246 unsigned int v_buflen; /* size of area to write */
1189 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1247 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1248
1190#ifdef KEYSYM_RESOURCE 1249#ifdef KEYSYM_RESOURCE
1191 const unsigned char *Keysym_map[256]; 1250 keyboard_manager *keyboard;
1192#endif 1251#endif
1252
1193 const char *rs[NUM_RESOURCES]; 1253 const char *rs[NUM_RESOURCES];
1194 /* command input buffering */ 1254 /* command input buffering */
1195 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1255 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1196 unsigned char cmdbuf_base[CBUFSIZ]; 1256 unsigned char cmdbuf_base[CBUFSIZ];
1197 1257
… …
1219#if TRANSPARENT 1279#if TRANSPARENT
1220 void rootwin_cb (XEvent &xev); 1280 void rootwin_cb (XEvent &xev);
1221 xevent_watcher rootwin_ev; 1281 xevent_watcher rootwin_ev;
1222#endif 1282#endif
1223 1283
1224
1225 void sig_term (sig_watcher &w); sig_watcher sw_term;
1226 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1227
1228 void x_cb (XEvent &xev); 1284 void x_cb (XEvent &xev);
1229 xevent_watcher termwin_ev; 1285 xevent_watcher termwin_ev;
1230 xevent_watcher vt_ev; 1286 xevent_watcher vt_ev;
1231#ifdef HAVE_SCROLLBARS 1287#ifdef HAVE_SCROLLBARS
1232 xevent_watcher scrollbar_ev; 1288 xevent_watcher scrollbar_ev;
… …
1273 void tt_winch (); 1329 void tt_winch ();
1274 1330
1275 rxvt_term (); 1331 rxvt_term ();
1276 ~rxvt_term (); 1332 ~rxvt_term ();
1277 void destroy (); 1333 void destroy ();
1334 void emergency_cleanup ();
1278 1335
1279 bool init (int argc, const char *const *argv); 1336 bool init (int argc, const char *const *argv);
1280 bool init_vars (); 1337 bool init_vars ();
1281 1338
1282 bool pty_fill (); 1339 bool pty_fill ();
… …
1291 int run_child (const char *const *argv); 1348 int run_child (const char *const *argv);
1292 1349
1293 void color_aliases (int idx); 1350 void color_aliases (int idx);
1294 void recolour_cursor (); 1351 void recolour_cursor ();
1295 void create_windows (int argc, const char *const *argv); 1352 void create_windows (int argc, const char *const *argv);
1296 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1353 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1297 void window_calc (unsigned int width, unsigned int height); 1354 void window_calc (unsigned int newwidth, unsigned int newheight);
1298 1355
1299#if USE_XIM 1356#if USE_XIM
1300 rxvt_xim *input_method; 1357 rxvt_xim *input_method;
1301 XIC Input_Context; 1358 XIC Input_Context;
1302 XIMStyle input_style; 1359 XIMStyle input_style;
… …
1336 1393
1337 bool cmd_parse (); 1394 bool cmd_parse ();
1338 void mouse_report (XButtonEvent &ev); 1395 void mouse_report (XButtonEvent &ev);
1339 void button_press (XButtonEvent &ev); 1396 void button_press (XButtonEvent &ev);
1340 void button_release (XButtonEvent &ev); 1397 void button_release (XButtonEvent &ev);
1398 void focus_in ();
1399 void focus_out ();
1341 int check_our_parents (); 1400 int check_our_parents ();
1342#ifdef PRINTPIPE 1401#ifdef PRINTPIPE
1343 FILE *popen_printer (); 1402 FILE *popen_printer ();
1344 int pclose_printer (FILE *stream); 1403 int pclose_printer (FILE *stream);
1345#endif 1404#endif
… …
1372 void set_title (const char *str); 1431 void set_title (const char *str);
1373 void set_icon_name (const char *str); 1432 void set_icon_name (const char *str);
1374 void set_window_color (int idx, const char *color); 1433 void set_window_color (int idx, const char *color);
1375 void set_colorfgbg (); 1434 void set_colorfgbg ();
1376 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1435 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1377 void set_widthheight (unsigned int width, unsigned int height); 1436 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1378 1437
1379#ifdef MENUBAR 1438#ifdef MENUBAR
1380 // menubar.C 1439 // menubar.C
1381 void menuitem_free (menu_t *menu, menuitem_t *item); 1440 void menuitem_free (menu_t *menu, menuitem_t *item);
1382 int action_dispatch (action_t *action); 1441 int action_dispatch (action_t *action);
… …
1408 void menubar_control (XButtonEvent &ev); 1467 void menubar_control (XButtonEvent &ev);
1409 void map_menuBar (int map); 1468 void map_menuBar (int map);
1410#endif 1469#endif
1411 1470
1412 // screen.C 1471 // screen.C
1413 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1472
1414 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1473 void lalloc (line_t &l)
1474 {
1475 l.t = (text_t *)talloc->alloc ();
1476 l.r = (rend_t *)ralloc->alloc ();
1477 }
1478
1479 void lfree (line_t &l)
1480 {
1481 talloc->free (l.t);
1482 ralloc->free (l.r);
1483 }
1484
1485 void lresize (line_t &l)
1486 {
1487 if (!l.t)
1488 return;
1489
1490 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1491 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1492
1493 MIN_IT (l.l, (int16_t)ncol);
1494
1495 if (ncol > prev_ncol)
1496 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1497 }
1498
1499 void scr_update_term ();
1500 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1501 void scr_blank_screen_mem (line_t &l, rend_t efs);
1415 int scr_scroll_text (int row1, int row2, int count, int spec); 1502 int scr_scroll_text (int row1, int row2, int count, int spec);
1416 void scr_reset (); 1503 void scr_reset ();
1417 void scr_reset_realloc (); 1504 void scr_reset_realloc ();
1418 void scr_release (); 1505 void scr_release ();
1419 void scr_clear (bool really = false); 1506 void scr_clear (bool really = false);
1420 void scr_refresh (unsigned char refresh_type); 1507 void scr_refresh (unsigned char refresh_type);
1421 bool scr_refresh_rend (rend_t mask, rend_t value); 1508 bool scr_refresh_rend (rend_t mask, rend_t value);
1422 void scr_erase_screen (int mode); 1509 void scr_erase_screen (int mode);
1510#if ENABLE_FRILLS
1511 void scr_erase_savelines ();
1512 void scr_backindex ();
1513 void scr_forwardindex ();
1514#endif
1423 void scr_touch (bool refresh); 1515 void scr_touch (bool refresh);
1424 void scr_expose (int x, int y, int width, int height, bool refresh); 1516 void scr_expose (int x, int y, int width, int height, bool refresh);
1425 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1517 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1426 void scr_recolour (); 1518 void scr_recolour ();
1427 void scr_remap_chars (); 1519 void scr_remap_chars ();
1428 void scr_remap_chars (text_t *tp, rend_t *rp); 1520 void scr_remap_chars (const line_t &l);
1429 1521
1430 void scr_poweron (); 1522 void scr_poweron ();
1431 void scr_cursor (int mode); 1523 void scr_cursor (int mode);
1432 void scr_do_wrap (); 1524 void scr_do_wrap ();
1433 int scr_change_screen (int scrn); 1525 int scr_change_screen (int scrn);
1434 void scr_color (unsigned int color, int fgbg); 1526 void scr_color (unsigned int color, int fgbg);
1435 void scr_rendition (int set, int style); 1527 void scr_rendition (int set, int style);
1436 void scr_add_lines (const unicode_t *str, int nlines, int len); 1528 void scr_add_lines (const unicode_t *str, int nlines, int len);
1437 void scr_backspace (); 1529 void scr_backspace ();
1438 void scr_tab (int count, bool ht = false); 1530 void scr_tab (int count, bool ht = false);
1439 void scr_backindex ();
1440 void scr_forwardindex ();
1441 void scr_gotorc (int row, int col, int relative); 1531 void scr_gotorc (int row, int col, int relative);
1442 void scr_index (enum page_dirn direction); 1532 void scr_index (enum page_dirn direction);
1443 void scr_erase_line (int mode); 1533 void scr_erase_line (int mode);
1444 void scr_E (); 1534 void scr_E ();
1445 void scr_insdel_lines (int count, int insdel); 1535 void scr_insdel_lines (int count, int insdel);
… …
1506 1596
1507 // xdefaults.C 1597 // xdefaults.C
1508 void get_options (int argc, const char *const *argv); 1598 void get_options (int argc, const char *const *argv);
1509 int parse_keysym (const char *str, const char *arg); 1599 int parse_keysym (const char *str, const char *arg);
1510 void get_xdefaults (FILE *stream, const char *name); 1600 void get_xdefaults (FILE *stream, const char *name);
1511 void extract_resources (Display *display, const char *name); 1601 void extract_resources ();
1512 // xpm.C 1602 // xpm.C
1513 int scale_pixmap (const char *geom); 1603 int scale_pixmap (const char *geom);
1514 void resize_pixmap (); 1604 void resize_pixmap ();
1515 Pixmap set_bgPixmap (const char *file); 1605 Pixmap set_bgPixmap (const char *file);
1516}; 1606};

Diff Legend

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