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.243 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.281 by ayin, Thu Aug 2 15:01:30 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 ENABLE_XIM_ONTHESPOT 1
21# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
22#else 23#else
23# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
24#endif 25#endif
25 26
26#include <limits.h> 27#include <limits.h>
… …
32#if ENABLE_FRILLS 33#if ENABLE_FRILLS
33# include <X11/Xmd.h> 34# include <X11/Xmd.h>
34#endif 35#endif
35 36
36#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
37#include "rxvtfont.h" 39#include "rxvtfont.h"
38#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
39#include "iom.h" 41#include "iom.h"
40#include "salloc.h" 42#include "salloc.h"
41#include "libptytty.h" 43#include "libptytty.h"
… …
68 70
69#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
70typedef char *XPointer; 72typedef char *XPointer;
71#endif 73#endif
72 74
73#ifdef HAVE_TERMIOS_H
74# include <termios.h> 75#include <termios.h>
75typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
76#else
77# include <sgtty.h>
78typedef struct {
79 struct sgttyb sg;
80 struct tchars tc;
81 struct ltchars lc;
82 int line;
83 int local;
84} ttymode_t;
85#endif
86 77
87#ifdef XPM_BACKGROUND 78#ifdef HAVE_AFTERIMAGE
88# ifdef XPM_INC_X11 79# include <afterimage.h>
89# include <X11/xpm.h> 80#undef min
90# else 81#undef max
91# include <xpm.h>
92# endif
93#endif 82#endif
94 83
95#ifndef STDIN_FILENO 84#ifndef STDIN_FILENO
96# define STDIN_FILENO 0 85# define STDIN_FILENO 0
97# define STDOUT_FILENO 1 86# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 87# define STDERR_FILENO 2
99#endif 88#endif
100 89
101/****************************************************************************/ 90/****************************************************************************/
102
103#ifndef __attribute__
104# if __GNUC__
105# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
106# define __attribute__(x)
107# endif
108# endif
109# define __attribute__(x)
110#endif
111
112#define NORETURN __attribute__ ((noreturn))
113#define UNUSED __attribute__ ((unused))
114
115// increases code size unless -fno-enforce-eh-specs
116#if __GNUC__
117# define NOTHROW
118# define THROW(x)
119#else
120# define NOTHROW throw()
121# define THROW(x) throw x
122#endif
123 91
124// exception thrown on fatal (per-instance) errors 92// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 93class rxvt_failure_exception { };
126 94
127// exception thrown when the command parser runs out of input data 95// exception thrown when the command parser runs out of input data
… …
143// misc.C 111// misc.C
144char * rxvt_wcstombs (const wchar_t *str, int len = -1); 112char * rxvt_wcstombs (const wchar_t *str, int len = -1);
145wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 113wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
146char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 114char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
147wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 115wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
148char * rxvt_strdup_cpp (const char *str);
149 116
150#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 117#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
151 118
152char * rxvt_r_basename (const char *str) NOTHROW; 119char * rxvt_r_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 120void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
… …
160const char * rxvt_Str_skip_space (const char *str) NOTHROW; 127const char * rxvt_Str_skip_space (const char *str) NOTHROW;
161char * rxvt_Str_trim (char *str) NOTHROW; 128char * rxvt_Str_trim (char *str) NOTHROW;
162int rxvt_Str_escaped (char *str) NOTHROW; 129int rxvt_Str_escaped (char *str) NOTHROW;
163char ** rxvt_splitcommastring (const char *cs) NOTHROW; 130char ** rxvt_splitcommastring (const char *cs) NOTHROW;
164void rxvt_freecommastring (char **cs) NOTHROW; 131void rxvt_freecommastring (char **cs) NOTHROW;
165char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
166 132
167///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
168 134
169// temporarily replace the process environment 135// temporarily replace the process environment
170extern char **environ; 136extern char **environ;
… …
207#endif 173#endif
208 174
209#ifdef XPM_BACKGROUND 175#ifdef XPM_BACKGROUND
210typedef struct { 176typedef struct {
211 short w, h, x, y; 177 short w, h, x, y;
178 bool auto_resize ;
212 Pixmap pixmap; 179 Pixmap pixmap;
213} bgPixmap_t; 180} bgPixmap_t;
214#endif 181#endif
215 182
216/* 183/*
… …
432// fake styles 399// fake styles
433#define RS_Blink 0x00010000UL // blink 400#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 401#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 402#define RS_Uline 0x00040000UL // underline
436 403
404// toggle this to force redraw, must be != RS_Careful
405#define RS_redraw 0x01000000UL
406
437// 5 custom bits for extensions 407// 5 custom bits for extensions
438#define RS_customCount 32 408#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 409#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 410#define RS_customShift 19
441 411
… …
510 Rxvt_restoreFG = 39, // change default fg color 480 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 481 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 482 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 483
514 URxvt_locale = 701, // change locale 484 URxvt_locale = 701, // change locale
485 URxvt_version = 702, // request version
515 486
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 487 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 488 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 489 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 490 URxvt_Color_UL = 707,
… …
535 * on the unnecessary items, e.g. Color_pointer, but won't bother 506 * on the unnecessary items, e.g. Color_pointer, but won't bother
536 * until we need to. Also, be aware of usage in pixcolor_set 507 * until we need to. Also, be aware of usage in pixcolor_set
537 */ 508 */
538 509
539enum colour_list { 510enum colour_list {
511 Color_none = -2,
512 Color_transparent = -1,
540 Color_fg = 0, 513 Color_fg = 0,
541 Color_bg, 514 Color_bg,
542 minCOLOR, /* 2 */ 515 minCOLOR, /* 2 */
543 Color_Black = minCOLOR, 516 Color_Black = minCOLOR,
544 Color_Red3, 517 Color_Red3,
… …
603 TOTAL_COLORS = NRS_COLORS 576 TOTAL_COLORS = NRS_COLORS
604#endif 577#endif
605}; 578};
606 579
607#define Color_Bits 7 // 0 .. maxTermCOLOR 580#define Color_Bits 7 // 0 .. maxTermCOLOR
608
609#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
610#define NPIXCLR_BITS 32
611 581
612/* 582/*
613 * Resource list 583 * Resource list
614 */ 584 */
615enum { 585enum {
… …
699 ***************************************************************************** 669 *****************************************************************************
700 * MACRO DEFINES 670 * MACRO DEFINES
701 ***************************************************************************** 671 *****************************************************************************
702 */ 672 */
703#define dLocal(type,name) type const name = this->name 673#define dLocal(type,name) type const name = this->name
704#define dDisp Display *disp = this->display->display
705 674
706// for speed reasons, we assume that all latin1 characters 675// for speed reasons, we assume that all codepoints 32 to 126 are
707// are single-width (the first unicdoe combining character 676// single-width.
708// is actually 0x300, but ascii is what matters most). 677#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
709#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c))
710 678
711/* convert pixel dimensions to row/column values. Everything as int32_t */ 679/* convert pixel dimensions to row/column values. Everything as int32_t */
712#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 680#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 681#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 682#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
716#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 684#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
717#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 685#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
718#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 686#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
719#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 687#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
720 688
721#define OPTION(opt) (options & (opt))
722#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
723 | Opt_jumpScroll | Opt_secondaryScreen \
724 | Opt_pastableTabs | Opt_intensityStyles)
725
726// for m >= -n, ensure remainder lies between 0..n-1 689// for m >= -n, ensure remainder lies between 0..n-1
727#define MOD(m,n) (((m) + (n)) % (n)) 690#define MOD(m,n) (((m) + (n)) % (n))
728 691
729#define LINENO(n) MOD (term_start + int(n), total_rows) 692#define LINENO(n) MOD (term_start + int(n), total_rows)
730#define ROW(n) row_buf [LINENO (n)] 693#define ROW(n) row_buf [LINENO (n)]
… …
748#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 711#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
749#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 712#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
750 713
751#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 714#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
752 715
753#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 716#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
754#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 717#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
755 718
756#if ENABLE_STYLES 719#if ENABLE_STYLES
757# define FONTSET(style) fontset[GET_STYLE (style)] 720# define FONTSET(style) fontset[GET_STYLE (style)]
758#else 721#else
759# define FONTSET(style) fontset[0] 722# define FONTSET(style) fontset[0]
… …
787#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 750#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
788#define scrollbar_position(y) ((y) - scrollBar.beg) 751#define scrollbar_position(y) ((y) - scrollBar.beg)
789#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 752#define scrollbar_size() (scrollBar.end - scrollBar.beg \
790 - scrollbar_minheight ()) 753 - scrollbar_minheight ())
791 754
792#ifdef XPM_BACKGROUND
793# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
794#else
795# define XPMClearArea(a, b, c, d, e, f, g)
796#endif
797
798typedef callback1<void, const char *> log_callback; 755typedef callback<void (const char *)> log_callback;
799typedef callback1<int, int> getfd_callback; 756typedef callback<int (int)> getfd_callback;
800 757
801#define SET_LOCALE(locale) rxvt_set_locale (locale) 758#define SET_LOCALE(locale) rxvt_set_locale (locale)
802extern bool rxvt_set_locale (const char *locale) NOTHROW; 759extern bool rxvt_set_locale (const char *locale) NOTHROW;
803extern void rxvt_push_locale (const char *locale) NOTHROW; 760extern void rxvt_push_locale (const char *locale) NOTHROW;
804extern void rxvt_pop_locale () NOTHROW; 761extern void rxvt_pop_locale () NOTHROW;
… …
806/****************************************************************************/ 763/****************************************************************************/
807 764
808#define LINE_LONGER 0x0001 // line is continued on the next row 765#define LINE_LONGER 0x0001 // line is continued on the next row
809#define LINE_FILTERED 0x0002 // line has been filtered 766#define LINE_FILTERED 0x0002 // line has been filtered
810#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 767#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
768#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
769#define LINE_BIDI 0x0010 // line needs bidi (NYI)
811 770
812struct line_t { 771struct line_t {
813 text_t *t; // terminal the text 772 text_t *t; // terminal the text
814 rend_t *r; // rendition, uses RS_ flags 773 rend_t *r; // rendition, uses RS_ flags
815 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 774 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
869# define COMPOSE_LO 0x40000000UL 828# define COMPOSE_LO 0x40000000UL
870# define COMPOSE_HI 0x400fffffUL 829# define COMPOSE_HI 0x400fffffUL
871# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 830# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
872#else 831#else
873# if ENABLE_PERL 832# if ENABLE_PERL
874# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 833# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
875# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 834# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
876# else 835# else
877# define COMPOSE_LO 0xd800UL 836# define COMPOSE_LO 0xd800UL
878# define COMPOSE_HI 0xf8ffUL 837# define COMPOSE_HI 0xf8ffUL
879# endif 838# endif
… …
908#endif 867#endif
909 868
910/****************************************************************************/ 869/****************************************************************************/
911 870
912#ifdef KEYSYM_RESOURCE 871#ifdef KEYSYM_RESOURCE
913 class keyboard_manager; 872class keyboard_manager;
914#endif 873#endif
915 874
916struct rxvt_term : zero_initialized, rxvt_vars { 875struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
876
877 // special markers with magic addresses
878 static const char resval_undef []; // options specifically unset
879 static const char resval_on []; // boolean options switched on
880 static const char resval_off []; // or off
881
917 log_callback *log_hook; // log error messages through this hook, if != 0 882 log_callback *log_hook; // log error messages through this hook, if != 0
918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 883 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
919#if ENABLE_PERL 884#if ENABLE_PERL
920 rxvt_perl_term perl; 885 rxvt_perl_term perl;
921#endif 886#endif
922 struct mbstate mbstate; // current input multibyte state 887 struct mbstate mbstate; // current input multibyte state
923 888
924 unsigned char want_refresh:1, 889 unsigned char want_refresh:1,
925#ifdef TRANSPARENT 890#ifdef ENABLE_TRANSPARENCY
926 want_full_refresh:1, /* awaiting full screen refresh */ 891 want_full_refresh:1, /* awaiting full screen refresh */
927#endif
928#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
929 am_transparent:1, /* is a transparent term */ 892 am_transparent:1, /* is a transparent term */
930 am_pixmap_trans:1, /* transparency w/known root pixmap */ 893 am_pixmap_trans:1, /* transparency w/known root pixmap */
931#endif 894#endif
932 current_screen:1, /* primary or secondary */ 895 current_screen:1, /* primary or secondary */
933 num_scr_allow:1, 896 num_scr_allow:1,
… …
962 int prev_ncol, /* screen: previous number of columns */ 925 int prev_ncol, /* screen: previous number of columns */
963 prev_nrow; /* screen: previous number of rows */ 926 prev_nrow; /* screen: previous number of rows */
964/* ---------- */ 927/* ---------- */
965 rend_t rstyle; 928 rend_t rstyle;
966/* ---------- */ 929/* ---------- */
967 uint32_t pixcolor_set[NPIXCLR_SETS];
968/* ---------- */
969#ifdef SELECTION_SCROLLING 930#ifdef SELECTION_SCROLLING
970 int scroll_selection_lines; 931 int scroll_selection_lines;
971 enum page_dirn scroll_selection_dir; 932 enum page_dirn scroll_selection_dir;
972 int selection_save_x, 933 int selection_save_x,
973 selection_save_y, 934 selection_save_y,
… …
978 /* give proper Scroll behaviour */ 939 /* give proper Scroll behaviour */
979#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 940#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
980 mouse_slip_wheel_speed, 941 mouse_slip_wheel_speed,
981#endif 942#endif
982 refresh_count, 943 refresh_count,
983 refresh_limit,
984 last_bot, /* scrollbar last bottom position */ 944 last_bot, /* scrollbar last bottom position */
985 last_top, /* scrollbar last top position */ 945 last_top, /* scrollbar last top position */
986 last_state, /* scrollbar last state */ 946 last_state, /* scrollbar last state */
987 scrollbar_len, 947 scrollbar_len,
988 window_vt_x, 948 window_vt_x,
… …
1046 XComposeStatus compose; 1006 XComposeStatus compose;
1047 ttymode_t tio; 1007 ttymode_t tio;
1048 row_col_t oldcursor; 1008 row_col_t oldcursor;
1049#ifdef XPM_BACKGROUND 1009#ifdef XPM_BACKGROUND
1050 bgPixmap_t bgPixmap; 1010 bgPixmap_t bgPixmap;
1051 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1011 struct ASVisual *asv;
1012 ASImageManager *asimman;
1013 ASImage *original_asim;
1014 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1052#endif 1015#endif
1053 1016
1054#if ENABLE_OVERLAY 1017#if ENABLE_OVERLAY
1055 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1018 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1056 text_t **ov_text; 1019 text_t **ov_text;
… …
1111 1074
1112 long vt_emask, vt_emask_perl, vt_emask_xim; 1075 long vt_emask, vt_emask_perl, vt_emask_xim;
1113 1076
1114 void vt_select_input () const NOTHROW 1077 void vt_select_input () const NOTHROW
1115 { 1078 {
1116 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1079 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1117 } 1080 }
1118 1081
1119#if TRANSPARENT 1082#if ENABLE_TRANSPARENCY || ENABLE_PERL
1120 void rootwin_cb (XEvent &xev); 1083 void rootwin_cb (XEvent &xev);
1121 xevent_watcher rootwin_ev; 1084 xevent_watcher rootwin_ev;
1085#endif
1086#if ENABLE_TRANSPARENCY
1087 int check_our_parents ();
1088 void check_our_parents_cb (time_watcher &w);
1089 time_watcher check_our_parents_ev;
1122#endif 1090#endif
1123 1091
1124 void x_cb (XEvent &xev); 1092 void x_cb (XEvent &xev);
1125 void flush (); 1093 void flush ();
1126 xevent_watcher termwin_ev; 1094 xevent_watcher termwin_ev;
… …
1186 bool pty_fill (); 1154 bool pty_fill ();
1187 1155
1188 void make_current () const // make this the "currently active" urxvt instance 1156 void make_current () const // make this the "currently active" urxvt instance
1189 { 1157 {
1190 SET_R (this); 1158 SET_R (this);
1159 set_environ (envv);
1191 rxvt_set_locale (locale); 1160 rxvt_set_locale (locale);
1192 set_environ (envv);
1193 } 1161 }
1194 1162
1195 void init_secondary (); 1163 void init_secondary ();
1196 const char **init_resources (int argc, const char *const *argv); 1164 const char **init_resources (int argc, const char *const *argv);
1197 const char *x_resource (const char *name); 1165 const char *x_resource (const char *name);
… …
1222 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1190 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1223 1191
1224 bool IMisRunning (); 1192 bool IMisRunning ();
1225 void IMSendSpot (); 1193 void IMSendSpot ();
1226 bool IM_get_IC (const char *modifiers); 1194 bool IM_get_IC (const char *modifiers);
1227 void IMSetStatusPosition (); 1195 void IMSetPosition ();
1228#endif 1196#endif
1229 1197
1230 void resize_scrollbar (); 1198 void resize_scrollbar ();
1231 1199
1232 // command.C 1200 // command.C
1233 void lookup_key (XKeyEvent &ev); 1201 void key_press (XKeyEvent &ev);
1202 void key_release (XKeyEvent &ev);
1234 unsigned int cmd_write (const char *str, unsigned int count); 1203 unsigned int cmd_write (const char *str, unsigned int count);
1235 1204
1236 wchar_t next_char () NOTHROW; 1205 wchar_t next_char () NOTHROW;
1237 wchar_t cmd_getc () THROW ((class out_of_input)); 1206 wchar_t cmd_getc () THROW ((class out_of_input));
1238 uint32_t next_octet () NOTHROW; 1207 uint32_t next_octet () NOTHROW;
… …
1242 void mouse_report (XButtonEvent &ev); 1211 void mouse_report (XButtonEvent &ev);
1243 void button_press (XButtonEvent &ev); 1212 void button_press (XButtonEvent &ev);
1244 void button_release (XButtonEvent &ev); 1213 void button_release (XButtonEvent &ev);
1245 void focus_in (); 1214 void focus_in ();
1246 void focus_out (); 1215 void focus_out ();
1247 int check_our_parents (); 1216 void update_fade_color (unsigned int idx);
1248#ifdef PRINTPIPE 1217#ifdef PRINTPIPE
1249 FILE *popen_printer (); 1218 FILE *popen_printer ();
1250 int pclose_printer (FILE *stream); 1219 int pclose_printer (FILE *stream);
1251#endif 1220#endif
1252 void process_print_pipe (); 1221 void process_print_pipe ();
… …
1273 void set_utf8_property (Atom prop, const char *str, int len = -1); 1242 void set_utf8_property (Atom prop, const char *str, int len = -1);
1274 void set_title (const char *str); 1243 void set_title (const char *str);
1275 void set_icon_name (const char *str); 1244 void set_icon_name (const char *str);
1276 void set_window_color (int idx, const char *color); 1245 void set_window_color (int idx, const char *color);
1277 void set_colorfgbg (); 1246 void set_colorfgbg ();
1278 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1247 bool set_color (rxvt_color &color, const char *name);
1248 void alias_color (int dst, int src);
1279 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1249 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1280 1250
1281 // screen.C 1251 // screen.C
1282 1252
1283 void lalloc (line_t &l) const 1253 void lalloc (line_t &l) const
… …
1312 { 1282 {
1313 int base = GET_BASEFG (r); 1283 int base = GET_BASEFG (r);
1314#ifndef NO_BRIGHTCOLOR 1284#ifndef NO_BRIGHTCOLOR
1315 if (r & RS_Bold 1285 if (r & RS_Bold
1316# if ENABLE_STYLES 1286# if ENABLE_STYLES
1317 && OPTION (Opt_intensityStyles) 1287 && option (Opt_intensityStyles)
1318# endif 1288# endif
1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1289 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1320 base += minBrightCOLOR - minCOLOR; 1290 base += minBrightCOLOR - minCOLOR;
1321#endif 1291#endif
1322 return base; 1292 return base;
… …
1326 { 1296 {
1327 int base = GET_BASEBG (r); 1297 int base = GET_BASEBG (r);
1328#ifndef NO_BRIGHTCOLOR 1298#ifndef NO_BRIGHTCOLOR
1329 if (r & RS_Blink 1299 if (r & RS_Blink
1330# if ENABLE_STYLES 1300# if ENABLE_STYLES
1331 && OPTION (Opt_intensityStyles) 1301 && option (Opt_intensityStyles)
1332# endif 1302# endif
1333 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1303 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1334 base += minBrightCOLOR - minCOLOR; 1304 base += minBrightCOLOR - minCOLOR;
1335#endif 1305#endif
1336 return base; 1306 return base;
1337 } 1307 }
1338 1308
1339 bool option (uint32_t opt) const NOTHROW 1309 bool option (uint8_t opt) const NOTHROW
1340 { 1310 {
1341 return OPTION (opt); 1311 return options[opt >> 3] & (1 << (opt & 7));
1342 } 1312 }
1343 1313
1344 void set_option (uint32_t opt, bool set) NOTHROW 1314 void set_option (uint8_t opt, bool set = true) NOTHROW
1345 { 1315 {
1346 if (set) 1316 if (set)
1347 options |= opt; 1317 options[opt >> 3] |= (1 << (opt & 7));
1348 else 1318 else
1349 options &= ~opt; 1319 options[opt >> 3] &= ~(1 << (opt & 7));
1350 } 1320 }
1351 1321
1352 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1322 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1353 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1323 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1354 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1324 int scr_scroll_text (int row1, int row2, int count) NOTHROW;

Diff Legend

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