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.342 by ayin, Sat Dec 29 12:03:39 2007 UTC vs.
Revision 1.395 by root, Thu Apr 1 00:41:07 2010 UTC

… …
97/* 97/*
98 ***************************************************************************** 98 *****************************************************************************
99 * SYSTEM HACKS 99 * SYSTEM HACKS
100 ***************************************************************************** 100 *****************************************************************************
101 */ 101 */
102/* Consistent defines - please report on the necessity
103 * @ Unixware: defines (__svr4__)
104 */
105#if defined (SVR4) && !defined (__svr4__)
106# define __svr4__ 1
107#endif
108#if defined (sun) && !defined (__sun__)
109# define __sun__ 1
110#endif
111 102
112#ifndef HAVE_XPOINTER 103#ifndef HAVE_XPOINTER
113typedef char *XPointer; 104typedef char *XPointer;
114#endif 105#endif
115 106
116#include <termios.h> 107#include <termios.h>
117typedef struct termios ttymode_t;
118 108
119#include "background.h" 109#include "background.h"
120 110
121#ifndef STDIN_FILENO 111#ifndef STDIN_FILENO
122# define STDIN_FILENO 0 112# define STDIN_FILENO 0
123# define STDOUT_FILENO 1 113# define STDOUT_FILENO 1
124# define STDERR_FILENO 2 114# define STDERR_FILENO 2
125#endif
126
127#if !defined (EACCESS) && defined(EAGAIN)
128# define EACCESS EAGAIN
129#endif 115#endif
130 116
131#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
132# define EXIT_SUCCESS 0 /* exit function success */ 118# define EXIT_SUCCESS 0 /* exit function success */
133# define EXIT_FAILURE 1 /* exit function failure */ 119# define EXIT_FAILURE 1 /* exit function failure */
… …
161char * rxvt_wcstombs (const wchar_t *str, int len = -1); 147char * rxvt_wcstombs (const wchar_t *str, int len = -1);
162wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 148wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
163char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 149char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
164wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 150wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
165 151
166char * rxvt_basename (const char *str) NOTHROW; 152const char * rxvt_basename (const char *str) NOTHROW;
167void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
168void rxvt_log (const char *fmt,...) NOTHROW; 154void rxvt_log (const char *fmt,...) NOTHROW;
169void rxvt_warn (const char *fmt,...) NOTHROW; 155void rxvt_warn (const char *fmt,...) NOTHROW;
170void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
171void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
… …
210 ***************************************************************************** 196 *****************************************************************************
211 * STRUCTURES AND TYPEDEFS 197 * STRUCTURES AND TYPEDEFS
212 ***************************************************************************** 198 *****************************************************************************
213 */ 199 */
214 200
215/* If we're using either the rxvt scrollbar, keep the
216 * scrollColor resource.
217 */
218#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
219# define KEEP_SCROLLCOLOR 1
220#else
221# undef KEEP_SCROLLCOLOR
222#endif
223
224/* 201/*
225 * the 'essential' information for reporting Mouse Events 202 * the 'essential' information for reporting Mouse Events
226 * pared down from XButtonEvent 203 * pared down from XButtonEvent
227 */ 204 */
228struct mouse_event { 205struct mouse_event
206{
229 int clicks; 207 int clicks;
230 Time time; /* milliseconds */ 208 Time time; /* milliseconds */
231 unsigned int state; /* key or button mask */ 209 unsigned int state; /* key or button mask */
232 unsigned int button; /* detail */ 210 unsigned int button; /* detail */
233}; 211};
… …
278# define NO_MOUSE_REPORT_SCROLLBAR 1 256# define NO_MOUSE_REPORT_SCROLLBAR 1
279#endif 257#endif
280 258
281#define scrollBar_esc 30 259#define scrollBar_esc 30
282 260
283#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 261#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR)
284# define HAVE_SCROLLBARS 1 262# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
285#endif 263#endif
286 264
287enum { 265enum {
288 NO_REFRESH = 0, /* Window not visible at all! */ 266 NO_REFRESH = 0, /* Window not visible at all! */
289 FAST_REFRESH = 1, /* Fully exposed window */ 267 FAST_REFRESH = 1, /* Fully exposed window */
… …
328 SECONDARY, 306 SECONDARY,
329}; 307};
330 308
331#define RS_None 0 309#define RS_None 0
332 310
333#define RS_fgMask 0x0000007fUL // 128 colors 311#define RS_colorMask ((1UL << Color_Bits) - 1UL)
334#define RS_bgMask 0x00003f80UL // 128 colors 312#define RS_bgShift 0
313#define RS_fgShift (RS_bgShift + Color_Bits)
314#define RS_bgMask (RS_colorMask << RS_bgShift)
315#define RS_fgMask (RS_colorMask << RS_fgShift)
335 316
336// font styles 317// font styles
337#define RS_Bold 0x00004000UL // value 1 318#define RS_Bold 0x08000000UL // value 1
338#define RS_Italic 0x00008000UL // value 2 319#define RS_Italic 0x10000000UL // value 2
339 320
340// fake styles 321// fake styles
341#define RS_Blink 0x00010000UL // blink 322#define RS_Blink 0x20000000UL // blink
342#define RS_RVid 0x00020000UL // reverse video 323#define RS_RVid 0x40000000UL // reverse video
343#define RS_Uline 0x00040000UL // underline 324#define RS_Uline 0x80000000UL // underline
344
345// toggle this to force redraw, must be != RS_Careful
346#define RS_redraw 0x01000000UL
347 325
348// 5 custom bits for extensions 326// 5 custom bits for extensions
349#define RS_customCount 32 327#define RS_customCount 16UL
350#define RS_customMask 0x00f80000UL
351#define RS_customShift 19 328#define RS_customShift 23
329#define RS_customMask ((RS_customCount - 1UL) << RS_customShift)
352 330
353// other flags 331// must have space for rxvt_fontset::fontCount * 2 + 2 values
332#define RS_fontShift (RS_fgShift + Color_Bits)
354#define RS_Careful 0x80000000UL /* be careful when drawing these */ 333#define RS_Careful (1UL << RS_fontShift) /* be careful when drawing these */
334#define RS_fontMask ((rxvt_fontset::fontCount << (RS_fontShift + 1)) | RS_Careful) // includes RS_Careful
335
336// toggle this to force redraw, must be != RS_Careful and otherwise "pretty neutral"
337#define RS_redraw (2UL << RS_fontShift)
355 338
356#define RS_styleCount 4 339#define RS_styleCount 4
357#define RS_styleMask (RS_Bold | RS_Italic) 340#define RS_styleMask (RS_Bold | RS_Italic)
358#define RS_styleShift 14 341#define RS_styleShift 27
359 342
360#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 343#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
361#define RS_attrMask (RS_baseattrMask | RS_fontMask) 344#define RS_attrMask (RS_baseattrMask | RS_fontMask)
362 345
363#define RS_fontCount 127 // not 127 or 256, see rxvtfont.h
364#define RS_fontMask 0xff000000UL // plenty(?) of fonts, includes RS_Careful
365#define RS_fontShift 24
366
367#define DEFAULT_RSTYLE (RS_None | Color_fg | (Color_bg << Color_Bits)) 346#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
368#define OVERLAY_RSTYLE (RS_None | Color_Black | (Color_Yellow << Color_Bits)) 347#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
369 348
370#define Sel_none 0 /* Not waiting */ 349#define Sel_none 0 /* Not waiting */
371#define Sel_normal 0x01 /* normal selection */ 350#define Sel_normal 0x01 /* normal selection */
372#define Sel_incr 0x02 /* incremental selection */ 351#define Sel_incr 0x02 /* incremental selection */
373#define Sel_direct 0x00 352#define Sel_direct 0x00
… …
395 XTerm_name = 0, 374 XTerm_name = 0,
396 XTerm_iconName = 1, 375 XTerm_iconName = 1,
397 XTerm_title = 2, 376 XTerm_title = 2,
398 XTerm_property = 3, // change X property 377 XTerm_property = 3, // change X property
399 XTerm_Color = 4, // change colors 378 XTerm_Color = 4, // change colors
400 XTerm_Color00 = 10, // not implemented, CLASH! 379 XTerm_Color00 = 10, // change fg color
401 XTerm_Color01 = 11, // not implemented 380 XTerm_Color01 = 11, // change bg color
402 XTerm_Color_cursor = 12, // change actual 'Cursor' color 381 XTerm_Color_cursor = 12, // change actual 'Cursor' color
403 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 382 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
404 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 383 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
405 XTerm_Color05 = 15, // not implemented (tektronix fg) 384 XTerm_Color05 = 15, // not implemented (tektronix fg)
406 XTerm_Color06 = 16, // not implemented (tektronix bg) 385 XTerm_Color06 = 16, // not implemented (tektronix bg)
… …
411 XTerm_konsole30 = 30, // reserved for konsole 390 XTerm_konsole30 = 30, // reserved for konsole
412 XTerm_konsole31 = 31, // reserved for konsole 391 XTerm_konsole31 = 31, // reserved for konsole
413 XTerm_emacs51 = 51, // reserved for emacs shell 392 XTerm_emacs51 = 51, // reserved for emacs shell
414 /* 393 /*
415 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 394 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
416 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
417 */ 395 */
418 Rxvt_Color_BD = 18, // change actual 'Bold' color 396
419 Rxvt_Color_UL = 19, // change actual 'Underline' color 397 // deprecated
398 Rxvt_Color_BD = 18,
399 Rxvt_Color_UL = 19,
400 Rxvt_restoreFG = 39,
401 Rxvt_restoreBG = 49,
402
420 Rxvt_Pixmap = 20, // new bg pixmap 403 Rxvt_Pixmap = 20, // new bg pixmap
421 Rxvt_restoreFG = 39, // change default fg color
422 Rxvt_restoreBG = 49, // change default bg color
423 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 404 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
424 405
425 URxvt_locale = 701, // change locale 406 URxvt_locale = 701, // change locale
426 URxvt_version = 702, // request version 407 URxvt_version = 702, // request version
427 408
428 URxvt_Color_IT = 704, // change actual 'Italic' colour 409 URxvt_Color_IT = 704, // change actual 'Italic' colour
429 URxvt_Color_tint = 705, // change actual tint colour 410 URxvt_Color_tint = 705, // change actual tint colour
411 URxvt_Color_BD = 706, // change actual 'Bold' color
412 URxvt_Color_UL = 707, // change actual 'Underline' color
430 URxvt_Color_BD = 706, 413 URxvt_Color_border = 708,
431 URxvt_Color_UL = 707,
432 414
433 URxvt_font = 710, 415 URxvt_font = 710,
434 URxvt_boldFont = 711, 416 URxvt_boldFont = 711,
435 URxvt_italicFont = 712, 417 URxvt_italicFont = 712,
436 URxvt_boldItalicFont = 713, 418 URxvt_boldItalicFont = 713,
437 419
438 URxvt_view_up = 720, 420 URxvt_view_up = 720,
439 URxvt_view_down = 721, 421 URxvt_view_down = 721,
440 422
441 URxvt_perl = 777, 423 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
442}; 424};
443 425
444/* Words starting with `Color_' are colours. Others are counts */ 426/* Words starting with `Color_' are colours. Others are counts */
445/* 427/*
446 * The PixColor and rendition colour usage should probably be decoupled 428 * The PixColor and rendition colour usage should probably be decoupled
… …
476 Color_White = maxBrightCOLOR, 458 Color_White = maxBrightCOLOR,
477#else 459#else
478 Color_White = maxCOLOR, 460 Color_White = maxCOLOR,
479#endif 461#endif
480 minTermCOLOR = Color_White + 1, 462 minTermCOLOR = Color_White + 1,
463#ifndef USE_256_COLORS
481 maxTermCOLOR = Color_White + 72, 464 maxTermCOLOR = Color_White + 72,
465#else
466 maxTermCOLOR = Color_White + 240,
467#endif
482#ifndef NO_CURSORCOLOR 468#ifndef NO_CURSORCOLOR
483 Color_cursor, 469 Color_cursor,
484 Color_cursor2, 470 Color_cursor2,
485#endif 471#endif
486 Color_pointer_fg, 472 Color_pointer_fg,
… …
496 Color_underline, 482 Color_underline,
497#endif 483#endif
498#ifdef OPTION_HC 484#ifdef OPTION_HC
499 Color_HC, 485 Color_HC,
500#endif 486#endif
501#ifdef KEEP_SCROLLCOLOR
502 Color_scroll, 487 Color_scroll,
488#ifdef RXVT_SCROLLBAR
503 Color_trough, 489 Color_trough,
504#endif 490#endif
505#if ENABLE_TRANSPARENCY 491#if ENABLE_TRANSPARENCY
506 Color_tint, 492 Color_tint,
507#endif 493#endif
508#if OFF_FOCUS_FADING 494#if OFF_FOCUS_FADING
509 Color_fade, 495 Color_fade,
510#endif 496#endif
511 NRS_COLORS, /* */ 497 NRS_COLORS, /* */
512#ifdef KEEP_SCROLLCOLOR 498#ifdef RXVT_SCROLLBAR
513 Color_topShadow = NRS_COLORS, 499 Color_topShadow = NRS_COLORS,
514 Color_bottomShadow, 500 Color_bottomShadow,
515 TOTAL_COLORS 501 TOTAL_COLORS
516#else 502#else
517 TOTAL_COLORS = NRS_COLORS 503 TOTAL_COLORS = NRS_COLORS
518#endif 504#endif
519}; 505};
520 506
507#ifndef USE_256_COLORS
521#define Color_Bits 7 // 0 .. maxTermCOLOR 508#define Color_Bits 7 // 0 .. maxTermCOLOR
509#else
510#define Color_Bits 9 // 0 .. maxTermCOLOR
511#endif
522 512
523/* 513/*
524 * Resource list 514 * Resource list
525 */ 515 */
526enum { 516enum {
… …
553#define PrivMode_smoothScroll (1UL<<17) 543#define PrivMode_smoothScroll (1UL<<17)
554#define PrivMode_vt52 (1UL<<18) 544#define PrivMode_vt52 (1UL<<18)
555#define PrivMode_LFNL (1UL<<19) 545#define PrivMode_LFNL (1UL<<19)
556#define PrivMode_MouseBtnEvent (1UL<<20) 546#define PrivMode_MouseBtnEvent (1UL<<20)
557#define PrivMode_MouseAnyEvent (1UL<<21) 547#define PrivMode_MouseAnyEvent (1UL<<21)
548#define PrivMode_BracketPaste (1UL<<22)
558 549
559#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 550#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
560 551
561#ifdef ALLOW_132_MODE 552#ifdef ALLOW_132_MODE
562# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 553# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
566 557
567// do not change these constants lightly, there are many interdependencies 558// do not change these constants lightly, there are many interdependencies
568#define IMBUFSIZ 128 // input modifier buffer sizes 559#define IMBUFSIZ 128 // input modifier buffer sizes
569#define KBUFSZ 512 // size of keyboard mapping buffer 560#define KBUFSZ 512 // size of keyboard mapping buffer
570#define CBUFSIZ 2048 // size of command buffer 561#define CBUFSIZ 2048 // size of command buffer
562#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
571#define UBUFSIZ 2048 // character buffer 563#define UBUFSIZ 2048 // character buffer
572 564
573#if ENABLE_FRILLS 565#if ENABLE_FRILLS
574# include <X11/Xmd.h> 566# include <X11/Xmd.h>
575typedef struct _mwmhints { 567typedef struct _mwmhints
568{
576 CARD32 flags; 569 CARD32 flags;
577 CARD32 functions; 570 CARD32 functions;
578 CARD32 decorations; 571 CARD32 decorations;
579 INT32 input_mode; 572 INT32 input_mode;
580 CARD32 status; 573 CARD32 status;
… …
627#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 620#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
628#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 621#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
629#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 622#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
630#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 623#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
631 624
632#define LINENO(n) MOD (term_start + int(n), total_rows) 625#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
633#define ROW(n) row_buf [LINENO (n)] 626#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
627
628#define LINENO(n) LINENO_of (this, n)
629#define ROW(n) ROW_of (this, n)
634 630
635/* how to build & extract colors and attributes */ 631/* how to build & extract colors and attributes */
636#define GET_BASEFG(x) (((x) & RS_fgMask)) 632#define GET_BASEFG(x) (((x) & RS_fgMask) >> RS_fgShift)
637#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 633#define GET_BASEBG(x) (((x) & RS_bgMask) >> RS_bgShift)
638 634
639#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 635#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
640#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 636#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
641 637
642#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 638#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
643#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift)) 639#define SET_STYLE(x,style) (((x) & ~RS_styleMask) | ((style) << RS_styleShift))
644 640
645#define GET_ATTR(x) (((x) & RS_attrMask)) 641#define GET_ATTR(x) (((x) & RS_attrMask))
646#define GET_BGATTR(x) \ 642#define GET_BGATTR(x) \
647 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \ 643 (((x) & RS_RVid) ? (((x) & (RS_attrMask & ~RS_RVid)) \
648 | (((x) & RS_fgMask)<<Color_Bits)) \ 644 | (((x) & RS_colorMask) << RS_bgShift)) \
649 : ((x) & (RS_attrMask | RS_bgMask))) 645 : ((x) & (RS_attrMask | RS_bgMask)))
650#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | (fg)) 646#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
651#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 647#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
652#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 648#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
653 649
654#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 650#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
655 651
656#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 652#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
657#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 653#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
658 654
659#if ENABLE_STYLES 655#if ENABLE_STYLES
660# define FONTSET(style) fontset[GET_STYLE (style)] 656# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
661#else 657#else
662# define FONTSET(style) fontset[0] 658# define FONTSET_of(t,style) (t)->fontset[0]
663#endif 659#endif
664 660
665#ifdef HAVE_SCROLLBARS 661#define FONTSET(style) FONTSET_of (this, style)
666# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
667#else
668# define scrollbar_TotalWidth() (0)
669#endif
670 662
671typedef callback<void (const char *)> log_callback; 663typedef callback<void (const char *)> log_callback;
672typedef callback<int (int)> getfd_callback; 664typedef callback<int (int)> getfd_callback;
673 665
674/****************************************************************************/ 666/****************************************************************************/
… …
677#define LINE_FILTERED 0x0002 // line has been filtered 669#define LINE_FILTERED 0x0002 // line has been filtered
678#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 670#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
679#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 671#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
680#define LINE_BIDI 0x0010 // line needs bidi (NYI) 672#define LINE_BIDI 0x0010 // line needs bidi (NYI)
681 673
682struct line_t { 674struct line_t
675{
683 text_t *t; // terminal the text 676 text_t *t; // terminal the text
684 rend_t *r; // rendition, uses RS_ flags 677 rend_t *r; // rendition, uses RS_ flags
685 tlen_t_ l; // length of each text line 678 tlen_t_ l; // length of each text line
686 uint32_t f; // flags 679 uint32_t f; // flags
687 680
… …
721}; 714};
722 715
723/****************************************************************************/ 716/****************************************************************************/
724 717
725// primitive wrapper around mbstate_t to ensure initialisation 718// primitive wrapper around mbstate_t to ensure initialisation
726struct mbstate { 719struct mbstate
720{
727 mbstate_t mbs; 721 mbstate_t mbs;
728 722
729 operator mbstate_t *() { return &mbs; } 723 operator mbstate_t *() { return &mbs; }
730 void reset () { memset (&mbs, 0, sizeof (mbs)); } 724 void reset () { memset (&mbs, 0, sizeof (mbs)); }
731 mbstate () { reset (); } 725 mbstate () { reset (); }
… …
752 746
753#if ENABLE_COMBINING 747#if ENABLE_COMBINING
754// compose chars are used to represent composite characters 748// compose chars are used to represent composite characters
755// that are not representable in unicode, as well as characters 749// that are not representable in unicode, as well as characters
756// not fitting in the BMP. 750// not fitting in the BMP.
757struct compose_char { 751struct compose_char
752{
758 unicode_t c1, c2; // any chars != NOCHAR are valid 753 unicode_t c1, c2; // any chars != NOCHAR are valid
759 compose_char (unicode_t c1, unicode_t c2) 754 compose_char (unicode_t c1, unicode_t c2)
760 : c1(c1), c2(c2) 755 : c1(c1), c2(c2)
761 { } 756 { }
762}; 757};
763 758
764class rxvt_composite_vec { 759class rxvt_composite_vec
760{
765 vector<compose_char> v; 761 vector<compose_char> v;
766public: 762public:
767 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 763 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
768 int expand (unicode_t c, wchar_t *r); 764 int expand (unicode_t c, wchar_t *r);
769 compose_char *operator [](text_t c) 765 compose_char *operator [](text_t c)
… …
788extern rxvt_t rxvt_current_term; 784extern rxvt_t rxvt_current_term;
789 785
790#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 786#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
791#define GET_R rxvt_current_term 787#define GET_R rxvt_current_term
792 788
789/* ------------------------------------------------------------------------- */
790struct overlay_base
791{
792 int x, y, w, h; // overlay dimensions
793 text_t **text;
794 rend_t **rend;
795
796 // while tempting to add swap() etc. here, it effetcively only increases code size
797};
798
799/* ------------------------------------------------------------------------- */
800
793typedef struct { 801typedef struct
802{
794 int row; 803 int row;
795 int col; 804 int col;
796} row_col_t; 805} row_col_t;
797 806
798/* 807/*
… …
823 * +------------+·display·+·= term_start 832 * +------------+·display·+·= term_start
824 * | terminal | display | 833 * | terminal | display |
825 * | terminal +---------+ 834 * | terminal +---------+
826 * | terminal | 835 * | terminal |
827 * | terminal | 836 * | terminal |
828 * +------------+···········= term_stat + nrow - 1 837 * +------------+···········= term_start + nrow - 1
829 * | 838 * |
830 * | 839 * |
831 * END······················= total_rows 840 * END······················= total_rows
832 */ 841 */
833 842
834struct TermWin_t { 843struct TermWin_t
844{
835 int width; /* window width [pixels] */ 845 int width; /* window width [pixels] */
836 int height; /* window height [pixels] */ 846 int height; /* window height [pixels] */
837 int fwidth; /* font width [pixels] */ 847 int fwidth; /* font width [pixels] */
838 int fheight; /* font height [pixels] */ 848 int fheight; /* font height [pixels] */
839 int fbase; /* font ascent (baseline) [pixels] */ 849 int fbase; /* font ascent (baseline) [pixels] */
… …
842 int focus; /* window has focus */ 852 int focus; /* window has focus */
843 int mapped; /* window state mapped? */ 853 int mapped; /* window state mapped? */
844 int int_bwidth; /* internal border width */ 854 int int_bwidth; /* internal border width */
845 int ext_bwidth; /* external border width */ 855 int ext_bwidth; /* external border width */
846 int lineSpace; /* number of extra pixels between rows */ 856 int lineSpace; /* number of extra pixels between rows */
857 int letterSpace; /* number of extra pixels between columns */
847 int saveLines; /* number of lines that fit in scrollback */ 858 int saveLines; /* number of lines that fit in scrollback */
848 int total_rows; /* total number of rows in this terminal */ 859 int total_rows; /* total number of rows in this terminal */
849 int term_start; /* term lines start here */ 860 int term_start; /* term lines start here */
850 int view_start; /* scrollback view starts here */ 861 int view_start; /* scrollback view starts here */
851 int top_row; /* topmost row index of scrollback */ 862 int top_row; /* topmost row index of scrollback */
… …
869 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 880 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
870 * nothing is selected 881 * nothing is selected
871 * beg: row/column of beginning of selection : never past mark 882 * beg: row/column of beginning of selection : never past mark
872 * mark: row/column of initial click : never past end 883 * mark: row/column of initial click : never past end
873 * end: row/column of one character past end of selection 884 * end: row/column of one character past end of selection
874 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 885 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
875 * * Note: col == -1 ==> we're left of screen 886 * * Note: col == -1 ==> we're left of screen
876 * 887 *
877 */ 888 */
878typedef struct { 889struct screen_t
890{
879 row_col_t cur; /* cursor position on the screen */ 891 row_col_t cur; /* cursor position on the screen */
880 int tscroll; /* top of settable scroll region */ 892 int tscroll; /* top of settable scroll region */
881 int bscroll; /* bottom of settable scroll region */ 893 int bscroll; /* bottom of settable scroll region */
882 unsigned int charset; /* character set number [0..3] */ 894 unsigned int charset; /* character set number [0..3] */
883 unsigned int flags; /* see below */ 895 unsigned int flags; /* see below */
884 row_col_t s_cur; /* saved cursor position */ 896 row_col_t s_cur; /* saved cursor position */
885 unsigned int s_charset; /* saved character set number [0..3] */ 897 unsigned int s_charset; /* saved character set number [0..3] */
886 char s_charset_char; 898 char s_charset_char;
887 rend_t s_rstyle; /* saved rendition style */ 899 rend_t s_rstyle; /* saved rendition style */
888} screen_t; 900};
889 901
890enum selection_op_t { 902enum selection_op_t
903{
891 SELECTION_CLEAR = 0, /* nothing selected */ 904 SELECTION_CLEAR = 0, /* nothing selected */
892 SELECTION_INIT, /* marked a point */ 905 SELECTION_INIT, /* marked a point */
893 SELECTION_BEGIN, /* started a selection */ 906 SELECTION_BEGIN, /* started a selection */
894 SELECTION_CONT, /* continued selection */ 907 SELECTION_CONT, /* continued selection */
895 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 908 SELECTION_DONE /* selection put in CUT_BUFFER0 */
896}; 909};
897 910
898typedef struct { 911struct selection_t
912{
899 wchar_t *text; /* selected text */ 913 wchar_t *text; /* selected text */
900 unsigned int len; /* length of selected text */ 914 unsigned int len; /* length of selected text */
901 unsigned int screen; /* screen being used */ 915 unsigned int screen; /* screen being used */
902 unsigned int clicks; /* number of clicks */ 916 unsigned int clicks; /* number of clicks */
903 selection_op_t op; /* current operation */ 917 selection_op_t op; /* current operation */
904 bool rect; /* rectangular selection? */ 918 bool rect; /* rectangular selection? */
905 row_col_t beg; /* beginning of selection <= mark */ 919 row_col_t beg; /* beginning of selection <= mark */
906 row_col_t mark; /* point of initial click <= end */ 920 row_col_t mark; /* point of initial click <= end */
907 row_col_t end; /* one character past end point */ 921 row_col_t end; /* one character past end point */
908} selection_t; 922 wchar_t *clip_text; /* text copied to the clipboard */
923 unsigned int clip_len; /* length of clipboard text */
924};
909 925
910/* ------------------------------------------------------------------------- */ 926/* ------------------------------------------------------------------------- */
911 927
912/* screen_t flags */ 928/* screen_t flags */
913#define Screen_Relative (1<<0) /* relative origin mode flag */ 929#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
927Opt_count 943Opt_count
928}; 944};
929 945
930/* ------------------------------------------------------------------------- */ 946/* ------------------------------------------------------------------------- */
931 947
932struct rxvt_vars : TermWin_t { 948struct rxvt_vars : TermWin_t
949{
933 scrollBar_t scrollBar; 950 scrollBar_t scrollBar;
934 uint8_t options[(Opt_count + 7) >> 3]; 951 uint8_t options[(Opt_count + 7) >> 3];
935 XSizeHints szHint; 952 XSizeHints szHint;
936 rxvt_color *pix_colors; 953 rxvt_color *pix_colors;
937 Cursor TermWin_cursor; /* cursor for vt window */ 954 Cursor TermWin_cursor; /* cursor for vt window */
938 int sb_shadow; /* scrollbar shadow width */
939 int numlock_state; 955 int numlock_state;
940 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 956 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
941 line_t *drawn_buf; // text on screen 957 line_t *drawn_buf; // text on screen
942 line_t *swap_buf; // lines for swap buffer 958 line_t *swap_buf; // lines for swap buffer
943 char *tabs; /* per location: 1 == tab-stop */ 959 char *tabs; /* per location: 1 == tab-stop */
… …
948#ifdef OFF_FOCUS_FADING 964#ifdef OFF_FOCUS_FADING
949 rxvt_color pix_colors_unfocused[TOTAL_COLORS]; 965 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
950#endif 966#endif
951}; 967};
952 968
953struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 969struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
970{
954 971
955 // special markers with magic addresses 972 // special markers with magic addresses
956 static const char resval_undef []; // options specifically unset 973 static const char resval_undef []; // options specifically unset
957 static const char resval_on []; // boolean options switched on 974 static const char resval_on []; // boolean options switched on
958 static const char resval_off []; // or off 975 static const char resval_off []; // or off
… …
966 983
967 unsigned char want_refresh:1, 984 unsigned char want_refresh:1,
968 current_screen:1, /* primary or secondary */ 985 current_screen:1, /* primary or secondary */
969 num_scr_allow:1, 986 num_scr_allow:1,
970 bypass_keystate:1, 987 bypass_keystate:1,
988#if ENABLE_FRILLS
989 urgency_hint:1,
990#endif
971#ifdef CURSOR_BLINK 991#if CURSOR_BLINK
972 hidden_cursor:1, 992 hidden_cursor:1,
973#endif 993#endif
974#ifdef TEXT_BLINK 994#if TEXT_BLINK
975 hidden_text:1, 995 hidden_text:1,
976#endif 996#endif
977#ifdef POINTER_BLANK 997#if POINTER_BLANK
978 hidden_pointer:1, 998 hidden_pointer:1,
979#endif 999#endif
980 enc_utf8:1, /* wether locale uses utf-8 */ 1000 enc_utf8:1, /* whether locale uses utf-8 */
981 seen_input:1, /* wether we have seen some program output yet */ 1001 seen_input:1, /* whether we have seen some program output yet */
982 seen_resize:1, /* wether we had a resize event */ 1002 seen_resize:1, /* whether we had a resize event */
983 parsed_geometry:1; 1003 parsed_geometry:1;
984 1004
985 unsigned char refresh_type, 1005 unsigned char refresh_type,
986#ifdef META8_OPTION 1006#ifdef META8_OPTION
987 meta_char, /* Alt-key prefix */ 1007 meta_char, /* Alt-key prefix */
988#endif 1008#endif
989 scrollbar_align,
990 selection_wait, 1009 selection_wait,
991 selection_type; 1010 selection_type;
992/* ---------- */ 1011/* ---------- */
993 bool rvideo_state, rvideo_mode; 1012 bool rvideo_state, rvideo_mode;
994#ifndef NO_BELL 1013#ifndef NO_BELL
995 bool rvideo_bell; 1014 bool rvideo_bell;
996#endif 1015#endif
997 int num_scr; /* screen: number lines scrolled */ 1016 int num_scr; /* screen: number of lines scrolled */
998 int prev_ncol, /* screen: previous number of columns */ 1017 int prev_ncol, /* screen: previous number of columns */
999 prev_nrow; /* screen: previous number of rows */ 1018 prev_nrow; /* screen: previous number of rows */
1000/* ---------- */ 1019/* ---------- */
1001 rend_t rstyle; 1020 rend_t rstyle;
1002/* ---------- */ 1021/* ---------- */
… …
1012 /* give proper Scroll behaviour */ 1031 /* give proper Scroll behaviour */
1013#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1032#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1014 mouse_slip_wheel_speed, 1033 mouse_slip_wheel_speed,
1015#endif 1034#endif
1016 refresh_count, 1035 refresh_count,
1017 last_bot, /* scrollbar last bottom position */
1018 last_top, /* scrollbar last top position */
1019 last_state, /* scrollbar last state */
1020 scrollbar_len,
1021 window_vt_x, 1036 window_vt_x,
1022 window_vt_y, 1037 window_vt_y,
1023 window_sb_x,
1024 mouse_row, 1038 mouse_row,
1025 mouse_col, 1039 mouse_col,
1026# ifdef POINTER_BLANK 1040# ifdef POINTER_BLANK
1027 pointerBlankDelay, 1041 pointerBlankDelay,
1028# endif 1042# endif
… …
1036 unsigned long priv_modes, 1050 unsigned long priv_modes,
1037 SavedModes; 1051 SavedModes;
1038/* ---------- */ 1052/* ---------- */
1039 Atom *xa; 1053 Atom *xa;
1040/* ---------- */ 1054/* ---------- */
1041#ifdef RXVT_SCROLLBAR
1042 GC scrollbarGC,
1043 topShadowGC,
1044 botShadowGC;
1045#endif
1046#ifdef XTERM_SCROLLBAR
1047 GC xscrollbarGC,
1048 ShadowGC;
1049#endif
1050#ifdef PLAIN_SCROLLBAR
1051 GC pscrollbarGC;
1052#endif
1053#ifdef NEXT_SCROLLBAR
1054 GC blackGC,
1055 whiteGC,
1056 grayGC,
1057 darkGC,
1058 stippleGC;
1059 Pixmap dimple,
1060 upArrow,
1061 downArrow,
1062 upArrowHi,
1063 downArrowHi;
1064#endif
1065/* ---------- */
1066 Time selection_time, 1055 Time selection_time,
1067 selection_request_time; 1056 selection_request_time,
1057 clipboard_time;
1068 pid_t cmd_pid; /* process id of child */ 1058 pid_t cmd_pid; /* process id of child */
1069 char * incr_buf; 1059 char * incr_buf;
1070 size_t incr_buf_size, incr_buf_fill; 1060 size_t incr_buf_size, incr_buf_fill;
1071/* ---------- */ 1061/* ---------- */
1072 Cursor leftptr_cursor;
1073/* ---------- */
1074 struct mouse_event MEvent; 1062 struct mouse_event MEvent;
1075 XComposeStatus compose; 1063 XComposeStatus compose;
1076 ttymode_t tio; 1064 struct termios tio;
1077 row_col_t oldcursor; 1065 row_col_t oldcursor;
1078#ifdef HAVE_BG_PIXMAP 1066#ifdef HAVE_BG_PIXMAP
1079 bgPixmap_t bgPixmap; 1067 bgPixmap_t bgPixmap;
1080#endif 1068#endif
1081#ifdef HAVE_AFTERIMAGE 1069#ifdef HAVE_AFTERIMAGE
1082 ASVisual *asv; 1070 ASVisual *asv;
1083 ASImageManager *asimman; 1071 ASImageManager *asimman;
1072
1073 void init_asv ()
1074 {
1075 if (!asv)
1076 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1077 }
1084#endif 1078#endif
1085 1079
1086#if ENABLE_OVERLAY 1080#if ENABLE_OVERLAY
1087 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1081 overlay_base ov;
1088 text_t **ov_text;
1089 rend_t **ov_rend;
1090 1082
1091 void scr_swap_overlay () NOTHROW; 1083 void scr_swap_overlay () NOTHROW;
1092 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1084 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1093 void scr_overlay_off () NOTHROW; 1085 void scr_overlay_off () NOTHROW;
1094 void scr_overlay_set (int x, int y, 1086 void scr_overlay_set (int x, int y,
… …
1132 1124
1133#if ENABLE_FRILLS || ISO_14755 1125#if ENABLE_FRILLS || ISO_14755
1134 // ISO 14755 entry support 1126 // ISO 14755 entry support
1135 unicode_t iso14755buf; 1127 unicode_t iso14755buf;
1136 void commit_iso14755 (); 1128 void commit_iso14755 ();
1137 int hex_keyval (XKeyEvent &ev);
1138# if ISO_14755 1129# if ISO_14755
1139 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1130 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1140 void iso14755_54 (int x, int y); 1131 void iso14755_54 (int x, int y);
1141# endif 1132# endif
1142#endif 1133#endif
… …
1163#endif 1154#endif
1164 1155
1165 void x_cb (XEvent &xev); 1156 void x_cb (XEvent &xev);
1166 xevent_watcher termwin_ev; 1157 xevent_watcher termwin_ev;
1167 xevent_watcher vt_ev; 1158 xevent_watcher vt_ev;
1168#ifdef HAVE_SCROLLBARS
1169 xevent_watcher scrollbar_ev; 1159 xevent_watcher scrollbar_ev;
1170#endif
1171 1160
1172 void child_cb (ev::child &w, int revents); ev::child child_ev; 1161 void child_cb (ev::child &w, int revents); ev::child child_ev;
1173 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1162 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1174 void refresh_check (); 1163 void refresh_check ();
1175 void flush (); 1164 void flush ();
… …
1248 wchar_t next_char () NOTHROW; 1237 wchar_t next_char () NOTHROW;
1249 wchar_t cmd_getc () THROW ((class out_of_input)); 1238 wchar_t cmd_getc () THROW ((class out_of_input));
1250 uint32_t next_octet () NOTHROW; 1239 uint32_t next_octet () NOTHROW;
1251 uint32_t cmd_get8 () THROW ((class out_of_input)); 1240 uint32_t cmd_get8 () THROW ((class out_of_input));
1252 1241
1253 bool cmd_parse (); 1242 void cmd_parse ();
1254 void mouse_report (XButtonEvent &ev); 1243 void mouse_report (XButtonEvent &ev);
1255 void button_press (XButtonEvent &ev); 1244 void button_press (XButtonEvent &ev);
1256 void button_release (XButtonEvent &ev); 1245 void button_release (XButtonEvent &ev);
1257 void focus_in (); 1246 void focus_in ();
1258 void focus_out (); 1247 void focus_out ();
1248#if ENABLE_FRILLS
1249 void set_urgency (bool enable);
1250#else
1251 void set_urgency (bool enable) { }
1252#endif
1259 void update_fade_color (unsigned int idx); 1253 void update_fade_color (unsigned int idx);
1260#ifdef PRINTPIPE 1254#ifdef PRINTPIPE
1261 FILE *popen_printer (); 1255 FILE *popen_printer ();
1262 int pclose_printer (FILE *stream); 1256 int pclose_printer (FILE *stream);
1263#endif 1257#endif
… …
1269 void process_window_ops (const int *args, unsigned int nargs); 1263 void process_window_ops (const int *args, unsigned int nargs);
1270 char *get_to_st (unicode_t &ends_how); 1264 char *get_to_st (unicode_t &ends_how);
1271 void process_dcs_seq (); 1265 void process_dcs_seq ();
1272 void process_osc_seq (); 1266 void process_osc_seq ();
1273 void process_color_seq (int report, int color, const char *str, char resp); 1267 void process_color_seq (int report, int color, const char *str, char resp);
1274 void process_xterm_seq (int op, const char *str, char resp); 1268 void process_xterm_seq (int op, char *str, char resp);
1275 int privcases (int mode, unsigned long bit); 1269 int privcases (int mode, unsigned long bit);
1276 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1270 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1277 void process_sgr_mode (unsigned int nargs, const int *arg); 1271 void process_sgr_mode (unsigned int nargs, const int *arg);
1278 void process_graphics (); 1272 void process_graphics ();
1279 // init.C 1273 // init.C
1280 void init_vars (); 1274 void init_vars ();
1281 void init_secondary ();
1282 const char **init_resources (int argc, const char *const *argv); 1275 const char **init_resources (int argc, const char *const *argv);
1276 void init (int argc, const char *const *argv, stringvec *envv);
1283 void init_env (); 1277 void init_env ();
1284 void set_locale (const char *locale); 1278 void set_locale (const char *locale);
1285 void init_xlocale (); 1279 void init_xlocale ();
1286 void init_command (const char *const *argv); 1280 void init_command (const char *const *argv);
1287 void run_command (const char *const *argv); 1281 void run_command (const char *const *argv);
1288 int run_child (const char *const *argv); 1282 int run_child (const char *const *argv);
1289 void color_aliases (int idx); 1283 void color_aliases (int idx);
1290 void create_windows (int argc, const char *const *argv); 1284 void create_windows (int argc, const char *const *argv);
1291 void Get_Colours (); 1285 void get_colours ();
1292 void get_ourmods (); 1286 void get_ourmods ();
1293 // main.C 1287 // main.C
1294 void tt_winch (); 1288 void tt_winch ();
1295 rxvt_term (); 1289 rxvt_term ();
1296 ~rxvt_term (); 1290 ~rxvt_term ();
1297 void destroy (); 1291 void destroy ();
1298 void emergency_cleanup (); 1292 void emergency_cleanup ();
1299 void init (int argc, const char *const *argv, stringvec *envv);
1300 void recolour_cursor (); 1293 void recolour_cursor ();
1301 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1294 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1302 void window_calc (unsigned int newwidth, unsigned int newheight); 1295 void window_calc (unsigned int newwidth, unsigned int newheight);
1303 bool set_fonts (); 1296 bool set_fonts ();
1304 void set_string_property (Atom prop, const char *str, int len = -1); 1297 void set_string_property (Atom prop, const char *str, int len = -1);
… …
1390 options[opt >> 3] |= (1 << (opt & 7)); 1383 options[opt >> 3] |= (1 << (opt & 7));
1391 else 1384 else
1392 options[opt >> 3] &= ~(1 << (opt & 7)); 1385 options[opt >> 3] &= ~(1 << (opt & 7));
1393 } 1386 }
1394 1387
1395 void PrivMode (int set, unsigned bit) NOTHROW 1388 void set_privmode (unsigned bit, int set) NOTHROW
1396 { 1389 {
1397 if (set) 1390 if (set)
1398 priv_modes |= bit; 1391 priv_modes |= bit;
1399 else 1392 else
1400 priv_modes &= ~bit; 1393 priv_modes &= ~bit;
… …
1402 1395
1403 // modifies first argument(!) 1396 // modifies first argument(!)
1404 void paste (char *data, unsigned int len) NOTHROW; 1397 void paste (char *data, unsigned int len) NOTHROW;
1405 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1398 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1406 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1399 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1400 void scr_kill_char (line_t &l, int col) const NOTHROW;
1407 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1401 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1408 void scr_reset (); 1402 void scr_reset ();
1409 void scr_release () NOTHROW; 1403 void scr_release () NOTHROW;
1410 void scr_clear (bool really = false) NOTHROW; 1404 void scr_clear (bool really = false) NOTHROW;
1411 void scr_refresh () NOTHROW; 1405 void scr_refresh () NOTHROW;
… …
1423 void scr_remap_chars (line_t &l) NOTHROW; 1417 void scr_remap_chars (line_t &l) NOTHROW;
1424 1418
1425 enum cursor_mode { SAVE, RESTORE }; 1419 enum cursor_mode { SAVE, RESTORE };
1426 1420
1427 void scr_poweron (); 1421 void scr_poweron ();
1422 void scr_soft_reset () NOTHROW;
1428 void scr_cursor (cursor_mode mode) NOTHROW; 1423 void scr_cursor (cursor_mode mode) NOTHROW;
1429 void scr_do_wrap () NOTHROW; 1424 void scr_do_wrap () NOTHROW;
1430 void scr_swap_screen () NOTHROW; 1425 void scr_swap_screen () NOTHROW;
1431 void scr_change_screen (int scrn); 1426 void scr_change_screen (int scrn);
1432 void scr_color (unsigned int color, int fgbg) NOTHROW; 1427 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1464 void selection_check (int check_more) NOTHROW; 1459 void selection_check (int check_more) NOTHROW;
1465 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW; 1460 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1466 void selection_property (Window win, Atom prop) NOTHROW; 1461 void selection_property (Window win, Atom prop) NOTHROW;
1467 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1462 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1468 int selection_request_other (Atom target, int selnum) NOTHROW; 1463 int selection_request_other (Atom target, int selnum) NOTHROW;
1469 void selection_clear () NOTHROW; 1464 void selection_clear (bool clipboard = false) NOTHROW;
1465 void clipboard_copy (Time tm);
1470 void selection_make (Time tm); 1466 void selection_make (Time tm);
1471 bool selection_grab (Time tm) NOTHROW; 1467 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1472 void selection_start_colrow (int col, int row) NOTHROW; 1468 void selection_start_colrow (int col, int row) NOTHROW;
1473 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1469 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
1474 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW; 1470 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW;
1475 void selection_remove_trailing_spaces () NOTHROW; 1471 void selection_remove_trailing_spaces () NOTHROW;
1476 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1472 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1477 void selection_click (int clicks, int x, int y) NOTHROW; 1473 void selection_click (int clicks, int x, int y) NOTHROW;
1478 void selection_extend (int x, int y, int flag) NOTHROW; 1474 void selection_extend (int x, int y, int flag) NOTHROW;
1479 void selection_rotate (int x, int y) NOTHROW; 1475 void selection_rotate (int x, int y) NOTHROW;
1480 1476
1481#if defined(NEXT_SCROLLBAR)
1482 // scrollbar-next.C
1483 Pixmap renderPixmap (const char *const *data, int width, int height);
1484 void init_scrollbar_stuff ();
1485 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1486 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1487#endif
1488
1489#if defined(RXVT_SCROLLBAR)
1490 // scrollbar-rxvt.C
1491 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1492#endif
1493
1494#if defined(XTERM_SCROLLBAR)
1495 // scrollbar-xterm.C
1496 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1497#endif
1498
1499#if defined(PLAIN_SCROLLBAR)
1500 // scrollbar-plain.C
1501 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1502#endif
1503
1504 // scrollbar.C
1505 void resize_scrollbar ();
1506 int scrollbar_mapping (int map);
1507 int scrollbar_show (int update);
1508 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1509
1510 // xdefaults.C 1477 // xdefaults.C
1511 void get_options (int argc, const char *const *argv); 1478 void get_options (int argc, const char *const *argv);
1512 int parse_keysym (const char *str, const char *arg); 1479 int parse_keysym (const char *str, const char *arg);
1513 const char *x_resource (const char *name); 1480 const char *x_resource (const char *name);
1514 void extract_resources (); 1481 void extract_resources ();

Diff Legend

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