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.234 by root, Sun Jan 22 00:48:13 2006 UTC vs.
Revision 1.270 by sasha, Fri Jun 8 20:04:12 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
… …
169extern char **environ; 144extern char **environ;
170extern char **rxvt_environ; // the original environ pointer 145extern char **rxvt_environ; // the original environ pointer
171 146
172inline void set_environ (stringvec *envv) 147inline void set_environ (stringvec *envv)
173{ 148{
149#if ENABLE_PERL
150 assert (envv);
151#else
174 if (envv) 152 if (envv)
153#endif
175 environ = (char **)envv->begin (); 154 environ = (char **)envv->begin ();
176} 155}
177 156
178inline void set_environ (char **envv) 157inline void set_environ (char **envv)
179{ 158{
159#if ENABLE_PERL
160 assert (envv);
161#else
180 if (envv) 162 if (envv)
163#endif
181 environ = envv; 164 environ = envv;
182} 165}
183 166
184/* 167/*
185 ***************************************************************************** 168 *****************************************************************************
… …
198#endif 181#endif
199 182
200#ifdef XPM_BACKGROUND 183#ifdef XPM_BACKGROUND
201typedef struct { 184typedef struct {
202 short w, h, x, y; 185 short w, h, x, y;
186 bool auto_resize ;
203 Pixmap pixmap; 187 Pixmap pixmap;
204} bgPixmap_t; 188} bgPixmap_t;
205#endif 189#endif
206 190
207/* 191/*
… …
423// fake styles 407// fake styles
424#define RS_Blink 0x00010000UL // blink 408#define RS_Blink 0x00010000UL // blink
425#define RS_RVid 0x00020000UL // reverse video 409#define RS_RVid 0x00020000UL // reverse video
426#define RS_Uline 0x00040000UL // underline 410#define RS_Uline 0x00040000UL // underline
427 411
412// toggle this to force redraw, must be != RS_Careful
413#define RS_redraw 0x01000000UL
414
428// 5 custom bits for extensions 415// 5 custom bits for extensions
429#define RS_customCount 32 416#define RS_customCount 32
430#define RS_customMask 0x00f80000UL 417#define RS_customMask 0x00f80000UL
431#define RS_customShift 19 418#define RS_customShift 19
432 419
… …
501 Rxvt_restoreFG = 39, // change default fg color 488 Rxvt_restoreFG = 39, // change default fg color
502 Rxvt_restoreBG = 49, // change default bg color 489 Rxvt_restoreBG = 49, // change default bg color
503 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 490 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
504 491
505 URxvt_locale = 701, // change locale 492 URxvt_locale = 701, // change locale
493 URxvt_version = 702, // request version
506 494
507 URxvt_Color_IT = 704, // change actual 'Italic' colour 495 URxvt_Color_IT = 704, // change actual 'Italic' colour
508 URxvt_Color_tint = 705, // change actual tint colour 496 URxvt_Color_tint = 705, // change actual tint colour
509 URxvt_Color_BD = 706, 497 URxvt_Color_BD = 706,
510 URxvt_Color_UL = 707, 498 URxvt_Color_UL = 707,
… …
526 * on the unnecessary items, e.g. Color_pointer, but won't bother 514 * on the unnecessary items, e.g. Color_pointer, but won't bother
527 * until we need to. Also, be aware of usage in pixcolor_set 515 * until we need to. Also, be aware of usage in pixcolor_set
528 */ 516 */
529 517
530enum colour_list { 518enum colour_list {
519 Color_none = -2,
520 Color_transparent = -1,
531 Color_fg = 0, 521 Color_fg = 0,
532 Color_bg, 522 Color_bg,
533 minCOLOR, /* 2 */ 523 minCOLOR, /* 2 */
534 Color_Black = minCOLOR, 524 Color_Black = minCOLOR,
535 Color_Red3, 525 Color_Red3,
… …
595#endif 585#endif
596}; 586};
597 587
598#define Color_Bits 7 // 0 .. maxTermCOLOR 588#define Color_Bits 7 // 0 .. maxTermCOLOR
599 589
600#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
601#define NPIXCLR_BITS 32
602
603/* 590/*
604 * Resource list 591 * Resource list
605 */ 592 */
606enum { 593enum {
607# define def(name) Rs_ ## name, 594# define def(name) Rs_ ## name,
608# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 595# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
609# include "rsinc.h" 596# include "rsinc.h"
610# undef def 597# undef def
611# undef reserve 598# undef reserve
612 NUM_RESOURCES 599 NUM_RESOURCES
613};
614
615// see init.C:xa_names, which must be kept in sync
616enum {
617 XA_TEXT = 0,
618 XA_COMPOUND_TEXT,
619 XA_UTF8_STRING,
620 XA_MULTIPLE,
621 XA_TARGETS,
622 XA_TIMESTAMP,
623 XA_VT_SELECTION,
624 XA_INCR,
625 XA_WM_PROTOCOLS,
626 XA_WM_DELETE_WINDOW,
627 XA_CLIPBOARD,
628#if ENABLE_FRILLS
629 XA_MOTIF_WM_HINTS,
630#endif
631#if ENABLE_EWMH
632 XA_NET_WM_PID,
633 XA_NET_WM_NAME,
634 XA_NET_WM_ICON_NAME,
635 XA_NET_WM_PING,
636#endif
637#if USE_XIM
638 XA_WM_LOCALE_NAME,
639#endif
640#if TRANSPARENT
641 XA_XROOTPMAP_ID,
642 XA_ESETROOT_PMAP_ID,
643#endif
644#if ENABLE_XEMBED
645 XA_XEMBED,
646 XA_XEMBED_INFO,
647#endif
648 NUM_XA
649}; 600};
650 601
651/* DEC private modes */ 602/* DEC private modes */
652#define PrivMode_132 (1UL<<0) 603#define PrivMode_132 (1UL<<0)
653#define PrivMode_132OK (1UL<<1) 604#define PrivMode_132OK (1UL<<1)
… …
726 ***************************************************************************** 677 *****************************************************************************
727 * MACRO DEFINES 678 * MACRO DEFINES
728 ***************************************************************************** 679 *****************************************************************************
729 */ 680 */
730#define dLocal(type,name) type const name = this->name 681#define dLocal(type,name) type const name = this->name
731#define dDisp Display *disp = this->display->display 682
683// for speed reasons, we assume that all codepoints 32 to 126 are
684// single-width.
685#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
732 686
733/* convert pixel dimensions to row/column values. Everything as int32_t */ 687/* convert pixel dimensions to row/column values. Everything as int32_t */
734#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 688#define Pixel2Col(x) Pixel2Width((int32_t)(x))
735#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 689#define Pixel2Row(y) Pixel2Height((int32_t)(y))
736#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 690#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
738#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 692#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
739#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 693#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
740#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 694#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
741#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 695#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
742 696
743#define OPTION(opt) (options & (opt))
744#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
745 | Opt_jumpScroll | Opt_secondaryScreen \
746 | Opt_pastableTabs | Opt_intensityStyles)
747
748// for m >= -n, ensure remainder lies between 0..n-1 697// for m >= -n, ensure remainder lies between 0..n-1
749#define MOD(m,n) (((m) + (n)) % (n)) 698#define MOD(m,n) (((m) + (n)) % (n))
750 699
751#define LINENO(n) MOD (term_start + int(n), total_rows) 700#define LINENO(n) MOD (term_start + int(n), total_rows)
752#define ROW(n) row_buf [LINENO (n)] 701#define ROW(n) row_buf [LINENO (n)]
… …
770#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 719#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
771#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 720#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
772 721
773#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 722#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
774 723
775#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 724#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
776#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 725#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
777 726
778#if ENABLE_STYLES 727#if ENABLE_STYLES
779# define FONTSET(style) fontset[GET_STYLE (style)] 728# define FONTSET(style) fontset[GET_STYLE (style)]
780#else 729#else
781# define FONTSET(style) fontset[0] 730# define FONTSET(style) fontset[0]
… …
815# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 764# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
816#else 765#else
817# define XPMClearArea(a, b, c, d, e, f, g) 766# define XPMClearArea(a, b, c, d, e, f, g)
818#endif 767#endif
819 768
820#ifdef DEBUG_CMD
821# define D_CMD(x) fprintf x ; fputc('\n', stderr)
822#else
823# define D_CMD(x)
824#endif
825#ifdef DEBUG_INIT
826# define D_INIT(x) fprintf x ; fputc('\n', stderr)
827#else
828# define D_INIT(x)
829#endif
830#ifdef DEBUG_MAIN
831# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
832#else
833# define D_MAIN(x)
834#endif
835#ifdef DEBUG_SIZE
836# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
837#else
838# define D_SIZE(x)
839#endif
840
841typedef callback1<void, const char *> log_callback; 769typedef callback<void (const char *)> log_callback;
842typedef callback1<int, int> getfd_callback; 770typedef callback<int (int)> getfd_callback;
843 771
844#define SET_LOCALE(locale) rxvt_set_locale (locale) 772#define SET_LOCALE(locale) rxvt_set_locale (locale)
845extern bool rxvt_set_locale (const char *locale) NOTHROW; 773extern bool rxvt_set_locale (const char *locale) NOTHROW;
846extern void rxvt_push_locale (const char *locale) NOTHROW; 774extern void rxvt_push_locale (const char *locale) NOTHROW;
847extern void rxvt_pop_locale () NOTHROW; 775extern void rxvt_pop_locale () NOTHROW;
… …
849/****************************************************************************/ 777/****************************************************************************/
850 778
851#define LINE_LONGER 0x0001 // line is continued on the next row 779#define LINE_LONGER 0x0001 // line is continued on the next row
852#define LINE_FILTERED 0x0002 // line has been filtered 780#define LINE_FILTERED 0x0002 // line has been filtered
853#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 781#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
782#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
783#define LINE_BIDI 0x0010 // line needs bidi (NYI)
854 784
855struct line_t { 785struct line_t {
856 text_t *t; // terminal the text 786 text_t *t; // terminal the text
857 rend_t *r; // rendition, uses RS_ flags 787 rend_t *r; // rendition, uses RS_ flags
858 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 788 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
912# define COMPOSE_LO 0x40000000UL 842# define COMPOSE_LO 0x40000000UL
913# define COMPOSE_HI 0x400fffffUL 843# define COMPOSE_HI 0x400fffffUL
914# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 844# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
915#else 845#else
916# if ENABLE_PERL 846# if ENABLE_PERL
917# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 847# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
918# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 848# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
919# else 849# else
920# define COMPOSE_LO 0xd800UL 850# define COMPOSE_LO 0xd800UL
921# define COMPOSE_HI 0xf8ffUL 851# define COMPOSE_HI 0xf8ffUL
922# endif 852# endif
… …
951#endif 881#endif
952 882
953/****************************************************************************/ 883/****************************************************************************/
954 884
955#ifdef KEYSYM_RESOURCE 885#ifdef KEYSYM_RESOURCE
956 class keyboard_manager; 886class keyboard_manager;
957#endif 887#endif
958 888
959struct rxvt_term : zero_initialized, rxvt_vars { 889struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
890
891 // special markers with magic addresses
892 static const char resval_undef []; // options specifically unset
893 static const char resval_on []; // boolean options switched on
894 static const char resval_off []; // or off
895
960 log_callback *log_hook; // log error messages through this hook, if != 0 896 log_callback *log_hook; // log error messages through this hook, if != 0
961 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 897 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
962#if ENABLE_PERL 898#if ENABLE_PERL
963 rxvt_perl_term perl; 899 rxvt_perl_term perl;
964#endif 900#endif
965 struct mbstate mbstate; // current input multibyte state 901 struct mbstate mbstate; // current input multibyte state
966 902
967 unsigned char want_refresh:1, 903 unsigned char want_refresh:1,
968#ifdef TRANSPARENT 904#ifdef TRANSPARENT
969 want_full_refresh:1, /* awaiting full screen refresh */ 905 want_full_refresh:1, /* awaiting full screen refresh */
970#endif
971#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
972 am_transparent:1, /* is a transparent term */ 906 am_transparent:1, /* is a transparent term */
973 am_pixmap_trans:1, /* transparency w/known root pixmap */ 907 am_pixmap_trans:1, /* transparency w/known root pixmap */
974#endif 908#endif
975 current_screen:1, /* primary or secondary */ 909 current_screen:1, /* primary or secondary */
976 num_scr_allow:1, 910 num_scr_allow:1,
… …
1004 int num_scr; /* screen: number lines scrolled */ 938 int num_scr; /* screen: number lines scrolled */
1005 int prev_ncol, /* screen: previous number of columns */ 939 int prev_ncol, /* screen: previous number of columns */
1006 prev_nrow; /* screen: previous number of rows */ 940 prev_nrow; /* screen: previous number of rows */
1007/* ---------- */ 941/* ---------- */
1008 rend_t rstyle; 942 rend_t rstyle;
1009/* ---------- */
1010 uint32_t pixcolor_set[NPIXCLR_SETS];
1011/* ---------- */ 943/* ---------- */
1012#ifdef SELECTION_SCROLLING 944#ifdef SELECTION_SCROLLING
1013 int scroll_selection_lines; 945 int scroll_selection_lines;
1014 enum page_dirn scroll_selection_dir; 946 enum page_dirn scroll_selection_dir;
1015 int selection_save_x, 947 int selection_save_x,
… …
1042 int old_width, /* last used width in screen resize */ 974 int old_width, /* last used width in screen resize */
1043 old_height; /* last used height in screen resize */ 975 old_height; /* last used height in screen resize */
1044 unsigned long priv_modes, 976 unsigned long priv_modes,
1045 SavedModes; 977 SavedModes;
1046/* ---------- */ 978/* ---------- */
1047 Atom xa[NUM_XA]; 979 Atom *xa;
1048/* ---------- */ 980/* ---------- */
1049#ifdef RXVT_SCROLLBAR 981#ifdef RXVT_SCROLLBAR
1050 GC scrollbarGC, 982 GC scrollbarGC,
1051 topShadowGC, 983 topShadowGC,
1052 botShadowGC; 984 botShadowGC;
… …
1089 XComposeStatus compose; 1021 XComposeStatus compose;
1090 ttymode_t tio; 1022 ttymode_t tio;
1091 row_col_t oldcursor; 1023 row_col_t oldcursor;
1092#ifdef XPM_BACKGROUND 1024#ifdef XPM_BACKGROUND
1093 bgPixmap_t bgPixmap; 1025 bgPixmap_t bgPixmap;
1026#ifdef HAVE_AFTERIMAGE
1027 ASImageManager *asimman;
1028 ASImage *original_asim;
1029 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1030#else
1094 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1031 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1032#endif
1095#endif 1033#endif
1096 1034
1097#if ENABLE_OVERLAY 1035#if ENABLE_OVERLAY
1098 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1036 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1099 text_t **ov_text; 1037 text_t **ov_text;
… …
1109 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1047 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1110#endif 1048#endif
1111 1049
1112 vector<void *> allocated; // free these memory blocks with free() 1050 vector<void *> allocated; // free these memory blocks with free()
1113 1051
1114 char *env_windowid; /* environmental variable WINDOWID */ 1052 char env_windowid[21]; /* environmental variable WINDOWID */
1053 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1115 char *env_display; /* environmental variable DISPLAY */ 1054 char *env_display; /* environmental variable DISPLAY */
1116 char *env_term; /* environmental variable TERM */ 1055 char *env_term; /* environmental variable TERM */
1117 char *env_colorfgbg; 1056
1118 char *locale; 1057 char *locale;
1119 char charsets[4]; 1058 char charsets[4];
1120 char *v_buffer; /* pointer to physical buffer */ 1059 char *v_buffer; /* pointer to physical buffer */
1121 unsigned int v_buflen; /* size of area to write */ 1060 unsigned int v_buflen; /* size of area to write */
1122 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1061 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1123 1062
1124#ifdef KEYSYM_RESOURCE 1063#ifdef KEYSYM_RESOURCE
1125 keyboard_manager *keyboard; 1064 keyboard_manager *keyboard;
1126#endif 1065#endif
1127 1066
… …
1149#endif 1088#endif
1150 1089
1151 // modifies first argument(!) 1090 // modifies first argument(!)
1152 void paste (char *data, unsigned int len) NOTHROW; 1091 void paste (char *data, unsigned int len) NOTHROW;
1153 1092
1154 long vt_emask, vt_emask_perl; 1093 long vt_emask, vt_emask_perl, vt_emask_xim;
1155 1094
1156 void vt_select_input () const NOTHROW 1095 void vt_select_input () const NOTHROW
1157 { 1096 {
1158 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1097 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1159 } 1098 }
1160 1099
1161#if TRANSPARENT 1100#if TRANSPARENT || ENABLE_PERL
1162 void rootwin_cb (XEvent &xev); 1101 void rootwin_cb (XEvent &xev);
1163 xevent_watcher rootwin_ev; 1102 xevent_watcher rootwin_ev;
1103 void check_our_parents_cb (time_watcher &w);
1104 time_watcher check_our_aprents_ev;
1164#endif 1105#endif
1165 1106
1166 void x_cb (XEvent &xev); 1107 void x_cb (XEvent &xev);
1167 void flush (); 1108 void flush ();
1168 xevent_watcher termwin_ev; 1109 xevent_watcher termwin_ev;
… …
1228 bool pty_fill (); 1169 bool pty_fill ();
1229 1170
1230 void make_current () const // make this the "currently active" urxvt instance 1171 void make_current () const // make this the "currently active" urxvt instance
1231 { 1172 {
1232 SET_R (this); 1173 SET_R (this);
1174 set_environ (envv);
1233 rxvt_set_locale (locale); 1175 rxvt_set_locale (locale);
1234 set_environ (envv);
1235 } 1176 }
1236 1177
1237 void init_secondary (); 1178 void init_secondary ();
1238 const char **init_resources (int argc, const char *const *argv); 1179 const char **init_resources (int argc, const char *const *argv);
1239 const char *x_resource (const char *name); 1180 const char *x_resource (const char *name);
… …
1249 void create_windows (int argc, const char *const *argv); 1190 void create_windows (int argc, const char *const *argv);
1250 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1191 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1251 void window_calc (unsigned int newwidth, unsigned int newheight); 1192 void window_calc (unsigned int newwidth, unsigned int newheight);
1252 1193
1253#if USE_XIM 1194#if USE_XIM
1254 rxvt_xim *input_method; 1195 rxvt_xim *input_method;
1255 XIC Input_Context; 1196 XIC Input_Context;
1256 XIMStyle input_style; 1197 XIMStyle input_style;
1257 XPoint spot; // most recently sent spot position 1198 XPoint spot; // most recently sent spot position
1258 1199
1259 void im_destroy (); 1200 void im_destroy ();
1260 void im_cb (); im_watcher im_ev; 1201 void im_cb (); im_watcher im_ev;
1261 void im_set_size (XRectangle &size); 1202 void im_set_size (XRectangle &size);
1262 void im_set_position (XPoint &pos) NOTHROW; 1203 void im_set_position (XPoint &pos) NOTHROW;
… …
1264 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1265 1206
1266 bool IMisRunning (); 1207 bool IMisRunning ();
1267 void IMSendSpot (); 1208 void IMSendSpot ();
1268 bool IM_get_IC (const char *modifiers); 1209 bool IM_get_IC (const char *modifiers);
1269 void IMSetStatusPosition (); 1210 void IMSetPosition ();
1270#endif 1211#endif
1271 1212
1272 void resize_scrollbar (); 1213 void resize_scrollbar ();
1273 1214
1274 // command.C 1215 // command.C
1275 void lookup_key (XKeyEvent &ev); 1216 void key_press (XKeyEvent &ev);
1217 void key_release (XKeyEvent &ev);
1276 unsigned int cmd_write (const char *str, unsigned int count); 1218 unsigned int cmd_write (const char *str, unsigned int count);
1277 1219
1278 wchar_t next_char () NOTHROW; 1220 wchar_t next_char () NOTHROW;
1279 wchar_t cmd_getc () THROW ((class out_of_input)); 1221 wchar_t cmd_getc () THROW ((class out_of_input));
1280 uint32_t next_octet () NOTHROW; 1222 uint32_t next_octet () NOTHROW;
… …
1284 void mouse_report (XButtonEvent &ev); 1226 void mouse_report (XButtonEvent &ev);
1285 void button_press (XButtonEvent &ev); 1227 void button_press (XButtonEvent &ev);
1286 void button_release (XButtonEvent &ev); 1228 void button_release (XButtonEvent &ev);
1287 void focus_in (); 1229 void focus_in ();
1288 void focus_out (); 1230 void focus_out ();
1231 void update_fade_color (unsigned int idx);
1289 int check_our_parents (); 1232 int check_our_parents ();
1290#ifdef PRINTPIPE 1233#ifdef PRINTPIPE
1291 FILE *popen_printer (); 1234 FILE *popen_printer ();
1292 int pclose_printer (FILE *stream); 1235 int pclose_printer (FILE *stream);
1293#endif 1236#endif
… …
1315 void set_utf8_property (Atom prop, const char *str, int len = -1); 1258 void set_utf8_property (Atom prop, const char *str, int len = -1);
1316 void set_title (const char *str); 1259 void set_title (const char *str);
1317 void set_icon_name (const char *str); 1260 void set_icon_name (const char *str);
1318 void set_window_color (int idx, const char *color); 1261 void set_window_color (int idx, const char *color);
1319 void set_colorfgbg (); 1262 void set_colorfgbg ();
1320 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1263 bool set_color (rxvt_color &color, const char *name);
1264 void alias_color (int dst, int src);
1321 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1265 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1322 1266
1323 // screen.C 1267 // screen.C
1324 1268
1325 void lalloc (line_t &l) const NOTHROW 1269 void lalloc (line_t &l) const
1326 { 1270 {
1327 l.t = (text_t *)talloc->alloc (); 1271 l.t = (text_t *)talloc->alloc ();
1328 l.r = (rend_t *)ralloc->alloc (); 1272 l.r = (rend_t *)ralloc->alloc ();
1329 } 1273 }
1330 1274
… …
1334 talloc->free (l.t); 1278 talloc->free (l.t);
1335 ralloc->free (l.r); 1279 ralloc->free (l.r);
1336 } 1280 }
1337#endif 1281#endif
1338 1282
1339 void lresize (line_t &l) const NOTHROW 1283 void lresize (line_t &l) const
1340 { 1284 {
1341 if (!l.t) 1285 if (!l.t)
1342 return; 1286 return;
1343 1287
1344 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1288 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1354 { 1298 {
1355 int base = GET_BASEFG (r); 1299 int base = GET_BASEFG (r);
1356#ifndef NO_BRIGHTCOLOR 1300#ifndef NO_BRIGHTCOLOR
1357 if (r & RS_Bold 1301 if (r & RS_Bold
1358# if ENABLE_STYLES 1302# if ENABLE_STYLES
1359 && OPTION (Opt_intensityStyles) 1303 && option (Opt_intensityStyles)
1360# endif 1304# endif
1361 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1305 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1362 base += minBrightCOLOR - minCOLOR; 1306 base += minBrightCOLOR - minCOLOR;
1363#endif 1307#endif
1364 return base; 1308 return base;
… …
1368 { 1312 {
1369 int base = GET_BASEBG (r); 1313 int base = GET_BASEBG (r);
1370#ifndef NO_BRIGHTCOLOR 1314#ifndef NO_BRIGHTCOLOR
1371 if (r & RS_Blink 1315 if (r & RS_Blink
1372# if ENABLE_STYLES 1316# if ENABLE_STYLES
1373 && OPTION (Opt_intensityStyles) 1317 && option (Opt_intensityStyles)
1374# endif 1318# endif
1375 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1376 base += minBrightCOLOR - minCOLOR; 1320 base += minBrightCOLOR - minCOLOR;
1377#endif 1321#endif
1378 return base; 1322 return base;
1379 } 1323 }
1380 1324
1381 bool option (uint32_t opt) const NOTHROW 1325 bool option (uint8_t opt) const NOTHROW
1382 { 1326 {
1383 return OPTION (opt); 1327 return options[opt >> 3] & (1 << (opt & 7));
1384 } 1328 }
1385 1329
1386 void set_option (uint32_t opt, bool set) NOTHROW 1330 void set_option (uint8_t opt, bool set = true) NOTHROW
1387 { 1331 {
1388 if (set) 1332 if (set)
1389 options |= opt; 1333 options[opt >> 3] |= (1 << (opt & 7));
1390 else 1334 else
1391 options &= ~opt; 1335 options[opt >> 3] &= ~(1 << (opt & 7));
1392 } 1336 }
1393 1337
1394 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1338 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1395 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1339 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1396 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1340 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1412 void scr_remap_chars () NOTHROW; 1356 void scr_remap_chars () NOTHROW;
1413 void scr_remap_chars (line_t &l) NOTHROW; 1357 void scr_remap_chars (line_t &l) NOTHROW;
1414 1358
1415 enum cursor_mode { SAVE, RESTORE }; 1359 enum cursor_mode { SAVE, RESTORE };
1416 1360
1417 void scr_poweron () NOTHROW; 1361 void scr_poweron ();
1418 void scr_cursor (cursor_mode mode) NOTHROW; 1362 void scr_cursor (cursor_mode mode) NOTHROW;
1419 void scr_do_wrap () NOTHROW; 1363 void scr_do_wrap () NOTHROW;
1364 void scr_swap_screen () NOTHROW;
1420 int scr_change_screen (int scrn) NOTHROW; 1365 void scr_change_screen (int scrn);
1421 void scr_color (unsigned int color, int fgbg) NOTHROW; 1366 void scr_color (unsigned int color, int fgbg) NOTHROW;
1422 void scr_rendition (int set, int style) NOTHROW; 1367 void scr_rendition (int set, int style) NOTHROW;
1423 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1368 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1424 void scr_backspace () NOTHROW; 1369 void scr_backspace () NOTHROW;
1425 void scr_tab (int count, bool ht = false) NOTHROW; 1370 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1517# define __PROTO(p) p 1462# define __PROTO(p) p
1518#else 1463#else
1519# define __PROTO(p) () 1464# define __PROTO(p) ()
1520#endif 1465#endif
1521 1466
1522#ifdef DEBUG_malloc
1523# include "dmalloc.h" /* This comes last */
1524#endif
1525
1526#endif /* _RXVT_H_ */ 1467#endif /* _RXVT_H_ */
1527 1468

Diff Legend

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