ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.166 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.210 by root, Mon Jan 16 17:11:12 2006 UTC

… …
2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include "rxvtlib.h" 4#include "rxvtlib.h"
5 5
6#include "feature.h" 6#include "feature.h"
7
8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1
10#endif
11
12#if ENABLE_PERL
13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1
15#endif
16
17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1
20# define CURSOR_BLINK 1
21#else
22# define ENABLE_MINIMAL 1
23#endif
7 24
8#include <limits.h> 25#include <limits.h>
9 26
10#include <X11/cursorfont.h> 27#include <X11/cursorfont.h>
11#include <X11/keysym.h> 28#include <X11/keysym.h>
… …
19#include "rxvtfont.h" 36#include "rxvtfont.h"
20#include "rxvttoolkit.h" 37#include "rxvttoolkit.h"
21#include "iom.h" 38#include "iom.h"
22#include "salloc.h" 39#include "salloc.h"
23 40
24#if ENABLE_FRILLS 41#include "rxvtperl.h"
25# define ENABLE_XEMBED 1 42
26# define ENABLE_EWMH 1 43// try to avoid some macros to decrease code size, on some systems
27# define CURSOR_BLINK 1 44#if ENABLE_MINIMAL
45# define strcmp(a,b) (strcmp)(a,b)
46# define strlen(a) (strlen)(a)
47# define strcpy(a,b) (strcpy)(a,b)
48# define memset(a,c,l) (memset)(a,c,l)
49# define memcpy(a,b,l) (memcpy)(a,b,l)
28#endif 50#endif
29 51
30/* 52/*
31 ***************************************************************************** 53 *****************************************************************************
32 * SYSTEM HACKS 54 * SYSTEM HACKS
… …
41#if defined (sun) && !defined (__sun__) 63#if defined (sun) && !defined (__sun__)
42# define __sun__ 1 64# define __sun__ 1
43#endif 65#endif
44 66
45#ifndef HAVE_XPOINTER 67#ifndef HAVE_XPOINTER
46typedef char *XPointer; 68typedef char *XPointer;
47#endif 69#endif
48 70
49#ifdef HAVE_TERMIOS_H 71#ifdef HAVE_TERMIOS_H
50# include <termios.h> 72# include <termios.h>
51typedef struct termios ttymode_t; 73typedef struct termios ttymode_t;
… …
70 92
71#ifndef STDIN_FILENO 93#ifndef STDIN_FILENO
72# define STDIN_FILENO 0 94# define STDIN_FILENO 0
73# define STDOUT_FILENO 1 95# define STDOUT_FILENO 1
74# define STDERR_FILENO 2 96# define STDERR_FILENO 2
75#endif
76
77#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
78# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
79# define NO_SETOWNER_TTYDEV 1
80# endif
81#endif
82#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
83# define NO_SETOWNER_TTYDEV 1
84#endif 97#endif
85 98
86/* 99/*
87 ***************************************************************************** 100 *****************************************************************************
88 * PROTOTYPES 101 * PROTOTYPES
… …
116char * rxvt_Str_trim (char *str); 129char * rxvt_Str_trim (char *str);
117int rxvt_Str_escaped (char *str); 130int rxvt_Str_escaped (char *str);
118char ** rxvt_splitcommastring (const char *cs); 131char ** rxvt_splitcommastring (const char *cs);
119void rxvt_freecommastring (char **cs); 132void rxvt_freecommastring (char **cs);
120char * rxvt_File_find (const char *file, const char *ext, const char *path); 133char * rxvt_File_find (const char *file, const char *ext, const char *path);
121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
123void rxvt_usleep (int usecs); 134void rxvt_usleep (int usecs);
135
136/////////////////////////////////////////////////////////////////////////////
137
138// temporarily replace the process environment
139extern char **environ;
140extern char **rxvt_environ; // the original environ pointer
141
142inline void set_environ (stringvec *envv)
143{
144 if (envv)
145 environ = (char **)envv->begin ();
146}
147
148inline void set_environ (char **envv)
149{
150 if (envv)
151 environ = envv;
152}
124 153
125/* 154/*
126 ***************************************************************************** 155 *****************************************************************************
127 * STRUCTURES AND TYPEDEFS 156 * STRUCTURES AND TYPEDEFS
128 ***************************************************************************** 157 *****************************************************************************
129 */ 158 */
130struct grwin_t; 159struct grwin_t;
131 160
132/* Sanitize menubar info */
133#ifndef MENUBAR
134# undef MENUBAR_MAX
135#endif
136#ifndef MENUBAR_MAX
137# define MENUBAR_MAX 0
138#endif
139
140/* If we're using either the rxvt scrollbar or menu bars, keep the 161/* If we're using either the rxvt scrollbar, keep the
141 * scrollColor resource. 162 * scrollColor resource.
142 */ 163 */
143#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 164#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
144# define KEEP_SCROLLCOLOR 1 165# define KEEP_SCROLLCOLOR 1
145#else 166#else
146# undef KEEP_SCROLLCOLOR 167# undef KEEP_SCROLLCOLOR
147#endif 168#endif
148 169
… …
162 Time time; /* milliseconds */ 183 Time time; /* milliseconds */
163 unsigned int state; /* key or button mask */ 184 unsigned int state; /* key or button mask */
164 unsigned int button; /* detail */ 185 unsigned int button; /* detail */
165}; 186};
166 187
167#define MAX_POSITIVE_INT16 (((uint16_t)-1)>>1) // TODO: configure/limits
168
169#if ENABLE_FRILLS 188#if ENABLE_FRILLS
170typedef struct _mwmhints { 189typedef struct _mwmhints {
171 CARD32 flags; 190 CARD32 flags;
172 CARD32 functions; 191 CARD32 functions;
173 CARD32 decorations; 192 CARD32 decorations;
… …
220 239
221#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 240#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
222# define NO_MOUSE_REPORT_SCROLLBAR 1 241# define NO_MOUSE_REPORT_SCROLLBAR 1
223#endif 242#endif
224 243
225#ifdef NO_RESOURCES
226# undef USE_XGETDEFAULT
227#endif
228
229#if ISO_14755
230# define ENABLE_OVERLAY 1
231#endif
232
233/* now look for other badly set stuff */ 244/* now look for other badly set stuff */
234 245
235#if !defined (EACCESS) && defined(EAGAIN) 246#if !defined (EACCESS) && defined(EAGAIN)
236# define EACCESS EAGAIN 247# define EACCESS EAGAIN
237#endif 248#endif
… …
239#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 250#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
240# define EXIT_SUCCESS 0 /* exit function success */ 251# define EXIT_SUCCESS 0 /* exit function success */
241# define EXIT_FAILURE 1 /* exit function failure */ 252# define EXIT_FAILURE 1 /* exit function failure */
242#endif 253#endif
243 254
244#define menuBar_esc 10
245#define scrollBar_esc 30 255#define scrollBar_esc 30
246#define menuBar_margin 2 /* margin below text */
247 256
248#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 257#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
249# define HAVE_SCROLLBARS 1 258# define HAVE_SCROLLBARS 1
250#endif
251
252/* width of scrollBar, menuBar shadow, must be 1 or 2 */
253#ifdef HALFSHADOW
254# define SHADOW 1
255#else
256# define SHADOW 2
257#endif 259#endif
258 260
259#define R_SB_ALIGN_CENTRE 0 261#define R_SB_ALIGN_CENTRE 0
260#define R_SB_ALIGN_TOP 1 262#define R_SB_ALIGN_TOP 1
261#define R_SB_ALIGN_BOTTOM 2 263#define R_SB_ALIGN_BOTTOM 2
… …
353#define FONT_DN "#-" 355#define FONT_DN "#-"
354#define FONT_UP "#+" 356#define FONT_UP "#+"
355 357
356/* flags for rxvt_scr_gotorc () */ 358/* flags for rxvt_scr_gotorc () */
357enum { 359enum {
358 C_RELATIVE = 1 , /* col movement is relative */ 360 C_RELATIVE = 1, /* col movement is relative */
359 R_RELATIVE = 2, /* row movement is relative */ 361 R_RELATIVE = 2, /* row movement is relative */
360 RELATIVE = 1 | 2, 362 RELATIVE = C_RELATIVE | R_RELATIVE,
361}; 363};
362 364
363/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 365/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
364enum { 366enum {
365 INSERT = -1, /* don't change these values */ 367 INSERT = -1, /* don't change these values */
… …
378enum { 380enum {
379 PRIMARY = 0, 381 PRIMARY = 0,
380 SECONDARY, 382 SECONDARY,
381}; 383};
382 384
383#define RS_None 0 /* Normal */ 385#define RS_None 0
384 386
385#define RS_fgMask 0x0000007fUL /* 128 colors */ 387#define RS_fgMask 0x0000007fUL // 128 colors
386#define RS_bgMask 0x00003f80UL /* 128 colors */ 388#define RS_bgMask 0x00003f80UL // 128 colors
387 389
388// font styles 390// font styles
389#define RS_Bold 0x00004000UL // value 1 391#define RS_Bold 0x00004000UL // value 1
390#define RS_Italic 0x00008000UL // value 2 392#define RS_Italic 0x00008000UL // value 2
391 393
392// fake styles 394// fake styles
393#define RS_Blink 0x00010000UL /* blink */ 395#define RS_Blink 0x00010000UL // blink
394#define RS_RVid 0x00020000UL /* reverse video */ 396#define RS_RVid 0x00020000UL // reverse video
395#define RS_Uline 0x00040000UL /* underline */ 397#define RS_Uline 0x00040000UL // underline
396 398
397// 5 bits still to go 399// 5 custom bits for extensions
400#define RS_customCount 32
401#define RS_customMask 0x00f80000UL
402#define RS_customShift 19
398 403
399// other flags 404// other flags
400#define RS_Careful 0x80000000UL /* be careful when drawing these */ 405#define RS_Careful 0x80000000UL /* be careful when drawing these */
401 406
402#define RS_styleCount 4 407#define RS_styleCount 4
… …
444 XTerm_property = 3, // change X property 449 XTerm_property = 3, // change X property
445 XTerm_Color = 4, // change colors 450 XTerm_Color = 4, // change colors
446 XTerm_Color00 = 10, // not implemented, CLASH! 451 XTerm_Color00 = 10, // not implemented, CLASH!
447 XTerm_Color01 = 11, // not implemented 452 XTerm_Color01 = 11, // not implemented
448 XTerm_Color_cursor = 12, // change actual 'Cursor' color 453 XTerm_Color_cursor = 12, // change actual 'Cursor' color
449 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 454 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
450 XTerm_Color_pointer_bg = 14, // not implemented 455 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
451 XTerm_Color05 = 15, // not implemented 456 XTerm_Color05 = 15, // not implemented (tektronix fg)
452 XTerm_Color06 = 16, // not implemented 457 XTerm_Color06 = 16, // not implemented (tektronix bg)
453 XTerm_Color_RV = 17, // change actual 'Highlight' color 458 XTerm_Color_RV = 17, // change actual 'Highlight' color
454 XTerm_logfile = 46, // not implemented 459 XTerm_logfile = 46, // not implemented
455 XTerm_font = 50, 460 XTerm_font = 50,
456 461
457 XTerm_konsole30 = 30, // reserved for konsole 462 XTerm_konsole30 = 30, // reserved for konsole
458 XTerm_konsole31 = 31, // reserved for konsole 463 XTerm_konsole31 = 31, // reserved for konsole
459 XTerm_emacs51 = 51, // reserved for emacs shell 464 XTerm_emacs51 = 51, // reserved for emacs shell
460 /* 465 /*
461 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 466 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
467 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
462 */ 468 */
463 XTerm_Color_BD = 18, // change actual 'Bold' color 469 Rxvt_Color_BD = 18, // change actual 'Bold' color
464 XTerm_Color_UL = 19, // change actual 'Underline' color 470 Rxvt_Color_UL = 19, // change actual 'Underline' color
465 XTerm_Pixmap = 20, // new bg pixmap 471 Rxvt_Pixmap = 20, // new bg pixmap
466 XTerm_restoreFG = 39, // change default fg color 472 Rxvt_restoreFG = 39, // change default fg color
467 XTerm_restoreBG = 49, // change default bg color 473 Rxvt_restoreBG = 49, // change default bg color
468 XTerm_dumpscreen = 55, // dump scrollback and all of screen 474 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
469 475
470 URxvt_locale = 701, // change locale 476 URxvt_locale = 701, // change locale
471 URxvt_Menu = 703, // set menu item 477
472 URxvt_Color_IT = 704, // change actual 'Italic' colour 478 URxvt_Color_IT = 704, // change actual 'Italic' colour
473 URxvt_Color_tint = 705, // change actual tint colour 479 URxvt_Color_tint = 705, // change actual tint colour
480 URxvt_Color_BD = 706,
481 URxvt_Color_UL = 707,
474 482
475 URxvt_font = 710, 483 URxvt_font = 710,
476 URxvt_boldFont = 711, 484 URxvt_boldFont = 711,
477 URxvt_italicFont = 712, 485 URxvt_italicFont = 712,
478 URxvt_boldItalicFont = 713, 486 URxvt_boldItalicFont = 713,
479 487
480 URxvt_view_up = 720, 488 URxvt_view_up = 720,
481 URxvt_view_down = 721, 489 URxvt_view_down = 721,
490
491 URxvt_perl = 777,
482}; 492};
483 493
484/* Words starting with `Color_' are colours. Others are counts */ 494/* Words starting with `Color_' are colours. Others are counts */
485/* 495/*
486 * The PixColor and rendition colour usage should probably be decoupled 496 * The PixColor and rendition colour usage should probably be decoupled
… …
563 573
564/* 574/*
565 * Resource list 575 * Resource list
566 */ 576 */
567enum { 577enum {
568 Rs_display_name = 0, 578# define def(name) Rs_ ## name,
569 Rs_term_name, 579# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
570 Rs_iconName, 580# include "rsinc.h"
571 Rs_geometry, 581# undef def
572 Rs_reverseVideo, 582# undef reserve
573 Rs_color,
574 _Rs_color = Rs_color + NRS_COLORS - 1,
575 Rs_font,
576#if ENABLE_STYLES
577 Rs_boldFont,
578 Rs_italicFont,
579 Rs_boldItalicFont,
580#endif
581 Rs_name,
582 Rs_title,
583#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
584 Rs_path,
585#endif
586#ifdef XPM_BACKGROUND
587 Rs_backgroundPixmap,
588#endif
589#if (MENUBAR_MAX)
590 Rs_menu,
591#endif
592 Rs_loginShell,
593 Rs_jumpScroll,
594#ifdef HAVE_SCROLLBARS
595 Rs_scrollBar,
596 Rs_scrollBar_right,
597 Rs_scrollBar_floating,
598 Rs_scrollBar_align,
599 Rs_scrollstyle, /* Rs_scrollBar_style */
600 Rs_scrollBar_thickness,
601#endif
602 Rs_scrollTtyOutput,
603 Rs_scrollTtyKeypress,
604 Rs_scrollWithBuffer,
605 Rs_saveLines,
606 Rs_utmpInhibit,
607 Rs_visualBell,
608#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
609 Rs_mapAlert,
610#endif
611#ifdef META8_OPTION
612 Rs_meta8,
613#endif
614#ifdef MOUSE_WHEEL
615 Rs_mouseWheelScrollPage,
616#endif
617#ifndef NO_BACKSPACE_KEY
618 Rs_backspace_key,
619#endif
620#ifndef NO_DELETE_KEY
621 Rs_delete_key,
622#endif
623 Rs_selectstyle,
624#ifdef PRINTPIPE
625 Rs_print_pipe,
626#endif
627#ifdef USE_XIM
628 Rs_preeditType,
629 Rs_inputMethod,
630#endif
631#ifdef TRANSPARENT
632 Rs_transparent,
633 Rs_transparent_all,
634#endif
635#if ENABLE_FRILLS
636 Rs_ext_bwidth,
637 Rs_int_bwidth,
638 Rs_borderLess,
639 Rs_lineSpace,
640 Rs_pty_fd,
641 Rs_cursorUnderline,
642#endif
643#if CURSOR_BLINK
644 Rs_cursorBlink,
645#endif
646#if ENABLE_XEMBED
647 Rs_embed,
648#endif
649 Rs_cutchars,
650 Rs_modifier,
651 Rs_answerbackstring,
652 Rs_tripleclickwords,
653 Rs_insecure,
654 Rs_pointerBlank,
655 Rs_pointerBlankDelay,
656 Rs_imLocale,
657 Rs_imFont,
658 Rs_pastableTabs,
659#ifndef NO_SECONDARY_SCREEN
660 Rs_secondaryScreen,
661 Rs_secondaryScroll,
662#endif
663#ifdef OFF_FOCUS_FADING
664 Rs_fade,
665#endif
666#ifdef TINTING
667 Rs_shade,
668#endif
669 NUM_RESOURCES 583 NUM_RESOURCES
670}; 584};
671 585
672// see init.C:xa_names, which must be kept in sync 586// see init.C:xa_names, which must be kept in sync
673enum { 587enum {
… …
723#define PrivMode_ShiftKeys (1UL<<10) 637#define PrivMode_ShiftKeys (1UL<<10)
724#define PrivMode_VisibleCursor (1UL<<11) 638#define PrivMode_VisibleCursor (1UL<<11)
725#define PrivMode_MouseX10 (1UL<<12) 639#define PrivMode_MouseX10 (1UL<<12)
726#define PrivMode_MouseX11 (1UL<<13) 640#define PrivMode_MouseX11 (1UL<<13)
727#define PrivMode_scrollBar (1UL<<14) 641#define PrivMode_scrollBar (1UL<<14)
728#define PrivMode_menuBar (1UL<<15)
729#define PrivMode_TtyOutputInh (1UL<<16) 642#define PrivMode_TtyOutputInh (1UL<<15)
730#define PrivMode_Keypress (1UL<<17) 643#define PrivMode_Keypress (1UL<<16)
731#define PrivMode_smoothScroll (1UL<<18) 644#define PrivMode_smoothScroll (1UL<<17)
732#define PrivMode_vt52 (1UL<<19) 645#define PrivMode_vt52 (1UL<<18)
733#define PrivMode_LFNL (1UL<<20) 646#define PrivMode_LFNL (1UL<<19)
734/* too annoying to implement X11 highlight tracking */ 647/* too annoying to implement X11 highlight tracking */
735/* #define PrivMode_MouseX11Track (1LU<<21) */ 648/* #define PrivMode_MouseX11Track (1LU<<20) */
736 649
737#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 650#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
738#define PrivMode(test,bit) \ 651#define PrivMode(test,bit) \
739 if (test) \ 652 if (test) \
740 priv_modes |= (bit); \ 653 priv_modes |= (bit); \
… …
748#endif 661#endif
749 662
750// do not change these constants lightly, there are many interdependencies 663// do not change these constants lightly, there are many interdependencies
751#define IMBUFSIZ 128 // input modifier buffer sizes 664#define IMBUFSIZ 128 // input modifier buffer sizes
752#define KBUFSZ 512 // size of keyboard mapping buffer 665#define KBUFSZ 512 // size of keyboard mapping buffer
753#define CBUFSIZ 4096 // size of command buffer 666#define CBUFSIZ 2048 // size of command buffer
754#define UBUFSIZ 4096 // character buffer 667#define UBUFSIZ 2048 // character buffer
755 668
756#ifndef PATH_MAX 669#ifndef PATH_MAX
757# define PATH_MAX 16384 670# define PATH_MAX 16384
758#endif 671#endif
759 672
… …
787/* 700/*
788 ***************************************************************************** 701 *****************************************************************************
789 * MACRO DEFINES 702 * MACRO DEFINES
790 ***************************************************************************** 703 *****************************************************************************
791 */ 704 */
792#define memset(x, y, z) memset((x), (y), (size_t)(z))
793#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
794#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
795#define strcasecmp(x, y) strcasecmp((x), (y))
796#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
797#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
798#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
799#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
800#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
801#define strcat(x, y) strcat((char *)(x), (const char *)(y))
802#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
803#define strdup(x) strdup((const char *)(x))
804#define strlen(x) strlen((const char *)(x))
805#define strchr(x, y) strchr((const char *)(x), (int)(y))
806#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
807
808#define dDisp Display *disp = display->display 705#define dDisp Display *disp = display->display
809 706
810/* convert pixel dimensions to row/column values. Everything as int32_t */ 707/* convert pixel dimensions to row/column values. Everything as int32_t */
811#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 708#define Pixel2Col(x) Pixel2Width((int32_t)(x))
812#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 709#define Pixel2Row(y) Pixel2Height((int32_t)(y))
… …
815#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 712#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
816#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 713#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 714#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 715#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
819 716
820#define TermWin_TotalWidth() ((int32_t)this->width) 717#define OPTION(opt) (options & (opt))
821#define TermWin_TotalHeight() ((int32_t)this->height) 718#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
719 | Opt_jumpScroll | Opt_secondaryScreen \
720 | Opt_pastableTabs | Opt_intensityStyles)
822 721
823#define LINENO(n) (((n) + term_start + total_rows) % total_rows) 722// for m >= -n, ensure remainder lies between 0..n-1
723#define MOD(m,n) (((m) + (n)) % (n))
724
725#define LINENO(n) MOD (term_start + int(n), total_rows)
824#define ROW(n) (save [LINENO (n)]) 726#define ROW(n) row_buf [LINENO (n)]
825 727
826/* how to build & extract colors and attributes */ 728/* how to build & extract colors and attributes */
827#define GET_BASEFG(x) (((x) & RS_fgMask)) 729#define GET_BASEFG(x) (((x) & RS_fgMask))
828#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 730#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
829#ifndef NO_BRIGHTCOLOR
830# define GET_FGCOLOR(x) \
831 ((((x) & RS_Bold) == 0 \
832 || GET_BASEFG (x) < minCOLOR \
833 || GET_BASEFG (x) >= minBrightCOLOR) \
834 ? GET_BASEFG (x) \
835 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
836# define GET_BGCOLOR(x) \
837 ((((x) & RS_Blink) == 0 \
838 || GET_BASEBG (x) < minCOLOR \
839 || GET_BASEBG (x) >= minBrightCOLOR) \
840 ? GET_BASEBG (x) \
841 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
842#else
843# define GET_FGCOLOR(x) GET_BASEFG(x)
844# define GET_BGCOLOR(x) GET_BASEBG(x)
845#endif
846 731
847#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 732#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
848#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 733#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
849 734
850#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 735#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
898#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 783#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
899#define scrollbar_position(y) ((y) - scrollBar.beg) 784#define scrollbar_position(y) ((y) - scrollBar.beg)
900#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 785#define scrollbar_size() (scrollBar.end - scrollBar.beg \
901 - scrollbar_minheight ()) 786 - scrollbar_minheight ())
902 787
903#if (MENUBAR_MAX > 1)
904/* rendition style flags */
905# define menuBar_height() (fheight + SHADOW)
906# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
907# define isMenuBarWindow(w) ((w) == menuBar.win)
908#else
909# define menuBar_height() (0)
910# define menuBar_TotalHeight() (0)
911# define isMenuBarWindow(w) (0)
912#endif
913
914#ifdef XPM_BACKGROUND 788#ifdef XPM_BACKGROUND
915# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 789# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
916#else 790#else
917# define XPMClearArea(a, b, c, d, e, f, g) 791# define XPMClearArea(a, b, c, d, e, f, g)
918#endif 792#endif
… …
957#endif 831#endif
958 832
959extern class rxvt_failure_exception { } rxvt_failure_exception; 833extern class rxvt_failure_exception { } rxvt_failure_exception;
960 834
961typedef callback1<void, const char *> log_callback; 835typedef callback1<void, const char *> log_callback;
836typedef callback1<int, int> getfd_callback;
962 837
963extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 838extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
964extern void rxvt_log (const char *fmt, ...); 839extern void rxvt_log (const char *fmt, ...);
965extern void rxvt_warn (const char *fmt, ...); 840extern void rxvt_warn (const char *fmt, ...);
966extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 841extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
967extern void rxvt_exit_failure () __attribute__ ((noreturn)); 842extern void rxvt_exit_failure () __attribute__ ((noreturn));
968 843
969#define SET_LOCALE(locale) rxvt_set_locale (locale) 844#define SET_LOCALE(locale) rxvt_set_locale (locale)
970extern bool rxvt_set_locale (const char *locale); 845extern bool rxvt_set_locale (const char *locale);
846extern void rxvt_push_locale (const char *locale);
847extern void rxvt_pop_locale ();
971 848
972/*
973 ***************************************************************************** 849/****************************************************************************/
974 * VARIABLES
975 *****************************************************************************
976 */
977#ifdef MENUBAR
978# include "menubar.h"
979#endif
980 850
981#define BLINK_INTERVAL 0.5 851#define BLINK_INTERVAL 0.5
982#define TEXT_BLINK_INTERVAL 0.5 852#define TEXT_BLINK_INTERVAL 0.5
983 853
984#ifndef __attribute__ 854#ifndef __attribute__
… …
988# endif 858# endif
989# endif 859# endif
990# define __attribute__(x) 860# define __attribute__(x)
991#endif 861#endif
992 862
863/****************************************************************************/
864
865#define LINE_LONGER 0x0001 // line is continued on the next row
866#define LINE_FILTERED 0x0002 // line has been filtered
867#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
868
869struct line_t {
870 text_t *t; // terminal the text
871 rend_t *r; // rendition, uses RS_ flags
872 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
873 uint32_t f; // flags
874
875 bool is_longer ()
876 {
877 return f & LINE_LONGER;
878 }
879
880 void is_longer (int set)
881 {
882 if (set)
883 f |= LINE_LONGER;
884 else
885 f &= ~LINE_LONGER;
886 }
887
888 void clear ()
889 {
890 t = 0;
891 r = 0;
892 l = 0;
893 f = 0;
894 }
895
896 void touch () // call whenever a line is changed/touched/updated
897 {
898#if ENABLE_PERL
899 f &= ~LINE_FILTERED;
900#endif
901 }
902
903 void touch (int col)
904 {
905 max_it (l, col);
906 touch ();
907 }
908};
909
910/****************************************************************************/
911
993// primivite wrapper around mbstate_t to ensure initialisation 912// primivite wrapper around mbstate_t to ensure initialisation
994struct mbstate { 913struct mbstate {
995 mbstate_t mbs; 914 mbstate_t mbs;
996 915
997 operator mbstate_t *() { return &mbs; } 916 operator mbstate_t *() { return &mbs; }
998 void reset () { memset (&mbs, 0, sizeof (mbs)); } 917 void reset () { memset (&mbs, 0, sizeof (mbs)); }
999 mbstate () { reset (); } 918 mbstate () { reset (); }
1000}; 919};
1001 920
921/****************************************************************************/
922
1002#define UNICODE_MASK 0x1fffffUL 923#define UNICODE_MASK 0x1fffffUL
1003 924
1004#if UNICODE3 925#if UNICODE3
1005# define COMPOSE_LO 0x40000000UL 926# define COMPOSE_LO 0x40000000UL
1006# define COMPOSE_HI 0x400fffffUL 927# define COMPOSE_HI 0x400fffffUL
1007# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 928# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
1008#else 929#else
930# if ENABLE_PERL
931# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
932# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
933# else
1009# define COMPOSE_LO 0xd800UL 934# define COMPOSE_LO 0xd800UL
1010# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 935# define COMPOSE_HI 0xf8ffUL
1011# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 936# endif
937# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
1012#endif 938#endif
1013 939
1014#if ENABLE_COMBINING 940#if ENABLE_COMBINING
1015// compose chars are used to represent composite characters 941// compose chars are used to represent composite characters
1016// that are not representable in unicode, as well as characters 942// that are not representable in unicode, as well as characters
… …
1036}; 962};
1037 963
1038extern class rxvt_composite_vec rxvt_composite; 964extern class rxvt_composite_vec rxvt_composite;
1039#endif 965#endif
1040 966
967/****************************************************************************/
1041 968
1042#ifdef KEYSYM_RESOURCE 969#ifdef KEYSYM_RESOURCE
1043 class keyboard_manager; 970 class keyboard_manager;
1044#endif 971#endif
1045 972
1046struct rxvt_term : zero_initialized, rxvt_vars { 973struct rxvt_term : zero_initialized, rxvt_vars {
1047 log_callback *log_hook; // log error messages through this hook, if != 0 974 log_callback *log_hook; // log error messages through this hook, if != 0
1048 975 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
976#if ENABLE_PERL
977 rxvt_perl_term perl;
978#endif
1049 struct mbstate mbstate; // current input multibyte state 979 struct mbstate mbstate; // current input multibyte state
1050 980
1051 unsigned char want_refresh:1, 981 unsigned char want_refresh:1,
1052#ifdef TRANSPARENT 982#ifdef TRANSPARENT
1053 want_full_refresh:1, /* awaiting full screen refresh */ 983 want_full_refresh:1, /* awaiting full screen refresh */
… …
1108 refresh_limit, 1038 refresh_limit,
1109 last_bot, /* scrollbar last bottom position */ 1039 last_bot, /* scrollbar last bottom position */
1110 last_top, /* scrollbar last top position */ 1040 last_top, /* scrollbar last top position */
1111 last_state, /* scrollbar last state */ 1041 last_state, /* scrollbar last state */
1112 scrollbar_len, 1042 scrollbar_len,
1113#ifdef MENUBAR
1114 menu_readonly, /* okay to alter menu? */
1115 Arrows_x,
1116#endif
1117#if MENUBAR_MAX > 1
1118 Nbars,
1119#endif
1120 window_vt_x, 1043 window_vt_x,
1121 window_vt_y, 1044 window_vt_y,
1122 window_sb_x, 1045 window_sb_x,
1123# ifdef POINTER_BLANK 1046# ifdef POINTER_BLANK
1124 pointerBlankDelay, 1047 pointerBlankDelay,
… …
1133 unsigned long priv_modes, 1056 unsigned long priv_modes,
1134 SavedModes; 1057 SavedModes;
1135/* ---------- */ 1058/* ---------- */
1136 Atom xa[NUM_XA]; 1059 Atom xa[NUM_XA];
1137/* ---------- */ 1060/* ---------- */
1138#ifdef MENUBAR 1061#ifdef RXVT_SCROLLBAR
1139 GC menubarGC;
1140#endif
1141#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1142 GC scrollbarGC, 1062 GC scrollbarGC,
1143 topShadowGC, 1063 topShadowGC,
1144 botShadowGC; 1064 botShadowGC;
1145#endif 1065#endif
1146#ifdef XTERM_SCROLLBAR 1066#ifdef XTERM_SCROLLBAR
… …
1195 row_col_t oldcursor; 1115 row_col_t oldcursor;
1196#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1197 bgPixmap_t bgPixmap; 1117 bgPixmap_t bgPixmap;
1198 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1118 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1199#endif 1119#endif
1200#ifdef MENUBAR
1201 menu_t *ActiveMenu, /* currently active menu */
1202 *BuildMenu; /* the menu currently being built */
1203 bar_t *CurrentBar;
1204# if ! (MENUBAR_MAX > 1)
1205 bar_t BarList;
1206# endif /* (MENUBAR_MAX > 1) */
1207#endif
1208#ifdef CURSOR_BLINK
1209 struct timeval lastcursorchange;
1210#endif
1211#ifdef POINTER_BLANK
1212 struct timeval lastmotion;
1213#endif
1214 1120
1215#if ENABLE_OVERLAY 1121#if ENABLE_OVERLAY
1216 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1122 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1217 text_t **ov_text; 1123 text_t **ov_text;
1218 rend_t **ov_rend; 1124 rend_t **ov_rend;
… …
1233 char *env_display; /* environmental variable DISPLAY */ 1139 char *env_display; /* environmental variable DISPLAY */
1234 char *env_term; /* environmental variable TERM */ 1140 char *env_term; /* environmental variable TERM */
1235 char *env_colorfgbg; 1141 char *env_colorfgbg;
1236 char *locale; 1142 char *locale;
1237 char charsets[4]; 1143 char charsets[4];
1238 unsigned char *v_buffer; /* pointer to physical buffer */ 1144 char *v_buffer; /* pointer to physical buffer */
1239 unsigned int v_buflen; /* size of area to write */ 1145 unsigned int v_buflen; /* size of area to write */
1240 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1146 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1241 1147
1242#ifdef KEYSYM_RESOURCE 1148#ifdef KEYSYM_RESOURCE
1243 keyboard_manager *keyboard; 1149 keyboard_manager *keyboard;
1244#endif 1150#endif
1245 1151
1246 const char *rs[NUM_RESOURCES]; 1152 const char *rs[NUM_RESOURCES];
1247 /* command input buffering */ 1153 /* command input buffering */
1248 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1154 char *cmdbuf_ptr, *cmdbuf_endp;
1249 unsigned char cmdbuf_base[CBUFSIZ]; 1155 char cmdbuf_base[CBUFSIZ];
1250 1156
1251 rxvt_salloc *talloc; // text line allocator 1157 rxvt_salloc *talloc; // text line allocator
1252 rxvt_salloc *ralloc; // rend line allocator 1158 rxvt_salloc *ralloc; // rend line allocator
1253 1159
1254 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1160 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1257 // ISO 14755 entry support 1163 // ISO 14755 entry support
1258 unicode_t iso14755buf; 1164 unicode_t iso14755buf;
1259 void commit_iso14755 (); 1165 void commit_iso14755 ();
1260 int hex_keyval (XKeyEvent &ev); 1166 int hex_keyval (XKeyEvent &ev);
1261# if ISO_14755 1167# if ISO_14755
1262 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1168 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1263 void iso14755_54 (int x, int y); 1169 void iso14755_54 (int x, int y);
1264# endif 1170# endif
1265#endif 1171#endif
1266 1172
1267 // modifies first argument(!) 1173 // modifies first argument(!)
1268 void paste (unsigned char *data, unsigned int len); 1174 void paste (char *data, unsigned int len);
1269 1175
1270 void flush (); 1176 long vt_emask, vt_emask_perl;
1177
1178 void vt_select_input () const
1179 {
1180 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1181 }
1271 1182
1272#if TRANSPARENT 1183#if TRANSPARENT
1273 void rootwin_cb (XEvent &xev); 1184 void rootwin_cb (XEvent &xev);
1274 xevent_watcher rootwin_ev; 1185 xevent_watcher rootwin_ev;
1275#endif 1186#endif
1276 1187
1277 void x_cb (XEvent &xev); 1188 void x_cb (XEvent &xev);
1189 void flush ();
1278 xevent_watcher termwin_ev; 1190 xevent_watcher termwin_ev;
1279 xevent_watcher vt_ev; 1191 xevent_watcher vt_ev;
1280#ifdef HAVE_SCROLLBARS 1192#ifdef HAVE_SCROLLBARS
1281 xevent_watcher scrollbar_ev; 1193 xevent_watcher scrollbar_ev;
1282#endif 1194#endif
1283#ifdef MENUBAR
1284 xevent_watcher menubar_ev;
1285#endif
1286 1195
1287 void check_cb (check_watcher &w); check_watcher check_ev; 1196 void check_cb (check_watcher &w); check_watcher check_ev;
1288 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1197 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1289 void flush_cb (time_watcher &w); time_watcher flush_ev; 1198 void flush_cb (time_watcher &w); time_watcher flush_ev;
1290 1199
… …
1314 void pointer_blank (); 1223 void pointer_blank ();
1315#endif 1224#endif
1316 void pointer_unblank (); 1225 void pointer_unblank ();
1317 1226
1318 void tt_printf (const char *fmt,...); 1227 void tt_printf (const char *fmt,...);
1319 void tt_write (const unsigned char *data, unsigned int len); 1228 void tt_write (const char *data, unsigned int len);
1320 void pty_write (); 1229 void pty_write ();
1321 1230
1322 void tt_winch (); 1231 void tt_winch ();
1323 1232
1324 rxvt_term (); 1233 rxvt_term ();
1325 ~rxvt_term (); 1234 ~rxvt_term ();
1235 void child_exit (); // child has exited, usually destroys
1326 void destroy (); 1236 void destroy ();
1327 void emergency_cleanup (); 1237 void emergency_cleanup ();
1328 1238
1329 bool init (int argc, const char *const *argv); 1239 bool init (int argc, const char *const *argv);
1330 bool init_vars (); 1240 bool init_vars ();
1331 1241
1332 bool pty_fill (); 1242 bool pty_fill ();
1333 1243
1244 void make_current () const // make this the "currently active" urxvt instance
1245 {
1246 SET_R (this);
1247 rxvt_set_locale (locale);
1248 set_environ (envv);
1249 }
1250
1334 void init_secondary (); 1251 void init_secondary ();
1335 const char **init_resources (int argc, const char *const *argv); 1252 const char **init_resources (int argc, const char *const *argv);
1253 const char *x_resource (const char *name);
1336 void init_env (); 1254 void init_env ();
1337 void set_locale (const char *locale); 1255 void set_locale (const char *locale);
1338 void init_xlocale (); 1256 void init_xlocale ();
1339 void init_command (const char *const *argv); 1257 void init_command (const char *const *argv);
1340 void run_command (const char *const *argv); 1258 void run_command (const char *const *argv);
… …
1375 1293
1376 /* autoconvert */ 1294 /* autoconvert */
1377 1295
1378 // command.C 1296 // command.C
1379 void lookup_key (XKeyEvent &ev); 1297 void lookup_key (XKeyEvent &ev);
1380 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1298 unsigned int cmd_write (const char *str, unsigned int count);
1381 1299
1382 unicode_t next_char (); 1300 wchar_t next_char ();
1383 unicode_t cmd_getc (); 1301 wchar_t cmd_getc ();
1384 unicode_t next_octet (); 1302 uint32_t next_octet ();
1385 unicode_t cmd_get8 (); 1303 uint32_t cmd_get8 ();
1386 1304
1387 bool cmd_parse (); 1305 bool cmd_parse ();
1388 void mouse_report (XButtonEvent &ev); 1306 void mouse_report (XButtonEvent &ev);
1389 void button_press (XButtonEvent &ev); 1307 void button_press (XButtonEvent &ev);
1390 void button_release (XButtonEvent &ev); 1308 void button_release (XButtonEvent &ev);
… …
1399 void process_nonprinting (unicode_t ch); 1317 void process_nonprinting (unicode_t ch);
1400 void process_escape_vt52 (unicode_t ch); 1318 void process_escape_vt52 (unicode_t ch);
1401 void process_escape_seq (); 1319 void process_escape_seq ();
1402 void process_csi_seq (); 1320 void process_csi_seq ();
1403 void process_window_ops (const int *args, unsigned int nargs); 1321 void process_window_ops (const int *args, unsigned int nargs);
1404 unsigned char *get_to_st (unicode_t &ends_how); 1322 char *get_to_st (unicode_t &ends_how);
1405 void process_dcs_seq (); 1323 void process_dcs_seq ();
1406 void process_osc_seq (); 1324 void process_osc_seq ();
1407 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1325 void process_color_seq (int report, int color, const char *str, char resp);
1408 void process_xterm_seq (int op, const char *str, unsigned char resp); 1326 void process_xterm_seq (int op, const char *str, char resp);
1409 int privcases (int mode, unsigned long bit); 1327 int privcases (int mode, unsigned long bit);
1410 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1328 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1411 void process_sgr_mode (unsigned int nargs, const int *arg); 1329 void process_sgr_mode (unsigned int nargs, const int *arg);
1412 void process_graphics (); 1330 void process_graphics ();
1413 // init.C 1331 // init.C
… …
1426 void set_window_color (int idx, const char *color); 1344 void set_window_color (int idx, const char *color);
1427 void set_colorfgbg (); 1345 void set_colorfgbg ();
1428 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1346 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1429 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1347 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1430 1348
1431#ifdef MENUBAR
1432 // menubar.C
1433 void menuitem_free (menu_t *menu, menuitem_t *item);
1434 int action_dispatch (action_t *action);
1435 void menuarrow_free (char name);
1436 void menuarrow_add (char *string);
1437 char *menu_find_base (menu_t **menu, char *path);
1438 menu_t *menu_delete (menu_t *menu);
1439 menu_t *menu_add (menu_t *parent, char *path);
1440 void drawbox_menubar (int x, int len, int state);
1441 void drawtriangle (int x, int y, int state);
1442 void drawbox_menuitem (int y, int state);
1443 void menu_show ();
1444 void menu_display (void (rxvt_term::*update) ());
1445 void menu_hide_all ();
1446 void menu_hide ();
1447 void menu_clear (menu_t *menu);
1448 void menubar_clear ();
1449 bar_t *menubar_find (const char *name);
1450 int menubar_push (const char *name);
1451 void menubar_remove (const char *name);
1452 void menubar_dump (FILE *fp);
1453 void menubar_read (const char *filename);
1454 void menubar_dispatch (char *str);
1455 void draw_Arrows (int name, int state);
1456 void menubar_expose ();
1457 int menubar_mapping (int map);
1458 int menu_select (XButtonEvent &ev);
1459 void menubar_select (XButtonEvent &ev);
1460 void menubar_control (XButtonEvent &ev);
1461 void map_menuBar (int map);
1462#endif
1463
1464 // screen.C 1349 // screen.C
1465 1350
1466 void lalloc (line_t &l) 1351 void lalloc (line_t &l) const
1467 { 1352 {
1468 l.t = (text_t *)talloc->alloc (); 1353 l.t = (text_t *)talloc->alloc ();
1469 l.r = (rend_t *)ralloc->alloc (); 1354 l.r = (rend_t *)ralloc->alloc ();
1470 } 1355 }
1471 1356
1357#if 0
1472 void lfree (line_t &l) 1358 void lfree (line_t &l)
1473 { 1359 {
1474 talloc->free (l.t); 1360 talloc->free (l.t);
1475 ralloc->free (l.r); 1361 ralloc->free (l.r);
1476 } 1362 }
1363#endif
1477 1364
1478 void lresize (line_t &l) 1365 void lresize (line_t &l) const
1479 { 1366 {
1480 if (!l.t) 1367 if (!l.t)
1481 return; 1368 return;
1482 1369
1483 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1370 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1487 1374
1488 if (ncol > prev_ncol) 1375 if (ncol > prev_ncol)
1489 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1376 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1490 } 1377 }
1491 1378
1379 int fgcolor_of (rend_t r) const
1380 {
1381 int base = GET_BASEFG (r);
1382#ifndef NO_BRIGHTCOLOR
1383 if (r & RS_Bold
1384# if ENABLE_STYLES
1385 && OPTION (Opt_intensityStyles)
1386# endif
1387 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1388 base += minBrightCOLOR - minCOLOR;
1389#endif
1390 return base;
1391 }
1392
1393 int bgcolor_of (rend_t r) const
1394 {
1395 int base = GET_BASEBG (r);
1396#ifndef NO_BRIGHTCOLOR
1397 if (r & RS_Blink
1398# if ENABLE_STYLES
1399 && OPTION (Opt_intensityStyles)
1400# endif
1401 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1402 base += minBrightCOLOR - minCOLOR;
1403#endif
1404 return base;
1405 }
1406
1407 bool option (uint32_t opt) const
1408 {
1409 return OPTION (opt);
1410 }
1411
1412 void set_option (uint32_t opt, bool set)
1413 {
1414 if (set)
1415 options |= opt;
1416 else
1417 options &= ~opt;
1418 }
1419
1492 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1420 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1493 void scr_blank_screen_mem (line_t &l, rend_t efs); 1421 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1494 int scr_scroll_text (int row1, int row2, int count); 1422 int scr_scroll_text (int row1, int row2, int count);
1495 void scr_reset (); 1423 void scr_reset ();
1496 void scr_reset_realloc ();
1497 void scr_release (); 1424 void scr_release ();
1498 void scr_clear (bool really = false); 1425 void scr_clear (bool really = false);
1499 void scr_refresh (unsigned char refresh_type); 1426 void scr_refresh (unsigned char refresh_type);
1500 bool scr_refresh_rend (rend_t mask, rend_t value); 1427 bool scr_refresh_rend (rend_t mask, rend_t value);
1501 void scr_erase_screen (int mode); 1428 void scr_erase_screen (int mode);
… …
1507 void scr_touch (bool refresh); 1434 void scr_touch (bool refresh);
1508 void scr_expose (int x, int y, int width, int height, bool refresh); 1435 void scr_expose (int x, int y, int width, int height, bool refresh);
1509 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1436 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1510 void scr_recolour (); 1437 void scr_recolour ();
1511 void scr_remap_chars (); 1438 void scr_remap_chars ();
1512 void scr_remap_chars (const line_t &l); 1439 void scr_remap_chars (line_t &l);
1513 1440
1514 void scr_poweron (); 1441 void scr_poweron ();
1515 void scr_cursor (int mode); 1442 void scr_cursor (int mode);
1516 void scr_do_wrap (); 1443 void scr_do_wrap ();
1517 int scr_change_screen (int scrn); 1444 int scr_change_screen (int scrn);
1518 void scr_color (unsigned int color, int fgbg); 1445 void scr_color (unsigned int color, int fgbg);
1519 void scr_rendition (int set, int style); 1446 void scr_rendition (int set, int style);
1520 void scr_add_lines (const unicode_t *str, int nlines, int len); 1447 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1521 void scr_backspace (); 1448 void scr_backspace ();
1522 void scr_tab (int count, bool ht = false); 1449 void scr_tab (int count, bool ht = false);
1523 void scr_gotorc (int row, int col, int relative); 1450 void scr_gotorc (int row, int col, int relative);
1524 void scr_index (enum page_dirn direction); 1451 void scr_index (enum page_dirn direction);
1525 void scr_erase_line (int mode); 1452 void scr_erase_line (int mode);
… …
1535 void scr_rvideo_mode (int mode); 1462 void scr_rvideo_mode (int mode);
1536 void scr_report_position (); 1463 void scr_report_position ();
1537 void set_font_style (); 1464 void set_font_style ();
1538 void scr_charset_choose (int set); 1465 void scr_charset_choose (int set);
1539 void scr_charset_set (int set, unsigned int ch); 1466 void scr_charset_set (int set, unsigned int ch);
1540 int scr_move_to (int y, int len); 1467 void scr_move_to (int y, int len);
1541 int scr_page (enum page_dirn direction, int nlines); 1468 bool scr_page (enum page_dirn direction, int nlines);
1542 int scr_changeview (unsigned int oldviewstart); 1469 bool scr_changeview (int new_view_start);
1543 void scr_bell (); 1470 void scr_bell ();
1544 void scr_printscreen (int fullhist); 1471 void scr_printscreen (int fullhist);
1472 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1473 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1545 void scr_reverse_selection (); 1474 void scr_reverse_selection ();
1546 void scr_dump (int fd); 1475 void scr_dump (int fd);
1547 void selection_check (int check_more); 1476 void selection_check (int check_more);
1548 void selection_paste (Window win, Atom prop, bool delete_prop); 1477 void selection_paste (Window win, Atom prop, bool delete_prop);
1549 void selection_property (Window win, Atom prop); 1478 void selection_property (Window win, Atom prop);
1550 void selection_request (Time tm, int x, int y); 1479 void selection_request (Time tm, int x, int y);
1551 int selection_request_other (Atom target, int selnum); 1480 int selection_request_other (Atom target, int selnum);
1552 void selection_clear (); 1481 void selection_clear ();
1553 void selection_make (Time tm); 1482 void selection_make (Time tm);
1483 bool selection_grab (Time tm);
1554 void selection_start_colrow (int col, int row); 1484 void selection_start_colrow (int col, int row);
1555 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1485 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1556 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1486 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1557 void selection_remove_trailing_spaces (); 1487 void selection_remove_trailing_spaces ();
1558 void selection_send (const XSelectionRequestEvent &rq); 1488 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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