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.208 by root, Mon Jan 16 15:00:20 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"
43#include "libptytty.h"
40 44
41#include "rxvtperl.h" 45#include "rxvtperl.h"
42 46
43// try to avoid some macros to decrease code size, on some systems 47// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 48#if ENABLE_MINIMAL
… …
66 70
67#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
68typedef char *XPointer; 72typedef char *XPointer;
69#endif 73#endif
70 74
71#ifdef HAVE_TERMIOS_H
72# include <termios.h> 75#include <termios.h>
73typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
74#else
75# include <sgtty.h>
76typedef struct {
77 struct sgttyb sg;
78 struct tchars tc;
79 struct ltchars lc;
80 int line;
81 int local;
82} ttymode_t;
83#endif
84 77
78#ifdef HAVE_AFTERIMAGE
79# include <afterimage.h>
80#undef min
81#undef max
85#ifdef XPM_BACKGROUND 82#elif defined(XPM_BACKGROUND)
86# ifdef XPM_INC_X11 83# ifdef XPM_INC_X11
87# include <X11/xpm.h> 84# include <X11/xpm.h>
88# else 85# else
89# include <xpm.h> 86# include <xpm.h>
90# endif 87# endif
… …
93#ifndef STDIN_FILENO 90#ifndef STDIN_FILENO
94# define STDIN_FILENO 0 91# define STDIN_FILENO 0
95# define STDOUT_FILENO 1 92# define STDOUT_FILENO 1
96# define STDERR_FILENO 2 93# define STDERR_FILENO 2
97#endif 94#endif
95
96/****************************************************************************/
97
98// exception thrown on fatal (per-instance) errors
99class rxvt_failure_exception { };
100
101// exception thrown when the command parser runs out of input data
102class out_of_input { };
98 103
99/* 104/*
100 ***************************************************************************** 105 *****************************************************************************
101 * PROTOTYPES 106 * PROTOTYPES
102 ***************************************************************************** 107 *****************************************************************************
103 */ 108 */
104// main.C 109// main.C
105RETSIGTYPE rxvt_Child_signal (int sig); 110RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
106RETSIGTYPE rxvt_Exit_signal (int sig); 111RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
107void rxvt_clean_exit (); 112void rxvt_clean_exit () NOTHROW;
108void * rxvt_malloc (size_t size); 113void * rxvt_malloc (size_t size);
109void * rxvt_calloc (size_t number, size_t size); 114void * rxvt_calloc (size_t number, size_t size);
110void * rxvt_realloc (void *ptr, size_t size); 115void * rxvt_realloc (void *ptr, size_t size);
111void rxvt_privileges (rxvt_privaction action);
112 116
113// util.C 117// misc.C
114char * rxvt_wcstombs (const wchar_t *str, int len = -1); 118char * rxvt_wcstombs (const wchar_t *str, int len = -1);
115wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 119wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
116char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 120char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
117wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 121wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
118char * rxvt_strdup (const char *str); 122char * rxvt_strdup_cpp (const char *str);
119 123
120// misc.C 124#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
125
121char * rxvt_r_basename (const char *str); 126char * rxvt_r_basename (const char *str) NOTHROW;
122void rxvt_vlog (const char *fmt, va_list arg_ptr); 127void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
123void rxvt_log (const char *fmt,...); 128void rxvt_log (const char *fmt,...) NOTHROW;
124void rxvt_warn (const char *fmt,...); 129void rxvt_warn (const char *fmt,...) NOTHROW;
125void rxvt_fatal (const char *fmt,...); 130void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
126void rxvt_exit_failure (); 131void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
132
127int rxvt_Str_match (const char *s1, const char *s2); 133int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
128const char * rxvt_Str_skip_space (const char *str); 134const char * rxvt_Str_skip_space (const char *str) NOTHROW;
129char * rxvt_Str_trim (char *str); 135char * rxvt_Str_trim (char *str) NOTHROW;
130int rxvt_Str_escaped (char *str); 136int rxvt_Str_escaped (char *str) NOTHROW;
131char ** rxvt_splitcommastring (const char *cs); 137char ** rxvt_splitcommastring (const char *cs) NOTHROW;
132void rxvt_freecommastring (char **cs); 138void rxvt_freecommastring (char **cs) NOTHROW;
133char * rxvt_File_find (const char *file, const char *ext, const char *path);
134void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
135void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
136void rxvt_usleep (int usecs);
137 139
138///////////////////////////////////////////////////////////////////////////// 140/////////////////////////////////////////////////////////////////////////////
139 141
140// temporarily replace the process environment 142// temporarily replace the process environment
141extern char **environ; 143extern char **environ;
142extern char **rxvt_environ; // the original environ pointer 144extern char **rxvt_environ; // the original environ pointer
143 145
144inline void set_environ (stringvec *envv) 146inline void set_environ (stringvec *envv)
145{ 147{
148#if ENABLE_PERL
149 assert (envv);
150#else
146 if (envv) 151 if (envv)
152#endif
147 environ = (char **)envv->begin (); 153 environ = (char **)envv->begin ();
148} 154}
149 155
150inline void set_environ (char **envv) 156inline void set_environ (char **envv)
151{ 157{
158#if ENABLE_PERL
159 assert (envv);
160#else
152 if (envv) 161 if (envv)
162#endif
153 environ = envv; 163 environ = envv;
154} 164}
155 165
156/* 166/*
157 ***************************************************************************** 167 *****************************************************************************
158 * STRUCTURES AND TYPEDEFS 168 * STRUCTURES AND TYPEDEFS
159 ***************************************************************************** 169 *****************************************************************************
160 */ 170 */
161struct grwin_t; 171struct grwin_t;
162 172
163/* If we're using either the rxvt scrollbar or menu bars, keep the 173/* If we're using either the rxvt scrollbar, keep the
164 * scrollColor resource. 174 * scrollColor resource.
165 */ 175 */
166#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 176#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
167# define KEEP_SCROLLCOLOR 1 177# define KEEP_SCROLLCOLOR 1
168#else 178#else
… …
170#endif 180#endif
171 181
172#ifdef XPM_BACKGROUND 182#ifdef XPM_BACKGROUND
173typedef struct { 183typedef struct {
174 short w, h, x, y; 184 short w, h, x, y;
185 bool auto_resize ;
175 Pixmap pixmap; 186 Pixmap pixmap;
176} bgPixmap_t; 187} bgPixmap_t;
177#endif 188#endif
178 189
179/* 190/*
… …
256 267
257#define scrollBar_esc 30 268#define scrollBar_esc 30
258 269
259#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 270#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
260# define HAVE_SCROLLBARS 1 271# define HAVE_SCROLLBARS 1
261#endif
262
263/* width of scrollBar shadow, must be 1 or 2 */
264#ifdef HALFSHADOW
265# define MENU_SHADOW 1
266#else
267# define MENU_SHADOW 2
268#endif 272#endif
269 273
270#define R_SB_ALIGN_CENTRE 0 274#define R_SB_ALIGN_CENTRE 0
271#define R_SB_ALIGN_TOP 1 275#define R_SB_ALIGN_TOP 1
272#define R_SB_ALIGN_BOTTOM 2 276#define R_SB_ALIGN_BOTTOM 2
… …
345 * | 349 * |
346 * +---< SB_WIDTH_NEXT 350 * +---< SB_WIDTH_NEXT
347 */ 351 */
348 352
349enum { 353enum {
350 NO_REFRESH = 0 , /* Window not visible at all! */ 354 NO_REFRESH = 0, /* Window not visible at all! */
351 FAST_REFRESH = 1<<0, /* Fully exposed window */ 355 FAST_REFRESH = 1, /* Fully exposed window */
352 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 356 SLOW_REFRESH = 2, /* Partially exposed window */
353 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
354}; 357};
355 358
356#ifdef NO_SECONDARY_SCREEN 359#ifdef NO_SECONDARY_SCREEN
357# define NSCREENS 0 360# define NSCREENS 0
358#else 361#else
… …
402 405
403// fake styles 406// fake styles
404#define RS_Blink 0x00010000UL // blink 407#define RS_Blink 0x00010000UL // blink
405#define RS_RVid 0x00020000UL // reverse video 408#define RS_RVid 0x00020000UL // reverse video
406#define RS_Uline 0x00040000UL // underline 409#define RS_Uline 0x00040000UL // underline
410
411// toggle this to force redraw, must be != RS_Careful
412#define RS_redraw 0x01000000UL
407 413
408// 5 custom bits for extensions 414// 5 custom bits for extensions
409#define RS_customCount 32 415#define RS_customCount 32
410#define RS_customMask 0x00f80000UL 416#define RS_customMask 0x00f80000UL
411#define RS_customShift 19 417#define RS_customShift 19
… …
481 Rxvt_restoreFG = 39, // change default fg color 487 Rxvt_restoreFG = 39, // change default fg color
482 Rxvt_restoreBG = 49, // change default bg color 488 Rxvt_restoreBG = 49, // change default bg color
483 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 489 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
484 490
485 URxvt_locale = 701, // change locale 491 URxvt_locale = 701, // change locale
486 URxvt_Menu = 703, // set menu item 492 URxvt_version = 702, // request version
493
487 URxvt_Color_IT = 704, // change actual 'Italic' colour 494 URxvt_Color_IT = 704, // change actual 'Italic' colour
488 URxvt_Color_tint = 705, // change actual tint colour 495 URxvt_Color_tint = 705, // change actual tint colour
489 URxvt_Color_BD = 706, 496 URxvt_Color_BD = 706,
490 URxvt_Color_UL = 707, 497 URxvt_Color_UL = 707,
491 498
… …
506 * 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
507 * 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
508 */ 515 */
509 516
510enum colour_list { 517enum colour_list {
518 Color_none = -2,
519 Color_transparent = -1,
511 Color_fg = 0, 520 Color_fg = 0,
512 Color_bg, 521 Color_bg,
513 minCOLOR, /* 2 */ 522 minCOLOR, /* 2 */
514 Color_Black = minCOLOR, 523 Color_Black = minCOLOR,
515 Color_Red3, 524 Color_Red3,
… …
575#endif 584#endif
576}; 585};
577 586
578#define Color_Bits 7 // 0 .. maxTermCOLOR 587#define Color_Bits 7 // 0 .. maxTermCOLOR
579 588
580#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
581#define NPIXCLR_BITS 32
582
583/* 589/*
584 * Resource list 590 * Resource list
585 */ 591 */
586enum { 592enum {
587# define def(name) Rs_ ## name, 593# define def(name) Rs_ ## name,
588# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 594# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
589# include "rsinc.h" 595# include "rsinc.h"
590# undef def 596# undef def
591# undef reserve 597# undef reserve
592 NUM_RESOURCES 598 NUM_RESOURCES
593};
594
595// see init.C:xa_names, which must be kept in sync
596enum {
597 XA_TEXT = 0,
598 XA_COMPOUND_TEXT,
599 XA_UTF8_STRING,
600 XA_MULTIPLE,
601 XA_TARGETS,
602 XA_TIMESTAMP,
603 XA_VT_SELECTION,
604 XA_INCR,
605 XA_WM_PROTOCOLS,
606 XA_WM_DELETE_WINDOW,
607 XA_CLIPBOARD,
608#if ENABLE_FRILLS
609 XA_MOTIF_WM_HINTS,
610#endif
611#if ENABLE_EWMH
612 XA_NET_WM_PID,
613 XA_NET_WM_NAME,
614 XA_NET_WM_ICON_NAME,
615 XA_NET_WM_PING,
616#endif
617#if USE_XIM
618 XA_WM_LOCALE_NAME,
619#endif
620#if TRANSPARENT
621 XA_XROOTPMAP_ID,
622 XA_ESETROOT_PMAP_ID,
623#endif
624#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
625 XA_DNDPROTOCOL,
626 XA_DNDSELECTION,
627#endif
628#if ENABLE_XEMBED
629 XA_XEMBED,
630 XA_XEMBED_INFO,
631#endif
632 NUM_XA
633}; 599};
634 600
635/* DEC private modes */ 601/* DEC private modes */
636#define PrivMode_132 (1UL<<0) 602#define PrivMode_132 (1UL<<0)
637#define PrivMode_132OK (1UL<<1) 603#define PrivMode_132OK (1UL<<1)
… …
709/* 675/*
710 ***************************************************************************** 676 *****************************************************************************
711 * MACRO DEFINES 677 * MACRO DEFINES
712 ***************************************************************************** 678 *****************************************************************************
713 */ 679 */
714#define dDisp Display *disp = display->display 680#define dLocal(type,name) type const name = this->name
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))
715 685
716/* convert pixel dimensions to row/column values. Everything as int32_t */ 686/* convert pixel dimensions to row/column values. Everything as int32_t */
717#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 687#define Pixel2Col(x) Pixel2Width((int32_t)(x))
718#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 688#define Pixel2Row(y) Pixel2Height((int32_t)(y))
719#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 689#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
721#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 691#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
722#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 692#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
723#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 693#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
724#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 694#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
725 695
726#define OPTION(opt) (options & (opt))
727#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
728 | Opt_jumpScroll | Opt_secondaryScreen \
729 | Opt_pastableTabs | Opt_intensityStyles)
730
731// for m >= -n, ensure remainder lies between 0..n-1 696// for m >= -n, ensure remainder lies between 0..n-1
732#define MOD(m,n) (((m) + (n)) % (n)) 697#define MOD(m,n) (((m) + (n)) % (n))
733 698
734#define LINENO(n) MOD (term_start + int(n), total_rows) 699#define LINENO(n) MOD (term_start + int(n), total_rows)
735#define ROW(n) row_buf [LINENO (n)] 700#define ROW(n) row_buf [LINENO (n)]
… …
753#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 718#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
754#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 719#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
755 720
756#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 721#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
757 722
758#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 723#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
759#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 724#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
760 725
761#if ENABLE_STYLES 726#if ENABLE_STYLES
762# define FONTSET(style) fontset[GET_STYLE (style)] 727# define FONTSET(style) fontset[GET_STYLE (style)]
763#else 728#else
764# define FONTSET(style) fontset[0] 729# define FONTSET(style) fontset[0]
… …
798# 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))
799#else 764#else
800# define XPMClearArea(a, b, c, d, e, f, g) 765# define XPMClearArea(a, b, c, d, e, f, g)
801#endif 766#endif
802 767
803#ifdef UTMP_SUPPORT
804# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
805# undef HAVE_UTMPX_H
806# undef HAVE_STRUCT_UTMPX
807# endif
808# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
809# undef HAVE_UTMP_H
810# undef HAVE_STRUCT_UTMP
811# endif
812
813# ifdef HAVE_UTMPX_H
814# include <utmpx.h>
815# endif
816# ifdef HAVE_UTMP_H
817# include <utmp.h>
818# endif
819#endif
820
821#ifdef DEBUG_CMD
822# define D_CMD(x) fprintf x ; fputc('\n', stderr)
823#else
824# define D_CMD(x)
825#endif
826#ifdef DEBUG_INIT
827# define D_INIT(x) fprintf x ; fputc('\n', stderr)
828#else
829# define D_INIT(x)
830#endif
831#ifdef DEBUG_MAIN
832# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
833#else
834# define D_MAIN(x)
835#endif
836#ifdef DEBUG_SIZE
837# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
838#else
839# define D_SIZE(x)
840#endif
841
842extern class rxvt_failure_exception { } rxvt_failure_exception;
843
844typedef callback1<void, const char *> log_callback; 768typedef callback<void (const char *)> log_callback;
845typedef callback1<int, int> getfd_callback; 769typedef callback<int (int)> getfd_callback;
846
847extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
848extern void rxvt_log (const char *fmt, ...);
849extern void rxvt_warn (const char *fmt, ...);
850extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
851extern void rxvt_exit_failure () __attribute__ ((noreturn));
852 770
853#define SET_LOCALE(locale) rxvt_set_locale (locale) 771#define SET_LOCALE(locale) rxvt_set_locale (locale)
854extern bool rxvt_set_locale (const char *locale); 772extern bool rxvt_set_locale (const char *locale) NOTHROW;
855extern void rxvt_push_locale (const char *locale); 773extern void rxvt_push_locale (const char *locale) NOTHROW;
856extern void rxvt_pop_locale (); 774extern void rxvt_pop_locale () NOTHROW;
857
858/****************************************************************************/
859
860#define BLINK_INTERVAL 0.5
861#define TEXT_BLINK_INTERVAL 0.5
862
863#ifndef __attribute__
864# ifdef __GNUC__
865# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
866# define __attribute__(x)
867# endif
868# endif
869# define __attribute__(x)
870#endif
871 775
872/****************************************************************************/ 776/****************************************************************************/
873 777
874#define LINE_LONGER 0x0001 // line is continued on the next row 778#define LINE_LONGER 0x0001 // line is continued on the next row
875#define LINE_FILTERED 0x0002 // line has been filtered 779#define LINE_FILTERED 0x0002 // line has been filtered
876#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)
877 783
878struct line_t { 784struct line_t {
879 text_t *t; // terminal the text 785 text_t *t; // terminal the text
880 rend_t *r; // rendition, uses RS_ flags 786 rend_t *r; // rendition, uses RS_ flags
881 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
… …
935# define COMPOSE_LO 0x40000000UL 841# define COMPOSE_LO 0x40000000UL
936# define COMPOSE_HI 0x400fffffUL 842# define COMPOSE_HI 0x400fffffUL
937# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 843# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
938#else 844#else
939# if ENABLE_PERL 845# if ENABLE_PERL
940# 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
941# 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
942# else 848# else
943# define COMPOSE_LO 0xd800UL 849# define COMPOSE_LO 0xd800UL
944# define COMPOSE_HI 0xf8ffUL 850# define COMPOSE_HI 0xf8ffUL
945# endif 851# endif
… …
974#endif 880#endif
975 881
976/****************************************************************************/ 882/****************************************************************************/
977 883
978#ifdef KEYSYM_RESOURCE 884#ifdef KEYSYM_RESOURCE
979 class keyboard_manager; 885class keyboard_manager;
980#endif 886#endif
981 887
982struct 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
983 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
984 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 896 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
985#if ENABLE_PERL 897#if ENABLE_PERL
986 rxvt_perl_term perl; 898 rxvt_perl_term perl;
987#endif 899#endif
988 struct mbstate mbstate; // current input multibyte state 900 struct mbstate mbstate; // current input multibyte state
989 901
990 unsigned char want_refresh:1, 902 unsigned char want_refresh:1,
991#ifdef TRANSPARENT 903#ifdef ENABLE_TRANSPARENCY
992 want_full_refresh:1, /* awaiting full screen refresh */ 904 want_full_refresh:1, /* awaiting full screen refresh */
993#endif
994#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
995 am_transparent:1, /* is a transparent term */ 905 am_transparent:1, /* is a transparent term */
996 am_pixmap_trans:1, /* transparency w/known root pixmap */ 906 am_pixmap_trans:1, /* transparency w/known root pixmap */
997#endif 907#endif
998 current_screen:1, /* primary or secondary */ 908 current_screen:1, /* primary or secondary */
999 hate_those_clicks:1, /* a.k.a. keep mark position */
1000 num_scr_allow:1, 909 num_scr_allow:1,
1001 bypass_keystate:1, 910 bypass_keystate:1,
1002#ifdef CURSOR_BLINK 911#ifdef CURSOR_BLINK
1003 hidden_cursor:1, 912 hidden_cursor:1,
1004#endif 913#endif
… …
1019#endif 928#endif
1020 scrollbar_align, 929 scrollbar_align,
1021 selection_wait, 930 selection_wait,
1022 selection_type; 931 selection_type;
1023/* ---------- */ 932/* ---------- */
933 bool rvideo_state, rvideo_mode;
934#ifndef NO_BELL
1024 short rvideo; 935 bool rvideo_bell;
936#endif
1025 int num_scr; /* screen: number lines scrolled */ 937 int num_scr; /* screen: number lines scrolled */
1026 int prev_ncol, /* screen: previous number of columns */ 938 int prev_ncol, /* screen: previous number of columns */
1027 prev_nrow; /* screen: previous number of rows */ 939 prev_nrow; /* screen: previous number of rows */
1028/* ---------- */ 940/* ---------- */
1029 rend_t rstyle; 941 rend_t rstyle;
1030/* ---------- */
1031 uint32_t pixcolor_set[NPIXCLR_SETS];
1032/* ---------- */ 942/* ---------- */
1033#ifdef SELECTION_SCROLLING 943#ifdef SELECTION_SCROLLING
1034 int scroll_selection_lines; 944 int scroll_selection_lines;
1035 enum page_dirn scroll_selection_dir; 945 enum page_dirn scroll_selection_dir;
1036 int selection_save_x, 946 int selection_save_x,
… …
1042 /* give proper Scroll behaviour */ 952 /* give proper Scroll behaviour */
1043#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 953#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1044 mouse_slip_wheel_speed, 954 mouse_slip_wheel_speed,
1045#endif 955#endif
1046 refresh_count, 956 refresh_count,
1047 refresh_limit,
1048 last_bot, /* scrollbar last bottom position */ 957 last_bot, /* scrollbar last bottom position */
1049 last_top, /* scrollbar last top position */ 958 last_top, /* scrollbar last top position */
1050 last_state, /* scrollbar last state */ 959 last_state, /* scrollbar last state */
1051 scrollbar_len, 960 scrollbar_len,
1052 window_vt_x, 961 window_vt_x,
… …
1063 int old_width, /* last used width in screen resize */ 972 int old_width, /* last used width in screen resize */
1064 old_height; /* last used height in screen resize */ 973 old_height; /* last used height in screen resize */
1065 unsigned long priv_modes, 974 unsigned long priv_modes,
1066 SavedModes; 975 SavedModes;
1067/* ---------- */ 976/* ---------- */
1068 Atom xa[NUM_XA]; 977 Atom *xa;
1069/* ---------- */ 978/* ---------- */
1070#ifdef RXVT_SCROLLBAR 979#ifdef RXVT_SCROLLBAR
1071 GC scrollbarGC, 980 GC scrollbarGC,
1072 topShadowGC, 981 topShadowGC,
1073 botShadowGC; 982 botShadowGC;
… …
1107 const char *key_delete; 1016 const char *key_delete;
1108#endif 1017#endif
1109 struct mouse_event MEvent; 1018 struct mouse_event MEvent;
1110 XComposeStatus compose; 1019 XComposeStatus compose;
1111 ttymode_t tio; 1020 ttymode_t tio;
1112#ifdef UTMP_SUPPORT
1113# ifdef HAVE_STRUCT_UTMP
1114 struct utmp ut;
1115# endif
1116# ifdef HAVE_STRUCT_UTMPX
1117 struct utmpx utx;
1118# endif
1119# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1120 char ut_id[5];
1121# endif
1122 int utmp_pos;
1123#endif
1124 row_col_t oldcursor; 1021 row_col_t oldcursor;
1125#ifdef XPM_BACKGROUND 1022#ifdef XPM_BACKGROUND
1126 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
1127 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1033 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1034#endif
1128#endif 1035#endif
1129 1036
1130#if ENABLE_OVERLAY 1037#if ENABLE_OVERLAY
1131 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1038 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1132 text_t **ov_text; 1039 text_t **ov_text;
1133 rend_t **ov_rend; 1040 rend_t **ov_rend;
1134 1041
1135 void scr_swap_overlay (); 1042 void scr_swap_overlay () NOTHROW;
1136 void scr_overlay_new (int x, int y, int w, int h); 1043 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1137 void scr_overlay_off (); 1044 void scr_overlay_off () NOTHROW;
1138 void scr_overlay_set (int x, int y, 1045 void scr_overlay_set (int x, int y,
1139 text_t text, 1046 text_t text,
1140 rend_t rend = OVERLAY_RSTYLE); 1047 rend_t rend = OVERLAY_RSTYLE) NOTHROW;
1141 void scr_overlay_set (int x, int y, const char *s); 1048 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1142 void scr_overlay_set (int x, int y, const wchar_t *s); 1049 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1143#endif 1050#endif
1144 1051
1145 vector<void *> allocated; // free these memory blocks with free() 1052 vector<void *> allocated; // free these memory blocks with free()
1146 1053
1147 char *env_windowid; /* environmental variable WINDOWID */ 1054 char env_windowid[21]; /* environmental variable WINDOWID */
1055 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1148 char *env_display; /* environmental variable DISPLAY */ 1056 char *env_display; /* environmental variable DISPLAY */
1149 char *env_term; /* environmental variable TERM */ 1057 char *env_term; /* environmental variable TERM */
1150 char *env_colorfgbg; 1058
1151 char *locale; 1059 char *locale;
1152 char charsets[4]; 1060 char charsets[4];
1153 char *v_buffer; /* pointer to physical buffer */ 1061 char *v_buffer; /* pointer to physical buffer */
1154 unsigned int v_buflen; /* size of area to write */ 1062 unsigned int v_buflen; /* size of area to write */
1155 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1063 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1156 1064
1157#ifdef KEYSYM_RESOURCE 1065#ifdef KEYSYM_RESOURCE
1158 keyboard_manager *keyboard; 1066 keyboard_manager *keyboard;
1159#endif 1067#endif
1160 1068
1161 const char *rs[NUM_RESOURCES]; 1069 const char *rs[NUM_RESOURCES];
1162 /* command input buffering */ 1070 /* command input buffering */
1163 char *cmdbuf_ptr, *cmdbuf_endp; 1071 char *cmdbuf_ptr, *cmdbuf_endp;
1164 char cmdbuf_base[CBUFSIZ]; 1072 char cmdbuf_base[CBUFSIZ];
1073
1074 ptytty *pty;
1165 1075
1166 rxvt_salloc *talloc; // text line allocator 1076 rxvt_salloc *talloc; // text line allocator
1167 rxvt_salloc *ralloc; // rend line allocator 1077 rxvt_salloc *ralloc; // rend line allocator
1168 1078
1169 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1079 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1178 void iso14755_54 (int x, int y); 1088 void iso14755_54 (int x, int y);
1179# endif 1089# endif
1180#endif 1090#endif
1181 1091
1182 // modifies first argument(!) 1092 // modifies first argument(!)
1183 void paste (char *data, unsigned int len); 1093 void paste (char *data, unsigned int len) NOTHROW;
1184 1094
1185 long vt_emask, vt_emask_perl; 1095 long vt_emask, vt_emask_perl, vt_emask_xim;
1186 1096
1187 void vt_select_input () const 1097 void vt_select_input () const NOTHROW
1188 { 1098 {
1189 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1099 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1190 } 1100 }
1191 1101
1192#if TRANSPARENT 1102#if ENABLE_TRANSPARENCY || ENABLE_PERL
1193 void rootwin_cb (XEvent &xev); 1103 void rootwin_cb (XEvent &xev);
1194 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;
1195#endif 1110#endif
1196 1111
1197 void x_cb (XEvent &xev); 1112 void x_cb (XEvent &xev);
1198 void flush (); 1113 void flush ();
1199 xevent_watcher termwin_ev; 1114 xevent_watcher termwin_ev;
1200 xevent_watcher vt_ev; 1115 xevent_watcher vt_ev;
1201#ifdef HAVE_SCROLLBARS 1116#ifdef HAVE_SCROLLBARS
1202 xevent_watcher scrollbar_ev; 1117 xevent_watcher scrollbar_ev;
1203#endif 1118#endif
1204 1119
1120 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1205 void check_cb (check_watcher &w); check_watcher check_ev; 1121 void check_cb (check_watcher &w); check_watcher check_ev;
1206 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1122 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1207 void flush_cb (time_watcher &w); time_watcher flush_ev; 1123 void flush_cb (time_watcher &w); time_watcher flush_ev;
1208
1209 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1124 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1210
1211 void incr_cb (time_watcher &w); time_watcher incr_ev; 1125 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1212 1126
1213#ifdef CURSOR_BLINK 1127#ifdef CURSOR_BLINK
1214 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1128 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1215#endif 1129#endif
1216#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
1217 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1131 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1132#endif
1133#ifndef NO_BELL
1134 void bell_cb (time_watcher &w); time_watcher bell_ev;
1218#endif 1135#endif
1219 1136
1220#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1137#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1221 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1138 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1222#endif 1139#endif
… …
1239 1156
1240 void tt_winch (); 1157 void tt_winch ();
1241 1158
1242 rxvt_term (); 1159 rxvt_term ();
1243 ~rxvt_term (); 1160 ~rxvt_term ();
1244 void child_exit (); // child has exited, usually destroys
1245 void destroy (); 1161 void destroy ();
1246 void emergency_cleanup (); 1162 void emergency_cleanup ();
1247 1163
1248 bool init (int argc, const char *const *argv); 1164 bool init (int argc, const char *const *argv, stringvec *envv);
1165
1166 bool init (stringvec *argv, stringvec *envv)
1167 {
1168 this->argv = argv;
1169 return init (argv->size (), argv->begin (), envv);
1170 }
1171
1249 bool init_vars (); 1172 bool init_vars ();
1250 1173
1251 bool pty_fill (); 1174 bool pty_fill ();
1252 1175
1253 void make_current () const // make this the "currently active" urxvt instance 1176 void make_current () const // make this the "currently active" urxvt instance
1254 { 1177 {
1255 SET_R (this); 1178 SET_R (this);
1179 set_environ (envv);
1256 rxvt_set_locale (locale); 1180 rxvt_set_locale (locale);
1257 set_environ (envv);
1258 } 1181 }
1259 1182
1260 void init_secondary (); 1183 void init_secondary ();
1261 const char **init_resources (int argc, const char *const *argv); 1184 const char **init_resources (int argc, const char *const *argv);
1262 const char *x_resource (const char *name); 1185 const char *x_resource (const char *name);
… …
1272 void create_windows (int argc, const char *const *argv); 1195 void create_windows (int argc, const char *const *argv);
1273 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1196 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1274 void window_calc (unsigned int newwidth, unsigned int newheight); 1197 void window_calc (unsigned int newwidth, unsigned int newheight);
1275 1198
1276#if USE_XIM 1199#if USE_XIM
1277 rxvt_xim *input_method; 1200 rxvt_xim *input_method;
1278 XIC Input_Context; 1201 XIC Input_Context;
1279 XIMStyle input_style; 1202 XIMStyle input_style;
1280 XPoint spot; // most recently sent spot position 1203 XPoint spot; // most recently sent spot position
1281 1204
1282 void im_destroy (); 1205 void im_destroy ();
1283 void im_cb (); im_watcher im_ev; 1206 void im_cb (); im_watcher im_ev;
1284 void im_set_size (XRectangle &size); 1207 void im_set_size (XRectangle &size);
1285 void im_set_position (XPoint &pos); 1208 void im_set_position (XPoint &pos) NOTHROW;
1286 void im_set_color (unsigned long &fg, unsigned long &bg); 1209 void im_set_color (unsigned long &fg, unsigned long &bg);
1287 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);
1288 1211
1289 bool IMisRunning (); 1212 bool IMisRunning ();
1290 void IMSendSpot (); 1213 void IMSendSpot ();
1291 bool IM_get_IC (const char *modifiers); 1214 bool IM_get_IC (const char *modifiers);
1292 void IMSetStatusPosition (); 1215 void IMSetPosition ();
1293#endif 1216#endif
1294 1217
1295 void resize_scrollbar (); 1218 void resize_scrollbar ();
1296 1219
1297 void pixel_position (int *x, int *y);
1298
1299 void selection_click (int clicks, int x, int y);
1300 void selection_extend (int x, int y, int flag);
1301 void selection_rotate (int x, int y);
1302
1303 /* autoconvert */
1304
1305 // command.C 1220 // command.C
1306 void lookup_key (XKeyEvent &ev); 1221 void key_press (XKeyEvent &ev);
1222 void key_release (XKeyEvent &ev);
1307 unsigned int cmd_write (const char *str, unsigned int count); 1223 unsigned int cmd_write (const char *str, unsigned int count);
1308 1224
1309 wchar_t next_char (); 1225 wchar_t next_char () NOTHROW;
1310 wchar_t cmd_getc (); 1226 wchar_t cmd_getc () THROW ((class out_of_input));
1311 uint32_t next_octet (); 1227 uint32_t next_octet () NOTHROW;
1312 uint32_t cmd_get8 (); 1228 uint32_t cmd_get8 () THROW ((class out_of_input));
1313 1229
1314 bool cmd_parse (); 1230 bool cmd_parse ();
1315 void mouse_report (XButtonEvent &ev); 1231 void mouse_report (XButtonEvent &ev);
1316 void button_press (XButtonEvent &ev); 1232 void button_press (XButtonEvent &ev);
1317 void button_release (XButtonEvent &ev); 1233 void button_release (XButtonEvent &ev);
1318 void focus_in (); 1234 void focus_in ();
1319 void focus_out (); 1235 void focus_out ();
1320 int check_our_parents (); 1236 void update_fade_color (unsigned int idx);
1321#ifdef PRINTPIPE 1237#ifdef PRINTPIPE
1322 FILE *popen_printer (); 1238 FILE *popen_printer ();
1323 int pclose_printer (FILE *stream); 1239 int pclose_printer (FILE *stream);
1324#endif 1240#endif
1325 void process_print_pipe (); 1241 void process_print_pipe ();
… …
1338 void process_sgr_mode (unsigned int nargs, const int *arg); 1254 void process_sgr_mode (unsigned int nargs, const int *arg);
1339 void process_graphics (); 1255 void process_graphics ();
1340 // init.C 1256 // init.C
1341 void Get_Colours (); 1257 void Get_Colours ();
1342 void get_ourmods (); 1258 void get_ourmods ();
1343 // logging.C
1344 void makeutent (const char *pty, const char *hostname);
1345 void cleanutent ();
1346 // main.C 1259 // main.C
1347 void privileged_utmp (rxvt_privaction action);
1348 bool set_fonts (); 1260 bool set_fonts ();
1349 void set_string_property (Atom prop, const char *str, int len = -1); 1261 void set_string_property (Atom prop, const char *str, int len = -1);
1350 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);
1351 void set_title (const char *str); 1263 void set_title (const char *str);
1352 void set_icon_name (const char *str); 1264 void set_icon_name (const char *str);
1353 void set_window_color (int idx, const char *color); 1265 void set_window_color (int idx, const char *color);
1354 void set_colorfgbg (); 1266 void set_colorfgbg ();
1355 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);
1356 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1269 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1357 1270
1358 // screen.C 1271 // screen.C
1359 1272
1360 void lalloc (line_t &l) const 1273 void lalloc (line_t &l) const
… …
1383 1296
1384 if (ncol > prev_ncol) 1297 if (ncol > prev_ncol)
1385 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1298 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1386 } 1299 }
1387 1300
1388 int fgcolor_of (rend_t r) const 1301 int fgcolor_of (rend_t r) const NOTHROW
1389 { 1302 {
1390 int base = GET_BASEFG (r); 1303 int base = GET_BASEFG (r);
1391#ifndef NO_BRIGHTCOLOR 1304#ifndef NO_BRIGHTCOLOR
1392 if (r & RS_Bold 1305 if (r & RS_Bold
1393# if ENABLE_STYLES 1306# if ENABLE_STYLES
1394 && OPTION (Opt_intensityStyles) 1307 && option (Opt_intensityStyles)
1395# endif 1308# endif
1396 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1309 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1397 base += minBrightCOLOR - minCOLOR; 1310 base += minBrightCOLOR - minCOLOR;
1398#endif 1311#endif
1399 return base; 1312 return base;
1400 } 1313 }
1401 1314
1402 int bgcolor_of (rend_t r) const 1315 int bgcolor_of (rend_t r) const NOTHROW
1403 { 1316 {
1404 int base = GET_BASEBG (r); 1317 int base = GET_BASEBG (r);
1405#ifndef NO_BRIGHTCOLOR 1318#ifndef NO_BRIGHTCOLOR
1406 if (r & RS_Blink 1319 if (r & RS_Blink
1407# if ENABLE_STYLES 1320# if ENABLE_STYLES
1408 && OPTION (Opt_intensityStyles) 1321 && option (Opt_intensityStyles)
1409# endif 1322# endif
1410 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1323 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1411 base += minBrightCOLOR - minCOLOR; 1324 base += minBrightCOLOR - minCOLOR;
1412#endif 1325#endif
1413 return base; 1326 return base;
1414 } 1327 }
1415 1328
1416 bool option (uint32_t opt) const 1329 bool option (uint8_t opt) const NOTHROW
1417 { 1330 {
1418 return OPTION (opt); 1331 return options[opt >> 3] & (1 << (opt & 7));
1419 } 1332 }
1420 1333
1421 void set_option (uint32_t opt, bool set) 1334 void set_option (uint8_t opt, bool set = true) NOTHROW
1422 { 1335 {
1423 if (set) 1336 if (set)
1424 options |= opt; 1337 options[opt >> 3] |= (1 << (opt & 7));
1425 else 1338 else
1426 options &= ~opt; 1339 options[opt >> 3] &= ~(1 << (opt & 7));
1427 } 1340 }
1428 1341
1429 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const; 1342 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1430 void scr_blank_screen_mem (line_t &l, rend_t efs) const; 1343 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1431 int scr_scroll_text (int row1, int row2, int count); 1344 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1432 void scr_reset (); 1345 void scr_reset ();
1433 void scr_release (); 1346 void scr_release () NOTHROW;
1434 void scr_clear (bool really = false); 1347 void scr_clear (bool really = false) NOTHROW;
1435 void scr_refresh (unsigned char refresh_type); 1348 void scr_refresh () NOTHROW;
1436 bool scr_refresh_rend (rend_t mask, rend_t value); 1349 bool scr_refresh_rend (rend_t mask, rend_t value) NOTHROW;
1437 void scr_erase_screen (int mode); 1350 void scr_erase_screen (int mode) NOTHROW;
1438#if ENABLE_FRILLS 1351#if ENABLE_FRILLS
1439 void scr_erase_savelines (); 1352 void scr_erase_savelines () NOTHROW;
1440 void scr_backindex (); 1353 void scr_backindex () NOTHROW;
1441 void scr_forwardindex (); 1354 void scr_forwardindex () NOTHROW;
1442#endif 1355#endif
1443 void scr_touch (bool refresh); 1356 void scr_touch (bool refresh) NOTHROW;
1444 void scr_expose (int x, int y, int width, int height, bool refresh); 1357 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1445 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1358 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1446 void scr_recolour (); 1359 void scr_recolour () NOTHROW;
1447 void scr_remap_chars (); 1360 void scr_remap_chars () NOTHROW;
1448 void scr_remap_chars (line_t &l); 1361 void scr_remap_chars (line_t &l) NOTHROW;
1362
1363 enum cursor_mode { SAVE, RESTORE };
1449 1364
1450 void scr_poweron (); 1365 void scr_poweron ();
1451 void scr_cursor (int mode); 1366 void scr_cursor (cursor_mode mode) NOTHROW;
1452 void scr_do_wrap (); 1367 void scr_do_wrap () NOTHROW;
1368 void scr_swap_screen () NOTHROW;
1453 int scr_change_screen (int scrn); 1369 void scr_change_screen (int scrn);
1454 void scr_color (unsigned int color, int fgbg); 1370 void scr_color (unsigned int color, int fgbg) NOTHROW;
1455 void scr_rendition (int set, int style); 1371 void scr_rendition (int set, int style) NOTHROW;
1456 void scr_add_lines (const wchar_t *str, int len, int minlines = 0); 1372 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1457 void scr_backspace (); 1373 void scr_backspace () NOTHROW;
1458 void scr_tab (int count, bool ht = false); 1374 void scr_tab (int count, bool ht = false) NOTHROW;
1459 void scr_gotorc (int row, int col, int relative); 1375 void scr_gotorc (int row, int col, int relative) NOTHROW;
1460 void scr_index (enum page_dirn direction); 1376 void scr_index (enum page_dirn direction) NOTHROW;
1461 void scr_erase_line (int mode); 1377 void scr_erase_line (int mode) NOTHROW;
1462 void scr_E (); 1378 void scr_E () NOTHROW;
1463 void scr_insdel_lines (int count, int insdel); 1379 void scr_insdel_lines (int count, int insdel) NOTHROW;
1464 void scr_insdel_chars (int count, int insdel); 1380 void scr_insdel_chars (int count, int insdel) NOTHROW;
1465 void scr_scroll_region (int top, int bot); 1381 void scr_scroll_region (int top, int bot) NOTHROW;
1466 void scr_cursor_visible (int mode); 1382 void scr_cursor_visible (int mode) NOTHROW;
1467 void scr_autowrap (int mode); 1383 void scr_autowrap (int mode) NOTHROW;
1468 void scr_relative_origin (int mode); 1384 void scr_relative_origin (int mode) NOTHROW;
1469 void scr_insert_mode (int mode); 1385 void scr_insert_mode (int mode) NOTHROW;
1470 void scr_set_tab (int mode); 1386 void scr_set_tab (int mode) NOTHROW;
1471 void scr_rvideo_mode (int mode); 1387 void scr_rvideo_mode (bool on) NOTHROW;
1472 void scr_report_position (); 1388 void scr_report_position () NOTHROW;
1473 void set_font_style (); 1389 void set_font_style () NOTHROW;
1474 void scr_charset_choose (int set); 1390 void scr_charset_choose (int set) NOTHROW;
1475 void scr_charset_set (int set, unsigned int ch); 1391 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1476 void scr_move_to (int y, int len); 1392 void scr_move_to (int y, int len) NOTHROW;
1477 bool scr_page (enum page_dirn direction, int nlines); 1393 bool scr_page (enum page_dirn direction, int nlines) NOTHROW;
1478 bool scr_changeview (int new_view_start); 1394 bool scr_changeview (int new_view_start) NOTHROW;
1479 void scr_bell (); 1395 void scr_bell () NOTHROW;
1480 void scr_printscreen (int fullhist); 1396 void scr_printscreen (int fullhist) NOTHROW;
1481 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2); 1397 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW;
1482 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle); 1398 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1483 void scr_reverse_selection (); 1399 void scr_reverse_selection () NOTHROW;
1484 void scr_dump (int fd); 1400 void scr_dump (int fd) NOTHROW;
1401
1485 void selection_check (int check_more); 1402 void selection_check (int check_more) NOTHROW;
1486 void selection_paste (Window win, Atom prop, bool delete_prop); 1403 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1487 void selection_property (Window win, Atom prop); 1404 void selection_property (Window win, Atom prop) NOTHROW;
1488 void selection_request (Time tm, int x, int y); 1405 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1489 int selection_request_other (Atom target, int selnum); 1406 int selection_request_other (Atom target, int selnum) NOTHROW;
1490 void selection_clear (); 1407 void selection_clear () NOTHROW;
1491 void selection_make (Time tm); 1408 void selection_make (Time tm);
1492 bool selection_grab (Time tm); 1409 bool selection_grab (Time tm) NOTHROW;
1493 void selection_start_colrow (int col, int row); 1410 void selection_start_colrow (int col, int row) NOTHROW;
1494 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1411 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1495 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1412 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1496 void selection_remove_trailing_spaces (); 1413 void selection_remove_trailing_spaces () NOTHROW;
1497 void selection_send (const XSelectionRequestEvent &rq); 1414 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1415 void selection_click (int clicks, int x, int y) NOTHROW;
1416 void selection_extend (int x, int y, int flag) NOTHROW;
1417 void selection_rotate (int x, int y) NOTHROW;
1418
1419 void pixel_position (int *x, int *y) NOTHROW;
1498 1420
1499#if defined(NEXT_SCROLLBAR) 1421#if defined(NEXT_SCROLLBAR)
1500 // scrollbar-next.C 1422 // scrollbar-next.C
1501 Pixmap renderPixmap (const char *const *data, int width, int height); 1423 Pixmap renderPixmap (const char *const *data, int width, int height);
1502 void init_scrollbar_stuff (); 1424 void init_scrollbar_stuff ();
… …
1504 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1426 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1505#endif 1427#endif
1506 1428
1507#if defined(RXVT_SCROLLBAR) 1429#if defined(RXVT_SCROLLBAR)
1508 // scrollbar-rxvt.C 1430 // scrollbar-rxvt.C
1509 void Draw_button (int x, int y, int state, int dirn);
1510 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1431 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1511#endif 1432#endif
1512 1433
1513#if defined(XTERM_SCROLLBAR) 1434#if defined(XTERM_SCROLLBAR)
1514 // scrollbar-xterm.C 1435 // scrollbar-xterm.C
… …
1545# define __PROTO(p) p 1466# define __PROTO(p) p
1546#else 1467#else
1547# define __PROTO(p) () 1468# define __PROTO(p) ()
1548#endif 1469#endif
1549 1470
1550#ifdef DEBUG_malloc
1551# include "dmalloc.h" /* This comes last */
1552#endif
1553
1554#endif /* _RXVT_H_ */ 1471#endif /* _RXVT_H_ */
1555 1472

Diff Legend

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