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.240 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.277 by sasha, Thu Jul 12 22:33:16 2007 UTC

… …
8#if defined (ISO_14755) || defined (ENABLE_PERL) 8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 9# define ENABLE_OVERLAY 1
10#endif 10#endif
11 11
12#if ENABLE_PERL 12#if ENABLE_PERL
13# define ENABLE_FRILLS 1 13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 14# define ENABLE_COMBINING 1
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1
20# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
21#else 23#else
22# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
23#endif 25#endif
24 26
25#include <limits.h> 27#include <limits.h>
… …
31#if ENABLE_FRILLS 33#if ENABLE_FRILLS
32# include <X11/Xmd.h> 34# include <X11/Xmd.h>
33#endif 35#endif
34 36
35#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
36#include "rxvtfont.h" 39#include "rxvtfont.h"
37#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
38#include "iom.h" 41#include "iom.h"
39#include "salloc.h" 42#include "salloc.h"
40#include "libptytty.h" 43#include "libptytty.h"
… …
67 70
68#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
69typedef char *XPointer; 72typedef char *XPointer;
70#endif 73#endif
71 74
72#ifdef HAVE_TERMIOS_H
73# include <termios.h> 75#include <termios.h>
74typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
75#else
76# include <sgtty.h>
77typedef struct {
78 struct sgttyb sg;
79 struct tchars tc;
80 struct ltchars lc;
81 int line;
82 int local;
83} ttymode_t;
84#endif
85 77
78#ifdef HAVE_AFTERIMAGE
79# include <afterimage.h>
80#undef min
81#undef max
86#ifdef XPM_BACKGROUND 82#elif defined(XPM_BACKGROUND)
87# ifdef XPM_INC_X11 83# ifdef XPM_INC_X11
88# include <X11/xpm.h> 84# include <X11/xpm.h>
89# else 85# else
90# include <xpm.h> 86# include <xpm.h>
91# endif 87# endif
… …
96# define STDOUT_FILENO 1 92# define STDOUT_FILENO 1
97# define STDERR_FILENO 2 93# define STDERR_FILENO 2
98#endif 94#endif
99 95
100/****************************************************************************/ 96/****************************************************************************/
101
102#ifndef __attribute__
103# if __GNUC__
104# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
105# define __attribute__(x)
106# endif
107# endif
108# define __attribute__(x)
109#endif
110
111#define NORETURN __attribute__ ((noreturn))
112#define UNUSED __attribute__ ((unused))
113
114// increases code size unless -fno-enforce-eh-specs
115#if __GNUC__
116# define NOTHROW
117# define THROW(x)
118#else
119# define NOTHROW throw()
120# define THROW(x) throw x
121#endif
122 97
123// exception thrown on fatal (per-instance) errors 98// exception thrown on fatal (per-instance) errors
124class rxvt_failure_exception { }; 99class rxvt_failure_exception { };
125 100
126// exception thrown when the command parser runs out of input data 101// exception thrown when the command parser runs out of input data
… …
159const char * rxvt_Str_skip_space (const char *str) NOTHROW; 134const char * rxvt_Str_skip_space (const char *str) NOTHROW;
160char * rxvt_Str_trim (char *str) NOTHROW; 135char * rxvt_Str_trim (char *str) NOTHROW;
161int rxvt_Str_escaped (char *str) NOTHROW; 136int rxvt_Str_escaped (char *str) NOTHROW;
162char ** rxvt_splitcommastring (const char *cs) NOTHROW; 137char ** rxvt_splitcommastring (const char *cs) NOTHROW;
163void rxvt_freecommastring (char **cs) NOTHROW; 138void rxvt_freecommastring (char **cs) NOTHROW;
164char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
165 139
166///////////////////////////////////////////////////////////////////////////// 140/////////////////////////////////////////////////////////////////////////////
167 141
168// temporarily replace the process environment 142// temporarily replace the process environment
169extern char **environ; 143extern char **environ;
… …
206#endif 180#endif
207 181
208#ifdef XPM_BACKGROUND 182#ifdef XPM_BACKGROUND
209typedef struct { 183typedef struct {
210 short w, h, x, y; 184 short w, h, x, y;
185 bool auto_resize ;
211 Pixmap pixmap; 186 Pixmap pixmap;
212} bgPixmap_t; 187} bgPixmap_t;
213#endif 188#endif
214 189
215/* 190/*
… …
431// fake styles 406// fake styles
432#define RS_Blink 0x00010000UL // blink 407#define RS_Blink 0x00010000UL // blink
433#define RS_RVid 0x00020000UL // reverse video 408#define RS_RVid 0x00020000UL // reverse video
434#define RS_Uline 0x00040000UL // underline 409#define RS_Uline 0x00040000UL // underline
435 410
411// toggle this to force redraw, must be != RS_Careful
412#define RS_redraw 0x01000000UL
413
436// 5 custom bits for extensions 414// 5 custom bits for extensions
437#define RS_customCount 32 415#define RS_customCount 32
438#define RS_customMask 0x00f80000UL 416#define RS_customMask 0x00f80000UL
439#define RS_customShift 19 417#define RS_customShift 19
440 418
… …
509 Rxvt_restoreFG = 39, // change default fg color 487 Rxvt_restoreFG = 39, // change default fg color
510 Rxvt_restoreBG = 49, // change default bg color 488 Rxvt_restoreBG = 49, // change default bg color
511 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 489 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
512 490
513 URxvt_locale = 701, // change locale 491 URxvt_locale = 701, // change locale
492 URxvt_version = 702, // request version
514 493
515 URxvt_Color_IT = 704, // change actual 'Italic' colour 494 URxvt_Color_IT = 704, // change actual 'Italic' colour
516 URxvt_Color_tint = 705, // change actual tint colour 495 URxvt_Color_tint = 705, // change actual tint colour
517 URxvt_Color_BD = 706, 496 URxvt_Color_BD = 706,
518 URxvt_Color_UL = 707, 497 URxvt_Color_UL = 707,
… …
534 * on the unnecessary items, e.g. Color_pointer, but won't bother 513 * on the unnecessary items, e.g. Color_pointer, but won't bother
535 * until we need to. Also, be aware of usage in pixcolor_set 514 * until we need to. Also, be aware of usage in pixcolor_set
536 */ 515 */
537 516
538enum colour_list { 517enum colour_list {
518 Color_none = -2,
519 Color_transparent = -1,
539 Color_fg = 0, 520 Color_fg = 0,
540 Color_bg, 521 Color_bg,
541 minCOLOR, /* 2 */ 522 minCOLOR, /* 2 */
542 Color_Black = minCOLOR, 523 Color_Black = minCOLOR,
543 Color_Red3, 524 Color_Red3,
… …
603#endif 584#endif
604}; 585};
605 586
606#define Color_Bits 7 // 0 .. maxTermCOLOR 587#define Color_Bits 7 // 0 .. maxTermCOLOR
607 588
608#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
609#define NPIXCLR_BITS 32
610
611/* 589/*
612 * Resource list 590 * Resource list
613 */ 591 */
614enum { 592enum {
615# define def(name) Rs_ ## name, 593# define def(name) Rs_ ## name,
616# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 594# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
617# include "rsinc.h" 595# include "rsinc.h"
618# undef def 596# undef def
619# undef reserve 597# undef reserve
620 NUM_RESOURCES 598 NUM_RESOURCES
621};
622
623// see init.C:xa_names, which must be kept in sync
624enum {
625 XA_TEXT = 0,
626 XA_COMPOUND_TEXT,
627 XA_UTF8_STRING,
628 XA_MULTIPLE,
629 XA_TARGETS,
630 XA_TIMESTAMP,
631 XA_VT_SELECTION,
632 XA_INCR,
633 XA_WM_PROTOCOLS,
634 XA_WM_DELETE_WINDOW,
635 XA_CLIPBOARD,
636#if ENABLE_FRILLS
637 XA_MOTIF_WM_HINTS,
638#endif
639#if ENABLE_EWMH
640 XA_NET_WM_PID,
641 XA_NET_WM_NAME,
642 XA_NET_WM_ICON_NAME,
643 XA_NET_WM_PING,
644#endif
645#if USE_XIM
646 XA_WM_LOCALE_NAME,
647#endif
648#if TRANSPARENT
649 XA_XROOTPMAP_ID,
650 XA_ESETROOT_PMAP_ID,
651#endif
652#if ENABLE_XEMBED
653 XA_XEMBED,
654 XA_XEMBED_INFO,
655#endif
656 NUM_XA
657}; 599};
658 600
659/* DEC private modes */ 601/* DEC private modes */
660#define PrivMode_132 (1UL<<0) 602#define PrivMode_132 (1UL<<0)
661#define PrivMode_132OK (1UL<<1) 603#define PrivMode_132OK (1UL<<1)
… …
734 ***************************************************************************** 676 *****************************************************************************
735 * MACRO DEFINES 677 * MACRO DEFINES
736 ***************************************************************************** 678 *****************************************************************************
737 */ 679 */
738#define dLocal(type,name) type const name = this->name 680#define dLocal(type,name) type const name = this->name
739#define dDisp Display *disp = this->display->display 681
682// for speed reasons, we assume that all codepoints 32 to 126 are
683// single-width.
684#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
740 685
741/* convert pixel dimensions to row/column values. Everything as int32_t */ 686/* convert pixel dimensions to row/column values. Everything as int32_t */
742#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 687#define Pixel2Col(x) Pixel2Width((int32_t)(x))
743#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 688#define Pixel2Row(y) Pixel2Height((int32_t)(y))
744#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 689#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
746#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 691#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
747#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 692#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
748#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 693#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
749#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 694#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
750 695
751#define OPTION(opt) (options & (opt))
752#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
753 | Opt_jumpScroll | Opt_secondaryScreen \
754 | Opt_pastableTabs | Opt_intensityStyles)
755
756// for m >= -n, ensure remainder lies between 0..n-1 696// for m >= -n, ensure remainder lies between 0..n-1
757#define MOD(m,n) (((m) + (n)) % (n)) 697#define MOD(m,n) (((m) + (n)) % (n))
758 698
759#define LINENO(n) MOD (term_start + int(n), total_rows) 699#define LINENO(n) MOD (term_start + int(n), total_rows)
760#define ROW(n) row_buf [LINENO (n)] 700#define ROW(n) row_buf [LINENO (n)]
… …
778#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 718#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
779#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 719#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
780 720
781#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 721#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
782 722
783#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 723#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
784#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 724#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
785 725
786#if ENABLE_STYLES 726#if ENABLE_STYLES
787# define FONTSET(style) fontset[GET_STYLE (style)] 727# define FONTSET(style) fontset[GET_STYLE (style)]
788#else 728#else
789# define FONTSET(style) fontset[0] 729# define FONTSET(style) fontset[0]
… …
823# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 763# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
824#else 764#else
825# define XPMClearArea(a, b, c, d, e, f, g) 765# define XPMClearArea(a, b, c, d, e, f, g)
826#endif 766#endif
827 767
828typedef callback1<void, const char *> log_callback; 768typedef callback<void (const char *)> log_callback;
829typedef callback1<int, int> getfd_callback; 769typedef callback<int (int)> getfd_callback;
830 770
831#define SET_LOCALE(locale) rxvt_set_locale (locale) 771#define SET_LOCALE(locale) rxvt_set_locale (locale)
832extern bool rxvt_set_locale (const char *locale) NOTHROW; 772extern bool rxvt_set_locale (const char *locale) NOTHROW;
833extern void rxvt_push_locale (const char *locale) NOTHROW; 773extern void rxvt_push_locale (const char *locale) NOTHROW;
834extern void rxvt_pop_locale () NOTHROW; 774extern void rxvt_pop_locale () NOTHROW;
… …
836/****************************************************************************/ 776/****************************************************************************/
837 777
838#define LINE_LONGER 0x0001 // line is continued on the next row 778#define LINE_LONGER 0x0001 // line is continued on the next row
839#define LINE_FILTERED 0x0002 // line has been filtered 779#define LINE_FILTERED 0x0002 // line has been filtered
840#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 780#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
781#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
782#define LINE_BIDI 0x0010 // line needs bidi (NYI)
841 783
842struct line_t { 784struct line_t {
843 text_t *t; // terminal the text 785 text_t *t; // terminal the text
844 rend_t *r; // rendition, uses RS_ flags 786 rend_t *r; // rendition, uses RS_ flags
845 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 787 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
899# define COMPOSE_LO 0x40000000UL 841# define COMPOSE_LO 0x40000000UL
900# define COMPOSE_HI 0x400fffffUL 842# define COMPOSE_HI 0x400fffffUL
901# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 843# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
902#else 844#else
903# if ENABLE_PERL 845# if ENABLE_PERL
904# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 846# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
905# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 847# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
906# else 848# else
907# define COMPOSE_LO 0xd800UL 849# define COMPOSE_LO 0xd800UL
908# define COMPOSE_HI 0xf8ffUL 850# define COMPOSE_HI 0xf8ffUL
909# endif 851# endif
… …
938#endif 880#endif
939 881
940/****************************************************************************/ 882/****************************************************************************/
941 883
942#ifdef KEYSYM_RESOURCE 884#ifdef KEYSYM_RESOURCE
943 class keyboard_manager; 885class keyboard_manager;
944#endif 886#endif
945 887
946struct rxvt_term : zero_initialized, rxvt_vars { 888struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
889
890 // special markers with magic addresses
891 static const char resval_undef []; // options specifically unset
892 static const char resval_on []; // boolean options switched on
893 static const char resval_off []; // or off
894
947 log_callback *log_hook; // log error messages through this hook, if != 0 895 log_callback *log_hook; // log error messages through this hook, if != 0
948 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 896 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
949#if ENABLE_PERL 897#if ENABLE_PERL
950 rxvt_perl_term perl; 898 rxvt_perl_term perl;
951#endif 899#endif
952 struct mbstate mbstate; // current input multibyte state 900 struct mbstate mbstate; // current input multibyte state
953 901
954 unsigned char want_refresh:1, 902 unsigned char want_refresh:1,
955#ifdef TRANSPARENT 903#ifdef ENABLE_TRANSPARENCY
956 want_full_refresh:1, /* awaiting full screen refresh */ 904 want_full_refresh:1, /* awaiting full screen refresh */
957#endif
958#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
959 am_transparent:1, /* is a transparent term */ 905 am_transparent:1, /* is a transparent term */
960 am_pixmap_trans:1, /* transparency w/known root pixmap */ 906 am_pixmap_trans:1, /* transparency w/known root pixmap */
961#endif 907#endif
962 current_screen:1, /* primary or secondary */ 908 current_screen:1, /* primary or secondary */
963 num_scr_allow:1, 909 num_scr_allow:1,
… …
992 int prev_ncol, /* screen: previous number of columns */ 938 int prev_ncol, /* screen: previous number of columns */
993 prev_nrow; /* screen: previous number of rows */ 939 prev_nrow; /* screen: previous number of rows */
994/* ---------- */ 940/* ---------- */
995 rend_t rstyle; 941 rend_t rstyle;
996/* ---------- */ 942/* ---------- */
997 uint32_t pixcolor_set[NPIXCLR_SETS];
998/* ---------- */
999#ifdef SELECTION_SCROLLING 943#ifdef SELECTION_SCROLLING
1000 int scroll_selection_lines; 944 int scroll_selection_lines;
1001 enum page_dirn scroll_selection_dir; 945 enum page_dirn scroll_selection_dir;
1002 int selection_save_x, 946 int selection_save_x,
1003 selection_save_y, 947 selection_save_y,
… …
1008 /* give proper Scroll behaviour */ 952 /* give proper Scroll behaviour */
1009#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 953#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1010 mouse_slip_wheel_speed, 954 mouse_slip_wheel_speed,
1011#endif 955#endif
1012 refresh_count, 956 refresh_count,
1013 refresh_limit,
1014 last_bot, /* scrollbar last bottom position */ 957 last_bot, /* scrollbar last bottom position */
1015 last_top, /* scrollbar last top position */ 958 last_top, /* scrollbar last top position */
1016 last_state, /* scrollbar last state */ 959 last_state, /* scrollbar last state */
1017 scrollbar_len, 960 scrollbar_len,
1018 window_vt_x, 961 window_vt_x,
… …
1029 int old_width, /* last used width in screen resize */ 972 int old_width, /* last used width in screen resize */
1030 old_height; /* last used height in screen resize */ 973 old_height; /* last used height in screen resize */
1031 unsigned long priv_modes, 974 unsigned long priv_modes,
1032 SavedModes; 975 SavedModes;
1033/* ---------- */ 976/* ---------- */
1034 Atom xa[NUM_XA]; 977 Atom *xa;
1035/* ---------- */ 978/* ---------- */
1036#ifdef RXVT_SCROLLBAR 979#ifdef RXVT_SCROLLBAR
1037 GC scrollbarGC, 980 GC scrollbarGC,
1038 topShadowGC, 981 topShadowGC,
1039 botShadowGC; 982 botShadowGC;
… …
1076 XComposeStatus compose; 1019 XComposeStatus compose;
1077 ttymode_t tio; 1020 ttymode_t tio;
1078 row_col_t oldcursor; 1021 row_col_t oldcursor;
1079#ifdef XPM_BACKGROUND 1022#ifdef XPM_BACKGROUND
1080 bgPixmap_t bgPixmap; 1023 bgPixmap_t bgPixmap;
1024#ifdef HAVE_AFTERIMAGE
1025 struct ASVisual *asv;
1026 /* to get libAfterImage to work with multiple displays we use that hack : */
1027 /* should not need that with libAfterImage version >= 1.15 */
1028#define AFTERIMAGE_DPY_OP(_op) ({::dpy = dpy; _op;})
1029 ASImageManager *asimman;
1030 ASImage *original_asim;
1031 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1032#else
1081 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1033 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1034#endif
1082#endif 1035#endif
1083 1036
1084#if ENABLE_OVERLAY 1037#if ENABLE_OVERLAY
1085 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1038 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1086 text_t **ov_text; 1039 text_t **ov_text;
… …
1096 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1049 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1097#endif 1050#endif
1098 1051
1099 vector<void *> allocated; // free these memory blocks with free() 1052 vector<void *> allocated; // free these memory blocks with free()
1100 1053
1101 char *env_windowid; /* environmental variable WINDOWID */ 1054 char env_windowid[21]; /* environmental variable WINDOWID */
1055 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1102 char *env_display; /* environmental variable DISPLAY */ 1056 char *env_display; /* environmental variable DISPLAY */
1103 char *env_term; /* environmental variable TERM */ 1057 char *env_term; /* environmental variable TERM */
1104 char *env_colorfgbg; 1058
1105 char *locale; 1059 char *locale;
1106 char charsets[4]; 1060 char charsets[4];
1107 char *v_buffer; /* pointer to physical buffer */ 1061 char *v_buffer; /* pointer to physical buffer */
1108 unsigned int v_buflen; /* size of area to write */ 1062 unsigned int v_buflen; /* size of area to write */
1109 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1063 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1110 1064
1111#ifdef KEYSYM_RESOURCE 1065#ifdef KEYSYM_RESOURCE
1112 keyboard_manager *keyboard; 1066 keyboard_manager *keyboard;
1113#endif 1067#endif
1114 1068
… …
1140 1094
1141 long vt_emask, vt_emask_perl, vt_emask_xim; 1095 long vt_emask, vt_emask_perl, vt_emask_xim;
1142 1096
1143 void vt_select_input () const NOTHROW 1097 void vt_select_input () const NOTHROW
1144 { 1098 {
1145 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1099 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1146 } 1100 }
1147 1101
1148#if TRANSPARENT 1102#if ENABLE_TRANSPARENCY || ENABLE_PERL
1149 void rootwin_cb (XEvent &xev); 1103 void rootwin_cb (XEvent &xev);
1150 xevent_watcher rootwin_ev; 1104 xevent_watcher rootwin_ev;
1105#endif
1106#if ENABLE_TRANSPARENCY
1107 int check_our_parents ();
1108 void check_our_parents_cb (time_watcher &w);
1109 time_watcher check_our_parents_ev;
1151#endif 1110#endif
1152 1111
1153 void x_cb (XEvent &xev); 1112 void x_cb (XEvent &xev);
1154 void flush (); 1113 void flush ();
1155 xevent_watcher termwin_ev; 1114 xevent_watcher termwin_ev;
… …
1215 bool pty_fill (); 1174 bool pty_fill ();
1216 1175
1217 void make_current () const // make this the "currently active" urxvt instance 1176 void make_current () const // make this the "currently active" urxvt instance
1218 { 1177 {
1219 SET_R (this); 1178 SET_R (this);
1179 set_environ (envv);
1220 rxvt_set_locale (locale); 1180 rxvt_set_locale (locale);
1221 set_environ (envv);
1222 } 1181 }
1223 1182
1224 void init_secondary (); 1183 void init_secondary ();
1225 const char **init_resources (int argc, const char *const *argv); 1184 const char **init_resources (int argc, const char *const *argv);
1226 const char *x_resource (const char *name); 1185 const char *x_resource (const char *name);
… …
1251 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1210 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1252 1211
1253 bool IMisRunning (); 1212 bool IMisRunning ();
1254 void IMSendSpot (); 1213 void IMSendSpot ();
1255 bool IM_get_IC (const char *modifiers); 1214 bool IM_get_IC (const char *modifiers);
1256 void IMSetStatusPosition (); 1215 void IMSetPosition ();
1257#endif 1216#endif
1258 1217
1259 void resize_scrollbar (); 1218 void resize_scrollbar ();
1260 1219
1261 // command.C 1220 // command.C
1262 void lookup_key (XKeyEvent &ev); 1221 void key_press (XKeyEvent &ev);
1222 void key_release (XKeyEvent &ev);
1263 unsigned int cmd_write (const char *str, unsigned int count); 1223 unsigned int cmd_write (const char *str, unsigned int count);
1264 1224
1265 wchar_t next_char () NOTHROW; 1225 wchar_t next_char () NOTHROW;
1266 wchar_t cmd_getc () THROW ((class out_of_input)); 1226 wchar_t cmd_getc () THROW ((class out_of_input));
1267 uint32_t next_octet () NOTHROW; 1227 uint32_t next_octet () NOTHROW;
… …
1271 void mouse_report (XButtonEvent &ev); 1231 void mouse_report (XButtonEvent &ev);
1272 void button_press (XButtonEvent &ev); 1232 void button_press (XButtonEvent &ev);
1273 void button_release (XButtonEvent &ev); 1233 void button_release (XButtonEvent &ev);
1274 void focus_in (); 1234 void focus_in ();
1275 void focus_out (); 1235 void focus_out ();
1276 int check_our_parents (); 1236 void update_fade_color (unsigned int idx);
1277#ifdef PRINTPIPE 1237#ifdef PRINTPIPE
1278 FILE *popen_printer (); 1238 FILE *popen_printer ();
1279 int pclose_printer (FILE *stream); 1239 int pclose_printer (FILE *stream);
1280#endif 1240#endif
1281 void process_print_pipe (); 1241 void process_print_pipe ();
… …
1302 void set_utf8_property (Atom prop, const char *str, int len = -1); 1262 void set_utf8_property (Atom prop, const char *str, int len = -1);
1303 void set_title (const char *str); 1263 void set_title (const char *str);
1304 void set_icon_name (const char *str); 1264 void set_icon_name (const char *str);
1305 void set_window_color (int idx, const char *color); 1265 void set_window_color (int idx, const char *color);
1306 void set_colorfgbg (); 1266 void set_colorfgbg ();
1307 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1267 bool set_color (rxvt_color &color, const char *name);
1268 void alias_color (int dst, int src);
1308 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1269 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1309 1270
1310 // screen.C 1271 // screen.C
1311 1272
1312 void lalloc (line_t &l) const 1273 void lalloc (line_t &l) const
… …
1341 { 1302 {
1342 int base = GET_BASEFG (r); 1303 int base = GET_BASEFG (r);
1343#ifndef NO_BRIGHTCOLOR 1304#ifndef NO_BRIGHTCOLOR
1344 if (r & RS_Bold 1305 if (r & RS_Bold
1345# if ENABLE_STYLES 1306# if ENABLE_STYLES
1346 && OPTION (Opt_intensityStyles) 1307 && option (Opt_intensityStyles)
1347# endif 1308# endif
1348 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1309 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1349 base += minBrightCOLOR - minCOLOR; 1310 base += minBrightCOLOR - minCOLOR;
1350#endif 1311#endif
1351 return base; 1312 return base;
… …
1355 { 1316 {
1356 int base = GET_BASEBG (r); 1317 int base = GET_BASEBG (r);
1357#ifndef NO_BRIGHTCOLOR 1318#ifndef NO_BRIGHTCOLOR
1358 if (r & RS_Blink 1319 if (r & RS_Blink
1359# if ENABLE_STYLES 1320# if ENABLE_STYLES
1360 && OPTION (Opt_intensityStyles) 1321 && option (Opt_intensityStyles)
1361# endif 1322# endif
1362 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1323 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1363 base += minBrightCOLOR - minCOLOR; 1324 base += minBrightCOLOR - minCOLOR;
1364#endif 1325#endif
1365 return base; 1326 return base;
1366 } 1327 }
1367 1328
1368 bool option (uint32_t opt) const NOTHROW 1329 bool option (uint8_t opt) const NOTHROW
1369 { 1330 {
1370 return OPTION (opt); 1331 return options[opt >> 3] & (1 << (opt & 7));
1371 } 1332 }
1372 1333
1373 void set_option (uint32_t opt, bool set) NOTHROW 1334 void set_option (uint8_t opt, bool set = true) NOTHROW
1374 { 1335 {
1375 if (set) 1336 if (set)
1376 options |= opt; 1337 options[opt >> 3] |= (1 << (opt & 7));
1377 else 1338 else
1378 options &= ~opt; 1339 options[opt >> 3] &= ~(1 << (opt & 7));
1379 } 1340 }
1380 1341
1381 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1342 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1382 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1343 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1383 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1344 int scr_scroll_text (int row1, int row2, int count) NOTHROW;

Diff Legend

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