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.340 by ayin, Fri Dec 28 14:00:47 2007 UTC vs.
Revision 1.377 by root, Sat May 30 08:51:23 2009 UTC

… …
76 76
77#include "encoding.h" 77#include "encoding.h"
78#include "rxvtutil.h" 78#include "rxvtutil.h"
79#include "rxvtfont.h" 79#include "rxvtfont.h"
80#include "rxvttoolkit.h" 80#include "rxvttoolkit.h"
81#include "scrollbar.h"
81#include "ev_cpp.h" 82#include "ev_cpp.h"
82#include "salloc.h" 83#include "salloc.h"
83#include "libptytty.h" 84#include "libptytty.h"
84 85
85#include "rxvtperl.h" 86#include "rxvtperl.h"
… …
96/* 97/*
97 ***************************************************************************** 98 *****************************************************************************
98 * SYSTEM HACKS 99 * SYSTEM HACKS
99 ***************************************************************************** 100 *****************************************************************************
100 */ 101 */
101/* Consistent defines - please report on the necessity
102 * @ Unixware: defines (__svr4__)
103 */
104#if defined (SVR4) && !defined (__svr4__)
105# define __svr4__ 1
106#endif
107#if defined (sun) && !defined (__sun__)
108# define __sun__ 1
109#endif
110 102
111#ifndef HAVE_XPOINTER 103#ifndef HAVE_XPOINTER
112typedef char *XPointer; 104typedef char *XPointer;
113#endif 105#endif
114 106
115#include <termios.h> 107#include <termios.h>
116typedef struct termios ttymode_t;
117 108
118#include "background.h" 109#include "background.h"
119 110
120#ifndef STDIN_FILENO 111#ifndef STDIN_FILENO
121# define STDIN_FILENO 0 112# define STDIN_FILENO 0
… …
160char * rxvt_wcstombs (const wchar_t *str, int len = -1); 151char * rxvt_wcstombs (const wchar_t *str, int len = -1);
161wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 152wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
162char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 153char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
163wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 154wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
164 155
165char * rxvt_basename (const char *str) NOTHROW; 156const char * rxvt_basename (const char *str) NOTHROW;
166void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 157void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
167void rxvt_log (const char *fmt,...) NOTHROW; 158void rxvt_log (const char *fmt,...) NOTHROW;
168void rxvt_warn (const char *fmt,...) NOTHROW; 159void rxvt_warn (const char *fmt,...) NOTHROW;
169void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 160void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
170void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 161void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
… …
209 ***************************************************************************** 200 *****************************************************************************
210 * STRUCTURES AND TYPEDEFS 201 * STRUCTURES AND TYPEDEFS
211 ***************************************************************************** 202 *****************************************************************************
212 */ 203 */
213 204
214/* If we're using either the rxvt scrollbar, keep the
215 * scrollColor resource.
216 */
217#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
218# define KEEP_SCROLLCOLOR 1
219#else
220# undef KEEP_SCROLLCOLOR
221#endif
222
223/* 205/*
224 * the 'essential' information for reporting Mouse Events 206 * the 'essential' information for reporting Mouse Events
225 * pared down from XButtonEvent 207 * pared down from XButtonEvent
226 */ 208 */
227struct mouse_event { 209struct mouse_event
210{
228 int clicks; 211 int clicks;
229 Time time; /* milliseconds */ 212 Time time; /* milliseconds */
230 unsigned int state; /* key or button mask */ 213 unsigned int state; /* key or button mask */
231 unsigned int button; /* detail */ 214 unsigned int button; /* detail */
232}; 215};
… …
277# define NO_MOUSE_REPORT_SCROLLBAR 1 260# define NO_MOUSE_REPORT_SCROLLBAR 1
278#endif 261#endif
279 262
280#define scrollBar_esc 30 263#define scrollBar_esc 30
281 264
282#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 265#if !defined (RXVT_SCROLLBAR) && !defined (NEXT_SCROLLBAR)
283# define HAVE_SCROLLBARS 1 266# define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1
284#endif 267#endif
285
286#define R_SB_ALIGN_CENTRE 0
287#define R_SB_ALIGN_TOP 1
288#define R_SB_ALIGN_BOTTOM 2
289
290#define R_SB_NEXT 1
291#define R_SB_XTERM 2
292#define R_SB_PLAIN 4
293#define R_SB_RXVT 8
294
295#define SB_WIDTH_NEXT 19
296#define SB_WIDTH_XTERM 15
297#define SB_WIDTH_PLAIN 7
298#ifndef SB_WIDTH_RXVT
299# define SB_WIDTH_RXVT 10
300#endif
301
302/*
303 * NeXT scrollbar defines
304 */
305#define SB_PADDING 1
306#define SB_BORDER_WIDTH 1
307#define SB_BEVEL_WIDTH_UPPER_LEFT 1
308#define SB_BEVEL_WIDTH_LOWER_RIGHT 2
309#define SB_LEFT_PADDING (SB_PADDING + SB_BORDER_WIDTH)
310#define SB_MARGIN_SPACE (SB_PADDING * 2)
311#define SB_BUTTON_WIDTH (SB_WIDTH_NEXT - SB_MARGIN_SPACE - SB_BORDER_WIDTH)
312#define SB_BUTTON_HEIGHT (SB_BUTTON_WIDTH)
313#define SB_BUTTON_SINGLE_HEIGHT (SB_BUTTON_HEIGHT + SB_PADDING)
314#define SB_BUTTON_BOTH_HEIGHT (SB_BUTTON_SINGLE_HEIGHT * 2)
315#define SB_BUTTON_TOTAL_HEIGHT (SB_BUTTON_BOTH_HEIGHT + SB_PADDING)
316#define SB_BUTTON_BEVEL_X (SB_LEFT_PADDING)
317#define SB_BUTTON_FACE_X (SB_BUTTON_BEVEL_X + SB_BEVEL_WIDTH_UPPER_LEFT)
318#define SB_THUMB_MIN_HEIGHT (SB_BUTTON_WIDTH - (SB_PADDING * 2))
319 /*
320 * +-------------+
321 * | | <---< SB_PADDING
322 * | ::::::::::: |
323 * | ::::::::::: |
324 * '''''''''''''''''
325 * ,,,,,,,,,,,,,,,,,
326 * | ::::::::::: |
327 * | ::::::::::: |
328 * | +---------------< SB_BEVEL_WIDTH_UPPER_LEFT
329 * | | :::::::: |
330 * | V :::: vv-------< SB_BEVEL_WIDTH_LOWER_RIGHT
331 * | +---------+ |
332 * | | ......%%| |
333 * | | ......%%| |
334 * | | .. ()..%%| |
335 * | | ......%%| |
336 * | | %%%%%%%%| |
337 * | +---------+ | <.........................
338 * | | <---< SB_PADDING :
339 * | +---------+ | <-+.......... :---< SB_BUTTON_TOTAL_HEIGHT
340 * | | ......%%| | | : :
341 * | | ../\..%%| | |---< SB_BUTTON_HEIGHT :
342 * | | %%%%%%%%| | | : :
343 * | +---------+ | <-+ : :
344 * | | : :
345 * | +---------+ | <-+ :---< SB_BUTTON_BOTH_HEIGHT
346 * | | ......%%| | | : :
347 * | | ..\/..%%| | | : :
348 * | | %%%%%%%%| | |---< SB_BUTTON_SINGLE_HEIGHT
349 * | +---------+ | | : :
350 * | | | : :
351 * +-------------+ <-+.........:............:
352 * ^^|_________| :
353 * || | :
354 * || +---< SB_BUTTON_WIDTH
355 * || :
356 * |+------< SB_PADDING
357 * |: :
358 * +----< SB_BORDER_WIDTH
359 * : :
360 * :............:
361 * |
362 * +---< SB_WIDTH_NEXT
363 */
364 268
365enum { 269enum {
366 NO_REFRESH = 0, /* Window not visible at all! */ 270 NO_REFRESH = 0, /* Window not visible at all! */
367 FAST_REFRESH = 1, /* Fully exposed window */ 271 FAST_REFRESH = 1, /* Fully exposed window */
368 SLOW_REFRESH = 2, /* Partially exposed window */ 272 SLOW_REFRESH = 2, /* Partially exposed window */
… …
473 XTerm_name = 0, 377 XTerm_name = 0,
474 XTerm_iconName = 1, 378 XTerm_iconName = 1,
475 XTerm_title = 2, 379 XTerm_title = 2,
476 XTerm_property = 3, // change X property 380 XTerm_property = 3, // change X property
477 XTerm_Color = 4, // change colors 381 XTerm_Color = 4, // change colors
478 XTerm_Color00 = 10, // not implemented, CLASH! 382 XTerm_Color00 = 10, // change fg color
479 XTerm_Color01 = 11, // not implemented 383 XTerm_Color01 = 11, // change bg color
480 XTerm_Color_cursor = 12, // change actual 'Cursor' color 384 XTerm_Color_cursor = 12, // change actual 'Cursor' color
481 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color 385 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
482 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color 386 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
483 XTerm_Color05 = 15, // not implemented (tektronix fg) 387 XTerm_Color05 = 15, // not implemented (tektronix fg)
484 XTerm_Color06 = 16, // not implemented (tektronix bg) 388 XTerm_Color06 = 16, // not implemented (tektronix bg)
… …
489 XTerm_konsole30 = 30, // reserved for konsole 393 XTerm_konsole30 = 30, // reserved for konsole
490 XTerm_konsole31 = 31, // reserved for konsole 394 XTerm_konsole31 = 31, // reserved for konsole
491 XTerm_emacs51 = 51, // reserved for emacs shell 395 XTerm_emacs51 = 51, // reserved for emacs shell
492 /* 396 /*
493 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 397 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
494 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
495 */ 398 */
496 Rxvt_Color_BD = 18, // change actual 'Bold' color 399
497 Rxvt_Color_UL = 19, // change actual 'Underline' color 400 // deprecated
401 Rxvt_Color_BD = 18,
402 Rxvt_Color_UL = 19,
403 Rxvt_restoreFG = 39,
404 Rxvt_restoreBG = 49,
405
498 Rxvt_Pixmap = 20, // new bg pixmap 406 Rxvt_Pixmap = 20, // new bg pixmap
499 Rxvt_restoreFG = 39, // change default fg color
500 Rxvt_restoreBG = 49, // change default bg color
501 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 407 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
502 408
503 URxvt_locale = 701, // change locale 409 URxvt_locale = 701, // change locale
504 URxvt_version = 702, // request version 410 URxvt_version = 702, // request version
505 411
506 URxvt_Color_IT = 704, // change actual 'Italic' colour 412 URxvt_Color_IT = 704, // change actual 'Italic' colour
507 URxvt_Color_tint = 705, // change actual tint colour 413 URxvt_Color_tint = 705, // change actual tint colour
414 URxvt_Color_BD = 706, // change actual 'Bold' color
415 URxvt_Color_UL = 707, // change actual 'Underline' color
508 URxvt_Color_BD = 706, 416 URxvt_Color_border = 708,
509 URxvt_Color_UL = 707,
510 417
511 URxvt_font = 710, 418 URxvt_font = 710,
512 URxvt_boldFont = 711, 419 URxvt_boldFont = 711,
513 URxvt_italicFont = 712, 420 URxvt_italicFont = 712,
514 URxvt_boldItalicFont = 713, 421 URxvt_boldItalicFont = 713,
515 422
516 URxvt_view_up = 720, 423 URxvt_view_up = 720,
517 URxvt_view_down = 721, 424 URxvt_view_down = 721,
518 425
519 URxvt_perl = 777, 426 URxvt_perl = 777, // for use by perl extensions, starts with "extension-name;"
520}; 427};
521 428
522/* Words starting with `Color_' are colours. Others are counts */ 429/* Words starting with `Color_' are colours. Others are counts */
523/* 430/*
524 * The PixColor and rendition colour usage should probably be decoupled 431 * The PixColor and rendition colour usage should probably be decoupled
… …
574 Color_underline, 481 Color_underline,
575#endif 482#endif
576#ifdef OPTION_HC 483#ifdef OPTION_HC
577 Color_HC, 484 Color_HC,
578#endif 485#endif
579#ifdef KEEP_SCROLLCOLOR
580 Color_scroll, 486 Color_scroll,
487#ifdef RXVT_SCROLLBAR
581 Color_trough, 488 Color_trough,
582#endif 489#endif
583#if ENABLE_TRANSPARENCY 490#if ENABLE_TRANSPARENCY
584 Color_tint, 491 Color_tint,
585#endif 492#endif
586#if OFF_FOCUS_FADING 493#if OFF_FOCUS_FADING
587 Color_fade, 494 Color_fade,
588#endif 495#endif
589 NRS_COLORS, /* */ 496 NRS_COLORS, /* */
590#ifdef KEEP_SCROLLCOLOR 497#ifdef RXVT_SCROLLBAR
591 Color_topShadow = NRS_COLORS, 498 Color_topShadow = NRS_COLORS,
592 Color_bottomShadow, 499 Color_bottomShadow,
593 TOTAL_COLORS 500 TOTAL_COLORS
594#else 501#else
595 TOTAL_COLORS = NRS_COLORS 502 TOTAL_COLORS = NRS_COLORS
… …
631#define PrivMode_smoothScroll (1UL<<17) 538#define PrivMode_smoothScroll (1UL<<17)
632#define PrivMode_vt52 (1UL<<18) 539#define PrivMode_vt52 (1UL<<18)
633#define PrivMode_LFNL (1UL<<19) 540#define PrivMode_LFNL (1UL<<19)
634#define PrivMode_MouseBtnEvent (1UL<<20) 541#define PrivMode_MouseBtnEvent (1UL<<20)
635#define PrivMode_MouseAnyEvent (1UL<<21) 542#define PrivMode_MouseAnyEvent (1UL<<21)
543#define PrivMode_BracketPaste (1UL<<22)
636 544
637#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 545#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
638 546
639#ifdef ALLOW_132_MODE 547#ifdef ALLOW_132_MODE
640# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 548# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
644 552
645// do not change these constants lightly, there are many interdependencies 553// do not change these constants lightly, there are many interdependencies
646#define IMBUFSIZ 128 // input modifier buffer sizes 554#define IMBUFSIZ 128 // input modifier buffer sizes
647#define KBUFSZ 512 // size of keyboard mapping buffer 555#define KBUFSZ 512 // size of keyboard mapping buffer
648#define CBUFSIZ 2048 // size of command buffer 556#define CBUFSIZ 2048 // size of command buffer
557#define CBUFCNT 8 // never call pty_fill/cmd_parse more than this often in a row
649#define UBUFSIZ 2048 // character buffer 558#define UBUFSIZ 2048 // character buffer
650 559
651#if ENABLE_FRILLS 560#if ENABLE_FRILLS
652# include <X11/Xmd.h> 561# include <X11/Xmd.h>
653typedef struct _mwmhints { 562typedef struct _mwmhints
563{
654 CARD32 flags; 564 CARD32 flags;
655 CARD32 functions; 565 CARD32 functions;
656 CARD32 decorations; 566 CARD32 decorations;
657 INT32 input_mode; 567 INT32 input_mode;
658 CARD32 status; 568 CARD32 status;
… …
705#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 615#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
706#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 616#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
707#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 617#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
708#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 618#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
709 619
710#define LINENO(n) MOD (term_start + int(n), total_rows) 620#define LINENO_of(t,n) MOD ((t)->term_start + int(n), (t)->total_rows)
711#define ROW(n) row_buf [LINENO (n)] 621#define ROW_of(t,n) (t)->row_buf [LINENO_of ((t), n)]
622
623#define LINENO(n) LINENO_of (this, n)
624#define ROW(n) ROW_of (this, n)
712 625
713/* how to build & extract colors and attributes */ 626/* how to build & extract colors and attributes */
714#define GET_BASEFG(x) (((x) & RS_fgMask)) 627#define GET_BASEFG(x) (((x) & RS_fgMask))
715#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 628#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
716 629
… …
733 646
734#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)] 647#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
735#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)]) 648#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
736 649
737#if ENABLE_STYLES 650#if ENABLE_STYLES
738# define FONTSET(style) fontset[GET_STYLE (style)] 651# define FONTSET_of(t,style) (t)->fontset[GET_STYLE (style)]
739#else 652#else
740# define FONTSET(style) fontset[0] 653# define FONTSET_of(t,style) (t)->fontset[0]
741#endif 654#endif
742 655
743#ifdef HAVE_SCROLLBARS 656#define FONTSET(style) FONTSET_of (this, style)
744# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
745#else
746# define scrollbar_TotalWidth() (0)
747#endif
748#define scrollbar_isMotion() (scrollBar.state == 'm')
749#define scrollbar_isUp() (scrollBar.state == 'U')
750#define scrollbar_isDn() (scrollBar.state == 'D')
751#define scrollbar_isUpDn() isupper (scrollBar.state)
752#define isScrollbarWindow(w) (scrollBar.state && (w) == scrollBar.win)
753
754#define scrollbarnext_dnval() (scrollBar.end + (scrollBar.width + 1))
755#define scrollbarnext_upButton(y) ((y) > scrollBar.end \
756 && (y) <= scrollbarnext_dnval ())
757#define scrollbarnext_dnButton(y) ((y) > scrollbarnext_dnval())
758#define SCROLLNEXT_MINHEIGHT SB_THUMB_MIN_HEIGHT
759#define scrollbarrxvt_upButton(y) ((y) < scrollBar.beg)
760#define scrollbarrxvt_dnButton(y) ((y) > scrollBar.end)
761#define SCROLLRXVT_MINHEIGHT 10
762#define SCROLLXTERM_MINHEIGHT 10
763
764#define scrollbar_minheight() (scrollBar.style == R_SB_NEXT \
765 ? SCROLLNEXT_MINHEIGHT \
766 : SCROLLRXVT_MINHEIGHT)
767#define scrollbar_above_slider(y) ((y) < scrollBar.top)
768#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
769#define scrollbar_position(y) ((y) - scrollBar.beg)
770#define scrollbar_size() (scrollBar.end - scrollBar.beg \
771 - scrollbar_minheight ())
772 657
773typedef callback<void (const char *)> log_callback; 658typedef callback<void (const char *)> log_callback;
774typedef callback<int (int)> getfd_callback; 659typedef callback<int (int)> getfd_callback;
775 660
776/****************************************************************************/ 661/****************************************************************************/
… …
779#define LINE_FILTERED 0x0002 // line has been filtered 664#define LINE_FILTERED 0x0002 // line has been filtered
780#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 665#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
781#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI) 666#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
782#define LINE_BIDI 0x0010 // line needs bidi (NYI) 667#define LINE_BIDI 0x0010 // line needs bidi (NYI)
783 668
784struct line_t { 669struct line_t
670{
785 text_t *t; // terminal the text 671 text_t *t; // terminal the text
786 rend_t *r; // rendition, uses RS_ flags 672 rend_t *r; // rendition, uses RS_ flags
787 tlen_t_ l; // length of each text line 673 tlen_t_ l; // length of each text line
788 uint32_t f; // flags 674 uint32_t f; // flags
789 675
… …
823}; 709};
824 710
825/****************************************************************************/ 711/****************************************************************************/
826 712
827// primitive wrapper around mbstate_t to ensure initialisation 713// primitive wrapper around mbstate_t to ensure initialisation
828struct mbstate { 714struct mbstate
715{
829 mbstate_t mbs; 716 mbstate_t mbs;
830 717
831 operator mbstate_t *() { return &mbs; } 718 operator mbstate_t *() { return &mbs; }
832 void reset () { memset (&mbs, 0, sizeof (mbs)); } 719 void reset () { memset (&mbs, 0, sizeof (mbs)); }
833 mbstate () { reset (); } 720 mbstate () { reset (); }
… …
854 741
855#if ENABLE_COMBINING 742#if ENABLE_COMBINING
856// compose chars are used to represent composite characters 743// compose chars are used to represent composite characters
857// that are not representable in unicode, as well as characters 744// that are not representable in unicode, as well as characters
858// not fitting in the BMP. 745// not fitting in the BMP.
859struct compose_char { 746struct compose_char
747{
860 unicode_t c1, c2; // any chars != NOCHAR are valid 748 unicode_t c1, c2; // any chars != NOCHAR are valid
861 compose_char (unicode_t c1, unicode_t c2) 749 compose_char (unicode_t c1, unicode_t c2)
862 : c1(c1), c2(c2) 750 : c1(c1), c2(c2)
863 { } 751 { }
864}; 752};
865 753
866class rxvt_composite_vec { 754class rxvt_composite_vec
755{
867 vector<compose_char> v; 756 vector<compose_char> v;
868public: 757public:
869 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR); 758 text_t compose (unicode_t c1, unicode_t c2 = NOCHAR);
870 int expand (unicode_t c, wchar_t *r); 759 int expand (unicode_t c, wchar_t *r);
871 compose_char *operator [](text_t c) 760 compose_char *operator [](text_t c)
… …
890extern rxvt_t rxvt_current_term; 779extern rxvt_t rxvt_current_term;
891 780
892#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r) 781#define SET_R(r) rxvt_current_term = const_cast<rxvt_term *>(r)
893#define GET_R rxvt_current_term 782#define GET_R rxvt_current_term
894 783
784/* ------------------------------------------------------------------------- */
785struct overlay_base
786{
787 int x, y, w, h; // overlay dimensions
788 text_t **text;
789 rend_t **rend;
790
791 // while tempting to add swap() etc. here, it effetcively only increases code size
792};
793
794/* ------------------------------------------------------------------------- */
795
895typedef struct { 796typedef struct
797{
896 int row; 798 int row;
897 int col; 799 int col;
898} row_col_t; 800} row_col_t;
899 801
900/* 802/*
… …
925 * +------------+·display·+·= term_start 827 * +------------+·display·+·= term_start
926 * | terminal | display | 828 * | terminal | display |
927 * | terminal +---------+ 829 * | terminal +---------+
928 * | terminal | 830 * | terminal |
929 * | terminal | 831 * | terminal |
930 * +------------+···········= term_stat + nrow - 1 832 * +------------+···········= term_start + nrow - 1
931 * | 833 * |
932 * | 834 * |
933 * END······················= total_rows 835 * END······················= total_rows
934 */ 836 */
935 837
936struct TermWin_t { 838struct TermWin_t
839{
937 int width; /* window width [pixels] */ 840 int width; /* window width [pixels] */
938 int height; /* window height [pixels] */ 841 int height; /* window height [pixels] */
939 int fwidth; /* font width [pixels] */ 842 int fwidth; /* font width [pixels] */
940 int fheight; /* font height [pixels] */ 843 int fheight; /* font height [pixels] */
941 int fbase; /* font ascent (baseline) [pixels] */ 844 int fbase; /* font ascent (baseline) [pixels] */
… …
944 int focus; /* window has focus */ 847 int focus; /* window has focus */
945 int mapped; /* window state mapped? */ 848 int mapped; /* window state mapped? */
946 int int_bwidth; /* internal border width */ 849 int int_bwidth; /* internal border width */
947 int ext_bwidth; /* external border width */ 850 int ext_bwidth; /* external border width */
948 int lineSpace; /* number of extra pixels between rows */ 851 int lineSpace; /* number of extra pixels between rows */
852 int letterSpace; /* number of extra pixels between columns */
949 int saveLines; /* number of lines that fit in scrollback */ 853 int saveLines; /* number of lines that fit in scrollback */
950 int total_rows; /* total number of rows in this terminal */ 854 int total_rows; /* total number of rows in this terminal */
951 int term_start; /* term lines start here */ 855 int term_start; /* term lines start here */
952 int view_start; /* scrollback view starts here */ 856 int view_start; /* scrollback view starts here */
953 int top_row; /* topmost row index of scrollback */ 857 int top_row; /* topmost row index of scrollback */
… …
971 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where 875 * clicks: 1, 2 or 3 clicks - 4 indicates a special condition of 1 where
972 * nothing is selected 876 * nothing is selected
973 * beg: row/column of beginning of selection : never past mark 877 * beg: row/column of beginning of selection : never past mark
974 * mark: row/column of initial click : never past end 878 * mark: row/column of initial click : never past end
975 * end: row/column of one character past end of selection 879 * end: row/column of one character past end of selection
976 * * Note: -nsaved <= beg.row <= mark.row <= end.row < nrow 880 * * Note: top_row <= beg.row <= mark.row <= end.row < nrow
977 * * Note: col == -1 ==> we're left of screen 881 * * Note: col == -1 ==> we're left of screen
978 * 882 *
979 */ 883 */
980typedef struct { 884struct screen_t
885{
981 row_col_t cur; /* cursor position on the screen */ 886 row_col_t cur; /* cursor position on the screen */
982 int tscroll; /* top of settable scroll region */ 887 int tscroll; /* top of settable scroll region */
983 int bscroll; /* bottom of settable scroll region */ 888 int bscroll; /* bottom of settable scroll region */
984 unsigned int charset; /* character set number [0..3] */ 889 unsigned int charset; /* character set number [0..3] */
985 unsigned int flags; /* see below */ 890 unsigned int flags; /* see below */
986 row_col_t s_cur; /* saved cursor position */ 891 row_col_t s_cur; /* saved cursor position */
987 unsigned int s_charset; /* saved character set number [0..3] */ 892 unsigned int s_charset; /* saved character set number [0..3] */
988 char s_charset_char; 893 char s_charset_char;
989 rend_t s_rstyle; /* saved rendition style */ 894 rend_t s_rstyle; /* saved rendition style */
990} screen_t; 895};
991 896
992enum selection_op_t { 897enum selection_op_t
898{
993 SELECTION_CLEAR = 0, /* nothing selected */ 899 SELECTION_CLEAR = 0, /* nothing selected */
994 SELECTION_INIT, /* marked a point */ 900 SELECTION_INIT, /* marked a point */
995 SELECTION_BEGIN, /* started a selection */ 901 SELECTION_BEGIN, /* started a selection */
996 SELECTION_CONT, /* continued selection */ 902 SELECTION_CONT, /* continued selection */
997 SELECTION_DONE /* selection put in CUT_BUFFER0 */ 903 SELECTION_DONE /* selection put in CUT_BUFFER0 */
998}; 904};
999 905
1000typedef struct { 906struct selection_t
907{
1001 wchar_t *text; /* selected text */ 908 wchar_t *text; /* selected text */
1002 unsigned int len; /* length of selected text */ 909 unsigned int len; /* length of selected text */
1003 unsigned int screen; /* screen being used */ 910 unsigned int screen; /* screen being used */
1004 unsigned int clicks; /* number of clicks */ 911 unsigned int clicks; /* number of clicks */
1005 selection_op_t op; /* current operation */ 912 selection_op_t op; /* current operation */
1006 bool rect; /* rectangular selection? */ 913 bool rect; /* rectangular selection? */
1007 row_col_t beg; /* beginning of selection <= mark */ 914 row_col_t beg; /* beginning of selection <= mark */
1008 row_col_t mark; /* point of initial click <= end */ 915 row_col_t mark; /* point of initial click <= end */
1009 row_col_t end; /* one character past end point */ 916 row_col_t end; /* one character past end point */
1010} selection_t; 917};
1011 918
1012/* ------------------------------------------------------------------------- */ 919/* ------------------------------------------------------------------------- */
1013 920
1014/* screen_t flags */ 921/* screen_t flags */
1015#define Screen_Relative (1<<0) /* relative origin mode flag */ 922#define Screen_Relative (1<<0) /* relative origin mode flag */
… …
1029Opt_count 936Opt_count
1030}; 937};
1031 938
1032/* ------------------------------------------------------------------------- */ 939/* ------------------------------------------------------------------------- */
1033 940
1034typedef struct {
1035 char state; /* scrollbar state */
1036 char init; /* scrollbar has been initialised */
1037 unsigned int beg; /* slider sub-window begin height */
1038 unsigned int end; /* slider sub-window end height */
1039 unsigned int top; /* slider top position */
1040 unsigned int bot; /* slider bottom position */
1041 unsigned int style; /* style: rxvt, xterm, next */
1042 unsigned int width; /* scrollbar width */
1043 Window win;
1044 int (rxvt_term::*update)(int, int, int, int);
1045
1046 void setIdle() { state = 1 ; }
1047 void setMotion() { state = 'm'; }
1048 void setUp() { state = 'U'; }
1049 void setDn() { state = 'D'; }
1050} scrollBar_t;
1051
1052struct rxvt_vars : TermWin_t { 941struct rxvt_vars : TermWin_t
942{
1053 scrollBar_t scrollBar; 943 scrollBar_t scrollBar;
1054 uint8_t options[(Opt_count + 7) >> 3]; 944 uint8_t options[(Opt_count + 7) >> 3];
1055 XSizeHints szHint; 945 XSizeHints szHint;
1056 rxvt_color *pix_colors; 946 rxvt_color *pix_colors;
1057 rxvt_color *pix_colors_focused;
1058#ifdef OFF_FOCUS_FADING
1059 rxvt_color *pix_colors_unfocused;
1060#endif
1061 Cursor TermWin_cursor; /* cursor for vt window */ 947 Cursor TermWin_cursor; /* cursor for vt window */
1062 int sb_shadow; /* scrollbar shadow width */
1063 int numlock_state; 948 int numlock_state;
1064 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 949 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf
1065 line_t *drawn_buf; // text on screen 950 line_t *drawn_buf; // text on screen
1066 line_t *swap_buf; // lines for swap buffer 951 line_t *swap_buf; // lines for swap buffer
1067 char *tabs; /* per location: 1 == tab-stop */ 952 char *tabs; /* per location: 1 == tab-stop */
1068 screen_t screen; 953 screen_t screen;
1069 screen_t swap; 954 screen_t swap;
1070 selection_t selection; 955 selection_t selection;
956 rxvt_color pix_colors_focused[TOTAL_COLORS];
957#ifdef OFF_FOCUS_FADING
958 rxvt_color pix_colors_unfocused[TOTAL_COLORS];
959#endif
1071}; 960};
1072 961
1073struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 962struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
963{
1074 964
1075 // special markers with magic addresses 965 // special markers with magic addresses
1076 static const char resval_undef []; // options specifically unset 966 static const char resval_undef []; // options specifically unset
1077 static const char resval_on []; // boolean options switched on 967 static const char resval_on []; // boolean options switched on
1078 static const char resval_off []; // or off 968 static const char resval_off []; // or off
… …
1086 976
1087 unsigned char want_refresh:1, 977 unsigned char want_refresh:1,
1088 current_screen:1, /* primary or secondary */ 978 current_screen:1, /* primary or secondary */
1089 num_scr_allow:1, 979 num_scr_allow:1,
1090 bypass_keystate:1, 980 bypass_keystate:1,
981#if ENABLE_FRILLS
982 urgency_hint:1,
983#endif
1091#ifdef CURSOR_BLINK 984#if CURSOR_BLINK
1092 hidden_cursor:1, 985 hidden_cursor:1,
1093#endif 986#endif
1094#ifdef TEXT_BLINK 987#if TEXT_BLINK
1095 hidden_text:1, 988 hidden_text:1,
1096#endif 989#endif
1097#ifdef POINTER_BLANK 990#if POINTER_BLANK
1098 hidden_pointer:1, 991 hidden_pointer:1,
1099#endif 992#endif
1100 enc_utf8:1, /* wether locale uses utf-8 */ 993 enc_utf8:1, /* wether locale uses utf-8 */
1101 seen_input:1, /* wether we have seen some program output yet */ 994 seen_input:1, /* wether we have seen some program output yet */
1102 seen_resize:1, /* wether we had a resize event */ 995 seen_resize:1, /* wether we had a resize event */
… …
1104 997
1105 unsigned char refresh_type, 998 unsigned char refresh_type,
1106#ifdef META8_OPTION 999#ifdef META8_OPTION
1107 meta_char, /* Alt-key prefix */ 1000 meta_char, /* Alt-key prefix */
1108#endif 1001#endif
1109 scrollbar_align,
1110 selection_wait, 1002 selection_wait,
1111 selection_type; 1003 selection_type;
1112/* ---------- */ 1004/* ---------- */
1113 bool rvideo_state, rvideo_mode; 1005 bool rvideo_state, rvideo_mode;
1114#ifndef NO_BELL 1006#ifndef NO_BELL
… …
1132 /* give proper Scroll behaviour */ 1024 /* give proper Scroll behaviour */
1133#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1025#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1134 mouse_slip_wheel_speed, 1026 mouse_slip_wheel_speed,
1135#endif 1027#endif
1136 refresh_count, 1028 refresh_count,
1137 last_bot, /* scrollbar last bottom position */
1138 last_top, /* scrollbar last top position */
1139 last_state, /* scrollbar last state */
1140 scrollbar_len,
1141 window_vt_x, 1029 window_vt_x,
1142 window_vt_y, 1030 window_vt_y,
1143 window_sb_x,
1144 mouse_row, 1031 mouse_row,
1145 mouse_col, 1032 mouse_col,
1146# ifdef POINTER_BLANK 1033# ifdef POINTER_BLANK
1147 pointerBlankDelay, 1034 pointerBlankDelay,
1148# endif 1035# endif
… …
1156 unsigned long priv_modes, 1043 unsigned long priv_modes,
1157 SavedModes; 1044 SavedModes;
1158/* ---------- */ 1045/* ---------- */
1159 Atom *xa; 1046 Atom *xa;
1160/* ---------- */ 1047/* ---------- */
1161#ifdef RXVT_SCROLLBAR
1162 GC scrollbarGC,
1163 topShadowGC,
1164 botShadowGC;
1165#endif
1166#ifdef XTERM_SCROLLBAR
1167 GC xscrollbarGC,
1168 ShadowGC;
1169#endif
1170#ifdef PLAIN_SCROLLBAR
1171 GC pscrollbarGC;
1172#endif
1173#ifdef NEXT_SCROLLBAR
1174 GC blackGC,
1175 whiteGC,
1176 grayGC,
1177 darkGC,
1178 stippleGC;
1179 Pixmap dimple,
1180 upArrow,
1181 downArrow,
1182 upArrowHi,
1183 downArrowHi;
1184#endif
1185/* ---------- */
1186 Time selection_time, 1048 Time selection_time,
1187 selection_request_time; 1049 selection_request_time;
1188 pid_t cmd_pid; /* process id of child */ 1050 pid_t cmd_pid; /* process id of child */
1189 char * incr_buf; 1051 char * incr_buf;
1190 size_t incr_buf_size, incr_buf_fill; 1052 size_t incr_buf_size, incr_buf_fill;
1191/* ---------- */ 1053/* ---------- */
1192 Cursor leftptr_cursor;
1193/* ---------- */
1194 struct mouse_event MEvent; 1054 struct mouse_event MEvent;
1195 XComposeStatus compose; 1055 XComposeStatus compose;
1196 ttymode_t tio; 1056 struct termios tio;
1197 row_col_t oldcursor; 1057 row_col_t oldcursor;
1198#ifdef HAVE_BG_PIXMAP 1058#ifdef HAVE_BG_PIXMAP
1199 bgPixmap_t bgPixmap; 1059 bgPixmap_t bgPixmap;
1200#endif 1060#endif
1201#ifdef HAVE_AFTERIMAGE 1061#ifdef HAVE_AFTERIMAGE
1202 ASVisual *asv; 1062 ASVisual *asv;
1203 ASImageManager *asimman; 1063 ASImageManager *asimman;
1064
1065 void init_asv ()
1066 {
1067 if (!asv)
1068 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1069 }
1204#endif 1070#endif
1205 1071
1206#if ENABLE_OVERLAY 1072#if ENABLE_OVERLAY
1207 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1073 overlay_base ov;
1208 text_t **ov_text;
1209 rend_t **ov_rend;
1210 1074
1211 void scr_swap_overlay () NOTHROW; 1075 void scr_swap_overlay () NOTHROW;
1212 void scr_overlay_new (int x, int y, int w, int h) NOTHROW; 1076 void scr_overlay_new (int x, int y, int w, int h) NOTHROW;
1213 void scr_overlay_off () NOTHROW; 1077 void scr_overlay_off () NOTHROW;
1214 void scr_overlay_set (int x, int y, 1078 void scr_overlay_set (int x, int y,
… …
1252 1116
1253#if ENABLE_FRILLS || ISO_14755 1117#if ENABLE_FRILLS || ISO_14755
1254 // ISO 14755 entry support 1118 // ISO 14755 entry support
1255 unicode_t iso14755buf; 1119 unicode_t iso14755buf;
1256 void commit_iso14755 (); 1120 void commit_iso14755 ();
1257 int hex_keyval (XKeyEvent &ev);
1258# if ISO_14755 1121# if ISO_14755
1259 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1122 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1260 void iso14755_54 (int x, int y); 1123 void iso14755_54 (int x, int y);
1261# endif 1124# endif
1262#endif 1125#endif
… …
1283#endif 1146#endif
1284 1147
1285 void x_cb (XEvent &xev); 1148 void x_cb (XEvent &xev);
1286 xevent_watcher termwin_ev; 1149 xevent_watcher termwin_ev;
1287 xevent_watcher vt_ev; 1150 xevent_watcher vt_ev;
1288#ifdef HAVE_SCROLLBARS
1289 xevent_watcher scrollbar_ev; 1151 xevent_watcher scrollbar_ev;
1290#endif
1291 1152
1292 void child_cb (ev::child &w, int revents); ev::child child_ev; 1153 void child_cb (ev::child &w, int revents); ev::child child_ev;
1293 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1154 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1294 void refresh_check (); 1155 void refresh_check ();
1295 void flush (); 1156 void flush ();
… …
1368 wchar_t next_char () NOTHROW; 1229 wchar_t next_char () NOTHROW;
1369 wchar_t cmd_getc () THROW ((class out_of_input)); 1230 wchar_t cmd_getc () THROW ((class out_of_input));
1370 uint32_t next_octet () NOTHROW; 1231 uint32_t next_octet () NOTHROW;
1371 uint32_t cmd_get8 () THROW ((class out_of_input)); 1232 uint32_t cmd_get8 () THROW ((class out_of_input));
1372 1233
1373 bool cmd_parse (); 1234 void cmd_parse ();
1374 void mouse_report (XButtonEvent &ev); 1235 void mouse_report (XButtonEvent &ev);
1375 void button_press (XButtonEvent &ev); 1236 void button_press (XButtonEvent &ev);
1376 void button_release (XButtonEvent &ev); 1237 void button_release (XButtonEvent &ev);
1377 void focus_in (); 1238 void focus_in ();
1378 void focus_out (); 1239 void focus_out ();
1240#if ENABLE_FRILLS
1241 void set_urgency (bool enable);
1242#else
1243 void set_urgency (bool enable) { }
1244#endif
1379 void update_fade_color (unsigned int idx); 1245 void update_fade_color (unsigned int idx);
1380#ifdef PRINTPIPE 1246#ifdef PRINTPIPE
1381 FILE *popen_printer (); 1247 FILE *popen_printer ();
1382 int pclose_printer (FILE *stream); 1248 int pclose_printer (FILE *stream);
1383#endif 1249#endif
… …
1389 void process_window_ops (const int *args, unsigned int nargs); 1255 void process_window_ops (const int *args, unsigned int nargs);
1390 char *get_to_st (unicode_t &ends_how); 1256 char *get_to_st (unicode_t &ends_how);
1391 void process_dcs_seq (); 1257 void process_dcs_seq ();
1392 void process_osc_seq (); 1258 void process_osc_seq ();
1393 void process_color_seq (int report, int color, const char *str, char resp); 1259 void process_color_seq (int report, int color, const char *str, char resp);
1394 void process_xterm_seq (int op, const char *str, char resp); 1260 void process_xterm_seq (int op, char *str, char resp);
1395 int privcases (int mode, unsigned long bit); 1261 int privcases (int mode, unsigned long bit);
1396 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1262 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1397 void process_sgr_mode (unsigned int nargs, const int *arg); 1263 void process_sgr_mode (unsigned int nargs, const int *arg);
1398 void process_graphics (); 1264 void process_graphics ();
1399 // init.C 1265 // init.C
1400 void init_vars (); 1266 void init_vars ();
1401 void init_secondary ();
1402 const char **init_resources (int argc, const char *const *argv); 1267 const char **init_resources (int argc, const char *const *argv);
1268 void init (int argc, const char *const *argv, stringvec *envv);
1403 void init_env (); 1269 void init_env ();
1404 void set_locale (const char *locale); 1270 void set_locale (const char *locale);
1405 void init_xlocale (); 1271 void init_xlocale ();
1406 void init_command (const char *const *argv); 1272 void init_command (const char *const *argv);
1407 void run_command (const char *const *argv); 1273 void run_command (const char *const *argv);
1408 int run_child (const char *const *argv); 1274 int run_child (const char *const *argv);
1409 void color_aliases (int idx); 1275 void color_aliases (int idx);
1410 void create_windows (int argc, const char *const *argv); 1276 void create_windows (int argc, const char *const *argv);
1411 void Get_Colours (); 1277 void get_colours ();
1412 void get_ourmods (); 1278 void get_ourmods ();
1413 // main.C 1279 // main.C
1414 void tt_winch (); 1280 void tt_winch ();
1415 rxvt_term (); 1281 rxvt_term ();
1416 ~rxvt_term (); 1282 ~rxvt_term ();
1417 void destroy (); 1283 void destroy ();
1418 void emergency_cleanup (); 1284 void emergency_cleanup ();
1419 void init (int argc, const char *const *argv, stringvec *envv);
1420 void recolour_cursor (); 1285 void recolour_cursor ();
1421 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1286 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1422 void window_calc (unsigned int newwidth, unsigned int newheight); 1287 void window_calc (unsigned int newwidth, unsigned int newheight);
1423 bool set_fonts (); 1288 bool set_fonts ();
1424 void set_string_property (Atom prop, const char *str, int len = -1); 1289 void set_string_property (Atom prop, const char *str, int len = -1);
… …
1510 options[opt >> 3] |= (1 << (opt & 7)); 1375 options[opt >> 3] |= (1 << (opt & 7));
1511 else 1376 else
1512 options[opt >> 3] &= ~(1 << (opt & 7)); 1377 options[opt >> 3] &= ~(1 << (opt & 7));
1513 } 1378 }
1514 1379
1515 void PrivMode (int set, unsigned bit) NOTHROW 1380 void set_privmode (unsigned bit, int set) NOTHROW
1516 { 1381 {
1517 if (set) 1382 if (set)
1518 priv_modes |= bit; 1383 priv_modes |= bit;
1519 else 1384 else
1520 priv_modes &= ~bit; 1385 priv_modes &= ~bit;
… …
1522 1387
1523 // modifies first argument(!) 1388 // modifies first argument(!)
1524 void paste (char *data, unsigned int len) NOTHROW; 1389 void paste (char *data, unsigned int len) NOTHROW;
1525 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1390 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1526 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1391 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1392 void scr_kill_char (line_t &l, int col) const NOTHROW;
1527 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1393 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1528 void scr_reset (); 1394 void scr_reset ();
1529 void scr_release () NOTHROW; 1395 void scr_release () NOTHROW;
1530 void scr_clear (bool really = false) NOTHROW; 1396 void scr_clear (bool really = false) NOTHROW;
1531 void scr_refresh () NOTHROW; 1397 void scr_refresh () NOTHROW;
… …
1543 void scr_remap_chars (line_t &l) NOTHROW; 1409 void scr_remap_chars (line_t &l) NOTHROW;
1544 1410
1545 enum cursor_mode { SAVE, RESTORE }; 1411 enum cursor_mode { SAVE, RESTORE };
1546 1412
1547 void scr_poweron (); 1413 void scr_poweron ();
1414 void scr_soft_reset () NOTHROW;
1548 void scr_cursor (cursor_mode mode) NOTHROW; 1415 void scr_cursor (cursor_mode mode) NOTHROW;
1549 void scr_do_wrap () NOTHROW; 1416 void scr_do_wrap () NOTHROW;
1550 void scr_swap_screen () NOTHROW; 1417 void scr_swap_screen () NOTHROW;
1551 void scr_change_screen (int scrn); 1418 void scr_change_screen (int scrn);
1552 void scr_color (unsigned int color, int fgbg) NOTHROW; 1419 void scr_color (unsigned int color, int fgbg) NOTHROW;
… …
1596 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1463 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1597 void selection_click (int clicks, int x, int y) NOTHROW; 1464 void selection_click (int clicks, int x, int y) NOTHROW;
1598 void selection_extend (int x, int y, int flag) NOTHROW; 1465 void selection_extend (int x, int y, int flag) NOTHROW;
1599 void selection_rotate (int x, int y) NOTHROW; 1466 void selection_rotate (int x, int y) NOTHROW;
1600 1467
1601#if defined(NEXT_SCROLLBAR)
1602 // scrollbar-next.C
1603 Pixmap renderPixmap (const char *const *data, int width, int height);
1604 void init_scrollbar_stuff ();
1605 void drawBevel (Drawable d, int x1, int y1, int w, int h);
1606 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1607#endif
1608
1609#if defined(RXVT_SCROLLBAR)
1610 // scrollbar-rxvt.C
1611 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1612#endif
1613
1614#if defined(XTERM_SCROLLBAR)
1615 // scrollbar-xterm.C
1616 int scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len);
1617#endif
1618
1619#if defined(PLAIN_SCROLLBAR)
1620 // scrollbar-plain.C
1621 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1622#endif
1623
1624 // scrollbar.C
1625 void resize_scrollbar ();
1626 int scrollbar_mapping (int map);
1627 int scrollbar_show (int update);
1628 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1629
1630 // xdefaults.C 1468 // xdefaults.C
1631 void get_options (int argc, const char *const *argv); 1469 void get_options (int argc, const char *const *argv);
1632 int parse_keysym (const char *str, const char *arg); 1470 int parse_keysym (const char *str, const char *arg);
1633 const char *x_resource (const char *name); 1471 const char *x_resource (const char *name);
1634 void extract_resources (); 1472 void extract_resources ();

Diff Legend

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