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.360 by ayin, Mon Feb 18 09:58:05 2008 UTC vs.
Revision 1.480 by sf-exg, Sat May 19 13:07:25 2012 UTC

1#ifndef RXVT_H_ /* include once only */ 1#ifndef RXVT_H_ /* include once only */
2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include <cstdio> 4#include <stdio.h>
5#include <cctype> 5#include <ctype.h>
6#include <cerrno> 6#include <errno.h>
7#include <cstdarg> 7#include <stdarg.h>
8#include <cstdlib> 8#include <stdlib.h>
9#ifdef HAVE_STDINT_H 9#ifdef HAVE_STDINT_H
10#include <stdint.h> 10#include <stdint.h>
11#endif 11#endif
12#include <sys/types.h> 12#include <sys/types.h>
13#include <unistd.h> 13#include <unistd.h>
14#include <cstring> 14#include <string.h>
15#include <assert.h> 15#include <assert.h>
16#ifdef HAVE_SYS_IOCTL_H 16#ifdef HAVE_SYS_IOCTL_H
17#include <sys/ioctl.h> 17#include <sys/ioctl.h>
18#endif 18#endif
19#ifdef HAVE_SYS_STRREDIR_H 19#ifdef HAVE_SYS_STRREDIR_H
20#include <sys/strredir.h> 20#include <sys/strredir.h>
21#endif 21#endif
22 22
23#if HAVE_CWCHAR
24# include <cwchar>
25#elif HAVE_WCHAR_H 23#if HAVE_WCHAR_H
26# include <wchar.h> 24# include <wchar.h>
27#else 25#else
28// stdlib.h might provide it 26// stdlib.h might provide it
29#endif 27#endif
30 28
31using namespace std; 29// we assume that Xlib.h defines XPointer, and it does since at least 1994...
32 30
33extern "C" { 31extern "C" {
34#include <X11/Xlib.h> 32#include <X11/Xlib.h>
35#include <X11/Xutil.h> 33#include <X11/Xutil.h>
36#include <X11/Xresource.h> 34#include <X11/Xresource.h>
… …
72#include <X11/cursorfont.h> 70#include <X11/cursorfont.h>
73#include <X11/keysym.h> 71#include <X11/keysym.h>
74#include <X11/keysymdef.h> 72#include <X11/keysymdef.h>
75#include <X11/Xatom.h> 73#include <X11/Xatom.h>
76 74
75#ifdef HAVE_PIXBUF
76# include <gdk-pixbuf/gdk-pixbuf.h>
77#endif
78
79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
80# define HAVE_BG_PIXMAP 1
81#endif
82
83#include <ecb.h>
77#include "encoding.h" 84#include "encoding.h"
78#include "rxvtutil.h" 85#include "rxvtutil.h"
79#include "rxvtfont.h" 86#include "rxvtfont.h"
80#include "rxvttoolkit.h" 87#include "rxvttoolkit.h"
81#include "scrollbar.h" 88#include "scrollbar.h"
… …
98 ***************************************************************************** 105 *****************************************************************************
99 * SYSTEM HACKS 106 * SYSTEM HACKS
100 ***************************************************************************** 107 *****************************************************************************
101 */ 108 */
102 109
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 110#include <termios.h>
108
109#include "background.h"
110 111
111#ifndef STDIN_FILENO 112#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 113# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 114# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 115# define STDERR_FILENO 2
115#endif 116#endif
116 117
117#if !defined (EACCESS) && defined(EAGAIN)
118# define EACCESS EAGAIN
119#endif
120
121#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 118#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
122# define EXIT_SUCCESS 0 /* exit function success */ 119# define EXIT_SUCCESS 0 /* exit function success */
123# define EXIT_FAILURE 1 /* exit function failure */ 120# define EXIT_FAILURE 1 /* exit function failure */
124#endif
125
126#ifndef PATH_MAX
127# define PATH_MAX 16384
128#endif 121#endif
129 122
130/****************************************************************************/ 123/****************************************************************************/
131 124
132// exception thrown on fatal (per-instance) errors 125// exception thrown on fatal (per-instance) errors
… …
151char * rxvt_wcstombs (const wchar_t *str, int len = -1); 144char * rxvt_wcstombs (const wchar_t *str, int len = -1);
152wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 145wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
153char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 146char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
154wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 147wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
155 148
156char * rxvt_basename (const char *str) NOTHROW; 149const char * rxvt_basename (const char *str) NOTHROW;
157void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
158void rxvt_log (const char *fmt,...) NOTHROW; 151void rxvt_log (const char *fmt,...) NOTHROW;
159void rxvt_warn (const char *fmt,...) NOTHROW; 152void rxvt_warn (const char *fmt,...) NOTHROW;
160void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 153void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
161void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 154void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
162 155
163char * rxvt_strtrim (char *str) NOTHROW; 156char * rxvt_strtrim (char *str) NOTHROW;
164char ** rxvt_splitcommastring (const char *cs) NOTHROW; 157char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
165void rxvt_freecommastring (char **cs) NOTHROW; 158
159static inline void
160rxvt_free_strsplit (char **ptr) NOTHROW
161{
162 free (ptr[0]);
163 free (ptr);
164}
166 165
167void * rxvt_malloc (size_t size); 166void * rxvt_malloc (size_t size);
168void * rxvt_calloc (size_t number, size_t size); 167void * rxvt_calloc (size_t number, size_t size);
169void * rxvt_realloc (void *ptr, size_t size); 168void * rxvt_realloc (void *ptr, size_t size);
170 169
… …
193#else 192#else
194 if (envv) 193 if (envv)
195#endif 194#endif
196 environ = envv; 195 environ = envv;
197} 196}
197
198struct localise_env
199{
200 char **orig_env;
201
202 localise_env (char **new_env)
203 {
204 orig_env = environ;
205 environ = new_env;
206 }
207
208 ~localise_env ()
209 {
210 environ = orig_env;
211 }
212};
213
214#ifdef HAVE_BG_PIXMAP
215# ifdef BG_IMAGE_FROM_FILE
216enum {
217 IM_IS_SET = 1 << 0,
218 IM_IS_SIZE_SENSITIVE = 1 << 1,
219 IM_KEEP_ASPECT = 1 << 2,
220 IM_ROOT_ALIGN = 1 << 3,
221 IM_TILE = 1 << 4,
222 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
223};
224
225enum {
226 noScale = 0,
227 windowScale = 100,
228 defaultScale = windowScale,
229 centerAlign = 50,
230 defaultAlign = centerAlign,
231};
232
233struct rxvt_image
234{
235 uint8_t flags;
236 unsigned int h_scale, v_scale; /* percents of the window size */
237 int h_align, v_align; /* percents of the window size:
238 0 - left align, 50 - center, 100 - right */
239
240# ifdef HAVE_PIXBUF
241 GdkPixbuf *pixbuf;
242
243 ~rxvt_image ()
244 {
245 if (pixbuf)
246 g_object_unref (pixbuf);
247 }
248
249 int width ()
250 {
251 return gdk_pixbuf_get_width (pixbuf);
252 }
253 int height ()
254 {
255 return gdk_pixbuf_get_height (pixbuf);
256 }
257# endif
258
259 bool set_file (const char *file);
260 bool set_geometry (const char *geom, bool update = false);
261 void set_default_geometry ()
262 {
263 h_scale = v_scale = defaultScale;
264 h_align = v_align = defaultAlign;
265 flags |= IM_IS_SIZE_SENSITIVE;
266 }
267};
268# endif
269#endif
198 270
199/* 271/*
200 ***************************************************************************** 272 *****************************************************************************
201 * STRUCTURES AND TYPEDEFS 273 * STRUCTURES AND TYPEDEFS
202 ***************************************************************************** 274 *****************************************************************************
… …
204 276
205/* 277/*
206 * the 'essential' information for reporting Mouse Events 278 * the 'essential' information for reporting Mouse Events
207 * pared down from XButtonEvent 279 * pared down from XButtonEvent
208 */ 280 */
209struct mouse_event { 281struct mouse_event
282{
210 int clicks; 283 int clicks;
211 Time time; /* milliseconds */ 284 Time time; /* milliseconds */
212 unsigned int state; /* key or button mask */ 285 unsigned int state; /* key or button mask */
213 unsigned int button; /* detail */ 286 unsigned int button; /* detail */
214}; 287};
… …
250# define COLORTERMENVFULL COLORTERMENV "-xpm" 323# define COLORTERMENVFULL COLORTERMENV "-xpm"
251#else 324#else
252# define COLORTERMENVFULL COLORTERMENV 325# define COLORTERMENVFULL COLORTERMENV
253#endif 326#endif
254#ifndef TERMENV 327#ifndef TERMENV
328# if USE_256_COLORS
329# define TERMENV "rxvt-unicode-256color"
330# else
255# define TERMENV "rxvt-unicode" 331# define TERMENV "rxvt-unicode"
332# endif
256#endif 333#endif
257 334
258#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 335#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
259# define NO_MOUSE_REPORT_SCROLLBAR 1 336# define NO_MOUSE_REPORT_SCROLLBAR 1
260#endif 337#endif
… …
275# define NSCREENS 0 352# define NSCREENS 0
276#else 353#else
277# define NSCREENS 1 354# define NSCREENS 1
278#endif 355#endif
279 356
280/* special (internal) prefix for font commands */
281#define FONT_CMD '#'
282#define FONT_DN "#-"
283#define FONT_UP "#+"
284
285/* flags for rxvt_scr_gotorc () */ 357/* flags for rxvt_term::scr_gotorc () */
286enum { 358enum {
287 C_RELATIVE = 1, /* col movement is relative */ 359 C_RELATIVE = 1, /* col movement is relative */
288 R_RELATIVE = 2, /* row movement is relative */ 360 R_RELATIVE = 2, /* row movement is relative */
289 RELATIVE = C_RELATIVE | R_RELATIVE, 361 RELATIVE = C_RELATIVE | R_RELATIVE,
290}; 362};
291 363
292/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 364/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
293enum { 365enum {
294 INSERT = -1, /* don't change these values */ 366 INSERT = -1, /* don't change these values */
295 DELETE = +1, 367 DELETE = +1,
296 ERASE = +2, 368 ERASE = +2,
297}; 369};
298 370
299/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 371/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
300enum page_dirn { 372enum page_dirn {
301 UP, 373 UP,
302 DN, 374 DN,
303 NO_DIR, 375 NO_DIR,
304}; 376};
305 377
306/* arguments for rxvt_scr_change_screen () */ 378/* arguments for rxvt_term::scr_change_screen () */
307enum { 379enum {
308 PRIMARY = 0, 380 PRIMARY = 0,
309 SECONDARY, 381 SECONDARY,
310}; 382};
311 383
384// define various rendition bits and masks. the rendition word
385// is 32 bits in size, and we should use it as efficiently as possible
386
312#define RS_None 0 387#define RS_None 0
313 388
314#define RS_fgMask 0x0000007fUL // 128 colors 389// GET_BGATTR depends on RS_fgShift > RS_bgShift
315#define RS_bgMask 0x00003f80UL // 128 colors 390#define RS_colorMask ((1UL << Color_Bits) - 1UL)
391#define RS_bgShift 0
392#define RS_fgShift (RS_bgShift + Color_Bits)
393#define RS_bgMask (RS_colorMask << RS_bgShift)
394#define RS_fgMask (RS_colorMask << RS_fgShift)
395
396// must have space for rxvt_fontset::fontCount * 2 + 2 values
397#define RS_fontShift (RS_fgShift + Color_Bits)
398#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
399#define RS_fontCount rxvt_fontset::fontCount
400#define RS_fontMask ((RS_fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
401
402// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
403#define RS_redraw (2UL << RS_fontShift)
404
405#define RS_Sel (1UL << 22)
406
407// 4 custom bits for extensions
408#define RS_customCount 16UL
409#define RS_customShift 23
410#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
316 411
317// font styles 412// font styles
318#define RS_Bold 0x00004000UL // value 1 413#define RS_Bold (1UL << RS_styleShift)
319#define RS_Italic 0x00008000UL // value 2 414#define RS_Italic (2UL << RS_styleShift)
415
416#define RS_styleCount 4
417#define RS_styleShift 27
418#define RS_styleMask (RS_Bold | RS_Italic)
320 419
321// fake styles 420// fake styles
322#define RS_Blink 0x00010000UL // blink 421#define RS_Blink (1UL << 29)
323#define RS_RVid 0x00020000UL // reverse video 422#define RS_RVid (1UL << 30) // reverse video
324#define RS_Uline 0x00040000UL // underline 423#define RS_Uline (1UL << 31) // underline
325
326// toggle this to force redraw, must be != RS_Careful
327#define RS_redraw 0x01000000UL
328
329// 5 custom bits for extensions
330#define RS_customCount 32
331#define RS_customMask 0x00f80000UL
332#define RS_customShift 19
333
334// other flags
335#define RS_Careful 0x80000000UL /* be careful when drawing these */
336
337#define RS_styleCount 4
338#define RS_styleMask (RS_Bold | RS_Italic)
339#define RS_styleShift 14
340 424
341#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 425#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
342#define RS_attrMask (RS_baseattrMask | RS_fontMask) 426#define RS_attrMask (RS_baseattrMask | RS_fontMask)
343 427
344#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
345#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
346#define RS_fontShift 24
347
348#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 428#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
349#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 429#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
350
351#define Sel_none 0 /* Not waiting */
352#define Sel_normal 0x01 /* normal selection */
353#define Sel_incr 0x02 /* incremental selection */
354#define Sel_direct 0x00
355#define Sel_Primary 0x01
356#define Sel_Secondary 0x02
357#define Sel_Clipboard 0x03
358#define Sel_whereMask 0x0f
359#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
360#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
361 430
362enum { 431enum {
363 C0_NUL = 0x00, 432 C0_NUL = 0x00,
364 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 433 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
365 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 434 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
383 XTerm_Color_cursor = 12, // change actual 'Cursor' color 452 XTerm_Color_cursor = 12, // change actual 'Cursor' color
384 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 453 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
385 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 454 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
386 XTerm_Color05 = 15, // not implemented (tektronix fg) 455 XTerm_Color05 = 15, // not implemented (tektronix fg)
387 XTerm_Color06 = 16, // not implemented (tektronix bg) 456 XTerm_Color06 = 16, // not implemented (tektronix bg)
388 XTerm_Color_RV = 17, // change actual 'Highlight' color 457 XTerm_Color_HC = 17, // change actual 'Highlight' bg color
458 XTerm_Color_HTC = 19, // change actual 'Highlight' fg color
389 XTerm_logfile = 46, // not implemented 459 XTerm_logfile = 46, // not implemented
390 XTerm_font = 50, 460 XTerm_font = 50,
391 461
392 XTerm_konsole30 = 30, // reserved for konsole 462 XTerm_konsole30 = 30, // reserved for konsole
393 XTerm_konsole31 = 31, // reserved for konsole 463 XTerm_konsole31 = 31, // reserved for konsole
… …
395 /* 465 /*
396 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 466 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
397 */ 467 */
398 468
399 // deprecated 469 // deprecated
400 Rxvt_Color_BD = 18,
401 Rxvt_Color_UL = 19,
402 Rxvt_restoreFG = 39, 470 Rxvt_restoreFG = 39,
403 Rxvt_restoreBG = 49, 471 Rxvt_restoreBG = 49,
404 472
405 Rxvt_Pixmap = 20, // new bg pixmap 473 Rxvt_Pixmap = 20, // new bg pixmap
406 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 474 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
… …
410 478
411 URxvt_Color_IT = 704, // change actual 'Italic' colour 479 URxvt_Color_IT = 704, // change actual 'Italic' colour
412 URxvt_Color_tint = 705, // change actual tint colour 480 URxvt_Color_tint = 705, // change actual tint colour
413 URxvt_Color_BD = 706, // change actual 'Bold' color 481 URxvt_Color_BD = 706, // change actual 'Bold' color
414 URxvt_Color_UL = 707, // change actual 'Underline' color 482 URxvt_Color_UL = 707, // change actual 'Underline' color
483 URxvt_Color_border = 708,
415 484
416 URxvt_font = 710, 485 URxvt_font = 710,
417 URxvt_boldFont = 711, 486 URxvt_boldFont = 711,
418 URxvt_italicFont = 712, 487 URxvt_italicFont = 712,
419 URxvt_boldItalicFont = 713, 488 URxvt_boldItalicFont = 713,
420 489
421 URxvt_view_up = 720, 490 URxvt_view_up = 720,
422 URxvt_view_down = 721, 491 URxvt_view_down = 721,
423 492
424 URxvt_perl = 777, 493 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
425}; 494};
426 495
427/* Words starting with `Color_' are colours. Others are counts */ 496/* Words starting with `Color_' are colours. Others are counts */
428/* 497/*
429 * The PixColor and rendition colour usage should probably be decoupled 498 * The PixColor and rendition colour usage should probably be decoupled
… …
459 Color_White = maxBrightCOLOR, 528 Color_White = maxBrightCOLOR,
460#else 529#else
461 Color_White = maxCOLOR, 530 Color_White = maxCOLOR,
462#endif 531#endif
463 minTermCOLOR = Color_White + 1, 532 minTermCOLOR = Color_White + 1,
533#if USE_256_COLORS
534 maxTermCOLOR = Color_White + 240,
535#else
464 maxTermCOLOR = Color_White + 72, 536 maxTermCOLOR = Color_White + 72,
537#endif
465#ifndef NO_CURSORCOLOR 538#ifndef NO_CURSORCOLOR
466 Color_cursor, 539 Color_cursor,
467 Color_cursor2, 540 Color_cursor2,
468#endif 541#endif
469 Color_pointer_fg, 542 Color_pointer_fg,
… …
478#if ENABLE_FRILLS 551#if ENABLE_FRILLS
479 Color_underline, 552 Color_underline,
480#endif 553#endif
481#ifdef OPTION_HC 554#ifdef OPTION_HC
482 Color_HC, 555 Color_HC,
556 Color_HTC,
483#endif 557#endif
484 Color_scroll, 558 Color_scroll,
485#ifdef RXVT_SCROLLBAR 559#ifdef RXVT_SCROLLBAR
486 Color_trough, 560 Color_trough,
487#endif 561#endif
… …
499#else 573#else
500 TOTAL_COLORS = NRS_COLORS 574 TOTAL_COLORS = NRS_COLORS
501#endif 575#endif
502}; 576};
503 577
578#if USE_256_COLORS
579# define Color_Bits 9 // 0 .. maxTermCOLOR
580#else
504#define Color_Bits 7 // 0 .. maxTermCOLOR 581# define Color_Bits 7 // 0 .. maxTermCOLOR
582#endif
505 583
506/* 584/*
507 * Resource list 585 * Resource list
508 */ 586 */
509enum { 587enum {
… …
537#define PrivMode_vt52 (1UL<<18) 615#define PrivMode_vt52 (1UL<<18)
538#define PrivMode_LFNL (1UL<<19) 616#define PrivMode_LFNL (1UL<<19)
539#define PrivMode_MouseBtnEvent (1UL<<20) 617#define PrivMode_MouseBtnEvent (1UL<<20)
540#define PrivMode_MouseAnyEvent (1UL<<21) 618#define PrivMode_MouseAnyEvent (1UL<<21)
541#define PrivMode_BracketPaste (1UL<<22) 619#define PrivMode_BracketPaste (1UL<<22)
620#define PrivMode_ExtModeMouse (1UL<<23) // xterm pseudo-utf-8 hack
621#define PrivMode_ExtMouseRight (1UL<<24) // xterm pseudo-utf-8, but works in non-utf-8-locales
542 622
543#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 623#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
544 624
545#ifdef ALLOW_132_MODE 625#ifdef ALLOW_132_MODE
546# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 626# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
550 630
551// do not change these constants lightly, there are many interdependencies 631// do not change these constants lightly, there are many interdependencies
552#define IMBUFSIZ 128 // input modifier buffer sizes 632#define IMBUFSIZ 128 // input modifier buffer sizes
553#define KBUFSZ 512 // size of keyboard mapping buffer 633#define KBUFSZ 512 // size of keyboard mapping buffer
554#define CBUFSIZ 2048 // size of command buffer 634#define CBUFSIZ 2048 // size of command buffer
635#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
555#define UBUFSIZ 2048 // character buffer 636#define UBUFSIZ 2048 // character buffer
556 637
557#if ENABLE_FRILLS 638#if ENABLE_FRILLS
558# include <X11/Xmd.h> 639# include <X11/Xmd.h>
559typedef struct _mwmhints { 640typedef struct _mwmhints
641{
560 CARD32 flags; 642 CARD32 flags;
561 CARD32 functions; 643 CARD32 functions;
562 CARD32 decorations; 644 CARD32 decorations;
563 INT32 input_mode; 645 INT32 input_mode;
564 CARD32 status; 646 CARD32 status;
… …
595/* 677/*
596 ***************************************************************************** 678 *****************************************************************************
597 * MACRO DEFINES 679 * MACRO DEFINES
598 ***************************************************************************** 680 *****************************************************************************
599 */ 681 */
682
683// speed hack, copy some member variable into a local variable of the same name
600#define dLocal(type,name) type const name = this->name 684#define dLocal(type,name) type const name = this->name
601 685
602// for speed reasons, we assume that all codepoints 32 to 126 are 686// for speed reasons, we assume that all codepoints 32 to 126 are
603// single-width. 687// single-width.
604#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c)) 688#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
… …
611#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 695#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
612#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 696#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
613#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 697#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
614#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 698#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
615 699
616#define LINENO(n) MOD (term_start + int(n), total_rows) 700#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
617#define ROW(n) row_buf [LINENO (n)] 701#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
702
703#define LINENO(n) LINENO_of (this, n)
704#define ROW(n) ROW_of (this, n)
618 705
619/* how to build & extract colors and attributes */ 706/* how to build & extract colors and attributes */
620#define GET_BASEFG(x) (((x) & RS_fgMask)) 707#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
621#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 708#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
622 709
623#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 710#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
624#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 711#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
625 712
626#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 713#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
627#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 714#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
628 715
629#define GET_ATTR(x) (((x) & RS_attrMask)) 716#define GET_ATTR(x) (((x) & RS_attrMask))
717// return attributes defining the background, encoding doesn't matter
718// depends on RS_fgShift > RS_bgShift
630#define GET_BGATTR(x) \ 719#define GET_BGATTR(x) \
720 (ecb_unlikely ((x) & RS_RVid) \
631 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 721 ? (((x) & (RS_attrMask & ~RS_RVid)) \
632 | (((x) & RS_fgMask)<<Color_Bits)) \ 722 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
633 : ((x) & (RS_attrMask | RS_bgMask))) 723 : ((x) & (RS_attrMask | RS_bgMask)))
634#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 724#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
635#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 725#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
636#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 726#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
637 727
638#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 728#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
639 729
640#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 730#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
641#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 731#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
642 732
643#if ENABLE_STYLES 733#if ENABLE_STYLES
644# define FONTSET(style) fontset[GET_STYLE (style)] 734# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
645#else 735#else
646# define FONTSET(style) fontset[0] 736# define FONTSET_of(t,style) (t)->fontset[0]
647#endif 737#endif
738
739#define FONTSET(style) FONTSET_of (this, style)
648 740
649typedef callback<void (const char *)> log_callback; 741typedef callback<void (const char *)> log_callback;
650typedef callback<int (int)> getfd_callback; 742typedef callback<int (int)> getfd_callback;
651 743
652/****************************************************************************/ 744/****************************************************************************/
… …
655#define LINE_FILTERED 0x0002 // line has been filtered 747#define LINE_FILTERED 0x0002 // line has been filtered
656#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 748#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
657#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 749#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
658#define LINE_BIDI 0x0010 // line needs bidi (NYI) 750#define LINE_BIDI 0x0010 // line needs bidi (NYI)
659 751
660struct line_t { 752struct line_t
753{
661 text_t *t; // terminal the text 754 text_t *t; // terminal the text
662 rend_t *r; // rendition, uses RS_ flags 755 rend_t *r; // rendition, uses RS_ flags
663 tlen_t_ l; // length of each text line 756 tlen_t_ l; // length of each text line
664 uint32_t f; // flags 757 uint32_t f; // flags
665 758
… …
699}; 792};
700 793
701/****************************************************************************/ 794/****************************************************************************/
702 795
703// primitive wrapper around mbstate_t to ensure initialisation 796// primitive wrapper around mbstate_t to ensure initialisation
704struct mbstate { 797struct mbstate
798{
705 mbstate_t mbs; 799 mbstate_t mbs;
706 800
707 operator mbstate_t *() { return &mbs; } 801 operator mbstate_t *() { return &mbs; }
708 void reset () { memset (&mbs, 0, sizeof (mbs)); } 802 void reset () { memset (&mbs, 0, sizeof (mbs)); }
709 mbstate () { reset (); } 803 mbstate () { reset (); }
… …
730 824
731#if ENABLE_COMBINING 825#if ENABLE_COMBINING
732// compose chars are used to represent composite characters 826// compose chars are used to represent composite characters
733// that are not representable in unicode, as well as characters 827// that are not representable in unicode, as well as characters
734// not fitting in the BMP. 828// not fitting in the BMP.
735struct compose_char { 829struct compose_char
830{
736 unicode_t c1, c2; // any chars != NOCHAR are valid 831 unicode_t c1, c2; // any chars != NOCHAR are valid
832 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
833 compose_char () = default;
834 #endif
737 compose_char (unicode_t c1, unicode_t c2) 835 compose_char (unicode_t c1, unicode_t c2)
738 : c1(c1), c2(c2) 836 : c1(c1), c2(c2)
739 { } 837 { }
740}; 838};
741 839
742class rxvt_composite_vec { 840class rxvt_composite_vec
841{
743 vector<compose_char> v; 842 vector<compose_char> v;
744public: 843public:
745 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 844 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
746 int expand (unicode_t c, wchar_t *r); 845 int expand (unicode_t c, wchar_t *r);
747 compose_char *operator [](text_t c) 846 compose_char *operator [](text_t c)
… …
766extern rxvt_t rxvt_current_term; 865extern rxvt_t rxvt_current_term;
767 866
768#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 867#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
769#define GET_R rxvt_current_term 868#define GET_R rxvt_current_term
770 869
870/* ------------------------------------------------------------------------- */
871struct overlay_base
872{
873 int x, y, w, h; // overlay dimensions
874 text_t **text;
875 rend_t **rend;
876
877 // while tempting to add swap() etc. here, it effectively only increases code size
878};
879
880/* ------------------------------------------------------------------------- */
881
771typedef struct { 882typedef struct
883{
772 int row; 884 int row;
773 int col; 885 int col;
774} row_col_t; 886} row_col_t;
775 887
776/* 888/*
… …
801 * +------------+·display·+·= term_start 913 * +------------+·display·+·= term_start
802 * | terminal | display | 914 * | terminal | display |
803 * | terminal +---------+ 915 * | terminal +---------+
804 * | terminal | 916 * | terminal |
805 * | terminal | 917 * | terminal |
806 * +------------+···········= term_stat + nrow - 1 918 * +------------+···········= term_start + nrow - 1
807 * | 919 * |
808 * | 920 * |
809 * END······················= total_rows 921 * END······················= total_rows
810 */ 922 */
811 923
812struct TermWin_t { 924struct TermWin_t
925{
926 int vt_width; /* actual window width [pixels] */
927 int vt_height; /* actual window height [pixels] */
813 int width; /* window width [pixels] */ 928 int width; /* window width [pixels] */
814 int height; /* window height [pixels] */ 929 int height; /* window height [pixels] */
815 int fwidth; /* font width [pixels] */ 930 int fwidth; /* font width [pixels] */
816 int fheight; /* font height [pixels] */ 931 int fheight; /* font height [pixels] */
817 int fbase; /* font ascent (baseline) [pixels] */ 932 int fbase; /* font ascent (baseline) [pixels] */
… …
820 int focus; /* window has focus */ 935 int focus; /* window has focus */
821 int mapped; /* window state mapped? */ 936 int mapped; /* window state mapped? */
822 int int_bwidth; /* internal border width */ 937 int int_bwidth; /* internal border width */
823 int ext_bwidth; /* external border width */ 938 int ext_bwidth; /* external border width */
824 int lineSpace; /* number of extra pixels between rows */ 939 int lineSpace; /* number of extra pixels between rows */
940 int letterSpace; /* number of extra pixels between columns */
825 int saveLines; /* number of lines that fit in scrollback */ 941 int saveLines; /* number of lines that fit in scrollback */
826 int total_rows; /* total number of rows in this terminal */ 942 int total_rows; /* total number of rows in this terminal */
827 int term_start; /* term lines start here */ 943 int term_start; /* term lines start here */
828 int view_start; /* scrollback view starts here */ 944 int view_start; /* scrollback view starts here */
829 int top_row; /* topmost row index of scrollback */ 945 int top_row; /* topmost row index of scrollback */
830 Window parent[6]; /* parent identifiers - we're parent[0] */ 946 Window parent; /* parent identifier */
831 Window vt; /* vt100 window */ 947 Window vt; /* vt100 window */
832 GC gc; /* GC for drawing */ 948 GC gc; /* GC for drawing */
833 Pixmap pixmap;
834 rxvt_drawable *drawable; 949 rxvt_drawable *drawable;
835 rxvt_fontset *fontset[4]; 950 rxvt_fontset *fontset[4];
836}; 951};
837 952
838/* 953/*
… …
847 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 962 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
848 * nothing is selected 963 * nothing is selected
849 * beg: row/column of beginning of selection : never past mark 964 * beg: row/column of beginning of selection : never past mark
850 * mark: row/column of initial click : never past end 965 * mark: row/column of initial click : never past end
851 * end: row/column of one character past end of selection 966 * end: row/column of one character past end of selection
852 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 967 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
853 * * Note: col == -1 ==> we're left of screen 968 * * Note: col == -1 ==> we're left of screen
854 * 969 *
855 */ 970 */
856typedef struct { 971struct screen_t
972{
857 row_col_t cur; /* cursor position on the screen */ 973 row_col_t cur; /* cursor position on the screen */
858 int tscroll; /* top of settable scroll region */ 974 int tscroll; /* top of settable scroll region */
859 int bscroll; /* bottom of settable scroll region */ 975 int bscroll; /* bottom of settable scroll region */
860 unsigned int charset; /* character set number [0..3] */ 976 unsigned int charset; /* character set number [0..3] */
861 unsigned int flags; /* see below */ 977 unsigned int flags; /* see below */
862 row_col_t s_cur; /* saved cursor position */ 978 row_col_t s_cur; /* saved cursor position */
863 unsigned int s_charset; /* saved character set number [0..3] */ 979 unsigned int s_charset; /* saved character set number [0..3] */
864 char s_charset_char; 980 char s_charset_char;
865 rend_t s_rstyle; /* saved rendition style */ 981 rend_t s_rstyle; /* saved rendition style */
866} screen_t; 982};
867 983
868enum selection_op_t { 984enum selection_op_t
985{
869 SELECTION_CLEAR = 0, /* nothing selected */ 986 SELECTION_CLEAR = 0, /* nothing selected */
870 SELECTION_INIT, /* marked a point */ 987 SELECTION_INIT, /* marked a point */
871 SELECTION_BEGIN, /* started a selection */ 988 SELECTION_BEGIN, /* started a selection */
872 SELECTION_CONT, /* continued selection */ 989 SELECTION_CONT, /* continued selection */
873 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 990 SELECTION_DONE /* selection put in CUT_BUFFER0 */
874}; 991};
875 992
876typedef struct { 993struct selection_t
994{
877 wchar_t *text; /* selected text */ 995 wchar_t *text; /* selected text */
878 unsigned int len; /* length of selected text */ 996 unsigned int len; /* length of selected text */
879 unsigned int screen; /* screen being used */ 997 unsigned int screen; /* screen being used */
880 unsigned int clicks; /* number of clicks */ 998 unsigned int clicks; /* number of clicks */
881 selection_op_t op; /* current operation */ 999 selection_op_t op; /* current operation */
882 bool rect; /* rectangular selection? */ 1000 bool rect; /* rectangular selection? */
883 row_col_t beg; /* beginning of selection <= mark */ 1001 row_col_t beg; /* beginning of selection <= mark */
884 row_col_t mark; /* point of initial click <= end */ 1002 row_col_t mark; /* point of initial click <= end */
885 row_col_t end; /* one character past end point */ 1003 row_col_t end; /* one character past end point */
886} selection_t; 1004 wchar_t *clip_text; /* text copied to the clipboard */
1005 unsigned int clip_len; /* length of clipboard text */
1006};
887 1007
888/* ------------------------------------------------------------------------- */ 1008/* ------------------------------------------------------------------------- */
889 1009
890/* screen_t flags */ 1010/* screen_t flags */
891#define Screen_Relative (1<<0) /* relative origin mode flag */ 1011#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
895#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 1015#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
896#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 1016#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
897 1017
898/* rxvt_vars.options */ 1018/* rxvt_vars.options */
899enum { 1019enum {
900# define def(name,idx) Opt_ ## name = idx,
901# define nodef(name) Opt_ ## name = 0, 1020# define def(name) Opt_ ## name,
1021# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
1022 Opt_0,
902# include "optinc.h" 1023# include "optinc.h"
903# undef nodef 1024# undef nodef
904# undef def 1025# undef def
905Opt_count 1026 Opt_count
906}; 1027};
907 1028
908/* ------------------------------------------------------------------------- */ 1029/* ------------------------------------------------------------------------- */
909 1030
910struct rxvt_vars : TermWin_t { 1031struct rxvt_vars : TermWin_t
1032{
911 scrollBar_t scrollBar; 1033 scrollBar_t scrollBar;
912 uint8_t options[(Opt_count + 7) >> 3]; 1034 uint8_t options[(Opt_count + 7) >> 3];
913 XSizeHints szHint; 1035 XSizeHints szHint;
914 rxvt_color *pix_colors; 1036 rxvt_color *pix_colors;
915 Cursor TermWin_cursor; /* cursor for vt window */ 1037 Cursor TermWin_cursor; /* cursor for vt window */
916 int numlock_state;
917 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 1038 line_t *row_buf; // all lines, scrollback + terminal, circular
918 line_t *drawn_buf; // text on screen 1039 line_t *drawn_buf; // text on screen
919 line_t *swap_buf; // lines for swap buffer 1040 line_t *swap_buf; // lines for swap buffer
920 char *tabs; /* per location: 1 == tab-stop */ 1041 char *tabs; /* per location: 1 == tab-stop */
921 screen_t screen; 1042 screen_t screen;
922 screen_t swap; 1043 screen_t swap;
… …
925#ifdef OFF_FOCUS_FADING 1046#ifdef OFF_FOCUS_FADING
926 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 1047 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
927#endif 1048#endif
928}; 1049};
929 1050
930struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 1051struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
1052{
931 1053
932 // special markers with magic addresses 1054 // special markers with magic addresses
933 static const char resval_undef []; // options specifically unset 1055 static const char resval_undef []; // options specifically unset
934 static const char resval_on []; // boolean options switched on 1056 static const char resval_on []; // boolean options switched on
935 static const char resval_off []; // or off 1057 static const char resval_off []; // or off
… …
943 1065
944 unsigned char want_refresh:1, 1066 unsigned char want_refresh:1,
945 current_screen:1, /* primary or secondary */ 1067 current_screen:1, /* primary or secondary */
946 num_scr_allow:1, 1068 num_scr_allow:1,
947 bypass_keystate:1, 1069 bypass_keystate:1,
1070#if ENABLE_FRILLS
1071 urgency_hint:1,
1072#endif
948#ifdef CURSOR_BLINK 1073#if CURSOR_BLINK
949 hidden_cursor:1, 1074 hidden_cursor:1,
950#endif 1075#endif
951#ifdef TEXT_BLINK 1076#if TEXT_BLINK
952 hidden_text:1, 1077 hidden_text:1,
953#endif 1078#endif
954#ifdef POINTER_BLANK 1079#if POINTER_BLANK
955 hidden_pointer:1, 1080 hidden_pointer:1,
956#endif 1081#endif
957 enc_utf8:1, /* wether locale uses utf-8 */ 1082 enc_utf8:1, /* whether locale uses utf-8 */
958 seen_input:1, /* wether we have seen some program output yet */ 1083 seen_input:1, /* whether we have seen some program output yet */
959 seen_resize:1, /* wether we had a resize event */ 1084 seen_resize:1, /* whether we had a resize event */
1085 init_done:1,
960 parsed_geometry:1; 1086 parsed_geometry:1;
961 1087
962 unsigned char refresh_type, 1088 unsigned char refresh_type,
963#ifdef META8_OPTION 1089#ifdef META8_OPTION
964 meta_char, /* Alt-key prefix */ 1090 meta_char; /* Alt-key prefix */
965#endif 1091#endif
966 selection_wait,
967 selection_type;
968/* ---------- */ 1092/* ---------- */
969 bool rvideo_state, rvideo_mode; 1093 bool rvideo_state, rvideo_mode;
970#ifndef NO_BELL 1094#ifndef NO_BELL
971 bool rvideo_bell; 1095 bool rvideo_bell;
972#endif 1096#endif
973 int num_scr; /* screen: number lines scrolled */ 1097 int num_scr; /* screen: number of lines scrolled */
974 int prev_ncol, /* screen: previous number of columns */ 1098 int prev_ncol, /* screen: previous number of columns */
975 prev_nrow; /* screen: previous number of rows */ 1099 prev_nrow; /* screen: previous number of rows */
976/* ---------- */ 1100/* ---------- */
977 rend_t rstyle; 1101 rend_t rstyle;
978/* ---------- */ 1102/* ---------- */
… …
1000 allowedxerror; 1124 allowedxerror;
1001/* ---------- */ 1125/* ---------- */
1002 unsigned int ModLevel3Mask, 1126 unsigned int ModLevel3Mask,
1003 ModMetaMask, 1127 ModMetaMask,
1004 ModNumLockMask; 1128 ModNumLockMask;
1005 int old_width, /* last used width in screen resize */
1006 old_height; /* last used height in screen resize */
1007 unsigned long priv_modes, 1129 unsigned long priv_modes,
1008 SavedModes; 1130 SavedModes;
1009/* ---------- */ 1131/* ---------- */
1010 Atom *xa; 1132 Atom *xa;
1011/* ---------- */ 1133/* ---------- */
1012#ifdef RXVT_SCROLLBAR
1013 GC scrollbarGC,
1014 topShadowGC,
1015 botShadowGC;
1016#endif
1017#ifdef XTERM_SCROLLBAR
1018 GC xscrollbarGC,
1019 ShadowGC;
1020#endif
1021#ifdef PLAIN_SCROLLBAR
1022 GC pscrollbarGC;
1023#endif
1024#ifdef NEXT_SCROLLBAR
1025 GC blackGC,
1026 whiteGC,
1027 grayGC,
1028 darkGC,
1029 stippleGC;
1030 Pixmap dimple,
1031 upArrow,
1032 downArrow,
1033 upArrowHi,
1034 downArrowHi;
1035#endif
1036/* ---------- */
1037 Time selection_time, 1134 Time selection_time,
1038 selection_request_time; 1135 clipboard_time;
1136 rxvt_selection *selection_req;
1039 pid_t cmd_pid; /* process id of child */ 1137 pid_t cmd_pid; /* process id of child */
1040 char * incr_buf;
1041 size_t incr_buf_size, incr_buf_fill;
1042/* ---------- */ 1138/* ---------- */
1043 struct mouse_event MEvent; 1139 struct mouse_event MEvent;
1044 XComposeStatus compose; 1140 XComposeStatus compose;
1045 struct termios tio; 1141 static struct termios def_tio;
1046 row_col_t oldcursor; 1142 row_col_t oldcursor;
1047#ifdef HAVE_BG_PIXMAP 1143#ifdef HAVE_BG_PIXMAP
1048 bgPixmap_t bgPixmap; 1144 void bg_init ();
1145 void bg_destroy ();
1146
1147 enum {
1148 BG_IS_VALID = 1 << 0,
1149
1150 BG_IS_TRANSPARENT = 1 << 1,
1151 BG_NEEDS_REFRESH = 1 << 2,
1152
1153 BG_HAS_RENDER = 1 << 3,
1154 BG_HAS_RENDER_CONV = 1 << 4,
1155 BG_CLIENT_RENDER = 1 << 5,
1156
1157 BG_TINT_SET = 1 << 6,
1158 BG_TINT_BITAND = 1 << 7,
1159 };
1160
1161 uint8_t bg_flags;
1162
1163# ifdef BG_IMAGE_FROM_FILE
1164 rxvt_image bg_image;
1165 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1166 bool render_image (rxvt_image &image);
1049#endif 1167# endif
1050#ifdef HAVE_AFTERIMAGE 1168
1051 ASVisual *asv; 1169# ifdef ENABLE_TRANSPARENCY
1052 ASImageManager *asimman; 1170 Pixmap root_pixmap; /* current root pixmap set */
1171 rxvt_color tint;
1172 int shade;
1173 int h_blurRadius, v_blurRadius;
1174
1175 void bg_set_transparent ()
1176 {
1177 bg_flags |= BG_IS_TRANSPARENT;
1178 }
1179 void bg_set_root_pixmap ();
1180 bool bg_set_tint (rxvt_color &new_tint);
1181 bool bg_set_shade (const char *shade_str);
1182 bool bg_set_blur (const char *geom);
1183
1184 bool blur_pixmap (Pixmap pixmap, int width, int height);
1185 bool tint_pixmap (Pixmap pixmap, int width, int height);
1186 void tint_ximage (XImage *ximage);
1187 bool make_transparency_pixmap ();
1188# endif
1189
1190 ev_tstamp bg_valid_since;
1191
1192 Pixmap bg_pixmap;
1193 unsigned int bg_pmap_width, bg_pmap_height;
1194
1195 int target_x;
1196 int target_y;
1197 bool bg_set_position (int x, int y);
1198 bool bg_window_size_sensitive ();
1199 bool bg_window_position_sensitive ();
1200
1201 bool bg_render ();
1202 void bg_invalidate ()
1203 {
1204 bg_flags &= ~BG_IS_VALID;
1205 }
1206#endif
1207#ifdef HAVE_PIXBUF
1208 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1209 int src_x, int src_y, int dst_x, int dst_y,
1210 unsigned int width, unsigned int height);
1053#endif 1211#endif
1054 1212
1055#if ENABLE_OVERLAY 1213#if ENABLE_OVERLAY
1056 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1214 overlay_base ov;
1057 text_t **ov_text;
1058 rend_t **ov_rend;
1059 1215
1060 void scr_swap_overlay () NOTHROW; 1216 void scr_swap_overlay () NOTHROW;
1061 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1217 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1062 void scr_overlay_off () NOTHROW; 1218 void scr_overlay_off () NOTHROW;
1063 void scr_overlay_set (int x, int y, 1219 void scr_overlay_set (int x, int y,
… …
1067 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1223 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1068#endif 1224#endif
1069 1225
1070 vector<void *> allocated; // free these memory blocks with free() 1226 vector<void *> allocated; // free these memory blocks with free()
1071 1227
1072 char env_windowid[21]; /* environmental variable WINDOWID */
1073 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1074 char *env_display; /* environmental variable DISPLAY */
1075 char *env_term; /* environmental variable TERM */
1076
1077 char *locale; 1228 char *locale;
1078 char charsets[4]; 1229 char charsets[4];
1079 char *v_buffer; /* pointer to physical buffer */ 1230 char *v_buffer; /* pointer to physical buffer */
1080 unsigned int v_buflen; /* size of area to write */ 1231 unsigned int v_buflen; /* size of area to write */
1081 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1232 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1120 void rootwin_cb (XEvent &xev); 1271 void rootwin_cb (XEvent &xev);
1121 xevent_watcher rootwin_ev; 1272 xevent_watcher rootwin_ev;
1122#endif 1273#endif
1123#ifdef HAVE_BG_PIXMAP 1274#ifdef HAVE_BG_PIXMAP
1124 void update_background (); 1275 void update_background ();
1125#if TRACE_PIXMAPS
1126 void trace_update_background (const char *file, int line);
1127# define update_background() trace_update_background (__FILE__, __LINE__)
1128#endif
1129 void update_background_cb (ev::timer &w, int revents); 1276 void update_background_cb (ev::timer &w, int revents);
1130 ev::timer update_background_ev; 1277 ev::timer update_background_ev;
1131#endif 1278#endif
1132 1279
1133 void x_cb (XEvent &xev); 1280 void x_cb (XEvent &xev);
… …
1138 void child_cb (ev::child &w, int revents); ev::child child_ev; 1285 void child_cb (ev::child &w, int revents); ev::child child_ev;
1139 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1286 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1140 void refresh_check (); 1287 void refresh_check ();
1141 void flush (); 1288 void flush ();
1142 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1289 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1290 void cmdbuf_reify ();
1291 void cmdbuf_append (const char *str, size_t count);
1143 bool pty_fill (); 1292 bool pty_fill ();
1144 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1293 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1145 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1146 1294
1147#ifdef CURSOR_BLINK 1295#ifdef CURSOR_BLINK
1296 void cursor_blink_reset ();
1148 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1297 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1149#endif 1298#endif
1150#ifdef TEXT_BLINK 1299#ifdef TEXT_BLINK
1151 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1300 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1152#endif 1301#endif
… …
1171 void pointer_unblank (); 1320 void pointer_unblank ();
1172 1321
1173 void tt_printf (const char *fmt,...); 1322 void tt_printf (const char *fmt,...);
1174 void tt_write (const char *data, unsigned int len); 1323 void tt_write (const char *data, unsigned int len);
1175 void pty_write (); 1324 void pty_write ();
1176
1177 void init (stringvec *argv, stringvec *envv)
1178 {
1179 this->argv = argv;
1180 init (argv->size (), argv->begin (), envv);
1181 }
1182 1325
1183 void make_current () const // make this the "currently active" urxvt instance 1326 void make_current () const // make this the "currently active" urxvt instance
1184 { 1327 {
1185 SET_R (this); 1328 SET_R (this);
1186 set_environ (envv); 1329 set_environ (envv);
… …
1198 void im_set_size (XRectangle &size); 1341 void im_set_size (XRectangle &size);
1199 void im_set_position (XPoint &pos) NOTHROW; 1342 void im_set_position (XPoint &pos) NOTHROW;
1200 void im_set_color (unsigned long &fg, unsigned long &bg); 1343 void im_set_color (unsigned long &fg, unsigned long &bg);
1201 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1344 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1202 1345
1203 bool IMisRunning (); 1346 bool im_is_running ();
1204 void IMSendSpot (); 1347 void im_send_spot ();
1205 bool IM_get_IC (const char *modifiers); 1348 bool im_get_ic (const char *modifiers);
1206 void IMSetPosition (); 1349 void im_set_position ();
1207#endif 1350#endif
1208 1351
1209 // command.C 1352 // command.C
1210 void key_press (XKeyEvent &ev); 1353 void key_press (XKeyEvent &ev);
1211 void key_release (XKeyEvent &ev); 1354 void key_release (XKeyEvent &ev);
1212 unsigned int cmd_write (const char *str, unsigned int count);
1213 1355
1214 wchar_t next_char () NOTHROW; 1356 wchar_t next_char () NOTHROW;
1215 wchar_t cmd_getc () THROW ((class out_of_input)); 1357 wchar_t cmd_getc () THROW ((class out_of_input));
1216 uint32_t next_octet () NOTHROW; 1358 uint32_t next_octet () NOTHROW;
1217 uint32_t cmd_get8 () THROW ((class out_of_input)); 1359 uint32_t cmd_get8 () THROW ((class out_of_input));
1218 1360
1219 bool cmd_parse (); 1361 void cmd_parse ();
1220 void mouse_report (XButtonEvent &ev); 1362 void mouse_report (XButtonEvent &ev);
1221 void button_press (XButtonEvent &ev); 1363 void button_press (XButtonEvent &ev);
1222 void button_release (XButtonEvent &ev); 1364 void button_release (XButtonEvent &ev);
1223 void focus_in (); 1365 void focus_in ();
1224 void focus_out (); 1366 void focus_out ();
1367#if ENABLE_FRILLS
1368 void set_urgency (bool enable);
1369#else
1370 void set_urgency (bool enable) { }
1371#endif
1225 void update_fade_color (unsigned int idx); 1372 void update_fade_color (unsigned int idx);
1226#ifdef PRINTPIPE 1373#ifdef PRINTPIPE
1227 FILE *popen_printer (); 1374 FILE *popen_printer ();
1228 int pclose_printer (FILE *stream); 1375 int pclose_printer (FILE *stream);
1229#endif 1376#endif
… …
1235 void process_window_ops (const int *args, unsigned int nargs); 1382 void process_window_ops (const int *args, unsigned int nargs);
1236 char *get_to_st (unicode_t &ends_how); 1383 char *get_to_st (unicode_t &ends_how);
1237 void process_dcs_seq (); 1384 void process_dcs_seq ();
1238 void process_osc_seq (); 1385 void process_osc_seq ();
1239 void process_color_seq (int report, int color, const char *str, char resp); 1386 void process_color_seq (int report, int color, const char *str, char resp);
1240 void process_xterm_seq (int op, const char *str, char resp); 1387 void process_xterm_seq (int op, char *str, char resp);
1241 int privcases (int mode, unsigned long bit); 1388 int privcases (int mode, unsigned long bit);
1242 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1389 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1243 void process_sgr_mode (unsigned int nargs, const int *arg); 1390 void process_sgr_mode (unsigned int nargs, const int *arg);
1244 void process_graphics ();
1245 // init.C 1391 // init.C
1392 void init (stringvec *argv, stringvec *envv);
1393 void init (int argc, const char *const *argv, const char *const *envv);
1394 void init2 (int argc, const char *const *argv);
1246 void init_vars (); 1395 void init_vars ();
1247 const char **init_resources (int argc, const char *const *argv); 1396 const char **init_resources (int argc, const char *const *argv);
1248 void init (int argc, const char *const *argv, stringvec *envv);
1249 void init_env (); 1397 void init_env ();
1250 void set_locale (const char *locale); 1398 void set_locale (const char *locale);
1251 void init_xlocale (); 1399 void init_xlocale ();
1252 void init_command (const char *const *argv); 1400 void init_command (const char *const *argv);
1253 void run_command (const char *const *argv); 1401 void run_command (const char *const *argv);
1254 int run_child (const char *const *argv); 1402 int run_child (const char *const *argv);
1255 void color_aliases (int idx); 1403 void color_aliases (int idx);
1256 void create_windows (int argc, const char *const *argv); 1404 void create_windows (int argc, const char *const *argv);
1257 void Get_Colours (); 1405 void get_colours ();
1258 void get_ourmods (); 1406 void get_ourmods ();
1407 void set_icon (const char *file);
1259 // main.C 1408 // main.C
1260 void tt_winch (); 1409 void tt_winch ();
1261 rxvt_term (); 1410 rxvt_term ();
1262 ~rxvt_term (); 1411 ~rxvt_term ();
1263 void destroy (); 1412 void destroy ();
… …
1265 void recolour_cursor (); 1414 void recolour_cursor ();
1266 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1415 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1267 void window_calc (unsigned int newwidth, unsigned int newheight); 1416 void window_calc (unsigned int newwidth, unsigned int newheight);
1268 bool set_fonts (); 1417 bool set_fonts ();
1269 void set_string_property (Atom prop, const char *str, int len = -1); 1418 void set_string_property (Atom prop, const char *str, int len = -1);
1419 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1270 void set_utf8_property (Atom prop, const char *str, int len = -1); 1420 void set_utf8_property (Atom prop, const char *str, int len = -1);
1271 void set_title (const char *str); 1421 void set_title (const char *str);
1272 void set_icon_name (const char *str); 1422 void set_icon_name (const char *str);
1273 void set_window_color (int idx, const char *color); 1423 void set_window_color (int idx, const char *color);
1274 void set_colorfgbg (); 1424 char *get_colorfgbg ();
1275 bool set_color (rxvt_color &color, const char *name); 1425 bool set_color (rxvt_color &color, const char *name);
1276 void alias_color (int dst, int src); 1426 void alias_color (int dst, int src);
1277 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1427 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1278 void get_window_origin (int &x, int &y); 1428 void get_window_origin (int &x, int &y);
1279 Pixmap get_pixmap_property (int prop_id); 1429 Pixmap get_pixmap_property (Atom property);
1280 1430
1281 // screen.C 1431 // screen.C
1282 1432
1283 void lalloc (line_t &l) const 1433 void lalloc (line_t &l) const
1284 { 1434 {
… …
1314#ifndef NO_BRIGHTCOLOR 1464#ifndef NO_BRIGHTCOLOR
1315 if (r & RS_Bold 1465 if (r & RS_Bold
1316# if ENABLE_STYLES 1466# if ENABLE_STYLES
1317 && option (Opt_intensityStyles) 1467 && option (Opt_intensityStyles)
1318# endif 1468# endif
1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1469 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1320 base += minBrightCOLOR - minCOLOR; 1470 base += minBrightCOLOR - minCOLOR;
1321#endif 1471#endif
1322 return base; 1472 return base;
1323 } 1473 }
1324 1474
… …
1328#ifndef NO_BRIGHTCOLOR 1478#ifndef NO_BRIGHTCOLOR
1329 if (r & RS_Blink 1479 if (r & RS_Blink
1330# if ENABLE_STYLES 1480# if ENABLE_STYLES
1331 && option (Opt_intensityStyles) 1481 && option (Opt_intensityStyles)
1332# endif 1482# endif
1333 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1483 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1334 base += minBrightCOLOR - minCOLOR; 1484 base += minBrightCOLOR - minCOLOR;
1335#endif 1485#endif
1336 return base; 1486 return base;
1337 } 1487 }
1338 1488
1339 bool option (uint8_t opt) const NOTHROW 1489 bool option (uint8_t opt) const NOTHROW
1340 { 1490 {
1341 if (!opt)
1342 return 0;
1343
1344 --opt;
1345 return options[opt >> 3] & (1 << (opt & 7)); 1491 return options[opt >> 3] & (1 << (opt & 7));
1346 } 1492 }
1347 1493
1348 void set_option (uint8_t opt, bool set = true) NOTHROW 1494 void set_option (uint8_t opt, bool set = true) NOTHROW;
1349 {
1350 if (!opt)
1351 return;
1352
1353 --opt;
1354 if (set)
1355 options[opt >> 3] |= (1 << (opt & 7));
1356 else
1357 options[opt >> 3] &= ~(1 << (opt & 7));
1358 }
1359
1360 void set_privmode (unsigned bit, int set) NOTHROW
1361 {
1362 if (set)
1363 priv_modes |= bit;
1364 else
1365 priv_modes &= ~bit;
1366 }
1367 1495
1368 // modifies first argument(!) 1496 // modifies first argument(!)
1497 void tt_paste (char *data, unsigned int len) NOTHROW;
1369 void paste (char *data, unsigned int len) NOTHROW; 1498 void paste (char *data, unsigned int len) NOTHROW;
1370 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1499 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1371 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1500 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1501 void scr_kill_char (line_t &l, int col) const NOTHROW;
1372 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1502 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1373 void scr_reset (); 1503 void scr_reset ();
1374 void scr_release () NOTHROW; 1504 void scr_release () NOTHROW;
1375 void scr_clear (bool really = false) NOTHROW; 1505 void scr_clear (bool really = false) NOTHROW;
1376 void scr_refresh () NOTHROW; 1506 void scr_refresh () NOTHROW;
… …
1381 void scr_backindex () NOTHROW; 1511 void scr_backindex () NOTHROW;
1382 void scr_forwardindex () NOTHROW; 1512 void scr_forwardindex () NOTHROW;
1383#endif 1513#endif
1384 void scr_touch (bool refresh) NOTHROW; 1514 void scr_touch (bool refresh) NOTHROW;
1385 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1515 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1386 void scr_recolour () NOTHROW; 1516 void scr_recolour (bool refresh = true) NOTHROW;
1387 void scr_remap_chars () NOTHROW; 1517 void scr_remap_chars () NOTHROW;
1388 void scr_remap_chars (line_t &l) NOTHROW; 1518 void scr_remap_chars (line_t &l) NOTHROW;
1389 1519
1390 enum cursor_mode { SAVE, RESTORE }; 1520 enum cursor_mode { SAVE, RESTORE };
1391 1521
1392 void scr_poweron (); 1522 void scr_poweron ();
1523 void scr_soft_reset () NOTHROW;
1393 void scr_cursor (cursor_mode mode) NOTHROW; 1524 void scr_cursor (cursor_mode mode) NOTHROW;
1394 void scr_do_wrap () NOTHROW; 1525 void scr_do_wrap () NOTHROW;
1395 void scr_swap_screen () NOTHROW; 1526 void scr_swap_screen () NOTHROW;
1396 void scr_change_screen (int scrn); 1527 void scr_change_screen (int scrn);
1397 void scr_color (unsigned int color, int fgbg) NOTHROW; 1528 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1425 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1556 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1426 void scr_reverse_selection () NOTHROW; 1557 void scr_reverse_selection () NOTHROW;
1427 void scr_dump (int fd) NOTHROW; 1558 void scr_dump (int fd) NOTHROW;
1428 1559
1429 void selection_check (int check_more) NOTHROW; 1560 void selection_check (int check_more) NOTHROW;
1430 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1431 void selection_property (Window win, Atom prop) NOTHROW;
1432 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1561 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1433 int selection_request_other (Atom target, int selnum) NOTHROW;
1434 void selection_clear () NOTHROW; 1562 void selection_clear (bool clipboard = false) NOTHROW;
1435 void selection_make (Time tm); 1563 void selection_make (Time tm);
1436 bool selection_grab (Time tm) NOTHROW; 1564 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1437 void selection_start_colrow (int col, int row) NOTHROW; 1565 void selection_start_colrow (int col, int row) NOTHROW;
1438 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1566 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1439 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1567 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1440 void selection_remove_trailing_spaces () NOTHROW; 1568 void selection_remove_trailing_spaces () NOTHROW;
1441 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1569 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1442 void selection_click (int clicks, int x, int y) NOTHROW; 1570 void selection_click (int clicks, int x, int y) NOTHROW;
1443 void selection_extend (int x, int y, int flag) NOTHROW; 1571 void selection_extend (int x, int y, int flag) NOTHROW;
1444 void selection_rotate (int x, int y) NOTHROW; 1572 void selection_rotate (int x, int y) NOTHROW;
1445 1573
1446#if defined(NEXT_SCROLLBAR)
1447 // scrollbar-next.C
1448 Pixmap renderPixmap (const char *const *data, int width, int height);
1449 void init_scrollbar_stuff ();
1450 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1451 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1452#endif
1453
1454#if defined(RXVT_SCROLLBAR)
1455 // scrollbar-rxvt.C
1456 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1457#endif
1458
1459#if defined(XTERM_SCROLLBAR)
1460 // scrollbar-xterm.C
1461 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1462#endif
1463
1464#if defined(PLAIN_SCROLLBAR)
1465 // scrollbar-plain.C
1466 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1467#endif
1468
1469 // scrollbar.C
1470 void resize_scrollbar ();
1471 int scrollbar_mapping (int map);
1472 int scrollbar_show (int update);
1473
1474 // xdefaults.C 1574 // xdefaults.C
1475 void get_options (int argc, const char *const *argv); 1575 const char **get_options (int argc, const char *const *argv);
1476 int parse_keysym (const char *str, const char *arg); 1576 int parse_keysym (const char *str, const char *arg);
1477 const char *x_resource (const char *name); 1577 const char *x_resource (const char *name);
1478 void extract_resources (); 1578 void extract_resources ();
1579 void extract_keysym_resources ();
1479}; 1580};
1480 1581
1481#endif /* _RXVT_H_ */ 1582#endif /* _RXVT_H_ */
1482 1583

Diff Legend

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